Merge lp:~bcurtiswx/ubuntu/precise/telepathy-glib/0.18.2-0ubuntu1 into lp:ubuntu/precise/telepathy-glib

[Brian Curtis]

telepathy-glib (0.18.2-0ubuntu1) UNRELEASED; urgency=low

  * New upstream stable release. (LP: #1030416)
    - refreshed patch
    - Empathy doesn't display buddy list (LP: #1018504)

 -- Brian Curtis <email address hidden> Sat, 28 Jul 2012 20:48:04 -0400

[Daniel Holbach (dholbach)]

Thanks a lot for your work on this, but I'm afraid we have 0.19.6-0ubuntu1 in quantal already.

[Daniel Holbach (dholbach)]

Sorry, I missed that this was for precise.

[Daniel Holbach (dholbach)]

Leaving this for somebody else, as I currently don't have a machine to test precise.

[Robert Bruce Park (robru)]

Built with pbuilder, no problem with build deps, skimmed through diff and didn't see any other version bumps. Compiled, installed on precise, it all looks good including showing my gtalk contact list successfully.

review: Approve

[Didier Roche-Tolomelli (didrocks)]

Thanks a lot Brian, looks good and robru confirmed it to work well on precise!

review: Approve

[Didier Roche-Tolomelli (didrocks)]

btw, your branch wasn't proposed against precise-proposed, so I've uploaded it there, (this branch will be marked as rejected even if your work went through ;))

Unmerged revisions

87. By Brian Curtis on 2012-07-29

* New upstream stable release. (LP: #1030416)
  - Empathy doesn't display buddy list (LP: #1018504)

86. By Brian Curtis on 2012-07-29

* New upstream release.
  - refreshed patch

=== modified file 'ChangeLog'
--- ChangeLog	2012-04-03 10:16:49 +0000
+++ ChangeLog	2012-07-29 01:19:20 +0000
@@ -1,3 +1,284 @@
+commit 19cb443d1a7accc92934e6fc89c4e3962caf2ff3
+Author: Xavier Claessens <[e-mail]>
+Date:   2012-07-05 15:29:58 +0200
+
+    Make sure "make -j3 maintainer-foo" works
+
+commit 8392229d6cf825198bb0cbeb706ed0900f962112
+Author: Guillaume Desmottes <[e-mail]>
+Date:   2012-07-28 10:52:01 +0200
+
+    prepare 0.18.2
+
+commit e2f99aa39425dd3431e9cd8d09fb3b144c1ab0a7
+Author: Xavier Claessens <[e-mail]>
+Date:   2012-07-24 15:28:00 +0200
+
+    tp_connection_upgrade_contacts(): Use special trick of ready_enough_for_contacts
+    
+    TpConnection itself wants to prepare TpContacts before being officially
+    CONNECTED. This was already the case for self contact. Use the same
+    trick for blocked contacts.
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=52441
+
+commit 14992772277269299373386d68a632a5968ad511
+Author: Colin Walters <[e-mail]>
+Date:   2012-05-11 15:53:51 +0100
+
+    vala: Fix srcdir != builddir
+    
+    We need to look for the .metadata file in the source directory,
+    otherwise we silently generate a binding with a namespace of "Tp", not
+    "TelepathyGLib".
+    
+    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49802
+    Reviewed-by: Simon McVittie <[e-mail]>
+
+commit f3681d4dddcfbb86525dcf2b9371231ad3681de5
+Author: Simon McVittie <[e-mail]>
+Date:   2012-05-02 12:07:40 +0100
+
+    NEWS for 0.18
+
+commit 759d4b5ff49e1f067ef6cf3cc71e2584d1067ed6
+Author: Simon McVittie <[e-mail]>
+Date:   2012-05-01 13:14:04 +0100
+
+    Add `make clean-for-new-branch`
+
+commit 5d2f1f6a6b491a9eb05ff0013a258471d59248de
+Author: Guillaume Desmottes <[e-mail]>
+Date:   2011-11-16 14:23:21 +0100
+
+    Retry to prepare features which failed because of a missing conn iface
+    
+    If we try to prepare a connection feature before the connection is connected,
+    the preparation may fall if a required interface hasn't been announced yet by
+    the CM. So, we give those features a second chance to be prepared when the
+    connection has been connected.
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=42981
+
+commit 3e49a76cd11ab42610ac498cd0d0a66e580d6f63
+Author: Simon McVittie <[e-mail]>
+Date:   2012-04-20 18:26:44 +0100
+
+    nano version
+
+commit 32532b43297b8c9009581e0dca93dc1f0c1e0a9d
+Author: Simon McVittie <[e-mail]>
+Date:   2012-04-20 18:19:39 +0100
+
+    belatedly name the release
+
+commit 629bea3bfcf0c6698055b5bf6811485b330d335b
+Author: Simon McVittie <[e-mail]>
+Date:   2012-04-20 17:07:25 +0100
+
+    Prepare 0.18.1
+
+commit bab960e0f3f63a52850e76b80b3dae77ea9c174d
+Author: Xavier Claessens <[e-mail]>
+Date:   2012-04-03 11:50:15 +0200
+
+    TpAM: Document that _set_default() keeps an internal reference
+
+commit 57e23d6d7788498061349649e9b4bccf9ea7bf7b
+Author: Xavier Claessens <[e-mail]>
+Date:   2012-04-16 17:42:33 +0200
+
+    Do not use _tp_connection_lookup_contact() outside contact.c
+    
+    That function is dangerous because it does not guarantee that the returned TpContact
+    has an identifier set.
+    
+    In the case a TpContact is being created with tp_connection_get_contacts_by_id(),
+    the first step is to inspect its handle and then create the TpContact object
+    *without* giving its ID. The id will be set later once we got the contact attributes.
+    
+    If _tp_connection_lookup_contact() is called for the same handle/id between
+    the moment the TpContact is created and the moment it sets its attributes, then
+    a contact with no identifier is returned.
+
+commit 66d1a078e9d52791ad53db2ce7a94e817e86d12e
+Author: Simon McVittie <[e-mail]>
+Date:   2012-04-13 12:38:26 +0100
+
+    NEWS
+
+commit 892174994149b1266f266833f90e73e6a727945c
+Author: Simon McVittie <[e-mail]>
+Date:   2012-04-12 16:55:47 +0100
+
+    Don't make g-ir-scanner warnings fatal on this stable branch
+    
+    Reviewed-by: Jonny Lamb <[e-mail]>
+
+commit c992c64af097576d1023dc793a6d4752360ff564
+Author: Alban Browaeys <[e-mail]>
+Date:   2012-04-10 00:48:08 +0200
+
+    Codegen: fix comment line start leftover.
+    
+    Generated telepathy-glib/_gen/telepathy-enums-gtk-doc.h from:
+     /usr/bin/python ../tools/c-constants-gen.py         Tp
+    _gen/stable-spec.xml _gen/telepathy-enums
+    has incorrect comment. Fix it with the same remedy as
+    in 5c58330c32f39a9dd6aaaef37f54461922cf6124
+    "many fixes to documentation comments"
+    ie remove the newline between '*' and identifier.
+    
+    Reviewed-by: Simon McVittie <[e-mail]>
+    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48363
+
+commit 0065a23ce403becdaf86139b5bb29d0d9fe2f3cc
+Author: Stef Walter <[e-mail]>
+Date:   2012-04-12 16:30:13 +0200
+
+    Fix gtk-doc comments for auto-generated constants headers
+    
+    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48592
+    Reviewed-by: Simon McVittie <[e-mail]>
+
+commit a769d111600b58452622279128f040f50ebe48f6
+Author: Simon McVittie <[e-mail]>
+Date:   2012-04-12 14:01:40 +0100
+
+    dbus-tube-chan test: listen on a random address appropriate for the OS
+    
+    Instead of hard-coding the abstract Unix socket '\000dbus-tube-test',
+    listen on a random (abstract or real) Unix socket in /tmp if on Unix,
+    or a random port on 127.0.0.1 if not. These are the same listening
+    addresses I used in test/loopback.c in libdbus. The Unix version also
+    matches what the session bus normally uses.
+    
+    This fixes the test on non-Linux Unix (not insisting on
+    abstract-namespace sockets working), when run twice in parallel on Linux
+    (not insisting on using a particular hard-coded name), and in theory
+    also on Windows (not trying to use Unix sockets).
+    
+    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48600
+    Signed-off-by: Simon McVittie <[e-mail]>
+    Reviewed-by: Guillaume Desmottes <[e-mail]>
+
+commit 3302343b9dbe8246e1fda0d75db2145d8a9520bd
+Author: Simon McVittie <[e-mail]>
+Date:   2012-04-12 13:27:04 +0100
+
+    Upload documentation to the 0.18.x location
+
+commit e0329bd9ccc05b095c38fde993289db4912c09d5
+Author: Simon McVittie <[e-mail]>
+Date:   2010-09-20 12:07:15 +0100
+
+    Don't check documentation completeness in this stable branch
+
+commit 07d4cb30fa07bf3dca05bc77aa28170ba062c77e
+Author: Simon McVittie <[e-mail]>
+Date:   2010-04-06 12:33:21 +0100
+
+    Disable warnings about deprecated functions for stable branch
+    
+    Since this is a stable branch, we're unlikely to fix uses of
+    deprecated functions, so we shouldn't warn about them.
+
+commit abacdfed03e8e0247e29d760a138400f3868e95b
+Author: Simon McVittie <[e-mail]>
+Date:   2012-04-12 12:53:00 +0100
+
+    NEWS
+
+commit 114a16ba3f91dfa700770ec817ff3f8b4061e0a7
+Author: Stef Walter <[e-mail]>
+Date:   2012-04-12 11:46:52 +0200
+
+    Fix doc comments for recent stricter gtk-doc
+    
+     * Build fails with new gtk-doc (1.18.1) which seems to
+       be stricter than previous versions.
+    
+    [Also fixes g-ir-scanner warnings, which were what was actually fatal. -smcv]
+    
+    Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48592
+    Reviewed-by: Simon McVittie <[e-mail]>
+
+commit e2b5e25a33edc03682b61b307d640dfbf3b72e6c
+Author: Simon McVittie <[e-mail]>
+Date:   2012-04-12 11:51:35 +0100
+
+    0.18 NEWS
+
+commit 76b0d3cc3f6dd10f1f88a7e7b1d57a88ac531a08
+Author: Guillaume Desmottes <[e-mail]>
+Date:   2012-04-04 11:04:41 +0200
+
+    the right GLib macro is GLIB_VERSION_MAX_ALLOWED
+
+commit 08f4a05e33f8a3fa2fe0e326014dbaccc7c55be6
+Author: Guillaume Desmottes <[e-mail]>
+Date:   2012-04-03 15:54:12 +0200
+
+    add stream-tubes.py/accepter.py
+
+commit 8c31202992b37f0e387f67ca0100df2e1643c889
+Author: Guillaume Desmottes <[e-mail]>
+Date:   2012-04-03 15:54:12 +0200
+
+    add stream-tubes.py/offerer.py
+
+commit cf0e9d8b366792a9df8303778fcda2dec21217ea
+Author: Guillaume Desmottes <[e-mail]>
+Date:   2012-04-03 15:48:42 +0200
+
+    Fix the type of the TpStreamTubeConnection::closed signal
+    
+    python-gobject can't bind G_TYPE_POINTER.
+    
+    This seems to be save from an API/ABI pov according to GLib gurus,
+    we'll just copy the GError instead of passing the same pointer:
+
+commit e17cd19f2341eeafa666301580fed1f0a77c83a6
+Author: Guillaume Desmottes <[e-mail]>
+Date:   2012-04-03 14:43:50 +0200
+
+    stream tube examples: send \n with data
+    
+    This will allow us to use g_data_input_stream_read_line_utf8() in Python as
+    g_input_stream_read() is not bindable.
+
+commit b985cb3474132a802df647e0438a2872c02c71fa
+Author: Guillaume Desmottes <[e-mail]>
+Date:   2012-04-03 14:43:50 +0200
+
+    stream tube examples: use tp_channel_close_async()
+
+commit 55582d8af3627adf09ebf6ac586753ad4f6abe59
+Author: Guillaume Desmottes <[e-mail]>
+Date:   2012-04-03 14:43:50 +0200
+
+    stream tube examples: split sending/receiving data debug messages
+    
+    Make it easier to understand/debug what's going on.
+
+commit c93cd8f2bbb9c8888ba3a4ad153a485e33568a4c
+Author: Xavier Claessens <[e-mail]>
+Date:   2012-04-03 14:11:34 +0200
+
+    Introspect a few getters
+    
+    It is not always a good idea for bindings to always rely on GObject::get_property(),
+    it can be slow to access properties that way everytime instead of keeping
+    a proxy object in native language.
+
+commit 0dfebb47ded9af7128e641ac90a032e13c2be7f4
+Author: Jonny Lamb <[e-mail]>
+Date:   2012-04-02 16:43:12 -0400
+
+    start on version 0.18.1
+    
+    Signed-off-by: Jonny Lamb <[e-mail]>
+
 commit 95b3336d2d43fdbfe61692144dca8700e0ad0071
 Author: Jonny Lamb <[e-mail]>
 Date:   2012-04-02 16:31:18 -0400

=== modified file 'Makefile.am'
--- Makefile.am	2012-04-03 10:16:49 +0000
+++ Makefile.am	2012-07-29 01:19:20 +0000
@@ -37,7 +37,7 @@
 maintainer-upload-release: _maintainer-upload-release-local
 _maintainer-upload-release-local: _maintainer-upload-release-check
 	rsync -rvzPp --chmod=Dg+s,ug+rwX,o=rX $(builddir)/docs/reference/html/ \
-	telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-glib/
+	telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-glib-0.18.x/
 
 BRANCH = $(shell sh tools/git-which-branch.sh misc | tr -d '\n' | tr -C "[:alnum:]" _)
 UPLOAD_BRANCH_TO = people.freedesktop.org:public_html/telepathy-glib
@@ -52,3 +52,16 @@
 CHECK_FOR_UNRELEASED = $(srcdir)/NEWS $(wildcard $(srcdir)/telepathy-glib/*.[ch])
 
 include tools/telepathy.am
+
+# Don't just "make distclean", because that would result in forgetting
+# the options we used when we ran configure.
+#
+# However, we do want to distclean in docs (to get rid of xml, html etc.)
+# and in telepathy-glib (to get rid of any stray files in _gen which might
+# not exist on the new branch).
+clean-for-new-branch:
+	$(MAKE) clean
+	$(MAKE) -C docs distclean
+	$(MAKE) -C telepathy-glib distclean
+	$(SHELL) ./config.status --recheck
+	$(SHELL) ./config.status

=== modified file 'Makefile.in'
--- Makefile.in	2012-04-03 10:16:49 +0000
+++ Makefile.in	2012-07-29 01:19:20 +0000
@@ -832,7 +832,7 @@
 maintainer-upload-release: _maintainer-upload-release-local
 _maintainer-upload-release-local: _maintainer-upload-release-check
 	rsync -rvzPp --chmod=Dg+s,ug+rwX,o=rX $(builddir)/docs/reference/html/ \
-	telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-glib/
+	telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-glib-0.18.x/
 
 upload-branch-docs: all
 	rsync -rtzvPp --chmod=a+rX docs/reference/html/ \
@@ -902,9 +902,16 @@
 %.tar.gz.asc: %.tar.gz
 	$(AM_V_GEN)gpg --detach-sign --armor $@
 
-@PACKAGE@-@VERSION@.tar.gz: _is-release-check check distcheck
+@PACKAGE@-@VERSION@.tar.gz:
+	$(MAKE) _is-release-check
+	$(MAKE) check
+	$(MAKE) distcheck
 
-maintainer-prepare-release: _is-release-check all distcheck release-mail
+maintainer-prepare-release:
+	$(MAKE) _is-release-check
+	$(MAKE) all
+	$(MAKE) distcheck
+	$(MAKE) release-mail
 	git tag -s @PACKAGE@-@VERSION@ -m @PACKAGE@' '@VERSION@
 	gpg --detach-sign --armor @PACKAGE@-@VERSION@.tar.gz
 
@@ -924,12 +931,27 @@
 	rsync -vzP @PACKAGE@-@VERSION@.tar.gz telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz
 	rsync -vzP @PACKAGE@-@VERSION@.tar.gz.asc telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz.asc
 
-maintainer-make-release: maintainer-prepare-release maintainer-upload-release
+maintainer-make-release:
+	$(MAKE) maintainer-prepare-release
+	$(MAKE) maintainer-upload-release
 	@echo "Now:"
 	@echo " • bump the nano-version;"
 	@echo " • push the branch and tags upstream; and"
 	@echo " • send release-mail to <[e-mail]>."
 
+# Don't just "make distclean", because that would result in forgetting
+# the options we used when we ran configure.
+#
+# However, we do want to distclean in docs (to get rid of xml, html etc.)
+# and in telepathy-glib (to get rid of any stray files in _gen which might
+# not exist on the new branch).
+clean-for-new-branch:
+	$(MAKE) clean
+	$(MAKE) -C docs distclean
+	$(MAKE) -C telepathy-glib distclean
+	$(SHELL) ./config.status --recheck
+	$(SHELL) ./config.status
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

=== modified file 'NEWS'
--- NEWS	2012-04-03 10:16:49 +0000
+++ NEWS	2012-07-29 01:19:20 +0000
@@ -1,3 +1,57 @@
+telepathy-glib 0.18.2 (2012-07-28)
+==================================
+
+Enhancements:
+
+• Add "clean-for-new-branch" Makefile target which is more thorough than
+  clean, but less thorough than distclean (in particular, it doesn't
+  forget your ./configure options) (Simon)
+
+Fixes:
+
+• Retry preparation of features that depended on a missing connection
+  interface after the connection connects, in the hope that the interface has
+  now become available (fd.o #42981, Guillaume)
+
+• Fix warning when preparing blocked contacts before
+  TP_CONNECTION_FEATURE_CONNECTED is officially prepared. (fd.o #52441, Xavier)
+
+• Fix Vala bindings build when srcdir is different from
+  builddir. (fdo#49802, Colin)
+
+telepathy-glib 0.18.1 (2012-04-20)
+==================================
+
+The “King's Cross is unrecognisable” release.
+
+Enhancements:
+
+• Make various methods of the form get_foo() available to
+  gobject-introspection (Xavier)
+
+• Improve stream tube examples (Guillaume)
+
+• Improve documentation (Xavier)
+
+Fixes:
+
+• Change the type of TpStreamTubeConnection::closed's argument from
+  POINTER to ERROR so PyGI can bind it (Guillaume)
+
+• Avoid TpCallChannel potentially returning a TpContact with no identifier
+  (Xavier)
+
+• Use the right macro to avoid post-2.30 GLib APIs (Guillaume)
+
+• Fix warnings with newer gtk-doc and g-ir-scanner (fd.o #48592, fd.o #48363,
+  fd.o #48620; Stef Walter, Alban Browaeys)
+
+• Make various warnings non-fatal for this stable branch: GIR scanner warnings,
+  documentation completeness, and deprecated functions (fd.o #48363, Simon)
+
+• Don't hard-code use of a particular abstract socket in dbus-tube-chan test,
+  fixing test failure on non-Linux (fd.o #48600, Simon)
+
 telepathy-glib 0.18.0 (2012-04-02)
 ==================================
 

=== modified file 'aclocal.m4'
--- aclocal.m4	2012-03-28 15:13:41 +0000
+++ aclocal.m4	2012-07-29 01:19:20 +0000
@@ -48,8 +48,7 @@
 # ----------------------------------
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
 AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
 AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -95,8 +94,7 @@
     pkg_cv_[]$1="$$1"
  elif test -n "$PKG_CONFIG"; then
     PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
 		     [pkg_failed=yes])
  else
     pkg_failed=untried
@@ -144,9 +142,9 @@
    	AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -159,7 +157,7 @@
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-_PKG_TEXT])[]dnl
+_PKG_TEXT])
         ])
 elif test $pkg_failed = untried; then
      	AC_MSG_RESULT([no])
@@ -170,7 +168,7 @@
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
         ])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS

=== modified file 'config.guess'
--- config.guess	2012-04-03 10:16:49 +0000
+++ config.guess	2012-07-29 01:19:20 +0000
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2012-01-01'
 
 # 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,7 +17,9 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -861,13 +863,6 @@
     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 ;;
@@ -1325,9 +1320,6 @@
     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

=== modified file 'config.h.in'
--- config.h.in	2012-03-20 10:39:42 +0000
+++ config.h.in	2012-07-29 01:19:20 +0000
@@ -13,7 +13,7 @@
 #undef ENABLE_INSTALLED_TESTS
 
 /* Prevent post 2.30 APIs */
-#undef GLIB_VERSION_MAX_REQUIRED
+#undef GLIB_VERSION_MAX_ALLOWED
 
 /* Ignore post 2.30 deprecations */
 #undef GLIB_VERSION_MIN_REQUIRED

=== modified file 'config.sub'
--- config.sub	2012-04-03 10:16:49 +0000
+++ config.sub	2012-07-29 01:19:20 +0000
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2012-01-01'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,7 +21,9 @@
 # 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, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -130,10 +132,6 @@
     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 ]
@@ -249,7 +247,6 @@
 	# 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 \
@@ -322,7 +319,7 @@
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -335,10 +332,7 @@
 	strongarm | thumb | xscale)
 		basic_machine=arm-unknown
 		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
+
 	xscaleeb)
 		basic_machine=armeb-unknown
 		;;
@@ -361,7 +355,6 @@
 	# 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-* \

=== modified file 'configure'
--- configure	2012-04-03 10:16:49 +0000
+++ configure	2012-07-29 01:19:20 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Telepathy-GLib 0.18.0.
+# Generated by GNU Autoconf 2.68 for Telepathy-GLib 0.18.2.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=tp-glib>.
 #
@@ -631,8 +631,8 @@
 # Identity of this package.
 PACKAGE_NAME='Telepathy-GLib'
 PACKAGE_TARNAME='telepathy-glib'
-PACKAGE_VERSION='0.18.0'
-PACKAGE_STRING='Telepathy-GLib 0.18.0'
+PACKAGE_VERSION='0.18.2'
+PACKAGE_STRING='Telepathy-GLib 0.18.2'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=tp-glib'
 PACKAGE_URL=''
 
@@ -1469,7 +1469,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 Telepathy-GLib 0.18.0 to adapt to many kinds of systems.
+\`configure' configures Telepathy-GLib 0.18.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1539,7 +1539,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Telepathy-GLib 0.18.0:";;
+     short | recursive ) echo "Configuration of Telepathy-GLib 0.18.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1692,7 +1692,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Telepathy-GLib configure 0.18.0
+Telepathy-GLib configure 0.18.2
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2182,7 +2182,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Telepathy-GLib $as_me 0.18.0, which was
+It was created by Telepathy-GLib $as_me 0.18.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3000,7 +3000,7 @@
 
 # Define the identity of the package.
  PACKAGE='telepathy-glib'
- VERSION='0.18.0'
+ VERSION='0.18.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5690,7 +5690,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | netbsdelf*-gnu)
+netbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -9091,9 +9091,6 @@
   openbsd*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu | gnu*)
-    link_all_deplibs=no
-    ;;
   esac
 
   ld_shlibs=yes
@@ -9315,7 +9312,7 @@
       fi
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -9492,7 +9489,6 @@
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
-	link_all_deplibs=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -9946,7 +9942,7 @@
       link_all_deplibs=yes
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -10959,10 +10955,14 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -10974,18 +10974,6 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -11970,7 +11958,6 @@
 
 
 
-
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -12261,7 +12248,6 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -12278,7 +12264,6 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -12298,9 +12283,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>&1`
+	        GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>&1`
         else
-	        GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>&1`
+	        GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTKDOC_DEPS_PKG_ERRORS" >&5
@@ -12315,6 +12300,7 @@
 Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
 and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
+
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -12330,6 +12316,7 @@
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
+
 else
 	GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS
 	GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS
@@ -12502,7 +12489,7 @@
 
 
 LT_CURRENT=70
-LT_REVISION=0
+LT_REVISION=2
 LT_AGE=70
 
 
@@ -12757,7 +12744,8 @@
 
 
   for tp_flag in missing-field-initializers \
-   unused-parameter; do
+   unused-parameter \
+   deprecated-declarations; do
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -Wno-$tp_flag" >&5
 $as_echo_n "checking to see if compiler understands -Wno-$tp_flag... " >&6; }
@@ -13068,7 +13056,6 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.30.0, gobject-2.0 >= 2.30.0, gio-2.0 >= 2.30.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13085,7 +13072,6 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.30.0, gobject-2.0 >= 2.30.0, gio-2.0 >= 2.30.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13105,9 +13091,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.30.0, gobject-2.0 >= 2.30.0, gio-2.0 >= 2.30.0" 2>&1`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.30.0, gobject-2.0 >= 2.30.0, gio-2.0 >= 2.30.0" 2>&1`
         else
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.30.0, gobject-2.0 >= 2.30.0, gio-2.0 >= 2.30.0" 2>&1`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.30.0, gobject-2.0 >= 2.30.0, gio-2.0 >= 2.30.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GLIB_PKG_ERRORS" >&5
@@ -13122,6 +13108,7 @@
 Alternatively, you may set the environment variables GLIB_CFLAGS
 and GLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
+
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -13137,6 +13124,7 @@
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
+
 else
 	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
 	GLIB_LIBS=$pkg_cv_GLIB_LIBS
@@ -13149,7 +13137,7 @@
 $as_echo "#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_30" >>confdefs.h
 
 
-$as_echo "#define GLIB_VERSION_MAX_REQUIRED GLIB_VERSION_2_30" >>confdefs.h
+$as_echo "#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_30" >>confdefs.h
 
 
 
@@ -13167,7 +13155,6 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GIO_UNIX_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13184,7 +13171,6 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GIO_UNIX_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13204,9 +13190,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-unix-2.0" 2>&1`
+	        GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-unix-2.0" 2>&1`
         else
-	        GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-unix-2.0" 2>&1`
+	        GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-unix-2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GIO_UNIX_PKG_ERRORS" >&5
@@ -13257,7 +13243,6 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 0.95, dbus-glib-1 >= 0.90" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13274,7 +13259,6 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 0.95, dbus-glib-1 >= 0.90" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -13294,9 +13278,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 0.95, dbus-glib-1 >= 0.90" 2>&1`
+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 0.95, dbus-glib-1 >= 0.90" 2>&1`
         else
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 0.95, dbus-glib-1 >= 0.90" 2>&1`
+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 0.95, dbus-glib-1 >= 0.90" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DBUS_PKG_ERRORS" >&5
@@ -13311,6 +13295,7 @@
 Alternatively, you may set the environment variables DBUS_CFLAGS
 and DBUS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
+
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -13326,6 +13311,7 @@
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
+
 else
 	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
 	DBUS_LIBS=$pkg_cv_DBUS_LIBS
@@ -16188,7 +16174,7 @@
 	    ;;
 	esac
 	;;
-      netbsd* | netbsdelf*-gnu)
+      netbsd*)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -16559,9 +16545,6 @@
       ;;
     esac
     ;;
-  linux* | k*bsd*-gnu | gnu*)
-    link_all_deplibs_CXX=no
-    ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
     ;;
@@ -17172,10 +17155,14 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -17187,18 +17174,6 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -18147,7 +18122,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Telepathy-GLib $as_me 0.18.0, which was
+This file was extended by Telepathy-GLib $as_me 0.18.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18213,7 +18188,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Telepathy-GLib config.status 0.18.0
+Telepathy-GLib config.status 0.18.2
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2012-04-03 10:16:49 +0000
+++ configure.ac	2012-07-29 01:19:20 +0000
@@ -11,7 +11,7 @@
 
 m4_define([tp_glib_major_version], [0])
 m4_define([tp_glib_minor_version], [18])
-m4_define([tp_glib_micro_version], [0])
+m4_define([tp_glib_micro_version], [2])
 m4_define([tp_glib_nano_version], [0])
 
 # If library source has changed since last release, increment revision
@@ -27,7 +27,7 @@
 # never seen in a release).
 
 m4_define([tp_glib_lt_current], [70])
-m4_define([tp_glib_lt_revision], [0])
+m4_define([tp_glib_lt_revision], [2])
 m4_define([tp_glib_lt_age], [70])
 
 # Some magic
@@ -91,7 +91,8 @@
    format-security \
    init-self],
   [missing-field-initializers \
-   unused-parameter])
+   unused-parameter \
+   deprecated-declarations])
 AC_SUBST([ERROR_CFLAGS])
 
 # these aren't really error flags but they serve a similar purpose for us -
@@ -143,14 +144,16 @@
     [ENABLE_DOC_CHECKS=$enableval], [ENABLE_DOC_CHECKS=no] )
 ],
 [ # tp-glib is version x.y.z.1 - enable extra checks by default
+  # (but only partially, because this is a stable branch and gtk-doc's
+  # definition of "complete" sometimes changes)
   AC_ARG_ENABLE(coding-style-checks,
     AC_HELP_STRING([--disable-coding-style-checks],
                    [do not check coding style using grep]),
     [ENABLE_CODING_STYLE_CHECKS=$enableval], [ENABLE_CODING_STYLE_CHECKS=yes])
   AC_ARG_ENABLE(doc-checks,
-    AC_HELP_STRING([--disable-doc-checks],
-                   [do not check for complete documentation coverage]),
-    [ENABLE_DOC_CHECKS=$enableval], [ENABLE_DOC_CHECKS=yes])
+    AC_HELP_STRING([--enable-doc-checks],
+                   [check for complete documentation coverage]),
+    [ENABLE_DOC_CHECKS=$enableval], [ENABLE_DOC_CHECKS=no])
 ])
 
 AC_SUBST([ENABLE_CODING_STYLE_CHECKS])
@@ -200,7 +203,7 @@
   [glib-2.0 >= 2.30.0, gobject-2.0 >= 2.30.0, gio-2.0 >= 2.30.0])
 
 AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_30], [Ignore post 2.30 deprecations])
