aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@novell.com>2008-10-17 17:48:54 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2008-10-17 17:48:54 +0800
commit35718d17f34cd1b1335412ccebf17f6a29ae2024 (patch)
tree10dee3d6f7d2a0a1beab8219d656d31efcc19ed5 /mail
parentbbbcb08af033697dfee8b82f61f96bc0ffd77093 (diff)
downloadgsoc2013-evolution-35718d17f34cd1b1335412ccebf17f6a29ae2024.tar
gsoc2013-evolution-35718d17f34cd1b1335412ccebf17f6a29ae2024.tar.gz
gsoc2013-evolution-35718d17f34cd1b1335412ccebf17f6a29ae2024.tar.bz2
gsoc2013-evolution-35718d17f34cd1b1335412ccebf17f6a29ae2024.tar.lz
gsoc2013-evolution-35718d17f34cd1b1335412ccebf17f6a29ae2024.tar.xz
gsoc2013-evolution-35718d17f34cd1b1335412ccebf17f6a29ae2024.tar.zst
gsoc2013-evolution-35718d17f34cd1b1335412ccebf17f6a29ae2024.zip
** Fix for bug #555276
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. svn path=/trunk/; revision=36639
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-vfolder.c15
2 files changed, 21 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 57ddb77b0f..4c7c9fde3b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
2008-10-17 Milan Crha <mcrha@redhat.com>
** Fix for bug #364542
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 951bcc51e7..f3b9b90aed 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -102,6 +102,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);
@@ -698,6 +705,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);