From 19265d6114dbc5ab7b4cc78a38dcafde13f37789 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 15 Jan 2009 15:07:46 +0000 Subject: ** Fix for bug #303738 2009-01-15 Milan Crha ** Fix for bug #303738 * gui/gnome-cal.c: (client_cal_opened_cb), (default_client_cal_opened_cb): * gui/e-memos.c: (client_cal_opened_cb), (default_client_cal_opened_cb): * gui/e-tasks.c: (client_cal_opened_cb), (default_client_cal_opened_cb): Forget password on AuthFailed or AuthRequired and try to reopen on AuthFailed status, which will ask for a password again. * gui/comp-editor-factory.c: (cal_opened_cb): Show "Authentication Required" on such status returned. * common/authentication.c: (auth_cal_forget_password): Do not free memory which hold ECal. Also always forget password for calendar with the URL key. svn path=/trunk/; revision=37080 --- calendar/common/authentication.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'calendar/common') diff --git a/calendar/common/authentication.c b/calendar/common/authentication.c index 7925a36b65..85bde3d6fd 100644 --- a/calendar/common/authentication.c +++ b/calendar/common/authentication.c @@ -77,21 +77,21 @@ auth_cal_forget_password (ECal *ecal) { ESource *source = NULL; const char *auth_domain = NULL, *component_name = NULL, *auth_type = NULL; - char *key = NULL; source = e_cal_get_source (ecal); auth_domain = e_source_get_property (source, "auth-domain"); component_name = auth_domain ? auth_domain : "Calendar"; auth_type = e_source_get_property (source, "auth-type"); - if (auth_type) - key = build_pass_key (ecal); - else - key = e_source_get_uri (source); + if (auth_type) { + char *key = NULL; - e_passwords_forget_password (component_name, key); + key = build_pass_key (ecal); + e_passwords_forget_password (component_name, key); + g_free (key); + } - g_free (key); + e_passwords_forget_password (component_name, e_source_get_uri (source)); } ECal * -- cgit v1.2.3