From 397b0a4ec150c4400de8a041d077c819f6e978bd Mon Sep 17 00:00:00 2001 From: Robert McQueen Date: Wed, 15 Feb 2006 23:45:50 +0000 Subject: 2006-02-16 Robert McQueen * glib/dbus-gmain.c: Make the previous commit compile. * python/_dbus.py, python/matchrules.py: Patch from Ole Andre Ravnaas 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. --- glib/dbus-gmain.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'glib/dbus-gmain.c') diff --git a/glib/dbus-gmain.c b/glib/dbus-gmain.c index d2716103..54f868dd 100644 --- a/glib/dbus-gmain.c +++ b/glib/dbus-gmain.c @@ -698,11 +698,11 @@ dbus_server_setup_with_g_main (DBusServer *server, /** * 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 @@ dbus_g_connection_open (const gchar *address, 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); -- cgit