dbus/python Makefile.am, 1.18, 1.19 _dbus.py, 1.11, 1.12 proxies.py, 1.6, 1.7

[John Palmieri]

Update of /cvs/dbus/dbus/python
In directory gabe:/tmp/cvs-serv29513/python

Modified Files:
	Makefile.am _dbus.py proxies.py 
Log Message:
- Merged changed from the DBUS_0_36_1 bugfix branch


Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/python/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile.am	18 Aug 2005 20:57:28 -0000	1.18
+++ Makefile.am	24 Aug 2005 19:58:32 -0000	1.19
@@ -5,7 +5,7 @@
 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

Index: _dbus.py
===================================================================
RCS file: /cvs/dbus/dbus/python/_dbus.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- _dbus.py	18 Aug 2005 04:04:57 -0000	1.11
+++ _dbus.py	24 Aug 2005 19:58:32 -0000	1.12
@@ -126,7 +126,7 @@
 
     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 @@
         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 @@
         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 @@
         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')):

Index: proxies.py
===================================================================
RCS file: /cvs/dbus/dbus/python/proxies.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- proxies.py	16 Aug 2005 22:54:04 -0000	1.6
+++ proxies.py	24 Aug 2005 19:58:32 -0000	1.7
@@ -105,12 +105,13 @@
             (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')