fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2026-04-23 02:50:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't emit changed events from the DkpBackend layer, instead push then through DkpDevice

Browse source
This commit is contained in:
Richard Hughes 2009-10-16 15:09:51 +01:00
parent 4da34c1ef5
commit cd74873cbd
2 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/dummy/dkp-backend.c
View file

@ -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,

11
src/linux/dkp-backend.c
View file

@ -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,