aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/e-shell-window-commands.c3
-rw-r--r--shell/shell.error.xml7
3 files changed, 17 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 6b8e3d0641..5405fd5aba 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-21 Sankar P <psankar@novell.com>
+
+ * shell.error.xml : Added string for forget password prompt.
+
+ * e-shell-window-commands.c: (command_forget_passwords)
+ Added call to a confirmation dialog before forgetting passwords.
+ Fixes bug #216021
+
2005-07-21 Not Zed <NotZed@Ximian.com>
* e-shell-window-commands.c: fix the pixmap location for the
diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c
index f87159fe82..fa91cb7031 100644
--- a/shell/e-shell-window-commands.c
+++ b/shell/e-shell-window-commands.c
@@ -648,7 +648,8 @@ command_forget_passwords (BonoboUIComponent *ui_component,
void *data,
const char *path)
{
- e_passwords_forget_passwords();
+ if (e_error_run (NULL, "shell:forget-passwords", NULL) == GTK_RESPONSE_OK)
+ e_passwords_forget_passwords();
}
/* Tools menu. */
diff --git a/shell/shell.error.xml b/shell/shell.error.xml
index e4d0506476..ede447d8d5 100644
--- a/shell/shell.error.xml
+++ b/shell/shell.error.xml
@@ -73,4 +73,11 @@ Click help for details.</_secondary>
<button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
</error>
+ <error id="forget-passwords" type="question" default="GTK_RESPONSE_OK">
+ <_primary>Are you sure you want to forget the passwords?</_primary>
+ <_secondary xml:space="preserve">Clicking the Forget button will forget your passwords and during next login, you will be prompted for password.</_secondary>
+ <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+ <button _label="_Forget" response="GTK_RESPONSE_OK"/>
+ </error>
+
</error-list>