[file-roller/wip/gtk4: 19/54] gtk4: use libadwaita

[Paolo Bacchilega <paobac src gnome org>]

commit 518c5182ce9481bf4fc36890e368330d6c7d0ca7
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Fri Sep 30 10:26:06 2022 +0200

    gtk4: use libadwaita

 meson.build          |  1 +
 src/fr-application.c | 13 +++++++------
 src/fr-application.h |  3 ++-
 src/meson.build      |  1 +
 4 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/meson.build b/meson.build
index 3e0c93e4..3bc7fbd5 100644
--- a/meson.build
+++ b/meson.build
@@ -34,6 +34,7 @@ gthread_dep = dependency('gthread-2.0')
 gtk_dep = dependency('gtk4', version: gtk4_version)
 libportal_dep = dependency('libportal', version: '>= 0.5', required: use_native_appchooser)
 libportal_gtk4_dep = dependency('libportal-gtk4', version: '>= 0.5', required: use_native_appchooser)
+libadwaita_dep = dependency('libadwaita-1')
 
 # Optional dependencies
 gobject_introspection_dep = dependency('gobject-introspection-1.0', required: get_option('introspection'))
diff --git a/src/fr-application.c b/src/fr-application.c
index 9c09aed4..b5ba14e4 100644
--- a/src/fr-application.c
+++ b/src/fr-application.c
@@ -365,7 +365,7 @@ static const GDBusInterfaceVTable interface_vtable = {
 
 
 struct _FrApplication {
-       GtkApplication  parent_instance;
+       AdwApplication  parent_instance;
        GDBusNodeInfo  *introspection_data;
        guint           owner_id;
        GSettings      *listing_settings;
@@ -373,7 +373,7 @@ struct _FrApplication {
 };
 
 
-G_DEFINE_TYPE (FrApplication, fr_application, GTK_TYPE_APPLICATION)
+G_DEFINE_TYPE (FrApplication, fr_application, ADW_TYPE_APPLICATION)
 
 
 static void
@@ -750,10 +750,11 @@ fr_application_init (FrApplication *self)
 GtkApplication *
 fr_application_new (void)
 {
-        return g_object_new (fr_application_get_type (),
-                             "application-id", "org.gnome.FileRoller",
-                             "flags", G_APPLICATION_HANDLES_COMMAND_LINE,
-                             NULL);
+       return g_object_new (fr_application_get_type (),
+                            "application-id", "org.gnome.FileRoller",
+                            "flags", G_APPLICATION_HANDLES_COMMAND_LINE,
+                            "resource-base-path", "/org/gnome/FileRoller/",
+                            NULL);
 }
 
 
diff --git a/src/fr-application.h b/src/fr-application.h
index 5cbee481..ac556720 100644
--- a/src/fr-application.h
+++ b/src/fr-application.h
@@ -24,8 +24,9 @@
 #define FR_APPLICATION_H
 
 #include <gtk/gtk.h>
+#include <adwaita.h>
 
-G_DECLARE_FINAL_TYPE (FrApplication, fr_application, FR, APPLICATION, GtkApplication)
+G_DECLARE_FINAL_TYPE (FrApplication, fr_application, FR, APPLICATION, AdwApplication)
 
 GtkApplication * fr_application_new           (void);
 
diff --git a/src/meson.build b/src/meson.build
index 4a9682a6..edc66164 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -133,6 +133,7 @@ fr_exe = executable(
     glib_dep,
     gthread_dep,
     gtk_dep,
+    libadwaita_dep,
     use_native_appchooser ? libportal_dep : [],
     use_native_appchooser ? libportal_gtk4_dep : [],
     build_introspection ? gobject_introspection_dep : [],