diff -Nru dbus-glib-0.100.1/ChangeLog dbus-glib-0.100.2/ChangeLog --- dbus-glib-0.100.1/ChangeLog 2012-04-17 10:04:03.000000000 +0000 +++ dbus-glib-0.100.2/ChangeLog 2013-02-25 12:24:40.000000000 +0000 @@ -1,3 +1,127 @@ +commit 02b44f8427ea48463d7b9f2a9f7099be7643b60d +Author: Simon McVittie +Date: 2013-02-25 12:24:35 +0000 + + 0.102: respin tarball + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 78f3e953e4a05a1126874dd2ca6cec5777a15b3b +Author: Simon McVittie +Date: 2013-02-15 12:37:04 +0000 + + 0.100.1 point release + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 166978a09cf5edff4028e670b6074215a4c75eca +Author: Colin Walters +Date: 2013-02-14 10:19:34 -0500 + + CVE-2013-0292: dbus-gproxy: Verify sender of NameOwnerChanged signals + to be o.f.DBus + + Anyone can hop on the bus and emit a signal whose interface is + o.f.DBus; it's expected at the moments that clients (and notably DBus + libraries) check the sender. + + This could previously be used to trick a system service using + dbus-glib + into thinking a malicious signal came from a privileged source, by + claiming that ownership of the privileged source's well-known name had + changed from the privileged source's real unique name to the + attacker's + unique name. + + [altered to be NULL-safe so it won't crash on peer connections -smcv] + Signed-off-by: Simon McVittie + Reviewed-by: Simon McVittie + + dbus/dbus-gproxy.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit c6cbdf9ed99f82983dd529319475dd02c53ad2aa +Author: Simon McVittie +Date: 2012-06-25 18:23:30 +0100 + + Fix builds without tests + + test/manual/Makefile.am | 5 +++++ + 1 file changed, 5 insertions(+) + +commit a0dd0c8c240896a5dd205c1dbc51924b9d41f833 +Author: Simon McVittie +Date: 2012-06-25 17:26:48 +0100 + + Prepare version 0.100 + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8b7e4a1c4ae055864e26db4addbcc2dc38ee6963 +Author: Simon McVittie +Date: 2012-04-16 12:11:38 +0100 + + Fix two crashes when dbus_g_proxy_new_for_peer is used on a bus + + The first part of the bug is that when NameOwnerChanged is received + with + a dbus_g_proxy_new_for_peer (which has no name) alive, checking + whether it was affected by the NameOwnerChanged caused a NULL + dereference and segfault. + + The second part of the bug is that if the last proxy in existence is + for a peer, when it was unregistered there would be no + owner_match_rules, + causing a crash. + + Both are exercised in the new test added here. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41126 + Signed-off-by: Simon McVittie + Reviewed-by: Will Thompson + + .gitignore | 1 + + dbus/dbus-gproxy.c | 5 +- + test/core/Makefile.am | 3 + + test/core/peer-on-bus.c | 148 + +++++++++++++++++++++++++++++++++++++++++++++++ + test/core/run-test.sh | 1 + + 5 files changed, 156 insertions(+), 2 deletions(-) + +commit 82d45d15088d206f1e1f024215e95301fa04e92c +Author: Simon McVittie +Date: 2012-04-16 12:10:37 +0100 + + Add a utility function to tear down a private connection in tests + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41126 + Reviewed-by: Will Thompson + + configure.ac | 1 + + test/Makefile.am | 4 +-- + test/core/Makefile.am | 4 ++- + test/interfaces/Makefile.am | 4 ++- + test/lib/Makefile.am | 19 ++++++++++++ + test/lib/util.c | 69 + +++++++++++++++++++++++++++++++++++++++++++ + test/lib/util.h | 32 ++++++++++++++++++++ + 7 files changed, 129 insertions(+), 4 deletions(-) + +commit 403c5bf4d98fcba83caa94aee96da27128bbf9c8 +Author: Matthias Klose +Date: 2012-06-25 17:11:45 +0100 + + Fix build error with -Werror=format-security + + Origin: vendor, Ubuntu + Reviewed-by: Simon McVittie + + dbus/dbus-gobject.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit ae0ed3e435c550c3fae1a86a1c3cb42da319dff2 Author: Simon McVittie Date: 2011-09-28 17:42:44 +0100 diff -Nru dbus-glib-0.100.1/config.guess dbus-glib-0.100.2/config.guess --- dbus-glib-0.100.1/config.guess 2011-09-30 15:46:14.000000000 +0000 +++ dbus-glib-0.100.2/config.guess 2012-06-08 16:15:38.000000000 +0000 @@ -2,9 +2,9 @@ # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-05-11' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # General Public License for more details. # # 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., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -57,8 +55,8 @@ Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +143,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -792,13 +790,12 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -807,6 +804,9 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -861,6 +861,13 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -895,13 +902,16 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -943,7 +953,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -978,13 +988,13 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-tilera-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -1315,6 +1325,9 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -Nru dbus-glib-0.100.1/config.sub dbus-glib-0.100.2/config.sub --- dbus-glib-0.100.1/config.sub 2011-09-30 15:46:14.000000000 +0000 +++ dbus-glib-0.100.2/config.sub 2012-06-08 16:15:38.000000000 +0000 @@ -2,9 +2,9 @@ # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-03-23' +timestamp='2012-04-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # GNU General Public License for more details. # # 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., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -76,8 +74,8 @@ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -132,6 +130,10 @@ os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -223,6 +225,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -247,17 +255,22 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -291,7 +304,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -300,7 +313,7 @@ | spu \ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -315,8 +328,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -329,7 +341,10 @@ strongarm | thumb | xscale) basic_machine=arm-unknown ;; - + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; xscaleeb) basic_machine=armeb-unknown ;; @@ -352,11 +367,13 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ @@ -365,8 +382,10 @@ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -400,7 +419,7 @@ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ @@ -408,10 +427,11 @@ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -711,7 +731,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -808,10 +827,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -1120,13 +1147,8 @@ basic_machine=t90-cray os=-unicos ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1336,7 +1358,7 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1521,6 +1543,9 @@ c4x-* | tic4x-*) os=-coff ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; @@ -1548,9 +1573,6 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout diff -Nru dbus-glib-0.100.1/configure dbus-glib-0.100.2/configure --- dbus-glib-0.100.1/configure 2013-02-15 16:59:50.000000000 +0000 +++ dbus-glib-0.100.2/configure 2013-02-25 12:20:14.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for dbus-glib 0.100.1. +# Generated by GNU Autoconf 2.69 for dbus-glib 0.100.2. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='dbus-glib' PACKAGE_TARNAME='dbus-glib' -PACKAGE_VERSION='0.100.1' -PACKAGE_STRING='dbus-glib 0.100.1' +PACKAGE_VERSION='0.100.2' +PACKAGE_STRING='dbus-glib 0.100.2' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=dbus&component=GLib' PACKAGE_URL='' @@ -1393,7 +1393,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures dbus-glib 0.100.1 to adapt to many kinds of systems. +\`configure' configures dbus-glib 0.100.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1463,7 +1463,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dbus-glib 0.100.1:";; + short | recursive ) echo "Configuration of dbus-glib 0.100.2:";; esac cat <<\_ACEOF @@ -1608,7 +1608,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dbus-glib configure 0.100.1 +dbus-glib configure 0.100.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1977,7 +1977,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dbus-glib $as_me 0.100.1, which was +It was created by dbus-glib $as_me 0.100.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2865,7 +2865,7 @@ # Define the identity of the package. PACKAGE='dbus-glib' - VERSION='0.100.1' + VERSION='0.100.2' cat >>confdefs.h <<_ACEOF @@ -13522,7 +13522,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dbus-glib $as_me 0.100.1, which was +This file was extended by dbus-glib $as_me 0.100.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13588,7 +13588,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -dbus-glib config.status 0.100.1 +dbus-glib config.status 0.100.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru dbus-glib-0.100.1/configure.ac dbus-glib-0.100.2/configure.ac --- dbus-glib-0.100.1/configure.ac 2013-02-15 16:59:23.000000000 +0000 +++ dbus-glib-0.100.2/configure.ac 2013-02-25 12:14:27.000000000 +0000 @@ -1,7 +1,7 @@ dnl -*- mode: m4 -*- AC_PREREQ(2.52) -AC_INIT([dbus-glib], [0.100.1], +AC_INIT([dbus-glib], [0.100.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=dbus&component=GLib]) AC_CANONICAL_HOST diff -Nru dbus-glib-0.100.1/debian/changelog dbus-glib-0.100.2/debian/changelog --- dbus-glib-0.100.1/debian/changelog 2013-02-25 12:39:46.000000000 +0000 +++ dbus-glib-0.100.2/debian/changelog 2013-02-25 12:59:22.000000000 +0000 @@ -1,9 +1,10 @@ -dbus-glib (0.100.1-1ubuntu1) raring; urgency=low +dbus-glib (0.100.2-1) unstable; urgency=low - * debian/patches/updated_dbus_glib_section.patch: - - use dbus-glib-sections.txt from git, the tarball one is outdated + * New upstream release + - respin upstream tarball to fix the HTML documentation (Closes: #701623) + - no source changes - -- Sebastien Bacher Mon, 25 Feb 2013 13:36:28 +0100 + -- Simon McVittie Mon, 25 Feb 2013 12:58:58 +0000 dbus-glib (0.100.1-1) unstable; urgency=high diff -Nru dbus-glib-0.100.1/debian/control dbus-glib-0.100.2/debian/control --- dbus-glib-0.100.1/debian/control 2013-02-25 12:39:52.000000000 +0000 +++ dbus-glib-0.100.2/debian/control 2013-02-25 12:59:22.000000000 +0000 @@ -1,8 +1,7 @@ Source: dbus-glib Section: devel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Utopia Maintenance Team +Maintainer: Utopia Maintenance Team Uploaders: Sjoerd Simons , Sebastian Dröge , Simon McVittie , diff -Nru dbus-glib-0.100.1/debian/patches/series dbus-glib-0.100.2/debian/patches/series --- dbus-glib-0.100.1/debian/patches/series 2013-02-25 12:38:44.000000000 +0000 +++ dbus-glib-0.100.2/debian/patches/series 2013-02-25 12:59:22.000000000 +0000 @@ -1 +0,0 @@ -updated_dbus_glib_section.patch diff -Nru dbus-glib-0.100.1/debian/patches/updated_dbus_glib_section.patch dbus-glib-0.100.2/debian/patches/updated_dbus_glib_section.patch --- dbus-glib-0.100.1/debian/patches/updated_dbus_glib_section.patch 2013-02-25 12:39:05.000000000 +0000 +++ dbus-glib-0.100.2/debian/patches/updated_dbus_glib_section.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,324 +0,0 @@ ---- dbus-glib/doc/reference/dbus-glib-sections.txt 2013-02-15 17:59:59.000000000 +0100 -+++ dbus-glib/doc/reference/dbus-glib-sections.txt 2013-02-25 13:36:44.567397191 +0100 -@@ -1,178 +1,200 @@ -
--dbus-glib --DBusGProxy --DBUS_GERROR --DBUS_INSIDE_DBUS_GLIB_H --DBUS_TYPE_G_BOOLEAN_ARRAY --DBUS_TYPE_G_CONNECTION --DBUS_TYPE_G_INT64_ARRAY --DBUS_TYPE_G_INT_ARRAY --DBUS_TYPE_G_MESSAGE --DBUS_TYPE_G_OBJECT_ARRAY --DBUS_TYPE_G_OBJECT_PATH --DBUS_TYPE_G_SIGNATURE --DBUS_TYPE_G_STRING_STRING_HASHTABLE --DBUS_TYPE_G_UCHAR_ARRAY --DBUS_TYPE_G_UINT64_ARRAY --DBUS_TYPE_G_UINT_ARRAY --DBusGAsyncData -+dbus-gconnection -+DBusGConnection -+dbus/dbus-glib.h - DBusGConnection --DBusGError --DBusGMessage --DBusGMethodInfo --DBusGMethodInvocation --DBusGObjectInfo --DBusGObjectPath --DBusGProxy --DBusGProxyCall --DBusGProxyCallNotify --DBusGProxyClass --DBusGSignature -+DBUS_TYPE_G_CONNECTION - dbus_g_bus_get - dbus_g_bus_get_private --dbus_g_connection_flush --dbus_g_connection_get_g_type --dbus_g_connection_lookup_g_object -+dbus_g_thread_init - dbus_g_connection_open - dbus_g_connection_ref --dbus_g_connection_register_g_object - dbus_g_connection_unref -+dbus_g_connection_flush -+dbus_g_connection_get_connection -+dbus_g_connection_register_g_object - dbus_g_connection_unregister_g_object --dbus_g_error_domain_register --dbus_g_error_get_name --dbus_g_error_has_name --dbus_g_error_quark --dbus_g_message_get_g_type -+dbus_g_connection_lookup_g_object -+ -+dbus_g_connection_get_g_type -+
-+ -+
-+dbus-gobject -+DBus GObject related functions -+dbus/dbus-glib.h -+DBusGObjectInfo -+dbus_g_object_type_install_info -+dbus_g_object_type_register_shadow_property -+dbus_g_object_path_get_g_type -+dbus_g_object_register_marshaller -+dbus_g_object_register_marshaller_array -+dbus_glib_global_set_disable_legacy_property_access -+
-+ -+
-+dbus-gmessage -+DBusGMessage -+dbus/dbus-glib.h -+DBusGMessage -+DBUS_TYPE_G_MESSAGE - dbus_g_message_ref - dbus_g_message_unref -+dbus_g_message_get_message -+ -+dbus_g_message_get_g_type -+
-+ -+
-+dbus-gmethod -+DBusGMethod -+dbus/dbus-glib.h -+DBusGMethodInfo -+DBusGMethodInvocation -+dbus_g_method_get_sender -+dbus_g_method_get_reply -+dbus_g_method_send_reply - dbus_g_method_return - dbus_g_method_return_error --dbus_g_object_path_get_g_type --dbus_g_object_register_marshaller --dbus_g_object_register_marshaller_array --dbus_g_object_type_install_info --dbus_g_object_type_register_shadow_property -+
-+ -+
-+dbus-gerror -+DBusGError -+dbus/dbus-glib.h -+DBusGError -+dbus_g_error_has_name -+dbus_g_error_get_name -+dbus_g_error_domain_register -+DBUS_GERROR -+ -+dbus_g_error_quark -+
-+ -+
-+dbus-gproxy -+DBusGProxy -+dbus/dbus-glib.h -+DBusGProxy -+DBusGProxyCall -+DBusGProxyCallNotify -+dbus_g_proxy_new_for_name -+dbus_g_proxy_new_for_name_owner -+dbus_g_proxy_new_from_proxy -+dbus_g_proxy_new_for_peer -+dbus_g_proxy_set_interface -+dbus_g_proxy_get_path -+dbus_g_proxy_get_bus_name -+dbus_g_proxy_get_interface - dbus_g_proxy_add_signal --dbus_g_proxy_begin_call --dbus_g_proxy_begin_call_with_timeout --dbus_g_proxy_call --dbus_g_proxy_call_no_reply --dbus_g_proxy_call_with_timeout --dbus_g_proxy_cancel_call - dbus_g_proxy_connect_signal - dbus_g_proxy_disconnect_signal -+dbus_g_proxy_send -+dbus_g_proxy_call -+dbus_g_proxy_call_with_timeout -+dbus_g_proxy_call_no_reply -+dbus_g_proxy_begin_call -+dbus_g_proxy_begin_call_with_timeout - dbus_g_proxy_end_call --dbus_g_proxy_get_bus_name --dbus_g_proxy_get_interface --dbus_g_proxy_get_path --dbus_g_proxy_new_for_name --dbus_g_proxy_new_for_name_owner --dbus_g_proxy_new_for_peer --dbus_g_proxy_new_from_proxy -+dbus_g_proxy_cancel_call - dbus_g_proxy_set_default_timeout --dbus_g_proxy_set_interface --dbus_g_signature_get_g_type --dbus_g_thread_init --dbus_glib_global_set_disable_legacy_property_access - - DBUS_G_PROXY --DBUS_G_PROXY_CLASS --DBUS_G_PROXY_GET_CLASS - DBUS_IS_G_PROXY --DBUS_IS_G_PROXY_CLASS - DBUS_TYPE_G_PROXY - dbus_g_proxy_get_type -+DBUS_G_PROXY_CLASS -+DBUS_IS_G_PROXY_CLASS -+DBUS_G_PROXY_GET_CLASS -+ -+DBusGAsyncData -
- -
- dbus-glib-lowlevel -+DBus GLib low level -+dbus/dbus-glib-lowlevel.h -+dbus_set_g_error -+dbus_connection_setup_with_g_main -+dbus_connection_get_g_connection -+dbus_server_setup_with_g_main - DBUS_TYPE_CONNECTION - DBUS_TYPE_MESSAGE --dbus_connection_get_g_connection -+ - dbus_connection_get_g_type --dbus_connection_setup_with_g_main --dbus_g_connection_get_connection --dbus_g_message_get_message --dbus_g_method_get_reply --dbus_g_method_get_sender --dbus_g_method_send_reply --dbus_g_proxy_send - dbus_message_get_g_type --dbus_server_setup_with_g_main --dbus_set_g_error --
-- --
--dbus-gobject -- --
-- --
--dbus-gtool-test -- -+ -+DBUS_INSIDE_DBUS_GLIB_H -
- -
- dbus-gtype-specialized -+Specializable GType System -+dbus/dbus-glib.h -+DBusGTypeSpecializedCollectionIterator -+DBusGTypeSpecializedMapIterator - DBusGTypeSpecializedAppendContext --DBusGTypeSpecializedCollectionAppendFunc --DBusGTypeSpecializedCollectionEndAppendFunc -+DBusGTypeSpecializedConstructor -+DBusGTypeSpecializedFreeFunc -+DBusGTypeSpecializedCopyFunc -+DBusGTypeSpecializedVtable - DBusGTypeSpecializedCollectionFixedAccessorFunc --DBusGTypeSpecializedCollectionIterator - DBusGTypeSpecializedCollectionIteratorFunc -+DBusGTypeSpecializedCollectionAppendFunc -+DBusGTypeSpecializedCollectionEndAppendFunc - DBusGTypeSpecializedCollectionVtable --DBusGTypeSpecializedConstructor --DBusGTypeSpecializedCopyFunc --DBusGTypeSpecializedFreeFunc --DBusGTypeSpecializedMapAppendFunc --DBusGTypeSpecializedMapIterator - DBusGTypeSpecializedMapIteratorFunc -+DBusGTypeSpecializedMapAppendFunc - DBusGTypeSpecializedMapVtable - DBusGTypeSpecializedStructGetMember - DBusGTypeSpecializedStructSetMember - DBusGTypeSpecializedStructVtable --DBusGTypeSpecializedVtable --dbus_g_type_collection_get_fixed --dbus_g_type_collection_peek_vtable --dbus_g_type_collection_value_iterate - dbus_g_type_get_collection --dbus_g_type_get_collection_specialization - dbus_g_type_get_map --dbus_g_type_get_map_key_specialization --dbus_g_type_get_map_value_specialization --dbus_g_type_get_struct --dbus_g_type_get_struct_member_type --dbus_g_type_get_struct_size - dbus_g_type_get_structv -+dbus_g_type_get_struct - dbus_g_type_is_collection - dbus_g_type_is_map - dbus_g_type_is_struct --dbus_g_type_map_peek_vtable --dbus_g_type_map_value_iterate --dbus_g_type_register_collection --dbus_g_type_register_map --dbus_g_type_register_struct --dbus_g_type_specialized_collection_append --dbus_g_type_specialized_collection_end_append -+dbus_g_type_get_collection_specialization -+dbus_g_type_get_map_key_specialization -+dbus_g_type_get_map_value_specialization -+dbus_g_type_get_struct_member_type -+dbus_g_type_get_struct_size - dbus_g_type_specialized_construct --dbus_g_type_specialized_init - dbus_g_type_specialized_init_append -+dbus_g_type_specialized_collection_append -+dbus_g_type_specialized_collection_end_append - dbus_g_type_specialized_map_append --dbus_g_type_struct_get -+dbus_g_type_collection_get_fixed -+dbus_g_type_collection_value_iterate -+dbus_g_type_map_value_iterate - dbus_g_type_struct_get_member --dbus_g_type_struct_peek_vtable --dbus_g_type_struct_set - dbus_g_type_struct_set_member -+dbus_g_type_struct_get -+dbus_g_type_struct_set -+dbus_g_type_specialized_init -+dbus_g_type_register_collection -+dbus_g_type_register_map -+dbus_g_type_map_peek_vtable -+dbus_g_type_collection_peek_vtable -+dbus_g_type_struct_peek_vtable -+dbus_g_type_register_struct - dbus_g_value_build_g_variant --
-- --
--dbus-gtype-specialized-priv -- --
-- --
--dbus-gvalue-parse-variant - dbus_g_value_parse_g_variant -+DBUS_TYPE_G_BOOLEAN_ARRAY -+DBUS_TYPE_G_UCHAR_ARRAY -+DBUS_TYPE_G_UINT_ARRAY -+DBUS_TYPE_G_INT_ARRAY -+DBUS_TYPE_G_UINT64_ARRAY -+DBUS_TYPE_G_INT64_ARRAY -+DBUS_TYPE_G_OBJECT_ARRAY -+DBUS_TYPE_G_STRING_STRING_HASHTABLE -+DBusGSignature -+DBUS_TYPE_G_SIGNATURE -+DBusGObjectPath -+DBUS_TYPE_G_OBJECT_PATH -+ -+dbus_g_object_path_get_g_type -+dbus_g_signature_get_g_type -
-- diff -Nru dbus-glib-0.100.1/depcomp dbus-glib-0.100.2/depcomp --- dbus-glib-0.100.1/depcomp 2011-09-30 15:46:14.000000000 +0000 +++ dbus-glib-0.100.2/depcomp 2012-07-10 21:28:47.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-03-27.16; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. # 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 @@ -28,7 +28,7 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) @@ -40,11 +40,11 @@ Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +57,12 @@ ;; esac +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -90,10 +96,24 @@ # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" + cygpath_u='sed s,\\\\,/,g' depmode=msvisualcpp fi +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -148,20 +168,21 @@ ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory + tr ' ' "$nl" < "$tmpdepfile" | +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -193,18 +214,15 @@ # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr "$nl" ' ' >> "$depfile" echo >> "$depfile" # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> "$depfile" else @@ -216,10 +234,17 @@ rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` @@ -249,12 +274,11 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. + # Each line is of the form 'foo.o: dependent.h'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. + # '$object: dependent.h' and one to simply 'dependent.h:'. sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -265,23 +289,26 @@ ;; icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. + # However on + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h - # which is wrong. We want: + # which is wrong. We want # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\': # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - + # tcc 0.9.26 (FIXME still under development at the moment of writing) + # will emit a similar output, but also prepend the continuation lines + # with horizontal tabulation characters. "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : @@ -290,15 +317,21 @@ exit $stat fi rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Each line is of the form 'foo.o: dependent.h', + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + # '$object: dependent.h' and one to simply 'dependent.h:'. + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ + < "$tmpdepfile" > "$depfile" + sed ' + s/[ '"$tab"'][ '"$tab"']*/ /g + s/^ *// + s/ *\\*$// + s/^[^:]*: *// + /^$/d + /:$/d + s/$/ :/ + ' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; @@ -334,7 +367,7 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + # Add 'dependent.h:' lines. sed -ne '2,${ s/^ *// s/ \\*$// @@ -349,9 +382,9 @@ tru64) # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. + # dependencies in 'foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= @@ -397,14 +430,59 @@ done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi rm -f "$tmpdepfile" ;; +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test "$stat" = 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -422,7 +500,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,15 +520,14 @@ done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ + tr ' ' "$nl" < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -503,9 +580,10 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -525,7 +603,7 @@ shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -594,8 +672,8 @@ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff -Nru dbus-glib-0.100.1/doc/reference/dbus-glib-sections.txt dbus-glib-0.100.2/doc/reference/dbus-glib-sections.txt --- dbus-glib-0.100.1/doc/reference/dbus-glib-sections.txt 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/dbus-glib-sections.txt 2013-02-25 12:24:41.000000000 +0000 @@ -1,178 +1,200 @@
-dbus-glib -DBusGProxy -DBUS_GERROR -DBUS_INSIDE_DBUS_GLIB_H -DBUS_TYPE_G_BOOLEAN_ARRAY -DBUS_TYPE_G_CONNECTION -DBUS_TYPE_G_INT64_ARRAY -DBUS_TYPE_G_INT_ARRAY -DBUS_TYPE_G_MESSAGE -DBUS_TYPE_G_OBJECT_ARRAY -DBUS_TYPE_G_OBJECT_PATH -DBUS_TYPE_G_SIGNATURE -DBUS_TYPE_G_STRING_STRING_HASHTABLE -DBUS_TYPE_G_UCHAR_ARRAY -DBUS_TYPE_G_UINT64_ARRAY -DBUS_TYPE_G_UINT_ARRAY -DBusGAsyncData +dbus-gconnection +DBusGConnection +dbus/dbus-glib.h DBusGConnection -DBusGError -DBusGMessage -DBusGMethodInfo -DBusGMethodInvocation -DBusGObjectInfo -DBusGObjectPath -DBusGProxy -DBusGProxyCall -DBusGProxyCallNotify -DBusGProxyClass -DBusGSignature +DBUS_TYPE_G_CONNECTION dbus_g_bus_get dbus_g_bus_get_private -dbus_g_connection_flush -dbus_g_connection_get_g_type -dbus_g_connection_lookup_g_object +dbus_g_thread_init dbus_g_connection_open dbus_g_connection_ref -dbus_g_connection_register_g_object dbus_g_connection_unref +dbus_g_connection_flush +dbus_g_connection_get_connection +dbus_g_connection_register_g_object dbus_g_connection_unregister_g_object -dbus_g_error_domain_register -dbus_g_error_get_name -dbus_g_error_has_name -dbus_g_error_quark -dbus_g_message_get_g_type +dbus_g_connection_lookup_g_object + +dbus_g_connection_get_g_type +
+ +
+dbus-gobject +DBus GObject related functions +dbus/dbus-glib.h +DBusGObjectInfo +dbus_g_object_type_install_info +dbus_g_object_type_register_shadow_property +dbus_g_object_path_get_g_type +dbus_g_object_register_marshaller +dbus_g_object_register_marshaller_array +dbus_glib_global_set_disable_legacy_property_access +
+ +
+dbus-gmessage +DBusGMessage +dbus/dbus-glib.h +DBusGMessage +DBUS_TYPE_G_MESSAGE dbus_g_message_ref dbus_g_message_unref +dbus_g_message_get_message + +dbus_g_message_get_g_type +
+ +
+dbus-gmethod +DBusGMethod +dbus/dbus-glib.h +DBusGMethodInfo +DBusGMethodInvocation +dbus_g_method_get_sender +dbus_g_method_get_reply +dbus_g_method_send_reply dbus_g_method_return dbus_g_method_return_error -dbus_g_object_path_get_g_type -dbus_g_object_register_marshaller -dbus_g_object_register_marshaller_array -dbus_g_object_type_install_info -dbus_g_object_type_register_shadow_property +
+ +
+dbus-gerror +DBusGError +dbus/dbus-glib.h +DBusGError +dbus_g_error_has_name +dbus_g_error_get_name +dbus_g_error_domain_register +DBUS_GERROR + +dbus_g_error_quark +
+ +
+dbus-gproxy +DBusGProxy +dbus/dbus-glib.h +DBusGProxy +DBusGProxyCall +DBusGProxyCallNotify +dbus_g_proxy_new_for_name +dbus_g_proxy_new_for_name_owner +dbus_g_proxy_new_from_proxy +dbus_g_proxy_new_for_peer +dbus_g_proxy_set_interface +dbus_g_proxy_get_path +dbus_g_proxy_get_bus_name +dbus_g_proxy_get_interface dbus_g_proxy_add_signal -dbus_g_proxy_begin_call -dbus_g_proxy_begin_call_with_timeout -dbus_g_proxy_call -dbus_g_proxy_call_no_reply -dbus_g_proxy_call_with_timeout -dbus_g_proxy_cancel_call dbus_g_proxy_connect_signal dbus_g_proxy_disconnect_signal +dbus_g_proxy_send +dbus_g_proxy_call +dbus_g_proxy_call_with_timeout +dbus_g_proxy_call_no_reply +dbus_g_proxy_begin_call +dbus_g_proxy_begin_call_with_timeout dbus_g_proxy_end_call -dbus_g_proxy_get_bus_name -dbus_g_proxy_get_interface -dbus_g_proxy_get_path -dbus_g_proxy_new_for_name -dbus_g_proxy_new_for_name_owner -dbus_g_proxy_new_for_peer -dbus_g_proxy_new_from_proxy +dbus_g_proxy_cancel_call dbus_g_proxy_set_default_timeout -dbus_g_proxy_set_interface -dbus_g_signature_get_g_type -dbus_g_thread_init -dbus_glib_global_set_disable_legacy_property_access DBUS_G_PROXY -DBUS_G_PROXY_CLASS -DBUS_G_PROXY_GET_CLASS DBUS_IS_G_PROXY -DBUS_IS_G_PROXY_CLASS DBUS_TYPE_G_PROXY dbus_g_proxy_get_type +DBUS_G_PROXY_CLASS +DBUS_IS_G_PROXY_CLASS +DBUS_G_PROXY_GET_CLASS + +DBusGAsyncData
dbus-glib-lowlevel +DBus GLib low level +dbus/dbus-glib-lowlevel.h +dbus_set_g_error +dbus_connection_setup_with_g_main +dbus_connection_get_g_connection +dbus_server_setup_with_g_main DBUS_TYPE_CONNECTION DBUS_TYPE_MESSAGE -dbus_connection_get_g_connection + dbus_connection_get_g_type -dbus_connection_setup_with_g_main -dbus_g_connection_get_connection -dbus_g_message_get_message -dbus_g_method_get_reply -dbus_g_method_get_sender -dbus_g_method_send_reply -dbus_g_proxy_send dbus_message_get_g_type -dbus_server_setup_with_g_main -dbus_set_g_error -
- -
-dbus-gobject - -
- -
-dbus-gtool-test - + +DBUS_INSIDE_DBUS_GLIB_H
dbus-gtype-specialized +Specializable GType System +dbus/dbus-glib.h +DBusGTypeSpecializedCollectionIterator +DBusGTypeSpecializedMapIterator DBusGTypeSpecializedAppendContext -DBusGTypeSpecializedCollectionAppendFunc -DBusGTypeSpecializedCollectionEndAppendFunc +DBusGTypeSpecializedConstructor +DBusGTypeSpecializedFreeFunc +DBusGTypeSpecializedCopyFunc +DBusGTypeSpecializedVtable DBusGTypeSpecializedCollectionFixedAccessorFunc -DBusGTypeSpecializedCollectionIterator DBusGTypeSpecializedCollectionIteratorFunc +DBusGTypeSpecializedCollectionAppendFunc +DBusGTypeSpecializedCollectionEndAppendFunc DBusGTypeSpecializedCollectionVtable -DBusGTypeSpecializedConstructor -DBusGTypeSpecializedCopyFunc -DBusGTypeSpecializedFreeFunc -DBusGTypeSpecializedMapAppendFunc -DBusGTypeSpecializedMapIterator DBusGTypeSpecializedMapIteratorFunc +DBusGTypeSpecializedMapAppendFunc DBusGTypeSpecializedMapVtable DBusGTypeSpecializedStructGetMember DBusGTypeSpecializedStructSetMember DBusGTypeSpecializedStructVtable -DBusGTypeSpecializedVtable -dbus_g_type_collection_get_fixed -dbus_g_type_collection_peek_vtable -dbus_g_type_collection_value_iterate dbus_g_type_get_collection -dbus_g_type_get_collection_specialization dbus_g_type_get_map -dbus_g_type_get_map_key_specialization -dbus_g_type_get_map_value_specialization -dbus_g_type_get_struct -dbus_g_type_get_struct_member_type -dbus_g_type_get_struct_size dbus_g_type_get_structv +dbus_g_type_get_struct dbus_g_type_is_collection dbus_g_type_is_map dbus_g_type_is_struct -dbus_g_type_map_peek_vtable -dbus_g_type_map_value_iterate -dbus_g_type_register_collection -dbus_g_type_register_map -dbus_g_type_register_struct -dbus_g_type_specialized_collection_append -dbus_g_type_specialized_collection_end_append +dbus_g_type_get_collection_specialization +dbus_g_type_get_map_key_specialization +dbus_g_type_get_map_value_specialization +dbus_g_type_get_struct_member_type +dbus_g_type_get_struct_size dbus_g_type_specialized_construct -dbus_g_type_specialized_init dbus_g_type_specialized_init_append +dbus_g_type_specialized_collection_append +dbus_g_type_specialized_collection_end_append dbus_g_type_specialized_map_append -dbus_g_type_struct_get +dbus_g_type_collection_get_fixed +dbus_g_type_collection_value_iterate +dbus_g_type_map_value_iterate dbus_g_type_struct_get_member -dbus_g_type_struct_peek_vtable -dbus_g_type_struct_set dbus_g_type_struct_set_member +dbus_g_type_struct_get +dbus_g_type_struct_set +dbus_g_type_specialized_init +dbus_g_type_register_collection +dbus_g_type_register_map +dbus_g_type_map_peek_vtable +dbus_g_type_collection_peek_vtable +dbus_g_type_struct_peek_vtable +dbus_g_type_register_struct dbus_g_value_build_g_variant -
- -
-dbus-gtype-specialized-priv - -
- -
-dbus-gvalue-parse-variant dbus_g_value_parse_g_variant +DBUS_TYPE_G_BOOLEAN_ARRAY +DBUS_TYPE_G_UCHAR_ARRAY +DBUS_TYPE_G_UINT_ARRAY +DBUS_TYPE_G_INT_ARRAY +DBUS_TYPE_G_UINT64_ARRAY +DBUS_TYPE_G_INT64_ARRAY +DBUS_TYPE_G_OBJECT_ARRAY +DBUS_TYPE_G_STRING_STRING_HASHTABLE +DBusGSignature +DBUS_TYPE_G_SIGNATURE +DBusGObjectPath +DBUS_TYPE_G_OBJECT_PATH + +dbus_g_object_path_get_g_type +dbus_g_signature_get_g_type
- diff -Nru dbus-glib-0.100.1/doc/reference/dbus-glib.types dbus-glib-0.100.2/doc/reference/dbus-glib.types --- dbus-glib-0.100.1/doc/reference/dbus-glib.types 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/dbus-glib.types 2013-02-25 12:24:41.000000000 +0000 @@ -1 +0,0 @@ -dbus_g_proxy_get_type diff -Nru dbus-glib-0.100.1/doc/reference/html/ch01.html dbus-glib-0.100.2/doc/reference/html/ch01.html --- dbus-glib-0.100.1/doc/reference/html/ch01.html 2013-02-15 17:00:01.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/html/ch01.html 2013-02-25 12:24:41.000000000 +0000 @@ -21,7 +21,7 @@

-Introduction

+Introduction

D-Bus is a message bus system, a simple way for applications to talk to one another.

D-Bus supplies both a system daemon (for events such as "new diff -Nru dbus-glib-0.100.1/doc/reference/html/ch02.html dbus-glib-0.100.2/doc/reference/html/ch02.html --- dbus-glib-0.100.1/doc/reference/html/ch02.html 2013-02-15 17:00:01.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/html/ch02.html 2013-02-25 12:24:41.000000000 +0000 @@ -7,7 +7,7 @@ - + @@ -17,18 +17,36 @@   Home D-Bus GLib bindings - Reference Manual -Next +Next

-API Reference

+API Reference
API for using D-BUS with GLib
-Specializable GType System — Specialized GTypes +DBusGConnection — DBus Connection
-DBus GLib low level — DBus lower level functions +DBus GObject related functions — Exporting a GObject remotely +
+
+DBusGMessage — DBus Message +
+
+DBusGMethod — GMethod Info & Invocation +
+
+DBusGError — DBus GError +
+
+DBusGProxy — DBus Proxy +
+
+Specializable GType System — Specialized GTypes +
+
+DBus GLib low level — DBus lower level functions
@@ -42,7 +60,6 @@ information.

To manipulate remote objects, use DBusGProxy.

-<xi:include></xi:include><xi:include></xi:include><xi:include></xi:include><xi:include></xi:include><xi:include></xi:include><xi:include></xi:include>
diff -Nru dbus-glib-0.100.1/doc/reference/html/ch03.html dbus-glib-0.100.2/doc/reference/html/ch03.html --- dbus-glib-0.100.1/doc/reference/html/ch03.html 2013-02-15 17:00:01.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/html/ch03.html 2013-02-25 12:24:41.000000000 +0000 @@ -6,14 +6,14 @@ - + - + @@ -21,7 +21,7 @@

-Tools Reference

+Tools Reference
dbus-binding-tool — C language GLib bindings generation utility
diff -Nru dbus-glib-0.100.1/doc/reference/html/dbus-binding-tool.html dbus-glib-0.100.2/doc/reference/html/dbus-binding-tool.html --- dbus-glib-0.100.1/doc/reference/html/dbus-binding-tool.html 2013-02-15 17:00:01.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/html/dbus-binding-tool.html 2013-02-25 12:24:41.000000000 +0000 @@ -32,16 +32,16 @@

[options...] [files...]

-

Description

+

Description

dbus-binding-tool bla bla bla

-

Invocation

+

Invocation

dbus-binding-tool bla bla bla

-

Options

+

Options

@@ -68,7 +68,7 @@
-

See also

+

See also

glib-genmarshal(1)

diff -Nru dbus-glib-0.100.1/doc/reference/html/dbus-glib-DBus-GLib-low-level.html dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBus-GLib-low-level.html --- dbus-glib-0.100.1/doc/reference/html/dbus-glib-DBus-GLib-low-level.html 1970-01-01 00:00:00.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBus-GLib-low-level.html 2013-02-25 12:24:41.000000000 +0000 @@ -0,0 +1,248 @@ + + + + +DBus GLib low level + + + + + + + + + +
+ + + + + + + + + +
+
+
+ + +
+

DBus GLib low level

+

DBus GLib low level — DBus lower level functions

+
+
+

Stability Level

+Unstable, unless otherwise indicated +
+
+

Synopsis

+
+#include <dbus/dbus-glib-lowlevel.h>
+
+void                dbus_set_g_error                    (GError **gerror,
+                                                         DBusError *derror);
+void                dbus_connection_setup_with_g_main   (DBusConnection *connection,
+                                                         GMainContext *context);
+DBusGConnection *   dbus_connection_get_g_connection    (DBusConnection *connection);
+void                dbus_server_setup_with_g_main       (DBusServer *server,
+                                                         GMainContext *context);
+#define             DBUS_TYPE_CONNECTION
+#define             DBUS_TYPE_MESSAGE
+
+
+
+

Description

+

+These functions can be used to access lower level of DBus. +

+
+
+

Details

+
+

dbus_set_g_error ()

+
void                dbus_set_g_error                    (GError **gerror,
+                                                         DBusError *derror);
+

+Store the information from a DBus method error return into a +GError. For the normal case of an arbitrary remote process, +the error code will be DBUS_GERROR_REMOTE_EXCEPTION. Now, +DBus errors have two components; a message and a "name". +The former is an arbitrary (normally American English) string. +The second is a string like com.example.FooFailure which +programs can use as a conditional source. Because a GError +only has one string, we use a hack to encode both values: +

+

+<human readable string><null><error name><null> +

+

+You can use the following code to retrieve both values: +

+

+

+
+ + + + + + + + 
1
+2
+3
const char *msg = error->message;
+size_t len = strlen(msg);
+const char *error_name = msg+len+1;
+
+ +

+

+
++ + + + + + + + + + +

gerror :

an error

derror :

a DBusError +
+
+
+
+

dbus_connection_setup_with_g_main ()

+
void                dbus_connection_setup_with_g_main   (DBusConnection *connection,
+                                                         GMainContext *context);
+

+Sets the watch and timeout functions of a DBusConnection +to integrate the connection with the GLib main loop. +Pass in NULL for the GMainContext unless you're +doing something specialized. +

+

+If called twice for the same context, does nothing the second +time. If called once with context A and once with context B, +context B replaces context A as the context monitoring the +connection. +

+
++ + + + + + + + + + +

connection :

the connection

context :

the GMainContext or NULL for default context
+
+
+
+

dbus_connection_get_g_connection ()

+
DBusGConnection *   dbus_connection_get_g_connection    (DBusConnection *connection);
+

+Get the DBusGConnection corresponding to this DBusConnection. This only +makes sense if the DBusConnection was originally a DBusGConnection that was +registered with the GLib main loop. The return value does not have its +refcount incremented. +

+
++ + + + + + + + + + +

connection :

a DBusConnection +

Returns :

DBusGConnection
+
+
+
+

dbus_server_setup_with_g_main ()

+
void                dbus_server_setup_with_g_main       (DBusServer *server,
+                                                         GMainContext *context);
+

+Sets the watch and timeout functions of a DBusServer +to integrate the server with the GLib main loop. +In most cases the context argument should be NULL. +

+

+If called twice for the same context, does nothing the second +time. If called once with context A and once with context B, +context B replaces context A as the context monitoring the +connection. +

+
++ + + + + + + + + + +

server :

the server

context :

the GMainContext or NULL for default
+
+
+
+

DBUS_TYPE_CONNECTION

+
#define DBUS_TYPE_CONNECTION      (dbus_connection_get_g_type ())
+
+

+Expands to a function call returning a boxed GType representing a +DBusConnection pointer from libdbus. Not to be confused with +DBUS_TYPE_G_CONNECTION, which you should usually use instead. +

+
++ + + + +

Returns :

the GLib type
+
+
+
+

DBUS_TYPE_MESSAGE

+
#define DBUS_TYPE_MESSAGE         (dbus_message_get_g_type ())
+
+

+Expands to a function call returning a boxed GType representing a +DBusMessage pointer from libdbus. Not to be confused with +DBUS_TYPE_G_MESSAGE, which you should usually use instead. +

+
++ + + + +

Returns :

the GLib type
+
+
+
+
+
+ Generated by GTK-Doc V1.18
+ + \ No newline at end of file diff -Nru dbus-glib-0.100.1/doc/reference/html/dbus-glib-DBus-GObject-related-functions.html dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBus-GObject-related-functions.html --- dbus-glib-0.100.1/doc/reference/html/dbus-glib-DBus-GObject-related-functions.html 1970-01-01 00:00:00.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBus-GObject-related-functions.html 2013-02-25 12:24:41.000000000 +0000 @@ -0,0 +1,308 @@ + + + + +DBus GObject related functions + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

DBus GObject related functions

+

DBus GObject related functions — Exporting a GObject remotely

+
+
+

Stability Level

+Stable, unless otherwise indicated +
+
+

Synopsis

+
+#include <dbus/dbus-glib.h>
+
+struct              DBusGObjectInfo;
+void                dbus_g_object_type_install_info     (GType object_type,
+                                                         const DBusGObjectInfo *info);
+void                dbus_g_object_type_register_shadow_property
+                                                        (GType iface_type,
+                                                         const char *dbus_prop_name,
+                                                         const char *shadow_prop_name);
+GType               dbus_g_object_path_get_g_type       (void);
+void                dbus_g_object_register_marshaller   (GClosureMarshal marshaller,
+                                                         GType rettype,
+                                                         ...);
+void                dbus_g_object_register_marshaller_array
+                                                        (GClosureMarshal marshaller,
+                                                         GType rettype,
+                                                         guint n_types,
+                                                         const GType *types);
+void                dbus_glib_global_set_disable_legacy_property_access
+                                                        (void);
+
+
+
+

Description

+

+FIXME +

+
+
+

Details

+
+

struct DBusGObjectInfo

+
struct DBusGObjectInfo {
+  int   format_version;
+                       
+  const DBusGMethodInfo *method_infos;
+  int   n_method_infos;                
+  const char *data; 
+  const char *exported_signals;  
+  const char *exported_properties; 
+};
+
+

+Introspection data for a GObject, normally autogenerated by +a tool such as dbus-binding-tool. +

+
++ + + + + + + + + + + + + + + + + + + + + + + + + + +

int format_version;

Allows us to change the rest of this struct +by adding DBusGObjectInfo2, DBusGObjectInfo3, etc.

const DBusGMethodInfo *method_infos;

Array of method pointers

int n_method_infos;

Length of the infos array

const char *data;

Introspection data

const char *exported_signals;

Exported signals

const char *exported_properties;

Exported properties
+
+
+
+

dbus_g_object_type_install_info ()

+
void                dbus_g_object_type_install_info     (GType object_type,
+                                                         const DBusGObjectInfo *info);
+

+Install introspection information about the given object GType +sufficient to allow methods on the object to be invoked by name. +The introspection information is normally generated by +dbus-glib-tool, then this function is called in the +class_init() for the object class. +

+

+Once introspection information has been installed, instances of the +object registered with dbus_g_connection_register_g_object() can have +their methods invoked remotely. +

+
++ + + + + + + + + + +

object_type :

 +GType for the object

info :

introspection data generated by dbus-glib-tool +
+
+
+
+

dbus_g_object_type_register_shadow_property ()

+
void                dbus_g_object_type_register_shadow_property
+                                                        (GType iface_type,
+                                                         const char *dbus_prop_name,
+                                                         const char *shadow_prop_name);
+

+Registers a new property name shadow_prop_name that overrides the +dbus_prop_name in D-Bus property get/set requests. Since all properties for +all interfaces implemented by a GObject exist in the same namespace, this +allows implementations to use the same property name in two or more D-Bus +interfaces implemented by the same GObject, as long as one of those D-Bus +interface properties is registered with a shadow property name. +

+

+For example, if both org.foobar.Baz.InterfaceA and org.foobar.Baz.InterfaceB +have a D-Bus property called "Bork", the developer assigns a shadow property +name to the conflicting property name in one or both of these GInterfaces to +resolve the conflict. Assume the GInterface implementing +org.foobar.Baz.InterfaceA registers a shadow property called "a-bork", while +the GInterface implementing org.foobar.Baz.InterfaceB registers a shadow +property called "b-bork". The GObject implementing both these GInterfaces +would then use #g_object_class_override_property() to implement both +"a-bork" and "b-bork" and D-Bus requests for "Bork" on either D-Bus interface +will not conflict. +

+
++ + + + + + + + + + + + + + +

iface_type :

 +GType for the GInterface +

dbus_prop_name :

D-Bus property name (as specified in the introspection data) +to override with the shadow property name (as specified in the GType's +initialization function, ie glib-style)

shadow_prop_name :

property name which should override the shadow property
+
+
+
+

dbus_g_object_path_get_g_type ()

+
GType               dbus_g_object_path_get_g_type       (void);
+

+

+
+
+
+

dbus_g_object_register_marshaller ()

+
void                dbus_g_object_register_marshaller   (GClosureMarshal marshaller,
+                                                         GType rettype,
+                                                         ...);
+

+Register a GClosureMarshal to be used for signal invocations, +giving its return type and a list of parameter types, +followed by G_TYPE_INVALID. +

+

+This function will not be needed once GLib includes libffi. +

+
++ + + + + + + + + + + + + + +

marshaller :

a GClosureMarshal to be used for invocation

rettype :

a GType for the return type of the function

... :

The parameter GTypes, followed by G_TYPE_INVALID +
+
+
+
+

dbus_g_object_register_marshaller_array ()

+
void                dbus_g_object_register_marshaller_array
+                                                        (GClosureMarshal marshaller,
+                                                         GType rettype,
+                                                         guint n_types,
+                                                         const GType *types);
+

+Register a GClosureMarshal to be used for signal invocations. +see_also dbus_g_object_register_marshaller() +

+
++ + + + + + + + + + + + + + + + + + +

marshaller :

a GClosureMarshal to be used for invocation

rettype :

a GType for the return type of the function

n_types :

number of function parameters

types :

a C array of GTypes values
+
+
+
+

dbus_glib_global_set_disable_legacy_property_access ()

+
void                dbus_glib_global_set_disable_legacy_property_access
+                                                        (void);
+

+For historical reasons, DBus-GLib will allow read-only +access to every GObject property of an object exported +to the bus, regardless of whether or not the property +is listed in the type info installed with +dbus_g_object_type_install_info(). (Write access is +denied however). +

+

+If you wish to restrict even read-only access, you +can call this method to globally change the behavior +for the entire process. +

+

Since 0.88

+
+
+
+

See Also

+GObject +
+
+
+
+ Generated by GTK-Doc V1.18
+ + \ No newline at end of file diff -Nru dbus-glib-0.100.1/doc/reference/html/dbus-glib-DBusGConnection.html dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGConnection.html --- dbus-glib-0.100.1/doc/reference/html/dbus-glib-DBusGConnection.html 1970-01-01 00:00:00.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGConnection.html 2013-02-25 12:24:41.000000000 +0000 @@ -0,0 +1,388 @@ + + + + +DBusGConnection + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

DBusGConnection

+

DBusGConnection — DBus Connection

+
+
+

Stability Level

+Stable, unless otherwise indicated +
+
+

Synopsis

+
+#include <dbus/dbus-glib.h>
+
+                    DBusGConnection;
+#define             DBUS_TYPE_G_CONNECTION
+DBusGConnection *   dbus_g_bus_get                      (DBusBusType type,
+                                                         GError **error);
+DBusGConnection *   dbus_g_bus_get_private              (DBusBusType type,
+                                                         GMainContext *context,
+                                                         GError **error);
+void                dbus_g_thread_init                  (void);
+DBusGConnection *   dbus_g_connection_open              (const gchar *address,
+                                                         GError **error);
+DBusGConnection *   dbus_g_connection_ref               (DBusGConnection *connection);
+void                dbus_g_connection_unref             (DBusGConnection *connection);
+void                dbus_g_connection_flush             (DBusGConnection *connection);
+DBusConnection *    dbus_g_connection_get_connection    (DBusGConnection *gconnection);
+void                dbus_g_connection_register_g_object (DBusGConnection *connection,
+                                                         const char *at_path,
+                                                         GObject *object);
+void                dbus_g_connection_unregister_g_object
+                                                        (DBusGConnection *connection,
+                                                         GObject *object);
+GObject *           dbus_g_connection_lookup_g_object   (DBusGConnection *connection,
+                                                         const char *at_path);
+
+
+
+

Description

+

+A DBusGConnection is a boxed type abstracting a DBusConnection. +

+
+
+

Details

+
+

DBusGConnection

+
typedef struct _DBusGConnection DBusGConnection;
+

+A DBusGConnection is a boxed type abstracting a DBusConnection from +libdbus. +

+
+
+
+

DBUS_TYPE_G_CONNECTION

+
#define DBUS_TYPE_G_CONNECTION   (dbus_g_connection_get_g_type ())
+
+

+Expands to a function call returning the boxed GType of a DBusGConnection. +

+
++ + + + +

Returns :

the GLib type
+
+
+
+

dbus_g_bus_get ()

+
DBusGConnection *   dbus_g_bus_get                      (DBusBusType type,
+                                                         GError **error);
+

+Returns a connection to the given bus. The connection is a global variable +shared with other callers of this function. +

+

+(Internally, calls dbus_bus_get() then calls +dbus_connection_setup_with_g_main() on the result.) +

+
++ + + + + + + + + + + + + + +

type :

bus type

error :

address where an error can be returned.

Returns :

a DBusConnection
+
+
+
+

dbus_g_bus_get_private ()

+
DBusGConnection *   dbus_g_bus_get_private              (DBusBusType type,
+                                                         GMainContext *context,
+                                                         GError **error);
+

+Returns a connection to the given bus. The connection will be a private +non-shared connection and should be closed when usage is complete. +

+

+Internally this function calls dbus_bus_get_private() then calls +dbus_connection_setup_with_g_main() on the result; see the documentation +of the former function for more information on private connections. +

+
++ + + + + + + + + + + + + + + + + + +

type :

bus type

context :

Mainloop context to attach to

error :

address where an error can be returned.

Returns :

a DBusConnection
+
+
+
+

dbus_g_thread_init ()

+
void                dbus_g_thread_init                  (void);
+

+Initializes the D-BUS thread system. +This function may only be called +once and must be called prior to calling any +other function in the D-BUS API. +

+
+
+
+

dbus_g_connection_open ()

+
DBusGConnection *   dbus_g_connection_open              (const gchar *address,
+                                                         GError **error);
+

+Returns a connection to the given address. +

+

+(Internally, calls dbus_connection_open() then calls +dbus_connection_setup_with_g_main() on the result.) +

+
++ + + + + + + + + + + + + + +

address :

address of the connection to open

error :

address where an error can be returned.

Returns :

a DBusConnection
+
+
+
+

dbus_g_connection_ref ()

+
DBusGConnection *   dbus_g_connection_ref               (DBusGConnection *connection);
+

+Increment refcount on a DBusGConnection +

+
++ + + + + + + + + + +

connection :

the DBusGConnection to ref

Returns :

the connection that was ref'd
+
+
+
+

dbus_g_connection_unref ()

+
void                dbus_g_connection_unref             (DBusGConnection *connection);
+

+Decrement refcount on a DBusGConnection +

+
++ + + + +

connection :

the connection to unref
+
+
+
+

dbus_g_connection_flush ()

+
void                dbus_g_connection_flush             (DBusGConnection *connection);
+

+Blocks until outgoing calls and signal emissions have been sent. +

+
++ + + + +

connection :

the DBusGConnection to flush
+
+
+
+

dbus_g_connection_get_connection ()

+
DBusConnection *    dbus_g_connection_get_connection    (DBusGConnection *gconnection);
+

+Get the DBusConnection corresponding to this DBusGConnection. +The return value does not have its refcount incremented. +

+
++ + + + + + + + + + +

gconnection :

a DBusGConnection +

Returns :

DBusConnection
+
+
+
+

dbus_g_connection_register_g_object ()

+
void                dbus_g_connection_register_g_object (DBusGConnection *connection,
+                                                         const char *at_path,
+                                                         GObject *object);
+

+Registers a GObject at the given path. Properties, methods, and signals +of the object can then be accessed remotely. Methods are only available +if method introspection data has been added to the object's class +with dbus_g_object_type_install_info(). +

+

+The registration will be cancelled if either the DBusConnection or +the GObject gets finalized, or if dbus_g_connection_unregister_g_object() +is used. +

+

+Note: If an object is registered multiple times, the first registration +takes priority for cases such as turning an object into an object path. +

+
++ + + + + + + + + + + + + + +

connection :

the D-BUS connection

at_path :

the path where the object will live (the object's name)

object :

the object
+
+
+
+

dbus_g_connection_unregister_g_object ()

+
void                dbus_g_connection_unregister_g_object
+                                                        (DBusGConnection *connection,
+                                                         GObject *object);
+

+Removes object from any object paths at which it is exported on +connection. Properties, methods, and signals +of the object can no longer be accessed remotely. +

+
++ + + + + + + + + + +

connection :

the D-BUS connection

object :

the object
+
+
+
+

dbus_g_connection_lookup_g_object ()

+
GObject *           dbus_g_connection_lookup_g_object   (DBusGConnection *connection,
+                                                         const char *at_path);
+

+FIXME +

+
++ + + + + + + + + + + + + + +

connection :

a DBusGConnection +

at_path :

path

Returns :

the object at path at_path +
+
+
+
+

See Also

+DBusConnection +
+
+
+
+ Generated by GTK-Doc V1.18
+ + \ No newline at end of file diff -Nru dbus-glib-0.100.1/doc/reference/html/dbus-glib-DBusGError.html dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGError.html --- dbus-glib-0.100.1/doc/reference/html/dbus-glib-DBusGError.html 1970-01-01 00:00:00.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGError.html 2013-02-25 12:24:41.000000000 +0000 @@ -0,0 +1,239 @@ + + + + +DBusGError + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

DBusGError

+

DBusGError — DBus GError

+
+
+

Stability Level

+Stable, unless otherwise indicated +
+
+

Synopsis

+
+#include <dbus/dbus-glib.h>
+
+enum                DBusGError;
+gboolean            dbus_g_error_has_name               (GError *error,
+                                                         const char *name);
+const char *        dbus_g_error_get_name               (GError *error);
+void                dbus_g_error_domain_register        (GQuark domain,
+                                                         const char *default_iface,
+                                                         GType code_enum);
+#define             DBUS_GERROR
+
+
+
+

Description

+

+DBusGError is the GError used by DBus. +

+
+
+

Details

+
+

enum DBusGError

+
typedef enum {
+DBUS_GERROR_FAILED,
+DBUS_GERROR_NO_MEMORY,
+DBUS_GERROR_SERVICE_UNKNOWN,
+DBUS_GERROR_NAME_HAS_NO_OWNER,
+DBUS_GERROR_NO_REPLY,
+DBUS_GERROR_IO_ERROR,
+DBUS_GERROR_BAD_ADDRESS,
+DBUS_GERROR_NOT_SUPPORTED,
+DBUS_GERROR_LIMITS_EXCEEDED,
+DBUS_GERROR_ACCESS_DENIED,
+DBUS_GERROR_AUTH_FAILED,
+DBUS_GERROR_NO_SERVER,
+DBUS_GERROR_TIMEOUT,
+DBUS_GERROR_NO_NETWORK,
+DBUS_GERROR_ADDRESS_IN_USE,
+DBUS_GERROR_DISCONNECTED,
+DBUS_GERROR_INVALID_ARGS,
+DBUS_GERROR_FILE_NOT_FOUND,
+DBUS_GERROR_FILE_EXISTS,
+DBUS_GERROR_UNKNOWN_METHOD,
+DBUS_GERROR_TIMED_OUT,
+DBUS_GERROR_MATCH_RULE_NOT_FOUND,
+DBUS_GERROR_MATCH_RULE_INVALID,
+DBUS_GERROR_SPAWN_EXEC_FAILED,
+DBUS_GERROR_SPAWN_FORK_FAILED,
+DBUS_GERROR_SPAWN_CHILD_EXITED,
+DBUS_GERROR_SPAWN_CHILD_SIGNALED,
+DBUS_GERROR_SPAWN_FAILED,
+DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN,
+DBUS_GERROR_INVALID_SIGNATURE,
+DBUS_GERROR_INVALID_FILE_CONTENT,
+DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN,
+DBUS_GERROR_REMOTE_EXCEPTION
+} DBusGError;
+
+

+A GError enumeration for the domain DBUS_GERROR. The values' meanings +can be found by looking at the comments for the corresponding constants +in dbus-protocol.h. +

+
+
+
+

dbus_g_error_has_name ()

+
gboolean            dbus_g_error_has_name               (GError *error,
+                                                         const char *name);
+

+Determine whether D-BUS error name for a remote exception matches +the given name. This function is intended to be invoked on a +GError returned from an invocation of a remote method, e.g. via +dbus_g_proxy_end_call(). It will silently return FALSE for errors +which are not remote D-BUS exceptions (i.e. with a domain other +than DBUS_GERROR or a code other than +DBUS_GERROR_REMOTE_EXCEPTION). +

+
++ + + + + + + + + + + + + + +

error :

the GError given from the remote method

name :

the D-BUS error name

Returns :

 +TRUE if and only if the remote error has the given name
+
+
+
+

dbus_g_error_get_name ()

+
const char *        dbus_g_error_get_name               (GError *error);
+

+This function may only be invoked on a GError returned from an +invocation of a remote method, e.g. via dbus_g_proxy_end_call(). +Moreover, you must ensure that the error's domain is DBUS_GERROR, +and the code is DBUS_GERROR_REMOTE_EXCEPTION. +

+
++ + + + + + + + + + +

error :

the GError given from the remote method

Returns :

the D-BUS name for a remote exception.
+
+
+
+

dbus_g_error_domain_register ()

+
void                dbus_g_error_domain_register        (GQuark domain,
+                                                         const char *default_iface,
+                                                         GType code_enum);
+

+Register a GError domain and set of codes with D-Bus. When an object +raises a GError in the domain domain from one of its D-Bus methods, +the D-Bus error name used will be default_iface, followed by a dot, +followed by the GEnumValue.value_nick corresponding to the GError.code. +For D-Bus, it's conventional to use an error name (value_nick) that is +in CamelCase. +

+

+(For instance, if a D-Bus method com.example.MyObject.GetThings +can raise a GError with domain MY_ERROR and code +MY_ERROR_NOT_HAPPY, you could call +dbus_g_error_domain_register (MY_ERROR, "com.example.MyError", +MY_TYPE_ERROR), and set up the value_nick for +MY_ERROR_NOT_HAPPY to be NotHappy, +resulting in the D-Bus error string +com.example.MyError.NotHappy.) +

+

+If default_iface is NULL, the D-Bus interface of the method that failed +will be used. +

+

+(For instance, if the above example had called +dbus_g_error_domain_register (MY_ERROR, NULL, MY_TYPE_ERROR) +instead, then the D-Bus error string would be +com.example.MyObject.NotHappy.) +

+
++ + + + + + + + + + + + + + +

domain :

the GError domain

default_iface :

the prefix used for error values, or NULL +

code_enum :

a GType for a GEnum of the error codes
+
+
+
+

DBUS_GERROR

+
#define DBUS_GERROR dbus_g_error_quark ()
+
+

+Expands to a function call returning the error domain quark for DBusGError, +for use with GError. +

+
+
+
+

See Also

+GError +
+
+
+
+ Generated by GTK-Doc V1.18
+ + \ No newline at end of file diff -Nru dbus-glib-0.100.1/doc/reference/html/dbus-glib-DBusGMessage.html dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGMessage.html --- dbus-glib-0.100.1/doc/reference/html/dbus-glib-DBusGMessage.html 1970-01-01 00:00:00.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGMessage.html 2013-02-25 12:24:41.000000000 +0000 @@ -0,0 +1,155 @@ + + + + +DBusGMessage + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

DBusGMessage

+

DBusGMessage — DBus Message

+
+
+

Stability Level

+Stable, unless otherwise indicated +
+
+

Synopsis

+
+#include <dbus/dbus-glib.h>
+
+                    DBusGMessage;
+#define             DBUS_TYPE_G_MESSAGE
+DBusGMessage *      dbus_g_message_ref                  (DBusGMessage *message);
+void                dbus_g_message_unref                (DBusGMessage *message);
+DBusMessage *       dbus_g_message_get_message          (DBusGMessage *gmessage);
+
+
+
+

Description

+

+A DBusGMessage is a boxed type abstracting a DBusMessage. +

+
+
+

Details

+
+

DBusGMessage

+
typedef struct _DBusGMessage DBusGMessage;
+

+A DBusGMessage is a boxed type abstracting a DBusMessage from +libdbus. +

+
+
+
+

DBUS_TYPE_G_MESSAGE

+
#define DBUS_TYPE_G_MESSAGE      (dbus_g_message_get_g_type ())
+
+

+Expands to a function call returning the boxed GType of a DBusGConnection. +

+
++ + + + +

Returns :

the GLib type
+
+
+
+

dbus_g_message_ref ()

+
DBusGMessage *      dbus_g_message_ref                  (DBusGMessage *message);
+

+Increment refcount on a DBusGMessage +

+
++ + + + + + + + + + +

message :

the message to ref

Returns :

the message that was ref'd
+
+
+
+

dbus_g_message_unref ()

+
void                dbus_g_message_unref                (DBusGMessage *message);
+

+Decrement refcount on a DBusGMessage +

+
++ + + + +

message :

the message to unref
+
+
+
+

dbus_g_message_get_message ()

+
DBusMessage *       dbus_g_message_get_message          (DBusGMessage *gmessage);
+

+Get the DBusMessage corresponding to this DBusGMessage. +The return value does not have its refcount incremented. +

+
++ + + + + + + + + + +

gmessage :

a DBusGMessage +

Returns :

DBusMessage
+
+
+
+

See Also

+DBusMessage +
+
+
+
+ Generated by GTK-Doc V1.18
+ + \ No newline at end of file diff -Nru dbus-glib-0.100.1/doc/reference/html/dbus-glib-DBusGMethod.html dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGMethod.html --- dbus-glib-0.100.1/doc/reference/html/dbus-glib-DBusGMethod.html 1970-01-01 00:00:00.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGMethod.html 2013-02-25 12:24:41.000000000 +0000 @@ -0,0 +1,239 @@ + + + + +DBusGMethod + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

DBusGMethod

+

DBusGMethod — GMethod Info & Invocation

+
+
+

Stability Level

+Stable, unless otherwise indicated +
+
+

Synopsis

+
+#include <dbus/dbus-glib.h>
+
+struct              DBusGMethodInfo;
+                    DBusGMethodInvocation;
+gchar *             dbus_g_method_get_sender            (DBusGMethodInvocation *context);
+DBusMessage *       dbus_g_method_get_reply             (DBusGMethodInvocation *context);
+void                dbus_g_method_send_reply            (DBusGMethodInvocation *context,
+                                                         DBusMessage *reply);
+void                dbus_g_method_return                (DBusGMethodInvocation *context,
+                                                         ...);
+void                dbus_g_method_return_error          (DBusGMethodInvocation *context,
+                                                         const GError *error);
+
+
+
+

Description

+

+These types are used to call methods on GObject objects. +

+
+
+

Details

+
+

struct DBusGMethodInfo

+
struct DBusGMethodInfo {
+  GCallback                 function;    
+  GClosureMarshal           marshaller;  
+  int                       data_offset; 
+};
+
+

+Object typically generated by dbus-binding-tool that +stores a mapping from introspection data to a +function pointer for a C method to be invoked. +

+
++ + + + + + + + + + + + + + +

GCallback function;

C method to invoke

GClosureMarshal marshaller;

Marshaller to invoke method

int data_offset;

Offset into the introspection data
+
+
+
+

DBusGMethodInvocation

+
typedef struct _DBusGMethodInvocation DBusGMethodInvocation;
+

+The context of an asynchronous method call. See dbus_g_method_return() and +dbus_g_method_return_error(). +

+
+
+
+

dbus_g_method_get_sender ()

+
gchar *             dbus_g_method_get_sender            (DBusGMethodInvocation *context);
+

+Get the sender of a message so we can send a +"reply" later (i.e. send a message directly +to a service which invoked the method at a +later time). +

+
++ + + + + + + + + + +

context :

the method context

Returns :

the unique name of the sender. It +is up to the caller to free the returned string.
+
+
+
+

dbus_g_method_get_reply ()

+
DBusMessage *       dbus_g_method_get_reply             (DBusGMethodInvocation *context);
+

+Get the reply message to append reply values +Used as a sidedoor when you can't generate dbus values +of the correct type due to glib binding limitations +

+
++ + + + + + + + + + +

context :

the method context

Returns :

a DBusMessage with the reply
+
+
+
+

dbus_g_method_send_reply ()

+
void                dbus_g_method_send_reply            (DBusGMethodInvocation *context,
+                                                         DBusMessage *reply);
+

+Send a manually created reply message. +

+

+Used as a sidedoor when you can't generate dbus values +of the correct type due to glib binding limitations +

+
++ + + + + + + + + + +

context :

the method context

reply :

the reply message, will be unreffed
+
+
+
+

dbus_g_method_return ()

+
void                dbus_g_method_return                (DBusGMethodInvocation *context,
+                                                         ...);
+

+Send a return message for a given method invocation, with arguments. +This function also frees the sending context. +

+
++ + + + + + + + + + +

context :

the method context

... :

zero or more values to return from the method, with their number +and types given by its DBusGObjectInfo +
+
+
+
+

dbus_g_method_return_error ()

+
void                dbus_g_method_return_error          (DBusGMethodInvocation *context,
+                                                         const GError *error);
+

+Send a error message for a given method invocation. +This function also frees the sending context. +

+
++ + + + + + + + + + +

context :

the method context

error :

the error to send
+
+
+
+

See Also

+DBusGMessage +
+
+
+
+ Generated by GTK-Doc V1.18
+ + \ No newline at end of file diff -Nru dbus-glib-0.100.1/doc/reference/html/dbus-glib-DBusGProxy.html dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGProxy.html --- dbus-glib-0.100.1/doc/reference/html/dbus-glib-DBusGProxy.html 1970-01-01 00:00:00.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/html/dbus-glib-DBusGProxy.html 2013-02-25 12:24:41.000000000 +0000 @@ -0,0 +1,1069 @@ + + + + +DBusGProxy + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

DBusGProxy

+

DBusGProxy — DBus Proxy

+
+
+

Stability Level

+Stable, unless otherwise indicated +
+
+

Synopsis

+
+#include <dbus/dbus-glib.h>
+
+struct              DBusGProxy;
+                    DBusGProxyCall;
+void                (*DBusGProxyCallNotify)             (DBusGProxy *proxy,
+                                                         DBusGProxyCall *call_id,
+                                                         void *user_data);
+DBusGProxy *        dbus_g_proxy_new_for_name           (DBusGConnection *connection,
+                                                         const char *name,
+                                                         const char *path,
+                                                         const char *iface);
+DBusGProxy *        dbus_g_proxy_new_for_name_owner     (DBusGConnection *connection,
+                                                         const char *name,
+                                                         const char *path,
+                                                         const char *iface,
+                                                         GError **error);
+DBusGProxy *        dbus_g_proxy_new_from_proxy         (DBusGProxy *proxy,
+                                                         const char *iface,
+                                                         const char *path);
+DBusGProxy *        dbus_g_proxy_new_for_peer           (DBusGConnection *connection,
+                                                         const char *path,
+                                                         const char *iface);
+void                dbus_g_proxy_set_interface          (DBusGProxy *proxy,
+                                                         const char *interface_name);
+const char *        dbus_g_proxy_get_path               (DBusGProxy *proxy);
+const char *        dbus_g_proxy_get_bus_name           (DBusGProxy *proxy);
+const char *        dbus_g_proxy_get_interface          (DBusGProxy *proxy);
+void                dbus_g_proxy_add_signal             (DBusGProxy *proxy,
+                                                         const char *signal_name,
+                                                         GType first_type,
+                                                         ...);
+void                dbus_g_proxy_connect_signal         (DBusGProxy *proxy,
+                                                         const char *signal_name,
+                                                         GCallback handler,
+                                                         void *data,
+                                                         GClosureNotify free_data_func);
+void                dbus_g_proxy_disconnect_signal      (DBusGProxy *proxy,
+                                                         const char *signal_name,
+                                                         GCallback handler,
+                                                         void *data);
+void                dbus_g_proxy_send                   (DBusGProxy *proxy,
+                                                         DBusMessage *message,
+                                                         dbus_uint32_t *client_serial);
+gboolean            dbus_g_proxy_call                   (DBusGProxy *proxy,
+                                                         const char *method,
+                                                         GError **error,
+                                                         GType first_arg_type,
+                                                         ...);
+gboolean            dbus_g_proxy_call_with_timeout      (DBusGProxy *proxy,
+                                                         const char *method,
+                                                         int timeout,
+                                                         GError **error,
+                                                         GType first_arg_type,
+                                                         ...);
+void                dbus_g_proxy_call_no_reply          (DBusGProxy *proxy,
+                                                         const char *method,
+                                                         GType first_arg_type,
+                                                         ...);
+DBusGProxyCall *    dbus_g_proxy_begin_call             (DBusGProxy *proxy,
+                                                         const char *method,
+                                                         DBusGProxyCallNotify notify,
+                                                         gpointer user_data,
+                                                         GDestroyNotify destroy,
+                                                         GType first_arg_type,
+                                                         ...);
+DBusGProxyCall *    dbus_g_proxy_begin_call_with_timeout
+                                                        (DBusGProxy *proxy,
+                                                         const char *method,
+                                                         DBusGProxyCallNotify notify,
+                                                         gpointer user_data,
+                                                         GDestroyNotify destroy,
+                                                         int timeout,
+                                                         GType first_arg_type,
+                                                         ...);
+gboolean            dbus_g_proxy_end_call               (DBusGProxy *proxy,
+                                                         DBusGProxyCall *call,
+                                                         GError **error,
+                                                         GType first_arg_type,
+                                                         ...);
+void                dbus_g_proxy_cancel_call            (DBusGProxy *proxy,
+                                                         DBusGProxyCall *call);
+void                dbus_g_proxy_set_default_timeout    (DBusGProxy *proxy,
+                                                         int timeout);
+
+
+
+

Description

+

+A DBusGProxy is a GObject representing a remote object in a D-Bus +service. +

+
+
+

Details

+
+

struct DBusGProxy

+
struct DBusGProxy {
+};
+
+

+A GObject representing a remote object in a D-Bus service. +

+
+
+
+

DBusGProxyCall

+
typedef struct _DBusGProxyCall DBusGProxyCall;
+

+An opaque pointer representing an asynchronous call in progress. +

+
+
+
+

DBusGProxyCallNotify ()

+
void                (*DBusGProxyCallNotify)             (DBusGProxy *proxy,
+                                                         DBusGProxyCall *call_id,
+                                                         void *user_data);
+

+Called when a reply to the call represented by call_id arrives. +Use dbus_g_proxy_end_call() to see whether call_id succeeded or +failed, and get the arguments returned (if any) on success. +

+
++ + + + + + + + + + + + + + +

proxy :

the proxy on which the method was called

call_id :

the call in progress

user_data :

data passed to dbus_g_proxy_begin_call() or similar
+
+
+
+

dbus_g_proxy_new_for_name ()

+
DBusGProxy *        dbus_g_proxy_new_for_name           (DBusGConnection *connection,
+                                                         const char *name,
+                                                         const char *path,
+                                                         const char *iface);
+

+Creates a new proxy for a remote interface exported by a connection +on a message bus. Method calls and signal connections over this +proxy will go to the name owner; the name's owner is expected to +support the given interface name. THE NAME OWNER MAY CHANGE OVER +TIME, for example between two different method calls, unless the +name is a unique name. If you need a fixed owner, you need to +request the current owner and bind a proxy to its unique name +rather than to the generic name; see +dbus_g_proxy_new_for_name_owner(). +

+

+A name-associated proxy only makes sense with a message bus, not +for app-to-app direct dbus connections. +

+

+This proxy will only emit the "destroy" signal if the +DBusConnection is disconnected, the proxy has no remaining +references, or the name is a unique name and its owner +disappears. If a well-known name changes owner, the proxy will +still be alive. +

+
++ + + + + + + + + + + + + + + + + + + + + + +

connection :

the connection to the remote bus

name :

any name on the message bus

path :

name of the object instance to call methods on

iface :

name of the interface to call methods on

Returns :

new proxy object
+
+
+
+

dbus_g_proxy_new_for_name_owner ()

+
DBusGProxy *        dbus_g_proxy_new_for_name_owner     (DBusGConnection *connection,
+                                                         const char *name,
+                                                         const char *path,
+                                                         const char *iface,
+                                                         GError **error);
+

+Similar to dbus_g_proxy_new_for_name(), but makes a round-trip +request to the message bus to get the current name owner, then +binds the proxy to the unique name of the current owner, rather +than to the well-known name. As a result, the name owner will +not change over time, and the proxy will emit the "destroy" signal +when the owner disappears from the message bus. +

+

+An example of the difference between dbus_g_proxy_new_for_name() +and dbus_g_proxy_new_for_name_owner(): if you provide the well-known name +"org.freedesktop.Database" dbus_g_proxy_new_for_name() remains bound +to that name as it changes owner. dbus_g_proxy_new_for_name_owner() +will fail if the name has no owner. If the name has an owner, +dbus_g_proxy_new_for_name_owner() will bind to the unique name +of that owner rather than the generic name. +

+
++ + + + + + + + + + + + + + + + + + + + + + + + + + +

connection :

the connection to the remote bus

name :

any name on the message bus

path :

name of the object inside the service to call methods on

iface :

name of the interface to call methods on

error :

return location for an error

Returns :

new proxy object, or NULL on error
+
+
+
+

dbus_g_proxy_new_from_proxy ()

+
DBusGProxy *        dbus_g_proxy_new_from_proxy         (DBusGProxy *proxy,
+                                                         const char *iface,
+                                                         const char *path);
+

+Creates a proxy using an existing proxy as a template, substituting +the specified interface and path. Either or both may be NULL. +

+
++ + + + + + + + + + + + + + + + + + +

proxy :

the proxy to use as a template

iface :

name of the interface to call methods on

path :

of the object inside the peer to call methods on

Returns :

new proxy object
+
+
+
+

dbus_g_proxy_new_for_peer ()

+
DBusGProxy *        dbus_g_proxy_new_for_peer           (DBusGConnection *connection,
+                                                         const char *path,
+                                                         const char *iface);
+

+Creates a proxy for an object in peer application (one +we're directly connected to). That is, this function is +intended for use when there's no message bus involved, +we're doing a simple 1-to-1 communication between two +applications. +

+
++ + + + + + + + + + + + + + + + + + +

connection :

the connection to the peer

path :

name of the object inside the peer to call methods on

iface :

name of the interface to call methods on

Returns :

new proxy object
+
+
+
+

dbus_g_proxy_set_interface ()

+
void                dbus_g_proxy_set_interface          (DBusGProxy *proxy,
+                                                         const char *interface_name);
+

+Sets the object interface proxy is bound to +

+

+It is an error to call this method on a proxy that has emitted +the "destroy" signal. +

+
++ + + + + + + + + + +

proxy :

the proxy

interface_name :

an object interface
+
+
+
+

dbus_g_proxy_get_path ()

+
const char *        dbus_g_proxy_get_path               (DBusGProxy *proxy);
+

+Gets the path this proxy is bound to +

+

+It is an error to call this method on a proxy that has emitted +the "destroy" signal. +

+
++ + + + + + + + + + +

proxy :

the proxy

Returns :

an object path
+
+
+
+

dbus_g_proxy_get_bus_name ()

+
const char *        dbus_g_proxy_get_bus_name           (DBusGProxy *proxy);
+

+Gets the bus name a proxy is bound to (may be NULL in some cases). +If you created the proxy with dbus_g_proxy_new_for_name(), then +the name you passed to that will be returned. +If you created it with dbus_g_proxy_new_for_name_owner(), then the +unique connection name will be returned. If you created it +with dbus_g_proxy_new_for_peer() then NULL will be returned. +

+

+It is an error to call this method on a proxy that has emitted +the "destroy" signal. +

+
++ + + + + + + + + + +

proxy :

the proxy

Returns :

the bus name the proxy sends messages to
+
+
+
+

dbus_g_proxy_get_interface ()

+
const char *        dbus_g_proxy_get_interface          (DBusGProxy *proxy);
+

+Gets the object interface proxy is bound to (may be NULL in some cases). +

+

+It is an error to call this method on a proxy that has emitted +the "destroy" signal. +

+
++ + + + + + + + + + +

proxy :

the proxy

Returns :

an object interface
+
+
+
+

dbus_g_proxy_add_signal ()

+
void                dbus_g_proxy_add_signal             (DBusGProxy *proxy,
+                                                         const char *signal_name,
+                                                         GType first_type,
+                                                         ...);
+

+Specifies the argument signature of a D-Bus signal. When the signal is +emitted by the remote object, if the GTypes corresponding to its arguments' +types do not match the types given here, the signal will be ignored. +

+

+It is an error to add the same signal_name to the same proxy more than +once, even if the argument types given are the same. +

+

+It is also an error to call this method on a proxy that has emitted +the "destroy" signal. +

+
++ + + + + + + + + + + + + + + + + + +

proxy :

the proxy for a remote interface

signal_name :

the name of the signal

first_type :

the first argument type, or G_TYPE_INVALID if none

... :

any subsequent argument types, followed by G_TYPE_INVALID +
+
+
+
+

dbus_g_proxy_connect_signal ()

+
void                dbus_g_proxy_connect_signal         (DBusGProxy *proxy,
+                                                         const char *signal_name,
+                                                         GCallback handler,
+                                                         void *data,
+                                                         GClosureNotify free_data_func);
+

+Connect a signal handler to a proxy for a remote interface. When +the remote interface emits the specified signal, the proxy will +emit a corresponding GLib signal. +

+

+It is an error to call this method on a proxy that has emitted +the "destroy" signal. +

+
++ + + + + + + + + + + + + + + + + + + + + + +

proxy :

a proxy for a remote interface

signal_name :

the DBus signal name to listen for

handler :

the handler to connect

data :

data to pass to handler

free_data_func :

callback function to destroy data
+
+
+
+

dbus_g_proxy_disconnect_signal ()

+
void                dbus_g_proxy_disconnect_signal      (DBusGProxy *proxy,
+                                                         const char *signal_name,
+                                                         GCallback handler,
+                                                         void *data);
+

+Disconnect all signal handlers from a proxy that match the given +criteria. +

+

+It is an error to call this method on a proxy that has emitted +the "destroy" signal. +

+
++ + + + + + + + + + + + + + + + + + +

proxy :

a proxy for a remote interface

signal_name :

the DBus signal name to disconnect

handler :

the handler to disconnect

data :

the data that was registered with handler
+
+
+
+

dbus_g_proxy_send ()

+
void                dbus_g_proxy_send                   (DBusGProxy *proxy,
+                                                         DBusMessage *message,
+                                                         dbus_uint32_t *client_serial);
+

+Sends a message to the interface we're proxying for. Does not +block or wait for a reply. The message is only actually written out +when you return to the main loop or block in +dbus_g_connection_flush(). +

+

+The message is modified to be addressed to the target interface. +That is, a destination name field or whatever is needed will be +added to the message. The basic point of this function is to add +the necessary header fields, otherwise it's equivalent to +dbus_connection_send(). +

+

+This function adds a reference to the message, so the caller +still owns its original reference. +

+

+It is an error to call this method on a proxy that has emitted +the "destroy" signal. +

+
++ + + + + + + + + + + + + + +

proxy :

a proxy for a remote interface

message :

the message to address and send

client_serial :

return location for message's serial, or NULL +
+
+
+
+

dbus_g_proxy_call ()

+
gboolean            dbus_g_proxy_call                   (DBusGProxy *proxy,
+                                                         const char *method,
+                                                         GError **error,
+                                                         GType first_arg_type,
+                                                         ...);
+

+Function for synchronously invoking a method and receiving reply +values. This function is equivalent to dbus_g_proxy_begin_call +followed by dbus_g_proxy_end_call. All of the input arguments are +specified first, followed by G_TYPE_INVALID, followed by all of the +output values, followed by a second G_TYPE_INVALID. Note that +this means you must always specify G_TYPE_INVALID twice. +

+

+It is an error to call this method on a proxy that has emitted +the "destroy" signal. +

+
++ + + + + + + + + + + + + + + + + + + + + + + + + + +

proxy :

a proxy for a remote interface

method :

method to invoke

error :

return location for an error

first_arg_type :

type of first "in" argument, or G_TYPE_INVALID if none

... :

value of first "in" argument, any further type/value pairs, +G_TYPE_INVALID, type/location pairs for "out" arguments, +and G_TYPE_INVALID again

Returns :

 +TRUE if the method succeeds, FALSE if it fails
+
+
+
+

dbus_g_proxy_call_with_timeout ()

+
gboolean            dbus_g_proxy_call_with_timeout      (DBusGProxy *proxy,
+                                                         const char *method,
+                                                         int timeout,
+                                                         GError **error,
+                                                         GType first_arg_type,
+                                                         ...);
+

+Function for synchronously invoking a method and receiving reply +values. This function is equivalent to dbus_g_proxy_begin_call +followed by dbus_g_proxy_end_call. All of the input arguments are +specified first, followed by G_TYPE_INVALID, followed by all of the +output values, followed by a second G_TYPE_INVALID. Note that +this means you must always specify G_TYPE_INVALID twice. +

+

+It is an error to call this method on a proxy that has emitted +the "destroy" signal. +

+
++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

proxy :

a proxy for a remote interface

method :

method to invoke

timeout :

the timeout in milliseconds, or -1 to use a default

error :

return location for an error

first_arg_type :

type of first "in" argument

... :

as for dbus_g_proxy_call() +

Returns :

 +TRUE if the method succeeds, FALSE if it fails
+
+
+
+

dbus_g_proxy_call_no_reply ()

+
void                dbus_g_proxy_call_no_reply          (DBusGProxy *proxy,
+                                                         const char *method,
+                                                         GType first_arg_type,
+                                                         ...);
+

+Sends a method call message as with dbus_g_proxy_begin_call(), but +does not ask for a reply or allow you to receive one. +

+

+It is an error to call this method on a proxy that has emitted +the "destroy" signal. +

+

+TODO: this particular function shouldn't die on out of memory, +since you should be able to do a call with large arguments. +

+
++ + + + + + + + + + + + + + + + + + +

proxy :

a proxy for a remote interface

method :

the name of the method to invoke

first_arg_type :

type of the first argument, or G_TYPE_INVALID to call +the method without arguments

... :

the first argument and any remaining type/argument pairs, followed by +G_TYPE_INVALID to terminate the list
+
+
+
+

dbus_g_proxy_begin_call ()

+
DBusGProxyCall *    dbus_g_proxy_begin_call             (DBusGProxy *proxy,
+                                                         const char *method,
+                                                         DBusGProxyCallNotify notify,
+                                                         gpointer user_data,
+                                                         GDestroyNotify destroy,
+                                                         GType first_arg_type,
+                                                         ...);
+

+Asynchronously invokes a method on a remote interface. The method +call will not be sent over the wire until the application returns +to the main loop, or blocks in dbus_g_connection_flush() to write out +pending data. The call will be completed after a timeout, or when +a reply is received. When the call returns, the callback specified +will be invoked; you can then collect the results of the call +(which may be an error, or a reply), use dbus_g_proxy_end_call(). +

+

+It is an error to call this method on a proxy that has emitted +the "destroy" signal. +

+

+TODO this particular function shouldn't die on out of memory, +since you should be able to do a call with large arguments. +

+
++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

proxy :

a proxy for a remote interface

method :

the name of the method to invoke

notify :

callback to be invoked when method returns

user_data :

user data passed to callback

destroy :

function called to destroy user_data

first_arg_type :

type of the first argument, or G_TYPE_INVALID if there +are no arguments

... :

first argument, followed by any further type/value pairs, followed +by G_TYPE_INVALID +

Returns :

call identifier.
+
+
+
+

dbus_g_proxy_begin_call_with_timeout ()

+
DBusGProxyCall *    dbus_g_proxy_begin_call_with_timeout
+                                                        (DBusGProxy *proxy,
+                                                         const char *method,
+                                                         DBusGProxyCallNotify notify,
+                                                         gpointer user_data,
+                                                         GDestroyNotify destroy,
+                                                         int timeout,
+                                                         GType first_arg_type,
+                                                         ...);
+

+Asynchronously invokes a method on a remote interface. The method +call will not be sent over the wire until the application returns +to the main loop, or blocks in dbus_g_connection_flush() to write out +pending data. The call will be completed after a timeout, or when +a reply is received. When the call returns, the callback specified +will be invoked; you can then collect the results of the call +(which may be an error, or a reply), use dbus_g_proxy_end_call(). +

+

+It is an error to call this method on a proxy that has emitted +the "destroy" signal. +

+

+TODO this particular function shouldn't die on out of memory, +since you should be able to do a call with large arguments. +

+
++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

proxy :

a proxy for a remote interface

method :

the name of the method to invoke

notify :

callback to be invoked when method returns

user_data :

user data passed to callback

destroy :

function called to destroy user_data

timeout :

the timeout in milliseconds, or -1 to use a default

first_arg_type :

type of the first argument, or G_TYPE_INVALID if there +are no arguments

... :

first argument, followed by any further type/value pairs, followed +by G_TYPE_INVALID +

Returns :

call identifier.
+
+
+
+

dbus_g_proxy_end_call ()

+
gboolean            dbus_g_proxy_end_call               (DBusGProxy *proxy,
+                                                         DBusGProxyCall *call,
+                                                         GError **error,
+                                                         GType first_arg_type,
+                                                         ...);
+

+Collects the results of a method call. The method call was normally +initiated with dbus_g_proxy_end_call(). You may use this function +outside of the callback given to dbus_g_proxy_begin_call; in that +case this function will block if the results haven't yet been +received. +

+

+All D-Bus method calls can fail with a remote error. If this occurs, +the error will be set and this function will return FALSE. +

+

+Otherwise, the "out" parameters and return value of the +method are stored in the provided varargs list. +The list should be terminated with G_TYPE_INVALID. +

+
++ + + + + + + + + + + + + + + + + + + + + + + + + + +

proxy :

a proxy for a remote interface

call :

the pending call ID from dbus_g_proxy_begin_call() +

error :

return location for an error

first_arg_type :

type of first "out" argument, or G_TYPE_INVALID if +there are no "out" arguments

... :

return location for first "out" argument, followed by any further +type/location pairs, followed by G_TYPE_INVALID +

Returns :

 +TRUE on success
+
+
+
+

dbus_g_proxy_cancel_call ()

+
void                dbus_g_proxy_cancel_call            (DBusGProxy *proxy,
+                                                         DBusGProxyCall *call);
+

+Cancels a pending method call. The method call was normally +initiated with dbus_g_proxy_begin_call(). This function +may not be used on pending calls that have already been +ended with dbus_g_proxy_end_call. +

+

+It is an error to call this method on a proxy that has emitted +the "destroy" signal. +

+
++ + + + + + + + + + +

proxy :

a proxy for a remote interface

call :

the pending call ID from dbus_g_proxy_begin_call() +
+
+
+
+

dbus_g_proxy_set_default_timeout ()

+
void                dbus_g_proxy_set_default_timeout    (DBusGProxy *proxy,
+                                                         int timeout);
+

+Sets the default timeout to use for a proxy. This timeout will be +used in calls where the timeout is not specified, or is specified to be -1. +If this timeout is also set to -1, libdbus will use a reasonable default +value. +

+

+This is useful for long-running operations that takes longer than +the default timeout (which is a on the order of magnitude of tens +of seconds). For some applications, consider using a pattern where +the method returns once the operation is underway +(e.g. immediately) and emits a signal when the operation terminates +(though beware of leaking information with/in the signal return value). +

+

+It is an error to call this method on a proxy that has emitted +the "destroy" signal. +

+
++ + + + + + + + + + +

proxy :

a proxy for a remote interface

timeout :

the timeout in milliseconds, or -1 to reset to the libdbus default
+

Since 0.75

+
+
+
+

See Also

+DBusGProxy +
+
+
+
+ Generated by GTK-Doc V1.18
+ + \ No newline at end of file diff -Nru dbus-glib-0.100.1/doc/reference/html/dbus-glib-Specializable-GType-System.html dbus-glib-0.100.2/doc/reference/html/dbus-glib-Specializable-GType-System.html --- dbus-glib-0.100.1/doc/reference/html/dbus-glib-Specializable-GType-System.html 1970-01-01 00:00:00.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/html/dbus-glib-Specializable-GType-System.html 2013-02-25 12:24:41.000000000 +0000 @@ -0,0 +1,1900 @@ + + + + +Specializable GType System + + + + + + + + + + + + + + + + + + + +
+
+
+ + +
+

Specializable GType System

+

Specializable GType System — Specialized GTypes

+
+
+

Stability Level

+Unstable, unless otherwise indicated +
+
+

Synopsis

+
+#include <dbus/dbus-glib.h>
+
+void                (*DBusGTypeSpecializedCollectionIterator)
+                                                        (const GValue *value,
+                                                         gpointer user_data);
+void                (*DBusGTypeSpecializedMapIterator)  (const GValue *key_val,
+                                                         const GValue *value_val,
+                                                         gpointer user_data);
+                    DBusGTypeSpecializedAppendContext;
+gpointer            (*DBusGTypeSpecializedConstructor)  (GType type);
+void                (*DBusGTypeSpecializedFreeFunc)     (GType type,
+                                                         gpointer val);
+gpointer            (*DBusGTypeSpecializedCopyFunc)     (GType type,
+                                                         gpointer src);
+                    DBusGTypeSpecializedVtable;
+gboolean            (*DBusGTypeSpecializedCollectionFixedAccessorFunc)
+                                                        (GType type,
+                                                         gpointer instance,
+                                                         gpointer *values,
+                                                         guint *len);
+void                (*DBusGTypeSpecializedCollectionIteratorFunc)
+                                                        (GType type,
+                                                         gpointer instance,
+                                                         DBusGTypeSpecializedCollectionIterator iterator,
+                                                         gpointer user_data);
+void                (*DBusGTypeSpecializedCollectionAppendFunc)
+                                                        (DBusGTypeSpecializedAppendContext *ctx,
+                                                         GValue *val);
+void                (*DBusGTypeSpecializedCollectionEndAppendFunc)
+                                                        (DBusGTypeSpecializedAppendContext *ctx);
+                    DBusGTypeSpecializedCollectionVtable;
+void                (*DBusGTypeSpecializedMapIteratorFunc)
+                                                        (GType type,
+                                                         gpointer instance,
+                                                         DBusGTypeSpecializedMapIterator iterator,
+                                                         gpointer user_data);
+void                (*DBusGTypeSpecializedMapAppendFunc)
+                                                        (DBusGTypeSpecializedAppendContext *ctx,
+                                                         GValue *key,
+                                                         GValue *val);
+                    DBusGTypeSpecializedMapVtable;
+gboolean            (*DBusGTypeSpecializedStructGetMember)
+                                                        (GType type,
+                                                         gpointer instance,
+                                                         guint member,
+                                                         GValue *ret_value);
+gboolean            (*DBusGTypeSpecializedStructSetMember)
+                                                        (GType type,
+                                                         gpointer instance,
+                                                         guint member,
+                                                         const GValue *new_value);
+                    DBusGTypeSpecializedStructVtable;
+GType               dbus_g_type_get_collection          (const char *container,
+                                                         GType specialization);
+GType               dbus_g_type_get_map                 (const char *container,
+                                                         GType key_specialization,
+                                                         GType value_specialization);
+GType               dbus_g_type_get_structv             (const char *container,
+                                                         guint num_members,
+                                                         GType *types);
+GType               dbus_g_type_get_struct              (const char *container,
+                                                         GType first_type,
+                                                         ...);
+gboolean            dbus_g_type_is_collection           (GType gtype);
+gboolean            dbus_g_type_is_map                  (GType gtype);
+gboolean            dbus_g_type_is_struct               (GType gtype);
+GType               dbus_g_type_get_collection_specialization
+                                                        (GType gtype);
+GType               dbus_g_type_get_map_key_specialization
+                                                        (GType gtype);
+GType               dbus_g_type_get_map_value_specialization
+                                                        (GType gtype);
+GType               dbus_g_type_get_struct_member_type  (GType gtype,
+                                                         guint member);
+guint               dbus_g_type_get_struct_size         (GType gtype);
+gpointer            dbus_g_type_specialized_construct   (GType gtype);
+void                dbus_g_type_specialized_init_append (GValue *value,
+                                                         DBusGTypeSpecializedAppendContext *ctx);
+void                dbus_g_type_specialized_collection_append
+                                                        (DBusGTypeSpecializedAppendContext *ctx,
+                                                         GValue *elt);
+void                dbus_g_type_specialized_collection_end_append
+                                                        (DBusGTypeSpecializedAppendContext *ctx);
+void                dbus_g_type_specialized_map_append  (DBusGTypeSpecializedAppendContext *ctx,
+                                                         GValue *key,
+                                                         GValue *val);
+gboolean            dbus_g_type_collection_get_fixed    (GValue *value,
+                                                         gpointer *data_ret,
+                                                         guint *len_ret);
+void                dbus_g_type_collection_value_iterate
+                                                        (const GValue *value,
+                                                         DBusGTypeSpecializedCollectionIterator iterator,
+                                                         gpointer user_data);
+void                dbus_g_type_map_value_iterate       (const GValue *value,
+                                                         DBusGTypeSpecializedMapIterator iterator,
+                                                         gpointer user_data);
+gboolean            dbus_g_type_struct_get_member       (const GValue *value,
+                                                         guint member,
+                                                         GValue *dest);
+gboolean            dbus_g_type_struct_set_member       (GValue *value,
+                                                         guint member,
+                                                         const GValue *src);
+gboolean            dbus_g_type_struct_get              (const GValue *value,
+                                                         guint member,
+                                                         ...);
+gboolean            dbus_g_type_struct_set              (GValue *value,
+                                                         guint member,
+                                                         ...);
+void                dbus_g_type_specialized_init        (void);
+void                dbus_g_type_register_collection     (const char *name,
+                                                         const DBusGTypeSpecializedCollectionVtable *vtable,
+                                                         guint flags);
+void                dbus_g_type_register_map            (const char *name,
+                                                         const DBusGTypeSpecializedMapVtable *vtable,
+                                                         guint flags);
+const DBusGTypeSpecializedMapVtable * dbus_g_type_map_peek_vtable
+                                                        (GType map_type);
+const DBusGTypeSpecializedCollectionVtable * dbus_g_type_collection_peek_vtable
+                                                        (GType collection_type);
+const DBusGTypeSpecializedStructVtable * dbus_g_type_struct_peek_vtable
+                                                        (GType struct_type);
+void                dbus_g_type_register_struct         (const char *name,
+                                                         const DBusGTypeSpecializedStructVtable *vtable,
+                                                         guint flags);
+GVariant *          dbus_g_value_build_g_variant        (const GValue *value);
+void                dbus_g_value_parse_g_variant        (GVariant *variant,
+                                                         GValue *value);
+#define             DBUS_TYPE_G_BOOLEAN_ARRAY
+#define             DBUS_TYPE_G_UCHAR_ARRAY
+#define             DBUS_TYPE_G_UINT_ARRAY
+#define             DBUS_TYPE_G_INT_ARRAY
+#define             DBUS_TYPE_G_UINT64_ARRAY
+#define             DBUS_TYPE_G_INT64_ARRAY
+#define             DBUS_TYPE_G_OBJECT_ARRAY
+#define             DBUS_TYPE_G_STRING_STRING_HASHTABLE
+typedef             DBusGSignature;
+#define             DBUS_TYPE_G_SIGNATURE
+typedef             DBusGObjectPath;
+#define             DBUS_TYPE_G_OBJECT_PATH
+
+
+
+

Description

+

+Specialized gtypes are basically a way to allow the definition of +recursive GTypes. It allows the definition of 'containers' which is +basically a user defined structure capable of holding other data, and a +set of functions defining how to access that structure. Containers come in +3 flavors: collections, maps and structs. +

+

+A collection is a container that holds an ordered set of items, all +of which must be the same type. (This is an array +in standard D-Bus terminology.) dbus-glib specialized collections can be +GArray (for numeric elements), GPtrArray (for string, object or +boxed elements), GSList (for boxed elements, not recommended), or a +user-defined type. +

+

+A map is a container that holds a set of key/value pairs. +The keys have one type, and the values another; the type of the keys +must be a numeric or string-like type. (This is a dict +(dictionary) or array of dict entry in standard D-Bus +terminology.) dbus-glib specialized maps can be GHashTable or a +user-defined type. +

+

+A struct is a container that holds a fixed number of members, each member +having a predefined type. (This is a struct in +standard D-Bus terminology.) It is analogous to the C struct keyword, but +dbus-glib does not generally represent D-Bus structs in C structs. +dbus-glib specialized structs can be GValueArray or a user-defined type. +

+

+A specialization is a GType detailing a particular container with +particular types (a type specialization). +

+

+Functions are provided for constructing and manipulating specializations. +

+

+This documentation needs splitting into two pages, one for defining new +containers and using existing containers. I expect most users to only do +the latter. I also need to add some examples. +

+
+
+

Details

+
+

DBusGTypeSpecializedCollectionIterator ()

+
void                (*DBusGTypeSpecializedCollectionIterator)
+                                                        (const GValue *value,
+                                                         gpointer user_data);
+

+A library-user-supplied function, called for each element in the +collection when dbus_g_type_collection_value_iterate() is called. +

+
++ + + + + + + + + + +

value :

an element of the collection

user_data :

the data supplied when calling +dbus_g_type_collection_value_iterate() +
+
+
+
+

DBusGTypeSpecializedMapIterator ()

+
void                (*DBusGTypeSpecializedMapIterator)  (const GValue *key_val,
+                                                         const GValue *value_val,
+                                                         gpointer user_data);
+

+A library-user-supplied function, called for each key/value pair in the +collection when dbus_g_type_map_value_iterate() is called. +

+
++ + + + + + + + + + + + + + +

key_val :

a key from the map

value_val :

a value from the map

user_data :

the data supplied when calling +dbus_g_type_map_value_iterate() +
+
+
+
+

DBusGTypeSpecializedAppendContext

+
typedef struct {
+  /* public */
+  GValue *val;
+  GType specialization_type;
+} DBusGTypeSpecializedAppendContext;
+
+

+A context for appending. There are more fields, which are private. +

+
++ + + + + + + + + + +

GValue *val;

the GValue containing the array to which you're appending

GType specialization_type;

the GType of the array's elements
+
+
+
+

DBusGTypeSpecializedConstructor ()

+
gpointer            (*DBusGTypeSpecializedConstructor)  (GType type);
+

+ +

+
++ + + + + + + + + + +

type :

a specialized boxed type

Returns :

a new instance of type +
+
+
+
+

DBusGTypeSpecializedFreeFunc ()

+
void                (*DBusGTypeSpecializedFreeFunc)     (GType type,
+                                                         gpointer val);
+

+Frees val according to type. This is analogous to GBoxedFreeFunc, but +can use information from type (for instance to free the contents of a +container before freeing the actual container). +

+
++ + + + + + + + + + +

type :

a specialized boxed type

val :

an instance of type +
+
+
+
+

DBusGTypeSpecializedCopyFunc ()

+
gpointer            (*DBusGTypeSpecializedCopyFunc)     (GType type,
+                                                         gpointer src);
+

+Copies src according to type. This is analogous to GBoxedCopyFunc, but +can use information from type (for instance to copy each element of a +collection). +

+
++ + + + + + + + + + + + + + +

type :

a specialized boxed type

src :

an instance of type +

Returns :

a deep copy of src +
+
+
+
+

DBusGTypeSpecializedVtable

+
typedef struct {
+  DBusGTypeSpecializedConstructor    constructor;
+  DBusGTypeSpecializedFreeFunc       free_func;
+  DBusGTypeSpecializedCopyFunc       copy_func;
+  GDestroyNotify                     simple_free_func; /* for type-independent freeing if possible */
+} DBusGTypeSpecializedVtable;
+
+

+A table of methods used to implement specialized container behaviour on +user-defined collections, maps and structs. Exactly one of free_func and +simple_free_func must be implemented; the other must be NULL. +constructor and copy_func must always be implemented. +

+

+There are additional members, which are reserved for future expansion and +must be NULL. +

+
++ + + + + + + + + + + + + + + + + + +

DBusGTypeSpecializedConstructor constructor;

returns a new, blank instance of the type +

DBusGTypeSpecializedFreeFunc free_func;

if not NULL, frees the type instance val +

DBusGTypeSpecializedCopyFunc copy_func;

returns a "deep copy" of the type instance val +

GDestroyNotify simple_free_func;

if not NULL, frees its argument
+
+
+
+

DBusGTypeSpecializedCollectionFixedAccessorFunc ()

+
gboolean            (*DBusGTypeSpecializedCollectionFixedAccessorFunc)
+                                                        (GType type,
+                                                         gpointer instance,
+                                                         gpointer *values,
+                                                         guint *len);
+

+Implements dbus_g_type_collection_get_fixed() for a GValue with type +type, containing instance. +

+
++ + + + + + + + + + + + + + + + + + + + + + +

type :

a specialized collection boxed type

instance :

an instance of type +

values :

used to return a pointer to the contents of instance +

len :

used to return the number of elements in instance +

Returns :

 +TRUE on success
+
+
+
+

DBusGTypeSpecializedCollectionIteratorFunc ()

+
void                (*DBusGTypeSpecializedCollectionIteratorFunc)
+                                                        (GType type,
+                                                         gpointer instance,
+                                                         DBusGTypeSpecializedCollectionIterator iterator,
+                                                         gpointer user_data);
+

+Implements dbus_g_type_collection_value_iterate() for a GValue with +type type, containing instance. +

+
++ + + + + + + + + + + + + + + + + + +

type :

a specialized collection boxed type

instance :

an instance of type +

iterator :

the function to call for each element

user_data :

data to pass to iterator +
+
+
+
+

DBusGTypeSpecializedCollectionAppendFunc ()

+
void                (*DBusGTypeSpecializedCollectionAppendFunc)
+                                                        (DBusGTypeSpecializedAppendContext *ctx,
+                                                         GValue *val);
+

+Implements dbus_g_type_specialized_collection_append(). +

+

+This function should use the val and specialization_type members of ctx. +

+
++ + + + + + + + + + +

ctx :

an appending context returned by dbus_g_type_specialized_init_append() +

val :

a value to copy into the collection
+
+
+
+

DBusGTypeSpecializedCollectionEndAppendFunc ()

+
void                (*DBusGTypeSpecializedCollectionEndAppendFunc)
+                                                        (DBusGTypeSpecializedAppendContext *ctx);
+

+Implements dbus_g_type_specialized_collection_end_append(). +

+

+This function should use the val and specialization_type members of ctx. +

+
++ + + + +

ctx :

an appending context returned by dbus_g_type_specialized_init_append() +
+
+
+
+

DBusGTypeSpecializedCollectionVtable

+
typedef struct {
+  DBusGTypeSpecializedVtable                        base_vtable;
+  DBusGTypeSpecializedCollectionFixedAccessorFunc   fixed_accessor;
+  DBusGTypeSpecializedCollectionIteratorFunc        iterator;
+  DBusGTypeSpecializedCollectionAppendFunc          append_func;
+  DBusGTypeSpecializedCollectionEndAppendFunc       end_append_func;
+} DBusGTypeSpecializedCollectionVtable;
+
+

+A table of methods used to implement specialized collection behaviour +on user-defined types. At least iterator and append_func must be +implemented. +

+
++ + + + + + + + + + + + + + + + + + + + + + +

DBusGTypeSpecializedVtable base_vtable;

base methods shared between collections and other types

DBusGTypeSpecializedCollectionFixedAccessorFunc fixed_accessor;

if not NULL, provides access to the contents of this +collection, as documented for dbus_g_type_collection_get_fixed() +

DBusGTypeSpecializedCollectionIteratorFunc iterator;

iterates through the members of instance +

DBusGTypeSpecializedCollectionAppendFunc append_func;

appends a new member to instance +

DBusGTypeSpecializedCollectionEndAppendFunc end_append_func;

if not NULL, called after each group of calls to +the append_func +
+
+
+
+

DBusGTypeSpecializedMapIteratorFunc ()

+
void                (*DBusGTypeSpecializedMapIteratorFunc)
+                                                        (GType type,
+                                                         gpointer instance,
+                                                         DBusGTypeSpecializedMapIterator iterator,
+                                                         gpointer user_data);
+

+Implements dbus_g_type_map_value_iterate() for a GValue with +type type, containing instance. +

+
++ + + + + + + + + + + + + + + + + + +

type :

a specialized map boxed type

instance :

an instance of type +

iterator :

the function to call for each key/value pair

user_data :

data to pass to iterator +
+
+
+
+

DBusGTypeSpecializedMapAppendFunc ()

+
void                (*DBusGTypeSpecializedMapAppendFunc)
+                                                        (DBusGTypeSpecializedAppendContext *ctx,
+                                                         GValue *key,
+                                                         GValue *val);
+

+Implements dbus_g_type_specialized_map_append(). +

+

+This function should use the val and specialization_type members of ctx, +and replace any existing value with key equal to key. +

+
++ + + + + + + + + + + + + + +

ctx :

an appending context returned by dbus_g_type_specialized_init_append() +

key :

a key to add to the collection

val :

a value to add to the collection
+
+
+
+

DBusGTypeSpecializedMapVtable

+
typedef struct {
+  DBusGTypeSpecializedVtable                        base_vtable;
+  DBusGTypeSpecializedMapIteratorFunc               iterator;
+  DBusGTypeSpecializedMapAppendFunc                 append_func;
+} DBusGTypeSpecializedMapVtable;
+
+

+A table of methods used to implement specialized collection behaviour +on user-defined types. Both methods must be implemented. +

+
++ + + + + + + + + + + + + + +

DBusGTypeSpecializedVtable base_vtable;

base methods shared between maps and other types

DBusGTypeSpecializedMapIteratorFunc iterator;

iterates through the members of instance +

DBusGTypeSpecializedMapAppendFunc append_func;

adds a new key/value pair to instance +
+
+
+
+

DBusGTypeSpecializedStructGetMember ()

+
gboolean            (*DBusGTypeSpecializedStructGetMember)
+                                                        (GType type,
+                                                         gpointer instance,
+                                                         guint member,
+                                                         GValue *ret_value);
+

+Implements dbus_g_type_struct_get_member() for a GValue with type type, +containing instance. +

+
++ + + + + + + + + + + + + + + + + + + + + + +

type :

a specialized struct boxed type

instance :

an instance of type +

member :

the index of the member, starting from 0

ret_value :

an initialized GValue of the appropriate type for the given +member of type +

Returns :

 +TRUE on success
+
+
+
+

DBusGTypeSpecializedStructSetMember ()

+
gboolean            (*DBusGTypeSpecializedStructSetMember)
+                                                        (GType type,
+                                                         gpointer instance,
+                                                         guint member,
+                                                         const GValue *new_value);
+

+Implements dbus_g_type_struct_set_member() for a GValue with type type, +containing instance. +

+
++ + + + + + + + + + + + + + + + + + + + + + +

type :

a specialized struct boxed type

instance :

an instance of type +

member :

the index of the member, starting from 0

new_value :

an initialized GValue of the appropriate type for the given +member of type +

Returns :

 +TRUE on success
+
+
+
+

DBusGTypeSpecializedStructVtable

+
typedef struct {
+  DBusGTypeSpecializedVtable                        base_vtable;
+  DBusGTypeSpecializedStructGetMember               get_member;
+  DBusGTypeSpecializedStructSetMember               set_member;
+} DBusGTypeSpecializedStructVtable;
+
+

+A table of methods used to implement specialized collection behaviour +on user-defined types. Both methods must be implemented. +

+
++ + + + + + + + + + + + + + +

DBusGTypeSpecializedVtable base_vtable;

base methods shared between maps and other types

DBusGTypeSpecializedStructGetMember get_member;

returns a member by its index

DBusGTypeSpecializedStructSetMember set_member;

sets a member by its index
+
+
+
+

dbus_g_type_get_collection ()

+
GType               dbus_g_type_get_collection          (const char *container,
+                                                         GType specialization);
+

+Gets a GType for a particular collection instance, +creating the type if not already created. +

+
++ + + + + + + + + + + + + + +

container :

a string specifying a registered collection type

specialization :

 +GType of collection elements

Returns :

the GType of that instance
+
+
+
+

dbus_g_type_get_map ()

+
GType               dbus_g_type_get_map                 (const char *container,
+                                                         GType key_specialization,
+                                                         GType value_specialization);
+

+Gets a GType for a particular map instance, +creating the type if not already created. +

+
++ + + + + + + + + + + + + + + + + + +

container :

a string specifying a registered map type

key_specialization :

 +GType of keys

value_specialization :

 +GType of values

Returns :

the GType of that instance
+
+
+
+

dbus_g_type_get_structv ()

+
GType               dbus_g_type_get_structv             (const char *container,
+                                                         guint num_members,
+                                                         GType *types);
+

+Gets a GType for a particular struct instance, +creating the type if not already created. +

+
++ + + + + + + + + + + + + + + + + + +

container :

a string specifying a registered struct type

num_members :

number of members in the struct

types :

an array specufying a GType for each struct element

Returns :

the GType of that instance
+
+
+
+

dbus_g_type_get_struct ()

+
GType               dbus_g_type_get_struct              (const char *container,
+                                                         GType first_type,
+                                                         ...);
+

+Varags methsod to get a GType for a particular struct instance, +creating the type if not already created. +

+
++ + + + + + + + + + + + + + + + + + +

container :

a string specifying a registered struct type

first_type :

 +GType for the struct's first member

... :

more GTypes for the struct's members, terminated by G_TYPE_INVALID

Returns :

the GType of that instance
+
+
+
+

dbus_g_type_is_collection ()

+
gboolean            dbus_g_type_is_collection           (GType gtype);
+

+Tests if a given GType is a collection. +

+
++ + + + + + + + + + +

gtype :

a GType to test

Returns :

true if the given GType is a collection
+
+
+
+

dbus_g_type_is_map ()

+
gboolean            dbus_g_type_is_map                  (GType gtype);
+

+Tests if a given GType is a map, +i.e. it was created with dbus_g_type_get_map(). +

+
++ + + + + + + + + + +

gtype :

a GType to test

Returns :

true if the given GType is a map
+
+
+
+

dbus_g_type_is_struct ()

+
gboolean            dbus_g_type_is_struct               (GType gtype);
+

+Tests if a given GType is a struct, +i.e. it was created with dbus_g_type_get_struct() +

+
++ + + + + + + + + + +

gtype :

a GType to test

Returns :

true if the given GType is a struct
+
+
+
+

dbus_g_type_get_collection_specialization ()

+
GType               dbus_g_type_get_collection_specialization
+                                                        (GType gtype);
+

+Return the type of each element in collections of type gtype. +It is an error to call this function on a non-collection type. +

+
++ + + + + + + + + + +

gtype :

a collection GType, as created by dbus_g_type_get_collection() +

Returns :

the element type for a given collection GType.
+
+
+
+

dbus_g_type_get_map_key_specialization ()

+
GType               dbus_g_type_get_map_key_specialization
+                                                        (GType gtype);
+

+Return the type of the keys in maps of type gtype. +It is an error to call this function on a non-map type. +

+
++ + + + + + + + + + +

gtype :

a map GType, as created by dbus_g_type_get_map() +

Returns :

the key type for a given map GType.
+
+
+
+

dbus_g_type_get_map_value_specialization ()

+
GType               dbus_g_type_get_map_value_specialization
+                                                        (GType gtype);
+

+Return the type of the values in maps of type gtype. +It is an error to call this function on a non-map type. +

+
++ + + + + + + + + + +

gtype :

a map GType, as created by dbus_g_type_get_map().

Returns :

the value type for a given map GType.
+
+
+
+

dbus_g_type_get_struct_member_type ()

+
GType               dbus_g_type_get_struct_member_type  (GType gtype,
+                                                         guint member);
+

+Get the type of a member of a specialized struct. +It is an error to call this function on a non-struct type. +

+
++ + + + + + + + + + + + + + +

gtype :

a struct GType, as created with dbus_g_type_get_struct() +

member :

the index of a struct member

Returns :

the type for a given member of a struct GType, +or G_TYPE_INVALID if member >= dbus_g_type_get_struct_size() +
+
+
+
+

dbus_g_type_get_struct_size ()

+
guint               dbus_g_type_get_struct_size         (GType gtype);
+

+Get the number of members in a specialized struct. +It is an error to call this function on a non-struct type. +

+
++ + + + + + + + + + +

gtype :

a struct GType, as created with dbus_g_type_get_struct().

Returns :

the number of members in a given struct GType.
+
+
+
+

dbus_g_type_specialized_construct ()

+
gpointer            dbus_g_type_specialized_construct   (GType gtype);
+

+Create an instance of a given specialized type. +The structure created and returned will depend on the container type of the +GType. E.g. If the given type was created by +dbus_g_type_get_collection("GArray", G_TYPE_INT), +then this will return a GArray with element_size of sizeof(int) +

+
++ + + + + + + + + + +

gtype :

a specialized GType, as created by dbus_g_type_get_collection(), +dbus_g_type_get_map() or dbus_g_type_get_struct() +

Returns :

a pointer to a newly constructed instance of the given type.
+
+
+
+

dbus_g_type_specialized_init_append ()

+
void                dbus_g_type_specialized_init_append (GValue *value,
+                                                         DBusGTypeSpecializedAppendContext *ctx);
+

+Create a new context for adding elements to a collection or key/value pairs +to a map. You generally don't need or want to use this.. +

+
++ + + + + + + + + + +

value :

a GValue containing an instance of specialized type

ctx :

a DBusGTypeSpecializedAppendContext in which to return a new appending context.
+
+
+
+

dbus_g_type_specialized_collection_append ()

+
void                dbus_g_type_specialized_collection_append
+                                                        (DBusGTypeSpecializedAppendContext *ctx,
+                                                         GValue *elt);
+

+Appends a given element to the end of a collection. +

+
++ + + + + + + + + + +

ctx :

a context created by dbus_g_type_specialized_init_append() +for a GValue containing a collection

elt :

a GValue containing an element to append to the collection
+
+
+
+

dbus_g_type_specialized_collection_end_append ()

+
void                dbus_g_type_specialized_collection_end_append
+                                                        (DBusGTypeSpecializedAppendContext *ctx);
+

+Finish appending elements to a given collection +

+
++ + + + +

ctx :

a context created by dbus_g_type_specialized_init_append() +for a GValue containing a collection
+
+
+
+

dbus_g_type_specialized_map_append ()

+
void                dbus_g_type_specialized_map_append  (DBusGTypeSpecializedAppendContext *ctx,
+                                                         GValue *key,
+                                                         GValue *val);
+

+Inserts the given key/value pair into the map instance. +

+
++ + + + + + + + + + + + + + +

ctx :

a context created by dbus_g_type_specialized_init_append() +for a GValue containing a map

key :

a GValue containing a key, whose contents will be stolen by ctx +

val :

a GValue containing a value, whose contents will be stolen by ctx +
+
+
+
+

dbus_g_type_collection_get_fixed ()

+
gboolean            dbus_g_type_collection_get_fixed    (GValue *value,
+                                                         gpointer *data_ret,
+                                                         guint *len_ret);
+

+Calling this function is likely to be a bad idea. Consider using +dbus_g_type_collection_value_iterate() instead. +

+

+On success, data_ret is a pointer to the underlying data in a collection +of fixed-length fundamental types. Knowledge of the underlying data model +of the collection is needed in order to use data_ret correctly. +

+

+It is an error to call this function on a specialized type that is not a +collection, or on a collection that does not have a fixed_accessor in its +DBusGTypeSpecializedCollectionVtable. +

+

+Specialized GArrays are the only types provided by dbus-glib that +can be used with this function; user-defined types might also work. +

+
++ + + + + + + + + + + + + + + + + + +

value :

a GValue containing a boxed specialized collection +that has a fixed_accessor in its vtable

data_ret :

used to return a pointer to the fixed data, which must not be +modified (for instance, for a GArray of gint, this would point +to an array of gint)

len_ret :

used to return the length (counting collection elements, not +bytes: in a GArray containing one gint, this would be 1)

Returns :

 +TRUE on success
+
+
+
+

dbus_g_type_collection_value_iterate ()

+
void                dbus_g_type_collection_value_iterate
+                                                        (const GValue *value,
+                                                         DBusGTypeSpecializedCollectionIterator iterator,
+                                                         gpointer user_data);
+

+Calls the given function for each element of the collection. +The function is passed a GValue containing the element and the given +user_data parameter. The collection may not be modified while iterating over +it. +

+
++ + + + + + + + + + + + + + +

value :

a GValue holding a collection type.

iterator :

a function to call for each element

user_data :

user data to pass to the iterator +
+
+
+
+

dbus_g_type_map_value_iterate ()

+
void                dbus_g_type_map_value_iterate       (const GValue *value,
+                                                         DBusGTypeSpecializedMapIterator iterator,
+                                                         gpointer user_data);
+

+Calls the given function for each key/value pair of the map. +The function is passed two GValues containing the key/value pair and the given +user_data parameter. The map may not be modified while iterating over +it. +

+
++ + + + + + + + + + + + + + +

value :

a GValue holding a specialized map

iterator :

a function to call for each element

user_data :

user data to pass to the iterator +
+
+
+
+

dbus_g_type_struct_get_member ()

+
gboolean            dbus_g_type_struct_get_member       (const GValue *value,
+                                                         guint member,
+                                                         GValue *dest);
+

+Fetches a given member of a given struct instance. dest must be initialised +was the correct type for that member, e.g. as returned by +dbus_g_type_get_struct_member_type +

+
++ + + + + + + + + + + + + + + + + + +

value :

a GValue containing a struct instance

member :

the index of a given member

dest :

an initialised GValue in which to return the struct member

Returns :

 +TRUE if successful
+
+
+
+

dbus_g_type_struct_set_member ()

+
gboolean            dbus_g_type_struct_set_member       (GValue *value,
+                                                         guint member,
+                                                         const GValue *src);
+

+Sets a given member of a struct to a new value. The type of src must match +the existing type of member member of the struct. +

+
++ + + + + + + + + + + + + + + + + + +

value :

a GValue containing a struct instance

member :

the index of a given member

src :

an GValue containing the new value for that struct member

Returns :

 +TRUE if successful
+
+
+
+

dbus_g_type_struct_get ()

+
gboolean            dbus_g_type_struct_get              (const GValue *value,
+                                                         guint member,
+                                                         ...);
+

+Collects the selected values of this struct into the return locations +provided. +

+
++ + + + + + + + + + + + + + + + + + +

value :

a GValue containing a struct instance

member :

struct member to get

... :

location in which to return the value of this member, +followed optionally by more member/return locations pairs, followed by +by G_MAXUINT +

Returns :

 +FALSE on failure
+
+
+
+

dbus_g_type_struct_set ()

+
gboolean            dbus_g_type_struct_set              (GValue *value,
+                                                         guint member,
+                                                         ...);
+

+Sets the selected members of the struct in value. +

+
++ + + + + + + + + + + + + + + + + + +

value :

a GValue containing a struct instance

member :

struct member to set

... :

value for the first member, followed optionally by +more member/value pairs, followed by G_MAXUINT +

Returns :

 +FALSE on failure
+
+
+
+

dbus_g_type_specialized_init ()

+
void                dbus_g_type_specialized_init        (void);
+

+Initialize dbus-glib specialized GTypes. +

+

+In older versions of dbus-glib, it was necessary to do this before +instantiating or registering any specialized type. It is now done +automatically whenever necessary. +

+
+
+
+

dbus_g_type_register_collection ()

+
void                dbus_g_type_register_collection     (const char *name,
+                                                         const DBusGTypeSpecializedCollectionVtable *vtable,
+                                                         guint flags);
+

+Defines a new collection container. +

+
++ + + + + + + + + + + + + + +

name :

The name of a new collection container

vtable :

the vtable defining the new container

flags :

As yet unused.
+
+
+
+

dbus_g_type_register_map ()

+
void                dbus_g_type_register_map            (const char *name,
+                                                         const DBusGTypeSpecializedMapVtable *vtable,
+                                                         guint flags);
+

+Defines a new map container. +

+
++ + + + + + + + + + + + + + +

name :

The name of a new map container

vtable :

the vtable defining the new container

flags :

As yet unused.
+
+
+
+

dbus_g_type_map_peek_vtable ()

+
const DBusGTypeSpecializedMapVtable * dbus_g_type_map_peek_vtable
+                                                        (GType map_type);
+

+Peek the vtable for a given map specialization +

+
++ + + + + + + + + + +

map_type :

a gtype of a map specialization

Returns :

the vtable
+
+
+
+

dbus_g_type_collection_peek_vtable ()

+
const DBusGTypeSpecializedCollectionVtable * dbus_g_type_collection_peek_vtable
+                                                        (GType collection_type);
+

+Peek the vtable for a given collection specialization +

+
++ + + + + + + + + + +

collection_type :

a gtype of a collection specialization

Returns :

the vtable
+
+
+
+

dbus_g_type_struct_peek_vtable ()

+
const DBusGTypeSpecializedStructVtable * dbus_g_type_struct_peek_vtable
+                                                        (GType struct_type);
+

+Peek the vtable for a given struct specialization +

+
++ + + + + + + + + + +

struct_type :

a gtype of a struct specialization

Returns :

the vtable
+
+
+
+

dbus_g_type_register_struct ()

+
void                dbus_g_type_register_struct         (const char *name,
+                                                         const DBusGTypeSpecializedStructVtable *vtable,
+                                                         guint flags);
+

+Defines a new struct container. +

+
++ + + + + + + + + + + + + + +

name :

The name of a new struct container

vtable :

the vtable defining the new container

flags :

As yet unused.
+
+
+
+

dbus_g_value_build_g_variant ()

+
GVariant *          dbus_g_value_build_g_variant        (const GValue *value);
+

+Recurses value and converts its contents to a GVariant. +

+

+The value must either be a simple value (integer, string, boolean, +object path etc.) or a specialized container registered with +dbus_g_type_get_collection(), dbus_g_type_get_map() or +dbus_g_type_get_struct(). Providing any other type is a programming error +(including as a child type). +

+
++ + + + + + + + + + +

value :

a simple or specialized GValue to convert to a GVariant +

Returns :

a new GVariant containing value with a floating reference
+
+
+
+

dbus_g_value_parse_g_variant ()

+
void                dbus_g_value_parse_g_variant        (GVariant *variant,
+                                                         GValue *value);
+

+Deserialize variant and put an equivalent dbus-glib data structure in +value. +

+

+It is an error if variant contains any GVariant extensions not supported +by dbus-glib, including handles (file descriptor passing) and 'maybe' types. +

+
++ + + + + + + + + + +

variant :

a GVariant +

value :

a zero-filled GValue +
+
+
+
+

DBUS_TYPE_G_BOOLEAN_ARRAY

+
#define DBUS_TYPE_G_BOOLEAN_ARRAY  (dbus_g_type_get_collection ("GArray", G_TYPE_BOOLEAN))
+
+

+Expands to a function call returning the GType of a GArray of gboolean +(corresponding to the D-Bus signature "ab"). +

+
+
+
+

DBUS_TYPE_G_UCHAR_ARRAY

+
#define DBUS_TYPE_G_UCHAR_ARRAY    (dbus_g_type_get_collection ("GArray", G_TYPE_UCHAR))
+
+

+Expands to a function call returning the GType of a GArray of guchar +(corresponding to the D-Bus signature "ay"). +

+

+Note that this is not the same thing as a GByteArray! dbus-glib does not +know about the GByteArray type. +

+
+
+
+

DBUS_TYPE_G_UINT_ARRAY

+
#define DBUS_TYPE_G_UINT_ARRAY     (dbus_g_type_get_collection ("GArray", G_TYPE_UINT))
+
+

+Expands to a function call returning the GType of a GArray of guint +(corresponding to the D-Bus signature "au"). +

+
+
+
+

DBUS_TYPE_G_INT_ARRAY

+
#define DBUS_TYPE_G_INT_ARRAY      (dbus_g_type_get_collection ("GArray", G_TYPE_INT))
+
+

+Expands to a function call returning the GType of a GArray of gint +(corresponding to the D-Bus signature "ai"). +

+
+
+
+

DBUS_TYPE_G_UINT64_ARRAY

+
#define DBUS_TYPE_G_UINT64_ARRAY   (dbus_g_type_get_collection ("GArray", G_TYPE_UINT64))
+
+

+Expands to a function call returning the GType of a GArray of guint64 +(corresponding to the D-Bus signature "at"). +

+
+
+
+

DBUS_TYPE_G_INT64_ARRAY

+
#define DBUS_TYPE_G_INT64_ARRAY    (dbus_g_type_get_collection ("GArray", G_TYPE_INT64))
+
+

+Expands to a function call returning the GType of a GArray of gint64 +(corresponding to the D-Bus signature "ax"). +

+
+
+
+

DBUS_TYPE_G_OBJECT_ARRAY

+
#define DBUS_TYPE_G_OBJECT_ARRAY   (dbus_g_type_get_collection ("GPtrArray", G_TYPE_OBJECT))
+
+

+Expands to a function call returning the GType of a GPtrArray of GObject. +

+

+Use this type with caution: it can sometimes be used as a representation +of arrays whose D-Bus signature is "ao" (transferred as an array of object +paths), but the conventional type for such arrays is +(dbus_g_type_get_collection ("GPtrArray", +DBUS_TYPE_G_OBJECT_PATH)). +

+
+
+
+

DBUS_TYPE_G_STRING_STRING_HASHTABLE

+
#define DBUS_TYPE_G_STRING_STRING_HASHTABLE (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING))
+
+

+Expands to a function call returning the GType of a GHashTable where the +keys are strings and the values are also strings (corresponding to the +D-Bus signature "a{ss}"). +

+
+
+
+

DBusGSignature

+
typedef gchar DBusGSignature;
+
+

+A typedef for a string used to represent D-Bus signatures. +Its GType is DBUS_TYPE_G_SIGNATURE, derived from G_TYPE_BOXED. +

+

+Prior to version 0.FIXME this was used as the type name of +DBUS_TYPE_G_SIGNATURE, but did not actually exist as a typedef. +

+

Since 0.FIXME

+
+
+
+

DBUS_TYPE_G_SIGNATURE

+
#define DBUS_TYPE_G_SIGNATURE (dbus_g_signature_get_g_type ())
+
+

+The GType of a DBusGSignature, which is a boxed type containing a +D-Bus signature as a zero-terminated string. Signatures can be +copied with g_strdup() and freed with g_free(), just like G_TYPE_STRING, +but have a distinct boxed type to allow them to be distinguished when +stored in a GValue. +

+
++ + + + +

Returns :

a type derived from G_TYPE_BOXED +
+
+
+
+

DBusGObjectPath

+
typedef gchar DBusGObjectPath;
+
+

+A typedef for a string used to represent D-Bus object paths. +Its GType is DBUS_TYPE_G_OBJECT_PATH, derived from G_TYPE_BOXED. +

+

+Prior to version 0.FIXME this was used as the type name of +DBUS_TYPE_G_OBJECT_PATH, but did not actually exist as a typedef. +

+

Since 0.FIXME

+
+
+
+

DBUS_TYPE_G_OBJECT_PATH

+
#define DBUS_TYPE_G_OBJECT_PATH (dbus_g_object_path_get_g_type ())
+
+

+The GType of a DBusGObjectPath, which is a boxed type containing a +D-Bus object path as a zero-terminated string. Object paths can be +copied with g_strdup() and freed with g_free(), just like G_TYPE_STRING, +but have a distinct boxed type to allow them to be distinguished when +stored in a GValue. +

+
++ + + + +

Returns :

a type derived from G_TYPE_BOXED +
+
+
+
+
+
+ Generated by GTK-Doc V1.18
+ + \ No newline at end of file diff -Nru dbus-glib-0.100.1/doc/reference/html/dbus-glib-dbus-glib-lowlevel.html dbus-glib-0.100.2/doc/reference/html/dbus-glib-dbus-glib-lowlevel.html --- dbus-glib-0.100.1/doc/reference/html/dbus-glib-dbus-glib-lowlevel.html 2013-02-15 17:00:01.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/html/dbus-glib-dbus-glib-lowlevel.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,436 +0,0 @@ - - - - -DBus GLib low level - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

DBus GLib low level

-

DBus GLib low level — DBus lower level functions

-
-
-

Stability Level

-Unstable, unless otherwise indicated -
-
-

Synopsis

-
#define             DBUS_TYPE_CONNECTION
-#define             DBUS_TYPE_MESSAGE
-DBusGConnection *   dbus_connection_get_g_connection    (DBusConnection *connection);
-GType               dbus_connection_get_g_type          (void);
-void                dbus_connection_setup_with_g_main   (DBusConnection *connection,
-                                                         GMainContext *context);
-DBusConnection *    dbus_g_connection_get_connection    (DBusGConnection *gconnection);
-DBusMessage *       dbus_g_message_get_message          (DBusGMessage *gmessage);
-DBusMessage *       dbus_g_method_get_reply             (DBusGMethodInvocation *context);
-gchar *             dbus_g_method_get_sender            (DBusGMethodInvocation *context);
-void                dbus_g_method_send_reply            (DBusGMethodInvocation *context,
-                                                         DBusMessage *reply);
-void                dbus_g_proxy_send                   (DBusGProxy *proxy,
-                                                         DBusMessage *message,
-                                                         dbus_uint32_t *client_serial);
-GType               dbus_message_get_g_type             (void);
-void                dbus_server_setup_with_g_main       (DBusServer *server,
-                                                         GMainContext *context);
-void                dbus_set_g_error                    (GError **gerror,
-                                                         DBusError *derror);
-
-
-
-

Description

-

-These functions can be used to access lower level of DBus. -

-
-
-

Details

-
-

DBUS_TYPE_CONNECTION

-
#define DBUS_TYPE_CONNECTION      (dbus_connection_get_g_type ())
-
-

-Expands to a function call returning a boxed GType representing a -DBusConnection pointer from libdbus. Not to be confused with -DBUS_TYPE_G_CONNECTION, which you should usually use instead. -

-
-- - - - -

Returns :

the GLib type
-
-
-
-

DBUS_TYPE_MESSAGE

-
#define DBUS_TYPE_MESSAGE         (dbus_message_get_g_type ())
-
-

-Expands to a function call returning a boxed GType representing a -DBusMessage pointer from libdbus. Not to be confused with -DBUS_TYPE_G_MESSAGE, which you should usually use instead. -

-
-- - - - -

Returns :

the GLib type
-
-
-
-

dbus_connection_get_g_connection ()

-
DBusGConnection *   dbus_connection_get_g_connection    (DBusConnection *connection);
-

-Get the DBusGConnection corresponding to this DBusConnection. This only -makes sense if the DBusConnection was originally a DBusGConnection that was -registered with the GLib main loop. The return value does not have its -refcount incremented. -

-
-- - - - - - - - - - -

connection :

a DBusConnection -

Returns :

DBusGConnection
-
-
-
-

dbus_connection_get_g_type ()

-
GType               dbus_connection_get_g_type          (void);
-

-

-
-
-
-

dbus_connection_setup_with_g_main ()

-
void                dbus_connection_setup_with_g_main   (DBusConnection *connection,
-                                                         GMainContext *context);
-

-Sets the watch and timeout functions of a DBusConnection -to integrate the connection with the GLib main loop. -Pass in NULL for the GMainContext unless you're -doing something specialized. -

-

-If called twice for the same context, does nothing the second -time. If called once with context A and once with context B, -context B replaces context A as the context monitoring the -connection. -

-
-- - - - - - - - - - -

connection :

the connection

context :

the GMainContext or NULL for default context
-
-
-
-

dbus_g_connection_get_connection ()

-
DBusConnection *    dbus_g_connection_get_connection    (DBusGConnection *gconnection);
-

-Get the DBusConnection corresponding to this DBusGConnection. -The return value does not have its refcount incremented. -

-
-- - - - - - - - - - -

gconnection :

a DBusGConnection -

Returns :

DBusConnection
-
-
-
-

dbus_g_message_get_message ()

-
DBusMessage *       dbus_g_message_get_message          (DBusGMessage *gmessage);
-

-Get the DBusMessage corresponding to this DBusGMessage. -The return value does not have its refcount incremented. -

-
-- - - - - - - - - - -

gmessage :

a DBusGMessage -

Returns :

DBusMessage
-
-
-
-

dbus_g_method_get_reply ()

-
DBusMessage *       dbus_g_method_get_reply             (DBusGMethodInvocation *context);
-

-Get the reply message to append reply values -Used as a sidedoor when you can't generate dbus values -of the correct type due to glib binding limitations -

-
-- - - - - - - - - - -

context :

the method context

Returns :

a DBusMessage with the reply
-
-
-
-

dbus_g_method_get_sender ()

-
gchar *             dbus_g_method_get_sender            (DBusGMethodInvocation *context);
-

-Get the sender of a message so we can send a -"reply" later (i.e. send a message directly -to a service which invoked the method at a -later time). -

-
-- - - - - - - - - - -

context :

the method context

Returns :

the unique name of the sender. It -is up to the caller to free the returned string.
-
-
-
-

dbus_g_method_send_reply ()

-
void                dbus_g_method_send_reply            (DBusGMethodInvocation *context,
-                                                         DBusMessage *reply);
-

-Send a manually created reply message. -

-

-Used as a sidedoor when you can't generate dbus values -of the correct type due to glib binding limitations -

-
-- - - - - - - - - - -

context :

the method context

reply :

the reply message, will be unreffed
-
-
-
-

dbus_g_proxy_send ()

-
void                dbus_g_proxy_send                   (DBusGProxy *proxy,
-                                                         DBusMessage *message,
-                                                         dbus_uint32_t *client_serial);
-

-Sends a message to the interface we're proxying for. Does not -block or wait for a reply. The message is only actually written out -when you return to the main loop or block in -dbus_g_connection_flush(). -

-

-The message is modified to be addressed to the target interface. -That is, a destination name field or whatever is needed will be -added to the message. The basic point of this function is to add -the necessary header fields, otherwise it's equivalent to -dbus_connection_send(). -

-

-This function adds a reference to the message, so the caller -still owns its original reference. -

-

-It is an error to call this method on a proxy that has emitted -the "destroy" signal. -

-
-- - - - - - - - - - - - - - -

proxy :

a proxy for a remote interface

message :

the message to address and send

client_serial :

return location for message's serial, or NULL -
-
-
-
-

dbus_message_get_g_type ()

-
GType               dbus_message_get_g_type             (void);
-

-

-
-
-
-

dbus_server_setup_with_g_main ()

-
void                dbus_server_setup_with_g_main       (DBusServer *server,
-                                                         GMainContext *context);
-

-Sets the watch and timeout functions of a DBusServer -to integrate the server with the GLib main loop. -In most cases the context argument should be NULL. -

-

-If called twice for the same context, does nothing the second -time. If called once with context A and once with context B, -context B replaces context A as the context monitoring the -connection. -

-
-- - - - - - - - - - -

server :

the server

context :

the GMainContext or NULL for default
-
-
-
-

dbus_set_g_error ()

-
void                dbus_set_g_error                    (GError **gerror,
-                                                         DBusError *derror);
-

-Store the information from a DBus method error return into a -GError. For the normal case of an arbitrary remote process, -the error code will be DBUS_GERROR_REMOTE_EXCEPTION. Now, -DBus errors have two components; a message and a "name". -The former is an arbitrary (normally American English) string. -The second is a string like com.example.FooFailure which -programs can use as a conditional source. Because a GError -only has one string, we use a hack to encode both values: -

-

-<human readable string><null><error name><null> -

-

-You can use the following code to retrieve both values: -

-

-

-
- - - - - - - - 
1
-2
-3
const char *msg = error->message;
-size_t len = strlen(msg);
-const char *error_name = msg+len+1;
-
- -

-

-
-- - - - - - - - - - -

gerror :

an error

derror :

a DBusError -
-
-
-
-
-
- Generated by GTK-Doc V1.18
- - \ No newline at end of file diff -Nru dbus-glib-0.100.1/doc/reference/html/dbus-glib-dbus-gtype-specialized.html dbus-glib-0.100.2/doc/reference/html/dbus-glib-dbus-gtype-specialized.html --- dbus-glib-0.100.1/doc/reference/html/dbus-glib-dbus-gtype-specialized.html 2013-02-15 17:00:01.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/html/dbus-glib-dbus-gtype-specialized.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,1691 +0,0 @@ - - - - -Specializable GType System - - - - - - - - - - - - - - - - - - - -
-
-
- - -
-

Specializable GType System

-

Specializable GType System — Specialized GTypes

-
-
-

Stability Level

-Unstable, unless otherwise indicated -
-
-

Synopsis

-
                    DBusGTypeSpecializedAppendContext;
-void                (*DBusGTypeSpecializedCollectionAppendFunc)
-                                                        (DBusGTypeSpecializedAppendContext *ctx,
-                                                         GValue *val);
-void                (*DBusGTypeSpecializedCollectionEndAppendFunc)
-                                                        (DBusGTypeSpecializedAppendContext *ctx);
-gboolean            (*DBusGTypeSpecializedCollectionFixedAccessorFunc)
-                                                        (GType type,
-                                                         gpointer instance,
-                                                         gpointer *values,
-                                                         guint *len);
-void                (*DBusGTypeSpecializedCollectionIterator)
-                                                        (const GValue *value,
-                                                         gpointer user_data);
-void                (*DBusGTypeSpecializedCollectionIteratorFunc)
-                                                        (GType type,
-                                                         gpointer instance,
-                                                         DBusGTypeSpecializedCollectionIterator iterator,
-                                                         gpointer user_data);
-                    DBusGTypeSpecializedCollectionVtable;
-gpointer            (*DBusGTypeSpecializedConstructor)  (GType type);
-gpointer            (*DBusGTypeSpecializedCopyFunc)     (GType type,
-                                                         gpointer src);
-void                (*DBusGTypeSpecializedFreeFunc)     (GType type,
-                                                         gpointer val);
-void                (*DBusGTypeSpecializedMapAppendFunc)
-                                                        (DBusGTypeSpecializedAppendContext *ctx,
-                                                         GValue *key,
-                                                         GValue *val);
-void                (*DBusGTypeSpecializedMapIterator)  (const GValue *key_val,
-                                                         const GValue *value_val,
-                                                         gpointer user_data);
-void                (*DBusGTypeSpecializedMapIteratorFunc)
-                                                        (GType type,
-                                                         gpointer instance,
-                                                         DBusGTypeSpecializedMapIterator iterator,
-                                                         gpointer user_data);
-                    DBusGTypeSpecializedMapVtable;
-gboolean            (*DBusGTypeSpecializedStructGetMember)
-                                                        (GType type,
-                                                         gpointer instance,
-                                                         guint member,
-                                                         GValue *ret_value);
-gboolean            (*DBusGTypeSpecializedStructSetMember)
-                                                        (GType type,
-                                                         gpointer instance,
-                                                         guint member,
-                                                         const GValue *new_value);
-                    DBusGTypeSpecializedStructVtable;
-                    DBusGTypeSpecializedVtable;
-gboolean            dbus_g_type_collection_get_fixed    (GValue *value,
-                                                         gpointer *data_ret,
-                                                         guint *len_ret);
-const DBusGTypeSpecializedCollectionVtable * dbus_g_type_collection_peek_vtable
-                                                        (GType collection_type);
-void                dbus_g_type_collection_value_iterate
-                                                        (const GValue *value,
-                                                         DBusGTypeSpecializedCollectionIterator iterator,
-                                                         gpointer user_data);
-GType               dbus_g_type_get_collection          (const char *container,
-                                                         GType specialization);
-GType               dbus_g_type_get_collection_specialization
-                                                        (GType gtype);
-GType               dbus_g_type_get_map                 (const char *container,
-                                                         GType key_specialization,
-                                                         GType value_specialization);
-GType               dbus_g_type_get_map_key_specialization
-                                                        (GType gtype);
-GType               dbus_g_type_get_map_value_specialization
-                                                        (GType gtype);
-GType               dbus_g_type_get_struct              (const char *container,
-                                                         GType first_type,
-                                                         ...);
-GType               dbus_g_type_get_struct_member_type  (GType gtype,
-                                                         guint member);
-guint               dbus_g_type_get_struct_size         (GType gtype);
-GType               dbus_g_type_get_structv             (const char *container,
-                                                         guint num_members,
-                                                         GType *types);
-gboolean            dbus_g_type_is_collection           (GType gtype);
-gboolean            dbus_g_type_is_map                  (GType gtype);
-gboolean            dbus_g_type_is_struct               (GType gtype);
-const DBusGTypeSpecializedMapVtable * dbus_g_type_map_peek_vtable
-                                                        (GType map_type);
-void                dbus_g_type_map_value_iterate       (const GValue *value,
-                                                         DBusGTypeSpecializedMapIterator iterator,
-                                                         gpointer user_data);
-void                dbus_g_type_register_collection     (const char *name,
-                                                         const DBusGTypeSpecializedCollectionVtable *vtable,
-                                                         guint flags);
-void                dbus_g_type_register_map            (const char *name,
-                                                         const DBusGTypeSpecializedMapVtable *vtable,
-                                                         guint flags);
-void                dbus_g_type_register_struct         (const char *name,
-                                                         const DBusGTypeSpecializedStructVtable *vtable,
-                                                         guint flags);
-void                dbus_g_type_specialized_collection_append
-                                                        (DBusGTypeSpecializedAppendContext *ctx,
-                                                         GValue *elt);
-void                dbus_g_type_specialized_collection_end_append
-                                                        (DBusGTypeSpecializedAppendContext *ctx);
-gpointer            dbus_g_type_specialized_construct   (GType gtype);
-void                dbus_g_type_specialized_init        (void);
-void                dbus_g_type_specialized_init_append (GValue *value,
-                                                         DBusGTypeSpecializedAppendContext *ctx);
-void                dbus_g_type_specialized_map_append  (DBusGTypeSpecializedAppendContext *ctx,
-                                                         GValue *key,
-                                                         GValue *val);
-gboolean            dbus_g_type_struct_get              (const GValue *value,
-                                                         guint member,
-                                                         ...);
-gboolean            dbus_g_type_struct_get_member       (const GValue *value,
-                                                         guint member,
-                                                         GValue *dest);
-const DBusGTypeSpecializedStructVtable * dbus_g_type_struct_peek_vtable
-                                                        (GType struct_type);
-gboolean            dbus_g_type_struct_set              (GValue *value,
-                                                         guint member,
-                                                         ...);
-gboolean            dbus_g_type_struct_set_member       (GValue *value,
-                                                         guint member,
-                                                         const GValue *src);
-GVariant *          dbus_g_value_build_g_variant        (const GValue *value);
-
-
-
-

Description

-

-Specialized gtypes are basically a way to allow the definition of -recursive GTypes. It allows the definition of 'containers' which is -basically a user defined structure capable of holding other data, and a -set of functions defining how to access that structure. Containers come in -3 flavors: collections, maps and structs. -

-

-A collection is a container that holds an ordered set of items, all -of which must be the same type. (This is an array -in standard D-Bus terminology.) dbus-glib specialized collections can be -GArray (for numeric elements), GPtrArray (for string, object or -boxed elements), GSList (for boxed elements, not recommended), or a -user-defined type. -

-

-A map is a container that holds a set of key/value pairs. -The keys have one type, and the values another; the type of the keys -must be a numeric or string-like type. (This is a dict -(dictionary) or array of dict entry in standard D-Bus -terminology.) dbus-glib specialized maps can be GHashTable or a -user-defined type. -

-

-A struct is a container that holds a fixed number of members, each member -having a predefined type. (This is a struct in -standard D-Bus terminology.) It is analogous to the C struct keyword, but -dbus-glib does not generally represent D-Bus structs in C structs. -dbus-glib specialized structs can be GValueArray or a user-defined type. -

-

-A specialization is a GType detailing a particular container with -particular types (a type specialization). -

-

-Functions are provided for constructing and manipulating specializations. -

-

-This documentation needs splitting into two pages, one for defining new -containers and using existing containers. I expect most users to only do -the latter. I also need to add some examples. -

-
-
-

Details

-
-

DBusGTypeSpecializedAppendContext

-
typedef struct {
-  /* public */
-  GValue *val;
-  GType specialization_type;
-} DBusGTypeSpecializedAppendContext;
-
-

-A context for appending. There are more fields, which are private. -

-
-- - - - - - - - - - -

GValue *val;

the GValue containing the array to which you're appending

GType specialization_type;

the GType of the array's elements
-
-
-
-

DBusGTypeSpecializedCollectionAppendFunc ()

-
void                (*DBusGTypeSpecializedCollectionAppendFunc)
-                                                        (DBusGTypeSpecializedAppendContext *ctx,
-                                                         GValue *val);
-

-Implements dbus_g_type_specialized_collection_append(). -

-

-This function should use the val and specialization_type members of ctx. -

-
-- - - - - - - - - - -

ctx :

an appending context returned by dbus_g_type_specialized_init_append() -

val :

a value to copy into the collection
-
-
-
-

DBusGTypeSpecializedCollectionEndAppendFunc ()

-
void                (*DBusGTypeSpecializedCollectionEndAppendFunc)
-                                                        (DBusGTypeSpecializedAppendContext *ctx);
-

-Implements dbus_g_type_specialized_collection_end_append(). -

-

-This function should use the val and specialization_type members of ctx. -

-
-- - - - -

ctx :

an appending context returned by dbus_g_type_specialized_init_append() -
-
-
-
-

DBusGTypeSpecializedCollectionFixedAccessorFunc ()

-
gboolean            (*DBusGTypeSpecializedCollectionFixedAccessorFunc)
-                                                        (GType type,
-                                                         gpointer instance,
-                                                         gpointer *values,
-                                                         guint *len);
-

-Implements dbus_g_type_collection_get_fixed() for a GValue with type -type, containing instance. -

-
-- - - - - - - - - - - - - - - - - - - - - - -

type :

a specialized collection boxed type

instance :

an instance of type -

values :

used to return a pointer to the contents of instance -

len :

used to return the number of elements in instance -

Returns :

 -TRUE on success
-
-
-
-

DBusGTypeSpecializedCollectionIterator ()

-
void                (*DBusGTypeSpecializedCollectionIterator)
-                                                        (const GValue *value,
-                                                         gpointer user_data);
-

-A library-user-supplied function, called for each element in the -collection when dbus_g_type_collection_value_iterate() is called. -

-
-- - - - - - - - - - -

value :

an element of the collection

user_data :

the data supplied when calling -dbus_g_type_collection_value_iterate() -
-
-
-
-

DBusGTypeSpecializedCollectionIteratorFunc ()

-
void                (*DBusGTypeSpecializedCollectionIteratorFunc)
-                                                        (GType type,
-                                                         gpointer instance,
-                                                         DBusGTypeSpecializedCollectionIterator iterator,
-                                                         gpointer user_data);
-

-Implements dbus_g_type_collection_value_iterate() for a GValue with -type type, containing instance. -

-
-- - - - - - - - - - - - - - - - - - -

type :

a specialized collection boxed type

instance :

an instance of type -

iterator :

the function to call for each element

user_data :

data to pass to iterator -
-
-
-
-

DBusGTypeSpecializedCollectionVtable

-
typedef struct {
-  DBusGTypeSpecializedVtable                        base_vtable;
-  DBusGTypeSpecializedCollectionFixedAccessorFunc   fixed_accessor;
-  DBusGTypeSpecializedCollectionIteratorFunc        iterator;
-  DBusGTypeSpecializedCollectionAppendFunc          append_func;
-  DBusGTypeSpecializedCollectionEndAppendFunc       end_append_func;
-} DBusGTypeSpecializedCollectionVtable;
-
-

-A table of methods used to implement specialized collection behaviour -on user-defined types. At least iterator and append_func must be -implemented. -

-
-- - - - - - - - - - - - - - - - - - - - - - -

DBusGTypeSpecializedVtable base_vtable;

base methods shared between collections and other types

DBusGTypeSpecializedCollectionFixedAccessorFunc fixed_accessor;

if not NULL, provides access to the contents of this -collection, as documented for dbus_g_type_collection_get_fixed() -

DBusGTypeSpecializedCollectionIteratorFunc iterator;

iterates through the members of instance -

DBusGTypeSpecializedCollectionAppendFunc append_func;

appends a new member to instance -

DBusGTypeSpecializedCollectionEndAppendFunc end_append_func;

if not NULL, called after each group of calls to -the append_func -
-
-
-
-

DBusGTypeSpecializedConstructor ()

-
gpointer            (*DBusGTypeSpecializedConstructor)  (GType type);
-

- -

-
-- - - - - - - - - - -

type :

a specialized boxed type

Returns :

a new instance of type -
-
-
-
-

DBusGTypeSpecializedCopyFunc ()

-
gpointer            (*DBusGTypeSpecializedCopyFunc)     (GType type,
-                                                         gpointer src);
-

-Copies src according to type. This is analogous to GBoxedCopyFunc, but -can use information from type (for instance to copy each element of a -collection). -

-
-- - - - - - - - - - - - - - -

type :

a specialized boxed type

src :

an instance of type -

Returns :

a deep copy of src -
-
-
-
-

DBusGTypeSpecializedFreeFunc ()

-
void                (*DBusGTypeSpecializedFreeFunc)     (GType type,
-                                                         gpointer val);
-

-Frees val according to type. This is analogous to GBoxedFreeFunc, but -can use information from type (for instance to free the contents of a -container before freeing the actual container). -

-
-- - - - - - - - - - -

type :

a specialized boxed type

val :

an instance of type -
-
-
-
-

DBusGTypeSpecializedMapAppendFunc ()

-
void                (*DBusGTypeSpecializedMapAppendFunc)
-                                                        (DBusGTypeSpecializedAppendContext *ctx,
-                                                         GValue *key,
-                                                         GValue *val);
-

-Implements dbus_g_type_specialized_map_append(). -

-

-This function should use the val and specialization_type members of ctx, -and replace any existing value with key equal to key. -

-
-- - - - - - - - - - - - - - -

ctx :

an appending context returned by dbus_g_type_specialized_init_append() -

key :

a key to add to the collection

val :

a value to add to the collection
-
-
-
-

DBusGTypeSpecializedMapIterator ()

-
void                (*DBusGTypeSpecializedMapIterator)  (const GValue *key_val,
-                                                         const GValue *value_val,
-                                                         gpointer user_data);
-

-A library-user-supplied function, called for each key/value pair in the -collection when dbus_g_type_map_value_iterate() is called. -

-
-- - - - - - - - - - - - - - -

key_val :

a key from the map

value_val :

a value from the map

user_data :

the data supplied when calling -dbus_g_type_map_value_iterate() -
-
-
-
-

DBusGTypeSpecializedMapIteratorFunc ()

-
void                (*DBusGTypeSpecializedMapIteratorFunc)
-                                                        (GType type,
-                                                         gpointer instance,
-                                                         DBusGTypeSpecializedMapIterator iterator,
-                                                         gpointer user_data);
-

-Implements dbus_g_type_map_value_iterate() for a GValue with -type type, containing instance. -

-
-- - - - - - - - - - - - - - - - - - -

type :

a specialized map boxed type

instance :

an instance of type -

iterator :

the function to call for each key/value pair

user_data :

data to pass to iterator -
-
-
-
-

DBusGTypeSpecializedMapVtable

-
typedef struct {
-  DBusGTypeSpecializedVtable                        base_vtable;
-  DBusGTypeSpecializedMapIteratorFunc               iterator;
-  DBusGTypeSpecializedMapAppendFunc                 append_func;
-} DBusGTypeSpecializedMapVtable;
-
-

-A table of methods used to implement specialized collection behaviour -on user-defined types. Both methods must be implemented. -

-
-- - - - - - - - - - - - - - -

DBusGTypeSpecializedVtable base_vtable;

base methods shared between maps and other types

DBusGTypeSpecializedMapIteratorFunc iterator;

iterates through the members of instance -

DBusGTypeSpecializedMapAppendFunc append_func;

adds a new key/value pair to instance -
-
-
-
-

DBusGTypeSpecializedStructGetMember ()

-
gboolean            (*DBusGTypeSpecializedStructGetMember)
-                                                        (GType type,
-                                                         gpointer instance,
-                                                         guint member,
-                                                         GValue *ret_value);
-

-Implements dbus_g_type_struct_get_member() for a GValue with type type, -containing instance. -

-
-- - - - - - - - - - - - - - - - - - - - - - -

type :

a specialized struct boxed type

instance :

an instance of type -

member :

the index of the member, starting from 0

ret_value :

an initialized GValue of the appropriate type for the given -member of type -

Returns :

 -TRUE on success
-
-
-
-

DBusGTypeSpecializedStructSetMember ()

-
gboolean            (*DBusGTypeSpecializedStructSetMember)
-                                                        (GType type,
-                                                         gpointer instance,
-                                                         guint member,
-                                                         const GValue *new_value);
-

-Implements dbus_g_type_struct_set_member() for a GValue with type type, -containing instance. -

-
-- - - - - - - - - - - - - - - - - - - - - - -

type :

a specialized struct boxed type

instance :

an instance of type -

member :

the index of the member, starting from 0

new_value :

an initialized GValue of the appropriate type for the given -member of type -

Returns :

 -TRUE on success
-
-
-
-

DBusGTypeSpecializedStructVtable

-
typedef struct {
-  DBusGTypeSpecializedVtable                        base_vtable;
-  DBusGTypeSpecializedStructGetMember               get_member;
-  DBusGTypeSpecializedStructSetMember               set_member;
-} DBusGTypeSpecializedStructVtable;
-
-

-A table of methods used to implement specialized collection behaviour -on user-defined types. Both methods must be implemented. -

-
-- - - - - - - - - - - - - - -

DBusGTypeSpecializedVtable base_vtable;

base methods shared between maps and other types

DBusGTypeSpecializedStructGetMember get_member;

returns a member by its index

DBusGTypeSpecializedStructSetMember set_member;

sets a member by its index
-
-
-
-

DBusGTypeSpecializedVtable

-
typedef struct {
-  DBusGTypeSpecializedConstructor    constructor;
-  DBusGTypeSpecializedFreeFunc       free_func;
-  DBusGTypeSpecializedCopyFunc       copy_func;
-  GDestroyNotify                     simple_free_func; /* for type-independent freeing if possible */
-} DBusGTypeSpecializedVtable;
-
-

-A table of methods used to implement specialized container behaviour on -user-defined collections, maps and structs. Exactly one of free_func and -simple_free_func must be implemented; the other must be NULL. -constructor and copy_func must always be implemented. -

-

-There are additional members, which are reserved for future expansion and -must be NULL. -

-
-- - - - - - - - - - - - - - - - - - -

DBusGTypeSpecializedConstructor constructor;

returns a new, blank instance of the type -

DBusGTypeSpecializedFreeFunc free_func;

if not NULL, frees the type instance val -

DBusGTypeSpecializedCopyFunc copy_func;

returns a "deep copy" of the type instance val -

GDestroyNotify simple_free_func;

if not NULL, frees its argument
-
-
-
-

dbus_g_type_collection_get_fixed ()

-
gboolean            dbus_g_type_collection_get_fixed    (GValue *value,
-                                                         gpointer *data_ret,
-                                                         guint *len_ret);
-

-Calling this function is likely to be a bad idea. Consider using -dbus_g_type_collection_value_iterate() instead. -

-

-On success, data_ret is a pointer to the underlying data in a collection -of fixed-length fundamental types. Knowledge of the underlying data model -of the collection is needed in order to use data_ret correctly. -

-

-It is an error to call this function on a specialized type that is not a -collection, or on a collection that does not have a fixed_accessor in its -DBusGTypeSpecializedCollectionVtable. -

-

-Specialized GArrays are the only types provided by dbus-glib that -can be used with this function; user-defined types might also work. -

-
-- - - - - - - - - - - - - - - - - - -

value :

a GValue containing a boxed specialized collection -that has a fixed_accessor in its vtable

data_ret :

used to return a pointer to the fixed data, which must not be -modified (for instance, for a GArray of gint, this would point -to an array of gint)

len_ret :

used to return the length (counting collection elements, not -bytes: in a GArray containing one gint, this would be 1)

Returns :

 -TRUE on success
-
-
-
-

dbus_g_type_collection_peek_vtable ()

-
const DBusGTypeSpecializedCollectionVtable * dbus_g_type_collection_peek_vtable
-                                                        (GType collection_type);
-

-Peek the vtable for a given collection specialization -

-
-- - - - - - - - - - -

collection_type :

a gtype of a collection specialization

Returns :

the vtable
-
-
-
-

dbus_g_type_collection_value_iterate ()

-
void                dbus_g_type_collection_value_iterate
-                                                        (const GValue *value,
-                                                         DBusGTypeSpecializedCollectionIterator iterator,
-                                                         gpointer user_data);
-

-Calls the given function for each element of the collection. -The function is passed a GValue containing the element and the given -user_data parameter. The collection may not be modified while iterating over -it. -

-
-- - - - - - - - - - - - - - -

value :

a GValue holding a collection type.

iterator :

a function to call for each element

user_data :

user data to pass to the iterator -
-
-
-
-

dbus_g_type_get_collection ()

-
GType               dbus_g_type_get_collection          (const char *container,
-                                                         GType specialization);
-

-Gets a GType for a particular collection instance, -creating the type if not already created. -

-
-- - - - - - - - - - - - - - -

container :

a string specifying a registered collection type

specialization :

 -GType of collection elements

Returns :

the GType of that instance
-
-
-
-

dbus_g_type_get_collection_specialization ()

-
GType               dbus_g_type_get_collection_specialization
-                                                        (GType gtype);
-

-Return the type of each element in collections of type gtype. -It is an error to call this function on a non-collection type. -

-
-- - - - - - - - - - -

gtype :

a collection GType, as created by dbus_g_type_get_collection() -

Returns :

the element type for a given collection GType.
-
-
-
-

dbus_g_type_get_map ()

-
GType               dbus_g_type_get_map                 (const char *container,
-                                                         GType key_specialization,
-                                                         GType value_specialization);
-

-Gets a GType for a particular map instance, -creating the type if not already created. -

-
-- - - - - - - - - - - - - - - - - - -

container :

a string specifying a registered map type

key_specialization :

 -GType of keys

value_specialization :

 -GType of values

Returns :

the GType of that instance
-
-
-
-

dbus_g_type_get_map_key_specialization ()

-
GType               dbus_g_type_get_map_key_specialization
-                                                        (GType gtype);
-

-Return the type of the keys in maps of type gtype. -It is an error to call this function on a non-map type. -

-
-- - - - - - - - - - -

gtype :

a map GType, as created by dbus_g_type_get_map() -

Returns :

the key type for a given map GType.
-
-
-
-

dbus_g_type_get_map_value_specialization ()

-
GType               dbus_g_type_get_map_value_specialization
-                                                        (GType gtype);
-

-Return the type of the values in maps of type gtype. -It is an error to call this function on a non-map type. -

-
-- - - - - - - - - - -

gtype :

a map GType, as created by dbus_g_type_get_map().

Returns :

the value type for a given map GType.
-
-
-
-

dbus_g_type_get_struct ()

-
GType               dbus_g_type_get_struct              (const char *container,
-                                                         GType first_type,
-                                                         ...);
-

-Varags methsod to get a GType for a particular struct instance, -creating the type if not already created. -

-
-- - - - - - - - - - - - - - - - - - -

container :

a string specifying a registered struct type

first_type :

 -GType for the struct's first member

... :

more GTypes for the struct's members, terminated by G_TYPE_INVALID

Returns :

the GType of that instance
-
-
-
-

dbus_g_type_get_struct_member_type ()

-
GType               dbus_g_type_get_struct_member_type  (GType gtype,
-                                                         guint member);
-

-Get the type of a member of a specialized struct. -It is an error to call this function on a non-struct type. -

-
-- - - - - - - - - - - - - - -

gtype :

a struct GType, as created with dbus_g_type_get_struct() -

member :

the index of a struct member

Returns :

the type for a given member of a struct GType, -or G_TYPE_INVALID if member >= dbus_g_type_get_struct_size() -
-
-
-
-

dbus_g_type_get_struct_size ()

-
guint               dbus_g_type_get_struct_size         (GType gtype);
-

-Get the number of members in a specialized struct. -It is an error to call this function on a non-struct type. -

-
-- - - - - - - - - - -

gtype :

a struct GType, as created with dbus_g_type_get_struct().

Returns :

the number of members in a given struct GType.
-
-
-
-

dbus_g_type_get_structv ()

-
GType               dbus_g_type_get_structv             (const char *container,
-                                                         guint num_members,
-                                                         GType *types);
-

-Gets a GType for a particular struct instance, -creating the type if not already created. -

-
-- - - - - - - - - - - - - - - - - - -

container :

a string specifying a registered struct type

num_members :

number of members in the struct

types :

an array specufying a GType for each struct element

Returns :

the GType of that instance
-
-
-
-

dbus_g_type_is_collection ()

-
gboolean            dbus_g_type_is_collection           (GType gtype);
-

-Tests if a given GType is a collection. -

-
-- - - - - - - - - - -

gtype :

a GType to test

Returns :

true if the given GType is a collection
-
-
-
-

dbus_g_type_is_map ()

-
gboolean            dbus_g_type_is_map                  (GType gtype);
-

-Tests if a given GType is a map, -i.e. it was created with dbus_g_type_get_map(). -

-
-- - - - - - - - - - -

gtype :

a GType to test

Returns :

true if the given GType is a map
-
-
-
-

dbus_g_type_is_struct ()

-
gboolean            dbus_g_type_is_struct               (GType gtype);
-

-Tests if a given GType is a struct, -i.e. it was created with dbus_g_type_get_struct() -

-
-- - - - - - - - - - -

gtype :

a GType to test

Returns :

true if the given GType is a struct
-
-
-
-

dbus_g_type_map_peek_vtable ()

-
const DBusGTypeSpecializedMapVtable * dbus_g_type_map_peek_vtable
-                                                        (GType map_type);
-

-Peek the vtable for a given map specialization -

-
-- - - - - - - - - - -

map_type :

a gtype of a map specialization

Returns :

the vtable
-
-
-
-

dbus_g_type_map_value_iterate ()

-
void                dbus_g_type_map_value_iterate       (const GValue *value,
-                                                         DBusGTypeSpecializedMapIterator iterator,
-                                                         gpointer user_data);
-

-Calls the given function for each key/value pair of the map. -The function is passed two GValues containing the key/value pair and the given -user_data parameter. The map may not be modified while iterating over -it. -

-
-- - - - - - - - - - - - - - -

value :

a GValue holding a specialized map

iterator :

a function to call for each element

user_data :

user data to pass to the iterator -
-
-
-
-

dbus_g_type_register_collection ()

-
void                dbus_g_type_register_collection     (const char *name,
-                                                         const DBusGTypeSpecializedCollectionVtable *vtable,
-                                                         guint flags);
-

-Defines a new collection container. -

-
-- - - - - - - - - - - - - - -

name :

The name of a new collection container

vtable :

the vtable defining the new container

flags :

As yet unused.
-
-
-
-

dbus_g_type_register_map ()

-
void                dbus_g_type_register_map            (const char *name,
-                                                         const DBusGTypeSpecializedMapVtable *vtable,
-                                                         guint flags);
-

-Defines a new map container. -

-
-- - - - - - - - - - - - - - -

name :

The name of a new map container

vtable :

the vtable defining the new container

flags :

As yet unused.
-
-
-
-

dbus_g_type_register_struct ()

-
void                dbus_g_type_register_struct         (const char *name,
-                                                         const DBusGTypeSpecializedStructVtable *vtable,
-                                                         guint flags);
-

-Defines a new struct container. -

-
-- - - - - - - - - - - - - - -

name :

The name of a new struct container

vtable :

the vtable defining the new container

flags :

As yet unused.
-
-
-
-

dbus_g_type_specialized_collection_append ()

-
void                dbus_g_type_specialized_collection_append
-                                                        (DBusGTypeSpecializedAppendContext *ctx,
-                                                         GValue *elt);
-

-Appends a given element to the end of a collection. -

-
-- - - - - - - - - - -

ctx :

a context created by dbus_g_type_specialized_init_append() -for a GValue containing a collection

elt :

a GValue containing an element to append to the collection
-
-
-
-

dbus_g_type_specialized_collection_end_append ()

-
void                dbus_g_type_specialized_collection_end_append
-                                                        (DBusGTypeSpecializedAppendContext *ctx);
-

-Finish appending elements to a given collection -

-
-- - - - -

ctx :

a context created by dbus_g_type_specialized_init_append() -for a GValue containing a collection
-
-
-
-

dbus_g_type_specialized_construct ()

-
gpointer            dbus_g_type_specialized_construct   (GType gtype);
-

-Create an instance of a given specialized type. -The structure created and returned will depend on the container type of the -GType. E.g. If the given type was created by -dbus_g_type_get_collection("GArray", G_TYPE_INT), -then this will return a GArray with element_size of sizeof(int) -

-
-- - - - - - - - - - -

gtype :

a specialized GType, as created by dbus_g_type_get_collection(), -dbus_g_type_get_map() or dbus_g_type_get_struct() -

Returns :

a pointer to a newly constructed instance of the given type.
-
-
-
-

dbus_g_type_specialized_init ()

-
void                dbus_g_type_specialized_init        (void);
-

-Initialize dbus-glib specialized GTypes. -

-

-In older versions of dbus-glib, it was necessary to do this before -instantiating or registering any specialized type. It is now done -automatically whenever necessary. -

-
-
-
-

dbus_g_type_specialized_init_append ()

-
void                dbus_g_type_specialized_init_append (GValue *value,
-                                                         DBusGTypeSpecializedAppendContext *ctx);
-

-Create a new context for adding elements to a collection or key/value pairs -to a map. You generally don't need or want to use this.. -

-
-- - - - - - - - - - -

value :

a GValue containing an instance of specialized type

ctx :

a DBusGTypeSpecializedAppendContext in which to return a new appending context.
-
-
-
-

dbus_g_type_specialized_map_append ()

-
void                dbus_g_type_specialized_map_append  (DBusGTypeSpecializedAppendContext *ctx,
-                                                         GValue *key,
-                                                         GValue *val);
-

-Inserts the given key/value pair into the map instance. -

-
-- - - - - - - - - - - - - - -

ctx :

a context created by dbus_g_type_specialized_init_append() -for a GValue containing a map

key :

a GValue containing a key, whose contents will be stolen by ctx -

val :

a GValue containing a value, whose contents will be stolen by ctx -
-
-
-
-

dbus_g_type_struct_get ()

-
gboolean            dbus_g_type_struct_get              (const GValue *value,
-                                                         guint member,
-                                                         ...);
-

-Collects the selected values of this struct into the return locations -provided. -

-
-- - - - - - - - - - - - - - - - - - -

value :

a GValue containing a struct instance

member :

struct member to get

... :

location in which to return the value of this member, -followed optionally by more member/return locations pairs, followed by -by G_MAXUINT -

Returns :

 -FALSE on failure
-
-
-
-

dbus_g_type_struct_get_member ()

-
gboolean            dbus_g_type_struct_get_member       (const GValue *value,
-                                                         guint member,
-                                                         GValue *dest);
-

-Fetches a given member of a given struct instance. dest must be initialised -was the correct type for that member, e.g. as returned by -dbus_g_type_get_struct_member_type -

-
-- - - - - - - - - - - - - - - - - - -

value :

a GValue containing a struct instance

member :

the index of a given member

dest :

an initialised GValue in which to return the struct member

Returns :

 -TRUE if successful
-
-
-
-

dbus_g_type_struct_peek_vtable ()

-
const DBusGTypeSpecializedStructVtable * dbus_g_type_struct_peek_vtable
-                                                        (GType struct_type);
-

-Peek the vtable for a given struct specialization -

-
-- - - - - - - - - - -

struct_type :

a gtype of a struct specialization

Returns :

the vtable
-
-
-
-

dbus_g_type_struct_set ()

-
gboolean            dbus_g_type_struct_set              (GValue *value,
-                                                         guint member,
-                                                         ...);
-

-Sets the selected members of the struct in value. -

-
-- - - - - - - - - - - - - - - - - - -

value :

a GValue containing a struct instance

member :

struct member to set

... :

value for the first member, followed optionally by -more member/value pairs, followed by G_MAXUINT -

Returns :

 -FALSE on failure
-
-
-
-

dbus_g_type_struct_set_member ()

-
gboolean            dbus_g_type_struct_set_member       (GValue *value,
-                                                         guint member,
-                                                         const GValue *src);
-

-Sets a given member of a struct to a new value. The type of src must match -the existing type of member member of the struct. -

-
-- - - - - - - - - - - - - - - - - - -

value :

a GValue containing a struct instance

member :

the index of a given member

src :

an GValue containing the new value for that struct member

Returns :

 -TRUE if successful
-
-
-
-

dbus_g_value_build_g_variant ()

-
GVariant *          dbus_g_value_build_g_variant        (const GValue *value);
-

-Recurses value and converts its contents to a GVariant. -

-

-The value must either be a simple value (integer, string, boolean, -object path etc.) or a specialized container registered with -dbus_g_type_get_collection(), dbus_g_type_get_map() or -dbus_g_type_get_struct(). Providing any other type is a programming error -(including as a child type). -

-
-- - - - - - - - - - -

value :

a simple or specialized GValue to convert to a GVariant -

Returns :

a new GVariant containing value with a floating reference
-
-
-
-
-
- Generated by GTK-Doc V1.18
- - \ No newline at end of file diff -Nru dbus-glib-0.100.1/doc/reference/html/dbus-glib.devhelp2 dbus-glib-0.100.2/doc/reference/html/dbus-glib.devhelp2 --- dbus-glib-0.100.1/doc/reference/html/dbus-glib.devhelp2 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/html/dbus-glib.devhelp2 2013-02-25 12:24:40.000000000 +0000 @@ -5,78 +5,149 @@ - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru dbus-glib-0.100.1/doc/reference/html/index.html dbus-glib-0.100.2/doc/reference/html/index.html --- dbus-glib-0.100.1/doc/reference/html/index.html 2013-02-15 17:00:01.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/html/index.html 2013-02-25 12:24:41.000000000 +0000 @@ -14,7 +14,7 @@
-

for version 0.100.1 +

for version 0.100.2

@@ -25,10 +25,28 @@
API for using D-BUS with GLib
-Specializable GType System — Specialized GTypes +DBusGConnection — DBus Connection
-DBus GLib low level — DBus lower level functions +DBus GObject related functions — Exporting a GObject remotely +
+
+DBusGMessage — DBus Message +
+
+DBusGMethod — GMethod Info & Invocation +
+
+DBusGError — DBus GError +
+
+DBusGProxy — DBus Proxy +
+
+Specializable GType System — Specialized GTypes +
+
+DBus GLib low level — DBus lower level functions
Tools Reference
diff -Nru dbus-glib-0.100.1/doc/reference/html/index.sgml dbus-glib-0.100.2/doc/reference/html/index.sgml --- dbus-glib-0.100.1/doc/reference/html/index.sgml 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/html/index.sgml 2013-02-25 12:24:40.000000000 +0000 @@ -1,75 +1,176 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru dbus-glib-0.100.1/doc/reference/tmpl/dbus-gconnection.sgml dbus-glib-0.100.2/doc/reference/tmpl/dbus-gconnection.sgml --- dbus-glib-0.100.1/doc/reference/tmpl/dbus-gconnection.sgml 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/tmpl/dbus-gconnection.sgml 2013-02-25 12:24:40.000000000 +0000 @@ -9,11 +9,13 @@ + + diff -Nru dbus-glib-0.100.1/doc/reference/tmpl/dbus-gerror.sgml dbus-glib-0.100.2/doc/reference/tmpl/dbus-gerror.sgml --- dbus-glib-0.100.1/doc/reference/tmpl/dbus-gerror.sgml 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/tmpl/dbus-gerror.sgml 2013-02-25 12:24:40.000000000 +0000 @@ -9,11 +9,13 @@ + + diff -Nru dbus-glib-0.100.1/doc/reference/tmpl/dbus-glib-lowlevel.sgml dbus-glib-0.100.2/doc/reference/tmpl/dbus-glib-lowlevel.sgml --- dbus-glib-0.100.1/doc/reference/tmpl/dbus-glib-lowlevel.sgml 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/tmpl/dbus-glib-lowlevel.sgml 2013-02-25 12:24:40.000000000 +0000 @@ -9,47 +9,26 @@ + + - - - - - - - - - - - - - - - - - - - -@connection: -@Returns: - - - + -@void: -@Returns: +@gerror: +@derror: @@ -61,85 +40,35 @@ @context: - - - - - -@gconnection: -@Returns: - - - - - - - -@gmessage: -@Returns: - - - - - - - -@context: -@Returns: - - - + -@context: +@connection: @Returns: - + +@server: @context: -@reply: - - - - - - - -@proxy: -@message: -@client_serial: - - - - - - -@void: -@Returns: - - + -@server: -@context: - + -@gerror: -@derror: diff -Nru dbus-glib-0.100.1/doc/reference/tmpl/dbus-glib-unused.sgml dbus-glib-0.100.2/doc/reference/tmpl/dbus-glib-unused.sgml --- dbus-glib-0.100.1/doc/reference/tmpl/dbus-glib-unused.sgml 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/tmpl/dbus-glib-unused.sgml 2013-02-25 12:24:40.000000000 +0000 @@ -1,545 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -DBusGConnection - - - - - - - - - - - - - - - - - - - - - - - - - - - -DBusGError - - - - - - - - - - - - - - - - - - - - - - - - - - - -DBusGMessage - - - - - - - - - - - - - - - - - - - - - - - - - - - -DBusGMethod - - - - - - - - - - - - - - - - - - - - - - - - - - - -DBusGProxy - - - - - - - - - - - - - - - - - - - - - - - - - - - -example-service-glue - - - - - - - - - - - - - - - - - - - - - - - - - - - -example-signal-emitter-glue - - - - - - - - - - - - - - - - - - - - - - - - - - - -sm-marshal - - - - - - - - - - - - - - - - - - - - - - - - - - - -statemachine-glue - - - - - - - - - - - - - - - - - - - - - - - - - - - -statemachine-server-glue - - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@v: - - - - - - -@v: - - - - - - -@v: - - - - - - -@v: - - - - - - -@v: - - - - - - -@v: - - - - - - -@v: - - - - - - -@v: - - - - - - -@v: - - - - - - -@v: - - - - - - -@v: - - - - - - -@v: - - - - - - -@v: - - - - - - -@v: - - - - - - -@v: - - - - - - -@v: - - - - - - -@v: - - - - - - -@v: - - - - - - -@v: - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - diff -Nru dbus-glib-0.100.1/doc/reference/tmpl/dbus-glib.sgml dbus-glib-0.100.2/doc/reference/tmpl/dbus-glib.sgml --- dbus-glib-0.100.1/doc/reference/tmpl/dbus-glib.sgml 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/tmpl/dbus-glib.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,749 +0,0 @@ - -DBusGProxy - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@cb: -@userdata: - - - - - - - - - - - - -@DBUS_GERROR_FAILED: -@DBUS_GERROR_NO_MEMORY: -@DBUS_GERROR_SERVICE_UNKNOWN: -@DBUS_GERROR_NAME_HAS_NO_OWNER: -@DBUS_GERROR_NO_REPLY: -@DBUS_GERROR_IO_ERROR: -@DBUS_GERROR_BAD_ADDRESS: -@DBUS_GERROR_NOT_SUPPORTED: -@DBUS_GERROR_LIMITS_EXCEEDED: -@DBUS_GERROR_ACCESS_DENIED: -@DBUS_GERROR_AUTH_FAILED: -@DBUS_GERROR_NO_SERVER: -@DBUS_GERROR_TIMEOUT: -@DBUS_GERROR_NO_NETWORK: -@DBUS_GERROR_ADDRESS_IN_USE: -@DBUS_GERROR_DISCONNECTED: -@DBUS_GERROR_INVALID_ARGS: -@DBUS_GERROR_FILE_NOT_FOUND: -@DBUS_GERROR_FILE_EXISTS: -@DBUS_GERROR_UNKNOWN_METHOD: -@DBUS_GERROR_TIMED_OUT: -@DBUS_GERROR_MATCH_RULE_NOT_FOUND: -@DBUS_GERROR_MATCH_RULE_INVALID: -@DBUS_GERROR_SPAWN_EXEC_FAILED: -@DBUS_GERROR_SPAWN_FORK_FAILED: -@DBUS_GERROR_SPAWN_CHILD_EXITED: -@DBUS_GERROR_SPAWN_CHILD_SIGNALED: -@DBUS_GERROR_SPAWN_FAILED: -@DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN: -@DBUS_GERROR_INVALID_SIGNATURE: -@DBUS_GERROR_INVALID_FILE_CONTENT: -@DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN: -@DBUS_GERROR_REMOTE_EXCEPTION: - - - - - - - - - - - - -@function: -@marshaller: -@data_offset: - - - - - - - - - - - - -@format_version: -@method_infos: -@n_method_infos: -@data: -@exported_signals: -@exported_properties: - - - - - - - - - - - - - - - - - - -@dbusgproxy: the object which received the signal. - - - - - - -@dbusgproxy: the object which received the signal. -@arg1: -@arg2: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@proxy: -@call_id: -@user_data: - - - - - - - - - - - - - - - - - - - -@type: -@error: -@Returns: - - - - - - - -@type: -@context: -@error: -@Returns: - - - - - - - -@connection: - - - - - - - -@void: -@Returns: - - - - - - - -@connection: -@at_path: -@Returns: - - - - - - - -@address: -@error: -@Returns: - - - - - - - -@connection: -@Returns: - - - - - - - -@connection: -@at_path: -@object: - - - - - - - -@connection: - - - - - - - -@connection: -@object: - - - - - - - -@domain: -@default_iface: -@code_enum: - - - - - - - -@error: -@Returns: - - - - - - - -@error: -@name: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@message: -@Returns: - - - - - - - -@message: - - - - - - - -@context: -@...: - - - - - - - -@context: -@error: - - - - - - - -@void: -@Returns: - - - - - - - -@marshaller: -@rettype: -@...: - - - - - - - -@marshaller: -@rettype: -@n_types: -@types: - - - - - - - -@object_type: -@info: - - - - - - - -@iface_type: -@dbus_prop_name: -@shadow_prop_name: - - - - - - - -@proxy: -@signal_name: -@first_type: -@...: - - - - - - - -@proxy: -@method: -@notify: -@user_data: -@destroy: -@first_arg_type: -@...: -@Returns: - - - - - - - -@proxy: -@method: -@notify: -@user_data: -@destroy: -@timeout: -@first_arg_type: -@...: -@Returns: - - - - - - - -@proxy: -@method: -@error: -@first_arg_type: -@...: -@Returns: - - - - - - - -@proxy: -@method: -@first_arg_type: -@...: - - - - - - - -@proxy: -@method: -@timeout: -@error: -@first_arg_type: -@...: -@Returns: - - - - - - - -@proxy: -@call: - - - - - - - -@proxy: -@signal_name: -@handler: -@data: -@free_data_func: - - - - - - - -@proxy: -@signal_name: -@handler: -@data: - - - - - - - -@proxy: -@call: -@error: -@first_arg_type: -@...: -@Returns: - - - - - - - -@proxy: -@Returns: - - - - - - - -@proxy: -@Returns: - - - - - - - -@proxy: -@Returns: - - - - - - - -@connection: -@name: -@path: -@iface: -@Returns: - - - - - - - -@connection: -@name: -@path: -@iface: -@error: -@Returns: - - - - - - - -@connection: -@path: -@iface: -@Returns: - - - - - - - -@proxy: -@iface: -@path: -@Returns: - - - - - - - -@proxy: -@timeout: - - - - - - - -@proxy: -@interface_name: - - - - - - - -@void: -@Returns: - - - - - - - -@void: - - - - - - - -@void: - - diff -Nru dbus-glib-0.100.1/doc/reference/tmpl/dbus-gmessage.sgml dbus-glib-0.100.2/doc/reference/tmpl/dbus-gmessage.sgml --- dbus-glib-0.100.1/doc/reference/tmpl/dbus-gmessage.sgml 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/tmpl/dbus-gmessage.sgml 2013-02-25 12:24:40.000000000 +0000 @@ -9,11 +9,13 @@ + + diff -Nru dbus-glib-0.100.1/doc/reference/tmpl/dbus-gmethod.sgml dbus-glib-0.100.2/doc/reference/tmpl/dbus-gmethod.sgml --- dbus-glib-0.100.1/doc/reference/tmpl/dbus-gmethod.sgml 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/tmpl/dbus-gmethod.sgml 2013-02-25 12:24:40.000000000 +0000 @@ -9,11 +9,13 @@ + + diff -Nru dbus-glib-0.100.1/doc/reference/tmpl/dbus-gobject.sgml dbus-glib-0.100.2/doc/reference/tmpl/dbus-gobject.sgml --- dbus-glib-0.100.1/doc/reference/tmpl/dbus-gobject.sgml 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/tmpl/dbus-gobject.sgml 2013-02-25 12:24:40.000000000 +0000 @@ -9,14 +9,85 @@ + + + + + + + +@format_version: +@method_infos: +@n_method_infos: +@data: +@exported_signals: +@exported_properties: + + + + + + +@object_type: +@info: + + + + + + + +@iface_type: +@dbus_prop_name: +@shadow_prop_name: + + + + + + + +@void: +@Returns: + + + + + + + +@marshaller: +@rettype: +@...: + + + + + + + +@marshaller: +@rettype: +@n_types: +@types: + + + + + + + +@void: + + diff -Nru dbus-glib-0.100.1/doc/reference/tmpl/dbus-gproxy.sgml dbus-glib-0.100.2/doc/reference/tmpl/dbus-gproxy.sgml --- dbus-glib-0.100.1/doc/reference/tmpl/dbus-gproxy.sgml 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/tmpl/dbus-gproxy.sgml 2013-02-25 12:24:40.000000000 +0000 @@ -9,11 +9,13 @@ + + diff -Nru dbus-glib-0.100.1/doc/reference/tmpl/dbus-gtool-test.sgml dbus-glib-0.100.2/doc/reference/tmpl/dbus-gtool-test.sgml --- dbus-glib-0.100.1/doc/reference/tmpl/dbus-gtool-test.sgml 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/tmpl/dbus-gtool-test.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ - -dbus-gtool-test - - - - - - - - - - - - - - - - - - - - diff -Nru dbus-glib-0.100.1/doc/reference/tmpl/dbus-gtype-specialized-priv.sgml dbus-glib-0.100.2/doc/reference/tmpl/dbus-gtype-specialized-priv.sgml --- dbus-glib-0.100.1/doc/reference/tmpl/dbus-gtype-specialized-priv.sgml 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/tmpl/dbus-gtype-specialized-priv.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ - -dbus-gtype-specialized-priv - - - - - - - - - - - - - - - - - - - - diff -Nru dbus-glib-0.100.1/doc/reference/tmpl/dbus-gtype-specialized.sgml dbus-glib-0.100.2/doc/reference/tmpl/dbus-gtype-specialized.sgml --- dbus-glib-0.100.1/doc/reference/tmpl/dbus-gtype-specialized.sgml 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/tmpl/dbus-gtype-specialized.sgml 2013-02-25 12:24:40.000000000 +0000 @@ -9,132 +9,134 @@ + + - + -@val: -@specialization_type: +@value: +@user_data: - + + -@ctx: -@val: +@key_val: +@value_val: +@user_data: - + -@ctx: - +@val: +@specialization_type: - + @type: -@instance: -@values: -@len: @Returns: - + -@value: -@user_data: +@type: +@val: - + @type: -@instance: -@iterator: -@user_data: +@src: +@Returns: - + -@base_vtable: -@fixed_accessor: -@iterator: -@append_func: -@end_append_func: +@constructor: +@free_func: +@copy_func: +@simple_free_func: - + @type: +@instance: +@values: +@len: @Returns: - + @type: -@src: -@Returns: +@instance: +@iterator: +@user_data: - + -@type: +@ctx: @val: - + @ctx: -@key: -@val: - + -@key_val: -@value_val: -@user_data: - +@base_vtable: +@fixed_accessor: +@iterator: +@append_func: +@end_append_func: @@ -147,6 +149,16 @@ @user_data: + + + + + +@ctx: +@key: +@val: + + @@ -189,57 +201,59 @@ @get_member: @set_member: - + -@constructor: -@free_func: -@copy_func: -@simple_free_func: +@container: +@specialization: +@Returns: - + + -@value: -@data_ret: -@len_ret: +@container: +@key_specialization: +@value_specialization: @Returns: - + -@collection_type: +@container: +@num_members: +@types: @Returns: - + -@value: -@iterator: -@user_data: +@container: +@first_type: +@...: +@Returns: - + -@container: -@specialization: +@gtype: @Returns: - + @@ -248,18 +262,16 @@ @Returns: - + -@container: -@key_specialization: -@value_specialization: +@gtype: @Returns: - + @@ -268,7 +280,7 @@ @Returns: - + @@ -277,14 +289,12 @@ @Returns: - + -@container: -@first_type: -@...: +@gtype: @Returns: @@ -307,53 +317,72 @@ @Returns: - + -@container: -@num_members: -@types: +@gtype: @Returns: - + -@gtype: -@Returns: +@value: +@ctx: - + -@gtype: -@Returns: +@ctx: +@elt: - + -@gtype: -@Returns: +@ctx: - + -@map_type: +@ctx: +@key: +@val: + + + + + + + +@value: +@data_ret: +@len_ret: @Returns: + + + + + +@value: +@iterator: +@user_data: + + @@ -364,6 +393,58 @@ @user_data: + + + + + +@value: +@member: +@dest: +@Returns: + + + + + + + +@value: +@member: +@src: +@Returns: + + + + + + + +@value: +@member: +@...: +@Returns: + + + + + + + +@value: +@member: +@...: +@Returns: + + + + + + + +@void: + + @@ -384,6 +465,33 @@ @flags: + + + + + +@map_type: +@Returns: + + + + + + + +@collection_type: +@Returns: + + + + + + + +@struct_type: +@Returns: + + @@ -394,118 +502,103 @@ @flags: - + -@ctx: -@elt: +@value: +@Returns: - + -@ctx: +@variant: +@value: - + -@gtype: -@Returns: - + -@void: - + -@value: -@ctx: - + -@ctx: -@key: -@val: - + -@value: -@member: -@...: -@Returns: - + -@value: -@member: -@dest: -@Returns: - + -@struct_type: -@Returns: - + -@value: -@member: -@...: -@Returns: - + -@value: -@member: -@src: -@Returns: + + - + + + + + + + + + + + -@value: -@Returns: diff -Nru dbus-glib-0.100.1/doc/reference/tmpl/dbus-gvalue-parse-variant.sgml dbus-glib-0.100.2/doc/reference/tmpl/dbus-gvalue-parse-variant.sgml --- dbus-glib-0.100.1/doc/reference/tmpl/dbus-gvalue-parse-variant.sgml 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/tmpl/dbus-gvalue-parse-variant.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ - -dbus-gvalue-parse-variant - - - - - - - - - - - - - - - - - - - - - - - - - -@variant: -@value: - - diff -Nru dbus-glib-0.100.1/doc/reference/tmpl/example-service-glue.sgml dbus-glib-0.100.2/doc/reference/tmpl/example-service-glue.sgml --- dbus-glib-0.100.1/doc/reference/tmpl/example-service-glue.sgml 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/tmpl/example-service-glue.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,208 +0,0 @@ - -example-service-glue - - - - - - - - - - - - - - - - - - - - - - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - diff -Nru dbus-glib-0.100.1/doc/reference/tmpl/example-signal-emitter-glue.sgml dbus-glib-0.100.2/doc/reference/tmpl/example-signal-emitter-glue.sgml --- dbus-glib-0.100.1/doc/reference/tmpl/example-signal-emitter-glue.sgml 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/tmpl/example-signal-emitter-glue.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,195 +0,0 @@ - -example-signal-emitter-glue - - - - - - - - - - - - - - - - - - - - - - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - diff -Nru dbus-glib-0.100.1/doc/reference/tmpl/sm-marshal.sgml dbus-glib-0.100.2/doc/reference/tmpl/sm-marshal.sgml --- dbus-glib-0.100.1/doc/reference/tmpl/sm-marshal.sgml 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/tmpl/sm-marshal.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ - -sm-marshal - - - - - - - - - - - - - - - - - - - - - - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - diff -Nru dbus-glib-0.100.1/doc/reference/tmpl/statemachine-glue.sgml dbus-glib-0.100.2/doc/reference/tmpl/statemachine-glue.sgml --- dbus-glib-0.100.1/doc/reference/tmpl/statemachine-glue.sgml 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/tmpl/statemachine-glue.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,221 +0,0 @@ - -statemachine-glue - - - - - - - - - - - - - - - - - - - - - - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - diff -Nru dbus-glib-0.100.1/doc/reference/tmpl/statemachine-server-glue.sgml dbus-glib-0.100.2/doc/reference/tmpl/statemachine-server-glue.sgml --- dbus-glib-0.100.1/doc/reference/tmpl/statemachine-server-glue.sgml 2013-02-15 16:59:59.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/tmpl/statemachine-server-glue.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,208 +0,0 @@ - -statemachine-server-glue - - - - - - - - - - - - - - - - - - - - - - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - - -@closure: -@return_value: -@n_param_values: -@param_values: -@invocation_hint: -@marshal_data: - - - - - - - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - - - - - - -@v: - - diff -Nru dbus-glib-0.100.1/doc/reference/version.xml dbus-glib-0.100.2/doc/reference/version.xml --- dbus-glib-0.100.1/doc/reference/version.xml 2013-02-15 16:59:56.000000000 +0000 +++ dbus-glib-0.100.2/doc/reference/version.xml 2013-02-25 12:21:09.000000000 +0000 @@ -1 +1 @@ -0.100.1 +0.100.2 diff -Nru dbus-glib-0.100.1/install-sh dbus-glib-0.100.2/install-sh --- dbus-glib-0.100.1/install-sh 2011-09-30 15:46:14.000000000 +0000 +++ dbus-glib-0.100.2/install-sh 2012-07-10 21:28:47.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-01-19.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -156,6 +156,10 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -200,7 +208,11 @@ fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for `test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -385,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru dbus-glib-0.100.1/missing dbus-glib-0.100.2/missing --- dbus-glib-0.100.1/missing 2011-09-30 15:46:14.000000000 +0000 +++ dbus-glib-0.100.2/missing 2012-07-10 21:28:47.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.13; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,6 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -122,15 +121,6 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -226,7 +216,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -256,7 +246,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -318,41 +308,6 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg.