From 83541a2ddc4813833e87f4dcfe57ecf5ac8b0abc Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Mon, 6 Sep 2021 17:34:22 +0200
Subject: [PATCH] Revert "device: Export kernel device from FpDevice"
This reverts commit 8f93aef1221eb1b2dfc81c5dbacede8a07b86118.
---
libfprint/fp-device.c | 25 +++----------------------
1 file changed, 3 insertions(+), 22 deletions(-)
diff --git a/libfprint/fp-device.c b/libfprint/fp-device.c
index 35e2f2b..4d19bf0 100644
--- a/libfprint/fp-device.c
+++ b/libfprint/fp-device.c
@@ -245,7 +245,6 @@ fp_device_get_property (GObject *object,
{
FpDevice *self = FP_DEVICE (object);
FpDevicePrivate *priv = fp_device_get_instance_private (self);
- FpDeviceClass *cls = FP_DEVICE_GET_CLASS (self);
switch (prop_id)
{
@@ -285,24 +284,6 @@ fp_device_get_property (GObject *object,
g_value_set_boolean (value, priv->is_removed);
break;
- case PROP_FPI_USB_DEVICE:
- g_value_set_object (value, priv->usb_device);
- break;
-
- case PROP_FPI_UDEV_DATA_SPIDEV:
- if (cls->type == FP_DEVICE_TYPE_UDEV)
- g_value_set_string (value, g_strdup (priv->udev_data.spidev_path));
- else
- g_value_set_string (value, NULL);
- break;
-
- case PROP_FPI_UDEV_DATA_HIDRAW:
- if (cls->type == FP_DEVICE_TYPE_UDEV)
- g_value_set_string (value, g_strdup (priv->udev_data.hidraw_path));
- else
- g_value_set_string (value, NULL);
- break;
-
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
@@ -549,7 +530,7 @@ fp_device_class_init (FpDeviceClass *klass)
"USB Device",
"Private: The USB device for the device",
G_USB_TYPE_DEVICE,
- G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+ G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
/**
* FpDevice::fpi-udev-data-spidev: (skip)
*
@@ -562,7 +543,7 @@ fp_device_class_init (FpDeviceClass *klass)
"Udev data: spidev path",
"Private: The path to /dev/spidevN.M",
NULL,
- G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+ G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
/**
* FpDevice::fpi-udev-data-hidraw: (skip)
*
@@ -575,7 +556,7 @@ fp_device_class_init (FpDeviceClass *klass)
"Udev data: hidraw path",
"Private: The path to /dev/hidrawN",
NULL,
- G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+ G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
/**
* FpDevice::fpi-driver-data: (skip)