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

(-)mail/mail-session.c (-5 / +14 lines)
Lines 200-210 get_password (CamelSession *session, Cam Link Here
200
200
201
			remember = config_service?config_service->save_passwd:FALSE;
201
			remember = config_service?config_service->save_passwd:FALSE;
202
202
203
			if (account)
203
			if (flags & CAMEL_SESSION_PASSPHRASE) {
204
				title = g_strdup_printf (_("Enter Password for %s"), account->name);
204
				if (account)
205
			else
205
					title = g_strdup_printf (_("Enter Passphrase for %s"), account->name);
206
				title = g_strdup (_("Enter Password"));
206
				else
207
207
					title = g_strdup (_("Enter Passphrase"));
208
			} else {
209
				if (account)
210
					title = g_strdup_printf (_("Enter Password for %s"), account->name);
211
				else
212
					title = g_strdup (_("Enter Password"));				
213
			}
208
			if ((flags & CAMEL_SESSION_PASSWORD_STATIC) != 0)
214
			if ((flags & CAMEL_SESSION_PASSWORD_STATIC) != 0)
209
				eflags = E_PASSWORDS_REMEMBER_NEVER;
215
				eflags = E_PASSWORDS_REMEMBER_NEVER;
210
			else if (config_service == NULL)
216
			else if (config_service == NULL)
Lines 218-223 get_password (CamelSession *session, Cam Link Here
218
			if (flags & CAMEL_SESSION_PASSWORD_SECRET)
224
			if (flags & CAMEL_SESSION_PASSWORD_SECRET)
219
				eflags |= E_PASSWORDS_SECRET;
225
				eflags |= E_PASSWORDS_SECRET;
220
226
227
			if (flags & CAMEL_SESSION_PASSPHRASE)
228
				eflags |= E_PASSWORDS_PASSPHRASE;
229
221
			/* HACK: breaks abstraction ...
230
			/* HACK: breaks abstraction ...
222
			   e_account_writable doesn't use the eaccount, it also uses the same writable key for
231
			   e_account_writable doesn't use the eaccount, it also uses the same writable key for
223
			   source and transport */
232
			   source and transport */

Return to bug 138047