aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/alarm-notify
diff options
context:
space:
mode:
authorChenthill Palanisamy <pchen@src.gnome.org>2005-11-08 17:02:41 +0800
committerChenthill Palanisamy <pchen@src.gnome.org>2005-11-08 17:02:41 +0800
commit9ba4b08d37cb9370cb85b14113052c1b42f14385 (patch)
treeaf1048d071daaa3ed42be9a841462240075759c9 /calendar/gui/alarm-notify
parent35b59bde31bebcf1a823a8b3e5262e73e719237a (diff)
downloadgsoc2013-evolution-9ba4b08d37cb9370cb85b14113052c1b42f14385.tar.gz
gsoc2013-evolution-9ba4b08d37cb9370cb85b14113052c1b42f14385.tar.zst
gsoc2013-evolution-9ba4b08d37cb9370cb85b14113052c1b42f14385.zip
Modified the code in alarm_notify_add_calendars() to generate the correct key for
obtaining the password for an authenticated calendar. svn path=/trunk/; revision=30579
Diffstat (limited to 'calendar/gui/alarm-notify')
-rw-r--r--calendar/gui/alarm-notify/alarm-notify.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index 5fa9117370..a74908bb2c 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -326,13 +326,18 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type, ESource
{
AlarmNotifyPrivate *priv;
ECal *client;
+ EUri *e_uri;
char *str_uri;
+ char *pass_key;
g_return_if_fail (an != NULL);
g_return_if_fail (IS_ALARM_NOTIFY (an));
-
+ /* Make sure the key used in for getting password is properly generated for all types of backends */
priv = an->priv;
str_uri = e_source_get_uri (source);
+ e_uri = e_uri_new (str_uri);
+ pass_key = e_uri_to_string (e_uri, FALSE);
+ e_uri_free (e_uri);
g_mutex_lock (an->priv->mutex);
/* See if we already know about this uri */
@@ -345,9 +350,10 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type, ESource
session skip this source loading. we do not really want to prompt for auth from alarm dameon*/
if ((e_source_get_property (source, "auth") &&
- (!e_passwords_get_password (e_source_get_property(source, "auth-domain"), str_uri)))) {
+ (!e_passwords_get_password (e_source_get_property(source, "auth-domain"), pass_key)))) {
g_mutex_unlock (an->priv->mutex);
g_free (str_uri);
+ g_free (pass_key);
return;
}
client = auth_new_cal_from_source (source, source_type);
@@ -357,6 +363,7 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type, ESource
g_signal_connect (G_OBJECT (client), "cal_opened", G_CALLBACK (cal_opened_cb), an);
e_cal_open_async (client, FALSE);
}
+ g_free (pass_key);
g_free (str_uri);
g_mutex_unlock (an->priv->mutex);
}