forked from Mirrors/flatpak-builder
We don't actually need the introspection data in the resource
All the required stuff are in the generated code anyway.tingping/wmclass
parent
d1788ae318
commit
49d84aed94
|
@ -1,17 +1,7 @@
|
||||||
system_helper_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/system-helper/xdg-app.gresource.xml)
|
|
||||||
|
|
||||||
libexec_PROGRAMS += \
|
libexec_PROGRAMS += \
|
||||||
xdg-app-system-helper \
|
xdg-app-system-helper \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
system-helper/xdg-app-resources.h: system-helper/xdg-app.gresource.xml
|
|
||||||
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
|
|
||||||
--target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-header
|
|
||||||
|
|
||||||
system-helper/xdg-app-resources.c: system-helper/xdg-app.gresource.xml $(system_helper_resource_files)
|
|
||||||
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
|
|
||||||
--target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-source
|
|
||||||
|
|
||||||
dbussystemservicedir = $(datadir)/dbus-1/system-services
|
dbussystemservicedir = $(datadir)/dbus-1/system-services
|
||||||
service_in_files += system-helper/org.freedesktop.XdgApp.SystemHelper.service.in
|
service_in_files += system-helper/org.freedesktop.XdgApp.SystemHelper.service.in
|
||||||
dbussystemservice_DATA = system-helper/org.freedesktop.XdgApp.SystemHelper.service
|
dbussystemservice_DATA = system-helper/org.freedesktop.XdgApp.SystemHelper.service
|
||||||
|
@ -22,12 +12,8 @@ dbusconf_DATA = system-helper/org.freedesktop.XdgApp.SystemHelper.conf
|
||||||
service_in_files += system-helper/xdg-app-system-helper.service.in
|
service_in_files += system-helper/xdg-app-system-helper.service.in
|
||||||
systemdsystemunit_DATA = system-helper/xdg-app-system-helper.service
|
systemdsystemunit_DATA = system-helper/xdg-app-system-helper.service
|
||||||
|
|
||||||
EXTRA_DIST += system-helper/xdg-app.gresource.xml
|
|
||||||
|
|
||||||
xdg_app_system_helper_SOURCES = \
|
xdg_app_system_helper_SOURCES = \
|
||||||
system-helper/xdg-app-system-helper.c \
|
system-helper/xdg-app-system-helper.c \
|
||||||
system-helper/xdg-app-resources.h \
|
|
||||||
system-helper/xdg-app-resources.c \
|
|
||||||
lib/xdg-app-error.c \
|
lib/xdg-app-error.c \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,6 @@
|
||||||
#include "lib/xdg-app-error.h"
|
#include "lib/xdg-app-error.h"
|
||||||
|
|
||||||
static PolkitAuthority *authority = NULL;
|
static PolkitAuthority *authority = NULL;
|
||||||
static GDBusNodeInfo *introspection_data = NULL;
|
|
||||||
|
|
||||||
#ifndef glib_autoptr_cleanup_PolkitAuthorizationResult
|
#ifndef glib_autoptr_cleanup_PolkitAuthorizationResult
|
||||||
G_DEFINE_AUTOPTR_CLEANUP_FUNC(PolkitAuthorizationResult, g_object_unref)
|
G_DEFINE_AUTOPTR_CLEANUP_FUNC(PolkitAuthorizationResult, g_object_unref)
|
||||||
|
@ -290,7 +289,6 @@ main (int argc,
|
||||||
{
|
{
|
||||||
guint owner_id;
|
guint owner_id;
|
||||||
GMainLoop *loop;
|
GMainLoop *loop;
|
||||||
GBytes *introspection_bytes;
|
|
||||||
g_autoptr(GError) error = NULL;
|
g_autoptr(GError) error = NULL;
|
||||||
|
|
||||||
setlocale (LC_ALL, "");
|
setlocale (LC_ALL, "");
|
||||||
|
@ -306,11 +304,6 @@ main (int argc,
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
introspection_bytes = g_resources_lookup_data ("/org/freedesktop/XdgApp/org.freedesktop.XdgApp.xml", 0, NULL);
|
|
||||||
g_assert (introspection_bytes != NULL);
|
|
||||||
|
|
||||||
introspection_data = g_dbus_node_info_new_for_xml (g_bytes_get_data (introspection_bytes, NULL), NULL);
|
|
||||||
|
|
||||||
owner_id = g_bus_own_name (G_BUS_TYPE_SYSTEM,
|
owner_id = g_bus_own_name (G_BUS_TYPE_SYSTEM,
|
||||||
"org.freedesktop.XdgApp.SystemHelper",
|
"org.freedesktop.XdgApp.SystemHelper",
|
||||||
G_BUS_NAME_OWNER_FLAGS_NONE,
|
G_BUS_NAME_OWNER_FLAGS_NONE,
|
||||||
|
@ -325,7 +318,5 @@ main (int argc,
|
||||||
|
|
||||||
g_bus_unown_name (owner_id);
|
g_bus_unown_name (owner_id);
|
||||||
|
|
||||||
g_dbus_node_info_unref (introspection_data);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
<?xml version='1.0' encoding='UTF-8'?>
|
|
||||||
<gresources>
|
|
||||||
<gresource prefix='/org/freedesktop/XdgApp'>
|
|
||||||
<file alias="org.freedesktop.XdgApp.xml">data/org.freedesktop.XdgApp.xml</file>
|
|
||||||
</gresource>
|
|
||||||
</gresources>
|
|
Loading…
Reference in New Issue