logind: rework power key/suspend key/lid switch handling

[elogind.git] / src / login / org.freedesktop.login1.policy.in

diff --git a/src/login/org.freedesktop.login1.policy.in b/src/login/org.freedesktop.login1.policy.in
index 970adbeff2157af75e0518af1762e8659cf0de3f..8d991e40fbd214f1a543b597b05c6280f2a1de23 100644 (file)
--- a/src/login/org.freedesktop.login1.policy.in
+++ b/src/login/org.freedesktop.login1.policy.in
@@ -20,7 +20,17 @@
                 <_description>Allow applications to inhibit system shutdown</_description>
                 <_message>Authentication is required to allow an application to inhibit system shutdown.</_message>
                 <defaults>
-                        <allow_any>auth_admin_keep</allow_any>
+                        <allow_any>no</allow_any>
+                        <allow_inactive>yes</allow_inactive>
+                        <allow_active>yes</allow_active>
+                </defaults>
+        </action>
+
+        <action id="org.freedesktop.login1.inhibit-delay-shutdown">
+                <_description>Allow applications to delay system shutdown</_description>
+                <_message>Authentication is required to allow an application to delay system shutdown.</_message>
+                <defaults>
+                        <allow_any>yes</allow_any>
                         <allow_inactive>yes</allow_inactive>
                         <allow_active>yes</allow_active>
                 </defaults>
@@ -30,7 +40,17 @@
                 <_description>Allow applications to inhibit system sleep</_description>
                 <_message>Authentication is required to allow an application to inhibit system sleep.</_message>
                 <defaults>
-                        <allow_any>auth_admin_keep</allow_any>
+                        <allow_any>no</allow_any>
+                        <allow_inactive>yes</allow_inactive>
+                        <allow_active>yes</allow_active>
+                </defaults>
+        </action>
+
+        <action id="org.freedesktop.login1.inhibit-delay-sleep">
+                <_description>Allow applications to delay system sleep</_description>
+                <_message>Authentication is required to allow an application to delay system sleep.</_message>
+                <defaults>
+                        <allow_any>yes</allow_any>
                         <allow_inactive>yes</allow_inactive>
                         <allow_active>yes</allow_active>
                 </defaults>
@@ -46,31 +66,31 @@
                 </defaults>
         </action>
 
-        <action id="org.freedesktop.login1.inhibit-delay-shutdown">
-                <_description>Allow applications to delay system shutdown</_description>
-                <_message>Authentication is required to allow an application to delay system shutdown.</_message>
+        <action id="org.freedesktop.login1.inhibit-handle-power-key">
+                <_description>Allow applications to inhibit system handling of the power key</_description>
+                <_message>Authentication is required to allow an application to inhibit system handling of the power key.</_message>
                 <defaults>
-                        <allow_any>yes</allow_any>
+                        <allow_any>no</allow_any>
                         <allow_inactive>yes</allow_inactive>
                         <allow_active>yes</allow_active>
                 </defaults>
         </action>
 
-        <action id="org.freedesktop.login1.inhibit-delay-sleep">
-                <_description>Allow applications to delay system sleep</_description>
-                <_message>Authentication is required to allow an application to delay system sleep.</_message>
+        <action id="org.freedesktop.login1.inhibit-handle-sleep-key">
+                <_description>Allow applications to inhibit system handling of the sleep key</_description>
+                <_message>Authentication is required to allow an application to inhibit system handling of the sleep key.</_message>
                 <defaults>
-                        <allow_any>yes</allow_any>
+                        <allow_any>no</allow_any>
                         <allow_inactive>yes</allow_inactive>
                         <allow_active>yes</allow_active>
                 </defaults>
         </action>
 
-        <action id="org.freedesktop.login1.inhibit-delay-idle">
-                <_description>Allow applications to delay automatic system suspend</_description>
-                <_message>Authentication is required to allow an application to delay automatic system suspend.</_message>
+        <action id="org.freedesktop.login1.inhibit-handle-lid-switch">
+                <_description>Allow applications to inhibit system handling of the lid switch</_description>
+                <_message>Authentication is required to allow an application to inhibit system handling of the lid switch.</_message>
                 <defaults>
-                        <allow_any>yes</allow_any>
+                        <allow_any>no</allow_any>
                         <allow_inactive>yes</allow_inactive>
                         <allow_active>yes</allow_active>
                 </defaults>