commit dd1eb1bd05aaa6e8cc07701630f8206204ab5206
parent 123d26deb9ce491a923329d3b1a8f379b52ce6ef
Author: Andrej Kacian <ticho@claws-mail.org>
Date: Tue, 20 Nov 2012 17:01:29 +0000
2012-11-20 [ticho] 3.9.0cvs15
* src/prefs_folder_item.c
Remove useless "Folder" root in page index of folder preferences UI.
Diffstat:
4 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-20 [ticho] 3.9.0cvs15
+
+ * src/prefs_folder_item.c
+ Remove useless "Folder" root in page index of folder preferences UI.
+
2012-11-18 [colin] 3.9.0cvs14
* AUTHORS
diff --git a/PATCHSETS b/PATCHSETS
@@ -4512,3 +4512,4 @@
( cvs diff -u -r 1.21.2.9 -r 1.21.2.10 po/bg.po; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 po/ca.po; cvs diff -u -r 1.9.2.26 -r 1.9.2.27 po/cs.po; cvs diff -u -r 1.58.2.52 -r 1.58.2.53 po/de.po; cvs diff -u -r 1.12.2.18 -r 1.12.2.19 po/en_GB.po; cvs diff -u -r 1.60.2.66 -r 1.60.2.67 po/es.po; cvs diff -u -r 1.1.2.29 -r 1.1.2.30 po/fi.po; cvs diff -u -r 1.42.2.59 -r 1.42.2.60 po/fr.po; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 po/he.po; cvs diff -u -r 1.5.2.23 -r 1.5.2.24 po/hu.po; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 po/id_ID.po; cvs diff -u -r 1.34.2.30 -r 1.34.2.31 po/it.po; cvs diff -u -r 1.16.2.12 -r 1.16.2.13 po/ja.po; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 po/lt.po; cvs diff -u -r 1.28.2.15 -r 1.28.2.16 po/nl.po; cvs diff -u -r 1.10.2.18 -r 1.10.2.19 po/pl.po; cvs diff -u -r 1.50.2.45 -r 1.50.2.46 po/pt_BR.po; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 po/pt_PT.po; cvs diff -u -r 1.17.2.22 -r 1.17.2.23 po/ru.po; cvs diff -u -r 1.2.2.37 -r 1.2.2.38 po/sk.po; cvs diff -u -r 1.17.2.28 -r 1.17.2.29 po/sr.po; cvs diff -u -r 1.4.2.13 -r 1.4.2.14 po/sv.po; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 po/uk.po; cvs diff -u -r 1.5.2.31 -r 1.5.2.32 po/zh_CN.po; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 po/zh_TW.po; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 po/Makevars; ) > 3.9.0cvs12.patchset
( cvs diff -u -r 1.28.2.55 -r 1.28.2.56 src/mbox.c; ) > 3.9.0cvs13.patchset
( cvs diff -u -r 1.100.2.86 -r 1.100.2.87 AUTHORS; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/advsearch.c; cvs diff -u -r 1.75.2.78 -r 1.75.2.79 src/matcher.c; cvs diff -u -r 1.39.2.23 -r 1.39.2.24 src/matcher.h; cvs diff -u -r 1.25.2.36 -r 1.25.2.37 src/matcher_parser_parse.y; cvs diff -u -r 1.43.2.99 -r 1.43.2.100 src/prefs_matcher.c; cvs diff -u -r 1.1.2.82 -r 1.1.2.83 src/gtk/authors.h; cvs diff -u -r 1.1.2.121 -r 1.1.2.122 src/gtk/quicksearch.c; ) > 3.9.0cvs14.patchset
+( cvs diff -u -r 1.52.2.91 -r 1.52.2.92 src/prefs_folder_item.c; ) > 3.9.0cvs15.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
@@ -1811,12 +1811,11 @@ static void folder_regexp_set_subject_example_cb(GtkWidget *widget, gpointer dat
#endif
static void register_general_page()
{
- static gchar *pfi_general_path[3];
+ static gchar *pfi_general_path[2];
static FolderItemGeneralPage folder_item_general_page;
- pfi_general_path[0] = _("Folder");
- pfi_general_path[1] = _("General");
- pfi_general_path[2] = NULL;
+ pfi_general_path[0] = _("General");
+ pfi_general_path[1] = NULL;
folder_item_general_page.page.path = pfi_general_path;
folder_item_general_page.page.create_widget = prefs_folder_item_general_create_widget_func;
@@ -1829,12 +1828,11 @@ static void register_general_page()
static void register_compose_page(void)
{
- static gchar *pfi_compose_path[3];
+ static gchar *pfi_compose_path[2];
static FolderItemComposePage folder_item_compose_page;
- pfi_compose_path[0] = _("Folder");
- pfi_compose_path[1] = _("Compose");
- pfi_compose_path[2] = NULL;
+ pfi_compose_path[0] = _("Compose");
+ pfi_compose_path[1] = NULL;
folder_item_compose_page.page.path = pfi_compose_path;
folder_item_compose_page.page.create_widget = prefs_folder_item_compose_create_widget_func;
@@ -1846,12 +1844,11 @@ static void register_compose_page(void)
static void register_templates_page(void)
{
- static gchar *pfi_templates_path[3];
+ static gchar *pfi_templates_path[2];
static FolderItemTemplatesPage folder_item_templates_page;
- pfi_templates_path[0] = _("Folder");
- pfi_templates_path[1] = _("Templates");
- pfi_templates_path[2] = NULL;
+ pfi_templates_path[0] = _("Templates");
+ pfi_templates_path[1] = NULL;
folder_item_templates_page.page.path = pfi_templates_path;
folder_item_templates_page.page.create_widget = prefs_folder_item_templates_create_widget_func;
