From 0b7219bd7c0ef0622ea7fcf07c9d27b9a99672b4 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Thu, 27 May 2010 18:32:30 +0200 Subject: [demo] rename com.pengutronix.devel.* -> com.pengutronix.jdb.* Signed-off-by: Michael Olbrich --- demo/dbus-python-service.py | 4 ++-- demo/dbus-simple-service/Makefile.am | 6 +++--- .../com_pengutronix_devel_SystemInfo.xml | 19 ------------------- .../com_pengutronix_jdb_SystemInfo.xml | 19 +++++++++++++++++++ demo/dbus-simple-service/dbus-simple-service.c | 2 +- demo/dbus-simple-service/systeminfo_skel.c | 6 +++--- demo/index.html | 16 ++++++++-------- demo/simple-test.sh | 6 +++--- 8 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 demo/dbus-simple-service/com_pengutronix_devel_SystemInfo.xml create mode 100644 demo/dbus-simple-service/com_pengutronix_jdb_SystemInfo.xml diff --git a/demo/dbus-python-service.py b/demo/dbus-python-service.py index 3abedc1..fc93c14 100755 --- a/demo/dbus-python-service.py +++ b/demo/dbus-python-service.py @@ -29,7 +29,7 @@ class Service(dbus.service.Object): self._state = 1 dbus.service.Object.__init__(self, None, "/", name) - @dbus.service.method("com.pengutronix.devel.Data", + @dbus.service.method("com.pengutronix.jdb.Data", in_signature='', out_signature='a{sai}') def Dump(self): return {"foo": [1, 2], "bar": [3, 4] } @@ -38,7 +38,7 @@ if __name__ == '__main__': dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) session_bus = dbus.SessionBus() - name = dbus.service.BusName("com.pengutronix.devel.demo1", session_bus) + name = dbus.service.BusName("com.pengutronix.jdb.demo1", session_bus) object = Service(session_bus, name) mainloop = gobject.MainLoop() diff --git a/demo/dbus-simple-service/Makefile.am b/demo/dbus-simple-service/Makefile.am index 8e10eb5..4f9414e 100644 --- a/demo/dbus-simple-service/Makefile.am +++ b/demo/dbus-simple-service/Makefile.am @@ -6,13 +6,13 @@ AM_CPPFLAGS = \ $(dbus_CFLAGS) EXTRA_DIST = \ - com_pengutronix_devel_SystemInfo.xml + com_pengutronix_jdb_SystemInfo.xml MAINTAINERCLEANFILES = \ Makefile.in CLEANFILES = \ - com_pengutronix_devel_SystemInfo_xml.h + com_pengutronix_jdb_SystemInfo_xml.h noinst_HEADERS = \ systeminfo_skel.h @@ -33,7 +33,7 @@ dbus_simple_service_SOURCES = \ dbus-simple-service.c \ systeminfo_skel.c -$(srcdir)/systeminfo_skel.c: com_pengutronix_devel_SystemInfo_xml.h +$(srcdir)/systeminfo_skel.c: com_pengutronix_jdb_SystemInfo_xml.h dbus_simple_service_LDADD = \ $(dbus_LIBS) diff --git a/demo/dbus-simple-service/com_pengutronix_devel_SystemInfo.xml b/demo/dbus-simple-service/com_pengutronix_devel_SystemInfo.xml deleted file mode 100644 index cc5a4ea..0000000 --- a/demo/dbus-simple-service/com_pengutronix_devel_SystemInfo.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/demo/dbus-simple-service/com_pengutronix_jdb_SystemInfo.xml b/demo/dbus-simple-service/com_pengutronix_jdb_SystemInfo.xml new file mode 100644 index 0000000..7f761e4 --- /dev/null +++ b/demo/dbus-simple-service/com_pengutronix_jdb_SystemInfo.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/demo/dbus-simple-service/dbus-simple-service.c b/demo/dbus-simple-service/dbus-simple-service.c index 032328e..e6ed3f6 100644 --- a/demo/dbus-simple-service/dbus-simple-service.c +++ b/demo/dbus-simple-service/dbus-simple-service.c @@ -84,7 +84,7 @@ int main(void) dbus_error_free(&err); exit(1); } - if (dbus_bus_request_name(connection, "com.pengutronix.devel.simpleinfo", + if (dbus_bus_request_name(connection, "com.pengutronix.jdb.simpleinfo", 0, &err) < 0) { fprintf(stderr, "couldn't connect to dbus: %s: %s\n", err.name, err.message); diff --git a/demo/dbus-simple-service/systeminfo_skel.c b/demo/dbus-simple-service/systeminfo_skel.c index d105eba..6301c5a 100644 --- a/demo/dbus-simple-service/systeminfo_skel.c +++ b/demo/dbus-simple-service/systeminfo_skel.c @@ -23,14 +23,14 @@ #include #include "systeminfo_skel.h" -#include "com_pengutronix_devel_SystemInfo_xml.h" +#include "com_pengutronix_jdb_SystemInfo_xml.h" static const char *introspect_system_info = \ DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE \ -COM_PENGUTRONIX_DEVEL_SYSTEMINFO_XML \ +COM_PENGUTRONIX_JDB_SYSTEMINFO_XML \ ; -#define DBUS_INTERFACE_SYSTEMINFO "com.pengutronix.devel.SystemInfo" +#define DBUS_INTERFACE_SYSTEMINFO "com.pengutronix.jdb.SystemInfo" DBusMessage *_system_info_error(DBusMessage *message, int err) { diff --git a/demo/index.html b/demo/index.html index 00847d9..7c585d0 100644 --- a/demo/index.html +++ b/demo/index.html @@ -9,17 +9,17 @@ - - + + - +
functionsendreceive
com.pengutronix.devel.SystemInfo.Pingfoobar
com.pengutronix.devel.SystemInfo.Date
com.pengutronix.jdb.SystemInfo.Pingfoobar
com.pengutronix.jdb.SystemInfo.Date
org.freedesktop.DBus.Introspectable.Introspect
com.pengutronix.devel.Data.Dump
com.pengutronix.jdb.Data.Dump