[pan2] another gkr compile fix



commit 2d3aff8f6a6f2f9569efcb2c6b1e1577ebf1f6ae
Author: Heinrich MÃller <henmull src gnome org>
Date:   Sun Apr 22 21:09:40 2012 +0200

    another gkr compile fix

 pan/data-impl/server.cc |    2 +-
 pan/gui/server-ui.cc    |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/pan/data-impl/server.cc b/pan/data-impl/server.cc
index f77dbbd..39fc479 100644
--- a/pan/data-impl/server.cc
+++ b/pan/data-impl/server.cc
@@ -222,7 +222,7 @@ DataImpl :: get_server_auth (const Quark   & server,
   if (found) {
     setme_username = s->username;
 #ifndef HAVE_GKR
-    setme_password = s->password.c_str();
+    setme_password = (gchar*)s->password.c_str();
 #else
     if (s->gkr_pw)
     {
diff --git a/pan/gui/server-ui.cc b/pan/gui/server-ui.cc
index 07b0c03..cbfa00a 100644
--- a/pan/gui/server-ui.cc
+++ b/pan/gui/server-ui.cc
@@ -194,8 +194,11 @@ namespace
       const int port (gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(d->port_spin)));
       const int max_conn (gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(d->connection_limit_spin)));
       StringView user (pan_entry_get_text (d->auth_username_entry));
+#ifdef HAVE_GKR
       gchar* pass = gnome_keyring_memory_strdup(gtk_entry_get_text(GTK_ENTRY(d->auth_password_entry)));
-
+#else
+      gchar* pass = (gchar*)gtk_entry_get_text(GTK_ENTRY(d->auth_password_entry));
+#endif
       int age (31);
       GtkTreeIter iter;
       GtkComboBox * combo (GTK_COMBO_BOX (d->expiration_age_combo));



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]