#include "procheader.h"
#include "procmime.h"
#include "account.h"
+#include "action.h"
#include "prefs_common.h"
#include "prefs_account.h"
#include "gtkutils.h"
#include "utils.h"
#include "rfc2015.h"
#include "send_message.h"
-#include "pgptext.h"
#include "stock_pixmap.h"
+#include "hooks.h"
+static GList *messageview_list = NULL;
static void messageview_change_view_type(MessageView *messageview,
MessageType type);
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/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Tools/Actio_ns"), NULL, NULL, 0, "<Branch>"},
{N_("/_Help"), NULL, NULL, 0, "<Branch>"},
{N_("/_Help/_About"), NULL, about_cb, 0, NULL}
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(textview),
TRUE, TRUE, 0);
+ gtk_widget_show(vbox);
/* to remove without destroyed */
gtk_widget_ref(GTK_WIDGET_PTR(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;
}
GtkWidget *handlebox;
GtkWidget *vbox;
GtkWidget *menubar;
+ GtkItemFactory *ifactory;
guint n_menu_entries;
vbox = gtk_vbox_new(FALSE, 0);
gtk_container_add(GTK_CONTAINER(vbox),
GTK_WIDGET_PTR(msgview));
+ ifactory = gtk_item_factory_from_widget(menubar);
+ action_update_msgview_menu(ifactory, msgview);
+
msgview_list = g_list_append(msgview_list, msgview);
}
gtk_window_set_title(GTK_WINDOW(window), _("Sylpheed - Message View"));
gtk_window_set_wmclass(GTK_WINDOW(window), "message_view", "Sylpheed");
gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
- gtk_widget_set_usize(window, prefs_common.msgwin_width,
- prefs_common.msgwin_height);
+ gtk_widget_set_size_request(window, prefs_common.msgwin_width,
+ prefs_common.msgwin_height);
msgview = messageview_create(mainwin);
- gtk_signal_connect(GTK_OBJECT(window), "size_allocate",
- GTK_SIGNAL_FUNC(messageview_size_allocate_cb),
- msgview);
- gtk_signal_connect(GTK_OBJECT(window), "destroy",
- GTK_SIGNAL_FUNC(messageview_destroy_cb), msgview);
- gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
- GTK_SIGNAL_FUNC(key_pressed), msgview);
+ g_signal_connect(G_OBJECT(window), "size_allocate",
+ G_CALLBACK(messageview_size_allocate_cb),
+ msgview);
+ g_signal_connect(G_OBJECT(window), "destroy",
+ G_CALLBACK(messageview_destroy_cb), msgview);
+ g_signal_connect(G_OBJECT(window), "key_press_event",
+ G_CALLBACK(key_pressed), msgview);
messageview_add_toolbar(msgview, window);
dest[len - 1] = '\0';
return;
} else
- conv_encode_header(dest, len, src, header_len);
-}
-
-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;
+ conv_encode_header(dest, len, src, header_len, FALSE);
}
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;
if ((!msginfo->returnreceiptto) &&
(!msginfo->dispositionnotificationto))
"receipt."), to, buf);
val = alertpanel(_("Warning"), message, _("Send"),
_("+Don't Send"), NULL);
+ g_free(message);
if (val != G_ALERTDEFAULT)
return -1;
}
g_warning("can't change file mode\n");
}
+ /* 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", to);
+
+ /* 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;
}
+GList *messageview_get_window_list(void)
+{
+ return messageview_list;
+}
+
void messageview_show(MessageView *messageview, MsgInfo *msginfo,
gboolean all_headers)
{
- FILE *fp;
gchar *file;
MimeInfo *mimeinfo;
g_return_if_fail(msginfo != NULL);
-#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);
+ g_return_if_fail(mimeinfo != NULL);
file = procmsg_get_message_file_path(msginfo);
if (!file) {
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) {
+ if (mimeinfo->mime_type != MIME_TEXT) {
messageview_change_view_type(messageview, MVIEW_MIME);
mimeview_show_message(messageview->mimeview, mimeinfo, file);
} else {
procmime_mimeinfo_free_all(mimeinfo);
}
- if (MSG_IS_RETRCPT_PENDING(msginfo->flags))
- return_receipt_show(messageview->noticeview, msginfo);
+ 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);
{
TextView *textview = messageview->textview;
MimeView *mimeview = messageview->mimeview;
+ gboolean hadfocus = GTK_WIDGET_HAS_FOCUS(textview->text);
if (messageview->type == type) return;
GTK_WIDGET_PTR(textview), TRUE, TRUE, 0);
} else
return;
+ if (hadfocus) gtk_widget_grab_focus(textview->text);
messageview->type = type;
}
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;
headerview_clear(messageview->headerview);
textview_clear(messageview->textview);
noticeview_hide(messageview->noticeview);
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);
void messageview_delete(MessageView *msgview)
{
- MsgInfo *msginfo = (MsgInfo*)msgview->msginfo;
- SummaryView *summaryview = (SummaryView*)msgview->mainwin->summaryview;
+ MsgInfo *msginfo = (MsgInfo *) msgview->msginfo;
FolderItem *trash = folder_get_default_trash();
- GSList *msg_list;
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);
-
- 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);
-
- 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 */
}
}
return text;
}
+MimeInfo *messageview_get_selected_mime_part(MessageView *messageview)
+{
+ if (messageview->type == MVIEW_MIME)
+ return mimeview_get_selected_part(messageview->mimeview);
+
+ return NULL;
+}
+
void messageview_copy_clipboard(MessageView *messageview)
{
TextView *text;
text = messageview_get_current_textview(messageview);
- if (text)
- gtk_editable_copy_clipboard(GTK_EDITABLE(text->text));
+ if (text) {
+ GtkTextView *textview = GTK_TEXT_VIEW(text->text);
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer(textview);
+ GtkClipboard *clipboard
+ = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+
+ gtk_text_buffer_copy_clipboard(buffer, clipboard);
+ }
}
void messageview_select_all(MessageView *messageview)
static void return_receipt_show(NoticeView *noticeview, MsgInfo *msginfo)
{
- noticeview_set_text(noticeview, _("This messages asks for a return receipt."));
+ noticeview_set_text(noticeview, _("This message asks for a return receipt"));
noticeview_set_button_text(noticeview, _("Send receipt"));
noticeview_set_button_press_callback(noticeview,
GTK_SIGNAL_FUNC(return_receipt_send_clicked),
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;
+ GtkTextView *edit = NULL;
+ GtkTextBuffer *textbuf;
+ 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));
+ textview = messageview_get_current_textview(msgview);
+ if (textview) {
+ edit = GTK_TEXT_VIEW(textview->text);
+ body_pos = textview->body_pos;
+ } else {
+ edit = GTK_TEXT_VIEW(msgview->mimeview->textview->text);
+ body_pos = msgview->mimeview->textview->body_pos;
}
- return text;
-}
-
-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);
+ g_return_val_if_fail(edit != NULL, NULL);
- msginfo = (MsgInfo*)msgview->msginfo;
- g_return_if_fail(msginfo != NULL);
+ textbuf = gtk_text_view_get_buffer(edit);
- msginfo_list = g_slist_append(msginfo_list, msginfo);
- g_return_if_fail(msginfo_list);
+ if (gtk_text_buffer_get_selection_bounds(textbuf, NULL, NULL))
+ return gtkut_text_view_get_selection(edit);
+ else if (msgview->filtered) {
+ GtkTextIter start_iter, end_iter;
+ gtk_text_buffer_get_iter_at_offset(textbuf, &start_iter, body_pos);
+ gtk_text_buffer_get_end_iter(textbuf, &end_iter);
+ gtk_text_buffer_get_text(textbuf, &start_iter, &end_iter, FALSE);
+ } else
+ text = NULL;
- body = messageview_get_selection(msgview);
- compose_reply_mode((ComposeMode)action, msginfo_list, body);
- g_free(body);
- g_slist_free(msginfo_list);
+ return text;
}
static void save_as_cb(gpointer data, guint action, GtkWidget *widget)
static void create_filter_cb(gpointer data, guint action, GtkWidget *widget)
{
+ MessageView *messageview = (MessageView *)data;
+ gchar *header = NULL;
+ gchar *key = NULL;
+
+ if (!messageview->msginfo) return;
+
+ procmsg_get_filter_keyword(messageview->msginfo, &header, &key,
+ (PrefsFilterType)action);
+ prefs_filtering_open(NULL, header, key);
+
+ g_free(header);
+ g_free(key);
}
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;
+}
projects / claws.git / blobdiff