* Reverted change 6137 as it was incorrect

pmo-trunk-r6167

diff --git a/src/hildon2/modest-connection-specific-smtp-window.c b/src/hildon2/modest-connection-specific-smtp-window.c
index 685e630..4b95597 100644 (file)
--- a/src/hildon2/modest-connection-specific-smtp-window.c
+++ b/src/hildon2/modest-connection-specific-smtp-window.c
@@ -200,17 +200,16 @@ modest_connection_specific_smtp_window_fill_with_connections (ModestConnectionSp
                        server_account_name = modest_account_mgr_get_connection_specific_smtp (
                                priv->account_manager, connection_id);
                                        
                        server_account_name = modest_account_mgr_get_connection_specific_smtp (
                                priv->account_manager, connection_id);
                                        

-                       if (server_account_name) {
-                               /* Add the row to the model: */
-                               GtkTreeIter iter;
-                               gtk_list_store_append (liststore, &iter);
-                               gtk_list_store_set(liststore, &iter, 
-                                                  MODEL_COL_ID, connection_id, 
-                                                  MODEL_COL_NAME, connection_name,
-                                                  MODEL_COL_SERVER_ACCOUNT_NAME, server_account_name,
-                                                  -1);                         
-                               g_free (server_account_name);
-                       }
+                       /* Add the row to the model: */
+                       GtkTreeIter iter;
+                       gtk_list_store_append (liststore, &iter);
+                       gtk_list_store_set(liststore, &iter, 
+                               MODEL_COL_ID, connection_id, 
+                               MODEL_COL_NAME, connection_name,
+                               MODEL_COL_SERVER_ACCOUNT_NAME, server_account_name,
+                               -1);
+                               
+                       g_free (server_account_name);

                }
                
                iter = g_slist_next (iter);     
                }
                
                iter = g_slist_next (iter);     

diff --git a/src/maemo/modest-connection-specific-smtp-window.c b/src/maemo/modest-connection-specific-smtp-window.c
index cf2bbbb..b734983 100644 (file)
--- a/src/maemo/modest-connection-specific-smtp-window.c
+++ b/src/maemo/modest-connection-specific-smtp-window.c
@@ -200,17 +200,16 @@ modest_connection_specific_smtp_window_fill_with_connections (ModestConnectionSp
                        server_account_name = modest_account_mgr_get_connection_specific_smtp (
                                priv->account_manager, connection_id);
                                        
                        server_account_name = modest_account_mgr_get_connection_specific_smtp (
                                priv->account_manager, connection_id);
                                        

-                       if (server_account_name) {
-                               /* Add the row to the model: */
-                               GtkTreeIter iter;
-                               gtk_list_store_append (liststore, &iter);
-                               gtk_list_store_set(liststore, &iter, 
-                                                  MODEL_COL_ID, connection_id, 
-                                                  MODEL_COL_NAME, connection_name,
-                                                  MODEL_COL_SERVER_ACCOUNT_NAME, server_account_name,
-                                                  -1);                         
-                               g_free (server_account_name);
-                       }
+                       /* Add the row to the model: */
+                       GtkTreeIter iter;
+                       gtk_list_store_append (liststore, &iter);
+                       gtk_list_store_set(liststore, &iter, 
+                               MODEL_COL_ID, connection_id, 
+                               MODEL_COL_NAME, connection_name,
+                               MODEL_COL_SERVER_ACCOUNT_NAME, server_account_name,
+                               -1);
+                               
+                       g_free (server_account_name);

                }
                
                iter = g_slist_next (iter);     
                }
                
                iter = g_slist_next (iter);