evolution r35806 - trunk/mail

[tml svn gnome org]

Author: tml
Date: Mon Jul 21 15:35:48 2008
New Revision: 35806
URL: http://svn.gnome.org/viewvc/evolution?rev=35806&view=rev

Log:
2008-07-21  Tor Lillqvist  <tml novell com>

	* em-migrate.c (migrate_folders): Guard against
	camel_store_get_folder() returning NULL, which happened at
	least for me. It was for a partially broken GroupWise folder
	structure on disk, so that is a case of garbage in--garbage
	out I guess, but it can't hurt to be careful...



Modified:
   trunk/mail/ChangeLog
   trunk/mail/em-migrate.c

Modified: trunk/mail/em-migrate.c
==============================================================================
--- trunk/mail/em-migrate.c	(original)
+++ trunk/mail/em-migrate.c	Mon Jul 21 15:35:48 2008
@@ -2853,7 +2853,8 @@
 		em_migrate_set_folder_name (tmp);
 		g_free (tmp);
 		folder = camel_store_get_folder (store, fi->full_name, 0, ex);
-		camel_folder_summary_migrate_infos (folder->summary);
+		if (folder != NULL)
+			camel_folder_summary_migrate_infos (folder->summary);
 		migrate_folders(store, fi->child, acc, ex);
 		fi = fi->next;
 	}