trivial: use g_set_error() in more places

3 files changed, 17 insertions, 33 deletions

diff --git a/devkit-power-gobject/dkp-client.c b/devkit-power-gobject/dkp-client.c
index 966678b..7b1e783 100644
--- a/devkit-power-gobject/dkp-client.c
+++ b/devkit-power-gobject/dkp-client.c
@@ -138,8 +138,7 @@ dkp_client_enumerate_devices_private (DkpClient *client, GError **error)
 				 G_TYPE_INVALID);
 	if (!ret) {
 		g_warning ("Couldn't enumerate devices: %s", error_local->message);
-		if (error != NULL)
-			*error = g_error_new (1, 0, "%s", error_local->message);
+		g_set_error (error, 1, 0, "%s", error_local->message);
 		g_error_free (error_local);
 	}
 	return devices;
@@ -178,8 +177,7 @@ dkp_client_suspend (DkpClient *client, GError **error)
 
 		/* an actual error */
 		g_warning ("Couldn't suspend: %s", error_local->message);
-		if (error != NULL)
-			*error = g_error_new (1, 0, "%s", error_local->message);
+		g_set_error (error, 1, 0, "%s", error_local->message);
 	}
 out:
 	if (error_local != NULL)
@@ -218,8 +216,7 @@ dkp_client_hibernate (DkpClient *client, GError **error)
 
 		/* an actual error */
 		g_warning ("Couldn't hibernate: %s", error_local->message);
-		if (error != NULL)
-			*error = g_error_new (1, 0, "%s", error_local->message);
+		g_set_error (error, 1, 0, "%s", error_local->message);
 	}
 out:
 	if (error_local != NULL)
diff --git a/devkit-power-gobject/dkp-device.c b/devkit-power-gobject/dkp-device.c
index e59b413..debf90f 100644
--- a/devkit-power-gobject/dkp-device.c
+++ b/devkit-power-gobject/dkp-device.c
@@ -132,8 +132,7 @@ dkp_device_get_device_properties (DkpDevice *device, GError **error)
 				 &hash_table,
 				 G_TYPE_INVALID);
 	if (!ret) {
-		if (error != NULL)
-			*error = g_error_new (1, 0, "Couldn't call GetAll() to get properties for %s: %s", device->priv->object_path, error_local->message);
+		g_set_error (error, 1, 0, "Couldn't call GetAll() to get properties for %s: %s", device->priv->object_path, error_local->message);
 		g_error_free (error_local);
 		goto out;
 	}
@@ -224,8 +223,7 @@ dkp_device_refresh_internal (DkpDevice *device, GError **error)
 	/* get all the properties */
 	hash = dkp_device_get_device_properties (device, &error_local);
 	if (hash == NULL) {
-		if (error != NULL)
-			*error = g_error_new (1, 0, "Cannot get device properties for %s: %s", device->priv->object_path, error_local->message);
+		g_set_error (error, 1, 0, "Cannot get device properties for %s: %s", device->priv->object_path, error_local->message);
 		g_error_free (error_local);
 		return FALSE;
 	}
@@ -266,8 +264,7 @@ dkp_device_set_object_path (DkpDevice *device, const gchar *object_path, GError
 	/* connect to the bus */
 	device->priv->bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error_local);
 	if (device->priv->bus == NULL) {
-		if (error != NULL)
-			*error = g_error_new (1, 0, "Couldn't connect to system bus: %s", error_local->message);
+		g_set_error (error, 1, 0, "Couldn't connect to system bus: %s", error_local->message);
 		g_error_free (error_local);
 		goto out;
 	}
