2005-01-26 [paul] 1.0.0cvs15

	* ChangeLog
	* ChangeLog.jp
	* src/common/template.c
		sync with main, (fix memory leak), see ChangeLog
		2005-01-25

diff --git a/ChangeLog b/ChangeLog
index 35c23ff25928e056e3008c5920d5a43f192af897..3f6491861d47c283288df76bb77f05f4cd8930c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-25
+
+       * src/template.c: template_write_config(): fixed a memory leak.
+
+2005-01-25
+
+       * src/inc.c: inc_finished(): removed warning when updating a
+         folder item while no folder is selected.
+
 2005-01-19
 
        * src/mh.c

diff --git a/ChangeLog.claws b/ChangeLog.claws
index fb574a8d2b64297525a5291174b9064deeffa315..390e5918397841f2cf07bbf75acbc8a72f70f8d8 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2005-01-26 [paul]      1.0.0cvs15
+
+       * ChangeLog
+       * ChangeLog.jp
+       * src/common/template.c
+               sync with main, (fix memory leak), see ChangeLog
+               2005-01-25
+
 2005-01-25 [paul]      1.0.0cvs14
 
        * src/compose.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index d7c953509f340083f786d559c5cb38abde91f8f8..19e9143c84ad62794846b7878e34235784e8ff04 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,12 @@
+2005-01-25
+
+       * src/template.c: template_write_config(): ¥á¥â¥ê¥ê¡¼¥¯¤ò½¤Àµ¡£
+
+2005-01-25
+
+       * src/inc.c: inc_finished(): ¥Õ¥©¥ë¥À¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Ê¤¤¤È¤­¤Ë
+         ¥Õ¥©¥ë¥À¥¢¥¤¥Æ¥à¤ò¹¹¿·¤·¤è¤¦¤È¤·¤¿¤È¤­¤Î·Ù¹ð¤ò½üµî¡£
+
 2005-01-19
 
        * src/mh.c

diff --git a/PATCHSETS b/PATCHSETS
index b6898b2c1305a405121dc24b308f93ac44f39799..ee6775047cc367c347ab2ee1ec7167245b88aeab 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -222,3 +222,4 @@
 ( cvs diff -u -r 1.455 -r 1.456 ChangeLog; cvs diff -u -r 1.450 -r 1.451 ChangeLog.jp; cvs diff -u -r 1.128 -r 1.129 src/messageview.c; cvs diff -u -r 1.86 -r 1.87 src/mh.c; cvs diff -u -r 1.61 -r 1.62 src/common/utils.c; ) > 1.0.0cvs12.patchset
 ( cvs diff -u -r 1.456 -r 1.457 src/summaryview.c; ) > 1.0.0cvs13.patchset
 ( cvs diff -u -r 1.466 -r 1.467 src/compose.c; ) > 1.0.0cvs14.patchset
+( cvs diff -u -r 1.456 -r 1.457 ChangeLog; cvs diff -u -r 1.451 -r 1.452 ChangeLog.jp; cvs diff -u -r 1.3 -r 1.4 src/common/template.c; ) > 1.0.0cvs15.patchset

diff --git a/configure.ac b/configure.ac
index a500750e12203d072f80a63a23bd047deeb47798..d280ab3a21300f75d6db75361936af9d24b6778d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/common/template.c b/src/common/template.c
index 9d6769a9dfb5769a0c46bf25dc2da0be3a5e0243..b43c7f4bdd6ab51eb6a1baca23d9f35b155056de 100644 (file)
--- a/src/common/template.c
+++ b/src/common/template.c
@@ -205,6 +205,7 @@ void template_write_config(GSList *tmpl_list)
                fputs("\n", fp);
                fwrite(tmpl->value, sizeof(gchar) * strlen(tmpl->value), 1, fp);
                fclose(fp);
+               g_free(filename);
        }
 }