+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-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
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
{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},
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);
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");
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) {
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");
}