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

Fix "--no-timeout" argument

Browse Source 
Fix logic error in the manager code causing it to exit when no
devices are in use even when --no-timeout is passed.
This commit is contained in:
Bastien Nocera
2008-11-21 22:56:49 +00:00
committed by Daniel Drake
parent dfa539a1f8
commit f1f2ae35f8
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/manager.c
View File

@ -95,10 +95,12 @@ fprint_manager_in_use_notified (FprintDevice *rdev, GParamSpec *spec, FprintMana
GSList *l; GSList *l;
gboolean in_use; gboolean in_use;
if (priv->timeout_id > 0) { if (priv->timeout_id > 0 || !priv->no_timeout) {
g_source_remove (priv->timeout_id); g_source_remove (priv->timeout_id);
priv->timeout_id = 0; priv->timeout_id = 0;
} }
if (!priv->no_timeout)
return;
for (l = priv->dev_registry; l != NULL; l = l->next) { for (l = priv->dev_registry; l != NULL; l = l->next) {
FprintDevice *dev = l->data; FprintDevice *dev = l->data;
@ -142,9 +144,6 @@ fprint_manager_init (FprintManager *manager)
G_OBJECT(rdev)); G_OBJECT(rdev));
g_free(path); g_free(path);
} }
if (!priv->no_timeout)
priv->timeout_id = g_timeout_add_seconds (TIMEOUT, (GSourceFunc) fprint_manager_timeout_cb, manager);
} }
FprintManager *fprint_manager_new(gboolean no_timeout) FprintManager *fprint_manager_new(gboolean no_timeout)
@ -156,6 +155,9 @@ FprintManager *fprint_manager_new(gboolean no_timeout)
priv = FPRINT_MANAGER_GET_PRIVATE (object); priv = FPRINT_MANAGER_GET_PRIVATE (object);
priv->no_timeout = no_timeout; priv->no_timeout = no_timeout;
if (!priv->no_timeout)
priv->timeout_id = g_timeout_add_seconds (TIMEOUT, (GSourceFunc) fprint_manager_timeout_cb, object);
return FPRINT_MANAGER (object); return FPRINT_MANAGER (object);
} }