diff options
| author | Milan Crha <mcrha@redhat.com> | 2009-01-15 23:07:46 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@src.gnome.org> | 2009-01-15 23:07:46 +0800 |
| commit | 19265d6114dbc5ab7b4cc78a38dcafde13f37789 (patch) | |
| tree | 68bfcede15a75c43186828ee6adc3a2b91cdbf78 /calendar/gui/e-tasks.c | |
| parent | 9a69a192221d827f263e6972b9f07031b62676ef (diff) | |
| download | gsoc2013-evolution-19265d6114dbc5ab7b4cc78a38dcafde13f37789.tar.gz gsoc2013-evolution-19265d6114dbc5ab7b4cc78a38dcafde13f37789.tar.zst gsoc2013-evolution-19265d6114dbc5ab7b4cc78a38dcafde13f37789.zip | |
** Fix for bug #303738
2009-01-15 Milan Crha <mcrha@redhat.com>
** 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
Diffstat (limited to 'calendar/gui/e-tasks.c')
| -rw-r--r-- | calendar/gui/e-tasks.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c index b866439413..fad9d6d300 100644 --- a/calendar/gui/e-tasks.c +++ b/calendar/gui/e-tasks.c @@ -953,7 +953,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, ETasks *tasks) source = e_cal_get_source (ecal); - if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED) + if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED || status == E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED) auth_cal_forget_password (ecal); switch (status) { @@ -966,6 +966,10 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, ETasks *tasks) set_status_message (tasks, NULL); break; + case E_CALENDAR_STATUS_AUTHENTICATION_FAILED: + /* try to reopen calendar - it'll ask for a password once again */ + e_cal_open_async (ecal, FALSE); + return; case E_CALENDAR_STATUS_BUSY : break; case E_CALENDAR_STATUS_REPOSITORY_OFFLINE: @@ -1001,7 +1005,7 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, ETasks *tasks) source = e_cal_get_source (ecal); - if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED) + if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED || status == E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED) auth_cal_forget_password (ecal); switch (status) { @@ -1012,6 +1016,10 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, ETasks *tasks) e_cal_model_set_default_client (model, ecal); set_status_message (tasks, NULL); break; + case E_CALENDAR_STATUS_AUTHENTICATION_FAILED: + /* try to reopen calendar - it'll ask for a password once again */ + e_cal_open_async (ecal, FALSE); + return; case E_CALENDAR_STATUS_BUSY: break; default : |