* groundwork for dragging to the desktop

[modest] / src / modest-mail-operation.c

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 2984cdd..49a6875 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -37,6 +37,7 @@
 #include <tny-folder-store-query.h>
 #include <tny-camel-stream.h>
 #include <tny-simple-list.h>
+#include <tny-send-queue.h>
 #include <camel/camel-stream-mem.h>
 #include <glib/gi18n.h>
 #include <modest-tny-account.h>
@@ -312,9 +313,7 @@ create_reply_forward_mail (TnyMsg *msg, const gchar *from, gboolean is_reply, gu
        g_object_unref (G_OBJECT(body));
        
        /* Fill the header */
-       new_header = TNY_HEADER (tny_platform_factory_new_header
-                                (modest_runtime_get_platform_factory()));
-       tny_msg_set_header (new_msg, new_header);
+       new_header = tny_msg_get_header (new_msg);      
        tny_header_set_from (new_header, from);
        tny_header_set_replyto (new_header, from);
 
@@ -637,7 +636,7 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
 {
        ModestMailOperationPrivate *priv;
        TnyFolder *new_folder = NULL;
-       TnyStoreAccount *store_account;
+       //TnyStoreAccount *store_account;
 
        g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL);
        g_return_val_if_fail (name, NULL);
@@ -648,12 +647,12 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
        new_folder = tny_folder_store_create_folder (parent, name, &(priv->error));
        CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, return NULL);
 
-       /* Subscribe to folder */
-       if (!tny_folder_is_subscribed (new_folder)) {
-               store_account = TNY_STORE_ACCOUNT (tny_folder_get_account (TNY_FOLDER (parent)));
-               tny_store_account_subscribe (store_account, new_folder);
-               g_object_unref (G_OBJECT (store_account));
-       }
+/*     /\* Subscribe to folder *\/ */
+/*     if (!tny_folder_is_subscribed (new_folder)) { */
+/*             store_account = TNY_STORE_ACCOUNT (tny_folder_get_account (TNY_FOLDER (parent))); */
+/*             tny_store_account_subscribe (store_account, new_folder); */
+/*             g_object_unref (G_OBJECT (store_account)); */
+/*     } */
 
        return new_folder;
 }