#include "rfc2015.h"
#include "send_message.h"
#include "stock_pixmap.h"
+#include "hooks.h"
+#include "filtering.h"
static GList *messageview_list = NULL;
-static void messageview_change_view_type(MessageView *messageview,
- MessageType type);
static void messageview_destroy_cb (GtkWidget *widget,
MessageView *messageview);
static void messageview_size_allocate_cb(GtkWidget *widget,
static void create_filter_cb (gpointer data,
guint action,
GtkWidget *widget);
+static void create_processing_cb (gpointer data,
+ guint action,
+ GtkWidget *widget);
-static void messageview_menubar_cb (MessageView *msgview,
- guint action,
- GtkWidget *widget);
static void about_cb (gpointer data,
guint action,
GtkWidget *widget);
static void messageview_update (MessageView *msgview);
-static void messageview_update_all (MessageView *msgview);
+static gboolean messageview_update_msg (gpointer source, gpointer data);
static GList *msgview_list = NULL;
static GtkItemFactoryEntry msgview_entries[] =
NULL, create_filter_cb, FILTER_BY_TO, NULL},
{N_("/_Tools/_Create filter rule/by _Subject"),
NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL},
+ {N_("/_Tools/Create processing rule/"),
+ NULL, NULL, 0, "<Branch>"},
+ {N_("/_Tools/Create processing rule/_Automatically"),
+ NULL, create_processing_cb, FILTER_BY_AUTO, NULL},
+ {N_("/_Tools/Create processing rule/by _From"),
+ NULL, create_processing_cb, FILTER_BY_FROM, NULL},
+ {N_("/_Tools/Create processing rule/by _To"),
+ NULL, create_processing_cb, FILTER_BY_TO, NULL},
+ {N_("/_Tools/Create processing rule/by _Subject"),
+ NULL, create_processing_cb, FILTER_BY_SUBJECT, NULL},
{N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Tools/Actio_ns"), NULL, NULL, 0, "<Branch>"},
MessageView *messageview;
GtkWidget *vbox;
HeaderView *headerview;
- TextView *textview;
MimeView *mimeview;
NoticeView *noticeview;
debug_print("Creating message view...\n");
messageview = g_new0(MessageView, 1);
- messageview->type = MVIEW_TEXT;
-
headerview = headerview_create();
noticeview = noticeview_create(mainwin);
- textview = textview_create();
- textview->messageview = messageview;
-
- mimeview = mimeview_create();
+ mimeview = mimeview_create(mainwin);
mimeview->textview = textview_create();
mimeview->textview->messageview = messageview;
mimeview->messageview = messageview;
FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET_PTR(noticeview),
FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET_PTR(textview),
- TRUE, TRUE, 0);
-
- /* to remove without destroyed */
- gtk_widget_ref(GTK_WIDGET_PTR(textview));
- gtk_widget_ref(GTK_WIDGET_PTR(mimeview));
- gtk_widget_ref(GTK_WIDGET_PTR(mimeview->textview));
+ gtk_box_pack_start(GTK_BOX(vbox),
+ GTK_WIDGET_PTR(mimeview), TRUE, TRUE, 0);
+ gtk_widget_show(vbox);
messageview->vbox = vbox;
messageview->new_window = FALSE;
messageview->window = NULL;
messageview->headerview = headerview;
- messageview->textview = textview;
messageview->mimeview = mimeview;
messageview->noticeview = noticeview;
messageview->mainwin = mainwin;
+ messageview->msginfo_update_callback_id =
+ hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, messageview_update_msg, (gpointer) messageview);
return messageview;
}
messageview_add_toolbar(msgview, window);
- gtk_widget_grab_focus(msgview->textview->text);
- gtk_widget_show_all(window);
+ gtk_widget_grab_focus(msgview->mimeview->textview->text);
+ gtk_widget_show(window);
msgview->new_window = TRUE;
msgview->window = window;
void messageview_init(MessageView *messageview)
{
headerview_init(messageview->headerview);
- textview_init(messageview->textview);
mimeview_init(messageview->mimeview);
/*messageview_set_font(messageview);*/
conv_encode_header(dest, len, src, header_len, FALSE);
}
-static gint disposition_notification_queue(PrefsAccount * account,
- gchar * to, const gchar *file)
-{
- FolderItem *queue;
- gchar *tmp;
- FILE *fp, *src_fp;
- gchar buf[BUFFSIZE];
- gint num;
-
- debug_print("queueing message...\n");
- g_return_val_if_fail(account != NULL, -1);
-
- tmp = g_strdup_printf("%s%cqueue.%d", g_get_tmp_dir(),
- G_DIR_SEPARATOR, (gint)file);
- if ((fp = fopen(tmp, "wb")) == NULL) {
- FILE_OP_ERROR(tmp, "fopen");
- g_free(tmp);
- return -1;
- }
- if ((src_fp = fopen(file, "rb")) == NULL) {
- FILE_OP_ERROR(file, "fopen");
- fclose(fp);
- unlink(tmp);
- g_free(tmp);
- return -1;
- }
- if (change_file_mode_rw(fp, tmp) < 0) {
- FILE_OP_ERROR(tmp, "chmod");
- g_warning("can't change file mode\n");
- }
-
- /* queueing variables */
- fprintf(fp, "AF:\n");
- fprintf(fp, "NF:0\n");
- fprintf(fp, "PS:10\n");
- fprintf(fp, "SRH:1\n");
- fprintf(fp, "SFN:\n");
- fprintf(fp, "DSR:\n");
- fprintf(fp, "MID:\n");
- fprintf(fp, "CFG:\n");
- fprintf(fp, "PT:0\n");
- fprintf(fp, "S:%s\n", account->address);
- fprintf(fp, "RQ:\n");
- if (account->smtp_server)
- fprintf(fp, "SSV:%s\n", account->smtp_server);
- else
- fprintf(fp, "SSV:\n");
- if (account->nntp_server)
- fprintf(fp, "NSV:%s\n", account->nntp_server);
- else
- fprintf(fp, "NSV:\n");
- fprintf(fp, "SSH:\n");
- fprintf(fp, "R:<%s>", to);
- fprintf(fp, "\n");
- fprintf(fp, "\n");
-
- while (fgets(buf, sizeof(buf), src_fp) != NULL) {
- if (fputs(buf, fp) == EOF) {
- FILE_OP_ERROR(tmp, "fputs");
- fclose(fp);
- fclose(src_fp);
- unlink(tmp);
- g_free(tmp);
- return -1;
- }
- }
-
- fclose(src_fp);
- if (fclose(fp) == EOF) {
- FILE_OP_ERROR(tmp, "fclose");
- unlink(tmp);
- g_free(tmp);
- return -1;
- }
-
- queue = folder_get_default_queue();
- if ((num = folder_item_add_msg(queue, tmp, TRUE)) < 0) {
- g_warning("can't queue the message\n");
- unlink(tmp);
- g_free(tmp);
- return -1;
- }
- g_free(tmp);
-
- return 0;
-}
-
static gint disposition_notification_send(MsgInfo *msginfo)
{
gchar buf[BUFFSIZE];
gchar tmp[MAXPATHLEN + 1];
FILE *fp;
- GSList *to_list;
GList *ac_list;
PrefsAccount *account;
gint ok;
gchar *to;
+ FolderItem *queue, *outbox;
+ gint num;
+ gchar *path;
+ gchar *addr;
+ gchar *addrp;
if ((!msginfo->returnreceiptto) &&
(!msginfo->dispositionnotificationto))
else
to = msginfo->returnreceiptto;
- ok = get_header_from_msginfo(msginfo, buf, sizeof(buf),
+ ok = procheader_get_header_from_msginfo(msginfo, buf, sizeof(buf),
"Return-Path:");
if (ok == 0) {
gchar *to_addr = g_strdup(to);
"receipt."), to, buf);
val = alertpanel(_("Warning"), message, _("Send"),
_("+Don't Send"), NULL);
+ g_free(message);
if (val != G_ALERTDEFAULT)
return -1;
}
FILE_OP_ERROR(tmp, "chmod");
g_warning("can't change file mode\n");
}
+
+ addr = g_strdup(to);
+
+ extract_address(addr);
+ addrp = addr;
+
+ /* write queue headers */
+ fprintf(fp, "AF:\n");
+ fprintf(fp, "NF:0\n");
+ fprintf(fp, "PS:10\n");
+ fprintf(fp, "SRH:1\n");
+ fprintf(fp, "SFN:\n");
+ fprintf(fp, "DSR:\n");
+ fprintf(fp, "MID:\n");
+ fprintf(fp, "CFG:\n");
+ fprintf(fp, "PT:0\n");
+ fprintf(fp, "S:%s\n", account->address);
+ fprintf(fp, "RQ:\n");
+ if (account->smtp_server)
+ fprintf(fp, "SSV:%s\n", account->smtp_server);
+ else
+ fprintf(fp, "SSV:\n");
+ fprintf(fp, "SSH:\n");
+ fprintf(fp, "R:<%s>\n", addrp);
+
+ g_free(addrp);
+
+ /* check whether we need to save the message */
+ outbox = account_get_special_folder(account, F_OUTBOX);
+ if (folder_get_default_outbox() == outbox && !prefs_common.savemsg)
+ outbox = NULL;
+ if (outbox) {
+ path = folder_item_get_identifier(outbox);
+ fprintf(fp, "SCF:%s\n", path);
+ g_free(path);
+ }
+ fprintf(fp, "\n");
+
/* Date */
get_rfc822_date(buf, sizeof(buf));
fprintf(fp, "Date: %s\n", buf);
strlen("Subject: "));
fprintf(fp, "Subject: Disposition notification: %s\n", buf);
+ /* Message ID */
+ generate_msgid(account->address, buf, sizeof buf);
+ fprintf(fp, "Message-Id: <%s>\n", buf);
+
if (fclose(fp) == EOF) {
FILE_OP_ERROR(tmp, "fclose");
unlink(tmp);
return -1;
}
- to_list = address_list_append(NULL, to);
- ok = send_message(tmp, account, to_list);
-
- if (ok < 0) {
- if (prefs_common.queue_msg) {
- AlertValue val;
-
- val = alertpanel
- (_("Queueing"),
- _("Error occurred while sending the notification.\n"
- "Put this notification into queue folder?"),
- _("OK"), _("Cancel"), NULL);
- if (G_ALERTDEFAULT == val) {
- ok = disposition_notification_queue(account, to, tmp);
- if (ok < 0)
- alertpanel_error(_("Can't queue the notification."));
- }
- } else
- alertpanel_error_log(_("Error occurred while sending the notification."));
+ /* put it in queue */
+ queue = account_get_special_folder(account, F_QUEUE);
+ if (!queue) queue = folder_get_default_queue();
+ if (!queue) {
+ g_warning("can't find queue folder\n");
+ unlink(tmp);
+ return -1;
}
-
- if (unlink(tmp) < 0) FILE_OP_ERROR(tmp, "unlink");
+ folder_item_scan(queue);
+ if ((num = folder_item_add_msg(queue, tmp, NULL, TRUE)) < 0) {
+ g_warning("can't queue the message\n");
+ unlink(tmp);
+ return -1;
+ }
+
+ /* send it */
+ path = folder_item_fetch_msg(queue, num);
+ ok = procmsg_send_message_queue(path);
+ g_free(path);
+ folder_item_remove_msg(queue, num);
return ok;
}
return messageview_list;
}
-void messageview_show(MessageView *messageview, MsgInfo *msginfo,
+static gboolean find_encrypted_func(GNode *node, gpointer data)
+{
+ MimeInfo *mimeinfo = (MimeInfo *) node->data;
+ MimeInfo **encinfo = (MimeInfo **) data;
+
+ if (privacy_mimeinfo_is_encrypted(mimeinfo)) {
+ *encinfo = mimeinfo;
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static MimeInfo *find_encrypted_part(MimeInfo *rootinfo)
+{
+ MimeInfo *encinfo = NULL;
+
+ g_node_traverse(rootinfo->node, G_IN_ORDER, G_TRAVERSE_ALL, -1,
+ find_encrypted_func, &encinfo);
+
+ return encinfo;
+}
+
+gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
gboolean all_headers)
{
- FILE *fp;
gchar *file;
- MimeInfo *mimeinfo;
+ MimeInfo *mimeinfo, *encinfo;
- g_return_if_fail(msginfo != NULL);
+ g_return_val_if_fail(msginfo != NULL, -1);
-#if USE_GPGME
- if ((fp = procmsg_open_message_decrypted(msginfo, &mimeinfo)) == NULL)
- return;
-#else /* !USE_GPGME */
- if ((fp = procmsg_open_message(msginfo)) == NULL) return;
- mimeinfo = procmime_scan_mime_header(fp);
-#endif /* USE_GPGME */
- fclose(fp);
- if (!mimeinfo) return;
+ mimeinfo = procmime_scan_message(msginfo);
+ if (!mimeinfo) {
+ textview_show_error(messageview->mimeview->textview);
+ return -1;
+ }
+ while ((encinfo = find_encrypted_part(mimeinfo)) != NULL) {
+ debug_print("decrypting message part\n");
+ if (privacy_mimeinfo_decrypt(encinfo) < 0)
+ break;
+ }
+
file = procmsg_get_message_file_path(msginfo);
if (!file) {
g_warning("can't get message file path.\n");
procmime_mimeinfo_free_all(mimeinfo);
- return;
+ textview_show_error(messageview->mimeview->textview);
+ return -1;
}
if (messageview->msginfo != msginfo) {
headerview_show(messageview->headerview, messageview->msginfo);
messageview->all_headers = all_headers;
- textview_set_all_headers(messageview->textview, all_headers);
textview_set_all_headers(messageview->mimeview->textview, all_headers);
- if (mimeinfo->mime_type != MIME_TEXT &&
- mimeinfo->mime_type != MIME_TEXT_HTML) {
- messageview_change_view_type(messageview, MVIEW_MIME);
- mimeview_show_message(messageview->mimeview, mimeinfo, file);
- } else {
- messageview_change_view_type(messageview, MVIEW_TEXT);
- textview_show_message(messageview->textview, mimeinfo, file);
- procmime_mimeinfo_free_all(mimeinfo);
- }
+ mimeview_show_message(messageview->mimeview, mimeinfo, file);
- if (MSG_IS_RETRCPT_PENDING(messageview->msginfo->flags))
+ if ((messageview->msginfo->dispositionnotificationto ||
+ messageview->msginfo->returnreceiptto) &&
+ !MSG_IS_RETRCPT_SENT(messageview->msginfo->flags))
return_receipt_show(messageview->noticeview, messageview->msginfo);
else
noticeview_hide(messageview->noticeview);
g_free(file);
-}
-
-static void messageview_change_view_type(MessageView *messageview,
- MessageType type)
-{
- TextView *textview = messageview->textview;
- MimeView *mimeview = messageview->mimeview;
-
- if (messageview->type == type) return;
-
- if (type == MVIEW_MIME) {
- gtkut_container_remove
- (GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
- GTK_WIDGET_PTR(textview));
- gtk_box_pack_start(GTK_BOX(messageview->vbox),
- GTK_WIDGET_PTR(mimeview), TRUE, TRUE, 0);
- gtk_container_add(GTK_CONTAINER(mimeview->vbox),
- GTK_WIDGET_PTR(textview));
- } else if (type == MVIEW_TEXT) {
- gtkut_container_remove
- (GTK_CONTAINER(GTK_WIDGET_PTR(messageview)),
- GTK_WIDGET_PTR(mimeview));
-
- if (mimeview->vbox == GTK_WIDGET_PTR(textview)->parent)
- gtkut_container_remove(GTK_CONTAINER(mimeview->vbox),
- GTK_WIDGET_PTR(textview));
-
- gtk_box_pack_start(GTK_BOX(messageview->vbox),
- GTK_WIDGET_PTR(textview), TRUE, TRUE, 0);
- } else
- return;
- messageview->type = type;
+ return 0;
}
void messageview_reflect_prefs_pixmap_theme(void)
for (cur = msgview_list; cur != NULL; cur = cur->next) {
msgview = (MessageView*)cur->data;
toolbar_update(TOOLBAR_MSGVIEW, msgview);
+ mimeview_update(msgview->mimeview);
}
}
{
procmsg_msginfo_free(messageview->msginfo);
messageview->msginfo = NULL;
- messageview_change_view_type(messageview, MVIEW_TEXT);
+ messageview->filtered = FALSE;
+ mimeview_clear(messageview->mimeview);
headerview_clear(messageview->headerview);
- textview_clear(messageview->textview);
noticeview_hide(messageview->noticeview);
}
void messageview_destroy(MessageView *messageview)
{
- GtkWidget *textview = GTK_WIDGET_PTR(messageview->textview);
GtkWidget *mimeview = GTK_WIDGET_PTR(messageview->mimeview);
debug_print("destroy messageview\n");
messageview_list = g_list_remove(messageview_list, messageview);
+ hooks_unregister_hook(MSGINFO_UPDATE_HOOKLIST,
+ messageview->msginfo_update_callback_id);
+
headerview_destroy(messageview->headerview);
- textview_destroy(messageview->textview);
mimeview_destroy(messageview->mimeview);
noticeview_destroy(messageview->noticeview);
g_free(messageview);
- gtk_widget_unref(textview);
gtk_widget_unref(mimeview);
}
void messageview_delete(MessageView *msgview)
{
- MsgInfo *msginfo = (MsgInfo*)msgview->msginfo;
- SummaryView *summaryview = (SummaryView*)msgview->mainwin->summaryview;
- FolderItem *trash = folder_get_default_trash();
- GSList *msg_list;
+ MsgInfo *msginfo = (MsgInfo *) msgview->msginfo;
+ FolderItem *trash = NULL;
+ PrefsAccount *ac = NULL;
g_return_if_fail(msginfo != NULL);
- g_return_if_fail(trash != NULL);
-
- msg_list = folder_item_get_msg_list(msginfo->folder);
-
- if (msg_list == NULL) {
- alertpanel_error(_("Message already removed from folder."));
- return;
- }
-
- for (; msg_list != NULL; msg_list = msg_list->next) {
- MsgInfo *msginfo_list = (MsgInfo*)msg_list->data;
-
- if (msginfo->msgnum == msginfo_list->msgnum) {
-
- if (prefs_common.immediate_exec)
- folder_item_move_msg(trash, msginfo);
- else {
- procmsg_msginfo_set_to_folder(msginfo, trash);
- procmsg_msginfo_set_flags(msginfo, MSG_DELETED, 0);
- /* NOTE: does not update to next message in summaryview
- */
- }
-
- messageview_update_all(msgview);
- break;
- }
- }
-}
-/*
- * scan List of MessageViews checking whether there are any Views holding messages
- * which need to be updated (another view might have deleted the one this MessagView holds)
- */
-static void messageview_update_all(MessageView *msgview)
-{
- MsgInfo *msginfo = (MsgInfo*)msgview->msginfo;
- GList *cur;
-
- g_return_if_fail(msginfo != NULL);
+ /* to get the trash folder, we have to choose either
+ * the folder's or account's trash default - we prefer
+ * the one in the account prefs */
+ if (msginfo->folder) {
+ if (NULL != (ac = account_find_from_item(msginfo->folder)))
+ trash = account_get_special_folder(ac, F_TRASH);
+ if (!trash && msginfo->folder->folder)
+ trash = msginfo->folder->folder->trash;
+ /* if still not found, use the default */
+ if (!trash)
+ trash = folder_get_default_trash();
+ }
- for (cur = msgview_list; cur != NULL; cur = cur->next) {
- MessageView *msgview = (MessageView*)cur->data;
- MsgInfo *msginfo_list = (MsgInfo*)msgview->msginfo;
-
- g_return_if_fail(msginfo != NULL);
+ g_return_if_fail(trash != NULL);
- if (msginfo->msgnum == msginfo_list->msgnum)
- messageview_update(msgview);
+ if (prefs_common.immediate_exec)
+ /* TODO: Delete from trash */
+ folder_item_move_msg(trash, msginfo);
+ else {
+ procmsg_msginfo_set_to_folder(msginfo, trash);
+ procmsg_msginfo_set_flags(msginfo, MSG_DELETED, 0);
+ /* NOTE: does not update to next message in summaryview */
}
}
void messageview_set_font(MessageView *messageview)
{
- textview_set_font(messageview->textview, NULL);
}
TextView *messageview_get_current_textview(MessageView *messageview)
{
TextView *text = NULL;
- if (messageview->type == MVIEW_TEXT)
- text = messageview->textview;
- else if (messageview->type == MVIEW_MIME) {
- if (gtk_notebook_get_current_page
- (GTK_NOTEBOOK(messageview->mimeview->notebook)) == 0)
- text = messageview->textview;
- else if (messageview->mimeview->type == MIMEVIEW_TEXT)
- text = messageview->mimeview->textview;
- }
+ text = messageview->mimeview->textview;
return text;
}
MimeInfo *messageview_get_selected_mime_part(MessageView *messageview)
{
- if (messageview->type == MVIEW_MIME)
- return mimeview_get_selected_part(messageview->mimeview);
-
- return NULL;
+ return mimeview_get_selected_part(messageview->mimeview);
}
void messageview_copy_clipboard(MessageView *messageview)
void messageview_set_position(MessageView *messageview, gint pos)
{
- textview_set_position(messageview->textview, pos);
+ TextView *text;
+
+ text = messageview_get_current_textview(messageview);
+ if (text)
+ textview_set_position(text, pos);
}
gboolean messageview_search_string(MessageView *messageview, const gchar *str,
gboolean case_sens)
{
- return textview_search_string(messageview->textview, str, case_sens);
+ TextView *text;
+
+ text = messageview_get_current_textview(messageview);
+ if (text)
+ return textview_search_string(text, str, case_sens);
return FALSE;
}
const gchar *str,
gboolean case_sens)
{
- return textview_search_string_backward(messageview->textview,
- str, case_sens);
+ TextView *text;
+
+ text = messageview_get_current_textview(messageview);
+ return textview_search_string_backward(text,
+ str, case_sens);
return FALSE;
}
gtkut_container_remove(GTK_CONTAINER(container), vpaned);
gtk_widget_reparent(GTK_WIDGET_PTR(messageview), container);
menu_set_sensitive(ifactory, "/View/Expand Summary View", FALSE);
- gtk_widget_grab_focus(GTK_WIDGET(messageview->textview->text));
} else {
gtk_widget_reparent(GTK_WIDGET_PTR(messageview), vpaned);
gtk_container_add(GTK_CONTAINER(container), vpaned);
tmpmsginfo->msgnum = msginfo->msgnum;
if (disposition_notification_send(tmpmsginfo) >= 0) {
- procmsg_msginfo_unset_flags(msginfo, MSG_RETRCPT_PENDING, 0);
+ procmsg_msginfo_set_flags(msginfo, MSG_RETRCPT_SENT, 0);
noticeview_hide(noticeview);
}
return account_find_from_id(account_id);
}
-
/*
- * \brief return selected messageview text used by composing
- * to reply to selected text only
+ * \brief return selected messageview text, when nothing is
+ * selected and message was filtered, return complete text
*
* \param pointer to Messageview
*
*/
gchar *messageview_get_selection(MessageView *msgview)
{
+ TextView *textview;
gchar *text = NULL;
+ GtkEditable *edit = NULL;
+ gint body_pos = 0;
g_return_val_if_fail(msgview != NULL, NULL);
- text = gtkut_editable_get_selection
- (GTK_EDITABLE(msgview->textview->text));
-
- if (!text && msgview->type == MVIEW_MIME
- && msgview->mimeview->type == MIMEVIEW_TEXT
- && msgview->mimeview->textview
- && !msgview->mimeview->textview->default_text) {
- text = gtkut_editable_get_selection
- (GTK_EDITABLE(msgview->mimeview->textview->text));
- }
-
- return text;
-}
+ textview = messageview_get_current_textview(msgview);
+ g_return_val_if_fail(textview != NULL, NULL);
-static void messageview_delete_cb(MessageView *msgview, guint action, GtkWidget *widget)
-{
- messageview_delete(msgview);
-}
-
-static void messageview_menubar_cb(MessageView *msgview, guint action, GtkWidget *widget)
-{
- GSList *msginfo_list = NULL;
- gchar *body;
- MsgInfo *msginfo;
-
- g_return_if_fail(msgview != NULL);
-
- msginfo = (MsgInfo*)msgview->msginfo;
- g_return_if_fail(msginfo != NULL);
+ edit = GTK_EDITABLE(textview->text);
+ g_return_val_if_fail(edit != NULL, NULL);
+ body_pos = textview->body_pos;
- msginfo_list = g_slist_append(msginfo_list, msginfo);
- g_return_if_fail(msginfo_list);
-
- body = messageview_get_selection(msgview);
- compose_reply_mode((ComposeMode)action, msginfo_list, body);
- g_free(body);
- g_slist_free(msginfo_list);
+ if (edit->has_selection)
+ text = gtkut_editable_get_selection(edit);
+ else if (msgview->filtered)
+ text = gtk_editable_get_chars (edit, body_pos, -1);
+ else
+ text = NULL;
+
+ return text;
}
static void save_as_cb(gpointer data, guint action, GtkWidget *widget)
MsgInfo *msginfo;
gchar *text = NULL;
ComposeMode mode = (ComposeMode)action;
+ TextView *textview;
msginfo = messageview->msginfo;
mlist = g_slist_append(NULL, msginfo);
+ textview = messageview_get_current_textview(messageview);
text = gtkut_editable_get_selection
- (GTK_EDITABLE(messageview->textview->text));
+ (GTK_EDITABLE(textview->text));
if (text && *text == '\0') {
g_free(text);
text = NULL;
}
break;
case COMPOSE_FORWARD_INLINE:
- compose_forward(NULL, msginfo, FALSE, text);
+ compose_forward(NULL, msginfo, FALSE, text, FALSE);
break;
case COMPOSE_FORWARD_AS_ATTACH:
compose_forward_multiple(NULL, mlist);
static void create_filter_cb(gpointer data, guint action, GtkWidget *widget)
{
MessageView *messageview = (MessageView *)data;
- gchar *header = NULL;
- gchar *key = NULL;
-
+ FolderItem * item;
+
if (!messageview->msginfo) return;
+
+ item = messageview->msginfo->folder;
+ summary_msginfo_filter_open(item, messageview->msginfo,
+ (PrefsFilterType)action, 0);
+}
- procmsg_get_filter_keyword(messageview->msginfo, &header, &key,
- (PrefsFilterType)action);
- prefs_filtering_open(NULL, header, key);
-
- g_free(header);
- g_free(key);
+static void create_processing_cb(gpointer data, guint action,
+ GtkWidget *widget)
+{
+ MessageView *messageview = (MessageView *)data;
+ FolderItem * item;
+
+ if (!messageview->msginfo) return;
+
+ item = messageview->msginfo->folder;
+ summary_msginfo_filter_open(item, messageview->msginfo,
+ (PrefsFilterType)action, 1);
}
static void about_cb(gpointer data, guint action, GtkWidget *widget)
{
about_show();
}
+
+static gboolean messageview_update_msg(gpointer source, gpointer data)
+{
+ MsgInfoUpdate *msginfo_update = (MsgInfoUpdate *) source;
+ MessageView *messageview = (MessageView *)data;
+
+ if (messageview->msginfo != msginfo_update->msginfo)
+ return FALSE;
+
+ if (msginfo_update->flags & MSGINFO_UPDATE_DELETED) {
+ messageview_clear(messageview);
+ messageview_update(messageview);
+ }
+
+ return FALSE;
+}