2004-10-29 Colin Walters <walters@redhat.com>

	Patch from Matthew Rickard <mjricka@epoch.ncsc.mil>

	* bus/services.c (bus_registry_acquire_service):
	Correctly retrieve service name from DBusString
	for printing.

diff --git a/ChangeLog b/ChangeLog
index fe7096566869f1537c09ee913edfb3f8372bb9b8..393de4f72e5f32fdf46c95fe886ee62424200a4d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2004-10-29 Colin Walters  <walters@redhat.com>
+2004-10-29  Colin Walters  <walters@redhat.com>
+
+       Patch from Matthew Rickard <mjricka@epoch.ncsc.mil>
+
+       * bus/services.c (bus_registry_acquire_service): 
+       Correctly retrieve service name from DBusString
+       for printing.
+
+2004-10-29  Colin Walters  <walters@redhat.com>
 
        * dbus/dbus-glib.h: Update documentation to not
        refer to internal APIs.

diff --git a/bus/services.c b/bus/services.c
index 0ba3225d12f8769a98bdf4112b56ea8955ebccd5..fb27ea0f99345d49af5678939de3a3d4d4f9683f 100644 (file)
--- a/bus/services.c
+++ b/bus/services.c
@@ -318,7 +318,7 @@ bus_registry_acquire_service (BusRegistry      *registry,
                       bus_connection_is_active (connection) ?
                       bus_connection_get_name (connection) :
                       "(inactive)",
-                     service_name);
+                      _dbus_string_get_const_data (service_name));
       goto out;
     }
       
@@ -331,7 +331,7 @@ bus_registry_acquire_service (BusRegistry      *registry,
                       bus_connection_is_active (connection) ?
                       bus_connection_get_name (connection) :
                       "(inactive)",
-                     service_name);
+                      _dbus_string_get_const_data (service_name));
       goto out;
     }