dbus/glib dbus-gvalue.c,1.11,1.12

[Colin Walters]

Update of /cvs/dbus/dbus/glib
In directory gabe:/tmp/cvs-serv29619/glib

Modified Files:
	dbus-gvalue.c 
Log Message:
2005-06-16  Colin Walters  <walters at verbum.org>

	* glib/dbus-gvalue.c (marshal_basic): Marshal NULL string
	values as the empty string (#2948).


Index: dbus-gvalue.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gvalue.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- dbus-gvalue.c	14 Jun 2005 15:55:10 -0000	1.11
+++ dbus-gvalue.c	16 Jun 2005 04:38:11 -0000	1.12
@@ -1275,6 +1275,8 @@
       /* 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))