X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-folder.c;h=e8d37daa11a0cdc834e81688a734e48b8549fa84;hp=e011a99b4e30a02d459a843d06baa877c201dafb;hb=8456d81c790c39f86e79fc28ccde1132f4564c1b;hpb=f236236d2478e3ad1fb68a47e2c4e32f706f8e66

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index e011a99..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(),