From 7fb5f2a33e1e7debf2364e00c13c8e80a05ac15e Mon Sep 17 00:00:00 2001
From: Matthew Leeds <matthew.leeds@endlessm.com>
Date: Fri, 7 Dec 2018 12:22:56 -0800
Subject: [PATCH] app: Fix compiler errors with old libpolkit

Make sure we have g_autoptr support for libpolkit types even if we're
compiling against an old version of libpolkit, the same way we do in
system-helper/flatpak-system-helper.c.

Fixes https://github.com/flatpak/flatpak/issues/2401

Closes: #2403
Approved by: matthiasclasen
---
 app/flatpak-main.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/flatpak-main.c b/app/flatpak-main.c
index 8856e19b..1048e38e 100644
--- a/app/flatpak-main.c
+++ b/app/flatpak-main.c
@@ -51,6 +51,10 @@ static char **opt_installations;
 
 static gboolean is_in_complete;
 
+/* Work with polkit before and after autoptr support was added */
+typedef PolkitSubject             AutoPolkitSubject;
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (AutoPolkitSubject, g_object_unref)
+
 typedef struct
 {
   const char *name;
@@ -649,7 +653,7 @@ main (int    argc,
     }
   else
     {
-      g_autoptr(PolkitSubject) subject = NULL;
+      g_autoptr(AutoPolkitSubject) subject = NULL;
       GVariantBuilder opt_builder;
       g_autoptr(GVariant) options = NULL;