reverse 0.9.12cvs29 to 31
authorColin Leroy <colin@colino.net>
Mon, 19 Jul 2004 09:31:11 +0000 (09:31 +0000)
committerColin Leroy <colin@colino.net>
Mon, 19 Jul 2004 09:31:11 +0000 (09:31 +0000)
ChangeLog.claws
PATCHSETS
configure.ac
src/folder.h
src/folderview.c
src/summaryview.c

index 4ea33c7..1e479e1 100644 (file)
@@ -1,3 +1,11 @@
+2004-07-19 [colin]     0.9.12cvs33
+
+       * src/folder.h
+       * src/folderview.c
+       * src/summaryview.c
+               Reverse 0.9.12cvs29 to 31 (folder icon update
+               when quicksearch is active)
+
 2004-07-18 [colin]     0.9.12cvs32
 
        * src/pop.c
index f4895db..ab41638 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -19,3 +19,4 @@
 ( cvs diff -u -r 1.439 -r 1.440 src/summaryview.c; ) > 0.9.12cvs30.patchset
 ( cvs diff -u -r 1.243 -r 1.244 src/folderview.c; ) > 0.9.12cvs31.patchset
 ( cvs diff -u -r 1.64 -r 1.65 src/pop.c; ) > 0.9.12cvs32.patchset
+( cvs diff -u -r 1.106 -r 1.107 src/folder.h; cvs diff -u -r 1.244 -r 1.245 src/folderview.c; cvs diff -u -r 1.440 -r 1.441 src/summaryview.c; ) > 0.9.12cvs33.patchset
index 41f2253..2e627c6 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=32
+EXTRA_VERSION=33
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
index b52bdf6..04a7cff 100644 (file)
@@ -114,7 +114,6 @@ 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,
index 1d13ac8..6c8b240 100644 (file)
@@ -62,7 +62,6 @@
 #include "statusbar.h"
 #include "hooks.h"
 #include "folderutils.h"
-#include "quicksearch.h"
 
 typedef enum
 {
@@ -966,15 +965,10 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
        gchar *str;
        gboolean add_unread_mark;
        gboolean use_bold, use_color;
-       gboolean hide_read_msgs = FALSE;
-       
+
        item = gtk_ctree_node_get_row_data(ctree, node);
        g_return_if_fail(item != NULL);
 
-       hide_read_msgs = item->hide_read_msgs;
-
-       item->hide_read_msgs |= quicksearch_is_active(folderview->summaryview->quicksearch);
-       
        switch (item->stype) {
        case F_INBOX:
                if (item->hide_read_msgs) {
@@ -1047,9 +1041,6 @@ 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 &&
@@ -1196,7 +1187,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 | F_ITEM_UPDATE_ICON))
+               if (update_info->update_flags & (F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_NAME))
                        folderview_update_node(folderview, node);
                if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) && (folderview->opened == node))
                        summary_show(folderview->summaryview, update_info->item);
index 288f56e..3c689f3 100644 (file)
@@ -790,12 +790,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        if (!prefs_common.summary_quicksearch_sticky
         && !quicksearch_is_running(summaryview->quicksearch)) {
-               FolderItemUpdateData source;
                quicksearch_set(summaryview->quicksearch, prefs_common.summary_quicksearch_type, "");
-
-               source.item = item;
-               source.update_flags = F_ITEM_UPDATE_ICON;
-               hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);                             
        }
 
        /* STATUSBAR_POP(summaryview->mainwin); */
@@ -4380,14 +4375,8 @@ 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)