fixes to the Message View toolbar and menu

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 2d8f1079a2cf7fc5ea2b35694b5ef4d6d705bab5..acef34cf66ec0fbf2d0b3eaed28310ecf128baef 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,13 @@
+2003-01-13 [paul]      0.8.8claws94
+
+       * src/messageview.c
+         src/toolbar.c
+               fixes to the Message View toolbar and menu:
+               fix non-functioning Forward button
+               make Reply button consider default_reply_list
+               remove 'Follow-up...' menu entry
+               add 'Forward' and 'Redirect' menu entries
+

 2003-01-13 [melvin]    0.8.8claws93
 
        * src/inc.c
 2003-01-13 [melvin]    0.8.8claws93
 
        * src/inc.c


@@ -48,7 +58,7 @@
 2003-01-12 [paul]      0.8.8claws86
 
        * sync with 0.8.8cvs5
 2003-01-12 [paul]      0.8.8claws86
 
        * sync with 0.8.8cvs5

-               see ChangeLog 2002-01-13 (!)
+               see ChangeLog 2003-01-13 (!)

 
 2003-01-12 [alfons]    0.8.8claws85
 
 
 2003-01-12 [alfons]    0.8.8claws85
 

diff --git a/configure.in b/configure.in
index babed6597b228312835dc1c8207cd0723d9cda4f..9ad51b00220e2b1555416e4049f69bc40918b9d7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws93
+EXTRA_VERSION=claws94

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/messageview.c b/src/messageview.c
index 4ccf3a0d16adb4f4c350e98184141b5013d44ff1..ca8b24a6d2b6cc83a175fe52f5549d208c047213 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -154,7 +154,10 @@ static GtkItemFactoryEntry messageview_entries[] =
        {N_("/_Message/Repl_y to/_sender"),     NULL, messageview_menubar_cb, COMPOSE_REPLY_TO_SENDER, NULL},
        {N_("/_Message/Repl_y to/mailing _list"),
                                                "<control>L", messageview_menubar_cb, COMPOSE_REPLY_TO_LIST, NULL},
        {N_("/_Message/Repl_y to/_sender"),     NULL, messageview_menubar_cb, COMPOSE_REPLY_TO_SENDER, NULL},
        {N_("/_Message/Repl_y to/mailing _list"),
                                                "<control>L", messageview_menubar_cb, COMPOSE_REPLY_TO_LIST, NULL},

-       {N_("/_Message/Follow-up and reply to"),NULL, messageview_menubar_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
+/*     {N_("/_Message/Follow-up and reply to"),NULL, messageview_menubar_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL}, */
+       {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
+       {N_("/_Message/_Forward"),              "<control><alt>F", messageview_menubar_cb, COMPOSE_FORWARD, NULL},
+       {N_("/_Message/Redirect"),              NULL, messageview_menubar_cb, COMPOSE_REDIRECT, NULL},

        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Delete"),               "<control>D", delete_msgview_cb,  0, NULL},
        
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/_Delete"),               "<control>D", delete_msgview_cb,  0, NULL},
        

diff --git a/src/toolbar.c b/src/toolbar.c
index 86b925dd40d3e06470fb196c5779d290ae3a3a7b..1f6ea456326ca13da034032f172e2ab543c473b7 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -1128,8 +1128,7 @@ static void toolbar_popup_cb(gpointer data, guint action, GtkWidget *widget)
 static void toolbar_reply_cb(GtkWidget *widget, gpointer data)
 {
        ToolbarItem *toolbar_item = (ToolbarItem*)data;
 static void toolbar_reply_cb(GtkWidget *widget, gpointer data)
 {
        ToolbarItem *toolbar_item = (ToolbarItem*)data;

-       MainWindow *mainwin;
-       MessageView *msgview;
+       MainWindow *mainwin = get_mainwin(data);

 
        g_return_if_fail(toolbar_item != NULL);
 
 
        g_return_if_fail(toolbar_item != NULL);
 


@@ -1148,11 +1147,16 @@ static void toolbar_reply_cb(GtkWidget *widget, gpointer data)
                                 NULL);
                break;
        case TOOLBAR_MSGVIEW:
                                 NULL);
                break;
        case TOOLBAR_MSGVIEW:

-               msgview = (MessageView*)toolbar_item->parent;
-               compose_reply(msgview->msginfo,
-                             prefs_common.reply_with_quote ? COMPOSE_REPLY_WITH_QUOTE 
-                             : COMPOSE_REPLY_WITHOUT_QUOTE,
-                             FALSE, FALSE, FALSE, NULL);
+               if (prefs_common.default_reply_list)
+                       reply_cb(mainwin, 
+                                prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE 
+                                : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE,
+                                NULL);
+               else
+                       reply_cb(mainwin,
+                                prefs_common.reply_with_quote ? COMPOSE_REPLY_WITH_QUOTE 
+                                : COMPOSE_REPLY_WITHOUT_QUOTE,
+                                NULL);

                break;
        default:
                debug_print("toolbar event not supported\n");
                break;
        default:
                debug_print("toolbar event not supported\n");


@@ -1286,8 +1290,8 @@ static void toolbar_addrbook_cb(GtkWidget *widget, gpointer data)
 static void toolbar_forward_cb(GtkWidget *widget, gpointer data)
 {
        ToolbarItem *toolbar_item = (ToolbarItem*)data;
 static void toolbar_forward_cb(GtkWidget *widget, gpointer data)
 {
        ToolbarItem *toolbar_item = (ToolbarItem*)data;

-       MainWindow *mainwin;
-
+       MainWindow *mainwin = get_mainwin(data);
+       

        g_return_if_fail(toolbar_item != NULL);
 
        switch (toolbar_item->type) {
        g_return_if_fail(toolbar_item != NULL);
 
        switch (toolbar_item->type) {


@@ -1299,6 +1303,13 @@ static void toolbar_forward_cb(GtkWidget *widget, gpointer data)
                        reply_cb(mainwin, COMPOSE_FORWARD, NULL);
                break;
                
                        reply_cb(mainwin, COMPOSE_FORWARD, NULL);
                break;
                

+       case TOOLBAR_MSGVIEW:
+               if (prefs_common.forward_as_attachment)
+                       reply_cb(mainwin, COMPOSE_FORWARD_AS_ATTACH, NULL);
+               else
+                       reply_cb(mainwin, COMPOSE_FORWARD, NULL);
+               break;
+               

        default:
                debug_print("toolbar event not supported\n");
        }
        default:
                debug_print("toolbar event not supported\n");
        }