aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-01-14 12:22:29 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-01-25 23:37:10 +0800
commitadc0e71ea6d243e815a7fed8fdd37b69bbf352db (patch)
tree85a2233ee3ad7cd64a5ec1d4e5e51ee9d62fa4f6 /modules/mail
parentee8232d7ee82e39d0dee27c39622b927ab86da0e (diff)
downloadgsoc2013-evolution-adc0e71ea6d243e815a7fed8fdd37b69bbf352db.tar
gsoc2013-evolution-adc0e71ea6d243e815a7fed8fdd37b69bbf352db.tar.gz
gsoc2013-evolution-adc0e71ea6d243e815a7fed8fdd37b69bbf352db.tar.bz2
gsoc2013-evolution-adc0e71ea6d243e815a7fed8fdd37b69bbf352db.tar.lz
gsoc2013-evolution-adc0e71ea6d243e815a7fed8fdd37b69bbf352db.tar.xz
gsoc2013-evolution-adc0e71ea6d243e815a7fed8fdd37b69bbf352db.tar.zst
gsoc2013-evolution-adc0e71ea6d243e815a7fed8fdd37b69bbf352db.zip
Adapt to GtkComboBox class reorg.
Diffstat (limited to 'modules/mail')
-rw-r--r--modules/mail/em-mailer-prefs.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index 8bec111b6e..870e5ec037 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -670,9 +670,12 @@ junk_plugin_changed (GtkWidget *combo, EMMailerPrefs *prefs)
{
gchar *def_plugin;
const GList *plugins = mail_session_get_junk_plugins (prefs->session);
+ GtkTreeIter iter;
+
+ g_return_if_fail (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter));
- def_plugin = gtk_combo_box_text_get_active_text (
- GTK_COMBO_BOX_TEXT (combo));
+ def_plugin = NULL;
+ gtk_tree_model_get (gtk_combo_box_get_model (GTK_COMBO_BOX (combo)), &iter, 0, &def_plugin, -1);
gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/junk/default_plugin", def_plugin, NULL);
while (plugins) {
@@ -705,6 +708,8 @@ junk_plugin_changed (GtkWidget *combo, EMMailerPrefs *prefs)
}
plugins = plugins->next;
}
+
+ g_free (def_plugin);
}
static void