fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2025-12-20 04:20:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

all: Remove WarningLevel from the daemon properties

Browse source 
The WarningLevel property just replicated the warning level
on the display device, or at least should have. So we fix the latter
to remove the former.
This commit is contained in:
Bastien Nocera 2013-10-17 00:57:27 +02:00
parent c00eda8ca0
commit b2f72dd69a
5 changed files with 1 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
libupower-glib/up-client.c
View file

@ -69,7 +69,6 @@ enum {
PROP_0,
PROP_DAEMON_VERSION,
PROP_ON_BATTERY,
PROP_WARNING_LEVEL,
PROP_LID_IS_CLOSED,
PROP_LID_IS_PRESENT,
PROP_IS_DOCKED,
@ -230,23 +229,6 @@ up_client_get_on_battery (UpClient *client)
return up_client_glue_get_on_battery (client->priv->proxy);
}
/**
* up_client_get_warning_level:
* @client: a #UpClient instance.
*
* Get whether the system is low on battery, or critically low.
*
* Return value: The #UpDeviceLevel of the whole system.
*
* Since: 1.0
**/
UpDeviceLevel
up_client_get_warning_level (UpClient *client)
{
g_return_val_if_fail (UP_IS_CLIENT (client), FALSE);
return up_client_glue_get_warning_level (client->priv->proxy);
}
/*
* up_client_add:
*/
@ -351,9 +333,6 @@ up_client_get_property (GObject *object,
case PROP_ON_BATTERY:
g_value_set_boolean (value, up_client_glue_get_on_battery (client->priv->proxy));
break;
case PROP_WARNING_LEVEL:
g_value_set_uint (value, up_client_glue_get_warning_level (client->priv->proxy));
break;
case PROP_LID_IS_CLOSED:
g_value_set_boolean (value, up_client_glue_get_lid_is_closed (client->priv->proxy));
break;
@ -409,21 +388,6 @@ up_client_class_init (UpClientClass *klass)
NULL,
FALSE,
G_PARAM_READABLE));
/**
* UpClient:warning-level:
*
* The warning level e.g. %UP_DEVICE_LEVEL_WARNING.
*
* Since: 1.0
**/
g_object_class_install_property (object_class,
PROP_WARNING_LEVEL,
g_param_spec_uint ("warning-level",
NULL, NULL,
UP_DEVICE_LEVEL_UNKNOWN,
UP_DEVICE_LEVEL_LAST,
UP_DEVICE_LEVEL_UNKNOWN,
G_PARAM_READABLE));
/**
* UpClient:lid-is-closed:
*

1
libupower-glib/up-client.h
View file

@ -89,7 +89,6 @@ gboolean up_client_get_lid_is_closed (UpClient *client);
gboolean up_client_get_lid_is_present (UpClient *client);
gboolean up_client_get_is_docked (UpClient *client);
gboolean up_client_get_on_battery (UpClient *client);
UpDeviceLevel up_client_get_warning_level (UpClient *client);
G_END_DECLS

7
src/org.freedesktop.UPower.xml
View file

@ -180,13 +180,6 @@ method return sender=:1.386 -> dest=:1.451 reply_serial=2
</doc:para></doc:description></doc:doc>
</property>
<property name="WarningLevel" type="u" access="read">
<doc:doc><doc:description><doc:para>
Indicates whether the system is running on battery power and if the batteries are low,
or critically low. This property is provided for convenience.
</doc:para></doc:description></doc:doc>
</property>
<property name="LidIsClosed" type="b" access="read">
<doc:doc>
<doc:description>

16
src/up-daemon.c
View file

@ -50,7 +50,6 @@ enum
PROP_LID_IS_CLOSED,
PROP_LID_IS_PRESENT,
PROP_IS_DOCKED,
PROP_WARNING_LEVEL,
PROP_LAST
};
@ -758,9 +757,8 @@ up_daemon_set_warning_level (UpDaemon *daemon, UpDeviceLevel warning_level)
g_debug ("warning_level = %s", up_device_level_to_string (warning_level));
priv->warning_level = warning_level;
g_object_notify (G_OBJECT (daemon), "warning-level");
up_daemon_queue_changed_property (daemon, "WarningLevel", g_variant_new_uint32 (warning_level));
g_object_set (G_OBJECT (daemon->priv->display_device), "warning-level", warning_level, NULL);
if (daemon->priv->warning_level == UP_DEVICE_LEVEL_ACTION) {
if (daemon->priv->action_timeout_id == 0) {
@ -1121,9 +1119,6 @@ up_daemon_get_property (GObject *object, guint prop_id, GValue *value, GParamSpe
case PROP_IS_DOCKED:
g_value_set_boolean (value, priv->is_docked);
break;
case PROP_WARNING_LEVEL:
g_value_set_uint (value, priv->warning_level);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@ -1206,15 +1201,6 @@ up_daemon_class_init (UpDaemonClass *klass)
FALSE,
G_PARAM_READABLE));
g_object_class_install_property (object_class,
PROP_WARNING_LEVEL,
g_param_spec_uint ("warning-level",
NULL, NULL,
UP_DEVICE_LEVEL_UNKNOWN,
UP_DEVICE_LEVEL_LAST,
UP_DEVICE_LEVEL_UNKNOWN,
G_PARAM_READABLE));
g_object_class_install_property (object_class,
PROP_LID_IS_CLOSED,
g_param_spec_boolean ("lid-is-closed",

2
tools/up-tool.c
View file

@ -128,7 +128,6 @@ up_client_print (UpClient *client)
g_object_get (client,
"daemon-version", &daemon_version,
"on-battery", &on_battery,
"warning-level", &warning_level,
"lid-is-closed", &lid_is_closed,
"lid-is-present", &lid_is_present,
"is-docked", &is_docked,
@ -136,7 +135,6 @@ up_client_print (UpClient *client)
g_print (" daemon-version: %s\n", daemon_version);
g_print (" on-battery: %s\n", on_battery ? "yes" : "no");
g_print (" warning-level: %s\n", up_device_level_to_string (warning_level));
g_print (" lid-is-closed: %s\n", lid_is_closed ? "yes" : "no");
g_print (" lid-is-present: %s\n", lid_is_present ? "yes" : "no");
g_print (" is-docked: %s\n", is_docked ? "yes" : "no");