add new ctree sorting code

[claws.git] / src / folderview.c

diff --git a/src/folderview.c b/src/folderview.c
index 0e564152a55da3b5431fa5e978753863c6960242..8e10ab7288a55fd8b9f511e24df8a50eaae70b79 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -55,6 +55,8 @@
 #include "prefs_common.h"
 #include "prefs_account.h"
 #include "prefs_filter.h"
+#include "prefs_filtering.h"
+#include "prefs_scoring.h"
 #include "prefs_folder_item.h"
 #include "account.h"
 #include "folder.h"
@@ -156,6 +158,9 @@ static GtkCTreeNode *folderview_find_by_name        (GtkCTree       *ctree,
                                                 GtkCTreeNode   *node,
                                                 const gchar    *name);
 
+static gint folderview_clist_compare   (GtkCList       *clist,
+                                        gconstpointer   ptr1,
+                                        gconstpointer   ptr2);
 static gint folderview_compare_name    (gconstpointer   a,
                                         gconstpointer   b);
 
@@ -356,9 +361,10 @@ FolderView *folderview_create(void)
        titles[COL_TOTAL]  = _("#");
 
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_ALWAYS);
+       gtk_scrolled_window_set_policy
+               (GTK_SCROLLED_WINDOW(scrolledwin),
+                GTK_POLICY_AUTOMATIC,
+                prefs_common.folderview_vscrollbar_policy);
        gtk_widget_set_usize(scrolledwin,
                             prefs_common.folderview_width,
                             prefs_common.folderview_height);
@@ -387,6 +393,7 @@ FolderView *folderview_create(void)
        gtk_ctree_set_expander_style(GTK_CTREE(ctree),
                                     GTK_CTREE_EXPANDER_SQUARE);
        gtk_ctree_set_indent(GTK_CTREE(ctree), CTREE_INDENT);
+       gtk_clist_set_compare_func(GTK_CLIST(ctree), folderview_clist_compare);
 
        /* don't let title buttons take key focus */
        for (i = 0; i < N_FOLDER_COLS; i++)
@@ -799,12 +806,14 @@ void folderview_rescan_tree(Folder *folder)
        window = label_window_create(_("Rescanning folder tree..."));
 
        folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
-       folder->scan_tree(folder);
+       folder_scan_tree(folder);
        folder_set_ui_func(folder, NULL, NULL);
 
        folder_write_list();
        folderview_set_all();
 
+       folderview_check_new(folder);
+       
        gtk_widget_destroy(window);
        inc_unlock();
 }
@@ -823,12 +832,20 @@ void folderview_rescan_all(void)
 
                if (!folder->scan_tree) continue;
                folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
-               folder->scan_tree(folder);
+               folder_scan_tree(folder);
                folder_set_ui_func(folder, NULL, NULL);
        }
 
        folder_write_list();
        folderview_set_all();
+
+       list = folder_get_list();
+       for (; list != NULL; list = list->next) {
+               Folder *folder = list->data;
+
+               folderview_check_new(folder);
+       }
+
        gtk_widget_destroy(window);
        inc_unlock();
 }
@@ -1275,7 +1292,7 @@ static void folderview_sort_folders(FolderView *folderview, GtkCTreeNode *root,
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *prev = NULL;
 
-       gtk_ctree_sort_recursive(ctree, root);
+       gtk_sctree_sort_recursive(ctree, root);
 
        if (GTK_CTREE_ROW(root)->parent) return;
 
@@ -1609,7 +1626,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                        (folderview->mainwin,
                         item->folder->type == F_NEWS ? 
                         COMPOSEBUTTON_NEWS : COMPOSEBUTTON_MAIL);
-        
+
        if (item->path)
                debug_print(_("Folder %s is selected\n"), item->path);
 
@@ -1626,8 +1643,14 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                        gdk_pointer_ungrab(GDK_CURRENT_TIME);
        }
 
+       if((item->folder->type == F_IMAP) || (item->folder->type == F_NEWS)) {
+               folder_item_scan(item);
+       }
+
        opened = summary_show(folderview->summaryview, item, FALSE);
 
+       folder_clean_cache_memory();
+       
        if (!opened) {
                gtkut_ctree_set_focus_row(ctree, folderview->opened);
                gtk_ctree_select(ctree, folderview->opened);
@@ -2086,7 +2109,7 @@ static void folderview_remove_mailbox_cb(FolderView *folderview, guint action,
        message = g_strdup_printf
                (_("Really remove the mailbox `%s' ?\n"
                   "(The messages are NOT deleted from the disk)"), name);
-       avalue = alertpanel(_("Remove folder"), message,
+       avalue = alertpanel(_("Remove mailbox"), message,
                            _("Yes"), _("+No"), NULL);
        g_free(message);
        if (avalue != G_ALERTDEFAULT) return;
@@ -2295,7 +2318,7 @@ static void folderview_new_news_group_cb(FolderView *folderview, guint action,
                gtk_ctree_node_set_row_data(ctree, node, newitem);
        }
 
-       gtk_ctree_sort_node(ctree, servernode);
+       folderview_sort_folders(folderview, servernode, folder);
        gtk_clist_thaw(GTK_CLIST(ctree));
 
        slist_free_strings(new_subscr);
@@ -2509,6 +2532,20 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
                gtk_drag_finish(drag_context, FALSE, FALSE, time);
 }
 
+static gint folderview_clist_compare(GtkCList *clist,
+                                    gconstpointer ptr1, gconstpointer ptr2)
+{
+       FolderItem *item1 = ((GtkCListRow *)ptr1)->data;
+       FolderItem *item2 = ((GtkCListRow *)ptr2)->data;
+
+       if (!item1->name)
+               return (item2->name != NULL);
+       if (!item2->name)
+               return -1;
+
+       return g_strcasecmp(item1->name, item2->name);
+}
+
 static gint folderview_compare_name(gconstpointer a, gconstpointer b)
 {
        const FolderItem *item = a;
@@ -2545,7 +2582,7 @@ static void folderview_processing_cb(FolderView *folderview, guint action,
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       prefs_filtering_open(item);
+       prefs_filtering_open(item, NULL, NULL);
 }
 
 void folderview_set_target_folder_color(gint color_op)