diff options
| author | Radek Doulik <rodo@src.gnome.org> | 2003-11-13 05:13:05 +0800 |
|---|---|---|
| committer | Radek Doulik <rodo@src.gnome.org> | 2003-11-13 05:13:05 +0800 |
| commit | 8e1251fa17b522d0539a8fcfb7463ba8cef1b31a (patch) | |
| tree | 9be2f3a8a184446361a8c72879947f7a6e7d8d75 /mail/mail-tools.c | |
| parent | 8187001a14295b4b64cc3e973fb1ab1e551133f2 (diff) | |
| download | gsoc2013-evolution-8e1251fa17b522d0539a8fcfb7463ba8cef1b31a.tar gsoc2013-evolution-8e1251fa17b522d0539a8fcfb7463ba8cef1b31a.tar.gz gsoc2013-evolution-8e1251fa17b522d0539a8fcfb7463ba8cef1b31a.tar.bz2 gsoc2013-evolution-8e1251fa17b522d0539a8fcfb7463ba8cef1b31a.tar.lz gsoc2013-evolution-8e1251fa17b522d0539a8fcfb7463ba8cef1b31a.tar.xz gsoc2013-evolution-8e1251fa17b522d0539a8fcfb7463ba8cef1b31a.tar.zst gsoc2013-evolution-8e1251fa17b522d0539a8fcfb7463ba8cef1b31a.zip | |
merged spam filtering branch
svn path=/trunk/; revision=23302
Diffstat (limited to 'mail/mail-tools.c')
| -rw-r--r-- | mail/mail-tools.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/mail/mail-tools.c b/mail/mail-tools.c index b85a18c12f..0538efd354 100644 --- a/mail/mail-tools.c +++ b/mail/mail-tools.c @@ -312,6 +312,8 @@ mail_tool_uri_to_folder (const char *uri, guint32 flags, CamelException *ex) /* This hack is still needed for file:/ since it's its own EvolutionStorage type */ if (!strncmp (uri, "vtrash:", 7)) offset = 7; + else if (!strncmp (uri, "vjunk:", 6)) + offset = 6; url = camel_url_new (uri + offset, ex); if (!url) { @@ -333,9 +335,14 @@ mail_tool_uri_to_folder (const char *uri, guint32 flags, CamelException *ex) name = ""; } - if (offset) - folder = camel_store_get_trash (store, ex); - else + if (offset) { + if (offset == 7) + folder = camel_store_get_trash (store, ex); + else if (offset == 6) + folder = camel_store_get_junk (store, ex); + else + g_assert (FALSE); + } else folder = camel_store_get_folder (store, name, flags, ex); camel_object_unref (store); } |