diff options
| -rw-r--r-- | ChangeLog | 38 | ||||
| -rw-r--r-- | NEWS | 12 | ||||
| -rw-r--r-- | python/Makefile.am | 16 | ||||
| -rw-r--r-- | python/_dbus.py | 1 | ||||
| -rw-r--r-- | python/examples/example-signal-emitter.py | 6 | ||||
| -rw-r--r-- | python/examples/example-signal-recipient.py | 13 | ||||
| -rw-r--r-- | python/service.py | 2 | ||||
| -rw-r--r-- | test/glib/Makefile.am | 5 |
8 files changed, 75 insertions, 18 deletions
@@ -1,3 +1,41 @@ +2005-07-17 John (J5) Palmieri <johnp@redhat.com> + + * NEWS: Update to 0.35.2 + +2005-07-17 John (J5) Palmieri <johnp@redhat.com> + + * python/_dbus.py: Remove import of the dbus.services + module as it no longer exists (patch from Dimitur Kirov) + + * python/service.py (Object::__init__): Fixed typo + s/name/bus_name (patch from Dimitur Kirov) + + * python/examples/example-signal-emitter.py: import dbus.glib + to get the main loop and use glib mainloop instead of gtk so + X doesn't have to be running. + + * python/examples/example-signal-recipient.py: import dbus.glib + to get the main loop and use glib mainloop instead of gtk so + X doesn't have to be running. Import the decorators module + directly. + + * test/glib/Makefile.am: Added DIST_EXTRA files that distcheck + didn't pick up on but are needed to build + + * configure.in: upped version to 0.35.2 + + * bus/driver.c, bus/selinux.c, bus/selinux.h, dbus/dbus-protocol.h: + added Colin Walters' SELinux API rename patch from head + s/unix sercurity context/selinux security context/ + +2005-07-16 John (J5) Palmieri <johnp@redhat.com> + + * python/Makefile.am: dbus_binding.pxd.in should be included + in EXTRA_DIST not dbus_binding.pxd + fix up $(srcdir) hopefully for the last time + + * NEWS: Update to 0.35.1 + 2005-07-15 Colin Walters <walters@verbum.org> * doc/TODO: Add note about convenience wrappers. @@ -1,3 +1,15 @@ +D-BUS 0.35.2 (17 July 2005) +=== +- Rename Unix Security Context to SELinux Security Context in API +- Fixed more dist errors that distcheck didn't pick up on +- Fixed various bugs in the python bindings that prevented them from working + +D-BUS 0.35.1 (16 July 2005) +=== +- Fixed dist error where python/dbus_bindings.pxd was being shipped + instead of dbus_bindings.pxd.in +- Use this instead of the 0.35 tarball + D-BUS 0.35 (15 July 2005) === - --with-dbus-user added to the configure scripts for configuring the diff --git a/python/Makefile.am b/python/Makefile.am index 302ed0d2..3621800a 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -10,19 +10,19 @@ dbusbindings_LTLIBRARIES = dbus_bindings.la dbus_glib_bindings.la dbus_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_bindings dbus_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la -nodist_dbus_bindings_la_SOURCES = $(srcdir)/dbus_bindings.c +nodist_dbus_bindings_la_SOURCES = dbus_bindings.c dbus_glib_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_glib_bindings dbus_glib_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la $(top_builddir)/glib/libdbus-glib-1.la dbus_glib_bindings_la_CFLAGS = $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -nodist_dbus_glib_bindings_la_SOURCES = $(srcdir)/dbus_glib_bindings.c +nodist_dbus_glib_bindings_la_SOURCES = dbus_glib_bindings.c EXTRA_DIST = \ dbus_h_wrapper.h \ dbus_bindings.pyx \ dbus_glib_bindings.pyx \ - dbus_bindings.pxd \ + dbus_bindings.pxd.in \ extract.py CLEANFILES = \ @@ -32,11 +32,11 @@ CLEANFILES = \ dbus_bindings.pxd: $(srcdir)/dbus_bindings.pxd.in $(srcdir)/extract.py - -$(PYTHON) $(srcdir)/extract.py $(srcdir)/dbus_bindings.pxd.in -I$(top_builddir) > $@.tmp && mv $@.tmp $@ + -$(PYTHON) $(srcdir)/extract.py $(srcdir)/dbus_bindings.pxd.in -I$(srcdir)/$(top_builddir) -I$(srcdir) > $@.tmp && mv $@.tmp $@ -dbus_bindings.c: $(srcdir)/dbus_bindings.pyx $(srcdir)/dbus_bindings.pxd - -pyrexc $(srcdir)/dbus_bindings.pyx +dbus_bindings.c: $(srcdir)/dbus_bindings.pyx dbus_bindings.pxd + -pyrexc $(srcdir)/dbus_bindings.pyx -I. -o ./dbus_bindings.c -dbus_glib_bindings.c: $(srcdir)/dbus_glib_bindings.pyx $(srcdir)/dbus_bindings.pxd - -pyrexc $(srcdir)/dbus_glib_bindings.pyx +dbus_glib_bindings.c: $(srcdir)/dbus_glib_bindings.pyx dbus_bindings.pxd + -pyrexc $(srcdir)/dbus_glib_bindings.pyx -I. -o ./dbus_glib_bindings.c diff --git a/python/_dbus.py b/python/_dbus.py index 652d27bd..7bab5856 100644 --- a/python/_dbus.py +++ b/python/_dbus.py @@ -46,7 +46,6 @@ import dbus_bindings import dbus from proxies import * from exceptions import * -from services import * from matchrules import * import re diff --git a/python/examples/example-signal-emitter.py b/python/examples/example-signal-emitter.py index f81ac3fb..02eff893 100644 --- a/python/examples/example-signal-emitter.py +++ b/python/examples/example-signal-emitter.py @@ -2,7 +2,8 @@ import dbus import dbus.service -import gtk +import dbus.glib +import gobject class TestObject(dbus.service.Object): def __init__(self, bus_name, object_path='/org/designfu/TestService/object'): @@ -24,4 +25,5 @@ session_bus = dbus.SessionBus() name = dbus.service.BusName('org.designfu.TestService', bus=session_bus) object = TestObject(name) -gtk.main() +loop = gobject.MainLoop() +loop.run() diff --git a/python/examples/example-signal-recipient.py b/python/examples/example-signal-recipient.py index 681dd7c2..558a41f0 100644 --- a/python/examples/example-signal-recipient.py +++ b/python/examples/example-signal-recipient.py @@ -1,7 +1,8 @@ #!/usr/bin/env python -import gtk import dbus +import dbus.decorators +import dbus.glib import gobject def handle_reply(msg): @@ -11,7 +12,7 @@ def handle_error(e): print str(e) def emit_signal(): - #call the emitHelloSignal method async + #call the emitHelloSignal method object.emitHelloSignal(dbus_interface="org.designfu.TestService") #reply_handler = handle_reply, error_handler = handle_error) return True @@ -22,7 +23,7 @@ object = bus.get_object("org.designfu.TestService","/org/designfu/TestService/o def hello_signal_handler(hello_string): print ("Received signal and it says: " + hello_string) -@dbus.explicitly_pass_message +@dbus.decorators.explicitly_pass_message def catchall_signal_handler(*args, **keywords): #The dbus.handler directive passes in the special __dbus_message__ variable dbus_message = keywords["dbus_message"] @@ -33,7 +34,7 @@ def catchall_signal_handler(*args, **keywords): def catchall_hello_signals_handler(hello_string): print ("Received a hello signal and it says ") + hello_string -@dbus.explicitly_pass_message +@dbus.decorators.explicitly_pass_message def catchall_testservice_interface_handler(hello_string, dbus_message): print "org.designfu.TestService interface says " + hello_string + " when it sent signal " + dbus_message.get_member() @@ -48,5 +49,5 @@ gobject.timeout_add(2000, emit_signal) # Tell the remote object to emit the signal -gtk.main() - +loop = gobject.MainLoop() +loop.run() diff --git a/python/service.py b/python/service.py index 18a2c81b..f6a1c7fd 100644 --- a/python/service.py +++ b/python/service.py @@ -154,7 +154,7 @@ class Object: def __init__(self, bus_name, object_path): self._object_path = object_path self._name = bus_name - self._bus = name.get_bus() + self._bus = bus_name.get_bus() self._connection = self._bus.get_connection() diff --git a/test/glib/Makefile.am b/test/glib/Makefile.am index 04d9c644..cf837c8f 100644 --- a/test/glib/Makefile.am +++ b/test/glib/Makefile.am @@ -78,3 +78,8 @@ test_profile_SOURCES= \ test_profile_LDADD= $(DBUS_GLIB_THREADS_LIBS) $(top_builddir)/glib/libdbus-glib-1.la endif + +EXTRA_DIST = \ + my-object-marshal.list \ + test-service-glib.xml + |