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

* glib/dbus-gvalue.c (marshal_basic): Marshal NULL string
	values as the empty string (#2948).
This commit is contained in:
Colin Walters 2005-06-16 04:38:11 +00:00
parent 6fe36d8791
commit 3220372584
2 changed files with 7 additions and 0 deletions

View file

@ -1,3 +1,8 @@
2005-06-16 Colin Walters <walters@verbum.org>
* glib/dbus-gvalue.c (marshal_basic): Marshal NULL string
values as the empty string (#2948).
2005-06-16 Colin Walters <walters@verbum.org>
* dbus/Makefile.am:

View file

@ -1275,6 +1275,8 @@ marshal_basic (DBusMessageIter *iter, GValue *value)
/* FIXME, the GValue string may not be valid UTF-8 */
{
const char *v = g_value_get_string (value);
if (!v)
v = "";
if (!dbus_message_iter_append_basic (iter,
DBUS_TYPE_STRING,
&v))