* src/foldersel.c

	folder view in folder selection dialog reflects state of
	folder view in main window

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8d9935617bf2c435ed60051cd812c4673f3ef54c..ee1bfd77a3776273a632fa236a1bdc0a39742447 100644 (file)
--- 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 7b5205ebe6c2aaf263ece202f05ba981400ad69c..e921550a8e9e90cfb5c6b5f4bb4742ef42304813 100644 (file)
--- 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 6ed0c0ddcd9d7d3ea05b53da797cb72a7849b267..9e069ea96626a6d20bd5d9ba8b9704f0f8528577 100644 (file)
--- 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) \