[2.30] bump webkit to 1.1.16
[jhbuild/xnox.git] / patches / hal-dbus_connection_close.patch
blob88a5a6a7295a449db3434f256152e2bf9fbe0de7
1 Index: tools/hal-device.c
2 ===================================================================
3 RCS file: /cvs/hal/hal/tools/hal-device.c,v
4 retrieving revision 1.4
5 diff -u -p -r1.4 hal-device.c
6 --- tools/hal-device.c 2 Nov 2005 15:38:14 -0000 1.4
7 +++ tools/hal-device.c 20 Aug 2006 00:51:46 -0000
8 @@ -155,7 +155,7 @@ int main(int argc, char **argv)
10 libhal_ctx_shutdown(hal_ctx, &error);
11 libhal_ctx_free(hal_ctx);
12 - dbus_connection_disconnect(conn);
13 + dbus_connection_close(conn);
14 dbus_connection_unref(conn);
15 dbus_error_free(&error);
17 Index: tools/lshal.c
18 ===================================================================
19 RCS file: /cvs/hal/hal/tools/lshal.c,v
20 retrieving revision 1.19
21 diff -u -p -r1.19 lshal.c
22 --- tools/lshal.c 13 Feb 2006 14:35:31 -0000 1.19
23 +++ tools/lshal.c 20 Aug 2006 00:51:47 -0000
24 @@ -701,7 +701,7 @@ main (int argc, char *argv[])
25 libhal_ctx_shutdown (hal_ctx, &error);
26 libhal_ctx_free (hal_ctx);
28 - dbus_connection_disconnect (conn);
29 + dbus_connection_close (conn);
30 dbus_connection_unref (conn);
32 if (show_device)