2012-10-12 [mones] 3.8.1cvs98
[claws.git] / src / procmsg.c
index dab25a9ea431a7d8dbd6fac04e75ad94478571d6..8a0e0e08603ac4ee97a9763ab2c2c31bbea06f0c 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,6 +48,9 @@
 #include "tags.h"
 #include "timing.h"
 #include "inc.h"
+#include "privacy.h"
+
+extern SessionStats session_stats;
 
 static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_session, gchar **errstr,
                                            FolderItem *queue, gint msgnum, gboolean *queued_removed);
@@ -86,6 +89,19 @@ void procmsg_msg_list_free(GSList *mlist)
        g_slist_free(mlist);
 }
 
+MsgNumberList *procmsg_get_number_list_for_msgs(MsgInfoList *msglist)
+{
+       GSList *cur = NULL;
+       GSList *nums = NULL;
+
+       for (cur = msglist; cur; cur = cur->next) {
+               MsgInfo *msg = (MsgInfo *)cur->data;
+               nums = g_slist_prepend(nums, GUINT_TO_POINTER(msg->msgnum));
+       }
+
+       return g_slist_reverse(nums);
+}
+
 struct MarkSum {
        gint *new_msgs;
        gint *unread_msgs;
@@ -756,6 +772,52 @@ static PrefsAccount *procmsg_get_account_from_file(const gchar *file)
        return mailac;
 }
 
+gchar *procmsg_msginfo_get_identifier(MsgInfo *msginfo)
+{
+       gchar *folder_id;
+       const gchar *msgid;
+       gchar *id;
+
+       cm_return_val_if_fail(msginfo != NULL, NULL);
+       folder_id = folder_item_get_identifier(msginfo->folder);
+       msgid = msginfo->msgid;
+
+       id = g_strconcat(folder_id, G_DIR_SEPARATOR_S, msgid, NULL);
+
+       g_free(folder_id);
+
+       return id;
+}
+
+MsgInfo *procmsg_get_msginfo_from_identifier(const gchar *id)
+{
+       gchar *folder_id = g_strdup(id);
+       gchar *separator = strrchr(folder_id, G_DIR_SEPARATOR);
+       const gchar *msgid;
+       FolderItem *item;
+       MsgInfo *msginfo;
+
+       if (separator == NULL) {
+               g_free(folder_id);
+               return NULL;
+       }
+
+       *separator = '\0';
+       msgid = separator + 1;
+
+       item = folder_find_item_from_identifier(folder_id);
+
+       if (item == NULL) {
+               g_free(folder_id);
+               return NULL;
+       }
+
+       msginfo = folder_item_get_msginfo_by_msgid(item, msgid);
+       g_free(folder_id);
+
+       return msginfo;
+}
+
 static GSList *procmsg_list_sort_by_account(FolderItem *queue, GSList *list)
 {
        GSList *result = NULL;
@@ -826,7 +888,7 @@ static gboolean procmsg_is_last_for_account(FolderItem *queue, MsgInfo *msginfo,
 {
        gchar *file = folder_item_fetch_msg(queue, msginfo->msgnum);
        PrefsAccount *ac = procmsg_get_account_from_file(file);
-       GSList *cur = elem;
+       GSList *cur;
        g_free(file);
        for (cur = elem; cur; cur = cur->next) {
                MsgInfo *cur_msginfo = (MsgInfo *)cur->data;
@@ -1089,6 +1151,7 @@ static gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
        return 0;
 }
 
+
 void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline)
 {
        static const gchar *def_cmd = "lpr %s";
@@ -1119,17 +1182,20 @@ void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline)
                return;
        }
 
-       if (msginfo->date) r = fprintf(prfp, "Date: %s\n", msginfo->date);
-       if (msginfo->from) r = fprintf(prfp, "From: %s\n", msginfo->from);
-       if (msginfo->to)   r = fprintf(prfp, "To: %s\n", msginfo->to);
-       if (msginfo->cc)   r = fprintf(prfp, "Cc: %s\n", msginfo->cc);
-       if (msginfo->newsgroups)
-               r = fprintf(prfp, "Newsgroups: %s\n", msginfo->newsgroups);
-       if (msginfo->subject) r = fprintf(prfp, "Subject: %s\n", msginfo->subject);
-       fputc('\n', prfp);
+       if (msginfo->date) { r = fprintf(prfp, "Date: %s\n", msginfo->date); if (r < 0) goto fpferr; }
+       if (msginfo->from) { r = fprintf(prfp, "From: %s\n", msginfo->from); if (r < 0) goto fpferr; }
+       if (msginfo->to)   { r = fprintf(prfp, "To: %s\n", msginfo->to); if (r < 0) goto fpferr; }
+       if (msginfo->cc)   { r = fprintf(prfp, "Cc: %s\n", msginfo->cc); if (r < 0) goto fpferr; }
+       if (msginfo->newsgroups) {
+               r = fprintf(prfp, "Newsgroups: %s\n", msginfo->newsgroups); if (r < 0) goto fpferr;
+       }
+       if (msginfo->subject) { r = fprintf(prfp, "Subject: %s\n", msginfo->subject); if (r < 0) goto fpferr; }
+       if (fputc('\n', prfp) == EOF) goto fpferr;
 
-       while (fgets(buf, sizeof(buf), tmpfp) != NULL)
+       while (fgets(buf, sizeof(buf), tmpfp) != NULL) {
                r = fputs(buf, prfp);
+               if (r == EOF) goto fpferr;
+       }
 
        fclose(prfp);
        fclose(tmpfp);
@@ -1151,6 +1217,12 @@ void procmsg_print_message(MsgInfo *msginfo, const gchar *cmdline)
                strncat(buf, "&", sizeof(buf) - strlen(buf) - 1);
        if (system(buf) == -1)
                g_warning("system(%s) failed.", buf);
+       return;
+fpferr:
+       FILE_OP_ERROR(prtmp, "fprintf/fputc/fputs");
+       g_free(prtmp);
+       fclose(tmpfp);
+       fclose(prfp);
 }
 
 MsgInfo *procmsg_msginfo_new_ref(MsgInfo *msginfo)
