From 290a4853102e645d76318e8e09ef45420a6559bc Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Tue, 7 Sep 2010 10:46:12 +0100 Subject: Remove calls to gtk_dialog_set_has_separator() if building against GTK+ 3 gtk_dialog_set_has_separator() has been removed in GTK+ 3, but can't be removed (or the property's default value changed) in GTK+ 2 without breaking API. This adds a wrapper macro to keep the calls when building against GTK+ 2, and remove them when building against GTK+ 3. --- src/empathy-accounts-dialog.c | 3 +++ src/empathy-import-dialog.c | 4 ++++ src/empathy-preferences.c | 4 ++++ 3 files changed, 11 insertions(+) (limited to 'src') diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index 4bf692778..2ad2fb759 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -2155,7 +2155,10 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog) gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG); + /* FIXME: Remove this once we unconditionally depend on GTK+ 3 */ +#ifndef HAVE_GTK3 gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); +#endif /* add dialog buttons */ gtk_button_box_set_layout (GTK_BUTTON_BOX (action_area), GTK_BUTTONBOX_END); diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c index e8b1ed87c..1fc00c0e5 100644 --- a/src/empathy-import-dialog.c +++ b/src/empathy-import-dialog.c @@ -198,7 +198,11 @@ empathy_import_dialog_init (EmpathyImportDialog *self) gtk_container_set_border_width (GTK_CONTAINER (self), 5); gtk_window_set_title (GTK_WINDOW (self), _("Import Accounts")); gtk_window_set_modal (GTK_WINDOW (self), TRUE); + + /* FIXME: Remove this once we unconditionally depend on GTK+ 3 */ +#ifndef HAVE_GTK3 gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE); +#endif } static void diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c index acf5eab21..edc405974 100644 --- a/src/empathy-preferences.c +++ b/src/empathy-preferences.c @@ -884,7 +884,11 @@ empathy_preferences_init (EmpathyPreferences *preferences) gtk_window_set_position (GTK_WINDOW (preferences), GTK_WIN_POS_CENTER_ON_PARENT); gtk_window_set_icon_name (GTK_WINDOW (preferences), "gtk-preferences"); + + /* FIXME: Remove this once we unconditionally depend on GTK+ 3 */ +#ifndef HAVE_GTK3 gtk_dialog_set_has_separator (GTK_DIALOG (preferences), FALSE); +#endif filename = empathy_file_lookup ("empathy-preferences.ui", "src"); gui = empathy_builder_get_file (filename, -- cgit v1.2.3