Skip to content

Commit 3728fb7

Browse files
Christian Perschraveit65
Christian Persch
authored and
raveit65
committed
daemon: Use gdbus-codegen for the org.mate.atril.Daemon interface
origin commit: https://git.gnome.org/browse/evince/commit/?h=gnome-3-6&id=1aac15e
1 parent e2420ea commit 3728fb7

File tree

3 files changed

+185
-164
lines changed

3 files changed

+185
-164
lines changed

shell/Makefile.am

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,21 @@ atril_LDADD= \
120120
BUILT_SOURCES = ev-marshal.h ev-marshal.c
121121

122122
if ENABLE_DBUS
123-
BUILT_SOURCES += ev-gdbus-generated.c ev-gdbus-generated.h
123+
BUILT_SOURCES += \
124+
ev-gdbus-generated.c \
125+
ev-gdbus-generated.h \
126+
ev-daemon-gdbus-generated.c \
127+
ev-daemon-gdbus-generated.h
124128
endif
125129

126130
if ENABLE_DBUS
127131
atrild_SOURCES= \
128-
ev-daemon.c
132+
ev-daemon.c \
133+
$(NULL)
134+
nodist_atrild_SOURCES = \
135+
ev-daemon-gdbus-generated.c \
136+
ev-daemon-gdbus-generated.h
137+
$(NULL)
129138

130139
atrild_CFLAGS= \
131140
-DATRILDATADIR=\"$(pkgdatadir)\" \
@@ -144,7 +153,8 @@ endif
144153

145154
EXTRA_DIST = \
146155
ev-marshal.list \
147-
ev-gdbus.xml
156+
ev-gdbus.xml \
157+
ev-daemon-gdbus.xml
148158

149159
ev-marshal.h: $(srcdir)/ev-marshal.list
150160
$(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --header > ev-marshal.h
@@ -161,6 +171,14 @@ ev-gdbus-generated.c ev-gdbus-generated.h: ev-gdbus.xml Makefile
161171
--generate-c-code ev-gdbus-generated \
162172
$<
163173

164-
DISTCLEANFILES =
174+
ev-daemon-gdbus-generated.c ev-daemon-gdbus-generated.h: ev-daemon-gdbus.xml Makefile
175+
$(AM_V_GEN) $(GDBUS_CODEGEN) \
176+
--interface-prefix=org.mate.atril \
177+
--c-namespace=Ev \
178+
--c-generate-object-manager \
179+
--generate-c-code ev-daemon-gdbus-generated \
180+
$<
181+
182+
DISTCLEANFILES = $(BUILT_SOURCES)
165183

166184
-include $(top_srcdir)/git.mk

shell/ev-daemon-gdbus.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Introspection 0.1//EN"
3+
"http://www.freedesktop.org/software/dbus/introspection.dtd">
4+
<node>
5+
<interface name="org.mate.atril.Daemon">
6+
<method name="RegisterDocument">
7+
<arg type="s" name="uri" direction="in"/>
8+
<arg type="s" name="owner" direction="out"/>
9+
</method>
10+
<method name="UnregisterDocument">
11+
<arg type="s" name="uri" direction="in"/>
12+
</method>
13+
<method name="FindDocument">
14+
<arg type="s" name="uri" direction="in"/>
15+
<arg type="b" name="spawn" direction="in"/>
16+
<arg type="s" name="owner" direction="out"/>
17+
</method>
18+
</interface>
19+
</node>

0 commit comments

Comments
 (0)