aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-07-04 21:55:30 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-09-14 20:08:34 +0800
commit6c54eecdf8d900f3297176d43485c512c353493f (patch)
tree74123007ed5fdc4cf97ba6eed0309961bcb90038 /calendar
parent16f35f7d67c51da14c9a9b643758407d2e965825 (diff)
downloadgsoc2013-evolution-6c54eecdf8d900f3297176d43485c512c353493f.tar.gz
gsoc2013-evolution-6c54eecdf8d900f3297176d43485c512c353493f.tar.zst
gsoc2013-evolution-6c54eecdf8d900f3297176d43485c512c353493f.zip
Adapt to CamelSession and e-passwords changes.
Diffstat (limited to 'calendar')
-rw-r--r--calendar/gui/alarm-notify/alarm-notify.c6
-rw-r--r--calendar/gui/e-meeting-store.c4
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),