From: Colin Leroy <colin@colino.net>
Date: Tue, 4 Oct 2005 07:20:17 +0000 (+0000)
Subject: 2005-10-04 [colin]	1.9.15cvs6
X-Git-Tag: rel_1_9_99~133
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=d6f1575b112ba0cd226cf40570dc56a5f4362928

2005-10-04 [colin]	1.9.15cvs6

	* src/folder.c
	* src/folderview.c
	* src/summaryview.c
		Better fix (don't break mark all read) for cvs2
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 618a30d39..42091f4e3 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2005-10-04 [colin]	1.9.15cvs6
+
+	* src/folder.c
+	* src/folderview.c
+	* src/summaryview.c
+		Better fix (don't break mark all read) for cvs2
+
 2005-10-03 [colin]	1.9.15cvs5
 
 	* src/folder.c
diff --git a/PATCHSETS b/PATCHSETS
index c156f0ecf..17f9c6fbd 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -842,3 +842,4 @@
 ( cvs diff -u -r 1.17.2.20 -r 1.17.2.21 src/send_message.c;  ) > 1.9.15cvs3.patchset
 ( cvs diff -u -r 1.149.2.36 -r 1.149.2.37 src/inc.c;  cvs diff -u -r 1.105.2.36 -r 1.105.2.37 src/prefs_account.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/wizard.c;  ) > 1.9.15cvs4.patchset
 ( cvs diff -u -r 1.213.2.58 -r 1.213.2.59 src/folder.c;  ) > 1.9.15cvs5.patchset
+( cvs diff -u -r 1.213.2.59 -r 1.213.2.60 src/folder.c;  cvs diff -u -r 1.207.2.65 -r 1.207.2.66 src/folderview.c;  cvs diff -u -r 1.395.2.129 -r 1.395.2.130 src/summaryview.c;  ) > 1.9.15cvs6.patchset
diff --git a/configure.ac b/configure.ac
index 8a71dc00d..56a8a987b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=5
+EXTRA_VERSION=6
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/folder.c b/src/folder.c
index acc65cdc8..7b136962e 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -51,7 +51,6 @@
 #include "remotefolder.h"
 #include "partial_download.h"
 #include "statusbar.h"
-#include "summaryview.h"
 
 /* Dependecies to be removed ?! */
 #include "prefs_common.h"
@@ -1496,8 +1495,6 @@ gint folder_item_close(FolderItem *item)
 	g_return_val_if_fail(item != NULL, -1);
 	g_return_val_if_fail(item->no_select == FALSE, -1);
 
-	summary_lock(mainwindow_get_mainwindow()->summaryview);
-
 	if (item->new_msgs) {
 		folder_item_update_freeze();
 		mlist = folder_item_get_msg_list(item);
@@ -1517,8 +1514,6 @@ gint folder_item_close(FolderItem *item)
 	
 	folder_item_update(item, F_ITEM_UPDATE_MSGCNT);
 
-	summary_unlock(mainwindow_get_mainwindow()->summaryview);
-	
 	item->opened = FALSE;
 	folder = item->folder;
 
diff --git a/src/folderview.c b/src/folderview.c
index 001163b77..0ce82f4de 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1803,6 +1803,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 		if (olditem) {
 			/* will be null if we just moved the previously opened folder */
 			summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
+			summary_show(folderview->summaryview, NULL);
 			folder_item_close(olditem);
 		}
 	}
diff --git a/src/summaryview.c b/src/summaryview.c
index 84dfc837b..b286eab07 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -5518,11 +5518,10 @@ static gboolean summary_update_msg(gpointer source, gpointer data)
 	g_return_val_if_fail(msginfo_update != NULL, TRUE);
 	g_return_val_if_fail(summaryview != NULL, FALSE);
 
-	if (summary_is_locked(summaryview))
-		return FALSE;
-
 	if (msginfo_update->flags & MSGINFO_UPDATE_FLAGS) {
-		node = gtk_ctree_find_by_row_data(GTK_CTREE(summaryview->ctree), NULL, msginfo_update->msginfo);
+		node = gtk_ctree_find_by_row_data(
+				GTK_CTREE(summaryview->ctree), NULL, 
+				msginfo_update->msginfo);
 
 		if (node) 
 			summary_set_row_marks(summaryview, node);