From d06bfe528bb8d5e2ad2b4844c36fe43155739b3d Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Tue, 12 Jul 2005 18:16:07 +0000 Subject: * python/dbus_bindings.pyx.in: removed * python/dbus_bindings.pyx: Added. - Fixed some memleaks (patch from Sean Meiners ) - Broke out the #include "dbus_h_wrapper.h" and put it in its own pxd file (Pyrex definition) - Broke out glib dependancies into its own pyx module * python/dbus_bindings.pdx: Added. - Defines C class Connection for exporting to other modules * python/dbus_glib_bindings.pyx: Added. - New module to handle lowlevel dbus-glib mainloop integration * python/glib.py: Added. - Registers the glib mainloop when you import this module * python/services.py: Removed (renamed to service.py) * python/service.py: Added. - (class Server): renamed Name * python/__init__.py: Bump ro version (0,41,0) - don't import the decorators or service module by default. These now reside in the dbus.service namespace * python/_dbus.py (Bus::__init__): Add code run the main loop setup function on creation * python/examples/example-service.py, python/examples/example-signal-emitter.py: update examples * python/examples/gconf-proxy-service.py, python/examples/gconf-proxy-service2.py: TODO fix these up * doc/TODO: Addition - Added a Python Bindings 1.0 section - added "Add match on args or match on details to match rules" --- python/examples/example-service.py | 19 +++++++++++-------- python/examples/example-signal-emitter.py | 15 ++++++++------- python/examples/gconf-proxy-service.py | 2 +- python/examples/gconf-proxy-service2.py | 2 +- 4 files changed, 21 insertions(+), 17 deletions(-) (limited to 'python/examples') diff --git a/python/examples/example-service.py b/python/examples/example-service.py index 9963454f..9e2f193b 100644 --- a/python/examples/example-service.py +++ b/python/examples/example-service.py @@ -1,29 +1,32 @@ #!/usr/bin/env python import dbus +import dbus.service + +import dbus.glib import pygtk import gtk -class SomeObject(dbus.Object): - def __init__(self, service): - dbus.Object.__init__(self, "/SomeObject", service) +class SomeObject(dbus.service.Object): + def __init__(self, name): + dbus.service.Object.__init__(self, "/SomeObject", name) - @dbus.method("org.designfu.SampleInterface") + @dbus.service.method("org.designfu.SampleInterface") def HelloWorld(self, hello_message): print (str(hello_message)) return ["Hello", " from example-service.py"] - @dbus.method("org.designfu.SampleInterface") + @dbus.service.method("org.designfu.SampleInterface") def GetTuple(self): return ("Hello Tuple", " from example-service.py") - @dbus.method("org.designfu.SampleInterface") + @dbus.service.method("org.designfu.SampleInterface") def GetDict(self): return {"first": "Hello Dict", "second": " from example-service.py"} session_bus = dbus.SessionBus() -service = dbus.Service("org.designfu.SampleService", bus=session_bus) -object = SomeObject(service) +name = dbus.service.Name("org.designfu.SampleService", bus=session_bus) +object = SomeObject(name) gtk.main() diff --git a/python/examples/example-signal-emitter.py b/python/examples/example-signal-emitter.py index 428f1440..64c7f177 100644 --- a/python/examples/example-signal-emitter.py +++ b/python/examples/example-signal-emitter.py @@ -1,26 +1,27 @@ #!/usr/bin/env python import dbus +import dbus.service import gtk -class TestObject(dbus.Object): - def __init__(self, service): - dbus.Object.__init__(self, "/org/designfu/TestService/object", service) +class TestObject(dbus.service.Object): + def __init__(self, name): + dbus.service.Object.__init__(self, "/org/designfu/TestService/object", name) - @dbus.signal('org.designfu.TestService') + @dbus.service.signal('org.designfu.TestService') def HelloSignal(self, message): # The signal is emitted when this method exits # You can have code here if you wish pass - @dbus.method('org.designfu.TestService') + @dbus.service.method('org.designfu.TestService') def emitHelloSignal(self): #you emit signals by calling the signal's skeleton method self.HelloSignal("Hello") return "Signal emitted" session_bus = dbus.SessionBus() -service = dbus.Service("org.designfu.TestService", bus=session_bus) -object = TestObject(service) +name = dbus.service.Name("org.designfu.TestService", bus=session_bus) +object = TestObject(name) gtk.main() diff --git a/python/examples/gconf-proxy-service.py b/python/examples/gconf-proxy-service.py index 18c8047f..b9bdef14 100644 --- a/python/examples/gconf-proxy-service.py +++ b/python/examples/gconf-proxy-service.py @@ -1,5 +1,5 @@ #!/usr/bin/env python - +#FIXME: Doesn't work with the new bindings import dbus import gtk diff --git a/python/examples/gconf-proxy-service2.py b/python/examples/gconf-proxy-service2.py index 3667a853..ba8d249b 100644 --- a/python/examples/gconf-proxy-service2.py +++ b/python/examples/gconf-proxy-service2.py @@ -1,5 +1,5 @@ #!/usr/bin/env python - +#FIXME: doesn't work with the new bindings import dbus import gtk -- cgit