[epiphany/wip/exalm/gtk4-cleanups-2: 20/27] window-commands: Stop using gtk_dialog_run() for web apps

[Alexander Mikhaylenko <alexm src gnome org>]

commit 0f2b92e05536eba205ff75d627fe2e866c727d47
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Tue Nov 30 17:18:46 2021 +0500

    window-commands: Stop using gtk_dialog_run() for web apps
    
    This one needed more refactoring than others.

 src/window-commands.c | 180 +++++++++++++++++++++++++++++---------------------
 1 file changed, 103 insertions(+), 77 deletions(-)
---
diff --git a/src/window-commands.c b/src/window-commands.c
index 80aa350e8..917d0db50 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -1360,6 +1360,7 @@ window_cmd_open (GSimpleAction *action,
 
 typedef struct {
   EphyWebView *view;
+  GtkWidget *dialog;
   GtkWidget *image;
   GtkWidget *entry;
   GtkWidget *spinner;
@@ -1709,36 +1710,6 @@ fill_mobile_capable (EphyApplicationDialogData *data)
   ephy_web_view_get_web_app_mobile_capable (data->view, data->cancellable, fill_mobile_capable_cb, data);
 }
 
-static gboolean
-confirm_web_application_overwrite (GtkWindow  *parent,
-                                   const char *title)
-{
-  GtkResponseType response;
-  GtkWidget *dialog;
-
-  dialog = gtk_message_dialog_new (parent,
-                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_QUESTION,
-                                   GTK_BUTTONS_NONE,
-                                   _("A web application named “%s” already exists. Do you want to replace 
it?"),
-                                   title);
-  gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-                          _("Cancel"),
-                          GTK_RESPONSE_CANCEL,
-                          _("Replace"),
-                          GTK_RESPONSE_OK,
-                          NULL);
-  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                            _("An application with the same name already exists. Replacing 
it will "
-                                              "overwrite it."));
-  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
-  response = gtk_dialog_run (GTK_DIALOG (dialog));
-
-  gtk_widget_destroy (dialog);
-
-  return response == GTK_RESPONSE_OK;
-}
-
 static void
 session_bus_ready_cb (GObject      *source,
                       GAsyncResult *res,
@@ -1792,66 +1763,120 @@ ephy_application_dialog_data_free (EphyApplicationDialogData *data)
 }
 
 static void
-dialog_save_as_application_response_cb (GtkDialog                 *dialog,
-                                        gint                       response,
-                                        EphyApplicationDialogData *data)
+save_as_application_proceed (EphyApplicationDialogData *data)
 {
-  if (response == GTK_RESPONSE_OK) {
-    const char *app_name;
-    g_autofree gchar *app_id = NULL;
-    g_autofree gchar *desktop_file = NULL;
-    g_autofree char *message = NULL;
-    GNotification *notification;
-
-    app_name = gtk_entry_get_text (GTK_ENTRY (data->entry));
-    app_id = ephy_web_application_get_app_id_from_name (app_name);
-
-    if (ephy_web_application_exists (app_id)) {
-      if (confirm_web_application_overwrite (GTK_WINDOW (dialog), app_name))
-        ephy_web_application_delete (app_id);
-      else
-        return;
-    }
+  const char *app_name;
+  g_autofree gchar *app_id = NULL;
+  g_autofree gchar *desktop_file = NULL;
+  g_autofree char *message = NULL;
+  GNotification *notification;
+
+  app_name = gtk_entry_get_text (GTK_ENTRY (data->entry));
+  app_id = ephy_web_application_get_app_id_from_name (app_name);
+
+  /* Create Web Application, including a new profile and .desktop file. */
+  desktop_file = ephy_web_application_create (app_id,
+                                              webkit_web_view_get_uri (WEBKIT_WEB_VIEW (data->view)),
+                                              app_name,
+                                              gtk_image_get_pixbuf (GTK_IMAGE (data->image)),
+                                              data->webapp_options);
+
+  if (desktop_file)
+    message = g_strdup_printf (_("The application “%s” is ready to be used"),
+                               app_name);
+  else
+    message = g_strdup_printf (_("The application “%s” could not be created"),
+                               app_name);
 
-    /* Create Web Application, including a new profile and .desktop file. */
-    desktop_file = ephy_web_application_create (app_id,
-                                                webkit_web_view_get_uri (WEBKIT_WEB_VIEW (data->view)),
-                                                app_name,
-                                                gtk_image_get_pixbuf (GTK_IMAGE (data->image)),
-                                                data->webapp_options);
+  notification = g_notification_new (message);
 
-    if (desktop_file)
-      message = g_strdup_printf (_("The application “%s” is ready to be used"),
-                                 app_name);
-    else
-      message = g_strdup_printf (_("The application “%s” could not be created"),
-                                 app_name);
+  if (data->image) {
+    GdkPixbuf *pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (data->image));
 
-    notification = g_notification_new (message);
+    g_notification_set_icon (notification, G_ICON (pixbuf));
+  }
 
-    if (data->image) {
-      GdkPixbuf *pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (data->image));
+  if (desktop_file) {
+    g_autofree char *basename = g_path_get_basename (desktop_file);
 
-      g_notification_set_icon (notification, G_ICON (pixbuf));
-    }
+    /* Translators: Desktop notification when a new web app is created. */
+    g_notification_add_button_with_target (notification, _("Launch"), "app.launch-app", "s", basename);
+    g_notification_set_default_action_and_target (notification, "app.launch-app", "s", basename);
 
-    if (desktop_file) {
-      g_autofree char *basename = g_path_get_basename (desktop_file);
+    ephy_focus_desktop_app (desktop_file);
+  }
 
-      /* Translators: Desktop notification when a new web app is created. */
-      g_notification_add_button_with_target (notification, _("Launch"), "app.launch-app", "s", basename);
-      g_notification_set_default_action_and_target (notification, "app.launch-app", "s", basename);
+  g_notification_set_priority (notification, G_NOTIFICATION_PRIORITY_LOW);
 
-      ephy_focus_desktop_app (desktop_file);
-    }
+  g_application_send_notification (G_APPLICATION (g_application_get_default ()), app_name, notification);
 
