← Back to branch summary

~ubuntu-branches/ubuntu/utopic/serpentine/utopic

« back to all changes in this revision

Viewing changes to debian/patches/plugsuspend_new-interface.patch

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2008-03-23 18:08:56 UTC
  • Revision ID: james.westby@ubuntu.com-20080323180856-3kj9x2zktc1s81fb
Tags: 0.9-5ubuntu1
https://launchpad.net/bugs/199014
* Merge from debian unstable, remaining changes (LP: #199014):
  - Use a recommends on gstreamer0.10-plugins-ugly, not a depends
  - Reformat Build-Dep and Build-Dep-Indep so source package builds
  - Modify Maintainer value to match the DebianMaintainerField
    specification.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/plugsuspend_new-interface.patch
 
1
--- serpentine-0.9.orig/serpentine/plugins/plugsuspend.py
 
2
+++ serpentine-0.9/serpentine/plugins/plugsuspend.py
 
3
@@ -28,9 +28,17 @@
 
4
     """
 
5
     def __init__(self):
 
6
         self.bus = dbus.Bus(dbus.Bus.TYPE_SESSION)
 
7
-        self.devobj = self.bus.get_object('org.gnome.PowerManager',
 
8
-                                          '/org/gnome/PowerManager')
 
9
-        self.dev = dbus.Interface(self.devobj, "org.gnome.PowerManager")
 
10
+        try:
 
11
+            self.devobj = self.bus.get_object('org.freedesktop.PowerManagement',
 
12
+                                              '/org/freedesktop/PowerManagement/Inhibit')
 
13
+            self.dev = dbus.Interface(self.devobj, "org.freedesktop.PowerManagement.Inhibit")
 
14
+        except dbus.DBusException:
 
15
+            try:
 
16
+                self.devobj = self.bus.get_object('org.gnome.PowerManager',
 
17
+                                                  '/org/gnome/PowerManager')
 
18
+                self.dev = dbus.Interface(self.devobj, "org.gnome.PowerManager")
 
19
+            except dbus.DBusException:
 
20
+                raise Exception ("No gnome-power-manager running")
 
21
 
 
22
     def on_writing_started(self, app):
 
23
         self.cookie = self.dev.Inhibit('Serpentine', _('Writing audio disc'))