From cd74873cbd42ace6486b0e3f9ef78a7a2b0c79be Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 16 Oct 2009 15:09:51 +0100 Subject: Don't emit changed events from the DkpBackend layer, instead push then through DkpDevice --- src/dummy/dkp-backend.c | 18 +++++++++--------- src/linux/dkp-backend.c | 11 ----------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/src/dummy/dkp-backend.c b/src/dummy/dkp-backend.c index 1ffd508..06d4890 100644 --- a/src/dummy/dkp-backend.c +++ b/src/dummy/dkp-backend.c @@ -50,7 +50,6 @@ struct DkpBackendPrivate enum { SIGNAL_DEVICE_ADDED, - SIGNAL_DEVICE_CHANGED, SIGNAL_DEVICE_REMOVED, SIGNAL_LAST }; @@ -65,8 +64,15 @@ G_DEFINE_TYPE (DkpBackend, dkp_backend, G_TYPE_OBJECT) static gboolean dkp_backend_changed_time_cb (DkpBackend *backend) { - /* emit */ - g_signal_emit (backend, signals[SIGNAL_DEVICE_CHANGED], 0, backend->priv->native, backend->priv->device); + DkpDevice *device; + GTimeVal timeval; + + //FIXME! + device = NULL; + + /* reset time */ + g_get_current_time (&timeval); + g_object_set (device, "update-time", (guint64) timeval.tv_sec, NULL); return TRUE; } @@ -132,12 +138,6 @@ dkp_backend_class_init (DkpBackendClass *klass) G_STRUCT_OFFSET (DkpBackendClass, device_added), NULL, NULL, dkp_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); - signals [SIGNAL_DEVICE_CHANGED] = - g_signal_new ("device-changed", - G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (DkpBackendClass, device_changed), - NULL, NULL, dkp_marshal_VOID__POINTER_POINTER, - G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); signals [SIGNAL_DEVICE_REMOVED] = g_signal_new ("device-removed", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, diff --git a/src/linux/dkp-backend.c b/src/linux/dkp-backend.c index e5c630a..a14ca9a 100644 --- a/src/linux/dkp-backend.c +++ b/src/linux/dkp-backend.c @@ -57,7 +57,6 @@ struct DkpBackendPrivate enum { SIGNAL_DEVICE_ADDED, - SIGNAL_DEVICE_CHANGED, SIGNAL_DEVICE_REMOVED, SIGNAL_LAST }; @@ -179,10 +178,6 @@ dkp_backend_device_changed (DkpBackend *backend, GUdevDevice *native) egg_debug ("no changes on %s", dkp_device_get_object_path (device)); goto out; } - - /* emit */ - egg_debug ("emitting changed %s", dkp_device_get_object_path (device)); - g_signal_emit (backend, signals[SIGNAL_DEVICE_CHANGED], 0, native, device); out: if (object != NULL) g_object_unref (object); @@ -328,12 +323,6 @@ dkp_backend_class_init (DkpBackendClass *klass) G_STRUCT_OFFSET (DkpBackendClass, device_added), NULL, NULL, dkp_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); - signals [SIGNAL_DEVICE_CHANGED] = - g_signal_new ("device-changed", - G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (DkpBackendClass, device_changed), - NULL, NULL, dkp_marshal_VOID__POINTER_POINTER, - G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); signals [SIGNAL_DEVICE_REMOVED] = g_signal_new ("device-removed", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, -- cgit v1.2.3