Do not use localized Re: or Fw: when replying/forwarding

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

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 58b2859..7b61749 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -66,8 +66,8 @@
 #include "maemo/modest-hildon-includes.h"
 #include "maemo/modest-connection-specific-smtp-window.h"
 #endif /* !MODEST_TOOLKIT_GTK */
-#include <modest-utils.h>
 
+#include <modest-utils.h>
 #include "widgets/modest-ui-constants.h"
 #include <widgets/modest-main-window.h>
 #include <widgets/modest-msg-view-window.h>
@@ -639,7 +639,7 @@ modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win)
        ModestWindowMgr *mgr = NULL;
 
 #ifdef MODEST_PLATFORM_MAEMO
-       modest_osso_save_state();
+       modest_window_mgr_save_state_for_all_windows (modest_runtime_get_window_mgr ());
 #endif /* MODEST_PLATFORM_MAEMO */
 
        g_debug ("closing down, clearing %d item(s) from operation queue",
@@ -686,9 +686,10 @@ modest_ui_actions_on_close_window (GtkAction *action, ModestWindow *win)
 void
 modest_ui_actions_add_to_contacts (GtkAction *action, ModestWindow *win)
 {
-       g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (win));
-
-       modest_msg_view_window_add_to_contacts (MODEST_MSG_VIEW_WINDOW (win));
+       if (MODEST_IS_MSG_VIEW_WINDOW (win))
+               modest_msg_view_window_add_to_contacts (MODEST_MSG_VIEW_WINDOW (win));
+       else if (MODEST_IS_MSG_EDIT_WINDOW (win))
+               modest_msg_edit_window_add_to_contacts (MODEST_MSG_EDIT_WINDOW (win));
 }
 
 void
@@ -1003,9 +1004,14 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op,
                                if (protocol) {
                                        if (tny_account_get_connection_status (account) ==
                                            TNY_CONNECTION_STATUS_CONNECTED) {
-                                               format = modest_protocol_get_translation (protocol,
-                                                                                         MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE,
-                                                                                         subject);
+                                               if (header) {
+                                                       format = modest_protocol_get_translation (protocol,
+                                                                                                 MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE,
+                                                                                                 subject);
+                                               } else {
+                                                       format = modest_protocol_get_translation (protocol,
+                                                                                                 MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE_LOST_HEADER);
+                                               }
                                        } else {
                                                format = g_strdup_printf (_("mail_ib_backend_server_invalid"),
                                                                          tny_account_get_hostname (account));
@@ -1014,8 +1020,13 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op,
                                g_object_unref (account);
                        }
 
-                       if (!format)
-                               format = g_strdup (_("emev_ni_ui_imap_message_not_available_in_server"));
+                       if (!format) {
+                               if (header) {
+                                       format = g_strdup (_("emev_ni_ui_imap_message_not_available_in_server"));
+                               } else {
+                                       format = g_strdup (_("emev_ni_ui_pop3_msg_recv_error"));
+                               }
+                       }
 
                        msg = g_strdup_printf (format, subject);
                        modest_platform_run_information_dialog (NULL, msg, FALSE);
@@ -2188,8 +2199,8 @@ idle_refresh_folder (gpointer source)
                header_view = modest_header_window_get_header_view ((ModestHeaderWindow *) source);
 #else
        if (MODEST_IS_MAIN_WINDOW (source))
-               header_view = modest_main_window_get_child_widget ((ModestMainWindow *) source,
-                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+               header_view = MODEST_HEADER_VIEW (modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (source),
+                                                                                      MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW));
 #endif
        if (header_view) {
                TnyFolder *folder = modest_header_view_get_folder (header_view);
@@ -3151,7 +3162,7 @@ gboolean
 modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 {
        TnyTransportAccount *transport_account = NULL;
-       gboolean had_error = FALSE;
+       gboolean had_error = FALSE, add_to_contacts;
        MsgData *data;
        ModestAccountMgr *account_mgr;
        gchar *account_name;
@@ -3160,7 +3171,10 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 
        g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window), TRUE);
 
-       if (!modest_msg_edit_window_check_names (edit_window, TRUE))
+       /* Check whether to automatically add new contacts to addressbook or not */
+       add_to_contacts = modest_conf_get_bool (modest_runtime_get_conf (),
+                                               MODEST_CONF_AUTO_ADD_TO_CONTACTS, NULL);
+       if (!modest_msg_edit_window_check_names (edit_window, add_to_contacts))
                return TRUE;
 
        data = modest_msg_edit_window_get_msg_data (edit_window);