aboutsummaryrefslogtreecommitdiffstats
path: root/modules
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
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')
-rw-r--r--modules/addressbook/addressbook-config.c1
-rw-r--r--modules/addressbook/ldap-config.ui4
-rw-r--r--modules/mail/em-mailer-prefs.c9
3 files changed, 10 insertions, 4 deletions
diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c
index 9c5a26ac5d..805cfe40b3 100644
--- a/modules/addressbook/addressbook-config.c
+++ b/modules/addressbook/addressbook-config.c
@@ -747,7 +747,6 @@ eabc_general_host (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget
g_signal_connect (sdialog->host, "changed", G_CALLBACK (host_changed_cb), sdialog);
sdialog->port_comboentry = e_builder_get_widget (builder, "port-comboentry");
- gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX_ENTRY (sdialog->port_comboentry), 0);
gtk_widget_set_has_tooltip (sdialog->port_comboentry, TRUE);
gtk_widget_set_tooltip_text (sdialog->port_comboentry, _("This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."));
sprintf(port, "%u", lud && lud->lud_port? lud->lud_port : LDAP_PORT);
diff --git a/modules/addressbook/ldap-config.ui b/modules/addressbook/ldap-config.ui
index c26cb1e95e..4d045f51a1 100644
--- a/modules/addressbook/ldap-config.ui
+++ b/modules/addressbook/ldap-config.ui
@@ -308,9 +308,11 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxEntry" id="port-comboentry">
+ <object class="GtkComboBox" id="port-comboentry">
<property name="visible">True</property>
<property name="model">model2</property>
+ <property name="has-entry">True</property>
+ <property name="entry-text-column">0</property>
</object>
<packing>
<property name="left_attach">1</property>
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