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

[Yves-Alexis Perez]

Author: corsac
Date: Wed Aug 27 20:08:01 2014
New Revision: 8551

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8551
Log:
    handling the logind inhibit keys and set the default to FALSE, meaning
    xfce4-power-manager will handle the keys and lid itself.

Modified:
    desktop/branches/experimental/xfce4-power-manager/debian/changelog
    desktop/branches/experimental/xfce4-power-manager/debian/patches/01_fix-logind-handle-xfconf-keys.patch
    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=8551&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-power-manager/debian/changelog	(original)
+++ desktop/branches/experimental/xfce4-power-manager/debian/changelog	Wed Aug 27 20:08:01 2014
@@ -2,12 +2,8 @@
 
   * 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.
+      handling the logind inhibit keys and set the default to FALSE, meaning
+      xfce4-power-manager will handle the keys and lid itself.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Wed, 27 Aug 2014 21:51:01 +0200
 

Modified: 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=8551&op=diff
==============================================================================
--- desktop/branches/experimental/xfce4-power-manager/debian/patches/01_fix-logind-handle-xfconf-keys.patch	(original)
+++ desktop/branches/experimental/xfce4-power-manager/debian/patches/01_fix-logind-handle-xfconf-keys.patch	Wed Aug 27 20:08:01 2014
@@ -20,3 +20,43 @@
          events = g_slist_append(events, "handle-lid-switch");
  
      while (events != NULL)
+diff --git a/src/xfpm-xfconf.c b/src/xfpm-xfconf.c
+index 2603bc1..721d977 100644
+--- a/src/xfpm-xfconf.c
++++ b/src/xfpm-xfconf.c
+@@ -563,7 +563,7 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
+                                      PROP_LOGIND_HANDLE_POWER_KEY,
+                                      g_param_spec_boolean (LOGIND_HANDLE_POWER_KEY,
+                                                            NULL, NULL,
+-                                                           TRUE,
++                                                           FALSE,
+                                                            G_PARAM_READWRITE));
+ 
+     /**
+@@ -573,7 +573,7 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
+                                      PROP_LOGIND_HANDLE_SUSPEND_KEY,
+                                      g_param_spec_boolean (LOGIND_HANDLE_SUSPEND_KEY,
+                                                            NULL, NULL,
+-                                                           TRUE,
++                                                           FALSE,
+                                                            G_PARAM_READWRITE));
+ 
+     /**
+@@ -583,7 +583,7 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
+                                      PROP_LOGIND_HANDLE_HIBERNATE_KEY,
+                                      g_param_spec_boolean (LOGIND_HANDLE_HIBERNATE_KEY,
+                                                            NULL, NULL,
+-                                                           TRUE,
++                                                           FALSE,
+                                                            G_PARAM_READWRITE));
+ 
+     /**
+@@ -593,7 +593,7 @@ xfpm_xfconf_class_init (XfpmXfconfClass *klass)
+                                      PROP_LOGIND_HANDLE_LID_SWITCH,
+                                      g_param_spec_boolean (LOGIND_HANDLE_LID_SWITCH,
+                                                            NULL, NULL,
+-                                                           TRUE,
++                                                           FALSE,
+                                                            G_PARAM_READWRITE));
+ 
+     g_type_class_add_private (klass, sizeof (XfpmXfconfPrivate));

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=8551&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 20:08:01 2014
@@ -3,9 +3,5 @@
 <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>