2006-09-26 [colin] 2.5.1cvs2

	* src/summaryview.c
		Fix bug #1023 (Sylpheed deletes too much messages)

diff --git a/ChangeLog b/ChangeLog
index 0c57a427d6355c6ec35091854e18fcd717f4d3a6..4b1fd97cf969327ee93667a30bf8520b4f54f4ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-26 [colin]     2.5.1cvs2
+
+       * src/summaryview.c
+               Fix bug #1023 (Sylpheed deletes too much messages)
+
 2006-09-26 [ticho]     2.5.1cvs1
 
        * src/mbox.c

diff --git a/PATCHSETS b/PATCHSETS
index f432e55332ec68a268001c9ce2ea6f36909b2c97..f68dd7da91bafe58c4d446d916d238b8d3b8dcdc 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1910,3 +1910,4 @@
 ( cvs diff -u -r 1.179.2.131 -r 1.179.2.132 src/imap.c;  cvs diff -u -r 1.1.4.51 -r 1.1.4.52 src/etpan/imap-thread.c;  ) > 2.5.0cvs2.patchset
 ( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.13.2.24 -r 1.13.2.25 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.18.2.41 -r 1.18.2.42 src/plugins/spamassassin/spamassassin.c;  ) > 2.5.0cvs3.patchset
 ( cvs diff -u -r 1.28.2.26 -r 1.28.2.27 src/mbox.c;  ) > 2.5.1cvs1.patchset
+( cvs diff -u -r 1.395.2.254 -r 1.395.2.255 src/summaryview.c;  ) > 2.5.1cvs2.patchset

diff --git a/configure.ac b/configure.ac
index bf67aca5adca65798a26db7c344708fbb7eef665..0f3b86b8cd06169940bd792bf48821a390ea6890 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=1
+EXTRA_VERSION=2
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/summaryview.c b/src/summaryview.c
index 7135d3f106d0be10592cb501bec99ab1ed01e932..b8532cd516a811924c834312100452ff23c4c3b2 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -5297,7 +5297,7 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                                g_list_length(GTK_CLIST(ctree)->row_list)-1);
                        if (next) {
                                gtk_sctree_select_with_state
-                                       (GTK_SCTREE(ctree), next, event->state);
+                                       (GTK_SCTREE(ctree), next, (event->state & ~GDK_CONTROL_MASK) );
 
                                /* Deprecated - what are the non-deprecated equivalents? */
                                if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL)