hal: Branch 'origin'

[Sjoerd Simons]

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

New commits:
diff-tree 40aa75e140eff9e2cfa22874a76badfbd126b6ec (from 2ea340399bf8cf3d2bb6bd1b5c4ecbc2042e93d4)
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.
    (cherry picked from c127f54ee1a91743989ccdbe93025740fe9cec73 commit)

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);
 				}
 			}