* Fixes NB#87102, add the signature to the forwarded mails that include the original...

[modest] / tests / check_folder-transfer.c

diff --git a/tests/check_folder-transfer.c b/tests/check_folder-transfer.c
index 65c7703..f3af164 100644 (file)
--- a/tests/check_folder-transfer.c
+++ b/tests/check_folder-transfer.c
@@ -65,19 +65,21 @@ find_folders (TnyFolderStore *store, TnyFolderStoreQuery *query,
        while (!tny_iterator_is_done (iter) && (!*folder_src || !*folder_dst))
        {
                TnyFolderStore *folder = (TnyFolderStore*) tny_iterator_get_current (iter);
-               const gchar *folder_name = NULL;
+               if (folder) {
+                       const gchar *folder_name = NULL;
 
-               folder_name = tny_folder_get_name (TNY_FOLDER (folder));
+                       folder_name = tny_folder_get_name (TNY_FOLDER (folder));
 
-               if (strcmp (folder_name, src_name) == 0)
-                   *folder_src = g_object_ref (folder);
+                       if (strcmp (folder_name, src_name) == 0)
+                           *folder_src = g_object_ref (folder);
                
-               if (!strcmp (folder_name, dst_name))
-                   *folder_dst = g_object_ref (folder);
+                       if (!strcmp (folder_name, dst_name))
+                           *folder_dst = g_object_ref (folder);
 
-               find_folders (folder, query, folder_src, folder_dst);
+                       find_folders (folder, query, folder_src, folder_dst);
            
-               g_object_unref (G_OBJECT (folder));
+                       g_object_unref (G_OBJECT (folder));
+               }
 
                tny_iterator_next (iter);           
        }
@@ -168,14 +170,9 @@ main (int argc, char **argv)
 
        mail_op = modest_mail_operation_new ();
                
-       if (move)
-               modest_mail_operation_move_folder (mail_op, 
-                                                  folder_src, 
-                                                  TNY_FOLDER_STORE (folder_dst));
-       else
-               modest_mail_operation_copy_folder (mail_op, 
-                                                  folder_src, 
-                                                  TNY_FOLDER_STORE (folder_dst));
+       modest_mail_operation_xfer_folder (mail_op, 
+                                          folder_src, 
+                                          TNY_FOLDER_STORE (folder_dst), move);
        
        g_object_unref (G_OBJECT (src_headers));
        g_object_unref (G_OBJECT (mail_op));