From: Colin Leroy <colin@colino.net>
Date: Thu, 15 Jun 2006 06:29:48 +0000 (+0000)
Subject: 2006-06-15 [cleroy]	2.3.0cvs13
X-Git-Tag: rel_2_4_0~116
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=c2ec50c6fbdabfff3376f5bda0fc62db38d7c997

2006-06-15 [cleroy]	2.3.0cvs13

	* src/folder.c
		Probably fix Bug #969 (crash on rebuilding
		imap folder)
---

diff --git a/ChangeLog b/ChangeLog
index 30a40c92e..dfe718646 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-15 [cleroy]	2.3.0cvs13
+
+	* src/folder.c
+		Probably fix Bug #969 (crash on rebuilding 
+		imap folder)
+
 2006-06-14 [colin]	2.3.0cvs12
 
 	* manual/dtd/manual.xsl
diff --git a/PATCHSETS b/PATCHSETS
index e361222c1..a0608fb4e 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1587,3 +1587,4 @@
 ( cvs diff -u -r 1.654.2.1630 -r 1.654.2.1631 configure.ac;  ) > 2.3.0cvs10.patchset
 ( cvs diff -u -r 1.654.2.1631 -r 1.654.2.1632 configure.ac;  ) > 2.3.0cvs11.patchset
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 manual/sylpheed-claws-manual.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/dtd/manual.xsl;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/fr/sylpheed-claws-manual.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/pl/sylpheed-claws-manual.xml;  ) > 2.3.0cvs12.patchset
+( cvs diff -u -r 1.213.2.99 -r 1.213.2.100 src/folder.c;  ) > 2.3.0cvs13.patchset
diff --git a/configure.ac b/configure.ac
index 5fc62992a..2d392fd3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=12
+EXTRA_VERSION=13
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/folder.c b/src/folder.c
index 8e7b0f135..acd07b390 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -841,7 +841,8 @@ void folder_scan_tree(Folder *folder, gboolean rebuild)
 	if (rebuild)
 		folder_tree_destroy(folder);
 
-	folder->klass->scan_tree(folder);
+	if (folder->klass->scan_tree(folder) < 0)
+		return;
 
 	hookdata.folder = folder;
 	hookdata.update_flags = FOLDER_TREE_CHANGED;
@@ -3460,6 +3461,9 @@ static GNode *folder_get_xml_node(Folder *folder)
 	xmlnode = xml_node_new(tag, NULL);
 
 	node = g_node_new(xmlnode);
+	
+	g_return_val_if_fail (folder->node != NULL, NULL);
+	
 	if (folder->node->children) {
 		GNode *cur;