* when the window-manager is asked for the main_window, and none such

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

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index da6c745..e0cb74f 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -288,7 +288,10 @@ void modest_ui_actions_refresh_message_window_after_delete (ModestMsgViewWindow*
                modest_msg_view_window_first_message_selected (win)) {
                modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (win));
        } else {
-               modest_msg_view_window_select_next_message (win);
+               if (!modest_msg_view_window_select_next_message (win)) {
+                       gboolean ret_value;
+                       g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);
+               }
        }
 }
 
@@ -315,6 +318,8 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                        return;
        }
        
+       /* Get the headers, either from the header view (if win is the main window),
+        * or from the message view window: */
        header_list = get_selected_headers (win);
        if (!header_list) return;
 
@@ -2455,9 +2460,15 @@ void
 modest_ui_actions_on_delete_folder (GtkAction *action,
                                     ModestMainWindow *main_window)
 {
+       GtkWidget *folder_view;
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
        delete_folder (main_window, FALSE);
+       folder_view = modest_main_window_get_child_widget (main_window,
+                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
+       if (!folder_view)
+               return;
+       modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
 }
 
 void 
@@ -3648,6 +3659,9 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder,
 {
        TnyList *headers = NULL;
        gint response = 0;
+       TnyAccount *dst_account = NULL;
+       const gchar *proto_str = NULL;
+       gboolean dst_is_pop = FALSE;
 
        if (!TNY_IS_FOLDER (dst_folder)) {
                modest_platform_information_banner (GTK_WIDGET (win),
@@ -3656,9 +3670,25 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder,
                return;
        }
 
+       dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder));
+       proto_str = tny_account_get_proto (dst_account);
+       dst_is_pop = (modest_protocol_info_get_transport_store_protocol (proto_str) == 
+                     MODEST_PROTOCOL_STORE_POP);
+       g_object_unref (dst_account);
+
        /* Get selected headers */
        headers = get_selected_headers (MODEST_WINDOW (win));
 
+       if (dst_is_pop) {
+               modest_platform_information_banner (GTK_WIDGET (win),
+                                                   NULL,
+                                                   ngettext("mail_in_ui_folder_move_target_error",
+                                                            "mail_in_ui_folder_move_targets_error",
+                                                            tny_list_get_length (headers)));
+               g_object_unref (headers);
+               return;
+       }
+
        /* Ask for user confirmation */
        response = msgs_move_to_confirmation (GTK_WINDOW (win), 
                                              TNY_FOLDER (dst_folder),