diff options
author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-11-24 13:14:44 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-11-24 13:14:44 +0800 |
commit | 4f4615a46d5ba518c1e6a0c2412b1edf1e268d99 (patch) | |
tree | 828acaa7b76aa12a490a3238b0ec4a7086b8be16 /mail/mail-vfolder.c | |
parent | 076b7c45131482b87d18963d34d035435491ee8d (diff) | |
download | gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.gz gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.zst gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.zip |
Merge revisions 36737:36810 from trunk.
svn path=/branches/kill-bonobo/; revision=36811
Diffstat (limited to 'mail/mail-vfolder.c')
-rw-r--r-- | mail/mail-vfolder.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index 3dadf3d37f..4498817afa 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -267,6 +267,11 @@ 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); |