modules: move all portal-permissionstore code into one file

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],

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)
 {

modules/module-portal-permissionstore/meson.build

@@ -1,5 +0,0 @@
-portal_permissionstore_enums = gnome.mkenums_simple('portal-permissionstore-enums',
-  sources: [ 'plugin.h' ],
-)
-
-portal_permissionstore_includes = include_directories('.')