[pan2] quickfix for gkr

[Heinrich MÃller <henmull src gnome org>]

commit 0a2ddf19225bc283a61e9782221683010b1e887d
Author: Heinrich MÃlller <henmull src gnome org>
Date:   Sat May 26 20:00:59 2012 +0200

    quickfix for gkr

 pan/data-impl/server.cc       |    5 ++++-
 pan/tasks/socket-impl-main.cc |    1 -
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/pan/data-impl/server.cc b/pan/data-impl/server.cc
index f58b9c0..525278d 100644
--- a/pan/data-impl/server.cc
+++ b/pan/data-impl/server.cc
@@ -231,7 +231,7 @@ DataImpl :: get_server_auth (const Quark   & server,
   if (found) {
     setme_username = s->username;
 #ifndef HAVE_GKR
-      setme_password = (gchar*)s->password.c_str();
+    setme_password = (gchar*)s->password.c_str();
 #else
     if (!use_gkr)
     {
@@ -469,6 +469,9 @@ DataImpl :: load_server_properties (const DataIO& source)
 #ifndef HAVE_GKR
     s.password = kv["password"];
 #endif
+    if (!_prefs.get_flag("use-gnome-keyring", false))
+      s.password = kv["password"];
+
     s.port = to_int (kv["port"], STD_NNTP_PORT);
     s.max_connections = to_int (kv["connection-limit"], 2);
     s.article_expiration_age = to_int(kv["expire-articles-n-days-old"], 31);
diff --git a/pan/tasks/socket-impl-main.cc b/pan/tasks/socket-impl-main.cc
index 7c0b1f1..d91eff2 100644
--- a/pan/tasks/socket-impl-main.cc
+++ b/pan/tasks/socket-impl-main.cc
@@ -66,7 +66,6 @@ using namespace pan;
 
 namespace
 {
-  const unsigned int TIMEOUT_SECS (10);
 
   struct ThreadWorker : public WorkerPool::Worker,
                         public WorkerPool::Worker::Listener