[PATCH] erstmal kompile

[Helmut Manck <manck laptop localdomain>]

---
 common-gnome/keyring-helpers.c |    4 ++--
 properties/auth-helpers.c      |    9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common-gnome/keyring-helpers.c b/common-gnome/keyring-helpers.c
index 720fc2c..086a738 100644
--- a/common-gnome/keyring-helpers.c
+++ b/common-gnome/keyring-helpers.c
@@ -21,7 +21,7 @@
  */
 
 #include <string.h>
-#include <gnome-keyring-memory.h>
+//#include <gnome-keyring-memory.h>
 
 #include <nm-setting-vpn.h>
 
@@ -137,7 +137,7 @@ keyring_helpers_delete_secret (const char *vpn_uuid,
 	                                      GNOME_KEYRING_ATTRIBUTE_TYPE_STRING,
 	                                      secret_name,
 	                                      NULL);
-	if (ret != GNOME_KEYRING_RESULT_OK && ret != GNOME_KEYRING_RESULT_NO_MATCH)
+	if (ret != GNOME_KEYRING_RESULT_OK ) // && ret != GNOME_KEYRING_RESULT_NO_MATCH)
 		return FALSE;
 	if (g_list_length (found) == 0)
 		return TRUE;
diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c
index 875554b..5ecfa79 100644
--- a/properties/auth-helpers.c
+++ b/properties/auth-helpers.c
@@ -33,7 +33,7 @@
 #include <errno.h>
 
 #include <glib/gi18n-lib.h>
-#include <gnome-keyring-memory.h>
+//#include <gnome-keyring-memory.h>
 #include <nm-setting-connection.h>
 
 #include "auth-helpers.h"
@@ -68,7 +68,8 @@ fill_password (GladeXML *xml,
 
 	password = NULL;
 
-	if (nm_connection_get_scope (connection) == NM_CONNECTION_SCOPE_SYSTEM) {
+	if ( 0 && nm_connection_get_scope (connection) == NM_CONNECTION_SCOPE_SYSTEM) {
+/*
 		NMSettingVPN *s_vpn;
 
 		s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN);
@@ -78,7 +79,7 @@ fill_password (GladeXML *xml,
 			tmp = nm_setting_vpn_get_secret (s_vpn, priv_key_password ? NM_OPENVPN_KEY_CERTPASS : NM_OPENVPN_KEY_PASSWORD);
 			if (tmp)
 				password = gnome_keyring_memory_strdup (tmp);
-		}
+		} */
 	} else {
 		NMSettingConnection *s_con;
 		gboolean unused;
@@ -91,7 +92,7 @@ fill_password (GladeXML *xml,
 
 	if (password) {
 		gtk_entry_set_text (GTK_ENTRY (widget), password);
-		gnome_keyring_memory_free (password);
+//		gnome_keyring_memory_free (password);
 	}
 
 	return widget;
-- 
1.5.2.1


--=-h02WRTdS9+xRSxYCGVI0
Content-Disposition: attachment; filename=0002-openvpn-plugin-fuer-pkcs11.patch
Content-Type: application/mbox; name=0002-openvpn-plugin-fuer-pkcs11.patch
Content-Transfer-Encoding: 8bit