sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

Drop local g_autoptr definitions for generated code

Browse source 
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.
This commit is contained in:
Emmanuele Bassi 2016-05-03 08:54:46 +01:00
parent aeda556af1
commit 5f5d8f4091
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -52,7 +52,7 @@ AC_HEADER_STDC
PKG_PROG_PKG_CONFIG([0.21]) PKG_PROG_PKG_CONFIG([0.21])
# Sets GLIB_GENMARSHAL and GLIB_MKENUMS # 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=libcanberra-gtk3
CANBERRA_GTK_VERSION=0.26 CANBERRA_GTK_VERSION=0.26

7
src/backends/native/meta-launcher.c
View file

@ -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(GUdevClient, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevEnumerator, 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 struct _MetaLauncher
{ {
Login1Session *session_proxy; Login1Session *session_proxy;