dbus/glib dbus-gproxy.c,1.19,1.20
Havoc Pennington
hp at freedesktop.org
Tue Feb 15 20:37:29 PST 2005
- Previous message: dbus/dbus dbus-connection-internal.h, 1.23, 1.24 dbus-connection.c,
1.97, 1.98 dbus-pending-call.c, 1.10, 1.11 dbus-pending-call.h,
1.6, 1.7
- Next message: dbus ChangeLog,1.702,1.703
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvs/dbus/dbus/glib
In directory gabe:/tmp/cvs-serv23849/glib
Modified Files:
dbus-gproxy.c
Log Message:
2005-02-15 Havoc Pennington <hp at redhat.com>
* dbus/dbus-connection.c (dbus_connection_dispatch): always
complete a pending call, don't run filters first.
* glib/dbus-gproxy.c (dbus_g_proxy_end_call): change to use
dbus_pending_call_steal_reply
* dbus/dbus-pending-call.c (dbus_pending_call_block): just call
_dbus_connection_block_pending_call
(dbus_pending_call_get_reply): change to steal_reply and return a
ref
* dbus/dbus-connection.c
(dbus_connection_send_with_reply_and_block): port to work in terms
of DBusPendingCall
(_dbus_connection_block_pending_call): replace block_for_reply
with this
Index: dbus-gproxy.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gproxy.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- dbus-gproxy.c 5 Feb 2005 04:15:57 -0000 1.19
+++ dbus-gproxy.c 16 Feb 2005 04:37:27 -0000 1.20
@@ -1386,7 +1386,7 @@
g_return_val_if_fail (pending != NULL, FALSE);
dbus_pending_call_block (DBUS_PENDING_CALL_FROM_G_PENDING_CALL (pending));
- message = dbus_pending_call_get_reply (DBUS_PENDING_CALL_FROM_G_PENDING_CALL (pending));
+ message = dbus_pending_call_steal_reply (DBUS_PENDING_CALL_FROM_G_PENDING_CALL (pending));
g_assert (message != NULL);
@@ -1403,6 +1403,7 @@
}
va_end (args);
+ dbus_message_unref (message);
return TRUE;
case DBUS_MESSAGE_TYPE_ERROR:
@@ -1416,6 +1417,8 @@
}
error:
+ dbus_message_unref (message);
+
dbus_set_g_error (error, &derror);
dbus_error_free (&derror);
return FALSE;
- Previous message: dbus/dbus dbus-connection-internal.h, 1.23, 1.24 dbus-connection.c,
1.97, 1.98 dbus-pending-call.c, 1.10, 1.11 dbus-pending-call.h,
1.6, 1.7
- Next message: dbus ChangeLog,1.702,1.703
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the dbus-commit
mailing list