D-Bus standard (1) doesn't allow hyphen in member names and interface names. Hyphen is allowed only in bus names.
(1) http://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names --- pam/pam_fprintd.c | 2 +- src/device.c | 4 ++-- src/device.xml | 4 ++-- tests/list.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pam/pam_fprintd.c b/pam/pam_fprintd.c index 5e8757c..0b398dd 100644 --- a/pam/pam_fprintd.c +++ b/pam/pam_fprintd.c @@ -276,7 +276,7 @@ static int do_verify(GMainLoop *loop, pam_handle_t *pamh, DBusGProxy *dev) dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props, G_TYPE_INVALID)) { const char *scan_type; data->driver = g_value_dup_string (g_hash_table_lookup (props, "name")); - scan_type = g_value_dup_string (g_hash_table_lookup (props, "scan-type")); + scan_type = g_value_dup_string (g_hash_table_lookup (props, "scan_type")); if (g_str_equal (scan_type, "swipe")) data->is_swipe = TRUE; g_hash_table_destroy (props); diff --git a/src/device.c b/src/device.c index e1127da..68b3fb1 100644 --- a/src/device.c +++ b/src/device.c @@ -240,13 +240,13 @@ static void fprint_device_class_init(FprintDeviceClass *klass) g_object_class_install_property(gobject_class, FPRINT_DEVICE_NAME, pspec); - pspec = g_param_spec_string("scan-type", "Scan Type", + pspec = g_param_spec_string("scan_type", "Scan Type", "The scan type of the device", "press", G_PARAM_READABLE); g_object_class_install_property(gobject_class, FPRINT_DEVICE_SCAN_TYPE, pspec); - pspec = g_param_spec_int("num-enroll-stages", "Number of enrollments stages", + pspec = g_param_spec_int("num_enroll_stages", "Number of enrollments stages", "Number of enrollment stages for the device.", -1, G_MAXINT, -1, G_PARAM_READABLE); g_object_class_install_property(gobject_class, diff --git a/src/device.xml b/src/device.xml index 99912ad..fa634f8 100644 --- a/src/device.xml +++ b/src/device.xml @@ -536,7 +536,7 @@ <!-- ************************************************************ --> - <property name="num-enroll-stages" type="i" access="read"> + <property name="num_enroll_stages" type="i" access="read"> <doc:doc> <doc:description> <doc:para> @@ -551,7 +551,7 @@ <!-- ************************************************************ --> - <property name="scan-type" type="s" access="read"> + <property name="scan_type" type="s" access="read"> <doc:doc> <doc:description> <doc:para> diff --git a/tests/list.c b/tests/list.c index 561b05a..69ce6d0 100644 --- a/tests/list.c +++ b/tests/list.c @@ -67,7 +67,7 @@ static void list_fingerprints(DBusGProxy *dev, const char *username) g_print("Fingerprints for user %s on %s (%s):\n", username, g_value_get_string (g_hash_table_lookup (props, "name")), - g_value_get_string (g_hash_table_lookup (props, "scan-type"))); + g_value_get_string (g_hash_table_lookup (props, "scan_type"))); g_hash_table_destroy (props); g_object_unref (p); -- 1.6.0.6 _______________________________________________ fprint mailing list [email protected] http://lists.reactivated.net/mailman/listinfo/fprint
