wingo - in flumotion/trunk: . flumotion/admin/gtk

[flumotion-commit at lists.fluendo.com]

Author: wingo
Date: Wed Jan 24 16:36:12 2007
New Revision: 4437

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/admin/gtk/client.py
Log:
2007-01-24  Andy Wingo  <wingo at pobox.com>

	* flumotion/admin/gtk/client.py (Window.setPlanetState): Accept
	the first flow instead of rejecting any flow not named 'default'.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Wed Jan 24 16:36:12 2007
@@ -1,3 +1,8 @@
+2007-01-24  Andy Wingo  <wingo at pobox.com>
+
+	* flumotion/admin/gtk/client.py (Window.setPlanetState): Accept
+	the first flow instead of rejecting any flow not named 'default'.
+
 2007-01-24  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* flumotion/component/component.py:

Modified: flumotion/trunk/flumotion/admin/gtk/client.py
==============================================================================
--- flumotion/trunk/flumotion/admin/gtk/client.py	(original)
+++ flumotion/trunk/flumotion/admin/gtk/client.py	Wed Jan 24 16:36:12 2007
@@ -469,16 +469,12 @@
     def setPlanetState(self, planetState):
         def flowStateAppend(state, key, value):
             self.debug('flow state append: key %s, value %r' % (key, value))
-            if state.get('name') != 'default':
-                return
             if key == 'components':
                 self._components[value.get('name')] = value
                 # FIXME: would be nicer to do this incrementally instead
                 self.update_components()
 
         def flowStateRemove(state, key, value):
-            if state.get('name') != 'default':
-                return
             if key == 'components':
                 self._remove_component(value)
 
@@ -494,9 +490,11 @@
 
         def planetStateAppend(state, key, value):
             if key == 'flows':
-                if value.get('name') != 'default':
+                if value != state.get('flows')[0]:
+                    self.warning('flumotion-admin can only handle one '
+                                 'flow, ignoring /%s', value.get('name'))
                     return
-                self.debug('default flow started')
+                self.debug('%s flow started', value.get('name'))
                 value.addListener(self, append=flowStateAppend,
                                   remove=flowStateRemove)
                 for c in value.get('components'):
@@ -521,7 +519,7 @@
             atmosphereStateAppend(a, 'components', c)
             
         for f in planetState.get('flows'):
-            planetStateAppend(f, 'flows', f)
+            planetStateAppend(planetState, 'flows', f)
  
     def stateSet(self, state, key, value):
         # called by model when state of something changes