2005-01-27 [colin] 1.0.0cvs18

	* src/compose.c
		Uhm, better not touch the original msginfo_list.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8b13445e0ff87420b5ca5d54e4bdb22f08c43137..0a82b188e7376b552d37454cd979e975c6487ceb 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2005-01-27 [colin]     1.0.0cvs18
+
+       * src/compose.c
+               Uhm, better not touch the original msginfo_list.
+
 2005-01-27 [colin]     1.0.0cvs17
 
        * src/procmsg.c

diff --git a/PATCHSETS b/PATCHSETS
index 3fa3ed101dd6cbf8b7681585be1aa225f1b12882..174d0bef906b280084fa4c290dd0f7f22b59bedc 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -225,3 +225,4 @@
 ( 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
 ( cvs diff -u -r 1.129 -r 1.130 src/messageview.c; cvs diff -u -r 1.457 -r 1.458 src/summaryview.c; cvs diff -u -r 1.467 -r 1.468 src/compose.c; cvs diff -u -r 1.57 -r 1.58 src/compose.h; cvs diff -u -r 1.56 -r 1.57 src/toolbar.c; cvs diff -u -r 1.316 -r 1.317 src/mainwindow.c; ) > 1.0.0cvs16.patchset
 ( cvs diff -u -r 1.175 -r 1.176 src/procmsg.c; cvs diff -u -r 1.72 -r 1.73 src/procmsg.h; cvs diff -u -r 1.468 -r 1.469 src/compose.c; ) > 1.0.0cvs17.patchset
+( cvs diff -u -r 1.469 -r 1.470 src/compose.c; ) > 1.0.0cvs18.patchset

diff --git a/configure.ac b/configure.ac
index 0fd311f50c493dafd2b1e922c678f88ed22ebe3f..6aa5d4dc737cca5b2e4b6939c6893e95515926fc 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=17
+EXTRA_VERSION=18
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/compose.c b/src/compose.c
index e6bd9095b514040334bdc5ee195aeda98e90808f..01442d1ab10fbe4359f546a744d9a4e49a600603 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -6923,7 +6923,8 @@ void compose_reply_from_messageview(MessageView *msgview, GSList *msginfo_list,
                                    guint action)
 {
        gchar *body;
-
+       GSList *new_msglist = NULL;
+       
        g_return_if_fail(msgview != NULL);
 
        g_return_if_fail(msginfo_list != NULL);
@@ -6938,14 +6939,19 @@ void compose_reply_from_messageview(MessageView *msgview, GSList *msginfo_list,
                        MsgInfo *tmp_msginfo = procmsg_msginfo_new_from_mimeinfo(
                                                orig_msginfo, mimeinfo);
                        if (tmp_msginfo != NULL) {
-                               g_slist_free(msginfo_list);
-                               msginfo_list = g_slist_append(NULL, tmp_msginfo);
+                               new_msglist = g_slist_append(NULL, tmp_msginfo);
                        } 
                }
        }
 
        body = messageview_get_selection(msgview);
-       compose_reply_mode((ComposeMode)action, msginfo_list, body);
+
+       if (new_msglist) {
+               compose_reply_mode((ComposeMode)action, new_msglist, body);
+               g_slist_free(new_msglist);
+       } else
+               compose_reply_mode((ComposeMode)action, msginfo_list, body);
+
        g_free(body);
 }