[gnome-media/gnome-2-32] Fix compilation problems with GTK+ 2.21.8

[Bastien Nocera <hadess src gnome org>]

commit e5c9940c7e2faf3b966acd809ab87928181e245b
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Sep 20 17:09:28 2010 +0100

    Fix compilation problems with GTK+ 2.21.8

 gnome-volume-control/src/gvc-mixer-dialog.c       |    8 ++++++--
 gnome-volume-control/src/gvc-stream-status-icon.c |    6 +++++-
 grecord/src/gsr-window.c                          |    2 ++
 profiles/audio-profiles-edit.c                    |    2 ++
 4 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/gnome-volume-control/src/gvc-mixer-dialog.c b/gnome-volume-control/src/gvc-mixer-dialog.c
index b753714..22de76b 100644
--- a/gnome-volume-control/src/gvc-mixer-dialog.c
+++ b/gnome-volume-control/src/gvc-mixer-dialog.c
@@ -1519,10 +1519,14 @@ on_test_speakers_clicked (GvcComboBox *widget,
         g_debug ("XXX Start speaker testing for profile '%s', card %s XXX",
                  profile->profile, gvc_mixer_card_get_name (card));
 
-	title = g_strdup_printf (_("Speaker Testing for %s"), gvc_mixer_card_get_name (card));
+        title = g_strdup_printf (_("Speaker Testing for %s"), gvc_mixer_card_get_name (card));
         d = gtk_dialog_new_with_buttons (title,
                                          GTK_WINDOW (dialog),
-                                         GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+                                         GTK_DIALOG_MODAL |
+#if !GTK_CHECK_VERSION (2, 21, 8)
+                                         GTK_DIALOG_NO_SEPARATOR |
+#endif
+                                         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 3254a5b..48ccd21 100644
--- a/gnome-volume-control/src/gvc-stream-status-icon.c
+++ b/gnome-volume-control/src/gvc-stream-status-icon.c
@@ -26,8 +26,12 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
+#if GTK_CHECK_VERSION (2, 21, 8)
+#include <gdk/gdkkeysyms-compat.h>
+#else
+#include <gdk/gdkkeysyms.h>
+#endif
 
 #include "gvc-mixer-stream.h"
 #include "gvc-channel-bar.h"
diff --git a/grecord/src/gsr-window.c b/grecord/src/gsr-window.c
index 4c827e5..4a9a1c5 100644
--- a/grecord/src/gsr-window.c
+++ b/grecord/src/gsr-window.c
@@ -1087,7 +1087,9 @@ file_properties_cb (GtkAction *action,
 					      GTK_DIALOG_DESTROY_WITH_PARENT,
 					      GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
 	g_free (title);
+#if !GTK_CHECK_VERSION (2, 21, 8)
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+#endif
 	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..efd9dc5 100644
--- a/profiles/audio-profiles-edit.c
+++ b/profiles/audio-profiles-edit.c
@@ -596,7 +596,9 @@ gm_audio_profiles_edit_init (GMAudioProfilesEdit *dialog)
                                  GTK_RESPONSE_ACCEPT,
                                  NULL);
 
+#if !GTK_CHECK_VERSION (2, 21, 8)
   gtk_dialog_set_has_separator (gdialog, FALSE);
+#endif
   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);