1 diff -ur hal-0.5.8/hald/device_info.c hal-0.5.8-patched/hald/device_info.c
2 --- hal-0.5.8/hald/device_info.c 2006-09-11 16:56:39.000000000 -0500
3 +++ hal-0.5.8-patched/hald/device_info.c 2006-11-15 11:52:24.000000000 -0600
8 -#include <dbus/dbus.h>
9 -#include <dbus/dbus-glib.h>
13 diff -ur hal-0.5.8/hald/dummy/osspec.c hal-0.5.8-patched/hald/dummy/osspec.c
14 --- hal-0.5.8/hald/dummy/osspec.c 2006-09-11 16:56:39.000000000 -0500
15 +++ hal-0.5.8-patched/hald/dummy/osspec.c 2006-11-15 11:52:24.000000000 -0600
20 -#include <dbus/dbus.h>
21 -#include <dbus/dbus-glib.h>
23 #include "../osspec.h"
24 #include "../logger.h"
25 diff -ur hal-0.5.8/hald/hald.c hal-0.5.8-patched/hald/hald.c
26 --- hal-0.5.8/hald/hald.c 2006-09-11 16:56:39.000000000 -0500
27 +++ hal-0.5.8-patched/hald/hald.c 2006-11-15 11:52:24.000000000 -0600
32 -#include <dbus/dbus.h>
33 -#include <dbus/dbus-glib.h>
34 -#include <dbus/dbus-glib-lowlevel.h>
36 /*#include "master_slave.h"*/
39 diff -ur hal-0.5.8/hald/hald_dbus.c hal-0.5.8-patched/hald/hald_dbus.c
40 --- hal-0.5.8/hald/hald_dbus.c 2006-09-11 16:56:39.000000000 -0500
41 +++ hal-0.5.8-patched/hald/hald_dbus.c 2006-11-15 11:52:24.000000000 -0600
46 -#include <dbus/dbus.h>
47 -#include <dbus/dbus-glib-lowlevel.h>
50 #include "hald_dbus.h"
52 diff -ur hal-0.5.8/hald/hald_runner.c hal-0.5.8-patched/hald/hald_runner.c
53 --- hal-0.5.8/hald/hald_runner.c 2006-09-11 16:56:39.000000000 -0500
54 +++ hal-0.5.8-patched/hald/hald_runner.c 2006-11-15 11:52:24.000000000 -0600
59 -#include <dbus/dbus.h>
60 -#include <dbus/dbus-glib-lowlevel.h>
64 diff -ur hal-0.5.8/hald/linux/addons/addon-cpufreq.h hal-0.5.8-patched/hald/linux/addons/addon-cpufreq.h
65 --- hal-0.5.8/hald/linux/addons/addon-cpufreq.h 2006-09-11 16:56:39.000000000 -0500
66 +++ hal-0.5.8-patched/hald/linux/addons/addon-cpufreq.h 2006-11-15 11:52:24.000000000 -0600
71 -#include <dbus/dbus-glib.h>
72 -#include <dbus/dbus-glib-lowlevel.h>
76 diff -ur hal-0.5.8/hald/linux/addons/addon-macbookpro-backlight.c hal-0.5.8-patched/hald/linux/addons/addon-macbookpro-backlight.c
77 --- hal-0.5.8/hald/linux/addons/addon-macbookpro-backlight.c 2006-09-11 16:56:39.000000000 -0500
78 +++ hal-0.5.8-patched/hald/linux/addons/addon-macbookpro-backlight.c 2006-11-15 11:52:24.000000000 -0600
82 #include <glib/gmain.h>
83 -#include <dbus/dbus-glib.h>
84 -#include <dbus/dbus-glib-lowlevel.h>
86 #include "libhal/libhal.h"
87 #include "../../logger.h"
88 diff -ur hal-0.5.8/hald/linux/addons/addon-usb-csr.c hal-0.5.8-patched/hald/linux/addons/addon-usb-csr.c
89 --- hal-0.5.8/hald/linux/addons/addon-usb-csr.c 2006-09-11 16:56:39.000000000 -0500
90 +++ hal-0.5.8-patched/hald/linux/addons/addon-usb-csr.c 2006-11-15 11:52:24.000000000 -0600
94 #include <glib/gmain.h>
95 -#include <dbus/dbus-glib.h>
96 -#include <dbus/dbus-glib-lowlevel.h>
98 #include "libhal/libhal.h"
99 #include "../../logger.h"
100 diff -ur hal-0.5.8/hald/linux/blockdev.c hal-0.5.8-patched/hald/linux/blockdev.c
101 --- hal-0.5.8/hald/linux/blockdev.c 2006-09-11 16:56:39.000000000 -0500
102 +++ hal-0.5.8-patched/hald/linux/blockdev.c 2006-11-15 11:52:24.000000000 -0600
107 -#include <dbus/dbus.h>
108 -#include <dbus/dbus-glib.h>
110 #include "../device_info.h"
112 #include "../hald_dbus.h"
113 diff -ur hal-0.5.8/hald/linux/classdev.c hal-0.5.8-patched/hald/linux/classdev.c
114 --- hal-0.5.8/hald/linux/classdev.c 2006-09-11 18:32:56.000000000 -0500
115 +++ hal-0.5.8-patched/hald/linux/classdev.c 2006-11-15 11:52:24.000000000 -0600
117 #include <sys/stat.h>
120 -#include <dbus/dbus.h>
121 -#include <dbus/dbus-glib.h>
123 #include "../device_info.h"
124 #include "../device_store.h"
126 diff -ur hal-0.5.8/hald/linux/coldplug.c hal-0.5.8-patched/hald/linux/coldplug.c
127 --- hal-0.5.8/hald/linux/coldplug.c 2006-09-11 16:56:39.000000000 -0500
128 +++ hal-0.5.8-patched/hald/linux/coldplug.c 2006-11-15 11:52:24.000000000 -0600
130 #include <sys/stat.h>
133 -#include <dbus/dbus.h>
134 -#include <dbus/dbus-glib.h>
136 #include "../device_info.h"
138 #include "../logger.h"
139 diff -ur hal-0.5.8/hald/linux/hotplug.c hal-0.5.8-patched/hald/linux/hotplug.c
140 --- hal-0.5.8/hald/linux/hotplug.c 2006-09-11 16:56:39.000000000 -0500
141 +++ hal-0.5.8-patched/hald/linux/hotplug.c 2006-11-15 11:52:24.000000000 -0600
146 -#include <dbus/dbus.h>
147 -#include <dbus/dbus-glib.h>
149 #include "../device_info.h"
151 #include "../logger.h"
152 diff -ur hal-0.5.8/hald/linux/ids.c hal-0.5.8-patched/hald/linux/ids.c
153 --- hal-0.5.8/hald/linux/ids.c 2006-09-11 16:56:39.000000000 -0500
154 +++ hal-0.5.8-patched/hald/linux/ids.c 2006-11-15 11:56:11.000000000 -0600
158 #include <dbus/dbus.h>
159 -#include <dbus/dbus-glib.h>
161 #include "../logger.h"
163 diff -ur hal-0.5.8/hald/linux/osspec.c hal-0.5.8-patched/hald/linux/osspec.c
164 --- hal-0.5.8/hald/linux/osspec.c 2006-09-11 16:56:39.000000000 -0500
165 +++ hal-0.5.8-patched/hald/linux/osspec.c 2006-11-15 11:52:24.000000000 -0600
167 #include <sys/utsname.h>
170 -#include <dbus/dbus.h>
171 -#include <dbus/dbus-glib.h>
173 #include "../device_info.h"
175 #include "../hald_dbus.h"
176 diff -ur hal-0.5.8/hald/linux/physdev.c hal-0.5.8-patched/hald/linux/physdev.c
177 --- hal-0.5.8/hald/linux/physdev.c 2006-09-11 16:56:39.000000000 -0500
178 +++ hal-0.5.8-patched/hald/linux/physdev.c 2006-11-15 11:52:24.000000000 -0600
183 -#include <dbus/dbus.h>
184 -#include <dbus/dbus-glib.h>
186 #include "../device_info.h"
188 #include "../logger.h"
189 diff -ur hal-0.5.8/hald/util.c hal-0.5.8-patched/hald/util.c
190 --- hal-0.5.8/hald/util.c 2006-09-11 16:56:39.000000000 -0500
191 +++ hal-0.5.8-patched/hald/util.c 2006-11-15 11:52:24.000000000 -0600
193 #include <sys/file.h>
196 -#include <dbus/dbus.h>
197 -#include <dbus/dbus-glib.h>
201 diff -ur hal-0.5.8/hald-runner/main.c hal-0.5.8-patched/hald-runner/main.c
202 --- hal-0.5.8/hald-runner/main.c 2006-09-11 16:56:39.000000000 -0500
203 +++ hal-0.5.8-patched/hald-runner/main.c 2006-11-15 11:52:24.000000000 -0600
205 **************************************************************************/
208 -#define DBUS_API_SUBJECT_TO_CHANGE
209 -#include <dbus/dbus-glib-lowlevel.h>
213 diff -ur hal-0.5.8/hald-runner/runner.c hal-0.5.8-patched/hald-runner/runner.c
214 --- hal-0.5.8/hald-runner/runner.c 2006-09-11 16:56:39.000000000 -0500
215 +++ hal-0.5.8-patched/hald-runner/runner.c 2006-11-15 11:56:42.000000000 -0600
220 -#define DBUS_API_SUBJECT_TO_CHANGE
221 -#include <dbus/dbus-glib-lowlevel.h>
222 +#include <dbus/dbus.h>
226 diff -ur hal-0.5.8/hald-runner/runner.h hal-0.5.8-patched/hald-runner/runner.h
227 --- hal-0.5.8/hald-runner/runner.h 2006-09-11 16:56:39.000000000 -0500
228 +++ hal-0.5.8-patched/hald-runner/runner.h 2006-11-15 11:52:24.000000000 -0600
233 -#define DBUS_API_SUBJECT_TO_CHANGE
234 -#include <dbus/dbus-glib-lowlevel.h>
239 diff -ur hal-0.5.8/hald-runner/utils.c hal-0.5.8-patched/hald-runner/utils.c
240 --- hal-0.5.8/hald-runner/utils.c 2006-09-11 16:56:39.000000000 -0500
241 +++ hal-0.5.8-patched/hald-runner/utils.c 2006-11-15 11:52:24.000000000 -0600
243 **************************************************************************/
246 -#define DBUS_API_SUBJECT_TO_CHANGE
247 -#include <dbus/dbus-glib-lowlevel.h>
251 diff -ur hal-0.5.8/hald-runner/utils.h hal-0.5.8-patched/hald-runner/utils.h
252 --- hal-0.5.8/hald-runner/utils.h 2006-09-11 16:56:39.000000000 -0500
253 +++ hal-0.5.8-patched/hald-runner/utils.h 2006-11-15 11:52:35.000000000 -0600
258 -#define DBUS_API_SUBJECT_TO_CHANGE
259 -#include <dbus/dbus-glib-lowlevel.h>
260 +#include <dbus/dbus.h>
262 char **get_string_array(DBusMessageIter *iter, gchar *extra);
263 char **get_string_array_from_fd(int fd);
264 diff -ur hal-0.5.8/tools/lshal.c hal-0.5.8-patched/tools/lshal.c
265 --- hal-0.5.8/tools/lshal.c 2006-09-11 16:56:40.000000000 -0500
266 +++ hal-0.5.8-patched/tools/lshal.c 2006-11-15 11:52:24.000000000 -0600
271 -#include <dbus/dbus-glib-lowlevel.h>
272 -#include <dbus/dbus-glib.h>