-AC_DEFINE([GLIB_VERSION_MAX_REQUIRED], [GLIB_VERSION_2_30], [Prevent post 2.30 APIs])
+AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_30], [Prevent post 2.30 APIs])
 
 dnl Check for GIO-Unix
 PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0],

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-03 10:16:49 +0000
+++ debian/changelog	2012-07-29 01:19:20 +0000
@@ -1,3 +1,11 @@
+telepathy-glib (0.18.2-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream stable release. (LP: #1030416)
+    - refreshed patch
+    - Empathy doesn't display buddy list (LP: #1018504)
+
+ -- Brian Curtis <[e-mail]>  Sat, 28 Jul 2012 20:48:04 -0400
+
 telepathy-glib (0.18.0-1ubuntu1) precise; urgency=low
 
   * Merge with Debian experimental. Remaining Ubuntu changes:

=== modified file 'debian/patches/ludicrous-timeout-for-lp-buildd.patch'
--- debian/patches/ludicrous-timeout-for-lp-buildd.patch	2012-02-08 09:35:54 +0000
+++ debian/patches/ludicrous-timeout-for-lp-buildd.patch	2012-07-29 01:19:20 +0000
@@ -6,11 +6,11 @@
 Bug-Ubuntu: https://bugs.launchpad.net/launchpad-buildd/+bug/804978
 Author: Adam Conrad <[e-mail]>
 
-Index: telepathy-glib-0.17.4/tests/dbus/contact-lists.c
+Index: telepathy-glib/tests/dbus/contact-lists.c
 ===================================================================
---- telepathy-glib-0.17.4.orig/tests/dbus/contact-lists.c	2011-12-19 16:11:12.000000000 +0100
-+++ telepathy-glib-0.17.4/tests/dbus/contact-lists.c	2012-02-08 09:37:37.699665948 +0100
-@@ -2664,7 +2664,7 @@
+--- telepathy-glib.orig/tests/dbus/contact-lists.c	2012-07-28 20:48:03.489133632 -0400
++++ telepathy-glib/tests/dbus/contact-lists.c	2012-07-28 20:51:57.321133382 -0400
+@@ -2679,7 +2679,7 @@
        char **argv)
  {
    g_type_init ();

=== modified file 'docs/reference/html/TpBaseCallChannel.html'
--- docs/reference/html/TpBaseCallChannel.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/TpBaseCallChannel.html	2012-07-29 01:19:20 +0000
@@ -193,7 +193,7 @@
 <tr>
 <td><p><span class="term"><a class="link" href="TpBaseCallChannel.html#TpBaseCallChannelAddContentFunc" title="TpBaseCallChannelAddContentFunc ()"><span class="type">TpBaseCallChannelAddContentFunc</span></a> <em class="structfield"><code><a name="TpBaseCallChannelClass.add-content"></a>add_content</code></em>;</span></p></td>
 <td>add content to the call. Implementation must call
-<a class="link" href="TpBaseCallChannel.html#tp-base-call-channel-add-content" title="tp_base_call_channel_add_content ()"><code class="function">tp_base_call_channel_add_content()</code></a>. Can be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if
+<a class="link" href="TpBaseCallChannel.html#tp-base-call-channel-add-content" title="tp_base_call_channel_add_content ()"><code class="function">tp_base_call_channel_add_content()</code></a>. Can be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if
 <a class="link" href="TpBaseCallChannel.html#TpBaseCallChannel--mutable-contents" title='The "mutable-contents" property'><span class="type">"mutable-contents"</span></a> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>.</td>
 </tr>
 <tr>

=== modified file 'docs/reference/html/TpBaseChannel.html'
--- docs/reference/html/TpBaseChannel.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/TpBaseChannel.html	2012-07-29 01:19:20 +0000
@@ -235,22 +235,22 @@
 14
 15
 16</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="gtkdoc kwb">static void</span>
-<span class="function">my_search_channel_fill_properties</span> <span class="gtkdoc opt">(</span>
-    TpBaseChannel <span class="gtkdoc opt">*</span>chan<span class="gtkdoc opt">,</span>
-    GHashTable <span class="gtkdoc opt">*</span>properties<span class="gtkdoc opt">)</span>
-<span class="gtkdoc opt">{</span>
-  TpBaseChannelClass <span class="gtkdoc opt">*</span>klass <span class="gtkdoc opt">=</span> <span class="function">TP_BASE_CHANNEL_CLASS</span> <span class="gtkdoc opt">(</span>my_search_channel_parent_class<span class="gtkdoc opt">);</span>
-
-  klass<span class="gtkdoc opt">-&gt;</span><span class="function">fill_immutable_properties</span> <span class="gtkdoc opt">(</span>chan<span class="gtkdoc opt">,</span> properties<span class="gtkdoc opt">);</span>
-
-  <span class="function"><a href="telepathy-glib-dbus-properties-mixin.html#tp-dbus-properties-mixin-fill-properties-hash">tp_dbus_properties_mixin_fill_properties_hash</a></span> <span class="gtkdoc opt">(</span>
-      <span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#G-OBJECT:CAPS">G_OBJECT</a></span> <span class="gtkdoc opt">(</span>chan<span class="gtkdoc opt">),</span> properties<span class="gtkdoc opt">,</span>
-      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH<span class="gtkdoc opt">,</span> <span class="string">&quot;Limit&quot;</span><span class="gtkdoc opt">,</span>
-      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH<span class="gtkdoc opt">,</span> <span class="string">&quot;AvailableSearchKeys&quot;</span><span class="gtkdoc opt">,</span>
-      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH<span class="gtkdoc opt">,</span> <span class="string">&quot;Server&quot;</span><span class="gtkdoc opt">,</span>
-      NULL<span class="gtkdoc opt">);</span>
-<span class="gtkdoc opt">}</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="keyword">static</span><span class="normal"> </span><span class="type">void</span>
+<span class="function">my_search_channel_fill_properties</span><span class="normal"> </span><span class="symbol">(</span>
+<span class="normal">    </span><span class="usertype">TpBaseChannel</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">chan</span><span class="symbol">,</span>
+<span class="normal">    </span><span class="usertype">GHashTable</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">properties</span><span class="symbol">)</span>
+<span class="cbracket">{</span>
+<span class="normal">  </span><span class="usertype">TpBaseChannelClass</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">klass </span><span class="symbol">=</span><span class="normal"> </span><span class="function">TP_BASE_CHANNEL_CLASS</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">my_search_channel_parent_class</span><span class="symbol">);</span>
+
+<span class="normal">  klass</span><span class="symbol">-&gt;</span><span class="function">fill_immutable_properties</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">chan</span><span class="symbol">,</span><span class="normal"> properties</span><span class="symbol">);</span>
+
+<span class="normal">  </span><span class="function"><a href="telepathy-glib-dbus-properties-mixin.html#tp-dbus-properties-mixin-fill-properties-hash">tp_dbus_properties_mixin_fill_properties_hash</a></span><span class="normal"> </span><span class="symbol">(</span>
+<span class="normal">      </span><span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#G-OBJECT:CAPS">G_OBJECT</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">chan</span><span class="symbol">),</span><span class="normal"> properties</span><span class="symbol">,</span>
+<span class="normal">      <a href="telepathy-glib-interfaces.html#TP-IFACE-CHANNEL-TYPE-CONTACT-SEARCH:CAPS">TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"Limit"</span><span class="symbol">,</span>
+<span class="normal">      <a href="telepathy-glib-interfaces.html#TP-IFACE-CHANNEL-TYPE-CONTACT-SEARCH:CAPS">TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"AvailableSearchKeys"</span><span class="symbol">,</span>
+<span class="normal">      <a href="telepathy-glib-interfaces.html#TP-IFACE-CHANNEL-TYPE-CONTACT-SEARCH:CAPS">TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"Server"</span><span class="symbol">,</span>
+<span class="normal">      <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS">NULL</a></span><span class="symbol">);</span>
+<span class="cbracket">}</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -335,34 +335,34 @@
 26
 27
 28</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="gtkdoc kwb">static void</span>
-<span class="function">my_channel_close</span> <span class="gtkdoc opt">(</span>TpBaseChannel <span class="gtkdoc opt">*</span>chan<span class="gtkdoc opt">)</span>
-<span class="gtkdoc opt">{</span>
-  MyChannel <span class="gtkdoc opt">*</span>self <span class="gtkdoc opt">=</span> <span class="function">MY_CHANNEL</span> <span class="gtkdoc opt">(</span>chan<span class="gtkdoc opt">);</span>
-
-  <span class="keyword">if</span> <span class="gtkdoc opt">(</span>self<span class="gtkdoc opt">-&gt;</span>priv<span class="gtkdoc opt">-&gt;</span>closing<span class="gtkdoc opt">)</span>
-    <span class="keyword">return</span><span class="gtkdoc opt">;</span>
-
-  self<span class="gtkdoc opt">-&gt;</span>priv<span class="gtkdoc opt">-&gt;</span>closing <span class="gtkdoc opt">=</span> TRUE<span class="gtkdoc opt">;</span>
-
-  <span class="gtkdoc slc">// some hypothetical channel-specific clean-up function:</span>
-  <span class="function">clean_up</span> <span class="gtkdoc opt">(</span>self<span class="gtkdoc opt">,</span> cleaned_up_cb<span class="gtkdoc opt">);</span>
-<span class="gtkdoc opt">}</span>
-
-<span class="gtkdoc kwb">static void</span>
-<span class="function">cleaned_up_cb</span> <span class="gtkdoc opt">(</span>MyChannel <span class="gtkdoc opt">*</span>self<span class="gtkdoc opt">)</span>
-<span class="gtkdoc opt">{</span>
-  <span class="gtkdoc slc">// all done, we can finish closing now</span>
-  <span class="function"><a href="TpBaseChannel.html#tp-base-channel-destroyed">tp_base_channel_destroyed</a></span> <span class="gtkdoc opt">(</span><span class="function">TP_BASE_CHANNEL</span> <span class="gtkdoc opt">(</span>self<span class="gtkdoc opt">));</span>
-<span class="gtkdoc opt">}</span>
-<span class="gtkdoc kwb">static void</span>
-<span class="function">my_channel_class_init</span> <span class="gtkdoc opt">(</span>MyChannelClass <span class="gtkdoc opt">*</span>klass<span class="gtkdoc opt">)</span>
-<span class="gtkdoc opt">{</span>
-  TpBaseChannelClass <span class="gtkdoc opt">*</span>base_channel_class <span class="gtkdoc opt">=</span> <span class="function">TP_BASE_CHANNEL_CLASS</span> <span class="gtkdoc opt">(</span>klass<span class="gtkdoc opt">);</span>
-
-  klass<span class="gtkdoc opt">-&gt;</span>close <span class="gtkdoc opt">=</span> my_channel_close<span class="gtkdoc opt">;</span>
-  <span class="gtkdoc slc">// ...</span>
-<span class="gtkdoc opt">}</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="keyword">static</span><span class="normal"> </span><span class="type">void</span>
+<span class="function">my_channel_close</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">TpBaseChannel</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">chan</span><span class="symbol">)</span>
+<span class="cbracket">{</span>
+<span class="normal">  </span><span class="usertype">MyChannel</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">self </span><span class="symbol">=</span><span class="normal"> </span><span class="function">MY_CHANNEL</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">chan</span><span class="symbol">);</span>
+
+<span class="normal">  </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">self</span><span class="symbol">-&gt;</span><span class="normal">priv</span><span class="symbol">-&gt;</span><span class="normal">closing</span><span class="symbol">)</span>
+<span class="normal">    </span><span class="keyword">return</span><span class="symbol">;</span>
+
+<span class="normal">  self</span><span class="symbol">-&gt;</span><span class="normal">priv</span><span class="symbol">-&gt;</span><span class="normal">closing </span><span class="symbol">=</span><span class="normal"> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS">TRUE</a></span><span class="symbol">;</span>
+
+<span class="normal">  </span><span class="comment">// some hypothetical channel-specific clean-up function:</span>
+<span class="normal">  </span><span class="function">clean_up</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">self</span><span class="symbol">,</span><span class="normal"> cleaned_up_cb</span><span class="symbol">);</span>
+<span class="cbracket">}</span>
+
+<span class="keyword">static</span><span class="normal"> </span><span class="type">void</span>
+<span class="function">cleaned_up_cb</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">MyChannel</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">self</span><span class="symbol">)</span>
+<span class="cbracket">{</span>
+<span class="normal">  </span><span class="comment">// all done, we can finish closing now</span>
+<span class="normal">  </span><span class="function"><a href="TpBaseChannel.html#tp-base-channel-destroyed">tp_base_channel_destroyed</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function">TP_BASE_CHANNEL</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">self</span><span class="symbol">));</span>
+<span class="cbracket">}</span>
+<span class="keyword">static</span><span class="normal"> </span><span class="type">void</span>
+<span class="function">my_channel_class_init</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">MyChannelClass</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">klass</span><span class="symbol">)</span>
+<span class="cbracket">{</span>
+<span class="normal">  </span><span class="usertype">TpBaseChannelClass</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">base_channel_class </span><span class="symbol">=</span><span class="normal"> </span><span class="function">TP_BASE_CHANNEL_CLASS</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">klass</span><span class="symbol">);</span>
+
+<span class="normal">  klass</span><span class="symbol">-&gt;</span><span class="normal">close </span><span class="symbol">=</span><span class="normal"> my_channel_close</span><span class="symbol">;</span>
+<span class="normal">  </span><span class="comment">// ...</span>
+<span class="cbracket">}</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -389,14 +389,14 @@
 6
 7
 8</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="gtkdoc kwb">static void</span>
-<span class="function">my_channel_class_init</span> <span class="gtkdoc opt">(</span>MyChannelClass <span class="gtkdoc opt">*</span>klass<span class="gtkdoc opt">)</span>
-<span class="gtkdoc opt">{</span>
-  TpBaseChannelClass <span class="gtkdoc opt">*</span>base_channel_class <span class="gtkdoc opt">=</span> <span class="function">TP_BASE_CHANNEL_CLASS</span> <span class="gtkdoc opt">(</span>klass<span class="gtkdoc opt">);</span>
+        <td class="listing_code"><pre class="programlisting"><span class="keyword">static</span><span class="normal"> </span><span class="type">void</span>
+<span class="function">my_channel_class_init</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">MyChannelClass</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">klass</span><span class="symbol">)</span>
+<span class="cbracket">{</span>
+<span class="normal">  </span><span class="usertype">TpBaseChannelClass</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">base_channel_class </span><span class="symbol">=</span><span class="normal"> </span><span class="function">TP_BASE_CHANNEL_CLASS</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">klass</span><span class="symbol">);</span>
 
-  klass<span class="gtkdoc opt">-&gt;</span>close <span class="gtkdoc opt">=</span> tp_base_channel_destroyed<span class="gtkdoc opt">;</span>
-  <span class="gtkdoc slc">// ...</span>
-<span class="gtkdoc opt">}</span></pre></td>
+<span class="normal">  klass</span><span class="symbol">-&gt;</span><span class="normal">close </span><span class="symbol">=</span><span class="normal"> <a href="TpBaseChannel.html#tp-base-channel-destroyed">tp_base_channel_destroyed</a></span><span class="symbol">;</span>
+<span class="normal">  </span><span class="comment">// ...</span>
+<span class="cbracket">}</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -467,17 +467,17 @@
 9
 10
 11</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="gtkdoc kwb">static</span> GPtrArray <span class="gtkdoc opt">*</span>
-<span class="function">my_channel_get_interfaces</span> <span class="gtkdoc opt">(</span>TpBaseChannel <span class="gtkdoc opt">*</span>self<span class="gtkdoc opt">)</span>
-<span class="gtkdoc opt">{</span>
-  GPtrArray <span class="gtkdoc opt">*</span>interfaces<span class="gtkdoc opt">;</span>
-
-  interfaces <span class="gtkdoc opt">=</span> <span class="function">TP_BASE_CHANNEL_CLASS</span> <span class="gtkdoc opt">(</span>my_channel_parent_class<span class="gtkdoc opt">)-&gt;</span><span class="function">get_interfaces</span> <span class="gtkdoc opt">(</span>self<span class="gtkdoc opt">);</span>
-
-  <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-add">g_ptr_array_add</a></span> <span class="gtkdoc opt">(</span>interfaces<span class="gtkdoc opt">,</span> TP_IFACE_BADGERS<span class="gtkdoc opt">);</span>
-
-  <span class="keyword">return</span> interfaces<span class="gtkdoc opt">;</span>
-<span class="gtkdoc opt">}</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="keyword">static</span><span class="normal"> <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray">GPtrArray</a> </span><span class="symbol">*</span>
+<span class="function">my_channel_get_interfaces</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">TpBaseChannel</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">self</span><span class="symbol">)</span>
+<span class="cbracket">{</span>
+<span class="normal">  </span><span class="usertype">GPtrArray</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">interfaces</span><span class="symbol">;</span>
+
+<span class="normal">  interfaces </span><span class="symbol">=</span><span class="normal"> </span><span class="function">TP_BASE_CHANNEL_CLASS</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">my_channel_parent_class</span><span class="symbol">)-&gt;</span><span class="function">get_interfaces</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">self</span><span class="symbol">);</span>
+
+<span class="normal">  </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-add">g_ptr_array_add</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">interfaces</span><span class="symbol">,</span><span class="normal"> TP_IFACE_BADGERS</span><span class="symbol">);</span>
+
+<span class="normal">  </span><span class="keyword">return</span><span class="normal"> interfaces</span><span class="symbol">;</span>
+<span class="cbracket">}</span></pre></td>
       </tr>
     </tbody>
   </table>

=== modified file 'docs/reference/html/TpBaseConnection.html'
--- docs/reference/html/TpBaseConnection.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/TpBaseConnection.html	2012-07-29 01:19:20 +0000
@@ -195,7 +195,7 @@
 </p>
 <p>
 In addition to the fields documented here, there are four gpointer fields
-which must currently be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> (a meaning may be defined for these in a
+which must currently be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> (a meaning may be defined for these in a
 future version of telepathy-glib), and a pointer to opaque private data.
 </p>
 <div class="variablelist"><table border="0">
@@ -279,20 +279,20 @@
 <td><p><span class="term"><a class="link" href="TpBaseConnection.html#TpBaseConnectionCreateHandleReposImpl" title="TpBaseConnectionCreateHandleReposImpl ()"><span class="type">TpBaseConnectionCreateHandleReposImpl</span></a> <em class="structfield"><code><a name="TpBaseConnectionClass.create-handle-repos"></a>create_handle_repos</code></em>;</span></p></td>
 <td>Fill in suitable handle repositories in the
 given array for all those handle types this Connection supports.
-Must be set by subclasses to a non-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> value; the function must create
+Must be set by subclasses to a non-<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> value; the function must create
 at least a CONTACT handle repository (failing to do so will cause a crash).</td>
 </tr>
 <tr>
 <td><p><span class="term"><a class="link" href="TpBaseConnection.html#TpBaseConnectionCreateChannelFactoriesImpl" title="TpBaseConnectionCreateChannelFactoriesImpl ()"><span class="type">TpBaseConnectionCreateChannelFactoriesImpl</span></a> <em class="structfield"><code><a name="TpBaseConnectionClass.create-channel-factories"></a>create_channel_factories</code></em>;</span></p></td>
 <td>Create an array of channel factories for this
 Connection. At least one of this or <em class="parameter"><code>create_channel_managers</code></em> must be set by
-subclasses to a non-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> value; in new code, setting this to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> and
+subclasses to a non-<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> value; in new code, setting this to <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> and
 using channel managers exclusively is recommended.</td>
 </tr>
 <tr>
 <td><p><span class="term"><a class="link" href="TpBaseConnection.html#TpBaseConnectionGetUniqueConnectionNameImpl" title="TpBaseConnectionGetUniqueConnectionNameImpl ()"><span class="type">TpBaseConnectionGetUniqueConnectionNameImpl</span></a> <em class="structfield"><code><a name="TpBaseConnectionClass.get-unique-connection-name"></a>get_unique_connection_name</code></em>;</span></p></td>
 <td>Construct a unique name for this connection
-(for example using the protocol's format for usernames). If <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> (the
+(for example using the protocol's format for usernames). If <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> (the
 default), a unique name will be generated. Subclasses should usually
 override this to get more obvious names, to aid debugging and prevent
 multiple connections to the same account.</td>
@@ -300,17 +300,17 @@
 <tr>
 <td><p><span class="term"><a class="link" href="TpBaseConnection.html#TpBaseConnectionProc" title="TpBaseConnectionProc ()"><span class="type">TpBaseConnectionProc</span></a> <em class="structfield"><code><a name="TpBaseConnectionClass.connecting"></a>connecting</code></em>;</span></p></td>
 <td>If set by subclasses, will be called just after the state
-changes to CONNECTING. May be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if nothing special needs to happen.</td>
+changes to CONNECTING. May be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if nothing special needs to happen.</td>
 </tr>
 <tr>
 <td><p><span class="term"><a class="link" href="TpBaseConnection.html#TpBaseConnectionProc" title="TpBaseConnectionProc ()"><span class="type">TpBaseConnectionProc</span></a> <em class="structfield"><code><a name="TpBaseConnectionClass.connected"></a>connected</code></em>;</span></p></td>
 <td>If set by subclasses, will be called just after the state
-changes to CONNECTED. May be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if nothing special needs to happen.</td>
+changes to CONNECTED. May be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if nothing special needs to happen.</td>
 </tr>
 <tr>
 <td><p><span class="term"><a class="link" href="TpBaseConnection.html#TpBaseConnectionProc" title="TpBaseConnectionProc ()"><span class="type">TpBaseConnectionProc</span></a> <em class="structfield"><code><a name="TpBaseConnectionClass.disconnected"></a>disconnected</code></em>;</span></p></td>
 <td>If set by subclasses, will be called just after the state
-changes to DISCONNECTED. May be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if nothing special needs to happen.</td>
+changes to DISCONNECTED. May be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if nothing special needs to happen.</td>
 </tr>
 <tr>
 <td><p><span class="term"><a class="link" href="TpBaseConnection.html#TpBaseConnectionProc" title="TpBaseConnectionProc ()"><span class="type">TpBaseConnectionProc</span></a> <em class="structfield"><code><a name="TpBaseConnectionClass.shut-down"></a>shut_down</code></em>;</span></p></td>
@@ -318,13 +318,13 @@
 connection. Must start the shutdown process for the underlying
 network connection, and arrange for <a class="link" href="TpBaseConnection.html#tp-base-connection-finish-shutdown" title="tp_base_connection_finish_shutdown ()"><code class="function">tp_base_connection_finish_shutdown()</code></a>
 to be called after the underlying connection has been closed. May not
-be left as <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.</td>
+be left as <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.</td>
 </tr>
 <tr>
 <td><p><span class="term"><a class="link" href="TpBaseConnection.html#TpBaseConnectionStartConnectingImpl" title="TpBaseConnectionStartConnectingImpl ()"><span class="type">TpBaseConnectionStartConnectingImpl</span></a> <em class="structfield"><code><a name="TpBaseConnectionClass.start-connecting"></a>start_connecting</code></em>;</span></p></td>
 <td>Asynchronously start connecting - called to implement
 the Connect D-Bus method. See <a class="link" href="TpBaseConnection.html#TpBaseConnectionStartConnectingImpl" title="TpBaseConnectionStartConnectingImpl ()"><span class="type">TpBaseConnectionStartConnectingImpl</span></a> for
-details. May not be left as <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.</td>
+details. May not be left as <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.</td>
 </tr>
 <tr>
 <td><p><span class="term">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> **<em class="structfield"><code><a name="TpBaseConnectionClass.interfaces-always-present"></a>interfaces_always_present</code></em>;</span></p></td>
@@ -339,8 +339,8 @@
 <td><p><span class="term"><a class="link" href="TpBaseConnection.html#TpBaseConnectionCreateChannelManagersImpl" title="TpBaseConnectionCreateChannelManagersImpl ()"><span class="type">TpBaseConnectionCreateChannelManagersImpl</span></a> <em class="structfield"><code><a name="TpBaseConnectionClass.create-channel-managers"></a>create_channel_managers</code></em>;</span></p></td>
 <td>Create an array of channel managers for this
 Connection. At least one of this or <em class="parameter"><code>create_channel_factories</code></em> must be set
-by subclasses to a non-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> value.
-Since: 0.7.15</td>
+by subclasses to a non-<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> value.
+Since 0.7.15</td>
 </tr>
 </tbody>
 </table></div>
@@ -557,7 +557,7 @@
 bus name, and will release it when destroyed.
 </p>
 <p>
-Since 0.11.11, <em class="parameter"><code>bus_name</code></em> and <em class="parameter"><code>object_path</code></em> may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the
+Since 0.11.11, <em class="parameter"><code>bus_name</code></em> and <em class="parameter"><code>object_path</code></em> may be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if the
 strings are not needed.
 </p>
 <div class="variablelist"><table border="0">
@@ -585,7 +585,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>Used to return an error if <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is returned; may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>Used to return an error if <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> is returned; may be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -618,7 +618,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>the handle repository corresponding to the given
-handle type, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if it's unsupported or invalid. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+handle type, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><span class="type">NULL</span></a> if it's unsupported or invalid. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -810,7 +810,7 @@
 <td><p><span class="term"><em class="parameter"><code>details</code></em> :</span></p></td>
 <td>Further details of the error, as a hash table where the keys
 are strings as defined in the Telepathy specification, and the
-values are <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a>s. <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is allowed, and treated as
+values are <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a>s. <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> is allowed, and treated as
 an empty hash table.</td>
 </tr>
 <tr>
@@ -861,7 +861,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>interfaces</code></em> :</span></p></td>
-<td>A <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array of D-Bus interface names, which
+<td>A <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array of D-Bus interface names, which
 must remain valid at least until the connection enters state
 <a class="link" href="telepathy-glib-enums.html#TP-CONNECTION-STATUS-DISCONNECTED:CAPS"><span class="type">TP_CONNECTION_STATUS_DISCONNECTED</span></a> (in practice, you should either
 use static strings, or use strdup'd strings and free them in the dispose
@@ -1066,14 +1066,14 @@
 6
 7
 8</pre></td>
-        <td class="listing_code"><pre class="programlisting">TpChannelManagerIter iter<span class="gtkdoc opt">;</span>
-TpChannelManager <span class="gtkdoc opt">*</span>manager<span class="gtkdoc opt">;</span>
+        <td class="listing_code"><pre class="programlisting"><span class="usertype">TpChannelManagerIter</span><span class="normal"> iter</span><span class="symbol">;</span>
+<span class="usertype">TpChannelManager</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">manager</span><span class="symbol">;</span>
 
-<span class="function"><a href="TpBaseConnection.html#tp-base-connection-channel-manager-iter-init">tp_base_connection_channel_manager_iter_init</a></span> <span class="gtkdoc opt">(&amp;</span>iter<span class="gtkdoc opt">,</span> base_conn<span class="gtkdoc opt">);</span>
-<span class="keyword">while</span> <span class="gtkdoc opt">(</span><span class="function"><a href="TpBaseConnection.html#tp-base-connection-channel-manager-iter-next">tp_base_connection_channel_manager_iter_next</a></span> <span class="gtkdoc opt">(&amp;</span>iter<span class="gtkdoc opt">, &amp;</span>manager<span class="gtkdoc opt">))</span>
-  <span class="gtkdoc opt">{</span>
-    <span class="gtkdoc opt">...</span><span class="keyword">do</span> something with manager<span class="gtkdoc opt">...</span>
-  <span class="gtkdoc opt">}</span></pre></td>
+<span class="function"><a href="TpBaseConnection.html#tp-base-connection-channel-manager-iter-init">tp_base_connection_channel_manager_iter_init</a></span><span class="normal"> </span><span class="symbol">(&amp;</span><span class="normal">iter</span><span class="symbol">,</span><span class="normal"> base_conn</span><span class="symbol">);</span>
+<span class="keyword">while</span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="TpBaseConnection.html#tp-base-connection-channel-manager-iter-next">tp_base_connection_channel_manager_iter_next</a></span><span class="normal"> </span><span class="symbol">(&amp;</span><span class="normal">iter</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">manager</span><span class="symbol">))</span>
+<span class="normal">  </span><span class="cbracket">{</span>
+<span class="normal">    </span><span class="symbol">...</span><span class="keyword">do</span><span class="normal"> something </span><span class="usertype">with</span><span class="normal"> manager</span><span class="symbol">...</span>
+<span class="normal">  </span><span class="cbracket">}</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -1118,7 +1118,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>manager_out</code></em> :</span></p></td>
-<td>a location to store the channel manager, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.</td>
+<td>a location to store the channel manager, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
@@ -1140,10 +1140,10 @@
 Read-only except during construction.
 </p>
 <p>
-If this property is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> or omitted during construction, the object will
+If this property is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> or omitted during construction, the object will
 automatically attempt to connect to the starter or session bus with
 <a class="link" href="telepathy-glib-dbus.html#tp-dbus-daemon-dup" title="tp_dbus_daemon_dup ()"><code class="function">tp_dbus_daemon_dup()</code></a> just after it is constructed; if this fails, this
-property will remain <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, and <a class="link" href="TpBaseConnection.html#tp-base-connection-register" title="tp_base_connection_register ()"><code class="function">tp_base_connection_register()</code></a> will fail.
+property will remain <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, and <a class="link" href="TpBaseConnection.html#tp-base-connection-register" title="tp_base_connection_register ()"><code class="function">tp_base_connection_register()</code></a> will fail.
 </p>
 <p class="since">Since 0.11.3</p>
 </div>

=== modified file 'docs/reference/html/TpBaseConnectionManager.html'
--- docs/reference/html/TpBaseConnectionManager.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/TpBaseConnectionManager.html	2012-07-29 01:19:20 +0000
@@ -307,7 +307,7 @@
 </p>
 <p>
 In addition to the fields documented here, there is one gpointer field
-which must currently be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. A meaning may be defined for it in a
+which must currently be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. A meaning may be defined for it in a
 future version of telepathy-glib.
 </p>
 <div class="variablelist"><table border="0">
@@ -335,10 +335,10 @@
 <tr>
 <td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> <em class="structfield"><code><a name="TpCMParamSpec.def"></a>def</code></em>;</span></p></td>
 <td>Default value, as a (const gchar *) for string parameters, or
-using <span class="type">GINT_TO_POINTER</span> or <span class="type">GUINT_TO_POINTER</span> for integer parameters</td>
+using <a href="http://library.gnome.org/devel/glib/unstable/glib-Type-Conversion-Macros.html#GINT-TO-POINTER:CAPS"><span class="type">GINT_TO_POINTER</span></a> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Type-Conversion-Macros.html#GUINT-TO-POINTER:CAPS"><span class="type">GUINT_TO_POINTER</span></a> for integer parameters</td>
 </tr>
 <tr>
-<td><p><span class="term"><span class="type">gsize</span> <em class="structfield"><code><a name="TpCMParamSpec.offset"></a>offset</code></em>;</span></p></td>
+<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> <em class="structfield"><code><a name="TpCMParamSpec.offset"></a>offset</code></em>;</span></p></td>
 <td>Offset of the parameter in the opaque data structure, if
 appropriate. The member at that offset is expected to be a gint,
 guint, (gchar *) or gboolean, depending on <em class="parameter"><code>gtype</code></em>. The default
@@ -377,7 +377,7 @@
 </p>
 <p>
 In addition to the fields documented here, there are three gpointer fields
-which must currently be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. A meaning may be defined for these in a
+which must currently be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. A meaning may be defined for these in a
 future version of telepathy-glib.
 </p>
 <div class="variablelist"><table border="0">
@@ -410,7 +410,7 @@
 <tr>
 <td><p><span class="term"><a class="link" href="TpBaseConnectionManager.html#TpCMParamSetter" title="TpCMParamSetter ()"><span class="type">TpCMParamSetter</span></a> <em class="structfield"><code><a name="TpCMProtocolSpec.set-param"></a>set_param</code></em>;</span></p></td>
 <td>A function which sets a parameter within the opaque data
-structure provided by <span class="type">params_new</span>. If <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>,
+structure provided by <span class="type">params_new</span>. If <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>,
 <a class="link" href="TpBaseConnectionManager.html#tp-cm-param-setter-offset" title="tp_cm_param_setter_offset ()"><code class="function">tp_cm_param_setter_offset()</code></a> will be used. (New in 0.7.0 -
 previously, code equivalent to <a class="link" href="TpBaseConnectionManager.html#tp-cm-param-setter-offset" title="tp_cm_param_setter_offset ()"><code class="function">tp_cm_param_setter_offset()</code></a> was
 always used.)</td>
@@ -445,7 +445,7 @@
 </p>
 <p>
 In addition to the fields documented here, there are some gpointer fields
-which must currently be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> (a meaning may be defined for these in a
+which must currently be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> (a meaning may be defined for these in a
 future version of telepathy-glib).
 </p>
 <p>
@@ -454,7 +454,7 @@
 </p>
 <p>
 Changed in 0.11.11: protocol_params and new_connection may both be
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. If so, this connection manager is assumed to use Protocol objects
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. If so, this connection manager is assumed to use Protocol objects
 instead.
 </p>
 <div class="variablelist"><table border="0">
@@ -475,12 +475,12 @@
 <td><p><span class="term">const <a class="link" href="TpBaseConnectionManager.html#TpCMProtocolSpec" title="TpCMProtocolSpec"><span class="type">TpCMProtocolSpec</span></a> *<em class="structfield"><code><a name="TpBaseConnectionManagerClass.protocol-params"></a>protocol_params</code></em>;</span></p></td>
 <td>An array of <a class="link" href="TpBaseConnectionManager.html#TpCMProtocolSpec" title="TpCMProtocolSpec"><span class="type">TpCMProtocolSpec</span></a> structures representing
 the protocols this connection manager supports, terminated by a structure
-whose name member is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>; or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if this CM uses Protocol objects.</td>
+whose name member is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>; or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if this CM uses Protocol objects.</td>
 </tr>
 <tr>
 <td><p><span class="term"><a class="link" href="TpBaseConnectionManager.html#TpBaseConnectionManagerNewConnFunc" title="TpBaseConnectionManagerNewConnFunc ()"><span class="type">TpBaseConnectionManagerNewConnFunc</span></a> <em class="structfield"><code><a name="TpBaseConnectionManagerClass.new-connection"></a>new_connection</code></em>;</span></p></td>
 <td>A <a class="link" href="TpBaseConnectionManager.html#TpBaseConnectionManagerNewConnFunc" title="TpBaseConnectionManagerNewConnFunc ()"><span class="type">TpBaseConnectionManagerNewConnFunc</span></a> used to construct
-new connections, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if this CM uses Protocol objects.</td>
+new connections, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if this CM uses Protocol objects.</td>
 </tr>
 <tr>
 <td><p><span class="term">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> * const  *<em class="structfield"><code><a name="TpBaseConnectionManagerClass.interfaces"></a>interfaces</code></em>;</span></p></td>
@@ -534,11 +534,11 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>if not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to indicate the error if <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is returned</td>
+<td>if not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to indicate the error if <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> is returned</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the new connection object, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error.</td>
+<td>the new connection object, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> on error.</td>
 </tr>
 </tbody>
 </table></div>
@@ -630,11 +630,11 @@
 Read-only except during construction.
 </p>
 <p>
-If this property is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> or omitted during construction, the object will
+If this property is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> or omitted during construction, the object will
 automatically attempt to connect to the starter or session bus with
 <a class="link" href="telepathy-glib-dbus.html#tp-dbus-daemon-dup" title="tp_dbus_daemon_dup ()"><code class="function">tp_dbus_daemon_dup()</code></a> just after it is constructed; if this fails, a
 warning will be logged with <a href="http://library.gnome.org/devel/glib/unstable/glib-Message-Logging.html#g-warning"><code class="function">g_warning()</code></a>, and this property will remain
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p class="since">Since 0.11.3</p>
 </div>

=== modified file 'docs/reference/html/TpBaseMediaCallChannel.html'
--- docs/reference/html/TpBaseMediaCallChannel.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/TpBaseMediaCallChannel.html	2012-07-29 01:19:20 +0000
@@ -183,7 +183,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>reason</code></em> :</span></p></td>
-<td>pointer to a location where to store the <em class="parameter"><code>reason</code></em>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>pointer to a location where to store the <em class="parameter"><code>reason</code></em>, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>

=== modified file 'docs/reference/html/TpBaseRoomConfig.html'
--- docs/reference/html/TpBaseRoomConfig.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/TpBaseRoomConfig.html	2012-07-29 01:19:20 +0000
@@ -131,13 +131,13 @@
 5
 6
 7</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-DEFINE-TYPE-WITH-CODE:CAPS">G_DEFINE_TYPE_WITH_CODE</a></span> <span class="gtkdoc opt">(</span>MyMucChannel<span class="gtkdoc opt">,</span> my_muc_channel<span class="gtkdoc opt">,</span>
-    TP_TYPE_BASE_CHANNEL<span class="gtkdoc opt">,</span>
-    <span class="gtkdoc slc">// ...</span>
-    <span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-IMPLEMENT-INTERFACE:CAPS">G_IMPLEMENT_INTERFACE</a></span> <span class="gtkdoc opt">(</span>TP_TYPE_SVC_CHANNEL_INTERFACE_ROOM_CONFIG<span class="gtkdoc opt">,</span>
-        tp_base_room_config_iface_init<span class="gtkdoc opt">)</span>
-    <span class="gtkdoc slc">// ...</span>
-    <span class="gtkdoc opt">)</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-DEFINE-TYPE-WITH-CODE:CAPS">G_DEFINE_TYPE_WITH_CODE</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">MyMucChannel</span><span class="symbol">,</span><span class="normal"> my_muc_channel</span><span class="symbol">,</span>
+<span class="normal">    TP_TYPE_BASE_CHANNEL</span><span class="symbol">,</span>
+<span class="normal">    </span><span class="comment">// ...</span>
+<span class="normal">    </span><span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-IMPLEMENT-INTERFACE:CAPS">G_IMPLEMENT_INTERFACE</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">TP_TYPE_SVC_CHANNEL_INTERFACE_ROOM_CONFIG</span><span class="symbol">,</span>
+<span class="normal">        <a href="TpBaseRoomConfig.html#tp-base-room-config-iface-init">tp_base_room_config_iface_init</a></span><span class="symbol">)</span>
+<span class="normal">    </span><span class="comment">// ...</span>
+<span class="normal">    </span><span class="symbol">)</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -158,13 +158,13 @@
 5
 6
 7</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="gtkdoc kwb">static void</span>
-<span class="function">my_muc_channel_class_init</span> <span class="gtkdoc opt">(</span>MyMucChannelClass <span class="gtkdoc opt">*</span>klass<span class="gtkdoc opt">)</span>
-<span class="gtkdoc opt">{</span>
-  <span class="gtkdoc slc">// ...</span>
-  <span class="function"><a href="TpBaseRoomConfig.html#tp-base-room-config-register-class">tp_base_room_config_register_class</a></span> <span class="gtkdoc opt">(</span><span class="function">TP_BASE_CHANNEL_CLASS</span> <span class="gtkdoc opt">(</span>klass<span class="gtkdoc opt">));</span>
-  <span class="gtkdoc slc">// ...</span>
-<span class="gtkdoc opt">}</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="keyword">static</span><span class="normal"> </span><span class="type">void</span>
+<span class="function">my_muc_channel_class_init</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">MyMucChannelClass</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">klass</span><span class="symbol">)</span>
+<span class="cbracket">{</span>
+<span class="normal">  </span><span class="comment">// ...</span>
+<span class="normal">  </span><span class="function"><a href="TpBaseRoomConfig.html#tp-base-room-config-register-class">tp_base_room_config_register_class</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function">TP_BASE_CHANNEL_CLASS</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">klass</span><span class="symbol">));</span>
+<span class="normal">  </span><span class="comment">// ...</span>
+<span class="cbracket">}</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -198,11 +198,11 @@
 3
 4
 5</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function">g_object_self</span> <span class="gtkdoc opt">(</span>room_config<span class="gtkdoc opt">,</span>
