[gnome-media] Fix build with newer GTK+

[Bastien Nocera <hadess src gnome org>]

commit 3fa063f155fd21e27296c7562ca598a1ced60a20
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Sep 20 17:01:24 2010 +0100

    Fix build with newer GTK+
    
    Require a newer GTK+ for 3.x, and fix build warnings and failures.
    
    With help from Matthias Clasen <mclasen redhat com>
    
    https://bugzilla.gnome.org/show_bug.cgi?id=629895

 configure.ac                                      |    6 +++---
 gnome-volume-control/src/gvc-mixer-dialog.c       |    2 +-
 gnome-volume-control/src/gvc-stream-status-icon.c |    2 +-
 grecord/src/gsr-window.c                          |    1 -
 profiles/audio-profiles-edit.c                    |    1 -
 5 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 38b6024..06323ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,7 @@ fi
 AC_MSG_NOTICE([Using $GM_ERROR_CFLAGS as error checking CFLAGS])
 
 GLIB_REQUIRED_VERSION=2.18.2
-GTK_REQUIRED_VERSION=2.18.0
+GTK_REQUIRED_VERSION=2.90.7
 GCONF_REQUIRED_VERSION=2.6.1
 PA_REQUIRED_VERSION=0.9.16
 CANBERRA_REQUIRED_VERSION=0.13
@@ -90,7 +90,7 @@ dnl Check for the new volume control modules
 dnl=======================================================================
 
 dnl The new gnome-volume-control needs a newer GTK+
-GTK_REQUIRED_VERSION=2.15.1
+GTK_REQUIRED_VERSION=2.90.7
 
 AC_ARG_ENABLE([pulseaudio],
               AS_HELP_STRING([--enable-pulseaudio],
@@ -312,7 +312,7 @@ fi
 if test "x$have_gst" = "xyes" && test "x$enable_gstmix" = "xyes";
 then
   PKG_CHECK_MODULES(GSTMIXER, [
-    gtk+-3.0
+    gtk+-3.0 >= $GTK_REQUIRED_VERSION
     gconf-2.0
     gstreamer-$GST_MAJORMINOR
     gstreamer-plugins-base-$GST_MAJORMINOR
diff --git a/gnome-volume-control/src/gvc-mixer-dialog.c b/gnome-volume-control/src/gvc-mixer-dialog.c
index 245ac58..6f0c8b7 100644
--- a/gnome-volume-control/src/gvc-mixer-dialog.c
+++ b/gnome-volume-control/src/gvc-mixer-dialog.c
@@ -1532,7 +1532,7 @@ on_test_speakers_clicked (GvcComboBox *widget,
         // https://bugzilla.gnome.org/show_bug.cgi?id=621940
         d = gtk_dialog_new_with_buttons (title,
                                          NULL,
-                                         GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+                                         GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                          NULL);
         g_free (title);
         speaker_test = gvc_speaker_test_new (dialog->priv->mixer_control,
diff --git a/gnome-volume-control/src/gvc-stream-status-icon.c b/gnome-volume-control/src/gvc-stream-status-icon.c
index 46619aa..533c8a6 100644
--- a/gnome-volume-control/src/gvc-stream-status-icon.c
+++ b/gnome-volume-control/src/gvc-stream-status-icon.c
@@ -377,7 +377,7 @@ on_dock_key_release (GtkWidget           *widget,
                      GdkEventKey         *event,
                      GvcStreamStatusIcon *icon)
 {
-        if (event->keyval == GDK_Escape) {
+        if (event->keyval == GDK_KEY_Escape) {
                 popdown_dock (icon);
                 return TRUE;
         }
diff --git a/grecord/src/gsr-window.c b/grecord/src/gsr-window.c
index df92ef3..8f3b8d6 100644
--- a/grecord/src/gsr-window.c
+++ b/grecord/src/gsr-window.c
@@ -1088,7 +1088,6 @@ file_properties_cb (GtkAction *action,
 					      GTK_DIALOG_DESTROY_WITH_PARENT,
 					      GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
 	g_free (title);
-	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 	gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
 	gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 2);
diff --git a/profiles/audio-profiles-edit.c b/profiles/audio-profiles-edit.c
index 0e8ca89..77489ad 100644
--- a/profiles/audio-profiles-edit.c
+++ b/profiles/audio-profiles-edit.c
@@ -596,7 +596,6 @@ gm_audio_profiles_edit_init (GMAudioProfilesEdit *dialog)
                                  GTK_RESPONSE_ACCEPT,
                                  NULL);
 
-  gtk_dialog_set_has_separator (gdialog, FALSE);
   gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
   gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (gdialog)), 2); /* 2 * 5 + 2 = 12 */
   gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_action_area (gdialog)), 5);