evolution r36800 - branches/gnome-2-24/mail

[sragavan svn gnome org]

Author: sragavan
Date: Wed Nov 19 05:42:09 2008
New Revision: 36800
URL: http://svn.gnome.org/viewvc/evolution?rev=36800&view=rev

Log:
2008-11-19  Srinivasa Ragavan  <sragavan novell com>

	** Fix for bug #555276

	* mail/mail-vfolder.c: Don't load vfolder as subfolder.




Modified:
   branches/gnome-2-24/mail/ChangeLog
   branches/gnome-2-24/mail/mail-vfolder.c

Modified: branches/gnome-2-24/mail/mail-vfolder.c
==============================================================================
--- branches/gnome-2-24/mail/mail-vfolder.c	(original)
+++ branches/gnome-2-24/mail/mail-vfolder.c	Wed Nov 19 05:42:09 2008
@@ -266,6 +266,11 @@
 		g_warning("Folder '%s' disappeared while I was adding/remove it to/from my vfolder", m->uri);
 		return;
 	}
+	if (strncmp(m->uri, "vfolder:/", 9) == 0 ||
+		strncmp(m->uri, "email://vfolder local", 21) == 0) {
+		printf("Ignoring loading vfolder as a subfolder \n");
+		return;
+	}
 
 	if (folder == NULL)
 		folder = mail_tool_uri_to_folder (m->uri, 0, &m->base.ex);