2005-12-24 [colin] 1.9.100cvs107

	* src/procmsg.c
		Allow NULL src_msginfo in
		procmsg_msginfo_new_from_mimeinfo

diff --git a/ChangeLog b/ChangeLog
index 00efd47dbf2dc30c2a94fb40c119de29d081ad28..cc1423dea101372c8b69b5ead973388b4da6ff16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-24 [colin]     1.9.100cvs107
+
+       * src/procmsg.c
+               Allow NULL src_msginfo in 
+               procmsg_msginfo_new_from_mimeinfo
+
 2005-12-23 [paul]      1.9.100cvs106
 
        * src/plugins/pgpinline/mypgpcore.def

diff --git a/PATCHSETS b/PATCHSETS
index 71f8d70edf444ffc5bdb675da66305e45c450ce6..bebfb3209f4444977fbb4519270943275f22862d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1090,3 +1090,4 @@
 ( cvs diff -u -r 1.4.2.5 -r 1.4.2.6 autogen.sh;  cvs diff -u -r 1.213.2.71 -r 1.213.2.72 src/folder.c;  cvs diff -u -r 1.79.2.20 -r 1.79.2.21 src/mh.c;  cvs diff -u -r 1.13.2.13 -r 1.13.2.14 src/common/plugin.c;  cvs diff -u -r 1.13.2.18 -r 1.13.2.19 src/common/socket.c;  cvs diff -u -r 1.13.2.4 -r 1.13.2.5 src/common/socket.h;  cvs diff -u -r 1.36.2.49 -r 1.36.2.50 src/common/utils.c;  cvs diff -u -r 1.20.2.28 -r 1.20.2.29 src/common/utils.h;  cvs diff -u -r 1.5.2.23 -r 1.5.2.24 src/gtk/pluginwindow.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/plugin.def;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpcore/sylpheed.def;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpinline/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpinline/plugin.def;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpinline/sylpheed.def;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/plugin.def;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpmime/sylpheed.def;  ) > 1.9.100cvs104.patchset
 ( cvs diff -u -r 1.274.2.83 -r 1.274.2.84 src/mainwindow.c;  ) > 1.9.100cvs105.patchset
 ( diff -u /dev/null src/plugins/pgpinline/mypgpcore.def;  ) > 1.9.100cvs106.patchset
+( cvs diff -u -r 1.150.2.47 -r 1.150.2.48 src/procmsg.c;  ) > 1.9.100cvs107.patchset

diff --git a/configure.ac b/configure.ac
index cbce6487f8ea404f45c5202e8886d899c6d4447c..f170eb91df7f05f2eb73c73de1fef8d7ea5b8a52 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=106
+EXTRA_VERSION=107
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/procmsg.c b/src/procmsg.c
index 5e826c5cb6587c1fa43cc67b62adb25323645c26..766609bbc681448258d8c3159c864167083a53dc 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -2003,7 +2003,8 @@ MsgInfo *procmsg_msginfo_new_from_mimeinfo(MsgInfo *src_msginfo, MimeInfo *mimei
                fclose(fp);
 
        if (tmp_msginfo != NULL) {
-               tmp_msginfo->folder = src_msginfo->folder;
+               if (src_msginfo)
+                       tmp_msginfo->folder = src_msginfo->folder;
                tmp_msginfo->plaintext_file = g_strdup(tmpfile);
        } else {
                g_warning("procmsg_msginfo_new_from_mimeinfo(): Can't generate new msginfo");