From ef19590dcb06db4ab5564d4058e713f0658f7074 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Fri, 28 Feb 2014 11:02:26 +0100
Subject: [PATCH] get xid for windows correctly
---
src/chat_control.py | 15 ++++++++++++---
src/dialogs.py | 15 ++++++++++++---
2 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/chat_control.py b/src/chat_control.py
index 97f5d177ca..a5c26ccf19 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -2214,12 +2214,21 @@ class ChatControl(ChatControlBase):
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 --git a/src/dialogs.py b/src/dialogs.py
index 5c2e7f48cb..15eae126d1 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -5345,12 +5345,21 @@ class VoIPCallReceivedDialog(object):
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():
--
GitLab