2006-02-09 [colin] 2.0.0cvs41

	* src/summaryview.c
		Fix shitty logic messed up. Thanks Ticho for the hint!

diff --git a/ChangeLog b/ChangeLog
index 83e8eff63e4a48ed2110b5930133bcb5846c8136..799989bfa8a54a8d6d493ccb9628ec3bc920968b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-09 [colin]     2.0.0cvs41
+
+       * src/summaryview.c
+               Fix shitty logic messed up. Thanks Ticho for the hint!
+
 2006-02-09 [wwp]       2.0.0cvs40
 
        * src/gtk/about.c

diff --git a/PATCHSETS b/PATCHSETS
index 781743c8af3c7c3a33ce7aa1a8152495ddc27d93..7a47d4b72d0b7f5abdf4ff97d50ff8b0fd0a341d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1224,3 +1224,4 @@
 ( cvs diff -u -r 1.2.2.21 -r 1.2.2.22 src/gtk/filesel.c;  ) > 2.0.0cvs38.patchset
 ( cvs diff -u -r 1.75.2.16 -r 1.75.2.17 src/matcher.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/gtksourceprintjob.c;  ) > 2.0.0cvs39.patchset
 ( cvs diff -u -r 1.4.2.28 -r 1.4.2.29 src/gtk/about.c;  cvs diff -u -r 1.382.2.239 -r 1.382.2.240 src/compose.c;  cvs diff -u -r 1.105.2.48 -r 1.105.2.49 src/prefs_account.c;  cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/prefs_gtk.h;  cvs diff -u -r 1.14.2.15 -r 1.14.2.16 src/editaddress.c;  ) > 2.0.0cvs40.patchset
+( cvs diff -u -r 1.395.2.167 -r 1.395.2.168 src/summaryview.c;  ) > 2.0.0cvs41.patchset

diff --git a/configure.ac b/configure.ac
index 104596726c9e50218ead6c046ea5e622c649d0b3..57cfe9835085de00125fea192f11a41a0fbc89ae 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=40
+EXTRA_VERSION=41
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/summaryview.c b/src/summaryview.c
index 227691b35bf380958acd725d2044e555cbf4062e..45b54726a61601e952dd9b73882bb9bde3de161b 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1739,8 +1739,9 @@ static GtkCTreeNode *summary_find_next_flagged_msg(SummaryView *summaryview,
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
                /* Find msg with matching flags but ignore messages with
                   ignore flags, if searching for new or unread messages */
-               if (!(((flags & (MSG_NEW | MSG_UNREAD)) != 0) && MSG_IS_IGNORE_THREAD(msginfo->flags)) && 
-                       (msginfo && (msginfo->flags.perm_flags & flags) != 0))
+               if ((msginfo && (msginfo->flags.perm_flags & flags) != 0) &&
+                   !(((flags & (MSG_NEW | MSG_UNREAD)) != 0) && MSG_IS_IGNORE_THREAD(msginfo->flags)) 
+                       )
                        break;
        }