changeset cee42c275cc2 in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=cee42c275cc2 description: specify module version before importing

diffstat:

src/common/gajim.py | 3 ++- src/common/passwords.py | 2 ++ src/gtkgui_helpers.py | 2 ++ src/notify.py | 2 ++ 4 files changed, 8 insertions(+), 1 deletions(-)

diffs (77 lines):

diff -r 88d74b9f4ea1 -r cee42c275cc2 src/common/gajim.py --- a/src/common/gajim.py Sat Jul 25 21:40:51 2015 +0200 +++ b/src/common/gajim.py Sat Jul 25 22:03:24 2015 +0200 @@ -31,6 +31,7 @@ import os import logging import locale +import gi

from common import config import nbxmpp @@ -188,7 +189,6 @@ if os.name == 'nt': os.environ['FS_PLUGIN_PATH'] = 'gtk\lib\farstream-0.1' os.environ['GST_PLUGIN_PATH'] = 'gtk\lib\gstreamer-0.10' - import gi gi.require_version('Farstream', '0.2') from gi.repository import Farstream gi.require_version('Gst', '1.0') @@ -208,6 +208,7 @@

HAVE_UPNP_IGD = True try: + gi.require_version('GUPnPIgd', '1.0') from gi.repository import GUPnPIgd gupnp_igd = GUPnPIgd.SimpleIgd() except ImportError: diff -r 88d74b9f4ea1 -r cee42c275cc2 src/common/passwords.py --- a/src/common/passwords.py Sat Jul 25 21:40:51 2015 +0200 +++ b/src/common/passwords.py Sat Jul 25 22:03:24 2015 +0200 @@ -30,6 +30,7 @@ from common import gajim from common import kwalletbinding from common.exceptions import GnomeKeyringError +import gi

USER_HAS_LIBSECRET = False USER_HAS_GNOMEKEYRING = False @@ -253,6 +254,7 @@ if gajim.config.get('use_gnomekeyring'): global Secret try: + gi.require_version('Secret', '1') gir = __import__('gi.repository', globals(), locals(), ['Secret'], 0) Secret = gir.Secret diff -r 88d74b9f4ea1 -r cee42c275cc2 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Sat Jul 25 21:40:51 2015 +0200 +++ b/src/gtkgui_helpers.py Sat Jul 25 22:03:24 2015 +0200 @@ -28,6 +28,7 @@ ##

import xml.sax.saxutils +import gi from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf @@ -732,6 +733,7 @@ gajim.config.set('check_if_gajim_is_default', False)

try: + gi.require_version('GConf', '2.0') GConf = importlib.import_module('gi.repository.GConf') # in try because daemon may not be there client = GConf.Client.get_default() diff -r 88d74b9f4ea1 -r cee42c275cc2 src/notify.py --- a/src/notify.py Sat Jul 25 21:40:51 2015 +0200 +++ b/src/notify.py Sat Jul 25 22:03:24 2015 +0200 @@ -46,6 +46,8 @@

USER_HAS_PYNOTIFY = True # user has pynotify module try: + import gi + gi.require_version('Notify', '0.7') from gi.repository import Notify Notify.init('Gajim Notification') except ImportError: