[rhythmbox] Increase required GTK+ version to 2.14.0

[Jonathan Matthew <jmatthew src gnome org>]

commit 0843ea038b8a1a7be6874a7a96166b3c04d07bae
Author: Jonathan Matthew <jonathan d14n org>
Date:   Fri Dec 4 21:18:45 2009 +1000

    Increase required GTK+ version to 2.14.0
    
    The main effect of this is the removal of the last vestiges of
    libgnome/libgnomeui.

 INSTALL.quick                 |   15 ++++-----
 configure.ac                  |    8 +---
 plugins/daap/rb-daap-source.c |   70 -----------------------------------------
 shell/rb-shell-preferences.c  |    8 -----
 shell/rb-shell.c              |   13 -------
 5 files changed, 9 insertions(+), 105 deletions(-)
---
diff --git a/INSTALL.quick b/INSTALL.quick
index a182c18..56a45a3 100644
--- a/INSTALL.quick
+++ b/INSTALL.quick
@@ -3,21 +3,20 @@ Prerequisites
 
 Rhythmbox requires the following packages:
 
-- A working GNOME platform (more specifically, you need glib 2.16, gtk+ 2.12,
-  libgnome, gconf, gnome-media, and libsoup 2.4)
-- Totem-plparser 2.22 or newer
-- GStreamer 0.10.12 or newer and associated plugin packages.
+- A working GNOME platform (more specifically, you need glib 2.16, gtk+ 2.14,
+  gconf, gnome-media, and libsoup 2.4)
+- Totem-plparser 2.26 or newer
+- GStreamer 0.10.20 or newer and associated plugin packages.
 - D-BUS 0.35 or newer
 
 Rhythmbox can also make use of the following packages:
 
-- HAL 0.5 or newer (for iPod and generic audio player support)
+- GUdev 143 or newer, or HAL (for iPod and generic audio player support)
 - libgpod 0.6 or newer (for iPod support)
 - Avahi 0.6 or newer (for DAAP)
 - libmusicbrainz 2.1.0 or newer (for audio CD track listings)
-- libnotify 0.3.2 or newer
-- libnautilus-burn 2.22 or newer, which can be gotten by installing 
-  nautilus-cd-burner
+- libnotify 0.4.1 or newer
+- libbrasero-media 0.9.1 or newer
 
 
 Simple install procedure
diff --git a/configure.ac b/configure.ac
index 65e7591..65b28fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_CHECK_SIZEOF(long)
 
 DBUS_MIN_REQS=0.35
 GST_0_10_REQS=0.10.20
-GTK_REQS=2.12.0
+GTK_REQS=2.14.0
 GLIB_REQS=2.16.0
 GNOME_MEDIA_PROFILES_REQS=2.8
 LIBNOTIFY_REQS=0.4.1
@@ -69,9 +69,6 @@ PKG_PROG_PKG_CONFIG
 
 PKG_CHECK_MODULES(RB_CLIENT, glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS)
 
