From: Matthias Clasen Date: Fri, 14 May 2010 03:08:34 +0000 (-0400) Subject: Merge branch 'gdbus-merge' X-Git-Tag: 2.25.4~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6223341cacc7dfa34a8d60ec1b4828382dee6d07;p=platform%2Fupstream%2Fglib.git Merge branch 'gdbus-merge' Conflicts: docs/reference/gio/gio-docs.xml docs/reference/gio/gio-sections.txt gio/tests/Makefile.am --- 6223341cacc7dfa34a8d60ec1b4828382dee6d07 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 @@@ + + - - DNS resolution - - - - - - - Highlevel network support + Highlevel network functionallity + + + DNS resolution + + + + + + + + Lowlevel D-Bus Support + + + + + + + + + + + + Highlevel D-Bus Support + + + + + Utilities 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: ++ ++ ++ ++ ++ ++@key_file: ++@group_name: ++@key: ++@error: ++@Returns: ++ ++ ++ ++ ++ ++ ++ ++@key_file: ++@group_name: ++@key: ++@error: ++@Returns: ++ ++ @@@ -511,6 -511,6 +535,28 @@@ @value: ++ ++ ++ ++ ++ ++@key_file: ++@group_name: ++@key: ++@value: ++ ++ ++ ++ ++ ++ ++ ++@key_file: ++@group_name: ++@key: ++@value: ++ ++ 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 - .\" 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