Revert too-soon integration of a feature planned for 0.8.6
authorColin Leroy <colin@colino.net>
Sun, 17 Nov 2002 09:36:23 +0000 (09:36 +0000)
committerColin Leroy <colin@colino.net>
Sun, 17 Nov 2002 09:36:23 +0000 (09:36 +0000)
(Sorry to have sent you this in an unrelated patch, Christoph...)

ChangeLog.claws
configure.in
src/summaryview.c

index f16f726..e7cc0fd 100644 (file)
@@ -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
index 6491057..8e0a071 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 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
index 1c6e9c3..45cfa27 100644 (file)
@@ -2988,19 +2988,13 @@ static void summary_delete_duplicated_func(GtkCTree *ctree, GtkCTreeNode *node,
 {
        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 (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)