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/empathy-preferences.c | |
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/empathy-preferences.c')
-rw-r--r-- | src/empathy-preferences.c | 4 |
1 files changed, 4 insertions, 0 deletions
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, |