alertdialog: Add a cancellable argumentalert-dialog-show-tweak

Allow passing a cancellable to gtk_alert_dialog_show.

16 files changed, 33 insertions, 26 deletions

diff --git a/demos/constraint-editor/constraint-editor-window.c b/demos/constraint-editor/constraint-editor-window.c
index 7b6042be25..8edbfa4d03 100644
--- a/demos/constraint-editor/constraint-editor-window.c
+++ b/demos/constraint-editor/constraint-editor-window.c
@@ -317,7 +317,8 @@ save_response_cb (GObject *source,
           alert = gtk_alert_dialog_new ("Saving failed");
           gtk_alert_dialog_set_detail (alert, error->message);
           gtk_alert_dialog_show (alert,
-                                 GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))));
+                                 GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))),
+                                 NULL);
           g_object_unref (alert);
           g_error_free (error);
         }
diff --git a/demos/gtk-demo/application.c b/demos/gtk-demo/application.c
index 4570d06452..907436965f 100644
--- a/demos/gtk-demo/application.c
+++ b/demos/gtk-demo/application.c
@@ -37,7 +37,7 @@ show_action_dialog (GSimpleAction *action)
 
   dialog = gtk_alert_dialog_new ("You activated action: \"%s\n",
                                  g_action_get_name (G_ACTION (action)));
-  gtk_alert_dialog_show (dialog, NULL);
+  gtk_alert_dialog_show (dialog, NULL, NULL);
   g_object_unref (dialog);
 }
 
@@ -106,7 +106,7 @@ open_response_cb (GObject *source,
       GtkAlertDialog *alert;
 
       alert = gtk_alert_dialog_new ("Error loading file: \"%s\"", error->message);
-      gtk_alert_dialog_show (alert, NULL);
+      gtk_alert_dialog_show (alert, NULL, NULL);
       g_object_unref (alert);
       g_error_free (error);
     }
diff --git a/demos/gtk-demo/images.c b/demos/gtk-demo/images.c
index af2ceb269c..e9a26206ab 100644
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -87,7 +87,7 @@ progressive_timeout (gpointer data)
 
           dialog = gtk_alert_dialog_new ("Failure reading image file 'alphatest.png': %s",
                                          error->message);
-          gtk_alert_dialog_show (dialog, NULL);
+          gtk_alert_dialog_show (dialog, NULL, NULL);
           g_object_unref (dialog);
           g_error_free (error);
 
@@ -107,7 +107,7 @@ progressive_timeout (gpointer data)
 
           dialog = gtk_alert_dialog_new ("Failed to load image: %s",
                                          error->message);
-          gtk_alert_dialog_show (dialog, NULL);
+          gtk_alert_dialog_show (dialog, NULL, NULL);
           g_object_unref (dialog);
           g_error_free (error);
 
@@ -132,7 +132,7 @@ progressive_timeout (gpointer data)
 
               dialog = gtk_alert_dialog_new ("Failed to load image: %s",
                                              error->message);
-              gtk_alert_dialog_show (dialog, NULL);
+              gtk_alert_dialog_show (dialog, NULL, NULL);
               g_object_unref (dialog);
               g_error_free (error);
 
@@ -160,7 +160,7 @@ progressive_timeout (gpointer data)
 
               dialog = gtk_alert_dialog_new ("Failed to load image: %s",
                                              error->message);
-              gtk_alert_dialog_show (dialog, NULL);
+              gtk_alert_dialog_show (dialog, NULL, NULL);
               g_object_unref (dialog);
               g_error_free (error);
 
@@ -188,7 +188,7 @@ progressive_timeout (gpointer data)
 
           dialog = gtk_alert_dialog_new ("%s",
                                          error->message);
-          gtk_alert_dialog_show (dialog, NULL);
+          gtk_alert_dialog_show (dialog, NULL, NULL);
           g_object_unref (dialog);
           g_error_free (error);
 
diff --git a/demos/gtk-demo/infobar.c b/demos/gtk-demo/infobar.c
index 49cb0701da..7126365be7 100644
--- a/demos/gtk-demo/infobar.c
+++ b/demos/gtk-demo/infobar.c
@@ -27,7 +27,7 @@ on_bar_response (GtkInfoBar *info_bar,
   detail = g_strdup_printf ("Your response has been %d", response_id);
   gtk_alert_dialog_set_detail (dialog, detail);
   g_free (detail);
-  gtk_alert_dialog_show (dialog, GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (info_bar))));
+  gtk_alert_dialog_show (dialog, GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (info_bar))), NULL);
   g_object_unref (dialog);
 }
 
diff --git a/demos/gtk-demo/links.c b/demos/gtk-demo/links.c
index e7ae51d5f1..f77f785928 100644
--- a/demos/gtk-demo/links.c
+++ b/demos/gtk-demo/links.c
@@ -21,7 +21,7 @@ activate_link (GtkWidget  *label,
                                    "The term ‘keynav’ is a shorthand for "
                                    "keyboard navigation and refers to the process of using "
                                    "a program (exclusively) via keyboard input.");
