From 9746c7a97871508c7298a8cad88dc7daff1c2bb3 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 16 Aug 2005 21:26:12 +0000 Subject: 2005-08-16 Colin Walters * glib/dbus-gobject.c (dbus_set_g_error): Don't lose if the DBusError message is NULL. --- ChangeLog | 5 +++++ glib/dbus-gobject.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2c97b9b4..c7fc00f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-16 Colin Walters + + * glib/dbus-gobject.c (dbus_set_g_error): Don't lose if the + DBusError message is NULL. + 2005-08-09 Havoc Pennington * dbus/dbus-errors.c: apply patch from Timo Teras to make a diff --git a/glib/dbus-gobject.c b/glib/dbus-gobject.c index e124f934..547a744b 100644 --- a/glib/dbus-gobject.c +++ b/glib/dbus-gobject.c @@ -1494,7 +1494,7 @@ dbus_set_g_error (GError **gerror, g_set_error (gerror, DBUS_GERROR, code, "%s%c%s", - error->message, + error->message ? error->message : "", '\0', error->name); } -- cgit