# HG changeset patch # User Alex Page a.t.page@gmail.com # Date 1591099370 14400 # Tue Jun 02 08:02:50 2020 -0400 # Branch py3 # Node ID 64ee0e070f2298571c9b2656396c653a59e01b67 # Parent d4e064ee05113349c9cfd7006e4f8cf3d5afc52b Fix some GTK errors in mainapp #7923
diff --git a/chirp/ui/mainapp.py b/chirp/ui/mainapp.py --- a/chirp/ui/mainapp.py +++ b/chirp/ui/mainapp.py @@ -898,9 +898,9 @@
# Do this in case the import process is going to take a while # to make sure we process events leading up to this - gtk.gdk.window_process_all_updates() + gtk.gdk.Window.process_all_updates() while gtk.events_pending(): - gtk.main_iteration(False) + gtk.main_iteration_do(False)
if do_import: eset = self.get_current_editorset() @@ -1030,9 +1030,9 @@ # Do this in case the import process is going to take a while # to make sure we process events leading up to this with compat.py3safe(): - gtk.gdk.window_process_all_updates() + gtk.gdk.Window.process_all_updates() while gtk.events_pending(): - gtk.main_iteration(False) + gtk.main_iteration_do(False)
fn = tempfile.mktemp(".csv") try: @@ -1142,9 +1142,9 @@ # Do this in case the import process is going to take a while # to make sure we process events leading up to this with compat.py3safe(): - gtk.gdk.window_process_all_updates() + gtk.gdk.Window.process_all_updates() while gtk.events_pending(): - gtk.main_iteration(False) + gtk.main_iteration_do(False)
fn = tempfile.mktemp(".csv") try: @@ -1316,9 +1316,9 @@
# Do this in case the import process is going to take a while # to make sure we process events leading up to this - gtk.gdk.window_process_all_updates() + gtk.gdk.Window.process_all_updates() while gtk.events_pending(): - gtk.main_iteration(False) + gtk.main_iteration_do(False)
if do_import: eset = self.get_current_editorset() @@ -1379,9 +1379,9 @@
# Do this in case the import process is going to take a while # to make sure we process events leading up to this - gtk.gdk.window_process_all_updates() + gtk.gdk.Window.process_all_updates() while gtk.events_pending(): - gtk.main_iteration(False) + gtk.main_iteration_do(False)
if do_import: eset = self.get_current_editorset()