Gtk: Add gi.require_version to specify versions.

Use gi.require_version before import to ensure that the right
versions of libraries get loaded.

Resolves: rhbz#1433943

anaconda

@@ -465,6 +465,9 @@ def setupLoggingFromOpts(options):
         anaconda_log.logger.updateRemote(options.syslog)
 
 def gtk_warning(title, reason):
+    import gi
+    gi.require_version("Gtk", "3.0")
+
     from gi.repository import Gtk
     dialog = Gtk.MessageDialog(type=Gtk.MessageType.ERROR,
                                buttons=Gtk.ButtonsType.CLOSE,

pyanaconda/exception.py

@@ -44,6 +44,9 @@
 from pyanaconda import startup_utils
 from pyanaconda import product
 
+import gi
+gi.require_version("GLib", "2.0")
+
 from gi.repository import GLib
 
 import logging
@@ -106,6 +109,7 @@ def handleException(self, dump_info):
             sys.exit(0)
         else:
             try:
+                gi.require_version("Gtk", "3.0")
                 from gi.repository import Gtk
 
                 # XXX: Gtk stopped raising RuntimeError if it fails to

pyanaconda/keyboard.py

@@ -37,6 +37,9 @@
 from pyanaconda.constants import DEFAULT_VC_FONT, DEFAULT_KEYBOARD
 from pyanaconda.flags import can_touch_runtime_system
 
+import gi
+gi.require_version("GLib", "2.0")
+
 from gi.repository import GLib
 
 import logging

pyanaconda/network.py

@@ -47,6 +47,9 @@
 from pyanaconda.i18n import _
 from pyanaconda.regexes import HOSTNAME_PATTERN_WITHOUT_ANCHORS, IBFT_CONFIGURED_DEVICE_NAME
 
+import gi
+gi.require_version("NM", "1.0")
+
 from gi.repository import NetworkManager
 # Register the types so that the use in threads is safe
 NetworkManager.State # pylint: disable=pointless-statement

pyanaconda/nm.py

@@ -19,8 +19,13 @@
 # Red Hat Author(s): Radek Vykydal <rvykydal@redhat.com>
 #
 
-from gi.repository import Gio, GLib
+import gi
+gi.require_version("GLib", "2.0")
+gi.require_version("Gio", "2.0")
+gi.require_version("NM", "1.0")
+gi.require_version("NetworkManager", "1.0")
 
+from gi.repository import Gio, GLib
 from gi.repository import NetworkManager
 # Register the types so that the use in threads is safe
 NetworkManager.ActiveConnectionState # pylint: disable=pointless-statement

pyanaconda/packaging/rpmostreepayload.py

@@ -26,6 +26,11 @@
 from pyanaconda import iutil
 from pyanaconda.i18n import _
 from pyanaconda.progress import progressQ
+
+import gi
+gi.require_version("GLib", "2.0")
+gi.require_version("Gio", "2.0")
+
 from gi.repository import GLib
 from gi.repository import Gio
 
@@ -127,6 +132,7 @@ def install(self):
         mainctx.push_thread_default()
 
         cancellable = None
+        gi.require_version("OSTree", "1.0")
         from gi.repository import OSTree
         ostreesetup = self.data.ostreesetup
         log.info("executing ostreesetup=%r", ostreesetup)
@@ -249,6 +255,7 @@ def recreateInitrds(self, force=False):
     def postInstall(self):
         super(RPMOSTreePayload, self).postInstall()
 
+        gi.require_version("OSTree", "1.0")
         from gi.repository import OSTree
         cancellable = None
 

pyanaconda/safe_dbus.py

@@ -20,8 +20,13 @@
 
 """Module providing thread-safe and mainloop-safe DBus operations."""
 
-import os
+import gi
+gi.require_version("GLib", "2.0")
+gi.require_version("Gio", "2.0")
+
 from gi.repository import GLib, Gio
+
+import os
 from pyanaconda.constants import DEFAULT_DBUS_TIMEOUT
 
 DBUS_PROPS_IFACE = "org.freedesktop.DBus.Properties"

pyanaconda/screensaver.py

@@ -20,6 +20,10 @@
 #
 
 from pyanaconda import safe_dbus
+
+import gi
+gi.require_version("GLib", "2.0")
+
 from gi.repository import GLib
 
 import logging

pyanaconda/ui/gui/__init__.py

@@ -23,6 +23,15 @@
 
 from contextlib import contextmanager
 
+import gi
+gi.require_version("Gdk", "3.0")
+gi.require_version("Gtk", "3.0")
+gi.require_version("AnacondaWidgets", "3.0")
+gi.require_version("Keybinder", "3.0")
+gi.require_version("GdkPixbuf", "2.0")
+gi.require_version("GLib", "2.0")
+gi.require_version("GObject", "2.0")
+
 from gi.repository import Gdk, Gtk, AnacondaWidgets, Keybinder, GdkPixbuf, GLib, GObject
 
 from pyanaconda.i18n import _

pyanaconda/ui/gui/helpers.py

@@ -26,6 +26,10 @@
 log = logging.getLogger("anaconda")
 
 from abc import ABCMeta, abstractproperty, abstractmethod
+
+import gi
+gi.require_version("Gtk", "3.0")
+
 from gi.repository import Gtk
 
 from pyanaconda.ui.helpers import InputCheck, InputCheckHandler

pyanaconda/ui/gui/hubs/__init__.py

@@ -18,6 +18,8 @@
 #
 # Red Hat Author(s): Chris Lumens <clumens@redhat.com>
 #
+import gi
+gi.require_version("GLib", "2.0")
 
 from gi.repository import GLib
 
@@ -102,6 +104,9 @@ def __init__(self, data, storage, payload, instclass):
         self._spokeAutostepIndex = 0
 
     def _createBox(self):
+        gi.require_version("Gtk", "3.0")
+        gi.require_version("AnacondaWidgets", "3.0")
+
         from gi.repository import Gtk, AnacondaWidgets
         from pyanaconda.ui.gui.utils import setViewportBackground
 
@@ -345,6 +350,7 @@ def refresh(self):
     ### SIGNAL HANDLERS
 
     def _on_spoke_clicked(self, selector, event, spoke):
+        gi.require_version("Gdk", "3.0")
         from gi.repository import Gdk
 
         # This handler only runs for these two kinds of events, and only for

pyanaconda/ui/gui/hubs/progress.py

@@ -21,6 +21,10 @@
 
 from __future__ import division
 
+import gi
+gi.require_version("GLib", "2.0")
+gi.require_version("Gtk", "3.0")
+
 from gi.repository import GLib, Gtk
 
 import itertools

pyanaconda/ui/gui/spokes/advstorage/iscsi.py

@@ -21,6 +21,10 @@
 
 from IPy import IP
 from collections import namedtuple
+
+import gi
+gi.require_version("GLib", "2.0")
+
 from gi.repository import GLib
 
 from pyanaconda import constants

pyanaconda/ui/gui/spokes/custom.py

@@ -89,6 +89,11 @@
 from pyanaconda.ui.gui.utils import really_hide, really_show, GtkActionList, timed_action
 from pyanaconda.ui.categories.system import SystemCategory
 
+import gi
+gi.require_version("Gtk", "3.0")
+gi.require_version("Gdk", "3.0")
+gi.require_version("AnacondaWidgets", "3.0")
+
 from gi.repository import Gdk, Gtk
 from gi.repository.AnacondaWidgets import MountpointSelector
 

pyanaconda/ui/gui/spokes/datetime_spoke.py

@@ -22,6 +22,12 @@
 import logging
 log = logging.getLogger("anaconda")
 
+import gi
+gi.require_version("GLib", "2.0")
+gi.require_version("Gdk", "3.0")
+gi.require_version("Gtk", "3.0")
+gi.require_version("TimezoneMap", "1.0")
+
 from gi.repository import GLib, Gdk, Gtk, TimezoneMap
 
 from pyanaconda.ui.communication import hubQ

pyanaconda/ui/gui/spokes/filter.py

@@ -18,6 +18,8 @@
 #
 # Red Hat Author(s): Chris Lumens <clumens@redhat.com>
 #
+import gi
+gi.require_version("Gtk", "3.0")
 
 from gi.repository import Gtk
 

pyanaconda/ui/gui/spokes/keyboard.py

@@ -19,6 +19,10 @@
 # Red Hat Author(s): Chris Lumens <clumens@redhat.com>
 #                    Vratislav Podzimek <vpodzime@redhat.com>
 #
+import gi
+gi.require_version("Gkbd", "3.0")
+gi.require_version("Gdk", "3.0")
+gi.require_version("Gtk", "3.0")
 
 from gi.repository import Gkbd, Gdk, Gtk
 

pyanaconda/ui/gui/spokes/langsupport.py

@@ -19,6 +19,9 @@
 # Red Hat Author(s): Radek Vykydal <rvykydal@redhat.com>
 #                    Vratislav Podzimek <vpodzime@redhat.com>
 #
+import gi
+gi.require_version("Pango", "1.0")
+gi.require_version("Gdk", "3.0")
 
 from gi.repository import Pango, Gdk
 from pyanaconda.flags import flags

pyanaconda/ui/gui/spokes/lib/accordion.py

@@ -26,6 +26,10 @@
 from pyanaconda.ui.gui.utils import escape_markup, really_hide, really_show
 from pyanaconda.storage_utils import AUTOPART_CHOICES
 
+import gi
+gi.require_version("AnacondaWidgets", "3.0")
+gi.require_version("Gtk", "3.0")
+
 from gi.repository.AnacondaWidgets import MountpointSelector
 from gi.repository import Gtk
 
@@ -208,6 +212,7 @@ def _mountpointType(self, mountpoint):
             return DATA_DEVICE
 
     def _onSelectorClicked(self, selector, event, cb):
+        gi.require_version("Gdk", "3.0")
         from gi.repository import Gdk
 
         if event and not event.type in [Gdk.EventType.BUTTON_PRESS, Gdk.EventType.KEY_RELEASE, Gdk.EventType.FOCUS_CHANGE]:

pyanaconda/ui/gui/spokes/lib/cart.py

@@ -19,6 +19,8 @@
 # Red Hat Author(s): David Lehman <dlehman@redhat.com>
 #                    Chris Lumens <clumens@redhat.com>
 #
+import gi
+gi.require_version("Gtk", "3.0")
 
 from gi.repository import Gtk
 

pyanaconda/ui/gui/spokes/lib/entropy_dialog.py

@@ -22,6 +22,10 @@
 import time
 import math
 
+import gi
+gi.require_version("Gtk", "3.0")
+gi.require_version("GLib", "2.0")
+
 from gi.repository import Gtk, GLib
 
 from pyanaconda.i18n import P_

pyanaconda/ui/gui/spokes/lib/lang_locale_handler.py

@@ -25,6 +25,11 @@
 """
 
 import os
+
+import gi
+gi.require_version("Gtk", "3.0")
+gi.require_version("Pango", "1.0")
+
 from gi.repository import Gtk, Pango
 from pyanaconda import localization
 from pyanaconda.iutil import strip_accents

pyanaconda/ui/gui/spokes/lib/passphrase.py

@@ -19,6 +19,9 @@
 # Red Hat Author(s): David Lehman <dlehman@redhat.com>
 #
 
+import gi
+gi.require_version("Gtk", "3.0")
+
 from gi.repository import Gtk
 
 from pyanaconda.ui.helpers import InputCheck

pyanaconda/ui/gui/spokes/lib/refresh.py

@@ -19,6 +19,9 @@
 # Red Hat Author(s): Chris Lumens <clumens@redhat.com>
 #
 
+import gi
+gi.require_version("GLib", "2.0")
+
 from gi.repository import GLib
 
 from pyanaconda.threads import threadMgr, AnacondaThread

pyanaconda/ui/gui/spokes/lib/resize.py

@@ -22,6 +22,10 @@
 from __future__ import division
 from collections import namedtuple
 
+import gi
+gi.require_version("Gdk", "3.0")
+gi.require_version("Gtk", "3.0")
+
 from gi.repository import Gdk, Gtk
 
 from pyanaconda.i18n import _, C_, N_, P_

pyanaconda/ui/gui/spokes/network.py

@@ -29,7 +29,17 @@
 # - NMClient.CLIENT_WIRELESS_ENABLED callback (hw switch?) - test
 # - nm-c-e run: blocking? logging?
 
+import gi
+gi.require_version("Gtk", "3.0")
+gi.require_version("GLib", "2.0")
+gi.require_version("GObject", "2.0")
+gi.require_version("Pango", "1.0")
+gi.require_version("Gio", "2.0")
+gi.require_version("NM", "1.0")
+gi.require_version("NMClient", "1.0")
+
 from gi.repository import Gtk
+from gi.repository import GLib, GObject, Pango, Gio, NetworkManager, NMClient
 
 from pyanaconda.flags import can_touch_runtime_system
 from pyanaconda.i18n import _, N_, C_, CN_
@@ -47,7 +57,6 @@
 from pyanaconda import network
 from pyanaconda import nm
 
-from gi.repository import GLib, GObject, Pango, Gio, NetworkManager, NMClient
 import dbus
 import dbus.service
 import string

pyanaconda/ui/gui/spokes/software.py

@@ -18,6 +18,9 @@
 #
 # Red Hat Author(s): Chris Lumens <clumens@redhat.com>
 #
+import gi
+gi.require_version("Gtk", "3.0")
+gi.require_version("Pango", "1.0")
 
 from gi.repository import Gtk, Pango
 

pyanaconda/ui/gui/spokes/source.py

@@ -28,6 +28,10 @@
 
 import os, signal, re
 
+import gi
+gi.require_version("GLib", "2.0")
+gi.require_version("Gtk", "3.0")
+
 from gi.repository import GLib, Gtk
 
 from pyanaconda.flags import flags

pyanaconda/ui/gui/spokes/storage.py

@@ -39,6 +39,11 @@
 
 """
 
+import gi
+gi.require_version("Gdk", "3.0")
+gi.require_version("GLib", "2.0")
+gi.require_version("AnacondaWidgets", "3.0")
+
 from gi.repository import Gdk, GLib, AnacondaWidgets
 
 from pyanaconda.iutil import firstNotNone

pyanaconda/ui/gui/tools/run-spoke.py

@@ -9,6 +9,9 @@
 for p in os.environ.get("ANACONDA_WIDGETS_OVERRIDES", "").split(":"):
     gi.overrides.__path__.insert(0, p)
 
+import gi
+gi.require_version("Gtk", "3.0")
+
 from gi.repository import Gtk
 
 import ctypes