From 69b559399d33e6f09a1902c5232a9a7ec385798f Mon Sep 17 00:00:00 2001
From: Julian Bouzas <julian.bouzas@collabora.com>
Date: Fri, 29 Apr 2022 10:43:06 -0400
Subject: [PATCH] modules: move all portal-permissionstore code into one file

---
 modules/meson.build                           |  5 +----
 ...ugin.c => module-portal-permissionstore.c} | 20 ++++++++++++++-----
 .../module-portal-permissionstore/meson.build |  5 -----
 3 files changed, 16 insertions(+), 14 deletions(-)
 rename modules/{module-portal-permissionstore/plugin.c => module-portal-permissionstore.c} (97%)
 delete mode 100644 modules/module-portal-permissionstore/meson.build

diff --git a/modules/meson.build b/modules/meson.build
index 6db7de4e..4930bfae 100644
--- a/modules/meson.build
+++ b/modules/meson.build
@@ -64,15 +64,12 @@ shared_library(
   dependencies : [wp_dep, giounix_dep],
 )
 
-subdir('module-portal-permissionstore')
 shared_library(
   'wireplumber-module-portal-permissionstore',
   [
-    'module-portal-permissionstore/plugin.c',
-    portal_permissionstore_enums,
+    'module-portal-permissionstore.c',
   ],
   c_args : [common_c_args, '-DG_LOG_DOMAIN="m-portal-permissionstore"'],
-  include_directories: portal_permissionstore_includes,
   install : true,
   install_dir : wireplumber_module_dir,
   dependencies : [wp_dep, giounix_dep],
diff --git a/modules/module-portal-permissionstore/plugin.c b/modules/module-portal-permissionstore.c
similarity index 97%
rename from modules/module-portal-permissionstore/plugin.c
rename to modules/module-portal-permissionstore.c
index aa8b8f9e..c4098747 100644
--- a/modules/module-portal-permissionstore/plugin.c
+++ b/modules/module-portal-permissionstore.c
@@ -6,15 +6,11 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "plugin.h"
-#include "portal-permissionstore-enums.h"
+#include <wp/wp.h>
 
 #define DBUS_INTERFACE_NAME "org.freedesktop.impl.portal.PermissionStore"
 #define DBUS_OBJECT_PATH "/org/freedesktop/impl/portal/PermissionStore"
 
-G_DEFINE_TYPE (WpPortalPermissionStorePlugin, wp_portal_permissionstore_plugin,
-    WP_TYPE_PLUGIN)
-
 enum
 {
   ACTION_GET_DBUS,
@@ -26,6 +22,20 @@ enum
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
+struct _WpPortalPermissionStorePlugin
+{
+  WpPlugin parent;
+
+  WpDbus *dbus;
+  guint signal_id;
+};
+
+G_DECLARE_FINAL_TYPE (WpPortalPermissionStorePlugin,
+    wp_portal_permissionstore_plugin, WP, PORTAL_PERMISSIONSTORE_PLUGIN,
+    WpPlugin)
+G_DEFINE_TYPE (WpPortalPermissionStorePlugin, wp_portal_permissionstore_plugin,
+    WP_TYPE_PLUGIN)
+
 static gpointer
 wp_portal_permissionstore_plugin_get_dbus (WpPortalPermissionStorePlugin *self)
 {
diff --git a/modules/module-portal-permissionstore/meson.build b/modules/module-portal-permissionstore/meson.build
deleted file mode 100644
index a3c1a252..00000000
--- a/modules/module-portal-permissionstore/meson.build
+++ /dev/null
@@ -1,5 +0,0 @@
-portal_permissionstore_enums = gnome.mkenums_simple('portal-permissionstore-enums',
-  sources: [ 'plugin.h' ],
-)
-
-portal_permissionstore_includes = include_directories('.')