From b25ae94a224a7185e03b7a099dd8c717a6ee49a1 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Mon, 21 Apr 2008 14:41:37 +0000 Subject: [PATCH] * use the incoming server in the providers combo box; thus, users can see the difference between imap.gmail.com and pop.gmail.com; same thing for e.g saunalahti in Finland. Fixes: a not yet filed bug. pmo-trunk-r4443 --- .../modest-easysetup-provider-combo-box.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/maemo/easysetup/modest-easysetup-provider-combo-box.c b/src/maemo/easysetup/modest-easysetup-provider-combo-box.c index bbe0f1c..7e42ff1 100644 --- a/src/maemo/easysetup/modest-easysetup-provider-combo-box.c +++ b/src/maemo/easysetup/modest-easysetup-provider-combo-box.c @@ -197,8 +197,10 @@ easysetup_provider_combo_box_fill (EasysetupProviderComboBox *combobox, ModestPr const gchar* provider_name = *iter_provider_names; const gchar* provider_id = *iter_provider_ids; - gchar *provider_domain = modest_presets_get_domain (presets, provider_id); - gchar *provider_display_name = g_strdup_printf ("%s (%s)", provider_name, provider_domain); + gchar *provider_incoming = modest_presets_get_server (presets, provider_id, + TRUE); + gchar *provider_display_name = g_strdup_printf ("%s (%s)", provider_name, + provider_incoming); /* Prevent duplicate providers: */ if (g_slist_find_custom (provider_ids_used_already, @@ -216,8 +218,8 @@ easysetup_provider_combo_box_fill (EasysetupProviderComboBox *combobox, ModestPr provider_ids_used_already = g_slist_prepend ( provider_ids_used_already, (gpointer)g_strdup (provider_id)); } - - g_free (provider_domain); + + g_free (provider_incoming); g_free (provider_display_name); ++iter_provider_names; -- 1.7.9.5