From 85b2913a380c69f14ae0254ad23b10fabfb33667 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 24 Oct 2008 23:52:05 +0000 Subject: Merge revisions 36534:36684 from trunk. svn path=/branches/kill-bonobo/; revision=36685 --- mail/mail-vfolder.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'mail/mail-vfolder.c') diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index 5df6d9e4cd..3dadf3d37f 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -103,6 +103,13 @@ vfolder_setup_exec (struct _setup_msg *m) 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); @@ -712,6 +719,14 @@ rule_add_sources(GList *l, GList **sources_folderp, GList **sources_urip) 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); -- cgit v1.2.3