-   <span class="string">&quot;description&quot;</span><span class="gtkdoc opt">,</span> <span class="string">&quot;A place to bury strangers&quot;</span><span class="gtkdoc opt">,</span>
-   <span class="string">&quot;private&quot;</span><span class="gtkdoc opt">,</span> TRUE<span class="gtkdoc opt">,</span>
-   NULL<span class="gtkdoc opt">);</span>
-<span class="function"><a href="TpBaseRoomConfig.html#tp-base-room-config-emit-properties-changed">tp_base_room_config_emit_properties_changed</a></span> <span class="gtkdoc opt">(</span>room_config<span class="gtkdoc opt">);</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function">g_object_self</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">room_config</span><span class="symbol">,</span>
+<span class="normal">   </span><span class="string">"description"</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"A place to bury strangers"</span><span class="symbol">,</span>
+<span class="normal">   </span><span class="string">"private"</span><span class="symbol">,</span><span class="normal"> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS">TRUE</a></span><span class="symbol">,</span>
+<span class="normal">   <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS">NULL</a></span><span class="symbol">);</span>
+<span class="function"><a href="TpBaseRoomConfig.html#tp-base-room-config-emit-properties-changed">tp_base_room_config_emit_properties_changed</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">room_config</span><span class="symbol">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -236,7 +236,7 @@
 };
 </pre>
 <p>
-Class structure for <a class="link" href="TpBaseRoomConfig.html" title="TpBaseRoomConfig"><span class="type">TpBaseRoomConfig</span></a>. By default, <em class="parameter"><code>update_async</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>,
+Class structure for <a class="link" href="TpBaseRoomConfig.html" title="TpBaseRoomConfig"><span class="type">TpBaseRoomConfig</span></a>. By default, <em class="parameter"><code>update_async</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>,
 indicating that updating room configuration is not implemented; subclasses
 should override it if they wish to support updating room configuration.
 </p>

=== modified file 'docs/reference/html/TpCallContentMediaDescription.html'
--- docs/reference/html/TpCallContentMediaDescription.html	2012-04-03 10:16:49 +0000
+++ docs/reference/html/TpCallContentMediaDescription.html	2012-07-29 01:19:20 +0000
@@ -417,7 +417,7 @@
 <p>
 Add a message for a given codec. This ensures <em class="parameter"><code>codec_identifier</code></em> is
 in the <a class="link" href="TpCallContentMediaDescription.html#TpCallContentMediaDescription--feedback-messages" title='The "feedback-messages" property'><span class="type">"feedback-messages"</span></a> map. The
-rtcp-minimum-interval is set to <code class="literal">G_MAXUINT</code> and can then be changed using
+rtcp-minimum-interval is set to <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#G-MAXUINT:CAPS"><code class="literal">G_MAXUINT</code></a> and can then be changed using
 <a class="link" href="TpCallContentMediaDescription.html#tp-call-content-media-description-set-rtcp-feedback-minimum-interval" title="tp_call_content_media_description_set_rtcp_feedback_minimum_interval ()"><code class="function">tp_call_content_media_description_set_rtcp_feedback_minimum_interval()</code></a>.
 </p>
 <p>

=== modified file 'docs/reference/html/TpChannelFactoryIface.html'
--- docs/reference/html/TpChannelFactoryIface.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/TpChannelFactoryIface.html	2012-07-29 01:19:20 +0000
@@ -627,7 +627,7 @@
 </p>
 <p>
 Otherwise, request may either be
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> or a request that led to the channel's creation; callers are expected
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> or a request that led to the channel's creation; callers are expected
 to determine which channels satisfy which requests based on the handle
 and handle-type.
 </p>
@@ -649,7 +649,7 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>request</code></em> :</span></p></td>
 <td>A request context as passed to <a class="link" href="TpChannelFactoryIface.html#tp-channel-factory-iface-request" title="tp_channel_factory_iface_request ()"><code class="function">tp_channel_factory_iface_request()</code></a>,
-or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 </tbody>
@@ -696,7 +696,7 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>request</code></em> :</span></p></td>
 <td>A request context as passed to <a class="link" href="TpChannelFactoryIface.html#tp-channel-factory-iface-request" title="tp_channel_factory_iface_request ()"><code class="function">tp_channel_factory_iface_request()</code></a>,
-or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 </tbody>
@@ -739,7 +739,7 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>request_context</code></em> :</span></p></td>
 <td>a request context as passed to
-<a class="link" href="TpChannelFactoryIface.html#tp-channel-factory-iface-request" title="tp_channel_factory_iface_request ()"><code class="function">tp_channel_factory_iface_request()</code></a>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<a class="link" href="TpChannelFactoryIface.html#tp-channel-factory-iface-request" title="tp_channel_factory_iface_request ()"><code class="function">tp_channel_factory_iface_request()</code></a>, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -766,7 +766,7 @@
 <a class="link" href="TpChannelFactoryIface.html#tp-channel-factory-iface-request" title="tp_channel_factory_iface_request ()"><code class="function">tp_channel_factory_iface_request()</code></a>.
 </p>
 <p>
-Otherwise, request may either be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> or a request that led to
+Otherwise, request may either be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> or a request that led to
 <em class="parameter"><code>channel</code></em>'s creation; callers are expected to determine which channels
 satisfy which requests based on the handle and handle-type.
 </p>
@@ -785,7 +785,7 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>request_context</code></em> :</span></p></td>
 <td>a request context as passed to
-<a class="link" href="TpChannelFactoryIface.html#tp-channel-factory-iface-request" title="tp_channel_factory_iface_request ()"><code class="function">tp_channel_factory_iface_request()</code></a>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<a class="link" href="TpChannelFactoryIface.html#tp-channel-factory-iface-request" title="tp_channel_factory_iface_request ()"><code class="function">tp_channel_factory_iface_request()</code></a>, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>

=== modified file 'docs/reference/html/TpChannelIface.html'
--- docs/reference/html/TpChannelIface.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/TpChannelIface.html	2012-07-29 01:19:20 +0000
@@ -142,9 +142,9 @@
 </p>
 <p>
 In <a class="link" href="telepathy-glib-channel.html#TpChannel"><span class="type">TpChannel</span></a> this property is read-only except during construction;
-if <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> during construction (the default), we ask the remote D-Bus
+if <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> during construction (the default), we ask the remote D-Bus
 object what its channel type is, and reading this property will yield
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> until a reply is received. This is not guaranteed to have happened
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> until a reply is received. This is not guaranteed to have happened
 until <a class="link" href="telepathy-glib-proxy.html#tp-proxy-prepare-async" title="tp_proxy_prepare_async ()"><code class="function">tp_proxy_prepare_async()</code></a> has finished preparing
 <a class="link" href="telepathy-glib-channel.html#TP-CHANNEL-FEATURE-CORE:CAPS" title="TP_CHANNEL_FEATURE_CORE"><code class="literal">TP_CHANNEL_FEATURE_CORE</code></a>.
 </p>

=== modified file 'docs/reference/html/TpChannelManager.html'
--- docs/reference/html/TpChannelManager.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/TpChannelManager.html	2012-07-29 01:19:20 +0000
@@ -202,7 +202,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>allowed_properties</code></em> :</span></p></td>
-<td>A <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array of property names which may
+<td>A <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array of property names which may
 appear in requests for a particular channel class.</td>
 </tr>
 <tr>
@@ -272,7 +272,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>allowed_properties</code></em> :</span></p></td>
-<td>A <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array of property names which may
+<td>A <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array of property names which may
 appear in requests for a particular channel class.</td>
 </tr>
 <tr>
@@ -453,7 +453,7 @@
 </p>
 <p>
 In addition to the fields documented here there are several GCallback
-fields which must currently be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+fields which must currently be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -535,11 +535,11 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>fixed</code></em> :</span></p></td>
-<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array of property names</td>
+<td>a <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array of property names</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>allowed</code></em> :</span></p></td>
-<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array of property names</td>
+<td>a <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated array of property names</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>

=== modified file 'docs/reference/html/TpDynamicHandleRepo.html'
--- docs/reference/html/TpDynamicHandleRepo.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/TpDynamicHandleRepo.html	2012-07-29 01:19:20 +0000
@@ -172,13 +172,13 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>normalize_func</code></em> :</span></p></td>
 <td>The function to be used to normalize and validate handles,
-or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to accept all handles as-is</td>
+or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to accept all handles as-is</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>default_normalize_context</code></em> :</span></p></td>
 <td>The context pointer to be passed to the
-<em class="parameter"><code>normalize_func</code></em> if a <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> context is passed to <a class="link" href="telepathy-glib-handle-repo.html#tp-handle-lookup" title="tp_handle_lookup ()"><code class="function">tp_handle_lookup()</code></a> and
-<a class="link" href="telepathy-glib-handle-repo.html#tp-handle-ensure" title="tp_handle_ensure ()"><code class="function">tp_handle_ensure()</code></a>; this may itself be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<em class="parameter"><code>normalize_func</code></em> if a <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> context is passed to <a class="link" href="telepathy-glib-handle-repo.html#tp-handle-lookup" title="tp_handle_lookup ()"><code class="function">tp_handle_lookup()</code></a> and
+<a class="link" href="telepathy-glib-handle-repo.html#tp-handle-ensure" title="tp_handle_ensure ()"><code class="function">tp_handle_ensure()</code></a>; this may itself be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -238,9 +238,9 @@
 <pre class="programlisting">  "default-normalize-context" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>              : Read / Write / Construct Only</pre>
 <p>
 An optional default context given to the
-<a class="link" href="TpDynamicHandleRepo.html#TpDynamicHandleRepo--normalize-function" title='The "normalize-function" property'><span class="type">"normalize-function"</span></a> if <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is passed as context to
+<a class="link" href="TpDynamicHandleRepo.html#TpDynamicHandleRepo--normalize-function" title='The "normalize-function" property'><span class="type">"normalize-function"</span></a> if <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> is passed as context to
 the ensure or lookup functions, e.g. when RequestHandle is called via
-D-Bus. The default is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+D-Bus. The default is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 </div>
 <hr>
@@ -249,7 +249,7 @@
 <pre class="programlisting">  "normalize-function"       <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>              : Read / Write / Construct Only</pre>
 <p>
 An optional <a class="link" href="TpDynamicHandleRepo.html#TpDynamicHandleRepoNormalizeFunc" title="TpDynamicHandleRepoNormalizeFunc ()"><span class="type">TpDynamicHandleRepoNormalizeFunc</span></a> used to validate and
-normalize handle IDs. If <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> (which is the default), any handle ID is
+normalize handle IDs. If <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> (which is the default), any handle ID is
 accepted as-is (equivalent to supplying a pointer to a function that just
 calls g_strdup).
 </p>

=== modified file 'docs/reference/html/TpExportableChannel.html'
--- docs/reference/html/TpExportableChannel.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/TpExportableChannel.html	2012-07-29 01:19:20 +0000
@@ -206,25 +206,25 @@
 17
 18
 19</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="keyword">case</span> PROP_CHANNEL_PROPERTIES<span class="gtkdoc opt">:</span>
-  <span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Standard-Parameter-and-Value-Types.html#g-value-take-boxed">g_value_take_boxed</a></span> <span class="gtkdoc opt">(</span>value<span class="gtkdoc opt">,</span>
-    <span class="function"><a href="telepathy-glib-dbus-properties-mixin.html#tp-dbus-properties-mixin-make-properties-hash">tp_dbus_properties_mixin_make_properties_hash</a></span> <span class="gtkdoc opt">(</span>object<span class="gtkdoc opt">,</span>
-        <span class="gtkdoc slc">// The spec says these properties MUST be included:</span>
-        TP_IFACE_CHANNEL<span class="gtkdoc opt">,</span> <span class="string">&quot;TargetHandle&quot;</span><span class="gtkdoc opt">,</span>
-        TP_IFACE_CHANNEL<span class="gtkdoc opt">,</span> <span class="string">&quot;TargetHandleType&quot;</span><span class="gtkdoc opt">,</span>
-        TP_IFACE_CHANNEL<span class="gtkdoc opt">,</span> <span class="string">&quot;ChannelType&quot;</span><span class="gtkdoc opt">,</span>
-        TP_IFACE_CHANNEL<span class="gtkdoc opt">,</span> <span class="string">&quot;TargetID&quot;</span><span class="gtkdoc opt">,</span>
-        TP_IFACE_CHANNEL<span class="gtkdoc opt">,</span> <span class="string">&quot;Requested&quot;</span><span class="gtkdoc opt">,</span>
-        <span class="gtkdoc slc">// These aren't mandatory as of spec 0.17.17</span>
-        <span class="gtkdoc slc">// (but they should be):</span>
-        TP_IFACE_CHANNEL<span class="gtkdoc opt">,</span> <span class="string">&quot;InitiatorHandle&quot;</span><span class="gtkdoc opt">,</span>
-        TP_IFACE_CHANNEL<span class="gtkdoc opt">,</span> <span class="string">&quot;InitiatorID&quot;</span><span class="gtkdoc opt">,</span>
-        TP_IFACE_CHANNEL<span class="gtkdoc opt">,</span> <span class="string">&quot;Interfaces&quot;</span><span class="gtkdoc opt">,</span>
-        <span class="gtkdoc slc">// Perhaps your channel has some other immutable properties:</span>
-        TP_IFACE_CHANNEL_INTERFACE_MESSAGES<span class="gtkdoc opt">,</span> <span class="string">&quot;SupportedContentTypes&quot;</span><span class="gtkdoc opt">,</span>
-        <span class="gtkdoc slc">// etc.</span>
-        NULL<span class="gtkdoc opt">));</span>
-  <span class="keyword">break</span><span class="gtkdoc opt">;</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="keyword">case</span><span class="normal"> PROP_CHANNEL_PROPERTIES</span><span class="symbol">:</span>
+<span class="normal">  </span><span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Standard-Parameter-and-Value-Types.html#g-value-take-boxed">g_value_take_boxed</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">value</span><span class="symbol">,</span>
+<span class="normal">    </span><span class="function"><a href="telepathy-glib-dbus-properties-mixin.html#tp-dbus-properties-mixin-make-properties-hash">tp_dbus_properties_mixin_make_properties_hash</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">object</span><span class="symbol">,</span>
+<span class="normal">        </span><span class="comment">// The spec says these properties MUST be included:</span>
+<span class="normal">        <a href="telepathy-glib-interfaces.html#TP-IFACE-CHANNEL:CAPS">TP_IFACE_CHANNEL</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"TargetHandle"</span><span class="symbol">,</span>
+<span class="normal">        <a href="telepathy-glib-interfaces.html#TP-IFACE-CHANNEL:CAPS">TP_IFACE_CHANNEL</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"TargetHandleType"</span><span class="symbol">,</span>
+<span class="normal">        <a href="telepathy-glib-interfaces.html#TP-IFACE-CHANNEL:CAPS">TP_IFACE_CHANNEL</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"ChannelType"</span><span class="symbol">,</span>
+<span class="normal">        <a href="telepathy-glib-interfaces.html#TP-IFACE-CHANNEL:CAPS">TP_IFACE_CHANNEL</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"TargetID"</span><span class="symbol">,</span>
+<span class="normal">        <a href="telepathy-glib-interfaces.html#TP-IFACE-CHANNEL:CAPS">TP_IFACE_CHANNEL</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"Requested"</span><span class="symbol">,</span>
+<span class="normal">        </span><span class="comment">// These aren't mandatory as of spec 0.17.17</span>
+<span class="normal">        </span><span class="comment">// (but they should be):</span>
+<span class="normal">        <a href="telepathy-glib-interfaces.html#TP-IFACE-CHANNEL:CAPS">TP_IFACE_CHANNEL</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"InitiatorHandle"</span><span class="symbol">,</span>
+<span class="normal">        <a href="telepathy-glib-interfaces.html#TP-IFACE-CHANNEL:CAPS">TP_IFACE_CHANNEL</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"InitiatorID"</span><span class="symbol">,</span>
+<span class="normal">        <a href="telepathy-glib-interfaces.html#TP-IFACE-CHANNEL:CAPS">TP_IFACE_CHANNEL</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"Interfaces"</span><span class="symbol">,</span>
+<span class="normal">        </span><span class="comment">// Perhaps your channel has some other immutable properties:</span>
+<span class="normal">        <a href="telepathy-glib-interfaces.html#TP-IFACE-CHANNEL-INTERFACE-MESSAGES:CAPS">TP_IFACE_CHANNEL_INTERFACE_MESSAGES</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"SupportedContentTypes"</span><span class="symbol">,</span>
+<span class="normal">        </span><span class="comment">// etc.</span>
+<span class="normal">        <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS">NULL</a></span><span class="symbol">));</span>
+<span class="normal">  </span><span class="keyword">break</span><span class="symbol">;</span></pre></td>
       </tr>
     </tbody>
   </table>

=== modified file 'docs/reference/html/TpIntset.html'
--- docs/reference/html/TpIntset.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/TpIntset.html	2012-07-29 01:19:20 +0000
@@ -707,15 +707,15 @@
 7
 8
 9</pre></td>
