copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

get xid for windows correctly

This commit is contained in:
Yann Leboulanger 2014-02-28 11:02:26 +01:00
parent 9437d0ac2f
commit a45d74024d
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/chat_control.py
View File

@ -2253,8 +2253,12 @@ class ChatControl(ChatControlBase):
fixed = self.xml.get_object('outgoing_fixed') fixed = self.xml.get_object('outgoing_fixed')
fixed.set_no_show_all(False) fixed.set_no_show_all(False)
video_hbox.show_all() video_hbox.show_all()
out_xid = self.xml.get_object( if os.name == 'nt':
'outgoing_drawingarea').get_window().xid out_xid = self.xml.get_object(
'outgoing_drawingarea').get_window().handle
else:
out_xid = self.xml.get_object(
'outgoing_drawingarea').get_window().xid
else: else:
out_xid = None out_xid = None
video_hbox.show_all() video_hbox.show_all()

16
src/dialogs.py
View File

@ -5391,13 +5391,21 @@ class VoIPCallReceivedDialog(object):
fixed = ctrl.xml.get_object('outgoing_fixed') fixed = ctrl.xml.get_object('outgoing_fixed')
fixed.set_no_show_all(False) fixed.set_no_show_all(False)
video_hbox.show_all() video_hbox.show_all()
in_xid = ctrl.xml.get_object('incoming_drawingarea').\ if os.name == 'nt':
get_window().xid 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') content = session.get_content('video')
# move outgoing stream to chat window # move outgoing stream to chat window
if gajim.config.get('video_see_self'): if gajim.config.get('video_see_self'):
out_xid = ctrl.xml.get_object('outgoing_drawingarea').\ if os.name == 'nt':
get_window().xid 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 b = content.src_bin
found = False found = False
for e in b.elements(): for e in b.elements():