From 78f80470e8f2318334d1022925bb91966e6a192f Mon Sep 17 00:00:00 2001
From: Stef Walter <stef@memberwebs.com>
Date: Tue, 22 Jun 2010 02:38:32 +0000
Subject: [PATCH] Stop gap fix for threading problem in gnome_keyring_is_available()

 * This will be fixed more fully in master.

https://bugzilla.gnome.org/show_bug.cgi?id=616512
---
 library/gnome-keyring.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/library/gnome-keyring.c b/library/gnome-keyring.c
index 9c8486a..c41de42 100644
--- a/library/gnome-keyring.c
+++ b/library/gnome-keyring.c
@@ -483,6 +483,7 @@ gnome_keyring_is_available (void)
 {
 	GkrOperation *op;
 	DBusMessage *req;
+	gboolean ret;
 
 	req = dbus_message_new_method_call (gkr_service_name (), SERVICE_PATH,
 	                                    DBUS_INTERFACE_PEER, "Ping");
@@ -490,8 +491,9 @@ gnome_keyring_is_available (void)
 	op = gkr_operation_new (gkr_callback_empty, GKR_CALLBACK_RES, NULL, NULL);
 	gkr_operation_request (op, req);
 	dbus_message_unref (req);
+	ret = gkr_operation_block (op) == GNOME_KEYRING_RESULT_OK;
 	gkr_operation_unref (op);
-	return gkr_operation_block (op) == GNOME_KEYRING_RESULT_OK;
+	return ret;
 }
 
 /**
-- 
1.7.1