exclude current msg from -hide read messages-

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 4a9ba4c7f4b3e76ae40c0d9a087534759b866c47..f6aa9f0ddfc9aad3eb1dd6c69f44149cc62a5a60 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-10-08 [thorsten]  0.8.5claws3
+
+       * src/summaryview.c
+               exclude current msg from -hide read messages-
+
 2002-10-08 [colin]     0.8.5claws2
 
        * src/inc.[ch]

diff --git a/configure.in b/configure.in
index fefea704d626ceaddbffe8b95a7e5d858d2df828..e51084c12b081c99dd2264c52a6d0beb0e5ee1b1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws2
+EXTRA_VERSION=claws3
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/summaryview.c b/src/summaryview.c
index 9ef43fd854f29a1acf60e69a29767208faba4237..27ddb5242750af8f71bc4042d02d0dcc9e03951d 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -765,6 +765,10 @@ GtkCTreeNode * summary_find_prev_important_score(SummaryView *summaryview,
                return best_node;
 }
 
+#define CURRENTLY_DISPLAYED(m) \
+( (m->msgnum == displayed_msgnum) \
+  && (!g_strcasecmp(m->folder->name,item->name)) )
+
 gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -888,7 +892,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                        
                        if ((MSG_IS_UNREAD(msginfo->flags)
                             || MSG_IS_MARKED(msginfo->flags)
-                            || MSG_IS_LOCKED(msginfo->flags))
+                            || MSG_IS_LOCKED(msginfo->flags)
+                            || CURRENTLY_DISPLAYED(msginfo))
                             && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                            not_killed = g_slist_append(not_killed, msginfo);
                        else
@@ -1025,6 +1030,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        return TRUE;
 }
 
+#undef CURRENTLY_DISPLAYED
+
 void summary_clear_list(SummaryView *summaryview)
 {
        GtkCList *clist = GTK_CLIST(summaryview->ctree);