* Added information dialog for folder creation

[modest] / src / modest-ui-actions.c

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 6dc7dab..fe0b54f 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -1266,27 +1266,48 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_windo
        parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
        
        if (parent_folder) {
-               gchar *folder_name;
-
-               folder_name = ask_for_folder_name (GTK_WINDOW (main_window),
-                                                  _("Please enter a name for the new folder"));
-
-               if (folder_name != NULL && strlen (folder_name) > 0) {
-                       TnyFolder *new_folder;
-                       ModestMailOperation *mail_op;
-
-                       mail_op = modest_mail_operation_new ();
-                       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
-                                                        mail_op);
-
-                       new_folder = modest_mail_operation_create_folder (mail_op,
-                                                                         parent_folder,
-                                                                         (const gchar *) folder_name);
-                       if (new_folder) 
-                               g_object_unref (new_folder);
-                       g_object_unref (mail_op);
+               gboolean finished = FALSE;
+               gint result;
+               gchar *folder_name = NULL, *suggested_name = NULL;
+
+               /* Run the new folder dialog */
+               while (!finished) {
+                       result = modest_platform_run_new_folder_dialog (GTK_WINDOW (main_window),
+                                                                       parent_folder,
+                                                                       suggested_name,
+                                                                       &folder_name);
+
+                       if (result == GTK_RESPONSE_REJECT) {
+                               finished = TRUE;
+                       } else {
+                               ModestMailOperation *mail_op = modest_mail_operation_new ();
+                               TnyFolder *new_folder = NULL;
+
+                               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
+                                                                mail_op);
+               
+                               new_folder = modest_mail_operation_create_folder (mail_op,
+                                                                                 parent_folder,
+                                                                                 (const gchar *) folder_name);
+                               if (new_folder) {
+                                       g_object_unref (new_folder);
+                                       finished = TRUE;
+                               } else {
+                                       const GError *error;
+                                       error = modest_mail_operation_get_error (mail_op);
+                                       g_printerr ("%s", error->message);
+                                       /* TODO: check error and follow proper actions */
+/*                                     suggested_name = X; */
+                                       /* Show error to the user */
+                                       modest_platform_run_information_dialog (GTK_WINDOW (main_window),
+                                                                               MODEST_INFORMATION_CREATE_FOLDER);
+                               }
+                               g_object_unref (mail_op);
+                       }
                        g_free (folder_name);
+                       folder_name = NULL;
                }
+
                g_object_unref (parent_folder);
        }
 }
@@ -1334,8 +1355,8 @@ static void
 delete_folder (ModestMainWindow *main_window, gboolean move_to_trash) 
 {
        TnyFolderStore *folder;
-       ModestMailOperation *mail_op;
        GtkWidget *folder_view;
+       gint response;
        
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
@@ -1345,13 +1366,27 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
                return;
 
        folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
-       
-       mail_op = modest_mail_operation_new ();
-       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
-                                        mail_op);
-       modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (folder), move_to_trash);
 
-       g_object_unref (G_OBJECT (mail_op));
+       /* Ask the user */      
+       response = modest_platform_run_confirmation_dialog (GTK_WINDOW (main_window), 
+                                                           MODEST_CONFIRMATION_DELETE_FOLDER,
+                                                           folder);
+
+       if (response == GTK_RESPONSE_OK) {
+               ModestMailOperation *mail_op = modest_mail_operation_new ();
+
+               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+                                                mail_op);
+               modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (folder), move_to_trash);
+
+               /* Show error if happened */
+               if (modest_mail_operation_get_error (mail_op))
+                       modest_platform_run_information_dialog (GTK_WINDOW (main_window),
+                                                               MODEST_INFORMATION_DELETE_FOLDER);
+
+               g_object_unref (G_OBJECT (mail_op));
+       }
+
        g_object_unref (G_OBJECT (folder));
 }