[gnome-keyring/gnome-3-6] dbus: Handle empty secrets correctly

[Stefan Walter <stefw src gnome org>]

commit c6a8c852ad4a43da6c5709ad98e38a32a6fde560
Author: Stef Walter <stefw gnome org>
Date:   Fri Nov 9 12:13:04 2012 +0100

    dbus: Handle empty secrets correctly
    
     * Don't assume an error occurred when retrieving an empty
       secret from the store.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=687979

 daemon/dbus/gkd-secret-session.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/daemon/dbus/gkd-secret-session.c b/daemon/dbus/gkd-secret-session.c
index 2b2e480..91a041f 100644
--- a/daemon/dbus/gkd-secret-session.c
+++ b/daemon/dbus/gkd-secret-session.c
@@ -605,7 +605,7 @@ gkd_secret_session_get_item_secret (GkdSecretSession *self, GckObject *item,
 	g_assert (GCK_IS_OBJECT (self->key));
 
 	session = gck_object_get_session (item);
-	g_return_val_if_fail (session, FALSE);
+	g_return_val_if_fail (session, NULL);
 
 	if (self->mech_type == CKM_AES_CBC_PAD) {
 		n_iv = 16;
@@ -623,7 +623,7 @@ gkd_secret_session_get_item_secret (GkdSecretSession *self, GckObject *item,
 	value = gck_session_wrap_key_full (session, self->key, &mech, item, &n_value,
 	                                   NULL, &error);
 
-	if (value == NULL) {
+	if (error != NULL) {
 		if (g_error_matches (error, GCK_ERROR, CKR_USER_NOT_LOGGED_IN)) {
 			dbus_set_error_const (derr, SECRET_ERROR_IS_LOCKED,
 			                      "Cannot get secret of a locked object");