From: Colin Leroy <colin@colino.net>
Date: Sat, 12 Oct 2002 10:16:01 +0000 (+0000)
Subject: fix a bug after "check for new messages"; remove unnecessary check
X-Git-Tag: w0-1~143
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=af584950d26f42baf1ce8624b9fac46b083e5a89;hp=54438953f3d39511cae9ea6d3589301caa6463cf

fix a bug after "check for new messages"; remove unnecessary check
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index cb4faf720..d93e7a3bc 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,12 @@
+2002-10-12 [colin]	0.8.5claws22
+
+	* src/folderview.c
+		Fix a bug after "Check for new messages":
+		If a folder was opened, it was still selected at
+		the end of the check, but displayed empty.
+	* src/mainwindow.c
+		Remove unnecessary check
+
 2002-10-12 [paul]
 
 	* tools/README
diff --git a/configure.in b/configure.in
index cde758545..e01cff201 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws21
+EXTRA_VERSION=claws22
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/folderview.c b/src/folderview.c
index 96cc5f337..59ebec08c 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1840,6 +1840,12 @@ static void folderview_update_tree_cb(FolderView *folderview, guint action,
 		folderview_check_new(item->folder);
 	else
 		folderview_rescan_tree(item->folder);
+	
+	if (folderview->opened) {
+		item = gtk_ctree_node_get_row_data(ctree, folderview->opened);
+		if (item)
+			folderview_update_item(item, TRUE);
+	}
 }
 
 static void folderview_new_folder_cb(FolderView *folderview, guint action,
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 4990cdc8e..076640f43 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -3564,8 +3564,7 @@ static void key_pressed (GtkWidget *widget, GdkEventKey *event,	gpointer data)
 		app_exit_cb(mainwin, 0, NULL);
 		return;
 	case GDK_space:
-		if (mainwin->folderview && mainwin->summaryview 
-		    && !mainwin->folderview->opened) {
+		if (mainwin->folderview && mainwin->summaryview ) {
 			summary_lock(mainwin->summaryview);
 			folderview_select_next_unread(mainwin->folderview);
 			summary_unlock(mainwin->summaryview);