X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-folder.c;h=24417113736bbaa64478851817048fc5fc98102d;hp=f29fef7be6389c4ef6d2cdc37adf1f1512b9ab23;hb=08777014ee682cfba5cbe1813e9472ea84c06cf4;hpb=e39070411876953aea11f14cc0c2dcc309bbfd01

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index f29fef7..2441711 100644
--- a/src/modest-tny-folder.c
+++ b/src/modest-tny-folder.c
@@ -30,6 +30,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <string.h>
+#include <modest-defs.h>
 #include <modest-tny-folder.h>
 #include <modest-tny-account.h>
 #include <modest-tny-outbox-account.h>
@@ -84,6 +85,9 @@ modest_tny_folder_guess_folder_type (TnyFolder *folder)
 				if ((strlen (downcase) == 5) &&
 				    !strncmp (downcase, "inbox", 5))
 					type = TNY_FOLDER_TYPE_INBOX;
+				if ((strlen (downcase) == 7) &&
+				    !strncmp (downcase, "archive", 7))
+					type = TNY_FOLDER_TYPE_ARCHIVE;
 				g_free (downcase);
 			}
 			g_object_unref (parent);
@@ -402,7 +406,7 @@ modest_tny_folder_get_account (TnyFolder *folder)
  *
  * The code that uses the query is available in revision 3152.
  */
-gboolean 
+gboolean
 modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent,
 					   const gchar *new_name,
 					   gboolean non_strict)
@@ -415,7 +419,7 @@ modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent,
 
 	g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), FALSE);
 	g_return_val_if_fail (new_name, FALSE);
-	
+
 	/* Get direct subfolders */
 	subfolders = tny_simple_list_new ();
 	tny_folder_store_get_folders (parent, subfolders, NULL, FALSE, &err);
@@ -423,19 +427,21 @@ modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent,
 	/* Check names */
 	iter = tny_list_create_iterator (subfolders);
 	while (!tny_iterator_is_done (iter) && !has_name) {
-		
+
 		const gchar *name;
-		
+
 		folder = (TnyFolder*)tny_iterator_get_current (iter);
 		if (!folder || ! TNY_IS_FOLDER(folder)) {
 			g_warning ("%s: invalid folder", __FUNCTION__);
+			tny_iterator_next (iter);
 			continue;
 		}
-		
+
 		name = tny_folder_get_name (folder);
 		if (!name) {
 			g_warning ("%s: folder name == NULL", __FUNCTION__);
 			g_object_unref (folder);
+			tny_iterator_next (iter);
 			continue;
 		}
 
@@ -455,17 +461,15 @@ modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent,
 		} else {
 			has_name = FALSE;
 		}
-		
+
 		g_object_unref (folder);
 		tny_iterator_next(iter);
 	}
-	
+
 	/* free */
-	if (iter != NULL)
-		g_object_unref (iter);
-	if (subfolders != NULL)
-		g_object_unref (subfolders);
-		
+	g_object_unref (iter);
+	g_object_unref (subfolders);
+
 	return has_name;
 }