source: scripts/scripts/untested/gnome-patches/gnome-vfs-2.10.1-hal_0.5.0-1.patch @ 0b402ff

clfs-1.2clfs-2.1clfs-3.0.0-systemdclfs-3.0.0-sysvinitsystemdsysvinit
Last change on this file since 0b402ff was 0b402ff, checked in by Jim Gifford <clfs@…>, 18 years ago

r698@server (orig r696): ryan | 2005-11-13 00:00:47 -0800

r704@rei: lfs | 2005-11-13 19:01:08 +1100
Import updates for untested blfs-scripts
  • Property mode set to 100644
File size: 30.3 KB
RevLine 
[0b402ff]1Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
2Date:                    2005-04-22
3Initial Package Version: 2.10.1
4Upstream Status:         Already in CVS
5Origin:                  GNOME CVS
6Description:             Port to the new HAL API (hal-0.5.0)
7
8$LastChangedBy: bdubbs $
9$Date: 2005-08-01 13:29:19 -0600 (Mon, 01 Aug 2005) $
10
11diff -Naur gnome-vfs-2.10.1-orig/libgnomevfs/gnome-vfs-hal-mounts.c gnome-vfs-2.10.1/libgnomevfs/gnome-vfs-hal-mounts.c
12--- gnome-vfs-2.10.1-orig/libgnomevfs/gnome-vfs-hal-mounts.c    2004-12-10 21:33:53.000000000 +0000
13+++ gnome-vfs-2.10.1/libgnomevfs/gnome-vfs-hal-mounts.c 2005-04-22 05:13:23.000000000 +0000
14@@ -49,16 +49,9 @@
15 
16 typedef struct {
17        GnomeVFSVolumeMonitorDaemon *volume_monitor_daemon;
18-       HalStoragePolicy *hal_storage_policy;
19+       LibHalStoragePolicy *hal_storage_policy;
20 } GnomeVFSHalUserData;
21 
22-static void
23-_hal_mainloop_integration (LibHalContext *ctx,
24-                          DBusConnection * dbus_connection)
25-{
26-        dbus_connection_setup_with_g_main (dbus_connection, NULL);
27-}
28-
29 static void
30 _hal_device_added (LibHalContext *hal_ctx,
31                   const char *udi)
32@@ -66,16 +59,16 @@
33        GnomeVFSHalUserData *hal_userdata;
34        GnomeVFSVolumeMonitorDaemon *volume_monitor_daemon;
35       
36-       hal_userdata = (GnomeVFSHalUserData *) hal_ctx_get_user_data (hal_ctx);
37+       hal_userdata = (GnomeVFSHalUserData *) libhal_ctx_get_user_data (hal_ctx);
38        volume_monitor_daemon = hal_userdata->volume_monitor_daemon;
39 
40        /* Handle optical discs without data since these are not handled
41         * by GNOME VFS
42         */
43-       if (hal_device_get_property_bool (hal_ctx, udi, "volume.is_disc")) {
44+       if (libhal_device_get_property_bool (hal_ctx, udi, "volume.is_disc", NULL)) {
45                const char *storage_udi;
46 
47-               storage_udi = hal_device_get_property_string (hal_ctx, udi, "block.storage_device");
48+               storage_udi = libhal_device_get_property_string (hal_ctx, udi, "block.storage_device", NULL);
49                if (storage_udi != NULL) {
50                        GnomeVFSDrive *drive;
51 
52@@ -97,7 +90,7 @@
53        GnomeVFSHalUserData *hal_userdata;
54        GnomeVFSVolumeMonitorDaemon *volume_monitor_daemon;
55       
56-       hal_userdata = (GnomeVFSHalUserData *) hal_ctx_get_user_data (hal_ctx);
57+       hal_userdata = (GnomeVFSHalUserData *) libhal_ctx_get_user_data (hal_ctx);
58        volume_monitor_daemon = hal_userdata->volume_monitor_daemon;
59 
60        drive = _gnome_vfs_volume_monitor_find_drive_by_hal_udi (
61@@ -122,153 +115,93 @@
62        }
63 }
64 
65-static void
66-_hal_device_new_capability (LibHalContext *hal_ctx,
67-                           const char *udi,
68-                           const char *capability)
69-{
70-       GnomeVFSHalUserData *hal_userdata;
71-       GnomeVFSVolumeMonitorDaemon *volume_monitor_daemon;
72-       
73-       hal_userdata = (GnomeVFSHalUserData *) hal_ctx_get_user_data (hal_ctx);
74-       volume_monitor_daemon = hal_userdata->volume_monitor_daemon;
75-
76-       /* do nothing */
77-}
78-
79-static void
80-_hal_device_lost_capability (LibHalContext *hal_ctx,
81-                            const char *udi,
82-                            const char *capability)
83-{
84-       GnomeVFSHalUserData *hal_userdata;
85-       GnomeVFSVolumeMonitorDaemon *volume_monitor_daemon;
86-       
87-       hal_userdata = (GnomeVFSHalUserData *) hal_ctx_get_user_data (hal_ctx);
88-       volume_monitor_daemon = hal_userdata->volume_monitor_daemon;
89 
90-       /* do nothing */
91-}
92 
93-static void
94-_hal_device_property_modified (LibHalContext *hal_ctx,
95-                              const char *udi,
96-                              const char *key,
97-                              dbus_bool_t is_removed,
98-                              dbus_bool_t is_added)
99-{
100-       GnomeVFSHalUserData *hal_userdata;
101-       GnomeVFSVolumeMonitorDaemon *volume_monitor_daemon;
102-       
103-       hal_userdata = (GnomeVFSHalUserData *) hal_ctx_get_user_data (hal_ctx);
104-       volume_monitor_daemon = hal_userdata->volume_monitor_daemon;
105-
106-       /* do nothing */
107-}
108-
109-static void
110-_hal_device_condition (LibHalContext *hal_ctx,
111-                      const char *udi,
112-                      const char *condition_name,
113-                      DBusMessage *message)
114-{
115-       GnomeVFSHalUserData *hal_userdata;
116-       GnomeVFSVolumeMonitorDaemon *volume_monitor_daemon;
117-       
118-       hal_userdata = (GnomeVFSHalUserData *) hal_ctx_get_user_data (hal_ctx);
119-       volume_monitor_daemon = hal_userdata->volume_monitor_daemon;
120-
121-       /* do nothing */
122-}
123-
124-static LibHalFunctions
125-hal_functions = { _hal_mainloop_integration,
126-                 _hal_device_added,
127-                 _hal_device_removed,
128-                 _hal_device_new_capability,
129-                 _hal_device_lost_capability,
130-                 _hal_device_property_modified,
131-                 _hal_device_condition };
132-
133-static HalStoragePolicyIconPair icon_mapping[] = {
134-       {HAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK,           "gnome-dev-removable"},
135-       {HAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_IDE,       "gnome-dev-removable"},
136-       {HAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_SCSI,      "gnome-dev-removable"},
137-       {HAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_USB,       "gnome-dev-removable-usb"},
138-       {HAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_IEEE1394,  "gnome-dev-removable-1394"},
139-       {HAL_STORAGE_ICON_DRIVE_DISK,                     "gnome-dev-removable"},
140-       {HAL_STORAGE_ICON_DRIVE_DISK_IDE,                 "gnome-dev-removable"},
141-       {HAL_STORAGE_ICON_DRIVE_DISK_SCSI,                "gnome-dev-removable"},
142-       {HAL_STORAGE_ICON_DRIVE_DISK_USB,                 "gnome-dev-removable-usb"},
143-       {HAL_STORAGE_ICON_DRIVE_DISK_IEEE1394,            "gnome-dev-removable-1394"},
144-       {HAL_STORAGE_ICON_DRIVE_CDROM,                    "gnome-dev-removable"},
145-       {HAL_STORAGE_ICON_DRIVE_CDROM_IDE,                "gnome-dev-removable"},
146-       {HAL_STORAGE_ICON_DRIVE_CDROM_SCSI,               "gnome-dev-removable"},
147-       {HAL_STORAGE_ICON_DRIVE_CDROM_USB,                "gnome-dev-removable-usb"},
148-       {HAL_STORAGE_ICON_DRIVE_CDROM_IEEE1394,           "gnome-dev-removable-1394"},
149-       {HAL_STORAGE_ICON_DRIVE_FLOPPY,                   "gnome-dev-removable"},
150-       {HAL_STORAGE_ICON_DRIVE_FLOPPY_IDE,               "gnome-dev-removable"},
151-       {HAL_STORAGE_ICON_DRIVE_FLOPPY_SCSI,              "gnome-dev-removable"},
152-       {HAL_STORAGE_ICON_DRIVE_FLOPPY_USB,               "gnome-dev-removable-usb"},
153-       {HAL_STORAGE_ICON_DRIVE_FLOPPY_IEEE1394,          "gnome-dev-removable-1394"},
154-       {HAL_STORAGE_ICON_DRIVE_TAPE,                     "gnome-dev-removable"},
155-       {HAL_STORAGE_ICON_DRIVE_COMPACT_FLASH,            "gnome-dev-removable"},
156-       {HAL_STORAGE_ICON_DRIVE_MEMORY_STICK,             "gnome-dev-removable"},
157-       {HAL_STORAGE_ICON_DRIVE_SMART_MEDIA,              "gnome-dev-removable"},
158-       {HAL_STORAGE_ICON_DRIVE_SD_MMC,                   "gnome-dev-removable"},
159-       {HAL_STORAGE_ICON_DRIVE_CAMERA,                   "gnome-dev-removable"},
160-       {HAL_STORAGE_ICON_DRIVE_PORTABLE_AUDIO_PLAYER,    "gnome-dev-removable"},
161-
162-       {HAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK,          "gnome-dev-harddisk"},
163-       {HAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_IDE,      "gnome-dev-harddisk"},
164-       {HAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_SCSI,     "gnome-dev-harddisk"},
165-       {HAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_USB,      "gnome-dev-harddisk-usb"},
166-       {HAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_IEEE1394, "gnome-dev-harddisk-1394"},
167-       {HAL_STORAGE_ICON_VOLUME_DISK,                    "gnome-dev-harddisk"},
168-       {HAL_STORAGE_ICON_VOLUME_DISK_IDE,                "gnome-dev-harddisk"},
169-       {HAL_STORAGE_ICON_VOLUME_DISK_SCSI,               "gnome-dev-harddisk"},
170-       {HAL_STORAGE_ICON_VOLUME_DISK_USB,                "gnome-dev-harddisk-usb"},
171-       {HAL_STORAGE_ICON_VOLUME_DISK_IEEE1394,           "gnome-dev-harddisk-1394"},
172-       {HAL_STORAGE_ICON_VOLUME_CDROM,                   "gnome-dev-cdrom"},
173-       {HAL_STORAGE_ICON_VOLUME_CDROM_IDE,               "gnome-dev-cdrom"},
174-       {HAL_STORAGE_ICON_VOLUME_CDROM_SCSI,              "gnome-dev-cdrom"},
175-       {HAL_STORAGE_ICON_VOLUME_CDROM_USB,               "gnome-dev-cdrom"},
176-       {HAL_STORAGE_ICON_VOLUME_CDROM_IEEE1394,          "gnome-dev-cdrom"},
177-       {HAL_STORAGE_ICON_VOLUME_FLOPPY,                  "gnome-dev-floppy"},
178-       {HAL_STORAGE_ICON_VOLUME_FLOPPY_IDE,              "gnome-dev-floppy"},
179-       {HAL_STORAGE_ICON_VOLUME_FLOPPY_SCSI,             "gnome-dev-floppy"},
180-       {HAL_STORAGE_ICON_VOLUME_FLOPPY_USB,              "gnome-dev-floppy"},
181-       {HAL_STORAGE_ICON_VOLUME_FLOPPY_IEEE1394,         "gnome-dev-floppy"},
182-       {HAL_STORAGE_ICON_VOLUME_TAPE,                    "gnome-dev-harddisk"},
183-       {HAL_STORAGE_ICON_VOLUME_COMPACT_FLASH,           "gnome-dev-media-cf"},
184-       {HAL_STORAGE_ICON_VOLUME_MEMORY_STICK,            "gnome-dev-media-ms"},
185-       {HAL_STORAGE_ICON_VOLUME_SMART_MEDIA,             "gnome-dev-media-sm"},
186-       {HAL_STORAGE_ICON_VOLUME_SD_MMC,                  "gnome-dev-media-sdmmc"},
187-       {HAL_STORAGE_ICON_VOLUME_CAMERA,                  "camera"},
188-       {HAL_STORAGE_ICON_VOLUME_PORTABLE_AUDIO_PLAYER,   "gnome-dev-ipod"},
189-
190-       {HAL_STORAGE_ICON_DISC_CDROM,                     "gnome-dev-cdrom"},
191-       {HAL_STORAGE_ICON_DISC_CDR,                       "gnome-dev-cdrom"},
192-       {HAL_STORAGE_ICON_DISC_CDRW,                      "gnome-dev-cdrom"},
193-       {HAL_STORAGE_ICON_DISC_DVDROM,                    "gnome-dev-dvd"},
194-       {HAL_STORAGE_ICON_DISC_DVDRAM,                    "gnome-dev-dvd"},
195-       {HAL_STORAGE_ICON_DISC_DVDR,                      "gnome-dev-dvd"},
196-       {HAL_STORAGE_ICON_DISC_DVDRW,                     "gnome-dev-dvd"},
197-       {HAL_STORAGE_ICON_DISC_DVDPLUSR,                  "gnome-dev-dvd"},
198-       {HAL_STORAGE_ICON_DISC_DVDPLUSRW,                 "gnome-dev-dvd"},
199+static LibHalStoragePolicyIconPair icon_mapping[] = {
200+       {LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK,           "gnome-dev-removable"},
201+       {LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_IDE,       "gnome-dev-removable"},
202+       {LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_SCSI,      "gnome-dev-removable"},
203+       {LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_USB,       "gnome-dev-removable-usb"},
204+       {LIBHAL_STORAGE_ICON_DRIVE_REMOVABLE_DISK_IEEE1394,  "gnome-dev-removable-1394"},
205+       {LIBHAL_STORAGE_ICON_DRIVE_DISK,                     "gnome-dev-removable"},
206+       {LIBHAL_STORAGE_ICON_DRIVE_DISK_IDE,                 "gnome-dev-removable"},
207+       {LIBHAL_STORAGE_ICON_DRIVE_DISK_SCSI,                "gnome-dev-removable"},
208+       {LIBHAL_STORAGE_ICON_DRIVE_DISK_USB,                 "gnome-dev-removable-usb"},
209+       {LIBHAL_STORAGE_ICON_DRIVE_DISK_IEEE1394,            "gnome-dev-removable-1394"},
210+       {LIBHAL_STORAGE_ICON_DRIVE_CDROM,                    "gnome-dev-removable"},
211+       {LIBHAL_STORAGE_ICON_DRIVE_CDROM_IDE,                "gnome-dev-removable"},
212+       {LIBHAL_STORAGE_ICON_DRIVE_CDROM_SCSI,               "gnome-dev-removable"},
213+       {LIBHAL_STORAGE_ICON_DRIVE_CDROM_USB,                "gnome-dev-removable-usb"},
214+       {LIBHAL_STORAGE_ICON_DRIVE_CDROM_IEEE1394,           "gnome-dev-removable-1394"},
215+       {LIBHAL_STORAGE_ICON_DRIVE_FLOPPY,                   "gnome-dev-removable"},
216+       {LIBHAL_STORAGE_ICON_DRIVE_FLOPPY_IDE,               "gnome-dev-removable"},
217+       {LIBHAL_STORAGE_ICON_DRIVE_FLOPPY_SCSI,              "gnome-dev-removable"},
218+       {LIBHAL_STORAGE_ICON_DRIVE_FLOPPY_USB,               "gnome-dev-removable-usb"},
219+       {LIBHAL_STORAGE_ICON_DRIVE_FLOPPY_IEEE1394,          "gnome-dev-removable-1394"},
220+       {LIBHAL_STORAGE_ICON_DRIVE_TAPE,                     "gnome-dev-removable"},
221+       {LIBHAL_STORAGE_ICON_DRIVE_COMPACT_FLASH,            "gnome-dev-removable"},
222+       {LIBHAL_STORAGE_ICON_DRIVE_MEMORY_STICK,             "gnome-dev-removable"},
223+       {LIBHAL_STORAGE_ICON_DRIVE_SMART_MEDIA,              "gnome-dev-removable"},
224+       {LIBHAL_STORAGE_ICON_DRIVE_SD_MMC,                   "gnome-dev-removable"},
225+       {LIBHAL_STORAGE_ICON_DRIVE_CAMERA,                   "gnome-dev-removable"},
226+       {LIBHAL_STORAGE_ICON_DRIVE_PORTABLE_AUDIO_PLAYER,    "gnome-dev-removable"},
227+       {LIBHAL_STORAGE_ICON_DRIVE_ZIP,                      "gnome-dev-removable"},
228+       {LIBHAL_STORAGE_ICON_DRIVE_JAZ,                      "gnome-dev-removable"},
229+       {LIBHAL_STORAGE_ICON_DRIVE_FLASH_KEY,                "gnome-dev-removable"},
230+
231+       {LIBHAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK,          "gnome-dev-harddisk"},
232+       {LIBHAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_IDE,      "gnome-dev-harddisk"},
233+       {LIBHAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_SCSI,     "gnome-dev-harddisk"},
234+       {LIBHAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_USB,      "gnome-dev-harddisk-usb"},
235+       {LIBHAL_STORAGE_ICON_VOLUME_REMOVABLE_DISK_IEEE1394, "gnome-dev-harddisk-1394"},
236+       {LIBHAL_STORAGE_ICON_VOLUME_DISK,                    "gnome-dev-harddisk"},
237+       {LIBHAL_STORAGE_ICON_VOLUME_DISK_IDE,                "gnome-dev-harddisk"},
238+       {LIBHAL_STORAGE_ICON_VOLUME_DISK_SCSI,               "gnome-dev-harddisk"},
239+       {LIBHAL_STORAGE_ICON_VOLUME_DISK_USB,                "gnome-dev-harddisk-usb"},
240+       {LIBHAL_STORAGE_ICON_VOLUME_DISK_IEEE1394,           "gnome-dev-harddisk-1394"},
241+       {LIBHAL_STORAGE_ICON_VOLUME_CDROM,                   "gnome-dev-cdrom"},
242+       {LIBHAL_STORAGE_ICON_VOLUME_CDROM_IDE,               "gnome-dev-cdrom"},
243+       {LIBHAL_STORAGE_ICON_VOLUME_CDROM_SCSI,              "gnome-dev-cdrom"},
244+       {LIBHAL_STORAGE_ICON_VOLUME_CDROM_USB,               "gnome-dev-cdrom"},
245+       {LIBHAL_STORAGE_ICON_VOLUME_CDROM_IEEE1394,          "gnome-dev-cdrom"},
246+       {LIBHAL_STORAGE_ICON_VOLUME_FLOPPY,                  "gnome-dev-floppy"},
247+       {LIBHAL_STORAGE_ICON_VOLUME_FLOPPY_IDE,              "gnome-dev-floppy"},
248+       {LIBHAL_STORAGE_ICON_VOLUME_FLOPPY_SCSI,             "gnome-dev-floppy"},
249+       {LIBHAL_STORAGE_ICON_VOLUME_FLOPPY_USB,              "gnome-dev-floppy"},
250+       {LIBHAL_STORAGE_ICON_VOLUME_FLOPPY_IEEE1394,         "gnome-dev-floppy"},
251+       {LIBHAL_STORAGE_ICON_VOLUME_TAPE,                    "gnome-dev-harddisk"},
252+       {LIBHAL_STORAGE_ICON_VOLUME_COMPACT_FLASH,           "gnome-dev-media-cf"},
253+       {LIBHAL_STORAGE_ICON_VOLUME_MEMORY_STICK,            "gnome-dev-media-ms"},
254+       {LIBHAL_STORAGE_ICON_VOLUME_SMART_MEDIA,             "gnome-dev-media-sm"},
255+       {LIBHAL_STORAGE_ICON_VOLUME_SD_MMC,                  "gnome-dev-media-sdmmc"},
256+       {LIBHAL_STORAGE_ICON_VOLUME_CAMERA,                  "camera"},
257+       {LIBHAL_STORAGE_ICON_VOLUME_PORTABLE_AUDIO_PLAYER,   "gnome-dev-ipod"},
258+       {LIBHAL_STORAGE_ICON_VOLUME_ZIP,                     "gnome-dev-zipdisk"},
259+       {LIBHAL_STORAGE_ICON_VOLUME_JAZ,                     "gnome-dev-jazdisk"},
260+       {LIBHAL_STORAGE_ICON_VOLUME_FLASH_KEY,               "gnome-dev-harddisk"},
261 
262 /*
263-       {HAL_STORAGE_ICON_DISC_CDROM,                     "gnome-dev-disc-cdrom"},
264-       {HAL_STORAGE_ICON_DISC_CDR,                       "gnome-dev-disc-cdr"},
265-       {HAL_STORAGE_ICON_DISC_CDRW,                      "gnome-dev-disc-cdrw"},
266-       {HAL_STORAGE_ICON_DISC_DVDROM,                    "gnome-dev-disc-dvdrom"},
267-       {HAL_STORAGE_ICON_DISC_DVDRAM,                    "gnome-dev-disc-dvdram"},
268-       {HAL_STORAGE_ICON_DISC_DVDR,                      "gnome-dev-disc-dvdr"},
269-       {HAL_STORAGE_ICON_DISC_DVDRW,                     "gnome-dev-disc-dvdrw"},
270-       {HAL_STORAGE_ICON_DISC_DVDPLUSR,                  "gnome-dev-disc-dvdr-plus"},
271-       {HAL_STORAGE_ICON_DISC_DVDPLUSRW,                 "gnome-dev-disc-dvdrw-plus"},
272+       {LIBHAL_STORAGE_ICON_DISC_CDROM,                     "gnome-dev-cdrom"},
273+       {LIBHAL_STORAGE_ICON_DISC_CDR,                       "gnome-dev-cdrom"},
274+       {LIBHAL_STORAGE_ICON_DISC_CDRW,                      "gnome-dev-cdrom"},
275+       {LIBHAL_STORAGE_ICON_DISC_DVDROM,                    "gnome-dev-dvd"},
276+       {LIBHAL_STORAGE_ICON_DISC_DVDRAM,                    "gnome-dev-dvd"},
277+       {LIBHAL_STORAGE_ICON_DISC_DVDR,                      "gnome-dev-dvd"},
278+       {LIBHAL_STORAGE_ICON_DISC_DVDRW,                     "gnome-dev-dvd"},
279+       {LIBHAL_STORAGE_ICON_DISC_DVDPLUSR,                  "gnome-dev-dvd"},
280+       {LIBHAL_STORAGE_ICON_DISC_DVDPLUSRW,                 "gnome-dev-dvd"},
281 */
282 
283+       {LIBHAL_STORAGE_ICON_DISC_CDROM,                     "gnome-dev-cdrom"},
284+       {LIBHAL_STORAGE_ICON_DISC_CDR,                       "gnome-dev-disc-cdr"},
285+       {LIBHAL_STORAGE_ICON_DISC_CDRW,                      "gnome-dev-disc-cdrw"},
286+       {LIBHAL_STORAGE_ICON_DISC_DVDROM,                    "gnome-dev-disc-dvdrom"},
287+       {LIBHAL_STORAGE_ICON_DISC_DVDRAM,                    "gnome-dev-disc-dvdram"},
288+       {LIBHAL_STORAGE_ICON_DISC_DVDR,                      "gnome-dev-disc-dvdr"},
289+       {LIBHAL_STORAGE_ICON_DISC_DVDRW,                     "gnome-dev-disc-dvdrw"},
290+       {LIBHAL_STORAGE_ICON_DISC_DVDPLUSR,                  "gnome-dev-disc-dvdr-plus"},
291+       {LIBHAL_STORAGE_ICON_DISC_DVDPLUSRW,                 "gnome-dev-disc-dvdrw"}, /* missing -plus icon here! */
292+
293        {0x00, NULL}
294 };
295 
296@@ -276,26 +209,52 @@
297 gboolean
298 _gnome_vfs_hal_mounts_init (GnomeVFSVolumeMonitorDaemon *volume_monitor_daemon)
299 {
300+       DBusError error;
301+       DBusConnection *dbus_connection;
302        GnomeVFSHalUserData *hal_userdata;
303-       HalStoragePolicy *hal_storage_policy;
304+       LibHalStoragePolicy *hal_storage_policy;
305 
306        /* Initialise the connection to the hal daemon */
307        if ((volume_monitor_daemon->hal_ctx =
308-            hal_initialize (&hal_functions, FALSE)) == NULL) {
309-               g_warning ("hal_initialize failed\n");
310+            libhal_ctx_new ()) == NULL) {
311+               g_warning ("libhal_ctx_new failed\n");
312+               return FALSE;
313+       }
314+
315+       dbus_error_init (&error);
316+       dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
317+       if (dbus_error_is_set (&error)) {
318+               g_warning ("Error connecting to D-BUS system bus: %s\n",
319+                          error.message);
320+               dbus_error_free (&error);
321+               return FALSE;
322+       }       
323+        dbus_connection_setup_with_g_main (dbus_connection, NULL);
324+
325+       libhal_ctx_set_dbus_connection (volume_monitor_daemon->hal_ctx,
326+                                       dbus_connection);
327+
328+       libhal_ctx_set_device_added (volume_monitor_daemon->hal_ctx,
329+                                    _hal_device_added);
330+       libhal_ctx_set_device_removed (volume_monitor_daemon->hal_ctx,
331+                                      _hal_device_removed);
332+       
333+       if (!libhal_ctx_init (volume_monitor_daemon->hal_ctx, &error)) {
334+               g_warning ("libhal_ctx_init failed: %s\n", error.message);
335+               dbus_error_free (&error);
336                return FALSE;
337        }
338 
339 
340        /* Setup GNOME specific policy - right now this is only icons */
341-       hal_storage_policy = hal_storage_policy_new ();
342-       hal_storage_policy_set_icon_mapping (hal_storage_policy, icon_mapping);
343+       hal_storage_policy = libhal_storage_policy_new ();
344+       libhal_storage_policy_set_icon_mapping (hal_storage_policy, icon_mapping);
345 
346        /* Tie some data with the libhal context */
347        hal_userdata = g_new0 (GnomeVFSHalUserData, 1);
348        hal_userdata->volume_monitor_daemon = volume_monitor_daemon;
349        hal_userdata->hal_storage_policy = hal_storage_policy;
350-       hal_ctx_set_user_data (volume_monitor_daemon->hal_ctx,
351+       libhal_ctx_set_user_data (volume_monitor_daemon->hal_ctx,
352                               hal_userdata);
353        return TRUE;
354 }
355@@ -304,13 +263,22 @@
356 _gnome_vfs_hal_mounts_shutdown (GnomeVFSVolumeMonitorDaemon *volume_monitor_daemon)
357 {
358        GnomeVFSHalUserData *hal_userdata;
359+       DBusError error;
360+
361+       hal_userdata = (GnomeVFSHalUserData *) libhal_ctx_get_user_data (volume_monitor_daemon->hal_ctx);
362+       libhal_storage_policy_free (hal_userdata->hal_storage_policy);
363 
364-       hal_userdata = (GnomeVFSHalUserData *) hal_ctx_get_user_data (volume_monitor_daemon->hal_ctx);
365-       hal_storage_policy_free (hal_userdata->hal_storage_policy);
366+       dbus_error_init (&error);
367+       if (!libhal_ctx_shutdown (volume_monitor_daemon->hal_ctx, &error)) {
368+               g_warning ("hal_shutdown failed: %s\n", error.message);
369+               dbus_error_free (&error);
370+               return;
371+       }
372 
373-       if (hal_shutdown (volume_monitor_daemon->hal_ctx) != 0) {
374-               g_warning ("hal_shutdown failed\n");
375+       if (!libhal_ctx_free (volume_monitor_daemon->hal_ctx)) {
376+               g_warning ("hal_shutdown failed - unable to free hal context\n");
377        }
378+
379 }
380 
381 /**************************************************************************/
382@@ -330,10 +298,10 @@
383        char *drive_icon;
384        char *unique_drive_name;
385        LibHalContext *hal_ctx;
386-       HalDrive *hal_drive;
387-       HalVolume *hal_volume;
388+       LibHalDrive *hal_drive;
389+       LibHalVolume *hal_volume;
390        GnomeVFSHalUserData *hal_userdata;
391-       HalStoragePolicy *hal_storage_policy;
392+       LibHalStoragePolicy *hal_storage_policy;
393        char *target_mount_point;
394 
395        hal_drive = NULL;
396@@ -342,7 +310,7 @@
397        if ((hal_ctx = volume_monitor_daemon->hal_ctx) == NULL)
398                goto out;
399 
400-       hal_userdata = (GnomeVFSHalUserData *) hal_ctx_get_user_data (hal_ctx);
401+       hal_userdata = (GnomeVFSHalUserData *) libhal_ctx_get_user_data (hal_ctx);
402        hal_storage_policy = hal_userdata->hal_storage_policy;
403 
404        if (drive == NULL || drive->priv == NULL || drive->priv->device_path == NULL)
405@@ -352,21 +320,21 @@
406         * /dev/sda1 etc, however we get the Drive object for the parent if
407         * that is the case. This is a feature of libhal-storage.
408         */
409-       if ((hal_drive = hal_drive_from_device_file (hal_ctx, drive->priv->device_path)) == NULL) {
410+       if ((hal_drive = libhal_drive_from_device_file (hal_ctx, drive->priv->device_path)) == NULL) {
411                g_warning ("%s: no hal drive for device=%s", __FUNCTION__, drive->priv->device_path);
412                goto out;
413        }
414 
415        /* There may not be a volume object associated, so hal_volume may be NULL */
416-       hal_volume = hal_volume_from_device_file (hal_ctx, drive->priv->device_path);
417+       hal_volume = libhal_volume_from_device_file (hal_ctx, drive->priv->device_path);
418 
419        /* For optical discs, we manually add/remove GnomeVFSVolume optical discs without
420         * data (e.g. blank and pure audio) since these don't appear in the mounted filesystems
421         * file /etc/mtab
422         */
423        if (hal_volume != NULL &&
424-           hal_drive_get_type (hal_drive) == HAL_DRIVE_TYPE_CDROM &&
425-           hal_volume_is_disc (hal_volume) && !hal_volume_disc_has_data (hal_volume)) {
426+           libhal_drive_get_type (hal_drive) == LIBHAL_DRIVE_TYPE_CDROM &&
427+           libhal_volume_is_disc (hal_volume) && !libhal_volume_disc_has_data (hal_volume)) {
428                GnomeVFSVolume *volume;
429                char *volume_name;
430                char *volume_icon;
431@@ -377,35 +345,35 @@
432                        gnome_vfs_volume_unref (volume);
433                } else {
434                       
435-                       volume_name = hal_volume_policy_compute_display_name (
436+                       volume_name = libhal_volume_policy_compute_display_name (
437                                hal_drive, hal_volume, hal_storage_policy);
438 
439                        /* set icon name; try dedicated icon name first... */
440-                       if (hal_drive_get_dedicated_icon_volume (hal_drive) != NULL)
441-                               volume_icon = strdup (hal_drive_get_dedicated_icon_volume (hal_drive));
442+                       if (libhal_drive_get_dedicated_icon_volume (hal_drive) != NULL)
443+                               volume_icon = strdup (libhal_drive_get_dedicated_icon_volume (hal_drive));
444                        else
445-                               volume_icon = hal_volume_policy_compute_icon_name (
446+                               volume_icon = libhal_volume_policy_compute_icon_name (
447                                        hal_drive, hal_volume, hal_storage_policy);
448 
449                        volume = g_object_new (GNOME_VFS_TYPE_VOLUME, NULL);
450-                       volume->priv->hal_udi = g_strdup (hal_volume_get_udi (hal_volume));
451+                       volume->priv->hal_udi = g_strdup (libhal_volume_get_udi (hal_volume));
452                        volume->priv->volume_type = GNOME_VFS_VOLUME_TYPE_MOUNTPOINT;
453                       
454-                       if (hal_volume_disc_is_blank (hal_volume)) {
455+                       if (libhal_volume_disc_is_blank (hal_volume)) {
456                                /* Blank discs should open the burn:/// location */
457-                               volume->priv->device_path = g_strdup (hal_volume_get_device_file (hal_volume));
458+                               volume->priv->device_path = g_strdup (libhal_volume_get_device_file (hal_volume));
459                                volume->priv->activation_uri = g_strdup ("burn:///");
460-                               volume->priv->unix_device = makedev (hal_volume_get_device_major (hal_volume),
461-                                                                    hal_volume_get_device_minor (hal_volume));
462-                               volume->priv->filesystem_type = g_strdup (hal_volume_get_fstype (hal_volume));
463-                       } else if (hal_volume_disc_has_audio (hal_volume)) {
464+                               volume->priv->unix_device = makedev (libhal_volume_get_device_major (hal_volume),
465+                                                                    libhal_volume_get_device_minor (hal_volume));
466+                               volume->priv->filesystem_type = g_strdup (libhal_volume_get_fstype (hal_volume));
467+                       } else if (libhal_volume_disc_has_audio (hal_volume)) {
468                                /* Audio discs with data should open the cdda:///dev/cdrom location */
469-                               volume->priv->device_path = g_strdup (hal_volume_get_device_file (hal_volume));
470+                               volume->priv->device_path = g_strdup (libhal_volume_get_device_file (hal_volume));
471                                volume->priv->activation_uri = g_strdup_printf (
472-                                       "cdda://%s", hal_volume_get_device_file (hal_volume));
473-                               volume->priv->unix_device = makedev (hal_volume_get_device_major (hal_volume),
474-                                                                    hal_volume_get_device_minor (hal_volume));
475-                               volume->priv->filesystem_type = g_strdup (hal_volume_get_fstype (hal_volume));
476+                                       "cdda://%s", libhal_volume_get_device_file (hal_volume));
477+                               volume->priv->unix_device = makedev (libhal_volume_get_device_major (hal_volume),
478+                                                                    libhal_volume_get_device_minor (hal_volume));
479+                               volume->priv->filesystem_type = g_strdup (libhal_volume_get_fstype (hal_volume));
480                        }
481                       
482                        volume->priv->is_read_only = TRUE;
483@@ -419,6 +387,7 @@
484                        volume->priv->is_user_visible = TRUE;
485                       
486                        volume->priv->drive = drive;
487+
488                        _gnome_vfs_drive_add_mounted_volume (drive, volume);
489                       
490                        _gnome_vfs_volume_monitor_mounted (GNOME_VFS_VOLUME_MONITOR (volume_monitor_daemon), volume);
491@@ -427,7 +396,7 @@
492                        free (volume_name);
493                        free (volume_icon);
494                }
495-       } else if (hal_volume == NULL && hal_drive_get_type (hal_drive) == HAL_DRIVE_TYPE_CDROM) {
496+       } else if (hal_volume == NULL && libhal_drive_get_type (hal_drive) == LIBHAL_DRIVE_TYPE_CDROM) {
497                GnomeVFSVolume *volume;
498 
499                /* Remove GnomeVFSVolume with same device file */
500@@ -444,10 +413,10 @@
501                goto out;
502 
503        /* set whether we need to eject */
504-       drive->priv->must_eject_at_unmount = hal_drive_requires_eject (hal_drive);
505+       drive->priv->must_eject_at_unmount = libhal_drive_requires_eject (hal_drive);
506 
507        /* set display name */
508-       drive_name = hal_drive_policy_compute_display_name (hal_drive, hal_volume, hal_storage_policy);
509+       drive_name = libhal_drive_policy_compute_display_name (hal_drive, hal_volume, hal_storage_policy);
510        unique_drive_name = _gnome_vfs_volume_monitor_uniquify_drive_name (
511                GNOME_VFS_VOLUME_MONITOR (volume_monitor_daemon), drive_name);
512        if (drive->priv->display_name != NULL)
513@@ -456,10 +425,10 @@
514        free (drive_name);
515 
516        /* set icon name; try dedicated icon name first... */
517-       if (hal_drive_get_dedicated_icon_drive (hal_drive) != NULL)
518-               drive_icon = strdup (hal_drive_get_dedicated_icon_drive (hal_drive));
519+       if (libhal_drive_get_dedicated_icon_drive (hal_drive) != NULL)
520+               drive_icon = strdup (libhal_drive_get_dedicated_icon_drive (hal_drive));
521        else
522-               drive_icon = hal_drive_policy_compute_icon_name (hal_drive, hal_volume, hal_storage_policy);
523+               drive_icon = libhal_drive_policy_compute_icon_name (hal_drive, hal_volume, hal_storage_policy);
524        if (drive->priv->icon != NULL)
525                g_free (drive->priv->icon);
526        drive->priv->icon = g_strdup (drive_icon);
527@@ -469,7 +438,7 @@
528        target_mount_point = NULL;
529        if (hal_volume != NULL) {
530                const char *str;
531-               str = hal_volume_get_mount_point (hal_volume);
532+               str = libhal_volume_get_mount_point (hal_volume);
533                if (str != NULL)
534                        target_mount_point = g_strdup (str);
535        }
536@@ -479,18 +448,18 @@
537                target_mount_point = gnome_vfs_get_local_path_from_uri (drive->priv->activation_uri);
538 
539        /* if we don't use removable media and the volume shouldn't be visible, then hide the drive */
540-       if(!hal_drive_uses_removable_media (hal_drive) &&
541-          !hal_volume_policy_should_be_visible (hal_drive, hal_volume, hal_storage_policy, target_mount_point))
542+       if(!libhal_drive_uses_removable_media (hal_drive) &&
543+          !libhal_volume_policy_should_be_visible (hal_drive, hal_volume, hal_storage_policy, target_mount_point))
544                drive->priv->is_user_visible = FALSE;
545 
546        g_free (target_mount_point);
547 
548        /* set hal udi */
549-       drive->priv->hal_udi = g_strdup (hal_drive_get_udi (hal_drive));
550+       drive->priv->hal_udi = g_strdup (libhal_drive_get_udi (hal_drive));
551 
552 out:
553-       hal_volume_free (hal_volume);
554-       hal_drive_free (hal_drive);
555+       libhal_volume_free (hal_volume);
556+       libhal_drive_free (hal_drive);
557 }
558 
559 void
560@@ -501,10 +470,10 @@
561        char *volume_icon;
562        char *unique_volume_name;
563        LibHalContext *hal_ctx;
564-       HalDrive *hal_drive;
565-       HalVolume *hal_volume;
566+       LibHalDrive *hal_drive;
567+       LibHalVolume *hal_volume;
568        GnomeVFSHalUserData *hal_userdata;
569-       HalStoragePolicy *hal_storage_policy;
570+       LibHalStoragePolicy *hal_storage_policy;
571        char *target_mount_point;
572 
573        hal_volume = NULL;
574@@ -515,7 +484,7 @@
575        if (volume == NULL || volume->priv == NULL || volume->priv->device_path == NULL)
576                goto out;
577 
578-       hal_userdata = (GnomeVFSHalUserData *) hal_ctx_get_user_data (hal_ctx);
579+       hal_userdata = (GnomeVFSHalUserData *) libhal_ctx_get_user_data (hal_ctx);
580        hal_storage_policy = hal_userdata->hal_storage_policy;
581 
582        /* Now, modify the drive with the hal stuff, unless we've already done so */
583@@ -526,17 +495,17 @@
584         * /dev/sda1 etc, however we get the Drive object for the parent if
585         * that is the case. This is a feature of libhal-storage.
586         */
587-       if ((hal_drive = hal_drive_from_device_file (hal_ctx, volume->priv->device_path)) == NULL) {
588+       if ((hal_drive = libhal_drive_from_device_file (hal_ctx, volume->priv->device_path)) == NULL) {
589                g_warning ("%s: no hal drive for device=%s", __FUNCTION__, volume->priv->device_path);
590                goto out;
591        }
592-       if ((hal_volume = hal_volume_from_device_file (hal_ctx, volume->priv->device_path)) == NULL) {
593+       if ((hal_volume = libhal_volume_from_device_file (hal_ctx, volume->priv->device_path)) == NULL) {
594                g_warning ("%s: no hal volume for device=%s", __FUNCTION__, volume->priv->device_path);
595                goto out;
596        }
597 
598        /* set display name */
599-       volume_name = hal_volume_policy_compute_display_name (hal_drive, hal_volume, hal_storage_policy);
600+       volume_name = libhal_volume_policy_compute_display_name (hal_drive, hal_volume, hal_storage_policy);
601        unique_volume_name = _gnome_vfs_volume_monitor_uniquify_volume_name (
602                GNOME_VFS_VOLUME_MONITOR (volume_monitor_daemon), volume_name);
603        if (volume->priv->display_name != NULL)
604@@ -545,10 +514,10 @@
605        free (volume_name);
606 
607        /* set icon name; try dedicated icon name first... */
608-       if (hal_drive_get_dedicated_icon_volume (hal_drive) != NULL)
609-               volume_icon = strdup (hal_drive_get_dedicated_icon_volume (hal_drive));
610+       if (libhal_drive_get_dedicated_icon_volume (hal_drive) != NULL)
611+               volume_icon = strdup (libhal_drive_get_dedicated_icon_volume (hal_drive));
612        else
613-               volume_icon = hal_volume_policy_compute_icon_name (hal_drive, hal_volume, hal_storage_policy);
614+               volume_icon = libhal_volume_policy_compute_icon_name (hal_drive, hal_volume, hal_storage_policy);
615        if (volume->priv->icon != NULL)
616                g_free (volume->priv->icon);
617        volume->priv->icon = g_strdup (volume_icon);
618@@ -558,7 +527,7 @@
619        target_mount_point = NULL;
620        {
621                const char *str;
622-               str = hal_volume_get_mount_point (hal_volume);
623+               str = libhal_volume_get_mount_point (hal_volume);
624                if (str != NULL)
625                        target_mount_point = g_strdup (str);
626        }
627@@ -569,16 +538,16 @@
628 
629        /* set whether it's visible on the desktop */
630        volume->priv->is_user_visible =
631-               hal_volume_policy_should_be_visible (hal_drive, hal_volume, hal_storage_policy, target_mount_point) &&
632-               (hal_drive_is_hotpluggable (hal_drive) || hal_drive_uses_removable_media (hal_drive));
633+               libhal_volume_policy_should_be_visible (hal_drive, hal_volume, hal_storage_policy, target_mount_point) &&
634+               (libhal_drive_is_hotpluggable (hal_drive) || libhal_drive_uses_removable_media (hal_drive));
635 
636        g_free (target_mount_point);
637 
638        /* set hal udi */
639-       volume->priv->hal_udi = g_strdup (hal_volume_get_udi (hal_volume));
640+       volume->priv->hal_udi = g_strdup (libhal_volume_get_udi (hal_volume));
641 out:
642-       hal_drive_free (hal_drive);
643-       hal_volume_free (hal_volume);
644+       libhal_drive_free (hal_drive);
645+       libhal_volume_free (hal_volume);
646 }
647 
648 #endif /* USE_HAL */
Note: See TracBrowser for help on using the repository browser.