2006-10-04 [colin] 2.5.2cvs42
[claws.git] / src / folder.c
index 3712be8434c57b2516859517139c39ba2277b4e2..ac0dc906e9b89d50e544ce2f92ec7890a9b34d36 100644 (file)
@@ -54,7 +54,9 @@
 #include "remotefolder.h"
 #include "partial_download.h"
 #include "statusbar.h"
+#include "gtkutils.h"
 #include "timing.h"
+#include "compose.h"
 
 /* Dependecies to be removed ?! */
 #include "prefs_common.h"
@@ -89,7 +91,6 @@ static void folder_get_persist_prefs_recursive
                                        (GNode *node, GHashTable *pptable);
 static gboolean persist_prefs_free     (gpointer key, gpointer val, gpointer data);
 void folder_item_read_cache            (FolderItem *item);
-void folder_item_free_cache            (FolderItem *item);
 gint folder_item_scan_full             (FolderItem *item, gboolean filtering);
 static void folder_item_update_with_msg (FolderItem *item, FolderItemUpdateFlags update_flags,
                                          MsgInfo *msg);
@@ -198,6 +199,52 @@ void folder_init(Folder *folder, const gchar *name)
        folder->trash = NULL;
 }
 
+static void reset_parent_type(FolderItem *item, gpointer data) {
+       item->parent_stype = -1;
+}
+
+void folder_item_change_type(FolderItem *item, SpecialFolderItemType newtype)
+{
+       Folder *folder = NULL;
+       FolderUpdateData hookdata;
+
+       folder = item->folder;
+       /* unset previous root of newtype */
+       switch(newtype) {
+       case F_INBOX:
+               folder_item_change_type(folder->inbox, F_NORMAL);
+               folder->inbox = item;
+               break;
+       case F_OUTBOX:
+               folder_item_change_type(folder->outbox, F_NORMAL);
+               folder->outbox = item;
+               break;
+       case F_QUEUE:
+               folder_item_change_type(folder->queue, F_NORMAL);
+               folder->queue = item;
+               break;
+       case F_DRAFT:
+               folder_item_change_type(folder->draft, F_NORMAL);
+               folder->draft = item;
+               break;
+       case F_TRASH:
+               folder_item_change_type(folder->trash, F_NORMAL);
+               folder->trash = item;
+               break;
+       case F_NORMAL:
+       default:
+               break;
+       }
+       /* set new type for current folder and sons */
+       item->stype = newtype;
+       folder_func_to_all_folders(reset_parent_type, NULL);
+       
+       hookdata.folder = folder;
+       hookdata.update_flags = FOLDER_TREE_CHANGED;
+       hookdata.item = NULL;
+       hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
+}
+
 void folder_destroy(Folder *folder)
 {
        g_return_if_fail(folder != NULL);
@@ -413,7 +460,7 @@ void folder_item_destroy(FolderItem *item)
        }
 
        if (item->cache)
-               folder_item_free_cache(item);
+               folder_item_free_cache(item, TRUE);
        if (item->prefs)
                folder_item_prefs_free(item->prefs);
        g_free(item->name);
@@ -784,16 +831,22 @@ void folder_scan_tree(Folder *folder, gboolean rebuild)
 {
        GHashTable *pptable;
        FolderUpdateData hookdata;
-       
+       Folder *old_folder = folder;
+
        if (!folder->klass->scan_tree)
                return;
        
        pptable = folder_persist_prefs_new(folder);
 
        if (rebuild)
-               folder_tree_destroy(folder);
+               folder_remove(folder);
 
-       folder->klass->scan_tree(folder);
+       if (folder->klass->scan_tree(folder) < 0) {
+               if (rebuild)
+                       folder_add(old_folder);
+               return;
+       } else if (rebuild)
+               folder_add(folder);
 
        hookdata.folder = folder;
        hookdata.update_flags = FOLDER_TREE_CHANGED;
@@ -1149,7 +1202,9 @@ gchar *folder_item_get_identifier(FolderItem *item)
        gchar *folder_id = NULL;
 
        g_return_val_if_fail(item != NULL, NULL);
-       g_return_val_if_fail(item->path != NULL, NULL);
+
+       if (item->path == NULL)
+               return NULL;
 
        folder_id = folder_get_identifier(item->folder);
        id = g_strconcat(folder_id, "/", item->path, NULL);
@@ -1293,6 +1348,8 @@ FolderItem *folder_get_default_inbox(void)
                        continue;
                if (folder->inbox == NULL)
                        continue;
+               if (folder->klass->type == F_UNKNOWN)
+                       continue;
 
                return folder->inbox;
        }
