Attachment 73198 Details for Bug 138047

[patch] EDS Patch

fix-eds-passphrase.diff (text/plain), 3.58 KB, created by Srinivasa Ragavan on 2006-03-16 05:09:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Srinivasa Ragavan

Created: 2006-03-16 05:09:56 UTC

Size: 3.58 KB

patch

obsolete

>Index: camel/camel-gpg-context.c
>===================================================================
>RCS file: /cvs/gnome/evolution-data-server/camel/camel-gpg-context.c,v
>retrieving revision 1.77
>diff -u -p -r1.77 camel-gpg-context.c
>--- camel/camel-gpg-context.c	2 Feb 2006 08:37:46 -0000	1.77
>+++ camel/camel-gpg-context.c	16 Mar 2006 05:04:39 -0000
>@@ -811,7 +811,7 @@ gpg_ctx_parse_status (struct _GpgCtx *gp
> 						"user: \"%s\""), name);
> 		}
> 		
>-		if ((passwd = camel_session_get_password (gpg->session, NULL, NULL, prompt,  gpg->need_id, CAMEL_SESSION_PASSWORD_SECRET, ex)) && !gpg->utf8) {
>+		if ((passwd = camel_session_get_password (gpg->session, NULL, NULL, prompt,  gpg->need_id, CAMEL_SESSION_PASSWORD_SECRET|CAMEL_SESSION_PASSPHRASE, ex)) && !gpg->utf8) {
> 			char *opasswd = passwd;
> 			
> 			if ((passwd = g_locale_to_utf8 (passwd, -1, &nread, &nwritten, NULL))) {
>Index: camel/camel-session.h
>===================================================================
>RCS file: /cvs/gnome/evolution-data-server/camel/camel-session.h,v
>retrieving revision 1.53
>diff -u -p -r1.53 camel-session.h
>--- camel/camel-session.h	22 Dec 2005 01:48:30 -0000	1.53
>+++ camel/camel-session.h	16 Mar 2006 05:04:39 -0000
>@@ -56,6 +56,7 @@ enum {
> 	CAMEL_SESSION_PASSWORD_REPROMPT = 1 << 0,
> 	CAMEL_SESSION_PASSWORD_SECRET = 1 << 2,
> 	CAMEL_SESSION_PASSWORD_STATIC = 1 << 3,
>+	CAMEL_SESSION_PASSPHRASE = 1 << 4,
> };
> 
> struct _CamelSession
>Index: libedataserverui/e-passwords.c
>===================================================================
>RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-passwords.c,v
>retrieving revision 1.31
>diff -u -p -r1.31 e-passwords.c
>--- libedataserverui/e-passwords.c	24 Feb 2006 21:00:47 -0000	1.31
>+++ libedataserverui/e-passwords.c	16 Mar 2006 05:04:42 -0000
>@@ -467,9 +739,16 @@ ep_ask_password(EPassMsg *msg)
> 	/* static password, shouldn't be remembered between sessions,
> 	   but will be remembered within the session beyond our control */
> 	if (type != E_PASSWORDS_REMEMBER_NEVER) {
>-		msg->check = gtk_check_button_new_with_mnemonic(type == E_PASSWORDS_REMEMBER_FOREVER
>-								? _("_Remember this password")
>-								: _("_Remember this password for the remainder of this session"));
>+		if (msg->flags & E_PASSWORDS_PASSPHRASE) {
>+			msg->check = gtk_check_button_new_with_mnemonic(type == E_PASSWORDS_REMEMBER_FOREVER
>+									? _("_Remember this passphrase")
>+									: _("_Remember this passphrase for the remainder of this session"));
>+		} else {
>+			msg->check = gtk_check_button_new_with_mnemonic(type == E_PASSWORDS_REMEMBER_FOREVER
>+									? _("_Remember this password")
>+									: _("_Remember this password for the remainder of this session"));
>+			
>+		}
> 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (msg->check), *msg->remember);
> 		gtk_box_pack_start (GTK_BOX (vbox), msg->check, TRUE, FALSE, 3);
> 		if ((msg->flags & E_PASSWORDS_DISABLE_REMEMBER))
>Index: libedataserverui/e-passwords.h
>===================================================================
>RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-passwords.h,v
>retrieving revision 1.12
>diff -u -p -r1.12 e-passwords.h
>--- libedataserverui/e-passwords.h	31 Aug 2005 04:26:10 -0000	1.12
>+++ libedataserverui/e-passwords.h	16 Mar 2006 05:04:42 -0000
>@@ -58,6 +58,7 @@ typedef enum {
> 	E_PASSWORDS_REPROMPT = 1<<9,
> 	E_PASSWORDS_ONLINE = 1<<10, /* only ask if we're online */
> 	E_PASSWORDS_DISABLE_REMEMBER = 1<<11, /* disable the 'remember password' checkbox */
>+	E_PASSWORDS_PASSPHRASE = 1<<12, /* We are asking a passphrase */
> } EPasswordsRememberType;
> 
> char *      e_passwords_ask_password      (const char *title,

Actions: View | Diff

Attachments on bug 138047: 60289 | 73198 | 73199