Revert "On creating forward, don't include purged parts (fixes NB#124831)."

[modest] / src / modest-utils.c

diff --git a/src/modest-utils.c b/src/modest-utils.c
index c6e50e7..4447e5e 100644 (file)
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -36,10 +36,11 @@
 #include <tny-fs-stream.h>
 #include <tny-camel-account.h>
 #include <tny-status.h>
+#include <tny-camel-send-queue.h>
 #include <tny-camel-transport-account.h>
 #include <tny-camel-imap-store-account.h>
 #include <tny-camel-pop-store-account.h>
-
+#include <locale.h>
 #include <modest-defs.h>
 #include "modest-utils.h"
 #include "modest-platform.h"
@@ -837,7 +838,7 @@ modest_utils_open_mcc_mapping_file (gboolean from_lc_messages, gboolean *transla
        gchar **parts, **node;
 
        if (from_lc_messages) {
-               env_list = getenv ("LC_MESSAGES");
+               env_list = setlocale (LC_MESSAGES, NULL);
        } else {
                env_list = getenv ("LANG");
        }
@@ -1140,3 +1141,27 @@ modest_utils_free_notification_list (GList *notification_list)
        g_list_foreach (notification_list, free_notification_data, NULL);
        g_list_free (notification_list);
 }
+
+void
+modest_utils_flush_send_queue (const gchar *account_id)
+{
+       TnyTransportAccount *account;
+
+       /* Get the transport account */
+       account = (TnyTransportAccount *)
+               modest_tny_account_store_get_server_account (modest_runtime_get_account_store (),
+                                                            account_id,
+                                                            TNY_ACCOUNT_TYPE_TRANSPORT);
+       if (account) {
+               ModestMailOperation *wakeup_op;
+               ModestTnySendQueue *send_queue = modest_runtime_get_send_queue (account, TRUE);
+
+               /* Flush it! */
+               wakeup_op = modest_mail_operation_new (NULL);
+               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+                                                wakeup_op);
+               modest_mail_operation_queue_wakeup (wakeup_op, send_queue);
+
+               g_object_unref (account);
+       }
+}