thomasvs - in flumotion/trunk: . flumotion/admin/gtk flumotion/component/producers/videotest

[flumotion-commit at lists.fluendo.com]

Author: thomasvs
Date: Thu Jan 18 09:43:17 2007
New Revision: 4404

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/admin/gtk/client.py
   flumotion/trunk/flumotion/component/producers/videotest/admin_gtk.py
Log:
	* flumotion/admin/gtk/client.py:
	  pass klass for debugging
	* flumotion/component/producers/videotest/admin_gtk.py:
	  return deferred from setup



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Thu Jan 18 09:43:17 2007
@@ -1,5 +1,12 @@
 2007-01-18  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* flumotion/admin/gtk/client.py:
+	  pass klass for debugging
+	* flumotion/component/producers/videotest/admin_gtk.py:
+	  return deferred from setup
+
+2007-01-18  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* flumotion/common/worker.py:
 	  properly get the interpolatable strings translated
 

Modified: flumotion/trunk/flumotion/admin/gtk/client.py
==============================================================================
--- flumotion/trunk/flumotion/admin/gtk/client.py	(original)
+++ flumotion/trunk/flumotion/admin/gtk/client.py	Thu Jan 18 09:43:17 2007
@@ -321,9 +321,9 @@
         # instantiate the GUIClass
         instance = klass(state, self.admin)
         self.debug("Created entry instance %r" % instance)
-        self._instanceSetup(instance, name)
+        self._instanceSetup(instance, klass, name)
 
-    def _instanceSetup(self, instance, name):
+    def _instanceSetup(self, instance, klass, name):
         self.debug('Setting up instance %r' % instance)
         msg = None
         try:
@@ -782,7 +782,7 @@
             # make a generic ui
             from flumotion.component.base import admin_gtk
             instance = admin_gtk.BaseAdminGtk(state, self.admin)
-            self._instanceSetup(instance, name)
+            self._instanceSetup(instance, admin_gtk.BaseAdminGtk, name)
 
         def gotEntrySleepingComponentErrback(failure):
             failure.trap(errors.SleepingComponentError)

Modified: flumotion/trunk/flumotion/component/producers/videotest/admin_gtk.py
==============================================================================
--- flumotion/trunk/flumotion/component/producers/videotest/admin_gtk.py	(original)
+++ flumotion/trunk/flumotion/component/producers/videotest/admin_gtk.py	Thu Jan 18 09:43:17 2007
@@ -82,6 +82,6 @@
         # FIXME: have constructor take self instead ?
         pattern = PatternNode(self.state, self.admin, title=_("Pattern"))
         self.nodes['Pattern'] = pattern
-        BaseAdminGtk.setup(self)
+        return BaseAdminGtk.setup(self)
 
 GUIClass = VideoTestAdminGtk