hal: Branch 'hal-0_5_8-branch'

[David Zeuthen]

 hald/linux/probing/probe-storage.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

New commits:
diff-tree c127f54ee1a91743989ccdbe93025740fe9cec73 (from 7691009aecd24b01899b2527835b2b8534ab3fc1)
Author: David Zeuthen <davidz at redhat.com>
Date:   Tue Sep 26 15:50:51 2006 -0400

    don't crash on cd drives without write capabilities
    
    This fix needs to be forward-ported to master. Probably we shouldn't
    be looking for write speeds unless the drive can write. This fix
    will do it for the 0.5.8 series though.

diff --git a/hald/linux/probing/probe-storage.c b/hald/linux/probing/probe-storage.c
index 41c43bd..8afeb8d 100644
--- a/hald/linux/probing/probe-storage.c
+++ b/hald/linux/probing/probe-storage.c
@@ -254,8 +254,10 @@ main (int argc, char *argv[])
 						free (write_speeds);
 					}
 				} else {
+					gchar *wspeeds[1] = {NULL};
 					libhal_changeset_set_property_int (cs, "storage.cdrom.write_speed", 0);
-					libhal_changeset_set_property_strlist (cs, "storage.cdrom.write_speeds", NULL);
+					libhal_changeset_set_property_strlist (cs, "storage.cdrom.write_speeds", 
+									       (const char **) wspeeds);
 				}
 			}