[seahorse/gnome-3-6] gkr: Fix regression for changing keyring password

[Stefan Walter <stefw src gnome org>]

commit 4a297007e5c555ee4efe881cda283bd1c45e8f52
Author: Stef Walter <stefw gnome org>
Date:   Sat Oct 13 14:59:57 2012 +0200

    gkr: Fix regression for changing keyring password
    
     * Changing a keyring password was failing with 'The collection does
       not exist'.
     * Use the correct DBus object path when changing the keyring password.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=684966

 gkr/seahorse-gkr-actions.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gkr/seahorse-gkr-actions.c b/gkr/seahorse-gkr-actions.c
index c181065..ab20598 100644
--- a/gkr/seahorse-gkr-actions.c
+++ b/gkr/seahorse-gkr-actions.c
@@ -240,7 +240,7 @@ on_change_password_prompt (GObject *source,
 
 	retval = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error);
 	if (error == NULL) {
-		g_variant_get (retval, "@s", &prompt_path);
+		g_variant_get (retval, "(&o)", &prompt_path);
 		secret_service_prompt_at_dbus_path (change->service, prompt_path, NULL,
 		                                    on_change_password_done, change);
 		g_variant_unref (retval);
@@ -272,7 +272,7 @@ on_keyring_password (GtkAction *action,
 	                        g_dbus_proxy_get_object_path (proxy),
 	                        "org.gnome.keyring.InternalUnsupportedGuiltRiddenInterface",
 	                        "ChangeWithPrompt",
-	                        g_variant_new ("(o)", g_dbus_proxy_get_object_path (proxy)),
+	                        g_variant_new ("(o)", g_dbus_proxy_get_object_path (G_DBUS_PROXY (collection))),
 	                        G_VARIANT_TYPE ("(o)"),
 	                        0, -1, NULL, on_change_password_prompt, change);
 }