@@ -1311,6 +1368,8 @@ FolderItem *folder_get_default_outbox(void)
                        continue;
                if (folder->outbox == NULL)
                        continue;
+               if (folder->klass->type == F_UNKNOWN)
+                       continue;
 
                return folder->outbox;
        }
@@ -1329,6 +1388,8 @@ FolderItem *folder_get_default_draft(void)
                        continue;
                if (folder->draft == NULL)
                        continue;
+               if (folder->klass->type == F_UNKNOWN)
+                       continue;
 
                return folder->draft;
        }
@@ -1347,6 +1408,8 @@ FolderItem *folder_get_default_queue(void)
                        continue;
                if (folder->queue == NULL)
                        continue;
+               if (folder->klass->type == F_UNKNOWN)
+                       continue;
 
                return folder->queue;
        }
@@ -1365,6 +1428,8 @@ FolderItem *folder_get_default_trash(void)
                        continue;
                if (folder->trash == NULL)
                        continue;
+               if (folder->klass->type == F_UNKNOWN)
+                       continue;
 
                return folder->trash;
        }
@@ -1506,7 +1571,6 @@ void folder_item_process_open (FolderItem *item,
        /* Processing */
        buf = g_strdup_printf(_("Processing (%s)...\n"), 
                              item->path ? item->path : item->name);
-       debug_print("%s\n", buf);
        g_free(buf);
 
        if (before_proc_func)
@@ -1517,13 +1581,13 @@ void folder_item_process_open (FolderItem *item,
        if (after_proc_func)
                after_proc_func(data);
 
-       debug_print("done.\n");
        item->processing_pending = FALSE;
        return; 
 }
 
 gint folder_item_open(FolderItem *item)
 {
+       START_TIMING(""); 
        if (item->no_select)
                return -1;
 
@@ -1536,7 +1600,7 @@ gint folder_item_open(FolderItem *item)
        folder_item_process_open (item, NULL, NULL, NULL);
        
        item->opened = TRUE;
-
+       END_TIMING();
        return 0;
 }
 
@@ -1870,47 +1934,57 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        folder_item_update_freeze();
        if (newmsg_list != NULL) {
                GSList *elem, *to_filter = NULL;
-               int total = g_slist_length(newmsg_list), cur = 0;
-               
-               if ((filtering == TRUE) &&
-                   (item->stype == F_INBOX) &&
-                   (item->folder->account != NULL) && 
-                   (item->folder->account->filter_on_recv)) 
-                       statusbar_print_all(_("Filtering messages...\n"));
+               gboolean do_filter = (filtering == TRUE) &&
+                                       (item->stype == F_INBOX) &&
+                                       (item->folder->account != NULL) && 
+                                       (item->folder->account->filter_on_recv);
                
                for (elem = newmsg_list; elem != NULL; elem = g_slist_next(elem)) {
                        MsgInfo *msginfo = (MsgInfo *) elem->data;
 
-                       statusbar_progress_all(cur++,total, 10);
-
                        msgcache_add_msg(item->cache, msginfo);
-                       if ((filtering == TRUE) &&
-                           (item->stype == F_INBOX) &&
-                           (item->folder->account != NULL) && 
-                           (item->folder->account->filter_on_recv) &&
-                           procmsg_msginfo_filter(msginfo))
-                               to_filter = g_slist_prepend(to_filter, msginfo);
-                       else {
+                       if (!do_filter) {
                                exists_list = g_slist_prepend(exists_list, msginfo);
-                               
+
                                if(prefs_common.thread_by_subject &&
                                        MSG_IS_IGNORE_THREAD(msginfo->flags) &&
                                        !subject_table_lookup(subject_table, msginfo->subject)) {
                                        subject_table_insert(subject_table, msginfo->subject, msginfo);
-                               }
+                               }                       
                        }
                }
-               filtering_move_and_copy_msgs(to_filter);
-               for (elem = to_filter; elem; elem = g_slist_next(elem)) {
-                       MsgInfo *msginfo = (MsgInfo *)elem->data;
-                       procmsg_msginfo_free(msginfo);
-               }
 
-               g_slist_free(to_filter);
+               if (do_filter) {
+                       GSList *unfiltered;
+                       procmsg_msglist_filter(newmsg_list, item->folder->account, 
+                                       &to_filter, &unfiltered, 
+                                       TRUE);
+                       
+                       filtering_move_and_copy_msgs(newmsg_list);
+                       if (to_filter != NULL) {
+                               for (elem = to_filter; elem; elem = g_slist_next(elem)) {
+                                       MsgInfo *msginfo = (MsgInfo *)elem->data;
+                                       procmsg_msginfo_free(msginfo);
+                               }
+                               g_slist_free(to_filter);
+                       }
+                       if (unfiltered != NULL) {
+                               for (elem = unfiltered; elem; elem = g_slist_next(elem)) {
+                                       MsgInfo *msginfo = (MsgInfo *)elem->data;
+                                       exists_list = g_slist_prepend(exists_list, msginfo);
+
+                                       if(prefs_common.thread_by_subject &&
+                                               MSG_IS_IGNORE_THREAD(msginfo->flags) &&
+                                               !subject_table_lookup(subject_table, msginfo->subject)) {
+                                               subject_table_insert(subject_table, msginfo->subject, msginfo);
+                                       }
+                               }
+                               g_slist_free(unfiltered);
+                       }
+               } 
+
                g_slist_free(newmsg_list);
 
-               statusbar_progress_all(0,0,0);
-               statusbar_pop_all();
                update_flags |= F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_CONTENT;
        }
 
@@ -1959,6 +2033,12 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                g_hash_table_destroy(subject_table);
        }
        
