* major code cleanup (part 2)

[claws.git] / src / folder.c

diff --git a/src/folder.c b/src/folder.c
index 56f62db9e843a0f7175724a5e7764a5f8fb4eaf4..71a780e8ff1e176bc05ceed0d3f04be707ff3d5d 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -429,6 +429,8 @@ gboolean folder_scan_tree_func(GNode *node, gpointer data)
        FolderItem *item = (FolderItem *)node->data;
        
        folder_item_restore_persist_prefs(item, pptable);
+
+       return FALSE;
 }
 
 void folder_scan_tree(Folder *folder)
@@ -790,33 +792,35 @@ gchar *folder_get_path(Folder *folder)
 
        g_return_val_if_fail(folder != NULL, NULL);
 
-       if (FOLDER_TYPE(folder) == F_MH)
-               path = g_strdup(LOCAL_FOLDER(folder)->rootpath);
-       else if (FOLDER_TYPE(folder) == F_MBOX) {
-               path = mbox_get_virtual_path(folder);
-               if (path == NULL)
-                       return NULL;
-               path = g_strconcat(get_mbox_cache_dir(),
-                                         G_DIR_SEPARATOR_S, path, NULL);
-               return path;
-       }
-       else if (FOLDER_TYPE(folder) == F_IMAP) {
-               g_return_val_if_fail(folder->account != NULL, NULL);
-               path = g_strconcat(get_imap_cache_dir(),
-                                  G_DIR_SEPARATOR_S,
-                                  folder->account->recv_server,
-                                  G_DIR_SEPARATOR_S,
-                                  folder->account->userid,
-                                  NULL);
-       } else if (FOLDER_TYPE(folder) == F_NEWS) {
-               g_return_val_if_fail(folder->account != NULL, NULL);
-               path = g_strconcat(get_news_cache_dir(),
-                                  G_DIR_SEPARATOR_S,
-                                  folder->account->nntp_server,
-                                  NULL);
-       } else
-               path = NULL;
+       switch(FOLDER_TYPE(folder)) {
+
+               case F_MH:
+                       path = g_strdup(LOCAL_FOLDER(folder)->rootpath);
+                       break;
+
+               case F_IMAP:
+                       g_return_val_if_fail(folder->account != NULL, NULL);
+                       path = g_strconcat(get_imap_cache_dir(),
+                                          G_DIR_SEPARATOR_S,
+                                          folder->account->recv_server,
+                                          G_DIR_SEPARATOR_S,
+                                          folder->account->userid,
+                                          NULL);
+                       break;
+
+               case F_NEWS:
+                       g_return_val_if_fail(folder->account != NULL, NULL);
+                       path = g_strconcat(get_news_cache_dir(),
+                                          G_DIR_SEPARATOR_S,
+                                          folder->account->nntp_server,
+                                          NULL);
+                       break;
 
+               default:
+                       path = NULL;
+                       break;
+       }
+       
        return path;
 }
 
@@ -827,26 +831,37 @@ gchar *folder_item_get_path(FolderItem *item)
 
        g_return_val_if_fail(item != NULL, NULL);
 
-       folder_path = folder_get_path(item->folder);
-       g_return_val_if_fail(folder_path != NULL, NULL);
+       if(FOLDER_TYPE(item->folder) != F_MBOX) {
+               folder_path = folder_get_path(item->folder);
+               g_return_val_if_fail(folder_path != NULL, NULL);
 
-       if (folder_path[0] == G_DIR_SEPARATOR) {
-               if (item->path)
-                       path = g_strconcat(folder_path, G_DIR_SEPARATOR_S,
-                                          item->path, NULL);
-               else
-                       path = g_strdup(folder_path);
+               if (folder_path[0] == G_DIR_SEPARATOR) {
+                       if (item->path)
+                               path = g_strconcat(folder_path, G_DIR_SEPARATOR_S,
+                                                  item->path, NULL);
+                       else
+                               path = g_strdup(folder_path);
+               } else {
+                       if (item->path)
+                               path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+                                                  folder_path, G_DIR_SEPARATOR_S,
+                                                  item->path, NULL);
+                       else
+                               path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+                                                  folder_path, NULL);
+               }
+
+               g_free(folder_path);
        } else {
-               if (item->path)
-                       path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
-                                          folder_path, G_DIR_SEPARATOR_S,
-                                          item->path, NULL);
-               else
-                       path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
-                                          folder_path, NULL);
-       }
+               gchar *itempath;
 
-       g_free(folder_path);
+               itempath = mbox_get_virtual_path(item);
+               if (itempath == NULL)
+                       return NULL;
+               path = g_strconcat(get_mbox_cache_dir(),
+                                         G_DIR_SEPARATOR_S, itempath, NULL);
+               g_free(itempath);
+       }
        return path;
 }