From: Paul Mangan Date: Mon, 7 Jul 2008 18:40:13 +0000 (+0000) Subject: 2008-07-07 [paul] 3.5.0cvs20 X-Git-Tag: rel_3_6_0~137 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=bd6066364bd0c4e2278efa2183c067958876b9c8 2008-07-07 [paul] 3.5.0cvs20 * src/mainwindow.c fit the menu style a bit better --- diff --git a/ChangeLog b/ChangeLog index a091e7fe0..82ee4637d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-07-07 [paul] 3.5.0cvs20 + + * src/mainwindow.c + fit the menu style a bit better + 2008-07-07 [colin] 3.5.0cvs19 * src/prefs_themes.c diff --git a/PATCHSETS b/PATCHSETS index af64c09ba..a800f3491 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3431,3 +3431,4 @@ ( cvs diff -u -r 1.204.2.174 -r 1.204.2.175 src/prefs_common.c; ) > 3.5.0cvs17.patchset ( cvs diff -u -r 1.274.2.249 -r 1.274.2.250 src/mainwindow.c; cvs diff -u -r 1.30.2.51 -r 1.30.2.52 src/prefs_toolbar.c; cvs diff -u -r 1.25.2.57 -r 1.25.2.58 src/stock_pixmap.c; ) > 3.5.0cvs18.patchset ( cvs diff -u -r 1.3.2.57 -r 1.3.2.58 src/prefs_themes.c; ) > 3.5.0cvs19.patchset +( cvs diff -u -r 1.274.2.250 -r 1.274.2.251 src/mainwindow.c; ) > 3.5.0cvs20.patchset diff --git a/configure.ac b/configure.ac index 4765cafad..15c2801b6 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=5 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=19 +EXTRA_VERSION=20 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/mainwindow.c b/src/mainwindow.c index 682dcda75..a56f97296 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -854,10 +854,10 @@ static GtkItemFactoryEntry mainwin_entries[] = {N_("/_Tools/_Address book..."), "A", addressbook_open_cb, 0, NULL}, {N_("/_Tools/Add sender to address boo_k"), NULL, add_address_cb, 0, NULL}, - {N_("/_Tools/C_ollect addresses from"), NULL, NULL, 0, ""}, - {N_("/_Tools/C_ollect addresses from/Current _folder..."), + {N_("/_Tools/C_ollect addresses), NULL, NULL, 0, ""}, + {N_("/_Tools/C_ollect addresses/from Current _folder..."), NULL, addr_harvest_cb, 0, NULL}, - {N_("/_Tools/C_ollect addresses from/Selected _messages..."), + {N_("/_Tools/C_ollect addresses/from Selected _messages..."), NULL, addr_harvest_msg_cb, 0, NULL}, {N_("/_Tools/---"), NULL, NULL, 0, ""}, {N_("/_Tools/_Filter all messages in folder"), @@ -2890,8 +2890,8 @@ 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/Collect addresses from" , M_MSG_EXIST|M_SUMMARY_ISLIST}, - {"/Tools/Collect addresses from/Selected messages..." + {"/Tools/Collect addresses" , M_MSG_EXIST|M_SUMMARY_ISLIST}, + {"/Tools/Collect addresses/from Selected messages..." , M_TARGET_EXIST}, {"/Tools/Filter all messages in folder", M_MSG_EXIST|M_EXEC}, {"/Tools/Filter selected messages" , M_TARGET_EXIST|M_EXEC},