From b310349cfe2712dc7be3de3e8614cf6bdbd42c9b Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Mon, 8 Nov 2004 18:36:06 +0000 Subject: [PATCH] 2004-11-08 [colin] 0.9.12cvs143.1 * src/summaryview.c Sync with HEAD (optimize quicksearch) --- ChangeLog-gtk2.claws | 5 +++++ PATCHSETS | 1 + configure.ac | 4 ++-- src/summaryview.c | 5 ++++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index c70d8cc3e..709fa2209 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -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 diff --git a/PATCHSETS b/PATCHSETS index a27dd9703..42cb28891 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -222,3 +222,4 @@ ( 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 diff --git a/configure.ac b/configure.ac index ea2e341e4..ade3671f9 100644 --- a/configure.ac +++ b/configure.ac @@ -11,9 +11,9 @@ MINOR_VERSION=9 MICRO_VERSION=12 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=142 +EXTRA_VERSION=143 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/summaryview.c b/src/summaryview.c index f1d611cd5..494d67fab 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -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; + gboolean changed = FALSE; 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); + changed = TRUE; } else if (G_ALERTALTERNATE == val) { /* DO NOTHING */ } else { @@ -831,7 +833,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item) 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)); -- 2.25.1