dbus/glib dbus-gmain.c,1.50,1.51

[Robert McQueen]

Update of /cvs/dbus/dbus/glib
In directory gabe:/tmp/cvs-serv26332/glib

Modified Files:
	dbus-gmain.c 
Log Message:
2006-02-16  Robert McQueen  <robot101 at debian.org>

	* glib/dbus-gmain.c: Make the previous commit compile.

	* python/_dbus.py, python/matchrules.py: Patch from Ole Andre
	Ravnaas <ole.andre.ravnaas at collabora.co.uk> to allow you to
	specify sender_keyword="foo", path_keyword="bar" when adding
	a signal listener, so that you can bind to signals generically
	but still do something useful in your callback.

	* python/dbus_bindings.pyx: Demarshal the byte type as unsigned
	chars so that they're not cast to chars and made negative. Thanks
	to Jakub Stachowski for reporting this and testing the fix.

Index: dbus-gmain.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gmain.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- dbus-gmain.c	15 Feb 2006 21:42:54 -0000	1.50
+++ dbus-gmain.c	15 Feb 2006 23:45:49 -0000	1.51
@@ -698,11 +698,11 @@
 
 /**
  * Returns a connection to the given address.
- * 
+ *
  * (Internally, calls dbus_connection_open() then calls
  * dbus_connection_setup_with_g_main() on the result.)
  *
- * @param address address of the connection to open 
+ * @param address address of the connection to open
  * @param error address where an error can be returned.
  * @returns a DBusConnection
  */
@@ -716,10 +716,10 @@
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
   _dbus_g_value_types_init ();
-  
+
   dbus_error_init (&derror);
 
-  connection = dbus_connection_open (socket, &derror);
+  connection = dbus_connection_open (address, &derror);
   if (connection == NULL)
     {
       dbus_set_g_error (error, &derror);