2004-08-24 [colin] 0.9.12cvs79.2
authorColin Leroy <colin@colino.net>
Tue, 24 Aug 2004 06:51:57 +0000 (06:51 +0000)
committerColin Leroy <colin@colino.net>
Tue, 24 Aug 2004 06:51:57 +0000 (06:51 +0000)
* src/compose.c
Check conversion result before replacing buffer

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/compose.c

index f3bfb8cbcda90bf54e705aab5ec9ad489e6a57c5..999abddaa96206691d457c960f25ab447e412427 100644 (file)
@@ -1,3 +1,8 @@
+2004-08-24 [colin]     0.9.12cvs79.2
+
+       * src/compose.c
+               Check conversion result before replacing buffer
+
 2004-08-23 [colin]     0.9.12cvs79.1
 
        * src/compose.c
index 34dfb978fbe0906ebfe97afdd047ec108bc026c4..7fa4111bef31d0bb87d56123771502f9870b2e7f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.43 -r 1.382.2.44 src/compose.c; ) > 0.9.12cvs77.3.patchset
 ( cvs diff -u -r 1.30.2.1 -r 1.30.2.2 src/rfc2015.c; cvs diff -u -r 1.7.2.1 -r 1.7.2.2 src/rfc2015.h; ) > 0.9.12cvs78.1.patchset
 ( cvs diff -u -r 1.382.2.44 -r 1.382.2.45 src/compose.c; ) > 0.9.12cvs79.1.patchset
+( cvs diff -u -r 1.382.2.45 -r 1.382.2.46 src/compose.c; ) > 0.9.12cvs79.2.patchset
index 23f0473eeef85c5f77ba454ea5aa3e5eb9b55401..7bbf9394d047f4d3f69b9b00fd870326234e546e 100644 (file)
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=79
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.1
+EXTRA_GTK2_VERSION=.2
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
@@ -535,7 +535,7 @@ AC_ARG_ENABLE(pgpmime-plugin,
        [  --disable-pgpmime-plugin           Do not build PGP/MIME plugin],
        [ac_cv_enable_pgpmime_plugin=$enableval], [ac_cv_enable_pgpmime_plugin=yes])
 if test x"$ac_cv_enable_gpgme" = xyes -a x"$ac_cv_enable_pgpmime_plugin" = xyes; then
-       PLUGINS="pgpmime $PLUGINS"
+       PLUGINS="pgpmime pgpinline $PLUGINS"
 fi
 AM_CONDITIONAL(BUILD_PGPMIME_PLUGIN, test x"$ac_cv_enable_pgpmime_plugin" = xyes)
 
@@ -643,6 +643,7 @@ src/plugins/trayicon/Makefile
 src/plugins/trayicon/libeggtrayicon/Makefile
 src/plugins/clamav/Makefile
 src/plugins/pgpmime/Makefile
+src/plugins/pgpinline/Makefile
 doc/Makefile
 doc/faq/Makefile
 doc/faq/de/Makefile
index 9ec107b98db620ff80fc9c0f4f59a2079f83d816..5b5be8d24bf213faf65b86c5213427bc492a4d84 100644 (file)
@@ -3839,8 +3839,10 @@ static gint compose_write_to_file(Compose *compose, const gchar *file,
                        return -1;
                }
                tmpbuf = conv_codeset_strdup(buf, CS_UTF_8, out_codeset);
-               g_free(buf);
-               buf = tmpbuf;
+               if (tmpbuf) {
+                       g_free(buf);
+                       buf = tmpbuf;
+               }
        }
 #endif