Merge lp:~azzar1/caffeine/notify into lp:caffeine

[Andrea Azzarone]

Many users complained that caffeine also disables notifications.
If we replace the freedesktop.org specific org.gnome.ScreenSaver with the freedesktop.org specific org.gnome.SessionManager we don't have this problem. I do not know if there is a special reasons for the choice of org.gnome.ScreenSaver but with this patch Caffeine works the same.

We can also add the possibility to choice between the two option: with notification, without notification.

[Marco Trevisan (Treviño) (3v1n0)]

This should be totally merged.

[Andrea Azzarone (azzar1)]

Thanks Marco! I have also add another options in the Preferences Dialog by the witch you can choose if show or not show the notification. The option works only for GNOME for the moment. Unfortunately I do not know whether to go ahead and added support for KDE because the mainteneirs don't answer. How can i do?

[Tommy Brunn (tommybrunn)]

The reason why this is not implemented is because the Notify-OSD specification states that when the screensaver is inhibited, any non-critical notifications should be hidden.

Personally I feel that adding options instead of sane defaults (and in this case, I would say following the specification is the most sane option) is bad software design. That said, we used to get a fair bit of complaints regarding this. Strangely we haven't gotten any such complaints during the last few months.

I'd like input from Isaiah on this before I give you the green light to keep working on this. You should be aware, however, that the option would have to work in any environment that Caffeine currently supports (gnome screensaver, the kde screensaver that I can't remember the name of, xscreensaver and plain DPMS) in order to be merged.

[Andrea Azzarone (azzar1)]

Thanks for the answer!

I write this sample patch becuase a lot of users complained!

I am waiting for reply Isaiah then.

[Reuben Thomas (rrt)]

We're now using freedesktop.org's ScreenSaver API.

Unmerged revisions

366. By a on 2011-02-10

Many users complained that caffeine also disables notifications.
If we replace the freedesktop.org specific org.gnome.ScreenSaver
with the freedesktop.org specific org.gnome.SessionManager
we don't have this problem. I do not know if there is a special
reason for the choice of org.gnome.ScreenSaver but with this patch
Caffeine works the same.

=== modified file 'caffeine/core.py'
--- caffeine/core.py	2011-01-14 20:12:35 +0000
+++ caffeine/core.py	2011-02-14 14:27:36 +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."""