-    g_notification_set_priority (notification, G_NOTIFICATION_PRIORITY_LOW);
+  gtk_widget_destroy (GTK_WIDGET (data->dialog));
+  ephy_application_dialog_data_free (data);
+}
 
-    g_application_send_notification (G_APPLICATION (g_application_get_default ()), app_name, notification);
-  }
+static void
+dialog_save_as_application_confirmation_cb (GtkDialog                 *dialog,
+                                            GtkResponseType            response,
+                                            EphyApplicationDialogData *data)
+{
+  const char *app_name;
+  g_autofree gchar *app_id = NULL;
+
+  app_name = gtk_entry_get_text (GTK_ENTRY (data->entry));
+  app_id = ephy_web_application_get_app_id_from_name (app_name);
 
-  ephy_application_dialog_data_free (data);
   gtk_widget_destroy (GTK_WIDGET (dialog));
+
+  if (response == GTK_RESPONSE_OK) {
+    ephy_web_application_delete (app_id);
+    save_as_application_proceed (data);
+  }
+}
+
+static void
+dialog_save_as_application_response_cb (GtkDialog                 *dialog,
+                                        GtkResponseType            response,
+                                        EphyApplicationDialogData *data)
+{
+  const char *app_name;
+  g_autofree gchar *app_id = NULL;
+  GtkWidget *confirmation_dialog;
+
+  if (response != GTK_RESPONSE_OK) {
+    ephy_application_dialog_data_free (data);
+    gtk_widget_destroy (GTK_WIDGET (dialog));
+    return;
+  }
+
+  app_name = gtk_entry_get_text (GTK_ENTRY (data->entry));
+  app_id = ephy_web_application_get_app_id_from_name (app_name);
+
+  if (!ephy_web_application_exists (app_id)) {
+    save_as_application_proceed (data);
+    return;
+  }
+
+  confirmation_dialog =
+    gtk_message_dialog_new (GTK_WINDOW (dialog),
+                            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                            GTK_MESSAGE_QUESTION,
+                            GTK_BUTTONS_NONE,
+                            _("A web application named “%s” already exists. Do you want to replace it?"),
+                            app_name);
+  gtk_dialog_add_buttons (GTK_DIALOG (confirmation_dialog),
+                          _("Cancel"),
+                          GTK_RESPONSE_CANCEL,
+                          _("Replace"),
+                          GTK_RESPONSE_OK,
+                          NULL);
+  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (confirmation_dialog),
+                                            _("An application with the same name already exists. Replacing 
it will "
+                                              "overwrite it."));
+  gtk_dialog_set_default_response (GTK_DIALOG (confirmation_dialog), GTK_RESPONSE_CANCEL);
+
+  g_signal_connect (confirmation_dialog, "response",
+                    G_CALLBACK (dialog_save_as_application_confirmation_cb), data);
+  gtk_window_present (GTK_WINDOW (confirmation_dialog));
 }
 
 void
@@ -1929,6 +1954,7 @@ window_cmd_save_as_application (GSimpleAction *action,
   gtk_style_context_add_class (context, "dim-label");
 
   data = g_new0 (EphyApplicationDialogData, 1);
+  data->dialog = dialog;
   data->view = view;
   data->image = image;
   data->entry = entry;