[seahorse] gkr: Update for latest changes in libsecret

[Stefan Walter <stefw src gnome org>]

commit bb9ee255d535e41bd9dc8aaf828ec2f04a5f8fcd
Author: Stef Walter <stefw gnome org>
Date:   Thu Jul 5 23:32:43 2012 +0200

    gkr: Update for latest changes in libsecret

 gkr/seahorse-gkr-backend.c |    2 +-
 gkr/seahorse-gkr-item.c    |    9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/gkr/seahorse-gkr-backend.c b/gkr/seahorse-gkr-backend.c
index 720d7ff..a45d8ec 100644
--- a/gkr/seahorse-gkr-backend.c
+++ b/gkr/seahorse-gkr-backend.c
@@ -167,7 +167,7 @@ on_service_new (GObject *source,
 		g_signal_connect (self->service, "notify::collections", G_CALLBACK (on_notify_collections), self);
 		refresh_collection (self);
 
-		secret_service_ensure_collections (self->service, NULL, NULL, NULL);
+		secret_service_load_collections (self->service, NULL, NULL, NULL);
 		seahorse_gkr_backend_load_async (self, NULL, NULL, NULL);
 	} else {
 		g_warning ("couldn't connect to secret service: %s", error->message);
diff --git a/gkr/seahorse-gkr-item.c b/gkr/seahorse-gkr-item.c
index 064573c..acdd3fd 100644
--- a/gkr/seahorse-gkr-item.c
+++ b/gkr/seahorse-gkr-item.c
@@ -517,16 +517,15 @@ received_item_secret (GObject *source,
                       gpointer user_data)
 {
 	SeahorseGkrItem *self = SEAHORSE_GKR_ITEM (source);
-	SecretValue *value;
 	GError *error = NULL;
 
 	g_clear_object (&self->pv->req_secret);
 
-	value = secret_item_get_secret_finish (SECRET_ITEM (source), result, &error);
+	secret_item_load_secret_finish (SECRET_ITEM (source), result, &error);
 	if (error == NULL) {
 		if (self->pv->item_secret)
 			secret_value_unref (self->pv->item_secret);
-		self->pv->item_secret = value;
+		self->pv->item_secret = secret_item_get_secret (SECRET_ITEM (self));
 		g_object_notify (G_OBJECT (self), "has-secret");
 	} else {
 		g_message ("Couldn't retrieve secret: %s", error->message);
@@ -543,8 +542,8 @@ load_item_secret (SeahorseGkrItem *self)
 		return;
 
 	self->pv->req_secret = g_cancellable_new ();
-	secret_item_get_secret (SECRET_ITEM (self), self->pv->req_secret,
-	                        received_item_secret, g_object_ref (self));
+	secret_item_load_secret (SECRET_ITEM (self), self->pv->req_secret,
+	                         received_item_secret, g_object_ref (self));
 }
 
 static gboolean