Merge branch 'dbus-1.2'

Conflicts:
	bus/dispatch.c
	configure.in
	test/name-test/test-names.c

1 files changed, 4 insertions, 1 deletions

diff --git a/bus/bus.c b/bus/bus.c
index 81d69b56..2e9a5050 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -1188,6 +1188,9 @@ bus_context_get_reply_timeout (BusContext *context)
 }
 
 void
+bus_context_log (BusContext *context, DBusSystemLogSeverity severity, const char *msg, ...) _DBUS_GNUC_PRINTF (3, 4);
+
+void
 bus_context_log (BusContext *context, DBusSystemLogSeverity severity, const char *msg, ...)
 {
   va_list args;
@@ -1208,7 +1211,7 @@ bus_context_log (BusContext *context, DBusSystemLogSeverity severity, const char
       if (!_dbus_string_append_printf_valist (&full_msg, msg, args))
         goto oom_out;
 
-      _dbus_system_log (severity, "%s", full_msg);
+      _dbus_system_log (severity, "%s", _dbus_string_get_const_data (&full_msg));
     oom_out:
       _dbus_string_free (&full_msg);
     }