diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-04-18 01:13:55 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-04-18 01:13:55 +0800 |
| commit | ea0fdf21ece0f81b6bbe3c08e1c21da76280acd4 (patch) | |
| tree | a832dbe0abedd11d440112ef44ade568bb76685a /mail/e-mail-session.c | |
| parent | 40cb250a71e0264f75cd1d02e3f77af5fb550c09 (diff) | |
| download | gsoc2013-evolution-ea0fdf21ece0f81b6bbe3c08e1c21da76280acd4.tar gsoc2013-evolution-ea0fdf21ece0f81b6bbe3c08e1c21da76280acd4.tar.gz gsoc2013-evolution-ea0fdf21ece0f81b6bbe3c08e1c21da76280acd4.tar.bz2 gsoc2013-evolution-ea0fdf21ece0f81b6bbe3c08e1c21da76280acd4.tar.lz gsoc2013-evolution-ea0fdf21ece0f81b6bbe3c08e1c21da76280acd4.tar.xz gsoc2013-evolution-ea0fdf21ece0f81b6bbe3c08e1c21da76280acd4.tar.zst gsoc2013-evolution-ea0fdf21ece0f81b6bbe3c08e1c21da76280acd4.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 */ |