-        <td class="listing_code"><pre class="programlisting">TpIntsetFastIter iter<span class="gtkdoc opt">;</span>
-guint element<span class="gtkdoc opt">;</span>
-
-<span class="function"><a href="TpIntset.html#tp-intset-fast-iter-init">tp_intset_fast_iter_init</a></span> <span class="gtkdoc opt">(&amp;</span>iter<span class="gtkdoc opt">,</span> intset<span class="gtkdoc opt">);</span>
-
-<span class="keyword">while</span> <span class="gtkdoc opt">(</span><span class="function"><a href="TpIntset.html#tp-intset-fast-iter-next">tp_intset_fast_iter_next</a></span> <span class="gtkdoc opt">(&amp;</span>iter<span class="gtkdoc opt">, &amp;</span>element<span class="gtkdoc opt">))</span>
-<span class="gtkdoc opt">{</span>
-  <span class="function">printf</span> <span class="gtkdoc opt">(</span><span class="string">&quot;%u is in the intset</span><span class="gtkdoc esc">\n</span><span class="string">&quot;</span><span class="gtkdoc opt">,</span> element<span class="gtkdoc opt">);</span>
-<span class="gtkdoc opt">}</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="usertype">TpIntsetFastIter</span><span class="normal"> iter</span><span class="symbol">;</span>
+<span class="usertype">guint</span><span class="normal"> element</span><span class="symbol">;</span>
+
+<span class="function"><a href="TpIntset.html#tp-intset-fast-iter-init">tp_intset_fast_iter_init</a></span><span class="normal"> </span><span class="symbol">(&amp;</span><span class="normal">iter</span><span class="symbol">,</span><span class="normal"> intset</span><span class="symbol">);</span>
+
+<span class="keyword">while</span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="TpIntset.html#tp-intset-fast-iter-next">tp_intset_fast_iter_next</a></span><span class="normal"> </span><span class="symbol">(&amp;</span><span class="normal">iter</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">element</span><span class="symbol">))</span>
+<span class="cbracket">{</span>
+<span class="normal">  </span><span class="function">printf</span><span class="normal"> </span><span class="symbol">(</span><span class="string">"%u is in the intset</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">,</span><span class="normal"> element</span><span class="symbol">);</span>
+<span class="cbracket">}</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -798,12 +798,12 @@
 4
 5
 6</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="gtkdoc kwb">void</span>
-<span class="function">do_something</span> <span class="gtkdoc opt">(</span><span class="gtkdoc kwb">const</span> TpIntset <span class="gtkdoc opt">*</span>intset<span class="gtkdoc opt">)</span>
-<span class="gtkdoc opt">{</span>
-  TpIntsetIter iter <span class="gtkdoc opt">=</span> <span class="function"><a href="TpIntset.html#TP-INTSET-ITER-INIT:CAPS">TP_INTSET_ITER_INIT</a></span> <span class="gtkdoc opt">(</span>intset<span class="gtkdoc opt">);</span>
-  <span class="comment">/* ... do something with iter ... */</span>
-<span class="gtkdoc opt">}</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="type">void</span>
+<span class="function">do_something</span><span class="normal"> </span><span class="symbol">(</span><span class="keyword">const</span><span class="normal"> </span><span class="usertype">TpIntset</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">intset</span><span class="symbol">)</span>
+<span class="cbracket">{</span>
+<span class="normal">  </span><span class="usertype">TpIntsetIter</span><span class="normal"> iter </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="TpIntset.html#TP-INTSET-ITER-INIT:CAPS">TP_INTSET_ITER_INIT</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">intset</span><span class="symbol">);</span>
+<span class="normal">  </span><span class="comment">/* ... do something with iter ... */</span>
+<span class="cbracket">}</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -903,11 +903,11 @@
 3
 4
 5</pre></td>
-        <td class="listing_code"><pre class="programlisting">TpIntsetIter iter <span class="gtkdoc opt">=</span> <span class="function">TP_INTSET_INIT</span> <span class="gtkdoc opt">(</span>intset<span class="gtkdoc opt">);</span>
-<span class="keyword">while</span> <span class="gtkdoc opt">(</span><span class="function"><a href="TpIntset.html#tp-intset-iter-next">tp_intset_iter_next</a></span> <span class="gtkdoc opt">(&amp;</span>iter<span class="gtkdoc opt">))</span>
-<span class="gtkdoc opt">{</span>
-  <span class="function">printf</span> <span class="gtkdoc opt">(</span><span class="string">&quot;%u is in the intset</span><span class="gtkdoc esc">\n</span><span class="string">&quot;</span><span class="gtkdoc opt">,</span> iter<span class="gtkdoc opt">.</span>element<span class="gtkdoc opt">);</span>
-<span class="gtkdoc opt">}</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="usertype">TpIntsetIter</span><span class="normal"> iter </span><span class="symbol">=</span><span class="normal"> </span><span class="function">TP_INTSET_INIT</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">intset</span><span class="symbol">);</span>
+<span class="keyword">while</span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="TpIntset.html#tp-intset-iter-next">tp_intset_iter_next</a></span><span class="normal"> </span><span class="symbol">(&amp;</span><span class="normal">iter</span><span class="symbol">))</span>
+<span class="cbracket">{</span>
+<span class="normal">  </span><span class="function">printf</span><span class="normal"> </span><span class="symbol">(</span><span class="string">"%u is in the intset</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">,</span><span class="normal"> iter</span><span class="symbol">.</span><span class="normal">element</span><span class="symbol">);</span>
+<span class="cbracket">}</span></pre></td>
       </tr>
     </tbody>
   </table>

=== modified file 'docs/reference/html/TpMessage.html'
--- docs/reference/html/TpMessage.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/TpMessage.html	2012-07-29 01:19:20 +0000
@@ -49,8 +49,8 @@
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="TpMessage.html#tp-message-to-text" title="tp_message_to_text ()">tp_message_to_text</a>                  (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *message</code></em>,
                                                          <em class="parameter"><code><a class="link" href="telepathy-glib-enums.html#TpChannelTextMessageFlags" title="enum TpChannelTextMessageFlags"><span class="type">TpChannelTextMessageFlags</span></a> *out_flags</code></em>);
 <a class="link" href="telepathy-glib-enums.html#TpChannelTextMessageType" title="enum TpChannelTextMessageType"><span class="returnvalue">TpChannelTextMessageType</span></a> <a class="link" href="TpMessage.html#tp-message-get-message-type" title="tp_message_get_message_type ()">tp_message_get_message_type</a>    (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>);
-<span class="returnvalue">gint64</span>              <a class="link" href="TpMessage.html#tp-message-get-received-timestamp" title="tp_message_get_received_timestamp ()">tp_message_get_received_timestamp</a>   (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>);
-<span class="returnvalue">gint64</span>              <a class="link" href="TpMessage.html#tp-message-get-sent-timestamp" title="tp_message_get_sent_timestamp ()">tp_message_get_sent_timestamp</a>       (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>              <a class="link" href="TpMessage.html#tp-message-get-received-timestamp" title="tp_message_get_received_timestamp ()">tp_message_get_received_timestamp</a>   (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>              <a class="link" href="TpMessage.html#tp-message-get-sent-timestamp" title="tp_message_get_sent_timestamp ()">tp_message_get_sent_timestamp</a>       (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>);
 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       <a class="link" href="TpMessage.html#tp-message-get-specific-to-interface" title="tp_message_get_specific_to_interface ()">tp_message_get_specific_to_interface</a>
                                                         (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>);
 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       <a class="link" href="TpMessage.html#tp-message-get-supersedes" title="tp_message_get_supersedes ()">tp_message_get_supersedes</a>           (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>);
@@ -58,7 +58,7 @@
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="TpMessage.html#tp-message-is-delivery-report" title="tp_message_is_delivery_report ()">tp_message_is_delivery_report</a>       (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="TpMessage.html#tp-message-is-rescued" title="tp_message_is_rescued ()">tp_message_is_rescued</a>               (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="TpMessage.html#tp-message-is-scrollback" title="tp_message_is_scrollback ()">tp_message_is_scrollback</a>            (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>);
-<span class="returnvalue">guint32</span>             <a class="link" href="TpMessage.html#tp-message-get-pending-message-id" title="tp_message_get_pending_message_id ()">tp_message_get_pending_message_id</a>   (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="TpMessage.html#tp-message-get-pending-message-id" title="tp_message_get_pending_message_id ()">tp_message_get_pending_message_id</a>   (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *valid</code></em>);
 
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="TpMessage.html#tp-message-is-mutable" title="tp_message_is_mutable ()">tp_message_is_mutable</a>               (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>);
@@ -88,11 +88,11 @@
 <span class="returnvalue">void</span>                <a class="link" href="TpMessage.html#tp-message-set-int32" title="tp_message_set_int32 ()">tp_message_set_int32</a>                (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> part</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint32</span> i</code></em>);
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint32"><span class="type">gint32</span></a> i</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="TpMessage.html#tp-message-set-int64" title="tp_message_set_int64 ()">tp_message_set_int64</a>                (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> part</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint64</span> i</code></em>);
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> i</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="TpMessage.html#tp-message-set-string" title="tp_message_set_string ()">tp_message_set_string</a>               (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> part</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
@@ -109,11 +109,11 @@
 <span class="returnvalue">void</span>                <a class="link" href="TpMessage.html#tp-message-set-uint32" title="tp_message_set_uint32 ()">tp_message_set_uint32</a>               (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> part</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
-                                                         <em class="parameter"><code><span class="type">guint32</span> u</code></em>);
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> u</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="TpMessage.html#tp-message-set-uint64" title="tp_message_set_uint64 ()">tp_message_set_uint64</a>               (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> part</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
-                                                         <em class="parameter"><code><span class="type">guint64</span> u</code></em>);
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> u</code></em>);
 
 <a class="link" href="TpMessage.html" title="TpMessage"><span class="returnvalue">TpMessage</span></a> *         <a class="link" href="TpMessage.html#tp-message-new" title="tp_message_new ()">tp_message_new</a>                      (<em class="parameter"><code><a class="link" href="TpBaseConnection.html" title="TpBaseConnection"><span class="type">TpBaseConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> initial_parts</code></em>,
@@ -217,7 +217,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> used to implement the given part, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the
+<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> used to implement the given part, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if the
 part number is out of range. The hash table is only valid as long as the
 message is valid and the part is not deleted. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8 GObject.Value]</span>
 </td>
@@ -244,7 +244,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>out_flags</code></em> :</span></p></td>
-<td>(out) : if not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, the <a class="link" href="telepathy-glib-enums.html#TpChannelTextMessageFlags" title="enum TpChannelTextMessageFlags"><span class="type">TpChannelTextMessageFlags</span></a> of <em class="parameter"><code>message</code></em>
+<td>(out) : if not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, the <a class="link" href="telepathy-glib-enums.html#TpChannelTextMessageFlags" title="enum TpChannelTextMessageFlags"><span class="type">TpChannelTextMessageFlags</span></a> of <em class="parameter"><code>message</code></em>
 </td>
 </tr>
 <tr>
@@ -282,7 +282,7 @@
 <hr>
 <div class="refsect2">
 <a name="tp-message-get-received-timestamp"></a><h3>tp_message_get_received_timestamp ()</h3>
-<pre class="programlisting"><span class="returnvalue">gint64</span>              tp_message_get_received_timestamp   (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>              tp_message_get_received_timestamp   (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>);</pre>
 <p>
 Return when this message was received locally, as a number of seconds since
 the beginning of 1970 in the UTC timezone (the same representation used by
@@ -306,7 +306,7 @@
 <hr>
 <div class="refsect2">
 <a name="tp-message-get-sent-timestamp"></a><h3>tp_message_get_sent_timestamp ()</h3>
-<pre class="programlisting"><span class="returnvalue">gint64</span>              tp_message_get_sent_timestamp       (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>);</pre>
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>              tp_message_get_sent_timestamp       (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>);</pre>
 <p>
 Return when this message was sent, as a number of seconds since the
 beginning of 1970 in the UTC timezone (the same representation used by
@@ -343,7 +343,7 @@
 name of the interface.
 </p>
 <p>
-If this message is an ordinary message or delivery report, return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+If this message is an ordinary message or delivery report, return <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -354,7 +354,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a D-Bus interface name, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for ordinary
+<td>a D-Bus interface name, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> for ordinary
 messages and delivery reports. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
@@ -368,7 +368,7 @@
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       tp_message_get_supersedes           (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>);</pre>
 <p>
 If this message replaces a previous message, return the value of
-<a class="link" href="TpMessage.html#tp-message-get-token" title="tp_message_get_token ()"><code class="function">tp_message_get_token()</code></a> for that previous message. Otherwise, return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+<a class="link" href="TpMessage.html#tp-message-get-token" title="tp_message_get_token ()"><code class="function">tp_message_get_token()</code></a> for that previous message. Otherwise, return <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>
 For instance, a user interface could replace the superseded
@@ -383,7 +383,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a non-empty opaque identifier, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+<td>a non-empty opaque identifier, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if none. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -401,7 +401,7 @@
 messages with different non-empty tokens are different messages.
 </p>
 <p>
-If there is no suitable token, return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+If there is no suitable token, return <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -412,7 +412,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a non-empty opaque identifier, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+<td>a non-empty opaque identifier, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if none. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -500,7 +500,7 @@
 <hr>
 <div class="refsect2">
 <a name="tp-message-get-pending-message-id"></a><h3>tp_message_get_pending_message_id ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint32</span>             tp_message_get_pending_message_id   (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>,
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             tp_message_get_pending_message_id   (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *valid</code></em>);</pre>
 <p>
 Return the incoming message ID of <em class="parameter"><code>self</code></em>. Only incoming messages have such
@@ -515,7 +515,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>valid</code></em> :</span></p></td>
-<td>either <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a location in which to store <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>self</code></em>
+<td>either <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a location in which to store <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>self</code></em>
 contains a pending message ID. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span>
 </td>
 </tr>
@@ -786,7 +786,7 @@
 <pre class="programlisting"><span class="returnvalue">void</span>                tp_message_set_int32                (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> part</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint32</span> i</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint32"><span class="type">gint32</span></a> i</code></em>);</pre>
 <p>
 Set <em class="parameter"><code>key</code></em> in part <em class="parameter"><code>part</code></em> of <em class="parameter"><code>self</code></em> to have <em class="parameter"><code>i</code></em> as a signed integer value.
 </p>
@@ -821,7 +821,7 @@
 <pre class="programlisting"><span class="returnvalue">void</span>                tp_message_set_int64                (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> part</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint64</span> i</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> i</code></em>);</pre>
 <p>
 Set <em class="parameter"><code>key</code></em> in part <em class="parameter"><code>part</code></em> of <em class="parameter"><code>self</code></em> to have <em class="parameter"><code>i</code></em> as a signed integer value.
 </p>
@@ -964,7 +964,7 @@
 <pre class="programlisting"><span class="returnvalue">void</span>                tp_message_set_uint32               (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> part</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
-                                                         <em class="parameter"><code><span class="type">guint32</span> u</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> u</code></em>);</pre>
 <p>
 Set <em class="parameter"><code>key</code></em> in part <em class="parameter"><code>part</code></em> of <em class="parameter"><code>self</code></em> to have <em class="parameter"><code>u</code></em> as an unsigned integer value.
 </p>
@@ -999,7 +999,7 @@
 <pre class="programlisting"><span class="returnvalue">void</span>                tp_message_set_uint64               (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> part</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
-                                                         <em class="parameter"><code><span class="type">guint64</span> u</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> u</code></em>);</pre>
 <p>
 Set <em class="parameter"><code>key</code></em> in part <em class="parameter"><code>part</code></em> of <em class="parameter"><code>self</code></em> to have <em class="parameter"><code>u</code></em> as an unsigned integer value.
 </p>

=== modified file 'docs/reference/html/TpSignalledMessage.html'
--- docs/reference/html/TpSignalledMessage.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/TpSignalledMessage.html	2012-07-29 01:19:20 +0000
@@ -88,7 +88,7 @@
 <a name="tp-signalled-message-get-sender"></a><h3>tp_signalled_message_get_sender ()</h3>
 <pre class="programlisting"><a class="link" href="telepathy-glib-contact.html#TpContact"><span class="returnvalue">TpContact</span></a> *         tp_signalled_message_get_sender     (<em class="parameter"><code><a class="link" href="TpMessage.html" title="TpMessage"><span class="type">TpMessage</span></a> *message</code></em>);</pre>
 <p>
-Returns a <a class="link" href="telepathy-glib-contact.html#TpContact"><span class="type">TpContact</span></a> representing the sender of <em class="parameter"><code>message</code></em> if known, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+Returns a <a class="link" href="telepathy-glib-contact.html#TpContact"><span class="type">TpContact</span></a> representing the sender of <em class="parameter"><code>message</code></em> if known, <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 otherwise.
 </p>
 <div class="variablelist"><table border="0">
@@ -115,7 +115,7 @@
 <a name="TpSignalledMessage--sender"></a><h3>The <code class="literal">"sender"</code> property</h3>
 <pre class="programlisting">  "sender"                   <a class="link" href="telepathy-glib-contact.html#TpContact"><span class="type">TpContact</span></a>*            : Read / Write / Construct Only</pre>
 <p>
-A <a class="link" href="telepathy-glib-contact.html#TpContact"><span class="type">TpContact</span></a> representing the sender of the message, if known, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+A <a class="link" href="telepathy-glib-contact.html#TpContact"><span class="type">TpContact</span></a> representing the sender of the message, if known, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 otherwise.
 </p>
 <p class="since">Since 0.13.9</p>

=== modified file 'docs/reference/html/index.html'
--- docs/reference/html/index.html	2012-04-03 10:16:49 +0000
+++ docs/reference/html/index.html	2012-07-29 01:19:20 +0000
@@ -15,10 +15,12 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">telepathy-glib API Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      This manual documents telepathy-glib version 0.18.0
+      This manual documents telepathy-glib version 0.18.2
 .
       The latest development version of this documentation can be found here:
       <a class="ulink" href="http://telepathy.freedesktop.org/doc/telepathy-glib/" target="_top">online copy of the telepathy-glib API Reference Manual</a>.
+      The latest version in this stable branch can be found here:
+      <a class="ulink" href="http://telepathy.freedesktop.org/doc/telepathy-glib-0.18.x/" target="_top">online copy of the telepathy-glib 0.18.x API Reference Manual</a>.
     </p></div>
 </div>
 <hr>

=== modified file 'docs/reference/html/index.sgml'
--- docs/reference/html/index.sgml	2012-04-03 10:16:49 +0000
+++ docs/reference/html/index.sgml	2012-07-29 01:19:20 +0000
@@ -1,4 +1,5 @@
 <ONLINE href="http://telepathy.freedesktop.org/doc/telepathy-glib/">
+<ONLINE href="http://telepathy.freedesktop.org/doc/telepathy-glib-0.18.x/">
 <ANCHOR id="telepathy-glib-proxy" href="telepathy-glib/telepathy-glib-proxy.html">
 <ANCHOR id="telepathy-glib-proxy.synopsis" href="telepathy-glib/telepathy-glib-proxy.html#telepathy-glib-proxy.synopsis">
 <ANCHOR id="TpProxy" href="telepathy-glib/telepathy-glib-proxy.html#TpProxy">

=== modified file 'docs/reference/html/telepathy-glib-TpContactsMixin.html'
--- docs/reference/html/telepathy-glib-TpContactsMixin.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/telepathy-glib-TpContactsMixin.html	2012-07-29 01:19:20 +0000
@@ -53,7 +53,7 @@
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-TpContactsMixin.html#tp-contacts-mixin-iface-init" title="tp_contacts_mixin_iface_init ()">tp_contacts_mixin_iface_init</a>        (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> g_iface</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> iface_data</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-TpContactsMixin.html#tp-contacts-mixin-init" title="tp_contacts_mixin_init ()">tp_contacts_mixin_init</a>              (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *obj</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> offset</code></em>);
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> offset</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-TpContactsMixin.html#tp-contacts-mixin-set-contact-attribute" title="tp_contacts_mixin_set_contact_attribute ()">tp_contacts_mixin_set_contact_attribute</a>
                                                         (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *contact_attributes</code></em>,
                                                          <em class="parameter"><code><a class="link" href="telepathy-glib-handle.html#TpHandle" title="TpHandle"><span class="type">TpHandle</span></a> handle</code></em>,
@@ -172,8 +172,8 @@
       <tr>
         <td class="listing_lines" align="right"><pre>1
 2</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-TpContactsMixin.html#tp-contacts-mixin-class-init">tp_contacts_mixin_class_init</a></span> <span class="gtkdoc opt">((</span>GObjectClass <span class="gtkdoc opt">*)</span> klass<span class="gtkdoc opt">,</span>
-                         <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span> <span class="gtkdoc opt">(</span>SomeObjectClass<span class="gtkdoc opt">,</span> contacts_mixin<span class="gtkdoc opt">));</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-TpContactsMixin.html#tp-contacts-mixin-class-init">tp_contacts_mixin_class_init</a></span><span class="normal"> </span><span class="symbol">((</span><span class="normal"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObjectClass">GObjectClass</a> </span><span class="symbol">*)</span><span class="normal"> klass</span><span class="symbol">,</span>
+<span class="normal">                         </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">SomeObjectClass</span><span class="symbol">,</span><span class="normal"> contacts_mixin</span><span class="symbol">));</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -243,7 +243,7 @@
 <div class="refsect2">
 <a name="tp-contacts-mixin-init"></a><h3>tp_contacts_mixin_init ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                tp_contacts_mixin_init              (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *obj</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> offset</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> offset</code></em>);</pre>
 <p>
 Initialize the contacts mixin. Should be called from the implementation's
 instance init function like so:
@@ -256,8 +256,8 @@
       <tr>
         <td class="listing_lines" align="right"><pre>1
 2</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-TpContactsMixin.html#tp-contacts-mixin-init">tp_contacts_mixin_init</a></span> <span class="gtkdoc opt">((</span>GObject <span class="gtkdoc opt">*)</span> self<span class="gtkdoc opt">,</span>
-                    <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span> <span class="gtkdoc opt">(</span>SomeObject<span class="gtkdoc opt">,</span> contacts_mixin<span class="gtkdoc opt">));</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-TpContactsMixin.html#tp-contacts-mixin-init">tp_contacts_mixin_init</a></span><span class="normal"> </span><span class="symbol">((</span><span class="normal"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> </span><span class="symbol">*)</span><span class="normal"> self</span><span class="symbol">,</span>
+<span class="normal">                    </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">SomeObject</span><span class="symbol">,</span><span class="normal"> contacts_mixin</span><span class="symbol">));</span></pre></td>
       </tr>
     </tbody>
   </table>

=== modified file 'docs/reference/html/telepathy-glib-TpGroupMixin.html'
--- docs/reference/html/telepathy-glib-TpGroupMixin.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/telepathy-glib-TpGroupMixin.html	2012-07-29 01:19:20 +0000
@@ -508,7 +508,7 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>rem_func</code></em> :</span></p></td>
 <td>A callback to be used to remove contacts from this group.
-This must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if you will subsequently call
+This must be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if you will subsequently call
 <a class="link" href="telepathy-glib-TpGroupMixin.html#tp-group-mixin-class-set-remove-with-reason-func" title="tp_group_mixin_class_set_remove_with_reason_func ()"><code class="function">tp_group_mixin_class_set_remove_with_reason_func()</code></a>.</td>
 </tr>
 </tbody>
@@ -560,7 +560,7 @@
 Set a callback to be used to implement <code class="function">RemoveMembers()</code> and
 <code class="function">RemoveMembersWithReason()</code>. If this function is called during class
 initialization, the given callback will be used instead of the remove
-callback passed to <a class="link" href="telepathy-glib-TpGroupMixin.html#tp-group-mixin-class-init" title="tp_group_mixin_class_init ()"><code class="function">tp_group_mixin_class_init()</code></a> (which must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+callback passed to <a class="link" href="telepathy-glib-TpGroupMixin.html#tp-group-mixin-class-init" title="tp_group_mixin_class_init ()"><code class="function">tp_group_mixin_class_init()</code></a> (which must be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 in this case).
 </p>
 <div class="variablelist"><table border="0">
@@ -1103,7 +1103,7 @@
 a non-empty intersection, the result is undefined. Don't do that.
 </p>
 <p>
-Each of the TpIntset arguments may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, which is treated as
+Each of the TpIntset arguments may be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, which is treated as
 equivalent to an empty set.
 </p>
 <div class="variablelist"><table border="0">
@@ -1116,7 +1116,7 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>message</code></em> :</span></p></td>
 <td>A message to be sent to the affected contacts if possible;
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is allowed, and is mapped to an empty string</td>
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> is allowed, and is mapped to an empty string</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>add</code></em> :</span></p></td>
@@ -1182,7 +1182,7 @@
 a non-empty intersection, the result is undefined. Don't do that.
 </p>
 <p>
-Each of the TpIntset arguments may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, which is treated as
+Each of the TpIntset arguments may be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, which is treated as
 equivalent to an empty set.
 </p>
 <p>

=== modified file 'docs/reference/html/telepathy-glib-TpHeap.html'
--- docs/reference/html/telepathy-glib-TpHeap.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/telepathy-glib-TpHeap.html	2012-07-29 01:19:20 +0000
@@ -87,7 +87,7 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>destructor</code></em> :</span></p></td>
 <td>Function to call on the pointers when the heap is destroyed
-or cleared, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if this is not needed</td>
+or cleared, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if this is not needed</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
@@ -188,7 +188,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The first item in the queue, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the queue is empty</td>
+<td>The first item in the queue, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if the queue is empty</td>
 </tr>
 </tbody>
 </table></div>

=== modified file 'docs/reference/html/telepathy-glib-TpMessageMixin.html'
--- docs/reference/html/telepathy-glib-TpMessageMixin.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/telepathy-glib-TpMessageMixin.html	2012-07-29 01:19:20 +0000
@@ -54,7 +54,7 @@
                                                          <em class="parameter"><code><a class="link" href="telepathy-glib-enums.html#TpDeliveryReportingSupportFlags" title="enum TpDeliveryReportingSupportFlags"><span class="type">TpDeliveryReportingSupportFlags</span></a> delivery_reporting_support_flags</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> * const *supported_content_types</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-TpMessageMixin.html#tp-message-mixin-init" title="tp_message_mixin_init ()">tp_message_mixin_init</a>               (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *obj</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> offset</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> offset</code></em>,
                                                          <em class="parameter"><code><a class="link" href="TpBaseConnection.html" title="TpBaseConnection"><span class="type">TpBaseConnection</span></a> *connection</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-TpMessageMixin.html#tp-message-mixin-init-dbus-properties" title="tp_message_mixin_init_dbus_properties ()">tp_message_mixin_init_dbus_properties</a>
                                                         (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObjectClass"><span class="type">GObjectClass</span></a> *cls</code></em>);
@@ -108,10 +108,10 @@
 2
 3
 4</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-IMPLEMENT-INTERFACE:CAPS">G_IMPLEMENT_INTERFACE</a></span> <span class="gtkdoc opt">(</span>TP_TYPE_SVC_CHANNEL_TYPE_TEXT<span class="gtkdoc opt">,</span>
-  tp_message_mixin_text_iface_init<span class="gtkdoc opt">);</span>
-<span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-IMPLEMENT-INTERFACE:CAPS">G_IMPLEMENT_INTERFACE</a></span> <span class="gtkdoc opt">(</span>TP_TYPE_SVC_CHANNEL_INTERFACE_MESSAGES<span class="gtkdoc opt">,</span>
-  tp_message_mixin_messages_iface_init<span class="gtkdoc opt">);</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-IMPLEMENT-INTERFACE:CAPS">G_IMPLEMENT_INTERFACE</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">TP_TYPE_SVC_CHANNEL_TYPE_TEXT</span><span class="symbol">,</span>
+<span class="normal">  <a href="telepathy-glib-TpMessageMixin.html#tp-message-mixin-text-iface-init">tp_message_mixin_text_iface_init</a></span><span class="symbol">);</span>
+<span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-IMPLEMENT-INTERFACE:CAPS">G_IMPLEMENT_INTERFACE</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">TP_TYPE_SVC_CHANNEL_INTERFACE_MESSAGES</span><span class="symbol">,</span>
+<span class="normal">  <a href="telepathy-glib-TpMessageMixin.html#tp-message-mixin-messages-iface-init">tp_message_mixin_messages_iface_init</a></span><span class="symbol">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -245,7 +245,7 @@
 <div class="refsect2">
 <a name="tp-message-mixin-init"></a><h3>tp_message_mixin_init ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                tp_message_mixin_init               (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> *obj</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> offset</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> offset</code></em>,
                                                          <em class="parameter"><code><a class="link" href="TpBaseConnection.html" title="TpBaseConnection"><span class="type">TpBaseConnection</span></a> *connection</code></em>);</pre>
 <p>
 Initialize the mixin. Should be called from the implementation's
@@ -260,9 +260,9 @@
         <td class="listing_lines" align="right"><pre>1
 2
 3</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-TpMessageMixin.html#tp-message-mixin-init">tp_message_mixin_init</a></span> <span class="gtkdoc opt">((</span>GObject <span class="gtkdoc opt">*)</span> self<span class="gtkdoc opt">,</span>
-    <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span> <span class="gtkdoc opt">(</span>SomeObject<span class="gtkdoc opt">,</span> message_mixin<span class="gtkdoc opt">),</span>
-    self<span class="gtkdoc opt">-&gt;</span>connection<span class="gtkdoc opt">);</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-TpMessageMixin.html#tp-message-mixin-init">tp_message_mixin_init</a></span><span class="normal"> </span><span class="symbol">((</span><span class="normal"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> </span><span class="symbol">*)</span><span class="normal"> self</span><span class="symbol">,</span>
+<span class="normal">    </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">SomeObject</span><span class="symbol">,</span><span class="normal"> message_mixin</span><span class="symbol">),</span>
+<span class="normal">    self</span><span class="symbol">-&gt;</span><span class="normal">connection</span><span class="symbol">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -419,12 +419,12 @@
 <td><p><span class="term"><em class="parameter"><code>token</code></em> :</span></p></td>
 <td>A token representing the sent message (see the Telepathy D-Bus API
 specification), or an empty string if no suitable identifier is available,
-or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error</td>
+or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> on error</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
 <td>
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on success, or the error with which message submission failed</td>
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> on success, or the error with which message submission failed</td>
 </tr>
 </tbody>
 </table></div>
@@ -484,7 +484,7 @@
                                                          <em class="parameter"><code><a class="link" href="telepathy-glib-handle.html#TpHandle" title="TpHandle"><span class="type">TpHandle</span></a> *first_sender</code></em>);</pre>
 <p>
 Return whether the channel <em class="parameter"><code>obj</code></em> has unacknowledged messages. If so, and
-<em class="parameter"><code>first_sender</code></em> is not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, the handle of the sender of the first message
+<em class="parameter"><code>first_sender</code></em> is not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, the handle of the sender of the first message
 is placed in it, without incrementing the handle's reference count.
 </p>
 <div class="variablelist"><table border="0">
@@ -496,7 +496,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>first_sender</code></em> :</span></p></td>
-<td>If not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to store the sender of the oldest pending
+<td>If not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to store the sender of the oldest pending
 message</td>
 </tr>
 <tr>

=== modified file 'docs/reference/html/telepathy-glib-TpPresenceMixin.html'
--- docs/reference/html/telepathy-glib-TpPresenceMixin.html	2012-04-03 10:16:49 +0000
+++ docs/reference/html/telepathy-glib-TpPresenceMixin.html	2012-07-29 01:19:20 +0000
@@ -108,7 +108,7 @@
 </p>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="idp104960912"></a>Implementing SimplePresence</h2></div></div></div>
+<a name="id1176980"></a>Implementing SimplePresence</h2></div></div></div>
 <p>
   Since 0.7.13 this mixin supports the entire SimplePresence interface.
   You can implement <a class="link" href="telepathy-glib-svc-connection.html#TpSvcConnectionInterfaceSimplePresence"><span class="type">TpSvcConnectionInterfaceSimplePresence</span></a> as follows:
@@ -131,13 +131,13 @@
 5
 6
 7</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-DEFINE-TYPE-WITH-CODE:CAPS">G_DEFINE_TYPE_WITH_CODE</a></span> <span class="gtkdoc opt">(</span>MyConnection<span class="gtkdoc opt">,</span> my_connection<span class="gtkdoc opt">,</span>
-    TP_TYPE_BASE_CONNECTION<span class="gtkdoc opt">,</span>
-    <span class="gtkdoc slc">// ...</span>
-    <span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-IMPLEMENT-INTERFACE:CAPS">G_IMPLEMENT_INTERFACE</a></span> <span class="gtkdoc opt">(</span>TP_TYPE_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE<span class="gtkdoc opt">,</span>
-        tp_presence_mixin_simple_presence_iface_init<span class="gtkdoc opt">);</span>
-    <span class="gtkdoc slc">// ...</span>
-    <span class="gtkdoc opt">)</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-DEFINE-TYPE-WITH-CODE:CAPS">G_DEFINE_TYPE_WITH_CODE</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">MyConnection</span><span class="symbol">,</span><span class="normal"> my_connection</span><span class="symbol">,</span>
+<span class="normal">    TP_TYPE_BASE_CONNECTION</span><span class="symbol">,</span>
+<span class="normal">    </span><span class="comment">// ...</span>
+<span class="normal">    </span><span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-IMPLEMENT-INTERFACE:CAPS">G_IMPLEMENT_INTERFACE</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">TP_TYPE_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE</span><span class="symbol">,</span>
+<span class="normal">        <a href="telepathy-glib-TpPresenceMixin.html#tp-presence-mixin-simple-presence-iface-init">tp_presence_mixin_simple_presence_iface_init</a></span><span class="symbol">);</span>
+<span class="normal">    </span><span class="comment">// ...</span>
+<span class="normal">    </span><span class="symbol">)</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -160,7 +160,7 @@
 </p>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="idp104976576"></a>Implementing old-style Presence</h2></div></div></div>
+<a name="id1177111"></a>Implementing old-style Presence</h2></div></div></div>
 <p>
   This mixin also supports a large subset of the deprecated Presence
   interface. It does not support protocols where it is possible to set
@@ -185,13 +185,13 @@
 5
 6
 7</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-DEFINE-TYPE-WITH-CODE:CAPS">G_DEFINE_TYPE_WITH_CODE</a></span> <span class="gtkdoc opt">(</span>MyConnection<span class="gtkdoc opt">,</span> my_connection<span class="gtkdoc opt">,</span>
-    TP_TYPE_BASE_CONNECTION<span class="gtkdoc opt">,</span>
-    <span class="gtkdoc slc">// ...</span>
-    <span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-IMPLEMENT-INTERFACE:CAPS">G_IMPLEMENT_INTERFACE</a></span> <span class="gtkdoc opt">(</span>TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE<span class="gtkdoc opt">,</span>
-        tp_presence_mixin_iface_init<span class="gtkdoc opt">);</span>
-    <span class="gtkdoc slc">// ...</span>
-    <span class="gtkdoc opt">)</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-DEFINE-TYPE-WITH-CODE:CAPS">G_DEFINE_TYPE_WITH_CODE</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">MyConnection</span><span class="symbol">,</span><span class="normal"> my_connection</span><span class="symbol">,</span>
+<span class="normal">    TP_TYPE_BASE_CONNECTION</span><span class="symbol">,</span>
+<span class="normal">    </span><span class="comment">// ...</span>
+<span class="normal">    </span><span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-IMPLEMENT-INTERFACE:CAPS">G_IMPLEMENT_INTERFACE</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE</span><span class="symbol">,</span>
+<span class="normal">        <a href="telepathy-glib-TpPresenceMixin.html#tp-presence-mixin-iface-init">tp_presence_mixin_iface_init</a></span><span class="symbol">);</span>
+<span class="normal">    </span><span class="comment">// ...</span>
+<span class="normal">    </span><span class="symbol">)</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -221,7 +221,7 @@
 </p>
 <p>
 In addition to the fields documented here, there are two gpointer fields
-which must currently be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. A meaning may be defined for these in a
+which must currently be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. A meaning may be defined for these in a
 future version of telepathy-glib.
 </p>
 <div class="variablelist"><table border="0">
@@ -253,7 +253,7 @@
 </p>
 <p>
 In addition to the fields documented here, there are two gpointer fields
-which must currently be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. A meaning may be defined for these in a
+which must currently be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. A meaning may be defined for these in a
 future version of telepathy-glib.
 </p>
 <div class="variablelist"><table border="0">
@@ -293,7 +293,7 @@
 status can be set on the connection. Most users of this mixin do not need to
 supply an implementation of this callback: the value of
 <a class="link" href="telepathy-glib-TpPresenceMixin.html#TpPresenceStatusSpec.self"><span class="type">TpPresenceStatusSpec.self</span></a> is enough to determine whether this is a
-user-settable presence, so <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> should be passed to
+user-settable presence, so <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> should be passed to
 <a class="link" href="telepathy-glib-TpPresenceMixin.html#tp-presence-mixin-class-init" title="tp_presence_mixin_class_init ()"><code class="function">tp_presence_mixin_class_init()</code></a> for this callback.
 </p>
 <p>
@@ -357,11 +357,11 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>Used to return a Telepathy D-Bus error if <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is returned</td>
+<td>Used to return a Telepathy D-Bus error if <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> is returned</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>The contact presence on success, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> with
+<td>The contact presence on success, <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> with
 error set on error. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
@@ -377,7 +377,7 @@
 <p>
 Signature of the callback used to commit changes to the user's own presence
 status in SetStatuses. It is also used in ClearStatus and RemoveStatus to
-reset the user's own status back to the "default" one with a <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> status
+reset the user's own status back to the "default" one with a <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> status
 argument.
 </p>
 <p>
@@ -455,7 +455,7 @@
 </p>
 <p>
 In addition to the fields documented here, there are two gpointer fields
-which must currently be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. A meaning may be defined for these in a
+which must currently be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. A meaning may be defined for these in a
 future version of telepathy-glib.
 </p>
 <div class="variablelist"><table border="0">
@@ -568,13 +568,13 @@
 5
 6
 7</pre></td>
-        <td class="listing_code"><pre class="programlisting">TpPresenceMixinClass <span class="gtkdoc opt">*</span>mixin_class<span class="gtkdoc opt">;</span>
+        <td class="listing_code"><pre class="programlisting"><span class="usertype">TpPresenceMixinClass</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">mixin_class</span><span class="symbol">;</span>
 
-<span class="function"><a href="telepathy-glib-TpPresenceMixin.html#tp-presence-mixin-class-init">tp_presence_mixin_class_init</a></span> <span class="gtkdoc opt">((</span>GObjectClass <span class="gtkdoc opt">*)</span> klass<span class="gtkdoc opt">,</span>
-    <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span> <span class="gtkdoc opt">(</span>SomeObjectClass<span class="gtkdoc opt">,</span> presence_mixin<span class="gtkdoc opt">));</span>
-mixin_class <span class="gtkdoc opt">=</span> <span class="function">TP_PRESENCE_MIXIN_CLASS</span> <span class="gtkdoc opt">(</span>klass<span class="gtkdoc opt">);</span>
-mixin_class<span class="gtkdoc opt">-&gt;</span>get_maximum_status_message_length <span class="gtkdoc opt">=</span>
-    some_object_get_maximum_status_message_length<span class="gtkdoc opt">;</span></pre></td>
+<span class="function"><a href="telepathy-glib-TpPresenceMixin.html#tp-presence-mixin-class-init">tp_presence_mixin_class_init</a></span><span class="normal"> </span><span class="symbol">((</span><span class="normal"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObjectClass">GObjectClass</a> </span><span class="symbol">*)</span><span class="normal"> klass</span><span class="symbol">,</span>
+<span class="normal">    </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">SomeObjectClass</span><span class="symbol">,</span><span class="normal"> presence_mixin</span><span class="symbol">));</span>
+<span class="normal">mixin_class </span><span class="symbol">=</span><span class="normal"> </span><span class="function">TP_PRESENCE_MIXIN_CLASS</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">klass</span><span class="symbol">);</span>
+<span class="normal">mixin_class</span><span class="symbol">-&gt;</span><span class="normal">get_maximum_status_message_length </span><span class="symbol">=</span>
+<span class="normal">    some_object_get_maximum_status_message_length</span><span class="symbol">;</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -642,9 +642,9 @@
         <td class="listing_lines" align="right"><pre>1
 2
 3</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-TpPresenceMixin.html#tp-presence-mixin-class-init">tp_presence_mixin_class_init</a></span> <span class="gtkdoc opt">((</span>GObjectClass <span class="gtkdoc opt">*)</span> klass<span class="gtkdoc opt">,</span>
-                              <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span> <span class="gtkdoc opt">(</span>SomeObjectClass<span class="gtkdoc opt">,</span>
-                                               presence_mixin<span class="gtkdoc opt">));</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-TpPresenceMixin.html#tp-presence-mixin-class-init">tp_presence_mixin_class_init</a></span><span class="normal"> </span><span class="symbol">((</span><span class="normal"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObjectClass">GObjectClass</a> </span><span class="symbol">*)</span><span class="normal"> klass</span><span class="symbol">,</span>
+<span class="normal">                              </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">SomeObjectClass</span><span class="symbol">,</span>
+<span class="normal">                                               presence_mixin</span><span class="symbol">));</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -667,7 +667,7 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>status_available</code></em> :</span></p></td>
 <td>A callback to be used to determine if a given presence
-status can be set on a particular connection. Should usually be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, to
+status can be set on a particular connection. Should usually be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, to
 consider all statuses with <a class="link" href="telepathy-glib-TpPresenceMixin.html#TpPresenceStatusSpec.self"><span class="type">TpPresenceStatusSpec.self</span></a> set to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> to be
 settable.</td>
 </tr>
@@ -708,8 +708,8 @@
       <tr>
         <td class="listing_lines" align="right"><pre>1
 2</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-TpPresenceMixin.html#tp-presence-mixin-init">tp_presence_mixin_init</a></span> <span class="gtkdoc opt">((</span>GObject <span class="gtkdoc opt">*)</span> self<span class="gtkdoc opt">,</span>
-                        <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span> <span class="gtkdoc opt">(</span>SomeObject<span class="gtkdoc opt">,</span> presence_mixin<span class="gtkdoc opt">));</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-TpPresenceMixin.html#tp-presence-mixin-init">tp_presence_mixin_init</a></span><span class="normal"> </span><span class="symbol">((</span><span class="normal"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> </span><span class="symbol">*)</span><span class="normal"> self</span><span class="symbol">,</span>
+<span class="normal">                        </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">SomeObject</span><span class="symbol">,</span><span class="normal"> presence_mixin</span><span class="symbol">));</span></pre></td>
       </tr>
     </tbody>
   </table>

=== modified file 'docs/reference/html/telepathy-glib-TpPropertiesMixin.html'
--- docs/reference/html/telepathy-glib-TpPropertiesMixin.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/telepathy-glib-TpPropertiesMixin.html	2012-07-29 01:19:20 +0000
@@ -336,9 +336,9 @@
         <td class="listing_lines" align="right"><pre>1
 2
 3</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-TpPropertiesMixin.html#tp-properties-mixin-class-init">tp_properties_mixin_class_init</a></span> <span class="gtkdoc opt">((</span>GObjectClass <span class="gtkdoc opt">*)</span> klass<span class="gtkdoc opt">,</span>
-                                <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span> <span class="gtkdoc opt">(</span>SomeObjectClass<span class="gtkdoc opt">,</span>
-                                 properties_mixin<span class="gtkdoc opt">));</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-TpPropertiesMixin.html#tp-properties-mixin-class-init">tp_properties_mixin_class_init</a></span><span class="normal"> </span><span class="symbol">((</span><span class="normal"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObjectClass">GObjectClass</a> </span><span class="symbol">*)</span><span class="normal"> klass</span><span class="symbol">,</span>
+<span class="normal">                                </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">SomeObjectClass</span><span class="symbol">,</span>
+<span class="normal">                                 properties_mixin</span><span class="symbol">));</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -392,9 +392,9 @@
         <td class="listing_lines" align="right"><pre>1
 2
 3</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-TpPropertiesMixin.html#tp-properties-mixin-init">tp_properties_mixin_init</a></span> <span class="gtkdoc opt">((</span>GObject <span class="gtkdoc opt">*)</span> self<span class="gtkdoc opt">,</span>
-                          <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span> <span class="gtkdoc opt">(</span>SomeObject<span class="gtkdoc opt">,</span> properties_mixin<span class="gtkdoc opt">),</span>
-                          self<span class="gtkdoc opt">-&gt;</span>contact_repo<span class="gtkdoc opt">);</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-TpPropertiesMixin.html#tp-properties-mixin-init">tp_properties_mixin_init</a></span><span class="normal"> </span><span class="symbol">((</span><span class="normal"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> </span><span class="symbol">*)</span><span class="normal"> self</span><span class="symbol">,</span>
+<span class="normal">                          </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">SomeObject</span><span class="symbol">,</span><span class="normal"> properties_mixin</span><span class="symbol">),</span>
+<span class="normal">                          self</span><span class="symbol">-&gt;</span><span class="normal">contact_repo</span><span class="symbol">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -553,7 +553,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>property</code></em> :</span></p></td>
-<td>either <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a pointer to a location to receive the property
+<td>either <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a pointer to a location to receive the property
 index</td>
 </tr>
 <tr>
@@ -710,7 +710,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>If <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, return successfully; otherwise return this error</td>
+<td>If <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, return successfully; otherwise return this error</td>
 </tr>
 </tbody>
 </table></div>
@@ -755,7 +755,7 @@
 <em class="parameter"><code>props</code></em> is ignored. Otherwise, the following applies:
 </p>
 <p>
-If <em class="parameter"><code>props</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> the PropertiesChanged signal is emitted for this one
+If <em class="parameter"><code>props</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> the PropertiesChanged signal is emitted for this one
 property.
 </p>
 <p>
@@ -780,7 +780,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>props</code></em> :</span></p></td>
-<td>either <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a pointer to a TpIntset</td>
+<td>either <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a pointer to a TpIntset</td>
 </tr>
 </tbody>
 </table></div>
@@ -802,7 +802,7 @@
 relied upon.
 </p>
 <p>
-If <em class="parameter"><code>props</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> the PropertyFlagsChanged signal is emitted for this
+If <em class="parameter"><code>props</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> the PropertyFlagsChanged signal is emitted for this
 single property.
 </p>
 <p>
@@ -831,7 +831,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>props</code></em> :</span></p></td>
-<td>either <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a pointer to a TpIntset</td>
+<td>either <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a pointer to a TpIntset</td>
 </tr>
 </tbody>
 </table></div>

