diff options
| author | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-09-07 17:46:12 +0800 |
|---|---|---|
| committer | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-09-07 17:50:47 +0800 |
| commit | 290a4853102e645d76318e8e09ef45420a6559bc (patch) | |
| tree | f35da604f566a7e148709707c4a3b863e49066b5 /src | |
| parent | 0b6ef5b5eac2633e4c7660c58b2bb6f412dd1a2a (diff) | |
| download | gsoc2013-empathy-290a4853102e645d76318e8e09ef45420a6559bc.tar gsoc2013-empathy-290a4853102e645d76318e8e09ef45420a6559bc.tar.gz gsoc2013-empathy-290a4853102e645d76318e8e09ef45420a6559bc.tar.bz2 gsoc2013-empathy-290a4853102e645d76318e8e09ef45420a6559bc.tar.lz gsoc2013-empathy-290a4853102e645d76318e8e09ef45420a6559bc.tar.xz gsoc2013-empathy-290a4853102e645d76318e8e09ef45420a6559bc.tar.zst gsoc2013-empathy-290a4853102e645d76318e8e09ef45420a6559bc.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-accounts-dialog.c | 3 | ||||
| -rw-r--r-- | src/empathy-import-dialog.c | 4 | ||||
| -rw-r--r-- | src/empathy-preferences.c | 4 |
3 files changed, 11 insertions, 0 deletions
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, |