2007-04-15 Sergio Villar Senin <svillar@igalia.com>

[modest] / src / modest-tny-folder.c

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index afbe166..15c7d0a 100644 (file)
--- 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);
 }