2006-09-03 [colin] 2.4.0cvs138

	* src/folderview.c
		Fix bug #1007 (Wrong folder highlighted)

diff --git a/ChangeLog b/ChangeLog
index ba8c788b380556c664cdb890a1795c7785bba42f..48be764c68f2101a89bbb172cbf048a2a62122cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-03 [colin]     2.4.0cvs138
+
+       * src/folderview.c
+               Fix bug #1007 (Wrong folder highlighted)
+
 2006-09-03 [colin]     2.4.0cvs137
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index ca432e17a6a0c3c6e3eb6ec35205b503e077e397..5945c727c45be1ae7f7a89a273a20aa794e83373 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1829,3 +1829,4 @@
 ( cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/prefs_summaries.c;  ) > 2.4.0cvs135.patchset
 ( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/prefs_other.c;  cvs diff -u -r 1.5.2.25 -r 1.5.2.26 src/prefs_spelling.c;  ) > 2.4.0cvs136.patchset
 ( cvs diff -u -r 1.382.2.305 -r 1.382.2.306 src/compose.c;  ) > 2.4.0cvs137.patchset
+( cvs diff -u -r 1.207.2.118 -r 1.207.2.119 src/folderview.c;  ) > 2.4.0cvs138.patchset

diff --git a/configure.ac b/configure.ac
index 9be92d7a610c914c81c5083bc332fc38c5518beb..2464cc0d2c8065cb4d46714b1660cad7e6449349 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=137
+EXTRA_VERSION=138
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index 4ab941e1de989222794dc750805c0b4dd81e677d..f221da499b1abef0d2c44580eed1bc79ecfaab31 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -786,6 +786,10 @@ static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
 
        g_return_if_fail(node != NULL);
 
+       if (folderview->open_folder) {
+               return;
+       }
+
        folderview->open_folder = TRUE;
        gtkut_ctree_set_focus_row(ctree, node);
        gtk_ctree_select(ctree, node);