2004-11-16 [colin] 0.9.12cvs148

[claws.git] / src / procmsg.c

diff --git a/src/procmsg.c b/src/procmsg.c
index a9d9d78c61d982fef61377303d11a650a267bb2f..25ecebd0fea17a26648ff572c8fd48661071c4de 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -600,24 +600,31 @@ void procmsg_get_filter_keyword(MsgInfo *msginfo, gchar **header, gchar **key,
        }
 }
 
-void procmsg_empty_trash(void)
+void procmsg_empty_trash(FolderItem *trash)
+{
+       FILE *fp;
+
+       if (trash && trash->total_msgs > 0) {
+               GSList *mlist = folder_item_get_msg_list(trash);
+               GSList *cur;
+               for (cur = mlist ; cur != NULL ; cur = cur->next) {
+                       MsgInfo * msginfo = (MsgInfo *) cur->data;
+                       partial_mark_for_delete(msginfo);
+                       procmsg_msginfo_free(msginfo);
+               }
+
+               folder_item_remove_all_msg(trash);
+       }
+}
+
+void procmsg_empty_all_trash(void)
 {
        FolderItem *trash;
        GList *cur;
 
        for (cur = folder_get_list(); cur != NULL; cur = cur->next) {
                trash = FOLDER(cur->data)->trash;
-               if (trash && trash->total_msgs > 0) {
-                       GSList *mlist = folder_item_get_msg_list(trash);
-                       GSList *cur;
-                       for (cur = mlist ; cur != NULL ; cur = cur->next) {
-                               MsgInfo * msginfo = (MsgInfo *) cur->data;
-                               partial_mark_for_delete(msginfo);
-                               procmsg_msginfo_free(msginfo);
-                       }
-
-                       folder_item_remove_all_msg(trash);
-               }
+               procmsg_empty_trash(trash);
        }
 }
 
@@ -721,7 +728,7 @@ gint procmsg_save_to_outbox(FolderItem *outbox, const gchar *file,
                gchar tmp[MAXPATHLEN + 1];
 
                g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg.out.%08x",
-                          get_rc_dir(), G_DIR_SEPARATOR, (guint)random());
+                          get_rc_dir(), G_DIR_SEPARATOR, (guint) rand());
                
                if (procmsg_remove_special_headers(file, tmp) !=0)
                        return -1;
@@ -1023,7 +1030,10 @@ enum
        Q_NEWS_ACCOUNT_ID  = 5,
        Q_SAVE_COPY_FOLDER = 6,
        Q_REPLY_MESSAGE_ID = 7,
-       Q_FWD_MESSAGE_ID   = 8
+       Q_FWD_MESSAGE_ID   = 8,
+       Q_PRIVACY_SYSTEM   = 9,
+       Q_ENCRYPT          = 10,
+       Q_ENCRYPT_DATA     = 11,
 };
 
 gint procmsg_send_message_queue(const gchar *file)
@@ -1037,6 +1047,9 @@ gint procmsg_send_message_queue(const gchar *file)
                                       {"SCF:",  NULL, FALSE},
                                       {"RMID:", NULL, FALSE},
                                       {"FMID:", NULL, FALSE},
+                                      {"X-Sylpheed-Privacy-System:", NULL, FALSE},
+                                      {"X-Sylpheed-Encrypt:", NULL, FALSE},
+                                      {"X-Sylpheed-Encrypt-Data:", NULL, FALSE},
                                       {NULL,    NULL, FALSE}};
        FILE *fp;
        gint filepos;
@@ -1048,6 +1061,9 @@ gint procmsg_send_message_queue(const gchar *file)
        gchar *savecopyfolder = NULL;
        gchar *replymessageid = NULL;
        gchar *fwdmessageid = NULL;
+       gchar *privacy_system = NULL;
+       gboolean encrypt = FALSE;
+       gchar *encrypt_data = NULL;
        gchar buf[BUFFSIZE];
        gint hnum;
        PrefsAccount *mailac = NULL, *newsac = NULL;
@@ -1092,10 +1108,50 @@ gint procmsg_send_message_queue(const gchar *file)
                case Q_FWD_MESSAGE_ID:
                        if (!fwdmessageid) fwdmessageid = g_strdup(p);
                        break;
+               case Q_PRIVACY_SYSTEM:
+                       if (!privacy_system) privacy_system = g_strdup(p);
+                       break;
+               case Q_ENCRYPT:
+                       if (p[0] == '1') encrypt = TRUE;
+                       break;
+               case Q_ENCRYPT_DATA:
+                       if (!encrypt_data) encrypt_data = g_strdup(p);
+                       break;
                }
        }
        filepos = ftell(fp);
 
+       if (encrypt) {
+               MimeInfo *mimeinfo;
+
+               fclose(fp);
+               
+               mimeinfo = procmime_scan_queue_file(file);
+               if (!privacy_encrypt(privacy_system, mimeinfo, encrypt_data)
+               || (fp = my_tmpfile()) == NULL
+               ||  procmime_write_mimeinfo(mimeinfo, fp) < 0) {
+                       if (fp)
+                               fclose(fp);
+                       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);
+                       g_free(savecopyfolder);
+                       g_free(replymessageid);
+                       g_free(fwdmessageid);
+                       g_free(privacy_system);
+                       g_free(encrypt_data);
+                       return -1;
+               }
+               
+               procmime_mimeinfo_free_all(mimeinfo);
+               rewind(fp);
+               filepos = 0;
+       }
+
        if (to_list) {
                debug_print("Sending message by mail\n");
                if (!from) {
@@ -1132,7 +1188,7 @@ gint procmsg_send_message_queue(const gchar *file)
        }
 
        fseek(fp, filepos, SEEK_SET);
-       if (newsgroup_list && (newsval == 0)) {
+       if (newsgroup_list && (mailval == 0)) {
                Folder *folder;
                gchar *tmp = NULL;
                FILE *tmpfp;
@@ -1175,12 +1231,6 @@ gint procmsg_send_message_queue(const gchar *file)
                g_free(tmp);
        }
 
-       slist_free_strings(to_list);
-       g_slist_free(to_list);
-       slist_free_strings(newsgroup_list);
-       g_slist_free(newsgroup_list);
-       g_free(from);
-       g_free(smtpserver);
        fclose(fp);
 
        /* save message to outbox */
@@ -1238,10 +1288,18 @@ gint procmsg_send_message_queue(const gchar *file)
                g_strfreev(tokens);
        }
 
+       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);
        g_free(savecopyfolder);
        g_free(replymessageid);
        g_free(fwdmessageid);
-       
+       g_free(privacy_system);
+       g_free(encrypt_data);
+
        return (newsval != 0 ? newsval : mailval);
 }