Merge lp:~ballogy/docky/systemd-support into lp:docky

[Balló György]

This change adds the following improvements for the Session Manager plugin:

1. Add support for reboot and power off with systemd-logind[1]. ConsoleKit is deprecated now, and no longer available on Arch Linux.

2. Fix GNOME Session support. gnome-session-save has been renamed to gnome-session-quit, and the parameters are changed.

3 Fix missing icon on the restart dialog. "system-restart" is not available in gnome-icon-theme 3.6, so the general fallback icon (broken image) displayed instead.

[1] http://www.freedesktop.org/wiki/Software/systemd/logind

[Rico Tzschichholz (ricotz)]

Thanks for this!

There are some things needs to be changed.
It is better to do the icon fixing in another branch since what you have done isn't enough yet.
Use string.Equals for checking equality of strings.
Using "No session bus available" suggests it is a dbus-related problem, so "No consolekit or systemd bus available" is better.

review: Needs Fixing

[lp:~ballogy/docky/systemd-support]

1832. By Balló György on 2012-12-31

Fixes

[Balló György (ballogy)]

Now I changed the things that you mentioned.

[Rico Tzschichholz (ricotz)]

review: Approve

=== modified file 'StandardPlugins/SessionManager/src/SystemManager.cs'
--- StandardPlugins/SessionManager/src/SystemManager.cs	2010-10-09 12:54:14 +0000
+++ StandardPlugins/SessionManager/src/SystemManager.cs	2012-12-31 04:31:20 +0000
@@ -41,6 +41,10 @@
 		const string DeviceKitPowerPath = "/org/freedesktop/DeviceKit/Power";
 		const string DeviceKitPowerIface = "org.freedesktop.DeviceKit.Power";
 
+		const string SystemdName = "org.freedesktop.login1";
+		const string SystemdPath = "/org/freedesktop/login1";
+		const string SystemdIface = "org.freedesktop.login1.Manager";
+
 		const string ConsoleKitName = "org.freedesktop.ConsoleKit";
 		const string ConsoleKitPath = "/org/freedesktop/ConsoleKit/Manager";
 		const string ConsoleKitIface = "org.freedesktop.ConsoleKit.Manager";
@@ -79,6 +83,16 @@
 			event Action Changed;
 		}
 
+		[Interface (SystemdIface)]
+		interface ISystemd
+		{
+			string CanPowerOff ();
+			string CanReboot ();
+
+			void PowerOff (bool interactive);
+			void Reboot (bool interactive);
+		}
+
 		[Interface (ConsoleKitIface)]
 		interface IConsoleKit
 		{
@@ -100,6 +114,7 @@
 		
 		IDeviceKitPower devicekit;
 		IUPower upower;
+		ISystemd systemd;
 		IConsoleKit consolekit;
 		
 		private static SystemManager instance;
@@ -117,7 +132,7 @@
 				SystemBus = Bus.System.GetObject<IBus> ("org.freedesktop.DBus", new ObjectPath ("/org/freedesktop/DBus"));
 				
 				SystemBus.NameOwnerChanged += delegate(string name, string old_owner, string new_owner) {
-					if (name != UPowerName && name != DeviceKitPowerName && name != ConsoleKitName)
+					if (name != UPowerName && name != DeviceKitPowerName && name != SystemdName && name != ConsoleKitName)
 						return;
 
 					Log<SystemManager>.Debug ("DBus services changed, reconnecting now");
@@ -128,6 +143,9 @@
 					if (devicekit != null)
 						devicekit = null;
 
+					if (systemd != null)
+						systemd = null;
+
 					if (consolekit != null)
 						consolekit = null;
 					
@@ -161,7 +179,10 @@
 					Log<SystemManager>.Debug ("Using DeviceKit.Power dbus service");
 				}
 				
-				if (consolekit == null && Bus.System.NameHasOwner (ConsoleKitName)) {
+				if (systemd == null && Bus.System.NameHasOwner (SystemdName)) {
+					systemd = Bus.System.GetObject<ISystemd> (SystemdName, new ObjectPath (SystemdPath));
+					Log<SystemManager>.Debug ("Using login1.Manager dbus service");
+				} else if (consolekit == null && Bus.System.NameHasOwner (ConsoleKitName)) {
 					consolekit = Bus.System.GetObject<IConsoleKit> (ConsoleKitName, new ObjectPath (ConsoleKitPath));
 					Log<SystemManager>.Debug ("Using ConsoleKit.Manager dbus service");
 				}
@@ -261,39 +282,49 @@
 		
 		public bool CanRestart ()
 		{
-			if (consolekit != null)
+			if (systemd != null)
+				return String.Equals (systemd.CanReboot (), "yes");
+			else if (consolekit != null)
 				return consolekit.CanRestart ();
 			
-			Log<SystemManager>.Debug ("No consolekit bus available");
+			Log<SystemManager>.Debug ("No consolekit or systemd bus available");
 			return false;
 		}
 
 		public void Restart ()
 		{
-			if (consolekit != null) {
+			if (systemd != null) {
+				if (String.Equals (systemd.CanReboot (), "yes"))
+					systemd.Reboot (true);
+			} else if (consolekit != null) {
 				if (consolekit.CanRestart ())
 					consolekit.Restart ();
 			} else {
-				Log<SystemManager>.Debug ("No consolekit bus available");
+				Log<SystemManager>.Debug ("No consolekit or systemd bus available");
 			}
 		}
 
 		public bool CanStop ()
 		{
-			if (consolekit != null)
+			if (systemd != null)
+				return String.Equals (systemd.CanPowerOff (), "yes");
+			else if (consolekit != null)
 				return consolekit.CanStop ();
 			
-			Log<SystemManager>.Debug ("No consolekit bus available");
+			Log<SystemManager>.Debug ("No consolekit or systemd bus available");
 			return false;
 		}
 
 		public void Stop ()
 		{
-			if (consolekit != null) {
+			if (systemd != null) {
+				if (String.Equals (systemd.CanPowerOff (), "yes"))
+					systemd.PowerOff (true);
+			} else if (consolekit != null) {
 				if (consolekit.CanStop ())
 					consolekit.Stop ();
 			} else {
-				Log<SystemManager>.Debug ("No consolekit bus available");
+				Log<SystemManager>.Debug ("No consolekit or systemd bus available");
 			}
 		}
 		
@@ -309,12 +340,12 @@
 		
 		public bool CanLogOut ()
 		{
-			return DockServices.System.IsValidExecutable ("gnome-session-save");
+			return DockServices.System.IsValidExecutable ("gnome-session-quit");
 		}
 		
 		public void LogOut ()
 		{
-			DockServices.System.Execute ("gnome-session-save --logout");
+			DockServices.System.Execute ("gnome-session-quit --logout --no-prompt");
 		}
 		
 		public void Dispose ()