update folderitem icon whenever its view is filtered

diff --git a/ChangeLog.claws b/ChangeLog.claws
index db038de448c0260c673e1cb13fbaa1527bd6adca..7a374038d1da231969aed2a74f1a1af8ee95e5f4 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2004-07-17 [colin]     0.9.12cvs29
+
+       * src/folder.h
+       * src/folderview.c
+       * src/summaryview.c
+               Update FolderItem icon whenever its summaryview is 
+               filtered
+
 2004-07-16 [christoph] 0.9.12cvs28
 
        * src/mimeview.c

diff --git a/PATCHSETS b/PATCHSETS
index 923874ef799213697b0643756c26629f63ff5ebe..be7e32fafd5b266f8bf3cc2827eb27e213357709 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -15,3 +15,4 @@
 ( cvs diff -u -r 1.7 -r 1.8 src/gtk/quicksearch.c; cvs diff -u -r 1.429 -r 1.430 src/compose.c; cvs diff -u -r 1.6 -r 1.7 src/customheader.c; cvs diff -u -r 1.119 -r 1.120 src/messageview.c; cvs diff -u -r 1.115 -r 1.116 src/news.c; cvs diff -u -r 1.113 -r 1.114 src/prefs_account.c; cvs diff -u -r 1.17 -r 1.18 src/prefs_display_header.c; cvs diff -u -r 1.57 -r 1.58 src/procheader.c; ) > 0.9.12cvs26.patchset
 ( cvs diff -u -r 1.120 -r 1.121 src/mimeview.c; ) > 0.9.12cvs27.patchset
 ( cvs diff -u -r 1.121 -r 1.123 src/mimeview.c; ) > 0.9.12cvs28.patchset
+( cvs diff -u -r 1.105 -r 1.106 src/folder.h; cvs diff -u -r 1.242 -r 1.243 src/folderview.c; cvs diff -u -r 1.438 -r 1.439 src/summaryview.c; ) > 0.9.12cvs29.patchset

diff --git a/configure.ac b/configure.ac
index 4a752b994229bde357cb1313ee4e2ca9d58f3df8..69a1664a3f4a6fa75f21962ebe25fb123124c995 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=29
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/folder.h b/src/folder.h
index 04a7cff5ab9a26f6c4f0c146fdb6f344c9dacd33..b52bdf6708575bb6f85270b2fd371d324c252132 100644 (file)
--- a/src/folder.h
+++ b/src/folder.h
@@ -114,6 +114,7 @@ typedef enum
        F_ITEM_UPDATE_ADDMSG = 1 << 2,
        F_ITEM_UPDATE_REMOVEMSG = 1 << 3,
        F_ITEM_UPDATE_NAME = 1 << 4,
+       F_ITEM_UPDATE_ICON = 1 << 5
 } FolderItemUpdateFlags;
 
 typedef void (*FolderUIFunc)           (Folder         *folder,

diff --git a/src/folderview.c b/src/folderview.c
index 6c8b240c4c3c84f1fddde5b90ea4708892225802..aa4cdff1ab49c5c5d9f0d58cf6a8dacdf7e0fb80 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -62,6 +62,7 @@
 #include "statusbar.h"
 #include "hooks.h"
 #include "folderutils.h"
+#include "quicksearch.h"
 
 typedef enum
 {
@@ -965,10 +966,13 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
        gchar *str;
        gboolean add_unread_mark;
        gboolean use_bold, use_color;
-
+       gboolean hide_read_msgs = item->hide_read_msgs;
+       
        item = gtk_ctree_node_get_row_data(ctree, node);
        g_return_if_fail(item != NULL);
 
+       item->hide_read_msgs |= quicksearch_is_active(folderview->summaryview->quicksearch);
+       
        switch (item->stype) {
        case F_INBOX:
                if (item->hide_read_msgs) {
@@ -1041,6 +1045,9 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                        openmask = folderopenxpmmask;
                }
        }
+       
+       item->hide_read_msgs = hide_read_msgs;
+       
        name = folder_item_get_name(item);
 
        if (!GTK_CTREE_ROW(node)->expanded &&
@@ -1187,7 +1194,7 @@ gboolean folderview_update_item_claws(gpointer source, gpointer data)
 
        node = gtk_ctree_find_by_row_data(ctree, NULL, update_info->item);
        if (node) {
-               if (update_info->update_flags & (F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_NAME))
+               if (update_info->update_flags & (F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_NAME | F_ITEM_UPDATE_ICON))
                        folderview_update_node(folderview, node);
                if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) && (folderview->opened == node))
                        summary_show(folderview->summaryview, update_info->item);

diff --git a/src/summaryview.c b/src/summaryview.c
index 3c689f3b47a519e693fa89491aae4a0027b9659e..998580c71c1306bff086d14a6acfdc02e8a8916b 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4375,8 +4375,14 @@ static gint summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
 static void quicksearch_execute_cb(QuickSearch *quicksearch, gpointer data)
 {
        SummaryView *summaryview = data;
+       FolderItemUpdateData source;
 
        summary_show(summaryview, summaryview->folder_item);
+                   
+       source.item = summaryview->folder_item;
+       source.update_flags = F_ITEM_UPDATE_ICON;
+       hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);                             
+
 }
 
 static void tog_searchbar_cb(GtkWidget *w, gpointer data)