+       if (item->new_msgs != newcnt || item->unread_msgs != unreadcnt
+       ||  item->total_msgs != totalcnt || item->marked_msgs != markedcnt
+       ||  item->unreadmarked_msgs != unreadmarkedcnt) {
+               update_flags |= F_ITEM_UPDATE_CONTENT;
+       }
+
        item->new_msgs = newcnt;
        item->unread_msgs = unreadcnt;
        item->total_msgs = totalcnt;
@@ -2069,24 +2149,26 @@ void folder_find_expired_caches(FolderItem *item, gpointer data)
        difftime = (gint) (time(NULL) - msgcache_get_last_access_time(item->cache));
        expiretime = prefs_common.cache_min_keep_time * 60;
        debug_print("Cache unused time: %d (Expire time: %d)\n", difftime, expiretime);
+
        if (difftime > expiretime && !item->opened && !item->processing_pending) {
                *folder_item_list = g_slist_insert_sorted(*folder_item_list, item, folder_cache_time_compare_func);
        }
 }
 
-void folder_item_free_cache(FolderItem *item)
+gboolean folder_item_free_cache(FolderItem *item, gboolean force)
 {
-       g_return_if_fail(item != NULL);
+       g_return_val_if_fail(item != NULL, TRUE);
        
        if (item->cache == NULL)
-               return;
+               return TRUE;
        
-       if (item->opened > 0)
-               return;
+       if (item->opened > 0 && !force)
+               return FALSE;
 
        folder_item_write_cache(item);
        msgcache_destroy(item->cache);
        item->cache = NULL;
+       return TRUE;
 }
 
 void folder_clean_cache_memory_force(void)
@@ -2119,13 +2201,16 @@ void folder_clean_cache_memory(FolderItem *protected_item)
                listitem = folder_item_list;
                while((listitem != NULL) && (memusage > (prefs_common.cache_max_mem_usage * 1024))) {
                        FolderItem *item = (FolderItem *)(listitem->data);
+                       gint cache_size = 0;
                        if (item == protected_item) {
                                listitem = listitem->next;
                                continue;
                        }
                        debug_print("Freeing cache memory for %s\n", item->path ? item->path : item->name);
-                       memusage -= msgcache_get_memory_usage(item->cache);
-                       folder_item_free_cache(item);
+                       cache_size = msgcache_get_memory_usage(item->cache);
+                       if (folder_item_free_cache(item, FALSE))
+                               memusage -= cache_size;
+
                        listitem = listitem->next;
                }
                g_slist_free(folder_item_list);
