move incoming and outgoing video stream in chat window when we receive the video call.

This commit is contained in:
Yann Leboulanger 2013-07-06 21:27:30 +02:00
parent 689e2581c5
commit 44513b912e
1 changed files with 17 additions and 0 deletions

View File

@ -5238,6 +5238,23 @@ class VoIPCallReceivedDialog(object):
if audio and not audio.negotiated:
ctrl.set_audio_state('connecting', self.sid)
if video and not video.negotiated:
video_hbox = ctrl.xml.get_object('video_hbox')
video_hbox.set_no_show_all(False)
if gajim.config.get('video_see_self'):
fixed = ctrl.xml.get_object('outgoing_fixed')
fixed.set_no_show_all(False)
video_hbox.show_all()
in_xid = ctrl.xml.get_object('incoming_drawingarea').window.xid
out_xid = ctrl.xml.get_object('outgoing_drawingarea').window.xid
content = session.get_content('video')
# move outgoing stream to chat window
if gajim.config.get('video_see_self'):
b = content.pipeline.get_by_name('bin2')
c = b.get_by_name('autovideosink0')
d = c.get_by_name('autovideosink0-actual-sink-xvimage')
d.set_xwindow_id(out_xid)
content.out_xid = out_xid
content.in_xid = in_xid
ctrl.set_video_state('connecting', self.sid)
# Now, accept the content/sessions.
# This should be done after the chat control is running