From bc9ece413fce4941a74a13619815a0869c1d2e99 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 11 Sep 2010 07:32:05 -0400 Subject: 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. --- widgets/misc/e-attachment-dialog.c | 4 ++-- widgets/misc/e-charset-combo-box.c | 4 ++-- widgets/misc/e-signature-script-dialog.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'widgets/misc') diff --git a/widgets/misc/e-attachment-dialog.c b/widgets/misc/e-attachment-dialog.c index 5e24f0d05b..24fe7b4049 100644 --- a/widgets/misc/e-attachment-dialog.c +++ b/widgets/misc/e-attachment-dialog.c @@ -306,8 +306,8 @@ e_attachment_dialog_init (EAttachmentDialog *dialog) gtk_window_set_title ( GTK_WINDOW (dialog), _("Attachment Properties")); -#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_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); diff --git a/widgets/misc/e-charset-combo-box.c b/widgets/misc/e-charset-combo-box.c index 0a977908c6..5f542a6d48 100644 --- a/widgets/misc/e-charset-combo-box.c +++ b/widgets/misc/e-charset-combo-box.c @@ -103,8 +103,8 @@ charset_combo_box_run_dialog (ECharsetComboBox *combo_box) dialog = GTK_DIALOG (widget); -#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_dialog_set_default_response (dialog, GTK_RESPONSE_OK); diff --git a/widgets/misc/e-signature-script-dialog.c b/widgets/misc/e-signature-script-dialog.c index 6580f97888..fa725081dc 100644 --- a/widgets/misc/e-signature-script-dialog.c +++ b/widgets/misc/e-signature-script-dialog.c @@ -243,8 +243,8 @@ e_signature_script_dialog_init (ESignatureScriptDialog *dialog) GTK_DIALOG (dialog), GTK_STOCK_SAVE, GTK_RESPONSE_OK); -#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_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); -- cgit v1.2.3