Merge branch 'gdbus-merge'

Conflicts:
	docs/reference/gio/gio-docs.xml
	docs/reference/gio/gio-sections.txt
	gio/tests/Makefile.am

diff --cc configure.in
Simple merge

diff --cc docs/reference/gio/Makefile.am
Simple merge

diff --cc docs/reference/gio/gio-docs.xml
index c63f4f7,9f3a972..151e909
--- 1/docs/reference/gio/gio-docs.xml
--- 2/docs/reference/gio/gio-docs.xml
+++ b/docs/reference/gio/gio-docs.xml
@@@ -107,24 -107,44 +107,45 @@@
        <xi:include href="xml/gsocketcontrolmessage.xml"/>
        <xi:include href="xml/gunixfdlist.xml"/>
        <xi:include href="xml/gunixfdmessage.xml"/>
+       <xi:include href="xml/gcredentials.xml"/>
+       <xi:include href="xml/gunixcredentialsmessage.xml"/>
      </chapter>
 -    <chapter id="resolver">
 -      <title>DNS resolution</title>
 -      <xi:include href="xml/gresolver.xml"/>
 -      <xi:include href="xml/gsocketconnectable.xml"/>
 -      <xi:include href="xml/gnetworkaddress.xml"/>
 -      <xi:include href="xml/gnetworkservice.xml"/>
 -      <xi:include href="xml/gsrvtarget.xml"/>
 -    </chapter>
      <chapter id="highlevel-socket">
-       <title>Highlevel network support</title>
+       <title>Highlevel network functionallity</title>
        <xi:include href="xml/gsocketclient.xml"/>
        <xi:include href="xml/gsocketconnection.xml"/>
 +      <xi:include href="xml/gunixconnection.xml"/>
        <xi:include href="xml/gsocketlistener.xml"/>
        <xi:include href="xml/gsocketservice.xml"/>
        <xi:include href="xml/gthreadedsocketservice.xml"/>
      </chapter>
 +    <chapter id="resolver">
 +      <title>DNS resolution</title>
 +      <xi:include href="xml/gresolver.xml"/>
 +      <xi:include href="xml/gsocketconnectable.xml"/>
 +      <xi:include href="xml/gnetworkaddress.xml"/>
 +      <xi:include href="xml/gnetworkservice.xml"/>
 +      <xi:include href="xml/gsrvtarget.xml"/>
 +    </chapter>
+     <chapter id="gdbus-lowlevel">
+       <title>Lowlevel D-Bus Support</title>
+       <xi:include href="xml/gdbusutils.xml"/>
+       <xi:include href="xml/gdbusaddress.xml"/>
+       <xi:include href="xml/gdbusintrospection.xml"/>
+       <xi:include href="xml/gdbuserror.xml"/>
+       <xi:include href="xml/gdbusmessage.xml"/>
+       <xi:include href="xml/gdbusconnection.xml"/>
+       <xi:include href="xml/gdbusmethodinvocation.xml"/>
+       <xi:include href="xml/gdbusserver.xml"/>
+       <xi:include href="xml/gdbusauthobserver.xml"/>
+     </chapter>
+     <chapter id="gdbus-convenience">
+       <title>Highlevel D-Bus Support</title>
+       <xi:include href="xml/gdbusnameowning.xml"/>
+       <xi:include href="xml/gdbusnamewatching.xml"/>
+       <xi:include href="xml/gdbusproxywatching.xml"/>
+       <xi:include href="xml/gdbusproxy.xml"/>
+     </chapter>
      <chapter id="utils">
          <title>Utilities</title>
          <xi:include href="xml/gfilenamecompleter.xml"/>

diff --cc docs/reference/gio/gio-sections.txt
Simple merge

diff --cc docs/reference/glib/tmpl/keyfile.sgml
index 4e72ad6,4e72ad6..8080774
--- 1/docs/reference/glib/tmpl/keyfile.sgml
--- 2/docs/reference/glib/tmpl/keyfile.sgml
+++ b/docs/reference/glib/tmpl/keyfile.sgml
@@@ -365,6 -365,6 +365,30 @@@ Flags which influence the parsing
  @Returns: 
  
  
