csd-power-manager.c: Sent property updates when the percentage (#438)

changes, not just an icon.

Commit c2c7609 removed the Tooltip property from csd-power. We
weren't making use of that property anywhere in Cinnamon, but it
was doing the work of triggering updates there whenever the battery
percentage changed, keeping the applet up-to-date in between actual
icon changes.

There's no point in reverting everything - most is string handling
that we still don't need. Instead, implement a simple percentage
monitor and dbus Property to trigger updates for clients.

Fixes linuxmint/cinnamon#13324.

Author: mtwebster

plugins/power/csd-power-manager.c

@@ -156,6 +156,7 @@ struct CsdPowerManagerPrivate
         GnomeRRScreen           *x11_screen;
         gboolean                 use_time_primary;
         GIcon                   *previous_icon;
+        guint                    previous_percentage;
         GpmPhone                *phone;
         GPtrArray               *devices_array;
         guint                    action_percentage;
@@ -379,7 +380,8 @@ typedef enum {
 
 static void
 engine_emit_changed (CsdPowerManager *manager,
-                     gboolean         icon_changed)
+                     gboolean         icon_changed,
+                     gboolean         percentage_changed)
 {
         /* not yet connected to the bus */
         if (manager->priv->power_iface == NULL)
@@ -401,6 +403,12 @@ engine_emit_changed (CsdPowerManager *manager,
                 g_object_unref (gicon);
         }
 
+        if (percentage_changed) {
+                csd_power_set_percentage (manager->priv->power_iface,
+                                          manager->priv->previous_percentage);
+                need_flush = TRUE;
+        }
+
         if (need_flush) {
                 g_dbus_interface_skeleton_flush (G_DBUS_INTERFACE_SKELETON (manager->priv->power_iface));
         }
@@ -685,16 +693,56 @@ engine_recalculate_state_icon (CsdPowerManager *manager)
         return FALSE;
 }
 
+static gboolean
+engine_recalculate_state_percentage (CsdPowerManager *manager)
+{
+        guint i;
+        UpDevice *device;
+        UpDeviceKind kind;
+        gboolean is_present;
+        gdouble percentage;
+        guint percentage_uint;
+        GPtrArray *array;
+
+        array = manager->priv->devices_array;
+        for (i = 0; i < array->len; i++) {
+                device = g_ptr_array_index (array, i);
+                g_object_get (device,
+                              "kind", &kind,
+                              "is-present", &is_present,
+                              "percentage", &percentage,
+                              NULL);
+
+                if (!is_present)
+                        continue;
+
+                if (kind == UP_DEVICE_KIND_BATTERY)
+                        device = engine_get_composite_device (manager, device);
+
+                g_object_get (device, "percentage", &percentage, NULL);
+                percentage_uint = (guint) CLAMP (percentage, 0.0, 100.0);
+
+                if (manager->priv->previous_percentage != percentage_uint) {
+                        manager->priv->previous_percentage = percentage_uint;
+                        return TRUE;
+                }
+        }
+
+        return FALSE;
+}
+
 static void
 engine_recalculate_state (CsdPowerManager *manager)
 {
         gboolean icon_changed = FALSE;
+        gboolean percentage_changed = FALSE;
 
         icon_changed = engine_recalculate_state_icon (manager);
+        percentage_changed = engine_recalculate_state_percentage (manager);
 
-        /* only emit if the icon has changed */
-        if (icon_changed)
-                engine_emit_changed (manager, icon_changed);
+        /* emit if the icon or percentage has changed */
+        if (icon_changed || percentage_changed)
+                engine_emit_changed (manager, icon_changed, percentage_changed);
 }
 
 static UpDevice *

plugins/power/org.cinnamon.SettingsDaemon.Power.xml

@@ -6,6 +6,8 @@
   <interface name='org.cinnamon.SettingsDaemon.Power'>
     <property name='Icon' type='s' access='read'>
     </property>
+    <property name='Percentage' type='u' access='read'>
+    </property>
     <method name='GetPrimaryDevice'>
       <arg name='device' type='(sssusduut)' direction='out' />
     </method>