hal: Branch 'master'

[Danny Kukawka]

 hald/hald_dbus.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6ce3f8d3d994867006ad948d96f778e36456c332
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Mar 6 21:16:22 2008 +0100

    fixed an other compiler warning from cgcc/sparse
    
    Fixed an other compiler warning from cgcc/sparse:
    - trying to concatenate 5817-character string (4095 bytes max)

diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c
index 8ad812e..c56fe9e 100644
--- a/hald/hald_dbus.c
+++ b/hald/hald_dbus.c
@@ -4558,8 +4558,9 @@ do_introspect (DBusConnection  *connection,
 				       "    </method>\n"
 				       "    <method name=\"Unlock\">\n"
 				       "      <arg name=\"released_lock\" direction=\"out\" type=\"b\"/>\n"
-				       "    </method>\n"
+				       "    </method>\n");
 
+		xml = g_string_append (xml,
 				       "    <method name=\"AcquireInterfaceLock\">\n"
 				       "      <arg name=\"interface_name\" direction=\"in\" type=\"s\"/>\n"
 				       "      <arg name=\"exclusive\" direction=\"in\" type=\"b\"/>\n"