diff options
Diffstat (limited to 'daemon/dbus/gkd-secret-unlock.c')
| -rw-r--r-- | daemon/dbus/gkd-secret-unlock.c | 66 |
1 files changed, 33 insertions, 33 deletions
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; |