[rhythmbox/gobject-introspection: 13/41] finish dropping gtk+2

[Jonathan Matthew <jmatthew src gnome org>]

commit bccb30a5a6483b35bd2825990418c4cbc9275f6a
Author: Jonathan Matthew <jonathan d14n org>
Date:   Mon Nov 29 09:30:42 2010 +1000

    finish dropping gtk+2

 bindings/gi/Makefile.am |    2 +-
 configure.ac            |   11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/bindings/gi/Makefile.am b/bindings/gi/Makefile.am
index 2756475..fcbc4d7 100644
--- a/bindings/gi/Makefile.am
+++ b/bindings/gi/Makefile.am
@@ -132,7 +132,7 @@ MPID_0_13_gir_PACKAGES = rhythmbox
 MPID_0_13_gir_SCANNERFLAGS = --symbol-prefix mpid_
 
 RB-0.13.gir: $(top_builddir)/shell/librhythmbox-core.la
-RB_0_13_gir_INCLUDES = GObject-2.0 Gio-2.0 Gtk-$(GTK_MAJ_VER) Gst-0.10 libxml2-2.0  MPID-0.13
+RB_0_13_gir_INCLUDES = GObject-2.0 Gio-2.0 Gtk-3.0 Gst-0.10 libxml2-2.0  MPID-0.13
 RB_0_13_gir_CFLAGS = $(RHYTHMBOX_CFLAGS_NOWARN) $(TOTEM_PLPARSER_CFLAGS) $(DBUS_CFLAGS) $(GUDEV_CFLAGS) -I../..
 RB_0_13_gir_LIBS = $(top_builddir)/shell/librhythmbox-core.la
 RB_0_13_gir_FILES = $(addprefix $(top_srcdir)/,$(rb_introspection_sources))
diff --git a/configure.ac b/configure.ac
index a7ee33b..2ab7b8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,8 +44,6 @@ AC_C_BIGENDIAN
 AC_CHECK_SIZEOF(long)
 
 GTK_REQS=2.91.4
-GTK_MAJ_VER=3.0
-AC_SUBST(GTK_MAJ_VER)
 
 DBUS_MIN_REQS=0.35
 GST_0_10_REQS=0.10.20
@@ -99,7 +97,7 @@ PKG_CHECK_MODULES(RB_CLIENT, glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS gio-un
 dnl  note: gio-unix-2.0 is here for libmediaplayerid
 PKG_CHECK_MODULES(RHYTHMBOX,				\
 		  gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQS \
-		  gtk+-$GTK_MAJ_VER >= $GTK_REQS			\
+		  gtk+-3.0 >= $GTK_REQS			\
 		  gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQS	\
 		  glib-2.0 >= $GLIB_REQS		\
 		  gio-2.0 >= $GLIB_REQS			\
@@ -430,7 +428,7 @@ AC_ARG_WITH(libbrasero-media,
 if test x"$with_libbrasero_media" != "xno"; then
     PKG_CHECK_MODULES(LIBBRASERO_MEDIA, [
 	libbrasero-media >= $BRASERO_MIN_REQS	\
-	gtk+-x11-$GTK_MAJ_VER],
+	gtk+-x11-3.0],
 	have_libbrasero_media=yes,
 	have_libbrasero_media=no)
 fi
@@ -940,11 +938,6 @@ remote/dbus/Makefile
 ])
 
 AC_MSG_NOTICE([Rhythmbox was configured with the following options:])
-if test "$GTK_MAJ_VER" = "3.0"; then
-	AC_MSG_NOTICE([** Using GTK+3])
-else
-	AC_MSG_NOTICE([** Using GTK+2])
-fi
 if test x"$with_database" = xtree; then
 	AC_MSG_NOTICE([** Tree database is enabled])
 else