=== modified file 'docs/reference/html/telepathy-glib-TpTextMixin.html'
--- docs/reference/html/telepathy-glib-TpTextMixin.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/telepathy-glib-TpTextMixin.html	2012-07-29 01:19:20 +0000
@@ -181,8 +181,8 @@
       <tr>
         <td class="listing_lines" align="right"><pre>1
 2</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-TpTextMixin.html#tp-text-mixin-class-init">tp_text_mixin_class_init</a></span> <span class="gtkdoc opt">((</span>GObjectClass <span class="gtkdoc opt">*)</span> klass<span class="gtkdoc opt">,</span>
-                          <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span> <span class="gtkdoc opt">(</span>SomeObjectClass<span class="gtkdoc opt">,</span> text_mixin<span class="gtkdoc opt">));</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-TpTextMixin.html#tp-text-mixin-class-init">tp_text_mixin_class_init</a></span><span class="normal"> </span><span class="symbol">((</span><span class="normal"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObjectClass">GObjectClass</a> </span><span class="symbol">*)</span><span class="normal"> klass</span><span class="symbol">,</span>
+<span class="normal">                          </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">SomeObjectClass</span><span class="symbol">,</span><span class="normal"> text_mixin</span><span class="symbol">));</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -223,9 +223,9 @@
         <td class="listing_lines" align="right"><pre>1
 2
 3</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-TpTextMixin.html#tp-text-mixin-init">tp_text_mixin_init</a></span> <span class="gtkdoc opt">((</span>GObject <span class="gtkdoc opt">*)</span> self<span class="gtkdoc opt">,</span>
-                    <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span> <span class="gtkdoc opt">(</span>SomeObject<span class="gtkdoc opt">,</span> text_mixin<span class="gtkdoc opt">),</span>
-                    self<span class="gtkdoc opt">-&gt;</span>contact_repo<span class="gtkdoc opt">);</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-TpTextMixin.html#tp-text-mixin-init">tp_text_mixin_init</a></span><span class="normal"> </span><span class="symbol">((</span><span class="normal"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> </span><span class="symbol">*)</span><span class="normal"> self</span><span class="symbol">,</span>
+<span class="normal">                    </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">SomeObject</span><span class="symbol">,</span><span class="normal"> text_mixin</span><span class="symbol">),</span>
+<span class="normal">                    self</span><span class="symbol">-&gt;</span><span class="normal">contact_repo</span><span class="symbol">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -510,7 +510,7 @@
                                                          <em class="parameter"><code><a class="link" href="telepathy-glib-handle.html#TpHandle" title="TpHandle"><span class="type">TpHandle</span></a> *first_sender</code></em>);</pre>
 <p>
 Return whether the channel <em class="parameter"><code>obj</code></em> has unacknowledged messages. If so, and
-<em class="parameter"><code>first_sender</code></em> is not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, the handle of the sender of the first message
+<em class="parameter"><code>first_sender</code></em> is not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, the handle of the sender of the first message
 is placed in it, without incrementing the handle's reference count.
 </p>
 <div class="variablelist"><table border="0">
@@ -522,7 +522,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>first_sender</code></em> :</span></p></td>
-<td>If not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to store the sender of the oldest pending
+<td>If not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to store the sender of the oldest pending
 message</td>
 </tr>
 <tr>

=== modified file 'docs/reference/html/telepathy-glib-account-channel-request.html'
--- docs/reference/html/telepathy-glib-account-channel-request.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/telepathy-glib-account-channel-request.html	2012-07-29 01:19:20 +0000
@@ -50,10 +50,10 @@
 <a class="link" href="telepathy-glib-account-channel-request.html#TpAccountChannelRequest"><span class="returnvalue">TpAccountChannelRequest</span></a> * <a class="link" href="telepathy-glib-account-channel-request.html#tp-account-channel-request-new" title="tp_account_channel_request_new ()">tp_account_channel_request_new</a>
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-account.html#TpAccount"><span class="type">TpAccount</span></a> *account</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *request</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint64</span> user_action_time</code></em>);
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> user_action_time</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="returnvalue">GHashTable</span></a> *        <a class="link" href="telepathy-glib-account-channel-request.html#tp-account-channel-request-get-request" title="tp_account_channel_request_get_request ()">tp_account_channel_request_get_request</a>
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-account-channel-request.html#TpAccountChannelRequest"><span class="type">TpAccountChannelRequest</span></a> *self</code></em>);
-<span class="returnvalue">gint64</span>              <a class="link" href="telepathy-glib-account-channel-request.html#tp-account-channel-request-get-user-action-time" title="tp_account_channel_request_get_user_action_time ()">tp_account_channel_request_get_user_action_time</a>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>              <a class="link" href="telepathy-glib-account-channel-request.html#tp-account-channel-request-get-user-action-time" title="tp_account_channel_request_get_user_action_time ()">tp_account_channel_request_get_user_action_time</a>
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-account-channel-request.html#TpAccountChannelRequest"><span class="type">TpAccountChannelRequest</span></a> *self</code></em>);
 <a class="link" href="telepathy-glib-account.html#TpAccount"><span class="returnvalue">TpAccount</span></a> *         <a class="link" href="telepathy-glib-account-channel-request.html#tp-account-channel-request-get-account" title="tp_account_channel_request_get_account ()">tp_account_channel_request_get_account</a>
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-account-channel-request.html#TpAccountChannelRequest"><span class="type">TpAccountChannelRequest</span></a> *self</code></em>);
@@ -152,7 +152,7 @@
   "<a class="link" href="telepathy-glib-account-channel-request.html#TpAccountChannelRequest--account" title='The "account" property'>account</a>"                  <a class="link" href="telepathy-glib-account.html#TpAccount"><span class="type">TpAccount</span></a>*            : Read / Write / Construct Only
   "<a class="link" href="telepathy-glib-account-channel-request.html#TpAccountChannelRequest--channel-request" title='The "channel-request" property'>channel-request</a>"          <a class="link" href="telepathy-glib-channel-request.html#TpChannelRequest"><span class="type">TpChannelRequest</span></a>*     : Read
   "<a class="link" href="telepathy-glib-account-channel-request.html#TpAccountChannelRequest--request" title='The "request" property'>request</a>"                  <span class="type">GHashTable_gchararray+GValue_*</span>  : Read / Write / Construct Only
-  "<a class="link" href="telepathy-glib-account-channel-request.html#TpAccountChannelRequest--user-action-time" title='The "user-action-time" property'>user-action-time</a>"         <span class="type">gint64</span>                : Read / Write / Construct Only
+  "<a class="link" href="telepathy-glib-account-channel-request.html#TpAccountChannelRequest--user-action-time" title='The "user-action-time" property'>user-action-time</a>"         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a>                : Read / Write / Construct Only
 </pre>
 </div>
 <div class="refsect1">
@@ -196,7 +196,7 @@
 <pre class="programlisting"><a class="link" href="telepathy-glib-account-channel-request.html#TpAccountChannelRequest"><span class="returnvalue">TpAccountChannelRequest</span></a> * tp_account_channel_request_new
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-account.html#TpAccount"><span class="type">TpAccount</span></a> *account</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *request</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint64</span> user_action_time</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> user_action_time</code></em>);</pre>
 <p>
 Convenience function to create a new <a class="link" href="telepathy-glib-account-channel-request.html#TpAccountChannelRequest"><span class="type">TpAccountChannelRequest</span></a> object.
 </p>
@@ -257,7 +257,7 @@
 <hr>
 <div class="refsect2">
 <a name="tp-account-channel-request-get-user-action-time"></a><h3>tp_account_channel_request_get_user_action_time ()</h3>
-<pre class="programlisting"><span class="returnvalue">gint64</span>              tp_account_channel_request_get_user_action_time
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>              tp_account_channel_request_get_user_action_time
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-account-channel-request.html#TpAccountChannelRequest"><span class="type">TpAccountChannelRequest</span></a> *self</code></em>);</pre>
 <p>
 Return the <a class="link" href="telepathy-glib-account-channel-request.html#TpAccountChannelRequest--user-action-time" title='The "user-action-time" property'><span class="type">"user-action-time"</span></a> construct-only property
@@ -339,7 +339,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>cancellable</code></em> :</span></p></td>
-<td>optional <a href="http://library.gnome.org/devel/gio/unstable/GCancellable.html"><span class="type">GCancellable</span></a> object, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to ignore</td>
+<td>optional <a href="http://library.gnome.org/devel/gio/unstable/GCancellable.html"><span class="type">GCancellable</span></a> object, <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to ignore</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
@@ -390,7 +390,7 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>context</code></em> :</span></p></td>
 <td>pointer used to return a
-reference to the context of the <code class="function">HandleChannels()</code> call, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>][<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
+reference to the context of the <code class="function">HandleChannels()</code> call, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>][<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 <tr>
@@ -400,7 +400,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a new reference on a <a class="link" href="telepathy-glib-channel.html#TpChannel"><span class="type">TpChannel</span></a> if the
-channel was successfully created and you are handling it, otherwise <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+channel was successfully created and you are handling it, otherwise <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -447,7 +447,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>cancellable</code></em> :</span></p></td>
-<td>optional <a href="http://library.gnome.org/devel/gio/unstable/GCancellable.html"><span class="type">GCancellable</span></a> object, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to ignore</td>
+<td>optional <a href="http://library.gnome.org/devel/gio/unstable/GCancellable.html"><span class="type">GCancellable</span></a> object, <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to ignore</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
@@ -502,7 +502,7 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>context</code></em> :</span></p></td>
 <td>pointer used to return a
-reference to the context of the <code class="function">HandleChannels()</code> call, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>][<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
+reference to the context of the <code class="function">HandleChannels()</code> call, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>][<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 <tr>
@@ -512,7 +512,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a new reference on a <a class="link" href="telepathy-glib-channel.html#TpChannel"><span class="type">TpChannel</span></a> if the
-channel was successfully created and you are handling it, otherwise <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+channel was successfully created and you are handling it, otherwise <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -549,11 +549,11 @@
 <td><p><span class="term"><em class="parameter"><code>preferred_handler</code></em> :</span></p></td>
 <td>Either the well-known bus name (starting with
 <a class="link" href="telepathy-glib-defs.html#TP-CLIENT-BUS-NAME-BASE:CAPS" title="TP_CLIENT_BUS_NAME_BASE"><code class="literal">TP_CLIENT_BUS_NAME_BASE</code></a>) of the preferred handler for the channel,
-or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to indicate that any handler would be acceptable.</td>
+or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to indicate that any handler would be acceptable.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>cancellable</code></em> :</span></p></td>
-<td>optional <a href="http://library.gnome.org/devel/gio/unstable/GCancellable.html"><span class="type">GCancellable</span></a> object, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to ignore</td>
+<td>optional <a href="http://library.gnome.org/devel/gio/unstable/GCancellable.html"><span class="type">GCancellable</span></a> object, <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to ignore</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
@@ -647,11 +647,11 @@
 <td><p><span class="term"><em class="parameter"><code>preferred_handler</code></em> :</span></p></td>
 <td>Either the well-known bus name (starting with
 <a class="link" href="telepathy-glib-defs.html#TP-CLIENT-BUS-NAME-BASE:CAPS" title="TP_CLIENT_BUS_NAME_BASE"><code class="literal">TP_CLIENT_BUS_NAME_BASE</code></a>) of the preferred handler for the channel,
-or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to indicate that any handler would be acceptable.</td>
+or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to indicate that any handler would be acceptable.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>cancellable</code></em> :</span></p></td>
-<td>optional <a href="http://library.gnome.org/devel/gio/unstable/GCancellable.html"><span class="type">GCancellable</span></a> object, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to ignore</td>
+<td>optional <a href="http://library.gnome.org/devel/gio/unstable/GCancellable.html"><span class="type">GCancellable</span></a> object, <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to ignore</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
@@ -739,11 +739,11 @@
 <td><p><span class="term"><em class="parameter"><code>preferred_handler</code></em> :</span></p></td>
 <td>Either the well-known bus name (starting with
 <a class="link" href="telepathy-glib-defs.html#TP-CLIENT-BUS-NAME-BASE:CAPS" title="TP_CLIENT_BUS_NAME_BASE"><code class="literal">TP_CLIENT_BUS_NAME_BASE</code></a>) of the preferred handler for the channel,
-or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to indicate that any handler would be acceptable.</td>
+or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to indicate that any handler would be acceptable.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>cancellable</code></em> :</span></p></td>
-<td>optional <a href="http://library.gnome.org/devel/gio/unstable/GCancellable.html"><span class="type">GCancellable</span></a> object, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to ignore</td>
+<td>optional <a href="http://library.gnome.org/devel/gio/unstable/GCancellable.html"><span class="type">GCancellable</span></a> object, <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to ignore</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
@@ -789,7 +789,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a newly created <a class="link" href="telepathy-glib-channel.html#TpChannel"><span class="type">TpChannel</span></a> if the channel was
-successfully created and dispatched, otherwise <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
+successfully created and dispatched, otherwise <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -839,11 +839,11 @@
 <td><p><span class="term"><em class="parameter"><code>preferred_handler</code></em> :</span></p></td>
 <td>Either the well-known bus name (starting with
 <a class="link" href="telepathy-glib-defs.html#TP-CLIENT-BUS-NAME-BASE:CAPS" title="TP_CLIENT_BUS_NAME_BASE"><code class="literal">TP_CLIENT_BUS_NAME_BASE</code></a>) of the preferred handler for the channel,
-or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to indicate that any handler would be acceptable.</td>
+or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to indicate that any handler would be acceptable.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>cancellable</code></em> :</span></p></td>
-<td>optional <a href="http://library.gnome.org/devel/gio/unstable/GCancellable.html"><span class="type">GCancellable</span></a> object, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to ignore</td>
+<td>optional <a href="http://library.gnome.org/devel/gio/unstable/GCancellable.html"><span class="type">GCancellable</span></a> object, <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to ignore</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
@@ -889,7 +889,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a newly created <a class="link" href="telepathy-glib-channel.html#TpChannel"><span class="type">TpChannel</span></a> if the channel was
-successfully ensure and (re-)dispatched, otherwise <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
+successfully ensure and (re-)dispatched, otherwise <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -1096,7 +1096,7 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
 <td>function called the channel requested using <em class="parameter"><code>self</code></em> is
-delegated, may not be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+delegated, may not be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -1123,7 +1123,7 @@
 Read-only except during construction.
 </p>
 <p>
-This property can't be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+This property can't be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p class="since">Since 0.11.12</p>
 </div>
@@ -1132,7 +1132,7 @@
 <a name="TpAccountChannelRequest--channel-request"></a><h3>The <code class="literal">"channel-request"</code> property</h3>
 <pre class="programlisting">  "channel-request"          <a class="link" href="telepathy-glib-channel-request.html#TpChannelRequest"><span class="type">TpChannelRequest</span></a>*     : Read</pre>
 <p>
-The <a class="link" href="telepathy-glib-channel-request.html#TpChannelRequest"><span class="type">TpChannelRequest</span></a> used to request the channel, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the
+The <a class="link" href="telepathy-glib-channel-request.html#TpChannelRequest"><span class="type">TpChannelRequest</span></a> used to request the channel, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if the
 channel has not be requested yet.
 </p>
 <p>
@@ -1159,14 +1159,14 @@
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> where the keys are strings and the values are <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a>.
 </p>
 <p>
-This property can't be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+This property can't be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p class="since">Since 0.11.12</p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="TpAccountChannelRequest--user-action-time"></a><h3>The <code class="literal">"user-action-time"</code> property</h3>
-<pre class="programlisting">  "user-action-time"         <span class="type">gint64</span>                : Read / Write / Construct Only</pre>
+<pre class="programlisting">  "user-action-time"         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a>                : Read / Write / Construct Only</pre>
 <p>
 The user action time that will be passed to the channel dispatcher when
 requesting the channel.
@@ -1207,7 +1207,7 @@
 <a name="TpAccountChannelRequest-re-handled"></a><h3>The <code class="literal">"re-handled"</code> signal</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                user_function                      (<a class="link" href="telepathy-glib-account-channel-request.html#TpAccountChannelRequest"><span class="type">TpAccountChannelRequest</span></a> *self,
                                                         <a class="link" href="telepathy-glib-channel.html#TpChannel"><span class="type">TpChannel</span></a>               *channel,
-                                                        <span class="type">gint64</span>                   user_action_time,
+                                                        <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a>                   user_action_time,
                                                         <a class="link" href="telepathy-glib-handle-channels-context.html#TpHandleChannelsContext"><span class="type">TpHandleChannelsContext</span></a> *context,
                                                         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>                 user_data)             : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-DETAILED:CAPS"><code class="literal">Has Details</code></a></pre>
 <p>

=== modified file 'docs/reference/html/telepathy-glib-account-manager.html'
--- docs/reference/html/telepathy-glib-account-manager.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/telepathy-glib-account-manager.html	2012-07-29 01:19:20 +0000
@@ -292,106 +292,106 @@
         <td class="listing_code"><pre class="programlisting"><span class="comment">/*</span>
 <span class="comment"> * contact-list</span>
 <span class="comment"> *</span>
-<span class="comment"> * Copyright © 2011 Collabora Ltd. &lt;http://www.collabora.co.uk/&gt;</span>
+<span class="comment"> * Copyright © 2011 Collabora Ltd. </span><span class="url"><a href="&lt;http://www.collabora.co.uk/&gt;">&lt;http://www.collabora.co.uk/&gt;</a></span>
 <span class="comment"> *</span>
 <span class="comment"> * Copying and distribution of this file, with or without modification,</span>
 <span class="comment"> * are permitted in any medium without royalty provided the copyright</span>
 <span class="comment"> * notice and this notice are preserved.</span>
 <span class="comment"> */</span>
 
-<span class="gtkdoc ppc">#include</span> <span class="gtkdoc pps">&quot;config.h&quot;</span><span class="gtkdoc ppc"></span>
-
-<span class="gtkdoc ppc">#include &lt;telepathy-glib/telepathy-glib.h&gt;</span>
-<span class="gtkdoc ppc">#include &lt;telepathy-glib/debug.h&gt;</span>
-
-<span class="gtkdoc kwb">static void</span>
-<span class="function">account_manager_prepared_cb</span> <span class="gtkdoc opt">(</span>GObject <span class="gtkdoc opt">*</span>object<span class="gtkdoc opt">,</span>
-    GAsyncResult <span class="gtkdoc opt">*</span>res<span class="gtkdoc opt">,</span>
-    gpointer user_data<span class="gtkdoc opt">)</span>
-<span class="gtkdoc opt">{</span>
-  TpAccountManager <span class="gtkdoc opt">*</span>manager <span class="gtkdoc opt">= (</span>TpAccountManager <span class="gtkdoc opt">*)</span> object<span class="gtkdoc opt">;</span>
-  GMainLoop <span class="gtkdoc opt">*</span>loop <span class="gtkdoc opt">=</span> user_data<span class="gtkdoc opt">;</span>  
-  GList <span class="gtkdoc opt">*</span>accounts<span class="gtkdoc opt">;</span>
-  GError <span class="gtkdoc opt">*</span>error <span class="gtkdoc opt">=</span> NULL<span class="gtkdoc opt">;</span>
-
-  <span class="keyword">if</span> <span class="gtkdoc opt">(!</span><span class="function"><a href="telepathy-glib-proxy.html#tp-proxy-prepare-finish">tp_proxy_prepare_finish</a></span> <span class="gtkdoc opt">(</span>object<span class="gtkdoc opt">,</span> res<span class="gtkdoc opt">, &amp;</span>error<span class="gtkdoc opt">))</span>
-    <span class="gtkdoc opt">{</span>
-      <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="gtkdoc opt">(</span><span class="string">&quot;Error preparing AM: %s</span><span class="gtkdoc esc">\n</span><span class="string">&quot;</span><span class="gtkdoc opt">,</span> error<span class="gtkdoc opt">-&gt;</span>message<span class="gtkdoc opt">);</span>
-      <span class="keyword">goto</span> OUT<span class="gtkdoc opt">;</span>
-    <span class="gtkdoc opt">}</span>
-
-  <span class="keyword">for</span> <span class="gtkdoc opt">(</span>accounts <span class="gtkdoc opt">=</span> <span class="function"><a href="telepathy-glib-account-manager.html#tp-account-manager-get-valid-accounts">tp_account_manager_get_valid_accounts</a></span> <span class="gtkdoc opt">(</span>manager<span class="gtkdoc opt">);</span>
-       accounts <span class="gtkdoc opt">!=</span> NULL<span class="gtkdoc opt">;</span> accounts <span class="gtkdoc opt">=</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#g-list-delete-link">g_list_delete_link</a></span> <span class="gtkdoc opt">(</span>accounts<span class="gtkdoc opt">,</span> accounts<span class="gtkdoc opt">))</span>
-    <span class="gtkdoc opt">{</span>
-      TpAccount <span class="gtkdoc opt">*</span>account <span class="gtkdoc opt">=</span> accounts<span class="gtkdoc opt">-&gt;</span>data<span class="gtkdoc opt">;</span>
-      TpConnection <span class="gtkdoc opt">*</span>connection <span class="gtkdoc opt">=</span> <span class="function"><a href="telepathy-glib-account.html#tp-account-get-connection">tp_account_get_connection</a></span> <span class="gtkdoc opt">(</span>account<span class="gtkdoc opt">);</span>
-      GPtrArray <span class="gtkdoc opt">*</span>contacts<span class="gtkdoc opt">;</span>
-      guint i<span class="gtkdoc opt">;</span>
-
-      <span class="comment">/* Verify account is online and received its contact list. If state is not</span>
+<span class="preproc">#include</span><span class="normal"> </span><span class="string">"config.h"</span>
+
+<span class="preproc">#include</span><span class="normal"> </span><span class="string">&lt;telepathy-glib/telepathy-glib.h&gt;</span>
+<span class="preproc">#include</span><span class="normal"> </span><span class="string">&lt;telepathy-glib/debug.h&gt;</span>
+
+<span class="keyword">static</span><span class="normal"> </span><span class="type">void</span>
+<span class="function">account_manager_prepared_cb</span><span class="normal"> </span><span class="symbol">(</span><span class="usertype">GObject</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">object</span><span class="symbol">,</span>
+<span class="normal">    </span><span class="usertype">GAsyncResult</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">res</span><span class="symbol">,</span>
+<span class="normal">    </span><span class="usertype">gpointer</span><span class="normal"> user_data</span><span class="symbol">)</span>
+<span class="cbracket">{</span>
+<span class="normal">  </span><span class="usertype">TpAccountManager</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">manager </span><span class="symbol">=</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="telepathy-glib-account-manager.html#TpAccountManager">TpAccountManager</a> </span><span class="symbol">*)</span><span class="normal"> object</span><span class="symbol">;</span>
+<span class="normal">  </span><span class="usertype">GMainLoop</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">loop </span><span class="symbol">=</span><span class="normal"> user_data</span><span class="symbol">;</span><span class="normal">  </span>
+<span class="normal">  </span><span class="usertype">GList</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">accounts</span><span class="symbol">;</span>
+<span class="normal">  </span><span class="usertype">GError</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">error </span><span class="symbol">=</span><span class="normal"> <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS">NULL</a></span><span class="symbol">;</span>
+
+<span class="normal">  </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(!</span><span class="function"><a href="telepathy-glib-proxy.html#tp-proxy-prepare-finish">tp_proxy_prepare_finish</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">object</span><span class="symbol">,</span><span class="normal"> res</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">error</span><span class="symbol">))</span>
+<span class="normal">    </span><span class="cbracket">{</span>
+<span class="normal">      </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"Error preparing AM: %s</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">,</span><span class="normal"> error</span><span class="symbol">-&gt;</span><span class="normal">message</span><span class="symbol">);</span>
+<span class="normal">      </span><span class="keyword">goto</span><span class="normal"> OUT</span><span class="symbol">;</span>
+<span class="normal">    </span><span class="cbracket">}</span>
+
+<span class="normal">  </span><span class="keyword">for</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">accounts </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="telepathy-glib-account-manager.html#tp-account-manager-get-valid-accounts">tp_account_manager_get_valid_accounts</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">manager</span><span class="symbol">);</span>
+<span class="normal">       accounts </span><span class="symbol">!=</span><span class="normal"> <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS">NULL</a></span><span class="symbol">;</span><span class="normal"> accounts </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#g-list-delete-link">g_list_delete_link</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">accounts</span><span class="symbol">,</span><span class="normal"> accounts</span><span class="symbol">))</span>
+<span class="normal">    </span><span class="cbracket">{</span>
+<span class="normal">      </span><span class="usertype">TpAccount</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">account </span><span class="symbol">=</span><span class="normal"> accounts</span><span class="symbol">-&gt;</span><span class="normal">data</span><span class="symbol">;</span>
+<span class="normal">      </span><span class="usertype">TpConnection</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">connection </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="telepathy-glib-account.html#tp-account-get-connection">tp_account_get_connection</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">account</span><span class="symbol">);</span>
+<span class="normal">      </span><span class="usertype">GPtrArray</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">contacts</span><span class="symbol">;</span>
+<span class="normal">      </span><span class="usertype">guint</span><span class="normal"> i</span><span class="symbol">;</span>
+
+<span class="normal">      </span><span class="comment">/* Verify account is online and received its contact list. If state is not</span>
 <span class="comment">       * SUCCESS this means we didn't received the roster from server yet and</span>
-<span class="comment">       * we would have to wait for the &quot;notify:contact-list-state&quot; signal. */</span>
-      <span class="keyword">if</span> <span class="gtkdoc opt">(</span>connection <span class="gtkdoc opt">==</span> NULL <span class="gtkdoc opt">||</span>
-          <span class="function"><a href="telepathy-glib-connection.html#tp-connection-get-contact-list-state">tp_connection_get_contact_list_state</a></span> <span class="gtkdoc opt">(</span>connection<span class="gtkdoc opt">) !=</span>
-              TP_CONTACT_LIST_STATE_SUCCESS<span class="gtkdoc opt">)</span>
-        <span class="keyword">continue</span><span class="gtkdoc opt">;</span>
-
-      contacts <span class="gtkdoc opt">=</span> <span class="function"><a href="telepathy-glib-connection.html#tp-connection-dup-contact-list">tp_connection_dup_contact_list</a></span> <span class="gtkdoc opt">(</span>connection<span class="gtkdoc opt">);</span>
-      <span class="keyword">for</span> <span class="gtkdoc opt">(</span>i <span class="gtkdoc opt">=</span> <span class="number">0</span><span class="gtkdoc opt">;</span> i <span class="gtkdoc opt">&lt;</span> contacts<span class="gtkdoc opt">-&gt;</span>len<span class="gtkdoc opt">;</span> i<span class="gtkdoc opt">++)</span>
-        <span class="gtkdoc opt">{</span>
-          TpContact <span class="gtkdoc opt">*</span>contact <span class="gtkdoc opt">=</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-index">g_ptr_array_index</a></span> <span class="gtkdoc opt">(</span>contacts<span class="gtkdoc opt">,</span> i<span class="gtkdoc opt">);</span>
-          <span class="gtkdoc kwb">const</span> gchar <span class="gtkdoc opt">*</span> <span class="gtkdoc kwb">const</span> <span class="gtkdoc opt">*</span>groups<span class="gtkdoc opt">;</span>
-
-          <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="gtkdoc opt">(</span><span class="string">&quot;contact %s (%s) in groups:</span><span class="gtkdoc esc">\n</span><span class="string">&quot;</span><span class="gtkdoc opt">,</span>
-              <span class="function"><a href="telepathy-glib-contact.html#tp-contact-get-identifier">tp_contact_get_identifier</a></span> <span class="gtkdoc opt">(</span>contact<span class="gtkdoc opt">),</span>
-              <span class="function"><a href="telepathy-glib-contact.html#tp-contact-get-alias">tp_contact_get_alias</a></span> <span class="gtkdoc opt">(</span>contact<span class="gtkdoc opt">));</span>
-
-          <span class="keyword">for</span> <span class="gtkdoc opt">(</span>groups <span class="gtkdoc opt">=</span> <span class="function"><a href="telepathy-glib-contact.html#tp-contact-get-contact-groups">tp_contact_get_contact_groups</a></span> <span class="gtkdoc opt">(</span>contact<span class="gtkdoc opt">);</span>
-               <span class="gtkdoc opt">*</span>groups <span class="gtkdoc opt">!=</span> NULL<span class="gtkdoc opt">;</span> groups<span class="gtkdoc opt">++)</span>
-            <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="gtkdoc opt">(</span><span class="string">&quot;  %s</span><span class="gtkdoc esc">\n</span><span class="string">&quot;</span><span class="gtkdoc opt">, *</span>groups<span class="gtkdoc opt">);</span>
-        <span class="gtkdoc opt">}</span>
-      <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-unref">g_ptr_array_unref</a></span> <span class="gtkdoc opt">(</span>contacts<span class="gtkdoc opt">);</span>
-    <span class="gtkdoc opt">}</span>
-
-OUT<span class="gtkdoc opt">:</span>
-  <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#g-main-loop-quit">g_main_loop_quit</a></span> <span class="gtkdoc opt">(</span>loop<span class="gtkdoc opt">);</span>
-<span class="gtkdoc opt">}</span>
-
-<span class="gtkdoc kwb">int</span>
-<span class="function">main</span> <span class="gtkdoc opt">(</span><span class="gtkdoc kwb">int</span> argc<span class="gtkdoc opt">,</span>
-      <span class="gtkdoc kwb">char</span> <span class="gtkdoc opt">**</span>argv<span class="gtkdoc opt">)</span>
-<span class="gtkdoc opt">{</span>
-  TpAccountManager <span class="gtkdoc opt">*</span>manager<span class="gtkdoc opt">;</span>
-  TpSimpleClientFactory <span class="gtkdoc opt">*</span>factory<span class="gtkdoc opt">;</span>
-  GMainLoop <span class="gtkdoc opt">*</span>loop<span class="gtkdoc opt">;</span>
-
-  <span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#g-type-init">g_type_init</a></span> <span class="gtkdoc opt">();</span>
-  <span class="function"><a href="telepathy-glib-debug.html#tp-debug-set-flags">tp_debug_set_flags</a></span> <span class="gtkdoc opt">(</span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Miscellaneous-Utility-Functions.html#g-getenv">g_getenv</a></span> <span class="gtkdoc opt">(</span><span class="string">&quot;EXAMPLE_DEBUG&quot;</span><span class="gtkdoc opt">));</span>
-
-  loop <span class="gtkdoc opt">=</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#g-main-loop-new">g_main_loop_new</a></span> <span class="gtkdoc opt">(</span>NULL<span class="gtkdoc opt">,</span> FALSE<span class="gtkdoc opt">);</span>
-
-  manager <span class="gtkdoc opt">=</span> <span class="function"><a href="telepathy-glib-account-manager.html#tp-account-manager-dup">tp_account_manager_dup</a></span> <span class="gtkdoc opt">();</span>
-  factory <span class="gtkdoc opt">=</span> <span class="function"><a href="telepathy-glib-proxy.html#tp-proxy-get-factory">tp_proxy_get_factory</a></span> <span class="gtkdoc opt">(</span>manager<span class="gtkdoc opt">);</span>
-  <span class="function"><a href="telepathy-glib-simple-client-factory.html#tp-simple-client-factory-add-account-features-varargs">tp_simple_client_factory_add_account_features_varargs</a></span> <span class="gtkdoc opt">(</span>factory<span class="gtkdoc opt">,</span>
-      TP_ACCOUNT_FEATURE_CONNECTION<span class="gtkdoc opt">,</span>
-      <span class="number">0</span><span class="gtkdoc opt">);</span>
-  <span class="function"><a href="telepathy-glib-simple-client-factory.html#tp-simple-client-factory-add-connection-features-varargs">tp_simple_client_factory_add_connection_features_varargs</a></span> <span class="gtkdoc opt">(</span>factory<span class="gtkdoc opt">,</span>
-      TP_CONNECTION_FEATURE_CONTACT_LIST<span class="gtkdoc opt">,</span>
-      <span class="number">0</span><span class="gtkdoc opt">);</span>
-  <span class="function"><a href="telepathy-glib-simple-client-factory.html#tp-simple-client-factory-add-contact-features-varargs">tp_simple_client_factory_add_contact_features_varargs</a></span> <span class="gtkdoc opt">(</span>factory<span class="gtkdoc opt">,</span>
-      TP_CONTACT_FEATURE_ALIAS<span class="gtkdoc opt">,</span>
-      TP_CONTACT_FEATURE_CONTACT_GROUPS<span class="gtkdoc opt">,</span>
-      TP_CONTACT_FEATURE_INVALID<span class="gtkdoc opt">);</span>
-
-  <span class="function"><a href="telepathy-glib-proxy.html#tp-proxy-prepare-async">tp_proxy_prepare_async</a></span> <span class="gtkdoc opt">(</span>manager<span class="gtkdoc opt">,</span> NULL<span class="gtkdoc opt">,</span> account_manager_prepared_cb<span class="gtkdoc opt">,</span> loop<span class="gtkdoc opt">);</span>
-
-  <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#g-main-loop-run">g_main_loop_run</a></span> <span class="gtkdoc opt">(</span>loop<span class="gtkdoc opt">);</span>
-
-  <span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref">g_object_unref</a></span> <span class="gtkdoc opt">(</span>manager<span class="gtkdoc opt">);</span>
-  <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#g-main-loop-unref">g_main_loop_unref</a></span> <span class="gtkdoc opt">(</span>loop<span class="gtkdoc opt">);</span>
-
-  <span class="keyword">return</span> <span class="number">0</span><span class="gtkdoc opt">;</span>
-<span class="gtkdoc opt">}</span></pre></td>
+<span class="comment">       * we would have to wait for the "notify:contact-list-state" signal. */</span>
+<span class="normal">      </span><span class="keyword">if</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">connection </span><span class="symbol">==</span><span class="normal"> <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS">NULL</a> </span><span class="symbol">||</span>
+<span class="normal">          </span><span class="function"><a href="telepathy-glib-connection.html#tp-connection-get-contact-list-state">tp_connection_get_contact_list_state</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">connection</span><span class="symbol">)</span><span class="normal"> </span><span class="symbol">!=</span>
+<span class="normal">              <a href="telepathy-glib-enums.html#TP-CONTACT-LIST-STATE-SUCCESS:CAPS">TP_CONTACT_LIST_STATE_SUCCESS</a></span><span class="symbol">)</span>
+<span class="normal">        </span><span class="keyword">continue</span><span class="symbol">;</span>
+
+<span class="normal">      contacts </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="telepathy-glib-connection.html#tp-connection-dup-contact-list">tp_connection_dup_contact_list</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">connection</span><span class="symbol">);</span>
+<span class="normal">      </span><span class="keyword">for</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">i </span><span class="symbol">=</span><span class="normal"> </span><span class="number">0</span><span class="symbol">;</span><span class="normal"> i </span><span class="symbol">&lt;</span><span class="normal"> contacts</span><span class="symbol">-&gt;</span><span class="normal">len</span><span class="symbol">;</span><span class="normal"> i</span><span class="symbol">++)</span>
+<span class="normal">        </span><span class="cbracket">{</span>
+<span class="normal">          </span><span class="usertype">TpContact</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">contact </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-index">g_ptr_array_index</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">contacts</span><span class="symbol">,</span><span class="normal"> i</span><span class="symbol">);</span>
+<span class="normal">          </span><span class="keyword">const</span><span class="normal"> <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar">gchar</a> </span><span class="symbol">*</span><span class="normal"> </span><span class="keyword">const</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">groups</span><span class="symbol">;</span>
+
+<span class="normal">          </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"contact %s (%s) in groups:</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">,</span>
+<span class="normal">              </span><span class="function"><a href="telepathy-glib-contact.html#tp-contact-get-identifier">tp_contact_get_identifier</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">contact</span><span class="symbol">),</span>
+<span class="normal">              </span><span class="function"><a href="telepathy-glib-contact.html#tp-contact-get-alias">tp_contact_get_alias</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">contact</span><span class="symbol">));</span>
+
+<span class="normal">          </span><span class="keyword">for</span><span class="normal"> </span><span class="symbol">(</span><span class="normal">groups </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="telepathy-glib-contact.html#tp-contact-get-contact-groups">tp_contact_get_contact_groups</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">contact</span><span class="symbol">);</span>
+<span class="normal">               </span><span class="symbol">*</span><span class="normal">groups </span><span class="symbol">!=</span><span class="normal"> <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS">NULL</a></span><span class="symbol">;</span><span class="normal"> groups</span><span class="symbol">++)</span>
+<span class="normal">            </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"  %s</span><span class="specialchar">\n</span><span class="string">"</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">groups</span><span class="symbol">);</span>
+<span class="normal">        </span><span class="cbracket">}</span>
+<span class="normal">      </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-unref">g_ptr_array_unref</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">contacts</span><span class="symbol">);</span>
+<span class="normal">    </span><span class="cbracket">}</span>
+
+<span class="label">OUT:</span>
+<span class="normal">  </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#g-main-loop-quit">g_main_loop_quit</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">loop</span><span class="symbol">);</span>
+<span class="cbracket">}</span>
+
+<span class="type">int</span>
+<span class="function">main</span><span class="normal"> </span><span class="symbol">(</span><span class="type">int</span><span class="normal"> argc</span><span class="symbol">,</span>
+<span class="normal">      </span><span class="type">char</span><span class="normal"> </span><span class="symbol">**</span><span class="normal">argv</span><span class="symbol">)</span>
+<span class="cbracket">{</span>
+<span class="normal">  </span><span class="usertype">TpAccountManager</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">manager</span><span class="symbol">;</span>
+<span class="normal">  </span><span class="usertype">TpSimpleClientFactory</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">factory</span><span class="symbol">;</span>
+<span class="normal">  </span><span class="usertype">GMainLoop</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">loop</span><span class="symbol">;</span>
+
+<span class="normal">  </span><span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#g-type-init">g_type_init</a></span><span class="normal"> </span><span class="symbol">();</span>
+<span class="normal">  </span><span class="function"><a href="telepathy-glib-debug.html#tp-debug-set-flags">tp_debug_set_flags</a></span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Miscellaneous-Utility-Functions.html#g-getenv">g_getenv</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"EXAMPLE_DEBUG"</span><span class="symbol">));</span>
+
+<span class="normal">  loop </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#g-main-loop-new">g_main_loop_new</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS">NULL</a></span><span class="symbol">,</span><span class="normal"> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS">FALSE</a></span><span class="symbol">);</span>
+
+<span class="normal">  manager </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="telepathy-glib-account-manager.html#tp-account-manager-dup">tp_account_manager_dup</a></span><span class="normal"> </span><span class="symbol">();</span>
+<span class="normal">  factory </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="telepathy-glib-proxy.html#tp-proxy-get-factory">tp_proxy_get_factory</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">manager</span><span class="symbol">);</span>
+<span class="normal">  </span><span class="function"><a href="telepathy-glib-simple-client-factory.html#tp-simple-client-factory-add-account-features-varargs">tp_simple_client_factory_add_account_features_varargs</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">factory</span><span class="symbol">,</span>
+<span class="normal">      <a href="telepathy-glib-account.html#TP-ACCOUNT-FEATURE-CONNECTION:CAPS">TP_ACCOUNT_FEATURE_CONNECTION</a></span><span class="symbol">,</span>
+<span class="normal">      </span><span class="number">0</span><span class="symbol">);</span>
+<span class="normal">  </span><span class="function"><a href="telepathy-glib-simple-client-factory.html#tp-simple-client-factory-add-connection-features-varargs">tp_simple_client_factory_add_connection_features_varargs</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">factory</span><span class="symbol">,</span>
+<span class="normal">      <a href="telepathy-glib-connection.html#TP-CONNECTION-FEATURE-CONTACT-LIST:CAPS">TP_CONNECTION_FEATURE_CONTACT_LIST</a></span><span class="symbol">,</span>
+<span class="normal">      </span><span class="number">0</span><span class="symbol">);</span>
+<span class="normal">  </span><span class="function"><a href="telepathy-glib-simple-client-factory.html#tp-simple-client-factory-add-contact-features-varargs">tp_simple_client_factory_add_contact_features_varargs</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">factory</span><span class="symbol">,</span>
+<span class="normal">      <a href="telepathy-glib-contact.html#TP-CONTACT-FEATURE-ALIAS:CAPS">TP_CONTACT_FEATURE_ALIAS</a></span><span class="symbol">,</span>
+<span class="normal">      <a href="telepathy-glib-contact.html#TP-CONTACT-FEATURE-CONTACT-GROUPS:CAPS">TP_CONTACT_FEATURE_CONTACT_GROUPS</a></span><span class="symbol">,</span>
+<span class="normal">      <a href="telepathy-glib-contact.html#TP-CONTACT-FEATURE-INVALID:CAPS">TP_CONTACT_FEATURE_INVALID</a></span><span class="symbol">);</span>
+
+<span class="normal">  </span><span class="function"><a href="telepathy-glib-proxy.html#tp-proxy-prepare-async">tp_proxy_prepare_async</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">manager</span><span class="symbol">,</span><span class="normal"> <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS">NULL</a></span><span class="symbol">,</span><span class="normal"> account_manager_prepared_cb</span><span class="symbol">,</span><span class="normal"> loop</span><span class="symbol">);</span>
+
+<span class="normal">  </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#g-main-loop-run">g_main_loop_run</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">loop</span><span class="symbol">);</span>
+
+<span class="normal">  </span><span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref">g_object_unref</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">manager</span><span class="symbol">);</span>
+<span class="normal">  </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#g-main-loop-unref">g_main_loop_unref</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">loop</span><span class="symbol">);</span>
+
+<span class="normal">  </span><span class="keyword">return</span><span class="normal"> </span><span class="number">0</span><span class="symbol">;</span>
+<span class="cbracket">}</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -499,6 +499,10 @@
 <a class="link" href="telepathy-glib-account-manager.html#tp-account-manager-new-with-factory" title="tp_account_manager_new_with_factory ()"><code class="function">tp_account_manager_new_with_factory()</code></a>.
 </p>
 <p>
