evolution-data-server r9287 - trunk/camel

[sragavan svn gnome org]

Author: sragavan
Date: Wed Aug  6 16:44:00 2008
New Revision: 9287
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9287&view=rev

Log:
2008-08-06  Srinivasa Ragavan  <sragavan novell com>

	** Fix for bug #546613

	* camel/camel-vee-folder.c: return NULL, if unmatched folder is
	requested.


Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-vee-folder.c

Modified: trunk/camel/camel-vee-folder.c
==============================================================================
--- trunk/camel/camel-vee-folder.c	(original)
+++ trunk/camel/camel-vee-folder.c	Wed Aug  6 16:44:00 2008
@@ -148,13 +148,14 @@
 
 	d(printf("returning folder %s %p, count = %d\n", name, vf, camel_folder_get_message_count((CamelFolder *)vf)));
 
-	tmp = g_strdup_printf("%s/%s.cmeta", ((CamelService *)parent_store)->url->path, full);
-	camel_object_set(vf, NULL, CAMEL_OBJECT_STATE_FILE, tmp, NULL);
-	g_free(tmp);
-	if (camel_object_state_read(vf) == -1) {
-		/* setup defaults: we have none currently */
+	if (vf) {
+		tmp = g_strdup_printf("%s/%s.cmeta", ((CamelService *)parent_store)->url->path, full);
+		camel_object_set(vf, NULL, CAMEL_OBJECT_STATE_FILE, tmp, NULL);
+		g_free(tmp);
+		if (camel_object_state_read(vf) == -1) {
+			/* setup defaults: we have none currently */
+		}
 	}
-
 	return (CamelFolder *)vf;
 }