From a7595655fb892b4ecab852aeb971cf53bdff09cc Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Fri, 15 Jul 2005 15:21:43 +0000 Subject: * bus/dispatch.c, test/test-service.c: Add testcase for sending messages to oneself (TODO item). * python/service.py (class Object): Swap ordering of bus_name and object_path parameters to better support inheritance. * doc/dbus-tutorial.xml: change Python docs to reflect change in parameter ordering and fix the inheritance section. * doc/TODO: remove sending message to oneself TODO item --- doc/TODO | 4 ---- doc/dbus-tutorial.xml | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 14 deletions(-) (limited to 'doc') diff --git a/doc/TODO b/doc/TODO index 03e156dc..4218c9aa 100644 --- a/doc/TODO +++ b/doc/TODO @@ -12,10 +12,6 @@ Important for 1.0 dbus-marshal-recursive.c (this is mostly done now, just needs some cleanup) - - need to define bus behavior if you send a message to - yourself; is it an error, or allowed? If allowed, - we need to have a test for it in the test suite. - - just before 1.0, try a HAVE_INT64=0 build and be sure it runs - dbus-pending-call.c has some API and thread safety issues to review diff --git a/doc/dbus-tutorial.xml b/doc/dbus-tutorial.xml index 924575f3..d066c0a9 100644 --- a/doc/dbus-tutorial.xml +++ b/doc/dbus-tutorial.xml @@ -7,8 +7,8 @@
D-BUS Tutorial - Version 0.4 - 14 July 2005 + Version 0.4.1 + 15 July 2005 Havoc @@ -1479,8 +1479,8 @@ if getattr(dbus, 'version', (0,0,0)) >= (0,41,0): import dbus.glib class HelloWorldObject(dbus.service.Object): - def __init__(self, bus_name): - dbus.service.Object.__init__(self, '/org/freedesktop/HelloWorldObject', bus_name) + def __init__(self, bus_name, object_path='/org/freedesktop/HelloWorldObject'): + dbus.service.Object.__init__(self, bus_name, object_path) session_bus = dbus.SessionBus() bus_name = dbus.service.BusName('org.freedesktop.HelloWorld', bus=session_bus) @@ -1506,8 +1506,8 @@ if getattr(dbus, 'version', (0,0,0)) >= (0,41,0): import dbus.glib class HelloWorldObject(dbus.service.Object): - def __init__(self, bus_name): - dbus.service.Object.__init__(self, '/org/freedesktop/HelloWorldObject', bus_name) + def __init__(self, bus_name, object_path='/org/freedesktop/HelloWorldObject'): + dbus.service.Object.__init__(self, bus_name, object_path) @dbus.service.method('org.freedesktop.HelloWorldIFace') def hello(self): @@ -1578,8 +1578,8 @@ if getattr(dbus, 'version', (0,0,0)) >= (0,41,0): import dbus.glib class HelloWorldObject(dbus.service.Object): - def __init__(self, bus_name): - dbus.service.Object.__init__(self, '/org/freedesktop/HelloWorldObject', bus_name) + def __init__(self, bus_name, object_path='/org/freedesktop/HelloWorldObject'): + dbus.service.Object.__init__(self, bus_name, object_path) @dbus.service.method('org.freedesktop.HelloWorldIFace') def hello(self): @@ -1614,8 +1614,8 @@ gtk.main() Let's inherit from the HelloWorldObject example above and overide the hello method to say goodbye. class HelloWorldGoodbyeObject(HelloWorldObject): - def __init__(self, bus_name): - HelloWorldObject.__init__(self, '/org/freedesktop/HelloWorldGoodbyeObject', bus_name) + def __init__(self, bus_name, object_path='/org/freedesktop/HelloWorldGoodbyeObject'): + HelloWorldObject.__init__(self, bus_name, object_path) @dbus.service.method('org.freedesktop.HelloWorldGoodbyeIFace') def hello(self): -- cgit