talons

commit 5c470182c53ab0ade4cb285f588adbb056ee9784
parent 3a2c2476bd8523bb15ce1b12756947bd79e46208
Author: Paul Mangan <paul@claws-mail.org>
Date:   Sat, 31 Jan 2009 15:09:14 +0000

2009-01-31 [paul]	3.7.0cvs50

	* src/gtk/prefswindow.c
		build prefs tree in a slightly smarter way -
		fix bug where if path[0] had same name as
		path[1], (like in the de translation), path[1]
		was lost and not shown in the window

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/prefswindow.c
 | 
2
+-

4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-31 [paul]	3.7.0cvs50
+
+	* src/gtk/prefswindow.c
+		build prefs tree in a slightly smarter way -
+		fix bug where if path[0] had same name as
+		path[1], (like in the de translation), path[1]
+		was lost and not shown in the window
+
 2009-01-31 [paul]	3.7.0cvs49
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3711,3 +3711,4 @@
 ( cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/prefs_compose_writing.c;  cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/prefs_message.c;  ) > 3.7.0cvs47.patchset
 ( cvs diff -u -r 1.395.2.405 -r 1.395.2.406 src/summaryview.c;  ) > 3.7.0cvs48.patchset
 ( cvs diff -u -r 1.382.2.496 -r 1.382.2.497 src/compose.c;  cvs diff -u -r 1.13.2.18 -r 1.13.2.19 src/undo.c;  ) > 3.7.0cvs49.patchset
+( cvs diff -u -r 1.12.2.51 -r 1.12.2.52 src/gtk/prefswindow.c;  ) > 3.7.0cvs50.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=49
+EXTRA_VERSION=50
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
@@ -337,7 +337,7 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
 			gtk_tree_model_foreach(GTK_TREE_MODEL(store), 
 					       (GtkTreeModelForeachFunc) find_node_by_name,
 					       &find_name);
-			if (find_name.found) {
+			if (find_name.found && page->path[i] != page->path[i-1]) {
 				node = find_name.node;
 				gtk_tree_model_get(GTK_TREE_MODEL(store), &node,
 						   PREFS_PAGE_DATA, &prefs_node,