jdahlin - in flumotion/trunk: . flumotion/admin/text

[flumotion-commit at lists.fluendo.com]

Author: jdahlin
Date: Fri Dec 21 12:49:10 2007
New Revision: 6027

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/admin/text/view.py
Log:
2007-12-21  Johan Dahlin  <johan at gnome.org>

	* flumotion/admin/text/view.py:
	Make sure it works again after some things got moved around



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Fri Dec 21 12:49:10 2007
@@ -1,5 +1,8 @@
 2007-12-21  Johan Dahlin  <johan at gnome.org>
 
+	* flumotion/admin/text/view.py:
+	Make sure it works again after some things got moved around
+
 	* flumotion/admin/connections.py (RecentConnection.__init__): 
 	set the name attribute which is used by the text client
 

Modified: flumotion/trunk/flumotion/admin/text/view.py
==============================================================================
--- flumotion/trunk/flumotion/admin/text/view.py	(original)
+++ flumotion/trunk/flumotion/admin/text/view.py	Fri Dec 21 12:49:10 2007
@@ -226,7 +226,7 @@
             lexicalVariableHack.append(res)
             self.debug("entry for %r of type %s is in file %s and method %s",
                        componentState, type, fileName, methodName)
-            return self.bundleLoader.getBundles(fileName=fileName)
+            return self.admin.bundleLoader.getBundles(fileName=fileName)
 
         def gotBundles(res):
             name, bundlePath = res[-1]
@@ -253,7 +253,7 @@
             if key == 'mood':
                 # this is needed so UIs load if they change to happy
                 # get bundle for component
-                d = self.admin.getEntry(state, 'admin/text')
+                d = self.getEntry(state, 'admin/text')
                 d.addCallback(self.gotEntryCallback, state.get('name'))
                 d.addErrback(self.gotEntryNoBundleErrback, state.get('name'))
                 d.addErrback(self.gotEntrySleepingComponentErrback)
@@ -269,7 +269,7 @@
             component.addListener(self, compStateSet)
 
             # get bundle for component
-            d = self.admin.getEntry(component, 'admin/text')
+            d = self.getEntry(component, 'admin/text')
             d.addCallback(self.gotEntryCallback, name)
             d.addErrback(self.gotEntryNoBundleErrback, name)
             d.addErrback(self.gotEntrySleepingComponentErrback)