fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2026-04-21 21:40:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Make it very clear that the Backlight interface is temporary"

Browse source 
This reverts commit 65571eed9d.
This commit is contained in:
Richard Hughes 2009-07-05 09:34:54 +01:00
parent 65571eed9d
commit cda6d85a9d
4 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
devkit-power-gobject/dkp-backlight.c
View file

@ -124,7 +124,7 @@ dkp_backlight_ensure_properties (DkpBacklight *backlight)
error = NULL;
ret = dbus_g_proxy_call (backlight->priv->prop_proxy, "GetAll", &error,
G_TYPE_STRING, "org.freedesktop.DeviceKit.Power.Backlight.Temporary.Interface",
G_TYPE_STRING, "org.freedesktop.DeviceKit.Power.Backlight",
G_TYPE_INVALID,
dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props,
G_TYPE_INVALID);
@ -317,7 +317,7 @@ dkp_backlight_init (DkpBacklight *backlight)
backlight->priv->proxy = dbus_g_proxy_new_for_name (backlight->priv->bus,
"org.freedesktop.DeviceKit.Power",
"/org/freedesktop/DeviceKit/Power/Backlight",
"org.freedesktop.DeviceKit.Power.Backlight.Temporary.Interface");
"org.freedesktop.DeviceKit.Power.Backlight");
if (backlight->priv->proxy == NULL) {
g_warning ("Couldn't connect to proxy");
goto out;

4
devkit-power-gobject/dkp-backlight.h
View file

@ -23,10 +23,6 @@
#error "Only <devicekit-power.h> can be included directly."
#endif
#if !defined (I_KNOW_DKP_BACKLIGHT_IS_TEMPORARY) && !defined (DKP_COMPILATION)
#error You have to define I_KNOW_DKP_BACKLIGHT_IS_TEMPORARY to use this code
#endif
#ifndef __DKP_BACKLIGHT_H
#define __DKP_BACKLIGHT_H

10
src/org.freedesktop.DeviceKit.Power.Backlight.xml
View file

@ -4,7 +4,7 @@
<!ENTITY ERROR_GENERAL "org.freedesktop.DeviceKit.Power.GeneralError">
]>
<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
<interface name="org.freedesktop.DeviceKit.Power.Backlight.Temporary.Interface">
<interface name="org.freedesktop.DeviceKit.Power.Backlight">
<doc:doc>
<doc:description>
<doc:para>
@ -12,14 +12,6 @@
by DeviceKit-power.
It allows applications to watch to change the system backlight brightness.
</doc:para>
<doc:para>
This interface should only be used as a fallback when the BACKLIGHT
property in X is not available.
</doc:para>
<doc:para>
THIS INTERFACE WILL BE REMOVED WITHOUT NOTICE WHEN ALL THE MAJOR XORG
DRIVERS ARE FIXED.
</doc:para>
</doc:description>
</doc:doc>

4
src/org.freedesktop.DeviceKit.Power.conf.in
View file

@ -21,7 +21,7 @@
send_interface="org.freedesktop.DBus.Properties"/>
<allow send_destination="org.freedesktop.DeviceKit.Power.Wakeups"
send_interface="org.freedesktop.DBus.Properties"/>
<allow send_destination="org.freedesktop.DeviceKit.Power.Backlight.Temporary.Interface"
<allow send_destination="org.freedesktop.DeviceKit.Power.Backlight"
send_interface="org.freedesktop.DBus.Properties"/>
<allow send_destination="org.freedesktop.DeviceKit.Power"
@ -33,6 +33,6 @@
<allow send_destination="org.freedesktop.DeviceKit.Power"
send_interface="org.freedesktop.DeviceKit.Power.Wakeups"/>
<allow send_destination="org.freedesktop.DeviceKit.Power"
send_interface="org.freedesktop.DeviceKit.Power.Backlight.Temporary.Interface"/>
send_interface="org.freedesktop.DeviceKit.Power.Backlight"/>
</policy>
</busconfig>