hal: Branch 'master'

[David Zeuthen]

 doc/spec/hal-spec-properties.xml         |    8 ++++----
 hald/linux/probing/probe-net-bluetooth.c |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
diff-tree 8e6daa796eec0bf639567ed94a784838c1fc5fdb (from 5757293a4d44b1696e4c935ab346546ce2673d73)
Author: David Zeuthen <davidz at redhat.com>
Date:   Tue Apr 24 15:19:23 2007 -0400

    properties in net.bluetooth.* are not Bluez specific; remove bluez_ prefix

diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index 852d5ee..e5c562e 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -4334,23 +4334,23 @@ org.freedesktop.Hal.Device.Volume.method
             </row>
            <row>
               <entry>
-                <literal>net.bluetooth.bluez_name</literal> (string)
+                <literal>net.bluetooth.name</literal> (string)
               </entry>
               <entry>example: Network Access Point Service</entry>
               <entry>
                 Only if the <literal>net.bluetooth</literal> capability is set and Bluez is being used.
               </entry>
-              <entry>Displayable Name according to Bluez</entry>
+              <entry>Displayable Name for network connection</entry>
             </row>
             <row>
               <entry>
-                <literal>net.bluetooth.bluez_uuid</literal> (string)
+                <literal>net.bluetooth.uuid</literal> (string)
               </entry>
               <entry>example: 00001116-0000-1000-8000-00805f9b34fb</entry>
               <entry>
                 Only if the <literal>net.bluetooth</literal> capability is set and Bluez is being used.
               </entry>
-              <entry>Universal Unique Identifier</entry>
+              <entry>Universal Unique Identifier for network connection</entry>
             </row>
           </tbody>
         </tgroup>
diff --git a/hald/linux/probing/probe-net-bluetooth.c b/hald/linux/probing/probe-net-bluetooth.c
index 7f576b6..854e8e7 100644
--- a/hald/linux/probing/probe-net-bluetooth.c
+++ b/hald/linux/probing/probe-net-bluetooth.c
@@ -88,7 +88,7 @@ get_properties (DBusConnection *conn, Li
 		dbus_message_iter_next (&dict_entry_iter);
 		dbus_message_iter_recurse (&dict_entry_iter, &var_iter);
 
-                snprintf(prop, sizeof (prop), "net.bluetooth.bluez_%s", key);
+                snprintf(prop, sizeof (prop), "net.bluetooth.%s", key);
 
 		/* Make any property found annouced by hal */
 		switch (dbus_message_iter_get_arg_type (&var_iter)) {