Skip to content

Commit a05cac5

Browse files
committed
Clear up deprecations
Clean up various deprecations raised by the test cases.
1 parent 08f32aa commit a05cac5

File tree

6 files changed

+14
-16
lines changed

6 files changed

+14
-16
lines changed

guake/boxes.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ def set_terminal(self, terminal):
412412
def add_scroll_bar(self):
413413
"""Packs the scrollbar."""
414414
adj = self.terminal.get_vadjustment()
415-
self.scroll = Gtk.VScrollbar(adj)
415+
self.scroll = Gtk.Scrollbar.new(Gtk.Orientation.VERTICAL, adj)
416416
self.scroll.show()
417417
self.pack_start(self.scroll, False, False, 0)
418418

@@ -636,8 +636,8 @@ class TabLabelEventBox(Gtk.EventBox):
636636
def __init__(self, notebook, text, settings):
637637
super().__init__()
638638
self.notebook = notebook
639-
self.box = Gtk.Box(Gtk.Orientation.HORIZONTAL, 0, visible=True)
640-
self.label = Gtk.Label(text, visible=True)
639+
self.box = Gtk.Box(homogeneous=Gtk.Orientation.HORIZONTAL, spacing=0, visible=True)
640+
self.label = Gtk.Label(label=text, visible=True)
641641
self.close_button = Gtk.Button(
642642
image=Gtk.Image.new_from_icon_name("window-close", Gtk.IconSize.MENU),
643643
relief=Gtk.ReliefStyle.NONE,

guake/gsettings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ def default_font_toggled(self, settings, key, user_data):
277277
"""
278278
font_name = None
279279
if settings.get_boolean(key):
280-
gio_settings = Gio.Settings("org.gnome.desktop.interface")
280+
gio_settings = Gio.Settings(schema="org.gnome.desktop.interface")
281281
font_name = gio_settings.get_string("monospace-font-name")
282282
else:
283283
font_name = self.settings.styleFont.get_string("style")
@@ -378,7 +378,7 @@ def fstyle_changed(self, settings, key, user_data):
378378
terminals = self.guake.notebook_manager.iter_terminals()
379379

380380
if self.settings.general.get_boolean("use-default-font"):
381-
gio_settings = Gio.Settings("org.gnome.desktop.interface")
381+
gio_settings = Gio.Settings(schema="org.gnome.desktop.interface")
382382
font_name = gio_settings.get_string("monospace-font-name")
383383
else:
384384
font_name = settings.get_string(key)

guake/guake_app.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
gi.require_version("Gdk", "3.0")
4040
gi.require_version("Keybinder", "3.0")
4141
from gi.repository import GLib
42-
from gi.repository import GObject
4342
from gi.repository import Gdk
4443
from gi.repository import Gio
4544
from gi.repository import Gtk
@@ -86,10 +85,8 @@
8685
# Disable find feature until python-vte hasn't been updated
8786
enable_find = False
8887

89-
GObject.threads_init()
90-
9188
# Setting gobject program name
92-
GObject.set_prgname(NAME)
89+
GLib.set_prgname(NAME)
9390

9491
GDK_WINDOW_STATE_WITHDRAWN = 1
9592
GDK_WINDOW_STATE_ICONIFIED = 2
@@ -308,7 +305,7 @@ def update_visual(self, user_data=None):
308305
self.hide()
309306
self.show()
310307
else:
311-
log.warn("System doesn't support transparency")
308+
log.warning("System doesn't support transparency")
312309
self.window.transparency = False
313310
self.window.set_visual(screen.get_system_visual())
314311

guake/keybindings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ def reload_global(self, settings, key, user_data):
224224
filename,
225225
)
226226
elif key == "show-focus" and not self.guake.hotkeys.bind(value, self.guake.show_focus):
227-
log.warn("can't bind show-focus key")
227+
log.warning("can't bind show-focus key")
228228

229229
def activate(self, window, event):
230230
"""If keystroke matches a key binding, activate keybinding. Otherwise, allow

guake/notebook.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,19 @@ def __init__(self, *args, **kwargs):
6868
GObject.signal_new(
6969
"terminal-spawned",
7070
TerminalNotebook,
71-
GObject.SIGNAL_RUN_LAST,
71+
GObject.SignalFlags.RUN_LAST,
7272
GObject.TYPE_NONE,
7373
(GObject.TYPE_PYOBJECT, GObject.TYPE_INT),
7474
)
7575
GObject.signal_new(
7676
"page-deleted",
7777
TerminalNotebook,
78-
GObject.SIGNAL_RUN_LAST,
78+
GObject.SignalFlags.RUN_LAST,
7979
GObject.TYPE_NONE,
8080
(),
8181
)
8282

83+
8384
self.scroll_callback = NotebookScrollCallback(self)
8485
self.add_events(Gdk.EventMask.SCROLL_MASK)
8586
self.connect("scroll-event", self.scroll_callback.on_scroll)
@@ -511,7 +512,7 @@ def __init__(
511512
GObject.signal_new(
512513
"notebook-created",
513514
self,
514-
GObject.SIGNAL_RUN_LAST,
515+
GObject.SignalFlags.RUN_LAST,
515516
GObject.TYPE_NONE,
516517
(GObject.TYPE_PYOBJECT, GObject.TYPE_INT),
517518
)

guake/terminal.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,13 @@ def add_matches(self):
230230
tag = self.match_add_regex(
231231
Vte.Regex.new_for_match(expr, len(expr), VTE_REGEX_FLAGS), 0
232232
)
233-
self.match_set_cursor_type(tag, Gdk.CursorType.HAND2)
233+
self.match_set_cursor_name(tag, "hand")
234234

235235
for _useless, match, _otheruseless in QUICK_OPEN_MATCHERS:
236236
tag = self.match_add_regex(
237237
Vte.Regex.new_for_match(match, len(match), VTE_REGEX_FLAGS), 0
238238
)
239-
self.match_set_cursor_type(tag, Gdk.CursorType.HAND2)
239+
self.match_set_cursor_name(tag, "hand")
240240
except (
241241
GLib.Error,
242242
AttributeError,

0 commit comments

Comments
 (0)