Merge lp:~osomon/elisa/gnome_screensaver_fixes into lp:elisa

[Olivier Tilloy]

This branch (originally submitted for merge against moovida) fixes bug #322719.

The issue was twofold:

1) A wrong assumption that a "status change" message and a "playback ended" message could not be received in a row. Adding a check fixes that.

2) A badly written condition to check whether to (un)inhibit which leaded in successive changes in the inhibition state when seeking in a file.

The careful reviewer will verify that the bug is fixed and that it doesn't introduce any regressions. Music and video playback as well as picture slideshow should be tested. In order to monitor (un)inhibition orders, one can run moovida with ELISA_DEBUG=gnome_screensaver_service:5

[Paul van Tilburg (paulvt)]

I have not reviewed the code, but merged the branch and tested it out when Moovida was idle, playing video, music, pictures. It seems to be fixed!

[Olivier Tilloy (osomon)]

Thanks for the functional review Paul.
Code review, anyone?

Unmerged revisions

1618. By Olivier Tilloy on 2010-02-02

Do not try to un-inhibit if already un-inhibited. D'oh!

1617. By Olivier Tilloy on 2010-02-02

Do not try to un-inhibit twice.

1616. By Olivier Tilloy on 2010-02-02

More debug info.

1615. By Olivier Tilloy on 2010-02-02

Explicit is better than implicit.

=== modified file 'elisa-plugins/elisa/plugins/gnome/gnome_screensaver_service.py'
--- elisa-plugins/elisa/plugins/gnome/gnome_screensaver_service.py	2009-11-09 15:44:51 +0000
+++ elisa-plugins/elisa/plugins/gnome/gnome_screensaver_service.py	2010-05-14 14:39:29 +0000
@@ -106,9 +106,9 @@
 
         def cleaned(r):
             common.application.bus.unregister(self._components_loaded)
-            if self._pm_cookie:
-                d = self._un_inhibit()
-                return d
+            if self._pm_cookie is not None:
+                return self._un_inhibit()
+
         dfr.addCallback(cleaned)
         return dfr
 
@@ -153,12 +153,15 @@
         self.debug("connected to players")
 
     def _playback_ended(self, player):
+        self.debug('%s ended playback' % player)
         # just unInhibit
-        self._un_inhibit()
+        if self._pm_cookie is not None:
+            self._un_inhibit()
 
     def _player_status_cb(self, player, status):
         self.debug("%s changed state to %s" % (player, status))
-        if status == player.PLAYING and not self._pm_cookie:
-            self._inhibit('playing media')
-        elif self._pm_cookie:
+        if status == player.PLAYING:
+            if self._pm_cookie is None:
+                self._inhibit('playing media')
+        elif self._pm_cookie is not None:
             self._un_inhibit()