summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--bus/services.c4
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index fe709656..393de4f7 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 0ba3225d..fb27ea0f 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;
}