forked from Mirrors/flatpak-builder
No need to put introspection xml in resources
This is already built in to the gdbus codegen code.tingping/wmclass
parent
54af892f3a
commit
4f4b8c536b
|
@ -13,30 +13,16 @@ $(xdp_dbus_built_sources) : data/org.freedesktop.portal.Documents.xml
|
||||||
$(srcdir)/data/org.freedesktop.portal.Documents.xml \
|
$(srcdir)/data/org.freedesktop.portal.Documents.xml \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
xdp_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/document-portal/xdg-document-portal.gresource.xml)
|
|
||||||
|
|
||||||
document-portal/xdp-resources.h: document-portal/xdg-document-portal.gresource.xml
|
|
||||||
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
|
|
||||||
--target=$@ --sourcedir=$(srcdir) --c-name _xdg_document --generate-header
|
|
||||||
|
|
||||||
document-portal/xdp-resources.c: document-portal/xdg-document-portal.gresource.xml $(xdp_resource_files)
|
|
||||||
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
|
|
||||||
--target=$@ --sourcedir=$(srcdir) --c-name _xdg_document --generate-source
|
|
||||||
|
|
||||||
service_in_files += document-portal/xdg-document-portal.service.in
|
service_in_files += document-portal/xdg-document-portal.service.in
|
||||||
systemduserunit_DATA += document-portal/xdg-document-portal.service
|
systemduserunit_DATA += document-portal/xdg-document-portal.service
|
||||||
|
|
||||||
service_in_files += document-portal/org.freedesktop.portal.Documents.service.in
|
service_in_files += document-portal/org.freedesktop.portal.Documents.service.in
|
||||||
dbus_service_DATA += document-portal/org.freedesktop.portal.Documents.service
|
dbus_service_DATA += document-portal/org.freedesktop.portal.Documents.service
|
||||||
|
|
||||||
EXTRA_DIST += document-portal/xdg-document-portal.gresource.xml
|
|
||||||
|
|
||||||
xdg_document_portal_SOURCES = \
|
xdg_document_portal_SOURCES = \
|
||||||
document-portal/xdp-main.c \
|
document-portal/xdp-main.c \
|
||||||
document-portal/xdp-enums.h \
|
document-portal/xdp-enums.h \
|
||||||
$(xdp_dbus_built_sources) \
|
$(xdp_dbus_built_sources) \
|
||||||
document-portal/xdp-resources.h \
|
|
||||||
document-portal/xdp-resources.c \
|
|
||||||
document-portal/xdp-util.h \
|
document-portal/xdp-util.h \
|
||||||
document-portal/xdp-util.c \
|
document-portal/xdp-util.c \
|
||||||
document-portal/xdp-fuse.h \
|
document-portal/xdp-fuse.h \
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
<?xml version='1.0' encoding='UTF-8'?>
|
|
||||||
<gresources>
|
|
||||||
<gresource prefix='/org/freedesktop/portal/Documents'>
|
|
||||||
<file alias="org.freedesktop.portal.Documents.xml">data/org.freedesktop.portal.Documents.xml</file>
|
|
||||||
</gresource>
|
|
||||||
</gresources>
|
|
|
@ -37,7 +37,6 @@ typedef struct
|
||||||
static GMainLoop *loop = NULL;
|
static GMainLoop *loop = NULL;
|
||||||
static XdgAppDb *db = NULL;
|
static XdgAppDb *db = NULL;
|
||||||
static XdgAppPermissionStore *permission_store;
|
static XdgAppPermissionStore *permission_store;
|
||||||
static GDBusNodeInfo *introspection_data = NULL;
|
|
||||||
static int daemon_event_fd = -1;
|
static int daemon_event_fd = -1;
|
||||||
static int final_exit_status = 0;
|
static int final_exit_status = 0;
|
||||||
static dev_t fuse_dev = 0;
|
static dev_t fuse_dev = 0;
|
||||||
|
@ -753,7 +752,6 @@ main (int argc,
|
||||||
char **argv)
|
char **argv)
|
||||||
{
|
{
|
||||||
guint owner_id;
|
guint owner_id;
|
||||||
GBytes *introspection_bytes;
|
|
||||||
g_autoptr(GError) error = NULL;
|
g_autoptr(GError) error = NULL;
|
||||||
g_autofree char *path = NULL;
|
g_autofree char *path = NULL;
|
||||||
GDBusConnection *session_bus;
|
GDBusConnection *session_bus;
|
||||||
|
@ -835,11 +833,6 @@ main (int argc,
|
||||||
do_exit (5);
|
do_exit (5);
|
||||||
}
|
}
|
||||||
|
|
||||||
introspection_bytes = g_resources_lookup_data ("/org/freedesktop/portal/Documents/org.freedesktop.portal.Documents.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_SESSION,
|
owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
|
||||||
"org.freedesktop.portal.Documents",
|
"org.freedesktop.portal.Documents",
|
||||||
G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT | (opt_replace ? G_BUS_NAME_OWNER_FLAGS_REPLACE : 0),
|
G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT | (opt_replace ? G_BUS_NAME_OWNER_FLAGS_REPLACE : 0),
|
||||||
|
@ -855,8 +848,6 @@ main (int argc,
|
||||||
|
|
||||||
g_bus_unown_name (owner_id);
|
g_bus_unown_name (owner_id);
|
||||||
|
|
||||||
g_dbus_node_info_unref (introspection_data);
|
|
||||||
|
|
||||||
do_exit (final_exit_status);
|
do_exit (final_exit_status);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -1,31 +1,17 @@
|
||||||
resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/session-helper/xdg-app.gresource.xml)
|
|
||||||
|
|
||||||
libexec_PROGRAMS += \
|
libexec_PROGRAMS += \
|
||||||
xdg-app-session-helper \
|
xdg-app-session-helper \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
session-helper/xdg-app-resources.h: session-helper/xdg-app.gresource.xml
|
|
||||||
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
|
|
||||||
--target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-header
|
|
||||||
|
|
||||||
session-helper/xdg-app-resources.c: session-helper/xdg-app.gresource.xml $(resource_files)
|
|
||||||
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
|
|
||||||
--target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-source
|
|
||||||
|
|
||||||
service_in_files += session-helper/xdg-app-session-helper.service.in
|
service_in_files += session-helper/xdg-app-session-helper.service.in
|
||||||
systemduserunit_DATA += session-helper/xdg-app-session-helper.service
|
systemduserunit_DATA += session-helper/xdg-app-session-helper.service
|
||||||
|
|
||||||
service_in_files += session-helper/org.freedesktop.XdgApp.service.in
|
service_in_files += session-helper/org.freedesktop.XdgApp.service.in
|
||||||
dbus_service_DATA += session-helper/org.freedesktop.XdgApp.service
|
dbus_service_DATA += session-helper/org.freedesktop.XdgApp.service
|
||||||
|
|
||||||
EXTRA_DIST += session-helper/xdg-app.gresource.xml
|
|
||||||
|
|
||||||
xdg_app_session_helper_SOURCES = \
|
xdg_app_session_helper_SOURCES = \
|
||||||
session-helper/xdg-app-session-helper.c \
|
session-helper/xdg-app-session-helper.c \
|
||||||
session-helper/xdg-app-permission-store.c \
|
session-helper/xdg-app-permission-store.c \
|
||||||
session-helper/xdg-app-permission-store.h \
|
session-helper/xdg-app-permission-store.h \
|
||||||
session-helper/xdg-app-resources.h \
|
|
||||||
session-helper/xdg-app-resources.c \
|
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
xdg_app_session_helper_LDADD = $(BASE_LIBS) libxdgapp-common.la
|
xdg_app_session_helper_LDADD = $(BASE_LIBS) libxdgapp-common.la
|
||||||
|
|
|
@ -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