aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog11
-rw-r--r--calendar/common/authentication.c39
-rw-r--r--calendar/common/authentication.h1
-rw-r--r--calendar/gui/e-tasks.c6
-rw-r--r--calendar/gui/gnome-cal.c4
5 files changed, 61 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 44e25e86a6..a438b53d44 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,16 @@
2008-02-18 Srinivasa Ragavan <sragavan@novell.com>
+ ** Fix for bnc #160049. Patch from OpenSUSE.
+
+ * common/authentication.c: (build_pass_key),
+ (auth_cal_forget_password):
+ * common/authentication.h:
+ * gui/e-tasks.c: (client_cal_opened_cb),
+ (default_client_cal_opened_cb):
+ * gui/gnome-cal.c: (client_cal_opened_cb):
+
+2008-02-18 Srinivasa Ragavan <sragavan@novell.com>
+
** Downstream patches from OpenSUSE
* conduits/calendar/calendar-conduit.c:
diff --git a/calendar/common/authentication.c b/calendar/common/authentication.c
index f11a0ed1ff..b21cded8e4 100644
--- a/calendar/common/authentication.c
+++ b/calendar/common/authentication.c
@@ -30,6 +30,7 @@
#include <libedataserver/e-source.h>
#include <libedataserverui/e-passwords.h>
#include "authentication.h"
+#include <libedataserver/e-url.h>
static GHashTable *source_lists_hash = NULL;
@@ -55,6 +56,44 @@ auth_func_cb (ECal *ecal, const char *prompt, const char *key, gpointer user_dat
return password;
}
+static char *
+build_pass_key (ECal *ecal)
+{
+ char *euri_str;
+ const char *uri;
+ EUri *euri;
+
+ uri = e_cal_get_uri (ecal);
+
+ euri = e_uri_new (uri);
+ euri_str = e_uri_to_string (euri, FALSE);
+
+ e_uri_free (euri);
+ return euri_str;
+}
+
+void
+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);
+
+ e_passwords_forget_password (component_name, key);
+
+ g_free (key);
+}
+
ECal *
auth_new_cal_from_default (ECalSourceType type)
{
diff --git a/calendar/common/authentication.h b/calendar/common/authentication.h
index 2b5804c039..63906eff20 100644
--- a/calendar/common/authentication.h
+++ b/calendar/common/authentication.h
@@ -30,5 +30,6 @@
ECal *auth_new_cal_from_default (ECalSourceType type);
ECal *auth_new_cal_from_source (ESource *source, ECalSourceType type);
ECal *auth_new_cal_from_uri (const char *uri, ECalSourceType type);
+void auth_cal_forget_password (ECal *ecal);
#endif
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index 84a03344df..33e4cdcb78 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -964,6 +964,9 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, ETasks *tasks)
priv = tasks->priv;
source = e_cal_get_source (ecal);
+
+ if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED)
+ auth_cal_forget_password (ecal);
switch (status) {
case E_CALENDAR_STATUS_OK :
@@ -1010,6 +1013,9 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, ETasks *tasks)
source = e_cal_get_source (ecal);
+ if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED)
+ auth_cal_forget_password (ecal);
+
switch (status) {
case E_CALENDAR_STATUS_OK :
g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, default_client_cal_opened_cb, NULL);
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index e396b879ff..bcd5cda400 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -2642,6 +2642,10 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
default:
break;
}
+
+ if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED && source_type == E_CAL_SOURCE_TYPE_EVENT)
+ auth_cal_forget_password (ecal);
+
switch (status) {
case E_CALENDAR_STATUS_OK:
break;