changeset 744f04e46576 in /home/hg/repos/gajim
author: Yann Leboulanger <[email protected]>
branches: gajim_0.16
details:http://hg.gajim.org/gajim?cmd=changeset;node=744f04e46576
description: get xid for windows correctly
diffstat:
src/chat_control.py | 15 ++++++++++++---
src/dialogs.py | 15 ++++++++++++---
2 files changed, 24 insertions(+), 6 deletions(-)
diffs (56 lines):
diff -r 8e3249074a1c -r 744f04e46576 src/chat_control.py
--- a/src/chat_control.py Tue Feb 25 14:37:21 2014 +0100
+++ b/src/chat_control.py Fri Feb 28 11:02:26 2014 +0100
@@ -2214,12 +2214,21 @@
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').\
- window.xid
+ if os.name == 'nt':
+ out_xid = self.xml.get_object(
+ 'outgoing_drawingarea').window.handle
+ else:
+ out_xid = self.xml.get_object(
+ 'outgoing_drawingarea').window.xid
else:
out_xid = None
video_hbox.show_all()
- in_xid =
self.xml.get_object('incoming_drawingarea').window.xid
+ if os.name == 'nt':
+ in_xid = self.xml.get_object('incoming_drawingarea').\
+ window.handle
+ else:
+ in_xid = self.xml.get_object('incoming_drawingarea').\
+ window.xid
sid = gajim.connections[self.account].start_video(
self.contact.get_full_jid(), in_xid, out_xid)
else:
diff -r 8e3249074a1c -r 744f04e46576 src/dialogs.py
--- a/src/dialogs.py Tue Feb 25 14:37:21 2014 +0100
+++ b/src/dialogs.py Fri Feb 28 11:02:26 2014 +0100
@@ -5345,12 +5345,21 @@
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
+ if os.name == 'nt':
+ in_xid = ctrl.xml.get_object('incoming_drawingarea').\
+ window.handle
+ else:
+ in_xid = ctrl.xml.get_object('incoming_drawingarea').\
+ window.xid
content = session.get_content('video')
# move outgoing stream to chat window
if gajim.config.get('video_see_self'):
- out_xid = ctrl.xml.get_object('outgoing_drawingarea').\
- window.xid
+ if os.name == 'nt':
+ out_xid = ctrl.xml.get_object('outgoing_drawingarea').\
+ window.handle
+ else:
+ out_xid = ctrl.xml.get_object('outgoing_drawingarea').\
+ window.xid
b = content.src_bin
found = False
for e in b.elements():
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
