From 5cf47392a1be8973d08afa9a6ebc9a5d1402b08e Mon Sep 17 00:00:00 2001
From: Alfons Hoogervorst <alfons@proteus.demon.nl>
Date: Mon, 21 Oct 2002 21:00:51 +0000
Subject: [PATCH] * src/foldersel.c 	folder view in folder selection dialog
 reflects state of 	folder view in main window

---
 ChangeLog.claws | 6 ++++++
 configure.in    | 2 +-
 src/foldersel.c | 6 ++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8d9935617..ee1bfd77a 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-10-21 [alfons]	0.8.5claws48
+
+	* src/foldersel.c
+		folder view in folder selection dialog reflects state of
+		folder view in main window
+
 2002-10-18 [alfons]	0.8.5claws47
 
 	* src/mbox.c
diff --git a/configure.in b/configure.in
index 7b5205ebe..e921550a8 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=claws47
+EXTRA_VERSION=claws48
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/foldersel.c b/src/foldersel.c
index 6ed0c0ddc..9e069ea96 100644
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -266,8 +266,10 @@ static gboolean foldersel_gnode_func(GtkCTree *ctree, guint depth,
 static void foldersel_expand_func(GtkCTree *ctree, GtkCTreeNode *node,
 				  gpointer data)
 {
-	if (GTK_CTREE_ROW(node)->children)
-		gtk_ctree_expand(ctree, node);
+	FolderItem *item = gtk_ctree_node_get_row_data(ctree, node);
+
+	if (item && GTK_CTREE_ROW(node)->children && !item->collapsed) 
+			gtk_ctree_expand(ctree, node);
 }
 
 #define SET_SPECIAL_FOLDER(item) \
-- 
2.25.1