[pan2] forgot this
- From: Heinrich MÃller <henmull src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2] forgot this
- Date: Thu, 5 Apr 2012 19:55:56 +0000 (UTC)
commit 47c5f947b200a2bd98da405adb7cf8ef9cf29179
Author: Heinrich MÃller <henmull src gnome org>
Date: Thu Apr 5 21:52:18 2012 +0200
forgot this
pan/data-impl/server.cc | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/pan/data-impl/server.cc b/pan/data-impl/server.cc
index 82d1b77..7c59923 100644
--- a/pan/data-impl/server.cc
+++ b/pan/data-impl/server.cc
@@ -227,24 +227,24 @@ DataImpl :: get_server_auth (const Quark & server,
PasswordData pw;
pw.server = s->host;
pw.user = s->username;
- password_decrypt(pw);
-// switch (res)
-// {
-// case GNOME_KEYRING_RESULT_NO_MATCH:
-// Log::add_info_va(_("There seems to be no Password set for Server %s."), s->host.c_str());
-// break;
-//
-// case GNOME_KEYRING_RESULT_NO_KEYRING_DAEMON:
-// Log::add_urgent_va (_("The Gnome keyring denied access to the Passwords."), s->host.c_str());
-// break;
-//
-// case GNOME_KEYRING_RESULT_OK:
-// setme_password.assign(pw.pw.str, pw.pw.len);
-// break;
-//
-// default:
-// break;
-// }
+ GnomeKeyringResult res = password_decrypt(pw);
+ switch (res)
+ {
+ case GNOME_KEYRING_RESULT_NO_MATCH:
+ Log::add_info_va(_("There seems to be no Password set for Server %s."), s->host.c_str());
+ break;
+
+ case GNOME_KEYRING_RESULT_NO_KEYRING_DAEMON:
+ Log::add_urgent_va (_("The Gnome keyring denied access to the Passwords."), s->host.c_str());
+ break;
+
+ case GNOME_KEYRING_RESULT_OK:
+ setme_password.assign(pw.pw.str, pw.pw.len);
+ break;
+
+ default:
+ break;
+ }
#endif
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]