diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-04-18 01:13:55 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:41:55 +0800 |
| commit | f31b492945408f038ae16a099900631ae9714912 (patch) | |
| tree | 031f02a545f2f540048ee1fe7a8180fb10d9dd0a /mail/e-mail-session.c | |
| parent | a6dbbf97cac0e702d9de86b4defabcbe22e12cf3 (diff) | |
| download | gsoc2013-evolution-f31b492945408f038ae16a099900631ae9714912.tar gsoc2013-evolution-f31b492945408f038ae16a099900631ae9714912.tar.gz gsoc2013-evolution-f31b492945408f038ae16a099900631ae9714912.tar.bz2 gsoc2013-evolution-f31b492945408f038ae16a099900631ae9714912.tar.lz gsoc2013-evolution-f31b492945408f038ae16a099900631ae9714912.tar.xz gsoc2013-evolution-f31b492945408f038ae16a099900631ae9714912.tar.zst gsoc2013-evolution-f31b492945408f038ae16a099900631ae9714912.zip | |
Adapt to sealed up CamelService.
Diffstat (limited to 'mail/e-mail-session.c')
| -rw-r--r-- | mail/e-mail-session.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c index e701509a63..622ee6f367 100644 --- a/mail/e-mail-session.c +++ b/mail/e-mail-session.c @@ -499,9 +499,8 @@ mail_session_make_key (CamelService *service, if (service != NULL) key = camel_url_to_string ( - service->url, - CAMEL_URL_HIDE_PASSWORD | - CAMEL_URL_HIDE_PARAMS); + camel_service_get_camel_url (service), + CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS); else key = g_strdup (item); @@ -598,11 +597,16 @@ mail_session_get_password (CamelSession *session, guint32 flags, GError **error) { - gchar *url; + gchar *url = NULL; gchar *ret = NULL; EAccount *account = NULL; - url = service?camel_url_to_string (service->url, CAMEL_URL_HIDE_ALL):NULL; + if (service != NULL) { + CamelURL *service_url; + + service_url = camel_service_get_camel_url (service); + url = camel_url_to_string (service_url, CAMEL_URL_HIDE_ALL); + } if (!strcmp(item, "popb4smtp_uri")) { /* not 100% mt safe, but should be ok */ |