* trunk: together with the update modest-providers-data (r4454), fixes NB#84852

pmo-trunk-r4455

diff --git a/src/maemo/easysetup/modest-easysetup-provider-combo-box.c b/src/maemo/easysetup/modest-easysetup-provider-combo-box.c
index 7e42ff1..ce36138 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-provider-combo-box.c
+++ b/src/maemo/easysetup/modest-easysetup-provider-combo-box.c
@@ -197,11 +197,6 @@ easysetup_provider_combo_box_fill (EasysetupProviderComboBox *combobox, ModestPr
                const gchar* provider_name = *iter_provider_names;
                const gchar* provider_id = *iter_provider_ids;
 
-               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, 
                                         provider_id, (GCompareFunc)strcmp) == NULL) {
@@ -213,15 +208,12 @@ easysetup_provider_combo_box_fill (EasysetupProviderComboBox *combobox, ModestPr
                        
                        gtk_list_store_set(liststore, &iter, 
                                           MODEL_COL_ID, provider_id, 
-                                          MODEL_COL_NAME, provider_display_name, -1);
+                                          MODEL_COL_NAME, provider_name, -1);
                        
                        provider_ids_used_already = g_slist_prepend (
                                provider_ids_used_already, (gpointer)g_strdup (provider_id));
                }
                
-               g_free (provider_incoming);
-               g_free (provider_display_name);
-               
                ++iter_provider_names;
                ++iter_provider_ids;
        }