From: Paul Mangan Date: Fri, 28 Sep 2007 09:32:04 +0000 (+0000) Subject: 2007-09-28 [paul] 3.0.1cvs37 X-Git-Tag: rel_3_1_0~175 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=0c461b6087f13e054c07ed40760346d9af5acdb7;ds=sidebyside 2007-09-28 [paul] 3.0.1cvs37 * src/prefs_folder_item.c give the orphans a parent. makes all prefs pages visible on maemo --- diff --git a/ChangeLog b/ChangeLog index e92dbbc0e..8b9ef8ebf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-09-28 [paul] 3.0.1cvs37 + + * src/prefs_folder_item.c + give the orphans a parent. makes all prefs + pages visible on maemo + 2007-09-28 [colin] 3.0.1cvs36 * src/prefs_folder_column.c diff --git a/PATCHSETS b/PATCHSETS index 5bd358387..34072791d 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2900,3 +2900,4 @@ ( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 manual/account.xml; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 manual/plugins.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/es/account.xml; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 manual/es/advanced.xml; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/es/claws-mail-manual.xml; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/es/glossary.xml; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/es/gpl.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/es/keyboard.xml; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/es/plugins.xml; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 manual/fr/plugins.xml; ) > 3.0.1cvs34.patchset ( cvs diff -u -r 1.1.2.77 -r 1.1.2.78 src/gtk/quicksearch.c; ) > 3.0.1cvs35.patchset ( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/prefs_folder_column.c; cvs diff -u -r 1.10.2.20 -r 1.10.2.21 src/prefs_summary_column.c; ) > 3.0.1cvs36.patchset +( cvs diff -u -r 1.52.2.51 -r 1.52.2.52 src/prefs_folder_item.c; ) > 3.0.1cvs37.patchset diff --git a/configure.ac b/configure.ac index 7022df66c..189d9c281 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=36 +EXTRA_VERSION=37 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c index bcd7d4587..400676d50 100644 --- a/src/prefs_folder_item.c +++ b/src/prefs_folder_item.c @@ -1495,11 +1495,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; @@ -1512,11 +1513,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; @@ -1528,11 +1530,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;