Fix possible warning when timeout is enabled

We'd get a warning when the first device starts being used, but
we don't use --no-timeout.
This commit is contained in:
Bastien Nocera
2008-11-22 00:27:45 +00:00
committed by Daniel Drake
parent 2b71776124
commit af42ec70f3

View File

@ -95,7 +95,7 @@ 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 || !priv->no_timeout) { if (priv->timeout_id > 0) {
g_source_remove (priv->timeout_id); g_source_remove (priv->timeout_id);
priv->timeout_id = 0; priv->timeout_id = 0;
} }
@ -110,7 +110,7 @@ fprint_manager_in_use_notified (FprintDevice *rdev, GParamSpec *spec, FprintMana
num_devices_used++; num_devices_used++;
} }
if (num_devices_used == 0 && !priv->no_timeout) if (num_devices_used == 0)
priv->timeout_id = g_timeout_add_seconds (TIMEOUT, (GSourceFunc) fprint_manager_timeout_cb, manager); priv->timeout_id = g_timeout_add_seconds (TIMEOUT, (GSourceFunc) fprint_manager_timeout_cb, manager);
} }