X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=3780e5baa6dcba3f50e80cc6f5eb856ef9a99bf6;hp=e60fac18f095c6d6f07c7a2e93a30530e16921e7;hb=391b0d19bd75e39f1dd12807a7d0ae1289d06f52;hpb=d1b20a72b6da066937e2bc3c4e4ce345b2a41aff

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index e60fac1..3780e5b 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -2537,7 +2537,8 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
 	GtkWidget *folder_view;
 	gint response;
 	gchar *message;
-	
+        gboolean do_delete = TRUE;
+
 	g_return_if_fail (MODEST_IS_MAIN_WINDOW (main_window));
 
 	folder_view = modest_main_window_get_child_widget (main_window,
@@ -2555,12 +2556,6 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
 		return ;
 	}
 
-	/* Offer the connection dialog if necessary: */
-	if (!modest_platform_connect_and_wait_if_network_folderstore (NULL, folder)) {
-		g_object_unref (G_OBJECT (folder));
-		return;
-	}
-
 	/* Ask the user */	
 	message =  g_strdup_printf (_("mcen_nc_delete_folder_text"), 
 				    tny_folder_get_name (TNY_FOLDER (folder)));
@@ -2568,7 +2563,16 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
 							    (const gchar *) message);
 	g_free (message);
 
-	if (response == GTK_RESPONSE_OK) {
+        if (response != GTK_RESPONSE_OK) {
+                do_delete = FALSE;
+        } else if (modest_platform_is_network_folderstore(folder) &&
+                   !tny_device_is_online (modest_runtime_get_device())) {
+                TnyAccount *account = tny_folder_get_account(TNY_FOLDER(folder));
+                do_delete = modest_platform_connect_and_wait(GTK_WINDOW(main_window), account);
+                g_object_unref(account);
+        }
+
+	if (do_delete) {
 		ModestMailOperation *mail_op;
 		GtkTreeSelection *sel;