* Fixes NB#90487, adds a required NULL check

[modest] / src / maemo / modest-connection-specific-smtp-window.c

diff --git a/src/maemo/modest-connection-specific-smtp-window.c b/src/maemo/modest-connection-specific-smtp-window.c
index 3f98ded..cf2bbbb 100644 (file)
--- a/src/maemo/modest-connection-specific-smtp-window.c
+++ b/src/maemo/modest-connection-specific-smtp-window.c
@@ -200,16 +200,17 @@ modest_connection_specific_smtp_window_fill_with_connections (ModestConnectionSp
                        server_account_name = modest_account_mgr_get_connection_specific_smtp (
                                priv->account_manager, connection_id);
                                        
-                       /* 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);
+                       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);
+                       }
                }
                
                iter = g_slist_next (iter);     
@@ -267,7 +268,9 @@ on_button_edit (ModestConnectionSpecificSmtpWindow *self)
                        server_settings = NULL;
                }
                        
-               modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (window));
+               modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), 
+                                            GTK_WINDOW (window),
+                                            GTK_WINDOW (self));
                
                gint response = gtk_dialog_run (GTK_DIALOG (window));
                if (response == GTK_RESPONSE_OK) {