From adf4655ea9f4f01ec447e63b2618e32f9d9efe5c Mon Sep 17 00:00:00 2001
From: Sebastian Wick <sebastian.wick@redhat.com>
Date: Fri, 11 Oct 2024 14:08:25 +0200
Subject: [PATCH] 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.
---
 src/meson.build | 1 -
 src/request.h   | 2 --
 src/session.h   | 1 -
 3 files changed, 4 deletions(-)

diff --git a/src/meson.build b/src/meson.build
index 87f7d16fd..12fca8e9b 100644
--- 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
index 20dfd9c57..38d6cc25c 100644
--- 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
index 283543ae6..a8e3b6043 100644
--- 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);