2004-11-16 [colin] 0.9.12cvs147.1

[claws.git] / src / procmsg.c

diff --git a/src/procmsg.c b/src/procmsg.c
index 9e5d41180abe95c277c179fd2a982943cd274726..accc7f2335ca832145a8f7372321945b76bdf0eb 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);
        }
 }
 
@@ -1102,34 +1109,43 @@ gint procmsg_send_message_queue(const gchar *file)
                        if (!fwdmessageid) fwdmessageid = g_strdup(p);
                        break;
                case Q_PRIVACY_SYSTEM:
-                       if (privacy_system == NULL) privacy_system = g_strdup(p);
+                       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 == NULL) encrypt_data = g_strdup(p);
+                       if (!encrypt_data) encrypt_data = g_strdup(p);
                        break;
                }
        }
        filepos = ftell(fp);
 
        if (encrypt) {
-               /* FIXME: memory leaks, in case of errors */
                MimeInfo *mimeinfo;
 
                fclose(fp);
-
+               
                mimeinfo = procmime_scan_queue_file(file);
-               if (!privacy_encrypt(privacy_system, mimeinfo, encrypt_data))
-                       return -1;
-
-               fp = my_tmpfile();
-               if (procmime_write_mimeinfo(mimeinfo, fp) < 0) {
-                       fclose(fp);
+               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;
@@ -1214,12 +1230,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 */
@@ -1277,10 +1287,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);
 }