wingo - in flumotion/trunk: . flumotion/component/combiners/switch

[flumotion-commit at lists.fluendo.com]

Author: wingo
Date: Tue Dec  4 17:49:41 2007
New Revision: 5970

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/component/combiners/switch/switch.py
Log:
2007-12-04  Andy Wingo  <wingo at pobox.com>

	* flumotion/component/combiners/switch/switch.py
	(Switch.do_check): Require new switch to avoid locking badness.

Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Tue Dec  4 17:49:41 2007
@@ -1,3 +1,8 @@
+2007-12-04  Andy Wingo  <wingo at pobox.com>
+
+	* flumotion/component/combiners/switch/switch.py
+	(Switch.do_check): Require new switch to avoid locking badness.
+
 2007-12-04  Johan Dahlin  <johan at gnome.org>
 
 	* flumotion/*.py:

Modified: flumotion/trunk/flumotion/component/combiners/switch/switch.py
==============================================================================
--- flumotion/trunk/flumotion/component/combiners/switch/switch.py	(original)
+++ flumotion/trunk/flumotion/component/combiners/switch/switch.py	Tue Dec  4 17:49:41 2007
@@ -175,7 +175,7 @@
             return result.value
 
         self.debug("checking for switch element")
-        d = check.checkPlugin('switch', 'gst-plugins-bad')
+        d = check.checkPlugin('switch', 'gst-plugins-bad', (0, 10, 5, 1))
         d.addCallback(cb)
         return d