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 /filter | |
| 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 'filter')
| -rw-r--r-- | filter/e-filter-datespec.c | 4 | ||||
| -rw-r--r-- | filter/e-rule-context.c | 4 | ||||
| -rw-r--r-- | filter/e-rule-editor.c | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/filter/e-filter-datespec.c b/filter/e-filter-datespec.c index 328ff5adc1..0ec87ad343 100644 --- a/filter/e-filter-datespec.c +++ b/filter/e-filter-datespec.c @@ -277,8 +277,8 @@ button_clicked (GtkButton *button, EFilterDatespec *fds) GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); -#if !GTK_CHECK_VERSION(2,21,8) - gtk_dialog_set_has_separator (dialog, FALSE); +#if !GTK_CHECK_VERSION(2,90,7) + g_object_set (dialog, "has-separator", FALSE, NULL); #endif p->notebook_type = e_builder_get_widget (builder, "notebook_type"); diff --git a/filter/e-rule-context.c b/filter/e-rule-context.c index 4e68e59515..2ec62536ec 100644 --- a/filter/e-rule-context.c +++ b/filter/e-rule-context.c @@ -774,8 +774,8 @@ e_rule_context_add_rule_gui (ERuleContext *context, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); -#if !GTK_CHECK_VERSION(2,21,8) - gtk_dialog_set_has_separator (dialog, FALSE); +#if !GTK_CHECK_VERSION(2,90,7) + g_object_set (dialog, "has-separator", FALSE, NULL); #endif gtk_window_set_title ((GtkWindow *) dialog, title); diff --git a/filter/e-rule-editor.c b/filter/e-rule-editor.c index 924d22a213..94d182ebb0 100644 --- a/filter/e-rule-editor.c +++ b/filter/e-rule-editor.c @@ -263,8 +263,8 @@ rule_add (GtkWidget *widget, ERuleEditor *editor) GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); -#if !GTK_CHECK_VERSION(2,21,8) - gtk_dialog_set_has_separator ((GtkDialog *) editor->dialog, FALSE); +#if !GTK_CHECK_VERSION(2,90,7) + g_object_set (editor->dialog, "has-separator", FALSE, NULL); #endif gtk_window_set_title ((GtkWindow *) editor->dialog, _("Add Rule")); @@ -352,8 +352,8 @@ rule_edit (GtkWidget *widget, ERuleEditor *editor) GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); -#if !GTK_CHECK_VERSION(2,21,8) - gtk_dialog_set_has_separator ((GtkDialog *) editor->dialog, FALSE); +#if !GTK_CHECK_VERSION(2,90,7) + g_object_set (editor->dialog, "has-separator", FALSE, NULL); #endif gtk_window_set_title ((GtkWindow *) editor->dialog, _("Edit Rule")); @@ -852,8 +852,8 @@ e_rule_editor_construct (ERuleEditor *editor, G_CALLBACK (editor_response), editor); rule_editor_set_source (editor, source); -#if !GTK_CHECK_VERSION(2,21,8) - gtk_dialog_set_has_separator ((GtkDialog *) editor, FALSE); +#if !GTK_CHECK_VERSION(2,90,7) + g_object_set (editor, "has-separator", FALSE, NULL); #endif gtk_dialog_add_buttons ((GtkDialog *) editor, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, |