From d6534892274a5906d3f24d45e6d19492fd71b427 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 6 Jul 2009 10:05:07 +0100 Subject: [PATCH] Add two new state enums, pending-discharge and pending-charge --- devkit-power-gobject/dkp-enum.c | 10 ++++++++++ devkit-power-gobject/dkp-enum.h | 2 ++ src/dkp-device-supply.c | 4 ++-- src/org.freedesktop.DeviceKit.Power.Device.xml | 6 ++++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/devkit-power-gobject/dkp-enum.c b/devkit-power-gobject/dkp-enum.c index 4c53517..d877b28 100644 --- a/devkit-power-gobject/dkp-enum.c +++ b/devkit-power-gobject/dkp-enum.c @@ -110,6 +110,12 @@ dkp_device_state_to_text (DkpDeviceState state_enum) case DKP_DEVICE_STATE_FULLY_CHARGED: state = "fully-charged"; break; + case DKP_DEVICE_STATE_PENDING_CHARGE: + state = "pending-charged"; + break; + case DKP_DEVICE_STATE_PENDING_DISCHARGE: + state = "pending-discharge"; + break; default: state = "unknown"; break; @@ -133,6 +139,10 @@ dkp_device_state_from_text (const gchar *state) return DKP_DEVICE_STATE_EMPTY; if (g_strcmp0 (state, "fully-charged") == 0) return DKP_DEVICE_STATE_FULLY_CHARGED; + if (g_strcmp0 (state, "pending-charge") == 0) + return DKP_DEVICE_STATE_PENDING_CHARGE; + if (g_strcmp0 (state, "pending-discharge") == 0) + return DKP_DEVICE_STATE_PENDING_DISCHARGE; return DKP_DEVICE_STATE_UNKNOWN; } diff --git a/devkit-power-gobject/dkp-enum.h b/devkit-power-gobject/dkp-enum.h index 28ec8d7..ce6fbab 100644 --- a/devkit-power-gobject/dkp-enum.h +++ b/devkit-power-gobject/dkp-enum.h @@ -49,6 +49,8 @@ typedef enum { DKP_DEVICE_STATE_DISCHARGING, DKP_DEVICE_STATE_EMPTY, DKP_DEVICE_STATE_FULLY_CHARGED, + DKP_DEVICE_STATE_PENDING_CHARGE, + DKP_DEVICE_STATE_PENDING_DISCHARGE, DKP_DEVICE_STATE_LAST } DkpDeviceState; diff --git a/src/dkp-device-supply.c b/src/dkp-device-supply.c index a5b2033..952fc48 100644 --- a/src/dkp-device-supply.c +++ b/src/dkp-device-supply.c @@ -545,9 +545,9 @@ dkp_device_supply_refresh_battery (DkpDeviceSupply *supply) /* try to find a suitable icon depending on AC state */ if (on_battery) { - state = DKP_DEVICE_STATE_DISCHARGING; + state = DKP_DEVICE_STATE_PENDING_DISCHARGE; } else { - state = DKP_DEVICE_STATE_CHARGING; + state = DKP_DEVICE_STATE_PENDING_CHARGE; } /* print what we did */ diff --git a/src/org.freedesktop.DeviceKit.Power.Device.xml b/src/org.freedesktop.DeviceKit.Power.Device.xml index b3f14c7..d6939d9 100644 --- a/src/org.freedesktop.DeviceKit.Power.Device.xml +++ b/src/org.freedesktop.DeviceKit.Power.Device.xml @@ -572,6 +572,12 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2 4Fully charged + + 5Pending charge + + + 6Pending discharge + This property is only valid if the property