aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc/e-auth-combo-box.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-11-04 11:36:30 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-11-07 09:10:57 +0800
commitbed7c0f05a4b4d60d35fd5e8ca1ade1e8225aae2 (patch)
tree13aec00b87de5a370343851d01edc4bede7bd89a /widgets/misc/e-auth-combo-box.c
parentd89f6379667a504ae2e3991eeeb543c43acb7003 (diff)
downloadgsoc2013-evolution-bed7c0f05a4b4d60d35fd5e8ca1ade1e8225aae2.tar.gz
gsoc2013-evolution-bed7c0f05a4b4d60d35fd5e8ca1ade1e8225aae2.tar.zst
gsoc2013-evolution-bed7c0f05a4b4d60d35fd5e8ca1ade1e8225aae2.zip
EMAccountEditor: Start using CamelNetworkSettings.
Instead of stuffing host/port/user/etc into CamelURLs. To enforce this in 3rd party extensions, remove EAccounts from EMConfigTargetAccount and rename it EMConfigTargetSettings with the following struct members: const gchar *email_address; const gchar *storage_protocol; CamelSettings *storage_settings; const gchar *transport_protocol; CamelSettings *transport_settings;
Diffstat (limited to 'widgets/misc/e-auth-combo-box.c')
-rw-r--r--widgets/misc/e-auth-combo-box.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/widgets/misc/e-auth-combo-box.c b/widgets/misc/e-auth-combo-box.c
index 48bd15cc1e..182e171c00 100644
--- a/widgets/misc/e-auth-combo-box.c
+++ b/widgets/misc/e-auth-combo-box.c
@@ -79,10 +79,11 @@ auth_combo_box_rebuild_model (EAuthComboBox *combo_box)
}
/* Try selecting the previous mechanism. */
- gtk_combo_box_set_active_id (gtk_combo_box, active_id);
+ if (active_id != NULL)
+ gtk_combo_box_set_active_id (gtk_combo_box, active_id);
/* Or else fall back to the first mechanism. */
- if (gtk_combo_box_get_active_id (gtk_combo_box) == NULL)
+ if (gtk_combo_box_get_active (gtk_combo_box) == -1)
gtk_combo_box_set_active (gtk_combo_box, 0);
}