keyring: don't change keyring password explicitly

It will happen automatically by the pam stack

https://bugzilla.gnome.org/show_bug.cgi?id=752980

3 files changed, 0 insertions, 60 deletions

diff --git a/gnome-initial-setup/gis-keyring.c b/gnome-initial-setup/gis-keyring.c
index 6459591..cbef4f2 100644
--- a/gnome-initial-setup/gis-keyring.c
+++ b/gnome-initial-setup/gis-keyring.c
@@ -67,60 +67,3 @@ out:
 	if (launcher)
 		g_object_unref (launcher);
 }
-
-void
-gis_update_login_keyring_password (const gchar *new_)
-{
-	GDBusConnection *bus = NULL;
-	SecretService *service = NULL;
-	SecretValue *old_secret = NULL;
-	SecretValue *new_secret = NULL;
-	GError *error = NULL;
-	
-	service = secret_service_get_sync (SECRET_SERVICE_OPEN_SESSION, NULL, &error);
-	if (service == NULL) {
-		g_warning ("Failed to get secret service: %s", error->message);
-		g_error_free (error);
-		goto out;
-	}
-
-	bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
-	if (bus == NULL) {
-		g_warning ("Failed to get session bus: %s", error->message);
-		g_error_free (error);
-		goto out;
-	}
-
-	old_secret = secret_value_new (DUMMY_PWD, strlen (DUMMY_PWD), "text/plain");
-	new_secret = secret_value_new (new_, strlen (new_), "text/plain");
-
-	g_dbus_connection_call_sync (bus,
-                                     "org.gnome.keyring",
-                                     "/org/freedesktop/secrets",
-                                     "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:
-
-	if (service)
-		g_object_unref (service);
-	if (bus)
-		g_object_unref (bus);
-	if (old_secret)
-		secret_value_unref (old_secret);
-	if (new_secret)
-		secret_value_unref (new_secret);
-}
diff --git a/gnome-initial-setup/gis-keyring.h b/gnome-initial-setup/gis-keyring.h
index 764f1e6..496b153 100644
--- a/gnome-initial-setup/gis-keyring.h
+++ b/gnome-initial-setup/gis-keyring.h
@@ -28,7 +28,6 @@
 G_BEGIN_DECLS
 
 void	gis_ensure_login_keyring	  ();
-void	gis_update_login_keyring_password (const gchar *new_);
 
 G_END_DECLS
 
diff --git a/gnome-initial-setup/pages/password/gis-password-page.c b/gnome-initial-setup/pages/password/gis-password-page.c
index 1841740..92ac744 100644
--- a/gnome-initial-setup/pages/password/gis-password-page.c
+++ b/gnome-initial-setup/pages/password/gis-password-page.c
@@ -91,8 +91,6 @@ gis_password_page_save_data (GisPage *gis_page)
     act_user_set_password (act_user, password, "");
 
   gis_driver_set_user_permissions (gis_page->driver, act_user, password);
-
-  gis_update_login_keyring_password (password);
 }
 
 static void