diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-09-29 07:31:42 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-09-29 07:31:42 +0800 |
| commit | 22a9d810427da7139cf53532d460bde0ba534ac5 (patch) | |
| tree | 7056a47d815986414680745ea5720bda8383e39e /camel/camel-mime-message.c | |
| parent | e023c17d5c4585474511f657bd3fcac1ee8963e3 (diff) | |
| download | gsoc2013-evolution-22a9d810427da7139cf53532d460bde0ba534ac5.tar gsoc2013-evolution-22a9d810427da7139cf53532d460bde0ba534ac5.tar.gz gsoc2013-evolution-22a9d810427da7139cf53532d460bde0ba534ac5.tar.bz2 gsoc2013-evolution-22a9d810427da7139cf53532d460bde0ba534ac5.tar.lz gsoc2013-evolution-22a9d810427da7139cf53532d460bde0ba534ac5.tar.xz gsoc2013-evolution-22a9d810427da7139cf53532d460bde0ba534ac5.tar.zst gsoc2013-evolution-22a9d810427da7139cf53532d460bde0ba534ac5.zip | |
Same here.
2001-09-28 Jeffrey Stedfast <fejj@ximian.com>
* camel-filter-search.c (get_source): Same here.
* camel-mime-message.c (camel_mime_message_set_source): Don't use
the e_url_shroud hack, use CamelURL functions instead.
svn path=/trunk/; revision=13240
Diffstat (limited to 'camel/camel-mime-message.c')
| -rw-r--r-- | camel/camel-mime-message.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c index 3ffa25f84e..53edc4f53b 100644 --- a/camel/camel-mime-message.c +++ b/camel/camel-mime-message.c @@ -32,13 +32,12 @@ #include <stdio.h> #include <string.h> -#include "e-util/e-url.h" - #include "camel-mime-message.h" #include "camel-multipart.h" #include "camel-stream-mem.h" #include "string-utils.h" #include "hash-table-utils.h" +#include "camel-url.h" #include "camel-stream-filter.h" #include "camel-stream-null.h" @@ -408,12 +407,18 @@ camel_mime_message_set_recipients(CamelMimeMessage *mime_message, const char *ty void camel_mime_message_set_source (CamelMimeMessage *mime_message, const char *src) { - char *shrouded_src; + CamelURL *url; + char *uri; + g_assert (mime_message); - shrouded_src = e_url_shroud (src); - camel_medium_add_header (CAMEL_MEDIUM (mime_message), "X-Evolution-Source", shrouded_src); - g_free (shrouded_src); + url = camel_url_new (src, NULL); + if (url) { + uri = camel_url_to_string (url, CAMEL_URL_HIDE_ALL); + camel_medium_add_header (CAMEL_MEDIUM (mime_message), "X-Evolution-Source", uri); + g_free (uri); + camel_url_free (url); + } } const char * @@ -843,16 +848,17 @@ struct _check_content_id { }; static gboolean -check_content_id (CamelMimeMessage *message, CamelMimePart *part, struct _check_content_id *data) +check_content_id (CamelMimeMessage *message, CamelMimePart *part, void *data) { + struct _check_content_id *check = (struct _check_content_id *) data; const char *content_id; gboolean found; content_id = camel_mime_part_get_content_id (part); - found = content_id && !strcmp (content_id, data->content_id) ? TRUE : FALSE; + found = content_id && !strcmp (content_id, check->content_id) ? TRUE : FALSE; if (found) { - data->part = part; + check->part = part; camel_object_ref (CAMEL_OBJECT (part)); } |