{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Reply"), NULL, summary_reply_cb, COMPOSE_REPLY, NULL},
{N_("/Reply to a_ll"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+ {N_("/Reply to author"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_AUTHOR, NULL},
{N_("/_Forward"), NULL, summary_reply_cb, COMPOSE_FORWARD, NULL},
{N_("/Forward as an a_ttachment"),
NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
sens = (selection == SUMMARY_SELECTED_MULTIPLE) ? FALSE : TRUE;
menu_set_sensitive(ifactory, "/Reply", sens);
menu_set_sensitive(ifactory, "/Reply to all", sens);
+ menu_set_sensitive(ifactory, "/Reply to author", sens);
menu_set_sensitive(ifactory, "/Forward", sens);
menu_set_sensitive(ifactory, "/Forward as an attachment", sens);
menu_set_sensitive(ifactory, "/Open in new window", sens);
menu_set_sensitive(ifactory, "/View source", sens);
menu_set_sensitive(ifactory, "/Show all header", sens);
- if (summaryview->folder_item->stype == F_DRAFT)
+ if ((summaryview->folder_item->stype == F_DRAFT) ||
+ (summaryview->folder_item->stype == F_OUTBOX) ||
+ (summaryview->folder_item->stype == F_QUEUE))
menu_set_sensitive(ifactory, "/Reedit", sens);
menu_set_sensitive(ifactory, "/Save as...", sens);
if (!summaryview->selected) return;
if (!summaryview->folder_item ||
- summaryview->folder_item->stype != F_DRAFT) return;
+ (summaryview->folder_item->stype != F_DRAFT &&
+ summaryview->folder_item->stype != F_OUTBOX &&
+ summaryview->folder_item->stype != F_QUEUE)) return;
msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
summaryview->selected);
switch ((ComposeReplyMode)action) {
case COMPOSE_REPLY:
- compose_reply(msginfo, prefs_common.reply_with_quote, FALSE);
+ compose_reply(msginfo, prefs_common.reply_with_quote,
+ FALSE, FALSE);
break;
case COMPOSE_REPLY_WITH_QUOTE:
- compose_reply(msginfo, TRUE, FALSE);
+ compose_reply(msginfo, TRUE, FALSE, FALSE);
break;
case COMPOSE_REPLY_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, FALSE);
+ compose_reply(msginfo, FALSE, FALSE, FALSE);
break;
case COMPOSE_REPLY_TO_ALL:
- compose_reply(msginfo, prefs_common.reply_with_quote, TRUE);
+ compose_reply(msginfo, prefs_common.reply_with_quote,
+ TRUE, FALSE);
break;
case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
- compose_reply(msginfo, TRUE, TRUE);
+ compose_reply(msginfo, TRUE, TRUE, FALSE);
break;
case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, TRUE);
+ compose_reply(msginfo, FALSE, TRUE, FALSE);
+ break;
+ case COMPOSE_REPLY_TO_AUTHOR:
+ compose_reply(msginfo, prefs_common.reply_with_quote,
+ FALSE, TRUE);
+ break;
+ case COMPOSE_REPLY_TO_AUTHOR_WITH_QUOTE:
+ compose_reply(msginfo, TRUE, FALSE, TRUE);
+ break;
+ case COMPOSE_REPLY_TO_AUTHOR_WITHOUT_QUOTE:
+ compose_reply(msginfo, FALSE, FALSE, TRUE);
break;
case COMPOSE_FORWARD:
- compose_forward(msginfo, FALSE);
+ compose_forward(NULL, msginfo, FALSE);
break;
case COMPOSE_FORWARD_AS_ATTACH:
- compose_forward(msginfo, TRUE);
+ compose_forward(NULL, msginfo, TRUE);
break;
default:
- compose_reply(msginfo, prefs_common.reply_with_quote, FALSE);
+ compose_reply(msginfo, prefs_common.reply_with_quote,
+ FALSE, FALSE);
}
summary_set_marks_selected(summaryview);
GtkMenuShell *menushell;
GtkWidget *menu;
GtkWidget *menuitem;
- GList *child = menushell->children;
+ GList *child;
gboolean found = FALSE;
MsgInfo *msginfo;
gchar *from_address;
menushell = GTK_MENU_SHELL(summaryview->popupmenu);
- g_return_if_fail(GTK_MENU_SHELL(summaryview->popupmenu));
+ g_return_if_fail(menushell != NULL);
+ child = menushell->children;
+ g_return_if_fail(child);
/* we're iterating each menu item searching for the one with
* a "contacts" object data. if not found add the menu,