diff options
| -rw-r--r-- | calendar/ChangeLog | 3 | ||||
| -rw-r--r-- | calendar/common/authentication.c | 11 |
2 files changed, 11 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 2f44fda12c..7c9481f047 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,8 @@ 2004-02-18 Rodrigo Moya <rodrigo@ximian.com> + * common/authentication.c (auth_func_cb): call first e_passwords_get_password + before calling _ask_password. + * gui/alarm-notify/alarm-queue.c (query_objects_changed_cb): add 1 second to the last notification time, or we'll get many times the same notification. diff --git a/calendar/common/authentication.c b/calendar/common/authentication.c index fa2be5323d..cb6e93e81c 100644 --- a/calendar/common/authentication.c +++ b/calendar/common/authentication.c @@ -30,10 +30,15 @@ static char * auth_func_cb (ECal *ecal, const char *prompt, const char *key, gpointer user_data) { gboolean remember; + char *password; - return e_passwords_ask_password (_("Enter password"), "Calendar", key, prompt, TRUE, - E_PASSWORDS_REMEMBER_FOREVER, &remember, - NULL); + password = e_passwords_get_password ("Calendar", key); + if (!password) + password = e_passwords_ask_password (_("Enter password"), "Calendar", key, prompt, TRUE, + E_PASSWORDS_REMEMBER_FOREVER, &remember, + NULL); + + return password; } ECal * |