* all:

	- use the new modest-tny-account stuff

pmo-trunk-r758

diff --git a/src/Makefile.am b/src/Makefile.am
index 448e7c8..b8909be 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,6 +65,8 @@ modest_SOURCES=\
        modest-singletons.h\
        modest-text-utils.c\
        modest-text-utils.h\
+       modest-tny-account.c\
+       modest-tny-account.h\
        modest-tny-account-store.c\
        modest-tny-account-store.h\
        modest-tny-folder.c \

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index c9b7226..3c17847 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -39,7 +39,7 @@
 #include <tny-simple-list.h>
 #include <camel/camel-stream-mem.h>
 #include <glib/gi18n.h>
-
+#include <modest-tny-account.h>
 #include "modest-text-utils.h"
 #include "modest-tny-msg-actions.h"
 #include "modest-tny-platform-factory.h"
@@ -85,10 +85,6 @@ static gboolean    modest_mail_operation_xfer_msg          (ModestMailOperation
                                                            TnyFolder *folder, 
                                                            gboolean delete_original);
 
-static TnyFolder * modest_mail_operation_find_trash_folder (ModestMailOperation *self,
-                                                           TnyStoreAccount *store_account);
-
-
 enum _ModestMailOperationSignals 
 {
        PROGRESS_CHANGED_SIGNAL,
@@ -349,8 +345,8 @@ create_reply_forward_mail (TnyMsg *msg, const gchar *from, gboolean is_reply, gu
        tny_header_set_replyto (new_header, from);
 
        /* Change the subject */
-       new_subject = 
-               (gchar *) modest_text_utils_derived_subject (tny_header_get_subject(header), 
+       new_subject =
+               (gchar *) modest_text_utils_derived_subject (tny_header_get_subject(header),
                                                             (is_reply) ? _("Re:") : _("Fwd:"));
        tny_header_set_subject (new_header, (const gchar *) new_subject);
        g_free (new_subject);
@@ -392,7 +388,7 @@ modest_mail_operation_create_reply_mail (TnyMsg *msg,
                                         ModestMailOperationReplyType reply_type,
                                         ModestMailOperationReplyMode reply_mode)
 {
-       TnyMsg *new_msg;
+       TnyMsg *new_msg = NULL;
        TnyHeader *new_header, *header;
        const gchar* reply_to;
        gchar *new_cc = NULL;
@@ -405,7 +401,9 @@ modest_mail_operation_create_reply_mail (TnyMsg *msg,
        header = tny_msg_get_header (msg);
        new_header = tny_msg_get_header (new_msg);
        reply_to = tny_header_get_replyto (header);
-       if (reply_to)
+
+       /* TODO: tinymail returns Invalid and it should return NULL */
+       if (strcmp (reply_to, "Invalid"))
                tny_header_set_to (new_header, reply_to);
        else
                tny_header_set_to (new_header, tny_header_get_from (header));
@@ -429,8 +427,8 @@ modest_mail_operation_create_reply_mail (TnyMsg *msg,
                /* Remove my own address from the cc list. TODO:
                   remove also the To: of the new message, needed due
                   to the new reply_to feature */
-               new_cc = (gchar *) 
-                       modest_text_utils_remove_address ((const gchar *) tmp->str, 
+               new_cc = (gchar *)
+                       modest_text_utils_remove_address ((const gchar *) tmp->str,
                                                          from);
                /* FIXME: remove also the mails from the new To: */
                tny_header_set_cc (new_header, new_cc);
@@ -687,10 +685,9 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
        /* Delete folder or move to trash */
        if (remove_to_trash) {
                TnyFolder *trash_folder;
-
-               trash_folder = modest_mail_operation_find_trash_folder (self,
-                                                                       TNY_STORE_ACCOUNT (folder_store));
-
+               trash_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT(folder_store),
+                                                                     TNY_FOLDER_TYPE_TRASH);
+               
                /* TODO: error_handling */
                modest_mail_operation_move_folder (self, 
                                                   folder, 
@@ -795,45 +792,6 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
 }
 
 
-/* FIXME: this method should be rewritten when the policy for the
-   Trash folder becomes clearer */
-static TnyFolder *
-modest_mail_operation_find_trash_folder (ModestMailOperation *self,
-                                        TnyStoreAccount *store_account)
-{
-       TnyList *folders;
-       TnyIterator *iter;
-       gboolean found;
-       /*TnyFolderStoreQuery *query;*/
-       TnyFolder *trash_folder;
-
-       /* Look for Trash folder */
-       folders = TNY_LIST (tny_simple_list_new ());
-       tny_folder_store_get_folders (TNY_FOLDER_STORE (store_account),
-                                     folders, NULL, NULL); /* FIXME */
-       iter = tny_list_create_iterator (folders);
-
-       found = FALSE;
-       while (!tny_iterator_is_done (iter) && !found) {
-
-               trash_folder = TNY_FOLDER (tny_iterator_get_current (iter));
-               if (tny_folder_get_folder_type (trash_folder) == TNY_FOLDER_TYPE_TRASH)
-                       found = TRUE;
-               else
-                       tny_iterator_next (iter);
-       }
-
-       /* Clean up */
-       g_object_unref (G_OBJECT (folders));
-       g_object_unref (G_OBJECT (iter));
-
-       /* TODO: better error handling management */
-       if (!found) 
-               return NULL;
-       else
-               return trash_folder;
-}
-
 /* ******************************************************************* */
 /* **************************  MSG  ACTIONS  ************************* */
 /* ******************************************************************* */
@@ -877,8 +835,8 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
                TnyStoreAccount *store_account;
 
                store_account = TNY_STORE_ACCOUNT (tny_folder_get_account (folder));
-               trash_folder = modest_mail_operation_find_trash_folder (self, store_account);
-
+               trash_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT(store_account),
+                                                                     TNY_FOLDER_TYPE_TRASH);
                if (trash_folder) {
                        modest_mail_operation_move_msg (self, header, trash_folder);
 /*                     g_object_unref (trash_folder); */
@@ -896,7 +854,7 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
                g_object_unref (G_OBJECT (store_account));
        } else {
                tny_folder_remove_msg (folder, header, NULL); /* FIXME */
-               tny_folder_sync (folder, TRUE, NULL); /* FIXME */
+               tny_folder_sync(folder, TRUE, NULL); /* FIXME */
        }
 
        /* Free */

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 71d06e4..6086a1d 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,14 +12,14 @@ TESTS                   =                           \
                         check_folder-xfer           \
                        check_text-utils            \
                        check_modest-conf           \
-                       check_update_account        \
+                       check_update-account        \
                        check_account-mgr           
 
 noinst_PROGRAMS=                                   \
                        check_folder-xfer           \
                        check_modest-conf           \
                        check_text-utils            \
-                       check_update_account        \
+                       check_update-account        \
                        check_account-mgr
 
 INCLUDES=\
@@ -56,7 +56,8 @@ objects=\
        ${top_srcdir}/src/modest-widget-factory.o \
         ${top_srcdir}/src/modest-mail-operation-queue.o \
         ${top_srcdir}/src/modest-mail-operation.o \
-        ${top_srcdir}/src/modest-tny-msg-actions.o \
+        ${top_srcdir}/src/modest-tny-account.o \
+       ${top_srcdir}/src/modest-tny-msg-actions.o \
         ${top_srcdir}/src/modest-local-folder-info.o \
         ${top_srcdir}/src/modest-tny-folder.o \
         ${top_srcdir}/src/modest-text-utils.o