@@ -2135,7 +2220,7 @@ void folder_clean_cache_memory(FolderItem *protected_item)
 void folder_item_read_cache(FolderItem *item)
 {
        gchar *cache_file, *mark_file;
-       START_TIMING("folder_item_read_cache");
+       START_TIMING("");
        g_return_if_fail(item != NULL);
 
        if (item->path != NULL) {
@@ -2189,10 +2274,17 @@ void folder_item_write_cache(FolderItem *item)
        FolderItemPrefs *prefs;
        gint filemode = 0;
        gchar *id;
+       time_t last_mtime = (time_t)0;
+       gboolean need_scan = FALSE;
        
        if (!item || !item->path || !item->cache)
                return;
 
+       if (FOLDER_TYPE(item->folder) == F_MH) {
+               last_mtime = item->mtime;
+               need_scan = item->folder->klass->scan_required(item->folder, item);
+       }
+
        id = folder_item_get_identifier(item);
        debug_print("Save cache for folder %s\n", id);
        g_free(id);
@@ -2210,6 +2302,12 @@ void folder_item_write_cache(FolderItem *item)
                }
         }
 
+       if (!need_scan && FOLDER_TYPE(item->folder) == F_MH) {
+               if (item->mtime == last_mtime) {
+                       mh_set_mtime(item);
+               }
+       }
+
        g_free(cache_file);
        g_free(mark_file);
 }
@@ -2286,7 +2384,12 @@ void msginfo_set_mime_flags(GNode *node, gpointer data)
                if (!mimeinfo->subtype 
                ||  strcmp(mimeinfo->subtype, "pgp-signature"))
                        procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
-       }
+       } else if (mimeinfo->disposition == DISPOSITIONTYPE_INLINE &&
+               strcmp(mimeinfo->subtype, "pgp-signature") && 
+               (procmime_mimeinfo_get_parameter(mimeinfo, "name") != NULL ||
+                procmime_mimeinfo_get_parameter(mimeinfo, "filename") != NULL)) {
+               procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
+       } 
 
        /* don't descend below top level message for signed and encrypted info */
        if (mimeinfo->type == MIMETYPE_MESSAGE)
@@ -2338,6 +2441,7 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
                                procmsg_msginfo_set_flags(msginfo, 0, MSG_SCANNED);
                        }
                }
+               procmsg_msginfo_free(msginfo);
        }
 
        return msgfile;
@@ -2380,6 +2484,7 @@ gchar *folder_item_fetch_msg_full(FolderItem *item, gint num, gboolean headers,
                                procmsg_msginfo_set_flags(msginfo, 0, MSG_SCANNED);
                        }
                }
+               procmsg_msginfo_free(msginfo);
        }
 
        return msgfile;
@@ -2504,7 +2609,7 @@ static void copy_msginfo_flags(MsgInfo *source, MsgInfo *dest)
                perm_flags |= MSG_IGNORE_THREAD;
 
        /* Unset tmp flags that should not be copied */
-       tmp_flags &= ~(MSG_MOVE | MSG_COPY);
+       tmp_flags &= ~(MSG_MOVE | MSG_COPY | MSG_MOVE_DONE);
 
        /* unset flags that are set but should not */
        /* and set new flags */
