Index: bus/config-parser.h
===================================================================
RCS file: /cvs/dbus/dbus/bus/config-parser.h,v
retrieving revision 1.18
diff -u -r1.18 config-parser.h
--- bus/config-parser.h	15 Jun 2005 02:31:38 -0000	1.18
+++ bus/config-parser.h	12 Mar 2007 16:51:35 -0000
@@ -82,4 +82,7 @@
                                   const BusConfigParser *parent,
                                   DBusError             *error);
 
+dbus_bool_t bus_config_get_base_dir (const DBusString   *file, 
+                                     const DBusString   *basedir);
+
 #endif /* BUS_CONFIG_PARSER_H */
Index: bus/config-loader-expat.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/config-loader-expat.c,v
retrieving revision 1.10
diff -u -r1.10 config-loader-expat.c
--- bus/config-loader-expat.c	10 Aug 2004 03:06:59 -0000	1.10
+++ bus/config-loader-expat.c	12 Mar 2007 16:56:56 -0000
@@ -203,7 +203,7 @@
       goto failed;
     }
 
-  if (!_dbus_string_get_dirname (file, &dirname))
+  if (!bus_config_get_base_dir (file, &dirname))
     {
       dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
       goto failed;
Index: bus/config-loader-libxml.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/config-loader-libxml.c,v
retrieving revision 1.8
diff -u -r1.8 config-loader-libxml.c
--- bus/config-loader-libxml.c	10 Aug 2004 03:06:59 -0000	1.8
+++ bus/config-loader-libxml.c	12 Mar 2007 16:53:25 -0000
@@ -177,7 +182,7 @@
       xmlSetGenericErrorFunc (NULL, xml_shut_up);
     }
 
-  if (!_dbus_string_get_dirname (file, &dirname))
+  if (!_dbus_string_get_base_dir (file, &dirname))
     {
       _DBUS_SET_OOM (error);
       goto failed;
Index: bus/config-parser.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/config-parser.c,v
retrieving revision 1.47
diff -u -r1.47 config-parser.c
--- bus/config-parser.c	26 Jan 2007 16:10:09 -0000	1.47
+++ bus/config-parser.c	12 Mar 2007 16:53:25 -0000
@@ -2545,6 +2546,14 @@
   return table;
 }
 
+dbus_bool_t 
+bus_config_get_base_dir (const DBusString   *file, 
+                         const DBusString   *basedir)
+{
+      return _dbus_string_get_dirname (file, basedir);
+}                                     
+
+
 #ifdef DBUS_BUILD_TESTS
 #include <stdio.h>
 
@@ -3070,10 +3079,15 @@