[gnome-keyring/dbus-api] [secrets] Add compat functions for acls.

[Stefan Walter <stefw src gnome org>]

commit 404319811a88ae6fdb30d773d55d444248f53bf2
Author: Stefan Walter <Stefan Walter>
Date:   Mon Aug 3 14:16:37 2009 +0000

    [secrets] Add compat functions for acls.

 pkcs11/secret-store/Makefile.am          |    2 +-
 pkcs11/secret-store/gck-secret-binary.c  |    6 ++--
 pkcs11/secret-store/gck-secret-compat.c  |   45 ++++++++++++++++++++++++++++++
 pkcs11/secret-store/gck-secret-compat.h  |    4 ++-
 pkcs11/secret-store/gck-secret-textual.c |    2 +-
 5 files changed, 53 insertions(+), 6 deletions(-)
---
diff --git a/pkcs11/secret-store/Makefile.am b/pkcs11/secret-store/Makefile.am
index 1731a0a..5d9e7b3 100644
--- a/pkcs11/secret-store/Makefile.am
+++ b/pkcs11/secret-store/Makefile.am
@@ -15,7 +15,7 @@ noinst_LTLIBRARIES = \
 libgck_secret_store_la_SOURCES = \
 	gck-secret-binary.c gck-secret-binary.h \
 	gck-secret-collection.h gck-secret-collection.c \
-	gck-secret-compat.h \
+	gck-secret-compat.h gck-secret-compat.c \
 	gck-secret-fields.h gck-secret-fields.c \
 	gck-secret-item.h gck-secret-item.c \
 	gck-secret-module.h gck-secret-module.c \
diff --git a/pkcs11/secret-store/gck-secret-binary.c b/pkcs11/secret-store/gck-secret-binary.c
index 3ee0d49..7591e29 100644
--- a/pkcs11/secret-store/gck-secret-binary.c
+++ b/pkcs11/secret-store/gck-secret-binary.c
@@ -697,7 +697,7 @@ decode_acl (EggBuffer *buffer, gsize offset, gsize *offset_out, GList **out)
 	return TRUE;
 	
 bail:
-	gck_secret_acl_free (acl);
+	gck_secret_compat_acl_free (acl);
 	return FALSE;
 }
 
@@ -740,7 +740,7 @@ setup_item_from_info (GckSecretItem *item, gboolean locked, ItemInfo *info)
 		secret = gck_login_new_from_password (info->secret);
 		gck_secret_item_set_secret (item, secret);
 		g_object_unref (secret);
-		g_object_set_data_full (G_OBJECT (item), "compat-acl", info->acl, gck_secret_acl_free);
+		g_object_set_data_full (G_OBJECT (item), "compat-acl", info->acl, gck_secret_compat_acl_free);
 		info->acl = NULL;
 	}
 
@@ -754,7 +754,7 @@ free_item_info (ItemInfo *info)
 	g_free (info->display_name);
 	egg_secure_free (info->secret);
 	g_hash_table_unref (info->attributes);
-	gck_secret_acl_free (info->acl);
+	gck_secret_compat_acl_free (info->acl);
 }
 
 gint
diff --git a/pkcs11/secret-store/gck-secret-compat.c b/pkcs11/secret-store/gck-secret-compat.c
new file mode 100644
index 0000000..1b67acb
--- /dev/null
+++ b/pkcs11/secret-store/gck-secret-compat.c
@@ -0,0 +1,45 @@
+/* 
+ * gnome-keyring
+ * 
+ * Copyright (C) 2009 Stefan Walter
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.  
+ */
+
+#include "config.h"
+
+#include "gck-secret-compat.h"
+
+void
+gck_secret_compat_access_free (gpointer data)
+{
+	GckSecretAccess *ac = data;
+	if (ac) {
+		g_free (ac->display_name);
+		g_free (ac->pathname);
+		g_free (ac);
+	}
+}
+
+void
+gck_secret_compat_acl_free (gpointer acl)
+{
+	GList *l;
+	for (l = acl; l; l = g_list_next (l)) 
+		gck_secret_compat_access_free (l->data);
+	g_list_free (acl);
+}
+
diff --git a/pkcs11/secret-store/gck-secret-compat.h b/pkcs11/secret-store/gck-secret-compat.h
index 302e21c..bc6b724 100644
--- a/pkcs11/secret-store/gck-secret-compat.h
+++ b/pkcs11/secret-store/gck-secret-compat.h
@@ -36,6 +36,8 @@ typedef struct _GckSecretAccess {
 	GckSecretAccessType types_allowed;
 } GckSecretAccess;
 
-void     gck_secret_acl_free           (gpointer acl);
+void     gck_secret_compat_access_free (gpointer ac);
+
+void     gck_secret_compat_acl_free    (gpointer acl);
 
 #endif /* __GCK_SECRET_COMPAT_H__ */
diff --git a/pkcs11/secret-store/gck-secret-textual.c b/pkcs11/secret-store/gck-secret-textual.c
index 2599b7e..999fb27 100644
--- a/pkcs11/secret-store/gck-secret-textual.c
+++ b/pkcs11/secret-store/gck-secret-textual.c
@@ -296,7 +296,7 @@ parse_acl (GKeyFile *file, GckSecretItem *item, const gchar **groups)
 		acl = g_list_prepend (acl, ac);
 	}
 	
-	g_object_set_data_full (G_OBJECT (item), "compat-acl", acl, gck_secret_acl_free);
+	g_object_set_data_full (G_OBJECT (item), "compat-acl", acl, gck_secret_compat_acl_free);
 	g_free (prefix);
 }