Gtk4Prep: Replace dialog.run () and dialog.present () where simple (#1756)

jeremypw · web-flow · commit f8441007b427 · 2026-06-27T10:17:38.000-07:00
diff --git a/plugins/spell/spell.vala b/plugins/spell/spell.vala
@@ -72,18 +72,21 @@ public class Scratch.Plugins.Spell: Peas.ExtensionBase, Scratch.Services.Activat
                     }
 
                     if (language_list.length () == 0) {
+                        // This fallback to the LC used but might fail.
+                        spell.set_language (null);
+
                         var dialog = new Granite.MessageDialog (
                             _("No Suitable Dictionaries Were Found"),
                             _("Please install at least one [aspell] dictionary."),
                             new ThemedIcon ("dialog-warning"),
                             Gtk.ButtonsType.CLOSE
                         );
-                        dialog.run ();
-                        dialog.destroy ();
-
-                        // This fallback to the LC used but might fail.
-                        spell.set_language (null);
-
+                        dialog.response.connect (() => {
+                            dialog.destroy ();
+                        });
+                        // The following code does not depend on the dialog response
+                        //so we can just show the dialog
+                        dialog.show ();
                     } else if (!exist_language) {
                         this.lang_dict = language_list.first ().data;
                         spell.set_language (lang_dict);
diff --git a/src/Dialogs/BranchActions/BranchActionDialog.vala b/src/Dialogs/BranchActions/BranchActionDialog.vala
@@ -49,7 +49,8 @@ public class Scratch.Dialogs.BranchActionDialog : Granite.MessageDialog {
 
     public BranchActionDialog (FolderManager.ProjectFolderItem project) {
         Object (
-            project: project
+            project: project,
+            modal: true
         );
     }
 
diff --git a/src/Dialogs/CloneRepositoryDialog.vala b/src/Dialogs/CloneRepositoryDialog.vala
@@ -41,15 +41,15 @@ public class Scratch.Dialogs.CloneRepositoryDialog : Granite.MessageDialog {
     public CloneRepositoryDialog (string _suggested_local_folder, string _suggested_remote) {
         Object (
             suggested_local_folder: _suggested_local_folder,
-            suggested_remote: _suggested_remote
+            suggested_remote: _suggested_remote,
+            modal: true
         );
     }
 
     construct {
         transient_for = ((Gtk.Application)(GLib.Application.get_default ())).get_active_window ();
         image_icon = new ThemedIcon ("git");
         badge_icon = new ThemedIcon ("emblem-downloads");
-        modal = true;
 
         ///TRANSLATORS "Git" is a proper name and must not be translated
         primary_text = _("Create a local clone of a Git repository");
diff --git a/src/Dialogs/CloseProjectsConfirmationDialog.vala b/src/Dialogs/CloseProjectsConfirmationDialog.vala
@@ -26,7 +26,8 @@ public class Scratch.Dialogs.CloseProjectsConfirmationDialog : Granite.MessageDi
             buttons: Gtk.ButtonsType.NONE,
             transient_for: parent,
             n_parents: n_parents,
-            n_children: n_children
+            n_children: n_children,
+            modal: true
         );
     }
 
diff --git a/src/Dialogs/GlobalSearchDialog.vala b/src/Dialogs/GlobalSearchDialog.vala
@@ -44,7 +44,8 @@ public class Scratch.Dialogs.GlobalSearchDialog : Granite.MessageDialog {
             is_repo: is_repo,
             case_sensitive: case_sensitive,
             wholeword: wholeword,
-            use_regex: use_regex
+            use_regex: use_regex,
+            modal: true
         );
     }
 
diff --git a/src/Dialogs/OverwriteUncommittedConfirmationDialog.vala b/src/Dialogs/OverwriteUncommittedConfirmationDialog.vala
@@ -27,14 +27,14 @@ public class Scratch.Dialogs.OverwriteUncommittedConfirmationDialog : Granite.Me
         Object (
             buttons: Gtk.ButtonsType.NONE,
             transient_for: parent,
-            branch_name: new_branch_name
+            branch_name: new_branch_name,
+            modal: true
         );
 
         show_error_details (details);
     }
 
     construct {
-        modal = true;
         image_icon = new ThemedIcon ("dialog-warning");
 
         primary_text = _("There are uncommitted changes in the current branch");
diff --git a/src/Dialogs/RestoreConfirmationDialog.vala b/src/Dialogs/RestoreConfirmationDialog.vala
@@ -21,7 +21,8 @@ public class Scratch.Dialogs.RestoreConfirmationDialog : Granite.MessageDialog {
     public RestoreConfirmationDialog (MainWindow parent) {
         Object (
             buttons: Gtk.ButtonsType.NONE,
-            transient_for: parent
+            transient_for: parent,
+            modal: true
         );
     }
 
diff --git a/src/FolderManager/FileView.vala b/src/FolderManager/FileView.vala
@@ -511,14 +511,18 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
         var dialog = new Gtk.AppChooserDialog (new Gtk.Window (), Gtk.DialogFlags.MODAL, file);
         dialog.deletable = false;
 
-        if (dialog.run () == Gtk.ResponseType.OK) {
-            var app_info = dialog.get_app_info ();
-            if (app_info != null) {
-                Utils.launch_app_with_file (app_info.get_id (), path);
+        dialog.response.connect ((res) => {
+            if (res == Gtk.ResponseType.OK) {
+                var app_info = dialog.get_app_info ();
+                if (app_info != null) {
+                    Utils.launch_app_with_file (app_info.get_id (), path);
+                }
             }
-        }
 
-        dialog.destroy ();
+            dialog.destroy ();
+        });
+
+        dialog.show ();
     }
 
     private void action_execute_contract_with_file_path (SimpleAction action, Variant? param) {
diff --git a/src/FolderManager/ProjectFolderItem.vala b/src/FolderManager/ProjectFolderItem.vala
@@ -397,13 +397,14 @@ namespace Scratch.FolderManager {
                     new ThemedIcon ("git"),
                     Gtk.ButtonsType.CLOSE
                 ) {
-                    badge_icon = new ThemedIcon ("dialog-error")
+                    badge_icon = new ThemedIcon ("dialog-error"),
+                    modal = true
                 };
                 dialog.transient_for = (Gtk.Window)(view.get_toplevel ());
                 dialog.response.connect (() => {
                     dialog.destroy ();
                 });
-                dialog.run ();
+                dialog.show ();
             }
         }
 
diff --git a/src/Services/Document.vala b/src/Services/Document.vala
@@ -1044,7 +1044,8 @@ namespace Scratch.Services {
                 Gtk.ButtonsType.NONE
             ) {
                 badge_icon = new ThemedIcon ("dialog-question"),
-                transient_for = app_instance.active_window
+                transient_for = app_instance.active_window,
+                modal = true
             };
 
             dialog.add_button (_("Ignore"), Gtk.ResponseType.REJECT);
@@ -1077,7 +1078,7 @@ namespace Scratch.Services {
                 });
             });
 
