GLib.Timeout.Add is available as GLib.Functions.TimeoutAddFull() with…

… gir.core
PintaProject · Mar 14, 2023 · 3aac3c5 · 3aac3c5
1 parent ea2295d
commit 3aac3c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/Pinta.Gui.Widgets/Dialogs/SimpleEffectDialog.cs b/Pinta.Gui.Widgets/Dialogs/SimpleEffectDialog.cs
@@ -459,21 +459,19 @@ private static string MakeCaption (string name)
 
 		private void DelayedUpdate (TimeoutHandler handler)
 		{
-#if false // TODO-GTK4
 			if (event_delay_timeout_id != 0) {
 				GLib.Source.Remove (event_delay_timeout_id);
 				if (handler != timeout_func)
 					timeout_func?.Invoke ();
 			}
 
 			timeout_func = handler;
-			event_delay_timeout_id = GLib.Timeout.Add (event_delay_millis, () => {
+			event_delay_timeout_id = GLib.Functions.TimeoutAddFull (0, event_delay_millis, (_) => {
 				event_delay_timeout_id = 0;
 				timeout_func.Invoke ();
 				timeout_func = null;
 				return false;
 			});
-#endif
 		}
 		#endregion
 	}

diff --git a/Pinta/Main.cs b/Pinta/Main.cs
@@ -154,9 +154,8 @@ private static void ExceptionManager_UnhandledException (GLib.UnhandledException
 		/// </summary>
 		static void RegisterForAppleEvents ()
 		{
-#if false // TODO-GTK4
 			MacInterop.ApplicationEvents.Quit += (sender, e) => {
-				GLib.Timeout.Add (10, delegate {
+				GLib.Functions.TimeoutAddFull (0, 10, delegate {
 					PintaCore.Actions.App.Exit.Activate ();
 					return false;
 				});
@@ -165,7 +164,7 @@ static void RegisterForAppleEvents ()
 
 			MacInterop.ApplicationEvents.Reopen += (sender, e) => {
 				var window = PintaCore.Chrome.MainWindow;
-				window.Deiconify ();
+				window.Unminimize ();
 				window.Hide ();
 				window.Show ();
 				window.Present ();
@@ -174,17 +173,16 @@ static void RegisterForAppleEvents ()
 
 			MacInterop.ApplicationEvents.OpenDocuments += (sender, e) => {
 				if (e.Documents != null) {
-					GLib.Timeout.Add (10, delegate {
+					GLib.Functions.TimeoutAddFull (0, 10, delegate {
 						foreach (string filename in e.Documents.Keys) {
 							System.Console.Error.WriteLine ("Opening: {0}", filename);
-							PintaCore.Workspace.OpenFile (Core.GtkExtensions.FileNewForCommandlineArg (filename));
+							PintaCore.Workspace.OpenFile (Gio.FileHelper.NewForCommandlineArg (filename));
 						}
 						return false;
 					});
 				}
 				e.Handled = true;
 			};
-#endif
 		}
 	}
 }