From 2073a7f24147e02204209f9ca336bee4114d31cd Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Mon, 1 Oct 2007 16:53:41 +0000 Subject: [PATCH] 2007-10-01 [colin] 3.0.1cvs11-stable * src/prefs_folder_item.c From 3.0.1cvs37 give the orphans a parent. makes all prefs pages visible on maemo --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/prefs_folder_item.c | 21 ++++++++++++--------- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9066a8ad4..91be9fe2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-10-01 [colin] 3.0.1cvs11-stable + + * src/prefs_folder_item.c + From 3.0.1cvs37 + give the orphans a parent. makes all prefs + pages visible on maemo + 2007-10-01 [colin] 3.0.1cvs10-stable * src/gtk/quicksearch.c diff --git a/PATCHSETS b/PATCHSETS index f84912f4a..671d78548 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2868,3 +2868,4 @@ ( cvs diff -u -r 1.1.2.76 -r 1.1.2.77 src/gtk/quicksearch.c; ) > 3.0.1cvs8-stable.patchset ( cvs diff -u -r 1.149.2.80.2.2 -r 1.149.2.80.2.3 src/inc.c; ) > 3.0.1cvs9-stable.patchset ( cvs diff -u -r 1.1.2.76.2.1 -r 1.1.2.76.2.2 src/gtk/quicksearch.c; ) > 3.0.1cvs10-stable.patchset +( cvs diff -u -r 1.52.2.48 -r 1.52.2.49 src/prefs_folder_item.c; ) > 3.0.1cvs11-stable.patchset diff --git a/configure.ac b/configure.ac index 26791da9b..a5fdc70e0 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=10 +EXTRA_VERSION=11 EXTRA_RELEASE= EXTRA_GTK2_VERSION=-stable diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c index ca660e264..157a8d785 100644 --- a/src/prefs_folder_item.c +++ b/src/prefs_folder_item.c @@ -1505,11 +1505,12 @@ static void folder_regexp_set_subject_example_cb(GtkWidget *widget, gpointer dat static void register_general_page() { - static gchar *pfi_general_path[2]; + static gchar *pfi_general_path[3]; static FolderItemGeneralPage folder_item_general_page; - pfi_general_path[0] = _("General"); - pfi_general_path[1] = NULL; + pfi_general_path[0] = _("Folder"); + pfi_general_path[1] = _("General"); + pfi_general_path[2] = NULL; folder_item_general_page.page.path = pfi_general_path; folder_item_general_page.page.create_widget = prefs_folder_item_general_create_widget_func; @@ -1522,11 +1523,12 @@ static void register_general_page() static void register_compose_page(void) { - static gchar *pfi_compose_path[2]; + static gchar *pfi_compose_path[3]; static FolderItemComposePage folder_item_compose_page; - pfi_compose_path[0] = _("Compose"); - pfi_compose_path[1] = NULL; + pfi_compose_path[0] = _("Folder"); + pfi_compose_path[1] = _("Compose"); + pfi_compose_path[2] = NULL; folder_item_compose_page.page.path = pfi_compose_path; folder_item_compose_page.page.create_widget = prefs_folder_item_compose_create_widget_func; @@ -1538,11 +1540,12 @@ static void register_compose_page(void) static void register_templates_page(void) { - static gchar *pfi_templates_path[2]; + static gchar *pfi_templates_path[3]; static FolderItemTemplatesPage folder_item_templates_page; - pfi_templates_path[0] = _("Templates"); - pfi_templates_path[1] = NULL; + pfi_templates_path[0] = _("Folder"); + pfi_templates_path[1] = _("Templates"); + pfi_templates_path[2] = NULL; folder_item_templates_page.page.path = pfi_templates_path; folder_item_templates_page.page.create_widget = prefs_folder_item_templates_create_widget_func; -- 2.11.4.GIT