evolution r36639 - trunk/mail

[sragavan svn gnome org]

Author: sragavan
Date: Fri Oct 17 09:48:54 2008
New Revision: 36639
URL: http://svn.gnome.org/viewvc/evolution?rev=36639&view=rev

Log:
2008-10-17  Srinivasa Ragavan  <sragavan novell com>

	** Fix for bug #555276

	* mail/mail-vfolder.c: Don't load a vfolder as a sub folder.




Modified:
   trunk/mail/ChangeLog
   trunk/mail/mail-vfolder.c

Modified: trunk/mail/mail-vfolder.c
==============================================================================
--- trunk/mail/mail-vfolder.c	(original)
+++ trunk/mail/mail-vfolder.c	Fri Oct 17 09:48:54 2008
@@ -102,6 +102,13 @@
 	l = m->sources_uri;
 	while (l && !shutdown) {
 		d(printf(" Adding uri: %s\n", (char *)l->data));
+		if (strncmp((char *)l->data, "vfolder:/", 9) == 0 ||
+			strncmp((char *)l->data, "email://vfolder local", 21) == 0) {
+			g_warning ("VFolder of VFolders not supporting. Ignoring loading this vfolder as a subfolder\n");
+			l=l->next;
+			continue;
+		}
+
 		folder = mail_tool_uri_to_folder (l->data, 0, &m->base.ex);
 		if (folder) {
 			list = g_list_append(list, folder);
@@ -698,6 +705,14 @@
 	while (l) {
 		char *curi = em_uri_to_camel(l->data);
 
+		if (strncmp((char *)l->data, "vfolder:/", 9) == 0 ||
+			strncmp((char *)l->data, "email://vfolder local", 21) == 0) {
+			g_warning ("VFolder of VFolders not supporting. Ignoring loading this vfolder as a subfolder\n");
+			l=l->next;
+			g_free(curi);
+			continue;
+		}
+
 		if (mail_note_get_folder_from_uri(curi, &newfolder)) {
 			if (newfolder)
 				sources_folder = g_list_append(sources_folder, newfolder);