2006-02-02 [paul] 2.0.0cvs9

	* src/mainwindow.c
		move global option 'Set displayed columns...' out
		of folder option grouping.
		fix sensitivity of 'harvest addresses'

diff --git a/ChangeLog b/ChangeLog
index 89939271497af6b97096f4edf3610c04528c4f27..50d91f97b2cc5bec299b444652a63a571698e17e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-02 [paul]      2.0.0cvs9
+
+       * src/mainwindow.c
+               move global option 'Set displayed columns...' out
+               of folder option grouping.
+               fix sensitivity of 'harvest addresses'
+
 2006-02-01 [colin]     2.0.0cvs8
 
        * src/mimeview.c

diff --git a/PATCHSETS b/PATCHSETS
index e9fd089b3e819f9bd44e1a64767057f1420abb58..b631cb2f1c3669f60885e3eabc717d07a210f577 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1192,3 +1192,4 @@
 ( cvs diff -u -r 1.83.2.59 -r 1.83.2.60 src/mimeview.c;  cvs diff -u -r 1.2.2.20 -r 1.2.2.21 src/gtk/filesel.c;  cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/filesel.h;  cvs diff -u -r 1.5.2.25 -r 1.5.2.26 src/gtk/pluginwindow.c;  ) > 2.0.0cvs6.patchset
 ( cvs diff -u -r 1.382.2.232 -r 1.382.2.233 src/compose.c;  cvs diff -u -r 1.105.2.47 -r 1.105.2.48 src/prefs_account.c;  cvs diff -u -r 1.204.2.73 -r 1.204.2.74 src/prefs_common.c;  cvs diff -u -r 1.9.2.21 -r 1.9.2.22 src/common/defs.h;  cvs diff -u -r 1.36.2.52 -r 1.36.2.53 src/common/utils.c;  cvs diff -u -r 1.20.2.30 -r 1.20.2.31 src/common/utils.h;  ) > 2.0.0cvs7.patchset
 ( cvs diff -u -r 1.83.2.60 -r 1.83.2.61 src/mimeview.c;  ) > 2.0.0cvs8.patchset
+( cvs diff -u -r 1.274.2.94 -r 1.274.2.95 src/mainwindow.c;  ) > 2.0.0cvs9.patchset

diff --git a/configure.ac b/configure.ac
index 18477e968b343bd91048276eb553fb479a3a8611..52d18aa24a693c7cbe9a278cf974f86792821ebf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=8
+EXTRA_VERSION=9
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 04f623b6e14210c871ffa083eded72c4bd9faf94..b5203d277f9b57549acdc9255d68657f965f05a6 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -502,6 +502,10 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Show or hide/Toolbar/Text below icons"},
        {N_("/_View/Show or hi_de/Status _bar"),
                                                NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
+       {N_("/_View/Set displayed _columns"),   NULL, NULL, 0, "<Branch>"},
+       {N_("/_View/Set displayed _columns/in _Folder list..."),        NULL, set_folder_display_item_cb, 0, NULL},
+       {N_("/_View/Set displayed _columns/in _Message list..."),NULL, set_summary_display_item_cb, 0, NULL},
+
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/Separate f_older tree"),    NULL, separate_widget_cb, SEPARATE_FOLDER, "<ToggleItem>"},
        {N_("/_View/Separate _message view"),   NULL, separate_widget_cb, SEPARATE_MESSAGE, "<ToggleItem>"},
@@ -532,9 +536,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/E_xpand all threads"),      NULL, expand_threads_cb, 0, NULL},
        {N_("/_View/Co_llapse all threads"),    NULL, collapse_threads_cb, 0, NULL},
        {N_("/_View/_Hide read messages"),      NULL, hide_read_messages, 0, "<ToggleItem>"},
-       {N_("/_View/Set displayed _columns"),   NULL, NULL, 0, "<Branch>"},
-       {N_("/_View/Set displayed _columns/in _Folder list..."),        NULL, set_folder_display_item_cb, 0, NULL},
-       {N_("/_View/Set displayed _columns/in _Message list..."),NULL, set_summary_display_item_cb, 0, NULL},
 
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Go to"),                   NULL, NULL, 0, "<Branch>"},
@@ -1900,10 +1901,9 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/Message/Re-edit"               , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
 
                {"/Tools/Add sender to address book"   , M_SINGLE_TARGET_EXIST},
-               {"/Tools/Harvest addresses/from Folder..."       
-                                                      , M_MSG_EXIST},
+               {"/Tools/Harvest addresses"            , M_MSG_EXIST},
                {"/Tools/Harvest addresses/from Messages..."
-                                                      , M_MSG_EXIST|M_TARGET_EXIST},
+                                                      , M_TARGET_EXIST},
                {"/Tools/Filter all messages in folder", M_MSG_EXIST|M_EXEC},
                {"/Tools/Filter selected messages"     , M_TARGET_EXIST|M_EXEC},
                {"/Tools/Create filter rule"           , M_SINGLE_TARGET_EXIST|M_UNLOCKED},