fp-device: Add a "open" property and method to check its state
This commit is contained in:
parent
d01bb41b7c
commit
92a5278a74
2 changed files with 33 additions and 1 deletions
|
@ -88,6 +88,7 @@ enum {
|
||||||
PROP_DRIVER,
|
PROP_DRIVER,
|
||||||
PROP_DEVICE_ID,
|
PROP_DEVICE_ID,
|
||||||
PROP_NAME,
|
PROP_NAME,
|
||||||
|
PROP_OPEN,
|
||||||
PROP_NR_ENROLL_STAGES,
|
PROP_NR_ENROLL_STAGES,
|
||||||
PROP_SCAN_TYPE,
|
PROP_SCAN_TYPE,
|
||||||
PROP_FPI_ENVIRON,
|
PROP_FPI_ENVIRON,
|
||||||
|
@ -417,6 +418,10 @@ fp_device_get_property (GObject *object,
|
||||||
g_value_set_string (value, priv->device_name);
|
g_value_set_string (value, priv->device_name);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case PROP_OPEN:
|
||||||
|
g_value_set_boolean (value, priv->is_open);
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
}
|
}
|
||||||
|
@ -551,6 +556,12 @@ fp_device_class_init (FpDeviceClass *klass)
|
||||||
NULL,
|
NULL,
|
||||||
G_PARAM_STATIC_STRINGS | G_PARAM_READABLE);
|
G_PARAM_STATIC_STRINGS | G_PARAM_READABLE);
|
||||||
|
|
||||||
|
properties[PROP_OPEN] =
|
||||||
|
g_param_spec_boolean ("open",
|
||||||
|
"Opened",
|
||||||
|
"Wether the device is open or not", FALSE,
|
||||||
|
G_PARAM_STATIC_STRINGS | G_PARAM_READABLE);
|
||||||
|
|
||||||
properties[PROP_FPI_ENVIRON] =
|
properties[PROP_FPI_ENVIRON] =
|
||||||
g_param_spec_string ("fp-environ",
|
g_param_spec_string ("fp-environ",
|
||||||
"Virtual Environment",
|
"Virtual Environment",
|
||||||
|
@ -628,6 +639,22 @@ fp_device_get_name (FpDevice *device)
|
||||||
return priv->device_name;
|
return priv->device_name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* fp_device_is_open:
|
||||||
|
* @device: A #FpDevice
|
||||||
|
*
|
||||||
|
* Returns: Whether the device is open or not
|
||||||
|
*/
|
||||||
|
gboolean
|
||||||
|
fp_device_is_open (FpDevice *device)
|
||||||
|
{
|
||||||
|
FpDevicePrivate *priv = fp_device_get_instance_private (device);
|
||||||
|
|
||||||
|
g_return_val_if_fail (FP_IS_DEVICE (device), FALSE);
|
||||||
|
|
||||||
|
return priv->is_open;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* fp_device_get_scan_type:
|
* fp_device_get_scan_type:
|
||||||
* @device: A #FpDevice
|
* @device: A #FpDevice
|
||||||
|
@ -1959,7 +1986,10 @@ fpi_device_open_complete (FpDevice *device, GError *error)
|
||||||
clear_device_cancel_action (device);
|
clear_device_cancel_action (device);
|
||||||
|
|
||||||
if (!error)
|
if (!error)
|
||||||
|
{
|
||||||
priv->is_open = TRUE;
|
priv->is_open = TRUE;
|
||||||
|
g_object_notify_by_pspec (G_OBJECT (device), properties[PROP_OPEN]);
|
||||||
|
}
|
||||||
|
|
||||||
if (!error)
|
if (!error)
|
||||||
fp_device_return_task_in_idle (device, FP_DEVICE_TASK_RETURN_BOOL,
|
fp_device_return_task_in_idle (device, FP_DEVICE_TASK_RETURN_BOOL,
|
||||||
|
@ -1988,6 +2018,7 @@ fpi_device_close_complete (FpDevice *device, GError *error)
|
||||||
|
|
||||||
clear_device_cancel_action (device);
|
clear_device_cancel_action (device);
|
||||||
priv->is_open = FALSE;
|
priv->is_open = FALSE;
|
||||||
|
g_object_notify_by_pspec (G_OBJECT (device), properties[PROP_OPEN]);
|
||||||
|
|
||||||
switch (priv->type)
|
switch (priv->type)
|
||||||
{
|
{
|
||||||
|
|
|
@ -129,6 +129,7 @@ typedef void (*FpEnrollProgress) (FpDevice *device,
|
||||||
const gchar *fp_device_get_driver (FpDevice *device);
|
const gchar *fp_device_get_driver (FpDevice *device);
|
||||||
const gchar *fp_device_get_device_id (FpDevice *device);
|
const gchar *fp_device_get_device_id (FpDevice *device);
|
||||||
const gchar *fp_device_get_name (FpDevice *device);
|
const gchar *fp_device_get_name (FpDevice *device);
|
||||||
|
gboolean fp_device_is_open (FpDevice *device);
|
||||||
FpScanType fp_device_get_scan_type (FpDevice *device);
|
FpScanType fp_device_get_scan_type (FpDevice *device);
|
||||||
gint fp_device_get_nr_enroll_stages (FpDevice *device);
|
gint fp_device_get_nr_enroll_stages (FpDevice *device);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue