Cleaner seperation between user fdi's and system fdi's ?

[Sjoerd Simons]

On Tue, Oct 19, 2004 at 04:36:50PM +0200, Sjoerd Simons wrote:
>   I quickly looked at the code and it seems trivial to first scan
>   /usr/share/hal/fdi and then /etc/hal/fdi..

Patch attached to do this.. Comments ? 

  Sjoerd
-- 
It has just been discovered that research causes cancer in rats.
-------------- next part --------------
Index: hald/device_info.c
===================================================================
RCS file: /cvs/hal/hal/hald/device_info.c,v
retrieving revision 1.16
diff -u -r1.16 device_info.c
--- hald/device_info.c	14 Oct 2004 18:37:28 -0000	1.16
+++ hald/device_info.c	28 Oct 2004 18:57:31 -0000
@@ -1176,7 +1176,10 @@
 di_search_and_merge (HalDevice *d)
 {
 
-	return scan_fdi_files (PACKAGE_DATA_DIR "/hal/fdi", d);
+	dbus_bool_t ret;
+
+	ret = scan_fdi_files (PACKAGE_DATA_DIR "/hal/fdi", d);
+	return scan_fdi_files (PACKAGE_SYSCONF_DIR "/hal/fdi", d) || ret;
 }
 
 /** @} */
-------------- next part --------------
_______________________________________________
hal mailing list
hal at freedesktop.org
http://freedesktop.org/mailman/listinfo/hal