libcolord: Fix a hard-to-reproduce bug when cancelling async operations

4 files changed, 32 insertions, 32 deletions

diff --git a/lib/colord/cd-client.c b/lib/colord/cd-client.c
index 3210db9..1ec7964 100644
--- a/lib/colord/cd-client.c
+++ b/lib/colord/cd-client.c
@@ -394,16 +394,16 @@ cd_client_connect_cb (GObject *source_object,
 	}
 
 	/* get signals from DBus */
-	g_signal_connect (priv->proxy,
-			  "g-signal",
-			  G_CALLBACK (cd_client_dbus_signal_cb),
-			  client);
+	g_signal_connect_object (priv->proxy,
+				 "g-signal",
+				 G_CALLBACK (cd_client_dbus_signal_cb),
+				 client, 0);
 
 	/* watch to see if it's fallen off the bus */
-	g_signal_connect (priv->proxy,
-			 "notify::g-name-owner",
-			 G_CALLBACK (cd_client_owner_notify_cb),
-			 client);
+	g_signal_connect_object (priv->proxy,
+				 "notify::g-name-owner",
+				 G_CALLBACK (cd_client_owner_notify_cb),
+				 client, 0);
 
 	/* success */
 	g_task_return_boolean (task, TRUE);
diff --git a/lib/colord/cd-device.c b/lib/colord/cd-device.c
index 3e7ec67..f1cae0f 100644
--- a/lib/colord/cd-device.c
+++ b/lib/colord/cd-device.c
@@ -891,16 +891,16 @@ cd_device_connect_cb (GObject *source_object,
 		cd_device_set_metadata_from_variant (device, metadata);
 
 	/* get signals from DBus */
-	g_signal_connect (priv->proxy,
-			  "g-signal",
-			  G_CALLBACK (cd_device_dbus_signal_cb),
-			  device);
+	g_signal_connect_object (priv->proxy,
+				 "g-signal",
+				 G_CALLBACK (cd_device_dbus_signal_cb),
+				 device, 0);
 
 	/* watch if any remote properties change */
-	g_signal_connect (priv->proxy,
-			  "g-properties-changed",
-			  G_CALLBACK (cd_device_dbus_properties_changed_cb),
-			  device);
+	g_signal_connect_object (priv->proxy,
+				 "g-properties-changed",
+				 G_CALLBACK (cd_device_dbus_properties_changed_cb),
+				 device, 0);
 
 	/* success */
 	g_task_return_boolean (task, TRUE);
diff --git a/lib/colord/cd-profile.c b/lib/colord/cd-profile.c
index dcc26fa..d5762a4 100644
--- a/lib/colord/cd-profile.c
+++ b/lib/colord/cd-profile.c
@@ -779,16 +779,16 @@ cd_profile_connect_cb (GObject *source_object,
 		cd_profile_set_metadata_from_variant (profile, metadata);
 
 	/* get signals from DBus */
-	g_signal_connect (priv->proxy,
-			  "g-signal",
-			  G_CALLBACK (cd_profile_dbus_signal_cb),
-			  profile);
+	g_signal_connect_object (priv->proxy,
+				 "g-signal",
+				 G_CALLBACK (cd_profile_dbus_signal_cb),
+				 profile, 0);
 
 	/* watch if any remote properties change */
-	g_signal_connect (priv->proxy,
-			  "g-properties-changed",
-			  G_CALLBACK (cd_profile_dbus_properties_changed_cb),
-			  profile);
+	g_signal_connect_object (priv->proxy,
+				 "g-properties-changed",
+				 G_CALLBACK (cd_profile_dbus_properties_changed_cb),
+				 profile, 0);
 
 	/* success */
 	g_task_return_boolean (task, TRUE);
diff --git a/lib/colord/cd-sensor.c b/lib/colord/cd-sensor.c
index 729054c..21b6729 100644
--- a/lib/colord/cd-sensor.c
+++ b/lib/colord/cd-sensor.c
@@ -616,16 +616,16 @@ cd_sensor_connect_cb (GObject *source_object,
 		cd_sensor_set_metadata_from_variant (sensor, metadata);
 
 	/* get signals from DBus */
-	g_signal_connect (priv->proxy,
-			  "g-signal",
-			  G_CALLBACK (cd_sensor_dbus_signal_cb),
-			  sensor);
+	g_signal_connect_object (priv->proxy,
+				 "g-signal",
+				 G_CALLBACK (cd_sensor_dbus_signal_cb),
+				 sensor, 0);
 
 	/* watch if any remote properties change */
-	g_signal_connect (priv->proxy,
-			  "g-properties-changed",
-			  G_CALLBACK (cd_sensor_dbus_properties_changed_cb),
-			  sensor);
+	g_signal_connect_object (priv->proxy,
+				 "g-properties-changed",
+				 G_CALLBACK (cd_sensor_dbus_properties_changed_cb),
+				 sensor, 0);
 
 	/* we're done */
 	g_task_return_boolean (task, TRUE);