X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-folder.c;h=15c7d0ad2806800b099aeeabe98ace3b7689b344;hp=afbe166e2120cd9643e9d8204fc73a3694c21e73;hb=2768976ccfcb850098f8c5eaed317048184f4ad1;hpb=ab8dec9571b29fc6e932de3f4310ee49262b9f54

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index afbe166..15c7d0a 100644
--- a/src/modest-tny-folder.c
+++ b/src/modest-tny-folder.c
@@ -121,6 +121,7 @@ modest_tny_folder_get_folder_rules   (const TnyFolder *folder)
 		case TNY_FOLDER_TYPE_JUNK:
 		case TNY_FOLDER_TYPE_TRASH:
 		case TNY_FOLDER_TYPE_SENT:
+		default:
 			rules |= MODEST_FOLDER_RULES_FOLDER_NON_DELETABLE;
 			rules |= MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE;
 			rules |= MODEST_FOLDER_RULES_FOLDER_NON_RENAMEABLE;
@@ -184,13 +185,19 @@ modest_tny_folder_get_local_folder_type  (const TnyFolder *folder)
 	g_return_val_if_fail (modest_tny_folder_is_local_folder(folder),
 			      TNY_FOLDER_TYPE_UNKNOWN);
 
+	/* we need to use the camel functions, because we want the
+	 * _full name_, that is, the full path name of the folder,
+	 * to distinguis between 'Outbox' and 'myfunkyfolder/Outbox'
+	 */
 	camel_folder = tny_camel_folder_get_folder (TNY_CAMEL_FOLDER(folder));
 	if (!camel_folder)
 		return TNY_FOLDER_TYPE_UNKNOWN;
 
 	full_name = camel_folder_get_full_name (camel_folder);
-	if (!full_name)
+	camel_object_unref (CAMEL_OBJECT(camel_folder));
+	
+	if (!full_name) 
 		return TNY_FOLDER_TYPE_UNKNOWN;
-
-	return modest_local_folder_info_get_type (full_name);
+	else 
+		return modest_local_folder_info_get_type (full_name);
 }