From 5f5d8f4091003b3eb2962c63a573835bb24ec86c Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 3 May 2016 08:54:46 +0100 Subject: [PATCH] Drop local g_autoptr definitions for generated code Sadly, GLib's autoptr cleanup macros cannot be detected by the C pre-processor, because they generate a function. This means that we are forced to bump up the dependency on GLib 2.49, in order to build against a newer version of gdbus-codegen. --- configure.ac | 2 +- src/backends/native/meta-launcher.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index a647fa306..06f5ba5d3 100644 --- a/configure.ac +++ b/configure.ac @@ -52,7 +52,7 @@ AC_HEADER_STDC PKG_PROG_PKG_CONFIG([0.21]) # Sets GLIB_GENMARSHAL and GLIB_MKENUMS -AM_PATH_GLIB_2_0() +AM_PATH_GLIB_2_0([2.49.0]) CANBERRA_GTK=libcanberra-gtk3 CANBERRA_GTK_VERSION=0.26 diff --git a/src/backends/native/meta-launcher.c b/src/backends/native/meta-launcher.c index 2a7b27953..d9d7d8610 100644 --- a/src/backends/native/meta-launcher.c +++ b/src/backends/native/meta-launcher.c @@ -50,13 +50,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevDevice, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevClient, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevEnumerator, g_object_unref) -#ifndef glib_autoptr_cleanup_Login1Session -G_DEFINE_AUTOPTR_CLEANUP_FUNC(Login1Session, g_object_unref) -#endif -#ifndef glib_autoptr_cleanup_Login1Seat -G_DEFINE_AUTOPTR_CLEANUP_FUNC(Login1Seat, g_object_unref) -#endif - struct _MetaLauncher { Login1Session *session_proxy;