[nautilus/wip/cdavis/use-adw-message-dialog] ui-utilities: Use AdwMessageDialog in show_dialog()

[Christopher Davis <christopherdavis src gnome org>]

commit 3e713e9294c84b4e437d18dcba4d442111176a9c
Author: Christopher Davis <christopherdavis gnome org>
Date:   Thu Jul 7 00:28:40 2022 -0400

    ui-utilities: Use AdwMessageDialog in show_dialog()

 src/nautilus-application.c  |  2 +-
 src/nautilus-ui-utilities.c | 22 ++++++----------------
 src/nautilus-ui-utilities.h |  2 +-
 3 files changed, 8 insertions(+), 18 deletions(-)
---
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 081c650d4..feb88798f 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -166,7 +166,7 @@ check_required_directories (NautilusApplication *self)
         GSList *l;
         char *error_string;
         g_autofree char *detail_string = NULL;
-        GtkDialog *dialog;
+        GtkWidget *dialog;
 
         ret = FALSE;
 
diff --git a/src/nautilus-ui-utilities.c b/src/nautilus-ui-utilities.c
index 8e5933ee8..ba69977e6 100644
--- a/src/nautilus-ui-utilities.c
+++ b/src/nautilus-ui-utilities.c
@@ -28,6 +28,7 @@
 
 #include <gio/gio.h>
 #include <gtk/gtk.h>
+#include <libadwaita-1/adwaita.h>
 #include <string.h>
 #include <glib/gi18n.h>
 
@@ -306,7 +307,7 @@ get_text_for_date_range (GPtrArray *date_range,
     return label;
 }
 
-GtkDialog *
+GtkWidget *
 show_dialog (const gchar    *primary_text,
              const gchar    *secondary_text,
              GtkWindow      *parent,
@@ -316,23 +317,12 @@ show_dialog (const gchar    *primary_text,
 
     g_return_val_if_fail (parent != NULL, NULL);
 
-    dialog = gtk_message_dialog_new (parent,
-                                     GTK_DIALOG_MODAL,
-                                     type,
-                                     GTK_BUTTONS_OK,
-                                     "%s", primary_text);
+    dialog = adw_message_dialog_new (parent, primary_text, secondary_text);
+    adw_message_dialog_add_response (ADW_MESSAGE_DIALOG (dialog), "ok", _("_OK"));
 
-    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                              "%s", secondary_text);
+    gtk_window_present (GTK_WINDOW (dialog));
 
-    gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-
-    gtk_widget_show (dialog);
-
-    g_signal_connect (GTK_DIALOG (dialog), "response",
-                      G_CALLBACK (gtk_window_destroy), NULL);
-
-    return GTK_DIALOG (dialog);
+    return dialog;
 }
 
 static void
diff --git a/src/nautilus-ui-utilities.h b/src/nautilus-ui-utilities.h
index d93cb84a9..bfad6ba67 100644
--- a/src/nautilus-ui-utilities.h
+++ b/src/nautilus-ui-utilities.h
@@ -43,7 +43,7 @@ gboolean    nautilus_date_time_is_between_dates     (GDateTime         *date,
 gchar     * get_text_for_date_range                 (GPtrArray         *date_range,
                                                      gboolean           prefix_with_since);
 
-GtkDialog * show_dialog                             (const gchar       *primary_text,
+GtkWidget * show_dialog                             (const gchar       *primary_text,
                                                      const gchar       *secondary_text,
                                                      GtkWindow         *parent,
                                                      GtkMessageType     type);