-      gtk_alert_dialog_show (dialog, GTK_WINDOW (gtk_widget_get_root (label)));
+      gtk_alert_dialog_show (dialog, GTK_WINDOW (gtk_widget_get_root (label)), NULL);
       g_object_unref (dialog);
 
       return TRUE;
diff --git a/demos/gtk-demo/listview_applauncher.c b/demos/gtk-demo/listview_applauncher.c
index e35b958731..c08d9d8058 100644
--- a/demos/gtk-demo/listview_applauncher.c
+++ b/demos/gtk-demo/listview_applauncher.c
@@ -124,7 +124,7 @@ activate_cb (GtkListView  *list,
        */
       dialog = gtk_alert_dialog_new ("Could not launch %s", g_app_info_get_display_name (app_info));
       gtk_alert_dialog_set_detail (dialog, error->message);
-      gtk_alert_dialog_show (dialog, GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (list))));
+      gtk_alert_dialog_show (dialog, GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (list))), NULL);
       g_object_unref (dialog);
       g_clear_error (&error);
     }
diff --git a/demos/gtk-demo/printing.c b/demos/gtk-demo/printing.c
index 94f00d1da9..feea008764 100644
--- a/demos/gtk-demo/printing.c
+++ b/demos/gtk-demo/printing.c
@@ -180,7 +180,7 @@ do_printing (GtkWidget *do_widget)
       GtkAlertDialog *dialog;
 
       dialog = gtk_alert_dialog_new ("%s", error->message);
-      gtk_alert_dialog_show (dialog, GTK_WINDOW (do_widget));
+      gtk_alert_dialog_show (dialog, GTK_WINDOW (do_widget), NULL);
       g_object_unref (dialog);
       g_error_free (error);
     }
diff --git a/demos/node-editor/node-editor-window.c b/demos/node-editor/node-editor-window.c
index 89110c64be..56baf00166 100644
--- a/demos/node-editor/node-editor-window.c
+++ b/demos/node-editor/node-editor-window.c
@@ -613,7 +613,8 @@ save_response_cb (GObject *source,
           alert = gtk_alert_dialog_new ("Saving failed");
           gtk_alert_dialog_set_detail (alert, error->message);
           gtk_alert_dialog_show (alert,
-                                 GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))));
+                                 GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))),
+                                 NULL);
           g_object_unref (alert);
           g_error_free (error);
         }
@@ -719,7 +720,9 @@ export_image_response_cb (GObject *source,
           GtkAlertDialog *alert;
 
           alert = gtk_alert_dialog_new ("Exporting to image failed");
-          gtk_alert_dialog_show (alert, GTK_WINDOW (gtk_window_get_transient_for (GTK_WINDOW (dialog))));
+          gtk_alert_dialog_show (alert,
+                                 GTK_WINDOW (gtk_window_get_transient_for (GTK_WINDOW (dialog))),
+                                 NULL);
           g_object_unref (alert);
         }
 
diff --git a/demos/print-editor/print-editor.c b/demos/print-editor/print-editor.c
index 34ed5a894e..42b845bb28 100644
--- a/demos/print-editor/print-editor.c
+++ b/demos/print-editor/print-editor.c
@@ -119,7 +119,7 @@ load_file (GFile *open_filename)
 
           alert = gtk_alert_dialog_new ("Error loading file %s", display_name);
           gtk_alert_dialog_set_detail (alert, "Not valid utf8");
-          gtk_alert_dialog_show (alert, GTK_WINDOW (main_window));
+          gtk_alert_dialog_show (alert, GTK_WINDOW (main_window), NULL);
           g_object_unref (alert);
           g_object_unref (info);
         }
@@ -132,7 +132,7 @@ load_file (GFile *open_filename)
 
       alert = gtk_alert_dialog_new ("Error loading file %s", display_name);
       gtk_alert_dialog_set_detail (alert, error->message);
-      gtk_alert_dialog_show (alert, GTK_WINDOW (main_window));
+      gtk_alert_dialog_show (alert, GTK_WINDOW (main_window), NULL);
       g_object_unref (alert);
       g_object_unref (info);
       g_error_free (error);
@@ -173,7 +173,7 @@ save_file (GFile *save_filename)
 
       alert = gtk_alert_dialog_new ("Error saving to file %s", display_name);
       gtk_alert_dialog_set_detail (alert, error->message);
-      gtk_alert_dialog_show (alert, GTK_WINDOW (main_window));
+      gtk_alert_dialog_show (alert, GTK_WINDOW (main_window), NULL);
       g_object_unref (alert);
       g_error_free (error);
       g_object_unref (info);
@@ -374,7 +374,7 @@ print_done (GtkPrintOperation *op,
       alert = gtk_alert_dialog_new ("Error printing file");
       if (error)
         gtk_alert_dialog_set_detail (alert, error->message);
-      gtk_alert_dialog_show (alert, GTK_WINDOW (main_window));
+      gtk_alert_dialog_show (alert, GTK_WINDOW (main_window), NULL);
       g_object_unref (alert);
     }
   else if (res == GTK_PRINT_OPERATION_RESULT_APPLY)