@@ -276,8 +273,7 @@ dkp_device_set_object_path (DkpDevice *device, const gchar *object_path, GError
 	proxy_props = dbus_g_proxy_new_for_name (device->priv->bus, "org.freedesktop.DeviceKit.Power",
 						 object_path, "org.freedesktop.DBus.Properties");
 	if (proxy_props == NULL) {
-		if (error != NULL)
-			*error = g_error_new (1, 0, "Couldn't connect to proxy");
+		g_set_error_literal (error, 1, 0, "Couldn't connect to proxy");
 		goto out;
 	}
 
@@ -285,8 +281,7 @@ dkp_device_set_object_path (DkpDevice *device, const gchar *object_path, GError
 	proxy_device = dbus_g_proxy_new_for_name (device->priv->bus, "org.freedesktop.DeviceKit.Power",
 						  object_path, "org.freedesktop.DeviceKit.Power.Device");
 	if (proxy_device == NULL) {
-		if (error != NULL)
-			*error = g_error_new (1, 0, "Couldn't connect to proxy");
+		g_set_error_literal (error, 1, 0, "Couldn't connect to proxy");
 		goto out;
 	}
 
@@ -303,8 +298,7 @@ dkp_device_set_object_path (DkpDevice *device, const gchar *object_path, GError
 	/* coldplug */
 	ret = dkp_device_refresh_internal (device, &error_local);
 	if (!ret) {
-		if (error != NULL)
-			*error = g_error_new (1, 0, "cannot refresh: %s", error_local->message);
+		g_set_error (error, 1, 0, "cannot refresh: %s", error_local->message);
 		g_error_free (error_local);
 	}
 out:
@@ -500,8 +494,7 @@ dkp_device_refresh (DkpDevice *device, GError **error)
 	ret = dbus_g_proxy_call (device->priv->proxy_device, "Refresh", &error_local,
 				 G_TYPE_INVALID, G_TYPE_INVALID);
 	if (!ret) {
-		if (error != NULL)
-			*error = g_error_new (1, 0, "Refresh() on %s failed: %s", device->priv->object_path, error_local->message);
+		g_set_error (error, 1, 0, "Refresh() on %s failed: %s", device->priv->object_path, error_local->message);
 		g_error_free (error_local);
 		goto out;
 	}
@@ -546,8 +539,7 @@ dkp_device_get_history (const DkpDevice *device, const gchar *type, guint timesp
 				 g_type_gvalue_array, &gvalue_ptr_array,
 				 G_TYPE_INVALID);
 	if (!ret) {
-		if (error != NULL)
-			*error = g_error_new (1, 0, "GetHistory(%s,%i) on %s failed: %s", type, timespec,
+		g_set_error (error, 1, 0, "GetHistory(%s,%i) on %s failed: %s", type, timespec,
 			   device->priv->object_path, error_local->message);
 		g_error_free (error_local);
 		goto out;
@@ -555,8 +547,7 @@ dkp_device_get_history (const DkpDevice *device, const gchar *type, guint timesp
 
 	/* no data */
 	if (gvalue_ptr_array->len == 0) {
-		if (error != NULL)
-			*error = g_error_new (1, 0, "no data");
+		g_set_error_literal (error, 1, 0, "no data");
 		goto out;
 	}
 
@@ -622,17 +613,15 @@ dkp_device_get_statistics (const DkpDevice *device, const gchar *type, GError **
 				 g_type_gvalue_array, &gvalue_ptr_array,
 				 G_TYPE_INVALID);
 	if (!ret) {
-		if (error != NULL)
-			*error = g_error_new (1, 0, "GetStatistics(%s) on %s failed: %s", type,
-					      device->priv->object_path, error_local->message);
+		g_set_error (error, 1, 0, "GetStatistics(%s) on %s failed: %s", type,
+				      device->priv->object_path, error_local->message);
 		g_error_free (error_local);
 		goto out;
 	}
 
 	/* no data */
 	if (gvalue_ptr_array->len == 0) {
-		if (error != NULL)
-			*error = g_error_new (1, 0, "no data");
+		g_set_error_literal (error, 1, 0, "no data");
 		goto out;
 	}
 
diff --git a/devkit-power-gobject/dkp-wakeups.c b/devkit-power-gobject/dkp-wakeups.c
index 1bd9f23..679520b 100644
--- a/devkit-power-gobject/dkp-wakeups.c
+++ b/devkit-power-gobject/dkp-wakeups.c
@@ -72,8 +72,7 @@ dkp_wakeups_get_total (DkpWakeups *wakeups, GError **error)
 				 G_TYPE_INVALID);
 	if (!ret) {
 		g_warning ("Couldn't get total: %s", error_local->message);
-		if (error != NULL)
-			*error = g_error_new (1, 0, "%s", error_local->message);
+		g_set_error (error, 1, 0, "%s", error_local->message);
 		g_error_free (error_local);
 	}
 	return total;
@@ -116,8 +115,7 @@ dkp_wakeups_get_data (DkpWakeups *wakeups, GError **error)
 				 G_TYPE_INVALID);
 	if (!ret) {
 		g_warning ("GetData on failed: %s", error_local->message);
-		if (error != NULL)
-			*error = g_error_new (1, 0, "%s", error_local->message);
+		g_set_error (error, 1, 0, "%s", error_local->message);
 		g_error_free (error_local);
 		goto out;
 	}