hal: Branch 'master'

[David Zeuthen]

 hald/linux/device.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9fc161488795bcd259ea499bb28c04383be3a51b
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Mar 3 18:19:37 2008 -0500

    cowardly adding back info.bus for usb and usb_device for now
    
    At least two external projects are relying on it.
    
      $ grep "info.bus" `rpm -ql gphoto2|grep fdi`
        <match key="info.bus" string="usb">
      $ grep "info.bus" `rpm -ql libmtp|grep fdi`
          <match key="info.bus" string="usb">
    
    Sigh. So add this back.

diff --git a/hald/linux/device.c b/hald/linux/device.c
index e39672b..0e983ee 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -1709,6 +1709,7 @@ usb_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
 		gint bmAttributes;
 
 		hal_device_property_set_string (d, "info.subsystem", "usb_device");
+		hal_device_property_set_string (d, "info.bus", "usb_device");
 
 		hal_util_set_driver (d, "info.linux.driver", sysfs_path);
 
@@ -1795,6 +1796,7 @@ usb_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
 
 	} else {
 		hal_device_property_set_string (d, "info.subsystem", "usb");
+		hal_device_property_set_string (d, "info.bus", "usb");
 
 		/* take all usb_device.* properties from parent and make them usb.* on this object */
 		if (parent_dev != NULL)