+Unlike <a class="link" href="telepathy-glib-account-manager.html#tp-account-manager-dup" title="tp_account_manager_dup ()"><code class="function">tp_account_manager_dup()</code></a>, this function will keep an internal
+reference to <em class="parameter"><code>manager</code></em>, so it will never be destroyed.
+</p>
+<p>
 Note that <em class="parameter"><code>manager</code></em> must use the default <a class="link" href="telepathy-glib-dbus.html#TpDBusDaemon"><span class="type">TpDBusDaemon</span></a> as returned by
 <a class="link" href="telepathy-glib-dbus.html#tp-dbus-daemon-dup" title="tp_dbus_daemon_dup ()"><code class="function">tp_dbus_daemon_dup()</code></a>
 </p>
@@ -532,7 +536,7 @@
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>an account manager proxy on the starter or session
-bus, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if it wasn't possible to get a dbus daemon proxy for
+bus, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if it wasn't possible to get a dbus daemon proxy for
 the appropriate bus. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span>
 </td>
 </tr></tbody>
@@ -643,7 +647,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a new <a class="link" href="telepathy-glib-account.html#TpAccount"><span class="type">TpAccount</span></a> which was just created on
-success, otherwise <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+success, otherwise <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -686,7 +690,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a new <a class="link" href="telepathy-glib-account.html#TpAccount"><span class="type">TpAccount</span></a> at <em class="parameter"><code>path</code></em>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>path</code></em> is
+<td>a new <a class="link" href="telepathy-glib-account.html#TpAccount"><span class="type">TpAccount</span></a> at <em class="parameter"><code>path</code></em>, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>path</code></em> is
 not a valid account path. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
@@ -716,9 +720,9 @@
         <td class="listing_lines" align="right"><pre>1
 2
 3</pre></td>
-        <td class="listing_code"><pre class="programlisting">GList <span class="gtkdoc opt">*</span>accounts<span class="gtkdoc opt">;</span>
-account <span class="gtkdoc opt">=</span> <span class="function"><a href="telepathy-glib-account-manager.html#tp-account-manager-get-valid-accounts">tp_account_manager_get_valid_accounts</a></span> <span class="gtkdoc opt">(</span>manager<span class="gtkdoc opt">);</span>
-<span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#g-list-foreach">g_list_foreach</a></span> <span class="gtkdoc opt">(</span>accounts<span class="gtkdoc opt">, (</span>GFunc<span class="gtkdoc opt">)</span> g_object_ref<span class="gtkdoc opt">,</span> NULL<span class="gtkdoc opt">);</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="usertype">GList</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">accounts</span><span class="symbol">;</span>
+<span class="normal">account </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="telepathy-glib-account-manager.html#tp-account-manager-get-valid-accounts">tp_account_manager_get_valid_accounts</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">manager</span><span class="symbol">);</span>
+<span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#g-list-foreach">g_list_foreach</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">accounts</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GFunc">GFunc</a></span><span class="symbol">)</span><span class="normal"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-ref">g_object_ref</a></span><span class="symbol">,</span><span class="normal"> <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS">NULL</a></span><span class="symbol">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -735,7 +739,7 @@
 The list of valid accounts returned is not guaranteed to have been retrieved
 until <a class="link" href="telepathy-glib-account-manager.html#TP-ACCOUNT-MANAGER-FEATURE-CORE:CAPS" title="TP_ACCOUNT_MANAGER_FEATURE_CORE"><code class="literal">TP_ACCOUNT_MANAGER_FEATURE_CORE</code></a> is prepared
 (<a class="link" href="telepathy-glib-proxy.html#tp-proxy-prepare-async" title="tp_proxy_prepare_async ()"><code class="function">tp_proxy_prepare_async()</code></a> has returned). Until this feature has
-been prepared, an empty list (<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>) will be returned.
+been prepared, an empty list (<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>) will be returned.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -948,9 +952,9 @@
 operation.
 </p>
 <p>
-If <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is given to <em class="parameter"><code>callback</code></em>, then no callback will be called when the
+If <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> is given to <em class="parameter"><code>callback</code></em>, then no callback will be called when the
 operation is finished. Instead, it will simply set <em class="parameter"><code>features</code></em> on <em class="parameter"><code>manager</code></em>.
-Note that if <em class="parameter"><code>callback</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, then <em class="parameter"><code>user_data</code></em> must also be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+Note that if <em class="parameter"><code>callback</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, then <em class="parameter"><code>user_data</code></em> must also be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>
 In version 0.11.3 or later, this is equivalent to calling
@@ -966,7 +970,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>features</code></em> :</span></p></td>
-<td>a 0-terminated list of features, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>a 0-terminated list of features, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -1044,12 +1048,12 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>out_Account</code></em> :</span></p></td>
-<td>Used to return an 'out' argument if <em class="parameter"><code>error</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>: The new &lt;tp:dbus-ref namespace="org.freedesktop.Telepathy"&gt;Account&lt;/tp:dbus-ref&gt;.</td>
+<td>Used to return an 'out' argument if <em class="parameter"><code>error</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>: The new &lt;tp:dbus-ref namespace="org.freedesktop.Telepathy"&gt;Account&lt;/tp:dbus-ref&gt;.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
 <td>
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on success, or an error on failure</td>
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> on success, or an error on failure</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
@@ -1119,28 +1123,28 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
 <td>called when the method call succeeds or fails;
-may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to make a "fire and forget" call with no
+may be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to make a "fire and forget" call with no
 reply tracking</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
 <td>user-supplied data passed to the callback;
-must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+must be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>destroy</code></em> :</span></p></td>
 <td>called with the user_data as argument, after the
 call has succeeded, failed or been cancelled;
-must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+must be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>weak_object</code></em> :</span></p></td>
-<td>If not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> which will be
+<td>If not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> which will be
 weakly referenced; if it is destroyed, this call
-will automatically be cancelled. Must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if
-<em class="parameter"><code>callback</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+will automatically be cancelled. Must be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if
+<em class="parameter"><code>callback</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -1223,7 +1227,7 @@
 <td><p><span class="term"><em class="parameter"><code>destroy</code></em> :</span></p></td>
 <td>Destructor for the user-supplied data, which
 will be called when this signal is disconnected, or
-before this function returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+before this function returns <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -1234,14 +1238,14 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>If not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to raise an error if <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is
+<td>If not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to raise an error if <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> is
 returned</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a <a class="link" href="telepathy-glib-proxy.html#TpProxySignalConnection" title="TpProxySignalConnection"><span class="type">TpProxySignalConnection</span></a> containing all of the
 above, which can be used to disconnect the signal; or
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the proxy does not have the desired interface
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if the proxy does not have the desired interface
 or has become invalid.</td>
 </tr>
 </tbody>
@@ -1322,7 +1326,7 @@
 <td><p><span class="term"><em class="parameter"><code>destroy</code></em> :</span></p></td>
 <td>Destructor for the user-supplied data, which
 will be called when this signal is disconnected, or
-before this function returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+before this function returns <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -1333,14 +1337,14 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>If not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to raise an error if <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is
+<td>If not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to raise an error if <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> is
 returned</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a <a class="link" href="telepathy-glib-proxy.html#TpProxySignalConnection" title="TpProxySignalConnection"><span class="type">TpProxySignalConnection</span></a> containing all of the
 above, which can be used to disconnect the signal; or
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the proxy does not have the desired interface
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if the proxy does not have the desired interface
 or has become invalid.</td>
 </tr>
 </tbody>

=== modified file 'docs/reference/html/telepathy-glib-account.html'
--- docs/reference/html/telepathy-glib-account.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/telepathy-glib-account.html	2012-07-29 01:19:20 +0000
@@ -201,7 +201,7 @@
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-account.html#tp-account-set-avatar-async" title="tp_account_set_avatar_async ()">tp_account_set_avatar_async</a>         (<em class="parameter"><code><a class="link" href="telepathy-glib-account.html#TpAccount"><span class="type">TpAccount</span></a> *self</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guchar"><span class="type">guchar</span></a> *avatar</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> len</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> len</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *mime_type</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gio/unstable/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a> callback</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
@@ -473,7 +473,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a new reference to an account proxy, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>object_path</code></em> is
+<td>a new reference to an account proxy, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>object_path</code></em> is
 not valid</td>
 </tr>
 </tbody>
@@ -508,8 +508,8 @@
 protocol name, as defined in the Account specification.
 </p>
 <p>
-Any of the out parameters may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if not needed. If <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> is returned,
-the caller is responsible for freeing the strings stored in any non-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+Any of the out parameters may be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if not needed. If <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> is returned,
+the caller is responsible for freeing the strings stored in any non-<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 out parameters, using <a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>.
 </p>
 <div class="variablelist"><table border="0">
@@ -638,7 +638,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the connection of the account, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if either
+<td>the connection of the account, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if either
 the object path <em class="parameter"><code>path</code></em> is invalid or it is the null-value "/". <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
@@ -1222,7 +1222,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>display_name</code></em> :</span></p></td>
-<td>a new display name, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to unset the display name</td>
+<td>a new display name, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to unset the display name</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
@@ -1295,7 +1295,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>icon_name</code></em> :</span></p></td>
-<td>a new icon name, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to unset the icon name</td>
+<td>a new icon name, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to unset the icon name</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
@@ -1368,7 +1368,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>service</code></em> :</span></p></td>
-<td>a new service name, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> or the empty string to unset the
+<td>a new service name, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> or the empty string to unset the
 service name (which will result in the <a class="link" href="telepathy-glib-account.html#TpAccount--service" title='The "service" property'><span class="type">"service"</span></a> property
 becoming the same as <a class="link" href="telepathy-glib-account.html#TpAccount--protocol" title='The "protocol" property'><span class="type">"protocol"</span></a>)</td>
 </tr>
@@ -1449,12 +1449,12 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>status</code></em> :</span></p></td>
-<td>a status message to set, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>a status message to set, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>message</code></em> :</span></p></td>
-<td>a message for the change, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>a message for the change, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -1536,12 +1536,12 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>status</code></em> :</span></p></td>
-<td>a status message to set, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>a status message to set, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>message</code></em> :</span></p></td>
-<td>a message for the change, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>a message for the change, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -1738,7 +1738,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>reason</code></em> :</span></p></td>
-<td>a <a class="link" href="telepathy-glib-enums.html#TpConnectionStatusReason" title="enum TpConnectionStatusReason"><span class="type">TpConnectionStatusReason</span></a> to fill, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span>
+<td>a <a class="link" href="telepathy-glib-enums.html#TpConnectionStatusReason" title="enum TpConnectionStatusReason"><span class="type">TpConnectionStatusReason</span></a> to fill, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span>
 </td>
 </tr>
 <tr>
@@ -1761,11 +1761,11 @@
 This is the same as <a class="link" href="telepathy-glib-account.html#TpAccount--connection-error" title='The "connection-error" property'><span class="type">"connection-error"</span></a>.
 </p>
 <p>
-If <em class="parameter"><code>details</code></em> is not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, it will be used to return additional details about
+If <em class="parameter"><code>details</code></em> is not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, it will be used to return additional details about
 the error (the same as <a class="link" href="telepathy-glib-account.html#TpAccount--connection-error-details" title='The "connection-error-details" property'><span class="type">"connection-error-details"</span></a>).
 </p>
 <p>
-Otherwise, return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, without altering <em class="parameter"><code>details</code></em>.
+Otherwise, return <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, without altering <em class="parameter"><code>details</code></em>.
 </p>
 <p>
 The returned string and <em class="parameter"><code>details</code></em> may become invalid when the main loop is
@@ -1786,7 +1786,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a D-Bus error name, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+<td>a D-Bus error name, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -1806,11 +1806,11 @@
 This is the same as <a class="link" href="telepathy-glib-account.html#TpAccount--connection-error" title='The "connection-error" property'><span class="type">"connection-error"</span></a>.
 </p>
 <p>
-If <em class="parameter"><code>details</code></em> is not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, it will be used to return additional details about
+If <em class="parameter"><code>details</code></em> is not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, it will be used to return additional details about
 the error (the same as <a class="link" href="telepathy-glib-account.html#TpAccount--connection-error-details" title='The "connection-error-details" property'><span class="type">"connection-error-details"</span></a>).
 </p>
 <p>
-Otherwise, return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, without altering <em class="parameter"><code>details</code></em>.
+Otherwise, return <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, without altering <em class="parameter"><code>details</code></em>.
 </p>
 <p>
 The returned string and <em class="parameter"><code>details</code></em> may become invalid when the main loop is
