2005-02-23 [colin] 1.0.1cvs15.6

	* src/compose.c
		Fix Mimeinfo leakage (including tmp files)
	* src/procmsg.c
		Fix tmp file leakage (spotted by Ivan Rayner)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 225479b3f3fe2fa62ad192f7e4c14480a9c12a33..1f2f64cd03712ee830ace3d832befc35cc328f41 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2005-02-23 [colin]     1.0.1cvs15.6
+
+       * src/compose.c
+               Fix Mimeinfo leakage (including tmp files)
+       * src/procmsg.c
+               Fix tmp file leakage (spotted by Ivan Rayner)
+

 2005-02-22 [colin]     1.0.1cvs15.5
 
        * src/expldifdlg.c
 2005-02-22 [colin]     1.0.1cvs15.5
 
        * src/expldifdlg.c

diff --git a/PATCHSETS b/PATCHSETS
index 68f297d03c346fe7972378c153539948677bd0b7..7a8eb7f801dbd0175a26af33461208a2e82509d5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -394,3 +394,4 @@
 ( cvs diff -u -r 1.115.2.28 -r 1.115.2.29 src/main.c; ) > 1.0.1cvs15.3.patchset
 ( cvs diff -u -r 1.382.2.104 -r 1.382.2.105 src/compose.c; cvs diff -u -r 1.204.2.31 -r 1.204.2.32 src/prefs_common.c; cvs diff -u -r 1.395.2.54 -r 1.395.2.55 src/summaryview.c; ) > 1.0.1cvs15.4.patchset
 ( cvs diff -u -r 1.1.4.7 -r 1.1.4.9 src/expldifdlg.c; ) > 1.0.1cvs15.5.patchset
 ( cvs diff -u -r 1.115.2.28 -r 1.115.2.29 src/main.c; ) > 1.0.1cvs15.3.patchset
 ( cvs diff -u -r 1.382.2.104 -r 1.382.2.105 src/compose.c; cvs diff -u -r 1.204.2.31 -r 1.204.2.32 src/prefs_common.c; cvs diff -u -r 1.395.2.54 -r 1.395.2.55 src/summaryview.c; ) > 1.0.1cvs15.4.patchset
 ( cvs diff -u -r 1.1.4.7 -r 1.1.4.9 src/expldifdlg.c; ) > 1.0.1cvs15.5.patchset

+( cvs diff -u -r 1.382.2.105 -r 1.382.2.106 src/compose.c; cvs diff -u -r 1.150.2.20 -r 1.150.2.21 src/procmsg.c; ) > 1.0.1cvs15.6.patchset

diff --git a/configure.ac b/configure.ac
index 3f39b0bc8af0edfdd34523b1cad6f79910803af7..791d90a9fb52e98cedb0be3a45f7a0bc299ffc1b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=15
 EXTRA_RELEASE=
 BINARY_AGE=0
 EXTRA_VERSION=15
 EXTRA_RELEASE=

-EXTRA_GTK2_VERSION=.5
+EXTRA_GTK2_VERSION=.6

 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/compose.c b/src/compose.c
index 6702e3d0855b07c5c1d0f6e1d0a55c8ad2dba190..aab311b75685385477ff289ff58752deb6315b5b 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3390,6 +3390,8 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
                        return -1;
 
        procmime_write_mimeinfo(mimemsg, fp);
                        return -1;
 
        procmime_write_mimeinfo(mimemsg, fp);

+       
+       procmime_mimeinfo_free_all(mimemsg);

 
        return 0;
 }
 
        return 0;
 }

diff --git a/src/procmsg.c b/src/procmsg.c
index 01d4e19b4d64b4f3444c2be988f3a8a144dfd80b..38030e729401f9d9bca8dce3ed86f9fc59bae89f 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -1173,7 +1173,6 @@ gint procmsg_send_message_queue(const gchar *file)
                                content = file_read_stream_to_str(fp);
                                rewind(fp);
 
                                content = file_read_stream_to_str(fp);
                                rewind(fp);
 

-                               get_tmpfile_in_dir(get_mime_tmp_dir(), &tmp_enc_file);

                                str_write_to_file(content, tmp_enc_file);
                                g_free(content);
                        } else {
                                str_write_to_file(content, tmp_enc_file);
                                g_free(content);
                        } else {


@@ -1281,11 +1280,15 @@ gint procmsg_send_message_queue(const gchar *file)
                        procmsg_save_to_outbox(outbox, file, TRUE);
                } else {
                        procmsg_save_to_outbox(outbox, tmp_enc_file, FALSE);
                        procmsg_save_to_outbox(outbox, file, TRUE);
                } else {
                        procmsg_save_to_outbox(outbox, tmp_enc_file, FALSE);

-                       unlink(tmp_enc_file);
-                       free(tmp_enc_file);

                }
        }
 
                }
        }
 

+       if (tmp_enc_file != NULL) {
+               unlink(tmp_enc_file);
+               free(tmp_enc_file);
+               tmp_enc_file = NULL;
+       }
+

        if (replymessageid != NULL || fwdmessageid != NULL) {
                gchar **tokens;
                FolderItem *item;
        if (replymessageid != NULL || fwdmessageid != NULL) {
                gchar **tokens;
                FolderItem *item;