diff --git a/gtk/gtkalertdialog.c b/gtk/gtkalertdialog.c
index ee40bcf1ee..6473304f8e 100644
--- a/gtk/gtkalertdialog.c
+++ b/gtk/gtkalertdialog.c
@@ -744,6 +744,7 @@ gtk_alert_dialog_choose_finish (GtkAlertDialog  *self,
  * gtk_alert_dialog_show:
  * @self: a `GtkAlertDialog`
  * @parent: (nullable): the parent `GtkWindow`
+ * @cancellable: (nullable): a `GCancellable` to cancel the operation
  *
  * This function shows the alert to the user.
  *
@@ -755,9 +756,10 @@ gtk_alert_dialog_choose_finish (GtkAlertDialog  *self,
  */
 void
 gtk_alert_dialog_show (GtkAlertDialog *self,
-                       GtkWindow      *parent)
+                       GtkWindow      *parent,
+                       GCancellable   *cancellable)
 {
-  gtk_alert_dialog_choose (self, parent, NULL, NULL, NULL);
+  gtk_alert_dialog_choose (self, parent, cancellable, NULL, NULL);
 }
 
 /* }}} */
diff --git a/gtk/gtkalertdialog.h b/gtk/gtkalertdialog.h
index 4263eb9c92..2af9d83c1b 100644
--- a/gtk/gtkalertdialog.h
+++ b/gtk/gtkalertdialog.h
@@ -91,6 +91,7 @@ int             gtk_alert_dialog_choose_finish      (GtkAlertDialog      *self,
 
 GDK_AVAILABLE_IN_4_10
 void            gtk_alert_dialog_show               (GtkAlertDialog      *self,
-                                                     GtkWindow           *parent);
+                                                     GtkWindow           *parent,
+                                                     GCancellable        *cancellable);
 
 G_END_DECLS
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 29b3f4ba37..5c6414faa2 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -673,7 +673,7 @@ error_message (GtkFileChooserWidget *impl,
 
   dialog = gtk_alert_dialog_new ("%s", msg);
   gtk_alert_dialog_set_detail (dialog, detail);
-  gtk_alert_dialog_show (dialog, parent);
+  gtk_alert_dialog_show (dialog, parent, NULL);
   g_object_unref (dialog);
 }
 
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index 8d7d3046ef..c0e1a186ed 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -1395,7 +1395,7 @@ on_end_process_activated (GtkButton         *button,
        */
       dialog = gtk_alert_dialog_new (_("Unable to end process"));
       gtk_alert_dialog_set_detail (dialog, error->message);
-      gtk_alert_dialog_show (dialog, GTK_WINDOW (op->priv->dialog));
+      gtk_alert_dialog_show (dialog, GTK_WINDOW (op->priv->dialog), NULL);
       g_object_unref (dialog);
 
       g_error_free (error);
diff --git a/gtk/gtkshow.c b/gtk/gtkshow.c
index 15c4ee1b11..b52a6cc86d 100644
--- a/gtk/gtkshow.c
+++ b/gtk/gtkshow.c
@@ -169,7 +169,7 @@ show_uri_done (GObject      *object,
 
       dialog = gtk_alert_dialog_new ("%s", _("Could not show link"));
       gtk_alert_dialog_set_detail (dialog, error->message);
-      gtk_alert_dialog_show (dialog, parent);
+      gtk_alert_dialog_show (dialog, parent, NULL);
       g_object_unref (dialog);
 
       g_error_free (error);
diff --git a/gtk/inspector/css-editor.c b/gtk/inspector/css-editor.c
index 6b866e27b8..efb8f65a18 100644
--- a/gtk/inspector/css-editor.c
+++ b/gtk/inspector/css-editor.c
@@ -205,7 +205,7 @@ save_to_file (GtkInspectorCssEditor *ce,
 
       alert = gtk_alert_dialog_new (_("Saving CSS failed"));
       gtk_alert_dialog_set_detail (alert, error->message);
-      gtk_alert_dialog_show (alert, GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (ce))));
+      gtk_alert_dialog_show (alert, GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (ce))), NULL);
       g_object_unref (alert);
       g_error_free (error);
     }
diff --git a/gtk/inspector/recorder.c b/gtk/inspector/recorder.c
index cb8b6b2ca8..c3aca3155d 100644
--- a/gtk/inspector/recorder.c
+++ b/gtk/inspector/recorder.c
@@ -1828,7 +1828,7 @@ render_node_save_response (GObject *source,
 
           alert = gtk_alert_dialog_new (_("Saving RenderNode failed"));
           gtk_alert_dialog_set_detail (alert, error->message);
-          gtk_alert_dialog_show (alert, GTK_WINDOW (gtk_window_get_transient_for (GTK_WINDOW (dialog))));
+          gtk_alert_dialog_show (alert, GTK_WINDOW (gtk_window_get_transient_for (GTK_WINDOW (dialog))), NULL);
           g_object_unref (alert);
           g_error_free (error);
         }