Attachment #73198 for bug #138047

View | Details | Raw Unified | Return to bug 138047
Collapse All | Expand All

Lines 811-817 gpg_ctx_parse_status (struct _GpgCtx *gp Link Here

(-)camel/camel-gpg-context.c (-1 / +1 lines)
811	"user: \"%s\""), name);	811	"user: \"%s\""), name);
812	}	812	}
813		813
814	if ((passwd = camel_session_get_password (gpg->session, NULL, NULL, prompt, gpg->need_id, CAMEL_SESSION_PASSWORD_SECRET, ex)) && !gpg->utf8) {	814	if ((passwd = camel_session_get_password (gpg->session, NULL, NULL, prompt, gpg->need_id, CAMEL_SESSION_PASSWORD_SECRET\|CAMEL_SESSION_PASSPHRASE, ex)) && !gpg->utf8) {
815	char *opasswd = passwd;	815	char *opasswd = passwd;
816		816
817	if ((passwd = g_locale_to_utf8 (passwd, -1, &nread, &nwritten, NULL))) {	817	if ((passwd = g_locale_to_utf8 (passwd, -1, &nread, &nwritten, NULL))) {

Lines 56-61 enum { Link Here

(-)camel/camel-session.h (+1 lines)
56	CAMEL_SESSION_PASSWORD_REPROMPT = 1 << 0,	56	CAMEL_SESSION_PASSWORD_REPROMPT = 1 << 0,
57	CAMEL_SESSION_PASSWORD_SECRET = 1 << 2,	57	CAMEL_SESSION_PASSWORD_SECRET = 1 << 2,
58	CAMEL_SESSION_PASSWORD_STATIC = 1 << 3,	58	CAMEL_SESSION_PASSWORD_STATIC = 1 << 3,
		59	CAMEL_SESSION_PASSPHRASE = 1 << 4,
59	};	60	};
60		61
61	struct _CamelSession	62	struct _CamelSession




	/* static password, shouldn't be remembered between sessions,
	   but will be remembered within the session beyond our control */
	if (type != E_PASSWORDS_REMEMBER_NEVER) {
		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))

Lines 58-63 typedef enum { Link Here

(-)libedataserverui/e-passwords.h (+1 lines)
58	E_PASSWORDS_REPROMPT = 1<<9,	58	E_PASSWORDS_REPROMPT = 1<<9,
59	E_PASSWORDS_ONLINE = 1<<10, /* only ask if we're online */	59	E_PASSWORDS_ONLINE = 1<<10, /* only ask if we're online */
60	E_PASSWORDS_DISABLE_REMEMBER = 1<<11, /* disable the 'remember password' checkbox */	60	E_PASSWORDS_DISABLE_REMEMBER = 1<<11, /* disable the 'remember password' checkbox */
		61	E_PASSWORDS_PASSPHRASE = 1<<12, /* We are asking a passphrase */
61	} EPasswordsRememberType;	62	} EPasswordsRememberType;
62		63
63	char * e_passwords_ask_password (const char *title,	64	char * e_passwords_ask_password (const char *title,

Return to bug 138047

Lines 467-475 ep_ask_password(EPassMsg *msg) Link Here

(-)libedataserverui/e-passwords.c (-3 / +10 lines)
467	/* static password, shouldn't be remembered between sessions,	739	/* static password, shouldn't be remembered between sessions,
468	but will be remembered within the session beyond our control */	740	but will be remembered within the session beyond our control */
469	if (type != E_PASSWORDS_REMEMBER_NEVER) {	741	if (type != E_PASSWORDS_REMEMBER_NEVER) {
470	msg->check = gtk_check_button_new_with_mnemonic(type == E_PASSWORDS_REMEMBER_FOREVER	742	if (msg->flags & E_PASSWORDS_PASSPHRASE) {
471	? _("_Remember this password")	743	msg->check = gtk_check_button_new_with_mnemonic(type == E_PASSWORDS_REMEMBER_FOREVER
472	: _("_Remember this password for the remainder of this session"));	744	? _("_Remember this passphrase")
		745	: _("_Remember this passphrase for the remainder of this session"));
		746	} else {
		747	msg->check = gtk_check_button_new_with_mnemonic(type == E_PASSWORDS_REMEMBER_FOREVER
		748	? _("_Remember this password")
		749	: _("_Remember this password for the remainder of this session"));
		750
		751	}
473	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (msg->check), *msg->remember);	752	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (msg->check), *msg->remember);
474	gtk_box_pack_start (GTK_BOX (vbox), msg->check, TRUE, FALSE, 3);	753	gtk_box_pack_start (GTK_BOX (vbox), msg->check, TRUE, FALSE, 3);
475	if ((msg->flags & E_PASSWORDS_DISABLE_REMEMBER))	754	if ((msg->flags & E_PASSWORDS_DISABLE_REMEMBER))