diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-07-18 00:42:35 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-07-18 00:42:35 +0800 |
| commit | 40934b5c2a61b36d997d0570706d600fda610d80 (patch) | |
| tree | 0c335d3ddf43d322a10d486239987a233e2fd6bc /mail/mail-tools.c | |
| parent | 14f7d6039fb40d64d6f68417b54e63098206d9d7 (diff) | |
| download | gsoc2013-evolution-40934b5c2a61b36d997d0570706d600fda610d80.tar gsoc2013-evolution-40934b5c2a61b36d997d0570706d600fda610d80.tar.gz gsoc2013-evolution-40934b5c2a61b36d997d0570706d600fda610d80.tar.bz2 gsoc2013-evolution-40934b5c2a61b36d997d0570706d600fda610d80.tar.lz gsoc2013-evolution-40934b5c2a61b36d997d0570706d600fda610d80.tar.xz gsoc2013-evolution-40934b5c2a61b36d997d0570706d600fda610d80.tar.zst gsoc2013-evolution-40934b5c2a61b36d997d0570706d600fda610d80.zip | |
Use CAMEL_VTRASH_NAME.
2001-07-17 Jeffrey Stedfast <fejj@ximian.com>
* mail-local.c (init_trash): Use CAMEL_VTRASH_NAME.
* mail-ops.c (add_vtrash_info): Use CAMEL_VTRASH_NAME.
* folder-browser.c: turned off some debugging
2001-07-16 Jeffrey Stedfast <fejj@ximian.com>
* mail-callbacks.c (transfer_msg): Disallow vtrash for now...
svn path=/trunk/; revision=11159
Diffstat (limited to 'mail/mail-tools.c')
| -rw-r--r-- | mail/mail-tools.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mail/mail-tools.c b/mail/mail-tools.c index cf140f7643..c72a5d2d02 100644 --- a/mail/mail-tools.c +++ b/mail/mail-tools.c @@ -253,23 +253,23 @@ mail_tool_uri_to_folder (const char *uri, CamelException *ex) CamelStore *store = NULL; CamelFolder *folder = NULL; int offset = 0; - + g_return_val_if_fail (uri != NULL, NULL); - + folder = mail_folder_cache_try_folder (uri); if (folder) { camel_object_ref (CAMEL_OBJECT (folder)); return folder; } - + if (!strncmp (uri, "vtrash:", 7)) offset = 7; - + url = camel_url_new (uri + offset, ex); if (!url) { return NULL; } - + if (!strcmp (url->protocol, "vfolder")) { folder = vfolder_uri_to_folder (uri, ex); } else { @@ -287,7 +287,7 @@ mail_tool_uri_to_folder (const char *uri, CamelException *ex) else name = ""; } - + if (offset) folder = camel_store_get_trash (store, ex); else @@ -296,7 +296,7 @@ mail_tool_uri_to_folder (const char *uri, CamelException *ex) camel_object_unref (CAMEL_OBJECT (store)); } } - + if (camel_exception_is_set (ex)) { if (folder) { camel_object_unref (CAMEL_OBJECT (folder)); @@ -304,9 +304,9 @@ mail_tool_uri_to_folder (const char *uri, CamelException *ex) } } else mail_folder_cache_note_folder (uri, folder); - + camel_url_free (url); - + return folder; } |