[gnome-keyring] daemon: Update for changes in gck

[Stefan Walter <stefw src gnome org>]

commit 19f484a6a57a5b06e86a6a395e739259f2382808
Author: Stef Walter <stefw collabora co uk>
Date:   Thu Dec 22 11:21:06 2011 +0100

    daemon: Update for changes in gck
    
     * Remove the gck_builder_add_owned function

 configure.ac                           |    2 +-
 daemon/dbus/gkd-secret-create.c        |    2 +-
 daemon/dbus/gkd-secret-objects.c       |    2 +-
 daemon/gpg-agent/gkd-gpg-agent-ops.c   |    6 +++---
 daemon/ssh-agent/gkd-ssh-agent-ops.c   |    4 ++--
 daemon/ssh-agent/gkd-ssh-agent-proto.c |   14 +++++++-------
 6 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9e96df2..3c9e631 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,7 +196,7 @@ fi
 # --------------------------------------------------------------------
 # GCR and GCK libraries
 
-PKG_CHECK_MODULES(GCK, gck-1 >= 3.3.3)
+PKG_CHECK_MODULES(GCK, gck-1 >= 3.3.4)
 PKG_CHECK_MODULES(GCR, gcr-3 >= 3.3.3)
 PKG_CHECK_MODULES(GCR_BASE, gcr-base-3 >= 3.3.3)
 
