2012-08-27 [wwp] 3.8.1cvs36

[claws.git] / src / procmsg.c

diff --git a/src/procmsg.c b/src/procmsg.c
index dab25a9ea431a7d8dbd6fac04e75ad94478571d6..e3e395f339dc3441a8bb4b44ce32f384bf862378 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -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
@@ -49,6 +49,8 @@
 #include "timing.h"
 #include "inc.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);
 static void procmsg_update_unread_children     (MsgInfo        *info,
@@ -756,6 +758,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;
@@ -1715,6 +1763,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;