[gnome-initial-setup/shell/4765: 100/362] keyring: report error when failing to change keyring password

[Jasper St. Pierre <jstpierre src gnome org>]

commit 58d5793618b8dcb06c2ec3cb59add75f118aedad
Author: Cosimo Cecchi <cosimo endlessm com>
Date:   Tue Jul 15 18:20:37 2014 -0700

    keyring: report error when failing to change keyring password
    
    [endlessm/eos-shell#2901]

 gnome-initial-setup/gis-keyring.c |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/gnome-initial-setup/gis-keyring.c b/gnome-initial-setup/gis-keyring.c
index dcb5816..4da4541 100644
--- a/gnome-initial-setup/gis-keyring.c
+++ b/gnome-initial-setup/gis-keyring.c
@@ -92,19 +92,24 @@ gis_update_login_keyring_password (const gchar *old_, const gchar *new_)
        old_secret = secret_value_new (old_, strlen (old_), "text/plain");
        new_secret = secret_value_new (new_, strlen (new_), "text/plain");
 
-       g_dbus_connection_call (bus,
-                               "org.gnome.keyring",
-                               "/org/gnome/keyring",
-                               "org.gnome.keyring.InternalUnsupportedGuiltRiddenInterface",
-                               "ChangeWithMasterPassword",
-                               g_variant_new ("(o@(oayays)@(oayays))",
-                                              "/org/freedesktop/secrets/collection/login",
-                                              secret_service_encode_dbus_secret (service, old_secret),
-                                              secret_service_encode_dbus_secret (service, new_secret)),
-                               NULL,
-                               0,
-                               G_MAXINT,
-                               NULL, NULL, NULL);
+       g_dbus_connection_call_sync (bus,
+                                     "org.gnome.keyring",
+                                     "/org/gnome/keyring",
+                                     "org.gnome.keyring.InternalUnsupportedGuiltRiddenInterface",
+                                     "ChangeWithMasterPassword",
+                                     g_variant_new ("(o@(oayays)@(oayays))",
+                                                    "/org/freedesktop/secrets/collection/login",
+                                                    secret_service_encode_dbus_secret (service, old_secret),
+                                                    secret_service_encode_dbus_secret (service, new_secret)),
+                                     NULL,
+                                     0,
+                                     G_MAXINT,
+                                     NULL, &error);
+
+        if (error != NULL) {
+          g_warning ("Failed to change keyring password: %s", error->message);
+          g_error_free (error);
+        }
 
 out: