Sync with 0.9.12cvs30

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index e3d4bc64f59f8b89ce72cc9bd53bfab563797ab8..db90dd6ec89729c852154e6b6d4dca6779cf2e2e 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2004-07-17 [colin]     0.9.12cvs30.1
+
+       * src/folder.h
+       * src/folderview.c
+       * src/summaryview.c
+               Sync with 0.9.12cvs30
+
 2004-07-17 [colin]     0.9.12cvs28.2
 
        * src/mimeview.c

diff --git a/INSTALL b/INSTALL
index 9ffbbce73db82a8af455554f807ba9623774be75..7cec46a15f4c68f1de9a446d735278efcd67c69c 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 Installation
 ============
 
-This program requires GTK+ 1.2.6 or higher to be compiled.
+This program requires GTK+ 2.4.0 or higher to be compiled.
 
 This program is developed on Debian GNU/Linux (woody/sid)
 (Linux 2.4.x + glibc 2.2), so it is possible not to work correctly

diff --git a/PATCHSETS b/PATCHSETS
index 4e703132ef0deb21dbd3cf97a55333be4d163696..6cdb1364d0ff55d15e7b7712dba2746fca8c0858 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -32,3 +32,4 @@
 ( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/gtk/quicksearch.c; cvs diff -u -r 1.61.2.6 -r  1.61.2.7 src/account.c; cvs diff -u -r 1.11 -r 1.11.2.1 src/account.h; cvs diff -u -r 1.382.2.20 -r 1.382.2.21 src/compose.c; cvs diff -u -r 1.5.2.1 -r 1.5.2.2 src/customheader.c; cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/folder_item_prefs.c; cvs diff -u -r 1.115.2.9 -r 1.115.2.10 src/main.c; cvs diff -u -r 1.274.2.8 -r 1.274.2.9 src/mainwindow.c; cvs diff -u -r 1.94.2.20 -r 1.94.2.21 src/messageview.c; cvs diff -u -r 1.83.2.8 -r 1.83.2.9 src/mimeview.c; cvs diff -u -r 1.101.2.4 -r 1.101.2.5 src/news.c; cvs diff -u -r 1.10.2.2 -r 1.10.2.3 src/pgpmime.c; cvs diff -u -r 1.56.2.17 -r 1.56.2.18 src/pop.c; cvs diff -u -r 1.17.2.11 -r 1.17.2.12 src/pop.h; cvs diff -u -r 1.105.2.6 -r 1.105.2.7 src/prefs_account.c; cvs diff -u -r 1.49.2.2 -r 1.49.2.3 src/prefs_account.h; cvs diff -u -r 1.204.2.13 -r 1.204.2.14 src/prefs_common.c; cvs diff -u -r 1.103.2.6 -r 1.103.2.7 src/prefs_common.h; cvs diff -u -r 1.16.2.2 -r 1.16.2.3 src/prefs_display_header.c; cvs diff -u -r 1.10.2.3 -r 1.10.2.4 src/prefs_gtk.c; cvs diff -u -r 1.5.2.1 -r 1.5.2.2 src/prefs_gtk.h; cvs diff -u -r 1.47.2.7 -r 1.47.2.8 src/procheader.c; cvs diff -u -r 1.49.2.6 -r 1.49.2.7 src/procmime.c; ) > 0.9.12cvs26.1.patchset
 ( cvs diff -u -r 1.2504.2.7 -r 1.2504.2.8 ChangeLog.claws; cvs diff -u -r 1.654.2.60 -r 1.654.2.61 configure.ac; cvs diff -u -r 1.83.2.9 -r 1.83.2.10 src/mimeview.c; ) > 0.9.12cvs28.1.patchset
 ( cvs diff -u -r 1.83.2.10 -r 1.83.2.11 src/mimeview.c; cvs diff -u -r 1.49.2.7 -r 1.49.2.8 src/procmime.c; cvs diff -u -r 1.395.2.18 -r 1.395.2.19 src/summaryview.c; cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/gtk/menu.c; ) > 0.9.12cvs28.2.patchset
+( cvs diff -u -r 1.29.2.1 -r 1.29.2.2 INSTALL; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 commitHelper; cvs diff -u -r 1.87.2.7 -r 1.87.2.8 src/folder.h; cvs diff -u -r 1.207.2.6 -r 1.207.2.7 src/folderview.c; cvs diff -u -r 1.395.2.19 -r 1.395.2.20 src/summaryview.c; ) > 0.9.12cvs28.3.patchset

diff --git a/commitHelper b/commitHelper
index 34ac58b6bb3b1de8c17f8765a4d87b029270c3e5..3a38b2ddefa28c9c76fa94783885f396a0a49af8 100644 (file)
--- a/commitHelper
+++ b/commitHelper
@@ -67,6 +67,9 @@ if [ "$ans" == "y" ]; then
        rm $chlog.old
        echo "$patchset" >> PATCHSETS
        echo "editing $chlog configure.ac..."
+       if [ "$EDITOR" == "" ]; then
+               EDITOR=vi
+       fi;
        $EDITOR $chlog configure.ac
        echo running cvs commit $@ PATCHSETS $chlog configure.ac
        cvs commit $@ PATCHSETS $chlog configure.ac

diff --git a/configure.ac b/configure.ac
index 71a60ab35b31524050e7367a3d995bef1c937f93..f7e63261e6606bdd7cbc35b24a9f898af2eac442 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=30
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.2
+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}

diff --git a/src/folder.h b/src/folder.h
index 64649e4898890ba0bc8be2418c62b3d81db8ad1a..22b69d2bb7dba4fd0546230bb2716dd6c86af122 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 46682676f9c9df69dd9cc100d2960e98e765bbe7..6fafb4773ca0900f50944b562bdb92678fe5f60e 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
 {
@@ -974,10 +975,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) {
@@ -1050,6 +1054,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 &&
@@ -1196,7 +1203,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 54e84d206b3e4c8e767bf4f8345146fe1b423426..177ece37ee0b408935d8c0e5cc2e683044a3039c 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -801,7 +801,12 @@ 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); */
@@ -4411,8 +4416,14 @@ 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)