[Pkg-xfce-commits] r8550 - in /desktop/branches/experimental/xfce4-power-manager/debian: changelog patches/01_fix-logind-handle-xfconf-keys.patch patches/series xfce4-power-manager.xml

[Yves-Alexis Perez]

Author: corsac
Date: Wed Aug 27 19:55:35 2014
New Revision: 8550

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8550
Log:
* debian/patches:
  - 01_fix-logind-handle-xfconf-keys.patch added, fix backward logic when
    handling the logind inhibit keys.
* debian/xfce4-power-manager.xml:
  - add configuration to inhibit logind handling the various actions (LID
    switch and suspend/power/hibernate keys), so configuration done in
    xfce4-power-manager will work. Users can still override that by setting
    the keys to true.

Added:
    desktop/branches/experimental/xfce4-power-manager/debian/patches/01_fix-logind-handle-xfconf-keys.patch
    desktop/branches/experimental/xfce4-power-manager/debian/patches/series
Modified:
    desktop/branches/experimental/xfce4-power-manager/debian/changelog
    desktop/branches/experimental/xfce4-power-manager/debian/xfce4-power-manager.xml

Modified: desktop/branches/experimental/xfce4-power-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-power-manager/debian/changelog?rev=8550&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-power-manager/debian/changelog	(original)
+++ desktop/branches/experimental/xfce4-power-manager/debian/changelog	Wed Aug 27 19:55:35 2014
@@ -1,3 +1,16 @@
+xfce4-power-manager (1.3.2-2) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    - 01_fix-logind-handle-xfconf-keys.patch added, fix backward logic when
+      handling the logind inhibit keys.
+  * debian/xfce4-power-manager.xml:
+    - add configuration to inhibit logind handling the various actions (LID
+      switch and suspend/power/hibernate keys), so configuration done in
+      xfce4-power-manager will work. Users can still override that by setting
+      the keys to true.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 27 Aug 2014 21:51:01 +0200
+
 xfce4-power-manager (1.3.2-1) experimental; urgency=medium
 
   [ Jackson Doak ]

Added: desktop/branches/experimental/xfce4-power-manager/debian/patches/01_fix-logind-handle-xfconf-keys.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-power-manager/debian/patches/01_fix-logind-handle-xfconf-keys.patch?rev=8550&op=file
==============================================================================
--- desktop/branches/experimental/xfce4-power-manager/debian/patches/01_fix-logind-handle-xfconf-keys.patch	(added)
+++ desktop/branches/experimental/xfce4-power-manager/debian/patches/01_fix-logind-handle-xfconf-keys.patch	Wed Aug 27 19:55:35 2014
@@ -0,0 +1,22 @@
+diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c
+index a7417a5..96d042c 100644
+--- a/src/xfpm-manager.c
++++ b/src/xfpm-manager.c
+@@ -513,13 +513,13 @@ xfpm_manager_get_systemd_events(XfpmManager *manager)
+         LOGIND_HANDLE_LID_SWITCH, &handle_lid_switch,
+         NULL);
+ 
+-    if (handle_power_key)
++    if (!handle_power_key)
+         events = g_slist_append(events, "handle-power-key");
+-    if (handle_suspend_key)
++    if (!handle_suspend_key)
+         events = g_slist_append(events, "handle-suspend-key");
+-    if (handle_hibernate_key)
++    if (!handle_hibernate_key)
+         events = g_slist_append(events, "handle-hibernate-key");
+-    if (handle_lid_switch)
++    if (!handle_lid_switch)
+         events = g_slist_append(events, "handle-lid-switch");
+ 
+     while (events != NULL)

Added: desktop/branches/experimental/xfce4-power-manager/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-power-manager/debian/patches/series?rev=8550&op=file
==============================================================================
--- desktop/branches/experimental/xfce4-power-manager/debian/patches/series	(added)
+++ desktop/branches/experimental/xfce4-power-manager/debian/patches/series	Wed Aug 27 19:55:35 2014
@@ -0,0 +1 @@
+01_fix-logind-handle-xfconf-keys.patch

Modified: desktop/branches/experimental/xfce4-power-manager/debian/xfce4-power-manager.xml
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/xfce4-power-manager/debian/xfce4-power-manager.xml?rev=8550&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-power-manager/debian/xfce4-power-manager.xml	(original)
+++ desktop/branches/experimental/xfce4-power-manager/debian/xfce4-power-manager.xml	Wed Aug 27 19:55:35 2014
@@ -3,5 +3,9 @@
 <channel name="xfce4-power-manager" version="1.0">
   <property name="xfce4-power-manager" type="empty">
     <property name="power-button-action" type="uint" value="3"/>
+    <property name="logind-handle-lid-switch" type="bool" value="false"/>
+    <property name="logind-handle-suspend-key" type="bool" value="false"/>
+    <property name="logind-handle-hibernate-key" type="bool" value="false"/>
+    <property name="logind-handle-power-key" type="bool" value="false"/>
   </property>
 </channel>