Rename the PolicyKit rules from org.freedesktop.devicekit.power to org.freedesktop.upower

This commit is contained in:
Richard Hughes 2010-01-18 17:05:25 +00:00
parent d27c836e97
commit a3dd31ee57
8 changed files with 24 additions and 24 deletions

View file

@ -1,8 +1,8 @@
# List of source files containing translatable strings. # List of source files containing translatable strings.
# Please keep this file sorted alphabetically. # Please keep this file sorted alphabetically.
[encoding: UTF-8] [encoding: UTF-8]
policy/org.freedesktop.devicekit.power.policy.in policy/org.freedesktop.upower.policy.in
policy/org.freedesktop.devicekit.power.qos.policy.in policy/org.freedesktop.upower.qos.policy.in
src/up-main.c src/up-main.c
tools/up-tool.c tools/up-tool.c
src/egg-debug.c src/egg-debug.c

View file

@ -1,19 +1,19 @@
polkit_policydir = $(datadir)/polkit-1/actions polkit_policydir = $(datadir)/polkit-1/actions
polkit_policy_DATA = \ polkit_policy_DATA = \
org.freedesktop.devicekit.power.policy \ org.freedesktop.upower.policy \
org.freedesktop.devicekit.power.qos.policy org.freedesktop.upower.qos.policy
# You will need a recent intltool or the patch from this bug # You will need a recent intltool or the patch from this bug
# http://bugzilla.gnome.org/show_bug.cgi?id=462312 # http://bugzilla.gnome.org/show_bug.cgi?id=462312
@INTLTOOL_POLICY_RULE@ @INTLTOOL_POLICY_RULE@
EXTRA_DIST = \ EXTRA_DIST = \
org.freedesktop.devicekit.power.policy.in \ org.freedesktop.upower.policy.in \
org.freedesktop.devicekit.power.qos.policy.in org.freedesktop.upower.qos.policy.in
DISTCLEANFILES = \ DISTCLEANFILES = \
org.freedesktop.devicekit.power.policy \ org.freedesktop.upower.policy \
org.freedesktop.devicekit.power.qos.policy org.freedesktop.upower.qos.policy
clean-local : clean-local :
rm -f *~ rm -f *~

View file

@ -19,7 +19,7 @@ file are instantly applied.
<vendor_url>http://hal.freedesktop.org/docs/DeviceKit-power/</vendor_url> <vendor_url>http://hal.freedesktop.org/docs/DeviceKit-power/</vendor_url>
<icon_name>system-suspend</icon_name> <icon_name>system-suspend</icon_name>
<action id="org.freedesktop.devicekit.power.suspend"> <action id="org.freedesktop.upower.suspend">
<_description>Suspend the system</_description> <_description>Suspend the system</_description>
<_message>Authentication is required to suspend the system</_message> <_message>Authentication is required to suspend the system</_message>
<defaults> <defaults>
@ -28,7 +28,7 @@ file are instantly applied.
</defaults> </defaults>
</action> </action>
<action id="org.freedesktop.devicekit.power.hibernate"> <action id="org.freedesktop.upower.hibernate">
<_description>Hibernate the system</_description> <_description>Hibernate the system</_description>
<_message>Authentication is required to hibernate the system</_message> <_message>Authentication is required to hibernate the system</_message>
<defaults> <defaults>

View file

@ -19,7 +19,7 @@ file are instantly applied.
<vendor_url>http://hal.freedesktop.org/docs/DeviceKit-power/</vendor_url> <vendor_url>http://hal.freedesktop.org/docs/DeviceKit-power/</vendor_url>
<icon_name>system-suspend</icon_name> <icon_name>system-suspend</icon_name>
<action id="org.freedesktop.devicekit.power.qos.request-latency"> <action id="org.freedesktop.upower.qos.request-latency">
<_description>Set the required latency of an application</_description> <_description>Set the required latency of an application</_description>
<_message>Authentication is required to set the required latency of an application</_message> <_message>Authentication is required to set the required latency of an application</_message>
<defaults> <defaults>
@ -28,7 +28,7 @@ file are instantly applied.
</defaults> </defaults>
</action> </action>
<action id="org.freedesktop.devicekit.power.qos.request-latency-persistent"> <action id="org.freedesktop.upower.qos.request-latency-persistent">
<_description>Set a persistent latency setting</_description> <_description>Set a persistent latency setting</_description>
<_message>Authentication is required to set a persistent latency setting</_message> <_message>Authentication is required to set a persistent latency setting</_message>
<defaults> <defaults>
@ -37,7 +37,7 @@ file are instantly applied.
</defaults> </defaults>
</action> </action>
<action id="org.freedesktop.devicekit.power.qos.set-minimum-latency"> <action id="org.freedesktop.upower.qos.set-minimum-latency">
<_description>Set administrator settings for latency control</_description> <_description>Set administrator settings for latency control</_description>
<_message>Authentication is required to set administrator settings for latency control</_message> <_message>Authentication is required to set administrator settings for latency control</_message>
<defaults> <defaults>
@ -46,7 +46,7 @@ file are instantly applied.
</defaults> </defaults>
</action> </action>
<action id="org.freedesktop.devicekit.power.qos.cancel-request"> <action id="org.freedesktop.upower.qos.cancel-request">
<_description>Cancel a latency request</_description> <_description>Cancel a latency request</_description>
<_message>Authentication is required to cancel a latency request</_message> <_message>Authentication is required to cancel a latency request</_message>
<defaults> <defaults>

View file

