* src/mainwindow.c

	fix regression caused by fix for invalid bug #7
	(should fix #246, "Multiple selections are deselected when
	moving from search window to main window")

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 55e766465d7b0c1e50af38a4920d39c3c3ca0846..f1ce75c467b8338f5a1a877450dc0224a15f6dea 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2003-04-14 [alfons]    0.9.5claws11
+
+       * src/mainwindow.c
+               fix regression caused by fix for invalid bug #7
+               (should fix #246, "Multiple selections are deselected when 
+               moving from search window to main window")
+               
 2003-09-14 [alfons]    0.9.5claws10
        
        * src/actions.[ch]

diff --git a/configure.ac b/configure.ac
index 093255986e59ee8489772cd0b4381b719bb1ce3b..c2ec18cff8ba190f2f90b5a0970a37ec7c1ee038 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=10
+EXTRA_VERSION=11
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 17be476a2304ac800156e5bce3fe7919e587daf5..54df72299712a1340bfee2ca545b3dae3538dc2d 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2799,6 +2799,11 @@ static gboolean mainwindow_focus_in_event(GtkWidget *widget, GdkEventFocus *focu
        g_return_val_if_fail(data, FALSE);
        summary = ((MainWindow *)data)->summaryview;
        g_return_val_if_fail(summary, FALSE);
+
+       if (GTK_CLIST(summary->ctree)->selection && 
+           g_list_length(GTK_CLIST(summary->ctree)->selection) > 1)
+               return FALSE;
+
        if (summary->selected != summary->displayed)
                summary_select_node(summary, summary->displayed, FALSE, TRUE);
        return FALSE;