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

manager: Fix sorting in GetDevices() output

Browse Source 
Sort the devices by ID for the GetDevices() output.
This commit is contained in:
Bastien Nocera
2015-02-03 16:55:48 +01:00
parent 56683b1098
commit 4edc17ac99
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/manager.c
View File

@ -159,15 +159,19 @@ static gboolean fprint_manager_get_devices(FprintManager *manager,
GPtrArray **devices, GError **error) GPtrArray **devices, GError **error)
{ {
FprintManagerPrivate *priv = FPRINT_MANAGER_GET_PRIVATE (manager); FprintManagerPrivate *priv = FPRINT_MANAGER_GET_PRIVATE (manager);
GSList *elem = priv->dev_registry; GSList *elem = g_slist_reverse(g_slist_copy(priv->dev_registry));
GSList *l;
int num_open = g_slist_length(elem); int num_open = g_slist_length(elem);
GPtrArray *devs = g_ptr_array_sized_new(num_open); GPtrArray *devs = g_ptr_array_sized_new(num_open);
if (num_open > 0) if (num_open > 0) {
do { for (l = elem; l != NULL; l = l->next) {
FprintDevice *rdev = elem->data; FprintDevice *rdev = l->data;
g_ptr_array_add(devs, get_device_path(rdev)); g_ptr_array_add(devs, get_device_path(rdev));
} while ((elem = g_slist_next(elem)) != NULL); }
}
g_slist_free(elem);
*devices = devs; *devices = devs;
return TRUE; return TRUE;
@ -181,7 +185,7 @@ static gboolean fprint_manager_get_default_device(FprintManager *manager,
int num_open = g_slist_length(elem); int num_open = g_slist_length(elem);
if (num_open > 0) { if (num_open > 0) {
*device = get_device_path (elem->data); *device = get_device_path (g_slist_last (elem)->data);
return TRUE; return TRUE;
} else { } else {
g_set_error (error, FPRINT_ERROR, FPRINT_ERROR_NO_SUCH_DEVICE, g_set_error (error, FPRINT_ERROR, FPRINT_ERROR_NO_SUCH_DEVICE,