From 8a8fe7b346e496b4ddf7acb3b54db248d55be7e5 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Fri, 8 Jul 2022 17:22:04 -0300
Subject: [PATCH] restrict-applications-dialog: Use close-request

Instead of delete-event. Pretty straightforward, 1:1 port to this
new signal.
---
 libmalcontent-ui/restrict-applications-dialog.ui |  1 -
 libmalcontent-ui/user-controls.c                 | 12 +++++-------
 libmalcontent-ui/user-controls.ui                |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/libmalcontent-ui/restrict-applications-dialog.ui b/libmalcontent-ui/restrict-applications-dialog.ui
index c729911..2fd728f 100644
--- a/libmalcontent-ui/restrict-applications-dialog.ui
+++ b/libmalcontent-ui/restrict-applications-dialog.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk+" version="3.12"/>
   <template class="MctRestrictApplicationsDialog" parent="AdwPreferencesWindow">
     <property name="title" translatable="yes">Restrict Applications</property>
-    <property name="skip-taskbar-hint">True</property>
     <property name="default-width">500</property>
     <property name="default-height">500</property>
     <property name="search-enabled">False</property>
diff --git a/libmalcontent-ui/user-controls.c b/libmalcontent-ui/user-controls.c
index caea88d..99908b8 100644
--- a/libmalcontent-ui/user-controls.c
+++ b/libmalcontent-ui/user-controls.c
@@ -125,9 +125,8 @@ static void on_restrict_applications_action_activated (GSimpleAction *action,
                                                        GVariant      *param,
                                                        gpointer       user_data);
 
-static gboolean on_restrict_applications_dialog_delete_event_cb (GtkWidget *widget,
-                                                                 GdkEvent  *event,
-                                                                 gpointer   user_data);
+static gboolean on_restrict_applications_dialog_close_request_cb (GtkWidget *widget,
+                                                                  gpointer   user_data);
 
 static void on_set_age_action_activated (GSimpleAction *action,
                                          GVariant      *param,
@@ -601,9 +600,8 @@ on_restrict_applications_action_activated (GSimpleAction *action,
 }
 
 static gboolean
-on_restrict_applications_dialog_delete_event_cb (GtkWidget *widget,
-                                                 GdkEvent  *event,
-                                                 gpointer   user_data)
+on_restrict_applications_dialog_close_request_cb (GtkWidget *widget,
+                                                  gpointer   user_data)
 {
   MctUserControls *self = MCT_USER_CONTROLS (user_data);
 
@@ -1003,7 +1001,7 @@ mct_user_controls_class_init (MctUserControlsClass *klass)
 
   gtk_widget_class_bind_template_callback (widget_class, on_restrict_installation_switch_active_changed_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_restrict_web_browsers_switch_active_changed_cb);
-  gtk_widget_class_bind_template_callback (widget_class, on_restrict_applications_dialog_delete_event_cb);
+  gtk_widget_class_bind_template_callback (widget_class, on_restrict_applications_dialog_close_request_cb);
 }
 
 static void
diff --git a/libmalcontent-ui/user-controls.ui b/libmalcontent-ui/user-controls.ui
index b31eefb..0397527 100644
--- a/libmalcontent-ui/user-controls.ui
+++ b/libmalcontent-ui/user-controls.ui
@@ -133,6 +133,6 @@
     <property name="visible">False</property>
     <property name="modal">True</property>
     <property name="destroy-with-parent">False</property>
-    <signal name="delete-event" handler="on_restrict_applications_dialog_delete_event_cb" />
+    <signal name="close-request" handler="on_restrict_applications_dialog_close_request_cb" />
   </object>
 </interface>