diff options
| author | Colin Walters <walters@verbum.org> | 2005-08-16 21:26:12 +0000 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2005-08-16 21:26:12 +0000 |
| commit | 9746c7a97871508c7298a8cad88dc7daff1c2bb3 (patch) | |
| tree | dc458213855e3742d6abe607c501770580a94f5e | |
| parent | f20cee8e12f647ba3acb08a69cd154c52dd3b6ed (diff) | |
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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | glib/dbus-gobject.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -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 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); } |