@ -146,7 +146,7 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
Refreshes the data collected from the power source. Refreshes the data collected from the power source.
</doc:para> </doc:para>
</doc:description> </doc:description>
<doc:permission>Callers need the org.freedesktop.devicekit.power.refresh-power-source authorization</doc:permission> <doc:permission>Callers need the org.freedesktop.upower.refresh-power-source authorization</doc:permission>
<doc:errors> <doc:errors>
<doc:error name="&ERROR_GENERAL;">if an error occured while refreshing</doc:error> <doc:error name="&ERROR_GENERAL;">if an error occured while refreshing</doc:error>
</doc:errors> </doc:errors>

View file

@ -97,7 +97,7 @@
You do not have to use this method during normal operation. You do not have to use this method during normal operation.
</doc:para> </doc:para>
</doc:description> </doc:description>
<doc:permission>Callers need the <doc:tt>org.freedesktop.devicekit.power.qos.set-minimum-latency</doc:tt> authorization</doc:permission> <doc:permission>Callers need the <doc:tt>org.freedesktop.upower.qos.set-minimum-latency</doc:tt> authorization</doc:permission>
<doc:errors> <doc:errors>
<doc:error name="&ERROR_GENERAL;">if an error occured while setting the latency</doc:error> <doc:error name="&ERROR_GENERAL;">if an error occured while setting the latency</doc:error>
</doc:errors> </doc:errors>
@ -151,9 +151,9 @@
</doc:description> </doc:description>
<doc:permission> <doc:permission>
Callers need the Callers need the
<doc:tt>org.freedesktop.devicekit.power.qos.request-latency-persistent</doc:tt> <doc:tt>org.freedesktop.upower.qos.request-latency-persistent</doc:tt>
authorization if <doc:tt>persistent</doc:tt> is TRUE, or authorization if <doc:tt>persistent</doc:tt> is TRUE, or
<doc:tt>org.freedesktop.devicekit.power.qos.request-latency</doc:tt> otherwise. <doc:tt>org.freedesktop.upower.qos.request-latency</doc:tt> otherwise.
</doc:permission> </doc:permission>
<doc:errors> <doc:errors>
<doc:error name="&ERROR_GENERAL;">if an error occured while setting the latency</doc:error> <doc:error name="&ERROR_GENERAL;">if an error occured while setting the latency</doc:error>
@ -188,7 +188,7 @@
</doc:description> </doc:description>
<doc:permission> <doc:permission>
Callers need the Callers need the
<doc:tt>org.freedesktop.devicekit.power.qos.cancel-request</doc:tt> <doc:tt>org.freedesktop.upower.qos.cancel-request</doc:tt>
authorization if they were not the one issuing the request. authorization if they were not the one issuing the request.
</doc:permission> </doc:permission>
<doc:errors> <doc:errors>

View file

@ -518,7 +518,7 @@ up_daemon_suspend (UpDaemon *daemon, DBusGMethodInvocation *context)
if (subject == NULL) if (subject == NULL)
goto out; goto out;
if (!up_polkit_check_auth (daemon->priv->polkit, subject, "org.freedesktop.devicekit.power.suspend", context)) if (!up_polkit_check_auth (daemon->priv->polkit, subject, "org.freedesktop.upower.suspend", context))
goto out; goto out;
ret = g_spawn_command_line_sync ("/usr/sbin/pm-suspend", &stdout, &stderr, NULL, &error_local); ret = g_spawn_command_line_sync ("/usr/sbin/pm-suspend", &stdout, &stderr, NULL, &error_local);
@ -586,7 +586,7 @@ up_daemon_hibernate (UpDaemon *daemon, DBusGMethodInvocation *context)
if (subject == NULL) if (subject == NULL)
goto out; goto out;
if (!up_polkit_check_auth (daemon->priv->polkit, subject, "org.freedesktop.devicekit.power.hibernate", context)) if (!up_polkit_check_auth (daemon->priv->polkit, subject, "org.freedesktop.upower.hibernate", context))
goto out; goto out;
ret = g_spawn_command_line_sync ("/usr/sbin/pm-hibernate", &stdout, &stderr, NULL, &error_local); ret = g_spawn_command_line_sync ("/usr/sbin/pm-hibernate", &stdout, &stderr, NULL, &error_local);

View file

@ -277,9 +277,9 @@ up_qos_request_latency (UpQos *qos, const gchar *type_text, gint value, gboolean
/* check auth */ /* check auth */
if (persistent) if (persistent)
auth = "org.freedesktop.devicekit.power.qos.request-latency-persistent"; auth = "org.freedesktop.upower.qos.request-latency-persistent";
else else
auth = "org.freedesktop.devicekit.power.qos.request-latency"; auth = "org.freedesktop.upower.qos.request-latency";
if (!up_polkit_check_auth (qos->priv->polkit, subject, auth, context)) if (!up_polkit_check_auth (qos->priv->polkit, subject, auth, context))
goto out; goto out;
@ -380,7 +380,7 @@ up_qos_cancel_request (UpQos *qos, guint cookie, DBusGMethodInvocation *context)
subject = up_polkit_get_subject (qos->priv->polkit, context); subject = up_polkit_get_subject (qos->priv->polkit, context);
if (subject == NULL) if (subject == NULL)
goto out; goto out;
if (!up_polkit_check_auth (qos->priv->polkit, subject, "org.freedesktop.devicekit.power.qos.cancel-request", context)) if (!up_polkit_check_auth (qos->priv->polkit, subject, "org.freedesktop.upower.qos.cancel-request", context))
goto out; goto out;
} }