++<!-- ##### FUNCTION g_key_file_get_int64 ##### -->
++<para>
++
++</para>
++
++@key_file: 
++@group_name: 
++@key: 
++@error: 
++@Returns: 
++
++
++<!-- ##### FUNCTION g_key_file_get_uint64 ##### -->
++<para>
++
++</para>
++
++@key_file: 
++@group_name: 
++@key: 
++@error: 
++@Returns: 
++
++
  <!-- ##### FUNCTION g_key_file_get_double ##### -->
  <para>
  
@@@ -511,6 -511,6 +535,28 @@@
  @value: 
  
  
++<!-- ##### FUNCTION g_key_file_set_int64 ##### -->
++<para>
++
++</para>
++
++@key_file: 
++@group_name: 
++@key: 
++@value: 
++
++
++<!-- ##### FUNCTION g_key_file_set_uint64 ##### -->
++<para>
++
++</para>
++
++@key_file: 
++@group_name: 
++@key: 
++@value: 
++
++
  <!-- ##### FUNCTION g_key_file_set_double ##### -->
  <para>
  

diff --cc docs/reference/gobject/glib-mkenums.1
index f44c320,f598893..7ac0f2e
--- 1/docs/reference/gobject/glib-mkenums.1
--- 2/docs/reference/gobject/glib-mkenums.1
+++ b/docs/reference/gobject/glib-mkenums.1
@@@ -2,21 -2,12 +2,12 @@@
  .\"     Title: glib-mkenums
  .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
  .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
- .\"      Date: 05/14/2010
 -.\"      Date: 04/19/2010
++.\"      Date: 05/13/2010
  .\"    Manual: User Commands
  .\"    Source: User Commands
  .\"  Language: English
  .\"
- .TH "GLIB\-MKENUMS" "1" "05/14/2010" "User Commands" "User Commands"
- .\" -----------------------------------------------------------------
- .\" * Define some portability stuff
- .\" -----------------------------------------------------------------
- .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- .\" http://bugs.debian.org/507673
- .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
- .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- .ie \n(.g .ds Aq \(aq
- .el       .ds Aq '
 -.TH "GLIB\-MKENUMS" "1" "04/19/2010" "User Commands" "User Commands"
++.TH "GLIB\-MKENUMS" "1" "05/13/2010" "User Commands" "User Commands"
  .\" -----------------------------------------------------------------
  .\" * set default formatting
  .\" -----------------------------------------------------------------

diff --cc gio/Makefile.am
Simple merge

diff --cc gio/gunixconnection.c
Simple merge

diff --cc gio/gunixfdmessage.c
Simple merge

diff --cc gio/tests/Makefile.am
index dec45bf,f383580..c25bf3c
--- 1/gio/tests/Makefile.am
--- 2/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@@ -36,16 -38,36 +38,37 @@@ TEST_PROGS +=                      
        contexts                \
        gsettings               \
        gschema-compile         \
-       async-close-output-stream
++      async-close-output-stream \
+       gdbus-addresses         \
+       gdbus-connection        \
+       gdbus-names             \
+       gdbus-proxy             \
+       gdbus-introspection     \
+       gdbus-threading         \
+       gdbus-export            \
+       gdbus-error             \
+       gdbus-peer              \
+       gdbus-exit-on-close     \
+       $(NULL)
+ 
+ SAMPLE_PROGS =                                \
+       resolver                        \
+       socket-server                   \
+       socket-client                   \
+       echo-server                     \
+       httpd                           \
+       send-data                       \
+       filter-cat                      \
+       gdbus-example-export            \
+       gdbus-example-own-name          \
+       gdbus-example-watch-name        \
+       gdbus-example-watch-proxy       \
+       gdbus-example-server            \
+       gdbus-example-subtree           \
+       gdbus-example-peer              \
+       gdbus-example-proxy-subclass    \
+       $(NULL)
  
- SAMPLE_PROGS =                        \
-       resolver                \
-       socket-server           \
-       socket-client           \
-       echo-server             \
-       httpd                   \
-       send-data               \
-       filter-cat
  
  if OS_UNIX
  TEST_PROGS += live-g-file desktop-app-info unix-fd #unix-streams