talons

commit 93909397d7d869c53985364cf4376445ccdd2cfc
parent 9b00d24183a7ad06b4ddfafa65f59d8683a9d2b3
Author: Paul Mangan <paul@claws-mail.org>
Date:   Sun, 30 Nov 2008 04:10:43 +0000

2008-11-30 [paul]	3.6.1cvs54

	* src/prefs_other.c
		move Other/ page to Other/Miscellaneous
	* src/gtk/prefswindow.c
		make parent page unselectable

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

5 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-30 [paul]	3.6.1cvs54
+
+	* src/prefs_other.c
+		move Other/ page to Other/Miscellaneous
+	* src/gtk/prefswindow.c
+		make parent page unselectable
+
 2008-11-29 [paul]	3.6.1cvs53
 
 	* README
diff --git a/PATCHSETS b/PATCHSETS
@@ -3635,3 +3635,4 @@
 ( cvs diff -u -r 1.42.2.43 -r 1.42.2.44 po/fr.po;  ) > 3.6.1cvs51.patchset
 ( cvs diff -u -r 1.83.2.148 -r 1.83.2.149 src/mimeview.c;  ) > 3.6.1cvs52.patchset
 ( cvs diff -u -r 1.8.2.52 -r 1.8.2.53 README;  cvs diff -u -r 1.1.2.51 -r 1.1.2.52 manual/advanced.xml;  ) > 3.6.1cvs53.patchset
+( cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/prefs_other.c;  cvs diff -u -r 1.12.2.48 -r 1.12.2.49 src/gtk/prefswindow.c;  ) > 3.6.1cvs54.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=53
+EXTRA_VERSION=54
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
@@ -690,6 +690,8 @@ static gboolean prefswindow_row_selected(GtkTreeSelection *selector,
 	GtkTreeIter iter;
 	GtkAdjustment *adj;
 
+	if (gtk_tree_path_get_depth(path) < 2)
+		return FALSE;
 #ifndef GENERIC_UMPC
 	if (currently_selected) 
 		return TRUE;
diff --git a/src/prefs_other.c b/src/prefs_other.c
@@ -646,10 +646,11 @@ OtherPage *prefs_other;
 void prefs_other_init(void)
 {
 	OtherPage *page;
-	static gchar *path[2];
+	static gchar *path[3];
 
 	path[0] = _("Other");
-	path[1] = NULL;
+	path[1] = _("Miscellaneous");
+	path[2] = NULL;
 
 	page = g_new0(OtherPage, 1);
 	page->page.path = path;