* src/modest-ui-actions.c:

[modest] / src / modest-tny-local-folders-account.c

diff --git a/src/modest-tny-local-folders-account.c b/src/modest-tny-local-folders-account.c
index eecb30c..400391b 100644 (file)
--- a/src/modest-tny-local-folders-account.c
+++ b/src/modest-tny-local-folders-account.c
@@ -161,6 +161,7 @@ get_folders (TnyFolderStore *self, TnyList *list, TnyFolderStoreQuery *query, GE
        while (iter)
        {
                TnyFolder *folder = TNY_FOLDER (iter->data);
+
                if (folder)
                        tny_list_append (list, G_OBJECT (folder));
                        
@@ -182,7 +183,7 @@ add_account_folders_to_merged_folder (TnyAccount *account, TnyMergeFolder* merge
 {
        const gchar* account_id = tny_account_get_id (account);
        const gboolean is_actual_local_folders_account = account_id && 
-               (strcmp (account_id, MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID) == 0);
+               (strcmp (account_id, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) == 0);
                
        TnyList *list_outbox_folders = tny_simple_list_new ();
        tny_folder_store_get_folders (TNY_FOLDER_STORE (account), 
@@ -226,6 +227,9 @@ void modest_tny_local_folders_account_add_merged_outbox_folders (ModestTnyLocalF
         * so that they appear as one outbox to the user: */
        TnyMergeFolder *merged_outbox = TNY_MERGE_FOLDER (tny_merge_folder_new());
        
+       /* Set type to outbox (NB#61580) */
+       tny_merge_folder_set_folder_type (merged_outbox, TNY_FOLDER_TYPE_OUTBOX);
+       
        GSList *iter = accounts;
        while (iter)
        {
@@ -245,6 +249,7 @@ void modest_tny_local_folders_account_add_merged_outbox_folders (ModestTnyLocalF
        }
        
        /* Add the merged outbox folder to the virtual local-folders store: */
+       /* printf ("Debug: %s: adding merged outbox.\n", __FUNCTION__); */
        modest_tny_local_folders_account_add_extra_folder (self, TNY_FOLDER(merged_outbox));
        g_object_unref (merged_outbox);
        merged_outbox = NULL;