changeset b4648e4208c1 in /home/hg/repos/gajim
author: Yann Leboulanger <[email protected]>
branches:
details:http://hg.gajim.org/gajim?cmd=changeset;node=b4648e4208c1
description: get xid for windows correctly
diffstat:
src/chat_control.py | 8 ++++++--
src/dialogs.py | 16 ++++++++++++----
2 files changed, 18 insertions(+), 6 deletions(-)
diffs (47 lines):
diff -r 0dc84e7d723a -r b4648e4208c1 src/chat_control.py
--- a/src/chat_control.py Mon Feb 24 23:03:04 2014 +0100
+++ b/src/chat_control.py Fri Feb 28 11:02:26 2014 +0100
@@ -2253,8 +2253,12 @@
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
+ if os.name == 'nt':
+ out_xid = self.xml.get_object(
+ 'outgoing_drawingarea').get_window().handle
+ else:
+ out_xid = self.xml.get_object(
+ 'outgoing_drawingarea').get_window().xid
else:
out_xid = None
video_hbox.show_all()
diff -r 0dc84e7d723a -r b4648e4208c1 src/dialogs.py
--- a/src/dialogs.py Mon Feb 24 23:03:04 2014 +0100
+++ b/src/dialogs.py Fri Feb 28 11:02:26 2014 +0100
@@ -5391,13 +5391,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').\
- get_window().xid
+ if os.name == 'nt':
+ in_xid = ctrl.xml.get_object('incoming_drawingarea').\
+ get_window().handle
+ else:
+ in_xid = ctrl.xml.get_object('incoming_drawingarea').\
+ get_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').\
- get_window().xid
+ if os.name == 'nt':
+ out_xid = ctrl.xml.get_object('outgoing_drawingarea').\
+ get_window().handle
+ else:
+ out_xid = ctrl.xml.get_object('outgoing_drawingarea').\
+ get_window().xid
b = content.src_bin
found = False
for e in b.elements():
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits