hal: Branch 'master'

[Danny Kukawka]

 hald/linux/device.c |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit d0e9f16b9111a5aa8c1e5d4da1b14f9139e7030b
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Sep 9 16:31:49 2008 +0200

    don't use hal_util_compute_udi directly inside of hald
    
    Fixed code to don't use hal_util_compute_udi directly inside of hald.

diff --git a/hald/linux/device.c b/hald/linux/device.c
index ea9015a..036e6a8 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -3760,12 +3760,10 @@ vmbus_compute_udi (HalDevice *d)
 {
 	gchar udi[256];
 	
-	hal_util_compute_udi (hald_get_gdl(), udi, sizeof (udi),
-			      "/org/freedesktop/Hal/devices/_%s",
-			      hal_device_property_get_string (d, "vmbus.bus_id"));
-
+	hald_compute_udi (udi, sizeof (udi), "/org/freedesktop/Hal/devices/_%s",
+			 hal_device_property_get_string (d, "vmbus.bus_id"));
 	hal_device_set_udi (d, udi);
-	
+
 	return TRUE;
 }
 
@@ -3805,11 +3803,9 @@ of_platform_compute_udi (HalDevice *d)
 {
 	gchar udi[256];
 
-	hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi),
-			      "/org/freedesktop/Hal/devices/of_platform_%s",
-			      hal_device_property_get_string (d, "of_platform.id"));
+	hald_compute_udi (udi, sizeof (udi), "/org/freedesktop/Hal/devices/of_platform_%s",
+			 hal_device_property_get_string (d, "of_platform.id"));
 	hal_device_set_udi (d, udi);
-	hal_device_property_set_string (d, "info.udi", udi);
 
 	return TRUE;
 }