Magellan Linux

Annotation of /trunk/hal/patches/hal-0.5.10-fix-addon-exiting-on-system-bus-restart.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 597 - (hide annotations) (download)
Mon May 19 19:05:19 2008 UTC (16 years ago) by niro
File size: 2124 byte(s)
-gentoo patches

1 niro 597 From 5fb6b516c9dff3233852384e369bf21f0baca732 Mon Sep 17 00:00:00 2001
2     From: Frederic Crozat <fcrozat@mandriva.com>
3     Date: Thu, 6 Dec 2007 15:04:53 -0500
4     Subject: [PATCH] fix addon exiting on system bus restart
5    
6     Hi,
7    
8     the attached patch prevent some hal addons from exiting when system dbus
9     is restarted (some addons were already fixed).
10    
11     --
12     Frederic Crozat <fcrozat@mandriva.com>
13     Mandriva
14     ---
15     hald/linux/addons/addon-macbook-backlight.c | 1 +
16     hald/linux/addons/addon-macbookpro-backlight.c | 1 +
17     hald/linux/addons/addon-storage.c | 1 +
18     3 files changed, 3 insertions(+), 0 deletions(-)
19    
20     diff --git a/hald/linux/addons/addon-macbook-backlight.c b/hald/linux/addons/addon-macbook-backlight.c
21     index 50a57d7..3f51b3f 100644
22     --- a/hald/linux/addons/addon-macbook-backlight.c
23     +++ b/hald/linux/addons/addon-macbook-backlight.c
24     @@ -320,6 +320,7 @@ main (int argc, char **argv)
25    
26     conn = libhal_ctx_get_dbus_connection (halctx);
27     dbus_connection_setup_with_g_main (conn, NULL);
28     + dbus_connection_set_exit_on_disconnect (conn, 0);
29    
30     dbus_connection_add_filter (conn, filter_function, NULL, NULL);
31    
32     diff --git a/hald/linux/addons/addon-macbookpro-backlight.c b/hald/linux/addons/addon-macbookpro-backlight.c
33     index 830f915..a72024c 100644
34     --- a/hald/linux/addons/addon-macbookpro-backlight.c
35     +++ b/hald/linux/addons/addon-macbookpro-backlight.c
36     @@ -502,6 +502,7 @@ main (int argc, char *argv[])
37    
38     conn = libhal_ctx_get_dbus_connection (halctx);
39     dbus_connection_setup_with_g_main (conn, NULL);
40     + dbus_connection_set_exit_on_disconnect (conn, 0);
41    
42     dbus_connection_add_filter (conn, filter_function, NULL, NULL);
43    
44     diff --git a/hald/linux/addons/addon-storage.c b/hald/linux/addons/addon-storage.c
45     index 42385fc..85e0518 100644
46     --- a/hald/linux/addons/addon-storage.c
47     +++ b/hald/linux/addons/addon-storage.c
48     @@ -665,6 +665,7 @@ main (int argc, char *argv[])
49     }
50     loop = g_main_loop_new (NULL, FALSE);
51     dbus_connection_setup_with_g_main (con, NULL);
52     + dbus_connection_set_exit_on_disconnect (con, 0);
53    
54     dbus_error_init (&error);
55     if ((ctx = libhal_ctx_init_direct (&error)) == NULL)
56     --
57     1.5.3.7
58