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

Connect to the device changed signal rather than the backend changed signal so we get the event for all refreshed data

Browse source
This commit is contained in:
Richard Hughes 2009-10-16 15:30:38 +01:00
parent cd74873cbd
commit f4229cce74
2 changed files with 56 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
src/dkp-daemon.c
View file

@ -698,40 +698,11 @@ dkp_daemon_get_device_list (DkpDaemon *daemon)
return g_object_ref (daemon->priv->power_devices);
}
/**
* dkp_daemon_device_added_cb:
**/
static void
dkp_daemon_device_added_cb (DkpBackend *backend, GObject *native, DkpDevice *device, DkpDaemon *daemon)
{
const gchar *object_path;
g_return_if_fail (DKP_IS_DAEMON (daemon));
g_return_if_fail (DKP_IS_DEVICE (device));
g_return_if_fail (G_IS_OBJECT (native));
/* add to device list */
dkp_device_list_insert (daemon->priv->power_devices, native, G_OBJECT (device));
/* emit */
if (!daemon->priv->during_coldplug) {
object_path = dkp_device_get_object_path (device);
egg_debug ("emitting added: %s (during coldplug %i)", object_path, daemon->priv->during_coldplug);
/* don't crash the session */
if (object_path == NULL) {
egg_warning ("INTERNAL STATE CORRUPT: not sending NULL, native:%p, device:%p", native, device);
return;
}
g_signal_emit (daemon, signals[SIGNAL_DEVICE_ADDED], 0, object_path);
}
}
/**
* dkp_daemon_device_changed_cb:
**/
static void
dkp_daemon_device_changed_cb (DkpBackend *backend, GObject *native, DkpDevice *device, DkpDaemon *daemon)
dkp_daemon_device_changed_cb (DkpDevice *device, DkpDaemon *daemon)
{
const gchar *object_path;
DkpDeviceType type;
@ -739,7 +710,6 @@ dkp_daemon_device_changed_cb (DkpBackend *backend, GObject *native, DkpDevice *d
g_return_if_fail (DKP_IS_DAEMON (daemon));
g_return_if_fail (DKP_IS_DEVICE (device));
g_return_if_fail (G_IS_OBJECT (native));
/* refresh battery devices when AC state changes */
g_object_get (device,
@ -772,19 +742,63 @@ dkp_daemon_device_changed_cb (DkpBackend *backend, GObject *native, DkpDevice *d
/* don't crash the session */
if (object_path == NULL) {
egg_warning ("INTERNAL STATE CORRUPT: not sending NULL, native:%p, device:%p", native, device);
egg_warning ("INTERNAL STATE CORRUPT: not sending NULL, device:%p", device);
return;
}
g_signal_emit (daemon, signals[SIGNAL_DEVICE_CHANGED], 0, object_path);
}
}
/**
* dkp_daemon_device_added_cb:
**/
static void
dkp_daemon_device_added_cb (DkpBackend *backend, GObject *native, DkpDevice *device, DkpDaemon *daemon)
{
DkpDeviceType type;
const gchar *object_path;
g_return_if_fail (DKP_IS_DAEMON (daemon));
g_return_if_fail (DKP_IS_DEVICE (device));
g_return_if_fail (G_IS_OBJECT (native));
/* add to device list */
dkp_device_list_insert (daemon->priv->power_devices, native, G_OBJECT (device));
/* connect, so we get changes */
g_signal_connect (device, "changed",
G_CALLBACK (dkp_daemon_device_changed_cb), daemon);
/* refresh after a short delay */
g_object_get (device,
"type", &type,
NULL);
if (type == DKP_DEVICE_TYPE_BATTERY) {
g_timeout_add_seconds (DKP_DAEMON_ON_BATTERY_REFRESH_DEVICES_DELAY,
(GSourceFunc) dkp_daemon_refresh_battery_devices_cb, daemon);
}
/* emit */
if (!daemon->priv->during_coldplug) {
object_path = dkp_device_get_object_path (device);
egg_debug ("emitting added: %s (during coldplug %i)", object_path, daemon->priv->during_coldplug);
/* don't crash the session */
if (object_path == NULL) {
egg_warning ("INTERNAL STATE CORRUPT: not sending NULL, native:%p, device:%p", native, device);
return;
}
g_signal_emit (daemon, signals[SIGNAL_DEVICE_ADDED], 0, object_path);
}
}
/**
* dkp_daemon_device_removed_cb:
**/
static void
dkp_daemon_device_removed_cb (DkpBackend *backend, GObject *native, DkpDevice *device, DkpDaemon *daemon)
{
DkpDeviceType type;
const gchar *object_path;
g_return_if_fail (DKP_IS_DAEMON (daemon));
@ -794,6 +808,15 @@ dkp_daemon_device_removed_cb (DkpBackend *backend, GObject *native, DkpDevice *d
/* remove from list */
dkp_device_list_remove (daemon->priv->power_devices, G_OBJECT(device));
/* refresh after a short delay */
g_object_get (device,
"type", &type,
NULL);
if (type == DKP_DEVICE_TYPE_BATTERY) {
g_timeout_add_seconds (DKP_DAEMON_ON_BATTERY_REFRESH_DEVICES_DELAY,
(GSourceFunc) dkp_daemon_refresh_battery_devices_cb, daemon);
}
/* emit */
if (!daemon->priv->during_coldplug) {
object_path = dkp_device_get_object_path (device);
@ -850,8 +873,6 @@ dkp_daemon_init (DkpDaemon *daemon)
daemon->priv->backend = dkp_backend_new ();
g_signal_connect (daemon->priv->backend, "device-added",
G_CALLBACK (dkp_daemon_device_added_cb), daemon);
g_signal_connect (daemon->priv->backend, "device-changed",
G_CALLBACK (dkp_daemon_device_changed_cb), daemon);
g_signal_connect (daemon->priv->backend, "device-removed",
G_CALLBACK (dkp_daemon_device_removed_cb), daemon);

8
src/dkp-device.c
View file

@ -860,15 +860,9 @@ dkp_device_perhaps_changed_cb (GObject *object, GParamSpec *pspec, DkpDevice *de
dkp_history_set_time_empty_data (device->priv->history, device->priv->time_to_empty);
/* The order here matters; we want Device::Changed() before
* the DeviceChanged() signal on the main object; otherwise
* clients that only listens on DeviceChanged() won't be
* fully caught up...
*/
* the DeviceChanged() signal on the main object */
egg_debug ("emitting changed on %s", device->priv->native_path);
g_signal_emit (device, signals[SIGNAL_CHANGED], 0);
egg_debug ("emitting device-changed on %s", device->priv->native_path);
g_signal_emit_by_name (device->priv->daemon, "device-changed",
device->priv->object_path, NULL);
}
/**