diff options
author | Jeffrey Stedfast <fejj@ximian.com> | 2004-04-12 23:35:25 +0800 |
---|---|---|
committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2004-04-12 23:35:25 +0800 |
commit | 85c5b26c407159e9bba4ad4d5e8e14a103a1d188 (patch) | |
tree | 38b8f85e7706802a5157b253eb4ab20456f487b1 | |
parent | dc9fd2d7220809f71d15e8aafcba1f09fb6446e2 (diff) | |
download | gsoc2013-evolution-85c5b26c407159e9bba4ad4d5e8e14a103a1d188.tar gsoc2013-evolution-85c5b26c407159e9bba4ad4d5e8e14a103a1d188.tar.gz gsoc2013-evolution-85c5b26c407159e9bba4ad4d5e8e14a103a1d188.tar.bz2 gsoc2013-evolution-85c5b26c407159e9bba4ad4d5e8e14a103a1d188.tar.lz gsoc2013-evolution-85c5b26c407159e9bba4ad4d5e8e14a103a1d188.tar.xz gsoc2013-evolution-85c5b26c407159e9bba4ad4d5e8e14a103a1d188.tar.zst gsoc2013-evolution-85c5b26c407159e9bba4ad4d5e8e14a103a1d188.zip |
If the provider is unavailable, return euri like the other fail cases.
2004-04-12 Jeffrey Stedfast <fejj@ximian.com>
* em-utils.c (em_uri_to_camel): If the provider is unavailable,
return euri like the other fail cases. Fixes bug #56846.
svn path=/trunk/; revision=25415
-rw-r--r-- | mail/ChangeLog | 5 | ||||
-rw-r--r-- | mail/em-utils.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index cfedf6e6da..47d828b224 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2004-04-12 Jeffrey Stedfast <fejj@ximian.com> + + * em-utils.c (em_uri_to_camel): If the provider is unavailable, + return euri like the other fail cases. Fixes bug #56846. + 2004-04-10 Francisco Javier F. Serrador <serrador@cvs.gnome.org> * evolution-mail.schemas.in.in.h: Correct typo s/hight/height/ at diff --git a/mail/em-utils.c b/mail/em-utils.c index 60d2bd659b..1225604bd7 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -2652,8 +2652,9 @@ char *em_uri_to_camel(const char *euri) } service = account->source; - provider = camel_provider_get(service->url, NULL); - + if (!(provider = camel_provider_get (service->url, NULL))) + return g_strdup (euri); + curl = camel_url_new(service->url, NULL); if (provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH) camel_url_set_fragment(curl, eurl->path[0]=='/'?eurl->path+1:eurl->path); |