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-filter-search.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-filter-search.c')
| -rw-r--r-- | camel/camel-filter-search.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/camel/camel-filter-search.c b/camel/camel-filter-search.c index c9c3d2853e..49ece8704a 100644 --- a/camel/camel-filter-search.c +++ b/camel/camel-filter-search.c @@ -35,7 +35,6 @@ #include <ctype.h> #include "e-util/e-sexp.h" -#include "e-util/e-url.h" #include "camel-mime-message.h" #include "camel-filter-search.h" @@ -44,6 +43,8 @@ #include "camel-stream-mem.h" #include "camel-search-private.h" +#include "camel-url.h" + #define d(x) typedef struct { @@ -411,16 +412,22 @@ static ESExpResult * get_source (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms) { ESExpResult *r; - char *src; + char *src = NULL; char *tmp; r = e_sexp_result_new (f, ESEXP_RES_STRING); if (fms->source) { - src = e_url_shroud (fms->source); + CamelURL *url; + + url = camel_url_new (fms->source, NULL); + if (url) { + src = camel_url_to_string (url, CAMEL_URL_HIDE_ALL); + camel_url_free (url); + } } else { src = g_strdup (camel_mime_message_get_source (fms->message)); } - + /* This is an abusive hack */ if ( src && (tmp = strstr (src, "://")) ) { tmp += 3; @@ -428,7 +435,7 @@ get_source (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessag if (tmp) *tmp = '\0'; } - + r->value.string = src; return r; |