Add two new state enums, pending-discharge and pending-charge

This commit is contained in:
Richard Hughes 2009-07-06 10:05:07 +01:00
parent 86f6278f61
commit d653489227
4 changed files with 20 additions and 2 deletions

View file

@ -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;
}

View file

@ -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;

View file

@ -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 */

View file

@ -572,6 +572,12 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
<doc:item>
<doc:term>4</doc:term><doc:definition>Fully charged</doc:definition>
</doc:item>
<doc:item>
<doc:term>5</doc:term><doc:definition>Pending charge</doc:definition>
</doc:item>
<doc:item>
<doc:term>6</doc:term><doc:definition>Pending discharge</doc:definition>
</doc:item>
</doc:list>
<doc:para>
This property is only valid if the property