diff --git a/document-portal/Makefile.am.inc b/document-portal/Makefile.am.inc index 5568bc56..8656f255 100644 --- a/document-portal/Makefile.am.inc +++ b/document-portal/Makefile.am.inc @@ -13,30 +13,16 @@ $(xdp_dbus_built_sources) : data/org.freedesktop.portal.Documents.xml $(srcdir)/data/org.freedesktop.portal.Documents.xml \ $(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 systemduserunit_DATA += document-portal/xdg-document-portal.service service_in_files += document-portal/org.freedesktop.portal.Documents.service.in dbus_service_DATA += document-portal/org.freedesktop.portal.Documents.service -EXTRA_DIST += document-portal/xdg-document-portal.gresource.xml - xdg_document_portal_SOURCES = \ document-portal/xdp-main.c \ document-portal/xdp-enums.h \ $(xdp_dbus_built_sources) \ - document-portal/xdp-resources.h \ - document-portal/xdp-resources.c \ document-portal/xdp-util.h \ document-portal/xdp-util.c \ document-portal/xdp-fuse.h \ diff --git a/document-portal/xdg-document-portal.gresource.xml b/document-portal/xdg-document-portal.gresource.xml deleted file mode 100644 index 8f58757d..00000000 --- a/document-portal/xdg-document-portal.gresource.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - data/org.freedesktop.portal.Documents.xml - - diff --git a/document-portal/xdp-main.c b/document-portal/xdp-main.c index 66e65f47..4b7a2e5d 100644 --- a/document-portal/xdp-main.c +++ b/document-portal/xdp-main.c @@ -37,7 +37,6 @@ typedef struct static GMainLoop *loop = NULL; static XdgAppDb *db = NULL; static XdgAppPermissionStore *permission_store; -static GDBusNodeInfo *introspection_data = NULL; static int daemon_event_fd = -1; static int final_exit_status = 0; static dev_t fuse_dev = 0; @@ -753,7 +752,6 @@ main (int argc, char **argv) { guint owner_id; - GBytes *introspection_bytes; g_autoptr(GError) error = NULL; g_autofree char *path = NULL; GDBusConnection *session_bus; @@ -835,11 +833,6 @@ main (int argc, 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, "org.freedesktop.portal.Documents", 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_dbus_node_info_unref (introspection_data); - do_exit (final_exit_status); return 0; diff --git a/session-helper/Makefile.am.inc b/session-helper/Makefile.am.inc index 2b08db98..5782fe39 100644 --- a/session-helper/Makefile.am.inc +++ b/session-helper/Makefile.am.inc @@ -1,31 +1,17 @@ -resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/session-helper/xdg-app.gresource.xml) - libexec_PROGRAMS += \ xdg-app-session-helper \ $(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 systemduserunit_DATA += session-helper/xdg-app-session-helper.service service_in_files += session-helper/org.freedesktop.XdgApp.service.in dbus_service_DATA += session-helper/org.freedesktop.XdgApp.service -EXTRA_DIST += session-helper/xdg-app.gresource.xml - xdg_app_session_helper_SOURCES = \ session-helper/xdg-app-session-helper.c \ session-helper/xdg-app-permission-store.c \ session-helper/xdg-app-permission-store.h \ - session-helper/xdg-app-resources.h \ - session-helper/xdg-app-resources.c \ $(NULL) xdg_app_session_helper_LDADD = $(BASE_LIBS) libxdgapp-common.la diff --git a/session-helper/xdg-app.gresource.xml b/session-helper/xdg-app.gresource.xml deleted file mode 100644 index 492189a3..00000000 --- a/session-helper/xdg-app.gresource.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - data/org.freedesktop.XdgApp.xml - -