mirror of
https://gitlab.com/mishakmak/pam-fprint-grosshack.git
synced 2026-04-08 20:03:34 +02:00
fprintd: Use GDBus codegen based implementation
Fprintd is dependent on the deprecated dbus-glib, also this doesn't provide various features we can take advantage of, like the ones for async authentication mechanism. So, remove all the dbus-glib dependencies and simplify the code, but without any further refactor, and keeping everything as it used to work, while this will give room for further improvements in subsequent commits. Internally, we just use dbus-codegen to generate the skeletons, and we use the generated FprintdDBusManager with composition, while we implement the device skeleton interface in FprintDevice, so that we don't have to use it as a proxy, and keep being closer to what it used to be with dbus-glib. Fixes: #61
This commit is contained in:
committed by
Benjamin Berg
parent
e224913b80
commit
93bad82540
555
src/device.c
555
src/device.c
File diff suppressed because it is too large
Load Diff
@ -12,9 +12,6 @@
|
||||
|
||||
<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
|
||||
<interface name="net.reactivated.Fprint.Device">
|
||||
<annotation name="org.freedesktop.DBus.GLib.CSymbol"
|
||||
value="fprint_device" />
|
||||
|
||||
<doc:doc>
|
||||
<doc:title id="polkit-integration">
|
||||
PolicyKit integration
|
||||
@ -282,8 +279,6 @@
|
||||
<arg type="as" name="enrolled_fingers" direction="out">
|
||||
<doc:doc><doc:summary>An array of strings representing the enrolled fingerprints. See <doc:ref type="description" to="fingerprint-names">Fingerprint names</doc:ref>.</doc:summary></doc:doc>
|
||||
</arg>
|
||||
<annotation name="org.freedesktop.DBus.GLib.Async" value="" />
|
||||
|
||||
<doc:doc>
|
||||
<doc:description>
|
||||
<doc:para>
|
||||
@ -304,8 +299,6 @@
|
||||
<arg type="s" name="username" direction="in">
|
||||
<doc:doc><doc:summary>The username for whom to delete the enrolled fingerprints. See <doc:ref type="description" to="usernames">Usernames</doc:ref>.</doc:summary></doc:doc>
|
||||
</arg>
|
||||
<annotation name="org.freedesktop.DBus.GLib.Async" value="" />
|
||||
|
||||
<doc:doc>
|
||||
<doc:description>
|
||||
<doc:para>
|
||||
@ -327,8 +320,6 @@
|
||||
<!-- ************************************************************ -->
|
||||
|
||||
<method name="DeleteEnrolledFingers2">
|
||||
<annotation name="org.freedesktop.DBus.GLib.Async" value="" />
|
||||
|
||||
<doc:doc>
|
||||
<doc:description>
|
||||
<doc:para>
|
||||
@ -348,8 +339,6 @@
|
||||
<arg type="s" name="username" direction="in">
|
||||
<doc:doc><doc:summary>The username for whom to claim the device. See <doc:ref type="description" to="usernames">Usernames</doc:ref>.</doc:summary></doc:doc>
|
||||
</arg>
|
||||
<annotation name="org.freedesktop.DBus.GLib.Async" value="" />
|
||||
|
||||
<doc:doc>
|
||||
<doc:description>
|
||||
<doc:para>
|
||||
@ -368,8 +357,6 @@
|
||||
<!-- ************************************************************ -->
|
||||
|
||||
<method name="Release">
|
||||
<annotation name="org.freedesktop.DBus.GLib.Async" value="" />
|
||||
|
||||
<doc:doc>
|
||||
<doc:description>
|
||||
<doc:para>
|
||||
@ -390,8 +377,6 @@
|
||||
<arg type="s" name="finger_name" direction="in">
|
||||
<doc:doc><doc:summary>A string representing the finger to verify. See <doc:ref type="description" to="fingerprint-names">Fingerprint names</doc:ref>.</doc:summary></doc:doc>
|
||||
</arg>
|
||||
<annotation name="org.freedesktop.DBus.GLib.Async" value="" />
|
||||
|
||||
<doc:doc>
|
||||
<doc:description>
|
||||
<doc:para>
|
||||
@ -415,8 +400,6 @@
|
||||
<!-- ************************************************************ -->
|
||||
|
||||
<method name="VerifyStop">
|
||||
<annotation name="org.freedesktop.DBus.GLib.Async" value="" />
|
||||
|
||||
<doc:doc>
|
||||
<doc:description>
|
||||
<doc:para>
|
||||
@ -486,8 +469,6 @@
|
||||
<doc:ref type="description" to="fingerprint-names">Fingerprint names</doc:ref>.
|
||||
Note that "any" is not a valid finger name for this method.</doc:summary></doc:doc>
|
||||
</arg>
|
||||
<annotation name="org.freedesktop.DBus.GLib.Async" value="" />
|
||||
|
||||
<doc:doc>
|
||||
<doc:description>
|
||||
<doc:para>
|
||||
@ -511,8 +492,6 @@
|
||||
<!-- ************************************************************ -->
|
||||
|
||||
<method name="EnrollStop">
|
||||
<annotation name="org.freedesktop.DBus.GLib.Async" value="" />
|
||||
|
||||
<doc:doc>
|
||||
<doc:description>
|
||||
<doc:para>
|
||||
|
||||
@ -1 +0,0 @@
|
||||
VOID:STRING,BOOLEAN
|
||||
@ -20,19 +20,19 @@
|
||||
#pragma once
|
||||
|
||||
#include <glib.h>
|
||||
#include <dbus/dbus-glib.h>
|
||||
#include <gio/gio.h>
|
||||
#include <fprint.h>
|
||||
#include "fprintd-dbus.h"
|
||||
|
||||
/* General */
|
||||
#define TIMEOUT 30
|
||||
#define FPRINT_SERVICE_NAME "net.reactivated.Fprint"
|
||||
#define FPRINT_SERVICE_PATH "/net/reactivated/Fprint"
|
||||
|
||||
/* Errors */
|
||||
GQuark fprint_error_quark(void);
|
||||
GType fprint_error_get_type(void);
|
||||
|
||||
#define FPRINT_ERROR fprint_error_quark()
|
||||
#define FPRINT_TYPE_ERROR fprint_error_get_type()
|
||||
#define FPRINT_ERROR_DBUS_INTERFACE "net.reactivated.Fprint.Error"
|
||||
typedef enum {
|
||||
FPRINT_ERROR_CLAIM_DEVICE, /* developer didn't claim the device */
|
||||
@ -53,23 +53,18 @@ struct _FprintManager {
|
||||
GObject parent;
|
||||
};
|
||||
|
||||
FprintManager *fprint_manager_new(gboolean no_timeout);
|
||||
FprintManager *fprint_manager_new (GDBusConnection *connection, gboolean no_timeout);
|
||||
|
||||
/* Device */
|
||||
#define FPRINT_TYPE_DEVICE (fprint_device_get_type())
|
||||
G_DECLARE_FINAL_TYPE (FprintDevice, fprint_device, FPRINT, DEVICE, GObject)
|
||||
G_DECLARE_FINAL_TYPE (FprintDevice, fprint_device, FPRINT, DEVICE,
|
||||
FprintDBusDeviceSkeleton)
|
||||
|
||||
struct _FprintDevice {
|
||||
GObject parent;
|
||||
FprintDBusDeviceSkeleton parent;
|
||||
};
|
||||
|
||||
FprintDevice *fprint_device_new(FpDevice *dev);
|
||||
guint32 _fprint_device_get_id(FprintDevice *rdev);
|
||||
/* Print */
|
||||
/* TODO */
|
||||
|
||||
/* Binding data included in main.c through server-bindings.h which individual
|
||||
* class implementations need to access.
|
||||
*/
|
||||
extern const DBusGObjectInfo dbus_glib_fprint_manager_object_info;
|
||||
extern const DBusGObjectInfo dbus_glib_fprint_device_object_info;
|
||||
|
||||
62
src/main.c
62
src/main.c
@ -1,6 +1,7 @@
|
||||
/*
|
||||
* fprint D-Bus daemon
|
||||
* Copyright (C) 2008 Daniel Drake <dsd@gentoo.org>
|
||||
* Copyright (C) 2020 Marco Trevisan <marco.trevisan@canonical.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -23,7 +24,7 @@
|
||||
#include <poll.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <dbus/dbus-glib-bindings.h>
|
||||
#include <gio/gio.h>
|
||||
#include <glib.h>
|
||||
#include <glib/gi18n.h>
|
||||
#include <fprint.h>
|
||||
@ -37,7 +38,6 @@
|
||||
|
||||
fp_storage store;
|
||||
|
||||
DBusGConnection *fprintd_dbus_conn = NULL;
|
||||
static gboolean no_timeout = FALSE;
|
||||
static gboolean g_fatal_warnings = FALSE;
|
||||
|
||||
@ -139,13 +139,33 @@ static gboolean sigterm_callback(gpointer data)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
on_name_acquired (GDBusConnection *connection,
|
||||
const char *name,
|
||||
gpointer user_data)
|
||||
{
|
||||
g_debug ("D-Bus service launched with name: %s", name);
|
||||
}
|
||||
|
||||
static void
|
||||
on_name_lost (GDBusConnection *connection,
|
||||
const char *name,
|
||||
gpointer user_data)
|
||||
{
|
||||
GMainLoop *loop = user_data;
|
||||
|
||||
g_warning ("Failed to get name: %s", name);
|
||||
|
||||
g_main_loop_quit (loop);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
g_autoptr(GOptionContext) context = NULL;
|
||||
g_autoptr(GMainLoop) loop = NULL;
|
||||
g_autoptr(GError) error = NULL;
|
||||
FprintManager *manager;
|
||||
DBusGProxy *driver_proxy;
|
||||
g_autoptr(FprintManager) manager = NULL;
|
||||
g_autoptr(GDBusConnection) connection = NULL;
|
||||
guint32 request_name_ret;
|
||||
|
||||
setlocale (LC_ALL, "");
|
||||
@ -170,16 +190,13 @@ int main(int argc, char **argv)
|
||||
g_log_set_always_fatal (fatal_mask);
|
||||
}
|
||||
|
||||
/* Obtain a connection to the session bus */
|
||||
fprintd_dbus_conn = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
|
||||
if (fprintd_dbus_conn == NULL) {
|
||||
/* Obtain a connection to the system bus */
|
||||
connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
|
||||
if (!G_IS_DBUS_CONNECTION (connection)) {
|
||||
g_warning("Failed to open connection to bus: %s", error->message);
|
||||
return 1;
|
||||
}
|
||||
|
||||
driver_proxy = dbus_g_proxy_new_for_name(fprintd_dbus_conn,
|
||||
DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
|
||||
|
||||
/* Load the configuration file,
|
||||
* and the default storage plugin */
|
||||
if (!load_conf())
|
||||
@ -193,32 +210,23 @@ int main(int argc, char **argv)
|
||||
|
||||
/* create the one instance of the Manager object to be shared between
|
||||
* all fprintd users. This blocks until all the devices are enumerated */
|
||||
manager = fprint_manager_new (no_timeout);
|
||||
manager = fprint_manager_new (connection, no_timeout);
|
||||
|
||||
/* Obtain the well-known name after the manager has been initialized.
|
||||
* Otherwise a client immediately enumerating the devices will not see
|
||||
* any. */
|
||||
if (!org_freedesktop_DBus_request_name(driver_proxy, FPRINT_SERVICE_NAME,
|
||||
0, &request_name_ret, &error)) {
|
||||
g_warning("Failed to get name: %s", error->message);
|
||||
g_object_unref (manager);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (request_name_ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
|
||||
g_warning ("Got result code %u from requesting name", request_name_ret);
|
||||
g_object_unref (manager);
|
||||
return 1;
|
||||
}
|
||||
|
||||
g_debug("D-Bus service launched with name: %s", FPRINT_SERVICE_NAME);
|
||||
request_name_ret = g_bus_own_name_on_connection (connection,
|
||||
FPRINT_SERVICE_NAME,
|
||||
G_BUS_NAME_OWNER_FLAGS_NONE,
|
||||
on_name_acquired,
|
||||
on_name_lost,
|
||||
loop, NULL);
|
||||
|
||||
g_debug("entering main loop");
|
||||
g_main_loop_run(loop);
|
||||
g_bus_unown_name (request_name_ret);
|
||||
g_debug("main loop completed");
|
||||
|
||||
g_object_unref (manager);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
208
src/manager.c
208
src/manager.c
@ -1,6 +1,7 @@
|
||||
/*
|
||||
* /net/reactivated/Fprint/Manager object implementation
|
||||
* Copyright (C) 2008 Daniel Drake <dsd@gentoo.org>
|
||||
* Copyright (C) 2020 Marco Trevisan <marco.trevisan@canonical.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -19,7 +20,6 @@
|
||||
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <dbus/dbus-glib-bindings.h>
|
||||
#include <glib.h>
|
||||
#include <glib/gi18n.h>
|
||||
#include <fprint.h>
|
||||
@ -27,17 +27,16 @@
|
||||
|
||||
#include "fprintd.h"
|
||||
|
||||
extern DBusGConnection *fprintd_dbus_conn;
|
||||
|
||||
static void fprint_manager_constructed (GObject *object);
|
||||
static gboolean fprint_manager_get_devices(FprintManager *manager,
|
||||
GPtrArray **devices, GError **error);
|
||||
static gboolean fprint_manager_get_default_device(FprintManager *manager,
|
||||
const char **device, GError **error);
|
||||
#include "manager-dbus-glue.h"
|
||||
|
||||
|
||||
typedef struct
|
||||
{
|
||||
GDBusConnection *connection;
|
||||
FprintDBusManager *dbus_manager;
|
||||
FpContext *context;
|
||||
GSList *dev_registry;
|
||||
gboolean no_timeout;
|
||||
@ -46,28 +45,81 @@ typedef struct
|
||||
|
||||
G_DEFINE_TYPE_WITH_CODE(FprintManager, fprint_manager, G_TYPE_OBJECT, G_ADD_PRIVATE (FprintManager))
|
||||
|
||||
enum {
|
||||
PROP_0,
|
||||
FPRINT_MANAGER_CONNECTION,
|
||||
N_PROPS
|
||||
};
|
||||
|
||||
static GParamSpec *properties[N_PROPS];
|
||||
|
||||
static void fprint_manager_finalize(GObject *object)
|
||||
{
|
||||
FprintManagerPrivate *priv = fprint_manager_get_instance_private (FPRINT_MANAGER (object));
|
||||
|
||||
g_clear_object (&priv->dbus_manager);
|
||||
g_clear_object (&priv->connection);
|
||||
g_clear_object (&priv->context);
|
||||
g_slist_free(priv->dev_registry);
|
||||
|
||||
G_OBJECT_CLASS(fprint_manager_parent_class)->finalize(object);
|
||||
}
|
||||
|
||||
static void fprint_manager_set_property (GObject *object, guint property_id,
|
||||
const GValue *value, GParamSpec *pspec)
|
||||
{
|
||||
FprintManager *self = FPRINT_MANAGER (object);
|
||||
FprintManagerPrivate *priv = fprint_manager_get_instance_private (self);
|
||||
|
||||
switch (property_id) {
|
||||
case FPRINT_MANAGER_CONNECTION:
|
||||
priv->connection = g_value_dup_object (value);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void fprint_manager_get_property (GObject *object, guint property_id,
|
||||
GValue *value, GParamSpec *pspec)
|
||||
{
|
||||
FprintManager *self = FPRINT_MANAGER (object);
|
||||
FprintManagerPrivate *priv = fprint_manager_get_instance_private (self);
|
||||
|
||||
switch (property_id) {
|
||||
case FPRINT_MANAGER_CONNECTION:
|
||||
g_value_set_object (value, priv->connection);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void fprint_manager_class_init(FprintManagerClass *klass)
|
||||
{
|
||||
dbus_g_object_type_install_info(FPRINT_TYPE_MANAGER,
|
||||
&dbus_glib_fprint_manager_object_info);
|
||||
dbus_g_error_domain_register (FPRINT_ERROR, FPRINT_ERROR_DBUS_INTERFACE, FPRINT_TYPE_ERROR);
|
||||
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
||||
|
||||
G_OBJECT_CLASS(klass)->finalize = fprint_manager_finalize;
|
||||
object_class->constructed = fprint_manager_constructed;
|
||||
object_class->set_property = fprint_manager_set_property;
|
||||
object_class->get_property = fprint_manager_get_property;
|
||||
object_class->finalize = fprint_manager_finalize;
|
||||
|
||||
properties[FPRINT_MANAGER_CONNECTION] =
|
||||
g_param_spec_object ("connection",
|
||||
"Connection",
|
||||
"Set GDBus connection property",
|
||||
G_TYPE_DBUS_CONNECTION,
|
||||
G_PARAM_CONSTRUCT_ONLY |
|
||||
G_PARAM_READWRITE);
|
||||
|
||||
g_object_class_install_properties (object_class, N_PROPS, properties);
|
||||
}
|
||||
|
||||
static gchar *get_device_path(FprintDevice *rdev)
|
||||
{
|
||||
return g_strdup_printf("/net/reactivated/Fprint/Device/%d",
|
||||
return g_strdup_printf (FPRINT_SERVICE_PATH "/Device/%d",
|
||||
_fprint_device_get_id(rdev));
|
||||
}
|
||||
|
||||
@ -106,6 +158,44 @@ fprint_manager_in_use_notified (FprintDevice *rdev, GParamSpec *spec, FprintMana
|
||||
priv->timeout_id = g_timeout_add_seconds (TIMEOUT, (GSourceFunc) fprint_manager_timeout_cb, manager);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
handle_get_devices (FprintManager *manager, GDBusMethodInvocation *invocation,
|
||||
FprintDBusManager *skeleton)
|
||||
{
|
||||
g_autoptr(GPtrArray) devices = NULL;
|
||||
g_autoptr(GError) error = NULL;
|
||||
|
||||
if (!fprint_manager_get_devices (manager, &devices, &error)) {
|
||||
g_dbus_method_invocation_return_gerror (invocation, error);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
fprint_dbus_manager_complete_get_devices (skeleton, invocation,
|
||||
(const gchar *const *)
|
||||
devices->pdata);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
handle_get_default_device (FprintManager *manager,
|
||||
GDBusMethodInvocation *invocation,
|
||||
FprintDBusManager *skeleton)
|
||||
{
|
||||
const gchar *device;
|
||||
g_autoptr(GError) error = NULL;
|
||||
|
||||
if (!fprint_manager_get_default_device (manager, &device, &error)) {
|
||||
g_dbus_method_invocation_return_gerror (invocation, error);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
fprint_dbus_manager_complete_get_default_device (skeleton, invocation,
|
||||
device);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
device_added_cb (FprintManager *manager, FpDevice *device, FpContext *context)
|
||||
{
|
||||
@ -118,8 +208,9 @@ device_added_cb (FprintManager *manager, FpDevice *device, FpContext *context)
|
||||
|
||||
priv->dev_registry = g_slist_prepend (priv->dev_registry, rdev);
|
||||
path = get_device_path (rdev);
|
||||
dbus_g_connection_register_g_object(fprintd_dbus_conn, path,
|
||||
G_OBJECT(rdev));
|
||||
g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (rdev),
|
||||
priv->connection,
|
||||
path, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -140,7 +231,8 @@ device_removed_cb (FprintManager *manager, FpDevice *device, FpContext *context)
|
||||
|
||||
priv->dev_registry = g_slist_delete_link (priv->dev_registry, item);
|
||||
|
||||
dbus_g_connection_unregister_g_object(fprintd_dbus_conn, G_OBJECT(rdev));
|
||||
g_dbus_interface_skeleton_unexport (
|
||||
G_DBUS_INTERFACE_SKELETON (rdev));
|
||||
|
||||
g_signal_handlers_disconnect_by_data (rdev, manager);
|
||||
g_object_unref (rdev);
|
||||
@ -154,13 +246,29 @@ device_removed_cb (FprintManager *manager, FpDevice *device, FpContext *context)
|
||||
fprint_manager_in_use_notified (NULL, NULL, manager);
|
||||
}
|
||||
|
||||
static void
|
||||
fprint_manager_init (FprintManager *manager)
|
||||
static void fprint_manager_constructed (GObject *object)
|
||||
{
|
||||
FprintManager *manager = FPRINT_MANAGER (object);
|
||||
FprintManagerPrivate *priv = fprint_manager_get_instance_private (manager);
|
||||
|
||||
priv->dbus_manager = fprint_dbus_manager_skeleton_new ();
|
||||
priv->context = fp_context_new ();
|
||||
|
||||
g_signal_connect_object (priv->dbus_manager,
|
||||
"handle-get-devices",
|
||||
G_CALLBACK (handle_get_devices),
|
||||
manager,
|
||||
G_CONNECT_SWAPPED);
|
||||
g_signal_connect_object (priv->dbus_manager,
|
||||
"handle-get-default-device",
|
||||
G_CALLBACK (handle_get_default_device),
|
||||
manager,
|
||||
G_CONNECT_SWAPPED);
|
||||
|
||||
g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (priv->dbus_manager),
|
||||
priv->connection,
|
||||
FPRINT_SERVICE_PATH "/Manager", NULL);
|
||||
|
||||
/* And register the signals for initial enumeration and hotplug. */
|
||||
g_signal_connect_object (priv->context,
|
||||
"device-added",
|
||||
@ -179,16 +287,20 @@ fprint_manager_init (FprintManager *manager)
|
||||
*/
|
||||
fp_context_enumerate (priv->context);
|
||||
|
||||
dbus_g_connection_register_g_object(fprintd_dbus_conn,
|
||||
"/net/reactivated/Fprint/Manager", G_OBJECT(manager));
|
||||
G_OBJECT_CLASS (fprint_manager_parent_class)->constructed (object);
|
||||
}
|
||||
|
||||
FprintManager *fprint_manager_new(gboolean no_timeout)
|
||||
static void
|
||||
fprint_manager_init (FprintManager *manager)
|
||||
{
|
||||
}
|
||||
|
||||
FprintManager *fprint_manager_new (GDBusConnection *connection, gboolean no_timeout)
|
||||
{
|
||||
FprintManagerPrivate *priv;
|
||||
GObject *object;
|
||||
|
||||
object = g_object_new(FPRINT_TYPE_MANAGER, NULL);
|
||||
object = g_object_new (FPRINT_TYPE_MANAGER, "connection", connection, NULL);
|
||||
priv = fprint_manager_get_instance_private (FPRINT_MANAGER (object));
|
||||
priv->no_timeout = no_timeout;
|
||||
|
||||
@ -213,10 +325,15 @@ static gboolean fprint_manager_get_devices(FprintManager *manager,
|
||||
|
||||
if (num_open > 0) {
|
||||
for (l = elem; l != NULL; l = l->next) {
|
||||
FprintDevice *rdev = l->data;
|
||||
g_ptr_array_add(devs, get_device_path(rdev));
|
||||
GDBusInterfaceSkeleton *dev_skeleton = l->data;
|
||||
const char *path;
|
||||
|
||||
path = g_dbus_interface_skeleton_get_object_path (
|
||||
dev_skeleton);
|
||||
g_ptr_array_add (devs, (char *) path);
|
||||
}
|
||||
}
|
||||
g_ptr_array_add (devs, NULL);
|
||||
|
||||
g_slist_free(elem);
|
||||
|
||||
@ -235,7 +352,8 @@ static gboolean fprint_manager_get_default_device(FprintManager *manager,
|
||||
num_open = g_slist_length(elem);
|
||||
|
||||
if (num_open > 0) {
|
||||
*device = get_device_path (g_slist_last (elem)->data);
|
||||
GDBusInterfaceSkeleton *dev_skeleton = g_slist_last (elem)->data;
|
||||
*device = g_dbus_interface_skeleton_get_object_path (dev_skeleton);
|
||||
return TRUE;
|
||||
} else {
|
||||
g_set_error (error, FPRINT_ERROR, FPRINT_ERROR_NO_SUCH_DEVICE,
|
||||
@ -245,34 +363,28 @@ static gboolean fprint_manager_get_default_device(FprintManager *manager,
|
||||
}
|
||||
}
|
||||
|
||||
GQuark fprint_error_quark(void)
|
||||
#define ERROR_ENTRY(name, dbus_name) \
|
||||
{ FPRINT_ERROR_ ## name, FPRINT_ERROR_DBUS_INTERFACE "." dbus_name }
|
||||
GDBusErrorEntry fprint_error_entries[] =
|
||||
{
|
||||
static GQuark quark = 0;
|
||||
if (!quark)
|
||||
quark = g_quark_from_static_string("fprintd-error-quark");
|
||||
return quark;
|
||||
}
|
||||
ERROR_ENTRY (CLAIM_DEVICE, "ClaimDevice"),
|
||||
ERROR_ENTRY (ALREADY_IN_USE, "AlreadyInUse"),
|
||||
ERROR_ENTRY (INTERNAL, "Internal"),
|
||||
ERROR_ENTRY (PERMISSION_DENIED, "PermissionDenied"),
|
||||
ERROR_ENTRY (NO_ENROLLED_PRINTS, "NoEnrolledPrints"),
|
||||
ERROR_ENTRY (NO_ACTION_IN_PROGRESS, "NoActionInProgress"),
|
||||
ERROR_ENTRY (INVALID_FINGERNAME, "InvalidFingername"),
|
||||
ERROR_ENTRY (NO_SUCH_DEVICE, "NoSuchDevice"),
|
||||
};
|
||||
|
||||
#define ENUM_ENTRY(NAME, DESC) { NAME, "" #NAME "", DESC }
|
||||
GType
|
||||
fprint_error_get_type (void)
|
||||
GQuark fprint_error_quark (void)
|
||||
{
|
||||
static GType etype = 0;
|
||||
|
||||
if (etype == 0) {
|
||||
static const GEnumValue values[] =
|
||||
{
|
||||
ENUM_ENTRY (FPRINT_ERROR_CLAIM_DEVICE, "ClaimDevice"),
|
||||
ENUM_ENTRY (FPRINT_ERROR_ALREADY_IN_USE, "AlreadyInUse"),
|
||||
ENUM_ENTRY (FPRINT_ERROR_INTERNAL, "Internal"),
|
||||
ENUM_ENTRY (FPRINT_ERROR_PERMISSION_DENIED, "PermissionDenied"),
|
||||
ENUM_ENTRY (FPRINT_ERROR_NO_ENROLLED_PRINTS, "NoEnrolledPrints"),
|
||||
ENUM_ENTRY (FPRINT_ERROR_NO_ACTION_IN_PROGRESS, "NoActionInProgress"),
|
||||
ENUM_ENTRY (FPRINT_ERROR_INVALID_FINGERNAME, "InvalidFingername"),
|
||||
ENUM_ENTRY (FPRINT_ERROR_NO_SUCH_DEVICE, "NoSuchDevice"),
|
||||
{ 0, 0, 0 }
|
||||
};
|
||||
etype = g_enum_register_static ("FprintError", values);
|
||||
static volatile gsize quark = 0;
|
||||
if (!quark) {
|
||||
g_dbus_error_register_error_domain ("fprintd-error-quark",
|
||||
&quark,
|
||||
fprint_error_entries,
|
||||
G_N_ELEMENTS (fprint_error_entries));
|
||||
}
|
||||
return etype;
|
||||
return (GQuark) quark;
|
||||
}
|
||||
|
||||
@ -5,8 +5,6 @@
|
||||
]>
|
||||
<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
|
||||
<interface name="net.reactivated.Fprint.Manager">
|
||||
<annotation name="org.freedesktop.DBus.GLib.CSymbol"
|
||||
value="fprint_manager" />
|
||||
|
||||
<!-- ************************************************************ -->
|
||||
|
||||
|
||||
@ -1,30 +1,10 @@
|
||||
fprintd_marshal = gnome.genmarshal('fprintd-marshal',
|
||||
prefix: 'fprintd_marshal',
|
||||
sources: 'fprintd-marshal.list',
|
||||
valist_marshallers: true,
|
||||
)
|
||||
|
||||
bash = find_program('bash')
|
||||
dbus_binding_tool = find_program('dbus-binding-tool')
|
||||
dbus_interfaces = ['Manager', 'Device']
|
||||
dbus_interfaces_files = []
|
||||
dbus_server_glue_sources = []
|
||||
|
||||
foreach interface_name: dbus_interfaces
|
||||
interface = interface_name.to_lower()
|
||||
interface_file = interface + '.xml'
|
||||
glue_name = interface + '-dbus-glue.h'
|
||||
dbus_server_glue_sources += custom_target(glue_name,
|
||||
input: interface_file,
|
||||
output: glue_name,
|
||||
command: [
|
||||
dbus_binding_tool,
|
||||
'--prefix=fprint_' + interface,
|
||||
'--mode=glib-server',
|
||||
'--output=@OUTPUT@',
|
||||
'@INPUT@',
|
||||
])
|
||||
|
||||
dbus_interfaces_files += custom_target('dbus_interface_' + interface,
|
||||
input: interface_file,
|
||||
output: 'net.reactivated.Fprint.@0@.xml'.format(interface_name),
|
||||
@ -34,14 +14,24 @@ foreach interface_name: dbus_interfaces
|
||||
)
|
||||
endforeach
|
||||
|
||||
fprintd_dbus_sources = gnome.gdbus_codegen('fprintd-dbus',
|
||||
sources: dbus_interfaces_files,
|
||||
autocleanup: 'all',
|
||||
interface_prefix: 'net.reactivated.Fprint.',
|
||||
namespace: 'FprintDBus',
|
||||
)
|
||||
|
||||
fprintd_deps = declare_dependency(
|
||||
include_directories: [
|
||||
include_directories('..'),
|
||||
],
|
||||
sources: [
|
||||
fprintd_dbus_sources,
|
||||
],
|
||||
dependencies: [
|
||||
dbus_glib_dep,
|
||||
glib_dep,
|
||||
gio_dep,
|
||||
gio_unix_dep,
|
||||
gmodule_dep,
|
||||
libfprint_dep,
|
||||
polkit_gobject_dep,
|
||||
@ -58,8 +48,6 @@ libfprintd_private = static_library('fprintd-private',
|
||||
'device.c',
|
||||
'fprintd.h',
|
||||
'manager.c',
|
||||
dbus_server_glue_sources,
|
||||
fprintd_marshal,
|
||||
],
|
||||
dependencies: fprintd_deps,
|
||||
gnu_symbol_visibility: 'hidden',
|
||||
|
||||
Reference in New Issue
Block a user