2004-10-04 [colin] 0.9.12cvs121.1

	* src/summaryview.c
		Sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 7f9f24c76f09c3caab54d6ebc3603ea43b54b8a8..d4eb965ce8da2f39a23cea6ad0d59e3afcfafef1 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-10-04 [colin]     0.9.12cvs121.1
+
+       * src/summaryview.c
+               Sync with HEAD
+
 2004-10-04 [paul]      0.9.12cvs120.1
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index 0706679aaa4ad6b685eada51e5fbf9664dcb20fe..b83e06d6d8320ff9ee91cf7cb4a35e7479a05c18 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -192,3 +192,4 @@
 ( cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/gtk/gtksctree.c; ) > 0.9.12cvs119.2.patchset
 ( cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/gtksctree.c; cvs diff -u -r 1.395.2.33 -r 1.395.2.34 src/summaryview.c; ) > 0.9.12cvs119.3.patchset
 ( cvs diff -u -r 1.654.2.225 -r 1.654.2.226 configure.ac; ) > 0.9.12cvs120.1.patchset
+( cvs diff -u -r 1.395.2.34 -r 1.395.2.35 src/summaryview.c; ) > 0.9.12cvs121.1.patchset

diff --git a/configure.ac b/configure.ac
index 65c815dfdc50f5993c57fa9cd778ece044111c94..f5b3316f0a9c277574cb020a6e0388dcb51e0292 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=120
+EXTRA_VERSION=121
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/summaryview.c b/src/summaryview.c
index e5928fb0056540c3dbef3ff5a59e3bb7f70b30c0..ce4bbdefb4da9ae366a23a2d1d34cdf1e8bf9d01 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3644,7 +3644,6 @@ void summary_thread_build(SummaryView *summaryview)
 
                if (parent && parent != node) {
                        gtk_ctree_move(ctree, node, parent, NULL);
-                       gtk_ctree_expand(ctree, node);
                }
 
                node = next;
@@ -3654,8 +3653,6 @@ void summary_thread_build(SummaryView *summaryview)
 
        while (node) {
                next = GTK_CTREE_NODE_NEXT(node);
-               if (!summaryview->thread_collapsed)
-                       gtk_ctree_expand(ctree, node);
                if (prefs_common.bold_unread &&
                    GTK_CTREE_ROW(node)->children)
                        summary_set_row_marks(summaryview, node);