From 8dfb1d197ae75c9a435e7e063e1cec96b141a301 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Mon, 30 Mar 2020 17:50:50 +0200
Subject: [PATCH] gtkprivate: Remove g_auto usage

Fixes: 93ab478af12648dc6e501e8f47661971d6e0b795
---
 gtk/gtkprivate.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/gtk/gtkprivate.c b/gtk/gtkprivate.c
index 134d3bbfe1..b3278ccabf 100644
--- a/gtk/gtkprivate.c
+++ b/gtk/gtkprivate.c
@@ -304,10 +304,10 @@ guint
 gtk_get_portal_interface_version (GDBusConnection *connection,
                                   const char      *interface_name)
 {
-  g_autoptr(GDBusProxy) proxy = NULL;
-  g_autoptr(GError) error = NULL;
-  g_autoptr(GVariant) ret = NULL;
-  g_autofree char *owner = NULL;
+  GDBusProxy *proxy = NULL;
+  GError *error = NULL;
+  GVariant *ret = NULL;
+  char *owner = NULL;
   guint version = 0;
 
   proxy = g_dbus_proxy_new_sync (connection,
@@ -323,14 +323,14 @@ gtk_get_portal_interface_version (GDBusConnection *connection,
       if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
         g_warning ("Could not query portal version on interface '%s': %s",
                    interface_name, error->message);
-      return 0;
+      goto out;
     }
 
   owner = g_dbus_proxy_get_name_owner (proxy);
   if (owner == NULL)
     {
       g_debug ("%s not provided by any service", interface_name);
-      return FALSE;
+      goto out;
     }
 
   ret = g_dbus_proxy_get_cached_property (proxy, "version");
@@ -340,6 +340,12 @@ gtk_get_portal_interface_version (GDBusConnection *connection,
   g_debug ("Got version %u for portal interface '%s'",
            version, interface_name);
 
+out:
+  g_clear_object (&proxy);
+  g_clear_error (&error);
+  g_clear_pointer (&ret, g_variant_unref);
+  g_clear_pointer (&owner, g_free);
+
   return version;
 }