2004-11-08 [colin] 0.9.12cvs143.1
authorColin Leroy <colin@colino.net>
Mon, 8 Nov 2004 18:36:06 +0000 (18:36 +0000)
committerColin Leroy <colin@colino.net>
Mon, 8 Nov 2004 18:36:06 +0000 (18:36 +0000)
* src/summaryview.c
Sync with HEAD (optimize quicksearch)

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/summaryview.c

index c70d8cc3e261b4550a2c77acb6128497ad990172..709fa220997592c331e5bc684ff8aa310479080e 100644 (file)
@@ -1,3 +1,8 @@
+2004-11-08 [colin]     0.9.12cvs143.1
+
+       * src/summaryview.c
+               Sync with HEAD (optimize quicksearch)
+
 2004-11-08 [colin]     0.9.12cvs142.2
 
        * src/compose.c
 2004-11-08 [colin]     0.9.12cvs142.2
 
        * src/compose.c
index a27dd970322db8e1701709a70b3032a212f87165..42cb2889131fa4bda68d74879195b90ad87e6ba3 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.2504.2.29 -r 1.2504.2.30 ChangeLog.claws; cvs diff -u -r 1.96.2.28 -r 1.96.2.29 src/textview.c; ) > 0.9.12cvs141.1.patchset
 ( cvs diff -u -r 1.96.2.29 -r 1.96.2.30 src/textview.c; ) > 0.9.12cvs142.1.patchset
 ( cvs diff -u -r 1.382.2.60 -r 1.382.2.61 src/compose.c; ) > 0.9.12cvs142.2.patchset
 ( cvs diff -u -r 1.2504.2.29 -r 1.2504.2.30 ChangeLog.claws; cvs diff -u -r 1.96.2.28 -r 1.96.2.29 src/textview.c; ) > 0.9.12cvs141.1.patchset
 ( cvs diff -u -r 1.96.2.29 -r 1.96.2.30 src/textview.c; ) > 0.9.12cvs142.1.patchset
 ( cvs diff -u -r 1.382.2.60 -r 1.382.2.61 src/compose.c; ) > 0.9.12cvs142.2.patchset
+( cvs diff -u -r 1.395.2.37 -r 1.395.2.38 src/summaryview.c; ) > 0.9.12cvs143.1.patchset
index ea2e341e42e2b23dd5fa8a11e1f51533bd93a7f5..ade3671f97503b8ae17e65f43235e96d6aebd513 100644 (file)
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=142
+EXTRA_VERSION=143
 EXTRA_RELEASE=
 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}
 
 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 f1d611cd5213ea87b9946b2ad56d14f72391c8f1..494d67fab5d002ae0dd0ed027564abfe81db15d1 100644 (file)
@@ -816,6 +816,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        if (summaryview->mainwin->lock_count == 0 &&
            (summaryview->moved > 0 || summaryview->copied > 0)) {
                AlertValue val;
        if (summaryview->mainwin->lock_count == 0 &&
            (summaryview->moved > 0 || summaryview->copied > 0)) {
                AlertValue val;
+               gboolean changed = FALSE;
 
                val = alertpanel(_("Process mark"),
                                 _("Some marks are left. Process it?"),
 
                val = alertpanel(_("Process mark"),
                                 _("Some marks are left. Process it?"),
@@ -824,6 +825,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                        summary_unlock(summaryview);
                        summary_execute(summaryview);
                        summary_lock(summaryview);
                        summary_unlock(summaryview);
                        summary_execute(summaryview);
                        summary_lock(summaryview);
+                       changed = TRUE;
                } else if (G_ALERTALTERNATE == val) {
                        /* DO NOTHING */
                } else {
                } else if (G_ALERTALTERNATE == val) {
                        /* DO NOTHING */
                } else {
@@ -831,7 +833,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                        inc_unlock();
                        return FALSE;
                }
                        inc_unlock();
                        return FALSE;
                }
-               folder_update_op_count();
+               if (changed || !quicksearch_is_active(summaryview->quicksearch))
+                       folder_update_op_count();
        }
        
        gtk_clist_freeze(GTK_CLIST(ctree));
        }
        
        gtk_clist_freeze(GTK_CLIST(ctree));