-            dialog.present ();
+            dialog.show ();
         }
 
         private void ask_external_changes (
@@ -1094,8 +1095,8 @@ namespace Scratch.Services {
                     new ThemedIcon ("dialog-warning"),
                     Gtk.ButtonsType.NONE
                 ) {
-                transient_for = app_instance.active_window
-
+                transient_for = app_instance.active_window,
+                modal = true
             };
 
             dialog.add_button (_("Continue"), Gtk.ResponseType.REJECT);
@@ -1153,7 +1154,7 @@ namespace Scratch.Services {
                 });
             });
 
-            dialog.present ();
+            dialog.show ();
         }
         // Set Undo/Redo action sensitive property
         public void check_undoable_actions () {
diff --git a/src/Services/MonitoredRepository.vala b/src/Services/MonitoredRepository.vala
@@ -259,7 +259,7 @@ namespace Scratch.Services {
                 };
 
                 dialog.response.connect (() => {dialog.destroy ();});
-                dialog.present ();
+                dialog.show ();
                 return false;
             }
 
@@ -313,16 +313,17 @@ namespace Scratch.Services {
                     parent,
                     new_branch_name,
                     project_diff
-                );
+                ) {
+                    modal = true
+                };
                 dialog.response.connect ((res) => {
                     dialog.destroy ();
                     if (res == Gtk.ResponseType.ACCEPT) {
                         checkout_branch (new_head_branch, false);
                     }
                 });
 
-                dialog.present ();
-
+                dialog.show ();
                 return false;
             }
 
@@ -342,10 +343,12 @@ namespace Scratch.Services {
                     _("An error occurred while checking out the requested branch"),
                     e.message,
                     "dialog-warning"
-                );
+                ) {
+                    modal = true
+                };
 
                 dialog.response.connect (dialog.destroy);
-                dialog.present ();
+                dialog.show ();
                 return false;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@ public class Scratch.Dialogs.BranchActionDialog : Granite.MessageDialog {`
`49`	`49`
`50`	`50`	`public BranchActionDialog (FolderManager.ProjectFolderItem project) {`
`51`	`51`	`Object (`
`52`		`- project: project`
	`52`	`+ project: project,`
	`53`	`+ modal: true`
`53`	`54`	`);`
`54`	`55`	`}`
`55`	`56`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@ public class Scratch.Dialogs.CloseProjectsConfirmationDialog : Granite.MessageDi`
`26`	`26`	`buttons: Gtk.ButtonsType.NONE,`
`27`	`27`	`transient_for: parent,`
`28`	`28`	`n_parents: n_parents,`
`29`		`- n_children: n_children`
	`29`	`+ n_children: n_children,`
	`30`	`+ modal: true`
`30`	`31`	`);`
`31`	`32`	`}`
`32`	`33`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,8 @@ public class Scratch.Dialogs.GlobalSearchDialog : Granite.MessageDialog {`
`44`	`44`	`is_repo: is_repo,`
`45`	`45`	`case_sensitive: case_sensitive,`
`46`	`46`	`wholeword: wholeword,`
`47`		`- use_regex: use_regex`
	`47`	`+ use_regex: use_regex,`
	`48`	`+ modal: true`
`48`	`49`	`);`
`49`	`50`	`}`
`50`	`51`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@ public class Scratch.Dialogs.RestoreConfirmationDialog : Granite.MessageDialog {`
`21`	`21`	`public RestoreConfirmationDialog (MainWindow parent) {`
`22`	`22`	`Object (`
`23`	`23`	`buttons: Gtk.ButtonsType.NONE,`
`24`		`- transient_for: parent`
	`24`	`+ transient_for: parent,`
	`25`	`+ modal: true`
`25`	`26`	`);`
`26`	`27`	`}`
`27`	`28`