-# libgnomeui still required with gtk < 2.14
-PKG_CHECK_EXISTS(gtk+-2.0 >= 2.14, [LIBGNOME_REQS=], [LIBGNOME_REQS=libgnomeui-2.0])
-
 # use gtk status icon with gtk >= 2.16
 PKG_CHECK_EXISTS(gtk+-2.0 >= 2.16, [
 	use_gtk_status_icon=yes
@@ -88,8 +85,7 @@ PKG_CHECK_MODULES(RHYTHMBOX,				\
 		  gio-unix-2.0 >= $GLIB_REQS		\
 		  gnome-media-profiles >= $GNOME_MEDIA_PROFILES_REQS \
 		  libsoup-2.4 >= $LIBSOUP_REQS		\
-		  libsoup-gnome-2.4 >= $LIBSOUP_REQS	\
-		  $LIBGNOME_REQS)
+		  libsoup-gnome-2.4 >= $LIBSOUP_REQS)
 
 PKG_CHECK_MODULES(TOTEM_PLPARSER, totem-plparser >= $TOTEM_PLPARSER_REQS, have_totem_plparser=yes, have_totem_plparser=no)
 if test x$have_totem_plparser != xyes; then
diff --git a/plugins/daap/rb-daap-source.c b/plugins/daap/rb-daap-source.c
index 619e518..309e7aa 100644
--- a/plugins/daap/rb-daap-source.c
+++ b/plugins/daap/rb-daap-source.c
@@ -39,10 +39,6 @@
 #include <gnome-keyring.h>
 #endif
 
-#if !GTK_CHECK_VERSION(2,14,0)
-#include <libgnomeui/gnome-password-dialog.h>
-#endif
-
 #include "rhythmdb.h"
 #include "rb-shell.h"
 #include "eel-gconf-extensions.h"
@@ -318,10 +314,6 @@ rb_daap_source_new (RBShell *shell,
 	return source;
 }
 
-#if GTK_CHECK_VERSION(2,14,0)
-
-/* use GtkMountOperation if available */
-
 static void
 mount_op_reply_cb (GMountOperation *op,
 		   GMountOperationResult result,
@@ -399,68 +391,6 @@ ask_password (RBDAAPSource *source, const char *name, const char *keyring)
 	return password;
 }
 
-#else
-
-static char *
-ask_password (RBDAAPSource *source, const char *name, const char *keyring)
-{
-	GtkWindow *parent;
-	GnomePasswordDialog *dialog;
-	char *message;
-	char *password;
-
-	parent = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (source)));
-
-	message = g_strdup_printf (_("The music share '%s' requires a password to connect"), name);
-	dialog = GNOME_PASSWORD_DIALOG (gnome_password_dialog_new (
-				_("Password Required"), message,
-				NULL, NULL, TRUE));
-	gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
-	g_free (message);
-
-	gnome_password_dialog_set_domain (dialog, "DAAP");
-	gnome_password_dialog_set_show_username (dialog, FALSE);
-	gnome_password_dialog_set_show_domain (dialog, FALSE);
-	gnome_password_dialog_set_show_userpass_buttons (dialog, FALSE);
-#ifdef WITH_GNOME_KEYRING
-	gnome_password_dialog_set_show_remember (dialog, gnome_keyring_is_available ());
-#endif
-
-	if (gnome_password_dialog_run_and_block (dialog)) {
-		password = gnome_password_dialog_get_password (dialog);
-
-#ifdef WITH_GNOME_KEYRING
-		switch (gnome_password_dialog_get_remember (dialog)) {
-		case GNOME_PASSWORD_DIALOG_REMEMBER_SESSION:
-			keyring = "session";
-			/* fall through */
-		case GNOME_PASSWORD_DIALOG_REMEMBER_FOREVER:
-		{
-			guint32 item_id;
-			gnome_keyring_set_network_password_sync (keyring,
-				NULL,
-				"DAAP", name,
-				NULL, "daap",
-				NULL, 0,
-				password,
-				&item_id);
-			break;
-		}
-		default:
-			break;
-		}
-#endif
-	} else {
-		password = NULL;
-	}
-
-	/* buggered if I know why we don't do this...
-	g_object_unref (G_OBJECT (dialog)); */
-	return password;
-}
-
-#endif
-
 static char *
 connection_auth_cb (RBDAAPConnection *connection,
 		    const char       *name,
diff --git a/shell/rb-shell-preferences.c b/shell/rb-shell-preferences.c
index fc16b27..26b0bc9 100644
--- a/shell/rb-shell-preferences.c
+++ b/shell/rb-shell-preferences.c
@@ -53,10 +53,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#if !GTK_CHECK_VERSION(2,14,0)
-#include <libgnome/gnome-help.h>
-#endif
-
 #include "rb-file-helpers.h"
 #include "rb-shell-preferences.h"
 #include "rb-source.h"
@@ -151,14 +147,10 @@ help_cb (GtkWidget *widget,
 {
 	GError *error = NULL;
 
-#if GTK_CHECK_VERSION(2,14,0)
 	gtk_show_uri (gtk_widget_get_screen (widget),
 		      "ghelp:rhythmbox?prefs",
 		      gtk_get_current_event_time (),
 		      &error);
-#else
-	gnome_help_display ("rhythmbox.xml", "prefs", &error);
-#endif
 
 	if (error != NULL) {
 		rb_error_dialog (NULL,
diff --git a/shell/rb-shell.c b/shell/rb-shell.c
index d71e2ad..dc80c00 100644
--- a/shell/rb-shell.c
+++ b/shell/rb-shell.c
@@ -43,10 +43,6 @@
 #include <X11/XF86keysym.h>
 #endif /* HAVE_MMKEYS */
 
-#if !GTK_CHECK_VERSION(2,14,0)
-#include <libgnome/libgnome.h>
-#endif
-
 #include "rb-shell.h"
 #include "rb-debug.h"
 #include "rb-dialog.h"
@@ -954,12 +950,7 @@ rb_shell_new (gboolean no_registration,
 static GMountOperation *
 rb_shell_create_mount_op_cb (RhythmDB *db, RBShell *shell)
 {
-	/* create a gtk mount operation if possible, otherwise don't use one at all */
-#if GTK_CHECK_VERSION(2,14,0)
 	return gtk_mount_operation_new (GTK_WINDOW (shell->priv->window));
-#else
-	return NULL;
-#endif
 }
 
 static void
@@ -2173,14 +2164,10 @@ rb_shell_cmd_contents (GtkAction *action,
 {
 	GError *error = NULL;
 
-#if GTK_CHECK_VERSION(2,14,0)
 	gtk_show_uri (gtk_widget_get_screen (shell->priv->window),
 		      "ghelp:rhythmbox",
 		      gtk_get_current_event_time (),
 		      &error);
-#else
-	gnome_help_display ("rhythmbox.xml", NULL, &error);
-#endif
 
 	if (error != NULL) {
 		rb_error_dialog (NULL, _("Couldn't display help"),