[Telepathy-commits] [mingle/master] Namespace fs2 Conference variables

[Sjoerd Simons]

---
 fs2.py |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fs2.py b/fs2.py
index 898c040..c6f2ee3 100644
--- a/fs2.py
+++ b/fs2.py
@@ -237,16 +237,16 @@ class Conference(gst.Pipeline):
         self.add(self.conf)
         self.set_state(gst.STATE_PLAYING)
 
-        self.sessions = {}
-        self.streams = {}
+        self.fssessions = {}
+        self.fsstreams = {}
 
     def add_stream(self, stream):
-        self.streams[stream.fsstream] = stream
+        self.fsstreams[stream.fsstream] = stream
 
     def create_session(self, type):
         fs = self.conf.new_session(type)
         s = ConferenceSession(self, fs, type)
-        self.sessions[fs] = s
+        self.fssessions[fs] = s
         return s
 
     def create_participant(self, cname):
@@ -266,16 +266,16 @@ class Conference(gst.Pipeline):
         dispatch = { }
 
         dispatch["farsight-codecs-changed"] = \
-            lambda m : self.sessions[m.structure["session"]].codecs_changed()
+            lambda m : self.fssessions[m.structure["session"]].codecs_changed()
 
         dispatch["farsight-new-local-candidate"] = \
             lambda m : \
-                self.streams[m.structure["stream"]].new_local_candidate(
+                self.fsstreams[m.structure["stream"]].new_local_candidate(
                     m.structure["candidate"])
 
         dispatch["farsight-component-state-changed"] = \
             lambda m : \
-                self.streams[m.structure["stream"]].component_state_changed(
+                self.fsstreams[m.structure["stream"]].component_state_changed(
                     m.structure["component"], m.structure["state"])
 
         dispatch["farsight-error"] = \
-- 
1.5.6.5