@@ -2747,7 +2852,7 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
 {
        FolderItem *tmp = folder_item_parent(dest);
        gchar * src_identifier, * dst_identifier;
-       gchar * phys_srcpath, * phys_dstpath;
+       gchar * phys_srcpath, * phys_dstpath, *tmppath;
        
        while (tmp) {
                if (tmp == src) {
@@ -2775,10 +2880,12 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
        }
 
        phys_srcpath = folder_item_get_path(src);
-       phys_dstpath = g_strconcat(folder_item_get_path(dest),
+       tmppath = folder_item_get_path(dest);
+       phys_dstpath = g_strconcat(tmppath,
                       G_DIR_SEPARATOR_S,
                       g_path_get_basename(phys_srcpath),
                       NULL);
+       g_free(tmppath);
 
        if (folder_item_parent(src) == dest || src == dest) {
                g_free(src_identifier);
@@ -2814,6 +2921,8 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
        gboolean folderscan = FALSE;
        GRelation *relation;
        GSList *not_moved = NULL;
+       gint total = 0, curmsg = 0;
+       MsgInfo *msginfo = NULL;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msglist != NULL, -1);
@@ -2824,6 +2933,40 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
        if (dest->no_select)
                return -1;
 
+       msginfo = (MsgInfo *)msglist->data;
+       
+       if (!msginfo)
+               return -1;
+       
+       if (!MSG_IS_QUEUED(msginfo->flags) && 
+           MSG_IS_DRAFT(msginfo->flags) && 
+           folder_has_parent_of_type(dest, F_QUEUE)) {
+               GSList *cur = msglist;
+               gboolean queue_err = FALSE;
+               for (; cur; cur = cur->next) {
+                       Compose *compose = NULL;
+                       FolderItem *queue = dest;
+                       int val = 0;
+                       
+                       msginfo = (MsgInfo *)cur->data;
+                       compose = compose_reedit(msginfo, TRUE);
+                       if (compose == NULL) {
+                               queue_err = TRUE;
+                               continue;
+                       }
+                       val = compose_queue(compose, NULL, &queue, NULL,
+                                       FALSE);
+                       if (val < 0) {
+                               queue_err = TRUE;
+                       } else if (remove_source) {
+                               folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
+                       }
+                       if (val == 0)
+                               compose_close(compose);
+               }
+               return queue_err ? -1:0;
+       }
+
        relation = g_relation_new(2);
        g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
        g_relation_index(relation, 1, g_direct_hash, g_direct_equal);
@@ -2880,7 +3023,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                 * copying was successfull and update folder
                 * message counts
                 */
-               if (item->folder->klass->remove_msgs) {
+               if (not_moved == NULL && item->folder->klass->remove_msgs) {
                        item->folder->klass->remove_msgs(item->folder,
                                                                msginfo->folder,
                                                                msglist,
@@ -2920,6 +3063,8 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                folderscan = TRUE;
        }
 
+       statusbar_print_all(_("Updating cache for %s..."), dest->path ? dest->path : "(null)");
+       total = g_slist_length(msglist);
        for (l = msglist; l != NULL; l = g_slist_next(l)) {
                MsgInfo *msginfo = (MsgInfo *) l->data;
                 GTuples *tuples;
@@ -2928,6 +3073,10 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                 num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
                 g_tuples_destroy(tuples);
 
+               statusbar_progress_all(curmsg++,total, 100);
+               if (curmsg % 100 == 0)
+                       GTK_EVENTS_FLUSH();
+
                if (num >= 0) {
                        MsgInfo *newmsginfo = NULL;
 
@@ -2966,6 +3115,8 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                                lastnum = num;
                }
        }
+       statusbar_progress_all(0,0,0);
+       statusbar_pop_all();
 
        g_relation_destroy(relation);
        if (not_moved != NULL) {
@@ -3128,7 +3279,7 @@ gint folder_item_remove_all_msg(FolderItem *item)
                result = folder->klass->remove_all_msg(folder, item);
 
                if (result == 0) {
-                       folder_item_free_cache(item);
+                       folder_item_free_cache(item, TRUE);
                        item->cache = msgcache_new();
                }
        } else {
@@ -3358,6 +3509,9 @@ static GNode *folder_get_xml_node(Folder *folder)
        xmlnode = xml_node_new(tag, NULL);
 
        node = g_node_new(xmlnode);
+       
+       g_return_val_if_fail (folder->node != NULL, NULL);
+       
        if (folder->node->children) {
                GNode *cur;
 
@@ -3597,6 +3751,7 @@ void folder_item_apply_processing(FolderItem *item)
        GSList *processing_list;
        GSList *mlist, *cur;
        guint total = 0, curmsg = 0;
+       gint last_apply_per_account;
 
        g_return_if_fail(item != NULL);
 
@@ -3609,11 +3764,16 @@ void folder_item_apply_processing(FolderItem *item)
        &&  !post_global_processing)
                return;
 
+       debug_print("processing %s\n", item->name);
        folder_item_update_freeze();
 
        mlist = folder_item_get_msg_list(item);
        total = g_slist_length(mlist);
        statusbar_print_all(_("Processing messages..."));
+
+       last_apply_per_account = prefs_common.apply_per_account_filtering_rules;
+       prefs_common.apply_per_account_filtering_rules = FILTERING_ACCOUNT_RULES_SKIP;
+
        for (cur = mlist ; cur != NULL ; cur = cur->next) {
                MsgInfo * msginfo;
 
@@ -3626,15 +3786,17 @@ void folder_item_apply_processing(FolderItem *item)
                statusbar_progress_all(curmsg++,total, 10);
 
                 /* apply pre global rules */
-               filter_message_by_msginfo(pre_global_processing, msginfo);
+               filter_message_by_msginfo(pre_global_processing, msginfo, NULL);
                
                 /* apply rules of the folder */
-               filter_message_by_msginfo(processing_list, msginfo);
+               filter_message_by_msginfo(processing_list, msginfo, NULL);
 
                 /* apply post global rules */
-               filter_message_by_msginfo(post_global_processing, msginfo);
+               filter_message_by_msginfo(post_global_processing, msginfo, NULL);
                 
        }
+       prefs_common.apply_per_account_filtering_rules = last_apply_per_account;
+
        if (pre_global_processing || processing_list
            || post_global_processing)
                filtering_move_and_copy_msgs(mlist);
@@ -3808,10 +3970,6 @@ gboolean folder_has_parent_of_type(FolderItem *item,
                        /* here's an exception: Inbox subfolders are normal. */
                        if (item->parent_stype == -1 && cur->stype == F_INBOX 
                        && item != cur) {
-                               debug_print("set item %s parent type to %d "
-                                       "even if %s is F_INBOX\n",
-                                       item->path ? item->path : "(null)",
-                                       0, cur->path);
                                item->parent_stype = F_NORMAL;
                                break;
                        }
@@ -3819,21 +3977,11 @@ gboolean folder_has_parent_of_type(FolderItem *item,
                         * well copy it instead of going up the full way */
                        if (cur->parent_stype != -1) {
                                item->parent_stype = cur->parent_stype;
-                               debug_print("set item %s parent type to %d "
-                                       "from %s's parent type\n",
-                                       item->path ? item->path : "(null)",
-                                       cur->parent_stype ? cur->parent_stype : 0, 
-                                       cur->path ? cur->path : "(null)");
                                break;
                        }
                        /* we found a parent that has a special type. That's 
                         * our parent type. */
                        if (cur->stype != F_NORMAL) {
-                               debug_print("set item %s parent type to %d "
-                                       "from %s's type\n",
-                                       item->path ? item->path : "(null)",
-                                       cur->stype ? cur->stype : 0, 
-                                       cur->path ? cur->path : "(null)");
                                cur->parent_stype = cur->stype;
                                item->parent_stype = cur->stype;
                                break;
@@ -3844,8 +3992,6 @@ gboolean folder_has_parent_of_type(FolderItem *item,
                /* as we still didn't find anything, our parents must all be 
                 * normal. */
                if (item->parent_stype == -1) {
-                       debug_print("set item %s to 0 from default\n", 
-                               item->path ? item->path : "(null)");
                        item->parent_stype = F_NORMAL;
                }
        }
@@ -3866,4 +4012,17 @@ gboolean folder_subscribe (const gchar *uri)
        return FALSE;
 
 }
+
+gboolean folder_get_sort_type          (Folder         *folder,
+                                        FolderSortKey  *sort_key,
+                                        FolderSortType *sort_type)
+{
+       if (!folder || !sort_key || !sort_type)
+               return FALSE;
+       if (folder->klass->get_sort_type == NULL)
+               return FALSE;
+       folder->klass->get_sort_type(folder, sort_key, sort_type); 
+       return TRUE;
+}
+
 #undef PUT_ESCAPE_STR