From: Colin Leroy Date: Mon, 31 Jan 2005 13:26:01 +0000 (+0000) Subject: 2005-01-31 [colin] 1.0.0cvs24.1 X-Git-Tag: rel_1_9_6~73 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=9aee30fc3194404d3e087449472f5a4a4c6cb99f 2005-01-31 [colin] 1.0.0cvs24.1 * src/compose.c Sync with HEAD --- diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 66c21e8e7..d0c019073 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,8 @@ +2005-01-31 [colin] 1.0.0cvs24.1 + + * src/compose.c + Sync with HEAD + 2005-01-29 [paul] 1.0.0cvs23.2 * src/account.c diff --git a/PATCHSETS b/PATCHSETS index dd5fb1d3e..012856dad 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -350,3 +350,4 @@ ( cvs diff -u -r 1.213.2.22 -r 1.213.2.23 src/folder.c; cvs diff -u -r 1.207.2.26 -r 1.207.2.27 src/folderview.c; ) > 1.0.0cvs21.1.patchset ( cvs diff -u -r 1.207.2.27 -r 1.207.2.28 src/folderview.c; ) > 1.0.0cvs23.1.patchset ( cvs diff -u -r 1.61.2.20 -r 1.61.2.21 src/account.c; cvs diff -u -r 1.12.2.18 -r 1.12.2.19 src/action.c; cvs diff -u -r 1.9.2.2 -r 1.9.2.3 src/addressadd.c; cvs diff -u -r 1.60.2.13 -r 1.60.2.14 src/addressbook.c; cvs diff -u -r 1.17.2.9 -r 1.17.2.10 src/alertpanel.c; cvs diff -u -r 1.382.2.90 -r 1.382.2.91 src/compose.c; cvs diff -u -r 1.14.2.4 -r 1.14.2.5 src/editaddress.c; cvs diff -u -r 1.5.12.1 -r 1.5.12.2 src/editbook.c; cvs diff -u -r 1.11.2.4 -r 1.11.2.5 src/editgroup.c; cvs diff -u -r 1.5.12.1 -r 1.5.12.2 src/editjpilot.c; cvs diff -u -r 1.8.2.2 -r 1.8.2.3 src/editldap.c; cvs diff -u -r 1.10.2.2 -r 1.10.2.3 src/editldap_basedn.c; cvs diff -u -r 1.5.12.1 -r 1.5.12.2 src/editvcard.c; cvs diff -u -r 1.8.2.4 -r 1.8.2.5 src/export.c; cvs diff -u -r 1.26.2.10 -r 1.26.2.11 src/foldersel.c; cvs diff -u -r 1.14.2.6 -r 1.14.2.7 src/grouplistdialog.c; cvs diff -u -r 1.13.2.5 -r 1.13.2.6 src/import.c; cvs diff -u -r 1.14.2.2 -r 1.14.2.3 src/importldif.c; cvs diff -u -r 1.149.2.19 -r 1.149.2.20 src/inc.c; cvs diff -u -r 1.115.2.26 -r 1.115.2.27 src/main.c; cvs diff -u -r 1.274.2.28 -r 1.274.2.29 src/mainwindow.c; cvs diff -u -r 1.3.12.6 -r 1.3.12.7 src/message_search.c; cvs diff -u -r 1.94.2.39 -r 1.94.2.40 src/messageview.c; cvs diff -u -r 1.83.2.26 -r 1.83.2.27 src/mimeview.c; cvs diff -u -r 1.60.2.10 -r 1.60.2.11 src/prefs_actions.c; cvs diff -u -r 1.204.2.28 -r 1.204.2.29 src/prefs_common.c; cvs diff -u -r 1.103.2.11 -r 1.103.2.12 src/prefs_common.h; cvs diff -u -r 1.16.2.6 -r 1.16.2.7 src/prefs_customheader.c; cvs diff -u -r 1.16.2.6 -r 1.16.2.7 src/prefs_display_header.c; cvs diff -u -r 1.59.2.13 -r 1.59.2.14 src/prefs_filtering.c; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/prefs_filtering_action.c; cvs diff -u -r 1.10.2.9 -r 1.10.2.10 src/prefs_gtk.c; cvs diff -u -r 1.43.2.15 -r 1.43.2.16 src/prefs_matcher.c; cvs diff -u -r 1.10.2.4 -r 1.10.2.5 src/prefs_summary_column.c; cvs diff -u -r 1.12.2.6 -r 1.12.2.7 src/prefs_template.c; cvs diff -u -r 1.9.2.8 -r 1.9.2.9 src/sourcewindow.c; cvs diff -u -r 1.15.2.12 -r 1.15.2.13 src/summary_search.c; cvs diff -u -r 1.395.2.48 -r 1.395.2.49 src/summaryview.c; cvs diff -u -r 1.96.2.39 -r 1.96.2.40 src/textview.c; cvs diff -u -r 1.4.2.5 -r 1.4.2.6 src/gtk/about.c; cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/gtk/description_window.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/gtkshruler.c; cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.6 -r 1.4.2.7 src/gtk/gtkutils.h; cvs diff -u -r 1.2.2.3 -r 1.2.2.4 src/gtk/inputdialog.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/logwindow.c; cvs diff -u -r 1.12.2.14 -r 1.12.2.15 src/gtk/prefswindow.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/progressdialog.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/progressdialog.h; ) > 1.0.0cvs23.2.patchset +( cvs diff -u -r 1.382.2.91 -r 1.382.2.92 src/compose.c; ) > 1.0.0cvs24.1.patchset diff --git a/configure.ac b/configure.ac index 153232f54..658c34f9a 100644 --- a/configure.ac +++ b/configure.ac @@ -11,9 +11,9 @@ MINOR_VERSION=0 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=23 +EXTRA_VERSION=24 EXTRA_RELEASE= -EXTRA_GTK2_VERSION=.2 +EXTRA_GTK2_VERSION=.1 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 d15d24ef4..4fb8ceee0 100644 --- a/src/compose.c +++ b/src/compose.c @@ -7570,7 +7570,8 @@ void compose_reply_from_messageview(MessageView *msgview, GSList *msginfo_list, { gchar *body; GSList *new_msglist = NULL; - + MsgInfo *tmp_msginfo = NULL; + g_return_if_fail(msgview != NULL); g_return_if_fail(msginfo_list != NULL); @@ -7582,7 +7583,7 @@ void compose_reply_from_messageview(MessageView *msgview, GSList *msginfo_list, if (mimeinfo != NULL && mimeinfo->type == MIMETYPE_MESSAGE && !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822")) { - MsgInfo *tmp_msginfo = procmsg_msginfo_new_from_mimeinfo( + tmp_msginfo = procmsg_msginfo_new_from_mimeinfo( orig_msginfo, mimeinfo); if (tmp_msginfo != NULL) { new_msglist = g_slist_append(NULL, tmp_msginfo); @@ -7594,6 +7595,7 @@ void compose_reply_from_messageview(MessageView *msgview, GSList *msginfo_list, if (new_msglist) { compose_reply_mode((ComposeMode)action, new_msglist, body); + procmsg_msginfo_free(tmp_msginfo); g_slist_free(new_msglist); } else compose_reply_mode((ComposeMode)action, msginfo_list, body);