diff --git a/daemon/dbus/gkd-secret-create.c b/daemon/dbus/gkd-secret-create.c
index 2c8c9f5..5b49c9f 100644
--- a/daemon/dbus/gkd-secret-create.c
+++ b/daemon/dbus/gkd-secret-create.c
@@ -413,7 +413,7 @@ gkd_secret_create_with_credential (GckSession *session, GckAttributes *attrs,
 
 	attr = gck_attributes_find (attrs, CKA_LABEL);
 	if (attr != NULL)
-		gck_builder_add_owned (&builder, attr);
+		gck_builder_add_attribute (&builder, attr);
 	if (!gck_attributes_find_boolean (attrs, CKA_TOKEN, &token))
 		token = FALSE;
 	gck_builder_add_boolean (&builder, CKA_TOKEN, token);
diff --git a/daemon/dbus/gkd-secret-objects.c b/daemon/dbus/gkd-secret-objects.c
index 28a243d..491d130 100644
--- a/daemon/dbus/gkd-secret-objects.c
+++ b/daemon/dbus/gkd-secret-objects.c
@@ -515,7 +515,7 @@ collection_find_matching_item (GkdSecretObjects *self,
 	gsize n_data;
 
 	/* Find items matching the collection and fields */
-	gck_builder_add_owned (&builder, fields);
+	gck_builder_add_attribute (&builder, fields);
 	gck_builder_add_string (&builder, CKA_G_COLLECTION, identifier);
 	gck_builder_add_ulong (&builder, CKA_CLASS, CKO_G_SEARCH);
 	gck_builder_add_boolean (&builder, CKA_TOKEN, FALSE);
diff --git a/daemon/gpg-agent/gkd-gpg-agent-ops.c b/daemon/gpg-agent/gkd-gpg-agent-ops.c
index 8f4e7ef..afca811 100644
--- a/daemon/gpg-agent/gkd-gpg-agent-ops.c
+++ b/daemon/gpg-agent/gkd-gpg-agent-ops.c
@@ -124,11 +124,11 @@ find_saved_items (GckSession *session, GckAttributes *attrs)
 
 	attr = gck_attributes_find (attrs, CKA_G_COLLECTION);
 	if (attr != NULL)
-		gck_builder_add_owned (&builder, attr);
+		gck_builder_add_attribute (&builder, attr);
 
 	attr = gck_attributes_find (attrs, CKA_G_FIELDS);
 	g_return_val_if_fail (attr != NULL, NULL);
-	gck_builder_add_owned (&builder, attr);
+	gck_builder_add_attribute (&builder, attr);
 
 	search = gck_session_create_object (session, gck_builder_end (&builder), NULL, &error);
 	if (search == NULL) {
@@ -186,7 +186,7 @@ do_save_password (GckSession *session, const gchar *keyid, const gchar *descript
 
 	/* Bring in all the unlock options */
 	for (i = 0; options && i < gck_attributes_count (options); ++i)
-		gck_builder_add_owned (&builder, gck_attributes_at (options, i));
+		gck_builder_add_attribute (&builder, gck_attributes_at (options, i));
 
 	/* Find a previously stored object like this, and replace if so */
 	attrs = gck_attributes_ref_sink (gck_builder_end (&builder));
diff --git a/daemon/ssh-agent/gkd-ssh-agent-ops.c b/daemon/ssh-agent/gkd-ssh-agent-ops.c
index 22c61ef..5927d9a 100644
--- a/daemon/ssh-agent/gkd-ssh-agent-ops.c
+++ b/daemon/ssh-agent/gkd-ssh-agent-ops.c
@@ -60,7 +60,7 @@ copy_attribute (GckAttributes *original,
 
 	attr = gck_attributes_find (original, type);
 	if (attr)
-		gck_builder_add_owned (dest, attr);
+		gck_builder_add_attribute (dest, attr);
 }
 
 static gboolean
@@ -239,7 +239,7 @@ return_private_matching (GckObject *object, gpointer user_data)
 	if (!login_session (session))
 		return FALSE;
 
-	gck_builder_add_owned (&builder, attr);
+	gck_builder_add_attribute (&builder, attr);
 	gck_builder_add_ulong (&builder, CKA_CLASS, CKO_PRIVATE_KEY);
 	gck_builder_add_boolean (&builder, CKA_TOKEN, token);
 
diff --git a/daemon/ssh-agent/gkd-ssh-agent-proto.c b/daemon/ssh-agent/gkd-ssh-agent-proto.c
index 0377fcf..f288374 100644
--- a/daemon/ssh-agent/gkd-ssh-agent-proto.c
+++ b/daemon/ssh-agent/gkd-ssh-agent-proto.c
@@ -242,9 +242,9 @@ gkd_ssh_agent_proto_read_pair_rsa (EggBuffer *req,
 
 	/* Copy attributes to the public key */
 	attr = gck_builder_find (priv_attrs, CKA_MODULUS);
-	gck_builder_add_owned (pub_attrs, attr);
+	gck_builder_add_attribute (pub_attrs, attr);
 	attr = gck_builder_find (priv_attrs, CKA_PUBLIC_EXPONENT);
-	gck_builder_add_owned (pub_attrs, attr);
+	gck_builder_add_attribute (pub_attrs, attr);
 
 	/* Add in your basic other required attributes */
 	gck_builder_add_ulong (priv_attrs, CKA_CLASS, CKO_PRIVATE_KEY);
@@ -278,9 +278,9 @@ gkd_ssh_agent_proto_read_pair_v1 (EggBuffer *req,
 
 	/* Copy attributes to the public key */
 	attr = gck_builder_find (priv_attrs, CKA_MODULUS);
-	gck_builder_add_owned (pub_attrs, attr);
+	gck_builder_add_attribute (pub_attrs, attr);
 	attr = gck_builder_find (priv_attrs, CKA_PUBLIC_EXPONENT);
-	gck_builder_add_owned (pub_attrs, attr);
+	gck_builder_add_attribute (pub_attrs, attr);
 
 	/* Add in your basic other required attributes */
 	gck_builder_add_ulong (priv_attrs, CKA_CLASS, CKO_PRIVATE_KEY);
@@ -358,11 +358,11 @@ gkd_ssh_agent_proto_read_pair_dsa (EggBuffer *req,
 
 	/* Copy attributes to the public key */
 	attr = gck_builder_find (priv_attrs, CKA_PRIME);
-	gck_builder_add_owned (pub_attrs, attr);
+	gck_builder_add_attribute (pub_attrs, attr);
 	attr = gck_builder_find (priv_attrs, CKA_SUBPRIME);
-	gck_builder_add_owned (pub_attrs, attr);
+	gck_builder_add_attribute (pub_attrs, attr);
 	attr = gck_builder_find (priv_attrs, CKA_BASE);
-	gck_builder_add_owned (pub_attrs, attr);
+	gck_builder_add_attribute (pub_attrs, attr);
 
 	/* Add in your basic other required attributes */
 	gck_builder_add_ulong (priv_attrs, CKA_CLASS, CKO_PRIVATE_KEY);