sync with HEAD
authorColin Leroy <colin@colino.net>
Mon, 19 Jul 2004 09:35:45 +0000 (09:35 +0000)
committerColin Leroy <colin@colino.net>
Mon, 19 Jul 2004 09:35:45 +0000 (09:35 +0000)
ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/folder.h
src/folderview.c
src/summaryview.c

index 4be063788a1b296e7b3497e8eedb2854b317250b..fd15a221c12620c5c52872a1d5a1451b354790f4 100644 (file)
@@ -1,3 +1,10 @@
+2004-07-19 [colin]     0.9.12cvs33.1
+
+       * src/folder.h
+       * src/folderview.c
+       * src/summaryview.c
+               Sync with HEAD
+
 2004-07-18 [colin]     0.9.12cvs32.7
 
        * configure.ac
index 0c543ba8926c3b15564075ab9aef388a039ecb9c..6337671ae02c2ffb53cdbebd576e367569269616 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -54,3 +54,4 @@
 ( cvs diff -u -r 1.382.2.27 -r 1.382.2.28 src/compose.c; cvs diff -u -r 1.204.2.14 -r 1.204.2.15 src/prefs_common.c; cvs diff -u -r 1.103.2.7 -r 1.103.2.8 src/prefs_common.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_wrapping.c; ) > 0.9.12cvs32.4.patchset
 ( cvs diff -u -r 1.204.2.15 -r 1.204.2.16 src/prefs_common.c; ) > 0.9.12cvs32.5.patchset
 ( cvs diff -u -r 1.395.2.21 -r 1.395.2.22 src/summaryview.c; ) > 0.9.12cvs32.6.patchset
+( cvs diff -u -r 1.87.2.8 -r 1.87.2.9 src/folder.h; cvs diff -u -r 1.207.2.9 -r 1.207.2.10 src/folderview.c; cvs diff -u -r 1.395.2.22 -r 1.395.2.23 src/summaryview.c; ) > 0.9.12cvs33.1.patchset
index 7b3a685b323cafd0b3685955f558fa3669493589..b0af0d1cae5ac304b66dc2e0545909d5b65e1658 100644 (file)
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=32
+EXTRA_VERSION=33
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.7
+EXTRA_GTK2_VERSION=.1
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
index 22b69d2bb7dba4fd0546230bb2716dd6c86af122..64649e4898890ba0bc8be2418c62b3d81db8ad1a 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 9b638d58745c98c64fa74eddf9e968f45d0ae174..98dcbe1fc24d830b56c98878bab05487a7ce46a1 100644 (file)
@@ -62,7 +62,6 @@
 #include "statusbar.h"
 #include "hooks.h"
 #include "folderutils.h"
-#include "quicksearch.h"
 
 typedef enum
 {
@@ -975,15 +974,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) {
@@ -1056,9 +1050,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 &&
@@ -1205,7 +1196,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 be1a7cc8f0183b033e7c387bde3556f08b02d024..2510b919e0f21facc852015afa26db232ea83ec9 100644 (file)
@@ -801,12 +801,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); */
@@ -4419,14 +4414,8 @@ static gboolean 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)