2004-10-03 [colin] 0.9.12cvs119.2

	* src/gtk/gtksctree.c
		Revert 608 fix that doesn't work that good

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 0191cbf9e8bd3a346442a2f22d0ff70558055311..58212884f0288182c83733d0055bad2ac22d0682 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-10-03 [colin]     0.9.12cvs119.2
+
+       * src/gtk/gtksctree.c
+               Revert 608 fix that doesn't work that good
+

 2004-10-02 [colin]     0.9.12cvs119.1
 
        * src/mainwindow.c
 2004-10-02 [colin]     0.9.12cvs119.1
 
        * src/mainwindow.c

diff --git a/PATCHSETS b/PATCHSETS
index 5747f9d36f95ebf8967030e47a3d2e5e6e062e14..fab8d5d6637b59b53cffe0b7bdef8ce18844b6a7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -189,3 +189,4 @@
 ( cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/gtk/gtksctree.c; ) > 0.9.12cvs117.2.patchset
 ( cvs diff -u -r 1.83.2.20 -r 1.83.2.21 src/mimeview.c; ) > 0.9.12cvs118.1.patchset
 ( cvs diff -u -r 1.274.2.20 -r 1.274.2.21 src/mainwindow.c; cvs diff -u -r 1.94.2.30 -r 1.94.2.31 src/messageview.c; cvs diff -u -r 1.103.2.9 -r 1.103.2.10 src/prefs_common.h; cvs diff -u -r 1.49.2.8 -r 1.49.2.9 src/procmime.c; cvs diff -u -r 1.17.2.3 -r 1.17.2.4 src/procmime.h; cvs diff -u -r 1.96.2.18 -r 1.96.2.19 src/textview.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/gtksctree.c; ) > 0.9.12cvs119.1.patchset
 ( cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/gtk/gtksctree.c; ) > 0.9.12cvs117.2.patchset
 ( cvs diff -u -r 1.83.2.20 -r 1.83.2.21 src/mimeview.c; ) > 0.9.12cvs118.1.patchset
 ( cvs diff -u -r 1.274.2.20 -r 1.274.2.21 src/mainwindow.c; cvs diff -u -r 1.94.2.30 -r 1.94.2.31 src/messageview.c; cvs diff -u -r 1.103.2.9 -r 1.103.2.10 src/prefs_common.h; cvs diff -u -r 1.49.2.8 -r 1.49.2.9 src/procmime.c; cvs diff -u -r 1.17.2.3 -r 1.17.2.4 src/procmime.h; cvs diff -u -r 1.96.2.18 -r 1.96.2.19 src/textview.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/gtksctree.c; ) > 0.9.12cvs119.1.patchset

+( cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/gtk/gtksctree.c; ) > 0.9.12cvs119.2.patchset

diff --git a/configure.ac b/configure.ac
index 2007693a1bdcbd9e5d23b324daf18804b3cc4e68..1984b5a7dd29b0a1b29d76306bf83dc2f5e67398 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=119
 EXTRA_RELEASE=
 BINARY_AGE=0
 EXTRA_VERSION=119
 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}
 
 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/gtk/gtksctree.c b/src/gtk/gtksctree.c
index 445a4b648ba6f6da7b2dc16949315dbe27fb2a39..1acfc2f18e69bfcff0b83e5e386deedb366374df 100644 (file)
--- a/src/gtk/gtksctree.c
+++ b/src/gtk/gtksctree.c
@@ -233,10 +233,7 @@ select_row (GtkSCTree *sctree, gint row, gint col, guint state)
                   (GTK_CLIST(sctree)->selection_mode != GTK_SELECTION_SINGLE) &&
                   (GTK_CLIST(sctree)->selection_mode != GTK_SELECTION_BROWSE);
 
                   (GTK_CLIST(sctree)->selection_mode != GTK_SELECTION_SINGLE) &&
                   (GTK_CLIST(sctree)->selection_mode != GTK_SELECTION_BROWSE);
 

-       if (additive || range)
-               gtk_clist_freeze (GTK_CLIST (sctree));
-
-       GTK_CLIST(sctree)->focus_row = row;
+       gtk_clist_freeze (GTK_CLIST (sctree));

 
        if (!additive && GTK_CLIST(sctree)->selection)
                gtk_clist_unselect_all (GTK_CLIST (sctree));
 
        if (!additive && GTK_CLIST(sctree)->selection)
                gtk_clist_unselect_all (GTK_CLIST (sctree));


@@ -264,8 +261,8 @@ select_row (GtkSCTree *sctree, gint row, gint col, guint state)
                select_range (sctree, row);
        
        GTK_CLIST_GET_CLASS(sctree)->refresh(GTK_CLIST(sctree));
                select_range (sctree, row);
        
        GTK_CLIST_GET_CLASS(sctree)->refresh(GTK_CLIST(sctree));

-       if (additive || range)
-               gtk_clist_thaw (GTK_CLIST (sctree));
+
+       gtk_clist_thaw (GTK_CLIST (sctree));

 }
 
 /* Our handler for button_press events.  We override all of GtkCList's broken
 }
 
 /* Our handler for button_press events.  We override all of GtkCList's broken