From f2bbafeedbe82ff83ad6ed6ef061e820a7a596de Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 2 Mar 2024 14:38:56 -0700 Subject: [PATCH] Move Gtk startup to __init__.py --- gui/__init__.py | 10 +++++++++- gui/startup.py | 7 +------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/gui/__init__.py b/gui/__init__.py index 37b29db..a75e580 100644 --- a/gui/__init__.py +++ b/gui/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2013, 2015 Tom Tromey +# Copyright (C) 2013, 2015, 2024 Tom Tromey # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,11 +15,19 @@ import os.path +import gi + + +gi.require_version("Gtk", "3.0") +gi.require_version("GtkSource", "3.0") +gi.require_version("Notify", "0.7") + self_dir = os.path.abspath(os.path.dirname(__file__)) # Import anything that defines a command or parameter. import gui.commands import gui.framecache + # Hooks in to gdb. import gui.notify import gui.params diff --git a/gui/startup.py b/gui/startup.py index cfb1d84..7cd0d46 100644 --- a/gui/startup.py +++ b/gui/startup.py @@ -1,4 +1,4 @@ -# Copyright (C) 2012, 2013, 2015, 2023 Tom Tromey +# Copyright (C) 2012, 2013, 2015, 2023, 2024 Tom Tromey # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,13 +20,8 @@ import threading import gdb import gi - import gui -gi.require_version("Gtk", "3.0") -gi.require_version("GtkSource", "3.0") -gi.require_version("Notify", "0.7") - from gi.repository import Gdk, GdkPixbuf, GLib, GObject, Gtk, GtkSource (read_pipe, write_pipe) = os.pipe()