diff options
| -rw-r--r-- | composer/ChangeLog | 19 | ||||
| -rw-r--r-- | composer/e-msg-composer-hdrs.c | 6 |
2 files changed, 18 insertions, 7 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index e7c517effc..2b64d185c1 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,9 +1,18 @@ +2005-10-21 Vivek Jain <jvivek@novell.com> + + Comitted NotZed's patch given on #314701 + + ** See bug #314701. + * e-msg-composer-hdrs.c (get_account_store_url): don't dereference + a null url or create an empty one. + 2005-10-19 Philip Van Hoof <pvanhoof@gnome.org> - composer/e-msg-composer-select-file.c, - composer/e-msg-composer.c, composer/e-msg-composer.h, - composer/evolution-composer.c, composer/listener.c, - mail/em-composer-utils.c, - plugins/mailing-list-actions/mailing-list-actions.c: + + * composer/e-msg-composer-select-file.c, + * composer/e-msg-composer.c, composer/e-msg-composer.h, + * composer/evolution-composer.c, composer/listener.c, + * mail/em-composer-utils.c, + * plugins/mailing-list-actions/mailing-list-actions.c: data hiding 2005-10-05 Parthasarathi Susarla <sparthasarathi@novell.com> diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c index 34f8b91f8a..6f187af83f 100644 --- a/composer/e-msg-composer-hdrs.c +++ b/composer/e-msg-composer-hdrs.c @@ -1281,8 +1281,10 @@ get_account_store_url (EMsgComposerHdrs *hdrs) CamelURL *url; char *ret = NULL; - if (hdrs->account->source && hdrs->account->source->url) { - url = camel_url_new (hdrs->account->source->url, NULL); + if (hdrs->account->source + && hdrs->account->source->url + && hdrs->account->source->url[0] + && (url = camel_url_new (hdrs->account->source->url, NULL))) { ret = camel_url_to_string (url, CAMEL_URL_HIDE_ALL); camel_url_free (url); } |