* Fixes NB#100172 do not show an error when no folder is selected to delete

* Restored a code that closes the accounts dialog when an account is removed

pmo-trunk-r7366

diff --git a/src/hildon2/modest-default-account-settings-dialog.c b/src/hildon2/modest-default-account-settings-dialog.c
index 65dfcc6..5ace93e 100644 (file)
--- a/src/hildon2/modest-default-account-settings-dialog.c
+++ b/src/hildon2/modest-default-account-settings-dialog.c
@@ -505,6 +505,10 @@ on_button_delete (GtkButton *button, gpointer user_data)
                                                       priv->account_name, 
                                                       (const gchar *) account_title);
        g_free (account_title);
                                                       priv->account_name, 
                                                       (const gchar *) account_title);
        g_free (account_title);

+
+       /* Close window */
+       if (removed)
+               gtk_widget_destroy (GTK_WIDGET (self));

 }
 
 static GtkWidget*
 }
 
 static GtkWidget*

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index df8fd8b..739638f 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -3703,6 +3703,9 @@ delete_folder (ModestWindow *window, gboolean move_to_trash)
 
        folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
 
        folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 

+       if (!folder)
+               return FALSE;
+

        /* Show an error if it's an account */
        if (!TNY_IS_FOLDER (folder)) {
                modest_platform_run_information_dialog (GTK_WINDOW (window),
        /* Show an error if it's an account */
        if (!TNY_IS_FOLDER (folder)) {
                modest_platform_run_information_dialog (GTK_WINDOW (window),

@@ -3712,7 +3715,7 @@ delete_folder (ModestWindow *window, gboolean move_to_trash)
                return FALSE;
        }
 
                return FALSE;
        }
 

-       /* Ask the user */      
+       /* Ask the user */

        message =  g_strdup_printf (_("mcen_nc_delete_folder_text"), 
                                    tny_folder_get_name (TNY_FOLDER (folder)));
        response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window),
        message =  g_strdup_printf (_("mcen_nc_delete_folder_text"), 
                                    tny_folder_get_name (TNY_FOLDER (folder)));
        response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window),