From afc504f848ebf3840dc80e0a2d529be7dcba8b26 Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Sun, 17 Jul 2005 21:02:56 +0000 Subject: * Merge DBUS_0_35_2 branch into HEAD 2005-07-17 John (J5) Palmieri * NEWS: Update to 0.35.2 2005-07-17 John (J5) Palmieri * 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 * 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 --- python/service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'python/service.py') 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() -- cgit