diff options
| author | Not Zed <NotZed@Ximian.com> | 2004-11-12 13:54:07 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-11-12 13:54:07 +0800 |
| commit | d25f16e9ea91dc50cc8477576c6a7def086d34c7 (patch) | |
| tree | afd1003f6acc2573c505d25b74d3e1f3c8b1691c /mail/mail-vfolder.c | |
| parent | 8e212824134c1740d05fb36799f78716c5059801 (diff) | |
| download | gsoc2013-evolution-d25f16e9ea91dc50cc8477576c6a7def086d34c7.tar gsoc2013-evolution-d25f16e9ea91dc50cc8477576c6a7def086d34c7.tar.gz gsoc2013-evolution-d25f16e9ea91dc50cc8477576c6a7def086d34c7.tar.bz2 gsoc2013-evolution-d25f16e9ea91dc50cc8477576c6a7def086d34c7.tar.lz gsoc2013-evolution-d25f16e9ea91dc50cc8477576c6a7def086d34c7.tar.xz gsoc2013-evolution-d25f16e9ea91dc50cc8477576c6a7def086d34c7.tar.zst gsoc2013-evolution-d25f16e9ea91dc50cc8477576c6a7def086d34c7.zip | |
** Merge in notzed-messageinfo-branch.
2004-11-12 Not Zed <NotZed@Ximian.com>
** Merge in notzed-messageinfo-branch.
svn path=/trunk/; revision=27899
Diffstat (limited to 'mail/mail-vfolder.c')
| -rw-r--r-- | mail/mail-vfolder.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index 07a2a85128..e600a34635 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -393,11 +393,19 @@ uri_is_spethal(CamelStore *store, const char *uri) return TRUE; /* don't use strcasecmp here */ - res = url->path - && (((store->flags & CAMEL_STORE_VTRASH) - && strcmp(url->path, "/" CAMEL_VTRASH_NAME) == 0) - || ((store->flags & CAMEL_STORE_VJUNK) - && strcmp(url->path, "/" CAMEL_VJUNK_NAME) == 0)); + if (url->fragment) { + res = (((store->flags & CAMEL_STORE_VTRASH) + && strcmp(url->fragment, CAMEL_VTRASH_NAME) == 0) + || ((store->flags & CAMEL_STORE_VJUNK) + && strcmp(url->fragment, CAMEL_VJUNK_NAME) == 0)); + } else { + res = url->path + && (((store->flags & CAMEL_STORE_VTRASH) + && strcmp(url->path, "/" CAMEL_VTRASH_NAME) == 0) + || ((store->flags & CAMEL_STORE_VJUNK) + && strcmp(url->path, "/" CAMEL_VJUNK_NAME) == 0)); + } + camel_url_free(url); return res; |