aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author3 <NotZed@Ximian.com>2001-10-04 01:55:48 +0800
committerMichael Zucci <zucchi@src.gnome.org>2001-10-04 01:55:48 +0800
commit6726c35ab5c59ac587a3347117b86e91e8655337 (patch)
tree94ee86292f05cfce03aa344489d19a69cdfd7ee0
parenta9155f28dddf3165003a36976ce8302a4a8c3794 (diff)
downloadgsoc2013-evolution-6726c35ab5c59ac587a3347117b86e91e8655337.tar
gsoc2013-evolution-6726c35ab5c59ac587a3347117b86e91e8655337.tar.gz
gsoc2013-evolution-6726c35ab5c59ac587a3347117b86e91e8655337.tar.bz2
gsoc2013-evolution-6726c35ab5c59ac587a3347117b86e91e8655337.tar.lz
gsoc2013-evolution-6726c35ab5c59ac587a3347117b86e91e8655337.tar.xz
gsoc2013-evolution-6726c35ab5c59ac587a3347117b86e91e8655337.tar.zst
gsoc2013-evolution-6726c35ab5c59ac587a3347117b86e91e8655337.zip
If we have a fragment, override that, rather than the path. Fixes #5251.
2001-10-03 <NotZed@Ximian.com> * mail-ops.c (add_vtrash_info): If we have a fragment, override that, rather than the path. Fixes #5251. svn path=/trunk/; revision=13379
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-ops.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index a1d3483545..752be19887 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-03 <NotZed@Ximian.com>
+
+ * mail-ops.c (add_vtrash_info): If we have a fragment, override
+ that, rather than the path. Fixes #5251.
+
2001-10-03 Rodrigo Moya <rodrigo@ximian.com>
* importers/Makefile.am: add $BONOBO_GNOME_CFLAGS to make it work
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 5c536d2adc..b8cd1309f7 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -1017,7 +1017,10 @@ add_vtrash_info (CamelStore *store, CamelFolderInfo *info)
/* create our vTrash URL */
url = camel_url_new (info->url, NULL);
path = g_strdup_printf ("/%s", CAMEL_VTRASH_NAME);
- camel_url_set_path (url, path);
+ if (url->fragment)
+ camel_url_set_fragment (url, path);
+ else
+ camel_url_set_path (url, path);
g_free (path);
uri = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
camel_url_free (url);