[Pkg-cli-apps-commits] [SCM] docky branch, master, updated. debian/2.1.4-1-4-gb000924

[Rico Tzschichholz]

The following commit has been merged in the master branch:
commit b00092430f674b835936002958bc4cdbb041df10
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Thu May 2 18:41:48 2013 +0200

    Add 00bzr_logind-suspend-hibernate.diff

diff --git a/debian/changelog b/debian/changelog
index 2132021..cbf6a0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ docky (2.2.0-1) UNRELEASED; urgency=low
     + Error building with mono 3 (LP: #1097805)
     + CPU Monitor Docklet doesn't launch System Monitor in KDE (LP: #779181)
     + Add systemd support for SessionManager
+  * debian/patches:
+    - 00bzr_logind-suspend-hibernate.diff: Add logind support for suspend
+      and hibernate
 
  -- Rico Tzschichholz <ricotz at ubuntu.com>  Thu, 02 May 2013 13:46:58 +0200
 
diff --git a/debian/patches/00bzr_logind-suspend-hibernate.diff b/debian/patches/00bzr_logind-suspend-hibernate.diff
new file mode 100644
index 0000000..1fe204b
--- /dev/null
+++ b/debian/patches/00bzr_logind-suspend-hibernate.diff
@@ -0,0 +1,66 @@
+=== modified file 'StandardPlugins/SessionManager/src/SystemManager.cs'
+--- a/StandardPlugins/SessionManager/src/SystemManager.cs	2012-12-31 04:25:57 +0000
++++ b/StandardPlugins/SessionManager/src/SystemManager.cs	2013-05-02 16:08:57 +0000
+@@ -86,11 +86,15 @@
+ 		[Interface (SystemdIface)]
+ 		interface ISystemd
+ 		{
++			string CanHibernate ();
++			string CanSuspend ();
+ 			string CanPowerOff ();
+ 			string CanReboot ();
+ 
+ 			void PowerOff (bool interactive);
+ 			void Reboot (bool interactive);
++			void Suspend (bool interactive);
++			void Hibernate (bool interactive);
+ 		}
+ 
+ 		[Interface (ConsoleKitIface)]
+@@ -212,7 +216,9 @@
+ 		
+ 		public bool CanHibernate ()
+ 		{
+-			if (upower != null)
++			if (systemd != null)
++				return String.Equals (systemd.CanHibernate (), "yes");
++			else if (upower != null)
+ 				return GetBoolean (upower, UPowerName, "CanHibernate") && upower.HibernateAllowed ();
+ 			else if (devicekit != null)
+ 				return GetBoolean (devicekit, DeviceKitPowerName, "CanHibernate");
+@@ -223,7 +229,10 @@
+ 
+ 		public void Hibernate ()
+ 		{
+-			if (upower != null) {
++			if (systemd != null) {
++				if (String.Equals (systemd.CanHibernate (), "yes"))
++					systemd.Hibernate (true);
++			} else if (upower != null) {
+ 				if (GetBoolean (upower, UPowerName, "CanHibernate") && upower.HibernateAllowed ())
+ 					upower.Hibernate ();
+ 			} else if (devicekit != null) {
+@@ -236,7 +245,9 @@
+ 
+ 		public bool CanSuspend ()
+ 		{
+-			if (upower != null)
++			if (systemd != null)
++				return String.Equals (systemd.CanSuspend (), "yes");
++			else if (upower != null)
+ 				return GetBoolean (upower, UPowerName, "CanSuspend") && upower.SuspendAllowed ();
+ 			else if (devicekit != null)
+ 				return GetBoolean (devicekit, DeviceKitPowerName, "CanSuspend");
+@@ -247,7 +258,10 @@
+ 
+ 		public void Suspend ()
+ 		{
+-			if (upower != null) {
++			if (systemd != null) {
++				if (String.Equals (systemd.CanSuspend (), "yes"))
++					systemd.Suspend (true);
++			} else if (upower != null) {
+ 				if (GetBoolean (upower, UPowerName, "CanSuspend") && upower.SuspendAllowed ())
+ 					upower.Suspend ();
+ 			} else if (devicekit != null) {
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..61fdd79 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+00bzr_logind-suspend-hibernate.diff

-- 
docky