2005-08-07 [paul] 1.9.13cvs21

	* src/summaryview.c
		fix bug 32 'Search Doesn't display results
		if "Hide Read Messages" is chosen'
		be more literal in interpreting 'Hide read
		messages'

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index f82498c724b674964e0e378a62ccf6270cc5b466..120d85e5a21c95656abb03b8fb572e7c66c9c3b5 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,11 @@
+2005-08-07 [paul]      1.9.13cvs21
+
+       * src/summaryview.c
+               fix bug 32 'Search Doesn't display results
+               if "Hide Read Messages" is chosen'
+               be more literal in interpreting 'Hide read
+               messages'
+

 2005-08-07 [colin]     1.9.13cvs20
 
        * src/folderview.c
 2005-08-07 [colin]     1.9.13cvs20
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index e93c1ef29da03b11b09973a55b7d54e850ae20be..144e3a9e4b5b5c5635b3032b114aaa3833c7c07c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -706,3 +706,4 @@
 ( cvs diff -u -r 1.274.2.50 -r 1.274.2.51 src/mainwindow.c;  cvs diff -u -r 1.16.2.10 -r 1.16.2.11 src/prefs_display_header.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_folder_column.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/prefs_summaries.c;  cvs diff -u -r 1.10.2.9 -r 1.10.2.10 src/prefs_summary_column.c;  ) > 1.9.13cvs18.patchset
 ( cvs diff -u -r 1.274.2.51 -r 1.274.2.52 src/mainwindow.c;  ) > 1.9.13cvs19.patchset
 ( cvs diff -u -r 1.207.2.52 -r 1.207.2.53 src/folderview.c;  cvs diff -u -r 1.395.2.103 -r 1.395.2.104 src/summaryview.c;  ) > 1.9.13cvs20.patchset
 ( cvs diff -u -r 1.274.2.50 -r 1.274.2.51 src/mainwindow.c;  cvs diff -u -r 1.16.2.10 -r 1.16.2.11 src/prefs_display_header.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/prefs_folder_column.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/prefs_summaries.c;  cvs diff -u -r 1.10.2.9 -r 1.10.2.10 src/prefs_summary_column.c;  ) > 1.9.13cvs18.patchset
 ( cvs diff -u -r 1.274.2.51 -r 1.274.2.52 src/mainwindow.c;  ) > 1.9.13cvs19.patchset
 ( cvs diff -u -r 1.207.2.52 -r 1.207.2.53 src/folderview.c;  cvs diff -u -r 1.395.2.103 -r 1.395.2.104 src/summaryview.c;  ) > 1.9.13cvs20.patchset

+( cvs diff -u -r 1.395.2.104 -r 1.395.2.105 src/summaryview.c;  ) > 1.9.13cvs21.patchset

diff --git a/configure.ac b/configure.ac
index 1b235789e42ace9f7fd88e738b505b02bf004348..cde5e006ae15134b23e74b1a1c75fb164446d954 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=20
+EXTRA_VERSION=21

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/summaryview.c b/src/summaryview.c
index 9744bb42662758de152e4030f5ac09450eb5e48d..9cc53de5c9d3002183caf2298f11ac1dc57ba8d5 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -899,7 +899,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        mlist = folder_item_get_msg_list(item);
 
 
        mlist = folder_item_get_msg_list(item);
 

-       if (summaryview->folder_item->hide_read_msgs) {
+       if (summaryview->folder_item->hide_read_msgs &&
+           quicksearch_is_active(summaryview->quicksearch) == FALSE) {

                GSList *not_killed;
                
                summary_set_hide_read_msgs_menu(summaryview, TRUE);
                GSList *not_killed;
                
                summary_set_hide_read_msgs_menu(summaryview, TRUE);


@@ -907,11 +908,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
                        MsgInfo * msginfo = (MsgInfo *) cur->data;
                        
                for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
                        MsgInfo * msginfo = (MsgInfo *) cur->data;
                        

-                       if ((MSG_IS_UNREAD(msginfo->flags)
-                            || MSG_IS_MARKED(msginfo->flags)
-                            || MSG_IS_LOCKED(msginfo->flags)
-                            || CURRENTLY_DISPLAYED(msginfo))
-                            && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+                       if (MSG_IS_UNREAD(msginfo->flags) &&
+                           !MSG_IS_IGNORE_THREAD(msginfo->flags))

                                not_killed = g_slist_prepend(not_killed, msginfo);
                        else
                                procmsg_msginfo_free(msginfo);
                                not_killed = g_slist_prepend(not_killed, msginfo);
                        else
                                procmsg_msginfo_free(msginfo);