diff options
| author | Bastien Nocera <hadess@hadess.net> | 2013-10-28 14:37:09 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2013-10-28 15:15:02 +0100 |
| commit | 8018418a97b2777c94ca6b6d693a3d52ce2147c9 (patch) | |
| tree | c433be2889c513c43c4733c438be96bc5ce54ad1 | |
| parent | b7d69524e8b73a90e1ae488a749bdf26acdb8937 (diff) | |
linux: Switch CSR devices to use the new daemon poll
| -rw-r--r-- | src/linux/up-device-csr.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/linux/up-device-csr.c b/src/linux/up-device-csr.c index cf2f938..9425689 100644 --- a/src/linux/up-device-csr.c +++ b/src/linux/up-device-csr.c @@ -52,7 +52,6 @@ struct UpDeviceCsrPrivate { - guint poll_timer_id; gboolean is_dual; guint bus_num; guint dev_num; @@ -206,10 +205,7 @@ up_device_csr_coldplug (UpDevice *device) goto out; /* set up a poll */ - csr->priv->poll_timer_id = g_timeout_add_seconds (UP_DEVICE_CSR_REFRESH_TIMEOUT, - (GSourceFunc) up_device_csr_poll_cb, csr); - - g_source_set_name_by_id (csr->priv->poll_timer_id, "[upower] up_device_csr_poll_cb (linux)"); + up_daemon_start_poll (G_OBJECT (device), (GSourceFunc) up_device_csr_poll_cb); out: return ret; } @@ -321,8 +317,7 @@ up_device_csr_finalize (GObject *object) if (csr->priv->ctx != NULL) libusb_exit (csr->priv->ctx); - if (csr->priv->poll_timer_id > 0) - g_source_remove (csr->priv->poll_timer_id); + up_daemon_stop_poll (object); G_OBJECT_CLASS (up_device_csr_parent_class)->finalize (object); } |