2005-10-09 [colin] 1.9.15cvs26

	* src/mainwindow.c
	* src/messageview.c
	* src/summaryview.c
		Clarify forward menus. Patch by wwp

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 2c01193a8b2e5c56345436899dff0d3b41b1410a..621d2c3ba0a5317f76ec982bb54868878aadd80a 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2005-10-09 [colin]     1.9.15cvs26
+
+       * src/mainwindow.c
+       * src/messageview.c
+       * src/summaryview.c
+               Clarify forward menus. Patch by wwp
+

 2005-10-09 [colin]     1.9.15cvs25
 
        * src/compose.c
 2005-10-09 [colin]     1.9.15cvs25
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index be81ed312985905ee9863c51870977c76c382f03..529833b2c86af73255fc009e28dd293d1058b12c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -862,3 +862,4 @@
 ( cvs diff -u -r 1.49.2.63 -r 1.49.2.64 src/procmime.c;  ) > 1.9.15cvs23.patchset
 ( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/wizard.c;  ) > 1.9.15cvs24.patchset
 ( cvs diff -u -r 1.382.2.180 -r 1.382.2.181 src/compose.c;  cvs diff -u -r 1.50.2.14 -r 1.50.2.15 src/compose.h;  ) > 1.9.15cvs25.patchset
 ( cvs diff -u -r 1.49.2.63 -r 1.49.2.64 src/procmime.c;  ) > 1.9.15cvs23.patchset
 ( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/wizard.c;  ) > 1.9.15cvs24.patchset
 ( cvs diff -u -r 1.382.2.180 -r 1.382.2.181 src/compose.c;  cvs diff -u -r 1.50.2.14 -r 1.50.2.15 src/compose.h;  ) > 1.9.15cvs25.patchset

+( cvs diff -u -r 1.274.2.70 -r 1.274.2.71 src/mainwindow.c;  cvs diff -u -r 1.94.2.66 -r 1.94.2.67 src/messageview.c;  cvs diff -u -r 1.395.2.133 -r 1.395.2.134 src/summaryview.c;  ) > 1.9.15cvs26.patchset

diff --git a/configure.ac b/configure.ac
index 999433502121b9288671ca016c512bfd723f5fca..1afdef21348d591f05259b4277080a43e55085d0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=25
+EXTRA_VERSION=26

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 60e52867d8298f7867300360775fd7ae0327b07c..929621e5159f66abc307470ce595437d0e4abf1d 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -691,7 +691,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                "<control>L", main_window_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
        {N_("/_Message/Follow-up and reply to"),NULL, main_window_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
                                                "<control>L", main_window_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
        {N_("/_Message/Follow-up and reply to"),NULL, main_window_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},

-       {N_("/_Message/_Forward"),              "<control><alt>F", main_window_reply_cb, COMPOSE_FORWARD, NULL},
+       {N_("/_Message/_Forward"),              "<control><alt>F", main_window_reply_cb, COMPOSE_FORWARD_INLINE, NULL},
+       {N_("/_Message/For_ward as attachment"),        NULL, main_window_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},

        {N_("/_Message/Redirect"),              NULL, main_window_reply_cb, COMPOSE_REDIRECT, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/M_ove..."),              "<control>O", move_to_cb, 0, NULL},
        {N_("/_Message/Redirect"),              NULL, main_window_reply_cb, COMPOSE_REDIRECT, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/M_ove..."),              "<control>O", move_to_cb, 0, NULL},


@@ -1832,6 +1833,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/Message/Reply to"              , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Message/Follow-up and reply to", M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
                {"/Message/Forward"               , M_HAVE_ACCOUNT|M_TARGET_EXIST},
                {"/Message/Reply to"              , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Message/Follow-up and reply to", M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
                {"/Message/Forward"               , M_HAVE_ACCOUNT|M_TARGET_EXIST},

+               {"/Message/Forward as attachment" , M_HAVE_ACCOUNT|M_TARGET_EXIST},

                {"/Message/Redirect"              , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Message/Move..."               , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
                {"/Message/Copy..."               , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
                {"/Message/Redirect"              , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Message/Move..."               , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
                {"/Message/Copy..."               , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},

diff --git a/src/messageview.c b/src/messageview.c
index c127298c3b62a68aefbdaa34bed4e7be1c6d1d32..1df6444f42d010580106507b4ef9294f9be717c2 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -281,7 +281,7 @@ static GtkItemFactoryEntry msgview_entries[] =
        {N_("/_Message/Repl_y to/mailing _list"),
                                        "<control>L", reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
        {N_("/_Message/---"),           NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Repl_y to/mailing _list"),
                                        "<control>L", reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
        {N_("/_Message/---"),           NULL, NULL, 0, "<Separator>"},

-       {N_("/_Message/_Forward"),      "<control><alt>F", reply_cb, COMPOSE_FORWARD, NULL},
+       {N_("/_Message/_Forward"),      "<control><alt>F", reply_cb, COMPOSE_FORWARD_INLINE, NULL},

        {N_("/_Message/For_ward as attachment"),
                                        NULL, reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
        {N_("/_Message/Redirec_t"),     NULL, reply_cb, COMPOSE_REDIRECT, NULL},
        {N_("/_Message/For_ward as attachment"),
                                        NULL, reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
        {N_("/_Message/Redirec_t"),     NULL, reply_cb, COMPOSE_REDIRECT, NULL},

diff --git a/src/summaryview.c b/src/summaryview.c
index 4520c77273eae2d66aeac77ab057eb14ee806ced..a32814630a474bbd583c61df0f1ad8120923165f 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -402,7 +402,8 @@ static GtkItemFactoryEntry summary_popup_entries[] =
                                        "<control>L", summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
        {N_("/Follow-up and reply to"), NULL, summary_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
                                        "<control>L", summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
        {N_("/Follow-up and reply to"), NULL, summary_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},

-       {N_("/_Forward"),               "<control><alt>F", summary_reply_cb, COMPOSE_FORWARD, NULL},
+       {N_("/_Forward"),               "<control><alt>F", summary_reply_cb, COMPOSE_FORWARD_INLINE, NULL},
+       {N_("/For_ward as attachment"), NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},

        {N_("/Redirect"),               NULL, summary_reply_cb, COMPOSE_REDIRECT, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/M_ove..."),               "<control>O", summary_move_to,  0, NULL},
        {N_("/Redirect"),               NULL, summary_reply_cb, COMPOSE_REDIRECT, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/M_ove..."),               "<control>O", summary_move_to,  0, NULL},


@@ -1216,6 +1217,7 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
                {"/Follow-up and reply to"      , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
 
                {"/Forward"                     , M_HAVE_ACCOUNT|M_TARGET_EXIST},
                {"/Follow-up and reply to"      , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
 
                {"/Forward"                     , M_HAVE_ACCOUNT|M_TARGET_EXIST},

+               {"/Forward as attachment"       , M_HAVE_ACCOUNT|M_TARGET_EXIST},

                {"/Redirect"                    , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
 
                {"/Re-edit"                     , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
                {"/Redirect"                    , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
 
                {"/Re-edit"                     , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},