Merge lp:~laney/exaile/logind-shutdown into lp:exaile/3.4.x

[Iain Lane]

ConsoleKit is deprecated; we should use logind to shut the computer down if we can.

[Dustin Spicuzza (dustin-virtualroadside)]

I apologize for reviewing this way after the merge was proposed.

I'm showing my ignorance here, but some questions come to mind about this:
- Is logind supported on all computers that ConsoleKit was found on? Or should we have something that uses both?
- Why shouldn't we use both interfaces, or do a detect of some kind to see if one or the other is there, and use the appropriate one?

Thanks!

[Dustin Spicuzza (dustin-virtualroadside)]

Oh, never mind. I missed that. You did try to use both interfaces.

Sigh. More sleep required. :)

=== modified file 'plugins/shutdown/__init__.py'
--- plugins/shutdown/__init__.py	2012-10-03 04:43:15 +0000
+++ plugins/shutdown/__init__.py	2013-05-01 23:37:33 +0000
@@ -118,17 +118,22 @@
         bus = dbus.SystemBus()
 
         try:
-            proxy = bus.get_object('org.freedesktop.ConsoleKit',
-                '/org/freedesktop/ConsoleKit/Manager')
-            proxy.Stop(dbus_interface='org.freedesktop.ConsoleKit.Manager')
+            proxy = bus.get_object('org.freedesktop.login1',
+                '/org/freedesktop/login1')
+            proxy.PowerOff(False, dbus_interface='org.freedesktop.login1.Manager')
         except dbus.exceptions.DBusException:
             try:
-                proxy = bus.get_object('org.freedesktop.Hal',
-                    '/org/freedesktop/Hal/devices/computer')
-                proxy.Shutdown(dbus_interface='org.freedesktop.Hal.Device.SystemPowerManagement')
+                proxy = bus.get_object('org.freedesktop.ConsoleKit',
+                    '/org/freedesktop/ConsoleKit/Manager')
+                proxy.Stop(dbus_interface='org.freedesktop.ConsoleKit.Manager')
             except dbus.exceptions.DBusException:
-                self.message.show_warning(_('Shutdown failed'),
-                    _('Computer could not be shutdown using D-Bus.'))
+                try:
+                    proxy = bus.get_object('org.freedesktop.Hal',
+                        '/org/freedesktop/Hal/devices/computer')
+                    proxy.Shutdown(dbus_interface='org.freedesktop.Hal.Device.SystemPowerManagement')
+                except dbus.exceptions.DBusException:
+                    self.message.show_warning(_('Shutdown failed'),
+                        _('Computer could not be shutdown using D-Bus.'))
 
     def destroy(self):
         """