@@ -1831,7 +1831,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a D-Bus error name, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+<td>a D-Bus error name, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -2268,7 +2268,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Arrays.html#GArray"><span class="type">GArray</span></a> of <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guchar"><span class="type">guchar</span></a>
-containing the bytes of the account's avatar, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on failure. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> guchar][<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+containing the bytes of the account's avatar, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> on failure. <span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> guchar][<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -2280,7 +2280,7 @@
 <a name="tp-account-set-avatar-async"></a><h3>tp_account_set_avatar_async ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                tp_account_set_avatar_async         (<em class="parameter"><code><a class="link" href="telepathy-glib-account.html#TpAccount"><span class="type">TpAccount</span></a> *self</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guchar"><span class="type">guchar</span></a> *avatar</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> len</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> len</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *mime_type</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gio/unstable/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a> callback</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
@@ -2302,7 +2302,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>avatar</code></em> :</span></p></td>
-<td>a new avatar to set; can be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>a new avatar to set; can be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 only if <em class="parameter"><code>len</code></em> equals 0. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>][<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> length=len]</span>
 </td>
 </tr>
@@ -2312,7 +2312,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>mime_type</code></em> :</span></p></td>
-<td>the MIME type of the new avatar; can be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>the MIME type of the new avatar; can be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 only if <em class="parameter"><code>len</code></em> equals 0. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
@@ -2452,7 +2452,7 @@
 </p>
 <p>
 When this feature is prepared, it is guaranteed that <a class="link" href="telepathy-glib-account.html#TpAccount--connection" title='The "connection" property'><span class="type">"connection"</span></a>
-will always be either <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> or prepared. If the account was created using a
+will always be either <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> or prepared. If the account was created using a
 <a class="link" href="telepathy-glib-simple-client-factory.html#TpSimpleClientFactory"><span class="type">TpSimpleClientFactory</span></a>, the same factory will be used to create <a class="link" href="telepathy-glib-connection.html#TpConnection"><span class="type">TpConnection</span></a>
 object and to determine desired connection features. Change notification of
 <a class="link" href="telepathy-glib-account.html#TpAccount--connection" title='The "connection" property'><span class="type">"connection"</span></a> property will be delayed until all features (at least
@@ -2513,13 +2513,13 @@
 operation.
 </p>
 <p>
-If <em class="parameter"><code>features</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, then <em class="parameter"><code>callback</code></em> will be called when the implied
+If <em class="parameter"><code>features</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, then <em class="parameter"><code>callback</code></em> will be called when the implied
 <a class="link" href="telepathy-glib-account.html#TP-ACCOUNT-FEATURE-CORE:CAPS" title="TP_ACCOUNT_FEATURE_CORE"><code class="literal">TP_ACCOUNT_FEATURE_CORE</code></a> feature is ready.
 </p>
 <p>
-If <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is given to <em class="parameter"><code>callback</code></em>, then no callback will be called when the
+If <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> is given to <em class="parameter"><code>callback</code></em>, then no callback will be called when the
 operation is finished. Instead, it will simply set <em class="parameter"><code>features</code></em> on <em class="parameter"><code>manager</code></em>.
-Note that if <em class="parameter"><code>callback</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, then <em class="parameter"><code>user_data</code></em> must also be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+Note that if <em class="parameter"><code>callback</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, then <em class="parameter"><code>user_data</code></em> must also be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>
 Since 0.11.3, this is equivalent to calling the new function
@@ -2535,7 +2535,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>features</code></em> :</span></p></td>
-<td>a 0-terminated list of features, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>a 0-terminated list of features, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -2616,7 +2616,7 @@
 <p>
 If the <a class="link" href="telepathy-glib-account.html#TP-ACCOUNT-FEATURE-ADDRESSING:CAPS" title="TP_ACCOUNT_FEATURE_ADDRESSING"><code class="literal">TP_ACCOUNT_FEATURE_ADDRESSING</code></a> feature has been prepared
 successfully, return a list of additional URI schemes for which this
-account should be used if possible. Otherwise return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+account should be used if possible. Otherwise return <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>
 For instance, a SIP or Skype account might have "tel" in this list if the
@@ -2637,7 +2637,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a list of URI schemes, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+<td>a list of URI schemes, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -2712,7 +2712,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>scheme</code></em> :</span></p></td>
-<td>a non-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> URI scheme such as "tel"</td>
+<td>a non-<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> URI scheme such as "tel"</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>associate</code></em> :</span></p></td>
@@ -3063,7 +3063,7 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
 <td>
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on success, or an error on failure</td>
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> on success, or an error on failure</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
@@ -3107,28 +3107,28 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
 <td>called when the method call succeeds or fails;
-may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to make a "fire and forget" call with no
+may be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to make a "fire and forget" call with no
 reply tracking</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
 <td>user-supplied data passed to the callback;
-must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+must be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>destroy</code></em> :</span></p></td>
 <td>called with the user_data as argument, after the
 call has succeeded, failed or been cancelled;
-must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+must be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>weak_object</code></em> :</span></p></td>
-<td>If not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> which will be
+<td>If not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> which will be
 weakly referenced; if it is destroyed, this call
-will automatically be cancelled. Must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if
-<em class="parameter"><code>callback</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+will automatically be cancelled. Must be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if
+<em class="parameter"><code>callback</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -3163,7 +3163,7 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
 <td>
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on success, or an error on failure</td>
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> on success, or an error on failure</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
@@ -3207,28 +3207,28 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
 <td>called when the method call succeeds or fails;
-may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to make a "fire and forget" call with no
+may be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to make a "fire and forget" call with no
 reply tracking</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
 <td>user-supplied data passed to the callback;
-must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+must be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>destroy</code></em> :</span></p></td>
 <td>called with the user_data as argument, after the
 call has succeeded, failed or been cancelled;
-must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+must be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>weak_object</code></em> :</span></p></td>
-<td>If not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> which will be
+<td>If not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> which will be
 weakly referenced; if it is destroyed, this call
-will automatically be cancelled. Must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if
-<em class="parameter"><code>callback</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+will automatically be cancelled. Must be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if
+<em class="parameter"><code>callback</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -3263,12 +3263,12 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>out_Reconnect_Required</code></em> :</span></p></td>
-<td>Used to return an 'out' argument if <em class="parameter"><code>error</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>: &lt;tp:docstring xmlns="http://www.w3.org/1999/xhtml"&gt;           &lt;p&gt;If all of the updates could be applied to the active             &lt;tp:member-ref&gt;Connection&lt;/tp:member-ref&gt; (if any),             the empty list, signifying that no reconnection is required for the             new parameters to take effect. For example, if the only parameter             updated is &lt;tt&gt;...Cellular.&lt;tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface.Cellular"&gt;MessageValidityPeriod&lt;/tp:dbus-ref&gt;&lt;/tt&gt;,             the new value can be applied immediately to the connection.&lt;/p&gt;            &lt;p&gt;Otherwise, a list of the names of parameters with changes that             will not take effect until the account is reconnected. User             interfaces that require &amp;quot;instant apply&amp;quot; semantics MAY call             &lt;tp:member-ref&gt;Reconnect&lt;/tp:member-ref&gt; in response to receiving a             non-empty list. For example, if the caller updates both             &lt;tt&gt;...Anonymity.&lt;tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface.Anonymity"&gt;AnonymityMandatory&lt;/tp:dbus-ref&gt;&lt;/tt&gt;             and &lt;tt&gt;require-encryption&lt;/tt&gt;, the former can be applied to the             current connection, but the latter needs a reconnect to take             effect, so this method should return             &lt;code&gt;[&amp;quot;require-encryption&amp;quot;]&lt;/code&gt;.&lt;/p&gt;</td>
+<td>Used to return an 'out' argument if <em class="parameter"><code>error</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>: &lt;tp:docstring xmlns="http://www.w3.org/1999/xhtml"&gt;           &lt;p&gt;If all of the updates could be applied to the active             &lt;tp:member-ref&gt;Connection&lt;/tp:member-ref&gt; (if any),             the empty list, signifying that no reconnection is required for the             new parameters to take effect. For example, if the only parameter             updated is &lt;tt&gt;...Cellular.&lt;tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface.Cellular"&gt;MessageValidityPeriod&lt;/tp:dbus-ref&gt;&lt;/tt&gt;,             the new value can be applied immediately to the connection.&lt;/p&gt;            &lt;p&gt;Otherwise, a list of the names of parameters with changes that             will not take effect until the account is reconnected. User             interfaces that require &amp;quot;instant apply&amp;quot; semantics MAY call             &lt;tp:member-ref&gt;Reconnect&lt;/tp:member-ref&gt; in response to receiving a             non-empty list. For example, if the caller updates both             &lt;tt&gt;...Anonymity.&lt;tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface.Anonymity"&gt;AnonymityMandatory&lt;/tp:dbus-ref&gt;&lt;/tt&gt;             and &lt;tt&gt;require-encryption&lt;/tt&gt;, the former can be applied to the             current connection, but the latter needs a reconnect to take             effect, so this method should return             &lt;code&gt;[&amp;quot;require-encryption&amp;quot;]&lt;/code&gt;.&lt;/p&gt;</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
 <td>
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on success, or an error on failure</td>
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> on success, or an error on failure</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
@@ -3323,28 +3323,28 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
 <td>called when the method call succeeds or fails;
-may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to make a "fire and forget" call with no
+may be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to make a "fire and forget" call with no
 reply tracking</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
 <td>user-supplied data passed to the callback;
-must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+must be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>destroy</code></em> :</span></p></td>
 <td>called with the user_data as argument, after the
 call has succeeded, failed or been cancelled;
-must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+must be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>weak_object</code></em> :</span></p></td>
-<td>If not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> which will be
+<td>If not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> which will be
 weakly referenced; if it is destroyed, this call
-will automatically be cancelled. Must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if
-<em class="parameter"><code>callback</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+will automatically be cancelled. Must be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if
+<em class="parameter"><code>callback</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -3427,7 +3427,7 @@
 <td><p><span class="term"><em class="parameter"><code>destroy</code></em> :</span></p></td>
 <td>Destructor for the user-supplied data, which
 will be called when this signal is disconnected, or
-before this function returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+before this function returns <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -3438,14 +3438,14 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>If not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to raise an error if <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is
+<td>If not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to raise an error if <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> is
 returned</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a <a class="link" href="telepathy-glib-proxy.html#TpProxySignalConnection" title="TpProxySignalConnection"><span class="type">TpProxySignalConnection</span></a> containing all of the
 above, which can be used to disconnect the signal; or
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the proxy does not have the desired interface
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if the proxy does not have the desired interface
 or has become invalid.</td>
 </tr>
 </tbody>
@@ -3516,7 +3516,7 @@
 <td><p><span class="term"><em class="parameter"><code>destroy</code></em> :</span></p></td>
 <td>Destructor for the user-supplied data, which
 will be called when this signal is disconnected, or
-before this function returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+before this function returns <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -3527,14 +3527,14 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>If not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to raise an error if <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is
+<td>If not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to raise an error if <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> is
 returned</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a <a class="link" href="telepathy-glib-proxy.html#TpProxySignalConnection" title="TpProxySignalConnection"><span class="type">TpProxySignalConnection</span></a> containing all of the
 above, which can be used to disconnect the signal; or
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the proxy does not have the desired interface
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if the proxy does not have the desired interface
 or has become invalid.</td>
 </tr>
 </tbody>
@@ -3605,7 +3605,7 @@
 <td><p><span class="term"><em class="parameter"><code>destroy</code></em> :</span></p></td>
 <td>Destructor for the user-supplied data, which
 will be called when this signal is disconnected, or
-before this function returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+before this function returns <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -3616,14 +3616,14 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>If not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to raise an error if <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is
+<td>If not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to raise an error if <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> is
 returned</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>a <a class="link" href="telepathy-glib-proxy.html#TpProxySignalConnection" title="TpProxySignalConnection"><span class="type">TpProxySignalConnection</span></a> containing all of the
 above, which can be used to disconnect the signal; or
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the proxy does not have the desired interface
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if the proxy does not have the desired interface
 or has become invalid.</td>
 </tr>
 </tbody>
@@ -3651,7 +3651,7 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
 <td>
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on success, or an error on failure</td>
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> on success, or an error on failure</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
@@ -3706,28 +3706,28 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
 <td>called when the method call succeeds or fails;
-may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to make a "fire and forget" call with no
+may be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to make a "fire and forget" call with no
 reply tracking</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
 <td>user-supplied data passed to the callback;
-must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+must be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>destroy</code></em> :</span></p></td>
 <td>called with the user_data as argument, after the
 call has succeeded, failed or been cancelled;
-must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+must be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>callback</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>weak_object</code></em> :</span></p></td>
-<td>If not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> which will be
+<td>If not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> which will be
 weakly referenced; if it is destroyed, this call
-will automatically be cancelled. Must be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if
-<em class="parameter"><code>callback</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+will automatically be cancelled. Must be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if
+<em class="parameter"><code>callback</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -3789,7 +3789,7 @@
 <p>
 This is not guaranteed to have been retrieved until
 <a class="link" href="telepathy-glib-proxy.html#tp-proxy-prepare-async" title="tp_proxy_prepare_async ()"><code class="function">tp_proxy_prepare_async()</code></a> has finished; until then, the value is
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>Default value: NULL</p>
 <p class="since">Since 0.13.8</p>
@@ -3812,7 +3812,7 @@
 <p>
 This is not guaranteed to have been retrieved until
 <a class="link" href="telepathy-glib-proxy.html#tp-proxy-prepare-async" title="tp_proxy_prepare_async ()"><code class="function">tp_proxy_prepare_async()</code></a> has finished; until then, the value is
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>Default value: NULL</p>
 <p class="since">Since 0.13.8</p>
@@ -3867,7 +3867,7 @@
 <a name="TpAccount--connection"></a><h3>The <code class="literal">"connection"</code> property</h3>
 <pre class="programlisting">  "connection"               <a class="link" href="telepathy-glib-connection.html#TpConnection"><span class="type">TpConnection</span></a>*         : Read</pre>
 <p>
-The connection of the account, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if account is offline.
+The connection of the account, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if account is offline.
 Note that the returned <a class="link" href="telepathy-glib-connection.html#TpConnection"><span class="type">TpConnection</span></a> is not guaranteed to have any
 features pre-prepared (not even <a class="link" href="telepathy-glib-connection.html#TP-CONNECTION-FEATURE-CORE:CAPS" title="TP_CONNECTION_FEATURE_CORE"><code class="literal">TP_CONNECTION_FEATURE_CORE</code></a>) unless
 <a class="link" href="telepathy-glib-account.html#TP-ACCOUNT-FEATURE-CONNECTION:CAPS" title="TP_ACCOUNT_FEATURE_CONNECTION"><code class="literal">TP_ACCOUNT_FEATURE_CONNECTION</code></a> has been prepared on the account
@@ -3881,7 +3881,7 @@
 <p>
 This is not guaranteed to have been retrieved until
 <a class="link" href="telepathy-glib-proxy.html#tp-proxy-prepare-async" title="tp_proxy_prepare_async ()"><code class="function">tp_proxy_prepare_async()</code></a> has finished; until then, the value is
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p class="since">Since 0.9.0</p>
 </div>
@@ -3892,7 +3892,7 @@
 <p>
 The D-Bus error name for the last disconnection or connection failure,
 (in particular, <a class="link" href="telepathy-glib-errors.html#TP-ERROR-STR-CANCELLED:CAPS" title="TP_ERROR_STR_CANCELLED"><code class="literal">TP_ERROR_STR_CANCELLED</code></a> if it was disconnected by user
-request), or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if the account is connected.
+request), or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if the account is connected.
 </p>
 <p>
 One can receive change notifications on this property by connecting
@@ -3903,7 +3903,7 @@
 <p>
 This is not guaranteed to have been retrieved until
 <a class="link" href="telepathy-glib-proxy.html#tp-proxy-prepare-async" title="tp_proxy_prepare_async ()"><code class="function">tp_proxy_prepare_async()</code></a> has finished; until then, the value is
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>Default value: NULL</p>
 <p class="since">Since 0.11.7</p>
@@ -4032,7 +4032,7 @@
 <p>
 This is not guaranteed to have been retrieved until
 <a class="link" href="telepathy-glib-proxy.html#tp-proxy-prepare-async" title="tp_proxy_prepare_async ()"><code class="function">tp_proxy_prepare_async()</code></a> has finished; until then, the value is
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>Default value: NULL</p>
 <p class="since">Since 0.9.0</p>
@@ -4054,7 +4054,7 @@
 <p>
 This is not guaranteed to have been retrieved until
 <a class="link" href="telepathy-glib-proxy.html#tp-proxy-prepare-async" title="tp_proxy_prepare_async ()"><code class="function">tp_proxy_prepare_async()</code></a> has finished; until then, the value is
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>Default value: NULL</p>
 <p class="since">Since 0.9.0</p>
@@ -4074,7 +4074,7 @@
 <p>
 This is not guaranteed to have been retrieved until
 <a class="link" href="telepathy-glib-proxy.html#tp-proxy-prepare-async" title="tp_proxy_prepare_async ()"><code class="function">tp_proxy_prepare_async()</code></a> has finished; until then, the value is
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>Default value: NULL</p>
 <p class="since">Since 0.9.0</p>
@@ -4134,7 +4134,7 @@
 <p>
 This is not guaranteed to have been retrieved until
 <a class="link" href="telepathy-glib-proxy.html#tp-proxy-prepare-async" title="tp_proxy_prepare_async ()"><code class="function">tp_proxy_prepare_async()</code></a> has finished; until then, the value is
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>Default value: NULL</p>
 <p class="since">Since 0.9.0</p>
@@ -4154,7 +4154,7 @@
 <p>
 This is not guaranteed to have been retrieved until
 <a class="link" href="telepathy-glib-proxy.html#tp-proxy-prepare-async" title="tp_proxy_prepare_async ()"><code class="function">tp_proxy_prepare_async()</code></a> has finished; until then, the value is
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>Default value: NULL</p>
 <p class="since">Since 0.9.0</p>
@@ -4176,7 +4176,7 @@
 <p>
 This is not guaranteed to have been retrieved until
 <a class="link" href="telepathy-glib-proxy.html#tp-proxy-prepare-async" title="tp_proxy_prepare_async ()"><code class="function">tp_proxy_prepare_async()</code></a> has finished; until then, the value is
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>Default value: NULL</p>
 <p class="since">Since 0.13.8</p>
@@ -4211,7 +4211,7 @@
 <p>
 This is not guaranteed to have been retrieved until
 <a class="link" href="telepathy-glib-proxy.html#tp-proxy-prepare-async" title="tp_proxy_prepare_async ()"><code class="function">tp_proxy_prepare_async()</code></a> has finished; until then, the value is
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>Allowed values: &lt;= 9</p>
 <p>Default value: 0</p>
@@ -4235,7 +4235,7 @@
 <p>
 This is not guaranteed to have been retrieved until
 <a class="link" href="telepathy-glib-proxy.html#tp-proxy-prepare-async" title="tp_proxy_prepare_async ()"><code class="function">tp_proxy_prepare_async()</code></a> has finished; until then, the value is
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>Default value: NULL</p>
 <p class="since">Since 0.9.0</p>
@@ -4258,7 +4258,7 @@
 <p>
 This is not guaranteed to have been retrieved until
 <a class="link" href="telepathy-glib-proxy.html#tp-proxy-prepare-async" title="tp_proxy_prepare_async ()"><code class="function">tp_proxy_prepare_async()</code></a> has finished; until then, the value is
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>Default value: NULL</p>
 <p class="since">Since 0.9.0</p>
@@ -4299,7 +4299,7 @@
 </p>
 <p>
 A provider-specific variant type used to identify this account with the
-provider. This value will be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <a class="link" href="telepathy-glib-account.html#TpAccount--storage-provider" title='The "storage-provider" property'><span class="type">"storage-provider"</span></a> is
+provider. This value will be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if <a class="link" href="telepathy-glib-account.html#TpAccount--storage-provider" title='The "storage-provider" property'><span class="type">"storage-provider"</span></a> is
 an empty string.
 </p>
 <p>
@@ -4308,7 +4308,7 @@
 <p>
 This is not guaranteed to have been retrieved until the
 <a class="link" href="telepathy-glib-account.html#TP-ACCOUNT-FEATURE-STORAGE:CAPS" title="TP_ACCOUNT_FEATURE_STORAGE"><code class="literal">TP_ACCOUNT_FEATURE_STORAGE</code></a> feature has been prepared; until then,
-the value is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+the value is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p class="since">Since 0.13.2</p>
 </div>
@@ -4331,7 +4331,7 @@
 <p>
 This is not guaranteed to have been retrieved until the
 <a class="link" href="telepathy-glib-account.html#TP-ACCOUNT-FEATURE-STORAGE:CAPS" title="TP_ACCOUNT_FEATURE_STORAGE"><code class="literal">TP_ACCOUNT_FEATURE_STORAGE</code></a> feature has been prepared; until then,
-the value is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+the value is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>Allowed values: GVariant&lt;*&gt;</p>
 <p>Default value: NULL</p>
@@ -4354,7 +4354,7 @@
 <p>
 This is not guaranteed to have been retrieved until the
 <a class="link" href="telepathy-glib-account.html#TP-ACCOUNT-FEATURE-STORAGE:CAPS" title="TP_ACCOUNT_FEATURE_STORAGE"><code class="literal">TP_ACCOUNT_FEATURE_STORAGE</code></a> feature has been prepared; until then,
-the value is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+the value is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>Default value: NULL</p>
 <p class="since">Since 0.13.2</p>
@@ -4474,7 +4474,7 @@
 </p>
 <p>
 The <em class="parameter"><code>dbus_error_name</code></em> and <em class="parameter"><code>details</code></em> parameters were present, but
-non-functional (always <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>), in older versions. They have been
+non-functional (always <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>), in older versions. They have been
 available with their current behaviour since version 0.11.7.
 </p>
 <div class="variablelist"><table border="0">

=== modified file 'docs/reference/html/telepathy-glib-add-dispatch-operation-context.html'
--- docs/reference/html/telepathy-glib-add-dispatch-operation-context.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/telepathy-glib-add-dispatch-operation-context.html	2012-07-29 01:19:20 +0000
@@ -168,7 +168,7 @@
 Read-only except during construction.
 </p>
 <p>
-This property can't be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+This property can't be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p class="since">Since 0.11.5</p>
 </div>
@@ -182,7 +182,7 @@
 Read-only except during construction.
 </p>
 <p>
-This property can't be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+This property can't be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p class="since">Since 0.11.5</p>
 </div>
@@ -196,7 +196,7 @@
 Read-only except during construction.
 </p>
 <p>
-This property can't be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+This property can't be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p class="since">Since 0.11.5</p>
 </div>
@@ -221,7 +221,7 @@
 Read-only except during construction.
 </p>
 <p>
-This property can't be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+This property can't be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p class="since">Since 0.11.5</p>
 </div>

=== modified file 'docs/reference/html/telepathy-glib-asv.html'
--- docs/reference/html/telepathy-glib-asv.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/telepathy-glib-asv.html	2012-07-29 01:19:20 +0000
@@ -81,18 +81,18 @@
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-asv.html#tp-asv-set-double" title="tp_asv_set_double ()">tp_asv_set_double</a>                   (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> value</code></em>);
-<span class="returnvalue">gint32</span>              <a class="link" href="telepathy-glib-asv.html#tp-asv-get-int32" title="tp_asv_get_int32 ()">tp_asv_get_int32</a>                    (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint32"><span class="returnvalue">gint32</span></a>              <a class="link" href="telepathy-glib-asv.html#tp-asv-get-int32" title="tp_asv_get_int32 ()">tp_asv_get_int32</a>                    (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *valid</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-asv.html#tp-asv-set-int32" title="tp_asv_set_int32 ()">tp_asv_set_int32</a>                    (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint32</span> value</code></em>);
-<span class="returnvalue">gint64</span>              <a class="link" href="telepathy-glib-asv.html#tp-asv-get-int64" title="tp_asv_get_int64 ()">tp_asv_get_int64</a>                    (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint32"><span class="type">gint32</span></a> value</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>              <a class="link" href="telepathy-glib-asv.html#tp-asv-get-int64" title="tp_asv_get_int64 ()">tp_asv_get_int64</a>                    (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *valid</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-asv.html#tp-asv-set-int64" title="tp_asv_set_int64 ()">tp_asv_set_int64</a>                    (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint64</span> value</code></em>);
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> value</code></em>);
 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       <a class="link" href="telepathy-glib-asv.html#tp-asv-get-object-path" title="tp_asv_get_object_path ()">tp_asv_get_object_path</a>              (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-asv.html#tp-asv-set-object-path" title="tp_asv_set_object_path ()">tp_asv_set_object_path</a>              (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
@@ -120,18 +120,18 @@
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-asv.html#tp-asv-set-strv" title="tp_asv_set_strv ()">tp_asv_set_strv</a>                     (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> **value</code></em>);
-<span class="returnvalue">guint32</span>             <a class="link" href="telepathy-glib-asv.html#tp-asv-get-uint32" title="tp_asv_get_uint32 ()">tp_asv_get_uint32</a>                   (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             <a class="link" href="telepathy-glib-asv.html#tp-asv-get-uint32" title="tp_asv_get_uint32 ()">tp_asv_get_uint32</a>                   (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *valid</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-asv.html#tp-asv-set-uint32" title="tp_asv_set_uint32 ()">tp_asv_set_uint32</a>                   (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
-                                                         <em class="parameter"><code><span class="type">guint32</span> value</code></em>);
-<span class="returnvalue">guint64</span>             <a class="link" href="telepathy-glib-asv.html#tp-asv-get-uint64" title="tp_asv_get_uint64 ()">tp_asv_get_uint64</a>                   (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> value</code></em>);
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="returnvalue">guint64</span></a>             <a class="link" href="telepathy-glib-asv.html#tp-asv-get-uint64" title="tp_asv_get_uint64 ()">tp_asv_get_uint64</a>                   (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *valid</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-asv.html#tp-asv-set-uint64" title="tp_asv_set_uint64 ()">tp_asv_set_uint64</a>                   (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
-                                                         <em class="parameter"><code><span class="type">guint64</span> value</code></em>);
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> value</code></em>);
 const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="returnvalue">GValue</span></a> *      <a class="link" href="telepathy-glib-asv.html#tp-asv-lookup" title="tp_asv_lookup ()">tp_asv_lookup</a>                       (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-asv.html#tp-asv-dump" title="tp_asv_dump ()">tp_asv_dump</a>                         (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>);
@@ -198,8 +198,8 @@
       <tr>
         <td class="listing_lines" align="right"><pre>1
 2</pre></td>
-        <td class="listing_code"><pre class="programlisting">GHashTable <span class="gtkdoc opt">*</span>asv <span class="gtkdoc opt">=</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#g-hash-table-new-full">g_hash_table_new_full</a></span> <span class="gtkdoc opt">(</span>g_str_hash<span class="gtkdoc opt">,</span> g_str_equal<span class="gtkdoc opt">,</span>
-   NULL<span class="gtkdoc opt">, (</span>GDestroyNotify<span class="gtkdoc opt">)</span> tp_g_value_slice_free<span class="gtkdoc opt">);</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="usertype">GHashTable</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">asv </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#g-hash-table-new-full">g_hash_table_new_full</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#g-str-hash">g_str_hash</a></span><span class="symbol">,</span><span class="normal"> <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#g-str-equal">g_str_equal</a></span><span class="symbol">,</span>
+<span class="normal">   <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS">NULL</a></span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">(</span><span class="normal"><a href="http://library.gnome.org/devel/glib/unstable/glib-Datasets.html#GDestroyNotify">GDestroyNotify</a></span><span class="symbol">)</span><span class="normal"> <a href="telepathy-glib-util.html#tp-g-value-slice-free">tp_g_value_slice_free</a></span><span class="symbol">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -222,8 +222,8 @@
       <tr>
         <td class="listing_lines" align="right"><pre>1
 2</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#g-hash-table-insert">g_hash_table_insert</a></span> <span class="gtkdoc opt">(</span>parameters<span class="gtkdoc opt">,</span> <span class="string">&quot;account&quot;</span><span class="gtkdoc opt">,</span>
-   <span class="function"><a href="telepathy-glib-util.html#tp-g-value-slice-new-string">tp_g_value_slice_new_string</a></span> <span class="gtkdoc opt">(</span><span class="string">&quot;bob&#64;mcbadgers.com&quot;</span><span class="gtkdoc opt">));</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#g-hash-table-insert">g_hash_table_insert</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">parameters</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"account"</span><span class="symbol">,</span>
+<span class="normal">   </span><span class="function"><a href="telepathy-glib-util.html#tp-g-value-slice-new-string">tp_g_value_slice_new_string</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"[e-mail]"</span><span class="symbol">));</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -234,7 +234,7 @@
 <p>
 </p>
 <div class="example">
-<a name="idp12688048"></a><p class="title"><b>Example 1. Using <a class="link" href="telepathy-glib-asv.html#tp-asv-new" title="tp_asv_new ()"><code class="function">tp_asv_new()</code></a></b></p>
+<a name="id408015"></a><p class="title"><b>Example 1. Using <a class="link" href="telepathy-glib-asv.html#tp-asv-new" title="tp_asv_new ()"><code class="function">tp_asv_new()</code></a></b></p>
 <div class="example-contents">
   <table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
     <tbody>
@@ -243,10 +243,10 @@
 2
 3
 4</pre></td>
-        <td class="listing_code"><pre class="programlisting">GHashTable <span class="gtkdoc opt">*</span>parameters <span class="gtkdoc opt">=</span> <span class="function"><a href="telepathy-glib-asv.html#tp-asv-new">tp_asv_new</a></span> <span class="gtkdoc opt">(</span>
-   <span class="string">&quot;answer&quot;</span><span class="gtkdoc opt">,</span> G_TYPE_INT<span class="gtkdoc opt">,</span> <span class="number">42</span><span class="gtkdoc opt">,</span>
-   <span class="string">&quot;question&quot;</span><span class="gtkdoc opt">,</span> G_TYPE_STRING<span class="gtkdoc opt">,</span> <span class="string">&quot;We just don't know&quot;</span><span class="gtkdoc opt">,</span>
-   NULL<span class="gtkdoc opt">);</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="usertype">GHashTable</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">parameters </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="telepathy-glib-asv.html#tp-asv-new">tp_asv_new</a></span><span class="normal"> </span><span class="symbol">(</span>
+<span class="normal">   </span><span class="string">"answer"</span><span class="symbol">,</span><span class="normal"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-TYPE-INT:CAPS">G_TYPE_INT</a></span><span class="symbol">,</span><span class="normal"> </span><span class="number">42</span><span class="symbol">,</span>
+<span class="normal">   </span><span class="string">"question"</span><span class="symbol">,</span><span class="normal"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-TYPE-STRING:CAPS">G_TYPE_STRING</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"We just don't know"</span><span class="symbol">,</span>
+<span class="normal">   <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS">NULL</a></span><span class="symbol">);</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -288,10 +288,10 @@
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *valid</code></em>);</pre>
 <p>
 If a value for <em class="parameter"><code>key</code></em> in <em class="parameter"><code>asv</code></em> is present and boolean, return it,
-and set *<em class="parameter"><code>valid</code></em> to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>valid</code></em> is not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+and set *<em class="parameter"><code>valid</code></em> to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>valid</code></em> is not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>
-Otherwise return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>, and set *<em class="parameter"><code>valid</code></em> to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if <em class="parameter"><code>valid</code></em> is not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+Otherwise return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>, and set *<em class="parameter"><code>valid</code></em> to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if <em class="parameter"><code>valid</code></em> is not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -308,7 +308,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>valid</code></em> :</span></p></td>
-<td>Either <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a location to store <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the key actually
+<td>Either <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a location to store <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the key actually
 exists and has a boolean value. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span>
 </td>
 </tr>
@@ -367,7 +367,7 @@
 return it.
 </p>
 <p>
-Otherwise return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+Otherwise return <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>
 The returned value is not copied, and is only valid as long as the value
@@ -395,7 +395,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the value of <em class="parameter"><code>key</code></em>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+<td>the value of <em class="parameter"><code>key</code></em>, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -536,7 +536,7 @@
 (its GType is <a href="/usr/share/gtk-doc/html/dbus-glib/dbus-glib-Specializable-GType-System.html#DBUS-TYPE-G-UCHAR-ARRAY:CAPS"><code class="literal">DBUS_TYPE_G_UCHAR_ARRAY</code></a>), return it.
 </p>
 <p>
-Otherwise return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+Otherwise return <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>
 The returned value is not copied, and is only valid as long as the value
@@ -559,7 +559,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the string value of <em class="parameter"><code>key</code></em>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+<td>the string value of <em class="parameter"><code>key</code></em>, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -600,7 +600,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>bytes</code></em> :</span></p></td>
-<td>location of an array of bytes to be copied (this may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>location of an array of bytes to be copied (this may be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 if and only if length is 0)</td>
 </tr>
 </tbody>
@@ -653,10 +653,10 @@
 <p>
 If a value for <em class="parameter"><code>key</code></em> in <em class="parameter"><code>asv</code></em> is present and has any numeric type used by
 dbus-glib (guchar, gint, guint, gint64, guint64 or gdouble),
-return it as a double, and if <em class="parameter"><code>valid</code></em> is not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>.
+return it as a double, and if <em class="parameter"><code>valid</code></em> is not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>.
 </p>
 <p>
-Otherwise, return 0.0, and if <em class="parameter"><code>valid</code></em> is not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>.
+Otherwise, return 0.0, and if <em class="parameter"><code>valid</code></em> is not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -673,7 +673,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>valid</code></em> :</span></p></td>
-<td>Either <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a location in which to store <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success
+<td>Either <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a location in which to store <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success
 or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on failure. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span>
 </td>
 </tr>
@@ -723,17 +723,17 @@
 <hr>
 <div class="refsect2">
 <a name="tp-asv-get-int32"></a><h3>tp_asv_get_int32 ()</h3>
-<pre class="programlisting"><span class="returnvalue">gint32</span>              tp_asv_get_int32                    (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint32"><span class="returnvalue">gint32</span></a>              tp_asv_get_int32                    (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *valid</code></em>);</pre>
 <p>
 If a value for <em class="parameter"><code>key</code></em> in <em class="parameter"><code>asv</code></em> is present, has an integer type used by
 dbus-glib (guchar, gint, guint, gint64 or guint64) and fits in the
-range of a gint32, return it, and if <em class="parameter"><code>valid</code></em> is not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to
+range of a gint32, return it, and if <em class="parameter"><code>valid</code></em> is not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>.
 </p>
 <p>
-Otherwise, return 0, and if <em class="parameter"><code>valid</code></em> is not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>.
+Otherwise, return 0, and if <em class="parameter"><code>valid</code></em> is not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -750,7 +750,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>valid</code></em> :</span></p></td>
-<td>Either <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a location in which to store <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success
+<td>Either <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a location in which to store <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success
 or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on failure. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span>
 </td>
 </tr>
@@ -767,7 +767,7 @@
 <a name="tp-asv-set-int32"></a><h3>tp_asv_set_int32 ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                tp_asv_set_int32                    (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint32</span> value</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint32"><span class="type">gint32</span></a> value</code></em>);</pre>
 <p>
 Stores the value in the map.
 </p>
@@ -800,17 +800,17 @@
 <hr>
 <div class="refsect2">
 <a name="tp-asv-get-int64"></a><h3>tp_asv_get_int64 ()</h3>
-<pre class="programlisting"><span class="returnvalue">gint64</span>              tp_asv_get_int64                    (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>              tp_asv_get_int64                    (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *valid</code></em>);</pre>
 <p>
 If a value for <em class="parameter"><code>key</code></em> in <em class="parameter"><code>asv</code></em> is present, has an integer type used by
 dbus-glib (guchar, gint, guint, gint64 or guint64) and fits in the
-range of a gint64, return it, and if <em class="parameter"><code>valid</code></em> is not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to
+range of a gint64, return it, and if <em class="parameter"><code>valid</code></em> is not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>.
 </p>
 <p>
-Otherwise, return 0, and if <em class="parameter"><code>valid</code></em> is not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>.
+Otherwise, return 0, and if <em class="parameter"><code>valid</code></em> is not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -827,7 +827,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>valid</code></em> :</span></p></td>
-<td>Either <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a location in which to store <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success
+<td>Either <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a location in which to store <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success
 or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on failure. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span>
 </td>
 </tr>
@@ -844,7 +844,7 @@
 <a name="tp-asv-set-int64"></a><h3>tp_asv_set_int64 ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                tp_asv_set_int64                    (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint64</span> value</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> value</code></em>);</pre>
 <p>
 Stores the value in the map.
 </p>
@@ -883,7 +883,7 @@
 If a value for <em class="parameter"><code>key</code></em> in <em class="parameter"><code>asv</code></em> is present and is an object path, return it.
 </p>
 <p>
-Otherwise return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+Otherwise return <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>
 The returned value is not copied, and is only valid as long as the value
@@ -906,7 +906,7 @@
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
 <td>the object-path value of <em class="parameter"><code>key</code></em>, or
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -1030,7 +1030,7 @@
 If a value for <em class="parameter"><code>key</code></em> in <em class="parameter"><code>asv</code></em> is present and is a string, return it.
 </p>
 <p>
-Otherwise return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+Otherwise return <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>
 The returned value is not copied, and is only valid as long as the value
@@ -1052,7 +1052,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the string value of <em class="parameter"><code>key</code></em>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+<td>the string value of <em class="parameter"><code>key</code></em>, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -1176,7 +1176,7 @@
 return it.
 </p>
 <p>
-Otherwise return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+Otherwise return <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>
 The returned value is not copied, and is only valid as long as the value
@@ -1198,8 +1198,8 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated string-array
-value of <em class="parameter"><code>key</code></em>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
+<td>the <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated string-array
+value of <em class="parameter"><code>key</code></em>, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -1235,7 +1235,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td>
-<td>a <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated string array</td>
+<td>a <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated string array</td>
 </tr>
 </tbody>
 </table></div>
@@ -1244,17 +1244,17 @@
 <hr>
 <div class="refsect2">
 <a name="tp-asv-get-uint32"></a><h3>tp_asv_get_uint32 ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint32</span>             tp_asv_get_uint32                   (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="returnvalue">guint32</span></a>             tp_asv_get_uint32                   (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *valid</code></em>);</pre>
 <p>
 If a value for <em class="parameter"><code>key</code></em> in <em class="parameter"><code>asv</code></em> is present, has an integer type used by
 dbus-glib (guchar, gint, guint, gint64 or guint64) and fits in the
-range of a guint32, return it, and if <em class="parameter"><code>valid</code></em> is not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to
+range of a guint32, return it, and if <em class="parameter"><code>valid</code></em> is not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>.
 </p>
 <p>
-Otherwise, return 0, and if <em class="parameter"><code>valid</code></em> is not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>.
+Otherwise, return 0, and if <em class="parameter"><code>valid</code></em> is not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -1271,7 +1271,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>valid</code></em> :</span></p></td>
-<td>Either <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a location in which to store <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success
+<td>Either <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a location in which to store <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success
 or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on failure. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span>
 </td>
 </tr>
@@ -1288,7 +1288,7 @@
 <a name="tp-asv-set-uint32"></a><h3>tp_asv_set_uint32 ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                tp_asv_set_uint32                   (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
-                                                         <em class="parameter"><code><span class="type">guint32</span> value</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> value</code></em>);</pre>
 <p>
 Stores the value in the map.
 </p>
@@ -1321,16 +1321,16 @@
 <hr>
 <div class="refsect2">
 <a name="tp-asv-get-uint64"></a><h3>tp_asv_get_uint64 ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint64</span>             tp_asv_get_uint64                   (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
+<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="returnvalue">guint64</span></a>             tp_asv_get_uint64                   (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *valid</code></em>);</pre>
 <p>
 If a value for <em class="parameter"><code>key</code></em> in <em class="parameter"><code>asv</code></em> is present, has an integer type used by
 dbus-glib (guchar, gint, guint, gint64 or guint64) and is non-negative,
-return it, and if <em class="parameter"><code>valid</code></em> is not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>.
+return it, and if <em class="parameter"><code>valid</code></em> is not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>.
 </p>
 <p>
-Otherwise, return 0, and if <em class="parameter"><code>valid</code></em> is not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>.
+Otherwise, return 0, and if <em class="parameter"><code>valid</code></em> is not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, set *<em class="parameter"><code>valid</code></em> to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -1347,7 +1347,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>valid</code></em> :</span></p></td>
-<td>Either <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a location in which to store <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success
+<td>Either <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, or a location in which to store <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success
 or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on failure. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span>
 </td>
 </tr>
@@ -1364,7 +1364,7 @@
 <a name="tp-asv-set-uint64"></a><h3>tp_asv_set_uint64 ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                tp_asv_set_uint64                   (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>,
-                                                         <em class="parameter"><code><span class="type">guint64</span> value</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> value</code></em>);</pre>
 <p>
 Stores the value in the map.
 </p>
@@ -1400,7 +1400,7 @@
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="returnvalue">GValue</span></a> *      tp_asv_lookup                       (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> *asv</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *key</code></em>);</pre>
 <p>
-If a value for <em class="parameter"><code>key</code></em> in <em class="parameter"><code>asv</code></em> is present, return it. Otherwise return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+If a value for <em class="parameter"><code>key</code></em> in <em class="parameter"><code>asv</code></em> is present, return it. Otherwise return <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>
 The returned value is not copied, and is only valid as long as the value
@@ -1420,7 +1420,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the value of <em class="parameter"><code>key</code></em>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>the value of <em class="parameter"><code>key</code></em>, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 </tbody>

=== modified file 'docs/reference/html/telepathy-glib-base-client.html'
--- docs/reference/html/telepathy-glib-base-client.html	2012-03-28 15:13:41 +0000
+++ docs/reference/html/telepathy-glib-base-client.html	2012-07-29 01:19:20 +0000
@@ -105,14 +105,14 @@
                                                          <em class="parameter"><code><a class="link" href="telepathy-glib-connection.html#TpConnection"><span class="type">TpConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *channels</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *requests_satisfied</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint64</span> user_action_time</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> user_action_time</code></em>,
                                                          <em class="parameter"><code><a class="link" href="telepathy-glib-handle-channels-context.html#TpHandleChannelsContext"><span class="type">TpHandleChannelsContext</span></a> *context</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-base-client.html#tp-base-client-implement-handle-channels" title="tp_base_client_implement_handle_channels ()">tp_base_client_implement_handle_channels</a>
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-base-client.html#TpBaseClientClass" title="struct TpBaseClientClass"><span class="type">TpBaseClientClass</span></a> *klass</code></em>,
                                                          <em class="parameter"><code><a class="link" href="telepathy-glib-base-client.html#TpBaseClientClassHandleChannelsImpl" title="TpBaseClientClassHandleChannelsImpl ()"><span class="type">TpBaseClientClassHandleChannelsImpl</span></a> impl</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-base-client.html#tp-base-client-add-account-features" title="tp_base_client_add_account_features ()">tp_base_client_add_account_features</a> (<em class="parameter"><code><a class="link" href="telepathy-glib-base-client.html#TpBaseClient"><span class="type">TpBaseClient</span></a> *self</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="type">GQuark</span></a> *features</code></em>,
-                                                         <em class="parameter"><code><span class="type">gssize</span> n</code></em>);
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gssize"><span class="type">gssize</span></a> n</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-base-client.html#tp-base-client-add-account-features-varargs" title="tp_base_client_add_account_features_varargs ()">tp_base_client_add_account_features_varargs</a>
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-base-client.html#TpBaseClient"><span class="type">TpBaseClient</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="type">GQuark</span></a> feature</code></em>,
@@ -120,14 +120,14 @@
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-base-client.html#tp-base-client-add-connection-features" title="tp_base_client_add_connection_features ()">tp_base_client_add_connection_features</a>
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-base-client.html#TpBaseClient"><span class="type">TpBaseClient</span></a> *self</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="type">GQuark</span></a> *features</code></em>,
-                                                         <em class="parameter"><code><span class="type">gssize</span> n</code></em>);
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gssize"><span class="type">gssize</span></a> n</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-base-client.html#tp-base-client-add-connection-features-varargs" title="tp_base_client_add_connection_features_varargs ()">tp_base_client_add_connection_features_varargs</a>
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-base-client.html#TpBaseClient"><span class="type">TpBaseClient</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="type">GQuark</span></a> feature</code></em>,
                                                          <em class="parameter"><code>...</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-base-client.html#tp-base-client-add-channel-features" title="tp_base_client_add_channel_features ()">tp_base_client_add_channel_features</a> (<em class="parameter"><code><a class="link" href="telepathy-glib-base-client.html#TpBaseClient"><span class="type">TpBaseClient</span></a> *self</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="type">GQuark</span></a> *features</code></em>,
-                                                         <em class="parameter"><code><span class="type">gssize</span> n</code></em>);
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gssize"><span class="type">gssize</span></a> n</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-base-client.html#tp-base-client-add-channel-features-varargs" title="tp_base_client_add_channel_features_varargs ()">tp_base_client_add_channel_features_varargs</a>
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-base-client.html#TpBaseClient"><span class="type">TpBaseClient</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="type">GQuark</span></a> feature</code></em>,
@@ -138,7 +138,7 @@
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-base-client.html#tp-base-client-delegate-channels-async" title="tp_base_client_delegate_channels_async ()">tp_base_client_delegate_channels_async</a>
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-base-client.html#TpBaseClient"><span class="type">TpBaseClient</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *channels</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint64</span> user_action_time</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> user_action_time</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *preferred_handler</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gio/unstable/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a> callback</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
@@ -159,7 +159,7 @@
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-base-client.html#tp-channel-dispatcher-present-channel-async" title="tp_channel_dispatcher_present_channel_async ()">tp_channel_dispatcher_present_channel_async</a>
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-channel-dispatcher.html#TpChannelDispatcher"><span class="type">TpChannelDispatcher</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a class="link" href="telepathy-glib-channel.html#TpChannel"><span class="type">TpChannel</span></a> *channel</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint64</span> user_action_time</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> user_action_time</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gio/unstable/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a> callback</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="telepathy-glib-base-client.html#tp-channel-dispatcher-present-channel-finish" title="tp_channel_dispatcher_present_channel_finish ()">tp_channel_dispatcher_present_channel_finish</a>
@@ -346,13 +346,13 @@
 5
 6
 7</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-base-client.html#tp-base-client-take-observer-filter">tp_base_client_take_observer_filter</a></span> <span class="gtkdoc opt">(</span>client<span class="gtkdoc opt">,</span>
-   <span class="function"><a href="telepathy-glib-asv.html#tp-asv-new">tp_asv_new</a></span> <span class="gtkdoc opt">(</span>
-       TP_PROP_CHANNEL_CHANNEL_TYPE<span class="gtkdoc opt">,</span> G_TYPE_STRING<span class="gtkdoc opt">,</span>
-           TP_IFACE_CHANNEL_TYPE_TEXT<span class="gtkdoc opt">,</span>
-       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE<span class="gtkdoc opt">,</span> G_TYPE_UINT<span class="gtkdoc opt">,</span>
-           TP_HANDLE_TYPE_CONTACT<span class="gtkdoc opt">,</span>
-       <span class="gtkdoc opt">...));</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-base-client.html#tp-base-client-take-observer-filter">tp_base_client_take_observer_filter</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">client</span><span class="symbol">,</span>
+<span class="normal">   </span><span class="function"><a href="telepathy-glib-asv.html#tp-asv-new">tp_asv_new</a></span><span class="normal"> </span><span class="symbol">(</span>
+<span class="normal">       <a href="telepathy-glib-interfaces.html#TP-PROP-CHANNEL-CHANNEL-TYPE:CAPS">TP_PROP_CHANNEL_CHANNEL_TYPE</a></span><span class="symbol">,</span><span class="normal"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-TYPE-STRING:CAPS">G_TYPE_STRING</a></span><span class="symbol">,</span>
+<span class="normal">           <a href="telepathy-glib-interfaces.html#TP-IFACE-CHANNEL-TYPE-TEXT:CAPS">TP_IFACE_CHANNEL_TYPE_TEXT</a></span><span class="symbol">,</span>
+<span class="normal">       <a href="telepathy-glib-interfaces.html#TP-PROP-CHANNEL-TARGET-HANDLE-TYPE:CAPS">TP_PROP_CHANNEL_TARGET_HANDLE_TYPE</a></span><span class="symbol">,</span><span class="normal"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-TYPE-UINT:CAPS">G_TYPE_UINT</a></span><span class="symbol">,</span>
+<span class="normal">           <a href="telepathy-glib-enums.html#TP-HANDLE-TYPE-CONTACT:CAPS">TP_HANDLE_TYPE_CONTACT</a></span><span class="symbol">,</span>
+<span class="normal">       </span><span class="symbol">...));</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -504,7 +504,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>dispatch_operation</code></em> :</span></p></td>
-<td>a <a class="link" href="telepathy-glib-channel-dispatch-operation.html#TpChannelDispatchOperation"><span class="type">TpChannelDispatchOperation</span></a> or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>;
+<td>a <a class="link" href="telepathy-glib-channel-dispatch-operation.html#TpChannelDispatchOperation"><span class="type">TpChannelDispatchOperation</span></a> or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>;
 the dispatch_operation is not guaranteed to be prepared. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
@@ -609,13 +609,13 @@
 5
 6
 7</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-base-client.html#tp-base-client-take-approver-filter">tp_base_client_take_approver_filter</a></span> <span class="gtkdoc opt">(</span>client<span class="gtkdoc opt">,</span>
-   <span class="function"><a href="telepathy-glib-asv.html#tp-asv-new">tp_asv_new</a></span> <span class="gtkdoc opt">(</span>
-       TP_PROP_CHANNEL_CHANNEL_TYPE<span class="gtkdoc opt">,</span> G_TYPE_STRING<span class="gtkdoc opt">,</span>
-           TP_IFACE_CHANNEL_TYPE_TEXT<span class="gtkdoc opt">,</span>
-       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE<span class="gtkdoc opt">,</span> G_TYPE_UINT<span class="gtkdoc opt">,</span>
-           TP_HANDLE_TYPE_CONTACT<span class="gtkdoc opt">,</span>
-       <span class="gtkdoc opt">...));</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-base-client.html#tp-base-client-take-approver-filter">tp_base_client_take_approver_filter</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">client</span><span class="symbol">,</span>
+<span class="normal">   </span><span class="function"><a href="telepathy-glib-asv.html#tp-asv-new">tp_asv_new</a></span><span class="normal"> </span><span class="symbol">(</span>
+<span class="normal">       <a href="telepathy-glib-interfaces.html#TP-PROP-CHANNEL-CHANNEL-TYPE:CAPS">TP_PROP_CHANNEL_CHANNEL_TYPE</a></span><span class="symbol">,</span><span class="normal"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-TYPE-STRING:CAPS">G_TYPE_STRING</a></span><span class="symbol">,</span>
+<span class="normal">           <a href="telepathy-glib-interfaces.html#TP-IFACE-CHANNEL-TYPE-TEXT:CAPS">TP_IFACE_CHANNEL_TYPE_TEXT</a></span><span class="symbol">,</span>
+<span class="normal">       <a href="telepathy-glib-interfaces.html#TP-PROP-CHANNEL-TARGET-HANDLE-TYPE:CAPS">TP_PROP_CHANNEL_TARGET_HANDLE_TYPE</a></span><span class="symbol">,</span><span class="normal"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-TYPE-UINT:CAPS">G_TYPE_UINT</a></span><span class="symbol">,</span>
+<span class="normal">           <a href="telepathy-glib-enums.html#TP-HANDLE-TYPE-CONTACT:CAPS">TP_HANDLE_TYPE_CONTACT</a></span><span class="symbol">,</span>
+<span class="normal">       </span><span class="symbol">...));</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -801,7 +801,7 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>...</code></em> :</span></p></td>
-<td>more tokens, ending with <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>more tokens, ending with <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 </tbody>
@@ -894,13 +894,13 @@
 5
 6
 7</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-base-client.html#tp-base-client-take-handler-filter">tp_base_client_take_handler_filter</a></span> <span class="gtkdoc opt">(</span>client<span class="gtkdoc opt">,</span>
