forked from Mirrors/flatpak-builder
common: Work around new glib codegen autogenerating g_autoptr support
glib master generates g_autoptr support, which causes a multiple declaration conflict. We work around this by using a custom type.tingping/wmclass
parent
131961644d
commit
de9fe1cb6a
|
@ -2215,7 +2215,7 @@ static void
|
||||||
add_monitor_path_args (GPtrArray *argv_array,
|
add_monitor_path_args (GPtrArray *argv_array,
|
||||||
char ***envp_p)
|
char ***envp_p)
|
||||||
{
|
{
|
||||||
g_autoptr(XdgAppSessionHelper) session_helper = NULL;
|
g_autoptr(AutoXdgAppSessionHelper) session_helper = NULL;
|
||||||
g_autofree char *monitor_path = NULL;
|
g_autofree char *monitor_path = NULL;
|
||||||
|
|
||||||
session_helper =
|
session_helper =
|
||||||
|
|
|
@ -284,7 +284,11 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(SoupRequest, g_object_unref)
|
||||||
G_DEFINE_AUTOPTR_CLEANUP_FUNC(SoupURI, soup_uri_free)
|
G_DEFINE_AUTOPTR_CLEANUP_FUNC(SoupURI, soup_uri_free)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
G_DEFINE_AUTOPTR_CLEANUP_FUNC(XdgAppSessionHelper, g_object_unref)
|
/* This uses a weird Auto prefix to avoid conflicts with later added autogenerated autoptr support, per:
|
||||||
|
* https://git.gnome.org/browse/glib/commit/?id=1c6cd5f0a3104aa9b62c7f1d3086181f63e71b59
|
||||||
|
*/
|
||||||
|
typedef XdgAppSessionHelper AutoXdgAppSessionHelper;
|
||||||
|
G_DEFINE_AUTOPTR_CLEANUP_FUNC(AutoXdgAppSessionHelper, g_object_unref)
|
||||||
|
|
||||||
typedef struct XdgAppXml XdgAppXml;
|
typedef struct XdgAppXml XdgAppXml;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue