From: Colin Walters <walters@verbum.org>
Date: Tue, 16 Aug 2005 21:26:12 +0000 (+0000)
Subject: 2005-08-16  Colin Walters  <walters@verbum.org>
X-Git-Tag: dbus-0.36~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9746c7a97871508c7298a8cad88dc7daff1c2bb3;p=platform%2Fupstream%2Fdbus.git

2005-08-16  Colin Walters  <walters@verbum.org>

	* glib/dbus-gobject.c (dbus_set_g_error): Don't lose if the
	DBusError message is NULL.
---

diff --git a/ChangeLog b/ChangeLog
index 2c97b9b..c7fc00f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-16  Colin Walters  <walters@verbum.org>
+
+	* glib/dbus-gobject.c (dbus_set_g_error): Don't lose if the
+	DBusError message is NULL.
+
 2005-08-09  Havoc Pennington  <hp@redhat.com>
 
 	* 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 e124f93..547a744 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);
 }