X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-connection-specific-smtp-window.c;h=f1dbb952144638940ff6413f12085a545daf2fee;hb=9e1515efeaa670ac6b01d13735fb7afb8dac0a2e;hp=3f98dedd031a59ab82affea6c3d21326415ff0f2;hpb=627c4af6ac85444cc3256fa568baf4a8d62178ae;p=modest

diff --git a/src/maemo/modest-connection-specific-smtp-window.c b/src/maemo/modest-connection-specific-smtp-window.c
index 3f98ded..f1dbb95 100644
--- a/src/maemo/modest-connection-specific-smtp-window.c
+++ b/src/maemo/modest-connection-specific-smtp-window.c
@@ -208,8 +208,9 @@ modest_connection_specific_smtp_window_fill_with_connections (ModestConnectionSp
 				MODEL_COL_NAME, connection_name,
 				MODEL_COL_SERVER_ACCOUNT_NAME, server_account_name,
 				-1);
-				
-			g_free (server_account_name);
+
+			if (server_account_name)				
+				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) {