[POS-commit] Kiwi/Kiwi Views.py,1.97,1.98

[kiko at async.com.br]

Update of /cvs/Kiwi/Kiwi
In directory anthem:/tmp/cvs-serv973/Kiwi

Modified Files:
	Views.py 
Log Message:
Fixup attach_slave to manage subslaves properly.


Index: Views.py
===================================================================
RCS file: /cvs/Kiwi/Kiwi/Views.py,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- Views.py	16 May 2003 15:12:55 -0000	1.97
+++ Views.py	16 May 2003 22:14:25 -0000	1.98
@@ -493,11 +493,13 @@
         # a main view. We store any slaves we attached ourselves and
         # when a non-gladeslaveview is finally attached to, we trigger
         # attach for the set of subslaves (see on_attach for details)
-        if isinstance(self, GladeSlaveView) and slave not in self._subslaves:
-            self._subslaves.append(slave)
+        if isinstance(self, GladeSlaveView):
+            if slave not in self._subslaves:
+                self._subslaves.append(slave)
+            # otherwise, do nothing
         else:
             # Only GladeSlaveViews should have subslaves!
-            assert not self._subslaves
+            assert not self._subslaves, self._subslaves
             slave.on_attach(self)
 
         # Return placeholder we just removed