Don't ask for confirmation on modest_ui_actions_xfer_messages_from_move_to(), it...
[modest] / src / modest-ui-actions.c
index fbd7088..307a6b9 100644 (file)
@@ -144,9 +144,7 @@ static void     _on_send_receive_progress_changed (ModestMailOperation  *mail_op
                                                   ModestMailOperationState *state,
                                                   gpointer user_data);
 
-static gint header_list_count_uncached_msgs (
-                                               TnyList *header_list, 
-                                               GtkWindow *win);
+static gint header_list_count_uncached_msgs (TnyList *header_list);
 static gboolean connect_to_get_msg (
                                                GtkWindow *win,
                                                gint num_of_uncached_msgs);
@@ -452,8 +450,10 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                GtkTreeModel *model = NULL;
                GtkTreeSelection *sel = NULL;
                GList *sel_list = NULL, *tmp = NULL;
-               GtkTreeRowReference *row_reference = NULL;
+               GtkTreeRowReference *next_row_reference = NULL;
+               GtkTreeRowReference *prev_row_reference = NULL;
                GtkTreePath *next_path = NULL;
+               GtkTreePath *prev_path = NULL;
                GError *err = NULL;
 
                /* Find last selected row */                    
@@ -463,10 +463,14 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                        sel_list = gtk_tree_selection_get_selected_rows (sel, &model);
                        for (tmp=sel_list; tmp; tmp=tmp->next) {
                                if (tmp->next == NULL) {
+                                       prev_path = gtk_tree_path_copy((GtkTreePath *) tmp->data);
                                        next_path = gtk_tree_path_copy((GtkTreePath *) tmp->data);
+
+                                       gtk_tree_path_prev (prev_path);
                                        gtk_tree_path_next (next_path);
-                                       row_reference = gtk_tree_row_reference_new (model, next_path);
-                                       gtk_tree_path_free (next_path);
+
+                                       prev_row_reference = gtk_tree_row_reference_new (model, prev_path);
+                                       next_row_reference = gtk_tree_row_reference_new (model, next_path);
                                }
                        }
                }
@@ -475,17 +479,11 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                modest_window_disable_dimming (MODEST_WINDOW(win));
 
                /* Remove each header. If it's a view window header_view == NULL */
-/*             do_headers_action (win, headers_action_delete, header_view); */
                modest_do_messages_delete (header_list, win);
                
-
                /* Enable window dimming management */
                gtk_tree_selection_unselect_all (sel);
                modest_window_enable_dimming (MODEST_WINDOW(win));
-
-               /* FIXME: May be folder_monitor will also refilter treemode on EXPUNGE changes ? */
-               /* refresh the header view (removing marked-as-deleted) */
-/*             modest_header_view_refilter (MODEST_HEADER_VIEW(header_view));  */
                
                if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
                        modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (win));
@@ -498,14 +496,24 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                        /* Move cursor to next row */
                        main_window = win; 
 
-                       /* Select next row */
-                       if (gtk_tree_row_reference_valid (row_reference)) {
-                               next_path = gtk_tree_row_reference_get_path (row_reference);
+                       /* Select next or previous row */
+                       if (gtk_tree_row_reference_valid (next_row_reference)) {
+/*                             next_path = gtk_tree_row_reference_get_path (row_reference); */
                                gtk_tree_selection_select_path (sel, next_path);
-                               gtk_tree_path_free (next_path);
                        }
-                       if (row_reference != NULL)
-                               gtk_tree_row_reference_free (row_reference);
+                       else if (gtk_tree_row_reference_valid (prev_row_reference)) {                           
+                               gtk_tree_selection_select_path (sel, prev_path);
+                       }
+
+                       /* Free */
+                       if (next_row_reference != NULL) 
+                               gtk_tree_row_reference_free (next_row_reference);
+                       if (next_path != NULL) 
+                               gtk_tree_path_free (next_path);                         
+                       if (prev_row_reference != NULL) 
+                               gtk_tree_row_reference_free (prev_row_reference);
+                       if (prev_path != NULL) 
+                               gtk_tree_path_free (prev_path);                         
                }
 
                if (err != NULL) {
@@ -553,7 +561,9 @@ modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow *
 
 void
 modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win)
-{
+{      
+       ModestWindowMgr *mgr = NULL;
+       
 #ifdef MODEST_PLATFORM_MAEMO
        modest_osso_save_state();
 #endif /* MODEST_PLATFORM_MAEMO */
@@ -568,11 +578,16 @@ modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win)
        
        g_debug ("queue has been cleared");
 
+
+       /* Check if there are opened editing windows */ 
+       mgr = modest_runtime_get_window_mgr ();
+       modest_window_mgr_close_all_windows (mgr);
+
        /* note: when modest-tny-account-store is finalized,
           it will automatically set all network connections
           to offline */
 
-       gtk_main_quit ();
+/*     gtk_main_quit (); */
 }
 
 void
