From e0a7649792b4f4cf3fe9e63d418e380ac35496ac Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 16 Nov 2004 08:58:42 +0000 Subject: [PATCH] 2004-11-16 [colin] 0.9.12cvs146.14 * src/compose.c Remove useless chunk of code Patch by Alfons --- ChangeLog-gtk2.claws | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/compose.c | 8 -------- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index d2b4c75f1..3c16bb665 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,9 @@ +2004-11-16 [colin] 0.9.12cvs146.14 + + * src/compose.c + Remove useless chunk of code + Patch by Alfons + 2004-11-15 [colin] 0.9.12cvs146.13 * src/compose.c diff --git a/PATCHSETS b/PATCHSETS index 2b055b55a..4f4885b9a 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -238,3 +238,4 @@ ( cvs diff -u -r 1.395.2.40 -r 1.395.2.41 src/summaryview.c; cvs diff -u -r 1.3.2.11 -r 1.3.2.12 src/prefs_themes.c; cvs diff -u -r 1.94.2.33 -r 1.94.2.34 src/messageview.c; ) > 0.9.12cvs146.11.patchset ( cvs diff -u -r 1.382.2.64 -r 1.382.2.65 src/compose.c; cvs diff -u -r 1.59.2.9 -r 1.59.2.10 src/prefs_filtering.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/prefs_filtering_action.c; cvs diff -u -r 1.30.2.6 -r 1.30.2.7 src/prefs_toolbar.c; ) > 0.9.12cvs146.12.patchset ( cvs diff -u -r 1.382.2.65 -r 1.382.2.66 src/compose.c; ) > 0.9.12cvs146.13.patchset +( cvs diff -u -r 1.382.2.66 -r 1.382.2.67 src/compose.c; ) > 0.9.12cvs146.14.patchset diff --git a/configure.ac b/configure.ac index 7427ad3fa..271f04e46 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ INTERFACE_AGE=0 BINARY_AGE=0 EXTRA_VERSION=146 EXTRA_RELEASE= -EXTRA_GTK2_VERSION=.13 +EXTRA_GTK2_VERSION=.14 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 9075f69d0..83e9b0e94 100644 --- a/src/compose.c +++ b/src/compose.c @@ -4122,20 +4122,12 @@ static gchar *compose_get_header(Compose *compose) /* Subject */ str = gtk_editable_get_chars(GTK_EDITABLE(compose->subject_entry), 0, -1); if (*str != '\0' && !IS_IN_CUSTOM_HEADER("Subject")) { - gchar *tmpstr; - - tmpstr = g_strdup(str); - if (tmpstr == NULL) { - g_string_free(header, TRUE); - return NULL; - } g_strstrip(str); if (*str != '\0') { compose_convert_header(buf, sizeof(buf), str, strlen("Subject: "), FALSE); g_string_append_printf(header, "Subject: %s\n", buf); } - g_free(tmpstr); } g_free(str);