From: Colin Walters <walters@verbum.org>
Date: Fri, 29 Oct 2004 18:13:53 +0000 (+0000)
Subject: 2004-10-29  Colin Walters  <walters@redhat.com>
X-Git-Tag: dbus-0.23~95
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e11c966b556e2410d3e7247e44b1079e08574d03;p=thirdparty%2Fdbus.git

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 fe7096566..393de4f72 100644
--- 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 0ba3225d1..fb27ea0f9 100644
--- 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;
     }