hal/hald Makefile.am, 1.47, 1.48 hald.c, 1.34, 1.35 property.c, 1.12, 1.13

[David Zeuthen]

Update of /cvs/hal/hal/hald
In directory gabe:/tmp/cvs-serv25660/hald

Modified Files:
	Makefile.am hald.c property.c 
Log Message:
2005-05-24  David Zeuthen  <davidz at redhat.com>

        * hald/property.c (hal_property_new_string): Just assign an
        empty string to the property if the value argument is NULL.
        Patch from Martin Pitt <martin at piware.de> (Ubuntu bug #11060)



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/hald/Makefile.am,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- Makefile.am	25 Feb 2005 01:55:08 -0000	1.47
+++ Makefile.am	24 May 2005 17:42:14 -0000	1.48
@@ -43,6 +43,7 @@
 	device_info.h			device_info.c			\
 	device_store.h			device_store.c			\
         hald.h				hald.c				\
+	master_slave.h			master_slave.c			\
 	hald_dbus.h			hald_dbus.c			\
 	logger.h			logger.c			\
 	osspec.h							\

Index: hald.c
===================================================================
RCS file: /cvs/hal/hal/hald/hald.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- hald.c	14 Apr 2005 03:18:58 -0000	1.34
+++ hald.c	24 May 2005 17:42:14 -0000	1.35
@@ -488,7 +488,8 @@
 		logger_disable ();
 
 	/* will fork into two; only the child will return here if we are successful */
-	/*master_slave_setup ();*/
+	/*master_slave_setup ();
+	  sleep (100000000);*/
 
 	loop = g_main_loop_new (NULL, FALSE);
 

Index: property.c
===================================================================
RCS file: /cvs/hal/hal/hald/property.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- property.c	28 Feb 2005 04:53:15 -0000	1.12
+++ property.c	24 May 2005 17:42:14 -0000	1.13
@@ -81,7 +81,7 @@
 
 	prop->type = HAL_PROPERTY_TYPE_STRING;
 	prop->key = g_strdup (key);
-	prop->str_value = g_strdup (value);
+	prop->str_value = g_strdup (value != NULL ? value : "");
 
 	while (!g_utf8_validate (prop->str_value, -1,
 				 (const char **) &endchar)) {
@@ -91,7 +91,7 @@
 
 	if (!validated) {
 		HAL_WARNING (("Key '%s' has invalid UTF-8 string '%s'",
-			      key, value));
+			      key, prop->str_value));
 	}
 
 	return prop;