diff options
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/mail-vfolder.c | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 3a73664c11..c94847f54b 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2008-11-19 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for bug #555276 + + * mail/mail-vfolder.c: Don't load vfolder as subfolder. + 2008-11-13 Bharath Acharya <abharath@novell.com> * em-folder-view.c: (emfv_setting_notify): diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index f3b9b90aed..ee0ab21e23 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -266,6 +266,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); |