Fix re-acquisition of sensor proxy for restarts, log failures

Author: mtwebster

plugins/power/csd-power-manager.c

@@ -3875,8 +3875,11 @@ iio_proxy_changed (CsdPowerManager *manager)
                 gdouble current_brightness;
 
                 current_brightness = (gdouble) backlight_get_percentage (manager, NULL);
-                if (current_brightness < 0.0)
+                if (current_brightness < 0.0) {
+                        g_warning ("Could not read current backlight level for ambient baseline, "
+                                   "defaulting to 50%%");
                         current_brightness = 50.0;
+                }
 
                 g_debug ("First sensor reading %f, adopting current brightness %.1f%% as baseline",
                          sensor_value, current_brightness);
@@ -4059,6 +4062,8 @@ iio_proxy_appeared_cb (GDBusConnection *connection,
                        gpointer user_data)
 {
         CsdPowerManager *manager = CSD_POWER_MANAGER (user_data);
+        GError *error = NULL;
+
         manager->priv->iio_proxy =
                 g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
                                                0,
@@ -4067,7 +4072,14 @@ iio_proxy_appeared_cb (GDBusConnection *connection,
                                                "/net/hadess/SensorProxy",
                                                "net.hadess.SensorProxy",
                                                NULL,
-                                               NULL);
+                                               &error);
+        if (manager->priv->iio_proxy == NULL) {
+                g_warning ("Failed to create iio-sensor-proxy D-Bus proxy: %s",
+                           error->message);
+                g_error_free (error);
+                return;
+        }
+
         iio_proxy_update_ambient_light_supported (manager);
         iio_proxy_maybe_claim_light (manager);
 }
@@ -4078,6 +4090,13 @@ iio_proxy_vanished_cb (GDBusConnection *connection,
                        gpointer user_data)
 {
         CsdPowerManager *manager = CSD_POWER_MANAGER (user_data);
+
+        ambient_cancel_timers (manager);
+        manager->priv->ambient_state = AMBIENT_STATE_IDLE;
+        manager->priv->ambient_baseline_sensor = -1.0;
+        manager->priv->ambient_brightness_baseline = -1.0;
+        manager->priv->light_claimed = FALSE;
+
         g_clear_object (&manager->priv->iio_proxy);
         iio_proxy_update_ambient_light_supported (manager);
 }
@@ -4649,15 +4668,15 @@ csd_power_manager_stop (CsdPowerManager *manager)
 {
         g_debug ("Stopping power manager");
 
+        iio_proxy_claim_light (manager, FALSE);
+
         if (manager->priv->bus_cancellable != NULL) {
                 g_cancellable_cancel (manager->priv->bus_cancellable);
                 g_object_unref (manager->priv->bus_cancellable);
                 manager->priv->bus_cancellable = NULL;
         }
 
         kill_lid_close_safety_timer (manager);
-
-        iio_proxy_claim_light (manager, FALSE);
         ambient_cancel_timers (manager);
         if (manager->priv->iio_proxy_watch_id != 0)
                 g_bus_unwatch_name (manager->priv->iio_proxy_watch_id);