[gnome-keyring] [dbus] Bug fixes for password lookup.

[Stefan Walter <stefw src gnome org>]

commit d1462e25d158f141cacec7ba80c1d3d2d411ac19
Author: Stef Walter <stef memberwebs com>
Date:   Sun Jan 3 00:46:43 2010 +0000

    [dbus] Bug fixes for password lookup.
    
    Some bug fixes for unlocking keyrings, and password lookup.

 daemon/dbus/gkd-secret-prompt.c |    4 +++-
 daemon/dbus/gkd-secret-unlock.c |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/daemon/dbus/gkd-secret-prompt.c b/daemon/dbus/gkd-secret-prompt.c
index bda65dc..0ca0cae 100644
--- a/daemon/dbus/gkd-secret-prompt.c
+++ b/daemon/dbus/gkd-secret-prompt.c
@@ -115,7 +115,9 @@ complete_transport_params (GkdSecretPrompt *self)
 	result = gkd_secret_session_complete (self->pv->session, peer, n_peer);
 	g_free (peer);
 
-	if (!result)
+	if (result)
+		self->pv->negotiated = TRUE;
+	else
 		g_warning ("negotiation of transport crypto with prompt failed");
 
 	return result;
diff --git a/daemon/dbus/gkd-secret-unlock.c b/daemon/dbus/gkd-secret-unlock.c
index 388b08c..a9e8a56 100644
--- a/daemon/dbus/gkd-secret-unlock.c
+++ b/daemon/dbus/gkd-secret-unlock.c
@@ -95,6 +95,7 @@ prepare_unlock_prompt (GkdSecretUnlock *self, GP11Object *coll)
 	gkd_prompt_hide_widget (prompt, "name_area");
 	gkd_prompt_hide_widget (prompt, "confirm_area");
 	gkd_prompt_hide_widget (prompt, "details_area");
+	gkd_prompt_show_widget (prompt, "password_area");
 
 	g_free (label);
 }
@@ -235,7 +236,7 @@ gkd_secret_unlock_prompt_ready (GkdSecretPrompt *prompt)
 			g_free (objpath);
 			continue;
 		} else if (!locked) {
-			g_array_append_val (self->results, self->current);
+			g_array_append_val (self->results, objpath);
 			g_object_unref (coll);
 			continue;
 		}