[balsa/gtk3] Drop Bonobo and change GtkSourceview configuration

[Peter Bloomfield <PeterB src gnome org>]

commit aea43e3345e392ff08990a0c29116061aa844ff0
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sun Jan 9 20:09:18 2011 -0500

    Drop Bonobo and change GtkSourceview configuration
    
    	* configure.in: do not configure Bonobo/Corba; do not check
    	GtkSourceview version.
    	* Makefile.am: unversioned GtkSourceview test.

 ChangeLog    |    6 ++++++
 Makefile.am  |    2 +-
 configure.in |   20 +++-----------------
 3 files changed, 10 insertions(+), 18 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9a306bd..d2124e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-09  Peter Bloomfield
+
+	* configure.in: do not configure Bonobo/Corba; do not check
+	GtkSourceview version.
+	* Makefile.am: unversioned GtkSourceview test.
+
 2011-01-08  Peter Bloomfield
 
 	* src/pref-manager.c (quoted_group), (mdn_group): let GtkLabel
diff --git a/Makefile.am b/Makefile.am
index 4fb5603..6d8f0e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,7 +49,7 @@ EXTRA_DIST =			\
     $(balsa_extra_dist)		\
     $(balsa_g_d_u_extra_dist)
 
-if BUILD_WITH_GTKSOURCEVIEW2
+if BUILD_WITH_GTKSOURCEVIEW
 gtksourceviewdir = $(BALSA_DATA_PREFIX)/gtksourceview-2.0
 gtksourceview_DATA = balsa-mail.lang		\
 	balsa-mail-style.xml
diff --git a/configure.in b/configure.in
index d248263..067ad6a 100644
--- a/configure.in
+++ b/configure.in
@@ -369,18 +369,6 @@ dnl ##########################################################################
 dnl Check versions
 dnl ##########################################################################
 
-# CORBA interface.
-#
-                                                                        
-ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
-AC_SUBST(ORBIT_IDL)
-
-LIBBONOBO_IDL="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
-AC_SUBST(LIBBONOBO_IDL)
- 
-BONOBO_ACTIVATION_IDL="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
-AC_SUBST(BONOBO_ACTIVATION_IDL)
-
 AC_SUBST(BALSA_CFLAGS)
 AC_SUBST(BALSA_LIBS)
 AC_SUBST(BALSA_AB_LIBS)
@@ -772,7 +760,7 @@ if test x$with_gtksourceview != xno; then
     BALSA_CFLAGS="$BALSA_CFLAGS $GTKSOURCEVIEW_CFLAGS"
     BALSA_LIBS="$BALSA_LIBS $GTKSOURCEVIEW_LIBS"
 fi
-AM_CONDITIONAL([BUILD_WITH_GTKSOURCEVIEW2], [test x$with_gtksourceview = x3 ])
+AM_CONDITIONAL([BUILD_WITH_GTKSOURCEVIEW], [test x$with_gtksourceview = x3 ])
 
 # libUnique configuration
 #
@@ -895,6 +883,7 @@ if test -d "${srcdir}/.git" ; then
         fi
         BALSA_DEFS="$BALSA_DEFS \
 -DG_DISABLE_DEPRECATED \
+-DG_DISABLE_SINGLE_INCLUDES \
 -DGDK_DISABLE_DEPRECATED \
 -DGDK_PIXBUF_DISABLE_DEPRECATED \
 -DGMIME_DISABLE_DEPRECATED \
@@ -902,14 +891,11 @@ if test -d "${srcdir}/.git" ; then
 -DGNOME_DISABLE_DEPRECATED_SOURCE \
 -DGNOME_VFS_DISABLE_DEPRECATED \
 -DGTK_DISABLE_DEPRECATED \
+-DGTK_DISABLE_SINGLE_INCLUDES \
 -DNM_DISABLE_DEPRECATED \
 -DPANGO_DISABLE_DEPRECATED \
 -D_FORTIFY_SOURCE=2 \
 "
-    if $PKG_CONFIG --atleast-version=2.9.9 gtksourceview-2.0; then
-        BALSA_DEFS="$BALSA_DEFS \
-        -DGTK_DISABLE_SINGLE_INCLUDES -DG_DISABLE_SINGLE_INCLUDES"
-    fi
 
     if test x"$use_html_widget" != xgtkhtml2 ; then
         BALSA_DEFS="$BALSA_DEFS \