Contents of /trunk/hal/patches/hal-0.5.7.1-fix-dbus.patch
Parent Directory | Revision Log
Revision 144 -
(show annotations)
(download)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 5438 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 5438 byte(s)
-import
1 | --- hal-0.5.7.1/tools/hal-device.c.fixdbus 2006-11-21 15:30:47.000000000 +0100 |
2 | +++ hal-0.5.7.1/tools/hal-device.c 2006-11-21 15:30:48.000000000 +0100 |
3 | @@ -155,7 +155,6 @@ |
4 | |
5 | libhal_ctx_shutdown(hal_ctx, &error); |
6 | libhal_ctx_free(hal_ctx); |
7 | - dbus_connection_close(conn); |
8 | dbus_connection_unref(conn); |
9 | dbus_error_free(&error); |
10 | |
11 | --- hal-0.5.7.1/tools/lshal.c.fixdbus 2006-11-21 15:30:47.000000000 +0100 |
12 | +++ hal-0.5.7.1/tools/lshal.c 2006-11-21 15:30:48.000000000 +0100 |
13 | @@ -701,7 +701,6 @@ |
14 | libhal_ctx_shutdown (hal_ctx, &error); |
15 | libhal_ctx_free (hal_ctx); |
16 | |
17 | - dbus_connection_close (conn); |
18 | dbus_connection_unref (conn); |
19 | |
20 | if (show_device) |
21 | --- hal-0.5.7.1/libhal/libhal.c.fixdbus 2006-02-12 22:47:28.000000000 +0100 |
22 | +++ hal-0.5.7.1/libhal/libhal.c 2006-11-21 15:33:31.000000000 +0100 |
23 | @@ -1525,7 +1525,7 @@ |
24 | reply = dbus_connection_send_with_reply_and_block (ctx->connection, |
25 | message, -1, |
26 | error); |
27 | - if (dbus_error_is_set (error)) { |
28 | + if (error != NULL && dbus_error_is_set (error)) { |
29 | dbus_message_unref (message); |
30 | return FALSE; |
31 | } |
32 | @@ -1710,7 +1710,7 @@ |
33 | reply = dbus_connection_send_with_reply_and_block (ctx->connection, |
34 | message, -1, |
35 | error); |
36 | - if (dbus_error_is_set (error)) { |
37 | + if (error != NULL && dbus_error_is_set (error)) { |
38 | dbus_message_unref (message); |
39 | return FALSE; |
40 | } |
41 | @@ -1762,7 +1762,7 @@ |
42 | reply = dbus_connection_send_with_reply_and_block (ctx->connection, |
43 | message, -1, |
44 | error); |
45 | - if (dbus_error_is_set (error)) { |
46 | + if (error != NULL && dbus_error_is_set (error)) { |
47 | dbus_message_unref (message); |
48 | return FALSE; |
49 | } |
50 | @@ -1814,7 +1814,7 @@ |
51 | reply = dbus_connection_send_with_reply_and_block (ctx->connection, |
52 | message, -1, |
53 | error); |
54 | - if (dbus_error_is_set (error)) { |
55 | + if (error != NULL && dbus_error_is_set (error)) { |
56 | dbus_message_unref (message); |
57 | return FALSE; |
58 | } |
59 | @@ -1865,7 +1865,7 @@ |
60 | reply = dbus_connection_send_with_reply_and_block (ctx->connection, |
61 | message, -1, |
62 | error); |
63 | - if (dbus_error_is_set (error)) { |
64 | + if (error != NULL && dbus_error_is_set (error)) { |
65 | dbus_message_unref (message); |
66 | return FALSE; |
67 | } |
68 | @@ -1926,7 +1926,7 @@ |
69 | message, -1, |
70 | error); |
71 | |
72 | - if (dbus_error_is_set (error)) { |
73 | + if (error != NULL && dbus_error_is_set (error)) { |
74 | if (strcmp (error->name, |
75 | "org.freedesktop.Hal.DeviceAlreadyLocked") == 0) { |
76 | if (reason_why_locked != NULL) { |
77 | @@ -1985,7 +1985,7 @@ |
78 | message, -1, |
79 | error); |
80 | |
81 | - if (dbus_error_is_set (error)) { |
82 | + if (error != NULL && dbus_error_is_set (error)) { |
83 | dbus_message_unref (message); |
84 | return FALSE; |
85 | } |
86 | @@ -2040,7 +2040,7 @@ |
87 | reply = dbus_connection_send_with_reply_and_block (ctx->connection, |
88 | message, -1, |
89 | error); |
90 | - if (dbus_error_is_set (error)) { |
91 | + if (error != NULL && dbus_error_is_set (error)) { |
92 | dbus_message_unref (message); |
93 | return NULL; |
94 | } |
95 | @@ -2125,7 +2125,7 @@ |
96 | reply = dbus_connection_send_with_reply_and_block (ctx->connection, |
97 | message, -1, |
98 | error); |
99 | - if (dbus_error_is_set (error)) { |
100 | + if (error != NULL && dbus_error_is_set (error)) { |
101 | dbus_message_unref (message); |
102 | return FALSE; |
103 | } |
104 | @@ -2179,7 +2179,7 @@ |
105 | reply = dbus_connection_send_with_reply_and_block (ctx->connection, |
106 | message, -1, |
107 | error); |
108 | - if (dbus_error_is_set (error)) { |
109 | + if (error != NULL && dbus_error_is_set (error)) { |
110 | dbus_message_unref (message); |
111 | return FALSE; |
112 | } |
113 | @@ -2365,7 +2365,7 @@ |
114 | reply = dbus_connection_send_with_reply_and_block (ctx->connection, |
115 | message, -1, |
116 | error); |
117 | - if (dbus_error_is_set (error)) { |
118 | + if (error != NULL && dbus_error_is_set (error)) { |
119 | dbus_message_unref (message); |
120 | return FALSE; |
121 | } |
122 | @@ -2652,7 +2652,7 @@ |
123 | reply = dbus_connection_send_with_reply_and_block (ctx->connection, |
124 | message, -1, |
125 | error); |
126 | - if (dbus_error_is_set (error)) { |
127 | + if (error != NULL && dbus_error_is_set (error)) { |
128 | dbus_message_unref (message); |
129 | return FALSE; |
130 | } |
131 | @@ -2788,7 +2788,7 @@ |
132 | "type='signal'," |
133 | "interface='org.freedesktop.Hal.Device'," |
134 | "sender='org.freedesktop.Hal'", error); |
135 | - if (dbus_error_is_set (error)) { |
136 | + if (error != NULL && dbus_error_is_set (error)) { |
137 | return FALSE; |
138 | } |
139 | return TRUE; |
140 | @@ -2820,7 +2820,7 @@ |
141 | "sender='org.freedesktop.Hal'," "path=%s", udi); |
142 | |
143 | dbus_bus_add_match (ctx->connection, buf, error); |
144 | - if (dbus_error_is_set (error)) { |
145 | + if (error != NULL && dbus_error_is_set (error)) { |
146 | return FALSE; |
147 | } |
148 | return TRUE; |
149 | @@ -2848,7 +2848,7 @@ |
150 | "sender='org.freedesktop.Hal'," "path=%s", udi); |
151 | |
152 | dbus_bus_remove_match (ctx->connection, buf, error); |
153 | - if (dbus_error_is_set (error)) { |
154 | + if (error != NULL && dbus_error_is_set (error)) { |
155 | return FALSE; |
156 | } |
157 | return TRUE; |
158 | @@ -3223,7 +3223,7 @@ |
159 | message, -1, |
160 | error); |
161 | |
162 | - if (dbus_error_is_set (error)) { |
163 | + if (error != NULL && dbus_error_is_set (error)) { |
164 | dbus_message_unref (message); |
165 | return FALSE; |
166 | } |
167 | @@ -3273,7 +3273,7 @@ |
168 | message, -1, |
169 | error); |
170 | |
171 | - if (dbus_error_is_set (error)) { |
172 | + if (error != NULL && dbus_error_is_set (error)) { |
173 | dbus_message_unref (message); |
174 | return FALSE; |
175 | } |
176 | @@ -3342,7 +3342,7 @@ |
177 | message, -1, |
178 | error); |
179 | |
180 | - if (dbus_error_is_set (error)) { |
181 | + if (error != NULL && dbus_error_is_set (error)) { |
182 | dbus_message_unref (message); |
183 | return FALSE; |
184 | } |