From: Colin Leroy Date: Tue, 24 Aug 2004 06:51:57 +0000 (+0000) Subject: 2004-08-24 [colin] 0.9.12cvs79.2 X-Git-Tag: gtk2_win32_last_merge~203 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=12f08dc5945c2bc73dc9f0c8a38d1b8eaa39b64d 2004-08-24 [colin] 0.9.12cvs79.2 * src/compose.c Check conversion result before replacing buffer --- diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index f3bfb8cbc..999abddaa 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -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 diff --git a/PATCHSETS b/PATCHSETS index 34dfb978f..7fa4111be 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -134,3 +134,4 @@ ( 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 diff --git a/configure.ac b/configure.ac index 23f0473ee..7bbf9394d 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/compose.c b/src/compose.c index 9ec107b98..5b5be8d24 100644 --- a/src/compose.c +++ b/src/compose.c @@ -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