[dconf: 11/14] Merge branch 'dbus1'

[Ryan Lortie <ryanl src gnome org>]

commit 20c8b18a8deac14eac00abbc80376f966409d5c8
Merge: 9f47ad1 5e7fbad
Author: Ryan Lortie <desrt desrt ca>
Date:   Mon Jan 17 13:07:18 2011 -0500

    Merge branch 'dbus1'

 Makefile.am               |    2 +-
 configure.ac              |    7 +-
 dbus-1/.gitignore         |    4 +
 dbus-1/Makefile.am        |   33 ++
 dbus-1/dconf-dbus-1.c     |  728 +++++++++++++++++++++++++++++++++++++++++++++
 dbus-1/dconf-dbus-1.h     |   56 ++++
 dbus-1/dconf-dbus-1.pc.in |   11 +
 tests/.gitignore          |    1 +
 tests/Makefile.am         |    5 +-
 tests/dbus1.c             |  351 ++++++++++++++++++++++
 10 files changed, 1193 insertions(+), 5 deletions(-)
---
diff --cc configure.ac
index e399f6f,9ed639f..a1fcae0
--- a/configure.ac
+++ b/configure.ac
@@@ -54,9 -57,9 +56,10 @@@ AC_CONFIG_FILES(
    client/dconf.pc
    client/Makefile
    service/Makefile
+   dbus-1/Makefile
    bin/Makefile
    editor/Makefile
 +  editor/dconf-editor.desktop
    tests/Makefile
    docs/Makefile
    Makefile