Skip to content

Commit 44ab559

Browse files
committed
fix: use GLib.Error instead of GError
1 parent f2912dc commit 44ab559

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

halftone/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def show_image_external(self, _action, image_path: GLib.Variant, *args):
100100

101101
try:
102102
image_file = Gio.File.new_for_path(image_path.get_string())
103-
except GLib.GError as e:
103+
except GLib.Error as e:
104104
logging.traceback_error("Failed to construct a new Gio.File object from path.",
105105
exc=e, show_exception=True)
106106
else:
@@ -109,7 +109,7 @@ def show_image_external(self, _action, image_path: GLib.Variant, *args):
109109
def open_image_finish(_, result, *args):
110110
try:
111111
launcher.launch_finish(result)
112-
except GLib.GError as e:
112+
except GLib.Error as e:
113113
if e.code != 2: # 'The portal dialog was dismissed by the user' error
114114
logging.traceback_error("Failed to finish Gtk.FileLauncher procedure.",
115115
exc=e, show_exception=True)

halftone/views/dither_page.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def update_preview_image(self, path: str, output_options: OutputOptions,
183183

184184
try:
185185
self.set_updated_paintable(self.preview_image_path)
186-
except GLib.GError:
186+
except GLib.Error:
187187
self.win.show_error_page()
188188
raise
189189

@@ -199,7 +199,7 @@ def load_preview_image(self, file: Gio.File):
199199

200200
try:
201201
self.set_original_paintable(self.input_image_path)
202-
except GLib.GError:
202+
except GLib.Error:
203203
self.win.show_error_page()
204204
raise
205205

@@ -414,7 +414,7 @@ def on_breakpoint_unapply(self, *args):
414414
def set_original_paintable(self, path: str):
415415
try:
416416
self.original_paintable = Gdk.Texture.new_from_filename(path)
417-
except GLib.GError as e:
417+
except GLib.Error as e:
418418
logging.traceback_error(
419419
"Failed to construct new Gdk.Texture from path.",
420420
exc=e, show_exception=True)
@@ -426,7 +426,7 @@ def set_original_paintable(self, path: str):
426426
def set_updated_paintable(self, path: str):
427427
try:
428428
self.updated_paintable = Gdk.Texture.new_from_filename(path)
429-
except GLib.GError as e:
429+
except GLib.Error as e:
430430
logging.traceback_error(
431431
"Failed to construct new Gdk.Texture from path.",
432432
exc=e, show_exception=True)
@@ -519,7 +519,7 @@ def start_task(self, task: callable, *args): #callback: callable
519519
thread.start()
520520
self.task_id = thread.ident
521521
self.tasks.append(thread)
522-
except GLib.GError:
522+
except GLib.Error:
523523
self.toast_overlay.add_toast(
524524
Adw.Toast(title=_("Failed to load preview image"))
525525
)

halftone/views/main_window.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def setup(self):
9393

9494
def setup_image_dialog(self):
9595
supported_filter = get_file_filter(
96-
_("Supported image formats"), supported_formats
96+
_("Supported image formats"), supported_input_formats
9797
)
9898

9999
filters = Gio.ListStore.new(Gtk.FileFilter)
@@ -111,7 +111,7 @@ def load_image(self, file: Gio.File):
111111
self.show_loading_page()
112112
try:
113113
self.dither_page.load_preview_image(file)
114-
except GLib.GError as e:
114+
except GLib.Error as e:
115115
# TODO: Modify error page for different error codes
116116
if e.code == 3: # Unrecognized image file format
117117
pass

0 commit comments

Comments
 (0)