X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bus%2Fconfig-loader-expat.c;h=51bbb51bd0b3e902d128898047f8c5b2c03f5bb5;hb=dbecdeabb20e0ce11121819c63373f0afba57c58;hp=3e45166dc41503ffbf53fa318dcab115b76b06d3;hpb=893d859ed4ab785f46485fad28779f026fa166a1;p=platform%2Fupstream%2Fdbus.git

diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c
index 3e45166..51bbb51 100644
--- a/bus/config-loader-expat.c
+++ b/bus/config-loader-expat.c
@@ -1,9 +1,9 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /* config-loader-expat.c  expat XML loader
  *
  * Copyright (C) 2003 Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.1
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,10 +17,11 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
 
+#include <config.h>
 #include "config-parser.h"
 #include <dbus/dbus-internals.h>
 #include <expat.h>
@@ -163,9 +164,10 @@ expat_CharacterDataHandler (void           *userData,
 
 
 BusConfigParser*
-bus_config_load (const DBusString *file,
-                 dbus_bool_t       is_toplevel,
-                 DBusError        *error)
+bus_config_load (const DBusString      *file,
+                 dbus_bool_t            is_toplevel,
+                 const BusConfigParser *parent,
+                 DBusError             *error)
 {
   XML_Parser expat;
   const char *filename;
@@ -208,7 +210,7 @@ bus_config_load (const DBusString *file,
       goto failed;
     }
   
-  parser = bus_config_parser_new (&dirname, is_toplevel);
+  parser = bus_config_parser_new (&dirname, is_toplevel, parent);
   if (parser == NULL)
     {
       dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);