diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-09-11 19:32:05 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-09-11 21:03:45 +0800 |
| commit | bc9ece413fce4941a74a13619815a0869c1d2e99 (patch) | |
| tree | d5a356da0b7e3ebbc985848d29ac1ea641014ee8 /plugins | |
| parent | 3e176a079f5b2973494b2eaf2c863a722bab214b (diff) | |
| download | gsoc2013-evolution-bc9ece413fce4941a74a13619815a0869c1d2e99.tar gsoc2013-evolution-bc9ece413fce4941a74a13619815a0869c1d2e99.tar.gz gsoc2013-evolution-bc9ece413fce4941a74a13619815a0869c1d2e99.tar.bz2 gsoc2013-evolution-bc9ece413fce4941a74a13619815a0869c1d2e99.tar.lz gsoc2013-evolution-bc9ece413fce4941a74a13619815a0869c1d2e99.tar.xz gsoc2013-evolution-bc9ece413fce4941a74a13619815a0869c1d2e99.tar.zst gsoc2013-evolution-bc9ece413fce4941a74a13619815a0869c1d2e99.zip | |
Re-work my GtkDialog:has-separator workaround.
If we're using GTK+ 2.21.8 (where gtk_dialog_set_has_separator() is
deprecated but the property is still present and defaults to TRUE), we
still need to set the property to FALSE. So instead use g_object_set()
up through GTK+ 2.90.6, after which the property itself is gone.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/backup-restore/backup.c | 4 | ||||
| -rw-r--r-- | plugins/mail-notification/mail-notification.c | 4 | ||||
| -rw-r--r-- | plugins/mark-all-read/mark-all-read.c | 4 | ||||
| -rw-r--r-- | plugins/publish-calendar/url-editor-dialog.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index 6c86ee8a36..5b39374b58 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -459,8 +459,8 @@ main (gint argc, gchar **argv) GTK_RESPONSE_REJECT, NULL); -#if !GTK_CHECK_VERSION(2,21,8) - gtk_dialog_set_has_separator (GTK_DIALOG (progress_dialog), FALSE); +#if !GTK_CHECK_VERSION(2,90,7) + g_object_set (progress_dialog, "has-separator", FALSE, NULL); #endif gtk_container_set_border_width (GTK_CONTAINER (progress_dialog), 12); diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index 02f7cae248..a46af56fa5 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -379,8 +379,8 @@ do_properties (GtkMenuItem *item, gpointer user_data) content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); -#if !GTK_CHECK_VERSION(2,21,8) - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); +#if !GTK_CHECK_VERSION(2,90,7) + g_object_set (dialog, "has-separator", FALSE, NULL); #endif gtk_container_add (GTK_CONTAINER (content_area), vbox); gtk_container_set_border_width (GTK_CONTAINER (vbox), 10); diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c index f3d72fd246..9cbbfdc950 100644 --- a/plugins/mark-all-read/mark-all-read.c +++ b/plugins/mark-all-read/mark-all-read.c @@ -111,8 +111,8 @@ prompt_user (gboolean has_subfolders) dialog = gtk_dialog_new (); widget = gtk_dialog_get_action_area (GTK_DIALOG (dialog)); gtk_widget_hide (widget); -#if !GTK_CHECK_VERSION(2,21,8) - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); +#if !GTK_CHECK_VERSION(2,90,7) + g_object_set (dialog, "has-separator", FALSE, NULL); #endif gtk_window_set_title (GTK_WINDOW (dialog), ""); g_signal_connect ( diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c index 74044415aa..69cce8b0d2 100644 --- a/plugins/publish-calendar/url-editor-dialog.c +++ b/plugins/publish-calendar/url-editor-dialog.c @@ -378,8 +378,8 @@ url_editor_dialog_construct (UrlEditorDialog *dialog) gtk_container_add (GTK_CONTAINER (content_area), toplevel); gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); -#if !GTK_CHECK_VERSION(2,21,8) - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); +#if !GTK_CHECK_VERSION(2,90,7) + g_object_set (dialog, "has-separator", FALSE, NULL); #endif dialog->cancel = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); |