hal: Branch 'master'

[David Zeuthen]

 hald/linux/addons/addon-macbook-backlight.c    |    1 +
 hald/linux/addons/addon-macbookpro-backlight.c |    1 +
 hald/linux/addons/addon-storage.c              |    1 +
 3 files changed, 3 insertions(+)

New commits:
commit ed37c42ba7dc2f78aa4d9f41bc700d5f7d30e214
Author: Frederic Crozat <fcrozat at mandriva.com>
Date:   Thu Dec 6 15:04:53 2007 -0500

    fix addon exiting on system bus restart
    
    Hi,
    
    the attached patch prevent some hal addons from exiting when system dbus
    is restarted (some addons were already fixed).
    
    --
    Frederic Crozat <fcrozat at mandriva.com>
    Mandriva

diff --git a/hald/linux/addons/addon-macbook-backlight.c b/hald/linux/addons/addon-macbook-backlight.c
index 50a57d7..3f51b3f 100644
--- a/hald/linux/addons/addon-macbook-backlight.c
+++ b/hald/linux/addons/addon-macbook-backlight.c
@@ -320,6 +320,7 @@ main (int argc, char **argv)
 
 	conn = libhal_ctx_get_dbus_connection (halctx);
 	dbus_connection_setup_with_g_main (conn, NULL);
+	dbus_connection_set_exit_on_disconnect (conn, 0);
 
 	dbus_connection_add_filter (conn, filter_function, NULL, NULL);
 
diff --git a/hald/linux/addons/addon-macbookpro-backlight.c b/hald/linux/addons/addon-macbookpro-backlight.c
index 830f915..a72024c 100644
--- a/hald/linux/addons/addon-macbookpro-backlight.c
+++ b/hald/linux/addons/addon-macbookpro-backlight.c
@@ -502,6 +502,7 @@ main (int argc, char *argv[])
 
 	conn = libhal_ctx_get_dbus_connection (halctx);
 	dbus_connection_setup_with_g_main (conn, NULL);
+	dbus_connection_set_exit_on_disconnect (conn, 0);
 
 	dbus_connection_add_filter (conn, filter_function, NULL, NULL);
 
diff --git a/hald/linux/addons/addon-storage.c b/hald/linux/addons/addon-storage.c
index 42385fc..85e0518 100644
--- a/hald/linux/addons/addon-storage.c
+++ b/hald/linux/addons/addon-storage.c
@@ -665,6 +665,7 @@ main (int argc, char *argv[])
 	}
 	loop = g_main_loop_new (NULL, FALSE);
 	dbus_connection_setup_with_g_main (con, NULL);
+	dbus_connection_set_exit_on_disconnect (con, 0);
 
 	dbus_error_init (&error);
 	if ((ctx = libhal_ctx_init_direct (&error)) == NULL)