build: Generate autocleanup functions for portal impls

We manually defined the autocleanup functions for some of the portal impl dbus proxy classes which conflicts with the generated autocleanup functions from GDBus. This commit removes those manual definitions and turns on the GDBus generated autocleanups.
flatpak · Oct 11, 2024 · 1e1d6c0 · 1e1d6c0
1 parent de8c331
commit 1e1d6c0
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 4 deletions.
diff --git a/src/meson.build b/src/meson.build
@@ -13,7 +13,6 @@ impl_built_sources = gnome.gdbus_codegen(
   interface_prefix: 'org.freedesktop.impl.portal',
   namespace: 'XdpDbusImpl',
   docbook: 'portal',
-  autocleanup: 'none',
 )
 background_monitor_built_sources = gnome.gdbus_codegen(
   'xdp-background-dbus',

diff --git a/src/request.h b/src/request.h
@@ -78,8 +78,6 @@ void request_export (Request *request,
 void request_unexport (Request *request);
 void close_requests_for_sender (const char *sender);
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (XdpDbusImplRequest, g_object_unref)
-
 void request_set_impl_request (Request *request,
                                XdpDbusImplRequest *impl_request);
 

diff --git a/src/session.h b/src/session.h
@@ -71,7 +71,6 @@ IS_SESSION (gpointer ptr)
 }
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (Session, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (XdpDbusImplSession, g_object_unref)
 
 const char * lookup_session_token (GVariant *options);
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,6 @@ IS_SESSION (gpointer ptr) @@
     }
     G_DEFINE_AUTOPTR_CLEANUP_FUNC (Session, g_object_unref)
-    G_DEFINE_AUTOPTR_CLEANUP_FUNC (XdpDbusImplSession, g_object_unref)
     const char * lookup_session_token (GVariant *options);
@@ Expand Down @@