From 2ca42801ebf604a246c0e605b6bfa696d6df0ef1 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sat, 25 Jul 2015 22:03:24 +0200
Subject: [PATCH] specify module version before importing

---
 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 deletion(-)

diff --git a/src/common/gajim.py b/src/common/gajim.py
index b357d1240..a40a26a8b 100644
--- a/src/common/gajim.py
+++ b/src/common/gajim.py
@@ -31,6 +31,7 @@ import sys
 import os
 import logging
 import locale
+import gi
 
 from common import config
 import nbxmpp
@@ -188,7 +189,6 @@ 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'
-    import gi
     gi.require_version('Farstream', '0.2')
     from gi.repository import Farstream
     gi.require_version('Gst', '1.0')
@@ -208,6 +208,7 @@ except (ImportError, ValueError):
 
 HAVE_UPNP_IGD = True
 try:
+    gi.require_version('GUPnPIgd', '1.0')
     from gi.repository import GUPnPIgd
     gupnp_igd = GUPnPIgd.SimpleIgd()
 except ImportError:
diff --git a/src/common/passwords.py b/src/common/passwords.py
index e52450d1e..708ef06f7 100644
--- a/src/common/passwords.py
+++ b/src/common/passwords.py
@@ -30,6 +30,7 @@ import warnings
 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 @@ def get_storage():
         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 --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py
index f35211774..a2de8e7df 100644
--- a/src/gtkgui_helpers.py
+++ b/src/gtkgui_helpers.py
@@ -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 @@ Description=xmpp
             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 --git a/src/notify.py b/src/notify.py
index 1918ed141..bdb0f907f 100644
--- a/src/notify.py
+++ b/src/notify.py
@@ -46,6 +46,8 @@ if dbus_support.supported:
 
 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: