Fix spaces -> tabswip/gdbus

16 files changed, 425 insertions, 425 deletions

diff --git a/daemon/dbus/gkd-dbus-environment.c b/daemon/dbus/gkd-dbus-environment.c
index 2c6a5bfd..49f1f1f5 100644
--- a/daemon/dbus/gkd-dbus-environment.c
+++ b/daemon/dbus/gkd-dbus-environment.c
@@ -115,5 +115,5 @@ gkd_dbus_environment_init (GDBusConnection *conn)
 		setenv_request (conn, *envp);
 
 	gkd_util_watch_environment (on_watch_environment, g_object_ref (conn),
-	                            (GDestroyNotify) g_object_unref);
+				    (GDestroyNotify) g_object_unref);
 }
diff --git a/daemon/dbus/gkd-dbus-secrets.c b/daemon/dbus/gkd-dbus-secrets.c
index f4e38fc4..2712a33d 100644
--- a/daemon/dbus/gkd-dbus-secrets.c
+++ b/daemon/dbus/gkd-dbus-secrets.c
@@ -102,7 +102,7 @@ gkd_dbus_secrets_startup (void)
 
 	if (error != NULL) {
 		g_message ("couldn't request name '%s' on session bus: %s",
-		           service, error->message);
+			   service, error->message);
 		g_error_free (error);
 	} else {
 		g_variant_get (request_variant, "(u)", &res);
@@ -127,7 +127,7 @@ gkd_dbus_secrets_startup (void)
 
 	g_return_val_if_fail (!secrets_service, FALSE);
 	secrets_service = g_object_new (GKD_SECRET_TYPE_SERVICE,
-	                                "connection", dbus_conn, "pkcs11-slot", slot, NULL);
+					"connection", dbus_conn, "pkcs11-slot", slot, NULL);
 
 	g_object_unref (slot);
 	return TRUE;
diff --git a/daemon/dbus/gkd-dbus.c b/daemon/dbus/gkd-dbus.c
index d927a8ad..6c24cf24 100644
--- a/daemon/dbus/gkd-dbus.c
+++ b/daemon/dbus/gkd-dbus.c
@@ -196,21 +196,21 @@ gkd_dbus_singleton_acquire (gboolean *acquired)
 		g_variant_unref (acquire_variant);
 
 		switch (res) {
-               /* We acquired the service name */
+		/* We acquired the service name */
 		case 1: /* DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER */
 		case 4: /* DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER */
-                       acquired_service = TRUE;
-                       break;
-               /* Another daemon is running */
+		       acquired_service = TRUE;
+		       break;
+		/* Another daemon is running */
 		case 2: /* DBUS_REQUEST_NAME_REPLY_IN_QUEUE */
 		case 3: /* DBUS_REQUEST_NAME_REPLY_EXISTS */
-                       acquired_service = FALSE;
-                       break;
-               default:
-                       acquired_service = FALSE;
-                       g_return_val_if_reached (FALSE);
-                       break;
-               };
+		       acquired_service = FALSE;
+		       break;
+		default:
+		       acquired_service = FALSE;
+		       g_return_val_if_reached (FALSE);
+		       break;
+	       };
 	}
 
 	*acquired = acquired_service;
diff --git a/daemon/dbus/gkd-secret-change.c b/daemon/dbus/gkd-secret-change.c
index 24466ea0..43cf6fa4 100644
--- a/daemon/dbus/gkd-secret-change.c
+++ b/daemon/dbus/gkd-secret-change.c
@@ -59,13 +59,13 @@ struct _GkdSecretChangeClass {
 };
 
 static void      perform_prompting     (GkdSecretChange *self,
-                                        GckObject *collection);
+					GckObject *collection);
 
 G_DEFINE_TYPE (GkdSecretChange, gkd_secret_change, GKD_SECRET_TYPE_PROMPT);
 
 static void
 setup_original_prompt (GkdSecretChange *self,
-                       GckObject *collection)
+		       GckObject *collection)
 {
 	GcrPrompt *prompt = GCR_PROMPT (self);
 	GError *error = NULL;
@@ -91,7 +91,7 @@ setup_original_prompt (GkdSecretChange *self,
 	g_free (text);
 
 	text = g_strdup_printf (_("An application wants to change the password for the '%s' keyring. "
-	                          "Enter the old password for it."), label);
+				  "Enter the old password for it."), label);
 	gcr_prompt_set_description (prompt, text);
 	g_free (text);
 
@@ -101,7 +101,7 @@ setup_original_prompt (GkdSecretChange *self,
 
 static void
 setup_password_prompt (GkdSecretChange *self,
-                       GckObject *collection)
+		       GckObject *collection)
 {
 	GcrPrompt *prompt = GCR_PROMPT (self);
 	GError *error = NULL;
@@ -127,7 +127,7 @@ setup_password_prompt (GkdSecretChange *self,
 	g_free (text);
 
 	text = g_strdup_printf (_("An application wants to change the password for the '%s' keyring. "
-	                          "Choose the new password you want to use for it."), label);
+				  "Choose the new password you want to use for it."), label);
 	gcr_prompt_set_description (prompt, text);
 	g_free (text);
 
@@ -141,8 +141,8 @@ setup_confirmation_prompt (GkdSecretChange *self)
 {
 	gcr_prompt_set_message (GCR_PROMPT (self), _("Store passwords unencrypted?"));
 	gcr_prompt_set_description (GCR_PROMPT (self),
-	                            _("By choosing to use a blank password, your stored passwords will not be safely encrypted. "
-	                              "They will be accessible by anyone with access to your files."));
+				    _("By choosing to use a blank password, your stored passwords will not be safely encrypted. "
+				      "They will be accessible by anyone with access to your files."));
 	gcr_prompt_set_continue_label (GCR_PROMPT (self), _("Continue"));
 }
 
@@ -154,8 +154,8 @@ set_warning_wrong (GkdSecretChange *self)
 
 static void
 on_prompt_original_complete (GObject *source,
-                             GAsyncResult *result,
-                             gpointer user_data)
+			     GAsyncResult *result,
+			     gpointer user_data)
 {
 	GkdSecretChange *self = GKD_SECRET_CHANGE (source);
 	GkdSecretPrompt *prompt = GKD_SECRET_PROMPT (source);
@@ -190,8 +190,8 @@ on_prompt_original_complete (GObject *source,
 
 		/* Create the original credential, in order to make sure we can unlock the collection */
 		self->ocred = gkd_secret_session_create_credential (original->session,
-		                                                    self->session, attrs,
-		                                                    original, &error);
+								    self->session, attrs,
+								    original, &error);
 
 		gck_attributes_unref (attrs);
 
@@ -223,8 +223,8 @@ on_prompt_original_complete (GObject *source,
 
 static void
 on_prompt_password_complete (GObject *source,
-                             GAsyncResult *result,
-                             gpointer user_data)
+			     GAsyncResult *result,
+			     gpointer user_data)
 {
 	GkdSecretChange *self = GKD_SECRET_CHANGE (source);
 	GkdSecretPrompt *prompt = GKD_SECRET_PROMPT (source);
@@ -255,8 +255,8 @@ on_prompt_password_complete (GObject *source,
 
 static void
 on_prompt_confirmation_complete (GObject *source,
-                                 GAsyncResult *result,
-                                 gpointer user_data)
+				 GAsyncResult *result,
+				 gpointer user_data)
 {
 	GkdSecretChange *self = GKD_SECRET_CHANGE (source);
 	GkdSecretPrompt *prompt = GKD_SECRET_PROMPT (source);
@@ -283,7 +283,7 @@ on_prompt_confirmation_complete (GObject *source,
 
 static void
 perform_prompting (GkdSecretChange *self,
-                   GckObject *collection)
+		   GckObject *collection)
 {
 	GkdSecretPrompt *prompt = GKD_SECRET_PROMPT (self);
 	GError *error = NULL;
@@ -296,26 +296,26 @@ perform_prompting (GkdSecretChange *self,
 	} else if (!self->unlocked) {
 		setup_original_prompt (self, collection);
 		gcr_prompt_password_async (GCR_PROMPT (self),
-		                           gkd_secret_prompt_get_cancellable (prompt),
-		                           on_prompt_original_complete, NULL);
+					   gkd_secret_prompt_get_cancellable (prompt),
+					   on_prompt_original_complete, NULL);
 
 	/* Get the new password */
 	} else if (self->master == NULL) {
 		setup_password_prompt (self, collection);
 		gcr_prompt_password_async (GCR_PROMPT (self),
-		                           gkd_secret_prompt_get_cancellable (prompt),
-		                           on_prompt_password_complete, NULL);
+					   gkd_secret_prompt_get_cancellable (prompt),
+					   on_prompt_password_complete, NULL);
 
 	/* Check that the password is not empty */
 	} else if (!self->confirmed) {
 		setup_confirmation_prompt (self);
 		gcr_prompt_confirm_async (GCR_PROMPT (self),
-		                          gkd_secret_prompt_get_cancellable (prompt),
-		                          on_prompt_confirmation_complete, NULL);
+					  gkd_secret_prompt_get_cancellable (prompt),
+					  on_prompt_confirmation_complete, NULL);
 
 	/* Actually create the keyring */
 	} else if (gkd_secret_change_with_secrets (collection, self->session,
-	                                           NULL, self->master, &error)) {
+						   NULL, self->master, &error)) {
 		gkd_secret_prompt_complete (prompt);
 
 	/* Failed */
@@ -339,7 +339,7 @@ gkd_secret_change_prompt_ready (GkdSecretPrompt *prompt)
 static GVariant *
 gkd_secret_change_encode_result (GkdSecretPrompt *base)
 {
-        return g_variant_new_variant (g_variant_new_string (""));
+	return g_variant_new_variant (g_variant_new_string (""));
 }
 
 static void
@@ -378,7 +378,7 @@ gkd_secret_change_finalize (GObject *obj)
 
 static void
 gkd_secret_change_set_property (GObject *obj, guint prop_id, const GValue *value,
-                                GParamSpec *pspec)
+				GParamSpec *pspec)
 {
 	GkdSecretChange *self = GKD_SECRET_CHANGE (obj);
 
@@ -396,7 +396,7 @@ gkd_secret_change_set_property (GObject *obj, guint prop_id, const GValue *value
 
 static void
 gkd_secret_change_get_property (GObject *obj, guint prop_id, GValue *value,
-                                GParamSpec *pspec)
+				GParamSpec *pspec)
 {
 	GkdSecretChange *self = GKD_SECRET_CHANGE (obj);
 
@@ -426,7 +426,7 @@ gkd_secret_change_class_init (GkdSecretChangeClass *klass)
 
 	g_object_class_install_property (gobject_class, PROP_COLLECTION_PATH,
 		g_param_spec_string ("collection-path", "Collection Path", "Collection Path",
-		                     "/", G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+				     "/", G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 }
 
 /* -----------------------------------------------------------------------------
@@ -435,7 +435,7 @@ gkd_secret_change_class_init (GkdSecretChangeClass *klass)
 
 GkdSecretChange*
 gkd_secret_change_new (GkdSecretService *service, const gchar *caller,
-                       const gchar *path)
+		       const gchar *path)
 {
 	const gchar *prompter_name;
 
@@ -445,19 +445,19 @@ gkd_secret_change_new (GkdSecretService *service, const gchar *caller,
 
 	prompter_name = g_getenv ("GNOME_KEYRING_TEST_PROMPTER");
 	return g_object_new (GKD_SECRET_TYPE_CHANGE,
-	                     "service", service,
-	                     "caller", caller,
-	                     "collection-path", path,
-	                     "bus-name", prompter_name,
-	                     NULL);
+			     "service", service,
+			     "caller", caller,
+			     "collection-path", path,
+			     "bus-name", prompter_name,
+			     NULL);
 }
 
 gboolean
 gkd_secret_change_with_secrets (GckObject *collection,
-                                GckSession *session,
-                                GkdSecretSecret *original,
-                                GkdSecretSecret *master,
-                                GError **error)
+				GckSession *session,
+				GkdSecretSecret *original,
+				GkdSecretSecret *master,
+				GError **error)
 {
 	GckBuilder builder = GCK_BUILDER_INIT;
 	GckAttributes *attrs = NULL;
diff --git a/daemon/dbus/gkd-secret-create.c b/daemon/dbus/gkd-secret-create.c
index 9e7c2d42..0f2b5738 100644
--- a/daemon/dbus/gkd-secret-create.c
+++ b/daemon/dbus/gkd-secret-create.c
@@ -78,7 +78,7 @@ setup_password_prompt (GkdSecretCreate *self)
 		label = g_strdup (_("Unnamed"));
 
 	text = g_strdup_printf (_("An application wants to create a new keyring called '%s'. "
-	                          "Choose the password you want to use for it."), label);
+				  "Choose the password you want to use for it."), label);
 	g_free (label);
 
 	gcr_prompt_set_message (GCR_PROMPT (self), _("Choose password for new keyring"));
@@ -93,8 +93,8 @@ setup_confirmation_prompt (GkdSecretCreate *self)
 {
 	gcr_prompt_set_message (GCR_PROMPT (self), _("Store passwords unencrypted?"));
 	gcr_prompt_set_description (GCR_PROMPT (self),
-	                            _("By choosing to use a blank password, your stored passwords will not be safely encrypted. "
-	                              "They will be accessible by anyone with access to your files."));
+				    _("By choosing to use a blank password, your stored passwords will not be safely encrypted. "
+				      "They will be accessible by anyone with access to your files."));
 }
 
 static gboolean
@@ -178,8 +178,8 @@ unlock_or_complete_this_prompt (GkdSecretCreate *self)
 	prompt = GKD_SECRET_PROMPT (self);
 
 	unlock = gkd_secret_unlock_new (gkd_secret_prompt_get_service (prompt),
-	                                gkd_secret_prompt_get_caller (prompt),
-	                                gkd_secret_dispatch_get_object_path (GKD_SECRET_DISPATCH (self)));
+					gkd_secret_prompt_get_caller (prompt),
+					gkd_secret_dispatch_get_object_path (GKD_SECRET_DISPATCH (self)));
 	gkd_secret_unlock_queue (unlock, self->result_path);
 
 	/*
@@ -189,8 +189,8 @@ unlock_or_complete_this_prompt (GkdSecretCreate *self)
 	 */
 	if (gkd_secret_unlock_have_queued (unlock)) {
 		gkd_secret_service_publish_dispatch (gkd_secret_prompt_get_service (prompt),
-		                                     gkd_secret_prompt_get_caller (prompt),
-		                                     GKD_SECRET_DISPATCH (unlock));
+						     gkd_secret_prompt_get_caller (prompt),
+						     GKD_SECRET_DISPATCH (unlock));
 		gkd_secret_unlock_call_prompt (unlock, gkd_secret_prompt_get_window_id (prompt));
 	}
 
@@ -200,8 +200,8 @@ unlock_or_complete_this_prompt (GkdSecretCreate *self)
 
 static void
 on_prompt_password_complete (GObject *source,
-                             GAsyncResult *result,
-                             gpointer user_data)
+			     GAsyncResult *result,
+			     gpointer user_data)
 {
 	GkdSecretCreate *self = GKD_SECRET_CREATE (source);
 	GkdSecretPrompt *prompt = GKD_SECRET_PROMPT (source);
@@ -230,8 +230,8 @@ on_prompt_password_complete (GObject *source,
 
 static void
 on_prompt_confirmation_complete (GObject *source,
-                                 GAsyncResult *result,
-                                 gpointer user_data)
+				 GAsyncResult *result,
+				 gpointer user_data)
 {
 	GkdSecretCreate *self = GKD_SECRET_CREATE (source);
 	GkdSecretPrompt *prompt = GKD_SECRET_PROMPT (source);
@@ -266,15 +266,15 @@ perform_prompting (GkdSecretCreate *self)
 	} else if (self->master == NULL) {
 		setup_password_prompt (self);
 		gcr_prompt_password_async (GCR_PROMPT (self),
-		                           gkd_secret_prompt_get_cancellable (prompt),
-		                           on_prompt_password_complete, NULL);
+					   gkd_secret_prompt_get_cancellable (prompt),
+					   on_prompt_password_complete, NULL);
 
 	/* Check that the password is not empty */
 	} else if (!self->confirmed) {
 		setup_confirmation_prompt (self);
 		gcr_prompt_confirm_async (GCR_PROMPT (self),
-		                          gkd_secret_prompt_get_cancellable (prompt),
-		                          on_prompt_confirmation_complete, NULL);
+					  gkd_secret_prompt_get_cancellable (prompt),
+					  on_prompt_confirmation_complete, NULL);
 
 	/* Actually create the keyring */
 	} else  if (create_collection_with_secret (self, self->master)) {
@@ -299,7 +299,7 @@ gkd_secret_create_encode_result (GkdSecretPrompt *base)
 	const gchar *path;
 
 	path = self->result_path ? self->result_path : "/";
-        return g_variant_new_variant (g_variant_new_object_path (path));
+	return g_variant_new_variant (g_variant_new_object_path (path));
 }
 
 static void
