7 files changed, 17 insertions, 21 deletions
diff --git a/grc/checks.py b/grc/checks.py
index 40a0b2b270..4b5ce9d316 100755
--- a/grc/checks.py
+++ b/grc/checks.py
@@ -36,11 +36,11 @@ Is the library path environment variable set correctly?
 def die(error, message):
     msg = "{0}\n\n({1})".format(message, error)
     try:
-        import gtk
-        d = gtk.MessageDialog(
-            type=gtk.MESSAGE_ERROR,
-            buttons=gtk.BUTTONS_CLOSE,
-            message_format=msg,
+        from gi.repository import Gtk
+        d = Gtk.MessageDialog(
+            message_type=Gtk.MessageType.ERROR,
+            buttons=Gtk.ButtonsType.CLOSE,
+            text=msg,
         )
         d.set_title(type(error).__name__)
         d.run()
diff --git a/grc/gui/Block.py b/grc/gui/Block.py
index 5efb571456..25435e9866 100644
--- a/grc/gui/Block.py
+++ b/grc/gui/Block.py
@@ -19,9 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 from __future__ import absolute_import
 import math
-import gi
-gi.require_version('Gtk', '3.0')
-gi.require_version('PangoCairo', '1.0')
+
 from gi.repository import Gtk, Pango, PangoCairo
 
 from . import Actions, Colors, Utils, Constants
diff --git a/grc/gui/BlockTreeWindow.py b/grc/gui/BlockTreeWindow.py
index f0f81b3757..4e42144c2d 100644
--- a/grc/gui/BlockTreeWindow.py
+++ b/grc/gui/BlockTreeWindow.py
@@ -20,11 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 from __future__ import absolute_import
 import six
 
-import gi
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk
-from gi.repository import Gdk
-from gi.repository import GObject
+from gi.repository import Gtk, Gdk, GObject
 
 from . import Actions, Utils
 from . import Constants
diff --git a/grc/gui/Constants.py b/grc/gui/Constants.py
index 035a7f8ca9..5c55c4180e 100644
--- a/grc/gui/Constants.py
+++ b/grc/gui/Constants.py
@@ -18,8 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 """
 
 from __future__ import absolute_import
-import gi
-gi.require_version('Gtk', '3.0')
+
 from gi.repository import Gtk
 
 from ..core.Constants import *
diff --git a/grc/gui/Utils.py b/grc/gui/Utils.py
index e5d4ccaa35..70adedeef7 100644
--- a/grc/gui/Utils.py
+++ b/grc/gui/Utils.py
@@ -19,8 +19,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 from __future__ import absolute_import
 
-import gi
-gi.require_version('Gtk', '3.0')
 from gi.repository import GLib
 
 from .Constants import POSSIBLE_ROTATIONS, CANVAS_GRID_SIZE
diff --git a/grc/main.py b/grc/main.py
index ff0811e22a..dc84e166d5 100755
--- a/grc/main.py
+++ b/grc/main.py
@@ -19,6 +19,8 @@ import argparse
 
 import gi
 gi.require_version('Gtk', '3.0')
+gi.require_version('PangoCairo', '1.0')
+
 from gi.repository import Gtk
 
 from gnuradio import gr
diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion
index 04a1cb44e7..6130582f35 100755
--- a/grc/scripts/gnuradio-companion
+++ b/grc/scripts/gnuradio-companion
@@ -26,13 +26,16 @@ source_tree_subpath = "/grc/scripts"
 
 if not script_path.endswith(source_tree_subpath):
     # run the installed version
-    from gnuradio.grc.main import main
     from gnuradio.grc import checks
+    checks.do_all()
+    from gnuradio.grc.main import main
+    exit(main())
+
 else:
     print("Running from source tree")
     sys.path.insert(1, script_path[:-len(source_tree_subpath)])
-    from grc.main import main
     from grc import checks
+    checks.do_all()
+    from grc.main import main
+    exit(main())
 
-checks.do_all()
-exit(main())