[glib: 78/78] Merge branch 'gdbus-merge'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 78/78] Merge branch 'gdbus-merge'
- Date: Fri, 14 May 2010 03:30:38 +0000 (UTC)
commit 6223341cacc7dfa34a8d60ec1b4828382dee6d07
Merge: a7c4c7d 6e8637e
Author: Matthias Clasen <mclasen redhat com>
Date: Thu May 13 23:08:34 2010 -0400
Merge branch 'gdbus-merge'
Conflicts:
docs/reference/gio/gio-docs.xml
docs/reference/gio/gio-sections.txt
gio/tests/Makefile.am
configure.in | 10 +
docs/reference/gio/Makefile.am | 17 +-
docs/reference/gio/gdbus.xml | 266 +
docs/reference/gio/gio-docs.xml | 32 +-
docs/reference/gio/gio-sections.txt | 386 ++
docs/reference/gio/gio.types | 11 +
.../gio/{migrating.xml => migrating-gconf.xml} | 163 -
docs/reference/gio/migrating-gdbus.xml | 358 ++
docs/reference/gio/migrating-gnome-vfs.xml | 133 +
.../gio/{migrating.xml => migrating-posix.xml} | 0
docs/reference/gio/overview.xml | 112 +-
docs/reference/glib/tmpl/keyfile.sgml | 46 +
docs/reference/gobject/glib-mkenums.1 | 13 +-
gio/Makefile.am | 64 +-
gio/gcredentials.c | 345 ++
gio/gcredentials.h | 108 +
gio/gdbus-bash-completion.sh | 33 +
gio/gdbus-tool.c | 1816 +++++++
gio/gdbusaddress.c | 1023 ++++
gio/gdbusaddress.h | 54 +
gio/gdbusauth.c | 1352 +++++
gio/gdbusauth.h | 86 +
gio/gdbusauthmechanism.c | 345 ++
gio/gdbusauthmechanism.h | 174 +
gio/gdbusauthmechanismanon.c | 331 ++
gio/gdbusauthmechanismanon.h | 82 +
gio/gdbusauthmechanismexternal.c | 409 ++
gio/gdbusauthmechanismexternal.h | 82 +
gio/gdbusauthmechanismsha1.c | 1222 +++++
gio/gdbusauthmechanismsha1.h | 82 +
gio/gdbusauthobserver.c | 247 +
gio/gdbusauthobserver.h | 104 +
gio/gdbusconnection.c | 5448 ++++++++++++++++++++
gio/gdbusconnection.h | 492 ++
gio/gdbuserror.c | 873 ++++
gio/gdbuserror.h | 96 +
gio/gdbusintrospection.c | 2079 ++++++++
gio/gdbusintrospection.h | 283 +
gio/gdbusmessage.c | 2522 +++++++++
gio/gdbusmessage.h | 172 +
gio/gdbusmethodinvocation.c | 559 ++
gio/gdbusmethodinvocation.h | 123 +
gio/gdbusnameowning.c | 724 +++
gio/gdbusnameowning.h | 94 +
gio/gdbusnamewatching.c | 691 +++
gio/gdbusnamewatching.h | 79 +
gio/gdbusprivate.c | 1057 ++++
gio/gdbusprivate.h | 83 +
gio/gdbusproxy.c | 1714 ++++++
gio/gdbusproxy.h | 152 +
gio/gdbusproxywatching.c | 490 ++
gio/gdbusproxywatching.h | 92 +
gio/gdbusserver.c | 1068 ++++
gio/gdbusserver.h | 101 +
gio/gdbusutils.c | 361 ++
gio/gdbusutils.h | 40 +
gio/gio-marshal.list | 3 +
gio/gio.h | 16 +
gio/gio.symbols | 292 ++
gio/gioenums.h | 398 ++-
gio/giotypes.h | 20 +
gio/gunixconnection.c | 256 +
gio/gunixconnection.h | 9 +
gio/gunixcredentialsmessage.c | 341 ++
gio/gunixcredentialsmessage.h | 83 +
gio/gunixfdlist.h | 3 +-
gio/gunixfdmessage.c | 1 +
gio/gunixfdmessage.h | 2 +-
gio/pltcheck.sh | 2 +-
gio/tests/Makefile.am | 106 +-
gio/tests/gdbus-addresses.c | 77 +
gio/tests/gdbus-connection.c | 653 +++
gio/tests/gdbus-error.c | 198 +
gio/tests/gdbus-example-export.c | 335 ++
gio/tests/gdbus-example-own-name.c | 86 +
gio/tests/gdbus-example-peer.c | 305 ++
gio/tests/gdbus-example-proxy-subclass.c | 447 ++
gio/tests/gdbus-example-server.c | 390 ++
gio/tests/gdbus-example-subtree.c | 397 ++
gio/tests/gdbus-example-unix-fd-client.c | 133 +
gio/tests/gdbus-example-watch-name.c | 88 +
gio/tests/gdbus-example-watch-proxy.c | 217 +
gio/tests/gdbus-exit-on-close.c | 82 +
gio/tests/gdbus-export.c | 1398 +++++
gio/tests/gdbus-introspection.c | 169 +
gio/tests/gdbus-names.c | 749 +++
gio/tests/gdbus-peer.c | 747 +++
gio/tests/gdbus-proxy.c | 487 ++
gio/tests/gdbus-serialization.c | 654 +++
gio/tests/gdbus-sessionbus.c | 342 ++
gio/tests/gdbus-sessionbus.h | 38 +
gio/tests/gdbus-tests.c | 219 +
gio/tests/gdbus-tests.h | 146 +
gio/tests/gdbus-testserver.py | 271 +
gio/tests/gdbus-threading.c | 532 ++
95 files changed, 39384 insertions(+), 207 deletions(-)
---
diff --cc docs/reference/gio/gio-docs.xml
index c63f4f7,9f3a972..151e909
--- a/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/glib/tmpl/keyfile.sgml
index 4e72ad6,4e72ad6..8080774
--- a/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
--- a/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/tests/Makefile.am
index dec45bf,f383580..c25bf3c
--- a/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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
