From c167b4f7377a3176dc170c94637288932c7ccc69 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Wed, 6 Feb 2008 07:44:43 +0000 Subject: [PATCH] * include the domain name in the list of providers, so users can distinguish between "AOL (aol.com)" and "AOL (aol.fr)". Fixes: NB#79501 pmo-trunk-r4139 --- .../modest-easysetup-provider-combo-box.c | 16 ++++++++++++---- 1 file changed, 12 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 de61021..bbe0f1c 100644 --- a/src/maemo/easysetup/modest-easysetup-provider-combo-box.c +++ b/src/maemo/easysetup/modest-easysetup-provider-combo-box.c @@ -196,6 +196,9 @@ easysetup_provider_combo_box_fill (EasysetupProviderComboBox *combobox, ModestPr while(iter_provider_names && *iter_provider_names && iter_provider_ids && *iter_provider_ids) { 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); /* Prevent duplicate providers: */ if (g_slist_find_custom (provider_ids_used_already, @@ -208,14 +211,17 @@ easysetup_provider_combo_box_fill (EasysetupProviderComboBox *combobox, ModestPr gtk_list_store_set(liststore, &iter, MODEL_COL_ID, provider_id, - MODEL_COL_NAME, provider_name, -1); + MODEL_COL_NAME, provider_display_name, -1); provider_ids_used_already = g_slist_prepend ( provider_ids_used_already, (gpointer)g_strdup (provider_id)); } - ++iter_provider_names; - ++iter_provider_ids; + g_free (provider_domain); + g_free (provider_display_name); + + ++iter_provider_names; + ++iter_provider_ids; } /* Free the result of modest_presets_get_providers() @@ -229,7 +235,9 @@ easysetup_provider_combo_box_fill (EasysetupProviderComboBox *combobox, ModestPr /* TODO: We need a Logical ID for this text. */ GtkTreeIter iter; gtk_list_store_prepend (liststore, &iter); - gtk_list_store_set (liststore, &iter, MODEL_COL_ID, 0, MODEL_COL_NAME, _("mcen_va_serviceprovider_other"), + gtk_list_store_set (liststore, &iter, + MODEL_COL_ID, 0, + MODEL_COL_NAME, _("mcen_va_serviceprovider_other"), -1); /* Select the "Other" item: */ -- 1.7.9.5