Update to evolution-exchange-2.32.2.
Merge patches from upstream to fix build with newer gtk+2.
This commit is contained in:
ajacoutot
parent
ab603a6b57
commit
f75a79b30a
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.16 2011/01/08 08:46:52 landry Exp $
|
||||
# $OpenBSD: Makefile,v 1.17 2011/03/07 19:41:32 ajacoutot Exp $
|
||||
|
||||
# No NTLM support in OpenLDAP; Plaintext password authentication will be
|
||||
# used when connecting to the Global Catalog server. Consider installing
|
||||
@ -10,8 +10,7 @@ SHARED_ONLY= Yes
|
||||
COMMENT= Evolution connector for MS Exchange
|
||||
|
||||
GNOME_PROJECT= evolution-exchange
|
||||
GNOME_VERSION= 2.32.1
|
||||
REVISION= 0
|
||||
GNOME_VERSION= 2.32.2
|
||||
|
||||
CATEGORIES= mail
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (evolution-exchange-2.32.1.tar.bz2) = W1MXVXs3kcdhkqMVe5gyEw==
|
||||
RMD160 (evolution-exchange-2.32.1.tar.bz2) = ZxBeFygR+QQThhVuGifUVjl/ZRU=
|
||||
SHA1 (evolution-exchange-2.32.1.tar.bz2) = WmsDjrAnteaBAnPp0fbxbPqnScA=
|
||||
SHA256 (evolution-exchange-2.32.1.tar.bz2) = MA4v2ZXq7NLQh3tAjMjGs9JkZ6o25BsdaQ+FY7Hfna4=
|
||||
SIZE (evolution-exchange-2.32.1.tar.bz2) = 1307820
|
||||
MD5 (evolution-exchange-2.32.2.tar.bz2) = b6jmBKK8n14Ke3hAj2nWLA==
|
||||
RMD160 (evolution-exchange-2.32.2.tar.bz2) = 9pLAZqGogbKj7QdTt+D0ZzsJ8S4=
|
||||
SHA1 (evolution-exchange-2.32.2.tar.bz2) = uH4WC0XGbm+5UfyVicpAVv7BUmc=
|
||||
SHA256 (evolution-exchange-2.32.2.tar.bz2) = YAMOst4ELO8dcDzafWTD7If87wvZZgEugWlUqWzDfWM=
|
||||
SIZE (evolution-exchange-2.32.2.tar.bz2) = 1306445
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure,v 1.4 2010/11/16 09:18:15 ajacoutot Exp $
|
||||
--- configure.orig Mon Nov 15 11:57:09 2010
|
||||
+++ configure Tue Nov 16 09:58:55 2010
|
||||
@@ -15439,7 +15439,7 @@ $as_echo_n "checking for Kerberos 5... " >&6; }
|
||||
$OpenBSD: patch-configure,v 1.5 2011/03/07 19:41:32 ajacoutot Exp $
|
||||
--- configure.orig Sun Feb 6 06:13:28 2011
|
||||
+++ configure Sat Feb 26 22:54:52 2011
|
||||
@@ -15618,7 +15618,7 @@ $as_echo_n "checking for Kerberos 5... " >&6; }
|
||||
LIBS_save="$LIBS"
|
||||
|
||||
mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
|
||||
|
||||
@ -0,0 +1,93 @@
|
||||
$OpenBSD: patch-eplugin_exchange-delegates-user_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-delegates-user.c.orig Tue Nov 2 11:32:25 2010
|
||||
+++ eplugin/exchange-delegates-user.c Sun Feb 13 15:47:05 2011
|
||||
@@ -42,6 +42,8 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
+#include "gtk-compat.h"
|
||||
+
|
||||
#define EXCHANGE_DELEGATES_USER_CUSTOM -3
|
||||
/* Can't use E2K_PERMISSIONS_ROLE_CUSTOM, because it's -1, which
|
||||
* means "end of list" to e_dialog_combo_box_get/set
|
||||
@@ -129,7 +131,7 @@ static void
|
||||
set_perms (GtkWidget *combobox, E2kPermissionsRole role)
|
||||
{
|
||||
if (!is_delegate_role (role)) {
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("Custom"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), _("Custom"));
|
||||
role = EXCHANGE_DELEGATES_USER_CUSTOM;
|
||||
}
|
||||
|
||||
@@ -287,45 +289,45 @@ exchange_delegates_user_edit (ExchangeAccount *account
|
||||
gtk_label_set_justify (GTK_LABEL (contact_label), GTK_JUSTIFY_CENTER);
|
||||
gtk_misc_set_alignment (GTK_MISC (contact_label), 0, 0.5);
|
||||
|
||||
- calendar_perms_combobox = gtk_combo_box_new_text ();
|
||||
+ calendar_perms_combobox = gtk_combo_box_text_new ();
|
||||
gtk_widget_show (calendar_perms_combobox);
|
||||
gtk_table_attach (GTK_TABLE (folders_table), calendar_perms_combobox, 1, 2, 0, 1,
|
||||
(GtkAttachOptions) (GTK_FILL),
|
||||
(GtkAttachOptions) (GTK_FILL), 0, 0);
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (calendar_perms_combobox), _("None"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (calendar_perms_combobox), _("Reviewer (read-only)"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (calendar_perms_combobox), _("Author (read, create)"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (calendar_perms_combobox), _("Editor (read, create, edit)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (calendar_perms_combobox), _("None"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (calendar_perms_combobox), _("Reviewer (read-only)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (calendar_perms_combobox), _("Author (read, create)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (calendar_perms_combobox), _("Editor (read, create, edit)"));
|
||||
|
||||
- task_perms_combobox = gtk_combo_box_new_text ();
|
||||
+ task_perms_combobox = gtk_combo_box_text_new ();
|
||||
gtk_widget_show (task_perms_combobox);
|
||||
gtk_table_attach (GTK_TABLE (folders_table), task_perms_combobox, 1, 2, 1, 2,
|
||||
(GtkAttachOptions) (GTK_FILL),
|
||||
(GtkAttachOptions) (GTK_FILL), 0, 0);
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (task_perms_combobox), _("None"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (task_perms_combobox), _("Reviewer (read-only)"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (task_perms_combobox), _("Author (read, create)"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (task_perms_combobox), _("Editor (read, create, edit)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (task_perms_combobox), _("None"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (task_perms_combobox), _("Reviewer (read-only)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (task_perms_combobox), _("Author (read, create)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (task_perms_combobox), _("Editor (read, create, edit)"));
|
||||
|
||||
- inbox_perms_combobox = gtk_combo_box_new_text ();
|
||||
+ inbox_perms_combobox = gtk_combo_box_text_new ();
|
||||
gtk_widget_show (inbox_perms_combobox);
|
||||
gtk_table_attach (GTK_TABLE (folders_table), inbox_perms_combobox, 1, 2, 2, 3,
|
||||
(GtkAttachOptions) (GTK_FILL),
|
||||
(GtkAttachOptions) (GTK_FILL), 0, 0);
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (inbox_perms_combobox), _("None"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (inbox_perms_combobox), _("Reviewer (read-only)"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (inbox_perms_combobox), _("Author (read, create)"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (inbox_perms_combobox), _("Editor (read, create, edit)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (inbox_perms_combobox), _("None"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (inbox_perms_combobox), _("Reviewer (read-only)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (inbox_perms_combobox), _("Author (read, create)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (inbox_perms_combobox), _("Editor (read, create, edit)"));
|
||||
|
||||
- contact_perms_combobox = gtk_combo_box_new_text ();
|
||||
+ contact_perms_combobox = gtk_combo_box_text_new ();
|
||||
gtk_widget_show (contact_perms_combobox);
|
||||
gtk_table_attach (GTK_TABLE (folders_table), contact_perms_combobox, 1, 2, 3, 4,
|
||||
(GtkAttachOptions) (GTK_FILL),
|
||||
(GtkAttachOptions) (GTK_FILL), 0, 0);
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (contact_perms_combobox), _("None"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (contact_perms_combobox), _("Reviewer (read-only)"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (contact_perms_combobox), _("Author (read, create)"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (contact_perms_combobox), _("Editor (read, create, edit)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (contact_perms_combobox), _("None"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (contact_perms_combobox), _("Reviewer (read-only)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (contact_perms_combobox), _("Author (read, create)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (contact_perms_combobox), _("Editor (read, create, edit)"));
|
||||
|
||||
delegate_mail = gtk_check_button_new_with_mnemonic (_("_Summarize permissions"));
|
||||
gtk_widget_show (delegate_mail);
|
||||
@ -0,0 +1,98 @@
|
||||
$OpenBSD: patch-eplugin_exchange-folder-subscription_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-folder-subscription.c.orig Tue Nov 2 11:32:25 2010
|
||||
+++ eplugin/exchange-folder-subscription.c Sun Feb 13 15:47:05 2011
|
||||
@@ -38,6 +38,7 @@
|
||||
#include "exchange-config-listener.h"
|
||||
#include "exchange-folder-subscription.h"
|
||||
#include "exchange-operations.h"
|
||||
+#include "gtk-compat.h"
|
||||
|
||||
static void
|
||||
user_response (ENameSelectorDialog *name_selector_dialog, gint response, gpointer data)
|
||||
@@ -63,7 +64,7 @@ setup_name_selector (GtkWidget *placeholder, GtkWidget
|
||||
ENameSelectorDialog *name_selector_dialog;
|
||||
GtkWidget *widget;
|
||||
|
||||
- g_assert (GTK_IS_CONTAINER (placeholder));
|
||||
+ g_return_val_if_fail (GTK_IS_CONTAINER (placeholder), NULL);
|
||||
|
||||
name_selector = e_name_selector_new ();
|
||||
|
||||
@@ -89,7 +90,7 @@ setup_name_selector (GtkWidget *placeholder, GtkWidget
|
||||
static void
|
||||
setup_folder_name_combo (GtkWidget *widget, const gchar *fname)
|
||||
{
|
||||
- GtkComboBox *combo;
|
||||
+ GtkComboBoxText *combo;
|
||||
const gchar *strings[] = {
|
||||
"Calendar",
|
||||
"Inbox",
|
||||
@@ -100,13 +101,13 @@ setup_folder_name_combo (GtkWidget *widget, const gcha
|
||||
};
|
||||
gint i;
|
||||
|
||||
- combo = GTK_COMBO_BOX (widget);
|
||||
- g_assert (GTK_IS_COMBO_BOX_ENTRY (combo));
|
||||
+ combo = GTK_COMBO_BOX_TEXT (widget);
|
||||
+ g_return_if_fail (GTK_IS_COMBO_BOX_TEXT (combo));
|
||||
|
||||
- gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (combo)));
|
||||
+ gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (combo))));
|
||||
|
||||
for (i = 0; strings[i] != NULL; i++)
|
||||
- gtk_combo_box_append_text (combo, strings[i]);
|
||||
+ gtk_combo_box_text_append_text (combo, strings[i]);
|
||||
|
||||
gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combo))), fname);
|
||||
}
|
||||
@@ -139,11 +140,11 @@ user_name_entry_changed_callback (GtkEditable *editabl
|
||||
static void
|
||||
setup_server_combobox (GtkWidget *widget, gchar *mail_account)
|
||||
{
|
||||
- g_return_if_fail (GTK_IS_COMBO_BOX (widget));
|
||||
+ g_return_if_fail (GTK_IS_COMBO_BOX_TEXT (widget));
|
||||
|
||||
gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (widget))));
|
||||
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (widget), mail_account);
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), mail_account);
|
||||
gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
|
||||
|
||||
/* FIXME: Default to the current storage in the shell view. */
|
||||
@@ -345,13 +346,29 @@ create_folder_subscription_dialog (ExchangeAccount *ac
|
||||
(GtkAttachOptions) (GTK_FILL),
|
||||
(GtkAttachOptions) (0), 0, 0);
|
||||
|
||||
+#if GTK_CHECK_VERSION(2,23,0)
|
||||
+ /* FIXME Rewrite this when removing the version check. */
|
||||
+ {
|
||||
+ GtkListStore *store;
|
||||
+
|
||||
+ store = gtk_list_store_new (1, G_TYPE_STRING);
|
||||
+ folder_name_combo = g_object_new (
|
||||
+ GTK_TYPE_COMBO_BOX,
|
||||
+ "model", store,
|
||||
+ "has-entry", TRUE,
|
||||
+ "entry-text-column", 0,
|
||||
+ NULL);
|
||||
+ g_object_unref (store);
|
||||
+ }
|
||||
+#else
|
||||
folder_name_combo = gtk_combo_box_entry_new_text ();
|
||||
+#endif
|
||||
gtk_widget_show (folder_name_combo);
|
||||
gtk_table_attach (GTK_TABLE (table1), folder_name_combo, 1, 2, 2, 3,
|
||||
(GtkAttachOptions) (GTK_FILL),
|
||||
(GtkAttachOptions) (GTK_FILL), 0, 0);
|
||||
|
||||
- server_combobox = gtk_combo_box_new_text ();
|
||||
+ server_combobox = gtk_combo_box_text_new ();
|
||||
gtk_widget_show (server_combobox);
|
||||
gtk_table_attach (GTK_TABLE (table1), server_combobox, 1, 2, 0, 1,
|
||||
(GtkAttachOptions) (GTK_FILL),
|
||||
@ -0,0 +1,49 @@
|
||||
$OpenBSD: patch-eplugin_exchange-permissions-dialog_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-permissions-dialog.c.orig Tue Nov 2 11:32:25 2010
|
||||
+++ eplugin/exchange-permissions-dialog.c Sun Feb 13 15:47:05 2011
|
||||
@@ -42,6 +42,8 @@
|
||||
#include <e-util/e-dialog-utils.h>
|
||||
#include <e-util/e-alert-dialog.h>
|
||||
|
||||
+#include "gtk-compat.h"
|
||||
+
|
||||
struct _ExchangePermissionsDialogPrivate {
|
||||
ExchangeAccount *account;
|
||||
gchar *base_uri, *folder_path;
|
||||
@@ -542,14 +544,14 @@ display_role (ExchangePermissionsDialog *dialog)
|
||||
|
||||
if (role == E2K_PERMISSIONS_ROLE_CUSTOM) {
|
||||
if (dialog->priv->custom_added == FALSE) {
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->priv->role_optionmenu), _("Custom"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->priv->role_optionmenu), _("Custom"));
|
||||
dialog->priv->custom_added = TRUE;
|
||||
}
|
||||
role = E2K_PERMISSIONS_ROLE_NUM_ROLES;
|
||||
}
|
||||
else {
|
||||
if (dialog->priv->custom_added) {
|
||||
- gtk_combo_box_remove_text (GTK_COMBO_BOX (dialog->priv->role_optionmenu), E2K_PERMISSIONS_ROLE_NUM_ROLES);
|
||||
+ gtk_combo_box_text_remove (GTK_COMBO_BOX_TEXT (dialog->priv->role_optionmenu), E2K_PERMISSIONS_ROLE_NUM_ROLES);
|
||||
dialog->priv->custom_added = FALSE;
|
||||
}
|
||||
}
|
||||
@@ -680,11 +682,11 @@ exchange_permissions_role_optionmenu_new (void)
|
||||
const gchar **roles;
|
||||
gint role;
|
||||
|
||||
- menu = gtk_combo_box_new_text ();
|
||||
+ menu = gtk_combo_box_text_new ();
|
||||
roles = g_new (const gchar *, E2K_PERMISSIONS_ROLE_NUM_ROLES + 1);
|
||||
for (role = 0; role < E2K_PERMISSIONS_ROLE_NUM_ROLES; role++) {
|
||||
roles[role] = e2k_permissions_role_get_name (role);
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (menu), roles[role]);
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (menu), roles[role]);
|
||||
}
|
||||
|
||||
roles[role] = NULL;
|
||||
@ -0,0 +1,51 @@
|
||||
$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);
|
||||
31
mail/evolution-exchange/patches/patch-eplugin_gtk-compat_h
Normal file
31
mail/evolution-exchange/patches/patch-eplugin_gtk-compat_h
Normal file
@ -0,0 +1,31 @@
|
||||
$OpenBSD: patch-eplugin_gtk-compat_h,v 1.1 2011/03/07 19:41:32 ajacoutot Exp $
|
||||
--- eplugin/gtk-compat.h.orig Sat Feb 26 22:54:52 2011
|
||||
+++ eplugin/gtk-compat.h Sat Feb 26 22:54:52 2011
|
||||
@@ -0,0 +1,27 @@
|
||||
+#ifndef __GTK_COMPAT_H__
|
||||
+#define __GTK_COMPAT_H__
|
||||
+
|
||||
+#include <gtk/gtk.h>
|
||||
+
|
||||
+/* Provide a GTK+ compatibility layer. */
|
||||
+
|
||||
+#if !GTK_CHECK_VERSION (2,23,0)
|
||||
+#define gtk_combo_box_text_new gtk_combo_box_new_text
|
||||
+#define gtk_combo_box_text_append_text gtk_combo_box_append_text
|
||||
+#define gtk_combo_box_text_remove gtk_combo_box_remove_text
|
||||
+#define gtk_combo_box_text_prepend_text gtk_combo_box_prepend_text
|
||||
+#define gtk_combo_box_text_get_active_text gtk_combo_box_get_active_text
|
||||
+#define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX
|
||||
+#define GTK_IS_COMBO_BOX_TEXT GTK_IS_COMBO_BOX
|
||||
+#define GtkComboBoxText GtkComboBox
|
||||
+#endif
|
||||
+
|
||||
+#if GTK_CHECK_VERSION (2,23,0)
|
||||
+#define GTK_COMBO_BOX_ENTRY GTK_COMBO_BOX
|
||||
+#define GTK_IS_COMBO_BOX_ENTRY GTK_IS_COMBO_BOX
|
||||
+#else
|
||||
+#define gtk_combo_box_set_entry_text_column \
|
||||
+ gtk_combo_box_entry_set_text_column
|
||||
+#endif
|
||||
+
|
||||
+#endif /* __GTK_COMPAT_H__ */
|
||||
Loading…
Reference in New Issue
Block a user