2006-06-15 [cleroy] 2.3.0cvs13
authorColin Leroy <colin@colino.net>
Thu, 15 Jun 2006 06:29:48 +0000 (06:29 +0000)
committerColin Leroy <colin@colino.net>
Thu, 15 Jun 2006 06:29:48 +0000 (06:29 +0000)
* src/folder.c
Probably fix Bug #969 (crash on rebuilding
imap folder)

ChangeLog
PATCHSETS
configure.ac
src/folder.c

index 30a40c92e8f6bd2c70cef0a655b486aa9178a5d9..dfe7186462ee1a76fc1f4bc157d331e1643c0013 100644 (file)
--- 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
index e361222c15d2760043d38d23b5a47f3ac616f130..a0608fb4ee30b487138720ffa5e530c08a20f1b1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 5fc62992a47a8e711d3826d6c8445b10bdf0d337..2d392fd3d36d487d9183e273b92313c05d2c6ad4 100644 (file)
@@ -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=
 
index 8e7b0f1350a34e097b800067ea58f655f518426e..acd07b390184900ac91b4947bc59765eecf31524 100644 (file)
@@ -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;