@@ -1359,8 +1431,7 @@ void procmsg_msginfo_free(MsgInfo *msginfo)
                g_free(msginfo->extradata->account_login);
                g_free(msginfo->extradata);
        }
-       slist_free_strings(msginfo->references);
-       g_slist_free(msginfo->references);
+       slist_free_strings_full(msginfo->references);
        g_slist_free(msginfo->tags);
 
        g_free(msginfo->plaintext_file);
@@ -1477,8 +1548,6 @@ static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_ses
        gboolean save_clear_text = TRUE;
        gchar *tmp_enc_file = NULL;
 
-       int local = 0;
-
        cm_return_val_if_fail(file != NULL, -1);
 
        if ((fp = g_fopen(file, "rb")) == NULL) {
@@ -1572,10 +1641,8 @@ send_mail:
                        procmime_mimeinfo_free_all(mimeinfo);
                        g_free(from);
                        g_free(smtpserver);
-                       slist_free_strings(to_list);
-                       g_slist_free(to_list);
-                       slist_free_strings(newsgroup_list);
-                       g_slist_free(newsgroup_list);
+                       slist_free_strings_full(to_list);
+                       slist_free_strings_full(newsgroup_list);
                        g_free(savecopyfolder);
                        g_free(replymessageid);
                        g_free(fwdmessageid);
@@ -1622,7 +1689,6 @@ send_mail:
                } else if (mailac && mailac->use_mail_command &&
                           mailac->mail_command && (* mailac->mail_command)) {
                        mailval = send_message_local(mailac->mail_command, fp);
-                       local = 1;
                } else {
                        if (!mailac) {
                                mailac = account_find_from_smtp_server(from, smtpserver);
@@ -1715,6 +1781,17 @@ send_mail:
 
        fclose(fp);
 
+       /* update session statistics */
+       if (mailval == 0 && newsval == 0) {
+               /* update session stats */
+               if (replymessageid)
+                       session_stats.replied++;
+               else if (fwdmessageid)
+                       session_stats.forwarded++;
+               else
+                       session_stats.sent++;
+       }
+
        /* save message to outbox */
        if (mailval == 0 && newsval == 0 && savecopyfolder) {
                FolderItem *outbox;
@@ -1804,10 +1881,8 @@ send_mail:
 
        g_free(from);
        g_free(smtpserver);
-       slist_free_strings(to_list);
-       g_slist_free(to_list);
-       slist_free_strings(newsgroup_list);
-       g_slist_free(newsgroup_list);
+       slist_free_strings_full(to_list);
+       slist_free_strings_full(newsgroup_list);
        g_free(savecopyfolder);
        g_free(replymessageid);
        g_free(fwdmessageid);