Re: [evolution-patches] UI-HACKFEST: Confirmation dialog for forget passwords

[Sankarasivasubramanian P <psankar novell com>]

I have replaced GTK_RESPONSE_YES with GTK_REPSONSE_OK.
I have added a secondary message.
Updated patch is attached.

Thanks,
Sankar P


On Thu, 2005-07-21 at 15:15 +0800, Not Zed wrote:
> for consistency, for the response codes, if you're using CANCEL for
> cancel, use OK for ok.  If youre using YES for ok, then use NO for
> cancel, etc.  Mixing them just makes it confusing.
> 
> +  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
> +  <button _label="_Forget" response="GTK_RESPONSE_YES"/>
> 
> On Thu, 2005-07-21 at 12:16 +0530, Sankarasivasubramanian P wrote:
> > Hi,
> > 
> > Attached patch will bring in a confirmation dialog before forgetting
> > passwords.
> > 
> > The changes are made under the evolution/shell folder.
> > 
> > Thanks,
> > Sankar P
> > _______________________________________________
> > evolution-patches mailing list
> > evolution-patches lists ximian com
> > http://lists.ximian.com/mailman/listinfo/evolution-patches
> 
> _______________________________________________
> evolution-patches mailing list
> evolution-patches lists ximian com
> http://lists.ximian.com/mailman/listinfo/evolution-patches

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1529
diff -u -p -r1.1529 ChangeLog
--- ChangeLog	13 Jul 2005 10:37:35 -0000	1.1529
+++ ChangeLog	21 Jul 2005 08:20:18 -0000
@@ -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-07  Kjartan Maraas  <kmaraas gnome org>
 
 	* e-shell-window.c: (setup_widgets): Free the style here.
Index: e-shell-window-commands.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-window-commands.c,v
retrieving revision 1.35
diff -u -p -r1.35 e-shell-window-commands.c
--- e-shell-window-commands.c	24 Jun 2005 10:56:29 -0000	1.35
+++ e-shell-window-commands.c	21 Jul 2005 08:20:19 -0000
@@ -33,6 +33,7 @@
 
 #include "e-util/e-icon-factory.h"
 #include "e-util/e-dialog-utils.h"
+#include "e-util/e-error.h"
 
 #include <glib/gprintf.h>
 
@@ -648,7 +649,8 @@ command_forget_passwords (BonoboUICompon
 			  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.  */
Index: shell.error.xml
===================================================================
RCS file: /cvs/gnome/evolution/shell/shell.error.xml,v
retrieving revision 1.2
diff -u -p -r1.2 shell.error.xml
--- shell.error.xml	12 Jul 2005 04:04:13 -0000	1.2
+++ shell.error.xml	21 Jul 2005 08:20:19 -0000
@@ -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>