Revert too-soon integration of a feature planned for 0.8.6

(Sorry to have sent you this in an unrelated patch, Christoph...)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index f16f726c0fa56acfff632342a84954cf1b2b73b0..e7cc0fd08d6978504769ae4092af89596d20ff5e 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-11-15 [colin]     0.8.5claws162
+
+       * src/summaryview.c
+               Revert too-soon integration of a feature
+

 2002-11-15 [christoph] 0.8.5claws161
 
        * src/imap.c
 2002-11-15 [christoph] 0.8.5claws161
 
        * src/imap.c

diff --git a/configure.in b/configure.in
index 6491057bd4dfb582249089d03c5fc486cc0d0589..8e0a071c0292994a62d19ce43e07039dd6498806 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws161
+EXTRA_VERSION=claws162

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/summaryview.c b/src/summaryview.c
index 1c6e9c3ccb73e7f0d8b18ba309ead9a203287d02..45cfa27b1d587e09cdced5ee11c9e5beb1fa6e5d 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2988,19 +2988,13 @@ static void summary_delete_duplicated_func(GtkCTree *ctree, GtkCTreeNode *node,
 {
        GtkCTreeNode *found;
        MsgInfo *msginfo = GTK_CTREE_ROW(node)->row.data;
 {
        GtkCTreeNode *found;
        MsgInfo *msginfo = GTK_CTREE_ROW(node)->row.data;

-       MsgInfo *dup_msginfo;
-       
+

        if (!msginfo->msgid || !*msginfo->msgid) return;
 
        found = g_hash_table_lookup(summaryview->msgid_table, msginfo->msgid);
        if (!msginfo->msgid || !*msginfo->msgid) return;
 
        found = g_hash_table_lookup(summaryview->msgid_table, msginfo->msgid);

-       
-       if (found && found != node) {
-               dup_msginfo = gtk_ctree_node_get_row_data(ctree, found);
-               /* prefer to delete the unread one */
-               if ((MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_UNREAD(dup_msginfo->flags))
-               ||  (MSG_IS_UNREAD(msginfo->flags) == MSG_IS_UNREAD(dup_msginfo->flags)))
-                       summary_delete_row(summaryview, node);
-       }
+
+       if (found && found != node)
+               summary_delete_row(summaryview, node);

 }
 
 static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
 }
 
 static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)