2005-02-26 [colin] 1.0.1cvs19.2

	* src/summaryview.c
		Fix 'mark all read' with collapsed threads.
		Patch by Alfons.

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index c0054c8b996be7d2c79794f0e3eaca515c3f1a26..167a3a438d968b192bb5ef4d5cd6d141b2b92bb8 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-02-26 [colin]     1.0.1cvs19.2
+
+       * src/summaryview.c
+               Fix 'mark all read' with collapsed threads.
+               Patch by Alfons.
+
 2005-02-25 [paul]      1.0.1cvs19.1
 
        * ChangeLog.claws

diff --git a/PATCHSETS b/PATCHSETS
index 611ee274812c6c5f67a2f86e082391303e61fb54..bc4b6c755e3caf14f2ea488847794412a19dc45e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -402,3 +402,4 @@
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpmime/passphrase.c; ) > 1.0.1cvs15.11.patchset
 ( cvs diff -u -r 1.17.2.11 -r 1.17.2.12 src/alertpanel.c; cvs diff -u -r 1.65.2.24 -r 1.65.2.25 src/codeconv.c; cvs diff -u -r 1.382.2.107 -r 1.382.2.108 src/compose.c; cvs diff -u -r 1.96.2.48 -r 1.96.2.49 src/textview.c; cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/gtk/gtkutils.h; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/logwindow.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/progressdialog.c; ) > 1.0.1cvs15.12.patchset
 ( cvs diff -u -r 1.2504.2.49 -r 1.2504.2.50 ChangeLog.claws; cvs diff -u -r 1.654.2.437 -r 1.654.2.438 configure.ac; cvs diff -u -r 1.105.2.17 -r 1.105.2.18 src/prefs_account.c; cvs diff -u -r 1.52.2.9 -r 1.52.2.10 src/prefs_folder_item.c; cvs diff -u -r 1.12.2.16 -r 1.12.2.17 src/gtk/prefswindow.c; cvs diff -u -r 1.7.2.2 -r 1.7.2.3 src/gtk/prefswindow.h; ) > 1.0.1cvs19.1.patchset
+( cvs diff -u -r 1.395.2.57 -r 1.395.2.58 src/summaryview.c; ) > 1.0.1cvs19.2.patchset

diff --git a/configure.ac b/configure.ac
index b247eccdbb915fb703f19a8ac5b895d20199c061..01bf80f2c9b0d9febd0cfc9eec76448d7265d5eb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=19
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.1
+EXTRA_GTK2_VERSION=.2
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/summaryview.c b/src/summaryview.c
index 9b3d63ce85b5d76fd64069e1deeb8b44d750ce7a..3dedb84016c5e51b6ad5c57b000567d1d8d7a4a2 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2849,6 +2849,11 @@ void summary_mark_all_read(SummaryView *summaryview)
        for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
             node = gtkut_ctree_node_next(ctree, node))
                summary_mark_row_as_read(summaryview, node);
+       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
+            node = gtkut_ctree_node_next(ctree, node)) {
+               if (!GTK_CTREE_ROW(node)->expanded)
+                       summary_set_row_marks(summaryview, node);
+       }
        folder_item_update_thaw();
        gtk_clist_thaw(clist);