[pan2] Change use-gnome-keyring to use-password-storage

[Petr Kovář <pmkovar src gnome org>]

commit 175889166acbc0f58ae2bf7199f67dba21fac3c6
Author: Petr Kovar <pknbe volny cz>
Date:   Sun Jun 18 20:27:45 2017 +0200

    Change use-gnome-keyring to use-password-storage

 pan/data-impl/server.cc |    8 ++++----
 pan/gui/prefs-ui.cc     |    4 ++--
 pan/gui/server-ui.cc    |    6 +++---
 pan/tasks/nntp-pool.cc  |    6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/pan/data-impl/server.cc b/pan/data-impl/server.cc
index 602262d..9dcc261 100644
--- a/pan/data-impl/server.cc
+++ b/pan/data-impl/server.cc
@@ -539,7 +539,7 @@ DataImpl :: load_server_properties (const DataIO& source)
 #ifndef HAVE_GKR
     s.password = kv["password"];
 #else
-    if (!_prefs.get_flag("use-gnome-keyring", false))
+    if (!_prefs.get_flag("use-password-storage", false))
       s.password = kv["password"];
 #endif
     s.port = to_int (kv["port"], STD_NNTP_PORT);
@@ -597,14 +597,14 @@ DataImpl :: save_server_properties (DataIO& data_io, Prefs& prefs)
     const Server* s (find_server (*it));
     std::string user;
     gchar* pass(NULL);
-    get_server_auth(*it, user, pass, prefs.get_flag("use-gnome-keyring",false));
+    get_server_auth(*it, user, pass, prefs.get_flag("use-password-storage",false));
     *out << indent(depth++) << "<server id=\"" << escaped(it->to_string()) << "\">\n";
     *out << indent(depth) << "<host>" << escaped(s->host) << "</host>\n"
          << indent(depth) << "<port>" << s->port << "</port>\n"
          << indent(depth) << "<username>" << escaped(user) << "</username>\n";
 #ifdef HAVE_GKR
-if (prefs.get_flag("use-gnome-keyring", false))
-    *out << indent(depth) << "<password>" << "HANDLED_BY_GNOME_KEYRING" << "</password>\n";
+if (prefs.get_flag("use-password-storage", false))
+    *out << indent(depth) << "<password>" << "HANDLED_BY_PASSWORD_STORAGE" << "</password>\n";
 else
     *out << indent(depth) << "<password>" << escaped(pass) << "</password>\n";
 #else
diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc
index 57f45bf..f735120 100644
--- a/pan/gui/prefs-ui.cc
+++ b/pan/gui/prefs-ui.cc
@@ -1061,8 +1061,8 @@ PrefsDialog :: PrefsDialog (Prefs& prefs, GtkWindow* parent):
 
     // Gnome Keyring Option
     HIG :: workarea_add_section_spacer (t, row, 2);
-    HIG :: workarea_add_section_title (t, &row, _("GNOME Keyring"));
-    w = new_check_button (_("Store passwords in GNOME Keyring"), "use-gnome-keyring", false, prefs);
+    HIG :: workarea_add_section_title (t, &row, _("Password Storage"));
+    w = new_check_button (_("Save passwords in password storage"), "use-password-storage", false, prefs);
     HIG :: workarea_add_wide_control (t, &row, w);
 
   HIG :: workarea_finish (t, &row);
diff --git a/pan/gui/server-ui.cc b/pan/gui/server-ui.cc
index d6f3e69..c5667c5 100644
--- a/pan/gui/server-ui.cc
+++ b/pan/gui/server-ui.cc
@@ -142,7 +142,7 @@ namespace
     gchar* pass(NULL);
     if (!server.empty()) {
       d->data.get_server_addr (server, addr, port);
-      d->data.get_server_auth (server, user, pass, prefs.get_flag("use-gnome-keyring",false));
+      d->data.get_server_auth (server, user, pass, prefs.get_flag("use-password-storage",false));
       age = d->data.get_server_article_expiration_age (server);
       rank = d->data.get_server_rank (server);
       max_conn = d->data.get_server_limits (server);
@@ -236,7 +236,7 @@ namespace
 #if GTK_CHECK_VERSION(3,0,0)
       gchar* pass = gcr_secure_memory_strdup(gtk_entry_get_text(GTK_ENTRY(d->auth_password_entry)));
 #else
-      gchar* pass = gnome_keyring_memory_strdup(gtk_entry_get_text(GTK_ENTRY(d->auth_password_entry))); 
+      gchar* pass = gnome_keyring_memory_strdup(gtk_entry_get_text(GTK_ENTRY(d->auth_password_entry)));
 #endif /* GTK_CHECK_VERSION(3,0,0) */
 #else
       gchar* pass = (gchar*)gtk_entry_get_text(GTK_ENTRY(d->auth_password_entry));
@@ -284,7 +284,7 @@ namespace
         if (d->server.empty())
           d->server = d->data.add_new_server ();
         d->data.set_server_addr (d->server, addr, port);
-        d->data.set_server_auth (d->server, user, pass, d->prefs.get_flag("use-gnome-keyring",false));
+        d->data.set_server_auth (d->server, user, pass, d->prefs.get_flag("use-password-storage",false));
         d->data.set_server_limits (d->server, max_conn);
         d->data.set_server_article_expiration_age (d->server, age);
         d->data.set_server_rank (d->server, rank);
diff --git a/pan/tasks/nntp-pool.cc b/pan/tasks/nntp-pool.cc
index ffb344b..603ec0a 100644
--- a/pan/tasks/nntp-pool.cc
+++ b/pan/tasks/nntp-pool.cc
@@ -175,7 +175,7 @@ NNTP_Pool :: on_socket_created (const StringView  & host,
 {
   std::string user;
   gchar* pass(NULL);
-  ok = ok && _server_info.get_server_auth (_server, user, pass, _prefs.get_flag("use-gnome-keyring", false));
+  ok = ok && _server_info.get_server_auth (_server, user, pass, _prefs.get_flag("use-password-storage", 
false));
   debug("on socket created "<<host<<" "<<ok<<" "<<socket);
   if (!ok)
   {
@@ -184,10 +184,10 @@ NNTP_Pool :: on_socket_created (const StringView  & host,
   }
   else
   {
-    // okay, we at least we established a connection.
+    // okay, we at least established a connection.
     // now try to handshake and pass the buck to on_nntp_done().
     NNTP * nntp;
-    if (!_prefs.get_flag("use-gnome-keyring", false))
+    if (!_prefs.get_flag("use-password-storage", false))
     {
       std::string pw (pass ? pass : "");
       if (pass) g_free(pass);