From 735c74a10f8f6265cc650ab7f907f668f195b2e4 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Sun, 3 May 2009 20:37:40 +0530 Subject: ** BUGFIX: 573170 - Add back support for vfolder of vfolders. Don't defer from loading vfolders of vfolders. We can handle it now. --- mail/mail-vfolder.c | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'mail/mail-vfolder.c') diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index ee0ab21e23..5ba3f17427 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -102,12 +102,6 @@ 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) { @@ -266,11 +260,6 @@ vfolder_adduri_exec (struct _adduri_msg *m) 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); @@ -710,14 +699,6 @@ 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