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.

4 files changed, 2 insertions, 84 deletions

diff --git a/src/org.freedesktop.UPower.Device.xml b/src/org.freedesktop.UPower.Device.xml
index d825c4b..8ce9c15 100644
--- a/src/org.freedesktop.UPower.Device.xml
+++ b/src/org.freedesktop.UPower.Device.xml
@@ -154,17 +154,6 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
     </method>
 
     <!-- ************************************************************ -->
-    <signal name="Changed">
-      <doc:doc>
-        <doc:description>
-          <doc:para>
-            Some value on the power source changed.
-          </doc:para>
-        </doc:description>
-      </doc:doc>
-    </signal>
-
-    <!-- ************************************************************ -->
     <method name="GetHistory">
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="type" direction="in" type="s">
diff --git a/src/org.freedesktop.UPower.xml b/src/org.freedesktop.UPower.xml
index 294d3fd..141cbac 100644
--- a/src/org.freedesktop.UPower.xml
+++ b/src/org.freedesktop.UPower.xml
@@ -166,34 +166,6 @@ method return sender=:1.386 -> dest=:1.451 reply_serial=2
 
     <!-- ************************************************************ -->
 
-    <signal name="DeviceChanged">
-      <arg name="device" type="o">
-        <doc:doc><doc:summary>Object path of device that was changed.</doc:summary></doc:doc>
-      </arg>
-
-      <doc:doc>
-        <doc:description>
-          <doc:para>
-            Emitted when a device changed.
-          </doc:para>
-        </doc:description>
-      </doc:doc>
-    </signal>
-
-    <!-- ************************************************************ -->
-
-    <signal name="Changed">
-      <doc:doc>
-        <doc:description>
-          <doc:para>
-            Emitted when one or more properties on the object changes.
-          </doc:para>
-        </doc:description>
-      </doc:doc>
-    </signal>
-
-    <!-- ************************************************************ -->
-
     <property name="DaemonVersion" type="s" access="read">
       <doc:doc><doc:description><doc:para>
             Version of the running daemon, e.g. <doc:tt>002</doc:tt>.
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",
diff --git a/src/up-device.c b/src/up-device.c
index 746e9b8..be141f8 100644
--- a/src/up-device.c
+++ b/src/up-device.c
@@ -119,13 +119,6 @@ enum {
 	PROP_LAST
 };
 
-enum {
-	SIGNAL_CHANGED,
-	SIGNAL_LAST,
-};
-
-static guint signals[SIGNAL_LAST] = { 0 };
-
 G_DEFINE_TYPE (UpDevice, up_device, G_TYPE_OBJECT)
 #define UP_DEVICE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), UP_TYPE_DEVICE, UpDevicePrivate))
 #define UP_DBUS_STRUCT_UINT_DOUBLE_UINT (dbus_g_type_get_struct ("GValueArray", \
@@ -1005,11 +998,6 @@ up_device_perhaps_changed_cb (GObject *object, GParamSpec *pspec, UpDevice *devi
 	up_history_set_rate_data (device->priv->history, device->priv->energy_rate);
 	up_history_set_time_full_data (device->priv->history, device->priv->time_to_full);
 	up_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 */
-	g_debug ("emitting changed on %s", device->priv->native_path);
-	g_signal_emit (device, signals[SIGNAL_CHANGED], 0);
 }
 
 /**
@@ -1071,14 +1059,6 @@ up_device_class_init (UpDeviceClass *klass)
 
 	g_type_class_add_private (klass, sizeof (UpDevicePrivate));
 
-	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);
-
 	dbus_g_object_type_install_info (UP_TYPE_DEVICE, &dbus_glib_up_device_object_info);
 
 	/**