hal: Branch 'master'
Danny Kukawka
dkukawka at kemper.freedesktop.org
Mon Aug 25 11:03:15 PDT 2008
fdi/information/10freedesktop/01-deprecated-keys.fdi | 10 ++++----
fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi | 2 -
fdi/policy/10osvendor/10-power-mgmt-policy.fdi | 2 -
fdi/policy/10osvendor/10-tabletPCs.fdi | 4 +--
fdi/policy/10osvendor/30-wol.fdi | 2 -
policy/org.freedesktop.hal.device-access.policy | 16 ++++++-------
policy/org.freedesktop.hal.killswitch.policy | 4 +--
policy/org.freedesktop.hal.policy | 2 -
policy/org.freedesktop.hal.power-management.policy | 22 +++++++++---------
policy/org.freedesktop.hal.storage.policy | 10 ++++----
10 files changed, 37 insertions(+), 37 deletions(-)
New commits:
commit e5a675f67615b447fccafb30da67955682de967b
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Aug 25 20:02:40 2008 +0200
removed needless whitespaces at the end of lines
Removed needless whitespaces at the end of lines.
diff --git a/fdi/information/10freedesktop/01-deprecated-keys.fdi b/fdi/information/10freedesktop/01-deprecated-keys.fdi
index 79337ae..47acf4d 100644
--- a/fdi/information/10freedesktop/01-deprecated-keys.fdi
+++ b/fdi/information/10freedesktop/01-deprecated-keys.fdi
@@ -3,11 +3,11 @@
<deviceinfo version="0.2">
<device>
- <!--
+ <!--
Note: This fdi-file contains several deprecated keys, which get removed 12 months
- after they get marked as deprecated in the HAL spec.
- For backward compability of some unported tools this file can contain for a
- short time some already finally removed keys.
+ after they get marked as deprecated in the HAL spec.
+ For backward compability of some unported tools this file can contain for a
+ short time some already finally removed keys.
-->
<!-- temporary readded keys -->
@@ -22,7 +22,7 @@
<match key="info.subsystem" contains="usb">
<merge key="info.bus" type="copy_property">info.subsystem</merge>
</match>
-
+
<!-- keys which are deprecated, but not removed finally -->
<!-- power_management.can_suspend_to_ram - planed remove: 2007-05-01 -->
<match key="power_management.can_suspend" exists="true">
diff --git a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
index e63c4b0..d78d85e 100644
--- a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
+++ b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
@@ -18,7 +18,7 @@
<append key="org.freedesktop.Hal.Device.LaptopPanel.method_signatures" type="strlist">i</append>
<append key="org.freedesktop.Hal.Device.LaptopPanel.method_argnames" type="strlist">brightness_value</append>
<append key="org.freedesktop.Hal.Device.LaptopPanel.method_execpaths" type="strlist">hal-system-lcd-set-brightness</append>
-
+
<append key="org.freedesktop.Hal.Device.LaptopPanel.method_names" type="strlist">GetBrightness</append>
<append key="org.freedesktop.Hal.Device.LaptopPanel.method_signatures" type="strlist"></append>
<append key="org.freedesktop.Hal.Device.LaptopPanel.method_argnames" type="strlist"></append>
diff --git a/fdi/policy/10osvendor/10-power-mgmt-policy.fdi b/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
index ec5613f..5bb0e7f 100644
--- a/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
+++ b/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
@@ -60,5 +60,5 @@
<merge key="power_management.is_powersave_set" type="bool">false</merge>
</match>
</device>
-
+
</deviceinfo>
diff --git a/fdi/policy/10osvendor/10-tabletPCs.fdi b/fdi/policy/10osvendor/10-tabletPCs.fdi
index 5b4a81d..eaa8058 100644
--- a/fdi/policy/10osvendor/10-tabletPCs.fdi
+++ b/fdi/policy/10osvendor/10-tabletPCs.fdi
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<deviceinfo version="0.2">
@@ -28,7 +28,7 @@
<!-- TabletPCs with USB Wacom Tablets -->
<match key="/org/freedesktop/Hal/devices/computer:system.formfactor" compare_ne="laptop">
<!-- set the correct formfactor if not already laptop -->
- <merge key="/org/freedesktop/Hal/devices/computer:system.formfactor" type="string">laptop</merge>
+ <merge key="/org/freedesktop/Hal/devices/computer:system.formfactor" type="string">laptop</merge>
</match>
<!-- set the correct subtype -->
<merge key="/org/freedesktop/Hal/devices/computer:system.formfactor.subtype" type="string">tabletpc</merge>
diff --git a/fdi/policy/10osvendor/30-wol.fdi b/fdi/policy/10osvendor/30-wol.fdi
index a668968..5c39729 100644
--- a/fdi/policy/10osvendor/30-wol.fdi
+++ b/fdi/policy/10osvendor/30-wol.fdi
@@ -23,6 +23,6 @@
<append key="org.freedesktop.Hal.Device.WakeOnLan.method_execpaths" type="strlist">hal-system-wol-enable</append>
</match>
-
+
</device>
</deviceinfo>
diff --git a/policy/org.freedesktop.hal.device-access.policy b/policy/org.freedesktop.hal.device-access.policy
index ead49c1..cacc88f 100644
--- a/policy/org.freedesktop.hal.device-access.policy
+++ b/policy/org.freedesktop.hal.device-access.policy
@@ -3,7 +3,7 @@
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
"http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-<!--
+<!--
Policy definitions for HAL's ACL Management mechanism
Copyright (c) 2007 David Zeuthen <david at fubar.dk>
@@ -24,7 +24,7 @@ details.
<allow_active>yes</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.device-access.video4linux">
<description>Directly access video capture devices</description>
<message>System policy prevents access to video capture devices</message>
@@ -33,7 +33,7 @@ details.
<allow_active>yes</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.device-access.cdrom">
<description>Directly access optical drives</description>
<message>System policy prevents access to optical drives</message>
@@ -42,7 +42,7 @@ details.
<allow_active>yes</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.device-access.dvb">
<description>Directly access DVB devices</description>
<message>System policy prevents access to DVB devices</message>
@@ -51,7 +51,7 @@ details.
<allow_active>yes</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.device-access.camera">
<description>Directly access digital cameras</description>
<message>System policy prevents access to digital cameras</message>
@@ -60,7 +60,7 @@ details.
<allow_active>yes</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.device-access.scanner">
<description>Directly access scanners</description>
<message>System policy prevents access to scanners</message>
@@ -78,7 +78,7 @@ details.
<allow_active>yes</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.device-access.ieee1394-iidc">
<description>Directly access Firewire IIDC devices</description>
<message>System policy prevents access to Firewire IIDC devices</message>
@@ -87,7 +87,7 @@ details.
<allow_active>yes</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.device-access.ieee1394-avc">
<description>Directly access Firewire AVC devices</description>
<message>System policy prevents access to Firewire AVC devices</message>
diff --git a/policy/org.freedesktop.hal.killswitch.policy b/policy/org.freedesktop.hal.killswitch.policy
index 713bb0d..50fb54d 100644
--- a/policy/org.freedesktop.hal.killswitch.policy
+++ b/policy/org.freedesktop.hal.killswitch.policy
@@ -3,7 +3,7 @@
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
"http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-<!--
+<!--
Policy definitions for HAL's RF kill switch mechanism
Copyright (c) 2007 David Zeuthen <david at fubar.dk>
@@ -24,7 +24,7 @@ details.
<allow_active>yes</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.killswitch.wlan">
<description>Turn WLAN radio On/Off</description>
<message>System policy prevents turning the WLAN radio On/Off</message>
diff --git a/policy/org.freedesktop.hal.policy b/policy/org.freedesktop.hal.policy
index 6789a4a..f17ad51 100644
--- a/policy/org.freedesktop.hal.policy
+++ b/policy/org.freedesktop.hal.policy
@@ -3,7 +3,7 @@
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
"http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-<!--
+<!--
Policy definitions for HAL's locking mechanism
Copyright (c) 2007 David Zeuthen <david at fubar.dk>
diff --git a/policy/org.freedesktop.hal.power-management.policy b/policy/org.freedesktop.hal.power-management.policy
index f0ee7fd..1f8897f 100644
--- a/policy/org.freedesktop.hal.power-management.policy
+++ b/policy/org.freedesktop.hal.power-management.policy
@@ -3,7 +3,7 @@
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
"http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-<!--
+<!--
Policy definitions for HAL's ACL Management mechanism
Copyright (c) 2007 David Zeuthen <david at fubar.dk>
@@ -24,7 +24,7 @@ details.
<allow_active>yes</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.power-management.shutdown-multiple-sessions">
<description>Shut down the system when multiple users are logged in</description>
<message>System policy prevents shutting down the system while multiple users are logged in</message>
@@ -33,7 +33,7 @@ details.
<allow_active>auth_admin</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.power-management.reboot">
<description>Reboot the system</description>
<message>System policy prevents rebooting the system</message>
@@ -42,7 +42,7 @@ details.
<allow_active>yes</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.power-management.reboot-multiple-sessions">
<description>Reboot the system when multiple users are logged in</description>
<message>System policy prevents rebooting the system while multiple users are logged in</message>
@@ -51,7 +51,7 @@ details.
<allow_active>auth_admin</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.power-management.set-powersave">
<description>Configure to system to prefer power savings</description>
<message>System policy prevents enabling power savings</message>
@@ -60,7 +60,7 @@ details.
<allow_active>yes</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.power-management.suspend">
<description>Suspend the system</description>
<message>System policy prevents suspending the system</message>
@@ -69,7 +69,7 @@ details.
<allow_active>yes</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.power-management.hibernate">
<description>Hibernate the system</description>
<message>System policy prevents hibernating the system</message>
@@ -78,7 +78,7 @@ details.
<allow_active>yes</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.power-management.cpufreq">
<description>Configure CPU frequency scaling</description>
<message>System policy prevents CPU frequency scaling to be configured</message>
@@ -87,7 +87,7 @@ details.
<allow_active>yes</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.power-management.lcd-panel">
<description>Set laptop panel brightness</description>
<message>System policy prevents adjusting the laptop panel brightness</message>
@@ -96,7 +96,7 @@ details.
<allow_active>yes</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.power-management.light-sensor">
<description>Detect ambient light using light sensor</description>
<message>System policy prevents accessing the ambient light sensor</message>
@@ -105,7 +105,7 @@ details.
<allow_active>yes</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.power-management.keyboard-backlight">
<description>Set keyboard backlight</description>
<message>System policy prevents adjusting the keyboard backlight</message>
diff --git a/policy/org.freedesktop.hal.storage.policy b/policy/org.freedesktop.hal.storage.policy
index f866117..a5bc01d 100644
--- a/policy/org.freedesktop.hal.storage.policy
+++ b/policy/org.freedesktop.hal.storage.policy
@@ -3,7 +3,7 @@
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
"http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-<!--
+<!--
Policy definitions for HAL's drives/media mechanims.
Copyright (c) 2007 David Zeuthen <david at fubar.dk>
@@ -24,7 +24,7 @@ details.
<allow_active>auth_admin_keep_always</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.storage.mount-removable">
<description>Mount file systems from removable drives.</description>
<message>System policy prevents mounting removable media</message>
@@ -33,7 +33,7 @@ details.
<allow_active>yes</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.storage.unmount-others">
<description>Unmount file systems mounted by other users.</description>
<message>System policy prevents unmounting media mounted by other users</message>
@@ -42,7 +42,7 @@ details.
<allow_active>auth_admin_keep_always</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.storage.eject">
<description>Eject removable media.</description>
<message>System policy prevents ejecting removable media</message>
@@ -51,7 +51,7 @@ details.
<allow_active>yes</allow_active>
</defaults>
</action>
-
+
<action id="org.freedesktop.hal.storage.crypto-setup-fixed">
<description>Set up decryption for encrypted fixed storage devices.</description>
<message>System policy prevents accessing encrypted fixed media</message>
More information about the hal-commit
mailing list