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

Drop the incorrect "since version" and mark the capacity_level property as deprecated

Browse source 
Fix: 09ada72 (dbus: org.freedesktop.UPower.Device: deprecate CapacityLevel property)
This commit is contained in:
Kate Hsuan 2025-12-16 16:30:26 +08:00
parent 38ab5417b7
commit 0f57b6bf73
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dbus/org.freedesktop.UPower.Device.xml
View file

@ -967,9 +967,6 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
<doc:para> <doc:para>
This property is deprecated since it is duplicated from the 'BatteryLevel' property. This property is deprecated since it is duplicated from the 'BatteryLevel' property.
</doc:para> </doc:para>
<doc:para>
Since 1.91.0
</doc:para>
</doc:description> </doc:description>
</doc:doc> </doc:doc>
</property> </property>

19
libupower-glib/up-device.c
View file

@ -350,9 +350,8 @@ up_device_to_text (UpDevice *device)
if (up_exported_device_get_voltage_max_design (priv->proxy_device) > 0) if (up_exported_device_get_voltage_max_design (priv->proxy_device) > 0)
g_string_append_printf (string, " voltage-max-design: %g V\n", up_exported_device_get_voltage_max_design (priv->proxy_device)); g_string_append_printf (string, " voltage-max-design: %g V\n", up_exported_device_get_voltage_max_design (priv->proxy_device));
/* Suppress the warning about the deprecated property CapacityLevel */ /* Eliminate the display of the deprecation warning specific to the CapacityLevel property. */
/* DEPRECATED. This property is deprecated since it is duplicated from the 'BatteryLevel' property. /* DEPRECATED. This property is deprecated since it is duplicated from the 'BatteryLevel' property. */
* since 1.91.0 */
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
capacity_level = up_exported_device_get_capacity_level (priv->proxy_device); capacity_level = up_exported_device_get_capacity_level (priv->proxy_device);
@ -741,9 +740,8 @@ up_device_set_property (GObject *object, guint prop_id, const GValue *value, GPa
case PROP_VOLTAGE_MAX_DESIGN: case PROP_VOLTAGE_MAX_DESIGN:
up_exported_device_set_voltage_max_design (device->priv->proxy_device, g_value_get_double (value)); up_exported_device_set_voltage_max_design (device->priv->proxy_device, g_value_get_double (value));
break; break;
/* Suppress the warning about the deprecated property CapacityLevel */ /* Eliminate the display of the deprecation warning specific to the CapacityLevel property. */
/* DEPRECATED. This property is deprecated since it is duplicated from the 'BatteryLevel' property. /* DEPRECATED. This property is deprecated since it is duplicated from the 'BatteryLevel' property. */
* since 1.91.0 */
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
case PROP_CAPACITY_LEVEL: case PROP_CAPACITY_LEVEL:
@ -885,9 +883,8 @@ up_device_get_property (GObject *object, guint prop_id, GValue *value, GParamSpe
case PROP_VOLTAGE_MAX_DESIGN: case PROP_VOLTAGE_MAX_DESIGN:
g_value_set_double (value, up_exported_device_get_voltage_max_design (device->priv->proxy_device)); g_value_set_double (value, up_exported_device_get_voltage_max_design (device->priv->proxy_device));
break; break;
/* Suppress the warning about the deprecated property CapacityLevel */ /* Eliminate the display of the deprecation warning specific to the CapacityLevel property. */
/* DEPRECATED. This property is deprecated since it is duplicated from the 'BatteryLevel' property. /* DEPRECATED. This property is deprecated since it is duplicated from the 'BatteryLevel' property. */
* since 1.91.0 */
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
case PROP_CAPACITY_LEVEL: case PROP_CAPACITY_LEVEL:
@ -1404,14 +1401,12 @@ up_device_class_init (UpDeviceClass *klass)
* *
* DEPRECATED. * DEPRECATED.
* This property is deprecated since it is duplicated from the 'BatteryLevel' property. * This property is deprecated since it is duplicated from the 'BatteryLevel' property.
*
* Since 1.91.0
**/ **/
g_object_class_install_property (object_class, g_object_class_install_property (object_class,
PROP_CAPACITY_LEVEL, PROP_CAPACITY_LEVEL,
g_param_spec_string ("capacity-level", g_param_spec_string ("capacity-level",
NULL, NULL, NULL, NULL, NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_DEPRECATED));
} }
static void static void