From: Colin Leroy <colin@colino.net>
Date: Tue, 31 Aug 2004 15:07:47 +0000 (+0000)
Subject: 2004-08-31 [colin]	0.9.12cvs85.1
X-Git-Tag: gtk2_win32_last_merge~187
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=066cf8dfd7dd3810b5b3700b5f50ffd42b794450

2004-08-31 [colin]	0.9.12cvs85.1

	* src/folder.c
		Sync with HEAD
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index dc3014347..41c82e9da 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-08-31 [colin]	0.9.12cvs85.1
+
+	* src/folder.c
+		Sync with HEAD
+
 2004-08-31 [colin]	0.9.12cvs84.4
 
 	* src/summary_search.c
diff --git a/PATCHSETS b/PATCHSETS
index e8bc2f653..15995aa26 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -149,3 +149,4 @@
 ( cvs diff -u -r 1.83.2.17 -r 1.83.2.18 src/mimeview.c; cvs diff -u -r 1.3.2.7 -r 1.3.2.8 src/prefs_themes.c; cvs diff -u -r 1.2.2.11 -r 1.2.2.12 src/gtk/filesel.c; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/gtk/filesel.h; ) > 0.9.12cvs84.2.patchset
 ( cvs diff -u -r 1.382.2.46 -r 1.382.2.47 src/compose.c; cvs diff -u -r 1.96.2.17 -r 1.96.2.18 src/textview.c; ) > 0.9.12cvs84.3.patchset
 ( cvs diff -u -r 1.15.2.8 -r 1.15.2.9 src/summary_search.c; ) > 0.9.12cvs84.4.patchset
+( cvs diff -u -r 1.213.2.14 -r 1.213.2.15 src/folder.c; ) > 0.9.12cvs85.1.patchset
diff --git a/configure.ac b/configure.ac
index 8322f1bfc..93e0b9f89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=84
+EXTRA_VERSION=85
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.4
+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/folder.c b/src/folder.c
index 8e56fb318..43ee8a16c 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -2621,7 +2621,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                 g_tuples_destroy(tuples);
 
 		if (num >= 0) {
-			MsgInfo *newmsginfo;
+			MsgInfo *newmsginfo = NULL;
 
 			if (folderscan) {
 				if (msginfo->msgid != NULL) {