Show a generic error (instead of the one from Tinymail) when

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

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 4f6ffd4..89a2121 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -936,7 +936,8 @@ open_msg_cb (ModestMailOperation *mail_op,
 
 
                /* Show banner */
-               modest_platform_information_banner (NULL, NULL, _("mail_ib_opening_draft_message"));
+               modest_platform_information_banner_with_timeout
+                       (NULL, NULL, _("mail_ib_opening_draft_message"), 1200);
 
        } else {
                gchar *uid = modest_tny_folder_get_header_unique_id (header);
@@ -1880,7 +1881,7 @@ modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win)
        
        /* Refresh the current folder. The if is always TRUE it's just an extra check */
        if (MODEST_IS_MAIN_WINDOW (win)) {
-               GtkWidget *header_view, *folder_view;
+               GtkWidget *folder_view;
                TnyFolderStore *folder_store;
 
                folder_view = 
@@ -1891,15 +1892,6 @@ modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win)
                
                folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
        
-               /* No need to refresh the INBOX the send_receive will do it for us */
-               if (folder_store && TNY_IS_FOLDER (folder_store) && 
-                   tny_folder_get_folder_type (TNY_FOLDER (folder_store)) != TNY_FOLDER_TYPE_INBOX) {
-                       header_view = 
-                               modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-                                                                    MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
-                
-               }
-       
                if (folder_store)
                        g_object_unref (folder_store);
        }       
@@ -4174,16 +4166,6 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op,
 {
        ModestWindow *main_window = NULL;
        GObject *win = NULL;
-       const GError *error = NULL;
-       const gchar *message = NULL;
-       
-       /* Get error message */
-       error = modest_mail_operation_get_error (mail_op);
-       if (error != NULL && error->message != NULL) {
-               message = error->message;
-       } else {
-               message = _("mail_in_ui_folder_move_target_error");
-       }
        
        /* Disable next automatic folder selection */
        main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
@@ -4203,7 +4185,7 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op,
 
        /* Show notification dialog */
        win = modest_mail_operation_get_source (mail_op);
-       modest_platform_run_information_dialog ((GtkWindow *) win, message);
+       modest_platform_run_information_dialog ((GtkWindow *) win, _("mail_in_ui_folder_move_target_error"));
        if (win)
                g_object_unref (win);
 }