diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-07-04 21:55:30 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-07-04 22:20:54 +0800 |
| commit | 99d492b8284fa467f2b8ad3e6b637e10258d1cc2 (patch) | |
| tree | eeabd62681bd3cbf0e903c509dbafeec75f804d1 /calendar/gui | |
| parent | 56e3e6818693118b1a33c682ff71ec7d561c46d1 (diff) | |
| download | gsoc2013-evolution-99d492b8284fa467f2b8ad3e6b637e10258d1cc2.tar gsoc2013-evolution-99d492b8284fa467f2b8ad3e6b637e10258d1cc2.tar.gz gsoc2013-evolution-99d492b8284fa467f2b8ad3e6b637e10258d1cc2.tar.bz2 gsoc2013-evolution-99d492b8284fa467f2b8ad3e6b637e10258d1cc2.tar.lz gsoc2013-evolution-99d492b8284fa467f2b8ad3e6b637e10258d1cc2.tar.xz gsoc2013-evolution-99d492b8284fa467f2b8ad3e6b637e10258d1cc2.tar.zst gsoc2013-evolution-99d492b8284fa467f2b8ad3e6b637e10258d1cc2.zip | |
Adapt to CamelSession and e-passwords changes.
Diffstat (limited to 'calendar/gui')
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-notify.c | 6 | ||||
| -rw-r--r-- | calendar/gui/e-meeting-store.c | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c index 28b10ff602..0de79effed 100644 --- a/calendar/gui/alarm-notify/alarm-notify.c +++ b/calendar/gui/alarm-notify/alarm-notify.c @@ -383,12 +383,8 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalClientSourceType source_type, E session skip this source loading. we do not really want to prompt for auth from alarm dameon*/ if (e_source_get_property (source, "auth")) { - const gchar *name = e_source_get_property (source, "auth-domain"); - if (!name) - name = "Calendar"; - - if (!e_passwords_get_password (name, pass_key)) { + if (!e_passwords_get_password (NULL, pass_key)) { g_mutex_unlock (an->priv->mutex); g_free (str_uri); g_free (pass_key); diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index ca4df0b854..539580320c 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -1809,7 +1809,7 @@ soup_authenticate (SoupSession *session, } else { gchar *password; - password = e_passwords_get_password ("Calendar", orig_uri); + password = e_passwords_get_password (NULL, orig_uri); if (password) { soup_auth_authenticate (auth, suri->user, password); tried = TRUE; @@ -1846,7 +1846,7 @@ soup_authenticate (SoupSession *session, } password = e_passwords_ask_password ( - _("Enter password"), "Calendar", orig_uri, + _("Enter password"), NULL, orig_uri, description->str, E_PASSWORDS_REMEMBER_FOREVER | E_PASSWORDS_SECRET | E_PASSWORDS_ONLINE | (retrying ? E_PASSWORDS_REPROMPT : 0), |