From 329ac511e9fec88df27b07d31a532d7826516f30 Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Wed, 24 Aug 2005 19:58:32 +0000 Subject: [PATCH] - Merged changed from the DBUS_0_36_1 bugfix branch --- ChangeLog | 14 ++++++++++++++ NEWS | 7 +++++++ python/Makefile.am | 2 +- python/_dbus.py | 12 ++++++------ python/proxies.py | 5 +++-- 5 files changed, 31 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index d398277..3d9962d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2005-08-24 John (J5) Palmieri + + * Release 0.36.1 + + * python/_dbus.py: + (Interface::connect_to_signal): propigate keywords for match on args + (Bus::add_signal_receiver): Fix typo s/dbus_inteface/dbus_interface + + * python/proxies.py (ProxyObject::connect_to_signal): + propigate keywords for match on args + + * Makefile.am: point everything to pyexecdir since python borks + on multilib + 2005-08-23 John (J5) Palmieri * Release 0.36 diff --git a/NEWS b/NEWS index 6747295..887492a 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +D-BUS 0.36.1 (24 August 2005) +=== +- Python Bindings: + - fixed to work with hal-device-manager + - For 64bit builds everything is installed to lib64/python2.4/ + since Python can't handle multilib + D-BUS 0.36 (23 August 2005) === - Maximum sized of cached messages have been reduced to 10K diff --git a/python/Makefile.am b/python/Makefile.am index a688a13..52ba8e5 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -5,7 +5,7 @@ INCLUDES=-I$(srcdir)/$(top_builddir) -I$(srcdir)/$(top_builddir)/dbus $(DBUS_CLI dbusmoduledir = $(pyexecdir) dbusmodule_PYTHON = dbus.pth -dbusdir = $(pythondir)/dbus +dbusdir = $(pyexecdir)/dbus dbus_PYTHON = __init__.py _dbus.py decorators.py exceptions.py service.py proxies.py _util.py types.py matchrules.py glib.py dbusbindingsdir = $(pyexecdir)/dbus diff --git a/python/_dbus.py b/python/_dbus.py index 2a290bd..890cdda 100644 --- a/python/_dbus.py +++ b/python/_dbus.py @@ -126,7 +126,7 @@ class Bus: def add_signal_receiver(self, handler_function, signal_name=None, - dbus_inteface=None, + dbus_interface=None, named_service=None, path=None, **keywords): @@ -149,7 +149,7 @@ class Bus: dbus_bindings.bus_add_match(self._connection, repr(match_rule)) def remove_signal_receiver(self, handler_function, - signal_name=None, + signal_name=None, dbus_interface=None, named_service=None, path=None, @@ -166,8 +166,8 @@ class Bus: if (args_dict): match_rule.add_args_match(args_dict) - if (handler_function): - match_rule.add_handler(handler_function) + if (handler_function): + match_rule.add_handler(handler_function) self._match_rule_tree.remove(match_rule) @@ -224,11 +224,11 @@ class Interface: self._obj = object self._dbus_interface = dbus_interface - def connect_to_signal(self, signal_name, handler_function, dbus_interface = None): + def connect_to_signal(self, signal_name, handler_function, dbus_interface = None, **keywords): if not dbus_interface: dbus_interface = self._dbus_interface - self._obj.connect_to_signal(signal_name, handler_function, dbus_interface) + self._obj.connect_to_signal(signal_name, handler_function, dbus_interface, **keywords) def __getattr__(self, member, **keywords): if (keywords.has_key('dbus_interface')): diff --git a/python/proxies.py b/python/proxies.py index c7dc02b..4286642 100644 --- a/python/proxies.py +++ b/python/proxies.py @@ -105,12 +105,13 @@ class ProxyObject: (result, self._pending_introspect) = self._Introspect() - def connect_to_signal(self, signal_name, handler_function, dbus_interface=None): + def connect_to_signal(self, signal_name, handler_function, dbus_interface=None, **keywords): self._bus.add_signal_receiver(handler_function, signal_name=signal_name, dbus_interface=dbus_interface, named_service=self._named_service, - path=self._object_path) + path=self._object_path, + **keywords) def _Introspect(self): message = dbus_bindings.MethodCall(self._object_path, 'org.freedesktop.DBus.Introspectable', 'Introspect') -- 2.7.4