[rhythmbox] increase gtk+ version requirement to 2.18.0

[Jonathan Matthew <jmatthew src gnome org>]

commit e42ed5051b95fcdce827085535180d3544effb90
Author: Jonathan Matthew <jonathan d14n org>
Date:   Sat Jun 19 11:23:07 2010 +1000

    increase gtk+ version requirement to 2.18.0

 configure.ac                              |    2 +-
 plugins/audiocd/rb-audiocd-source.c       |   10 ++++------
 plugins/visualizer/rb-visualizer-plugin.c |   20 +-------------------
 3 files changed, 6 insertions(+), 26 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 161926e..3208df0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,7 @@ AC_CHECK_SIZEOF(long)
 
 DBUS_MIN_REQS=0.35
 GST_0_10_REQS=0.10.20
-GTK_REQS=2.16.0
+GTK_REQS=2.18.0
 GLIB_REQS=2.18.0
 GNOME_MEDIA_PROFILES_REQS=2.8
 LIBNOTIFY_REQS=0.4.1
diff --git a/plugins/audiocd/rb-audiocd-source.c b/plugins/audiocd/rb-audiocd-source.c
index 50b6ffe..8fc223e 100644
--- a/plugins/audiocd/rb-audiocd-source.c
+++ b/plugins/audiocd/rb-audiocd-source.c
@@ -85,7 +85,7 @@ static gboolean update_album_cb (GtkWidget *widget, GdkEventFocus *event, RBAudi
 static gboolean update_genre_cb (GtkWidget *widget, GdkEventFocus *event, RBAudioCdSource *source);
 static gboolean update_year_cb (GtkWidget *widget, GdkEventFocus *event, RBAudioCdSource *source);
 static gboolean update_disc_number_cb (GtkWidget *widget, GdkEventFocus *event, RBAudioCdSource *source);
-#if defined(HAVE_SJ_METADATA_GETTER) && GTK_CHECK_VERSION(2,17,6)
+#if defined(HAVE_SJ_METADATA_GETTER)
 static void info_bar_response_cb (GtkInfoBar *info_bar, gint response_id, RBAudioCdSource *source);
 #endif
 
@@ -343,7 +343,7 @@ rb_audiocd_source_constructed (GObject *object)
 		RBAudioCdSourcePrivate *priv;
 		GtkWidget *table;
 		GtkBuilder *builder;
-#if defined(HAVE_SJ_METADATA_GETTER) && GTK_CHECK_VERSION(2,17,6)
+#if defined(HAVE_SJ_METADATA_GETTER)
 		GtkWidget *box;
 		char *message;
 #endif
@@ -356,7 +356,7 @@ rb_audiocd_source_constructed (GObject *object)
 		table = GTK_WIDGET (gtk_builder_get_object (builder, "album_info"));
 		g_assert (table != NULL);
 
-#if defined(HAVE_SJ_METADATA_GETTER) && GTK_CHECK_VERSION(2,17,6)
+#if defined(HAVE_SJ_METADATA_GETTER)
 		/* Info bar for non-Musicbrainz data */
 		priv->info_bar = gtk_info_bar_new_with_buttons (_("S_ubmit Album"), GTK_RESPONSE_OK,
 								_("Hide"), GTK_RESPONSE_CANCEL,
@@ -817,13 +817,11 @@ metadata_cb (SjMetadataGetter *metadata,
 	} else
 		album = (AlbumDetails *)albums->data;
 
-#if GTK_CHECK_VERSION(2,17,6)
 	if (album->metadata_source != SOURCE_MUSICBRAINZ) {
 		priv->submit_url = sj_metadata_getter_get_submit_url (metadata);
 		if (priv->submit_url != NULL)
 			gtk_widget_show (priv->info_bar);
 	}
-#endif
 
 	if (album->metadata_source == SOURCE_FALLBACK) {
 		rb_debug ("ignoring CD metadata from fallback source");
@@ -1237,7 +1235,7 @@ update_disc_number_cb (GtkWidget *widget, GdkEventFocus *event, RBAudioCdSource
 	return FALSE;
 }
 
-#if defined(HAVE_SJ_METADATA_GETTER) && GTK_CHECK_VERSION(2,17,6)
+#if defined(HAVE_SJ_METADATA_GETTER)
 static void
 info_bar_response_cb (GtkInfoBar *info_bar, gint response_id, RBAudioCdSource *source)
 {
diff --git a/plugins/visualizer/rb-visualizer-plugin.c b/plugins/visualizer/rb-visualizer-plugin.c
index 451ff6c..3430417 100644
--- a/plugins/visualizer/rb-visualizer-plugin.c
+++ b/plugins/visualizer/rb-visualizer-plugin.c
@@ -249,24 +249,6 @@ static const VisualizerModeName vis_mode_name[] = {
 
 RB_PLUGIN_REGISTER(RBVisualizerPlugin, rb_visualizer_plugin)
 
-static GdkCursor *
-get_blank_cursor (GdkWindow *window)
-{
-#if !GTK_CHECK_VERSION(2,16,0)
-	GdkPixmap *pixmap;
-	GdkCursor *cursor;
-	GdkColor color = {0, 0, 0, 0};
-
-	pixmap = gdk_bitmap_create_from_data (window, "\0\0\0\0\0\0\0\0", 1, 1);
-	cursor = gdk_cursor_new_from_pixmap (pixmap, pixmap, &color, &color, 0, 0);
-	g_object_unref (pixmap);
-
-	return cursor;
-#else
-	return gdk_cursor_new (GDK_BLANK_CURSOR);
-#endif
-}
-
 static void
 rb_visualizer_plugin_init (RBVisualizerPlugin *plugin)
 {
@@ -831,7 +813,7 @@ actually_hide_controls (RBVisualizerPlugin *plugin)
 
 			window = gtk_widget_get_window (plugin->vis_widget);
 
-			cursor = get_blank_cursor (window);
+			cursor = gdk_cursor_new (GDK_BLANK_CURSOR);
 			gdk_window_set_cursor (window, cursor);
 			gdk_cursor_unref (cursor);
 		}