This email list is read-only. Emails sent to this list will be discarded
----------------------------------
common/Makefile.am | 13 +++++++++++--
common/client.xml | 21 +++++++++++++++++++++
common/marshal.list | 1 +
configure.ac | 3 +++
4 files changed, 36 insertions(+), 2 deletions(-)
New commits:
commit c628bf549c125607a46e4b5b3a9178e510551214
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Thu Dec 4 16:59:01 2008 +0100
Add marshal list and client introspection
commit 49124ce3d0e561e55edb6884ed8618624bdb570c
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Thu Dec 4 16:57:37 2008 +0100
Check for GLib genmarshal tool
Diff in this email is a maximum of 400 lines.
diff --git a/common/Makefile.am b/common/Makefile.am
index 2e2bcfa..015ca0c 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -8,7 +8,7 @@ noinst_PROGRAMS = test-client
test_client_LDADD = libcommon.a @GTK_LIBS@ @DBUS_LIBS@
-BUILT_SOURCES = instance-glue.h
+BUILT_SOURCES = marshal.h marshal.c instance-glue.h client-glue.h
nodist_libcommon_a_SOURCES = $(BUILT_SOURCES)
@@ -16,9 +16,18 @@ CLEANFILES = $(BUILT_SOURCES)
AM_CFLAGS = @DBUS_CFLAGS@ @GTK_CFLAGS@
-EXTRA_DIST = instance.xml
+EXTRA_DIST = marshal.list instance.xml client.xml
MAINTAINERCLEANFILES = Makefile.in
+marshal.h: marshal.list
+ $(GLIB_GENMARSHAL) --prefix=marshal $< --header > $@
+
+marshal.c: marshal.list
+ $(GLIB_GENMARSHAL) --prefix=marshal $< --body > $@
+
instance-glue.h: instance.xml
$(DBUS_BINDING_TOOL) --prefix=instance --mode=glib-server --output=$@ $<
+
+client-glue.h: client.xml
+ $(DBUS_BINDING_TOOL) --prefix=client --mode=glib-client --output=$@ $<
diff --git a/common/client.xml b/common/client.xml
new file mode 100644
index 0000000..7b4070d
--- /dev/null
+++ b/common/client.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node name="/">
+ <interface name="manager">
+ <method name="GetProperties">
+ <arg type="a{sv}" direction="out"/>
+ </method>
+ </interface>
+
+ <interface name="device">
+ <method name="GetProperties">
+ <arg type="a{sv}" direction="out"/>
+ </method>
+ </interface>
+
+ <interface name="network">
+ <method name="GetProperties">
+ <arg type="a{sv}" direction="out"/>
+ </method>
+ </interface>
+</node>
diff --git a/common/marshal.list b/common/marshal.list
new file mode 100644
index 0000000..e72aa4b
--- /dev/null
+++ b/common/marshal.list
@@ -0,0 +1 @@
+VOID:STRING,BOXED
diff --git a/configure.ac b/configure.ac
index de35204..141a4ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,5 +60,8 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8, dummy=yes,
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
+GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+AC_SUBST(GLIB_GENMARSHAL)
+
AC_OUTPUT(Makefile common/Makefile applet/Makefile properties/Makefile
icons/Makefile po/Makefile.in)
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
