toolbar reply refactoring: part 2

[claws.git] / src / folderview.c

diff --git a/src/folderview.c b/src/folderview.c
index 2eb832e35740e61cbb7afa4787bda85e770f825e..bd9cd280658eebf189a9a7cf511ee66299e951ce 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -131,6 +131,10 @@ static GdkPixmap *newxpm;
 static GdkBitmap *newxpmmask;
 static GdkPixmap *unreadxpm;
 static GdkBitmap *unreadxpmmask;
+static GdkPixmap *draftsxpm;
+static GdkBitmap *draftsxpmmask;
+static GdkPixmap *draftsopenxpm;
+static GdkBitmap *draftsopenxpmmask;
 
 static void folderview_select_node      (FolderView    *folderview,
                                          GtkCTreeNode  *node);
@@ -543,6 +547,8 @@ void folderview_init(FolderView *folderview)
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_CLOSE_HRM, &queuehrmxpm, &queuehrmxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN, &queueopenxpm, &queueopenxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN_HRM, &queueopenhrmxpm, &queueopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DRAFTS_CLOSE, &draftsxpm, &draftsxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DRAFTS_OPEN, &draftsopenxpm, &draftsopenxpmmask);
 
        /* CLAWS: titles for "New" and "Unread" show new & unread pixmaps
         * instead text (text overflows making them unreadable and ugly) */
@@ -874,6 +880,12 @@ void folderview_rescan_all(void)
 }
 #endif
 
+/** folderview_check_new()
+ *  Scan and update the folder and return the 
+ *  count the number of new messages since last check. 
+ *  \param folder the folder to check for new messages
+ *  \return the number of new messages since last check
+ */
 gint folderview_check_new(Folder *folder)
 {
        GList *list;
@@ -882,6 +894,8 @@ gint folderview_check_new(Folder *folder)
        GtkCTree *ctree;
        GtkCTreeNode *node;
        gint new_msgs = 0;
+       gint former_new_msgs = 0;
+       gint former_new = 0;
 
        for (list = folderview_list; list != NULL; list = list->next) {
                folderview = (FolderView *)list->data;
@@ -900,12 +914,14 @@ gint folderview_check_new(Folder *folder)
                        if (!folder && !FOLDER_IS_LOCAL(item->folder)) continue;
 
                        folderview_scan_tree_func(item->folder, item, NULL);
+                       former_new = item->new;
                        if (folder_item_scan(item) < 0) {
                                if (folder && !FOLDER_IS_LOCAL(folder))
                                        break;
                        }
                        folderview_update_node(folderview, node);
                        new_msgs += item->new;
+                       former_new_msgs += former_new;
                }
 
                gtk_widget_set_sensitive(folderview->ctree, TRUE);
@@ -914,6 +930,12 @@ gint folderview_check_new(Folder *folder)
        }
 
        folder_write_list();
+       /* Number of new messages since last check is the just the difference 
+        * between former_new_msgs and new_msgs. If new_msgs is less than
+        * former_new_msgs, that would mean another session accessed the folder
+        * and the result is not well defined.
+        */
+       new_msgs = (former_new_msgs < new_msgs ? new_msgs - former_new_msgs : 0);
        return new_msgs;
 }
 
@@ -1119,15 +1141,10 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                                item->name);
                break;
        case F_DRAFT:
-               xpm = folderxpm;
-               mask = folderxpmmask;
-               if (item->hide_read_msgs) {
-                       openxpm = folderopenhrmxpm;
-                       openmask = folderopenhrmxpmmask;
-               } else {
-                       openxpm = folderopenxpm;
-                       openmask = folderopenxpmmask;
-               }
+               xpm = draftsxpm;
+               mask = draftsxpmmask;
+               openxpm = draftsopenxpm;
+               openmask = draftsopenxpmmask;
                name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
                                !strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
                                item->name);
@@ -1742,6 +1759,10 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        /* Show messages */
        summary_set_prefs_from_folderitem(folderview->summaryview, item);
        opened = summary_show(folderview->summaryview, item);
+       
+       /* messageview could have deleted messages in this folder */
+       if (prefs_common.immediate_exec)
+               summary_execute(folderview->summaryview);
 
        folder_clean_cache_memory();
 
@@ -2449,6 +2470,8 @@ static void folderview_rm_news_group_cb(FolderView *folderview, guint action,
        folder_item_remove(item);
        gtk_ctree_remove_node(ctree, folderview->selected);
        folder_write_list();
+       
+       prefs_filtering_delete_path(name);
 }
 
 static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
@@ -2516,8 +2539,10 @@ static void folderview_property_cb(FolderView *folderview, guint action,
 
        if (item->parent == NULL && item->folder->account)
                account_open(item->folder->account);
-       else
+       else {
+               summary_save_prefs_to_folderitem(folderview->summaryview, item);
                prefs_folder_item_create(folderview, item);
+       }
 }
 
 static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *node)