[gnome-settings-daemon] power: Remove engine_just_laptop_battery()

[Bastien Nocera <hadess src gnome org>]

commit 530cd007b10a68198ac3dcb0e2f27f6917c9cc2f
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Oct 17 11:39:14 2013 +0200

    power: Remove engine_just_laptop_battery()
    
    Checking if there's only a laptop battery is as easy as
    checking if there's no other devices, now that the devices_array
    doesn't contain batteries or UPSes.

 plugins/power/gsd-power-manager.c |   31 ++++---------------------------
 1 files changed, 4 insertions(+), 27 deletions(-)
---
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index bdd501a..96cb4b5 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -393,29 +393,6 @@ manager_critical_action_do_cb (GsdPowerManager *manager)
         return FALSE;
 }
 
-static gboolean
-engine_just_laptop_battery (GsdPowerManager *manager)
-{
-        UpDevice *device;
-        UpDeviceKind kind;
-        GPtrArray *array;
-        gboolean ret = TRUE;
-        guint i;
-
-        /* find if there are any other device types that mean we have to
-         * be more specific in our wording */
-        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, NULL);
-                if (kind != UP_DEVICE_KIND_BATTERY) {
-                        ret = FALSE;
-                        break;
-                }
-        }
-        return ret;
-}
-
 static void
 engine_charge_low (GsdPowerManager *manager, UpDevice *device)
 {
@@ -440,7 +417,7 @@ engine_charge_low (GsdPowerManager *manager, UpDevice *device)
         /* check to see if the batteries have not noticed we are on AC */
         if (kind == UP_DEVICE_KIND_BATTERY) {
                 if (!up_client_get_on_battery (manager->priv->up_client)) {
-                        g_warning ("ignoring low message as we are not on battery power");
+                        g_warning ("ignoring critically low message as we are not on battery power");
                         goto out;
                 }
         }
@@ -448,7 +425,7 @@ engine_charge_low (GsdPowerManager *manager, UpDevice *device)
         if (kind == UP_DEVICE_KIND_BATTERY) {
 
                 /* if the user has no other batteries, drop the "Laptop" wording */
-                ret = engine_just_laptop_battery (manager);
+                ret = (manager->priv->devices_array->len > 0);
                 if (ret) {
                         /* TRANSLATORS: laptop battery low, and we only have one battery */
                         title = _("Battery low");
@@ -578,7 +555,7 @@ engine_charge_critical (GsdPowerManager *manager, UpDevice *device)
         /* check to see if the batteries have not noticed we are on AC */
         if (kind == UP_DEVICE_KIND_BATTERY) {
                 if (!up_client_get_on_battery (manager->priv->up_client)) {
-                        g_warning ("ignoring critically low message as we are not on battery power");
+                        g_warning ("ignoring low message as we are not on battery power");
                         goto out;
                 }
         }
@@ -586,7 +563,7 @@ engine_charge_critical (GsdPowerManager *manager, UpDevice *device)
         if (kind == UP_DEVICE_KIND_BATTERY) {
 
                 /* if the user has no other batteries, drop the "Laptop" wording */
-                ret = engine_just_laptop_battery (manager);
+                ret = (manager->priv->devices_array->len > 0);
                 if (ret) {
                         /* TRANSLATORS: laptop battery critically low, and only have one kind of battery */
                         title = _("Battery critically low");