@@ -323,7 +323,7 @@ gkd_secret_create_finalize (GObject *obj)
 
 static void
 gkd_secret_create_set_property (GObject *obj, guint prop_id, const GValue *value,
-                                GParamSpec *pspec)
+				GParamSpec *pspec)
 {
 	GkdSecretCreate *self = GKD_SECRET_CREATE (obj);
 
@@ -345,7 +345,7 @@ gkd_secret_create_set_property (GObject *obj, guint prop_id, const GValue *value
 
 static void
 gkd_secret_create_get_property (GObject *obj, guint prop_id, GValue *value,
-                                GParamSpec *pspec)
+				GParamSpec *pspec)
 {
 	GkdSecretCreate *self = GKD_SECRET_CREATE (obj);
 
@@ -377,11 +377,11 @@ gkd_secret_create_class_init (GkdSecretCreateClass *klass)
 
 	g_object_class_install_property (gobject_class, PROP_PKCS11_ATTRIBUTES,
 		g_param_spec_boxed ("pkcs11-attributes", "PKCS11 Attributes", "PKCS11 Attributes",
-		                     GCK_TYPE_ATTRIBUTES, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+				     GCK_TYPE_ATTRIBUTES, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
 	g_object_class_install_property (gobject_class, PROP_ALIAS,
 		g_param_spec_string ("alias", "Alias", "Collection Alias",
-		                     NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+				     NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 }
 
 /* -----------------------------------------------------------------------------
@@ -390,23 +390,23 @@ gkd_secret_create_class_init (GkdSecretCreateClass *klass)
 
 GkdSecretCreate*
 gkd_secret_create_new (GkdSecretService *service, const gchar *caller,
-                       GckAttributes *attrs, const gchar *alias)
+		       GckAttributes *attrs, const gchar *alias)
 {
 	const gchar *prompter_name;
 
 	prompter_name = g_getenv ("GNOME_KEYRING_TEST_PROMPTER");
 	return g_object_new (GKD_SECRET_TYPE_CREATE,
-	                     "service", service,
-	                     "caller", caller,
-	                     "pkcs11-attributes", attrs,
-	                     "alias", alias,
-	                     "bus-name", prompter_name,
-	                     NULL);
+			     "service", service,
+			     "caller", caller,
+			     "pkcs11-attributes", attrs,
+			     "alias", alias,
+			     "bus-name", prompter_name,
+			     NULL);
 }
 
 GckObject*
 gkd_secret_create_with_credential (GckSession *session, GckAttributes *attrs,
-                                   GckObject *cred, GError **error)
+				   GckObject *cred, GError **error)
 {
 	GckBuilder builder = GCK_BUILDER_INIT;
 	const GckAttribute *attr;
@@ -427,8 +427,8 @@ gkd_secret_create_with_credential (GckSession *session, GckAttributes *attrs,
 
 gchar*
 gkd_secret_create_with_secret (GckAttributes *attrs,
-                               GkdSecretSecret *master,
-                               GError **error)
+			       GkdSecretSecret *master,
+			       GError **error)
 {
 	GckBuilder builder = GCK_BUILDER_INIT;
 	GckAttributes *atts;
@@ -453,7 +453,7 @@ gkd_secret_create_with_secret (GckAttributes *attrs,
 	/* Create ourselves some credentials */
 	atts = gck_attributes_ref_sink (gck_builder_end (&builder));
 	cred = gkd_secret_session_create_credential (master->session, session,
-	                                             atts, master, error);
+						     atts, master, error);
 	gck_attributes_unref (atts);
 
 	if (cred == NULL)
diff --git a/daemon/dbus/gkd-secret-error.c b/daemon/dbus/gkd-secret-error.c
index 185be76a..f9012c30 100644
--- a/daemon/dbus/gkd-secret-error.c
+++ b/daemon/dbus/gkd-secret-error.c
@@ -29,22 +29,22 @@
 #include <glib.h>
 
 static const GDBusErrorEntry gkd_secret_error_entries[] = {
-        { GKD_SECRET_ERROR_ALREADY_EXISTS, SECRET_INTERFACE_PREFIX "Error.AlreadyExists" },
-        { GKD_SECRET_ERROR_IS_LOCKED, SECRET_INTERFACE_PREFIX "Error.IsLocked" },
-        { GKD_SECRET_ERROR_NO_SESSION, SECRET_INTERFACE_PREFIX "Error.NoSession" },
-        { GKD_SECRET_ERROR_NO_SUCH_OBJECT, SECRET_INTERFACE_PREFIX "Error.NoSuchObject" }
+	{ GKD_SECRET_ERROR_ALREADY_EXISTS, SECRET_INTERFACE_PREFIX "Error.AlreadyExists" },
+	{ GKD_SECRET_ERROR_IS_LOCKED, SECRET_INTERFACE_PREFIX "Error.IsLocked" },
+	{ GKD_SECRET_ERROR_NO_SESSION, SECRET_INTERFACE_PREFIX "Error.NoSession" },
+	{ GKD_SECRET_ERROR_NO_SUCH_OBJECT, SECRET_INTERFACE_PREFIX "Error.NoSuchObject" }
 };
 
 GQuark
 gkd_secret_error_quark (void)
 {
-        static volatile gsize quark_volatile = 0;
+	static volatile gsize quark_volatile = 0;
 
-        g_dbus_error_register_error_domain ("gkd_secret_error",
-                                            &quark_volatile,
-                                            gkd_secret_error_entries,
-                                            G_N_ELEMENTS (gkd_secret_error_entries));
-        return quark_volatile;
+	g_dbus_error_register_error_domain ("gkd_secret_error",
+					    &quark_volatile,
+					    gkd_secret_error_entries,
+					    G_N_ELEMENTS (gkd_secret_error_entries));
+	return quark_volatile;
 }
 
 static const GDBusErrorEntry gkd_secret_daemon_error_entries[] = {
@@ -54,40 +54,40 @@ static const GDBusErrorEntry gkd_secret_daemon_error_entries[] = {
 GQuark
 gkd_secret_daemon_error_quark (void)
 {
-        static volatile gsize quark_volatile = 0;
+	static volatile gsize quark_volatile = 0;
 
-        g_dbus_error_register_error_domain ("gkd_secret_daemon_error",
-                                            &quark_volatile,
-                                            gkd_secret_daemon_error_entries,
-                                            G_N_ELEMENTS (gkd_secret_daemon_error_entries));
-        return quark_volatile;
+	g_dbus_error_register_error_domain ("gkd_secret_daemon_error",
+					    &quark_volatile,
+					    gkd_secret_daemon_error_entries,
+					    G_N_ELEMENTS (gkd_secret_daemon_error_entries));
+	return quark_volatile;
 }
 
 void
 gkd_secret_propagate_error (GDBusMethodInvocation *invocation,
-                            const gchar *description,
-                            GError *error)
+			    const gchar *description,
+			    GError *error)
 {
 	g_return_if_fail (error != NULL);
 
 	if (g_error_matches (error, GCK_ERROR, CKR_USER_NOT_LOGGED_IN) ||
 	    g_error_matches (error, GCK_ERROR, CKR_PIN_INCORRECT)) {
 		g_dbus_method_invocation_return_error_literal (invocation,
-                                                               GKD_SECRET_DAEMON_ERROR,
+							       GKD_SECRET_DAEMON_ERROR,
 							       GKD_SECRET_DAEMON_ERROR_DENIED,
 							       "The password was invalid");
 	} else if (g_error_matches (error, GCK_ERROR, CKR_WRAPPED_KEY_INVALID) ||
-	           g_error_matches (error, GCK_ERROR, CKR_WRAPPED_KEY_LEN_RANGE) ||
-	           g_error_matches (error, GCK_ERROR, CKR_MECHANISM_PARAM_INVALID)) {
+		   g_error_matches (error, GCK_ERROR, CKR_WRAPPED_KEY_LEN_RANGE) ||
+		   g_error_matches (error, GCK_ERROR, CKR_MECHANISM_PARAM_INVALID)) {
 		g_dbus_method_invocation_return_error_literal (invocation,
-                                                               G_DBUS_ERROR,
-                                                               G_DBUS_ERROR_INVALID_ARGS,
-                                                               "The secret was transferred or encrypted in an invalid way.");
+							       G_DBUS_ERROR,
+							       G_DBUS_ERROR_INVALID_ARGS,
+							       "The secret was transferred or encrypted in an invalid way.");
 	} else {
 		g_warning ("%s: %s", description, egg_error_message (error));
 		g_dbus_method_invocation_return_error_literal (invocation,
-                                                               G_DBUS_ERROR,
-                                                               G_DBUS_ERROR_FAILED,
+							       G_DBUS_ERROR,
+							       G_DBUS_ERROR_FAILED,
 							       description);
 	}
 
diff --git a/daemon/dbus/gkd-secret-exchange.c b/daemon/dbus/gkd-secret-exchange.c
index 13916201..6603916a 100644
--- a/daemon/dbus/gkd-secret-exchange.c
+++ b/daemon/dbus/gkd-secret-exchange.c
@@ -61,9 +61,9 @@ gkd_secret_exchange_init (GkdSecretExchange *self)
 
 static void
 gkd_secret_exchange_set_property (GObject *obj,
-                                  guint prop_id,
-                                  const GValue *value,
-                                  GParamSpec *pspec)
+				  guint prop_id,
+				  const GValue *value,
+				  GParamSpec *pspec)
 {
 	GkdSecretExchange *self = GKD_SECRET_EXCHANGE (obj);
 
@@ -77,7 +77,7 @@ gkd_secret_exchange_set_property (GObject *obj,
 		self->service = g_value_get_object (value);
 		g_return_if_fail (self->service);
 		g_object_add_weak_pointer (G_OBJECT (self->service),
-		                           (gpointer*)&(self->service));
+					   (gpointer*)&(self->service));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec);
@@ -87,9 +87,9 @@ gkd_secret_exchange_set_property (GObject *obj,
 
 static void
 gkd_secret_exchange_get_property (GObject *obj,
-                                  guint prop_id,
-                                  GValue *value,
-                                  GParamSpec *pspec)
+				  guint prop_id,
+				  GValue *value,
+				  GParamSpec *pspec)
 {
 	GkdSecretExchange *self = GKD_SECRET_EXCHANGE (obj);
 
@@ -113,7 +113,7 @@ gkd_secret_exchange_finalize (GObject *obj)
 
 	if (self->service) {
 		g_object_remove_weak_pointer (G_OBJECT (self->service),
-		                              (gpointer*)&(self->service));
+					      (gpointer*)&(self->service));
 		self->service = NULL;
 	}
 
@@ -126,9 +126,9 @@ gkd_secret_exchange_finalize (GObject *obj)
 
 static gboolean
 gkd_secret_exchange_generate_exchange_key (GcrSecretExchange *exchange,
-                                           const gchar *scheme,
-                                           guchar **public_key,
-                                           gsize *n_public_key)
+					   const gchar *scheme,
+					   guchar **public_key,
+					   gsize *n_public_key)
 {
 	GkdSecretExchange *self = GKD_SECRET_EXCHANGE (exchange);
 
@@ -137,15 +137,15 @@ gkd_secret_exchange_generate_exchange_key (GcrSecretExchange *exchange,
 	g_clear_object (&self->session);
 	self->session = gkd_secret_session_new (self->service, self->caller);
 	*public_key = gkd_secret_session_begin (self->session,
-	                                        "ietf-ike-grp-modp-1536",
-	                                        n_public_key);
+						"ietf-ike-grp-modp-1536",
+						n_public_key);
 	return (*public_key != NULL) ? TRUE : FALSE;
 }
 
 static gboolean
 gkd_secret_exchange_derive_transport_key (GcrSecretExchange *exchange,
-                                          const guchar *peer,
-                                          gsize n_peer)
+					  const guchar *peer,
+					  gsize n_peer)
 {
 	GkdSecretExchange *self = GKD_SECRET_EXCHANGE (exchange);
 
@@ -154,13 +154,13 @@ gkd_secret_exchange_derive_transport_key (GcrSecretExchange *exchange,
 
 static gboolean
 gkd_secret_exchange_encrypt_transport_data (GcrSecretExchange *exchange,
-                                            GckAllocator allocator,
-                                            const guchar *plain_text,
-                                            gsize n_plain_text,
-                                            guchar **parameter,
-                                            gsize *n_parameter,
-                                            guchar **cipher_text,
-                                            gsize *n_cipher_text)
+					    GckAllocator allocator,
+					    const guchar *plain_text,
+					    gsize n_plain_text,
+					    guchar **parameter,
+					    gsize *n_parameter,
+					    guchar **cipher_text,
+					    gsize *n_cipher_text)
 {
 	g_warning ("Not implemented: a GkdSecretExchange was used to encrypt a secret");
 	return FALSE;
@@ -168,21 +168,21 @@ gkd_secret_exchange_encrypt_transport_data (GcrSecretExchange *exchange,
 
 static gboolean
 gkd_secret_exchange_decrypt_transport_data (GcrSecretExchange *exchange,
-                                            GckAllocator allocator,
-                                            const guchar *cipher_text,
-                                            gsize n_cipher_text,
-                                            const guchar *parameter,
-                                            gsize n_parameter,
-                                            guchar **plain_text,
-                                            gsize *n_plain_text)
+					    GckAllocator allocator,
+					    const guchar *cipher_text,
+					    gsize n_cipher_text,
+					    const guchar *parameter,
+					    gsize n_parameter,
+					    guchar **plain_text,
+					    gsize *n_plain_text)
 {
 	GkdSecretExchange *self = GKD_SECRET_EXCHANGE (exchange);
 
 	gkd_secret_secret_free (self->last_secret);
 
 	self->last_secret = gkd_secret_secret_new (self->session,
-	                                           parameter, n_parameter,
-	                                           cipher_text, n_cipher_text);
+						   parameter, n_parameter,
+						   cipher_text, n_cipher_text);
 
 	*plain_text = NULL;
 	*n_plain_text = 0;
@@ -206,21 +206,21 @@ gkd_secret_exchange_class_init (GkdSecretExchangeClass *klass)
 
 	g_object_class_install_property (gobject_class, PROP_CALLER,
 		g_param_spec_string ("caller", "Caller", "DBus caller name",
-		                     NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY ));
+				     NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY ));
 
 	g_object_class_install_property (gobject_class, PROP_SERVICE,
 		g_param_spec_object ("service", "Service", "Service which owns this session",
-		                     GKD_SECRET_TYPE_SERVICE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+				     GKD_SECRET_TYPE_SERVICE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 }
 
 GkdSecretExchange *
 gkd_secret_exchange_new (GkdSecretService *service,
-                         const gchar *caller)
+			 const gchar *caller)
 {
 	return g_object_new (GKD_TYPE_SECRET_EXCHANGE,
-	                     "service", service,
-	                     "caller", caller,
-	                     NULL);
+			     "service", service,
+			     "caller", caller,
+			     NULL);
 }
 
 GkdSecretSecret *
diff --git a/daemon/dbus/gkd-secret-lock.c b/daemon/dbus/gkd-secret-lock.c
index 70e34839..f8f02f90 100644
--- a/daemon/dbus/gkd-secret-lock.c
+++ b/daemon/dbus/gkd-secret-lock.c
@@ -31,7 +31,7 @@
 
 gboolean
 gkd_secret_lock (GckObject *collection,
-                 GError **error_out)
+		 GError **error_out)
 {
 	GckBuilder builder = GCK_BUILDER_INIT;
 	GError *error = NULL;
@@ -50,9 +50,9 @@ gkd_secret_lock (GckObject *collection,
 
 	if (error != NULL) {
 		g_warning ("couldn't search for credential objects: %s", egg_error_message (error));
-                g_set_error_literal (error_out, G_DBUS_ERROR,
-                                     G_DBUS_ERROR_FAILED,
-                                     "Couldn't lock collection");
+		g_set_error_literal (error_out, G_DBUS_ERROR,
+				     G_DBUS_ERROR_FAILED,
+				     "Couldn't lock collection");
 		g_clear_error (&error);
 		return FALSE;
 	}
@@ -70,7 +70,7 @@ gkd_secret_lock (GckObject *collection,
 
 gboolean
 gkd_secret_lock_all (GckSession *session,
-                     GError **error_out)
+		     GError **error_out)
 {
 	GckBuilder builder = GCK_BUILDER_INIT;
 	GError *error = NULL;
@@ -83,7 +83,7 @@ gkd_secret_lock_all (GckSession *session,
 	objects = gck_session_find_objects (session, gck_builder_end (&builder), NULL, &error);
 	if (error != NULL) {
 		g_warning ("couldn't search for credential objects: %s", egg_error_message (error));
-                g_set_error (error_out, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Couldn't lock service");
+		g_set_error (error_out, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Couldn't lock service");
 		g_clear_error (&error);
 		return FALSE;
 	}
@@ -102,7 +102,7 @@ gkd_secret_lock_all (GckSession *session,
 	objects = gck_session_find_objects (session, gck_builder_end (&builder), NULL, &error);
 	if (error != NULL) {
 		g_warning ("couldn't search for session items: %s", egg_error_message (error));
-                g_set_error (error_out, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Couldn't lock service");
+		g_set_error (error_out, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "Couldn't lock service");
 		g_clear_error (&error);
 		return FALSE;
 	}
diff --git a/daemon/dbus/gkd-secret-objects.c b/daemon/dbus/gkd-secret-objects.c
index 190ae866..cc40517d 100644
--- a/daemon/dbus/gkd-secret-objects.c
+++ b/daemon/dbus/gkd-secret-objects.c
@@ -87,7 +87,7 @@ on_object_path_append_to_builder (GkdSecretObjects *self,
 static GVariant *
 gkd_secret_objects_append_item_paths (GkdSecretObjects *self,
 				      const gchar *caller,
-                                      const gchar *base)
+				      const gchar *base)
 {
 	GVariantBuilder builder;
 
@@ -102,7 +102,7 @@ gkd_secret_objects_append_item_paths (GkdSecretObjects *self,
 
 static gchar **
 gkd_secret_objects_get_collection_items (GkdSecretObjects *self,
-                                         const gchar *collection_path)
+					 const gchar *collection_path)
 {
 	GVariant *items_variant;
 	gchar **items;
@@ -117,9 +117,9 @@ gkd_secret_objects_get_collection_items (GkdSecretObjects *self,
 static gboolean
 object_property_set (GkdSecretObjects *objects,
 		     GckObject *object,
-                     const gchar *prop_name,
-                     GVariant *value,
-                     GError **error_out)
+		     const gchar *prop_name,
+		     GVariant *value,
+		     GError **error_out)
 {
 	GckBuilder builder = GCK_BUILDER_INIT;
 	GError *error = NULL;
@@ -132,15 +132,15 @@ object_property_set (GkdSecretObjects *objects,
 			     "Object does not have the '%s' property",
 			     prop_name);
 		return FALSE;
-        }
+	}
 
 	/* Retrieve the actual attribute value */
 	if (!gkd_secret_property_parse_variant (value, prop_name, &builder)) {
 		gck_builder_clear (&builder);
-                g_set_error (error_out, G_DBUS_ERROR,
-                             G_DBUS_ERROR_INVALID_ARGS,
-                             "The property type or value was invalid: %s",
-                             prop_name);
+		g_set_error (error_out, G_DBUS_ERROR,
+			     G_DBUS_ERROR_INVALID_ARGS,
+			     "The property type or value was invalid: %s",
+			     prop_name);
 		return FALSE;
 	}
 
@@ -166,7 +166,7 @@ object_property_set (GkdSecretObjects *objects,
 static GVariant *
 object_property_get (GkdSecretObjects *objects,
 		     GckObject *object,
-                     const gchar *prop_name,
+		     const gchar *prop_name,
 		     GError **error_out)
 {
 	GError *error = NULL;
@@ -208,7 +208,7 @@ gkd_secret_collection_skeleton_set_property_dbus (GDBusConnection *connection,
 						  const gchar *object_path,
 						  const gchar *interface_name,
 						  const gchar *property_name,
-                                                  GVariant *value,
+						  GVariant *value,
 						  GError **error,
 						  gpointer user_data)
 {
@@ -314,7 +314,7 @@ gkd_secret_item_skeleton_set_property_dbus (GDBusConnection *connection,
 	if (!object)
 		return FALSE;
 
-        if (!object_property_set (self->objects, object, property_name, value, error)) {
+	if (!object_property_set (self->objects, object, property_name, value, error)) {
 		g_object_unref (object);
 		return FALSE;
 	}
@@ -398,7 +398,7 @@ enum {
 };
 
 static gchar *    object_path_for_item          (const gchar *base,
-                                                 GckObject *item);
+						 GckObject *item);
 
 static gchar *    object_path_for_collection    (GckObject *collection);
 
@@ -452,7 +452,7 @@ secret_objects_lookup_gck_object_for_path (GkdSecretObjects *self,
 	gchar *c_ident;
 	gchar *i_ident;
 	GckObject *object = NULL;
-        GError *error = NULL;
+	GError *error = NULL;
 
 	g_return_val_if_fail (path, FALSE);
 
@@ -648,7 +648,7 @@ item_method_set_secret (GkdExportedItem *skeleton,
 
 static void
 item_cleanup_search_results (GckSession *session, GList *items,
-                             GList **locked, GList **unlocked)
+			     GList **locked, GList **unlocked)
 {
 	GError *error = NULL;
 	gpointer value;
@@ -694,9 +694,9 @@ collection_method_search_items (GkdExportedCollection *skeleton,
 
 static GckObject*
 collection_find_matching_item (GkdSecretObjects *self,
-                               GckSession *session,
-                               const gchar *identifier,
-                               const GckAttribute *fields)
+			       GckSession *session,
+			       const gchar *identifier,
+			       const GckAttribute *fields)
 {
 	GckBuilder builder = GCK_BUILDER_INIT;
 	GckObject *result = NULL;
@@ -734,7 +734,7 @@ collection_find_matching_item (GkdSecretObjects *self,
 
 static gchar *
 object_path_for_item (const gchar *base,
-                      GckObject *item)
+		      GckObject *item)
 {
 	GError *error = NULL;
 	gpointer identifier;
@@ -935,8 +935,8 @@ collection_method_delete (GkdExportedCollection *skeleton,
 		g_dbus_method_invocation_return_error (invocation,
 						       G_DBUS_ERROR,
 						       G_DBUS_ERROR_FAILED,
-		                                       "Couldn't delete collection: %s",
-		                                       egg_error_message (error));
+						       "Couldn't delete collection: %s",
+						       egg_error_message (error));
 		g_clear_error (&error);
 		goto cleanup;
 	}
@@ -985,7 +985,7 @@ gkd_secret_objects_dispose (GObject *obj)
 
 	if (self->service) {
 		g_object_remove_weak_pointer (G_OBJECT (self->service),
-		                              (gpointer*)&(self->service));
+					      (gpointer*)&(self->service));
 		self->service = NULL;
 	}
 
@@ -1008,7 +1008,7 @@ gkd_secret_objects_finalize (GObject *obj)
 
 static void
 gkd_secret_objects_set_property (GObject *obj, guint prop_id, const GValue *value,
-                                 GParamSpec *pspec)
+				 GParamSpec *pspec)
 {
 	GkdSecretObjects *self = GKD_SECRET_OBJECTS (obj);
 
@@ -1023,7 +1023,7 @@ gkd_secret_objects_set_property (GObject *obj, guint prop_id, const GValue *valu
 		self->service = g_value_get_object (value);
 		g_return_if_fail (self->service);
 		g_object_add_weak_pointer (G_OBJECT (self->service),
-		                           (gpointer*)&(self->service));
+					   (gpointer*)&(self->service));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec);
@@ -1033,7 +1033,7 @@ gkd_secret_objects_set_property (GObject *obj, guint prop_id, const GValue *valu
 
 static void
 gkd_secret_objects_get_property (GObject *obj, guint prop_id, GValue *value,
-                                     GParamSpec *pspec)
+				     GParamSpec *pspec)
 {
 	GkdSecretObjects *self = GKD_SECRET_OBJECTS (obj);
 
@@ -1061,12 +1061,12 @@ gkd_secret_objects_class_init (GkdSecretObjectsClass *klass)
 	gobject_class->get_property = gkd_secret_objects_get_property;
 
 	g_object_class_install_property (gobject_class, PROP_PKCS11_SLOT,
-	        g_param_spec_object ("pkcs11-slot", "Pkcs11 Slot", "PKCS#11 slot that we use for secrets",
-	                             GCK_TYPE_SLOT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+		g_param_spec_object ("pkcs11-slot", "Pkcs11 Slot", "PKCS#11 slot that we use for secrets",
+				     GCK_TYPE_SLOT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
 	g_object_class_install_property (gobject_class, PROP_SERVICE,
 		g_param_spec_object ("service", "Service", "Service which owns this objects",
-		                     GKD_SECRET_TYPE_SERVICE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+				     GKD_SECRET_TYPE_SERVICE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 }
 
 /* -----------------------------------------------------------------------------
@@ -1082,7 +1082,7 @@ gkd_secret_objects_get_pkcs11_slot (GkdSecretObjects *self)
 
 GckObject*
 gkd_secret_objects_lookup_collection (GkdSecretObjects *self, const gchar *caller,
-                                      const gchar *path)
+				      const gchar *path)
 {
 	GckBuilder builder = GCK_BUILDER_INIT;
 	GckObject *object = NULL;
@@ -1125,7 +1125,7 @@ gkd_secret_objects_lookup_collection (GkdSecretObjects *self, const gchar *calle
 
 GckObject*
 gkd_secret_objects_lookup_item (GkdSecretObjects *self, const gchar *caller,
-                                const gchar *path)
+				const gchar *path)
 {
 	GckBuilder builder = GCK_BUILDER_INIT;
 	GckObject *object = NULL;
@@ -1169,10 +1169,10 @@ gkd_secret_objects_lookup_item (GkdSecretObjects *self, const gchar *caller,
 
 static void
 objects_foreach_item (GkdSecretObjects *self,
-                      GList *items,
-                      const gchar *base,
-                      GkdSecretObjectsForeach callback,
-                      gpointer user_data)
+		      GList *items,
+		      const gchar *base,
+		      GkdSecretObjectsForeach callback,
+		      gpointer user_data)
 {
 	gchar *path;
 	GList *l;
@@ -1187,9 +1187,9 @@ objects_foreach_item (GkdSecretObjects *self,
 void
 gkd_secret_objects_foreach_item (GkdSecretObjects *self,
 				 const gchar *caller,
-                                 const gchar *base,
-                                 GkdSecretObjectsForeach callback,
-                                 gpointer user_data)
+				 const gchar *base,
+				 GkdSecretObjectsForeach callback,
+				 gpointer user_data)
 {
 	GckBuilder builder = GCK_BUILDER_INIT;
 	GckSession *session;
@@ -1231,8 +1231,8 @@ gkd_secret_objects_foreach_item (GkdSecretObjects *self,
 void
 gkd_secret_objects_foreach_collection (GkdSecretObjects *self,
 				       const gchar *caller,
-                                       GkdSecretObjectsForeach callback,
-                                       gpointer user_data)
+				       GkdSecretObjectsForeach callback,
+				       gpointer user_data)
 {
 	GckBuilder builder = GCK_BUILDER_INIT;
 	GckSession *session;
@@ -1297,10 +1297,10 @@ gkd_secret_objects_append_collection_paths (GkdSecretObjects *self,
 
 gboolean
 gkd_secret_objects_handle_search_items (GkdSecretObjects *self,
-                                        GDBusMethodInvocation *invocation,
-                                        GVariant *attributes,
-                                        const gchar *base,
-                                        gboolean separate_locked)
+					GDBusMethodInvocation *invocation,
+					GVariant *attributes,
+					const gchar *base,
+					gboolean separate_locked)
 {
 	GckBuilder builder = GCK_BUILDER_INIT;
 	GckObject *search;
@@ -1315,11 +1315,11 @@ gkd_secret_objects_handle_search_items (GkdSecretObjects *self,
 
 	if (!gkd_secret_property_parse_fields (attributes, &builder)) {
 		gck_builder_clear (&builder);
-                g_dbus_method_invocation_return_error_literal (invocation,
-                                                               G_DBUS_ERROR,
-                                                               G_DBUS_ERROR_FAILED,
-                                                               "Invalid data in attributes argument");
-                return TRUE;
+		g_dbus_method_invocation_return_error_literal (invocation,
+							       G_DBUS_ERROR,
+							       G_DBUS_ERROR_FAILED,
+							       "Invalid data in attributes argument");
+		return TRUE;
 	}
 
 	if (base != NULL) {
@@ -1343,8 +1343,8 @@ gkd_secret_objects_handle_search_items (GkdSecretObjects *self,
 		g_dbus_method_invocation_return_error (invocation,
 						       G_DBUS_ERROR,
 						       G_DBUS_ERROR_FAILED,
-		                                       "Couldn't search for items: %s",
-		                                       egg_error_message (error));
+						       "Couldn't search for items: %s",
+						       egg_error_message (error));
 		g_clear_error (&error);
 		return TRUE;
 	}
@@ -1358,8 +1358,8 @@ gkd_secret_objects_handle_search_items (GkdSecretObjects *self,
 		g_dbus_method_invocation_return_error (invocation,
 						       G_DBUS_ERROR,
 						       G_DBUS_ERROR_FAILED,
-		                                       "Couldn't retrieve matched items: %s",
-		                                       egg_error_message (error));
+						       "Couldn't retrieve matched items: %s",
+						       egg_error_message (error));
 		g_clear_error (&error);
 		return TRUE;
 	}
@@ -1461,9 +1461,9 @@ gkd_secret_objects_handle_get_secrets (GkdSecretObjects *self,
 
 static void
 on_each_item_emit_locked (GkdSecretObjects *self,
-                          const gchar *path,
-                          GckObject *object,
-                          gpointer user_data)
+			  const gchar *path,
+			  GckObject *object,
+			  gpointer user_data)
 {
 	GkdExportedItem *skeleton;
 	GVariant *value;
@@ -1486,12 +1486,12 @@ on_each_item_emit_locked (GkdSecretObjects *self,
 	gkd_exported_item_set_locked (skeleton, g_variant_get_boolean (value));
 	g_variant_unref (value);
 
-        gkd_secret_objects_emit_item_changed (self, object);
+	gkd_secret_objects_emit_item_changed (self, object);
 }
 
 void
 gkd_secret_objects_emit_collection_locked (GkdSecretObjects *self,
-                                           GckObject *collection)
+					   GckObject *collection)
 {
 	gchar *collection_path;
 	GkdExportedCollection *skeleton;
@@ -1500,7 +1500,7 @@ gkd_secret_objects_emit_collection_locked (GkdSecretObjects *self,
 
 	collection_path = object_path_for_collection (collection);
 	gkd_secret_objects_foreach_item (self, NULL, collection_path,
-	                                 on_each_item_emit_locked, NULL);
+					 on_each_item_emit_locked, NULL);
 
 	skeleton = g_hash_table_lookup (self->collections_to_skeletons, collection_path);
 	if (skeleton == NULL) {
@@ -1520,7 +1520,7 @@ gkd_secret_objects_emit_collection_locked (GkdSecretObjects *self,
 	g_variant_unref (value);
 
 	gkd_secret_service_emit_collection_changed (self->service, collection_path);
-        g_free (collection_path);
+	g_free (collection_path);
 }
 
 static void
@@ -1567,8 +1567,8 @@ gkd_secret_objects_unregister_item (GkdSecretObjects *self,
 
 void
 gkd_secret_objects_emit_item_created (GkdSecretObjects *self,
-                                      GckObject *collection,
-                                      const gchar *item_path)
+				      GckObject *collection,
+				      const gchar *item_path)
 {
 	GkdExportedCollection *skeleton;
 	gchar *collection_path;
@@ -1594,7 +1594,7 @@ gkd_secret_objects_emit_item_created (GkdSecretObjects *self,
 
 void
 gkd_secret_objects_emit_item_changed (GkdSecretObjects *self,
-                                      GckObject *item)
+				      GckObject *item)
 {
 	GkdExportedCollection *skeleton;
 	gchar *collection_path;
@@ -1616,8 +1616,8 @@ gkd_secret_objects_emit_item_changed (GkdSecretObjects *self,
 
 void
 gkd_secret_objects_emit_item_deleted (GkdSecretObjects *self,
-                                      GckObject *collection,
-                                      const gchar *item_path)
+				      GckObject *collection,
+				      const gchar *item_path)
 {
 	GkdExportedCollection *skeleton;
 	gchar *collection_path;
@@ -1643,7 +1643,7 @@ gkd_secret_objects_emit_item_deleted (GkdSecretObjects *self,
 
 static void
 gkd_secret_objects_init_collection_items (GkdSecretObjects *self,
-                                          const gchar *collection_path)
+					  const gchar *collection_path)
 {
 	gchar **items;
 	gint idx;
@@ -1686,7 +1686,7 @@ gkd_secret_objects_register_collection (GkdSecretObjects *self,
 	g_signal_connect (skeleton, "handle-search-items",
 			  G_CALLBACK (collection_method_search_items), self);
 
-        gkd_secret_objects_init_collection_items (self, collection_path);
+	gkd_secret_objects_init_collection_items (self, collection_path);
 }
 
 void
diff --git a/daemon/dbus/gkd-secret-prompt.c b/daemon/dbus/gkd-secret-prompt.c
index e8c8edac..3aa4dcc6 100644
--- a/daemon/dbus/gkd-secret-prompt.c
+++ b/daemon/dbus/gkd-secret-prompt.c
@@ -59,7 +59,7 @@ struct _GkdSecretPromptPrivate {
 
 static void gkd_secret_dispatch_iface (GkdSecretDispatchIface *iface);
 G_DEFINE_TYPE_WITH_CODE (GkdSecretPrompt, gkd_secret_prompt, GCR_TYPE_SYSTEM_PROMPT,
-                         G_IMPLEMENT_INTERFACE (GKD_SECRET_TYPE_DISPATCH, gkd_secret_dispatch_iface));
+			 G_IMPLEMENT_INTERFACE (GKD_SECRET_TYPE_DISPATCH, gkd_secret_dispatch_iface));
 
 static guint unique_prompt_number = 0;
 
@@ -77,8 +77,8 @@ emit_completed (GkdSecretPrompt *self, gboolean dismissed)
 
 static void
 on_system_prompt_inited (GObject *source,
-                         GAsyncResult *result,
-                         gpointer user_data)
+			 GAsyncResult *result,
+			 gpointer user_data)
 {
 	GkdSecretPrompt *self = GKD_SECRET_PROMPT (source);
 	GkdSecretPromptClass *klass;
@@ -120,7 +120,7 @@ prompt_method_prompt (GkdExportedPrompt *skeleton,
 	gcr_prompt_set_caller_window (GCR_PROMPT (self), window_id);
 
 	g_async_initable_init_async (G_ASYNC_INITABLE (self), G_PRIORITY_DEFAULT,
-	                             self->pv->cancellable, on_system_prompt_inited, NULL);
+				     self->pv->cancellable, on_system_prompt_inited, NULL);
 
 	gkd_exported_prompt_complete_prompt (skeleton, invocation);
 	return TRUE;
@@ -174,12 +174,12 @@ gkd_secret_prompt_constructed (GObject *obj)
 	/* Set the exchange for the prompt */
 	g_object_set (self, "secret-exchange", self->pv->exchange, NULL);
 
-        self->pv->skeleton = gkd_exported_prompt_skeleton_new ();
-        g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (self->pv->skeleton),
-                                          gkd_secret_service_get_connection (self->pv->service), self->pv->object_path,
-                                          &error);
+	self->pv->skeleton = gkd_exported_prompt_skeleton_new ();
+	g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (self->pv->skeleton),
+					  gkd_secret_service_get_connection (self->pv->service), self->pv->object_path,
+					  &error);
 
-        if (error != NULL) {
+	if (error != NULL) {
 		g_warning ("could not register secret prompt on session bus: %s", error->message);
 		g_error_free (error);
 	}
@@ -209,7 +209,7 @@ gkd_secret_prompt_dispose (GObject *obj)
 
 	if (self->pv->service) {
 		g_object_remove_weak_pointer (G_OBJECT (self->pv->service),
-		                              (gpointer*)&(self->pv->service));
+					      (gpointer*)&(self->pv->service));
 		self->pv->service = NULL;
 	}
 
@@ -236,7 +236,7 @@ gkd_secret_prompt_finalize (GObject *obj)
 
 static void
 gkd_secret_prompt_set_property (GObject *obj, guint prop_id, const GValue *value,
-                                GParamSpec *pspec)
+				GParamSpec *pspec)
 {
 	GkdSecretPrompt *self = GKD_SECRET_PROMPT (obj);
 
@@ -250,7 +250,7 @@ gkd_secret_prompt_set_property (GObject *obj, guint prop_id, const GValue *value
 		self->pv->service = g_value_get_object (value);
 		g_return_if_fail (self->pv->service);
 		g_object_add_weak_pointer (G_OBJECT (self->pv->service),
-		                           (gpointer*)&(self->pv->service));
+					   (gpointer*)&(self->pv->service));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec);
@@ -260,7 +260,7 @@ gkd_secret_prompt_set_property (GObject *obj, guint prop_id, const GValue *value
 
 static void
 gkd_secret_prompt_get_property (GObject *obj, guint prop_id, GValue *value,
-                                GParamSpec *pspec)
+				GParamSpec *pspec)
 {
 	GkdSecretPrompt *self = GKD_SECRET_PROMPT (obj);
 
@@ -298,15 +298,15 @@ gkd_secret_prompt_class_init (GkdSecretPromptClass *klass)
 
 	g_object_class_install_property (gobject_class, PROP_CALLER,
 		g_param_spec_string ("caller", "Caller", "DBus caller name",
-		                     NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY ));
+				     NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY ));
 
 	g_object_class_install_property (gobject_class, PROP_OBJECT_PATH,
-	        g_param_spec_pointer ("object-path", "Object Path", "DBus Object Path",
-		                      G_PARAM_READABLE));
+		g_param_spec_pointer ("object-path", "Object Path", "DBus Object Path",
+				      G_PARAM_READABLE));
 
 	g_object_class_install_property (gobject_class, PROP_SERVICE,
 		g_param_spec_object ("service", "Service", "Service which owns this prompt",
-		                     GKD_SECRET_TYPE_SERVICE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+				     GKD_SECRET_TYPE_SERVICE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 }
 
 static void
@@ -382,7 +382,7 @@ gkd_secret_prompt_dismiss (GkdSecretPrompt *self)
 
 void
 gkd_secret_prompt_dismiss_with_error (GkdSecretPrompt *self,
-                                      GError *error)
+				      GError *error)
 {
 	g_warning ("prompting failed: %s", egg_error_message (error));
 	gkd_secret_prompt_dismiss (self);
diff --git a/daemon/dbus/gkd-secret-property.c b/daemon/dbus/gkd-secret-property.c
index 3be7f6a2..ff01b4b2 100644
--- a/daemon/dbus/gkd-secret-property.c
+++ b/daemon/dbus/gkd-secret-property.c
@@ -61,7 +61,7 @@ typedef enum _DataType {
 
 static gboolean
 property_to_attribute (const gchar *prop_name, const gchar *interface,
-                       CK_ATTRIBUTE_TYPE *attr_type, DataType *data_type)
+		       CK_ATTRIBUTE_TYPE *attr_type, DataType *data_type)
 {
 	g_return_val_if_fail (prop_name, FALSE);
 	g_assert (attr_type);
@@ -166,15 +166,15 @@ iter_append_string (const GckAttribute *attr)
 
 static gboolean
 iter_get_string (GVariant *variant,
-                 gulong attr_type,
-                 GckBuilder *builder)
+		 gulong attr_type,
+		 GckBuilder *builder)
 {
 	const char *value;
 
 	g_assert (variant != NULL);
 	g_assert (builder != NULL);
 
-        value = g_variant_get_string (variant, NULL);
+	value = g_variant_get_string (variant, NULL);
 	if (value == NULL)
 		value = "";
 	gck_builder_add_string (builder, attr_type, value);
@@ -191,15 +191,15 @@ iter_append_bool (const GckAttribute *attr)
 
 static gboolean
 iter_get_bool (GVariant *variant,
-               gulong attr_type,
-               GckBuilder *builder)
+	       gulong attr_type,
+	       GckBuilder *builder)
 {
 	gboolean value;
 
 	g_assert (variant != NULL);
 	g_assert (builder != NULL);
 
-        value = g_variant_get_boolean (variant);
+	value = g_variant_get_boolean (variant);
 	gck_builder_add_boolean (builder, attr_type, value);
 	return TRUE;
 }
@@ -246,8 +246,8 @@ iter_append_time (const GckAttribute *attr)
 
 static gboolean
 iter_get_time (GVariant *variant,
-               gulong attr_type,
-               GckBuilder *builder)
+	       gulong attr_type,
+	       GckBuilder *builder)
 {
 	time_t time;
 	struct tm tm;
@@ -257,7 +257,7 @@ iter_get_time (GVariant *variant,
 	g_assert (variant != NULL);
 	g_assert (builder != NULL);
 
-        value = g_variant_get_uint64 (variant);
+	value = g_variant_get_uint64 (variant);
 	if (value == 0) {
 		gck_builder_add_empty (builder, attr_type);
 		return TRUE;
@@ -325,12 +325,12 @@ iter_append_fields (const GckAttribute *attr)
 
 static gboolean
 iter_get_fields (GVariant *variant,
-                 gulong attr_type,
-                 GckBuilder *builder)
+		 gulong attr_type,
+		 GckBuilder *builder)
 {
 	GString *result;
 	const gchar *key, *value;
-        GVariantIter iter;
+	GVariantIter iter;
 
 	g_assert (variant != NULL);
 	g_assert (builder != NULL);
@@ -338,9 +338,9 @@ iter_get_fields (GVariant *variant,
 	g_return_val_if_fail (g_variant_type_is_array (g_variant_get_type (variant)), FALSE);
 
 	result = g_string_new ("");
-        g_variant_iter_init (&iter, variant);
+	g_variant_iter_init (&iter, variant);
 
-        while (g_variant_iter_next (&iter, "{&s&s}", &key, &value)) {
+	while (g_variant_iter_next (&iter, "{&s&s}", &key, &value)) {
 		/* Key */
 		g_string_append (result, key);
 		g_string_append_c (result, '\0');
@@ -357,7 +357,7 @@ iter_get_fields (GVariant *variant,
 
 static GVariant *
 iter_append_variant (DataType data_type,
-                     const GckAttribute *attr)
+		     const GckAttribute *attr)
 {
 	IterAppendFunc func = NULL;
 
@@ -386,13 +386,13 @@ iter_append_variant (DataType data_type,
 
 static gboolean
 iter_get_variant (GVariant *variant,
-                  DataType data_type,
-                  gulong attr_type,
-                  GckBuilder *builder)
+		  DataType data_type,
+		  gulong attr_type,
+		  GckBuilder *builder)
 {
 	IterGetFunc func = NULL;
 	gboolean ret;
-        const GVariantType *sig;
+	const GVariantType *sig;
 
 	g_assert (variant != NULL);
 	g_assert (builder != NULL);
@@ -400,26 +400,26 @@ iter_get_variant (GVariant *variant,
 	switch (data_type) {
 	case DATA_TYPE_STRING:
 		func = iter_get_string;
-                sig = G_VARIANT_TYPE_STRING;
+		sig = G_VARIANT_TYPE_STRING;
 		break;
 	case DATA_TYPE_BOOL:
 		func = iter_get_bool;
-                sig = G_VARIANT_TYPE_BOOLEAN;
+		sig = G_VARIANT_TYPE_BOOLEAN;
 		break;
 	case DATA_TYPE_TIME:
 		func = iter_get_time;
-                sig = G_VARIANT_TYPE_UINT64;
+		sig = G_VARIANT_TYPE_UINT64;
 		break;
 	case DATA_TYPE_FIELDS:
 		func = iter_get_fields;
-                sig = G_VARIANT_TYPE ("a{ss}");
+		sig = G_VARIANT_TYPE ("a{ss}");
 		break;
 	default:
 		g_assert (FALSE);
 		break;
 	}
 
-        ret = g_variant_type_equal (g_variant_get_type (variant), sig);
+	ret = g_variant_type_equal (g_variant_get_type (variant), sig);
 	if (ret == FALSE)
 		return FALSE;
 
@@ -443,19 +443,19 @@ gkd_secret_property_get_type (const gchar *property, CK_ATTRIBUTE_TYPE *type)
 
 gboolean
 gkd_secret_property_parse_all (GVariant *array,
-                               const gchar *interface,
-                               GckBuilder *builder)
+			       const gchar *interface,
+			       GckBuilder *builder)
 {
 	CK_ATTRIBUTE_TYPE attr_type;
 	const char *name;
 	DataType data_type;
-        GVariantIter iter;
-        GVariant *variant;
+	GVariantIter iter;
+	GVariant *variant;
 
 	g_return_val_if_fail (array != NULL, FALSE);
 	g_return_val_if_fail (builder != NULL, FALSE);
 
-        g_variant_iter_init (&iter, array);
+	g_variant_iter_init (&iter, array);
 
 	while (g_variant_iter_next (&iter, "{&sv}", &name, &variant)) {
 		/* Property interface.name */
@@ -517,8 +517,8 @@ gkd_secret_property_append_variant (const GckAttribute *attr)
 
 gboolean
 gkd_secret_property_parse_variant (GVariant *variant,
-                                   const gchar *property,
-                                   GckBuilder *builder)
+				   const gchar *property,
+				   GckBuilder *builder)
 {
 	CK_ATTRIBUTE_TYPE attr_type;
 	DataType data_type;
@@ -535,7 +535,7 @@ gkd_secret_property_parse_variant (GVariant *variant,
 
 gboolean
 gkd_secret_property_parse_fields (GVariant *variant,
-                                  GckBuilder *builder)
+				  GckBuilder *builder)
 {
 	g_return_val_if_fail (variant != NULL, FALSE);
 	g_return_val_if_fail (builder != NULL, FALSE);
diff --git a/daemon/dbus/gkd-secret-secret.c b/daemon/dbus/gkd-secret-secret.c
index 336ea498..12bf62e6 100644
--- a/daemon/dbus/gkd-secret-secret.c
+++ b/daemon/dbus/gkd-secret-secret.c
@@ -34,16 +34,16 @@
 
 GkdSecretSecret *
 gkd_secret_secret_new (GkdSecretSession *session,
-                       gconstpointer parameter,
-                       gsize n_parameter,
-                       gconstpointer value,
-                       gsize n_value)
+		       gconstpointer parameter,
+		       gsize n_parameter,
+		       gconstpointer value,
+		       gsize n_value)
 {
 	return gkd_secret_secret_new_take_memory (session,
-	                                          g_memdup (parameter, n_parameter),
-	                                          n_parameter,
-	                                          g_memdup (value, n_value),
-	                                          n_value);
+						  g_memdup (parameter, n_parameter),
+						  n_parameter,
+						  g_memdup (value, n_value),
+						  n_value);
 }
 
 static void
@@ -56,8 +56,8 @@ destroy_with_owned_memory (gpointer data)
 
 GkdSecretSecret*
 gkd_secret_secret_new_take_memory (GkdSecretSession *session,
-                                   gpointer parameter, gsize n_parameter,
-                                   gpointer value, gsize n_value)
+				   gpointer parameter, gsize n_parameter,
+				   gpointer value, gsize n_value)
 {
 	GkdSecretSecret *secret;
 
@@ -78,35 +78,35 @@ gkd_secret_secret_new_take_memory (GkdSecretSession *session,
 
 GkdSecretSecret*
 gkd_secret_secret_parse (GkdSecretService *service,
-                         const char *sender,
-                         GVariant *variant,
-                         GError **error)
+			 const char *sender,
+			 GVariant *variant,
+			 GError **error)
 {
 	GkdSecretSecret *secret = NULL;
 	GkdSecretSession *session;
 	const char *parameter, *value, *path, *content_type;
-        gsize n_parameter, n_value;
-        GVariant *parameter_variant, *value_variant;
+	gsize n_parameter, n_value;
+	GVariant *parameter_variant, *value_variant;
 
 	g_return_val_if_fail (GKD_SECRET_IS_SERVICE (service), NULL);
 	g_return_val_if_fail (variant, NULL);
 	g_return_val_if_fail (sender, NULL);
 
-        g_variant_get (variant, "(&o^&ay^&ay&s)", &path, NULL, NULL, &content_type);
+	g_variant_get (variant, "(&o^&ay^&ay&s)", &path, NULL, NULL, &content_type);
 
-        /* parameter */
-        parameter_variant = g_variant_get_child_value (variant, 1);
-        parameter = g_variant_get_fixed_array (parameter_variant, &n_parameter, sizeof (guint8));
+	/* parameter */
+	parameter_variant = g_variant_get_child_value (variant, 1);
+	parameter = g_variant_get_fixed_array (parameter_variant, &n_parameter, sizeof (guint8));
 
-        /* value */
-        value_variant = g_variant_get_child_value (variant, 2);
-        value = g_variant_get_fixed_array (value_variant, &n_value, sizeof (guint8));
+	/* value */
+	value_variant = g_variant_get_child_value (variant, 2);
+	value = g_variant_get_fixed_array (value_variant, &n_value, sizeof (guint8));
 
 	/* Try to lookup the session */
 	session = gkd_secret_service_lookup_session (service, path, sender);
 	if (session == NULL) {
 		g_set_error_literal (error, GKD_SECRET_ERROR,
-                                     GKD_SECRET_ERROR_NO_SESSION,
+				     GKD_SECRET_ERROR_NO_SESSION,
 				     "The session wrapping the secret does not exist");
 		goto out;
 	}
@@ -119,8 +119,8 @@ gkd_secret_secret_parse (GkdSecretService *service,
 	secret->n_value = n_value;
 
  out:
-        g_variant_unref (parameter_variant);
-        g_variant_unref (value_variant);
+	g_variant_unref (parameter_variant);
+	g_variant_unref (value_variant);
 
 	return secret;
 }
diff --git a/daemon/dbus/gkd-secret-service.c b/daemon/dbus/gkd-secret-service.c
index 3b75f099..65657bc4 100644
--- a/daemon/dbus/gkd-secret-service.c
+++ b/daemon/dbus/gkd-secret-service.c
@@ -334,9 +334,9 @@ ensure_client_for_sender (gpointer user_data)
 
 static GDBusMessage *
 service_message_filter (GDBusConnection *connection,
-                        GDBusMessage *message,
-                        gboolean incoming,
-                        gpointer user_data)
+			GDBusMessage *message,
+			gboolean incoming,
+			gpointer user_data)
 {
 	GkdSecretService *self = user_data;
 	MessageFilterData *data;
@@ -373,23 +373,23 @@ service_method_open_session (GkdExportedService *skeleton,
 	gchar *result = NULL;
 	GError *error = NULL;
 	const gchar *caller;
-        GVariant *input_payload;
+	GVariant *input_payload;
 
 	caller = g_dbus_method_invocation_get_sender (invocation);
 
 	/* Now we can create a session with this information */
 	session = gkd_secret_session_new (self, caller);
-        input_payload = g_variant_get_variant (input);
+	input_payload = g_variant_get_variant (input);
 	gkd_secret_session_handle_open (session, algorithm, input_payload,
 					&output, &result,
 					&error);
-        g_variant_unref (input_payload);
+	g_variant_unref (input_payload);
 
 	if (error != NULL) {
 		g_dbus_method_invocation_take_error (invocation, error);
 	} else {
 		gkd_secret_service_publish_dispatch (self, caller,
-		                                     GKD_SECRET_DISPATCH (session));
+						     GKD_SECRET_DISPATCH (session));
 		gkd_exported_service_complete_open_session (skeleton, invocation, output, result);
 		g_free (result);
 	}
@@ -463,7 +463,7 @@ service_method_create_collection (GkdExportedService *skeleton,
 
 	path = gkd_secret_dispatch_get_object_path (GKD_SECRET_DISPATCH (create));
 	gkd_secret_service_publish_dispatch (self, caller,
-	                                     GKD_SECRET_DISPATCH (create));
+					     GKD_SECRET_DISPATCH (create));
 
 	gkd_exported_service_complete_create_collection (skeleton, invocation,
 							 "/", path);
@@ -511,7 +511,7 @@ service_method_unlock (GkdExportedService *skeleton,
 	/* So do we need to prompt? */
 	if (gkd_secret_unlock_have_queued (unlock)) {
 		gkd_secret_service_publish_dispatch (self, caller,
-		                                     GKD_SECRET_DISPATCH (unlock));
+						     GKD_SECRET_DISPATCH (unlock));
 		path = gkd_secret_dispatch_get_object_path (GKD_SECRET_DISPATCH (unlock));
 
 	/* No need to prompt */
@@ -549,7 +549,7 @@ service_method_lock (GkdExportedService *skeleton,
 			if (gkd_secret_lock (collection, NULL)) {
 				g_ptr_array_add (array, objpaths[i]);
 				gkd_secret_objects_emit_collection_locked (self->objects,
-				                                           collection);
+									   collection);
 			}
 			g_object_unref (collection);
 		}
@@ -580,8 +580,8 @@ method_change_lock_internal (GkdSecretService *self,
 	collection = gkd_secret_objects_lookup_collection (self->objects, caller, collection_path);
 	if (!collection) {
 		g_dbus_method_invocation_return_error_literal (invocation, GKD_SECRET_ERROR,
-                                                               GKD_SECRET_ERROR_NO_SUCH_OBJECT,
-                                                               "The collection does not exist");
+							       GKD_SECRET_ERROR_NO_SUCH_OBJECT,
+							       "The collection does not exist");
 		return TRUE;
 	}
 
@@ -590,7 +590,7 @@ method_change_lock_internal (GkdSecretService *self,
 	change = gkd_secret_change_new (self, caller, collection_path);
 	path = gkd_secret_dispatch_get_object_path (GKD_SECRET_DISPATCH (change));
 	gkd_secret_service_publish_dispatch (self, caller,
-	                                     GKD_SECRET_DISPATCH (change));
+					     GKD_SECRET_DISPATCH (change));
 
 	g_dbus_method_invocation_return_value (invocation, g_variant_new ("(o)", path));
 	g_object_unref (change);
@@ -633,7 +633,7 @@ service_method_read_alias (GkdExportedService *skeleton,
 	/* Make sure it actually exists */
 	if (path)
 		collection = gkd_secret_objects_lookup_collection (self->objects,
-		                                                   g_dbus_method_invocation_get_sender (invocation),
+								   g_dbus_method_invocation_get_sender (invocation),
 								   path);
 	if (collection == NULL) {
 		g_free (path);
@@ -688,8 +688,8 @@ service_method_set_alias (GkdExportedService *skeleton,
 		if (collection == NULL) {
 			g_free (identifier);
 			g_dbus_method_invocation_return_error_literal (invocation, GKD_SECRET_ERROR,
-                                                                       GKD_SECRET_ERROR_NO_SUCH_OBJECT,
-                                                                       "The collection does not exist");
+								       GKD_SECRET_ERROR_NO_SUCH_OBJECT,
+								       "The collection does not exist");
 			return TRUE;
 		}
 
@@ -721,8 +721,8 @@ service_method_create_with_master_password (GkdExportedInternal *skeleton,
 	if (!gkd_secret_property_parse_all (attributes, SECRET_COLLECTION_INTERFACE, &builder)) {
 		gck_builder_clear (&builder);
 		g_dbus_method_invocation_return_error_literal (invocation, G_DBUS_ERROR,
-                                                               G_DBUS_ERROR_INVALID_ARGS,
-                                                               "Invalid properties argument");
+							       G_DBUS_ERROR_INVALID_ARGS,
+							       "Invalid properties argument");
 		return TRUE;
 	}
 
@@ -789,13 +789,13 @@ service_method_change_with_master_password (GkdExportedInternal *skeleton,
 
 	/* Make sure we have such a collection */
 	collection = gkd_secret_objects_lookup_collection (self->objects, sender,
-	                                                   path);
+							   path);
 
 	/* No such collection */
 	if (collection == NULL) {
-          g_dbus_method_invocation_return_error_literal (invocation, GKD_SECRET_ERROR,
-                                                         GKD_SECRET_ERROR_NO_SUCH_OBJECT,
-                                                         "The collection does not exist");
+	  g_dbus_method_invocation_return_error_literal (invocation, GKD_SECRET_ERROR,
+							 GKD_SECRET_ERROR_NO_SUCH_OBJECT,
+							 "The collection does not exist");
 	}
 
 	/* Success */
@@ -843,8 +843,8 @@ service_method_unlock_with_master_password (GkdExportedInternal *skeleton,
 	/* No such collection */
 	if (collection == NULL) {
 		g_dbus_method_invocation_return_error_literal (invocation, GKD_SECRET_ERROR,
-                                                               GKD_SECRET_ERROR_NO_SUCH_OBJECT,
-                                                               "The collection does not exist");
+							       GKD_SECRET_ERROR_NO_SUCH_OBJECT,
+							       "The collection does not exist");
 
 	/* Success */
 	} else if (gkd_secret_unlock_with_secret (collection, master, &error)) {
@@ -877,7 +877,7 @@ service_name_owner_changed (GDBusConnection *connection,
 	const gchar *object_name;
 	const gchar *old_owner;
 	const gchar *new_owner;
-        GkdSecretService *self = user_data;
+	GkdSecretService *self = user_data;
 
 	/* A peer is connecting or disconnecting from the bus,
 	 * remove any client info, when client gone.
@@ -895,10 +895,10 @@ service_name_owner_changed (GDBusConnection *connection,
 static void
 gkd_secret_service_init_collections (GkdSecretService *self)
 {
-        gchar **collections = gkd_secret_service_get_collections (self);
-        gint idx;
+	gchar **collections = gkd_secret_service_get_collections (self);
+	gint idx;
 
-        for (idx = 0; collections[idx] != NULL; idx++)
+	for (idx = 0; collections[idx] != NULL; idx++)
 		gkd_secret_objects_register_collection (self->objects, collections[idx]);
 
 	g_strfreev (collections);
@@ -906,8 +906,8 @@ gkd_secret_service_init_collections (GkdSecretService *self)
 
 static GObject*
 gkd_secret_service_constructor (GType type,
-                                guint n_props,
-                                GObjectConstructParam *props)
+				guint n_props,
+				GObjectConstructParam *props)
 {
 	GkdSecretService *self = GKD_SECRET_SERVICE (G_OBJECT_CLASS (gkd_secret_service_parent_class)->constructor(type, n_props, props));
 	GError *error = NULL;
@@ -926,11 +926,11 @@ gkd_secret_service_constructor (GType type,
 	/* Create our objects proxy */
 	g_return_val_if_fail (GCK_IS_SLOT (slot), NULL);
 	self->objects = g_object_new (GKD_SECRET_TYPE_OBJECTS,
-	                              "pkcs11-slot", slot, "service", self, NULL);
+				      "pkcs11-slot", slot, "service", self, NULL);
 
-        self->skeleton = gkd_secret_service_skeleton_new (self);
+	self->skeleton = gkd_secret_service_skeleton_new (self);
 	g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (self->skeleton),
-                                          self->connection,
+					  self->connection,
 					  SECRET_SERVICE_PATH, &error);
 	if (error != NULL) {
 		g_warning ("could not register secret service on session bus: %s", error->message);
@@ -958,9 +958,9 @@ gkd_secret_service_constructor (GType type,
 	g_signal_connect (self->skeleton, "handle-unlock",
 			  G_CALLBACK (service_method_unlock), self);
 
-        self->internal_skeleton = gkd_exported_internal_skeleton_new ();
+	self->internal_skeleton = gkd_exported_internal_skeleton_new ();
 	g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (self->internal_skeleton),
-                                          self->connection,
+					  self->connection,
 					  SECRET_SERVICE_PATH, &error);
 
 	if (error != NULL) {
@@ -986,11 +986,11 @@ gkd_secret_service_constructor (GType type,
 								  service_name_owner_changed,
 								  self, NULL);
 
-        self->filter_id = g_dbus_connection_add_filter (self->connection,
-                                                        service_message_filter,
-                                                        self, NULL);
+	self->filter_id = g_dbus_connection_add_filter (self->connection,
+							service_message_filter,
+							self, NULL);
 
-        gkd_secret_service_init_collections (self);
+	gkd_secret_service_init_collections (self);
 
 	return G_OBJECT (self);
 }
@@ -1057,7 +1057,7 @@ gkd_secret_service_finalize (GObject *obj)
 
 static void
 gkd_secret_service_set_property (GObject *obj, guint prop_id, const GValue *value,
-                                 GParamSpec *pspec)
+				 GParamSpec *pspec)
 {
 	GkdSecretService *self = GKD_SECRET_SERVICE (obj);
 
@@ -1078,7 +1078,7 @@ gkd_secret_service_set_property (GObject *obj, guint prop_id, const GValue *valu
 
 static void
 gkd_secret_service_get_property (GObject *obj, guint prop_id, GValue *value,
-                                 GParamSpec *pspec)
+				 GParamSpec *pspec)
 {
 	GkdSecretService *self = GKD_SECRET_SERVICE (obj);
 
@@ -1108,11 +1108,11 @@ gkd_secret_service_class_init (GkdSecretServiceClass *klass)
 
 	g_object_class_install_property (gobject_class, PROP_CONNECTION,
 		g_param_spec_object ("connection", "Connection", "DBus Connection",
-                                     G_TYPE_DBUS_CONNECTION, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+				     G_TYPE_DBUS_CONNECTION, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
 	g_object_class_install_property (gobject_class, PROP_PKCS11_SLOT,
-	        g_param_spec_object ("pkcs11-slot", "Pkcs11 Slot", "PKCS#11 slot that we use for secrets",
-	                             GCK_TYPE_SLOT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+		g_param_spec_object ("pkcs11-slot", "Pkcs11 Slot", "PKCS#11 slot that we use for secrets",
+				     GCK_TYPE_SLOT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 }
 
 /* -----------------------------------------------------------------------------
@@ -1186,18 +1186,18 @@ gkd_secret_service_get_pkcs11_session (GkdSecretService *self, const gchar *call
 	if (!client->pkcs11_session) {
 		slot = gkd_secret_service_get_pkcs11_slot (self);
 		client->pkcs11_session = gck_slot_open_session_full (slot, GCK_SESSION_READ_WRITE,
-		                                                     CKF_G_APPLICATION_SESSION, &client->app,
-		                                                     NULL, NULL, &error);
+								     CKF_G_APPLICATION_SESSION, &client->app,
+								     NULL, NULL, &error);
 		if (!client->pkcs11_session) {
 			g_warning ("couldn't open pkcs11 session for secret service: %s",
-			           egg_error_message (error));
+				   egg_error_message (error));
 			g_clear_error (&error);
 			return NULL;
 		}
 
 		if (!log_into_pkcs11_session (client->pkcs11_session, &error)) {
 			g_warning ("couldn't log in to pkcs11 session for secret service: %s",
-			           egg_error_message (error));
+				   egg_error_message (error));
 			g_clear_error (&error);
 			g_object_unref (client->pkcs11_session);
 			client->pkcs11_session = NULL;
@@ -1221,17 +1221,17 @@ gkd_secret_service_internal_pkcs11_session (GkdSecretService *self)
 
 	slot = gkd_secret_service_get_pkcs11_slot (self);
 	self->internal_session = gck_slot_open_session_full (slot, GCK_SESSION_READ_WRITE,
-	                                                     0, NULL, NULL, NULL, &error);
+							     0, NULL, NULL, NULL, &error);
 	if (!self->internal_session) {
 		g_warning ("couldn't open pkcs11 session for secret service: %s",
-		           egg_error_message (error));
+			   egg_error_message (error));
 		g_clear_error (&error);
 		return NULL;
 	}
 
 	if (!log_into_pkcs11_session (self->internal_session, &error)) {
 		g_warning ("couldn't log in to pkcs11 session for secret service: %s",
-		           egg_error_message (error));
+			   egg_error_message (error));
 		g_clear_error (&error);
 		g_object_unref (self->internal_session);
 		self->internal_session = NULL;
@@ -1243,7 +1243,7 @@ gkd_secret_service_internal_pkcs11_session (GkdSecretService *self)
 
 GkdSecretSession*
 gkd_secret_service_lookup_session (GkdSecretService *self, const gchar *path,
-                                   const gchar *caller)
+				   const gchar *caller)
 {
 	ServiceClient *client;
 	gpointer object;
@@ -1298,19 +1298,19 @@ gkd_secret_service_get_alias (GkdSecretService *self, const gchar *alias)
 			if (identifier == NULL) {
 				identifier = "login";
 				g_hash_table_replace (self->aliases, g_strdup (alias),
-				                      g_strdup (identifier));
+						      g_strdup (identifier));
 			}
 
 		} else if (g_str_equal (alias, "session")) {
 			identifier = "session";
 			g_hash_table_replace (self->aliases, g_strdup (alias),
-			                      g_strdup (identifier));
+					      g_strdup (identifier));
 
 		/* TODO: We should be using CKA_G_LOGIN_COLLECTION */
 		} else if (g_str_equal (alias, "login")) {
 			identifier = "login";
 			g_hash_table_replace (self->aliases, g_strdup (alias),
-			                      g_strdup (identifier));
+					      g_strdup (identifier));
 		}
 	}
 
@@ -1319,7 +1319,7 @@ gkd_secret_service_get_alias (GkdSecretService *self, const gchar *alias)
 
 void
 gkd_secret_service_set_alias (GkdSecretService *self, const gchar *alias,
-                              const gchar *identifier)
+			      const gchar *identifier)
 {
 	g_return_if_fail (GKD_SECRET_IS_SERVICE (self));
 	g_return_if_fail (alias);
@@ -1332,7 +1332,7 @@ gkd_secret_service_set_alias (GkdSecretService *self, const gchar *alias,
 
 void
 gkd_secret_service_publish_dispatch (GkdSecretService *self, const gchar *caller,
-                                     GkdSecretDispatch *object)
+				     GkdSecretDispatch *object)
 {
 	ServiceClient *client;
 	const gchar *path;
@@ -1358,7 +1358,7 @@ gkd_secret_service_get_collections (GkdSecretService *self)
 	g_return_val_if_fail (GKD_SECRET_IS_SERVICE (self), NULL);
 
 	collections_variant = gkd_secret_objects_append_collection_paths (self->objects, NULL);
-        collections = g_variant_dup_objv (collections_variant, NULL);
+	collections = g_variant_dup_objv (collections_variant, NULL);
 	g_variant_unref (collections_variant);
 
 	return collections;
@@ -1366,7 +1366,7 @@ gkd_secret_service_get_collections (GkdSecretService *self)
 
 void
 gkd_secret_service_emit_collection_created (GkdSecretService *self,
-                                            const gchar *collection_path)
+					    const gchar *collection_path)
 {
 	gchar **collections;
 
@@ -1384,7 +1384,7 @@ gkd_secret_service_emit_collection_created (GkdSecretService *self,
 
 void
 gkd_secret_service_emit_collection_deleted (GkdSecretService *self,
-                                            const gchar *collection_path)
+					    const gchar *collection_path)
 {
 	gchar **collections;
 
@@ -1402,7 +1402,7 @@ gkd_secret_service_emit_collection_deleted (GkdSecretService *self,
 
 void
 gkd_secret_service_emit_collection_changed (GkdSecretService *self,
-                                            const gchar *collection_path)
+					    const gchar *collection_path)
 {
 	g_return_if_fail (GKD_SECRET_IS_SERVICE (self));
 	g_return_if_fail (collection_path != NULL);
diff --git a/daemon/dbus/gkd-secret-session.c b/daemon/dbus/gkd-secret-session.c
index f8793754..6ae382f5 100644
--- a/daemon/dbus/gkd-secret-session.c
+++ b/daemon/dbus/gkd-secret-session.c
@@ -64,7 +64,7 @@ struct _GkdSecretSession {
 
 static void gkd_secret_dispatch_iface (GkdSecretDispatchIface *iface);
 G_DEFINE_TYPE_WITH_CODE (GkdSecretSession, gkd_secret_session, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GKD_SECRET_TYPE_DISPATCH, gkd_secret_dispatch_iface));
+			 G_IMPLEMENT_INTERFACE (GKD_SECRET_TYPE_DISPATCH, gkd_secret_dispatch_iface));
 
 static guint unique_session_number = 0;
 
@@ -82,7 +82,7 @@ take_session_key (GkdSecretSession *self, GckObject *key, CK_MECHANISM_TYPE mech
 
 static gboolean
 aes_create_dh_keys (GckSession *session, const gchar *group,
-                    GckObject **pub_key, GckObject **priv_key)
+		    GckObject **pub_key, GckObject **priv_key)
 {
 	GckBuilder builder = GCK_BUILDER_INIT;
 	GckAttributes *attrs;
@@ -102,7 +102,7 @@ aes_create_dh_keys (GckSession *session, const gchar *group,
 
 	/* Perform the DH key generation */
 	ret = gck_session_generate_key_pair (session, CKM_DH_PKCS_KEY_PAIR_GEN, attrs, attrs,
-	                                     pub_key, priv_key, NULL, &error);
+					     pub_key, priv_key, NULL, &error);
 
 	gck_attributes_unref (attrs);
 
@@ -117,7 +117,7 @@ aes_create_dh_keys (GckSession *session, const gchar *group,
 
 static gboolean
 aes_derive_key (GckSession *session, GckObject *priv_key,
-                gconstpointer input, gsize n_input, GckObject **aes_key)
+		gconstpointer input, gsize n_input, GckObject **aes_key)
 {
 	GckBuilder builder = GCK_BUILDER_INIT;
 	GError *error = NULL;
@@ -179,8 +179,8 @@ aes_negotiate (GkdSecretSession *self,
 	GError *error = NULL;
 	gpointer output;
 	gsize n_output;
-        const gchar *input;
-        gsize n_input;
+	const gchar *input;
+	gsize n_input;
 	gboolean ret;
 
 	session = gkd_secret_service_get_pkcs11_session (self->service, self->caller);
@@ -208,7 +208,7 @@ aes_negotiate (GkdSecretSession *self,
 		return FALSE;
 	}
 
-        input = g_variant_get_fixed_array (input_variant, &n_input, sizeof (guint8));
+	input = g_variant_get_fixed_array (input_variant, &n_input, sizeof (guint8));
 	ret = aes_derive_key (session, priv, input, n_input, &key);
 
 	gck_object_destroy (priv, NULL, NULL);
@@ -349,7 +349,7 @@ gkd_secret_session_dispose (GObject *obj)
 
 	if (self->service) {
 		g_object_remove_weak_pointer (G_OBJECT (self->service),
-		                              (gpointer*)&(self->service));
+					      (gpointer*)&(self->service));
 		self->service = NULL;
 	}
 
@@ -381,7 +381,7 @@ gkd_secret_session_finalize (GObject *obj)
 
 static void
 gkd_secret_session_set_property (GObject *obj, guint prop_id, const GValue *value,
-                                 GParamSpec *pspec)
+				 GParamSpec *pspec)
 {
 	GkdSecretSession *self = GKD_SECRET_SESSION (obj);
 
@@ -399,7 +399,7 @@ gkd_secret_session_set_property (GObject *obj, guint prop_id, const GValue *valu
 		self->service = g_value_get_object (value);
 		g_return_if_fail (self->service);
 		g_object_add_weak_pointer (G_OBJECT (self->service),
-		                           (gpointer*)&(self->service));
+					   (gpointer*)&(self->service));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec);
@@ -409,7 +409,7 @@ gkd_secret_session_set_property (GObject *obj, guint prop_id, const GValue *valu
 
 static void
 gkd_secret_session_get_property (GObject *obj, guint prop_id, GValue *value,
-                                 GParamSpec *pspec)
+				 GParamSpec *pspec)
 {
 	GkdSecretSession *self = GKD_SECRET_SESSION (obj);
 
@@ -445,19 +445,19 @@ gkd_secret_session_class_init (GkdSecretSessionClass *klass)
 
 	g_object_class_install_property (gobject_class, PROP_CALLER,
 		g_param_spec_string ("caller", "Caller", "DBus caller name",
-		                     NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY ));
+				     NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY ));
 
 	g_object_class_install_property (gobject_class, PROP_CALLER_EXECUTABLE,
 		g_param_spec_string ("caller-executable", "Caller Executable", "Executable of caller",
-		                     NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY ));
+				     NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY ));
 
 	g_object_class_install_property (gobject_class, PROP_OBJECT_PATH,
-	        g_param_spec_pointer ("object-path", "Object Path", "DBus Object Path",
-		                      G_PARAM_READABLE));
+		g_param_spec_pointer ("object-path", "Object Path", "DBus Object Path",
+				      G_PARAM_READABLE));
 
 	g_object_class_install_property (gobject_class, PROP_SERVICE,
 		g_param_spec_object ("service", "Service", "Service which owns this session",
-		                     GKD_SECRET_TYPE_SERVICE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+				     GKD_SECRET_TYPE_SERVICE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 }
 
 static void
@@ -475,12 +475,12 @@ gkd_secret_session_new (GkdSecretService *service, const gchar *caller)
 	g_return_val_if_fail (GKD_SECRET_IS_SERVICE (service), NULL);
 	g_return_val_if_fail (caller, NULL);
 	return g_object_new (GKD_SECRET_TYPE_SESSION,
-	                     "caller", caller, "service", service, NULL);
+			     "caller", caller, "service", service, NULL);
 }
 
 gpointer
 gkd_secret_session_begin (GkdSecretSession *self, const gchar *group,
-                          gsize *n_output)
+			  gsize *n_output)
 {
 	GError *error = NULL;
 	GckSession *session;
@@ -514,7 +514,7 @@ gkd_secret_session_begin (GkdSecretSession *self, const gchar *group,
 
 gboolean
 gkd_secret_session_complete (GkdSecretSession *self, gconstpointer peer,
-                             gsize n_peer)
+			     gsize n_peer)
 {
 	GckSession *session;
 
@@ -558,9 +558,9 @@ gkd_secret_session_handle_open (GkdSecretSession *self,
 	} else if (g_str_equal (algorithm, "dh-ietf1024-sha256-aes128-cbc-pkcs7")) {
 		if (!g_variant_type_equal (variant_type, G_VARIANT_TYPE_BYTESTRING)) {
 			g_set_error (error, G_DBUS_ERROR,
-                                     G_DBUS_ERROR_INVALID_ARGS,
-                                     "The session algorithm input argument (%s) was invalid",
-                                     algorithm);
+				     G_DBUS_ERROR_INVALID_ARGS,
+				     "The session algorithm input argument (%s) was invalid",
+				     algorithm);
 			return FALSE;
 		}
 
@@ -627,7 +627,7 @@ gkd_secret_session_get_item_secret (GkdSecretSession *self, GckObject *item,
 	mech.n_parameter = n_iv;
 
 	value = gck_session_wrap_key_full (session, self->key, &mech, item, &n_value,
-	                                   NULL, &error);
+					   NULL, &error);
 
 	if (error != NULL) {
 		if (g_error_matches (error, GCK_ERROR, CKR_USER_NOT_LOGGED_IN)) {
@@ -650,7 +650,7 @@ gkd_secret_session_get_item_secret (GkdSecretSession *self, GckObject *item,
 
 gboolean
 gkd_secret_session_set_item_secret (GkdSecretSession *self, GckObject *item,
-                                    GkdSecretSecret *secret, GError **error_out)
+				    GkdSecretSecret *secret, GError **error_out)
 {
 	GckBuilder builder = GCK_BUILDER_INIT;
 	GckMechanism mech;
@@ -690,7 +690,7 @@ gkd_secret_session_set_item_secret (GkdSecretSession *self, GckObject *item,
 	mech.n_parameter = secret->n_parameter;
 
 	object = gck_session_unwrap_key_full (session, self->key, &mech, secret->value,
-	                                      secret->n_value, gck_builder_end (&builder), NULL, &error);
+					      secret->n_value, gck_builder_end (&builder), NULL, &error);
 
 	if (object == NULL) {
 		if (g_error_matches (error, GCK_ERROR, CKR_USER_NOT_LOGGED_IN)) {
@@ -698,8 +698,8 @@ gkd_secret_session_set_item_secret (GkdSecretSession *self, GckObject *item,
 					     GKD_SECRET_ERROR_IS_LOCKED,
 					     "Cannot set secret of a locked item");
 		} else if (g_error_matches (error, GCK_ERROR, CKR_WRAPPED_KEY_INVALID) ||
-		           g_error_matches (error, GCK_ERROR, CKR_WRAPPED_KEY_LEN_RANGE) ||
-		           g_error_matches (error, GCK_ERROR, CKR_MECHANISM_PARAM_INVALID)) {
+			   g_error_matches (error, GCK_ERROR, CKR_WRAPPED_KEY_LEN_RANGE) ||
+			   g_error_matches (error, GCK_ERROR, CKR_MECHANISM_PARAM_INVALID)) {
 			g_set_error_literal (error_out, G_DBUS_ERROR,
 					     G_DBUS_ERROR_INVALID_ARGS,
 					     "The secret was transferred or encrypted in an invalid way.");
@@ -728,10 +728,10 @@ gkd_secret_session_set_item_secret (GkdSecretSession *self, GckObject *item,
 
 GckObject*
 gkd_secret_session_create_credential (GkdSecretSession *self,
-                                      GckSession *session,
-                                      GckAttributes *attrs,
-                                      GkdSecretSecret *secret,
-                                      GError **error)
+				      GckSession *session,
+				      GckAttributes *attrs,
+				      GkdSecretSecret *secret,
+				      GError **error)
 {
 	GckBuilder builder = GCK_BUILDER_INIT;
 	GckAttributes *alloc = NULL;
@@ -756,7 +756,7 @@ gkd_secret_session_create_credential (GkdSecretSession *self,
 	mech.n_parameter = secret->n_parameter;
 
 	object = gck_session_unwrap_key_full (session, self->key, &mech, secret->value,
-	                                      secret->n_value, attrs, NULL, error);
+					      secret->n_value, attrs, NULL, error);
 
 	gck_attributes_unref (alloc);
 
diff --git a/daemon/dbus/gkd-secret-unlock.c b/daemon/dbus/gkd-secret-unlock.c
index 37c4dedb..1f77a705 100644
--- a/daemon/dbus/gkd-secret-unlock.c
+++ b/daemon/dbus/gkd-secret-unlock.c
@@ -78,7 +78,7 @@ static void gkd_secret_dispatch_iface (GkdSecretDispatchIface *iface);
 static void perform_next_unlock (GkdSecretUnlock *self);
 
 G_DEFINE_TYPE_WITH_CODE (GkdSecretUnlock, gkd_secret_unlock, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GKD_SECRET_TYPE_DISPATCH, gkd_secret_dispatch_iface));
+			 G_IMPLEMENT_INTERFACE (GKD_SECRET_TYPE_DISPATCH, gkd_secret_dispatch_iface));
 
 static guint unique_prompt_number = 0;
 static GQueue unlock_prompt_queue = G_QUEUE_INIT;
@@ -98,7 +98,7 @@ lookup_collection (GkdSecretUnlock *self, const gchar *path)
 
 static void
 emit_collection_unlocked (GkdSecretUnlock *self,
-                          const gchar *path)
+			  const gchar *path)
 {
 	GkdSecretObjects *objects;
 	GckObject *collection;
@@ -122,7 +122,7 @@ check_locked_collection (GckObject *collection, gboolean *locked)
 	if (value == NULL) {
 		if (!g_error_matches (error, GCK_ERROR, CKR_OBJECT_HANDLE_INVALID))
 			g_warning ("couldn't check locked status of collection: %s",
-			           egg_error_message (error));
+				   egg_error_message (error));
 		return FALSE;
 	}
 
@@ -133,7 +133,7 @@ check_locked_collection (GckObject *collection, gboolean *locked)
 
 static void
 common_unlock_attributes (GckBuilder *builder,
-                          GckObject *collection)
+			  GckObject *collection)
 {
 	g_assert (builder != NULL);
 	g_assert (GCK_IS_OBJECT (collection));
@@ -213,7 +213,7 @@ on_unlock_complete (GObject *object, GAsyncResult *res, gpointer user_data)
 	/* Another error, something's broken */
 	} else {
 		g_warning ("couldn't create credential for collection: %s",
-		           egg_error_message (error));
+			   egg_error_message (error));
 	}
 
 	g_clear_error (&error);
@@ -275,8 +275,8 @@ perform_next_unlock (GkdSecretUnlock *self)
 
 			session = gkd_secret_service_get_pkcs11_session (self->service, self->caller);
 			gck_session_create_object_async (session, gck_builder_end (&builder),
-			                                 self->cancellable, on_unlock_complete,
-			                                 g_object_ref (self));
+							 self->cancellable, on_unlock_complete,
+							 g_object_ref (self));
 			self->current = objpath;
 			break;
 		}
@@ -311,9 +311,9 @@ prompt_method_prompt (GkdExportedPrompt *skeleton,
 	/* Prompt can only be called once */
 	if (self->prompted) {
 		g_dbus_method_invocation_return_error_literal (invocation,
-                                                               GKD_SECRET_ERROR,
-                                                               GKD_SECRET_ERROR_ALREADY_EXISTS,
-                                                               "This prompt has already been shown.");
+							       GKD_SECRET_ERROR,
+							       GKD_SECRET_ERROR_ALREADY_EXISTS,
+							       "This prompt has already been shown.");
 		return TRUE;
 	}
 
@@ -355,7 +355,7 @@ static GObject*
 gkd_secret_unlock_constructor (GType type, guint n_props, GObjectConstructParam *props)
 {
 	GkdSecretUnlock *self = GKD_SECRET_UNLOCK (G_OBJECT_CLASS (gkd_secret_unlock_parent_class)->constructor(type, n_props, props));
-        GError *error = NULL;
+	GError *error = NULL;
 
 	g_return_val_if_fail (self, NULL);
 	g_return_val_if_fail (self->caller, NULL);
@@ -365,12 +365,12 @@ gkd_secret_unlock_constructor (GType type, guint n_props, GObjectConstructParam
 	if (!self->object_path)
 		self->object_path = g_strdup_printf (SECRET_PROMPT_PREFIX "/u%d", ++unique_prompt_number);
 
-        self->skeleton = gkd_exported_prompt_skeleton_new ();
-        g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (self->skeleton),
-                                          gkd_secret_service_get_connection (self->service), self->object_path,
-                                          &error);
+	self->skeleton = gkd_exported_prompt_skeleton_new ();
+	g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (self->skeleton),
+					  gkd_secret_service_get_connection (self->service), self->object_path,
+					  &error);
 
-        if (error != NULL) {
+	if (error != NULL) {
 		g_warning ("could not register secret prompt on session bus: %s", error->message);
 		g_error_free (error);
 	}
@@ -395,7 +395,7 @@ gkd_secret_unlock_dispose (GObject *obj)
 
 	if (self->service) {
 		g_object_remove_weak_pointer (G_OBJECT (self->service),
-		                              (gpointer*)&(self->service));
+					      (gpointer*)&(self->service));
 		self->service = NULL;
 	}
 
@@ -446,7 +446,7 @@ gkd_secret_unlock_finalize (GObject *obj)
 
 static void
 gkd_secret_unlock_set_property (GObject *obj, guint prop_id, const GValue *value,
-                                GParamSpec *pspec)
+				GParamSpec *pspec)
 {
 	GkdSecretUnlock *self = GKD_SECRET_UNLOCK (obj);
 
@@ -460,7 +460,7 @@ gkd_secret_unlock_set_property (GObject *obj, guint prop_id, const GValue *value
 		self->service = g_value_get_object (value);
 		g_return_if_fail (self->service);
 		g_object_add_weak_pointer (G_OBJECT (self->service),
-		                           (gpointer*)&(self->service));
+					   (gpointer*)&(self->service));
 		break;
 	case PROP_OBJECT_PATH:
 		g_return_if_fail (!self->object_path);
@@ -474,7 +474,7 @@ gkd_secret_unlock_set_property (GObject *obj, guint prop_id, const GValue *value
 
 static void
 gkd_secret_unlock_get_property (GObject *obj, guint prop_id, GValue *value,
-                                GParamSpec *pspec)
+				GParamSpec *pspec)
 {
 	GkdSecretUnlock *self = GKD_SECRET_UNLOCK (obj);
 
@@ -508,15 +508,15 @@ gkd_secret_unlock_class_init (GkdSecretUnlockClass *klass)
 
 	g_object_class_install_property (gobject_class, PROP_CALLER,
 		g_param_spec_string ("caller", "Caller", "DBus caller name",
-		                     NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY ));
+				     NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY ));
 
 	g_object_class_install_property (gobject_class, PROP_OBJECT_PATH,
-	        g_param_spec_pointer ("object-path", "Object Path", "DBus Object Path",
-		                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+		g_param_spec_pointer ("object-path", "Object Path", "DBus Object Path",
+				      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
 	g_object_class_install_property (gobject_class, PROP_SERVICE,
 		g_param_spec_object ("service", "Service", "Service which owns this prompt",
-		                     GKD_SECRET_TYPE_SERVICE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+				     GKD_SECRET_TYPE_SERVICE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 }
 
 static void
@@ -530,13 +530,13 @@ gkd_secret_dispatch_iface (GkdSecretDispatchIface *iface)
 
 GkdSecretUnlock*
 gkd_secret_unlock_new (GkdSecretService *service, const gchar *caller,
-                       const gchar *object_path)
+		       const gchar *object_path)
 {
 	return g_object_new (GKD_SECRET_TYPE_UNLOCK,
-	                     "service", service,
-	                     "caller", caller,
-	                     "object-path", object_path,
-	                     NULL);
+			     "service", service,
+			     "caller", caller,
+			     "object-path", object_path,
+			     NULL);
 }
 
 void
@@ -611,8 +611,8 @@ gkd_secret_unlock_call_prompt (GkdSecretUnlock *self, const gchar *window_id)
 
 gboolean
 gkd_secret_unlock_with_secret (GckObject *collection,
-                               GkdSecretSecret *master,
-                               GError **error)
+			       GkdSecretSecret *master,
+			       GError **error)
 {
 	GckBuilder builder = GCK_BUILDER_INIT;
 	GckAttributes *attrs;
@@ -632,7 +632,7 @@ gkd_secret_unlock_with_secret (GckObject *collection,
 	attrs = gck_attributes_ref_sink (gck_builder_end (&builder));
 
 	cred = gkd_secret_session_create_credential (master->session, NULL,
-	                                             attrs, master, error);
+						     attrs, master, error);
 
 	gck_attributes_unref (attrs);
 
@@ -643,7 +643,7 @@ gkd_secret_unlock_with_secret (GckObject *collection,
 
 gboolean
 gkd_secret_unlock_with_password (GckObject *collection, const guchar *password,
-                                 gsize n_password, GError **error_out)
+				 gsize n_password, GError **error_out)
 {
 	GckBuilder builder = GCK_BUILDER_INIT;
 	GError *error = NULL;
diff --git a/daemon/dbus/gkd-secret-util.c b/daemon/dbus/gkd-secret-util.c
index 86af09c2..29443f8c 100644
--- a/daemon/dbus/gkd-secret-util.c
+++ b/daemon/dbus/gkd-secret-util.c
@@ -47,8 +47,8 @@ decode_object_identifier (const gchar* enc, gssize length)
 
 		/* Underscores get special handling */
 		if (G_UNLIKELY (ch == '_' &&
-		                g_ascii_isxdigit(enc[0]) &&
-		                g_ascii_isxdigit (enc[1]))) {
+				g_ascii_isxdigit(enc[0]) &&
+				g_ascii_isxdigit (enc[1]))) {
 			ch = (g_ascii_xdigit_value (enc[0]) * 16) +
 			     (g_ascii_xdigit_value (enc[1]));
 			enc += 2;
@@ -134,8 +134,8 @@ gkd_secret_util_build_path (const gchar *base, gconstpointer identifier, gssize
 
 		/* Normal characters can go right through */
 		if (G_LIKELY ((ch >= 'A' && ch <= 'Z') ||
-		              (ch >= 'a' && ch <= 'z') ||
-		              (ch >= '0' && ch <= '9'))) {
+			      (ch >= 'a' && ch <= 'z') ||
+			      (ch >= '0' && ch <= '9'))) {
 			g_string_append_c (result, ch);
 
 		/* Special characters are encoded with a _ */