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 2c97b9b4bb58aee5769340e894e30917e4135a6a..c7fc00f1bb50202a7385b5b30c52d88c2bec905a 100644 (file)
--- 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 e124f93474c077a7d1c329aad46c3c13093413c3..547a744b249d4bd86694a59ea90dde1b4bc74bd1 100644 (file)
--- 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);
 }