[Telepathy-commits] [mingle/master] Only create new contents if the FsConference didn't have sessions yet

[Sjoerd Simons]

---
 jingle.py |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/jingle.py b/jingle.py
index 89c277a..189f059 100644
--- a/jingle.py
+++ b/jingle.py
@@ -691,10 +691,15 @@ class JingleBaseSession:
 
         assert self.contents == {}
 
-        video = JingleContent(self, "video", farsight.MEDIA_TYPE_VIDEO)
-        audio = JingleContent(self, "audio", farsight.MEDIA_TYPE_AUDIO)
-        self.contents = {video.name: video, audio.name: audio}
-        #self.contents = {audio.name: audio}
+        # If the conference already has sessions then reuse those
+
+        if len(self.conference.sessions) == 0:
+            video = JingleContent(self, "video", farsight.MEDIA_TYPE_VIDEO)
+            audio = JingleContent(self, "audio", farsight.MEDIA_TYPE_AUDIO)
+            self.contents = {video.name: video, audio.name: audio}
+        else:
+            for (name, session) in self.conference.sessions.iteritems():
+                self.contents[name] = JingleContent(self, name, session.type)
 
         deferreds = []
         for c in self.contents.copy().itervalues():
-- 
1.5.6.5