2008-11-30 [paul] 3.6.1cvs54
authorPaul Mangan <paul@claws-mail.org>
Sun, 30 Nov 2008 04:10:43 +0000 (04:10 +0000)
committerPaul Mangan <paul@claws-mail.org>
Sun, 30 Nov 2008 04:10:43 +0000 (04:10 +0000)
* src/prefs_other.c
move Other/ page to Other/Miscellaneous
* src/gtk/prefswindow.c
make parent page unselectable

ChangeLog
PATCHSETS
configure.ac
src/gtk/prefswindow.c
src/prefs_other.c

index d7a27f0..a46e910 100644 (file)
--- 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
index af8da6b..faf48d3 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index edd0925..246ac6a 100644 (file)
@@ -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=
 
index 46d9562..292daed 100644 (file)
@@ -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;
index 7756863..4d023de 100644 (file)
@@ -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;