=== modified file 'caffeine/core.py' --- caffeine/core.py 2011-01-14 20:12:35 +0000 +++ caffeine/core.py 2011-02-10 20:57:39 +0000 @@ -472,7 +472,7 @@ After detection is complete, it will finish the inhibiting process.""" logging.info("Attempting to detect screensaver/powersaving type... (" + str(self.dbusDetectionFailures) + " dbus failures so far)") bus = dbus.SessionBus() - if 'org.gnome.ScreenSaver' in bus.list_names(): + if 'org.gnome.SessionManager' in bus.list_names(): self.screensaverAndPowersavingType = "Gnome" elif 'org.freedesktop.ScreenSaver' in bus.list_names() and \ 'org.freedesktop.PowerManagement.Inhibit' in bus.list_names(): @@ -527,17 +527,17 @@ def _toggleGnome(self): """Toggle the screensaver and powersaving with the interfaces used by Gnome.""" - self._toggleDPMS() bus = dbus.SessionBus() - self.ssProxy = bus.get_object('org.gnome.ScreenSaver', - '/org/gnome/ScreenSaver') + self.ssProxy = bus.get_object('org.gnome.SessionManager', + '/org/gnome/SessionManager') + self.ssProxy_interface = dbus.Interface(self.ssProxy, "org.gnome.SessionManager") if self.sleepIsPrevented: if self.screenSaverCookie != None: - self.ssProxy.UnInhibit(self.screenSaverCookie) + self.ssProxy_interface.Uninhibit(self.screenSaverCookie) else: - self.screenSaverCookie = self.ssProxy.Inhibit("Caffeine", - "User has requested that Caffeine disable the screen saver") + self.screenSaverCookie = self.ssProxy_interface.Inhibit("Caffeine", 0, + "User has requested that Caffeine disable the screen saver", 8) def _toggleKDE(self): """Toggle the screensaver and powersaving with the interfaces used by KDE."""