fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 01:48:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dbus-1.8'

Browse source 
Conflicts:
	dbus/dbus-sysdeps-win.c
This commit is contained in:
Ralf Habacker 2015-04-13 15:36:21 +02:00
commit 718843d351
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dbus/dbus-internals.c
View file

@ -509,7 +509,7 @@ _dbus_trace_ref (const char *obj_name,
{
VALGRIND_PRINTF_BACKTRACE ("%s %p ref stolen (%s)",
obj_name, obj, why);
_dbus_verbose ("%s %p ref stolen (%s)",
_dbus_verbose ("%s %p ref stolen (%s)\n",
obj_name, obj, why);
}
else
@ -517,7 +517,7 @@ _dbus_trace_ref (const char *obj_name,
VALGRIND_PRINTF_BACKTRACE ("%s %p %d -> %d refs (%s)",
obj_name, obj,
old_refcount, new_refcount, why);
_dbus_verbose ("%s %p %d -> %d refs (%s)",
_dbus_verbose ("%s %p %d -> %d refs (%s)\n",
obj_name, obj, old_refcount, new_refcount, why);
}
}

4
test/relay.c
View file

@ -273,6 +273,7 @@ teardown (Fixture *f,
{
if (f->left_client_conn != NULL)
{
test_connection_shutdown(NULL, f->left_client_conn);
dbus_connection_close (f->left_client_conn);
dbus_connection_unref (f->left_client_conn);
f->left_client_conn = NULL;
@ -280,6 +281,7 @@ teardown (Fixture *f,
if (f->right_client_conn != NULL)
{
test_connection_shutdown(NULL, f->right_client_conn);
dbus_connection_close (f->right_client_conn);
dbus_connection_unref (f->right_client_conn);
f->right_client_conn = NULL;
@ -287,6 +289,7 @@ teardown (Fixture *f,
if (f->left_server_conn != NULL)
{
test_connection_shutdown(NULL, f->left_server_conn);
dbus_connection_close (f->left_server_conn);
dbus_connection_unref (f->left_server_conn);
f->left_server_conn = NULL;
@ -294,6 +297,7 @@ teardown (Fixture *f,
if (f->right_server_conn != NULL)
{
test_connection_shutdown(NULL, f->right_server_conn);
dbus_connection_close (f->right_server_conn);
dbus_connection_unref (f->right_server_conn);
f->right_server_conn = NULL;