X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodest-tny-folder.c;h=e8d37daa11a0cdc834e81688a734e48b8549fa84;hb=ab8f1b74bd81753cf93ec2d1664dc2d101ee2267;hp=725c0ec1b7b70c0dbeaf670e069ced5cdbd8a777;hpb=6ac061ec36df6dd76868a31525a4d233a6359fb8;p=modest

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index 725c0ec..e8d37da 100644
--- a/src/modest-tny-folder.c
+++ b/src/modest-tny-folder.c
@@ -58,14 +58,15 @@ modest_tny_folder_guess_folder_type_from_name (const gchar* full_name)
 
 
 TnyFolderType
-modest_tny_folder_guess_folder_type (const TnyFolder *folder)
+modest_tny_folder_guess_folder_type (TnyFolder *folder)
 {
 	TnyFolderType type;
 	
 	g_return_val_if_fail (TNY_IS_FOLDER(folder), TNY_FOLDER_TYPE_INVALID);
 
-	if (modest_tny_folder_is_local_folder ((TnyFolder*)folder))
-		type = modest_tny_folder_get_local_or_mmc_folder_type ((TnyFolder*)folder);
+	if (modest_tny_folder_is_local_folder (folder) || 
+	    modest_tny_folder_is_memory_card_folder (folder))
+		type = modest_tny_folder_get_local_or_mmc_folder_type (folder);
 	else
 		type = tny_folder_get_folder_type (TNY_FOLDER (folder));
 	
@@ -231,8 +232,6 @@ gboolean
 modest_tny_folder_is_memory_card_folder   (TnyFolder *folder)
 {
 	g_return_val_if_fail (folder, FALSE);
-	g_return_val_if_fail (modest_tny_folder_guess_folder_type (folder) !=
-			      TNY_FOLDER_TYPE_INVALID, FALSE);
 	
 	/* The merge folder is a special case, 
 	 * used to merge the per-account local outbox folders. 
@@ -259,7 +258,7 @@ modest_tny_folder_is_remote_folder   (TnyFolder *folder)
 {
 	gboolean is_local = TRUE;
 
-	g_return_val_if_fail (folder, FALSE);
+	g_return_val_if_fail (TNY_IS_FOLDER(folder), FALSE);
 	
 	is_local = ((modest_tny_folder_is_local_folder(folder)) ||
 		    (modest_tny_folder_is_memory_card_folder(folder)));
@@ -352,6 +351,8 @@ TnyAccount *
 modest_tny_folder_get_account (TnyFolder *folder)
 {
 	TnyAccount *account = NULL;
+
+	g_return_val_if_fail (TNY_IS_FOLDER(folder), NULL);
 	
 	if (TNY_IS_MERGE_FOLDER (folder)) {
 		/* TnyMergeFolder does not support get_account(), 
@@ -422,11 +423,12 @@ modest_tny_folder_has_subfolder_with_name (TnyFolderStore *parent,
 		else if (non_strict) {
 			TnyFolderType type = modest_tny_folder_guess_folder_type (folder);
 			if (type != TNY_FOLDER_TYPE_INVALID && type != TNY_FOLDER_TYPE_NORMAL) 
-				has_name =  modest_text_utils_utf8_strcmp (modest_local_folder_info_get_type_display_name (type),
-									   new_name,
-									   TRUE);
-		} else
+				has_name = !(modest_text_utils_utf8_strcmp (modest_local_folder_info_get_type_display_name (type),
+									    new_name,
+									    TRUE));
+		} else {
 			has_name = FALSE;
+		}
 		
 		g_object_unref (folder);
 		tny_iterator_next(iter);