summaryrefslogtreecommitdiff
path: root/document-portal
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2016-04-26 11:54:59 +0200
committerAlexander Larsson <alexl@redhat.com>2016-04-26 11:54:59 +0200
commit4f4b8c536b06ea2a5fa0e89f456a97ccd9684682 (patch)
tree4e56e822a2c9ec3dc7438688611e225b6922b1c5 /document-portal
parent54af892f3ad33fb326b3d03d5f65af4941f2c811 (diff)
downloadxdg-app-4f4b8c536b06ea2a5fa0e89f456a97ccd9684682.tar.gz
No need to put introspection xml in resources
This is already built in to the gdbus codegen code.
Diffstat (limited to 'document-portal')
-rw-r--r--document-portal/Makefile.am.inc14
-rw-r--r--document-portal/xdg-document-portal.gresource.xml6
-rw-r--r--document-portal/xdp-main.c9
3 files changed, 0 insertions, 29 deletions
diff --git a/document-portal/Makefile.am.inc b/document-portal/Makefile.am.inc
index 5568bc5..8656f25 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 8f58757..0000000
--- a/document-portal/xdg-document-portal.gresource.xml
+++ /dev/null
@@ -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>
diff --git a/document-portal/xdp-main.c b/document-portal/xdp-main.c
index 66e65f4..4b7a2e5 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;