changeset 50d442d512b5 in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=50d442d512b5 description: make audio work under windows

diffstat:

gajim.nsi | 24 +++++++++++++++++++----- setup_win32.py | 5 +++++ src/common/gajim.py | 4 ++++ src/gajim.py | 6 ++++++ 4 files changed, 34 insertions(+), 5 deletions(-)

diffs (118 lines):

diff -r de9353e7061b -r 50d442d512b5 gajim.nsi --- a/gajim.nsi Sun Mar 09 10:19:24 2014 +0100 +++ b/gajim.nsi Sun Mar 09 10:25:26 2014 +0100 @@ -164,22 +164,29 @@ File "bin\atk.pyd" File "bin\bz2.pyd" File "bin\cairo._cairo.pyd" - File "bin\Crypto.Cipher.AES.pyd" - File "bin\Crypto.Hash.SHA256.pyd" + File "bin\Crypto.Cipher._AES.pyd" + File "bin\Crypto.Cipher._DES.pyd" + File "bin\Crypto.Cipher._DES3.pyd" + File "bin\Crypto.Hash._SHA256.pyd" File "bin\Crypto.Random.OSRNG.winrandom.pyd" File "bin\Crypto.Util._counter.pyd" File "bin\Crypto.Util.strxor.pyd" + File "bin\farstream.pyd" File "bin\gajim.exe" File "bin\gio._gio.pyd" File "bin\glib._glib.pyd" File "bin\gobject._gobject.pyd" File "bin\goocanvas.pyd" + File "bin\gst._gst.pyd" + File "bin\gst.interfaces.pyd" File "bin\gtk._gtk.pyd" File "bin\history_manager.exe" File "bin\OpenSSL.crypto.pyd" File "bin\libeay32.dll" File "bin\libgoocanvas-3.dll" File "bin\library.zip" + File "bin\libxml2mod.pyd" + File "bin\libxmlmods.libxml2mod.pyd" File "bin\pangocairo.pyd" File "bin\pango.pyd" File "bin\pycurl.pyd" @@ -544,20 +551,27 @@ Delete "$INSTDIR\bin\atk.pyd" Delete "$INSTDIR\bin\bz2.pyd" Delete "$INSTDIR\bin\cairo._cairo.pyd" - Delete "$INSTDIR\bin\Crypto.Cipher.AES.pyd" - Delete "$INSTDIR\bin\Crypto.Hash.SHA256.pyd" + Delete "$INSTDIR\bin\Crypto.Cipher._AES.pyd" + Delete "$INSTDIR\bin\Crypto.Cipher._DES.pyd" + Delete "$INSTDIR\bin\Crypto.Cipher._DES3.pyd" + Delete "$INSTDIR\bin\Crypto.Hash._SHA256.pyd" Delete "$INSTDIR\bin\Crypto.Random.OSRNG.winrandom.pyd" Delete "$INSTDIR\bin\Crypto.Util._counter.pyd" - Delete "$INSTDIR\bin\gajim.exe" + Delete "$INSTDIR\bin\farstream.pyd" + Delete "$INSTDIR\bin\gajim.exe" Delete "$INSTDIR\bin\gio._gio.pyd" Delete "$INSTDIR\bin\glib._glib.pyd" Delete "$INSTDIR\bin\gobject._gobject.pyd" Delete "$INSTDIR\bin\goocanvas.pyd" + Delete "$INSTDIR\bin\gst._gst.pyd" + Delete "$INSTDIR\bin\gst.interfaces.pyd" Delete "$INSTDIR\bin\gtk._gtk.pyd" Delete "$INSTDIR\bin\history_manager.exe" Delete "$INSTDIR\bin\libeay32.dll" Delete "$INSTDIR\bin\libgoocanvas-3.dll" Delete "$INSTDIR\bin\library.zip" + Delete "$INSTDIR\bin\libxml2mod.pyd" + Delete "$INSTDIR\bin\libxmlmods.libxml2mod.pyd" Delete "$INSTDIR\bin\OpenSSL.crypto.pyd" Delete "$INSTDIR\bin\OpenSSL.rand.pyd" Delete "$INSTDIR\bin\OpenSSL.SSL.pyd" diff -r de9353e7061b -r 50d442d512b5 setup_win32.py --- a/setup_win32.py Sun Mar 09 10:19:24 2014 +0100 +++ b/setup_win32.py Sun Mar 09 10:25:26 2014 +0100 @@ -44,6 +44,11 @@ 'libgtk-win32-2.0-0.dll', 'libpango-1.0-0.dll', 'libpangowin32-1.0-0.dll', 'libcairo-2.dll', 'libpangocairo-1.0-0.dll', 'libpangoft2-1.0-0.dll', + 'libfarstream-0.1-0.dll', 'libgcc_s_dw2-1.dll', + 'libgstbase-0.10-0.dll', 'libgstcontroller-0.10-0.dll', + 'libgstdataprotocol-0.10-0.dll', 'libgstinterfaces-0.10-0.dll', + 'libgstnet-0.10-0.dll', 'libgstreamer-0.10-0.dll', + 'libiconv-2.dll', 'libxml2.dll', 'libxml2-2.dll', ], } } diff -r de9353e7061b -r 50d442d512b5 src/common/gajim.py --- a/src/common/gajim.py Sun Mar 09 10:19:24 2014 +0100 +++ b/src/common/gajim.py Sun Mar 09 10:25:26 2014 +0100 @@ -28,6 +28,7 @@ ##

import sys +import os import logging import locale

@@ -185,6 +186,9 @@

HAVE_FARSTREAM = True try: + if os.name == 'nt': + os.environ['FS_PLUGIN_PATH'] = 'gtk\lib\farstream-0.1' + os.environ['GST_PLUGIN_PATH'] = 'gtk\lib\gstreamer-0.10' farstream = __import__('farstream') import gst import glib diff -r de9353e7061b -r 50d442d512b5 src/gajim.py --- a/src/gajim.py Sun Mar 09 10:19:24 2014 +0100 +++ b/src/gajim.py Sun Mar 09 10:25:26 2014 +0100 @@ -62,6 +62,12 @@ new_list.insert(0, os.path.join(os.getcwd(), 'gtk', 'bin')) os.environ['PATH'] = ';'.join(new_list)

+ # Needs to be imported very early to not crash Gajim on exit. + try: + __import__('libxml2mod') + except ImportError: + pass + try: import nbxmpp except ImportError: