diff options
| author | Bastien Nocera <hadess@hadess.net> | 2013-10-17 12:40:41 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2013-10-17 14:25:25 +0200 |
| commit | 0010e9325110e5a70a0d2381c84f88e7fb044ce4 (patch) | |
| tree | ffd6d04397da8d8dea883b43a95e21e5d5a4ad2b /src/up-daemon.c | |
| parent | 8453da5014e6750ff2cdffcaa3a89dd616ca7434 (diff) | |
| download | upower-0010e9325110e5a70a0d2381c84f88e7fb044ce4.tar.gz | |
all: Remove *changed signals
Now that we send out PropertiesChanged signals (on the daemon side)
and "notify" signals (on the client side), there's no need for the
all encompassing DeviceChanged and Changed signals.
They would have woken up any client, even if they were not interested
in receiving the signals.
Diffstat (limited to 'src/up-daemon.c')
| -rw-r--r-- | src/up-daemon.c | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/src/up-daemon.c b/src/up-daemon.c index 2edbbdc..1528ee2 100644 --- a/src/up-daemon.c +++ b/src/up-daemon.c @@ -57,8 +57,6 @@ enum { SIGNAL_DEVICE_ADDED, SIGNAL_DEVICE_REMOVED, - SIGNAL_DEVICE_CHANGED, - SIGNAL_CHANGED, SIGNAL_LAST, }; @@ -642,10 +640,6 @@ changed_props_idle_cb (gpointer user_data) { UpDaemon *daemon = user_data; - /* GObject */ - g_debug ("emitting changed"); - g_signal_emit (daemon, signals[SIGNAL_CHANGED], 0); - /* D-Bus */ up_daemon_emit_properties_changed (daemon->priv->connection, "/org/freedesktop/UPower", @@ -889,7 +883,7 @@ up_daemon_poll_battery_devices_for_a_little_bit (UpDaemon *daemon) * up_daemon_device_changed_cb: **/ static void -up_daemon_device_changed_cb (UpDevice *device, UpDaemon *daemon) +up_daemon_device_changed_cb (UpDevice *device, GParamSpec *pspec, UpDaemon *daemon) { const gchar *object_path; UpDeviceKind type; @@ -928,7 +922,6 @@ up_daemon_device_changed_cb (UpDevice *device, UpDaemon *daemon) g_warning ("INTERNAL STATE CORRUPT: not sending NULL, device:%p", device); return; } - g_signal_emit (daemon, signals[SIGNAL_DEVICE_CHANGED], 0, object_path); } /** @@ -949,7 +942,7 @@ up_daemon_device_added_cb (UpBackend *backend, GObject *native, UpDevice *device up_device_list_insert (priv->power_devices, native, G_OBJECT (device)); /* connect, so we get changes */ - g_signal_connect (device, "changed", + g_signal_connect (device, "notify", G_CALLBACK (up_daemon_device_changed_cb), daemon); /* refresh after a short delay */ @@ -1169,22 +1162,6 @@ up_daemon_class_init (UpDaemonClass *klass) g_cclosure_marshal_generic, G_TYPE_NONE, 1, DBUS_TYPE_G_OBJECT_PATH); - signals[SIGNAL_DEVICE_CHANGED] = - g_signal_new ("device-changed", - G_OBJECT_CLASS_TYPE (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, - 0, NULL, NULL, - g_cclosure_marshal_generic, - G_TYPE_NONE, 1, DBUS_TYPE_G_OBJECT_PATH); - - signals[SIGNAL_CHANGED] = - g_signal_new ("changed", - G_OBJECT_CLASS_TYPE (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, - 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - g_object_class_install_property (object_class, PROP_DAEMON_VERSION, g_param_spec_string ("daemon-version", |