f75a79b30a
Merge patches from upstream to fix build with newer gtk+2.
52 lines
2.7 KiB
Plaintext
52 lines
2.7 KiB
Plaintext
$OpenBSD: patch-eplugin_exchange-send-options_c,v 1.1 2011/03/07 19:41:32 ajacoutot Exp $
|
|
|
|
From e9596e5a2f5e2c1bc5c8700eafc3ead17f819020 Mon Sep 17 00:00:00 2001
|
|
From: Milan Crha <mcrha@redhat.com>
|
|
Date: Tue, 26 Oct 2010 08:38:22 +0000
|
|
Subject: Be able to compile against Gtk+ 2.23.0
|
|
|
|
--- eplugin/exchange-send-options.c.orig Tue Nov 2 11:32:25 2010
|
|
+++ eplugin/exchange-send-options.c Sun Feb 13 15:47:05 2011
|
|
@@ -32,6 +32,7 @@
|
|
#include <e-util/e-alert-dialog.h>
|
|
|
|
#include "exchange-send-options.h"
|
|
+#include "gtk-compat.h"
|
|
|
|
G_DEFINE_TYPE (ExchangeSendOptionsDialog, exchange_sendoptions_dialog, G_TYPE_OBJECT)
|
|
|
|
@@ -385,24 +386,24 @@ exchange_sendoptions_dialog_run (ExchangeSendOptionsDi
|
|
(GtkAttachOptions) (0), 0, 0);
|
|
gtk_misc_set_alignment (GTK_MISC (sensitivity_label), 0, 0.5);
|
|
|
|
- sensitivity_combo_box = gtk_combo_box_new_text ();
|
|
+ sensitivity_combo_box = gtk_combo_box_text_new ();
|
|
gtk_widget_show (sensitivity_combo_box);
|
|
gtk_table_attach (GTK_TABLE (msg_settings_table), sensitivity_combo_box, 1, 2, 1, 2,
|
|
(GtkAttachOptions) (GTK_FILL),
|
|
(GtkAttachOptions) (GTK_FILL), 0, 0);
|
|
- gtk_combo_box_append_text (GTK_COMBO_BOX (sensitivity_combo_box), _("Normal"));
|
|
- gtk_combo_box_append_text (GTK_COMBO_BOX (sensitivity_combo_box), _("Personal"));
|
|
- gtk_combo_box_append_text (GTK_COMBO_BOX (sensitivity_combo_box), _("Private"));
|
|
- gtk_combo_box_append_text (GTK_COMBO_BOX (sensitivity_combo_box), _("Confidential"));
|
|
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (sensitivity_combo_box), _("Normal"));
|
|
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (sensitivity_combo_box), _("Personal"));
|
|
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (sensitivity_combo_box), _("Private"));
|
|
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (sensitivity_combo_box), _("Confidential"));
|
|
|
|
- imp_combo_box = gtk_combo_box_new_text ();
|
|
+ imp_combo_box = gtk_combo_box_text_new ();
|
|
gtk_widget_show (imp_combo_box);
|
|
gtk_table_attach (GTK_TABLE (msg_settings_table), imp_combo_box, 1, 2, 0, 1,
|
|
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
|
|
(GtkAttachOptions) (GTK_FILL), 0, 0);
|
|
- gtk_combo_box_append_text (GTK_COMBO_BOX (imp_combo_box), _("Normal"));
|
|
- gtk_combo_box_append_text (GTK_COMBO_BOX (imp_combo_box), _("High"));
|
|
- gtk_combo_box_append_text (GTK_COMBO_BOX (imp_combo_box), _("Low"));
|
|
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (imp_combo_box), _("Normal"));
|
|
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (imp_combo_box), _("High"));
|
|
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (imp_combo_box), _("Low"));
|
|
|
|
del_enabled_check = gtk_check_button_new_with_mnemonic (_("Send as Delegate"));
|
|
gtk_widget_show (del_enabled_check);
|