Commit 718843d3 authored by Ralf Habacker's avatar Ralf Habacker

Merge branch 'dbus-1.8'

Conflicts:
	dbus/dbus-sysdeps-win.c
parents 4101e0bc c225ff83
......@@ -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);
}
}
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment