changeset 5dee103853a7 in /home/hg/repos/gajim
branches: gtk3
details:http://hg.gajim.org/gajim?cmd=changeset;node=5dee103853a7
description: better way to set outgoing video in chat window
diffstat:
src/chat_control.py | 8 ++++++--
src/dialogs.py | 17 ++++++++++++-----
2 files changed, 18 insertions(+), 7 deletions(-)
diffs (46 lines):
diff -r 97a7ab5b200f -r 5dee103853a7 src/chat_control.py
--- a/src/chat_control.py Wed Jul 31 18:22:55 2013 +0200
+++ b/src/chat_control.py Wed Jul 31 19:15:42 2013 +0200
@@ -2271,9 +2271,13 @@
if gajim.config.get('video_see_self'):
fixed = self.xml.get_object('outgoing_fixed')
fixed.set_no_show_all(False)
+ video_hbox.show_all()
+ out_xid = self.xml.get_object(
+ 'outgoing_drawingarea').get_window().xid
+ else:
+ out_xid = None
video_hbox.show_all()
- in_xid =
self.xml.get_object('incoming_drawingarea').window.xid
- out_xid =
self.xml.get_object('outgoing_drawingarea').window.xid
+ in_xid =
self.xml.get_object('incoming_drawingarea').get_window().xid
sid = gajim.connections[self.account].start_video(
self.contact.get_full_jid(), in_xid, out_xid)
else:
diff -r 97a7ab5b200f -r 5dee103853a7 src/dialogs.py
--- a/src/dialogs.py Wed Jul 31 18:22:55 2013 +0200
+++ b/src/dialogs.py Wed Jul 31 19:15:42 2013 +0200
@@ -5366,11 +5366,18 @@
if gajim.config.get('video_see_self'):
out_xid = ctrl.xml.get_object('outgoing_drawingarea').\
get_window().xid
- 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
+ b = content.src_bin
+ found = False
+ for e in b.elements():
+ if e.get_name().startswith('autovideosink'):
+ found = True
+ break
+ if found:
+ found = False
+ for f in e.elements():
+ if f.get_name().startswith('autovideosink'):
+ f.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.
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
