2005-01-21 [colin] 1.0.0cvs7.1

	* src/summaryview.c
		Sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 5f786a72856b41150282c0693e70c2b33105b6f5..a58625932d5d1ee8ea20b226b7bd4a698bc82545 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-01-21 [colin]     1.0.0cvs7.1
+
+       * src/summaryview.c
+               Sync with HEAD
+
 2005-01-21 [colin]     1.0.0cvs6.1
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index 37b17695599f36e44da582e5e3e693431378a576..861dda048e2c4aea41f6fa1b99bd2456af2fe0e7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -335,3 +335,4 @@
 ( cvs diff -u -r 1.87.2.9 -r 1.87.2.10 src/folder.h; cvs diff -u -r 1.207.2.24 -r 1.207.2.25 src/folderview.c; cvs diff -u -r 1.20.2.3 -r 1.20.2.4 src/folderview.h; cvs diff -u -r 1.395.2.42 -r 1.395.2.43 src/summaryview.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/quicksearch.h; ) > 1.0.0cvs4.1.patchset
 ( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/gtk/quicksearch.c; cvs diff -u -r 1.204.2.27 -r 1.204.2.28 src/prefs_common.c; cvs diff -u -r 1.103.2.10 -r 1.103.2.11 src/prefs_common.h; ) > 1.0.0cvs5.1.patchset
 ( cvs diff -u -r 1.395.2.43 -r 1.395.2.44 src/summaryview.c; ) > 1.0.0cvs6.1.patchset
+( cvs diff -u -r 1.395.2.44 -r 1.395.2.45 src/summaryview.c; ) > 1.0.0cvs7.1.patchset

diff --git a/configure.ac b/configure.ac
index ddb5cfe52098a15a6bbff18853821f9104706251..3a5a440be3781bb02111c1173bf5915e41f226e9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=6
+EXTRA_VERSION=7
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/summaryview.c b/src/summaryview.c
index ab8740dfb6cae9c964979168a31d97dbc09835a6..aaf262129bef287593bbb7a68b456db6f3127150 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -922,10 +922,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                if (quicksearch_changed) {
                        /* only scan subfolders when quicksearch changed,
                         * not when search is the same and folder changed */
+                       main_window_cursor_wait(summaryview->mainwin);
                        quicksearch_reset_cur_folder_item(summaryview->quicksearch);
                        quicksearch_search_subfolders(summaryview->quicksearch, 
                                              summaryview->folderview,
                                              summaryview->folder_item);
+                       main_window_cursor_normal(summaryview->mainwin);
                }
                
                g_slist_free(mlist);