* src/summaryview.c

	fix "goto next/prev unread message" with
	ignored threads

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 9e01439d770032e9b70995131fa39377106d1fa3..57cb6bd246a8398b6e6f2e89dd5b53797a5254f0 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-07-01 [christoph] 0.7.8claws41
+
+       * src/summaryview.c
+               fix "goto next/prev unread message" with
+               ignored threads
+
 2002-07-01 [paul]      0.7.8claws40
 
        * po/es.po
@@ -24,19 +30,19 @@
        * src/mh.c
        * src/news.c
        * src/procmsg.c
-           fix broken folder tree rescaning
-           and don't use procmsg_get_mark_sum
-           anymore
+               fix broken folder tree rescaning
+               and don't use procmsg_get_mark_sum
+               anymore
 
 2002-06-30 [christoph] 0.7.8claws36
 
        * merge new cache branch
        * src/imap.c
-           fix new cache imap copy bug
+               fix new cache imap copy bug
        * src/folder.c
-           improved folder_item_scan
-           it should now always set the correct
-           new, unread and total message counts
+               improved folder_item_scan
+               it should now always set the correct
+               new, unread and total message counts
 
 2002-06-29 [paul]      0.7.8claws35
 

diff --git a/configure.in b/configure.in
index fa66aed819f219f141b013f12ee01a6582a26b63..39c5f19bdb5a3948532538df54fe08eb86e1f9b6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,7 @@ MINOR_VERSION=7
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws40
+EXTRA_VERSION=claws41
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/imap.c b/src/imap.c
index bcd4a6fd11a2c4015512e11f130da8cfc1f88b93..4a89cdc7eb14aefd38bbc4cc30a28428425b0c70 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -3046,7 +3046,7 @@ GSList *imap_get_num_list(Folder *folder, FolderItem *item)
        gint ok, exists = 0, recent = 0, unseen = 0;
        guint32 uid_validity = 0;
        guint32 uid = 0;
-
+       
        g_return_val_if_fail(folder != NULL, NULL);
        g_return_val_if_fail(item != NULL, NULL);
        g_return_val_if_fail(item->path != NULL, NULL);

diff --git a/src/summaryview.c b/src/summaryview.c
index bf196cd56abb6730564d197daf073d198fce4571..0043ce81499b597830af69594613f814e6274034 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1500,7 +1500,11 @@ static GtkCTreeNode *summary_find_next_flagged_msg(SummaryView *summaryview,
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
-               if ((msginfo->flags.perm_flags & flags) != 0) break;
+               /* 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->flags.perm_flags & flags) != 0))
+                       break;
        }
 
        return node;