aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2010-10-21 03:06:38 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-10-21 03:08:16 +0800
commit8da37ea812d5b784dade3dc0f05df54fdc60fc7a (patch)
tree04bf6d75a584f2f8af8c4b061e38bf8220a0bf15 /modules
parent4142c97c7b59de8d859a217d7b76667b339e33c0 (diff)
downloadgsoc2013-evolution-8da37ea812d5b784dade3dc0f05df54fdc60fc7a.tar
gsoc2013-evolution-8da37ea812d5b784dade3dc0f05df54fdc60fc7a.tar.gz
gsoc2013-evolution-8da37ea812d5b784dade3dc0f05df54fdc60fc7a.tar.bz2
gsoc2013-evolution-8da37ea812d5b784dade3dc0f05df54fdc60fc7a.tar.lz
gsoc2013-evolution-8da37ea812d5b784dade3dc0f05df54fdc60fc7a.tar.xz
gsoc2013-evolution-8da37ea812d5b784dade3dc0f05df54fdc60fc7a.tar.zst
gsoc2013-evolution-8da37ea812d5b784dade3dc0f05df54fdc60fc7a.zip
Bug 632641 - Handle combo box text API going away
Diffstat (limited to 'modules')
-rw-r--r--modules/mail/em-mailer-prefs.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index ff8f238b4a..2c4a2ebd06 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -50,6 +50,9 @@
#include "em-junk.h"
#include "em-config.h"
+/* backward-compatibility cruft */
+#include "e-util/gtk-compat.h"
+
enum {
HEADER_LIST_NAME_COLUMN, /* displayable name of the header (may be a translation) */
HEADER_LIST_ENABLED_COLUMN, /* is the header enabled? */
@@ -553,8 +556,9 @@ emmp_empty_trash_init (EMMailerPrefs *prefs,
for (ii = 0; ii < G_N_ELEMENTS (empty_trash_frequency); ii++) {
if (days >= empty_trash_frequency[ii].days)
hist = ii;
- gtk_combo_box_append_text (
- combo_box, gettext (empty_trash_frequency[ii].label));
+ gtk_combo_box_text_append_text (
+ GTK_COMBO_BOX_TEXT (combo_box),
+ gettext (empty_trash_frequency[ii].label));
}
g_signal_connect (
@@ -597,8 +601,9 @@ emmp_empty_junk_init (EMMailerPrefs *prefs,
for (ii = 0; ii < G_N_ELEMENTS (empty_trash_frequency); ii++) {
if (days >= empty_trash_frequency[ii].days)
hist = ii;
- gtk_combo_box_append_text (
- combo_box, gettext (empty_trash_frequency[ii].label));
+ gtk_combo_box_text_append_text (
+ GTK_COMBO_BOX_TEXT (combo_box),
+ gettext (empty_trash_frequency[ii].label));
}
g_signal_connect (
@@ -660,9 +665,12 @@ emmp_free (EConfig *ec, GSList *items, gpointer data)
static void
junk_plugin_changed (GtkWidget *combo, EMMailerPrefs *prefs)
{
- gchar *def_plugin = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo));
+ gchar *def_plugin;
const GList *plugins = mail_session_get_junk_plugins (prefs->session);
+ def_plugin = gtk_combo_box_text_get_active_text (
+ GTK_COMBO_BOX_TEXT (combo));
+
gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/junk/default_plugin", def_plugin, NULL);
while (plugins) {
EMJunkInterface *iface = plugins->data;