-   <span class="function"><a href="telepathy-glib-asv.html#tp-asv-new">tp_asv_new</a></span> <span class="gtkdoc opt">(</span>
-       TP_PROP_CHANNEL_CHANNEL_TYPE<span class="gtkdoc opt">,</span> G_TYPE_STRING<span class="gtkdoc opt">,</span>
-           TP_IFACE_CHANNEL_TYPE_TEXT<span class="gtkdoc opt">,</span>
-       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE<span class="gtkdoc opt">,</span> G_TYPE_UINT<span class="gtkdoc opt">,</span>
-           TP_HANDLE_TYPE_CONTACT<span class="gtkdoc opt">,</span>
-       <span class="gtkdoc opt">...));</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="telepathy-glib-base-client.html#tp-base-client-take-handler-filter">tp_base_client_take_handler_filter</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">client</span><span class="symbol">,</span>
+<span class="normal">   </span><span class="function"><a href="telepathy-glib-asv.html#tp-asv-new">tp_asv_new</a></span><span class="normal"> </span><span class="symbol">(</span>
+<span class="normal">       <a href="telepathy-glib-interfaces.html#TP-PROP-CHANNEL-CHANNEL-TYPE:CAPS">TP_PROP_CHANNEL_CHANNEL_TYPE</a></span><span class="symbol">,</span><span class="normal"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-TYPE-STRING:CAPS">G_TYPE_STRING</a></span><span class="symbol">,</span>
+<span class="normal">           <a href="telepathy-glib-interfaces.html#TP-IFACE-CHANNEL-TYPE-TEXT:CAPS">TP_IFACE_CHANNEL_TYPE_TEXT</a></span><span class="symbol">,</span>
+<span class="normal">       <a href="telepathy-glib-interfaces.html#TP-PROP-CHANNEL-TARGET-HANDLE-TYPE:CAPS">TP_PROP_CHANNEL_TARGET_HANDLE_TYPE</a></span><span class="symbol">,</span><span class="normal"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-TYPE-UINT:CAPS">G_TYPE_UINT</a></span><span class="symbol">,</span>
+<span class="normal">           <a href="telepathy-glib-enums.html#TP-HANDLE-TYPE-CONTACT:CAPS">TP_HANDLE_TYPE_CONTACT</a></span><span class="symbol">,</span>
+<span class="normal">       </span><span class="symbol">...));</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -958,7 +958,7 @@
                                                          <em class="parameter"><code><a class="link" href="telepathy-glib-connection.html#TpConnection"><span class="type">TpConnection</span></a> *connection</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *channels</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *requests_satisfied</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint64</span> user_action_time</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> user_action_time</code></em>,
                                                          <em class="parameter"><code><a class="link" href="telepathy-glib-handle-channels-context.html#TpHandleChannelsContext"><span class="type">TpHandleChannelsContext</span></a> *context</code></em>);</pre>
 <p>
 Signature of the implementation of the HandleChannels method.
@@ -1055,7 +1055,7 @@
 <a name="tp-base-client-add-account-features"></a><h3>tp_base_client_add_account_features ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                tp_base_client_add_account_features (<em class="parameter"><code><a class="link" href="telepathy-glib-base-client.html#TpBaseClient"><span class="type">TpBaseClient</span></a> *self</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="type">GQuark</span></a> *features</code></em>,
-                                                         <em class="parameter"><code><span class="type">gssize</span> n</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gssize"><span class="type">gssize</span></a> n</code></em>);</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">tp_base_client_add_account_features</code> is deprecated and should not be used in newly-written code. New code should use
@@ -1130,7 +1130,7 @@
 <pre class="programlisting"><span class="returnvalue">void</span>                tp_base_client_add_connection_features
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-base-client.html#TpBaseClient"><span class="type">TpBaseClient</span></a> *self</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="type">GQuark</span></a> *features</code></em>,
-                                                         <em class="parameter"><code><span class="type">gssize</span> n</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gssize"><span class="type">gssize</span></a> n</code></em>);</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">tp_base_client_add_connection_features</code> is deprecated and should not be used in newly-written code. New code should use
@@ -1203,7 +1203,7 @@
 <a name="tp-base-client-add-channel-features"></a><h3>tp_base_client_add_channel_features ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                tp_base_client_add_channel_features (<em class="parameter"><code><a class="link" href="telepathy-glib-base-client.html#TpBaseClient"><span class="type">TpBaseClient</span></a> *self</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="type">GQuark</span></a> *features</code></em>,
-                                                         <em class="parameter"><code><span class="type">gssize</span> n</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gssize"><span class="type">gssize</span></a> n</code></em>);</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">tp_base_client_add_channel_features</code> is deprecated and should not be used in newly-written code. New code should use
@@ -1333,7 +1333,7 @@
 <pre class="programlisting"><span class="returnvalue">void</span>                tp_base_client_delegate_channels_async
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-base-client.html#TpBaseClient"><span class="type">TpBaseClient</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *channels</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint64</span> user_action_time</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> user_action_time</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *preferred_handler</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gio/unstable/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a> callback</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
@@ -1367,7 +1367,7 @@
 <td><p><span class="term"><em class="parameter"><code>preferred_handler</code></em> :</span></p></td>
 <td>Either the well-known bus name (starting with
 <a class="link" href="telepathy-glib-defs.html#TP-CLIENT-BUS-NAME-BASE:CAPS" title="TP_CLIENT_BUS_NAME_BASE"><code class="literal">TP_CLIENT_BUS_NAME_BASE</code></a>) of the preferred handler for the channels,
-or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> to indicate that any handler but <em class="parameter"><code>self</code></em> would be acceptable.</td>
+or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to indicate that any handler but <em class="parameter"><code>self</code></em> would be acceptable.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
@@ -1410,13 +1410,13 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>delegated</code></em> :</span></p></td>
-<td>if not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to return a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing the <a class="link" href="telepathy-glib-channel.html#TpChannel"><span class="type">TpChannel</span></a>s
+<td>if not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to return a <a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> containing the <a class="link" href="telepathy-glib-channel.html#TpChannel"><span class="type">TpChannel</span></a>s
 which have been properly delegated. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> TelepathyGLib.Channel][<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>]</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>not_delegated</code></em> :</span></p></td>
-<td>if not not <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to return a <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> mapping <a class="link" href="telepathy-glib-channel.html#TpChannel"><span class="type">TpChannel</span></a>s
+<td>if not not <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, used to return a <a href="http://library.gnome.org/devel/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a> mapping <a class="link" href="telepathy-glib-channel.html#TpChannel"><span class="type">TpChannel</span></a>s
 which have not been delegated to a <a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> explaining the reason of
 the failure. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> TelepathyGLib.Channel GLib.Error][<acronym title="Free data container after the code is done."><span class="acronym">transfer container</span></acronym>]</span>
 </td>
@@ -1497,7 +1497,7 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
 <td>function called when channels currently handled by <em class="parameter"><code>self</code></em> are
-delegated, may not be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+delegated, may not be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -1519,7 +1519,7 @@
 <pre class="programlisting"><span class="returnvalue">void</span>                tp_channel_dispatcher_present_channel_async
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-channel-dispatcher.html#TpChannelDispatcher"><span class="type">TpChannelDispatcher</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a class="link" href="telepathy-glib-channel.html#TpChannel"><span class="type">TpChannel</span></a> *channel</code></em>,
-                                                         <em class="parameter"><code><span class="type">gint64</span> user_action_time</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> user_action_time</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gio/unstable/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a> callback</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
 <p>
@@ -1886,7 +1886,7 @@
 <pre class="programlisting"><a class="link" href="telepathy-glib-account-manager.html#TpAccountManager"><span class="returnvalue">TpAccountManager</span></a> *  tp_base_client_get_account_manager  (<em class="parameter"><code><a class="link" href="telepathy-glib-base-client.html#TpBaseClient"><span class="type">TpBaseClient</span></a> *self</code></em>);</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
-<p><code class="literal">tp_base_client_get_account_manager</code> is deprecated and should not be used in newly-written code. New code should not use this function, it may return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> in
+<p><code class="literal">tp_base_client_get_account_manager</code> is deprecated and should not be used in newly-written code. New code should not use this function, it may return <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> in
  the case <em class="parameter"><code>self</code></em> was constructed with a <a class="link" href="telepathy-glib-simple-client-factory.html#TpSimpleClientFactory"><span class="type">TpSimpleClientFactory</span></a>.</p>
 </div>
 <p>
@@ -1987,7 +1987,7 @@
 <pre class="programlisting">  "account-manager"          <a class="link" href="telepathy-glib-account-manager.html#TpAccountManager"><span class="type">TpAccountManager</span></a>*     : Read / Write / Construct Only</pre>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
-<p><code class="literal">TpBaseClient:account-manager</code> is deprecated and should not be used in newly-written code. New code should not use this property, it may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> in
+<p><code class="literal">TpBaseClient:account-manager</code> is deprecated and should not be used in newly-written code. New code should not use this property, it may be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> in
  the case <em class="parameter"><code>self</code></em> was constructed with a <a class="link" href="telepathy-glib-simple-client-factory.html#TpSimpleClientFactory"><span class="type">TpSimpleClientFactory</span></a>.</p>
 </div>
 <p>
@@ -2013,12 +2013,12 @@
 the result of <a class="link" href="telepathy-glib-account-manager.html#tp-account-manager-dup" title="tp_account_manager_dup ()"><code class="function">tp_account_manager_dup()</code></a>.
 </p>
 <p>
-This property may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> initially, but will always be non-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+This property may be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> initially, but will always be non-<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 after the <a class="link" href="telepathy-glib-base-client.html#TpBaseClient"><span class="type">TpBaseClient</span></a> has been constructed.
 </p>
 <p>
-It is an error to specify both a non-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> account manager, and a
-non-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> <a class="link" href="telepathy-glib-base-client.html#TpBaseClient--dbus-daemon" title='The "dbus-daemon" property'><span class="type">"dbus-daemon"</span></a> that is not the same as the
+It is an error to specify both a non-<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> account manager, and a
+non-<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> <a class="link" href="telepathy-glib-base-client.html#TpBaseClient--dbus-daemon" title='The "dbus-daemon" property'><span class="type">"dbus-daemon"</span></a> that is not the same as the
 account manager's <a class="link" href="telepathy-glib-proxy.html#TpProxy--dbus-daemon" title='The "dbus-daemon" property'><span class="type">"dbus-daemon"</span></a>.
 </p>
 <p class="since">Since 0.11.14</p>
@@ -2052,10 +2052,10 @@
 Read-only except during construction.
 </p>
 <p>
-This property can't be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> after construction.
+This property can't be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> after construction.
 </p>
 <p>
-Since 0.11.14 this property may be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> or unspecified in
+Since 0.11.14 this property may be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> or unspecified in
 <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-new"><code class="function">g_object_new()</code></a>, but only if <a class="link" href="telepathy-glib-base-client.html#TpBaseClient--account-manager" title='The "account-manager" property'><span class="type">"account-manager"</span></a> is provided
 instead, in which case its <a class="link" href="telepathy-glib-proxy.html#TpProxy--dbus-daemon" title='The "dbus-daemon" property'><span class="type">"dbus-daemon"</span></a> property will be
 used.
@@ -2081,7 +2081,7 @@
 and object path of the service.
 </p>
 <p>
-This property can't be <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+This property can't be <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>Default value: NULL</p>
 <p class="since">Since 0.11.5</p>

=== modified file 'docs/reference/html/telepathy-glib-base-contact-list.html'
--- docs/reference/html/telepathy-glib-base-contact-list.html	2012-04-03 10:16:49 +0000
+++ docs/reference/html/telepathy-glib-base-contact-list.html	2012-07-29 01:19:20 +0000
@@ -215,22 +215,22 @@
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-base-contact-list.html#tp-base-contact-list-groups-changed" title="tp_base_contact_list_groups_changed ()">tp_base_contact_list_groups_changed</a> (<em class="parameter"><code><a class="link" href="telepathy-glib-base-contact-list.html#TpBaseContactList"><span class="type">TpBaseContactList</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a class="link" href="telepathy-glib-handle-repo.html#TpHandleSet"><span class="type">TpHandleSet</span></a> *contacts</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> * const *added</code></em>,
-                                                         <em class="parameter"><code><span class="type">gssize</span> n_added</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gssize"><span class="type">gssize</span></a> n_added</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> * const *removed</code></em>,
-                                                         <em class="parameter"><code><span class="type">gssize</span> n_removed</code></em>);
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gssize"><span class="type">gssize</span></a> n_removed</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-base-contact-list.html#tp-base-contact-list-one-contact-groups-changed" title="tp_base_contact_list_one_contact_groups_changed ()">tp_base_contact_list_one_contact_groups_changed</a>
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-base-contact-list.html#TpBaseContactList"><span class="type">TpBaseContactList</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a class="link" href="telepathy-glib-handle.html#TpHandle" title="TpHandle"><span class="type">TpHandle</span></a> contact</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> * const *added</code></em>,
-                                                         <em class="parameter"><code><span class="type">gssize</span> n_added</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gssize"><span class="type">gssize</span></a> n_added</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> * const *removed</code></em>,
-                                                         <em class="parameter"><code><span class="type">gssize</span> n_removed</code></em>);
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gssize"><span class="type">gssize</span></a> n_removed</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-base-contact-list.html#tp-base-contact-list-groups-created" title="tp_base_contact_list_groups_created ()">tp_base_contact_list_groups_created</a> (<em class="parameter"><code><a class="link" href="telepathy-glib-base-contact-list.html#TpBaseContactList"><span class="type">TpBaseContactList</span></a> *self</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> * const *created</code></em>,
-                                                         <em class="parameter"><code><span class="type">gssize</span> n_created</code></em>);
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gssize"><span class="type">gssize</span></a> n_created</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-base-contact-list.html#tp-base-contact-list-groups-removed" title="tp_base_contact_list_groups_removed ()">tp_base_contact_list_groups_removed</a> (<em class="parameter"><code><a class="link" href="telepathy-glib-base-contact-list.html#TpBaseContactList"><span class="type">TpBaseContactList</span></a> *self</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> * const *removed</code></em>,
-                                                         <em class="parameter"><code><span class="type">gssize</span> n_removed</code></em>);
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gssize"><span class="type">gssize</span></a> n_removed</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="telepathy-glib-base-contact-list.html#tp-base-contact-list-has-disjoint-groups" title="tp_base_contact_list_has_disjoint_groups ()">tp_base_contact_list_has_disjoint_groups</a>
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-base-contact-list.html#TpBaseContactList"><span class="type">TpBaseContactList</span></a> *self</code></em>);
 
@@ -240,14 +240,14 @@
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-base-contact-list.html#TpBaseContactList"><span class="type">TpBaseContactList</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a class="link" href="telepathy-glib-handle.html#TpHandle" title="TpHandle"><span class="type">TpHandle</span></a> contact</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> * const *normalized_names</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> n_names</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> n_names</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gio/unstable/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a> callback</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="telepathy-glib-base-contact-list.html#tp-base-contact-list-set-contact-groups-async" title="tp_base_contact_list_set_contact_groups_async ()">tp_base_contact_list_set_contact_groups_async</a>
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-base-contact-list.html#TpBaseContactList"><span class="type">TpBaseContactList</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a class="link" href="telepathy-glib-handle.html#TpHandle" title="TpHandle"><span class="type">TpHandle</span></a> contact</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> * const *normalized_names</code></em>,
-                                                         <em class="parameter"><code><span class="type">gsize</span> n_names</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> n_names</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/gio/unstable/GAsyncResult.html#GAsyncReadyCallback"><span class="type">GAsyncReadyCallback</span></a> callback</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="telepathy-glib-base-contact-list.html#tp-base-contact-list-set-contact-groups-finish" title="tp_base_contact_list_set_contact_groups_finish ()">tp_base_contact_list_set_contact_groups_finish</a>
@@ -418,13 +418,13 @@
 5
 6
 7</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-DEFINE-TYPE-WITH-CODE:CAPS">G_DEFINE_TYPE_WITH_CODE</a></span> <span class="gtkdoc opt">(</span>MyConnection<span class="gtkdoc opt">,</span> my_connection<span class="gtkdoc opt">,</span>
-    TP_TYPE_BASE_CONNECTION<span class="gtkdoc opt">,</span>
-    <span class="gtkdoc slc">// ...</span>
-    <span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-IMPLEMENT-INTERFACE:CAPS">G_IMPLEMENT_INTERFACE</a></span> <span class="gtkdoc opt">(</span>TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST<span class="gtkdoc opt">,</span>
-        tp_base_contact_list_mixin_list_iface_init<span class="gtkdoc opt">);</span>
-    <span class="gtkdoc slc">// ...</span>
-    <span class="gtkdoc opt">)</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-DEFINE-TYPE-WITH-CODE:CAPS">G_DEFINE_TYPE_WITH_CODE</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">MyConnection</span><span class="symbol">,</span><span class="normal"> my_connection</span><span class="symbol">,</span>
+<span class="normal">    TP_TYPE_BASE_CONNECTION</span><span class="symbol">,</span>
+<span class="normal">    </span><span class="comment">// ...</span>
+<span class="normal">    </span><span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#G-IMPLEMENT-INTERFACE:CAPS">G_IMPLEMENT_INTERFACE</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST</span><span class="symbol">,</span>
+<span class="normal">        <a href="telepathy-glib-base-contact-list.html#tp-base-contact-list-mixin-list-iface-init">tp_base_contact_list_mixin_list_iface_init</a></span><span class="symbol">);</span>
+<span class="normal">    </span><span class="comment">// ...</span>
+<span class="normal">    </span><span class="symbol">)</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -444,11 +444,11 @@
 3
 4
 5</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="gtkdoc slc">// ...</span>
-<span class="function"><a href="telepathy-glib-TpContactsMixin.html#tp-contacts-mixin-class-init">tp_contacts_mixin_class_init</a></span> <span class="gtkdoc opt">(</span>object_class<span class="gtkdoc opt">,</span>
-    <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span> <span class="gtkdoc opt">(</span>MyConnectionClass<span class="gtkdoc opt">,</span> contacts_mixin<span class="gtkdoc opt">));</span>
-<span class="function"><a href="telepathy-glib-base-contact-list.html#tp-base-contact-list-mixin-class-init">tp_base_contact_list_mixin_class_init</a></span> <span class="gtkdoc opt">(</span>base_connection_class<span class="gtkdoc opt">);</span>
-<span class="gtkdoc slc">// ...</span></pre></td>
+        <td class="listing_code"><pre class="programlisting"><span class="comment">// ...</span>
+<span class="function"><a href="telepathy-glib-TpContactsMixin.html#tp-contacts-mixin-class-init">tp_contacts_mixin_class_init</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">object_class</span><span class="symbol">,</span>
+<span class="normal">    </span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-STRUCT-OFFSET:CAPS">G_STRUCT_OFFSET</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">MyConnectionClass</span><span class="symbol">,</span><span class="normal"> contacts_mixin</span><span class="symbol">));</span>
+<span class="function"><a href="telepathy-glib-base-contact-list.html#tp-base-contact-list-mixin-class-init">tp_base_contact_list_mixin_class_init</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">base_connection_class</span><span class="symbol">);</span>
+<span class="comment">// ...</span></pre></td>
       </tr>
     </tbody>
   </table>
@@ -741,7 +741,7 @@
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
 <p>
 Return the Connection this contact list uses. If this contact list's
-connection has already disconnected, return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> instead.
+connection has already disconnected, return <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> instead.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -752,11 +752,11 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>used to raise an error if <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is returned</td>
+<td>used to raise an error if <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> is returned</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>the connection, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
+<td>the connection, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -1525,7 +1525,7 @@
 <td><p><span class="term"><a class="link" href="telepathy-glib-base-contact-list.html#TpBaseContactListActOnContactsFunc" title="TpBaseContactListActOnContactsFunc ()"><span class="type">TpBaseContactListActOnContactsFunc</span></a> <em class="structfield"><code><a name="TpMutableContactListInterface.store-contacts-async"></a>store_contacts_async</code></em>;</span></p></td>
 <td>the implementation of
 <a class="link" href="telepathy-glib-base-contact-list.html#tp-base-contact-list-store-contacts-async" title="tp_base_contact_list_store_contacts_async ()"><code class="function">tp_base_contact_list_store_contacts_async()</code></a>; if not reimplemented,
-the default implementation is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, which is interpreted as "do nothing"</td>
+the default implementation is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, which is interpreted as "do nothing"</td>
 </tr>
 <tr>
 <td><p><span class="term"><a class="link" href="telepathy-glib-base-contact-list.html#TpBaseContactListAsyncFinishFunc" title="TpBaseContactListAsyncFinishFunc ()"><span class="type">TpBaseContactListAsyncFinishFunc</span></a> <em class="structfield"><code><a name="TpMutableContactListInterface.store-contacts-finish"></a>store_contacts_finish</code></em>;</span></p></td>
@@ -1945,7 +1945,7 @@
 </p>
 <p>
 If the implementation of
-<a class="link" href="telepathy-glib-base-contact-list.html#TpMutableContactListInterface.store-contacts-async"><span class="type">TpMutableContactListInterface.store_contacts_async</span></a> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> (which is
+<a class="link" href="telepathy-glib-base-contact-list.html#TpMutableContactListInterface.store-contacts-async"><span class="type">TpMutableContactListInterface.store_contacts_async</span></a> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> (which is
 the default), this method calls <em class="parameter"><code>callback</code></em> to signal success, but does
 nothing in the underlying protocol.
 </p>
@@ -2366,7 +2366,7 @@
 <td><p><span class="term"><a class="link" href="telepathy-glib-base-contact-list.html#TpBaseContactListNormalizeFunc" title="TpBaseContactListNormalizeFunc ()"><span class="type">TpBaseContactListNormalizeFunc</span></a> <em class="structfield"><code><a name="TpContactGroupListInterface.normalize-group"></a>normalize_group</code></em>;</span></p></td>
 <td>the implementation of
 <a class="link" href="telepathy-glib-base-contact-list.html#tp-base-contact-list-normalize-group" title="tp_base_contact_list_normalize_group ()"><code class="function">tp_base_contact_list_normalize_group()</code></a>; if not reimplemented,
-the default implementation is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>, which allows any UTF-8 string
+the default implementation is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>, which allows any UTF-8 string
 as a group name (including the empty string) and assumes that any distinct
 group names can coexist</td>
 </tr>
@@ -2392,11 +2392,11 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>s</code></em> :</span></p></td>
-<td>a non-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> name to normalize</td>
+<td>a non-<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> name to normalize</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a normalized form of <em class="parameter"><code>s</code></em>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error</td>
+<td>a normalized form of <em class="parameter"><code>s</code></em>, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> on error</td>
 </tr>
 </tbody>
 </table></div>
@@ -2409,13 +2409,13 @@
                                                         (<em class="parameter"><code><a class="link" href="telepathy-glib-base-contact-list.html#TpBaseContactList"><span class="type">TpBaseContactList</span></a> *self</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *s</code></em>);</pre>
 <p>
-Return a normalized form of the group name <em class="parameter"><code>s</code></em>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if a group of a
+Return a normalized form of the group name <em class="parameter"><code>s</code></em>, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> if a group of a
 sufficiently similar name cannot be created.
 </p>
 <p>
 If the <a class="link" href="telepathy-glib-base-contact-list.html#TpBaseContactList"><span class="type">TpBaseContactList</span></a> subclass does not implement
 <a class="link" href="telepathy-glib-base-contact-list.html#TP-TYPE-CONTACT-GROUP-LIST:CAPS" title="TP_TYPE_CONTACT_GROUP_LIST"><code class="literal">TP_TYPE_CONTACT_GROUP_LIST</code></a>, this method is meaningless, and always
-returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
+returns <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>.
 </p>
 <p>
 For implementations of <a class="link" href="telepathy-glib-base-contact-list.html#TP-TYPE-CONTACT-GROUP-LIST:CAPS" title="TP_TYPE_CONTACT_GROUP_LIST"><code class="literal">TP_TYPE_CONTACT_GROUP_LIST</code></a>, this is a virtual
@@ -2437,11 +2437,11 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>s</code></em> :</span></p></td>
-<td>a non-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> group name to normalize</td>
+<td>a non-<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> group name to normalize</td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a normalized form of <em class="parameter"><code>s</code></em>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on error</td>
+<td>a normalized form of <em class="parameter"><code>s</code></em>, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> on error</td>
 </tr>
 </tbody>
 </table></div>
@@ -2459,7 +2459,7 @@
 </p>
 <p>
 If <em class="parameter"><code>contact</code></em> is not on the contact list, this method must return either
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> or an empty array, without error.
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> or an empty array, without error.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -2496,7 +2496,7 @@
 </p>
 <p>
 If <em class="parameter"><code>contact</code></em> is not on the contact list, this method must return either
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> or an empty array.
+<a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> or an empty array.
 </p>
 <p>
 For implementations of <a class="link" href="telepathy-glib-base-contact-list.html#TP-TYPE-CONTACT-GROUP-LIST:CAPS" title="TP_TYPE_CONTACT_GROUP_LIST"><code class="literal">TP_TYPE_CONTACT_GROUP_LIST</code></a>, this is a virtual
@@ -2623,7 +2623,7 @@
 that does not implement <a class="link" href="telepathy-glib-base-contact-list.html#TP-TYPE-CONTACT-GROUP-LIST:CAPS" title="TP_TYPE_CONTACT_GROUP_LIST"><code class="literal">TP_TYPE_CONTACT_GROUP_LIST</code></a>.
 </p>
 <p>
-If <em class="parameter"><code>group</code></em> does not exist, this method must return either <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> or an empty
+If <em class="parameter"><code>group</code></em> does not exist, this method must return either <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> or an empty
 set, without error.
 </p>
 <p>
@@ -2694,9 +2694,9 @@
 <pre class="programlisting"><span class="returnvalue">void</span>                tp_base_contact_list_groups_changed (<em class="parameter"><code><a class="link" href="telepathy-glib-base-contact-list.html#TpBaseContactList"><span class="type">TpBaseContactList</span></a> *self</code></em>,
                                                          <em class="parameter"><code><a class="link" href="telepathy-glib-handle-repo.html#TpHandleSet"><span class="type">TpHandleSet</span></a> *contacts</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> * const *added</code></em>,
-                                                         <em class="parameter"><code><span class="type">gssize</span> n_added</code></em>,
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gssize"><span class="type">gssize</span></a> n_added</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> * const *removed</code></em>,
-                                                         <em class="parameter"><code><span class="type">gssize</span> n_removed</code></em>);</pre>
+                                                         <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gssize"><span class="type">gssize</span></a> n_removed</code></em>);</pre>
 <p>
 Called by subclasses when groups' membership has been changed.
 </p>
@@ -2723,25 +2723,25 @@
 <tr>
 <td><p><span class="term"><em class="parameter"><code>added</code></em> :</span></p></td>
 <td>zero or
-more groups to which the <em class="parameter"><code>contacts</code></em> were added, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> (which has the
+more groups to which the <em class="parameter"><code>contacts</code></em> were added, or <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> (which has the
 same meaning as an empty list). <span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> length=n_added][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>n_added</code></em> :</span></p></td>
-<td>the number of groups added, or -1 if <em class="parameter"><code>added</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated</td>
+<td>the number of groups added, or -1 if <em class="parameter"><code>added</code></em> is <a href="/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>removed</code></em> :</span></p></td>
 <td>zero
-or more groups from which the <em class="parameter"><code>contacts</code></em> were removed, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> (which has