cookiez/pam-fprint-grosshack
1
0
Fork 0
mirror of https://gitlab.com/mishakmak/pam-fprint-grosshack.git synced 2026-04-09 04:13:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use GetDefaultDevice

Browse Source 
As we're not using the non-default device anyway.
This commit is contained in:
Bastien Nocera
2008-11-20 10:53:32 +00:00
committed by Daniel Drake
parent e207203b44
commit 5426b1a472
3 changed files with 12 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pam/pam_fprintd.c
View File

@ -187,25 +187,22 @@ static DBusGProxy *create_manager (DBusGConnection **ret_conn, GMainLoop **ret_l
static DBusGProxy *open_device(DBusGConnection *connection, DBusGProxy *manager, const char *username)
{
GError *error = NULL;
GPtrArray *devices;
gchar *path;
DBusGProxy *dev;
if (!dbus_g_proxy_call (manager, "GetDevices", &error,
G_TYPE_INVALID, dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH),
&devices, G_TYPE_INVALID)) {
D(g_message("list_devices failed: %s", error->message));
if (!dbus_g_proxy_call (manager, "GetDefaultDevice", &error,
G_TYPE_INVALID, DBUS_TYPE_G_OBJECT_PATH,
&path, G_TYPE_INVALID)) {
D(g_message("get_default_devices failed: %s", error->message));
g_error_free (error);
return NULL;
}
if (devices->len == 0) {
if (path == NULL) {
D(g_message("No devices found\n"));
return NULL;
}
D(g_message("found %d devices\n", devices->len));
path = g_ptr_array_index(devices, 0);
D(g_message("Using device %s\n", path));
dev = dbus_g_proxy_new_for_name(connection,
@ -213,8 +210,7 @@ static DBusGProxy *open_device(DBusGConnection *connection, DBusGProxy *manager,
path,
"net.reactivated.Fprint.Device");
g_ptr_array_foreach(devices, (GFunc) g_free, NULL);
g_ptr_array_free(devices, TRUE);
g_free (path);
if (!dbus_g_proxy_call (dev, "Claim", &error, G_TYPE_STRING, username, G_TYPE_INVALID, G_TYPE_INVALID)) {
D(g_message("failed to claim device: %s\n", error->message));