@@ -849,7 +864,11 @@ open_msg_cb (ModestMailOperation *mail_op, TnyHeader *header,  TnyMsg *msg, gpoi
                                goto cleanup;
                }
                win = modest_msg_edit_window_new (msg, account, TRUE);
-               
+
+
+               /* Show banner */
+               modest_platform_information_banner (NULL, NULL, _("mail_ib_opening_draft_message"));
+
        } else {
                gchar *uid = modest_tny_folder_get_header_unique_id (header);
                
@@ -1190,9 +1209,7 @@ cleanup:
  * downloaded (CACHED) then returns TRUE else returns FALSE.
  */
 static gint
-header_list_count_uncached_msgs (
-                               TnyList *header_list, 
-                               GtkWindow *win)
+header_list_count_uncached_msgs (TnyList *header_list)
 {
        TnyIterator *iter;
        gint uncached_messages = 0;
@@ -1276,9 +1293,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
        if (do_retrieve){
                gint num_of_unc_msgs;
                /* check that the messages have been previously downloaded */
-               num_of_unc_msgs = header_list_count_uncached_msgs(
-                                                               header_list,
-                                                               GTK_WINDOW (win));
+               num_of_unc_msgs = header_list_count_uncached_msgs(header_list);
                /* If there are any uncached message ask the user
                 * whether he/she wants to download them. */
                if (num_of_unc_msgs)
@@ -2839,8 +2854,7 @@ modest_ui_actions_on_cut (GtkAction *action,
                gboolean continue_download = FALSE;
                gint num_of_unc_msgs;
 
-               num_of_unc_msgs = header_list_count_uncached_msgs(
-                               header_list, GTK_WINDOW (window));
+               num_of_unc_msgs = header_list_count_uncached_msgs(header_list);
 
                if (num_of_unc_msgs)
                        continue_download = connect_to_get_msg(
@@ -2895,9 +2909,7 @@ modest_ui_actions_on_copy (GtkAction *action,
                gboolean continue_download = FALSE;
                gint num_of_unc_msgs;
 
-               num_of_unc_msgs = header_list_count_uncached_msgs(
-                                                               header_list,
-                                                               GTK_WINDOW (window));
+               num_of_unc_msgs = header_list_count_uncached_msgs(header_list);
 
                if (num_of_unc_msgs)
                        continue_download = connect_to_get_msg(
@@ -3748,7 +3760,6 @@ has_retrieved_msgs (TnyList *list)
  * GTK_RESPONSE_OK
  *
  * This one is used by the next functions:
- *     modest_ui_actions_xfer_messages_from_move_to
  *     modest_ui_actions_on_paste                      - commented out
  *     drag_and_drop_from_header_view (for d&d in modest_folder_view.c)
  */
@@ -4028,7 +4039,6 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder,
                                              ModestWindow *win)
 {
        TnyList *headers = NULL;
-       gint response = 0;
        TnyAccount *dst_account = NULL;
        const gchar *proto_str = NULL;
        gboolean dst_is_pop = FALSE;
@@ -4063,39 +4073,30 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder,
                return;
        }
 
-       /* Ask for user confirmation */
-       response = msgs_move_to_confirmation (GTK_WINDOW (win), 
-                                             TNY_FOLDER (dst_folder), 
-                                             TRUE,
-                                             headers);
-
-       /* Transfer messages */
-       if (response == GTK_RESPONSE_OK) {
-                GtkWidget *inf_note;
-               inf_note = modest_platform_animation_banner (GTK_WIDGET (win), NULL,
-                                                            _CS("ckct_nw_pasting"));
-               if (inf_note != NULL)  {
-                       gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE);
-                       gtk_widget_show (GTK_WIDGET(inf_note));
-               }
+        GtkWidget *inf_note;
+       inf_note = modest_platform_animation_banner (GTK_WIDGET (win), NULL,
+                                                    _CS("ckct_nw_pasting"));
+       if (inf_note != NULL)  {
+               gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE);
+               gtk_widget_show (GTK_WIDGET(inf_note));
+       }
 
-               ModestMailOperation *mail_op = 
-                       modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
-                                                                      G_OBJECT(win),
-                                                                      modest_ui_actions_move_folder_error_handler,
-                                                                      NULL);
-               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
-                                                mail_op);
+       ModestMailOperation *mail_op = 
+               modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
+                                                              G_OBJECT(win),
+                                                              modest_ui_actions_move_folder_error_handler,
+                                                              NULL);
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
+                                        mail_op);
 
-               modest_mail_operation_xfer_msgs (mail_op, 
-                                                headers,
-                                                TNY_FOLDER (dst_folder),
-                                                TRUE,
-                                                move_to_cb,
-                                                inf_note);
+       modest_mail_operation_xfer_msgs (mail_op, 
+                                        headers,
+                                        TNY_FOLDER (dst_folder),
+                                        TRUE,
+                                        move_to_cb,
+                                        inf_note);
 
-               g_object_unref (G_OBJECT (mail_op));
-       }
+       g_object_unref (G_OBJECT (mail_op));
        g_object_unref (headers);
 }