[Telepathy-commits] [multi-jingle/master] Cope with the fact that the conference is no longer a Gst pipeline

[Sjoerd Simons]

---
 multi-jingle-client.py |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/multi-jingle-client.py b/multi-jingle-client.py
index 9ba4716..a2875cc 100644
--- a/multi-jingle-client.py
+++ b/multi-jingle-client.py
@@ -133,13 +133,13 @@ class UI(gtk.Window):
 
         pad = session.source.tee.get_pad("src%d")
 
-        vsink = VideoSink(self.conference)
+        vsink = VideoSink(self.conference.pipeline)
         session.source.add(vsink.sink)
 
         #vsink.sink.set_property("sync", False)
 
-        pad.link(vsink.sink.get_pad("sink"))
         vsink.sink.set_state(gst.STATE_PLAYING)
+        pad.link(vsink.sink.get_pad("sink"))
 
         self.preview_frame.add(vsink)
         vsink.show_all()
@@ -185,16 +185,17 @@ class UI(gtk.Window):
         if type(frame.get_child()) == gtk.Label:
             frame.remove(frame.get_child())
 
-        vsink = VideoSink(self.conference)
+        vsink = VideoSink(self.conference.pipeline)
         frame.add(vsink)
         frame.show_all()
 
         stream.add_sink (vsink.sink)
 
-        self.conference.add(vsink.sink)
-        pad.link(vsink.sink.get_pad("sink"))
+        self.conference.pipeline.add(vsink.sink)
         vsink.sink.set_state(gst.STATE_PLAYING)
 
+        pad.link(vsink.sink.get_pad("sink"))
+
         gtk.gdk.threads_leave()
 
 class Muc:
-- 
1.5.6.5