diff -Nru telepathy-glib-0.17.5/aclocal.m4 telepathy-glib-0.17.6/aclocal.m4 --- telepathy-glib-0.17.5/aclocal.m4 2012-02-20 17:31:07.000000000 +0000 +++ telepathy-glib-0.17.6/aclocal.m4 2012-03-19 15:34:27.000000000 +0000 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -48,8 +47,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 +93,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 +141,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 +156,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 +167,7 @@ _PKG_TEXT -To get pkg-config, see .])[]dnl +To get pkg-config, see .]) ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -180,15 +177,12 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -198,7 +192,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.11.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -214,21 +208,19 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.11.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -310,14 +302,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 10 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -357,7 +349,6 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. - rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -422,7 +413,7 @@ break fi ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) + msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -487,13 +478,10 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' - am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -AC_SUBST([am__nodep])dnl -_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -727,15 +715,12 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -867,15 +852,12 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -898,14 +880,13 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 4 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -913,13 +894,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# -------------------- +# ------------------------------ # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) # _AM_SET_OPTIONS(OPTIONS) -# ------------------------ +# ---------------------------------- # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -930,15 +911,13 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # --------------------------------------------------------------------------- # Adds support for distributing Python modules and packages. To @@ -966,10 +945,8 @@ dnl Find a Python interpreter. Python versions prior to 2.0 are not dnl supported. (2.0 was released on October 16, 2000). m4_define_default([_AM_PYTHON_INTERPRETER_LIST], -[python python2 python3 python3.2 python3.1 python3.0 python2.7 dnl - python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) - - AC_ARG_VAR([PYTHON], [the Python interpreter]) + [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl +python2.1 python2.0]) m4_if([$1],[],[ dnl No version check is needed. @@ -1041,7 +1018,9 @@ dnl site-packages directory, not the python standard library dnl directory like in previous automake betas. This behavior dnl is more consistent with lispdir.m4 for example. - dnl Query distutils for this directory. + dnl Query distutils for this directory. distutils does not exist in + dnl Python 1.5, so we fall back to the hardcoded directory if it + dnl doesn't work. AC_CACHE_CHECK([for $am_display_PYTHON script directory], [am_cv_python_pythondir], [if test "x$prefix" = xNONE @@ -1050,7 +1029,8 @@ else am_py_prefix=$prefix fi - am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null` + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` case $am_cv_python_pythondir in $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` @@ -1076,7 +1056,9 @@ dnl pyexecdir -- directory for installing python extension modules dnl (shared libraries) - dnl Query distutils for this directory. + dnl Query distutils for this directory. distutils does not exist in + dnl Python 1.5, so we fall back to the hardcoded directory if it + dnl doesn't work. AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], [am_cv_python_pyexecdir], [if test "x$exec_prefix" = xNONE @@ -1085,7 +1067,8 @@ else am_py_exec_prefix=$exec_prefix fi - am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null` + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` case $am_cv_python_pyexecdir in $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` @@ -1133,14 +1116,12 @@ sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_RUN_LOG(COMMAND) # ------------------- # Run COMMAND, save the exit status in ac_status, and log it. @@ -1217,13 +1198,13 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2009, 2011 Free Software Foundation, Inc. +# Copyright (C) 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 1 # AM_SILENT_RULES([DEFAULT]) # -------------------------- @@ -1238,50 +1219,18 @@ no) AM_DEFAULT_VERBOSITY=1;; *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac -dnl -dnl A few `make' implementations (e.g., NonStop OS and NextStep) -dnl do not support nested variable expansions. -dnl See automake bug#9928 and bug#10237. -am_make=${MAKE-make} -AC_CACHE_CHECK([whether $am_make supports nested variables], - [am_cv_make_support_nested_variables], - [if AS_ECHO([['TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi]) -if test $am_cv_make_support_nested_variables = yes; then - dnl Using `$V' instead of `$(V)' breaks IRIX make. - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AC_SUBST([AM_V])dnl -AM_SUBST_NOTMAKE([AM_V])dnl -AC_SUBST([AM_DEFAULT_V])dnl -AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl AC_SUBST([AM_DEFAULT_VERBOSITY])dnl AM_BACKSLASH='\' AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor `install' (even GNU) is that you can't @@ -1304,13 +1253,13 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 2 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -1319,13 +1268,13 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- +# --------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1347,11 +1296,10 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AC_SUBST([AMTAR], ['$${TAR-tar}']) +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) diff -Nru telepathy-glib-0.17.5/ChangeLog telepathy-glib-0.17.6/ChangeLog --- telepathy-glib-0.17.5/ChangeLog 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/ChangeLog 2012-03-19 15:38:22.000000000 +0000 @@ -1,3 +1,745 @@ +commit a2a0637336525f48434ac2d2b9707bc9314a77c2 +Author: Guillaume Desmottes +Date: 2012-03-19 16:38:14 +0100 + + NEWS: set release date + +commit d75169034b7b0a83409ad0318ff0169b0d99d1f1 +Author: Guillaume Desmottes +Date: 2012-03-19 16:28:38 +0100 + + prepare 0.17.6 + +commit cd804b6cb321d94a3b5b6ddbd31425dec304be46 +Author: Guillaume Desmottes +Date: 2012-03-16 15:26:31 +0100 + + call-channel: annotate the state-changed signal + + https://bugs.freedesktop.org/show_bug.cgi?id=47410 + +commit f61ee3ebdd4de33e3996c7ca0d05f7d0542e2199 +Author: Olivier Crête +Date: 2012-03-15 18:44:54 -0400 + + CallChannel: Add const keyword for the const strings + +commit 9b39d51b1056de9923a7ddc16b7ac9defc69da3f +Author: Olivier Crête +Date: 2012-03-13 18:33:37 -0400 + + BaseMediaCallStream: Update the sending and receiving states when a channel is set + +commit 5d4cd5e236294458cbe9988aa19222652d5dfa4d +Author: Olivier Crête +Date: 2012-03-13 18:33:17 -0400 + + BaseCallStream: Emit notification when the channel is set + +commit 1d019b177f5e9b49154125af9b6ef9e3973d4e23 +Author: Olivier Crête +Date: 2012-03-05 18:31:14 -0500 + + CallChannel: Add functions to request hold + +commit 7e178c06747a0fc389e16c06d9f0dd2064850a0e +Author: Olivier Crête +Date: 2012-03-05 18:03:42 -0500 + + CallChannel: Add Hold state as a GObject property + +commit 369fb5e87d6ed501b4ab50819808ae7fdcac94f1 +Author: Olivier Crête +Date: 2012-03-05 18:00:49 -0500 + + CallChannel: Expose the hold state as a GObject property + +commit c1f734fef56277f75ce31564042263d26bcbab74 +Author: Olivier Crête +Date: 2012-03-05 16:31:19 -0500 + + Document that CallStateDetails is a asv + +commit 7358f2ad6fd53652d5ed0c008b7f3876a6ae5fa7 +Author: Olivier Crête +Date: 2012-03-05 13:07:03 -0500 + + BaseMediaCallStream: Never start sending until a call is accepted + +commit ff2e7f25e366c94d8bf41134cce8a65daf16cc18 +Author: Olivier Crête +Date: 2012-03-02 19:37:17 -0500 + + BaseMediaCallStream: Make it possible to set the Content at construct time + + Make it possible to set the content as construct time if it is + available. + +commit c3ce04aedca4e3dbda47c0b9e870e3e2b15b9c96 +Author: Olivier Crête +Date: 2012-03-01 20:34:06 -0500 + + BaseMediaCallStream: Don't start receiving during a failure report + +commit cf32f035a8c34667cbb20e7d78afdf279c23b640 +Author: Olivier Crête +Date: 2012-03-01 19:47:10 -0500 + + BaseMediaCallStream: Don't start sending during a failure report + +commit 7e87424f0f7aaa0d142d26332516a1a1a27d62bc +Author: Olivier Crête +Date: 2012-03-01 18:29:46 -0500 + + BaseMedia: Don't report sending/receiving failures when unholding + + They will instead just cause the unholding to fail. + +commit 73bd281569d45b4acce20f952dba3d4e79441ec2 +Author: Olivier Crête +Date: 2012-02-29 16:53:05 -0500 + + BaseMediaCallChannel: Add method to get the hold state + +commit c40b66f5847eb37700a992beb091ae383badbec9 +Author: Olivier Crête +Date: 2012-02-24 20:43:40 -0500 + + BaseCallStream: Fix read of uninitialised memory + +commit 508675e357d279ef3a48124a0bca80db0a4a2612 +Author: Olivier Crête +Date: 2012-03-14 15:14:32 -0400 + + CallContent: Add property for parent Channel + +commit 6a45e85dc139ec3e77e0c5c5db2f987b26c37085 +Author: Olivier Crête +Date: 2012-03-14 15:11:25 -0400 + + CallStream: Add property for parent Content + +commit 9a0f22e36a6af966ffe41e1ee70100f10852186c +Author: Olivier Crête +Date: 2012-03-05 18:55:54 -0500 + + CallContentMediaDescription: Add extra interfaces without filling them + +commit 4186135646b69477ccb2f04a021c436e7b637ffd +Author: Xavier Claessens +Date: 2012-01-16 20:54:18 +0100 + + TpCallContentMediaDescription: Add extra interfaces + +commit 7de10745e106f3d9c55e01c8711a5d39b48c8a45 +Author: Simon McVittie +Date: 2012-03-13 12:41:20 +0000 + + Bump dbus-glib dependency to 0.90 for dbus_g_value_parse_variant_by_type + + Also add Requires.private: dbus-1 to the pkg-config files, since it'd + be required for static linking. + + Signed-off-by: Simon McVittie + Reviewed-by: Vivek Dasmohapatra + +commit 1f75801db3e04254fd04de7d7269f1ccceef36fc +Author: Simon McVittie +Date: 2012-03-09 18:38:26 +0000 + + Update NEWS + +commit 6cd7f67b3a538a434251005951c4fdf2f2be7199 +Author: Simon McVittie +Date: 2012-03-08 13:32:40 +0000 + + tp_account_dup_detailed_error_vardict: add + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30422 + Reviewed-by: Jonny Lamb + +commit 5820fe7bafb6be7d12b1983fc10c30f68391ff92 +Author: Simon McVittie +Date: 2012-03-08 13:32:23 +0000 + + tp_account_update_parameters_vardict_async: add + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30422 + Reviewed-by: Jonny Lamb + +commit 2ee978bca10ab13133c8766db27bfed38cf0917e +Author: Simon McVittie +Date: 2012-03-08 13:31:27 +0000 + + tp_account_dup_parameters_vardict: add + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30422 + Reviewed-by: Jonny Lamb + +commit 4bea527034d215c0bc1cbeed2ce7e87d39e0afd8 +Author: Simon McVittie +Date: 2012-03-08 12:51:41 +0000 + + tp_account_dup_storage_specific_information_vardict_async: add + + This is just like tp_account_get_storage_specific_information_async, + but with more GVariant. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30422 + Reviewed-by: Jonny Lamb + +commit eda90e08141dbcb6be4685839208dfebc8b6679d +Author: Simon McVittie +Date: 2012-03-08 12:51:17 +0000 + + account test: rename variables in macros to not shadow normal variables + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30422 + Reviewed-by: Jonny Lamb + +commit c978190ff2c5b87e363c4a41dd400c51566327ed +Author: Simon McVittie +Date: 2012-03-08 12:49:09 +0000 + + Add _tp_asv_to_vardict, a utility function to convert a{sv} representations + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30422 + Reviewed-by: Jonny Lamb + +commit 8b3f45676451e8c6d03db131cfc1b60005136ca4 +Author: Simon McVittie +Date: 2012-03-08 12:45:12 +0000 + + Add tp_account_dup_storage_identifier_variant + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30422 + Reviewed-by: Jonny Lamb + +commit 6e83a149157b06d7717f5f960f97a61471e59725 +Author: Simon McVittie +Date: 2012-03-08 11:24:54 +0000 + + Add a Python example which lists and inspects protocols with g-i + + I could get used to this "rapid prototyping in Python" thing. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46358 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit 1eae5f295c9b57a9a64df7b2c06dc56e627cc06a +Author: Simon McVittie +Date: 2012-03-07 14:32:28 +0000 + + tp_connection_manager_dup_protocols: add + + Again, this provides a more introspectable way to get the protocols. + Combining dup_protocol_names() and get_protocol() is more type-safe, + but less obvious. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46358 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit dcb1a9b3a6e3b822299dc1dcf6f8722879a3e43e +Author: Simon McVittie +Date: 2012-03-07 14:23:16 +0000 + + tp_protocol_dup_params, tp_protocol_dup_param, tp_protocol_borrow_params: add + + tp_protocol_dup_params might be less nice for C (you have to free the + list and the items), but is definitely nicer for Python and other g-i + bindings. It will probably be renamed to ...get_params in Telepathy 1.0. + + tp_protocol_borrow_params is an efficient "C binding", but not as GObject'y. + + tp_protocol_dup_param will replace get_param in Telepathy 1.0. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46358 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit 3ddd7624ed38d8eaf12acd5165c10da6d386768d +Author: Simon McVittie +Date: 2012-03-05 20:00:08 +0000 + + Test listing CMs the new way + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46358 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit 0c7e8cb86c9f47d043fbdb598c0efdb87cbcba17 +Author: Simon McVittie +Date: 2012-03-05 19:36:55 +0000 + + tp_list_connection_managers_async: add + + This is a modern, bindable version of tp_list_connection_managers(), + which has been noted not to work in Python. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46358 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit b455b394c152fbad69fcd743c2882469e2dec73f +Author: Simon McVittie +Date: 2012-03-05 19:34:36 +0000 + + _tp_object_list_copy, _tp_object_list_free: add + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46358 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit bcbb0a54bb7090c12def75f3ba979c5537fa1f4f +Author: Simon McVittie +Date: 2012-03-05 19:49:19 +0000 + + CM test: after listing CMs, inspect them in the test, not the callback + + This will make it easier to re-use the same test for different ways to + list CMs. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46358 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit bada24f6df04dc974cd7b004673fe2a9a5606f76 +Author: Simon McVittie +Date: 2012-03-05 19:48:46 +0000 + + cm test: free things in a less verbose way + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46358 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit 882bd3001dda65d47db51ec200161560d6b66703 +Author: Simon McVittie +Date: 2012-03-05 19:18:49 +0000 + + tests/dbus/cm: actually run the test that lists connection managers + + It turns out this was my fault, back in 2009. Oops. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46358 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit e2194ffe34164653ad699cd97448d6c7336489cf +Author: Simon McVittie +Date: 2012-03-05 19:18:23 +0000 + + Expect to find service files in the srcdir, not the builddir + + This fixes the /cm/list test in out-of-tree builds, or rather, would + fix it if that test had ever worked (which is fixed by the next commit). + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46358 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit 2af32b0f649029a8ae5f7dcdb27aa837a5987c6a +Author: Simon McVittie +Date: 2012-03-09 15:42:48 +0000 + + Apply the same codegen changes to examples, tests as to the main codegen + +commit 29dd816547415a8dc093bfeed8b13e9a60ded772 +Author: Simon McVittie +Date: 2012-03-09 15:28:05 +0000 + + Generate reentrant-methods.list from ABI lists, not documentation + + The ABI lists are really the canonical list of what we've committed + to generating, and we don't want every alteration to -sections.txt + to trigger a rebuild. It currently does, because reentrant-methods.list + causes a rebuild of the client codegen, which causes a rebuild of + everything that includes channel.h, connection.h or telepathy-glib.h. + +commit beb2d9712e271af88a10edd5565c9d0991adbbed +Author: Simon McVittie +Date: 2012-03-09 14:06:49 +0000 + + improve the mtime-transferring hack in tools/ + + The point of this stuff is to rebuild generated code when, for instance, + libtpcodegen.py has changed, without every rule that uses + glib-something-gen.py having to know to depend on libtpcodegen.py as well. + To do that, we propagate newer mtime from Python library code to Python + executables, using touch(1). + + If building out-of-tree, we need to touch the file in srcdir, + rather than creating an empty file in the builddir. The rules that + depend on glib-something-gen.py specifically depend on the version in + the $(srcdir), so in an out-of-tree build, if we aren't careful to act + on the version in the srcdir, editing libtpcodegen.py won't actually + cause a rebuild. + + Reviewed-by: Xavier Claessens + +commit 36c2a545c9c1d1cc6db205bfc33d980d29b0a0f6 +Author: Simon McVittie +Date: 2012-03-09 15:13:13 +0000 + + Avoid having two of the same set of commands run in parallel + + A rule like this: + + _gen/x.c _gen/x.h: prerequisites + $(AM_V_GEN)x-generator + + doesn't consider x.c and x.h together. Instead, it expands to two rules, + one to generate x.c and one to generate x.h, which happen to run the + same commands. + + This means that in the worst case, you can end up running x-generator + twice in parallel, and they'll race with each other and overwrite or + delete each other's output. + + Reviewed-by: Xavier Claessens + +commit 60470526bdbe624201c32a50f9d4145dd32fa1cb +Author: Simon McVittie +Date: 2012-02-21 14:32:40 +0000 + + Codegen: write temporary files first, and rename them into place + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36398 + Reviewed-by: Xavier Claessens + +commit 920c4e208fd7e0ce27abfc9657750ab8d34e38a7 +Author: Simon McVittie +Date: 2012-02-21 14:20:13 +0000 + + Write intermediate files by writing a temporary file first + + Otherwise, we have a race condition: the file exists, so make can + proceed, but its contents are not right yet. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36398 + Reviewed-by: Xavier Claessens + +commit 09fa07cfd8e0d7dcfe37a427d91360798d93f9e2 +Author: Simon McVittie +Date: 2012-03-09 13:26:21 +0000 + + Redo documentation setup every time a copied source file changes + + gtk-doc copies these files from the srcdir into the builddir, but after + it does so, it touches setup-build.stamp. That file has no prerequisites + in gtk-doc.mk, so once these files have been copied once, they won't be + updated from the srcdir unless you explicitly delete them. This is pretty + annoying when you're adding API on branches and building out-of-tree. + + To fix this, we just need to give it some prerequisites. + + Reviewed-by: Xavier Claessens + +commit 37b40c8244d16a0e88768cb30436618cab315d71 +Author: Simon McVittie +Date: 2012-03-09 13:10:37 +0000 + + Partially revert previous commit (re-add variable 'count'), fixing the build + + Reviewed-by: Xavier Claessens + +commit 94d9e891eac8577e125e9bb30be157041ebff3c4 +Author: Xavier Claessens +Date: 2012-02-15 15:06:52 +0100 + + Correctly implement and document tp_call_channel_has_dtmf(). + +commit a406196624c70121fdb802e77ca0164b8dfb6622 +Author: Simon McVittie +Date: 2012-03-06 13:38:50 +0000 + + glib-interfaces-gen: generate self-contained header files + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46835 + Reviewed-by: Jonny Lamb + +commit 9afcd919e3aa05a36748ff3f45241ffb6316458a +Author: Simon McVittie +Date: 2012-03-06 13:45:13 +0000 + + Update GLib dependency in .pc files to catch up with configure.ac + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46835 + Reviewed-by: Jonny Lamb + +commit ebd37e9690a542574ef93df7eb775eeb27ddd68d +Author: Guillaume Desmottes +Date: 2012-03-07 12:59:56 +0100 + + Make use of new GLib macros to check API we are using + +commit c1da88f54b7444fe406d72c85f7d7291a2a2451d +Author: Simon McVittie +Date: 2012-03-05 17:48:37 +0000 + + Rewrite unsupported-interface to be suitable for the 'next' branch + + TpDBusDaemon doesn't have optionally-supported interfaces after the + removal of Telepathy Properties, so we have to use TpConnection. + I took the opportunity to modernize the test and use GTest. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46978 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit 8d80ec6b2c5b6b9fb8753a5ec512f213b096304e +Author: Simon McVittie +Date: 2012-03-05 14:32:49 +0000 + + Deprecate tp_connection_manager_call_when_ready and is_ready + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45842 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit db40ebdb33258f70164cf60bd5a41640dbc0fb93 +Author: Simon McVittie +Date: 2012-03-06 10:36:40 +0000 + + tp_list_connection_managers: use tp_proxy_prepare_async + + We're about to deprecate call_when_ready, so let's not call it. + + [+ a comment in response to Jonny's review] + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45842 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit ca73fa52ebf7be00b43600ecd96d4b964cdb19a6 +Author: Simon McVittie +Date: 2012-03-05 14:02:42 +0000 + + Improve coverage of TpConnectionManager test + + * test prepare_async in every situation where we previously tested + call_when_ready + * test is_prepared (CORE) in the same situations + * test get_invalidated in the same situations + + This brings us closer to being able to deprecate call_when_ready + and is_ready. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45842 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit 9bc4fbe9caa6b9e03d5c0cb305ef7913b8690711 +Author: Simon McVittie +Date: 2012-03-05 13:36:51 +0000 + + tests/dbus/cm: use g_assert_no_error for better diagnostics + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45842 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit 2b35afc056b7dc30e9bc910802c87012c5cf8a6c +Author: Simon McVittie +Date: 2012-03-05 12:54:53 +0000 + + NEWS so far for 0.17.x + +commit e744fbcbc9aee7eaa58204427ebd0752b51a94a2 +Author: Simon McVittie +Date: 2012-02-09 15:58:32 +0000 + + inspect-cm example: stop using call_when_ready + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45842 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit 418d0a1e9a07d564212f258f51c11330c2e91803 +Author: Simon McVittie +Date: 2012-02-09 15:28:02 +0000 + + Deprecate tp_connection_is_ready, TpConnection:connection-ready + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45842 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit 4fb68b07fc1adc48b88858a85639b38bbb4f2271 +Author: Simon McVittie +Date: 2012-02-09 15:42:07 +0000 + + TpContact: stop using about-to-be-deprecated Connection API + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45842 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit ebc0d0068b1d362e06767cab760991a09dd862ea +Author: Simon McVittie +Date: 2012-02-09 15:27:37 +0000 + + Deprecate tp_channel_is_ready and TpChannel:channel-ready + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45842 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit a2bd9248fb0a514d1880902b5b3237a6f1c510fd +Author: Simon McVittie +Date: 2012-02-09 14:40:34 +0000 + + Deprecate tp_channel_call_when_ready, tp_connection_call_when_ready + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45842 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit 7162d30eea3e94894531c1ab6d85b89534cbcada +Author: Simon McVittie +Date: 2012-02-09 15:58:04 +0000 + + Use tp_proxy_prepare_async() to prepare connections in example code + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45842 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit 38b6331ab00d96f81f9eeedeb28a14395f2ff1cb +Author: Simon McVittie +Date: 2012-03-02 19:11:21 +0000 + + Don't use tp_channel_call_when_ready, except in its regression tests + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45842 + Signed-off-by: Simon McVittie + Reviewed-by: Jonny Lamb + +commit ad90e68c7c7ede1a7849151169eea8faddcd1a04 +Author: Xavier Claessens +Date: 2012-03-01 16:18:04 +0000 + + Add handle_type arg to tp_capabilities_support_*_call() + + Like that they can be used to know about call conferences as well. + +commit d70ba9ba46ea037b8003efc27de7f8c2d067befa +Author: Simon McVittie +Date: 2012-02-23 15:32:02 +0000 + + Stop generating lists of signals marshallers altogether + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46523 + Reviewed-by: Jonny Lamb + +commit a7f5ea03fd6b09a8a3c4c3a63a85d0d9932bf11d +Author: Simon McVittie +Date: 2012-02-23 15:31:36 +0000 + + Use GLib's default marshaller everywhere + + In contrast to the previous commit, I'm just using NULL here - + telepathy-glib has an explicit dependency on GLib 2.30. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46523 + Reviewed-by: Jonny Lamb + +commit 1eee3b6d61e52c5bf23128236c9f8f931f5ea033 +Author: Simon McVittie +Date: 2012-02-23 15:30:40 +0000 + + Generate code that uses g_cclosure_marshal_generic() + + I'm using the symbol explicitly in the generated code, because if + someone copies the tools into another project but forgets to increase + the GLib dependency, failing to compile with a missing symbol is a much + nicer failure mode than failing to work at runtime. (Also, I haven't + checked whether dbus-glib copes gracefully with NULL as a marshaller.) + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46523 + Reviewed-by: Jonny Lamb + +commit daed91cba508fa2cc72df986f14585725d324c51 +Author: Simon McVittie +Date: 2012-02-23 15:29:27 +0000 + + Require GLib 2.30, for g_cclosure_marshal_generic() + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46523 + Reviewed-by: Jonny Lamb + +commit b13c6c36f5326fcfadc1d22ea1f1fa5fa98eb548 +Author: Xavier Claessens +Date: 2012-02-29 15:58:20 +0100 + + TpCapabilities: Add API telling if call and file transfer are supported + +commit 8cf081eccb2634cff8013463319a5688a68ba71f +Author: Olivier Crête +Date: 2012-02-24 15:44:20 -0500 + + Call.Content.MD: Reject codecs with the appropriate error + +commit 08751a5682109baf203c13f2f4d41cef9356217b +Author: Olivier Crête +Date: 2012-02-23 21:56:31 -0500 + + Call.I.Stream: Don't confuse hold and set_sending(FALSE) + + Don't change the stream direction because of a Hold + +commit 9f725fe9a199a77fbde1b0d57778b5edb113781c +Author: Olivier Crête +Date: 2012-02-23 21:55:18 -0500 + + Call.Content.I.Media: Reject updates while offer is pending + + Reject updates to the local while there is an offer pending + +commit dfd72a979c07ee9ce91d8b9a7aa920c214108356 +Author: Simon McVittie +Date: 2012-02-21 15:41:46 +0000 + + Remove another unnecessary forward-declaration of TpBaseCallChannel + + Reviewed-by: Guillaume Desmottes + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46384 + +commit de075fb368386470a342082a343daa4e3e6a9a0d +Author: Simon McVittie +Date: 2012-02-21 13:59:05 +0000 + + Avoid forward-declaring Call classes + + Having more than one typedef for the same name is an error. + + If forward declarations are needed to break cycles, the typedef must + be *moved* (not copied) from the header it'd normally appear in to the + header with the forward declaration: for instance, TpCallContent + (forward-declared in call-channel.h) gets this right. In extreme cases, + a global "types.h" header can forward-declare everything, although that + often leads to unnecessary compilation, so we've avoided it in + telepathy-glib. + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46384 + Reviewed-by: Guillaume Desmottes + +commit 9a03650ec5a67807bd9f7e022473e8b77b3630c7 +Author: George Kiagiadakis +Date: 2012-02-21 12:23:20 +0200 + + example-call: s/Call.DRAFT/Call1/ in example_call.manager + + Reviewed-by: Simon McVittie + +commit 66fe90c1096cacad680956f4f564d9394d501812 +Author: Simon McVittie +Date: 2012-02-20 19:02:45 +0000 + + Nano version + commit 5656c065f5ed1f98a6cd05df6bb0101c7ac88427 Author: Simon McVittie Date: 2012-02-20 17:17:36 +0000 diff -Nru telepathy-glib-0.17.5/config.guess telepathy-glib-0.17.6/config.guess --- telepathy-glib-0.17.5/config.guess 2012-02-01 12:09:12.000000000 +0000 +++ telepathy-glib-0.17.6/config.guess 2012-01-12 14:34:15.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# Free Software Foundation, Inc. -timestamp='2011-05-11' +timestamp='2009-11-20' # 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 @@ -56,9 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -181,7 +180,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -224,7 +223,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -270,10 +269,7 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; + exit ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -299,7 +295,7 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -398,23 +394,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -484,8 +480,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -498,7 +494,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -555,7 +551,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[4567]) + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -598,52 +594,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include + sed 's/^ //' << EOF >$dummy.c - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -734,22 +730,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -773,14 +769,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -808,14 +804,14 @@ echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -870,7 +866,7 @@ EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@ -882,13 +878,7 @@ then echo ${UNAME_MACHINE}-unknown-linux-gnu else - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP - then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi - else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf - fi + echo ${UNAME_MACHINE}-unknown-linux-gnueabi fi exit ;; avr32*:Linux:*:*) @@ -901,7 +891,7 @@ echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo frv-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -969,7 +959,7 @@ echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -977,9 +967,6 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - tile*:Linux:*:*) - echo ${UNAME_MACHINE}-tilera-linux-gnu - exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; @@ -987,7 +974,7 @@ echo x86_64-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -996,11 +983,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1032,7 +1019,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1060,13 +1047,13 @@ exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1101,8 +1088,8 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1145,10 +1132,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1174,11 +1161,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1243,9 +1230,6 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} - exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1291,13 +1275,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1337,11 +1321,11 @@ #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff -Nru telepathy-glib-0.17.5/config.h.in telepathy-glib-0.17.6/config.h.in --- telepathy-glib-0.17.5/config.h.in 2012-02-20 17:31:15.000000000 +0000 +++ telepathy-glib-0.17.6/config.h.in 2012-03-19 15:34:39.000000000 +0000 @@ -12,8 +12,11 @@ /* Make tests installable */ #undef ENABLE_INSTALLED_TESTS -/* Build with GLib deprecated */ -#undef GLIB_DISABLE_DEPRECATION_WARNINGS +/* Prevent post 2.30 APIs */ +#undef GLIB_VERSION_MAX_REQUIRED + +/* Ignore post 2.30 deprecations */ +#undef GLIB_VERSION_MIN_REQUIRED /* Define to 1 if you have the `backtrace' function. */ #undef HAVE_BACKTRACE diff -Nru telepathy-glib-0.17.5/config.sub telepathy-glib-0.17.6/config.sub --- telepathy-glib-0.17.5/config.sub 2012-02-01 12:09:13.000000000 +0000 +++ telepathy-glib-0.17.6/config.sub 2012-01-12 14:34:15.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# Free Software Foundation, Inc. -timestamp='2011-03-23' +timestamp='2009-11-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -75,9 +75,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -124,9 +123,8 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os @@ -158,8 +156,8 @@ os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -175,10 +173,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -283,13 +281,11 @@ | moxie \ | mt \ | msp430 \ - | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ - | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | rx \ | score \ @@ -297,24 +293,15 @@ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ | ubicom32 \ | v850 | v850e \ | we32k \ - | x86 | xc16x | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - c54x) - basic_machine=tic54x-unknown - ;; - c55x) - basic_machine=tic55x-unknown - ;; - c6x) - basic_machine=tic6x-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12 | picochip) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -326,18 +313,6 @@ basic_machine=mt-unknown ;; - strongarm | thumb | xscale) - basic_machine=arm-unknown - ;; - - xscaleeb) - basic_machine=armeb-unknown - ;; - - xscaleel) - basic_machine=armel-unknown - ;; - # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -358,7 +333,7 @@ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ @@ -392,28 +367,25 @@ | mmix-* \ | mt-* \ | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -438,7 +410,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -508,20 +480,11 @@ basic_machine=powerpc-ibm os=-cnk ;; - c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -553,7 +516,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16 | cr16-*) + cr16) basic_machine=cr16-unknown os=-elf ;; @@ -769,7 +732,7 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -876,12 +839,6 @@ np1) basic_machine=np1-gould ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -964,10 +921,9 @@ ;; power) basic_machine=power-ibm ;; - ppc | ppcbe) basic_machine=powerpc-unknown + ppc) basic_machine=powerpc-unknown ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1061,9 +1017,6 @@ basic_machine=i860-stratus os=-sysv4 ;; - strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; sun2) basic_machine=m68000-sun ;; @@ -1120,10 +1073,17 @@ basic_machine=t90-cray os=-unicos ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff + ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff ;; tile*) basic_machine=tile-unknown @@ -1196,9 +1156,6 @@ xps | xps100) basic_machine=xps100-honeywell ;; - xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` - ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1296,11 +1253,11 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1337,8 +1294,7 @@ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1385,7 +1341,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1434,7 +1390,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1479,8 +1435,6 @@ -dicos*) os=-dicos ;; - -nacl*) - ;; -none) ;; *) @@ -1503,10 +1457,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1518,17 +1472,8 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; - tic54x-*) - os=-coff - ;; - tic55x-*) - os=-coff - ;; - tic6x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1555,7 +1500,7 @@ m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1582,7 +1527,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff -Nru telepathy-glib-0.17.5/configure telepathy-glib-0.17.6/configure --- telepathy-glib-0.17.5/configure 2012-02-20 17:31:08.000000000 +0000 +++ telepathy-glib-0.17.6/configure 2012-03-19 15:34:32.000000000 +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.17.5. +# Generated by GNU Autoconf 2.68 for Telepathy-GLib 0.17.6. # # Report bugs to . # @@ -631,8 +631,8 @@ # Identity of this package. PACKAGE_NAME='Telepathy-GLib' PACKAGE_TARNAME='telepathy-glib' -PACKAGE_VERSION='0.17.5' -PACKAGE_STRING='Telepathy-GLib 0.17.5' +PACKAGE_VERSION='0.17.6' +PACKAGE_STRING='Telepathy-GLib 0.17.6' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=tp-glib' PACKAGE_URL='' @@ -793,7 +793,6 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE -am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -809,8 +808,6 @@ CC AM_BACKSLASH AM_DEFAULT_VERBOSITY -AM_DEFAULT_V -AM_V am__untar am__tar AMTAR @@ -922,7 +919,6 @@ GIO_UNIX_LIBS DBUS_CFLAGS DBUS_LIBS -PYTHON CXX CXXFLAGS CCC @@ -1469,7 +1465,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.17.5 to adapt to many kinds of systems. +\`configure' configures Telepathy-GLib 0.17.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1539,7 +1535,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Telepathy-GLib 0.17.5:";; + short | recursive ) echo "Configuration of Telepathy-GLib 0.17.6:";; esac cat <<\_ACEOF @@ -1588,7 +1584,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use + --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR @@ -1621,7 +1617,6 @@ linker flags for GIO_UNIX, overriding pkg-config DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config DBUS_LIBS linker flags for DBUS, overriding pkg-config - PYTHON the Python interpreter CXX C++ compiler command CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor @@ -1692,7 +1687,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Telepathy-GLib configure 0.17.5 +Telepathy-GLib configure 0.17.6 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2182,7 +2177,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.17.5, which was +It was created by Telepathy-GLib $as_me 0.17.6, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3000,7 +2995,7 @@ # Define the identity of the package. PACKAGE='telepathy-glib' - VERSION='0.17.5' + VERSION='0.17.6' cat >>confdefs.h <<_ACEOF @@ -3030,11 +3025,11 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AMTAR='$${TAR-tar}' +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} -am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' @@ -3053,33 +3048,6 @@ no) AM_DEFAULT_VERBOSITY=1;; *) AM_DEFAULT_VERBOSITY=1;; esac -am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } -if test $am_cv_make_support_nested_variables = yes; then - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi AM_BACKSLASH='\' @@ -3924,7 +3892,6 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' - am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3949,7 +3916,6 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. - rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4009,7 +3975,7 @@ break fi ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) + msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -4366,8 +4332,8 @@ -macro_version='2.4.2' -macro_revision='1.3337' +macro_version='2.4' +macro_revision='1.3293' @@ -5212,11 +5178,6 @@ lt_cv_sys_max_cmd_len=196608 ;; - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -5256,7 +5217,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -5685,12 +5646,12 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be glibc/ELF. +# This must be Linux ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) 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 @@ -6326,13 +6287,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi case $host_os in @@ -6479,7 +6440,6 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -6868,7 +6828,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -*-*solaris*) +sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -6879,20 +6839,7 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; + yes*) LD="${LD-ld} -m elf64_sparc" ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -7532,13 +7479,7 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&5 - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7549,7 +7490,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -7582,7 +7522,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -7604,9 +7543,7 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -8011,22 +7948,7 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac + withval=$with_pic; pic_mode="$withval" else pic_mode=default fi @@ -8104,10 +8026,6 @@ - - - - test -z "$LN_S" && LN_S="ln -s" @@ -8567,9 +8485,7 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - if test -n "$lt_prog_compiler_pic"; then - lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" - fi + lt_prog_compiler_pic='-Xcompiler -fPIC' ;; esac else @@ -8660,33 +8576,18 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) + *Sun\ F* | *Sun*Fortran*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; - *Sun\ F* | *Sun*Fortran*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Qoption ld ' - ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; - *Intel*\ [CF]*Compiler*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - *Portland\ Group*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; esac ;; esac @@ -9048,6 +8949,7 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -9091,9 +8993,6 @@ openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs=no - ;; esac ld_shlibs=yes @@ -9300,7 +9199,8 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld='-rpath $libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -9315,7 +9215,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 +9392,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 @@ -9680,7 +9579,6 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes - exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -9726,7 +9624,6 @@ hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - else whole_archive_flag_spec='' fi @@ -9755,6 +9652,10 @@ hardcode_shlibpath_var=no ;; + freebsd1*) + ld_shlibs=no + ;; + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -9767,7 +9668,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) + freebsd2*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -9806,6 +9707,7 @@ fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -9946,7 +9848,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 @@ -10429,6 +10331,11 @@ + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -10518,7 +10425,7 @@ case $host_os in aix3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -10527,7 +10434,7 @@ ;; aix[4-9]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -10592,7 +10499,7 @@ ;; bsdi[45]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux 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' @@ -10731,7 +10638,7 @@ ;; dgux*) - version_type=linux # correct to gnu/linux during the next big refactor + 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' @@ -10739,6 +10646,10 @@ shlibpath_var=LD_LIBRARY_PATH ;; +freebsd1*) + dynamic_linker=no + ;; + freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -10746,7 +10657,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[23].*) objformat=aout ;; + freebsd[123]*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -10764,7 +10675,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2.*) + freebsd2*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -10784,18 +10695,17 @@ ;; gnu*) - version_type=linux # correct to gnu/linux during the next big refactor + 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 ;; haiku*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -10856,7 +10766,7 @@ ;; interix[3-9]*) - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -10872,7 +10782,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux else version_type=irix fi ;; @@ -10909,9 +10819,9 @@ dynamic_linker=no ;; -# This must be glibc/ELF. +# This must be Linux ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -10959,10 +10869,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 +10888,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 @@ -11005,7 +10907,7 @@ ;; newsos6) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -11074,7 +10976,7 @@ ;; solaris*) - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -11099,7 +11001,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux 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 @@ -11123,7 +11025,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -11154,7 +11056,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -11164,7 +11066,7 @@ ;; uts4*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux 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 @@ -11946,8 +11848,6 @@ - - ac_config_commands="$ac_config_commands libtool" @@ -11970,7 +11870,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 +12160,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 +12176,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 +12195,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 +12212,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 +12228,7 @@ To get pkg-config, see . 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 @@ -12501,19 +12400,13 @@ -LT_CURRENT=67 +LT_CURRENT=68 LT_REVISION=0 -LT_AGE=67 +LT_AGE=68 -# Disable GLib deprecation warnings for now; GValueArray is deprecated but we -# need it for dbus-glib. - -$as_echo "#define GLIB_DISABLE_DEPRECATION_WARNINGS 1" >>confdefs.h - - # Check whether --enable-compiler-optimisations was given. if test "${enable_compiler_optimisations+set}" = set; then : enableval=$enable_compiler_optimisations; if test "x$enable_compiler_optimisations" = "xno"; then @@ -13068,13 +12961,12 @@ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.28.0, gobject-2.0 >= 2.28.0, gio-2.0 >= 2.28.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.28.0, gobject-2.0 >= 2.28.0, gio-2.0 >= 2.28.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.30.0, gobject-2.0 >= 2.30.0, gio-2.0 >= 2.30.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.30.0, gobject-2.0 >= 2.30.0, gio-2.0 >= 2.30.0") 2>&5 ac_status=$? $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.28.0, gobject-2.0 >= 2.28.0, gio-2.0 >= 2.28.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + 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` else pkg_failed=yes fi @@ -13085,13 +12977,12 @@ pkg_cv_GLIB_LIBS="$GLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.28.0, gobject-2.0 >= 2.28.0, gio-2.0 >= 2.28.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.28.0, gobject-2.0 >= 2.28.0, gio-2.0 >= 2.28.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.30.0, gobject-2.0 >= 2.30.0, gio-2.0 >= 2.30.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.30.0, gobject-2.0 >= 2.30.0, gio-2.0 >= 2.30.0") 2>&5 ac_status=$? $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.28.0, gobject-2.0 >= 2.28.0, gio-2.0 >= 2.28.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + 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` else pkg_failed=yes fi @@ -13111,14 +13002,14 @@ _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.28.0, gobject-2.0 >= 2.28.0, gio-2.0 >= 2.28.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.28.0, gobject-2.0 >= 2.28.0, gio-2.0 >= 2.28.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 - as_fn_error $? "Package requirements (glib-2.0 >= 2.28.0, gobject-2.0 >= 2.28.0, gio-2.0 >= 2.28.0) were not met: + as_fn_error $? "Package requirements (glib-2.0 >= 2.30.0, gobject-2.0 >= 2.30.0, gio-2.0 >= 2.30.0) were not met: $GLIB_PKG_ERRORS @@ -13128,6 +13019,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; } @@ -13143,6 +13035,7 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } + else GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS GLIB_LIBS=$pkg_cv_GLIB_LIBS @@ -13152,6 +13045,13 @@ fi +$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 + + + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO_UNIX" >&5 $as_echo_n "checking for GIO_UNIX... " >&6; } @@ -13166,7 +13066,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 @@ -13183,7 +13082,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 @@ -13203,9 +13101,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 @@ -13250,13 +13148,12 @@ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.95, dbus-glib-1 >= 0.82\""; } >&5 - ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.95, dbus-glib-1 >= 0.82") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.95, dbus-glib-1 >= 0.90\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.95, dbus-glib-1 >= 0.90") 2>&5 ac_status=$? $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.82" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 0.95, dbus-glib-1 >= 0.90" 2>/dev/null` else pkg_failed=yes fi @@ -13267,13 +13164,12 @@ pkg_cv_DBUS_LIBS="$DBUS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.95, dbus-glib-1 >= 0.82\""; } >&5 - ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.95, dbus-glib-1 >= 0.82") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.95, dbus-glib-1 >= 0.90\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.95, dbus-glib-1 >= 0.90") 2>&5 ac_status=$? $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.82" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 0.95, dbus-glib-1 >= 0.90" 2>/dev/null` else pkg_failed=yes fi @@ -13293,14 +13189,14 @@ _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.82" 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.82" 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 - as_fn_error $? "Package requirements (dbus-1 >= 0.95, dbus-glib-1 >= 0.82) were not met: + as_fn_error $? "Package requirements (dbus-1 >= 0.95, dbus-glib-1 >= 0.90) were not met: $DBUS_PKG_ERRORS @@ -13310,6 +13206,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; } @@ -13325,6 +13222,7 @@ To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } + else DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS DBUS_LIBS=$pkg_cv_DBUS_LIBS @@ -13575,8 +13473,6 @@ - - if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.5" >&5 @@ -13610,7 +13506,7 @@ $as_echo_n "(cached) " >&6 else - for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros @@ -13719,7 +13615,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 $as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } if ${am_cv_python_pythondir+:} false; then : $as_echo_n "(cached) " >&6 @@ -13730,7 +13626,8 @@ else am_py_prefix=$prefix fi - am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null` + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` case $am_cv_python_pythondir in $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` @@ -13756,7 +13653,7 @@ pkgpythondir=\${pythondir}/$PACKAGE - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 $as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } if ${am_cv_python_pyexecdir+:} false; then : $as_echo_n "(cached) " >&6 @@ -13767,7 +13664,8 @@ else am_py_exec_prefix=$exec_prefix fi - am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null` + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` case $am_cv_python_pyexecdir in $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` @@ -14175,7 +14073,6 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. - rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -14235,7 +14132,7 @@ break fi ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) + msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -14455,6 +14352,7 @@ hardcode_direct_CXX=no hardcode_direct_absolute_CXX=no hardcode_libdir_flag_spec_CXX= +hardcode_libdir_flag_spec_ld_CXX= hardcode_libdir_separator_CXX= hardcode_minus_L_CXX=no hardcode_shlibpath_var_CXX=unsupported @@ -15038,7 +14936,6 @@ hardcode_shlibpath_var_CXX=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - else whole_archive_flag_spec_CXX='' fi @@ -15083,7 +14980,7 @@ esac ;; - freebsd2.*) + freebsd[12]*) # C++ shared libraries reported to be fairly broken before # switch to ELF ld_shlibs_CXX=no @@ -15759,7 +15656,6 @@ case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -16187,7 +16083,7 @@ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -16549,18 +16445,13 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) - exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - ;; + cl*) ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' ;; 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' ;; @@ -16707,6 +16598,8 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -16732,7 +16625,7 @@ case $host_os in aix3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -16741,7 +16634,7 @@ ;; aix[4-9]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -16806,7 +16699,7 @@ ;; bsdi[45]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux 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' @@ -16943,7 +16836,7 @@ ;; dgux*) - version_type=linux # correct to gnu/linux during the next big refactor + 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' @@ -16951,6 +16844,10 @@ shlibpath_var=LD_LIBRARY_PATH ;; +freebsd1*) + dynamic_linker=no + ;; + freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -16958,7 +16855,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[23].*) objformat=aout ;; + freebsd[123]*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -16976,7 +16873,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2.*) + freebsd2*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -16996,18 +16893,17 @@ ;; gnu*) - version_type=linux # correct to gnu/linux during the next big refactor + 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 ;; haiku*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -17068,7 +16964,7 @@ ;; interix[3-9]*) - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -17084,7 +16980,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux else version_type=irix fi ;; @@ -17121,9 +17017,9 @@ dynamic_linker=no ;; -# This must be glibc/ELF. +# This must be Linux ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -17171,10 +17067,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 @@ -17186,18 +17086,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 @@ -17217,7 +17105,7 @@ ;; newsos6) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -17286,7 +17174,7 @@ ;; solaris*) - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -17311,7 +17199,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux 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 @@ -17335,7 +17223,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -17366,7 +17254,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -17376,7 +17264,7 @@ ;; uts4*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux 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 @@ -18146,7 +18034,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.17.5, which was +This file was extended by Telepathy-GLib $as_me 0.17.6, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18212,7 +18100,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.17.5 +Telepathy-GLib config.status 0.17.6 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -18349,7 +18237,6 @@ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' -PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -18432,6 +18319,7 @@ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -18503,6 +18391,7 @@ allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' @@ -18541,7 +18430,6 @@ # Quote evaled strings. for var in SHELL \ ECHO \ -PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -18592,6 +18480,7 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ +hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -18625,6 +18514,7 @@ allow_undefined_flag_CXX \ no_undefined_flag_CXX \ hardcode_libdir_flag_spec_CXX \ +hardcode_libdir_flag_spec_ld_CXX \ hardcode_libdir_separator_CXX \ exclude_expsyms_CXX \ include_expsyms_CXX \ @@ -19458,8 +19348,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -19513,9 +19403,6 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO -# The PATH separator for the build system. -PATH_SEPARATOR=$lt_PATH_SEPARATOR - # The host system. host_alias=$host_alias host=$host @@ -19817,6 +19704,10 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec +# If ld is used when linking, flag to hardcode \$libdir into a binary +# during linking. This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld + # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -20159,6 +20050,10 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX +# If ld is used when linking, flag to hardcode \$libdir into a binary +# during linking. This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX + # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX diff -Nru telepathy-glib-0.17.5/configure.ac telepathy-glib-0.17.6/configure.ac --- telepathy-glib-0.17.5/configure.ac 2012-02-20 17:31:02.000000000 +0000 +++ telepathy-glib-0.17.6/configure.ac 2012-03-19 15:33:56.000000000 +0000 @@ -11,7 +11,7 @@ m4_define([tp_glib_major_version], [0]) m4_define([tp_glib_minor_version], [17]) -m4_define([tp_glib_micro_version], [5]) +m4_define([tp_glib_micro_version], [6]) m4_define([tp_glib_nano_version], [0]) # If library source has changed since last release, increment revision @@ -26,9 +26,9 @@ # (we don't guarantee that we won't add ABI then remove it again, if it was # never seen in a release). -m4_define([tp_glib_lt_current], [67]) +m4_define([tp_glib_lt_current], [68]) m4_define([tp_glib_lt_revision], [0]) -m4_define([tp_glib_lt_age], [67]) +m4_define([tp_glib_lt_age], [68]) # Some magic m4_define([tp_glib_base_version], @@ -68,10 +68,6 @@ AC_SUBST([LT_REVISION]) AC_SUBST([LT_AGE]) -# Disable GLib deprecation warnings for now; GValueArray is deprecated but we -# need it for dbus-glib. -AC_DEFINE(GLIB_DISABLE_DEPRECATION_WARNINGS, 1, [Build with GLib deprecated]) - dnl optimizations, etc. COMPILER_OPTIMISATIONS COMPILER_COVERAGE @@ -201,7 +197,10 @@ dnl Check for Glib PKG_CHECK_MODULES(GLIB, - [glib-2.0 >= 2.28.0, gobject-2.0 >= 2.28.0, gio-2.0 >= 2.28.0]) + [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]) dnl Check for GIO-Unix PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0], @@ -224,7 +223,7 @@ AC_SUBST(GLIB_MKENUMS) dnl Check for D-Bus -PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.95, dbus-glib-1 >= 0.82]) +PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.95, dbus-glib-1 >= 0.90]) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) diff -Nru telepathy-glib-0.17.5/debian/changelog telepathy-glib-0.17.6/debian/changelog --- telepathy-glib-0.17.5/debian/changelog 2012-02-22 19:29:47.000000000 +0000 +++ telepathy-glib-0.17.6/debian/changelog 2012-03-20 14:39:44.000000000 +0000 @@ -1,3 +1,19 @@ +telepathy-glib (0.17.6-1ubuntu1) precise; urgency=low + + * Merge with Debian experimental. Remaining Ubuntu changes: + - ludicrous-timeout-for-lp-buildd.patch: Cope with launchpad-buildd's + slightly sad output buffering/handling. + + -- Ken VanDine Tue, 20 Mar 2012 10:39:42 -0400 + +telepathy-glib (0.17.6-1) experimental; urgency=low + + * New upstream release + * Build-depend on vala (>=0.14) | vala-0.14 + * debian/libtelepathy-glib0.symbols: Updated + + -- Sjoerd Simons Mon, 19 Mar 2012 19:39:07 +0100 + telepathy-glib (0.17.5-1ubuntu1) precise; urgency=low * Merge with Debian experimental. Remaining Ubuntu changes: diff -Nru telepathy-glib-0.17.5/debian/control telepathy-glib-0.17.6/debian/control --- telepathy-glib-0.17.5/debian/control 2012-02-22 18:13:11.000000000 +0000 +++ telepathy-glib-0.17.6/debian/control 2012-03-20 14:11:15.000000000 +0000 @@ -19,7 +19,7 @@ libglib2.0-dev (>= 2.28), libdbus-glib-1-dev (>= 0.82), libdbus-1-dev (>= 0.95), - valac-0.14, + valac (>= 0.14) | valac-0.14, xsltproc, python, gtk-doc-tools (>= 1.17), diff -Nru telepathy-glib-0.17.5/debian/libtelepathy-glib0.symbols telepathy-glib-0.17.6/debian/libtelepathy-glib0.symbols --- telepathy-glib-0.17.5/debian/libtelepathy-glib0.symbols 2012-02-22 17:57:21.000000000 +0000 +++ telepathy-glib-0.17.6/debian/libtelepathy-glib0.symbols 2012-03-20 14:15:59.000000000 +0000 @@ -46,6 +46,7 @@ TELEPATHY_GLIB_0.17.2@TELEPATHY_GLIB_0.17.2 0.17.2 TELEPATHY_GLIB_0.17.3@TELEPATHY_GLIB_0.17.3 0.17.3 TELEPATHY_GLIB_0.17.5@TELEPATHY_GLIB_0.17.5 0.17.5 + TELEPATHY_GLIB_0.17.6@TELEPATHY_GLIB_0.17.6 0.17.6 TELEPATHY_GLIB_0.7.0@TELEPATHY_GLIB_0.7.0 0.7.1 TELEPATHY_GLIB_0.7.10@TELEPATHY_GLIB_0.7.10 0.7.10 TELEPATHY_GLIB_0.7.12@TELEPATHY_GLIB_0.7.12 0.7.12 @@ -105,6 +106,11 @@ tp_account_channel_request_set_delegate_to_preferred_handler@TELEPATHY_GLIB_0.15.3 0.15.3 tp_account_channel_request_set_delegated_channel_callback@TELEPATHY_GLIB_0.15.3 0.15.3 tp_account_channel_request_set_hints@TELEPATHY_GLIB_0.13.14 0.13.14 + tp_account_dup_detailed_error_vardict@TELEPATHY_GLIB_0.17.6 0.17.6 + tp_account_dup_parameters_vardict@TELEPATHY_GLIB_0.17.6 0.17.6 + tp_account_dup_storage_identifier_variant@TELEPATHY_GLIB_0.17.6 0.17.6 + tp_account_dup_storage_specific_information_vardict_async@TELEPATHY_GLIB_0.17.6 0.17.6 + tp_account_dup_storage_specific_information_vardict_finish@TELEPATHY_GLIB_0.17.6 0.17.6 tp_account_ensure_connection@TELEPATHY_GLIB_0.9.0 0.9.0 tp_account_get_automatic_presence@TELEPATHY_GLIB_0.13.8 0.13.8 tp_account_get_avatar_async@TELEPATHY_GLIB_0.9.0 0.9.0 @@ -189,6 +195,8 @@ tp_account_set_uri_scheme_association_finish@TELEPATHY_GLIB_0.13.8 0.13.8 tp_account_update_parameters_async@TELEPATHY_GLIB_0.9.0 0.9.0 tp_account_update_parameters_finish@TELEPATHY_GLIB_0.9.0 0.9.0 + tp_account_update_parameters_vardict_async@TELEPATHY_GLIB_0.17.6 0.17.6 + tp_account_update_parameters_vardict_finish@TELEPATHY_GLIB_0.17.6 0.17.6 tp_add_dispatch_operation_context_accept@TELEPATHY_GLIB_0.11.5 0.11.5 tp_add_dispatch_operation_context_delay@TELEPATHY_GLIB_0.11.5 0.11.5 tp_add_dispatch_operation_context_fail@TELEPATHY_GLIB_0.11.5 0.11.5 @@ -404,6 +412,7 @@ tp_base_contact_list_unpublish_finish@TELEPATHY_GLIB_0.13.0 0.13.0 tp_base_contact_list_unsubscribe_async@TELEPATHY_GLIB_0.13.0 0.13.0 tp_base_contact_list_unsubscribe_finish@TELEPATHY_GLIB_0.13.0 0.13.0 + tp_base_media_call_channel_get_local_hold_state@TELEPATHY_GLIB_0.17.6 0.17.6 tp_base_media_call_channel_get_type@TELEPATHY_GLIB_0.17.5 0.17.5 tp_base_media_call_content_get_local_media_description@TELEPATHY_GLIB_0.17.5 0.17.5 tp_base_media_call_content_get_type@TELEPATHY_GLIB_0.17.5 0.17.5 @@ -456,9 +465,12 @@ tp_call_channel_hangup_finish@TELEPATHY_GLIB_0.17.5 0.17.5 tp_call_channel_has_dtmf@TELEPATHY_GLIB_0.17.5 0.17.5 tp_call_channel_has_hardware_streaming@TELEPATHY_GLIB_0.17.5 0.17.5 + tp_call_channel_has_hold@TELEPATHY_GLIB_0.17.6 0.17.6 tp_call_channel_has_initial_audio@TELEPATHY_GLIB_0.17.5 0.17.5 tp_call_channel_has_initial_video@TELEPATHY_GLIB_0.17.5 0.17.5 tp_call_channel_has_mutable_contents@TELEPATHY_GLIB_0.17.5 0.17.5 + tp_call_channel_request_hold_async@TELEPATHY_GLIB_0.17.6 0.17.6 + tp_call_channel_request_hold_finish@TELEPATHY_GLIB_0.17.6 0.17.6 tp_call_channel_send_tones_async@TELEPATHY_GLIB_0.17.5 0.17.5 tp_call_channel_send_tones_finish@TELEPATHY_GLIB_0.17.5 0.17.5 tp_call_channel_set_queued_async@TELEPATHY_GLIB_0.17.5 0.17.5 @@ -472,6 +484,11 @@ tp_call_content_get_streams@TELEPATHY_GLIB_0.17.5 0.17.5 tp_call_content_get_type@TELEPATHY_GLIB_0.17.5 0.17.5 tp_call_content_init_known_interfaces@TELEPATHY_GLIB_0.17.5 0.17.5 + tp_call_content_media_description_add_rtcp_extended_reports_interface@TELEPATHY_GLIB_0.17.6 0.17.6 + tp_call_content_media_description_add_rtcp_feedback_interface@TELEPATHY_GLIB_0.17.6 0.17.6 + tp_call_content_media_description_add_rtcp_feedback_message@TELEPATHY_GLIB_0.17.6 0.17.6 + tp_call_content_media_description_add_rtp_header_extension@TELEPATHY_GLIB_0.17.6 0.17.6 + tp_call_content_media_description_add_rtp_header_extensions_interface@TELEPATHY_GLIB_0.17.6 0.17.6 tp_call_content_media_description_add_ssrc@TELEPATHY_GLIB_0.17.5 0.17.5 tp_call_content_media_description_append_codec@TELEPATHY_GLIB_0.17.5 0.17.5 tp_call_content_media_description_get_object_path@TELEPATHY_GLIB_0.17.5 0.17.5 @@ -479,6 +496,9 @@ tp_call_content_media_description_get_type@TELEPATHY_GLIB_0.17.5 0.17.5 tp_call_content_media_description_init_known_interfaces@TELEPATHY_GLIB_0.17.5 0.17.5 tp_call_content_media_description_new@TELEPATHY_GLIB_0.17.5 0.17.5 + tp_call_content_media_description_set_does_avpf@TELEPATHY_GLIB_0.17.6 0.17.6 + tp_call_content_media_description_set_rtcp_extended_reports@TELEPATHY_GLIB_0.17.6 0.17.6 + tp_call_content_media_description_set_rtcp_feedback_minimum_interval@TELEPATHY_GLIB_0.17.6 0.17.6 tp_call_content_remove_async@TELEPATHY_GLIB_0.17.5 0.17.5 tp_call_content_remove_finish@TELEPATHY_GLIB_0.17.5 0.17.5 tp_call_content_send_tones_async@TELEPATHY_GLIB_0.17.5 0.17.5 @@ -505,8 +525,11 @@ tp_capabilities_get_channel_classes@TELEPATHY_GLIB_0.11.3 0.11.3 tp_capabilities_get_type@TELEPATHY_GLIB_0.11.3 0.11.3 tp_capabilities_is_specific_to_contact@TELEPATHY_GLIB_0.11.3 0.11.3 + tp_capabilities_supports_audio_call@TELEPATHY_GLIB_0.17.6 0.17.6 + tp_capabilities_supports_audio_video_call@TELEPATHY_GLIB_0.17.6 0.17.6 tp_capabilities_supports_contact_search@TELEPATHY_GLIB_0.13.11 0.13.11 tp_capabilities_supports_dbus_tubes@TELEPATHY_GLIB_0.13.0 0.13.0 + tp_capabilities_supports_file_transfer@TELEPATHY_GLIB_0.17.6 0.17.6 tp_capabilities_supports_room_list@TELEPATHY_GLIB_0.13.14 0.13.14 tp_capabilities_supports_stream_tubes@TELEPATHY_GLIB_0.13.0 0.13.0 tp_capabilities_supports_text_chatrooms@TELEPATHY_GLIB_0.11.3 0.11.3 @@ -1279,6 +1302,7 @@ tp_connection_manager_check_valid_name@TELEPATHY_GLIB_0.7.1 0.7.1 tp_connection_manager_check_valid_protocol_name@TELEPATHY_GLIB_0.7.1 0.7.1 tp_connection_manager_dup_protocol_names@TELEPATHY_GLIB_0.7.26 0.7.26 + tp_connection_manager_dup_protocols@TELEPATHY_GLIB_0.17.6 0.17.6 tp_connection_manager_get_feature_quark_core@TELEPATHY_GLIB_0.11.3 0.11.3 tp_connection_manager_get_info_source@TELEPATHY_GLIB_0.7.26 0.7.26 tp_connection_manager_get_name@TELEPATHY_GLIB_0.7.26 0.7.26 @@ -1739,6 +1763,8 @@ tp_intset_union@TELEPATHY_GLIB_0.7.0 0.7.1 tp_intset_union_update@TELEPATHY_GLIB_0.13.10 0.13.10 tp_list_connection_managers@TELEPATHY_GLIB_0.7.1 0.7.1 + tp_list_connection_managers_async@TELEPATHY_GLIB_0.17.6 0.17.6 + tp_list_connection_managers_finish@TELEPATHY_GLIB_0.17.6 0.17.6 tp_list_connection_names@TELEPATHY_GLIB_0.7.1 0.7.1 tp_media_session_handler_get_type@TELEPATHY_GLIB_0.7.1 0.7.1 tp_media_session_handler_init_known_interfaces@TELEPATHY_GLIB_0.7.32 0.7.32 @@ -1838,8 +1864,11 @@ tp_properties_mixin_list_properties@TELEPATHY_GLIB_0.7.0 0.7.1 tp_properties_mixin_set_properties@TELEPATHY_GLIB_0.7.0 0.7.1 tp_protocol_addressing_get_type@TELEPATHY_GLIB_0.17.2 0.17.2 + tp_protocol_borrow_params@TELEPATHY_GLIB_0.17.6 0.17.6 tp_protocol_can_register@TELEPATHY_GLIB_0.11.11 0.11.11 + tp_protocol_dup_param@TELEPATHY_GLIB_0.17.6 0.17.6 tp_protocol_dup_param_names@TELEPATHY_GLIB_0.11.11 0.11.11 + tp_protocol_dup_params@TELEPATHY_GLIB_0.17.6 0.17.6 tp_protocol_get_authentication_types@TELEPATHY_GLIB_0.13.9 0.13.9 tp_protocol_get_avatar_requirements@TELEPATHY_GLIB_0.15.6 0.15.6 tp_protocol_get_capabilities@TELEPATHY_GLIB_0.11.11 0.11.11 diff -Nru telepathy-glib-0.17.5/depcomp telepathy-glib-0.17.6/depcomp --- telepathy-glib-0.17.5/depcomp 2012-02-01 12:09:15.000000000 +0000 +++ telepathy-glib-0.17.6/depcomp 2012-01-12 14:34:17.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2011-12-04.11; # UTC +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free +# Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ object Object file output by `PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputting dependencies. + tmpdepfile Temporary file to use when outputing dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -90,18 +90,10 @@ # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' + cygpath_u="sed s,\\\\\\\\,/,g" depmode=msvisualcpp fi -if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 -fi - case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -166,12 +158,10 @@ ' < "$tmpdepfile" | ## Some versions of gcc put a space before the `:'. On the theory ## that the space means something, we add a space to the output as -## well. hp depmode also adds that space, but also prefixes the VPATH -## to the object. Take care to not repeat it in the output. +## well. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -415,52 +405,6 @@ rm -f "$tmpdepfile" ;; -msvc7) - if test "$libtool" = yes; then - showIncludes=-Wc,-showIncludes - else - showIncludes=-showIncludes - fi - "$@" $showIncludes > "$tmpdepfile" - stat=$? - grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - # The first sed program below extracts the file names and escapes - # backslashes for cygpath. The second sed program outputs the file - # name when reading, but also accumulates all include files in the - # hold buffer in order to output them again at the end. This only - # works with sed implementations that can handle large buffers. - sed < "$tmpdepfile" -n ' -/^Note: including file: *\(.*\)/ { - s//\1/ - s/\\/\\\\/g - p -}' | $cygpath_u | sort -u | sed -n ' -s/ /\\ /g -s/\(.*\)/ \1 \\/p -s/.\(.*\) \\/\1:/ -H -$ { - s/.*/ / - G - p -}' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvc7msys) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -559,9 +503,7 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - # makedepend may prepend the VPATH from the source file name to the object. - # No need to regex-escape $object, excess matching of '.' is harmless. - sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + cat < "$tmpdepfile" > "$depfile" sed '1,2d' "$tmpdepfile" | tr ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation diff -Nru telepathy-glib-0.17.5/docs/Makefile.in telepathy-glib-0.17.6/docs/Makefile.in --- telepathy-glib-0.17.5/docs/Makefile.in 2012-02-20 17:31:08.000000000 +0000 +++ telepathy-glib-0.17.6/docs/Makefile.in 2012-03-19 15:34:29.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -50,11 +50,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -516,15 +516,10 @@ installcheck: installcheck-recursive install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru telepathy-glib-0.17.5/docs/reference/html/index.html telepathy-glib-0.17.6/docs/reference/html/index.html --- telepathy-glib-0.17.5/docs/reference/html/index.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/index.html 2012-03-19 15:38:21.000000000 +0000 @@ -15,7 +15,7 @@

- This manual documents telepathy-glib version 0.17.5 + This manual documents telepathy-glib version 0.17.6 . The latest development version of this documentation can be found here: online copy of the telepathy-glib API Reference Manual. diff -Nru telepathy-glib-0.17.5/docs/reference/html/index.sgml telepathy-glib-0.17.6/docs/reference/html/index.sgml --- telepathy-glib-0.17.5/docs/reference/html/index.sgml 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/index.sgml 2012-03-19 15:38:21.000000000 +0000 @@ -1617,6 +1617,8 @@ + + @@ -1634,6 +1636,7 @@ + @@ -1692,8 +1695,11 @@ + + + @@ -2031,6 +2037,9 @@ + + + @@ -3117,6 +3126,8 @@ + + @@ -3135,11 +3146,13 @@ + + @@ -3163,9 +3176,12 @@ + + + @@ -3207,6 +3223,7 @@ + @@ -3644,6 +3661,7 @@ + @@ -3656,10 +3674,14 @@ + + + + @@ -3694,6 +3716,7 @@ + @@ -3725,6 +3748,7 @@ + @@ -6079,6 +6103,7 @@ + @@ -6151,15 +6176,33 @@ + + + + + + + + + + + + + + + + + + @@ -6182,7 +6225,9 @@ + + diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-account-channel-request.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-account-channel-request.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-account-channel-request.html 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-account-channel-request.html 2012-03-19 15:38:21.000000000 +0000 @@ -50,10 +50,10 @@ TpAccountChannelRequest * tp_account_channel_request_new (TpAccount *account, GHashTable *request, - gint64 user_action_time); + gint64 user_action_time); GHashTable * tp_account_channel_request_get_request (TpAccountChannelRequest *self); -gint64 tp_account_channel_request_get_user_action_time +gint64 tp_account_channel_request_get_user_action_time (TpAccountChannelRequest *self); TpAccount * tp_account_channel_request_get_account (TpAccountChannelRequest *self); @@ -152,7 +152,7 @@ "account" TpAccount* : Read / Write / Construct Only "channel-request" TpChannelRequest* : Read "request" GHashTable_gchararray+GValue_* : Read / Write / Construct Only - "user-action-time" gint64 : Read / Write / Construct Only + "user-action-time" gint64 : Read / Write / Construct Only

@@ -196,7 +196,7 @@ 
TpAccountChannelRequest * tp_account_channel_request_new
                                                         (TpAccount *account,
                                                          GHashTable *request,
-                                                         gint64 user_action_time);
+ gint64 user_action_time);

Convenience function to create a new TpAccountChannelRequest object.

@@ -257,7 +257,7 @@

tp_account_channel_request_get_user_action_time ()

-
gint64              tp_account_channel_request_get_user_action_time
+
gint64              tp_account_channel_request_get_user_action_time
                                                         (TpAccountChannelRequest *self);

 

 Return the "user-action-time" construct-only property
@@ -339,7 +339,7 @@
 
 
 
cancellable :

-optional GCancellable object, NULL to ignore
+optional GCancellable object, NULL to ignore
 
 
 
callback :

@@ -390,7 +390,7 @@
 
 
context :

 pointer used to return a
-reference to the context of the HandleChannels() call, or NULL. [out][allow-none][transfer full]
+reference to the context of the HandleChannels() call, or NULL. [out][allow-none][transfer full]
 
 
 
@@ -400,7 +400,7 @@
 
 
Returns :

 a new reference on a TpChannel if the
-channel was successfully created and you are handling it, otherwise NULL. [transfer full][allow-none]
+channel was successfully created and you are handling it, otherwise NULL. [transfer full][allow-none]
 
 
 
@@ -447,7 +447,7 @@
 
 
 
cancellable :

-optional GCancellable object, NULL to ignore
+optional GCancellable object, NULL to ignore
 
 
 
callback :

@@ -502,7 +502,7 @@
 
 
context :

 pointer used to return a
-reference to the context of the HandleChannels() call, or NULL. [out][allow-none][transfer full]
+reference to the context of the HandleChannels() call, or NULL. [out][allow-none][transfer full]
 
 
 
@@ -512,7 +512,7 @@
 
 
Returns :

 a new reference on a TpChannel if the
-channel was successfully created and you are handling it, otherwise NULL. [transfer full][allow-none]
+channel was successfully created and you are handling it, otherwise NULL. [transfer full][allow-none]
 
 
 
@@ -549,11 +549,11 @@
 
preferred_handler :

 Either the well-known bus name (starting with
 TP_CLIENT_BUS_NAME_BASE) of the preferred handler for the channel,
-or NULL to indicate that any handler would be acceptable.
+or NULL to indicate that any handler would be acceptable.
 
 
 
cancellable :

-optional GCancellable object, NULL to ignore
+optional GCancellable object, NULL to ignore
 
 
 
callback :

@@ -647,11 +647,11 @@
 
preferred_handler :

 Either the well-known bus name (starting with
 TP_CLIENT_BUS_NAME_BASE) of the preferred handler for the channel,
-or NULL to indicate that any handler would be acceptable.
+or NULL to indicate that any handler would be acceptable.
 
 
 
cancellable :

-optional GCancellable object, NULL to ignore
+optional GCancellable object, NULL to ignore
 
 
 
callback :

@@ -739,11 +739,11 @@
 
preferred_handler :

 Either the well-known bus name (starting with
 TP_CLIENT_BUS_NAME_BASE) of the preferred handler for the channel,
-or NULL to indicate that any handler would be acceptable.
+or NULL to indicate that any handler would be acceptable.
 
 
 
cancellable :

-optional GCancellable object, NULL to ignore
+optional GCancellable object, NULL to ignore
 
 
 
callback :

@@ -789,7 +789,7 @@
 
 
Returns :

 a newly created TpChannel if the channel was
-successfully created and dispatched, otherwise NULL. [transfer full]
+successfully created and dispatched, otherwise NULL. [transfer full]
 
 
 
@@ -839,11 +839,11 @@
 
preferred_handler :

 Either the well-known bus name (starting with
 TP_CLIENT_BUS_NAME_BASE) of the preferred handler for the channel,
-or NULL to indicate that any handler would be acceptable.
+or NULL to indicate that any handler would be acceptable.
 
 
 
cancellable :

-optional GCancellable object, NULL to ignore
+optional GCancellable object, NULL to ignore
 
 
 
callback :

@@ -889,7 +889,7 @@
 
 
Returns :

 a newly created TpChannel if the channel was
-successfully ensure and (re-)dispatched, otherwise NULL. [transfer full]
+successfully ensure and (re-)dispatched, otherwise NULL. [transfer full]
 
 
 
@@ -1096,7 +1096,7 @@
 
 
callback :

 function called the channel requested using self is
-delegated, may not be NULL
+delegated, may not be NULL
 
 
 
@@ -1123,7 +1123,7 @@
 Read-only except during construction.
 

 

-This property can't be NULL.
+This property can't be NULL.
 

 
Since 0.11.12
@@ -1132,7 +1132,7 @@

The "channel-request" property

  "channel-request"          TpChannelRequest*     : Read

-The TpChannelRequest used to request the channel, or NULL if the +The TpChannelRequest used to request the channel, or NULL if the channel has not be requested yet.

@@ -1159,14 +1159,14 @@ GHashTable where the keys are strings and the values are GValue.

-This property can't be NULL. +This property can't be NULL.

Since 0.11.12

The "user-action-time" property

-
  "user-action-time"         gint64                : Read / Write / Construct Only
+
  "user-action-time"         gint64                : Read / Write / Construct Only

The user action time that will be passed to the channel dispatcher when requesting the channel. @@ -1207,7 +1207,7 @@

The "re-handled" signal

void                user_function                      (TpAccountChannelRequest *self,
                                                         TpChannel               *channel,
-                                                        gint64                   user_action_time,
+                                                        gint64                   user_action_time,
                                                         TpHandleChannelsContext *context,
                                                         gpointer                 user_data)             : Has Details

diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-account.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-account.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-account.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-account.html 2012-03-19 15:38:21.000000000 +0000 @@ -91,6 +91,17 @@ GAsyncResult *result, gchar ***reconnect_required, GError **error); +void tp_account_update_parameters_vardict_async + (TpAccount *account, + GVariant *parameters, + const gchar **unset_parameters, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean tp_account_update_parameters_vardict_finish + (TpAccount *account, + GAsyncResult *result, + gchar ***reconnect_required, + GError **error); void tp_account_remove_async (TpAccount *account, GAsyncReadyCallback callback, gpointer user_data); @@ -154,6 +165,9 @@ TpConnectionStatusReason *reason); const gchar * tp_account_get_detailed_error (TpAccount *self, const GHashTable **details); +gchar * tp_account_dup_detailed_error_vardict + (TpAccount *self, + GVariant **details); gboolean tp_account_get_changing_presence (TpAccount *self); TpConnectionPresenceType tp_account_get_current_presence (TpAccount *account, @@ -168,6 +182,7 @@ gchar **status, gchar **status_message); const GHashTable * tp_account_get_parameters (TpAccount *account); +GVariant * tp_account_dup_parameters_vardict (TpAccount *account); const gchar * tp_account_get_nickname (TpAccount *account); void tp_account_set_nickname_async (TpAccount *account, const gchar *nickname, @@ -186,7 +201,7 @@ GError **error); void tp_account_set_avatar_async (TpAccount *self, const guchar *avatar, - gsize len, + gsize len, const gchar *mime_type, GAsyncReadyCallback callback, gpointer user_data); @@ -230,6 +245,8 @@ #define TP_ACCOUNT_FEATURE_STORAGE const gchar * tp_account_get_storage_provider (TpAccount *self); const GValue * tp_account_get_storage_identifier (TpAccount *self); +GVariant * tp_account_dup_storage_identifier_variant + (TpAccount *self); TpStorageRestrictionFlags tp_account_get_storage_restrictions (TpAccount *self); void tp_account_get_storage_specific_information_async @@ -240,6 +257,14 @@ (TpAccount *self, GAsyncResult *result, GError **error); +void tp_account_dup_storage_specific_information_vardict_async + (TpAccount *self, + GAsyncReadyCallback callback, + gpointer user_data); +GVariant * tp_account_dup_storage_specific_information_vardict_finish + (TpAccount *self, + GAsyncResult *result, + GError **error); void (*tp_cli_account_callback_for_reconnect) @@ -368,6 +393,7 @@ "requested-status-message" gchar* : Read "service" gchar* : Read "storage-identifier" GValue* : Read + "storage-identifier-variant" GVariant* : Read "storage-provider" gchar* : Read "storage-restrictions" guint : Read "supersedes" GStrv : Read @@ -447,7 +473,7 @@

Returns :

-a new reference to an account proxy, or NULL if object_path is +a new reference to an account proxy, or NULL if object_path is not valid @@ -482,8 +508,8 @@ protocol name, as defined in the Account specification.

-Any of the out parameters may be NULL if not needed. If TRUE is returned, -the caller is responsible for freeing the strings stored in any non-NULL +Any of the out parameters may be NULL if not needed. If TRUE is returned, +the caller is responsible for freeing the strings stored in any non-NULL out parameters, using g_free().

@@ -612,7 +638,7 @@ - @@ -1012,6 +1038,102 @@
+

tp_account_update_parameters_vardict_async ()

+
void                tp_account_update_parameters_vardict_async
+                                                        (TpAccount *account,
+                                                         GVariant *parameters,
+                                                         const gchar **unset_parameters,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+

+Requests an asynchronous update of parameters of account. When the +operation is finished, callback will be called. You can then call +tp_account_update_parameters_finish() to get the result of the operation. +

+

+If parameters is a floating reference (see g_variant_ref_sink()), +ownership of parameters is taken by this function. This means +you can pass the result of g_variant_new() or g_variant_new_parsed() +directly to this function without additional reference-count management. +

+

Returns :

the connection of the account, or NULL if either +the connection of the account, or NULL if either the object path path is invalid or it is the null-value "/". [transfer none]
++ + + + + + + + + + + + + + + + + + + + + + +

account :

a TpAccount +

parameters :

a variant of type G_VARIANT_TYPE_VARDICT +containing new parameters to set on account. [transfer none] +

unset_parameters :

list of parameters to unset on account +

callback :

a callback to call when the request is satisfied

user_data :

data to pass to callback +
+

Since 0.UNRELEASED

+
+
+
+

tp_account_update_parameters_vardict_finish ()

+
gboolean            tp_account_update_parameters_vardict_finish
+                                                        (TpAccount *account,
+                                                         GAsyncResult *result,
+                                                         gchar ***reconnect_required,
+                                                         GError **error);
+

+Finishes an async update of the parameters on account. +

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

account :

a TpAccount +

result :

a GAsyncResult +

reconnect_required :

a GStrv to +fill with properties that need a reconnect to take effect. [out][type GObject.Strv][transfer full] +

error :

a GError to fill

Returns :

 +TRUE if the request succeeded, otherwise FALSE +
+

Since 0.UNRELEASED

+
+
+

tp_account_remove_async ()

void                tp_account_remove_async             (TpAccount *account,
                                                          GAsyncReadyCallback callback,
@@ -1100,7 +1222,7 @@
 
 
 
display_name :

-a new display name, or NULL to unset the display name
+a new display name, or NULL to unset the display name
 
 
 
callback :

@@ -1173,7 +1295,7 @@
 
 
 
icon_name :

-a new icon name, or NULL to unset the icon name
+a new icon name, or NULL to unset the icon name
 
 
 
callback :

@@ -1246,7 +1368,7 @@
 
 
 
service :

-a new service name, or NULL or the empty string to unset the
+a new service name, or NULL or the empty string to unset the
 service name (which will result in the "service" property
 becoming the same as "protocol")
 
@@ -1327,12 +1449,12 @@
 
 
 
status :

-a status message to set, or NULL
+a status message to set, or NULL
 
 
 
 
message :

-a message for the change, or NULL
+a message for the change, or NULL
 
 
 
@@ -1414,12 +1536,12 @@
 
 
 
status :

-a status message to set, or NULL
+a status message to set, or NULL
 
 
 
 
message :

-a message for the change, or NULL
+a message for the change, or NULL
 
 
 
@@ -1616,7 +1738,7 @@
 
 
 
reason :

-a TpConnectionStatusReason to fill, or NULL. [out]
+a TpConnectionStatusReason to fill, or NULL. [out]
 
 
 
@@ -1639,11 +1761,11 @@
 This is the same as "connection-error".
 

 

-If details is not NULL, it will be used to return additional details about
+If details is not NULL, it will be used to return additional details about
 the error (the same as "connection-error-details").
 

 

-Otherwise, return NULL, without altering details.
+Otherwise, return NULL, without altering details.
 

 

 The returned string and details may become invalid when the main loop is
@@ -1664,7 +1786,7 @@
 
 
 
Returns :

-a D-Bus error name, or NULL. [transfer none][allow-none]
+a D-Bus error name, or NULL. [transfer none][allow-none]
 
 
 
@@ -1673,6 +1795,51 @@
+

tp_account_dup_detailed_error_vardict ()

+
gchar *             tp_account_dup_detailed_error_vardict
+                                                        (TpAccount *self,
+                                                         GVariant **details);
+

+If the account's connection is not connected, return the D-Bus error name +with which it last disconnected or failed to connect (in particular, this +is TP_ERROR_STR_CANCELLED if it was disconnected by a user request). +This is the same as "connection-error". +

+

+If details is not NULL, it will be used to return additional details about +the error (the same as "connection-error-details"). +

+

+Otherwise, return NULL, without altering details. +

+

+The returned string and details may become invalid when the main loop is +re-entered or the account is destroyed. +

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

self :

an account

details :

optionally used to return a variant of type G_VARIANT_TYPE_VARDICT, +which must be unreffed by the caller with g_variant_unref(). [out][allow-none][transfer full] +

Returns :

a D-Bus error name, or NULL. [transfer full][allow-none] +
+

Since 0.UNRELEASED

+
+
+

tp_account_get_changing_presence ()

gboolean            tp_account_get_changing_presence    (TpAccount *self);

@@ -1851,6 +2018,43 @@

+

tp_account_dup_parameters_vardict ()

+
GVariant *          tp_account_dup_parameters_vardict   (TpAccount *account);
+

+Returns the parameters of the account, in a variant of type +G_VARIANT_TYPE_VARDICT where the keys +are parameter names (account, password, require-encryption etc.). +Use g_variant_lookup() or g_variant_lookup_value() for convenient +access to the values. +

+

+The allowed parameters depend on the connection manager, and can be found +via tp_connection_manager_get_protocol() and +tp_connection_manager_protocol_get_param(). Well-known parameters are +listed +in +the Telepathy D-Bus Interface Specification. +

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

account :

a TpAccount +

Returns :

the dictionary of +parameters on account, of type G_VARIANT_TYPE_VARDICT. [transfer full] +
+

Since 0.UNRELEASED

+
+
+

tp_account_get_nickname ()

const gchar *       tp_account_get_nickname             (TpAccount *account);

@@ -2064,7 +2268,7 @@

Returns :

a GArray of guchar -containing the bytes of the account's avatar, or NULL on failure. [element-type guchar][transfer none] +containing the bytes of the account's avatar, or NULL on failure. [element-type guchar][transfer none] @@ -2076,7 +2280,7 @@

tp_account_set_avatar_async ()

void                tp_account_set_avatar_async         (TpAccount *self,
                                                          const guchar *avatar,
-                                                         gsize len,
+                                                         gsize len,
                                                          const gchar *mime_type,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);
@@ -2098,7 +2302,7 @@

avatar :

-a new avatar to set; can be NULL +a new avatar to set; can be NULL only if len equals 0. [allow-none][array length=len] @@ -2108,7 +2312,7 @@

mime_type :

-the MIME type of the new avatar; can be NULL +the MIME type of the new avatar; can be NULL only if len equals 0. [allow-none] @@ -2248,7 +2452,7 @@

When this feature is prepared, it is guaranteed that "connection" -will always be either NULL or prepared. If the account was created using a +will always be either NULL or prepared. If the account was created using a TpSimpleClientFactory, the same factory will be used to create TpConnection object and to determine desired connection features. Change notification of "connection" property will be delayed until all features (at least @@ -2309,13 +2513,13 @@ operation.

-If features is NULL, then callback will be called when the implied +If features is NULL, then callback will be called when the implied TP_ACCOUNT_FEATURE_CORE feature is ready.

-If NULL is given to callback, then no callback will be called when the +If NULL is given to callback, then no callback will be called when the operation is finished. Instead, it will simply set features on manager. -Note that if callback is NULL, then user_data must also be NULL. +Note that if callback is NULL, then user_data must also be NULL.

Since 0.11.3, this is equivalent to calling the new function @@ -2331,7 +2535,7 @@

features :

-a 0-terminated list of features, or NULL +a 0-terminated list of features, or NULL @@ -2412,7 +2616,7 @@

If the TP_ACCOUNT_FEATURE_ADDRESSING feature has been prepared successfully, return a list of additional URI schemes for which this -account should be used if possible. Otherwise return NULL. +account should be used if possible. Otherwise return NULL.

For instance, a SIP or Skype account might have "tel" in this list if the @@ -2433,7 +2637,7 @@

Returns :

-a list of URI schemes, or NULL. [transfer none] +a list of URI schemes, or NULL. [transfer none] @@ -2508,7 +2712,7 @@

scheme :

-a non-NULL URI scheme such as "tel" +a non-NULL URI scheme such as "tel"

associate :

@@ -2631,6 +2835,36 @@
+

tp_account_dup_storage_identifier_variant ()

+
GVariant *          tp_account_dup_storage_identifier_variant
+                                                        (TpAccount *self);
+

+Return provider-specific information used to identify this +account. Use g_variant_get_type() to check that the type +is what you expect; for instance, if the +"storage-provider" has string-based user identifiers, +this variant should have type G_VARIANT_TYPE_STRING. +

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

self :

a TpAccount +

Returns :

the same as the +"storage-identifier-variant" property. [transfer full] +
+

Since 0.13.2

+
+
+

tp_account_get_storage_restrictions ()

TpStorageRestrictionFlags tp_account_get_storage_restrictions
                                                         (TpAccount *self);
@@ -2734,6 +2968,81 @@
+

tp_account_dup_storage_specific_information_vardict_async ()

+
void                tp_account_dup_storage_specific_information_vardict_async
+                                                        (TpAccount *self,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+

+Makes an asynchronous request of self's StorageSpecificInformation +property (part of the Account.Interface.Storage interface). +

+

+When the operation is finished, callback will be called. You must then +call tp_account_dup_storage_specific_information_vardict_finish() to get the +result of the request. +

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

self :

a TpAccount +

callback :

a callback to call when the request is satisfied

user_data :

data to pass to callback +
+

Since 0.UNRELEASED

+
+
+
+

tp_account_dup_storage_specific_information_vardict_finish ()

+
GVariant *          tp_account_dup_storage_specific_information_vardict_finish
+                                                        (TpAccount *self,
+                                                         GAsyncResult *result,
+                                                         GError **error);
+

+Retrieve the value of the request begun with +tp_account_dup_storage_specific_information_vardict_async(). +

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

self :

a TpAccount +

result :

a GAsyncResult +

error :

a GError to fill

Returns :

a map from strings to variants, +of type G_VARIANT_TYPE_VARDICT. [transfer full] +
+

Since 0.13.2

+
+
+

tp_cli_account_callback_for_reconnect ()

void                (*tp_cli_account_callback_for_reconnect)
                                                         (TpAccount *proxy,
@@ -2754,7 +3063,7 @@
 
 
error :

 
-NULL on success, or an error on failure
+NULL on success, or an error on failure
 
 
 
user_data :

@@ -2798,28 +3107,28 @@
 
 
callback :

 called when the method call succeeds or fails;
-may be NULL to make a "fire and forget" call with no
+may be NULL to make a "fire and forget" call with no
 reply tracking
 
 
 
user_data :

 user-supplied data passed to the callback;
-must be NULL if callback is NULL
+must be NULL if callback is NULL
 
 
 
 
destroy :

 called with the user_data as argument, after the
 call has succeeded, failed or been cancelled;
-must be NULL if callback is NULL
+must be NULL if callback is NULL
 
 
 
 
weak_object :

-If not NULL, a GObject which will be
+If not NULL, a GObject which will be
 weakly referenced; if it is destroyed, this call
-will automatically be cancelled. Must be NULL if
-callback is NULL
+will automatically be cancelled. Must be NULL if
+callback is NULL
 
 
 
@@ -2854,7 +3163,7 @@
 
 
error :

 
-NULL on success, or an error on failure
+NULL on success, or an error on failure
 
 
 
user_data :

@@ -2898,28 +3207,28 @@
 
 
callback :

 called when the method call succeeds or fails;
-may be NULL to make a "fire and forget" call with no
+may be NULL to make a "fire and forget" call with no
 reply tracking
 
 
 
user_data :

 user-supplied data passed to the callback;
-must be NULL if callback is NULL
+must be NULL if callback is NULL
 
 
 
 
destroy :

 called with the user_data as argument, after the
 call has succeeded, failed or been cancelled;
-must be NULL if callback is NULL
+must be NULL if callback is NULL
 
 
 
 
weak_object :

-If not NULL, a GObject which will be
+If not NULL, a GObject which will be
 weakly referenced; if it is destroyed, this call
-will automatically be cancelled. Must be NULL if
-callback is NULL
+will automatically be cancelled. Must be NULL if
+callback is NULL
 
 
 
@@ -2954,12 +3263,12 @@
 
 
 
out_Reconnect_Required :

-Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml">           <p>If all of the updates could be applied to the active             <tp:member-ref>Connection</tp:member-ref> (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 <tt>...Cellular.<tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface.Cellular">MessageValidityPeriod</tp:dbus-ref></tt>,             the new value can be applied immediately to the connection.</p>            <p>Otherwise, a list of the names of parameters with changes that             will not take effect until the account is reconnected. User             interfaces that require &quot;instant apply&quot; semantics MAY call             <tp:member-ref>Reconnect</tp:member-ref> in response to receiving a             non-empty list. For example, if the caller updates both             <tt>...Anonymity.<tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface.Anonymity">AnonymityMandatory</tp:dbus-ref></tt>             and <tt>require-encryption</tt>, the former can be applied to the             current connection, but the latter needs a reconnect to take             effect, so this method should return             <code>[&quot;require-encryption&quot;]</code>.</p>
+Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml">           <p>If all of the updates could be applied to the active             <tp:member-ref>Connection</tp:member-ref> (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 <tt>...Cellular.<tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface.Cellular">MessageValidityPeriod</tp:dbus-ref></tt>,             the new value can be applied immediately to the connection.</p>            <p>Otherwise, a list of the names of parameters with changes that             will not take effect until the account is reconnected. User             interfaces that require &quot;instant apply&quot; semantics MAY call             <tp:member-ref>Reconnect</tp:member-ref> in response to receiving a             non-empty list. For example, if the caller updates both             <tt>...Anonymity.<tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface.Anonymity">AnonymityMandatory</tp:dbus-ref></tt>             and <tt>require-encryption</tt>, the former can be applied to the             current connection, but the latter needs a reconnect to take             effect, so this method should return             <code>[&quot;require-encryption&quot;]</code>.</p>
 
 
 
error :

 
-NULL on success, or an error on failure
+NULL on success, or an error on failure
 
 
 
user_data :

@@ -3014,28 +3323,28 @@
 
 
callback :

 called when the method call succeeds or fails;
-may be NULL to make a "fire and forget" call with no
+may be NULL to make a "fire and forget" call with no
 reply tracking
 
 
 
user_data :

 user-supplied data passed to the callback;
-must be NULL if callback is NULL
+must be NULL if callback is NULL
 
 
 
 
destroy :

 called with the user_data as argument, after the
 call has succeeded, failed or been cancelled;
-must be NULL if callback is NULL
+must be NULL if callback is NULL
 
 
 
 
weak_object :

-If not NULL, a GObject which will be
+If not NULL, a GObject which will be
 weakly referenced; if it is destroyed, this call
-will automatically be cancelled. Must be NULL if
-callback is NULL
+will automatically be cancelled. Must be NULL if
+callback is NULL
 
 
 
@@ -3118,7 +3427,7 @@
 
destroy :

 Destructor for the user-supplied data, which
 will be called when this signal is disconnected, or
-before this function returns NULL
+before this function returns NULL
 
 
 
@@ -3129,14 +3438,14 @@
 
 
 
error :

-If not NULL, used to raise an error if NULL is
+If not NULL, used to raise an error if NULL is
 returned
 
 
 
Returns :

 a TpProxySignalConnection containing all of the
 above, which can be used to disconnect the signal; or
-NULL if the proxy does not have the desired interface
+NULL if the proxy does not have the desired interface
 or has become invalid.
 
 
@@ -3207,7 +3516,7 @@
 
destroy :

 Destructor for the user-supplied data, which
 will be called when this signal is disconnected, or
-before this function returns NULL
+before this function returns NULL
 
 
 
@@ -3218,14 +3527,14 @@
 
 
 
error :

-If not NULL, used to raise an error if NULL is
+If not NULL, used to raise an error if NULL is
 returned
 
 
 
Returns :

 a TpProxySignalConnection containing all of the
 above, which can be used to disconnect the signal; or
-NULL if the proxy does not have the desired interface
+NULL if the proxy does not have the desired interface
 or has become invalid.
 
 
@@ -3296,7 +3605,7 @@
 
destroy :

 Destructor for the user-supplied data, which
 will be called when this signal is disconnected, or
-before this function returns NULL
+before this function returns NULL
 
 
 
@@ -3307,14 +3616,14 @@
 
 
 
error :

-If not NULL, used to raise an error if NULL is
+If not NULL, used to raise an error if NULL is
 returned
 
 
 
Returns :

 a TpProxySignalConnection containing all of the
 above, which can be used to disconnect the signal; or
-NULL if the proxy does not have the desired interface
+NULL if the proxy does not have the desired interface
 or has become invalid.
 
 
@@ -3342,7 +3651,7 @@
 
 
error :

 
-NULL on success, or an error on failure
+NULL on success, or an error on failure
 
 
 
user_data :

@@ -3397,28 +3706,28 @@
 
 
callback :

 called when the method call succeeds or fails;
-may be NULL to make a "fire and forget" call with no
+may be NULL to make a "fire and forget" call with no
 reply tracking
 
 
 
user_data :

 user-supplied data passed to the callback;
-must be NULL if callback is NULL
+must be NULL if callback is NULL
 
 
 
 
destroy :

 called with the user_data as argument, after the
 call has succeeded, failed or been cancelled;
-must be NULL if callback is NULL
+must be NULL if callback is NULL
 
 
 
 
weak_object :

-If not NULL, a GObject which will be
+If not NULL, a GObject which will be
 weakly referenced; if it is destroyed, this call
-will automatically be cancelled. Must be NULL if
-callback is NULL
+will automatically be cancelled. Must be NULL if
+callback is NULL
 
 
 
@@ -3480,7 +3789,7 @@
 

 This is not guaranteed to have been retrieved until
 tp_proxy_prepare_async() has finished; until then, the value is
-NULL.
+NULL.
 

 
Default value: NULL

 
Since 0.13.8

@@ -3503,7 +3812,7 @@
 

 This is not guaranteed to have been retrieved until
 tp_proxy_prepare_async() has finished; until then, the value is
-NULL.
+NULL.
 

 
Default value: NULL

 
Since 0.13.8

@@ -3558,7 +3867,7 @@
 
The "connection" property

 
  "connection"               TpConnection*         : Read

 

-The connection of the account, or NULL if account is offline.
+The connection of the account, or NULL if account is offline.
 Note that the returned TpConnection is not guaranteed to have any
 features pre-prepared (not even TP_CONNECTION_FEATURE_CORE) unless
 TP_ACCOUNT_FEATURE_CONNECTION has been prepared on the account
@@ -3572,7 +3881,7 @@
 

 This is not guaranteed to have been retrieved until
 tp_proxy_prepare_async() has finished; until then, the value is
-NULL.
+NULL.
 

 
Since 0.9.0
@@ -3583,7 +3892,7 @@

The D-Bus error name for the last disconnection or connection failure, (in particular, TP_ERROR_STR_CANCELLED if it was disconnected by user -request), or NULL if the account is connected. +request), or NULL if the account is connected.

One can receive change notifications on this property by connecting @@ -3594,7 +3903,7 @@

This is not guaranteed to have been retrieved until tp_proxy_prepare_async() has finished; until then, the value is -NULL. +NULL.

Default value: NULL

Since 0.11.7

@@ -3723,7 +4032,7 @@

This is not guaranteed to have been retrieved until tp_proxy_prepare_async() has finished; until then, the value is -NULL. +NULL.

Default value: NULL

Since 0.9.0

@@ -3745,7 +4054,7 @@

This is not guaranteed to have been retrieved until tp_proxy_prepare_async() has finished; until then, the value is -NULL. +NULL.

Default value: NULL

Since 0.9.0

@@ -3765,7 +4074,7 @@

This is not guaranteed to have been retrieved until tp_proxy_prepare_async() has finished; until then, the value is -NULL. +NULL.

Default value: NULL

Since 0.9.0

@@ -3825,7 +4134,7 @@

This is not guaranteed to have been retrieved until tp_proxy_prepare_async() has finished; until then, the value is -NULL. +NULL.

Default value: NULL

Since 0.9.0

@@ -3845,7 +4154,7 @@

This is not guaranteed to have been retrieved until tp_proxy_prepare_async() has finished; until then, the value is -NULL. +NULL.

Default value: NULL

Since 0.9.0

@@ -3867,7 +4176,7 @@

This is not guaranteed to have been retrieved until tp_proxy_prepare_async() has finished; until then, the value is -NULL. +NULL.

Default value: NULL

Since 0.13.8

@@ -3902,7 +4211,7 @@

This is not guaranteed to have been retrieved until tp_proxy_prepare_async() has finished; until then, the value is -NULL. +NULL.

Allowed values: <= 9

Default value: 0

@@ -3926,7 +4235,7 @@

This is not guaranteed to have been retrieved until tp_proxy_prepare_async() has finished; until then, the value is -NULL. +NULL.

Default value: NULL

Since 0.9.0

@@ -3949,7 +4258,7 @@

This is not guaranteed to have been retrieved until tp_proxy_prepare_async() has finished; until then, the value is -NULL. +NULL.

Default value: NULL

Since 0.9.0

@@ -3990,7 +4299,7 @@

A provider-specific variant type used to identify this account with the -provider. This value will be NULL if "storage-provider" is +provider. This value will be NULL if "storage-provider" is an empty string.

@@ -3999,8 +4308,33 @@

This is not guaranteed to have been retrieved until the TP_ACCOUNT_FEATURE_STORAGE feature has been prepared; until then, -the value is NULL. +the value is NULL. +

+

Since 0.13.2

+
+
+
+

The "storage-identifier-variant" property

+
  "storage-identifier-variant" GVariant*             : Read
+

+Provider-specific information used to identify this +account. Use g_variant_get_type() to check that the type +is what you expect. For instance, if you use a +"storage-provider" with numeric identifiers for accounts, +this variant might have type G_VARIANT_TYPE_UINT32; +if the storage provider has string-based identifiers, it should +have type G_VARIANT_TYPE_STRING. +

+

+This property cannot change once an Account has been created. +

+

+This is not guaranteed to have been retrieved until the +TP_ACCOUNT_FEATURE_STORAGE feature has been prepared; until then, +the value is NULL.

+

Allowed values: GVariant<*>

+

Default value: NULL

Since 0.13.2

@@ -4020,7 +4354,7 @@

This is not guaranteed to have been retrieved until the TP_ACCOUNT_FEATURE_STORAGE feature has been prepared; until then, -the value is NULL. +the value is NULL.

Default value: NULL

Since 0.13.2

@@ -4140,7 +4474,7 @@

The dbus_error_name and details parameters were present, but -non-functional (always NULL), in older versions. They have been +non-functional (always NULL), in older versions. They have been available with their current behaviour since version 0.11.7.

diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-account-manager.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-account-manager.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-account-manager.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-account-manager.html 2012-03-19 15:38:21.000000000 +0000 @@ -186,8 +186,212 @@
- - + + 
1
FIXME: MISSING XINCLUDE CONTENT
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
/*
+ * contact-list
+ *
+ * Copyright © 2011 Collabora Ltd. <http://www.collabora.co.uk/>
+ *
+ * Copying and distribution of this file, with or without modification,
+ * are permitted in any medium without royalty provided the copyright
+ * notice and this notice are preserved.
+ */
+
+#include "config.h"
+
+#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-glib/debug.h>
+
+static void
+account_manager_prepared_cb (GObject *object,
+    GAsyncResult *res,
+    gpointer user_data)
+{
+  TpAccountManager *manager = (TpAccountManager *) object;
+  GMainLoop *loop = user_data;  
+  GList *accounts;
+  GError *error = NULL;
+
+  if (!tp_proxy_prepare_finish (object, res, &error))
+    {
+      g_print ("Error preparing AM: %s\n", error->message);
+      goto OUT;
+    }
+
+  for (accounts = tp_account_manager_get_valid_accounts (manager);
+       accounts != NULL; accounts = g_list_delete_link (accounts, accounts))
+    {
+      TpAccount *account = accounts->data;
+      TpConnection *connection = tp_account_get_connection (account);
+      GPtrArray *contacts;
+      guint i;
+
+      /* Verify account is online and received its contact list. If state is not
+       * SUCCESS this means we didn't received the roster from server yet and
+       * we would have to wait for the "notify:contact-list-state" signal. */
+      if (connection == NULL ||
+          tp_connection_get_contact_list_state (connection) !=
+              TP_CONTACT_LIST_STATE_SUCCESS)
+        continue;
+
+      contacts = tp_connection_dup_contact_list (connection);
+      for (i = 0; i < contacts->len; i++)
+        {
+          TpContact *contact = g_ptr_array_index (contacts, i);
+          const gchar * const *groups;
+
+          g_print ("contact %s (%s) in groups:\n",
+              tp_contact_get_identifier (contact),
+              tp_contact_get_alias (contact));
+
+          for (groups = tp_contact_get_contact_groups (contact);
+               *groups != NULL; groups++)
+            g_print ("  %s\n", *groups);
+        }
+      g_ptr_array_unref (contacts);
+    }
+
+OUT:
+  g_main_loop_quit (loop);
+}
+
+int
+main (int argc,
+      char **argv)
+{
+  TpAccountManager *manager;
+  TpSimpleClientFactory *factory;
+  GMainLoop *loop;
+
+  g_type_init ();
+  tp_debug_set_flags (g_getenv ("EXAMPLE_DEBUG"));
+
+  loop = g_main_loop_new (NULL, FALSE);
+
+  manager = tp_account_manager_dup ();
+  factory = tp_proxy_get_factory (manager);
+  tp_simple_client_factory_add_account_features_varargs (factory,
+      TP_ACCOUNT_FEATURE_CONNECTION,
+      0);
+  tp_simple_client_factory_add_connection_features_varargs (factory,
+      TP_CONNECTION_FEATURE_CONTACT_LIST,
+      0);
+  tp_simple_client_factory_add_contact_features_varargs (factory,
+      TP_CONTACT_FEATURE_ALIAS,
+      TP_CONTACT_FEATURE_CONTACT_GROUPS,
+      TP_CONTACT_FEATURE_INVALID);
+
+  tp_proxy_prepare_async (manager, NULL, account_manager_prepared_cb, loop);
+
+  g_main_loop_run (loop);
+
+  g_object_unref (manager);
+  g_main_loop_unref (loop);
+
+  return 0;
+}
@@ -328,7 +532,7 @@

Returns :

an account manager proxy on the starter or session -bus, or NULL if it wasn't possible to get a dbus daemon proxy for +bus, or NULL if it wasn't possible to get a dbus daemon proxy for the appropriate bus. [transfer full] @@ -439,7 +643,7 @@

Returns :

a new TpAccount which was just created on -success, otherwise NULL. [transfer none] +success, otherwise NULL. [transfer none] @@ -482,7 +686,7 @@

Returns :

-a new TpAccount at path, or NULL if path is +a new TpAccount at path, or NULL if path is not a valid account path. [transfer none] @@ -512,9 +716,9 @@ 
1
 2
 3
- 
GList *accounts;
-account = tp_account_manager_get_valid_accounts (manager);
-g_list_foreach (accounts, (GFunc) g_object_ref, NULL);
+ 
GList *accounts;
+account = tp_account_manager_get_valid_accounts (manager);
+g_list_foreach (accounts, (GFunc) g_object_ref, NULL);
@@ -531,7 +735,7 @@ The list of valid accounts returned is not guaranteed to have been retrieved until TP_ACCOUNT_MANAGER_FEATURE_CORE is prepared (tp_proxy_prepare_async() has returned). Until this feature has -been prepared, an empty list (NULL) will be returned. +been prepared, an empty list (NULL) will be returned.

@@ -744,9 +948,9 @@ operation.

-If NULL is given to callback, then no callback will be called when the +If NULL is given to callback, then no callback will be called when the operation is finished. Instead, it will simply set features on manager. -Note that if callback is NULL, then user_data must also be NULL. +Note that if callback is NULL, then user_data must also be NULL.

In version 0.11.3 or later, this is equivalent to calling @@ -762,7 +966,7 @@

- @@ -840,12 +1044,12 @@ - + +NULL on success, or an error on failure @@ -915,28 +1119,28 @@ - @@ -1019,7 +1223,7 @@ @@ -1030,14 +1234,14 @@ - @@ -1118,7 +1322,7 @@ @@ -1129,14 +1333,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-add-dispatch-operation-context.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-add-dispatch-operation-context.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-add-dispatch-operation-context.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-add-dispatch-operation-context.html 2012-03-19 15:38:21.000000000 +0000 @@ -168,7 +168,7 @@ Read-only except during construction.

-This property can't be NULL. +This property can't be NULL.

Since 0.11.5

@@ -182,7 +182,7 @@ Read-only except during construction.

-This property can't be NULL. +This property can't be NULL.

Since 0.11.5

@@ -196,7 +196,7 @@ Read-only except during construction.

-This property can't be NULL. +This property can't be NULL.

Since 0.11.5

@@ -221,7 +221,7 @@ Read-only except during construction.

-This property can't be NULL. +This property can't be NULL.

Since 0.11.5

diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-asv.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-asv.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-asv.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-asv.html 2012-03-19 15:38:21.000000000 +0000 @@ -81,18 +81,18 @@ voidtp_asv_set_double (GHashTable *asv, const gchar *key, gdouble value); -gint32tp_asv_get_int32 (const GHashTable *asv, +gint32tp_asv_get_int32 (const GHashTable *asv, const gchar *key, gboolean *valid); voidtp_asv_set_int32 (GHashTable *asv, const gchar *key, - gint32 value); -gint64tp_asv_get_int64 (const GHashTable *asv, + gint32 value); +gint64tp_asv_get_int64 (const GHashTable *asv, const gchar *key, gboolean *valid); voidtp_asv_set_int64 (GHashTable *asv, const gchar *key, - gint64 value); + gint64 value); const gchar * tp_asv_get_object_path (const GHashTable *asv, const gchar *key); voidtp_asv_set_object_path (GHashTable *asv, @@ -120,18 +120,18 @@ voidtp_asv_set_strv (GHashTable *asv, const gchar *key, gchar **value); -guint32tp_asv_get_uint32 (const GHashTable *asv, +guint32tp_asv_get_uint32 (const GHashTable *asv, const gchar *key, gboolean *valid); voidtp_asv_set_uint32 (GHashTable *asv, const gchar *key, - guint32 value); -guint64tp_asv_get_uint64 (const GHashTable *asv, + guint32 value); +guint64tp_asv_get_uint64 (const GHashTable *asv, const gchar *key, gboolean *valid); voidtp_asv_set_uint64 (GHashTable *asv, const gchar *key, - guint64 value); + guint64 value); const GValue * tp_asv_lookup (const GHashTable *asv, const gchar *key); voidtp_asv_dump (GHashTable *asv); @@ -198,8 +198,8 @@ - +

features :

a 0-terminated list of features, or NULL +a 0-terminated list of features, or NULL

out_Account :

Used to return an 'out' argument if error is NULL: The new <tp:dbus-ref namespace="org.freedesktop.Telepathy">Account</tp:dbus-ref>.Used to return an 'out' argument if error is NULL: The new <tp:dbus-ref namespace="org.freedesktop.Telepathy">Account</tp:dbus-ref>.

error :

 -NULL on success, or an error on failure

user_data :

callback :

 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

destroy :

 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

error :

If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

destroy :

 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

error :

If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. 
1
 2
GHashTable *asv = g_hash_table_new_full (g_str_hash, g_str_equal,
-   NULL, (GDestroyNotify) tp_g_value_slice_free);
GHashTable *asv = g_hash_table_new_full (g_str_hash, g_str_equal,
+   NULL, (GDestroyNotify) tp_g_value_slice_free);
@@ -222,8 +222,8 @@ 
1
 2
- 
g_hash_table_insert (parameters, "account",
-   tp_g_value_slice_new_string ("bob@mcbadgers.com"));
+ 
g_hash_table_insert (parameters, "account",
+   tp_g_value_slice_new_string ("bob@mcbadgers.com"));
@@ -234,7 +234,7 @@

-

Example 1. Using tp_asv_new()

+

Example 1. Using tp_asv_new()

@@ -243,10 +243,10 @@ 2 3 4 - + 
GHashTable *parameters = tp_asv_new (
-   "answer", G_TYPE_INT, 42,
-   "question", G_TYPE_STRING, "We just don't know",
-   NULL);
GHashTable *parameters = tp_asv_new (
+   "answer", G_TYPE_INT, 42,
+   "question", G_TYPE_STRING, "We just don't know",
+   NULL);
@@ -288,10 +288,10 @@ gboolean *valid);

If a value for key in asv is present and boolean, return it, -and set *valid to TRUE if valid is not NULL. +and set *valid to TRUE if valid is not NULL.

-Otherwise return FALSE, and set *valid to FALSE if valid is not NULL. +Otherwise return FALSE, and set *valid to FALSE if valid is not NULL.

@@ -308,7 +308,7 @@ - @@ -367,7 +367,7 @@ return it.

-Otherwise return NULL. +Otherwise return NULL.

The returned value is not copied, and is only valid as long as the value @@ -395,7 +395,7 @@

- @@ -536,7 +536,7 @@ (its GType is DBUS_TYPE_G_UCHAR_ARRAY), return it.

-Otherwise return NULL. +Otherwise return NULL.

The returned value is not copied, and is only valid as long as the value @@ -559,7 +559,7 @@

- @@ -600,7 +600,7 @@ - @@ -653,10 +653,10 @@

If a value for key in asv 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 valid is not NULL, set *valid to TRUE. +return it as a double, and if valid is not NULL, set *valid to TRUE.

-Otherwise, return 0.0, and if valid is not NULL, set *valid to FALSE. +Otherwise, return 0.0, and if valid is not NULL, set *valid to FALSE.

valid :

Either NULL, or a location to store TRUE if the key actually +Either NULL, or a location to store TRUE if the key actually exists and has a boolean value. [out]

Returns :

the value of key, or NULL. [transfer none][allow-none] +the value of key, or NULL. [transfer none][allow-none]

Returns :

the string value of key, or NULL. [transfer none][allow-none] +the string value of key, or NULL. [transfer none][allow-none]

bytes :

location of an array of bytes to be copied (this may be NULL +location of an array of bytes to be copied (this may be NULL if and only if length is 0)
@@ -673,7 +673,7 @@ - @@ -723,17 +723,17 @@

tp_asv_get_int32 ()

-
gint32              tp_asv_get_int32                    (const GHashTable *asv,
+
gint32              tp_asv_get_int32                    (const GHashTable *asv,
                                                          const gchar *key,
                                                          gboolean *valid);

 

 If a value for key in asv 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 valid is not NULL, set *valid to
+range of a gint32, return it, and if valid is not NULL, set *valid to
 TRUE.
 

 

-Otherwise, return 0, and if valid is not NULL, set *valid to FALSE.
+Otherwise, return 0, and if valid is not NULL, set *valid to FALSE.

valid :

Either NULL, or a location in which to store TRUE on success +Either NULL, or a location in which to store TRUE on success or FALSE on failure. [out]
@@ -750,7 +750,7 @@ - @@ -767,7 +767,7 @@

tp_asv_set_int32 ()

void                tp_asv_set_int32                    (GHashTable *asv,
                                                          const gchar *key,
-                                                         gint32 value);
+ gint32 value);

Stores the value in the map.

@@ -800,17 +800,17 @@

tp_asv_get_int64 ()

-
gint64              tp_asv_get_int64                    (const GHashTable *asv,
+
gint64              tp_asv_get_int64                    (const GHashTable *asv,
                                                          const gchar *key,
                                                          gboolean *valid);

 

 If a value for key in asv 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 valid is not NULL, set *valid to
+range of a gint64, return it, and if valid is not NULL, set *valid to
 TRUE.
 

 

-Otherwise, return 0, and if valid is not NULL, set *valid to FALSE.
+Otherwise, return 0, and if valid is not NULL, set *valid to FALSE.

valid :

Either NULL, or a location in which to store TRUE on success +Either NULL, or a location in which to store TRUE on success or FALSE on failure. [out]
@@ -827,7 +827,7 @@ - @@ -844,7 +844,7 @@

tp_asv_set_int64 ()

void                tp_asv_set_int64                    (GHashTable *asv,
                                                          const gchar *key,
-                                                         gint64 value);
+ gint64 value);

Stores the value in the map.

@@ -883,7 +883,7 @@ If a value for key in asv is present and is an object path, return it.

-Otherwise return NULL. +Otherwise return NULL.

The returned value is not copied, and is only valid as long as the value @@ -906,7 +906,7 @@

@@ -1030,7 +1030,7 @@ If a value for key in asv is present and is a string, return it.

-Otherwise return NULL. +Otherwise return NULL.

The returned value is not copied, and is only valid as long as the value @@ -1052,7 +1052,7 @@

- @@ -1176,7 +1176,7 @@ return it.

-Otherwise return NULL. +Otherwise return NULL.

The returned value is not copied, and is only valid as long as the value @@ -1198,8 +1198,8 @@

- @@ -1235,7 +1235,7 @@ - +

valid :

Either NULL, or a location in which to store TRUE on success +Either NULL, or a location in which to store TRUE on success or FALSE on failure. [out]

Returns :

 the object-path value of key, or -NULL. [transfer none][allow-none] +NULL. [transfer none][allow-none]

Returns :

the string value of key, or NULL. [transfer none][allow-none] +the string value of key, or NULL. [transfer none][allow-none]

Returns :

the NULL-terminated string-array -value of key, or NULL. [transfer none][allow-none] +the NULL-terminated string-array +value of key, or NULL. [transfer none][allow-none]

value :

a NULL-terminated string arraya NULL-terminated string array
@@ -1244,17 +1244,17 @@

tp_asv_get_uint32 ()

-
guint32             tp_asv_get_uint32                   (const GHashTable *asv,
+
guint32             tp_asv_get_uint32                   (const GHashTable *asv,
                                                          const gchar *key,
                                                          gboolean *valid);

 

 If a value for key in asv 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 valid is not NULL, set *valid to
+range of a guint32, return it, and if valid is not NULL, set *valid to
 TRUE.
 

 

-Otherwise, return 0, and if valid is not NULL, set *valid to FALSE.
+Otherwise, return 0, and if valid is not NULL, set *valid to FALSE.
 

 
@@ -1271,7 +1271,7 @@
 
-
@@ -1288,7 +1288,7 @@
 
tp_asv_set_uint32 ()
void                tp_asv_set_uint32                   (GHashTable *asv,
                                                          const gchar *key,
-                                                         guint32 value);

+                                                         guint32 value);

 Stores the value in the map.
 

@@ -1321,16 +1321,16 @@
 

 
tp_asv_get_uint64 ()

-
guint64             tp_asv_get_uint64                   (const GHashTable *asv,
+
guint64             tp_asv_get_uint64                   (const GHashTable *asv,
                                                          const gchar *key,
                                                          gboolean *valid);

 

 If a value for key in asv is present, has an integer type used by
 dbus-glib (guchar, gint, guint, gint64 or guint64) and is non-negative,
-return it, and if valid is not NULL, set *valid to TRUE.
+return it, and if valid is not NULL, set *valid to TRUE.
 

 

-Otherwise, return 0, and if valid is not NULL, set *valid to FALSE.
+Otherwise, return 0, and if valid is not NULL, set *valid to FALSE.
 

 

 

 

 
valid :
Either NULL, or a location in which to store TRUE on success
+Either NULL, or a location in which to store TRUE on success
 or FALSE on failure. [out]
 
 

 
 
 
@@ -1347,7 +1347,7 @@
 
-
@@ -1364,7 +1364,7 @@
 
tp_asv_set_uint64 ()
void                tp_asv_set_uint64                   (GHashTable *asv,
                                                          const gchar *key,
-                                                         guint64 value);

+                                                         guint64 value);

 Stores the value in the map.
 

@@ -1400,7 +1400,7 @@
 
const GValue *      tp_asv_lookup                       (const GHashTable *asv,
                                                          const gchar *key);

-If a value for key in asv is present, return it. Otherwise return NULL.
+If a value for key in asv is present, return it. Otherwise return NULL.
 

 The returned value is not copied, and is only valid as long as the value
@@ -1420,7 +1420,7 @@
 
 

-
diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-base-client.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-base-client.html
--- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-base-client.html	2012-02-20 17:31:29.000000000 +0000
+++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-base-client.html	2012-03-19 15:38:21.000000000 +0000
@@ -105,14 +105,14 @@
                                                          TpConnection *connection,
                                                          GList *channels,
                                                          GList *requests_satisfied,
-                                                         gint64 user_action_time,
+                                                         gint64 user_action_time,
                                                          TpHandleChannelsContext *context);
 voidtp_base_client_implement_handle_channels
                                                         (TpBaseClientClass *klass,
                                                          TpBaseClientClassHandleChannelsImpl impl);
 voidtp_base_client_add_account_features (TpBaseClient *self,
                                                          const GQuark *features,
-                                                         gssize n);
+                                                         gssize n);
 voidtp_base_client_add_account_features_varargs
                                                         (TpBaseClient *self,
                                                          GQuark feature,
@@ -120,14 +120,14 @@
 voidtp_base_client_add_connection_features
                                                         (TpBaseClient *self,
                                                          const GQuark *features,
-                                                         gssize n);
+                                                         gssize n);
 voidtp_base_client_add_connection_features_varargs
                                                         (TpBaseClient *self,
                                                          GQuark feature,
                                                          ...);
 voidtp_base_client_add_channel_features (TpBaseClient *self,
                                                          const GQuark *features,
-                                                         gssize n);
+                                                         gssize n);
 voidtp_base_client_add_channel_features_varargs
                                                         (TpBaseClient *self,
                                                          GQuark feature,
@@ -138,7 +138,7 @@
 voidtp_base_client_delegate_channels_async
                                                         (TpBaseClient *self,
                                                          GList *channels,
-                                                         gint64 user_action_time,
+                                                         gint64 user_action_time,
                                                          const gchar *preferred_handler,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);
@@ -159,7 +159,7 @@
 voidtp_channel_dispatcher_present_channel_async
                                                         (TpChannelDispatcher *self,
                                                          TpChannel *channel,
-                                                         gint64 user_action_time,
+                                                         gint64 user_action_time,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);
 gbooleantp_channel_dispatcher_present_channel_finish
@@ -346,13 +346,13 @@
 5
 6
 7
-        
+        

 

 

 
valid :
Either NULL, or a location in which to store TRUE on success
+Either NULL, or a location in which to store TRUE on success
 or FALSE on failure. [out]
 
 

 
 
 
 

 
Returns :
the value of key, or NULL
+the value of key, or NULL
 
 

                                                                                                                                                             
tp_base_client_take_observer_filter (client,
-   tp_asv_new (
-       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-           TP_IFACE_CHANNEL_TYPE_TEXT,
-       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
-           TP_HANDLE_TYPE_CONTACT,
-       ...));
tp_base_client_take_observer_filter (client,
+   tp_asv_new (
+       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
+           TP_IFACE_CHANNEL_TYPE_TEXT,
+       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+           TP_HANDLE_TYPE_CONTACT,
+       ...));

       

     
   

@@ -504,7 +504,7 @@
 
 
 
dispatch_operation :

-a TpChannelDispatchOperation or NULL;
+a TpChannelDispatchOperation or NULL;
 the dispatch_operation is not guaranteed to be prepared. [allow-none]
 
 
@@ -609,13 +609,13 @@
 5
 6
 7
- 
tp_base_client_take_approver_filter (client,
-   tp_asv_new (
-       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-           TP_IFACE_CHANNEL_TYPE_TEXT,
-       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
-           TP_HANDLE_TYPE_CONTACT,
-       ...));
+ 
tp_base_client_take_approver_filter (client,
+   tp_asv_new (
+       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
+           TP_IFACE_CHANNEL_TYPE_TEXT,
+       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+           TP_HANDLE_TYPE_CONTACT,
+       ...));
@@ -801,7 +801,7 @@

... :

-more tokens, ending with NULL +more tokens, ending with NULL @@ -894,13 +894,13 @@ 5 6 7 - 
tp_base_client_take_handler_filter (client,
-   tp_asv_new (
-       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-           TP_IFACE_CHANNEL_TYPE_TEXT,
-       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
-           TP_HANDLE_TYPE_CONTACT,
-       ...));
+ 
tp_base_client_take_handler_filter (client,
+   tp_asv_new (
+       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
+           TP_IFACE_CHANNEL_TYPE_TEXT,
+       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+           TP_HANDLE_TYPE_CONTACT,
+       ...));
@@ -958,7 +958,7 @@ TpConnection *connection, GList *channels, GList *requests_satisfied, - gint64 user_action_time, + gint64 user_action_time, TpHandleChannelsContext *context);

Signature of the implementation of the HandleChannels method. @@ -1055,7 +1055,7 @@

tp_base_client_add_account_features ()

void                tp_base_client_add_account_features (TpBaseClient *self,
                                                          const GQuark *features,
-                                                         gssize n);
+ gssize n);

Warning

tp_base_client_add_account_features is deprecated and should not be used in newly-written code. New code should use @@ -1130,7 +1130,7 @@ 

void                tp_base_client_add_connection_features
                                                         (TpBaseClient *self,
                                                          const GQuark *features,
-                                                         gssize n);
+ gssize n);

Warning

tp_base_client_add_connection_features is deprecated and should not be used in newly-written code. New code should use @@ -1203,7 +1203,7 @@

tp_base_client_add_channel_features ()

void                tp_base_client_add_channel_features (TpBaseClient *self,
                                                          const GQuark *features,
-                                                         gssize n);
+ gssize n);

Warning

tp_base_client_add_channel_features is deprecated and should not be used in newly-written code. New code should use @@ -1333,7 +1333,7 @@ 

void                tp_base_client_delegate_channels_async
                                                         (TpBaseClient *self,
                                                          GList *channels,
-                                                         gint64 user_action_time,
+                                                         gint64 user_action_time,
                                                          const gchar *preferred_handler,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);
@@ -1367,7 +1367,7 @@

preferred_handler :

Either the well-known bus name (starting with TP_CLIENT_BUS_NAME_BASE) of the preferred handler for the channels, -or NULL to indicate that any handler but self would be acceptable. +or NULL to indicate that any handler but self would be acceptable.

callback :

@@ -1410,13 +1410,13 @@

delegated :

-if not NULL, used to return a GPtrArray containing the TpChannels +if not NULL, used to return a GPtrArray containing the TpChannels which have been properly delegated. [out][element-type TelepathyGLib.Channel][transfer container]

not_delegated :

-if not not NULL, used to return a GHashTable mapping TpChannels +if not not NULL, used to return a GHashTable mapping TpChannels which have not been delegated to a GError explaining the reason of the failure. [out][element-type TelepathyGLib.Channel GLib.Error][transfer container] @@ -1497,7 +1497,7 @@

callback :

function called when channels currently handled by self are -delegated, may not be NULL +delegated, may not be NULL @@ -1519,7 +1519,7 @@ 
void                tp_channel_dispatcher_present_channel_async
                                                         (TpChannelDispatcher *self,
                                                          TpChannel *channel,
-                                                         gint64 user_action_time,
+                                                         gint64 user_action_time,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);

@@ -1886,7 +1886,7 @@ 

TpAccountManager *  tp_base_client_get_account_manager  (TpBaseClient *self);

Warning

-

tp_base_client_get_account_manager is deprecated and should not be used in newly-written code. New code should not use this function, it may return NULL in +

tp_base_client_get_account_manager is deprecated and should not be used in newly-written code. New code should not use this function, it may return NULL in the case self was constructed with a TpSimpleClientFactory.

@@ -1987,7 +1987,7 @@ 

  "account-manager"          TpAccountManager*     : Read / Write / Construct Only

Warning

-

TpBaseClient:account-manager is deprecated and should not be used in newly-written code. New code should not use this property, it may be NULL in +

TpBaseClient:account-manager is deprecated and should not be used in newly-written code. New code should not use this property, it may be NULL in the case self was constructed with a TpSimpleClientFactory.

@@ -2013,12 +2013,12 @@ the result of tp_account_manager_dup().

-This property may be NULL initially, but will always be non-NULL +This property may be NULL initially, but will always be non-NULL after the TpBaseClient has been constructed.

-It is an error to specify both a non-NULL account manager, and a -non-NULL "dbus-daemon" that is not the same as the +It is an error to specify both a non-NULL account manager, and a +non-NULL "dbus-daemon" that is not the same as the account manager's "dbus-daemon".

Since 0.11.14

@@ -2052,10 +2052,10 @@ Read-only except during construction.

-This property can't be NULL after construction. +This property can't be NULL after construction.

-Since 0.11.14 this property may be NULL or unspecified in +Since 0.11.14 this property may be NULL or unspecified in g_object_new(), but only if "account-manager" is provided instead, in which case its "dbus-daemon" property will be used. @@ -2081,7 +2081,7 @@ and object path of the service.

-This property can't be NULL. +This property can't be NULL.

Default value: NULL

Since 0.11.5

diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-base-contact-list.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-base-contact-list.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-base-contact-list.html 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-base-contact-list.html 2012-03-19 15:38:21.000000000 +0000 @@ -203,22 +203,22 @@ void tp_base_contact_list_groups_changed (TpBaseContactList *self, TpHandleSet *contacts, const gchar * const *added, - gssize n_added, + gssize n_added, const gchar * const *removed, - gssize n_removed); + gssize n_removed); void tp_base_contact_list_one_contact_groups_changed (TpBaseContactList *self, TpHandle contact, const gchar * const *added, - gssize n_added, + gssize n_added, const gchar * const *removed, - gssize n_removed); + gssize n_removed); void tp_base_contact_list_groups_created (TpBaseContactList *self, const gchar * const *created, - gssize n_created); + gssize n_created); void tp_base_contact_list_groups_removed (TpBaseContactList *self, const gchar * const *removed, - gssize n_removed); + gssize n_removed); gboolean tp_base_contact_list_has_disjoint_groups (TpBaseContactList *self); @@ -228,14 +228,14 @@ (TpBaseContactList *self, TpHandle contact, const gchar * const *normalized_names, - gsize n_names, + gsize n_names, GAsyncReadyCallback callback, gpointer user_data); void tp_base_contact_list_set_contact_groups_async (TpBaseContactList *self, TpHandle contact, const gchar * const *normalized_names, - gsize n_names, + gsize n_names, GAsyncReadyCallback callback, gpointer user_data); gboolean tp_base_contact_list_set_contact_groups_finish @@ -405,13 +405,13 @@ 5 6 7 - 
G_DEFINE_TYPE_WITH_CODE (MyConnection, my_connection,
-    TP_TYPE_BASE_CONNECTION,
-    // ...
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST,
-        tp_base_contact_list_mixin_list_iface_init);
-    // ...
-    )
+ 
G_DEFINE_TYPE_WITH_CODE (MyConnection, my_connection,
+    TP_TYPE_BASE_CONNECTION,
+    // ...
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST,
+        tp_base_contact_list_mixin_list_iface_init);
+    // ...
+    )
@@ -431,11 +431,11 @@ 3 4 5 - 
// ...
-tp_contacts_mixin_class_init (object_class,
-    G_STRUCT_OFFSET (MyConnectionClass, contacts_mixin));
-tp_base_contact_list_mixin_class_init (base_connection_class);
-// ...
+ 
// ...
+tp_contacts_mixin_class_init (object_class,
+    G_STRUCT_OFFSET (MyConnectionClass, contacts_mixin));
+tp_base_contact_list_mixin_class_init (base_connection_class);
+// ...
@@ -713,7 +713,7 @@ GError **error);

Return the Connection this contact list uses. If this contact list's -connection has already disconnected, return NULL instead. +connection has already disconnected, return NULL instead.

@@ -724,11 +724,11 @@ - + - @@ -1368,7 +1368,7 @@ +the default implementation is NULL, which is interpreted as "do nothing" @@ -1788,7 +1788,7 @@

If the implementation of -TpMutableContactListInterface.store_contacts_async is NULL (which is +TpMutableContactListInterface.store_contacts_async is NULL (which is the default), this method calls callback to signal success, but does nothing in the underlying protocol.

@@ -2209,7 +2209,7 @@ @@ -2235,11 +2235,11 @@ - + - +

error :

used to raise an error if NULL is returnedused to raise an error if NULL is returned

Returns :

the connection, or NULL. [transfer none] +the connection, or NULL. [transfer none]

TpBaseContactListActOnContactsFunc store_contacts_async;

 the implementation of tp_base_contact_list_store_contacts_async(); if not reimplemented, -the default implementation is NULL, which is interpreted as "do nothing"

TpBaseContactListAsyncFinishFunc store_contacts_finish;

TpBaseContactListNormalizeFunc normalize_group;

 the implementation of tp_base_contact_list_normalize_group(); if not reimplemented, -the default implementation is NULL, which allows any UTF-8 string +the default implementation is NULL, which allows any UTF-8 string as a group name (including the empty string) and assumes that any distinct group names can coexist

s :

a non-NULL name to normalizea non-NULL name to normalize

Returns :

a normalized form of s, or NULL on errora normalized form of s, or NULL on error
@@ -2252,13 +2252,13 @@ (TpBaseContactList *self, const gchar *s);

-Return a normalized form of the group name s, or NULL if a group of a +Return a normalized form of the group name s, or NULL if a group of a sufficiently similar name cannot be created.

If the TpBaseContactList subclass does not implement TP_TYPE_CONTACT_GROUP_LIST, this method is meaningless, and always -returns NULL. +returns NULL.

For implementations of TP_TYPE_CONTACT_GROUP_LIST, this is a virtual @@ -2280,11 +2280,11 @@

s :

-a non-NULL group name to normalize +a non-NULL group name to normalize

Returns :

-a normalized form of s, or NULL on error +a normalized form of s, or NULL on error
@@ -2302,7 +2302,7 @@

If contact is not on the contact list, this method must return either -NULL or an empty array, without error. +NULL or an empty array, without error.

@@ -2339,7 +2339,7 @@

If contact is not on the contact list, this method must return either -NULL or an empty array. +NULL or an empty array.

For implementations of TP_TYPE_CONTACT_GROUP_LIST, this is a virtual @@ -2466,7 +2466,7 @@ that does not implement TP_TYPE_CONTACT_GROUP_LIST.

-If group does not exist, this method must return either NULL or an empty +If group does not exist, this method must return either NULL or an empty set, without error.

@@ -2537,9 +2537,9 @@ 

void                tp_base_contact_list_groups_changed (TpBaseContactList *self,
                                                          TpHandleSet *contacts,
                                                          const gchar * const *added,
-                                                         gssize n_added,
+                                                         gssize n_added,
                                                          const gchar * const *removed,
-                                                         gssize n_removed);
+ gssize n_removed);

Called by subclasses when groups' membership has been changed.

@@ -2566,25 +2566,25 @@ - + +NULL-terminated

added :

 zero or -more groups to which the contacts were added, or NULL (which has the +more groups to which the contacts were added, or NULL (which has the same meaning as an empty list). [array length=n_added][element-type utf8][allow-none]

n_added :

the number of groups added, or -1 if added is NULL-terminatedthe number of groups added, or -1 if added is NULL-terminated

removed :

 zero -or more groups from which the contacts were removed, or NULL (which has +or more groups from which the contacts were removed, or NULL (which has the same meaning as an empty list). [array zero-terminated=1][element-type utf8][allow-none]

n_removed :

 the number of groups removed, or -1 if removed is -NULL-terminated
@@ -2597,9 +2597,9 @@ (TpBaseContactList *self, TpHandle contact, const gchar * const *added, - gssize n_added, + gssize n_added, const gchar * const *removed, - gssize n_removed); + gssize n_removed);

Convenience wrapper around tp_base_contact_list_groups_changed() for a single handle in the 'contacts' set. @@ -2623,23 +2623,23 @@

added :

zero or -more groups to which contact was added, or NULL. [array length=n_added][element-type utf8][allow-none] +more groups to which contact was added, or NULL. [array length=n_added][element-type utf8][allow-none]

n_added :

-the number of groups added, or -1 if added is NULL-terminated +the number of groups added, or -1 if added is NULL-terminated

removed :

zero -or more groups from which the contact was removed, or NULL. [array zero-terminated=1][element-type utf8][allow-none] +or more groups from which the contact was removed, or NULL. [array zero-terminated=1][element-type utf8][allow-none]

n_removed :

the number of groups removed, or -1 if removed is -NULL-terminated +NULL-terminated
@@ -2650,7 +2650,7 @@

tp_base_contact_list_groups_created ()

void                tp_base_contact_list_groups_created (TpBaseContactList *self,
                                                          const gchar * const *created,
-                                                         gssize n_created);
+ gssize n_created);

Called by subclasses when new groups have been created. This will typically be followed by a call to tp_base_contact_list_groups_changed() to add @@ -2676,7 +2676,7 @@

n_created :

the number of groups created, or -1 if created is -NULL-terminated +NULL-terminated
@@ -2687,7 +2687,7 @@

tp_base_contact_list_groups_removed ()

void                tp_base_contact_list_groups_removed (TpBaseContactList *self,
                                                          const gchar * const *removed,
-                                                         gssize n_removed);
+ gssize n_removed);

Called by subclasses when groups have been removed.

@@ -2717,7 +2717,7 @@

n_removed :

the number of groups removed, or -1 if removed is -NULL-terminated +NULL-terminated
@@ -2897,7 +2897,7 @@

TpBaseContactListUIntFunc get_group_storage;

the implementation of tp_base_contact_list_get_group_storage(); the default implementation is -NULL, which results in TP_CONTACT_METADATA_STORAGE_TYPE_ANYONE being +NULL, which results in TP_CONTACT_METADATA_STORAGE_TYPE_ANYONE being advertised @@ -2911,7 +2911,7 @@ (TpBaseContactList *self, TpHandle contact, const gchar * const *normalized_names, - gsize n_names, + gsize n_names, GAsyncReadyCallback callback, gpointer user_data);

@@ -2958,7 +2958,7 @@ (TpBaseContactList *self, TpHandle contact, const gchar * const *normalized_names, - gsize n_names, + gsize n_names, GAsyncReadyCallback callback, gpointer user_data);

@@ -3686,7 +3686,7 @@ TpMutableContactGroupListInterface.get_group_storage.

-The default implementation is NULL, which is treated as equivalent to an +The default implementation is NULL, which is treated as equivalent to an implementation that always returns TP_CONTACT_METADATA_STORAGE_TYPE_ANYONE. A custom implementation can also be used.

diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-base-password-channel.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-base-password-channel.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-base-password-channel.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-base-password-channel.html 2012-03-19 15:38:21.000000000 +0000 @@ -212,7 +212,7 @@

password :

-the password provided by the user, or NULL if the +the password provided by the user, or NULL if the authentication has been aborted @@ -227,7 +227,7 @@

message :

-a message associated with the error, or NULL +a message associated with the error, or NULL diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-base-protocol.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-base-protocol.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-base-protocol.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-base-protocol.html 2012-03-19 15:38:21.000000000 +0000 @@ -253,7 +253,7 @@

Returns :

an array of TpPresenceStatusSpec structs describing the standard statuses supported by this protocol, with a final element -whose name element is guaranteed to be NULL. The array must remain +whose name element is guaranteed to be NULL. The array must remain valid at least as long as self does. @@ -298,11 +298,11 @@

error :

-used to return an error if NULL is returned +used to return an error if NULL is returned

Returns :

-a new connection, or NULL on error +a new connection, or NULL on error
@@ -380,7 +380,7 @@ a callback used to implement the NormalizeContact D-Bus method; it must either return a newly allocated string that is the normalized version of contact, or raise an error via error and -return NULL. If not implemented, TP_ERROR_NOT_IMPLEMENTED will be raised +return NULL. If not implemented, TP_ERROR_NOT_IMPLEMENTED will be raised instead. @@ -389,7 +389,7 @@ D-Bus method; it takes as input a map from strings to GValues, and must either return a newly allocated string that represents the "identity" of the parameters in asv (usually the "account" parameter), -or NULL with an error raised via error +or NULL with an error raised via error @@ -484,11 +484,11 @@

error :

-used to return an error if NULL is returned +used to return an error if NULL is returned

Returns :

-a new connection, or NULL on error. [transfer full] +a new connection, or NULL on error. [transfer full] @@ -505,7 +505,7 @@

Signature of a virtual method to perform best-effort offline normalization of a contact's identifier. It must either return a newly allocated string -that is the normalized form of contact, or raise an error and return NULL. +that is the normalized form of contact, or raise an error and return NULL.

@@ -520,11 +520,11 @@ - + - @@ -562,11 +562,11 @@ - + - @@ -594,7 +594,7 @@ - @@ -625,7 +625,7 @@ @@ -687,7 +687,7 @@ @@ -847,7 +847,7 @@ Signature of a virtual method to perform best-effort offline normalization of a vCard address. It must either return a newly allocated string that is the normalized form of vcard_address, or raise an error and -return NULL. +return NULL.

error :

used to return an error if NULL is returnedused to return an error if NULL is returned

Returns :

a normalized identifier, or NULL on error. [transfer full] +a normalized identifier, or NULL on error. [transfer full]

error :

used to return an error if NULL is returnedused to return an error if NULL is returned

Returns :

a unique name for the account, or NULL on error. [transfer full] +a unique name for the account, or NULL on error. [transfer full]

Returns :

a NULL-terminated array of D-Bus interface names. [transfer full] +a NULL-terminated array of D-Bus interface names. [transfer full]

connection_interfaces :

 used to return a -NULL-terminated array of interfaces which might be implemented on +NULL-terminated array of interfaces which might be implemented on connections to this protocol. [out][transfer full]

supported_mime_types :

 used to return a -NULL-terminated array of supported avatar mime types. [out][transfer full] +NULL-terminated array of supported avatar mime types. [out][transfer full]
@@ -866,11 +866,11 @@ - + - @@ -886,7 +886,7 @@

Signature of a virtual method to perform best-effort offline normalization of a URI. It must either return a newly allocated string -that is the normalized form of uri, or raise an error and return NULL. +that is the normalized form of uri, or raise an error and return NULL.

error :

used to return an error if NULL is returnedused to return an error if NULL is returned

Returns :

a normalized identifier, or NULL on error. [transfer full] +a normalized identifier, or NULL on error. [transfer full]
@@ -901,11 +901,11 @@ - + - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-call-channel.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-call-channel.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-call-channel.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-call-channel.html 2012-03-19 15:38:21.000000000 +0000 @@ -70,6 +70,7 @@ GHashTable * tp_call_channel_get_members (TpCallChannel *self); gbooleantp_call_channel_has_dtmf (TpCallChannel *self); +gbooleantp_call_channel_has_hold (TpCallChannel *self); voidtp_call_channel_send_tones_async (TpCallChannel *self, const gchar *tones, GCancellable *cancellable, @@ -99,15 +100,15 @@ GError **error); voidtp_call_channel_hangup_async (TpCallChannel *self, TpCallStateChangeReason reason, - gchar *detailed_reason, - gchar *message, + const gchar *detailed_reason, + const gchar *message, GAsyncReadyCallback callback, gpointer user_data); gbooleantp_call_channel_hangup_finish (TpCallChannel *self, GAsyncResult *result, GError **error); voidtp_call_channel_add_content_async (TpCallChannel *self, - gchar *name, + const gchar *name, TpMediaStreamType type, TpMediaStreamDirection initial_direction, GAsyncReadyCallback callback, @@ -115,6 +116,13 @@ TpCallContent * tp_call_channel_add_content_finish (TpCallChannel *self, GAsyncResult *result, GError **error); +voidtp_call_channel_request_hold_async (TpCallChannel *self, + gboolean hold, + GAsyncReadyCallback callback, + gpointer user_data); +gbooleantp_call_channel_request_hold_finish (TpCallChannel *self, + GAsyncResult *result, + GError **error);
@@ -142,6 +150,8 @@ "contents" GPtrArray* : Read "flags" guint : Read "hardware-streaming" gboolean : Read + "hold-state" guint : Read + "hold-state-reason" guint : Read "initial-audio" gboolean : Read "initial-audio-name" gchar* : Read "initial-video" gboolean : Read @@ -455,8 +465,10 @@

tp_call_channel_has_dtmf ()

gboolean            tp_call_channel_has_dtmf            (TpCallChannel *self);

-Whether or not self has the TP_IFACE_CHANNEL_INTERFACE_DTMF -interfaces +Whether or not self can send DTMF tones using +tp_call_channel_send_tones_async(). To be able to send DTMF tones, at least +one of self's "contents" must implement +TP_IFACE_CALL_CONTENT_INTERFACE_DTMF interface.

error :

used to return an error if NULL is returnedused to return an error if NULL is returned

Returns :

a normalized identifier, or NULL on error. [transfer full] +a normalized identifier, or NULL on error. [transfer full]
@@ -468,7 +480,7 @@ - +

Returns :

whether or not self supports DTMFwhether or not self can send DTMF tones.
@@ -476,6 +488,30 @@
+

tp_call_channel_has_hold ()

+
gboolean            tp_call_channel_has_hold            (TpCallChannel *self);
+

+Whether or not self has the TP_IFACE_CHANNEL_INTERFACE_HOLD +interfaces +

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

self :

a TpCallChannel +

Returns :

whether or not self supports Hold
+

Since 0.UNRELEASED

+
+
+

tp_call_channel_send_tones_async ()

void                tp_call_channel_send_tones_async    (TpCallChannel *self,
                                                          const gchar *tones,
@@ -503,7 +539,7 @@
 
 
 
cancellable :

-optional GCancellable object, NULL to ignore
+optional GCancellable object, NULL to ignore
 
 
 
callback :

@@ -747,8 +783,8 @@
 
tp_call_channel_hangup_async ()

 
void                tp_call_channel_hangup_async        (TpCallChannel *self,
                                                          TpCallStateChangeReason reason,
-                                                         gchar *detailed_reason,
-                                                         gchar *message,
+                                                         const gchar *detailed_reason,
+                                                         const gchar *message,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);

 

@@ -770,7 +806,7 @@
 
 
detailed_reason :

 a more specific reason for the call hangup, if one is
-available, or an empty or NULL string otherwise
+available, or an empty or NULL string otherwise
 
 
 
message :

@@ -823,7 +859,7 @@
 

 
tp_call_channel_add_content_async ()

 
void                tp_call_channel_add_content_async   (TpCallChannel *self,
-                                                         gchar *name,
+                                                         const gchar *name,
                                                          TpMediaStreamType type,
                                                          TpMediaStreamDirection initial_direction,
                                                          GAsyncReadyCallback callback,
@@ -907,6 +943,74 @@
 

 
Since 0.17.5
+
+
+

tp_call_channel_request_hold_async ()

+
void                tp_call_channel_request_hold_async  (TpCallChannel *self,
+                                                         gboolean hold,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+

+Requests that the connection manager holds or unholds the call. Watch +"hold-state" property to know when the channel goes on +hold or is unheld. Unholding may fail if the streaming implementation +can not obtain all the resources needed to restart the call. +

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

self :

a TpCallChannel +

hold :

Whether to request a hold or a unhold

callback :

a callback to call when the operation finishes

user_data :

data to pass to callback +
+

Since 0.UNRELEASED

+
+
+
+

tp_call_channel_request_hold_finish ()

+
gboolean            tp_call_channel_request_hold_finish (TpCallChannel *self,
+                                                         GAsyncResult *result,
+                                                         GError **error);
+

+Finishes tp_call_channel_request_hold_async +

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

self :

a TpCallChannel +

result :

a GAsyncResult +

error :

a GError to fill
+

Since 0.UNRELEASED

+

Property Details

@@ -945,6 +1049,26 @@
+

The "hold-state" property

+
  "hold-state"               guint                 : Read
+

+A TpLocalHoldState specifying if the Call is currently held +

+

Default value: 0

+

Since 0.UNRELEASED

+
+
+
+

The "hold-state-reason" property

+
  "hold-state-reason"        guint                 : Read
+

+A TpLocalHoldStateReason specifying why the Call is currently held. +

+

Default value: 0

+

Since 0.UNRELEASED

+
+
+

The "initial-audio" property

  "initial-audio"            gboolean              : Read

@@ -959,7 +1083,7 @@ 

  "initial-audio-name"       gchar*                : Read

If "initial-audio" is set to TRUE, then this property will -is the name of the intial audio content, NULL otherwise. +is the name of the intial audio content, NULL otherwise.

Default value: NULL

Since 0.17.5

@@ -980,7 +1104,7 @@ 
  "initial-video-name"       gchar*                : Read

If "initial-video" is set to TRUE, then this property will -is the name of the intial video content, NULL otherwise. +is the name of the intial video content, NULL otherwise.

Default value: NULL

Since 0.17.5

@@ -1010,7 +1134,8 @@

The "state-details" property

  "state-details"            GHashTable*           : Read

-Detailed information about "state". +Detailed infoermation about "state". It is a GHashTable +mapping gchar*->GValue, it can be accessed using the tp_asv_* functions.

Since 0.17.5

@@ -1187,7 +1312,9 @@

details :

-additional details +additional details as a +GHashTable readable using the tp_asv_* functions. [element-type utf8 GObject.Value] +

user_data :

diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-call-content.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-call-content.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-call-content.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-call-content.html 2012-03-19 15:38:21.000000000 +0000 @@ -86,6 +86,7 @@

Properties

+  "channel"                  TpCallChannel*        : Read / Write / Construct Only
   "connection"               TpConnection*         : Read / Write / Construct Only
   "disposition"              guint                 : Read
   "media-type"               guint                 : Read
@@ -344,7 +345,7 @@
 
 
 
cancellable :

-optional GCancellable object, NULL to ignore
+optional GCancellable object, NULL to ignore
 
 
 
callback :

@@ -398,6 +399,15 @@
 

 
Property Details

 

+
The "channel" property

+
  "channel"                  TpCallChannel*        : Read / Write / Construct Only

+

+The parent TpCallChannel of the content.
+

+
Since 0.UNRELEASED

+

+

+

 
The "connection" property

 
  "connection"               TpConnection*         : Read / Write / Construct Only

 

diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-call-stream.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-call-stream.html
--- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-call-stream.html	2012-02-20 17:31:30.000000000 +0000
+++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-call-stream.html	2012-03-19 15:38:21.000000000 +0000
@@ -90,6 +90,7 @@
 
   "can-request-receiving"    gboolean              : Read
   "connection"               TpConnection*         : Read / Write / Construct Only
+  "content"                  TpCallContent*        : Read / Write / Construct Only
   "local-sending-state"      guint                 : Read
 

 

@@ -411,6 +412,15 @@
 

 

 

+
The "content" property

+
  "content"                  TpCallContent*        : Read / Write / Construct Only

+

+The Content that this streams belongs to
+

+
Since 0.UNRELEASED

+

+

+

 
The "local-sending-state" property

 
  "local-sending-state"      guint                 : Read

 

diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-capabilities.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-capabilities.html
--- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-capabilities.html	2012-02-20 17:31:30.000000000 +0000
+++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-capabilities.html	2012-03-19 15:38:21.000000000 +0000
@@ -51,6 +51,13 @@
 gboolean            tp_capabilities_supports_text_chatrooms
                                                         (TpCapabilities *self);
 gboolean            tp_capabilities_supports_text_chats (TpCapabilities *self);
+gboolean            tp_capabilities_supports_audio_call (TpCapabilities *self,
+                                                         TpHandleType handle_type);
+gboolean            tp_capabilities_supports_audio_video_call
+                                                        (TpCapabilities *self,
+                                                         TpHandleType handle_type);
+gboolean            tp_capabilities_supports_file_transfer
+                                                        (TpCapabilities *self);
 gboolean            tp_capabilities_supports_stream_tubes
                                                         (TpCapabilities *self,
                                                          TpHandleType handle_type,
@@ -215,6 +222,100 @@
 

 

 

+
tp_capabilities_supports_audio_call ()

+
gboolean            tp_capabilities_supports_audio_call (TpCapabilities *self,
+                                                         TpHandleType handle_type);

+

+Return whether audio call can be established.
+

+

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


self :
a TpCapabilities object
handle_type :
the handle type of the call; TP_HANDLE_TYPE_CONTACT for
+private, TP_HANDLE_TYPE_ROOM or TP_HANDLE_TYPE_NONE for conference
+(depending on the protocol)
Returns :

+TRUE if a channel request containing Call as ChannelType,
+handle_type as TargetHandleType, a True value for InitialAudio and an
+identifier of the appropriate type can be expected to work, FALSE otherwise.

+
Since 0.UNRELEASED

+

+

+

+
tp_capabilities_supports_audio_video_call ()

+
gboolean            tp_capabilities_supports_audio_video_call
+                                                        (TpCapabilities *self,
+                                                         TpHandleType handle_type);

+

+Return whether audio/video call can be established.
+

+

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


self :
a TpCapabilities object
handle_type :
the handle type of the call; TP_HANDLE_TYPE_CONTACT for
+private, TP_HANDLE_TYPE_ROOM or TP_HANDLE_TYPE_NONE for conference
+(depending on the protocol)
Returns :

+TRUE if a channel request containing Call as ChannelType,
+handle_type as TargetHandleType, a True value for
+InitialAudio/InitialVideo and an identifier of the appropriate type can be
+expected to work,
+FALSE otherwise.

+
Since 0.UNRELEASED

+

+

+

+
tp_capabilities_supports_file_transfer ()

+
gboolean            tp_capabilities_supports_file_transfer
+                                                        (TpCapabilities *self);

+

+Return whether private file transfer can be established by providing
+a contact identifier.
+

+

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


self :
a TpCapabilities object
Returns :

+TRUE if a channel request containing FileTransfer as ChannelType,
+HandleTypeContact as TargetHandleType and a contact identifier can be
+expected to work, FALSE otherwise.

+
Since 0.UNRELEASED

+

+

+

 
tp_capabilities_supports_stream_tubes ()

 
gboolean            tp_capabilities_supports_stream_tubes
                                                         (TpCapabilities *self,
@@ -224,7 +325,7 @@
 If the "contact-specific" property is TRUE, this function
 checks if the contact associated with this TpCapabilities supports
 stream tubes with handle_type as TargetHandleType.
-If service is not NULL, it also checks if it supports stream tubes
+If service is not NULL, it also checks if it supports stream tubes
 with service as TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE.
 

 

@@ -246,7 +347,7 @@
 
 
 
service :

-the service of the tube, or NULL
+the service of the tube, or NULL
 
 
 
@@ -269,7 +370,7 @@
 If the "contact-specific" property is TRUE, this function
 checks if the contact associated with this TpCapabilities supports
 D-Bus tubes with handle_type as TargetHandleType.
-If service_name is not NULL, it also checks if it supports stream tubes
+If service_name is not NULL, it also checks if it supports stream tubes
 with service as TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME.
 

 

@@ -292,7 +393,7 @@
 
 
 
service_name :

-the service name of the tube, or NULL
+the service name of the tube, or NULL
 
 
 
@@ -327,16 +428,16 @@
 
 
 
with_limit :

-if not NULL, used to return TRUE if the limit
+if not NULL, used to return TRUE if the limit
 parameter to tp_contact_search_new_async() and
 tp_contact_search_reset_async() can be nonzero. [out]
 
 
 
 
with_server :

-if not NULL, used to return TRUE if the server
+if not NULL, used to return TRUE if the server
 parameter to tp_contact_search_new_async() and
-tp_contact_search_reset_async() can be non-NULL. [out]
+tp_contact_search_reset_async() can be non-NULL. [out]
 
 
 
@@ -379,23 +480,23 @@
 15
 16
 17

-        
GHashTable *request;
-TpAccountChannelRequest *req;
+        
GHashTable *request;
+TpAccountChannelRequest *req;
 
-request = tp_asv_new (
-    TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-      TP_IFACE_CHANNEL_TYPE_ROOM_LIST,
-    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_NONE,
-    NULL);
+request = tp_asv_new (
+    TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
+      TP_IFACE_CHANNEL_TYPE_ROOM_LIST,
+    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_NONE,
+    NULL);
 
-req = tp_account_channel_request_new (account, request,
-   TP_USER_ACTION_TIME_CURRENT_TIME);
+req = tp_account_channel_request_new (account, request,
+   TP_USER_ACTION_TIME_CURRENT_TIME);
 
-tp_account_channel_request_create_and_handle_channel_async (req, NULL,
-    create_channel_cb, NULL);
+tp_account_channel_request_create_and_handle_channel_async (req, NULL,
+    create_channel_cb, NULL);
 
-g_object_unref (req);
-g_hash_table_unref (request);

+g_object_unref (req);
+g_hash_table_unref (request);

       
     
   
@@ -419,14 +520,14 @@
 6
 7
 8
- 
/\* Same code as above but with request defined using: *\/
-request = tp_asv_new (
-    TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-      TP_IFACE_CHANNEL_TYPE_ROOM_LIST,
-    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_NONE,
-    TP_PROP_CHANNEL_TYPE_ROOM_LIST_SERVER, G_TYPE_STRING,
-      "characters.shakespeare.lit",
-    NULL);
+ 
/\* Same code as above but with request defined using: *\/
+request = tp_asv_new (
+    TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
+      TP_IFACE_CHANNEL_TYPE_ROOM_LIST,
+    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_NONE,
+    TP_PROP_CHANNEL_TYPE_ROOM_LIST_SERVER, G_TYPE_STRING,
+      "characters.shakespeare.lit",
+    NULL);
@@ -443,7 +544,7 @@

with_server :

-if not NULL, used to return TRUE if the +if not NULL, used to return TRUE if the TP_PROP_CHANNEL_TYPE_ROOM_LIST_SERVER property can be defined when requesting a RoomList channel. [out] diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-auth.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-auth.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-auth.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-auth.html 2012-03-19 15:38:21.000000000 +0000 @@ -233,28 +233,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -299,28 +299,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -370,28 +370,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -441,28 +441,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -517,28 +517,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -573,7 +573,7 @@

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -608,7 +608,7 @@

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -643,7 +643,7 @@

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -678,7 +678,7 @@

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -713,7 +713,7 @@

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -762,7 +762,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -773,14 +773,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -822,7 +822,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -833,14 +833,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -883,28 +883,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -959,28 +959,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -1035,28 +1035,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -1101,28 +1101,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -1157,7 +1157,7 @@

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -1192,7 +1192,7 @@

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -1227,12 +1227,12 @@

out_Captcha_Data :

-Used to return an 'out' argument if error is NULL: Captcha data as requested. +Used to return an 'out' argument if error is NULL: Captcha data as requested.

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -1269,20 +1269,20 @@

out_Captcha_Info :

-Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> Information about each of the available captcha methods. +Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> Information about each of the available captcha methods.

out_Number_Required :

-Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> The number of captcha methods required to be answered in order to successfully complete this captcha challenge (most frequently 1, but XMPP allows servers to demand that more than one captcha is answered). +Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> The number of captcha methods required to be answered in order to successfully complete this captcha challenge (most frequently 1, but XMPP allows servers to demand that more than one captcha is answered).

out_Language :

-Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> The language of each Label in Captcha_Info if available, for instance en_US, or &quot;&quot; if unknown. +Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> The language of each Label in Captcha_Info if available, for instance en_US, or &quot;&quot; if unknown.

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-contactsearch.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-contactsearch.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-contactsearch.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-contactsearch.html 2012-03-19 15:38:21.000000000 +0000 @@ -166,28 +166,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -237,28 +237,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -303,28 +303,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -359,7 +359,7 @@

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -394,7 +394,7 @@

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -429,7 +429,7 @@

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -478,7 +478,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -489,14 +489,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -538,7 +538,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -549,14 +549,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -597,12 +597,12 @@

error :

-If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

loop :

-If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -656,12 +656,12 @@

error :

-If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

loop :

-If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -710,12 +710,12 @@

error :

-If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

loop :

-If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-dispatcher.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-dispatcher.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-dispatcher.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-dispatcher.html 2012-03-19 15:38:21.000000000 +0000 @@ -59,7 +59,7 @@ gint timeout_ms, const gchar *in_Account, GHashTable *in_Requested_Properties, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, const gchar *in_Preferred_Handler, tp_cli_channel_dispatcher_callback_for_create_channel callback, gpointer user_data, @@ -76,7 +76,7 @@ gint timeout_ms, const gchar *in_Account, GHashTable *in_Requested_Properties, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, const gchar *in_Preferred_Handler, GHashTable *in_Hints, tp_cli_channel_dispatcher_callback_for_create_channel_with_hints callback, @@ -94,7 +94,7 @@ gint timeout_ms, const gchar *in_Account, GHashTable *in_Requested_Properties, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, const gchar *in_Preferred_Handler, tp_cli_channel_dispatcher_callback_for_ensure_channel callback, gpointer user_data, @@ -111,7 +111,7 @@ gint timeout_ms, const gchar *in_Account, GHashTable *in_Requested_Properties, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, const gchar *in_Preferred_Handler, GHashTable *in_Hints, tp_cli_channel_dispatcher_callback_for_ensure_channel_with_hints callback, @@ -122,7 +122,7 @@ (TpChannelDispatcher *proxy, gint timeout_ms, const GPtrArray *in_Channels, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, const gchar *in_Preferred_Handler, tp_cli_channel_dispatcher_callback_for_delegate_channels callback, gpointer user_data, @@ -132,7 +132,7 @@ (TpChannelDispatcher *proxy, gint timeout_ms, const gchar *in_Channel, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, tp_cli_channel_dispatcher_callback_for_present_channel callback, gpointer user_data, GDestroyNotify destroy, @@ -287,12 +287,12 @@

out_Request :

-Used to return an 'out' argument if error is NULL: A <tp:dbus-ref namespace="org.freedesktop.Telepathy">ChannelRequest</tp:dbus-ref> object. +Used to return an 'out' argument if error is NULL: A <tp:dbus-ref namespace="org.freedesktop.Telepathy">ChannelRequest</tp:dbus-ref> object.

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -313,7 +313,7 @@ gint timeout_ms, const gchar *in_Account, GHashTable *in_Requested_Properties, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, const gchar *in_Preferred_Handler, tp_cli_channel_dispatcher_callback_for_create_channel callback, gpointer user_data, @@ -357,28 +357,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -413,12 +413,12 @@

out_Request :

-Used to return an 'out' argument if error is NULL: A <tp:dbus-ref namespace="org.freedesktop.Telepathy">ChannelRequest</tp:dbus-ref> object. +Used to return an 'out' argument if error is NULL: A <tp:dbus-ref namespace="org.freedesktop.Telepathy">ChannelRequest</tp:dbus-ref> object.

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -439,7 +439,7 @@ gint timeout_ms, const gchar *in_Account, GHashTable *in_Requested_Properties, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, const gchar *in_Preferred_Handler, GHashTable *in_Hints, tp_cli_channel_dispatcher_callback_for_create_channel_with_hints callback, @@ -488,28 +488,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -544,12 +544,12 @@

out_Request :

-Used to return an 'out' argument if error is NULL: A <tp:dbus-ref namespace="org.freedesktop.Telepathy">ChannelRequest</tp:dbus-ref> object. +Used to return an 'out' argument if error is NULL: A <tp:dbus-ref namespace="org.freedesktop.Telepathy">ChannelRequest</tp:dbus-ref> object.

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -570,7 +570,7 @@ gint timeout_ms, const gchar *in_Account, GHashTable *in_Requested_Properties, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, const gchar *in_Preferred_Handler, tp_cli_channel_dispatcher_callback_for_ensure_channel callback, gpointer user_data, @@ -614,28 +614,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -670,12 +670,12 @@

out_Request :

-Used to return an 'out' argument if error is NULL: A <tp:dbus-ref namespace="org.freedesktop.Telepathy">ChannelRequest</tp:dbus-ref> object. +Used to return an 'out' argument if error is NULL: A <tp:dbus-ref namespace="org.freedesktop.Telepathy">ChannelRequest</tp:dbus-ref> object.

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -696,7 +696,7 @@ gint timeout_ms, const gchar *in_Account, GHashTable *in_Requested_Properties, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, const gchar *in_Preferred_Handler, GHashTable *in_Hints, tp_cli_channel_dispatcher_callback_for_ensure_channel_with_hints callback, @@ -745,28 +745,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -786,7 +786,7 @@ (TpChannelDispatcher *proxy, gint timeout_ms, const GPtrArray *in_Channels, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, const gchar *in_Preferred_Handler, tp_cli_channel_dispatcher_callback_for_delegate_channels callback, gpointer user_data, @@ -826,28 +826,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -867,7 +867,7 @@ (TpChannelDispatcher *proxy, gint timeout_ms, const gchar *in_Channel, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, tp_cli_channel_dispatcher_callback_for_present_channel callback, gpointer user_data, GDestroyNotify destroy, @@ -902,28 +902,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -959,16 +959,16 @@

out_Delegated :

-Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The list of channels which have been delegated; the caller is no longer handling these channels.</p> <p>The client should remove these channels from its <tp:dbus-ref namespace="ofdT.Client.Handler">HandledChannels</tp:dbus-ref> property.</p> +Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The list of channels which have been delegated; the caller is no longer handling these channels.</p> <p>The client should remove these channels from its <tp:dbus-ref namespace="ofdT.Client.Handler">HandledChannels</tp:dbus-ref> property.</p>

out_Not_Delegated :

-Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The list of channels which have NOT been delegated; the caller is still handling these channels.</p> +Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The list of channels which have NOT been delegated; the caller is still handling these channels.</p>

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -1003,7 +1003,7 @@

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -1086,7 +1086,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -1097,14 +1097,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -1185,7 +1185,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -1196,14 +1196,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-dispatch-operation.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-dispatch-operation.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-dispatch-operation.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-dispatch-operation.html 2012-03-19 15:38:21.000000000 +0000 @@ -91,7 +91,7 @@ (TpChannelDispatchOperation *proxy, gint timeout_ms, const gchar *in_Handler, - gint64 in_UserActionTime, + gint64 in_UserActionTime, tp_cli_channel_dispatch_operation_callback_for_handle_with_time callback, gpointer user_data, GDestroyNotify destroy, @@ -144,7 +144,7 @@ void tp_channel_dispatch_operation_handle_with_time_async (TpChannelDispatchOperation *self, const gchar *handler, - gint64 user_action_time, + gint64 user_action_time, GAsyncReadyCallback callback, gpointer user_data); gboolean tp_channel_dispatch_operation_handle_with_time_finish @@ -327,15 +327,15 @@

immutable_properties :

As many as are known of the immutable D-Bus -properties of this channel dispatch operation, or NULL if none are known +properties of this channel dispatch operation, or NULL if none are known

error :

-Used to raise an error if NULL is returned +Used to raise an error if NULL is returned

Returns :

-a new reference to an channel dispatch operation proxy, or NULL if +a new reference to an channel dispatch operation proxy, or NULL if object_path is not syntactically valid or the channel dispatcher is not running @@ -379,7 +379,7 @@

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -424,28 +424,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -480,7 +480,7 @@

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -530,28 +530,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -586,7 +586,7 @@

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -606,7 +606,7 @@ (TpChannelDispatchOperation *proxy, gint timeout_ms, const gchar *in_Handler, - gint64 in_UserActionTime, + gint64 in_UserActionTime, tp_cli_channel_dispatch_operation_callback_for_handle_with_time callback, gpointer user_data, GDestroyNotify destroy, @@ -641,28 +641,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -755,7 +755,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -766,14 +766,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -844,7 +844,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -855,14 +855,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -1086,7 +1086,7 @@

handler :

The well-known bus name (starting with TP_CLIENT_BUS_NAME_BASE) of the channel handler that should handle the -channel, or NULL if the client has no preferred channel handler. [allow-none] +channel, or NULL if the client has no preferred channel handler. [allow-none] @@ -1145,7 +1145,7 @@ 
void                tp_channel_dispatch_operation_handle_with_time_async
                                                         (TpChannelDispatchOperation *self,
                                                          const gchar *handler,
-                                                         gint64 user_action_time,
+                                                         gint64 user_action_time,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);

@@ -1178,7 +1178,7 @@

handler :

The well-known bus name (starting with TP_CLIENT_BUS_NAME_BASE) of the channel handler that should handle the -channel, or NULL if the client has no preferred channel handler. [allow-none] +channel, or NULL if the client has no preferred channel handler. [allow-none] diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-file-transfer.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-file-transfer.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-file-transfer.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-file-transfer.html 2012-03-19 15:38:21.000000000 +0000 @@ -46,7 +46,7 @@ guint in_Address_Type, guint in_Access_Control, const GValue *in_Access_Control_Param, - guint64 in_Offset, + guint64 in_Offset, tp_cli_channel_type_file_transfer_callback_for_accept_file callback, gpointer user_data, GDestroyNotify destroy, @@ -107,7 +107,7 @@ guint in_Address_Type, guint in_Access_Control, const GValue *in_Access_Control_Param, - guint64 in_Offset, + guint64 in_Offset, GValue **out_Address, GError **error, GMainLoop **loop); @@ -128,12 +128,12 @@ GObject *weak_object); void (*tp_cli_channel_type_file_transfer_signal_callback_initial_offset_defined) (TpChannel *proxy, - guint64 arg_InitialOffset, + guint64 arg_InitialOffset, gpointer user_data, GObject *weak_object); void (*tp_cli_channel_type_file_transfer_signal_callback_transferred_bytes_changed) (TpChannel *proxy, - guint64 arg_Count, + guint64 arg_Count, gpointer user_data, GObject *weak_object); void (*tp_cli_channel_type_file_transfer_signal_callback_uri_defined) @@ -160,7 +160,7 @@ guint in_Address_Type, guint in_Access_Control, const GValue *in_Access_Control_Param, - guint64 in_Offset, + guint64 in_Offset, tp_cli_channel_type_file_transfer_callback_for_accept_file callback, gpointer user_data, GDestroyNotify destroy, @@ -203,28 +203,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -284,28 +284,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -340,12 +340,12 @@

out_Address :

-Used to return an 'out' argument if error is NULL: The address on which the connection manager will listen for connections for this file transfer. +Used to return an 'out' argument if error is NULL: The address on which the connection manager will listen for connections for this file transfer.

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -380,12 +380,12 @@

out_Address :

-Used to return an 'out' argument if error is NULL: The address on which the connection manager will listen for connections for this file transfer. +Used to return an 'out' argument if error is NULL: The address on which the connection manager will listen for connections for this file transfer.

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -434,7 +434,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -445,14 +445,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -494,7 +494,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -505,14 +505,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -554,7 +554,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -565,14 +565,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -614,7 +614,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -625,14 +625,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -647,7 +647,7 @@ guint in_Address_Type, guint in_Access_Control, const GValue *in_Access_Control_Param, - guint64 in_Offset, + guint64 in_Offset, GValue **out_Address, GError **error, GMainLoop **loop); @@ -698,12 +698,12 @@

error :

-If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

loop :

-If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -772,12 +772,12 @@

error :

-If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

loop :

-If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -835,7 +835,7 @@

tp_cli_channel_type_file_transfer_signal_callback_initial_offset_defined ()

void                (*tp_cli_channel_type_file_transfer_signal_callback_initial_offset_defined)
                                                         (TpChannel *proxy,
-                                                         guint64 arg_InitialOffset,
+                                                         guint64 arg_InitialOffset,
                                                          gpointer user_data,
                                                          GObject *weak_object);

@@ -869,7 +869,7 @@

tp_cli_channel_type_file_transfer_signal_callback_transferred_bytes_changed ()

void                (*tp_cli_channel_type_file_transfer_signal_callback_transferred_bytes_changed)
                                                         (TpChannel *proxy,
-                                                         guint64 arg_Count,
+                                                         guint64 arg_Count,
                                                          gpointer user_data,
                                                          GObject *weak_object);

diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-group.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-group.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-group.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-group.html 2012-03-19 15:38:21.000000000 +0000 @@ -485,12 +485,12 @@

error :

-If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

loop :

-If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -554,12 +554,12 @@

error :

-If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

loop :

-If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -613,12 +613,12 @@

error :

-If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

loop :

-If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -677,12 +677,12 @@

error :

-If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

loop :

-If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -736,12 +736,12 @@

error :

-If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

loop :

-If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -795,12 +795,12 @@

error :

-If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

loop :

-If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -854,12 +854,12 @@

error :

-If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

loop :

-If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -913,12 +913,12 @@

error :

-If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

loop :

-If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -972,12 +972,12 @@

error :

-If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

loop :

-If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1036,12 +1036,12 @@

error :

-If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

loop :

-If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1105,12 +1105,12 @@

error :

-If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

loop :

-If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1166,28 +1166,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -1236,28 +1236,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -1306,28 +1306,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -1381,28 +1381,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -1451,28 +1451,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -1521,28 +1521,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -1591,28 +1591,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -1661,28 +1661,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -1731,28 +1731,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -1807,28 +1807,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -1888,28 +1888,28 @@

callback :

called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

user_data :

user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

destroy :

called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

weak_object :

-If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -1944,7 +1944,7 @@

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -1985,20 +1985,20 @@

out_Members :

-Used to return an 'out' argument if error is NULL: array of handles of current members +Used to return an 'out' argument if error is NULL: array of handles of current members

out_Local_Pending :

-Used to return an 'out' argument if error is NULL: array of handles of local pending members +Used to return an 'out' argument if error is NULL: array of handles of local pending members

out_Remote_Pending :

-Used to return an 'out' argument if error is NULL: array of handles of remote pending members +Used to return an 'out' argument if error is NULL: array of handles of remote pending members

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -2037,12 +2037,12 @@

out_Group_Flags :

-Used to return an 'out' argument if error is NULL: The value of the GroupFlags property (TpChannelGroupFlags) +Used to return an 'out' argument if error is NULL: The value of the GroupFlags property (TpChannelGroupFlags)

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -2081,12 +2081,12 @@

out_Owners :

-Used to return an 'out' argument if error is NULL: An array of integer handles representing the owner handles of the given room members, in the same order, or 0 if the owner is not available +Used to return an 'out' argument if error is NULL: An array of integer handles representing the owner handles of the given room members, in the same order, or 0 if the owner is not available

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -2125,12 +2125,12 @@

out_Handles :

-Used to return an 'out' argument if error is NULL: (Undocumented) +Used to return an 'out' argument if error is NULL: (Undocumented)

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -2169,12 +2169,12 @@

out_Info :

-Used to return an 'out' argument if error is NULL: An array of structs containing: <ul> <li> A handle representing the contact requesting channel membership </li> <li> A handle representing the contact making the request, or 0 if unknown </li> <li> The reason for the request: one of the values of <tp:type>Channel_Group_Change_Reason</tp:type> </li> <li> A string message containing the reason for the request if any (or blank if none) </li> </ul> +Used to return an 'out' argument if error is NULL: An array of structs containing: <ul> <li> A handle representing the contact requesting channel membership </li> <li> A handle representing the contact making the request, or 0 if unknown </li> <li> The reason for the request: one of the values of <tp:type>Channel_Group_Change_Reason</tp:type> </li> <li> A string message containing the reason for the request if any (or blank if none) </li> </ul>

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -2213,12 +2213,12 @@

out_Handles :

-Used to return an 'out' argument if error is NULL: (Undocumented) +Used to return an 'out' argument if error is NULL: (Undocumented)

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -2257,12 +2257,12 @@

out_Handles :

-Used to return an 'out' argument if error is NULL: (Undocumented) +Used to return an 'out' argument if error is NULL: (Undocumented)

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -2301,12 +2301,12 @@

out_Self_Handle :

-Used to return an 'out' argument if error is NULL: (Undocumented) (TpContactHandle) +Used to return an 'out' argument if error is NULL: (Undocumented) (TpContactHandle)

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -2341,7 +2341,7 @@

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -2376,7 +2376,7 @@

error :

-NULL on success, or an error on failure +NULL on success, or an error on failure

user_data :

@@ -2425,7 +2425,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -2436,14 +2436,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -2485,7 +2485,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -2496,14 +2496,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -2545,7 +2545,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -2556,14 +2556,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -2762,7 +2762,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -2773,14 +2773,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -2822,7 +2822,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -2833,14 +2833,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -2955,7 +2955,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -2966,14 +2966,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -3015,7 +3015,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -3026,14 +3026,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -3221,7 +3221,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -3232,14 +3232,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -3281,7 +3281,7 @@

destroy :

Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -3292,14 +3292,14 @@

error :

-If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

Returns :

a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel.html 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel.html 2012-03-19 15:38:21.000000000 +0000 @@ -385,17 +385,17 @@

conn :

-a connection; may not be NULL +a connection; may not be NULL

object_path :

-the object path of the channel; may not be NULL +the object path of the channel; may not be NULL

optional_channel_type :

-the channel type if already known, or NULL if not +the channel type if already known, or NULL if not

optional_handle_type :

@@ -410,11 +410,11 @@

error :

-used to indicate the error if NULL is returned +used to indicate the error if NULL is returned

Returns :

-a new channel proxy, or NULL on invalid arguments. +a new channel proxy, or NULL on invalid arguments.
@@ -435,12 +435,12 @@

conn :

-a connection; may not be NULL +a connection; may not be NULL

object_path :

-the object path of the channel; may not be NULL +the object path of the channel; may not be NULL @@ -453,11 +453,11 @@

error :

-used to indicate the error if NULL is returned +used to indicate the error if NULL is returned

Returns :

-a new channel proxy, or NULL on invalid arguments +a new channel proxy, or NULL on invalid arguments
@@ -471,9 +471,9 @@ GMainLoop **loop);

Warning

-

tp_channel_run_until_ready has been deprecated since version 0.11.0 and should not be used in newly-written code. Use tp_connection_call_when_ready, - or restructure your program in such a way as to avoid re-entering the - main loop.

+

tp_channel_run_until_ready has been deprecated since version 0.11.0 and should not be used in newly-written code. Use tp_proxy_prepare_async() and re-enter the main + loop yourself, or restructure your program in such a way as to avoid + re-entering the main loop.

If self is ready for use (introspection has finished, etc.), return @@ -490,12 +490,12 @@

error :

-if not NULL and FALSE is returned, used to raise an error +if not NULL and FALSE is returned, used to raise an error

loop :

-if not NULL, a GMainLoop is placed here while it is being run -(so calling code can call g_main_loop_quit() to abort), and NULL is +if not NULL, a GMainLoop is placed here while it is being run +(so calling code can call g_main_loop_quit() to abort), and NULL is placed here after the loop has been run @@ -514,6 +514,10 @@ 
void                (*TpChannelWhenReadyCb)             (TpChannel *channel,
                                                          const GError *error,
                                                          gpointer user_data);
+
+

Warning

+

TpChannelWhenReadyCb is deprecated and should not be used in newly-written code. 0.17.UNRELEASED

+

Signature of a callback passed to tp_channel_call_when_ready(), which will be called exactly once, when the channel becomes ready or @@ -525,13 +529,13 @@

channel :

the channel (which may be in the middle of being disposed, -if error is non-NULL, error->domain is TP_DBUS_ERRORS and error->code is +if error is non-NULL, error->domain is TP_DBUS_ERRORS and error->code is TP_DBUS_ERROR_PROXY_UNREFERENCED)

error :

-NULL if the channel is ready for use, or the error with which +NULL if the channel is ready for use, or the error with which it was invalidated if it is now invalid @@ -548,6 +552,10 @@ 
void                tp_channel_call_when_ready          (TpChannel *self,
                                                          TpChannelWhenReadyCb callback,
                                                          gpointer user_data);
+
+

Warning

+

tp_channel_call_when_ready is deprecated and should not be used in newly-written code. 0.17.UNRELEASED: Use tp_proxy_prepare_async()

+

If self is ready for use or has been invalidated, call callback immediately, then return. Otherwise, arrange @@ -598,6 +606,11 @@

tp_channel_is_ready ()

gboolean            tp_channel_is_ready                 (TpChannel *self);
+
+

Warning

+

tp_channel_is_ready is deprecated and should not be used in newly-written code. 0.17.UNRELEASED: use tp_proxy_is_prepared() with + TP_CHANNEL_FEATURE_CORE

+

Returns the same thing as the "channel-ready" property.

@@ -768,7 +781,7 @@

This is the same as the "channel-type" property; it isn't -guaranteed to be non-NULL until the TP_CHANNEL_FEATURE_CORE feature has +guaranteed to be non-NULL until the TP_CHANNEL_FEATURE_CORE feature has been prepared.

@@ -781,7 +794,7 @@ +type or NULL, if the channel is not yet ready.

Returns :

 the channel type, if the channel is ready; either the channel -type or NULL, if the channel is not yet ready.
@@ -832,7 +845,7 @@ feature is ready.

-If handle_type is not NULL, the type of handle is written into it. +If handle_type is not NULL, the type of handle is written into it. This will be TP_UNKNOWN_HANDLE_TYPE if the handle has not yet been discovered, or TP_HANDLE_TYPE_NONE if there is no handle with which this channel will always communicate. This is the same as the @@ -847,7 +860,7 @@

handle_type :

-if not NULL, used to return the type of this handle. [out] +if not NULL, used to return the type of this handle. [out] @@ -872,8 +885,8 @@

Changed in 0.11.4: as with "identifier", this could -previously either be NULL or the empty string if there was no suitable -value. It is now non-NULL in all cases. +previously either be NULL or the empty string if there was no suitable +value. It is now non-NULL in all cases.

@@ -1199,7 +1212,7 @@ - @@ -1515,7 +1528,7 @@

  • if contact is channel-specific and its globally valid "owner" is known, return that owner;

  • if contact is channel-specific and its globally valid "owner" is unknown, - return NULL;

    • + return NULL;

  • if contact is globally valid, return contact itself

    • @@ -1556,7 +1569,7 @@

    @@ -1619,10 +1632,10 @@

    If self is a group but TP_CHANNEL_FEATURE_GROUP has not been prepared, -the result may either be a set of members, or NULL. +the result may either be a set of members, or NULL.

    -If self is not a group, return NULL. +If self is not a group, return NULL.

    callback :

    		a callback to call when we closed the channel, or NULL +a callback to call when we closed the channel, or NULL to ignore any reply

    Returns :

    		 the global contact that owns the given contact, -or NULL. [transfer none] +or NULL. [transfer none]
    @@ -1633,7 +1646,7 @@ - @@ -1651,10 +1664,10 @@

    If self is a group but TP_CHANNEL_FEATURE_CONTACTS has not been prepared, -the result may either be a set of members, or NULL. +the result may either be a set of members, or NULL.

    -If self is not a group, return NULL. +If self is not a group, return NULL.

    Returns :

    		the members, or NULL. [transfer none] +the members, or NULL. [transfer none]
    @@ -1665,7 +1678,7 @@ - @@ -1682,10 +1695,10 @@

    If self is a group but TP_CHANNEL_FEATURE_GROUP has not been prepared, -the result may either be a set of local-pending members, or NULL. +the result may either be a set of local-pending members, or NULL.

    -If self is not a group, return NULL. +If self is not a group, return NULL.

    Returns :

    		a new GPtrArray of TpContact, free it with g_ptr_array_unref(), or NULL. [transfer container][type GLib.PtrArray][element-type TelepathyGLib.Contact] +a new GPtrArray of TpContact, free it with g_ptr_array_unref(), or NULL. [transfer container][type GLib.PtrArray][element-type TelepathyGLib.Contact]
    @@ -1696,7 +1709,7 @@ - @@ -1714,10 +1727,10 @@

    If self is a group but TP_CHANNEL_FEATURE_CONTACTS has not been prepared, -the result may either be a set of local-pending members, or NULL. +the result may either be a set of local-pending members, or NULL.

    -If self is not a group, return NULL. +If self is not a group, return NULL.

    Returns :

    		the local-pending members, or NULL. [transfer none] +the local-pending members, or NULL. [transfer none]
    @@ -1728,7 +1741,7 @@ - @@ -1745,10 +1758,10 @@

    If self is a group but TP_CHANNEL_FEATURE_GROUP has not been prepared, -the result may either be a set of remote-pending members, or NULL. +the result may either be a set of remote-pending members, or NULL.

    -If self is not a group, return NULL. +If self is not a group, return NULL.

    Returns :

    		a new GPtrArray of TpContact, free it with g_ptr_array_unref(), or NULL. [transfer container][type GLib.PtrArray][element-type TelepathyGLib.Contact] +a new GPtrArray of TpContact, free it with g_ptr_array_unref(), or NULL. [transfer container][type GLib.PtrArray][element-type TelepathyGLib.Contact]
    @@ -1759,7 +1772,7 @@ - @@ -1777,10 +1790,10 @@

    If self is a group but TP_CHANNEL_FEATURE_CONTACTS has not been prepared, -the result may either be a set of remote-pending members, or NULL. +the result may either be a set of remote-pending members, or NULL.

    -If self is not a group, return NULL. +If self is not a group, return NULL.

    Returns :

    		the remote-pending members, or NULL. [transfer none] +the remote-pending members, or NULL. [transfer none]
    @@ -1791,7 +1804,7 @@ - @@ -1832,19 +1845,19 @@ - - - @@ -1874,7 +1887,7 @@

    If local_pending is not the handle of a local-pending contact, -write NULL into actor, TP_CHANNEL_GROUP_CHANGE_REASON_NONE into reason +write NULL into actor, TP_CHANNEL_GROUP_CHANGE_REASON_NONE into reason and "" into message, and return FALSE.

    Returns :

    		a new GPtrArray of TpContact, free it with g_ptr_array_unref(), or NULL. [transfer container][type GLib.PtrArray][element-type TelepathyGLib.Contact] +a new GPtrArray of TpContact, free it with g_ptr_array_unref(), or NULL. [transfer container][type GLib.PtrArray][element-type TelepathyGLib.Contact]

    actor :

    		either NULL or a location to return the contact +either NULL or a location to return the contact who requested the change. [out][allow-none]

    reason :

    		either NULL or a location to return the reason +either NULL or a location to return the reason for the change. [out][allow-none]

    message :

    		either NULL or a location to +either NULL or a location to return the user-supplied message. [out][transfer none][allow-none]
    @@ -1891,19 +1904,19 @@ - - - @@ -2090,28 +2103,28 @@ - @@ -2160,28 +2173,28 @@ - @@ -2229,28 +2242,28 @@ - @@ -2298,28 +2311,28 @@ - @@ -2354,7 +2367,7 @@ +NULL on success, or an error on failure @@ -2393,12 +2406,12 @@ - + +NULL on success, or an error on failure @@ -2438,16 +2451,16 @@ - + - + +NULL on success, or an error on failure @@ -2486,12 +2499,12 @@ - + +NULL on success, or an error on failure @@ -2538,12 +2551,12 @@ - - - - - - - - @@ -2783,14 +2796,14 @@ - @@ -2857,28 +2870,28 @@ - @@ -2913,7 +2926,7 @@ +NULL on success, or an error on failure @@ -2961,12 +2974,12 @@ - - - @@ -539,28 +539,28 @@ - @@ -615,28 +615,28 @@ - @@ -691,28 +691,28 @@ - @@ -747,12 +747,12 @@ - + +NULL on success, or an error on failure @@ -787,7 +787,7 @@ +NULL on success, or an error on failure @@ -822,7 +822,7 @@ +NULL on success, or an error on failure @@ -857,12 +857,12 @@ - + +NULL on success, or an error on failure @@ -915,12 +915,12 @@ - - - - - - - - @@ -1173,14 +1173,14 @@ - @@ -1222,7 +1222,7 @@ @@ -1233,14 +1233,14 @@ - @@ -1282,7 +1282,7 @@ @@ -1293,14 +1293,14 @@ - @@ -1342,7 +1342,7 @@ @@ -1353,14 +1353,14 @@ - @@ -1402,7 +1402,7 @@ @@ -1413,14 +1413,14 @@ - @@ -1663,28 +1663,28 @@ - @@ -1719,12 +1719,12 @@ - + +NULL on success, or an error on failure @@ -1773,7 +1773,7 @@ @@ -1784,14 +1784,14 @@ - @@ -1837,12 +1837,12 @@ - - - - - - - @@ -2131,28 +2131,28 @@ - @@ -2187,7 +2187,7 @@ +NULL on success, or an error on failure @@ -2222,7 +2222,7 @@ +NULL on success, or an error on failure @@ -2272,28 +2272,28 @@ - @@ -2328,7 +2328,7 @@ +NULL on success, or an error on failure @@ -2377,7 +2377,7 @@ @@ -2388,14 +2388,14 @@ - @@ -2471,7 +2471,7 @@ @@ -2482,14 +2482,14 @@ - @@ -2565,7 +2565,7 @@ @@ -2576,14 +2576,14 @@ - @@ -2646,16 +2646,16 @@ - + - + +NULL on success, or an error on failure @@ -2700,28 +2700,28 @@ - @@ -2779,12 +2779,12 @@ - - +NULL on success, or an error on failure @@ -2870,28 +2870,28 @@ - @@ -2944,12 +2944,12 @@ - - @@ -3049,14 +3049,14 @@ - @@ -3102,12 +3102,12 @@ - - - @@ -3209,12 +3209,12 @@ - + +NULL on success, or an error on failure @@ -3263,7 +3263,7 @@ @@ -3274,14 +3274,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-request.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-request.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-request.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-request.html 2012-03-19 15:38:21.000000000 +0000 @@ -61,7 +61,7 @@ const GHashTable * tp_channel_request_get_immutable_properties (TpChannelRequest *self); TpAccount * tp_channel_request_get_account (TpChannelRequest *self); -gint64tp_channel_request_get_user_action_time +gint64tp_channel_request_get_user_action_time (TpChannelRequest *self); const gchar * tp_channel_request_get_preferred_handler (TpChannelRequest *self); @@ -147,7 +147,7 @@ "hints" GHashTable_gchararray+GValue_* : Read "immutable-properties" GHashTable_gchararray+GValue_* : Read / Write / Construct Only "preferred-handler" gchar* : Read - "user-action-time" gint64 : Read + "user-action-time" gint64 : Read
    @@ -248,15 +248,15 @@
    +properties of this channel request, or NULL if none are known - + - @@ -361,7 +361,7 @@

    tp_channel_request_get_user_action_time ()

    -
    gint64              tp_channel_request_get_user_action_time
+
    gint64              tp_channel_request_get_user_action_time
                                                         (TpChannelRequest *self);
    
 
    
 return the "user-action-time" construct-only property
@@ -455,7 +455,7 @@
    +NULL on success, or an error on failure @@ -499,28 +499,28 @@ - @@ -555,7 +555,7 @@ +NULL on success, or an error on failure @@ -600,28 +600,28 @@ - @@ -709,7 +709,7 @@ @@ -720,14 +720,14 @@ - @@ -798,7 +798,7 @@ @@ -809,14 +809,14 @@ - @@ -907,7 +907,7 @@ @@ -918,14 +918,14 @@ - @@ -972,7 +972,7 @@ 
      "hints"                    GHashTable_gchararray+GValue_*  : Read

    A TP_HASH_TYPE_STRING_VARIANT_MAP of metadata provided by -the channel requester; or NULL if "immutable-properties" +the channel requester; or NULL if "immutable-properties" is not defined or if no hints has been defined.

    @@ -1005,7 +1005,7 @@

    Either the well-known bus name (starting with TP_CLIENT_BUS_NAME_BASE) of the preferred handler for this channel request, -or NULL to indicate that any handler would be acceptable. +or NULL to indicate that any handler would be acceptable.

    Read-only. @@ -1016,7 +1016,7 @@

    The "user-action-time" property

    -
      "user-action-time"         gint64                : Read
    +
      "user-action-time"         gint64                : Read

    The time at which user action occurred, or TP_USER_ACTION_TIME_NOT_USER_ACTION if this channel request is @@ -1071,7 +1071,7 @@

    With telepathy-mission-control version 5.7.1 and earlier, connection and -channel will be NULL. When using newer versions, they will be correctly +channel will be NULL. When using newer versions, they will be correctly set to the newly-created channel, and the connection which owns it.

    @@ -1089,12 +1089,12 @@

    - - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-room.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-room.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-room.html 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-room.html 2012-03-19 15:38:21.000000000 +0000 @@ -133,28 +133,28 @@ - @@ -189,7 +189,7 @@ +NULL on success, or an error on failure @@ -239,28 +239,28 @@ - @@ -295,7 +295,7 @@ +NULL on success, or an error on failure diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-roomlist.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-roomlist.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-roomlist.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-roomlist.html 2012-03-19 15:38:21.000000000 +0000 @@ -160,28 +160,28 @@ - @@ -226,28 +226,28 @@ - @@ -292,28 +292,28 @@ - @@ -348,12 +348,12 @@ - + +NULL on success, or an error on failure @@ -388,7 +388,7 @@ +NULL on success, or an error on failure @@ -423,7 +423,7 @@ +NULL on success, or an error on failure @@ -476,12 +476,12 @@ - - - - - - @@ -650,14 +650,14 @@ - @@ -699,7 +699,7 @@ @@ -710,14 +710,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-text.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-text.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-text.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-text.html 2012-03-19 15:38:21.000000000 +0000 @@ -441,12 +441,12 @@ - - - - - - - - - @@ -753,28 +753,28 @@ - @@ -828,28 +828,28 @@ - @@ -907,28 +907,28 @@ - @@ -963,7 +963,7 @@ +NULL on success, or an error on failure @@ -1002,12 +1002,12 @@ - + +NULL on success, or an error on failure @@ -1046,12 +1046,12 @@ - + +NULL on success, or an error on failure @@ -1090,7 +1090,7 @@ +NULL on success, or an error on failure @@ -1139,7 +1139,7 @@ @@ -1150,14 +1150,14 @@ - @@ -1199,7 +1199,7 @@ @@ -1210,14 +1210,14 @@ - @@ -1259,7 +1259,7 @@ @@ -1270,14 +1270,14 @@ - @@ -1319,7 +1319,7 @@ @@ -1330,14 +1330,14 @@ - @@ -1550,12 +1550,12 @@ - + +NULL on success, or an error on failure @@ -1614,28 +1614,28 @@ - @@ -1698,12 +1698,12 @@ - - - + +NULL on success, or an error on failure @@ -1799,28 +1799,28 @@ - @@ -1883,12 +1883,12 @@ - - @@ -1983,14 +1983,14 @@ - @@ -2076,7 +2076,7 @@ @@ -2087,14 +2087,14 @@ - @@ -2170,7 +2170,7 @@ @@ -2181,14 +2181,14 @@ - @@ -2234,12 +2234,12 @@ - - - @@ -2346,7 +2346,7 @@ +NULL on success, or an error on failure @@ -2395,7 +2395,7 @@ @@ -2406,14 +2406,14 @@ - @@ -2498,12 +2498,12 @@ - - - - - @@ -2684,28 +2684,28 @@ - @@ -2740,12 +2740,12 @@ - + +NULL on success, or an error on failure @@ -2780,12 +2780,12 @@ - + +NULL on success, or an error on failure @@ -2834,7 +2834,7 @@ @@ -2845,14 +2845,14 @@ - @@ -2933,7 +2933,7 @@ @@ -2944,14 +2944,14 @@ - @@ -3028,28 +3028,28 @@ - @@ -3086,20 +3086,20 @@ - + - + - + +NULL on success, or an error on failure @@ -3167,12 +3167,12 @@ - - @@ -258,14 +258,14 @@ - @@ -360,12 +360,12 @@ - - - - - @@ -586,28 +586,28 @@ - @@ -642,7 +642,7 @@ +NULL on success, or an error on failure @@ -677,12 +677,12 @@ - + +NULL on success, or an error on failure @@ -731,7 +731,7 @@ @@ -742,14 +742,14 @@ - @@ -791,7 +791,7 @@ @@ -802,14 +802,14 @@ - @@ -851,7 +851,7 @@ @@ -862,14 +862,14 @@ - @@ -1047,12 +1047,12 @@ - - - - - @@ -1243,28 +1243,28 @@ - @@ -1299,12 +1299,12 @@ - + +NULL on success, or an error on failure @@ -1339,12 +1339,12 @@ - + +NULL on success, or an error on failure @@ -1393,7 +1393,7 @@ @@ -1404,14 +1404,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-tubes.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-tubes.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-tubes.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-tubes.html 2012-03-19 15:38:21.000000000 +0000 @@ -408,12 +408,12 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -1220,28 +1220,28 @@ - @@ -1291,28 +1291,28 @@ - @@ -1357,28 +1357,28 @@ - @@ -1423,28 +1423,28 @@ - @@ -1494,28 +1494,28 @@ - @@ -1565,28 +1565,28 @@ - @@ -1636,28 +1636,28 @@ - @@ -1702,28 +1702,28 @@ - @@ -1778,28 +1778,28 @@ - @@ -1874,28 +1874,28 @@ - @@ -1930,12 +1930,12 @@ - + +NULL on success, or an error on failure @@ -1970,12 +1970,12 @@ - + +NULL on success, or an error on failure @@ -2010,7 +2010,7 @@ +NULL on success, or an error on failure @@ -2045,12 +2045,12 @@ - + +NULL on success, or an error on failure @@ -2085,12 +2085,12 @@ - + +NULL on success, or an error on failure @@ -2125,12 +2125,12 @@ - + +NULL on success, or an error on failure @@ -2165,12 +2165,12 @@ - + +NULL on success, or an error on failure @@ -2206,16 +2206,16 @@ - + - + +NULL on success, or an error on failure @@ -2250,12 +2250,12 @@ - + +NULL on success, or an error on failure @@ -2290,12 +2290,12 @@ - + +NULL on success, or an error on failure @@ -2330,12 +2330,12 @@ - + +NULL on success, or an error on failure @@ -2384,7 +2384,7 @@ @@ -2395,14 +2395,14 @@ - @@ -2444,7 +2444,7 @@ @@ -2455,14 +2455,14 @@ - @@ -2504,7 +2504,7 @@ @@ -2515,14 +2515,14 @@ - @@ -2564,7 +2564,7 @@ @@ -2575,14 +2575,14 @@ - @@ -2624,7 +2624,7 @@ @@ -2635,14 +2635,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-cli-anonymity.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-cli-anonymity.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-cli-anonymity.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-cli-anonymity.html 2012-03-19 15:38:21.000000000 +0000 @@ -104,7 +104,7 @@ @@ -115,14 +115,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-cli-call-channel.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-cli-call-channel.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-cli-call-channel.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-cli-call-channel.html 2012-03-19 15:38:21.000000000 +0000 @@ -204,28 +204,28 @@ - @@ -285,28 +285,28 @@ - @@ -366,28 +366,28 @@ - @@ -432,28 +432,28 @@ - @@ -498,28 +498,28 @@ - @@ -554,7 +554,7 @@ +NULL on success, or an error on failure @@ -589,12 +589,12 @@ - + +NULL on success, or an error on failure @@ -629,7 +629,7 @@ +NULL on success, or an error on failure @@ -664,7 +664,7 @@ +NULL on success, or an error on failure @@ -699,7 +699,7 @@ +NULL on success, or an error on failure @@ -748,7 +748,7 @@ @@ -759,14 +759,14 @@ - @@ -808,7 +808,7 @@ @@ -819,14 +819,14 @@ - @@ -868,7 +868,7 @@ @@ -879,14 +879,14 @@ - @@ -928,7 +928,7 @@ @@ -939,14 +939,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-cli-call-content.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-cli-call-content.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-cli-call-content.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-cli-call-content.html 2012-03-19 15:38:21.000000000 +0000 @@ -392,28 +392,28 @@ - @@ -448,7 +448,7 @@ +NULL on success, or an error on failure @@ -497,7 +497,7 @@ @@ -508,14 +508,14 @@ - @@ -557,7 +557,7 @@ @@ -568,14 +568,14 @@ - @@ -696,28 +696,28 @@ - @@ -767,28 +767,28 @@ - @@ -838,28 +838,28 @@ - @@ -894,7 +894,7 @@ +NULL on success, or an error on failure @@ -929,7 +929,7 @@ +NULL on success, or an error on failure @@ -964,7 +964,7 @@ +NULL on success, or an error on failure @@ -1013,7 +1013,7 @@ @@ -1024,14 +1024,14 @@ - @@ -1073,7 +1073,7 @@ @@ -1084,14 +1084,14 @@ - @@ -1133,7 +1133,7 @@ @@ -1144,14 +1144,14 @@ - @@ -1193,7 +1193,7 @@ @@ -1204,14 +1204,14 @@ - @@ -1253,7 +1253,7 @@ @@ -1264,14 +1264,14 @@ - @@ -1313,7 +1313,7 @@ @@ -1324,14 +1324,14 @@ - @@ -1582,7 +1582,7 @@ @@ -1593,14 +1593,14 @@ - @@ -1642,7 +1642,7 @@ @@ -1653,14 +1653,14 @@ - @@ -1702,7 +1702,7 @@ @@ -1713,14 +1713,14 @@ - @@ -1762,7 +1762,7 @@ @@ -1773,14 +1773,14 @@ - @@ -1822,7 +1822,7 @@ @@ -1833,14 +1833,14 @@ - @@ -2048,28 +2048,28 @@ - @@ -2119,28 +2119,28 @@ - @@ -2175,7 +2175,7 @@ +NULL on success, or an error on failure @@ -2210,7 +2210,7 @@ +NULL on success, or an error on failure @@ -2260,28 +2260,28 @@ - @@ -2331,28 +2331,28 @@ - @@ -2397,28 +2397,28 @@ - @@ -2453,7 +2453,7 @@ +NULL on success, or an error on failure @@ -2488,7 +2488,7 @@ +NULL on success, or an error on failure @@ -2523,7 +2523,7 @@ +NULL on success, or an error on failure @@ -2572,7 +2572,7 @@ @@ -2583,14 +2583,14 @@ - @@ -2632,7 +2632,7 @@ @@ -2643,14 +2643,14 @@ - @@ -2692,7 +2692,7 @@ @@ -2703,14 +2703,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-cli-call-misc.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-cli-call-misc.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-cli-call-misc.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-cli-call-misc.html 2012-03-19 15:38:21.000000000 +0000 @@ -245,28 +245,28 @@ - @@ -316,28 +316,28 @@ - @@ -372,7 +372,7 @@ +NULL on success, or an error on failure @@ -407,7 +407,7 @@ +NULL on success, or an error on failure @@ -462,28 +462,28 @@ - @@ -538,28 +538,28 @@ - @@ -609,28 +609,28 @@ - @@ -685,28 +685,28 @@ - @@ -761,28 +761,28 @@ - @@ -817,7 +817,7 @@ +NULL on success, or an error on failure @@ -852,7 +852,7 @@ +NULL on success, or an error on failure @@ -887,7 +887,7 @@ +NULL on success, or an error on failure @@ -922,7 +922,7 @@ +NULL on success, or an error on failure @@ -957,7 +957,7 @@ +NULL on success, or an error on failure @@ -1006,7 +1006,7 @@ @@ -1017,14 +1017,14 @@ - @@ -1066,7 +1066,7 @@ @@ -1077,14 +1077,14 @@ - @@ -1126,7 +1126,7 @@ @@ -1137,14 +1137,14 @@ - @@ -1186,7 +1186,7 @@ @@ -1197,14 +1197,14 @@ - @@ -1246,7 +1246,7 @@ @@ -1257,14 +1257,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-cli-call-stream.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-cli-call-stream.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-cli-call-stream.html 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-cli-call-stream.html 2012-03-19 15:38:21.000000000 +0000 @@ -363,28 +363,28 @@ - @@ -434,28 +434,28 @@ - @@ -490,7 +490,7 @@ +NULL on success, or an error on failure @@ -525,7 +525,7 @@ +NULL on success, or an error on failure @@ -574,7 +574,7 @@ @@ -585,14 +585,14 @@ - @@ -634,7 +634,7 @@ @@ -645,14 +645,14 @@ - @@ -783,28 +783,28 @@ - @@ -854,28 +854,28 @@ - @@ -925,28 +925,28 @@ - @@ -996,28 +996,28 @@ - @@ -1062,28 +1062,28 @@ - @@ -1143,28 +1143,28 @@ - @@ -1224,28 +1224,28 @@ - @@ -1300,28 +1300,28 @@ - @@ -1356,7 +1356,7 @@ +NULL on success, or an error on failure @@ -1391,7 +1391,7 @@ +NULL on success, or an error on failure @@ -1426,7 +1426,7 @@ +NULL on success, or an error on failure @@ -1461,7 +1461,7 @@ +NULL on success, or an error on failure @@ -1496,7 +1496,7 @@ +NULL on success, or an error on failure @@ -1531,7 +1531,7 @@ +NULL on success, or an error on failure @@ -1566,7 +1566,7 @@ +NULL on success, or an error on failure @@ -1601,7 +1601,7 @@ +NULL on success, or an error on failure @@ -1650,7 +1650,7 @@ @@ -1661,14 +1661,14 @@ - @@ -1710,7 +1710,7 @@ @@ -1721,14 +1721,14 @@ - @@ -1770,7 +1770,7 @@ @@ -1781,14 +1781,14 @@ - @@ -1830,7 +1830,7 @@ @@ -1841,14 +1841,14 @@ - @@ -1890,7 +1890,7 @@ @@ -1901,14 +1901,14 @@ - @@ -1950,7 +1950,7 @@ @@ -1961,14 +1961,14 @@ - @@ -2010,7 +2010,7 @@ @@ -2021,14 +2021,14 @@ - @@ -2070,7 +2070,7 @@ @@ -2081,14 +2081,14 @@ - @@ -2130,7 +2130,7 @@ @@ -2141,14 +2141,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-client-channel-factory.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-client-channel-factory.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-client-channel-factory.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-client-channel-factory.html 2012-03-19 15:38:21.000000000 +0000 @@ -207,11 +207,11 @@ - + - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-client.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-client.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-client.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-client.html 2012-03-19 15:38:21.000000000 +0000 @@ -77,7 +77,7 @@ const gchar *in_Connection, const GPtrArray *in_Channels, const GPtrArray *in_Requests_Satisfied, - guint64 in_User_Action_Time, + guint64 in_User_Action_Time, GHashTable *in_Handler_Info, tp_cli_client_handler_callback_for_handle_channels callback, gpointer user_data, @@ -215,7 +215,7 @@ +NULL on success, or an error on failure @@ -290,28 +290,28 @@ - @@ -346,7 +346,7 @@ +NULL on success, or an error on failure @@ -369,7 +369,7 @@ const gchar *in_Connection, const GPtrArray *in_Channels, const GPtrArray *in_Requests_Satisfied, - guint64 in_User_Action_Time, + guint64 in_User_Action_Time, GHashTable *in_Handler_Info, tp_cli_client_handler_callback_for_handle_channels callback, gpointer user_data, @@ -421,28 +421,28 @@ - @@ -477,7 +477,7 @@ +NULL on success, or an error on failure @@ -532,28 +532,28 @@ - @@ -588,7 +588,7 @@ +NULL on success, or an error on failure @@ -648,28 +648,28 @@ - @@ -704,7 +704,7 @@ +NULL on success, or an error on failure @@ -764,28 +764,28 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-cli-service-point.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-cli-service-point.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-cli-service-point.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-cli-service-point.html 2012-03-19 15:38:21.000000000 +0000 @@ -117,7 +117,7 @@ @@ -128,14 +128,14 @@ - @@ -211,7 +211,7 @@ @@ -222,14 +222,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-addressing.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-addressing.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-addressing.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-addressing.html 2012-03-19 15:38:21.000000000 +0000 @@ -125,28 +125,28 @@ - @@ -206,28 +206,28 @@ - @@ -263,16 +263,16 @@ - + - + +NULL on success, or an error on failure @@ -308,16 +308,16 @@ - + - + +NULL on success, or an error on failure diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-aliasing.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-aliasing.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-aliasing.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-aliasing.html 2012-03-19 15:38:21.000000000 +0000 @@ -183,12 +183,12 @@ - - - - - - - - - @@ -492,28 +492,28 @@ - @@ -563,28 +563,28 @@ - @@ -634,28 +634,28 @@ - @@ -690,12 +690,12 @@ - + +NULL on success, or an error on failure @@ -730,12 +730,12 @@ - + +NULL on success, or an error on failure @@ -770,12 +770,12 @@ - + +NULL on success, or an error on failure @@ -810,7 +810,7 @@ +NULL on success, or an error on failure @@ -859,7 +859,7 @@ @@ -870,14 +870,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-avatars.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-avatars.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-avatars.html 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-avatars.html 2012-03-19 15:38:21.000000000 +0000 @@ -267,12 +267,12 @@ - - - - - - - - - - - - - - - @@ -797,28 +797,28 @@ - @@ -872,28 +872,28 @@ - @@ -943,28 +943,28 @@ - @@ -1018,28 +1018,28 @@ - @@ -1089,28 +1089,28 @@ - @@ -1165,28 +1165,28 @@ - @@ -1221,7 +1221,7 @@ +NULL on success, or an error on failure @@ -1265,32 +1265,32 @@ - + - + - + - + - + - + +NULL on success, or an error on failure @@ -1329,12 +1329,12 @@ - + +NULL on success, or an error on failure @@ -1369,12 +1369,12 @@ - + +NULL on success, or an error on failure @@ -1414,16 +1414,16 @@ - + - + +NULL on success, or an error on failure @@ -1458,7 +1458,7 @@ +NULL on success, or an error on failure @@ -1493,12 +1493,12 @@ - + +NULL on success, or an error on failure @@ -1547,7 +1547,7 @@ @@ -1558,14 +1558,14 @@ - @@ -1607,7 +1607,7 @@ @@ -1618,14 +1618,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-balance.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-balance.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-balance.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-balance.html 2012-03-19 15:38:21.000000000 +0000 @@ -103,7 +103,7 @@ @@ -114,14 +114,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-caps.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-caps.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-caps.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-caps.html 2012-03-19 15:38:21.000000000 +0000 @@ -165,12 +165,12 @@ - + +NULL on success, or an error on failure @@ -220,28 +220,28 @@ - @@ -276,7 +276,7 @@ +NULL on success, or an error on failure @@ -326,28 +326,28 @@ - @@ -430,7 +430,7 @@ @@ -441,14 +441,14 @@ - @@ -496,28 +496,28 @@ - @@ -567,28 +567,28 @@ - @@ -623,12 +623,12 @@ - + +NULL on success, or an error on failure @@ -663,12 +663,12 @@ - + +NULL on success, or an error on failure @@ -717,7 +717,7 @@ @@ -728,14 +728,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-cellular.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-cellular.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-cellular.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-cellular.html 2012-03-19 15:38:21.000000000 +0000 @@ -98,7 +98,7 @@ @@ -109,14 +109,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-client-types.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-client-types.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-client-types.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-client-types.html 2012-03-19 15:38:21.000000000 +0000 @@ -134,28 +134,28 @@ - @@ -205,28 +205,28 @@ - @@ -261,12 +261,12 @@ - + +NULL on success, or an error on failure @@ -301,12 +301,12 @@ - + +NULL on success, or an error on failure @@ -355,7 +355,7 @@ @@ -366,14 +366,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-contact-info.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-contact-info.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-contact-info.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-contact-info.html 2012-03-19 15:38:21.000000000 +0000 @@ -186,28 +186,28 @@ - @@ -257,28 +257,28 @@ - @@ -328,28 +328,28 @@ - @@ -399,28 +399,28 @@ - @@ -455,12 +455,12 @@ - + +NULL on success, or an error on failure @@ -495,7 +495,7 @@ +NULL on success, or an error on failure @@ -530,12 +530,12 @@ - + +NULL on success, or an error on failure @@ -570,7 +570,7 @@ +NULL on success, or an error on failure @@ -619,7 +619,7 @@ @@ -630,14 +630,14 @@ - @@ -688,12 +688,12 @@ - - - - - - - - - @@ -487,28 +487,28 @@ - @@ -558,28 +558,28 @@ - @@ -614,7 +614,7 @@ +NULL on success, or an error on failure @@ -649,12 +649,12 @@ - + +NULL on success, or an error on failure @@ -689,7 +689,7 @@ +NULL on success, or an error on failure @@ -738,7 +738,7 @@ @@ -749,14 +749,14 @@ - @@ -807,12 +807,12 @@ - - - - - - - @@ -1101,28 +1101,28 @@ - @@ -1172,28 +1172,28 @@ - @@ -1248,28 +1248,28 @@ - @@ -1324,28 +1324,28 @@ - @@ -1400,28 +1400,28 @@ - @@ -1456,7 +1456,7 @@ +NULL on success, or an error on failure @@ -1491,7 +1491,7 @@ +NULL on success, or an error on failure @@ -1526,7 +1526,7 @@ +NULL on success, or an error on failure @@ -1561,7 +1561,7 @@ +NULL on success, or an error on failure @@ -1596,7 +1596,7 @@ +NULL on success, or an error on failure @@ -1631,7 +1631,7 @@ +NULL on success, or an error on failure @@ -1680,7 +1680,7 @@ @@ -1691,14 +1691,14 @@ - @@ -1740,7 +1740,7 @@ @@ -1751,14 +1751,14 @@ - @@ -1800,7 +1800,7 @@ @@ -1811,14 +1811,14 @@ - @@ -1860,7 +1860,7 @@ @@ -1871,14 +1871,14 @@ - @@ -2072,28 +2072,28 @@ - @@ -2138,28 +2138,28 @@ - @@ -2209,28 +2209,28 @@ - @@ -2285,28 +2285,28 @@ - @@ -2356,28 +2356,28 @@ - @@ -2427,28 +2427,28 @@ - @@ -2483,7 +2483,7 @@ +NULL on success, or an error on failure @@ -2518,7 +2518,7 @@ +NULL on success, or an error on failure @@ -2553,7 +2553,7 @@ +NULL on success, or an error on failure @@ -2588,7 +2588,7 @@ +NULL on success, or an error on failure @@ -2623,7 +2623,7 @@ +NULL on success, or an error on failure @@ -2658,7 +2658,7 @@ +NULL on success, or an error on failure @@ -2707,7 +2707,7 @@ @@ -2718,14 +2718,14 @@ - @@ -2811,7 +2811,7 @@ @@ -2822,14 +2822,14 @@ - @@ -2910,7 +2910,7 @@ @@ -2921,14 +2921,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-contacts.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-contacts.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-contacts.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-contacts.html 2012-03-19 15:38:21.000000000 +0000 @@ -126,28 +126,28 @@ - @@ -182,12 +182,12 @@ - + +NULL on success, or an error on failure @@ -255,12 +255,12 @@ - - - + +NULL on success, or an error that occurred @@ -860,7 +860,7 @@ - @@ -921,31 +921,31 @@ - - + - @@ -1025,7 +1025,7 @@
  • "self-handle" is valid and non-zero
  • -"self-contact" is non-NULL +"self-contact" is non-NULL
  • all interfaces have been added to the set of "interfaces", and that set will not change again
    • @@ -1248,9 +1248,9 @@ GMainLoop **loop);

    Warning

    -

    tp_connection_run_until_ready has been deprecated since version 0.11.0 and should not be used in newly-written code. Use tp_connection_call_when_ready, - or restructure your program in such a way as to avoid re-entering the - main loop.

    +

    tp_connection_run_until_ready has been deprecated since version 0.11.0 and should not be used in newly-written code. Use tp_proxy_prepare_async() and re-enter the main + loop yourself, or restructure your program in such a way as to avoid + re-entering the main loop.

    If self is connected and ready for use, return immediately. Otherwise, @@ -1272,12 +1272,12 @@

    - + - @@ -1296,6 +1296,10 @@ 
    void                (*TpConnectionWhenReadyCb)          (TpConnection *connection,
                                                          const GError *error,
                                                          gpointer user_data);
    +
    +

    Warning

    +

    TpConnectionWhenReadyCb is deprecated and should not be used in newly-written code. 0.17.UNRELEASED

    +

    Signature of a callback passed to tp_connection_call_when_ready(), which will be called exactly once, when the connection becomes ready or @@ -1307,13 +1311,13 @@

    @@ -1330,6 +1334,10 @@ 
    void                tp_connection_call_when_ready       (TpConnection *self,
                                                          TpConnectionWhenReadyCb callback,
                                                          gpointer user_data);
    +
    +

    Warning

    +

    tp_connection_call_when_ready is deprecated and should not be used in newly-written code. 0.17.UNRELEASED: Use tp_proxy_prepare_async()

    +

    If self is ready for use or has been invalidated, call callback immediately, then return. Otherwise, arrange @@ -1367,6 +1375,11 @@

    tp_connection_is_ready ()

    gboolean            tp_connection_is_ready              (TpConnection *self);
    +
    +

    Warning

    +

    tp_connection_is_ready is deprecated and should not be used in newly-written code. 0.17.UNRELEASED: use tp_proxy_is_prepared() with + TP_CONNECTION_FEATURE_CONNECTED

    +

    Returns the same thing as the "connection-ready" property.

    @@ -1464,7 +1477,7 @@

    tp_connection_get_account ()

    TpAccount *         tp_connection_get_account           (TpConnection *self);

    -Return the the TpAccount associated with this connection. Will return NULL +Return the the TpAccount associated with this connection. Will return NULL if self was not acquired from a TpAccount via tp_account_get_connection(), or if the account object got finalized in the meantime (TpConnection does not keep a strong ref on its TpAccount). @@ -1479,7 +1492,7 @@

    @@ -1492,7 +1505,7 @@ 
    TpConnectionStatus  tp_connection_get_status            (TpConnection *self,
                                                          TpConnectionStatusReason *reason);

    -If reason is not NULL it is set to the reason why "status" changed to its +If reason is not NULL it is set to the reason why "status" changed to its current value, or TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED if unknown.

    actor :

    		either NULL or a location to +either NULL or a location to return the contact who requested the change. [out][allow-none][transfer none]

    reason :

    		either NULL or a location to return the reason +either NULL or a location to return the reason for the change. [out][allow-none]

    message :

    		either NULL or a location to +either NULL or a location to return the user-supplied message. [out][allow-none][transfer none]

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Channel_Type :

    		Used to return an 'out' argument if error is NULL: The interface nameUsed to return an 'out' argument if error is NULL: The interface name

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Target_Handle_Type :

    		Used to return an 'out' argument if error is NULL: The same as TargetHandleType. (TpHandleType)Used to return an 'out' argument if error is NULL: The same as TargetHandleType. (TpHandleType)

    out_Target_Handle :

    		Used to return an 'out' argument if error is NULL: The same as TargetHandle. (TpHandle)Used to return an 'out' argument if error is NULL: The same as TargetHandle. (TpHandle)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Interfaces :

    		Used to return an 'out' argument if error is NULL: An array of the D-Bus interface namesUsed to return an 'out' argument if error is NULL: An array of the D-Bus interface names

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2596,12 +2609,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2659,12 +2672,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2717,12 +2730,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2772,7 +2785,7 @@

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -3003,6 +3016,12 @@

    The "channel-ready" property

      "channel-ready"            gboolean              : Read
    +
    +

    Warning

    +

    TpChannel:channel-ready is deprecated and should not be used in newly-written code. 0.17.UNRELEASED: use tp_proxy_is_prepared() with + TP_CHANNEL_FEATURE_CORE for checks, or tp_proxy_prepare_async() for + notification

    +

    Initially FALSE; changes to TRUE when tp_proxy_prepare_async() has finished preparing TP_CHANNEL_FEATURE_CORE, and if the channel is a @@ -3062,7 +3081,7 @@

    Otherwise, the result may be either a contact representing the user, -or NULL. +or NULL.

    Change notification is via notify::group-self-contact. @@ -3105,8 +3124,8 @@ the empty string.

    -Changed in 0.11.4: this property is never NULL. Previously, -it was NULL before an identifier was known, or when a channel +Changed in 0.11.4: this property is never NULL. Previously, +it was NULL before an identifier was known, or when a channel with no TargetID D-Bus property had TargetHandleType TP_HANDLE_TYPE_NONE.

    Default value: ""

    @@ -3116,7 +3135,7 @@

    The "initiator-contact" property

      "initiator-contact"        TpContact*            : Read

    -The TpContact of the initiator of this channel, or NULL if there is no +The TpContact of the initiator of this channel, or NULL if there is no particular initiator.

    @@ -3132,12 +3151,12 @@

    If the channel appeared for some other reason (for instance as a -side-effect of connecting to the server), this property may be NULL. +side-effect of connecting to the server), this property may be NULL.

    This is not guaranteed to be set until tp_proxy_prepare_async() has finished preparing TP_CHANNEL_FEATURE_CONTACTS; until then, it may be -NULL. +NULL.

    Since 0.15.6

    @@ -3239,12 +3258,12 @@ If this channel is for communication with a single contact (that is, "handle-type" is TP_HANDLE_TYPE_CONTACT), then a TpContact representing the remote contact. For chat rooms, contact search channels and -other channels without a single remote contact, NULL. +other channels without a single remote contact, NULL.

    This is not guaranteed to be set until tp_proxy_prepare_async() has finished preparing TP_CHANNEL_FEATURE_CONTACTS; until then, it may be -NULL. +NULL.

    Since 0.15.6

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-media.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-media.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-media.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-media.html 2012-03-19 15:38:21.000000000 +0000 @@ -468,28 +468,28 @@

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    out_Streams :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> An array of structs containing: <ul> <li>the stream identifier</li> <li>the contact handle who the stream is with (or 0 if the stream represents more than a single member)</li> <li>the type of the stream</li> <li>the current stream state</li> <li>the current direction of the stream</li> <li>the current pending send flags</li> </ul>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> An array of structs containing: <ul> <li>the stream identifier</li> <li>the contact handle who the stream is with (or 0 if the stream represents more than a single member)</li> <li>the type of the stream</li> <li>the current stream state</li> <li>the current direction of the stream</li> <li>the current pending send flags</li> </ul>

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Streams :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> An array of structs (in the same order as the given stream types) containing: <ul> <li>the stream identifier</li> <li>the contact handle who the stream is with (or 0 if the stream represents more than a single member)</li> <li>the type of the stream</li> <li>the current stream state</li> <li>the current direction of the stream</li> <li>the current pending send flags</li> </ul>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> An array of structs (in the same order as the given stream types) containing: <ul> <li>the stream identifier</li> <li>the contact handle who the stream is with (or 0 if the stream represents more than a single member)</li> <li>the type of the stream</li> <li>the current stream state</li> <li>the current direction of the stream</li> <li>the current pending send flags</li> </ul>

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -974,12 +974,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1038,12 +1038,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1107,12 +1107,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1162,7 +1162,7 @@

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    out_States :

    		Used to return an 'out' argument if error is NULL: The current call states. Participants where the call state flags would be 0 (all unset) may be omitted from this mapping.Used to return an 'out' argument if error is NULL: The current call states. Participants where the call state flags would be 0 (all unset) may be omitted from this mapping.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1940,12 +1940,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1999,12 +1999,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2060,28 +2060,28 @@

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    out_HoldState :

    		Used to return an 'out' argument if error is NULL: The state of the channel (TpLocalHoldState)Used to return an 'out' argument if error is NULL: The state of the channel (TpLocalHoldState)

    out_Reason :

    		Used to return an 'out' argument if error is NULL: The reason why the channel is in that state (TpLocalHoldStateReason)Used to return an 'out' argument if error is NULL: The reason why the channel is in that state (TpLocalHoldStateReason)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2820,7 +2820,7 @@

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -3038,7 +3038,7 @@

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -3153,28 +3153,28 @@

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    out_Session_Handlers :

    		Used to return an 'out' argument if error is NULL: (Undocumented)Used to return an 'out' argument if error is NULL: (Undocumented)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    immutable_properties :

    		 As many as are known of the immutable D-Bus -properties of this channel request, or NULL if none are known

    error :

    		Used to raise an error if NULL is returnedUsed to raise an error if NULL is returned

    Returns :

    		a new reference to an channel request proxy, or NULL if +a new reference to an channel request proxy, or NULL if object_path is not syntactically valid or the channel dispatcher is not running

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    connection :

    		the TpConnection of channel, or NULL +the TpConnection of channel, or NULL

    channel :

    		the TpChannel created, or NULL +the TpChannel created, or NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    out_In_Progress :

    		Used to return an 'out' argument if error is NULL: A boolean indicating if room listing is in progressUsed to return an 'out' argument if error is NULL: A boolean indicating if room listing is in progress

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -530,12 +530,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -584,12 +584,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -639,7 +639,7 @@

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -500,12 +500,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -564,12 +564,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -627,12 +627,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -683,28 +683,28 @@

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Available_Types :

    		Used to return an 'out' argument if error is NULL: An array of integer message types (ChannelTextMessageType)Used to return an 'out' argument if error is NULL: An array of integer message types (ChannelTextMessageType)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Pending_Messages :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> An array of structs representing the pending queue. Each contains: <ul> <li>a numeric identifier</li> <li>a Unix timestamp indicating when the message was received</li> <li>the contact handle for the contact who sent the message</li> <li>the message type, taken from ChannelTextMessageType</li> <li>the bitwise-OR of the message flags from ChannelTextMessageFlags</li> <li>the text of the message</li> </ul>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> An array of structs representing the pending queue. Each contains: <ul> <li>a numeric identifier</li> <li>a Unix timestamp indicating when the message was received</li> <li>the contact handle for the contact who sent the message</li> <li>the message type, taken from ChannelTextMessageType</li> <li>the bitwise-OR of the message flags from ChannelTextMessageFlags</li> <li>the text of the message</li> </ul>

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    out_Content :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The content of the requested parts. The keys in this mapping are positions in the array of message parts; the values are either of type 's' or 'ay' (UTF-8 text string, or byte array), following the same rules as for the value of the 'content' key in the <tp:type>Message_Part</tp:type> mappings.</p> <p>If the one of the requested part numbers was greater than zero but referred to a part that had no content (i.e. it had no 'content-type' key or no 'content' key), it is simply omitted from this mapping; this is not considered to be an error condition.</p>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The content of the requested parts. The keys in this mapping are positions in the array of message parts; the values are either of type 's' or 'ay' (UTF-8 text string, or byte array), following the same rules as for the value of the 'content' key in the <tp:type>Message_Part</tp:type> mappings.</p> <p>If the one of the requested part numbers was greater than zero but referred to a part that had no content (i.e. it had no 'content-type' key or no 'content' key), it is simply omitted from this mapping; this is not considered to be an error condition.</p>

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1739,12 +1739,12 @@

    out_Token :

    		Used to return an 'out' argument if error is NULL: An opaque token used to match any incoming delivery or failure reports against this message, or an empty string if the message is not readily identifiable.Used to return an 'out' argument if error is NULL: An opaque token used to match any incoming delivery or failure reports against this message, or an empty string if the message is not readily identifiable.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1972,7 +1972,7 @@

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2290,28 +2290,28 @@

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2562,12 +2562,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2613,28 +2613,28 @@

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    out_Password_Flags :

    		Used to return an 'out' argument if error is NULL: An integer with the logical OR of all the flags set (values of ChannelPasswordFlags) (TpChannelPasswordFlags)Used to return an 'out' argument if error is NULL: An integer with the logical OR of all the flags set (values of ChannelPasswordFlags) (TpChannelPasswordFlags)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Correct :

    		Used to return an 'out' argument if error is NULL: A boolean indicating whether or not the password was correctUsed to return an 'out' argument if error is NULL: A boolean indicating whether or not the password was correct

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    out_Chunks_Required :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The number of 140 octet chunks required to send this message.</p> <p>For example, in the GSM standard 7-bit encoding, a 162 character message would require 2 chunks.</p>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The number of 140 octet chunks required to send this message.</p> <p>For example, in the GSM standard 7-bit encoding, a 162 character message would require 2 chunks.</p>

    out_Remaining_Characters :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The number of further characters that can be fit in the final chunk. A negative value indicates that the message will be truncated by <code>abs(Remaining_Characters)</code>. The value <code>MIN_INT32</code> (<code>-2<sup>31</sup></code>) indicates the message will be truncated by an unknown amount.</p> <p>For example, in the GSM standard 7-bit encoding, a 162 character message would return 144 remaining characters (because of the space required for the multipart SMS header).</p>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The number of further characters that can be fit in the final chunk. A negative value indicates that the message will be truncated by <code>abs(Remaining_Characters)</code>. The value <code>MIN_INT32</code> (<code>-2<sup>31</sup></code>) indicates the message will be truncated by an unknown amount.</p> <p>For example, in the GSM standard 7-bit encoding, a 162 character message would return 144 remaining characters (because of the space required for the multipart SMS header).</p>

    out_Estimated_Cost :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The estimated cost of sending this message. The currency and scale of this value are the same as the <tp:dbus-ref namespace="ofdT.Connection.Interface">Balance.AccountBalance</tp:dbus-ref> property.</p> <p>A value of <code>-1</code> indicates the cost could not be estimated.</p>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The estimated cost of sending this message. The currency and scale of this value are the same as the <tp:dbus-ref namespace="ofdT.Connection.Interface">Balance.AccountBalance</tp:dbus-ref> property.</p> <p>A value of <code>-1</code> indicates the cost could not be estimated.</p>

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-tube.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-tube.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-channel-tube.html 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-channel-tube.html 2012-03-19 15:38:21.000000000 +0000 @@ -247,7 +247,7 @@

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -434,12 +434,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -505,28 +505,28 @@

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_address :

    		Used to return an 'out' argument if error is NULL: The address on which the connection manager will listen for connections to this tube. The client should not attempt to connect to the address until the tube is open.Used to return an 'out' argument if error is NULL: The address on which the connection manager will listen for connections to this tube. The client should not attempt to connect to the address until the tube is open.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1111,12 +1111,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1172,28 +1172,28 @@

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    out_address :

    		Used to return an 'out' argument if error is NULL: The string describing the address of the private bus. The client SHOULD NOT attempt to connect to the address until the tube is open.Used to return an 'out' argument if error is NULL: The string describing the address of the private bus. The client SHOULD NOT attempt to connect to the address until the tube is open.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_address :

    		Used to return an 'out' argument if error is NULL: The string describing the address of the private bus. The client SHOULD NOT attempt to connect to the address until the tube is open.Used to return an 'out' argument if error is NULL: The string describing the address of the private bus. The client SHOULD NOT attempt to connect to the address until the tube is open.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -487,12 +487,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -546,12 +546,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -605,12 +605,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -664,12 +664,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -728,12 +728,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -792,12 +792,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -861,12 +861,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -920,12 +920,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -989,12 +989,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1078,12 +1078,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1134,28 +1134,28 @@

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    out_Address :

    		Used to return an 'out' argument if error is NULL: The string describing the address of the private bus. The client should not attempt to connect to the address until the tube is open.Used to return an 'out' argument if error is NULL: The string describing the address of the private bus. The client should not attempt to connect to the address until the tube is open.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Address :

    		Used to return an 'out' argument if error is NULL: The address on which the connection manager will listen for connections to this tube. The client should not attempt to connect to the address until the tube is open.Used to return an 'out' argument if error is NULL: The address on which the connection manager will listen for connections to this tube. The client should not attempt to connect to the address until the tube is open.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Available_Stream_Tube_Types :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A mapping from address types (members of Socket_Address_Type) to arrays of access-control type (members of Socket_Access_Control) that the connection manager supports for stream tubes with that address type. For simplicity, if a CM supports offering a particular type of tube, it is assumed to support accepting it.</p> <p>A typical value for a host without IPv6 support:</p> <pre> { Socket_Address_Type_IPv4: [Socket_Access_Control_Localhost, Socket_Access_Control_Port, Socket_Access_Control_Netmask], Socket_Address_Type_Unix: [Socket_Access_Control_Localhost, Socket_Access_Control_Credentials] } </pre> <p>If stream tubes are not supported, this will be an empty dictionary.</p>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A mapping from address types (members of Socket_Address_Type) to arrays of access-control type (members of Socket_Access_Control) that the connection manager supports for stream tubes with that address type. For simplicity, if a CM supports offering a particular type of tube, it is assumed to support accepting it.</p> <p>A typical value for a host without IPv6 support:</p> <pre> { Socket_Address_Type_IPv4: [Socket_Access_Control_Localhost, Socket_Access_Control_Port, Socket_Access_Control_Netmask], Socket_Address_Type_Unix: [Socket_Access_Control_Localhost, Socket_Access_Control_Credentials] } </pre> <p>If stream tubes are not supported, this will be an empty dictionary.</p>

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Available_Tube_Types :

    		Used to return an 'out' argument if error is NULL: An array of the available tube types, as defined by the Tube_Type enum.Used to return an 'out' argument if error is NULL: An array of the available tube types, as defined by the Tube_Type enum.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_DBus_Names :

    		Used to return an 'out' argument if error is NULL: An array of structures, each containing a contact handle and a D-Bus bus name.Used to return an 'out' argument if error is NULL: An array of structures, each containing a contact handle and a D-Bus bus name.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Address :

    		Used to return an 'out' argument if error is NULL: The bus address.Used to return an 'out' argument if error is NULL: The bus address.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Address_Type :

    		Used to return an 'out' argument if error is NULL: The type of the listening address of the socket, as a member of Socket_Address_Type. (TpSocketAddressType)Used to return an 'out' argument if error is NULL: The type of the listening address of the socket, as a member of Socket_Address_Type. (TpSocketAddressType)

    out_Address :

    		Used to return an 'out' argument if error is NULL: The listening address of the socket, as indicated by the address_type.Used to return an 'out' argument if error is NULL: The listening address of the socket, as indicated by the address_type.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Tubes :

    		Used to return an 'out' argument if error is NULL: Return an array of tuples, each representing a tube, with the following members: <ul> <li>the tube's ID</li> <li>the tube's initiator</li> <li>the tube's type</li> <li>the tube's service</li> <li>the tube's parameters</li> <li>the tube's state</li> </ul>Used to return an 'out' argument if error is NULL: Return an array of tuples, each representing a tube, with the following members: <ul> <li>the tube's ID</li> <li>the tube's initiator</li> <li>the tube's type</li> <li>the tube's service</li> <li>the tube's parameters</li> <li>the tube's state</li> </ul>

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Tube_ID :

    		Used to return an 'out' argument if error is NULL: The ID of the new tube. (TpTubeID)Used to return an 'out' argument if error is NULL: The ID of the new tube. (TpTubeID)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Tube_ID :

    		Used to return an 'out' argument if error is NULL: The ID of the new tube. (TpTubeID)Used to return an 'out' argument if error is NULL: The ID of the new tube. (TpTubeID)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Content :

    		Used to return an 'out' argument if error is NULL: Path to the newly-created <tp:dbus-ref namespace="org.freedesktop.Telepathy">Call1.Content</tp:dbus-ref> object.Used to return an 'out' argument if error is NULL: Path to the newly-created <tp:dbus-ref namespace="org.freedesktop.Telepathy">Call1.Content</tp:dbus-ref> object.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    error :

    		used to indicate the error if NULL is returnedused to indicate the error if NULL is returned

    Returns :

    		a new channel proxy, or NULL on invalid arguments. [transfer full] +a new channel proxy, or NULL on invalid arguments. [transfer full]

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    out_Requested :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A mapping of requested URIs to the corresponding contact handles.</p> <p>Requested URIs that are not valid or understood for this protocol MUST be omitted from the mapping.</p>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A mapping of requested URIs to the corresponding contact handles.</p> <p>Requested URIs that are not valid or understood for this protocol MUST be omitted from the mapping.</p>

    out_Attributes :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A dictionary mapping the contact handles to contact attributes. If any of the requested addresses are in fact invalid, they are simply omitted from this mapping. If contact attributes are not immediately known, the behaviour is defined by the interface; the attribute should either be omitted from the result or replaced with a default value.</p> <p>Requested URIs that are not valid or understood for this protocol MUST be omitted from the mapping.</p> <p>Each contact's attributes will always include at least the identifier that would be obtained by inspecting the handle (<code>org.freedesktop.Telepathy.Connection/contact-id</code>). </p>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A dictionary mapping the contact handles to contact attributes. If any of the requested addresses are in fact invalid, they are simply omitted from this mapping. If contact attributes are not immediately known, the behaviour is defined by the interface; the attribute should either be omitted from the result or replaced with a default value.</p> <p>Requested URIs that are not valid or understood for this protocol MUST be omitted from the mapping.</p> <p>Each contact's attributes will always include at least the identifier that would be obtained by inspecting the handle (<code>org.freedesktop.Telepathy.Connection/contact-id</code>). </p>

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Requested :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A mapping from requested vCard addresses to the corresponding contact handles.</p> <p>Requested addresses that are not valid or understood for this protocol MUST be omitted from the mapping.</p>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A mapping from requested vCard addresses to the corresponding contact handles.</p> <p>Requested addresses that are not valid or understood for this protocol MUST be omitted from the mapping.</p>

    out_Attributes :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A dictionary mapping the contact handles to contact attributes. If any of the requested addresses are in fact invalid, they are simply omitted from this mapping. If contact attributes are not immediately known, the behaviour is defined by the interface; the attribute should either be omitted from the result or replaced with a default value.</p> <p>Requested addresses that are not valid or understood for this protocol MUST be omitted from the mapping.</p> <p>Each contact's attributes will always include at least the identifier that would be obtained by inspecting the handle (<code>org.freedesktop.Telepathy.Connection/contact-id</code>). </p>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A dictionary mapping the contact handles to contact attributes. If any of the requested addresses are in fact invalid, they are simply omitted from this mapping. If contact attributes are not immediately known, the behaviour is defined by the interface; the attribute should either be omitted from the result or replaced with a default value.</p> <p>Requested addresses that are not valid or understood for this protocol MUST be omitted from the mapping.</p> <p>Each contact's attributes will always include at least the identifier that would be obtained by inspecting the handle (<code>org.freedesktop.Telepathy.Connection/contact-id</code>). </p>

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -247,12 +247,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -311,12 +311,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -370,12 +370,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -421,28 +421,28 @@

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    out_Alias_Flags :

    		Used to return an 'out' argument if error is NULL: An integer with a bitwise OR of flags from ConnectionAliasFlags (TpConnectionAliasFlags)Used to return an 'out' argument if error is NULL: An integer with a bitwise OR of flags from ConnectionAliasFlags (TpConnectionAliasFlags)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Aliases :

    		Used to return an 'out' argument if error is NULL: A list of aliases in the same order as the contact handlesUsed to return an 'out' argument if error is NULL: A list of aliases in the same order as the contact handles

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Aliases :

    		Used to return an 'out' argument if error is NULL: A dictionary mapping contact handles to aliasesUsed to return an 'out' argument if error is NULL: A dictionary mapping contact handles to aliases

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -351,12 +351,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -415,12 +415,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -479,12 +479,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -548,12 +548,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -607,12 +607,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -676,12 +676,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -727,28 +727,28 @@

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_MIME_Types :

    		Used to return an 'out' argument if error is NULL: An array of supported MIME types (eg image/jpeg)Used to return an 'out' argument if error is NULL: An array of supported MIME types (eg image/jpeg)

    out_Min_Width :

    		Used to return an 'out' argument if error is NULL: The minimum image width in pixelsUsed to return an 'out' argument if error is NULL: The minimum image width in pixels

    out_Min_Height :

    		Used to return an 'out' argument if error is NULL: The minimum image height in pixelsUsed to return an 'out' argument if error is NULL: The minimum image height in pixels

    out_Max_Width :

    		Used to return an 'out' argument if error is NULL: The maximum image width in pixels, or 0 if there is no limitUsed to return an 'out' argument if error is NULL: The maximum image width in pixels, or 0 if there is no limit

    out_Max_Height :

    		Used to return an 'out' argument if error is NULL: The maximum image height in pixels, or 0 if there is no limitUsed to return an 'out' argument if error is NULL: The maximum image height in pixels, or 0 if there is no limit

    out_Max_Bytes :

    		Used to return an 'out' argument if error is NULL: The maximum image size in bytes, or 0 if there is no limitUsed to return an 'out' argument if error is NULL: The maximum image size in bytes, or 0 if there is no limit

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Tokens :

    		Used to return an 'out' argument if error is NULL: An array of avatar tokens or empty strings (if no avatar is set) in the same order as the given array of contact handlesUsed to return an 'out' argument if error is NULL: An array of avatar tokens or empty strings (if no avatar is set) in the same order as the given array of contact handles

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Tokens :

    		Used to return an 'out' argument if error is NULL: A dictionary of handles mapped to avatar tokens, containing only the known avatar tokens.Used to return an 'out' argument if error is NULL: A dictionary of handles mapped to avatar tokens, containing only the known avatar tokens.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Data :

    		Used to return an 'out' argument if error is NULL: An array of bytes containing the image dataUsed to return an 'out' argument if error is NULL: An array of bytes containing the image data

    out_MIME_Type :

    		Used to return an 'out' argument if error is NULL: A string containing the image MIME type (eg image/jpeg), or empty if unknownUsed to return an 'out' argument if error is NULL: A string containing the image MIME type (eg image/jpeg), or empty if unknown

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Token :

    		Used to return an 'out' argument if error is NULL: The string token of the new avatarUsed to return an 'out' argument if error is NULL: The string token of the new avatar

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    out_Contact_Capabilities :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A map from contact handles to lists of requestable channel classes, representing the channel requests that are expected to succeed for that contact.</p> <p>Contacts listed among Handles whose capabilities are unknown SHOULD be omitted from this map; contacts known to have an empty set of capabilities SHOULD be included in the keys of this map, with an empty array as the corresponding value.</p>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A map from contact handles to lists of requestable channel classes, representing the channel requests that are expected to succeed for that contact.</p> <p>Contacts listed among Handles whose capabilities are unknown SHOULD be omitted from this map; contacts known to have an empty set of capabilities SHOULD be included in the keys of this map, with an empty array as the corresponding value.</p>

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    out_Self_Capabilities :

    		Used to return an 'out' argument if error is NULL: An array of structures describing the current capabilities containing: <ul> <li>a string channel type</li> <li>a bitwise OR of type specific capability flags</li> </ul>Used to return an 'out' argument if error is NULL: An array of structures describing the current capabilities containing: <ul> <li>a string channel type</li> <li>a bitwise OR of type specific capability flags</li> </ul>

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Contact_Capabilities :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> An array of structures containing: <ul> <li>an integer handle representing the contact</li> <li>a string channel type</li> <li>a bitwise OR of generic capability flags for the type</li> <li>a bitwise OR of type specific capability flags for the type</li> </ul>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> An array of structures containing: <ul> <li>an integer handle representing the contact</li> <li>a string channel type</li> <li>a bitwise OR of generic capability flags for the type</li> <li>a bitwise OR of type specific capability flags for the type</li> </ul>

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    out_Client_Types :

    		Used to return an 'out' argument if error is NULL: The contacts' client types, if already known. Contacts whose client types are not already known are omitted from the mapping; contacts known to have no client type information appear in the mapping with an empty list.Used to return an 'out' argument if error is NULL: The contacts' client types, if already known. Contacts whose client types are not already known are omitted from the mapping; contacts known to have no client type information appear in the mapping with an empty list.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Client_Types :

    		Used to return an 'out' argument if error is NULL: The contact's client types. It MAY be empty, indicating that no client type information was found.Used to return an 'out' argument if error is NULL: The contact's client types. It MAY be empty, indicating that no client type information was found.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    out_ContactInfo :

    		Used to return an 'out' argument if error is NULL: A dictionary mapping contact handles to information, whose keys are the subset of the requested list of handles for which information was cached.Used to return an 'out' argument if error is NULL: A dictionary mapping contact handles to information, whose keys are the subset of the requested list of handles for which information was cached.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Contact_Info :

    		Used to return an 'out' argument if error is NULL: Information about that contact.Used to return an 'out' argument if error is NULL: Information about that contact.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -747,12 +747,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -811,12 +811,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -870,12 +870,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-contact-list.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-contact-list.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-contact-list.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-contact-list.html 2012-03-19 15:38:21.000000000 +0000 @@ -421,28 +421,28 @@

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Contacts :

    		Used to return an 'out' argument if error is NULL: The blocked contacts’ handles, together with their identifiers.Used to return an 'out' argument if error is NULL: The blocked contacts’ handles, together with their identifiers.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -866,12 +866,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -925,12 +925,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1025,28 +1025,28 @@

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    out_Attributes :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A dictionary mapping the contact handles to contact attributes. If any of the requested handles are in fact invalid, they are simply omitted from this mapping. If contact attributes are not immediately known, the behaviour is defined by the interface; the attribute should either be omitted from the result or replaced with a default value.</p> <p>Each contact's attributes will always include at least the identifier that would be obtained by inspecting the handle (<code>org.freedesktop.Telepathy.Connection/contact-id</code>).</p>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A dictionary mapping the contact handles to contact attributes. If any of the requested handles are in fact invalid, they are simply omitted from this mapping. If contact attributes are not immediately known, the behaviour is defined by the interface; the attribute should either be omitted from the result or replaced with a default value.</p> <p>Each contact's attributes will always include at least the identifier that would be obtained by inspecting the handle (<code>org.freedesktop.Telepathy.Connection/contact-id</code>).</p>

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection.html 2012-03-19 15:38:21.000000000 +0000 @@ -47,7 +47,7 @@ #include <telepathy-glib/telepathy-glib.h> void (*TpConnectionNameListCb) (const gchar * const *names, - gsize n, + gsize n, const gchar * const *cms, const gchar * const *protocols, const GError *error, @@ -762,7 +762,7 @@

    TpConnectionNameListCb ()

    void                (*TpConnectionNameListCb)           (const gchar * const *names,
-                                                         gsize n,
+                                                         gsize n,
                                                          const gchar * const *cms,
                                                          const gchar * const *protocols,
                                                          const GError *error,
@@ -777,34 +777,34 @@

    names :

    		 -NULL-terminated array of n -connection bus names, or NULL on error. [array zero-terminated=1] +NULL-terminated array of n +connection bus names, or NULL on error. [array zero-terminated=1]

    n :

    		number of names (not including the final NULL), or 0 on errornumber of names (not including the final NULL), or 0 on error

    cms :

    		 -NULL-terminated array of n +NULL-terminated array of n connection manager names (e.g. "gabble") in the same order as names, or -NULL on error. [array zero-terminated=1] +NULL on error. [array zero-terminated=1]

    protocols :

    		 -NULL-terminated array of +NULL-terminated array of n protocol names as defined in the Telepathy spec (e.g. "jabber") in the -same order as names, or NULL on error. [array zero-terminated=1] +same order as names, or NULL on error. [array zero-terminated=1]

    error :

    		 -NULL on success, or an error that occurred

    user_data :

    weak_object :

    		if not NULL, will be weakly referenced; the callback will +if not NULL, will be weakly referenced; the callback will not be called if the object has vanished. [allow-none]

    dbus :

    		a D-Bus daemon; may not be NULL +a D-Bus daemon; may not be NULL

    bus_name :

    		 the well-known or unique name of the connection process; if well-known, this function will make a blocking call to the bus -daemon to resolve the unique name. May be NULL if object_path is not, in +daemon to resolve the unique name. May be NULL if object_path is not, in which case a well-known name will be derived from object_path. [allow-none]

    object_path :

    		 the object path of the connection process. -May be NULL if bus_name is a well-known name, in which case the object +May be NULL if bus_name is a well-known name, in which case the object path will be derived from bus_name. [allow-none]

    error :

    		used to indicate the error if NULL is returnedused to indicate the error if NULL is returned

    Returns :

    		a new connection proxy, or NULL if unique-name resolution +a new connection proxy, or NULL if unique-name resolution fails or on invalid arguments

    error :

    		if not NULL and FALSE is returned, used to raise an errorif not NULL and FALSE is returned, used to raise an error

    loop :

    		if not NULL, a GMainLoop is placed here while it is being run -(so calling code can call g_main_loop_quit() to abort), and NULL is +if not NULL, a GMainLoop is placed here while it is being run +(so calling code can call g_main_loop_quit() to abort), and NULL is placed here after the loop has been run

    connection :

    		 the connection (which may be in the middle of being disposed, -if error is non-NULL, error->domain is TP_DBUS_ERRORS and error->code is +if error is non-NULL, error->domain is TP_DBUS_ERRORS and error->code is TP_DBUS_ERROR_PROXY_UNREFERENCED)

    error :

    		 -NULL if the connection is ready for use, or the error with which +NULL if the connection is ready for use, or the error with which it was invalidated if it is now invalid

    Returns :

    		 the account associated with this connection, or -NULL. [transfer none] +NULL. [transfer none]
    @@ -1504,7 +1517,7 @@ - @@ -1584,7 +1597,7 @@ @@ -1700,20 +1713,20 @@ +NULL on success, or an error on failure @@ -1768,7 +1781,7 @@ @@ -1787,7 +1800,7 @@ - @@ -1842,12 +1855,12 @@ +tp_connection_hold_handles() on success, or NULL on failure +NULL on success, or an error on failure @@ -1953,7 +1966,7 @@ - @@ -2033,7 +2046,7 @@ - @@ -2106,7 +2119,7 @@ - @@ -2279,7 +2292,7 @@ - @@ -2350,7 +2363,7 @@ - @@ -2481,7 +2494,7 @@ disconnected by a user request).

    -Otherwise, return NULL, without altering details. +Otherwise, return NULL, without altering details.

    reason :

    		a TpConnectionStatusReason, or NULL. [out] +a TpConnectionStatusReason, or NULL. [out]

    Returns :

    		 the value of the TpConnection:self-contact -property, which may be NULL. [transfer none] +property, which may be NULL. [transfer none]

    handles :

    		 the n_handles -handles corresponding to ids, in the same order, or NULL on failure. [element-type uint][array length=n_handles] +handles corresponding to ids, in the same order, or NULL on failure. [element-type uint][array length=n_handles]

    ids :

    		 a copy of the array of n_handles IDs that was passed to tp_connection_request_handles() on -success, or NULL on failure. [element-type utf8][array length=n_handles] +success, or NULL on failure. [element-type utf8][array length=n_handles]

    error :

    		 -NULL on success, or an error on failure

    user_data :

    ids :

    		 an array of string identifiers for which -handles are required, terminated by NULL (must not be NULL or empty). [array zero-terminated=1] +handles are required, terminated by NULL (must not be NULL or empty). [array zero-terminated=1]

    weak_object :

    		if not NULL, an object to be weakly referenced: if it is +if not NULL, an object to be weakly referenced: if it is destroyed, callback will not be called

    handles :

    		 a copy of the array of n_handles handles that was passed to -tp_connection_hold_handles() on success, or NULL on failure

    error :

    		 -NULL on success, or an error on failure

    user_data :

    weak_object :

    		if not NULL, an object to be weakly referenced: if it is +if not NULL, an object to be weakly referenced: if it is destroyed, callback will not be called

    weak_object :

    		if not NULL, an object to be weakly referenced: if it is +if not NULL, an object to be weakly referenced: if it is destroyed, callback will not be called

    weak_object :

    		if not NULL, an object to be weakly referenced: if it is +if not NULL, an object to be weakly referenced: if it is destroyed, callback will not be called

    Returns :

    		a TpAvatarRequirements struct, or NULL if the +a TpAvatarRequirements struct, or NULL if the feature is not yet prepared or the connection doesn't have the necessary properties. [transfer none]

    Returns :

    		a GList of TpContactInfoFieldSpec struct, or NULL if the feature is not +a GList of TpContactInfoFieldSpec struct, or NULL if the feature is not yet prepared or the connection doesn't have the necessary properties. [element-type TelepathyGLib.ContactInfoFieldSpec][transfer container]
    @@ -2498,7 +2511,7 @@ - @@ -2651,18 +2664,18 @@ - - @@ -4529,7 +4542,7 @@ +NULL on success, or an error on failure @@ -4573,28 +4586,28 @@ - @@ -4641,12 +4654,12 @@ - - +NULL on success, or an error on failure @@ -4726,28 +4739,28 @@ - @@ -4794,12 +4807,12 @@ - - - + +NULL on success, or an error on failure @@ -4885,28 +4898,28 @@ - @@ -4959,12 +4972,12 @@ - - - + +NULL on success, or an error on failure @@ -5050,28 +5063,28 @@ - @@ -5123,12 +5136,12 @@ - - - + +NULL on success, or an error on failure @@ -5222,28 +5235,28 @@ - @@ -5296,12 +5309,12 @@ - - - + +NULL on success, or an error on failure @@ -5386,28 +5399,28 @@ - @@ -5459,12 +5472,12 @@ - - +NULL on success, or an error on failure @@ -5555,28 +5568,28 @@ - @@ -5633,12 +5646,12 @@ - - - + +NULL on success, or an error on failure @@ -5734,28 +5747,28 @@ - @@ -5818,12 +5831,12 @@ - - - + +NULL on success, or an error on failure @@ -5917,28 +5930,28 @@ - @@ -5990,12 +6003,12 @@ - - +NULL on success, or an error on failure @@ -6086,28 +6099,28 @@ - @@ -6165,12 +6178,12 @@ - - - + +NULL on success, or an error on failure @@ -6284,28 +6297,28 @@ - @@ -6378,12 +6391,12 @@ - - - + +NULL on success, or an error on failure @@ -6479,28 +6492,28 @@ - @@ -6563,12 +6576,12 @@ - - @@ -6683,14 +6696,14 @@ - @@ -6766,7 +6779,7 @@ @@ -6777,14 +6790,14 @@ - @@ -6865,7 +6878,7 @@ @@ -6876,14 +6889,14 @@ - @@ -6964,7 +6977,7 @@ @@ -6975,14 +6988,14 @@ - @@ -7025,28 +7038,28 @@ - @@ -7096,28 +7109,28 @@ - @@ -7152,7 +7165,7 @@ +NULL on success, or an error on failure @@ -7187,7 +7200,7 @@ +NULL on success, or an error on failure @@ -7348,6 +7361,12 @@

    The "connection-ready" property

      "connection-ready"         gboolean              : Read
    +
    +

    Warning

    +

    TpConnection:connection-ready is deprecated and should not be used in newly-written code. 0.17.UNRELEASED: use tp_proxy_is_prepared() with + TP_CHANNEL_FEATURE_CONNECTED for checks, or tp_proxy_prepare_async() for + notification

    +

    Initially FALSE; changes to TRUE when the connection has gone to CONNECTED status, introspection has finished and it's ready for use. @@ -7500,7 +7519,7 @@ 

      "self-contact"             TpContact*            : Read

    A TpContact representing the local user on this connection, -or NULL if not yet available. +or NULL if not yet available.

    If the local user's unique identifier changes (for instance by using @@ -7512,7 +7531,7 @@ passed to tp_simple_client_factory_add_contact_features() prepared.

    -To wait for a non-NULL self-contact (and other properties), call +To wait for a non-NULL self-contact (and other properties), call tp_proxy_prepare_async() with the feature TP_CONNECTION_FEATURE_CONNECTED.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-location.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-location.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-location.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-location.html 2012-03-19 15:38:21.000000000 +0000 @@ -145,7 +145,7 @@
    @@ -156,14 +156,14 @@ - @@ -245,28 +245,28 @@ - @@ -301,12 +301,12 @@ - + +NULL on success, or an error on failure @@ -356,28 +356,28 @@ - @@ -412,12 +412,12 @@ - + +NULL on success, or an error on failure @@ -467,28 +467,28 @@ - @@ -523,7 +523,7 @@ +NULL on success, or an error on failure diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-mail.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-mail.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-mail.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-mail.html 2012-03-19 15:38:21.000000000 +0000 @@ -141,28 +141,28 @@ - @@ -217,28 +217,28 @@ - @@ -273,12 +273,12 @@ - + +NULL on success, or an error on failure @@ -313,12 +313,12 @@ - + +NULL on success, or an error on failure @@ -367,7 +367,7 @@ @@ -378,14 +378,14 @@ - @@ -427,7 +427,7 @@ @@ -438,14 +438,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-manager.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-manager.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-manager.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-manager.html 2012-03-19 15:38:21.000000000 +0000 @@ -47,10 +47,15 @@ #include <telepathy-glib/connection-manager.h> void (*TpConnectionManagerListCb) (TpConnectionManager * const *cms, - gsize n_cms, + gsize n_cms, const GError *error, gpointer user_data, GObject *weak_object); +voidtp_list_connection_managers_async (TpDBusDaemon *dbus_daemon, + GAsyncReadyCallback callback, + gpointer user_data); +GList * tp_list_connection_managers_finish (GAsyncResult *result, + GError **error); voidtp_list_connection_managers (TpDBusDaemon *bus_daemon, TpConnectionManagerListCb callback, gpointer user_data, @@ -81,6 +86,7 @@ (TpConnectionManager *self); gbooleantp_connection_manager_activate (TpConnectionManager *self); gbooleantp_connection_manager_is_running (TpConnectionManager *self); +GList * tp_connection_manager_dup_protocols (TpConnectionManager *self); gchar ** tp_connection_manager_dup_protocol_names (TpConnectionManager *self); gbooleantp_connection_manager_has_protocol (TpConnectionManager *self, @@ -264,7 +270,7 @@

    TpConnectionManagerListCb ()

    void                (*TpConnectionManagerListCb)        (TpConnectionManager * const *cms,
-                                                         gsize n_cms,
+                                                         gsize n_cms,
                                                          const GError *error,
                                                          gpointer user_data,
                                                          GObject *weak_object);
    @@ -283,22 +289,22 @@
    +NULL) +NULL on success, or an error that occurred @@ -314,6 +320,73 @@
    +

    tp_list_connection_managers_async ()

    +
    void                tp_list_connection_managers_async   (TpDBusDaemon *dbus_daemon,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
    +

    +List the available (running or installed) connection managers, +asynchronously, and wait for their TP_CONNECTION_MANAGER_FEATURE_CORE +feature to be ready. +

    +

    Returns :

    		a D-Bus error name, or NULL. [transfer none][allow-none] +a D-Bus error name, or NULL. [transfer none][allow-none]

    balance :

    		a pointer to store the account balance (or NULL). [out] +a pointer to store the account balance (or NULL). [out]

    scale :

    		a pointer to store the balance scale (or NULL). [out] +a pointer to store the balance scale (or NULL). [out]

    currency :

    		 a pointer to store the balance -currency (or NULL). [out][transfer none] +currency (or NULL). [out][transfer none]

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -4682,7 +4695,7 @@

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -4835,12 +4848,12 @@

    out_Interfaces :

    		Used to return an 'out' argument if error is NULL: The value of the <tp:member-ref>Interfaces</tp:member-ref> propertyUsed to return an 'out' argument if error is NULL: The value of the <tp:member-ref>Interfaces</tp:member-ref> property

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -5000,12 +5013,12 @@

    out_Protocol :

    		Used to return an 'out' argument if error is NULL: A string identifier for the protocolUsed to return an 'out' argument if error is NULL: A string identifier for the protocol

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -5168,12 +5181,12 @@

    out_Self_Handle :

    		Used to return an 'out' argument if error is NULL: The value of the <tp:member-ref>SelfHandle</tp:member-ref> property (TpContactHandle)Used to return an 'out' argument if error is NULL: The value of the <tp:member-ref>SelfHandle</tp:member-ref> property (TpContactHandle)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -5337,12 +5350,12 @@

    out_Status :

    		Used to return an 'out' argument if error is NULL: The value of the <tp:member-ref>Status</tp:member-ref> property (TpConnectionStatus)Used to return an 'out' argument if error is NULL: The value of the <tp:member-ref>Status</tp:member-ref> property (TpConnectionStatus)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -5500,7 +5513,7 @@

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -5674,12 +5687,12 @@

    out_Identifiers :

    		Used to return an 'out' argument if error is NULL: An array of identifiers corresponding to the given handles, in the same order.Used to return an 'out' argument if error is NULL: An array of identifiers corresponding to the given handles, in the same order.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -5863,12 +5876,12 @@

    out_Channel_Info :

    		Used to return an 'out' argument if error is NULL: An array of structs representing channels.Used to return an 'out' argument if error is NULL: An array of structs representing channels.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -6031,7 +6044,7 @@

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -6210,12 +6223,12 @@

    out_Object_Path :

    		Used to return an 'out' argument if error is NULL: The D-Bus object path for the channel created or retrievedUsed to return an 'out' argument if error is NULL: The D-Bus object path for the channel created or retrieved

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -6419,12 +6432,12 @@

    out_Handles :

    		Used to return an 'out' argument if error is NULL: An array of integer handle numbers in the same order as the given identifiers.Used to return an 'out' argument if error is NULL: An array of integer handle numbers in the same order as the given identifiers.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -6672,7 +6685,7 @@

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    out_Locations :

    		Used to return an 'out' argument if error is NULL: The contacts' locations, if already known. Contacts whose locations are not already known are omitted from the mapping; contacts known to have no location information appear in the mapping with an empty Location dictionary.Used to return an 'out' argument if error is NULL: The contacts' locations, if already known. Contacts whose locations are not already known are omitted from the mapping; contacts known to have no location information appear in the mapping with an empty Location dictionary.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    out_Location :

    		Used to return an 'out' argument if error is NULL: The contact's location. It MAY be empty, indicating that no location information was found.Used to return an 'out' argument if error is NULL: The contact's location. It MAY be empty, indicating that no location information was found.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    out_URL :

    		Used to return an 'out' argument if error is NULL: A struture containing a URL and optional additional data to open a webmail client, without re-authentication if possible.Used to return an 'out' argument if error is NULL: A struture containing a URL and optional additional data to open a webmail client, without re-authentication if possible.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_URL :

    		Used to return an 'out' argument if error is NULL: A struture that contains a URL and optional additional data to open a webmail client, without re-authentication if possible.Used to return an 'out' argument if error is NULL: A struture that contains a URL and optional additional data to open a webmail client, without re-authentication if possible.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    cms :

    		 -NULL-terminated array of +NULL-terminated array of TpConnectionManager (the objects will be unreferenced and the array will be freed after the callback returns, so the callback must reference any CMs it stores a pointer to), -or NULL on error. [array zero-terminated=1] +or NULL on error. [array zero-terminated=1]

    n_cms :

    		 number of connection managers in cms (not including the final -NULL)

    error :

    		 -NULL on success, or an error that occurred

    user_data :
    ++ + + + + + + + + + + + + + +

    dbus_daemon :

    		a TpDBusDaemon, or NULL to use +tp_dbus_daemon_dup(). [allow-none] +

    callback :

    		a callback to call with a list of CMs

    user_data :

    		data to pass to callback +
    +

    Since 0.UNRELEASED

    +
    +
    +
    +

    tp_list_connection_managers_finish ()

    +
    GList *             tp_list_connection_managers_finish  (GAsyncResult *result,
+                                                         GError **error);
    +

    +Finish listing the available connection managers. +

    +

    +Free the list after use, for instance with +g_list_free_full (list, g_object_unref). +

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

    result :

    		the result of tp_list_connection_managers_async() +

    error :

    		used to raise an error if the operation failed

    Returns :

    		a +newly allocated list of references to TpConnectionManager objects. [transfer full][element-type TelepathyGLib.ConnectionManager] +
    +

    Since 0.UNRELEASED

    +
    +
    +

    tp_list_connection_managers ()

    void                tp_list_connection_managers         (TpDBusDaemon *bus_daemon,
                                                          TpConnectionManagerListCb callback,
@@ -326,8 +399,8 @@
 
    
 
    
 Since 0.7.26, this function will wait for each TpConnectionManager
-to be ready, so all connection managers passed to callback will be ready
-(tp_connection_manager_is_ready() will return TRUE) unless an error
+to be ready, so all connection managers passed to callback will have
+their TP_CONNECTION_MANAGER_FEATURE_CORE feature prepared, unless an error
 occurred while launching that connection manager.
 
    
 
    
@@ -353,7 +426,7 @@
 
-
@@ -416,9 +489,9 @@
 
-
+NULL. Should be considered read-only
@@ -471,7 +544,7 @@
 
    
 Convenience function to create a new connection manager proxy. If
 its protocol and parameter information are required, you should call
-tp_connection_manager_call_when_ready() on the result.
+tp_proxy_prepare_async() on the result.
 
    
 
    
 
    weak_object :
    		if not NULL, will be weakly
+if not NULL, will be weakly
 referenced; the callback will not be called, and the call will be
 cancelled, if the object has vanished. [allow-none]
 
    
 
    
 
    const TpConnectionManagerProtocol * const  *protocols;
    		If info_source > TP_CM_INFO_SOURCE_NONE, a NULL-terminated
+If info_source > TP_CM_INFO_SOURCE_NONE, a NULL-terminated
 array of pointers to TpConnectionManagerProtocol structures; otherwise
-NULL. Should be considered read-only
 
    
 
    
 
    unsigned int running :1;
    		
 
    @@ -487,16 +560,16 @@
 
-
+
-
@@ -540,10 +613,10 @@
 
    
 After this feature is prepared, basic information about the connection
-manager's protocols (tp_connection_manager_get_protocol() and
-tp_connection_manager_dup_protocol_names()), and their available parameters,
-will have been retrieved, either by activating the connection manager over
-D-Bus or by reading the .manager file in which that information is cached.
+manager's protocols (tp_connection_manager_dup_protocols()), and their
+available parameters, will have been retrieved, either by activating the
+connection manager over D-Bus or by reading the .manager file in which
+that information is cached.
 
    
 Since 0.11.11, this feature also finds any extra interfaces that
@@ -567,11 +640,15 @@
                                                          const GError *error,
                                                          gpointer user_data,
                                                          GObject *weak_object);
+
    
+
    Warning
    
+
    TpConnectionManagerWhenReadyCb is deprecated and should not be used in newly-written code. since 0.UNRELEASED, use tp_proxy_prepare_async() instead
    
+
    
 Called as the result of tp_connection_manager_call_when_ready(). If the
 connection manager's protocol and parameter information could be retrieved,
-error is NULL and cm is considered to be ready. Otherwise, error is
-non-NULL and cm is not ready.
+error is NULL and cm is considered to be ready. Otherwise, error is
+non-NULL and cm is not ready.
 
    
 

    
 
    manager_filename :
    		
 The "manager-file"
-property, which may (and generally should) be NULL. [allow-none]
+property, which may (and generally should) be NULL. [allow-none]
 
 
    
 
    
 
    error :
    		used to return an error if NULL is returnedused to return an error if NULL is returned
 
    
 
    
 
    Returns :
    		a new reference to a connection manager proxy, or NULL if error
+a new reference to a connection manager proxy, or NULL if error
 is set.
 
    
     
 
 
 
 
    @@ -583,7 +660,7 @@
 
@@ -610,6 +687,10 @@
                                                          gpointer user_data,
                                                          GDestroyNotify destroy,
                                                          GObject *weak_object);
+
    
+
    Warning
    
+
    tp_connection_manager_call_when_ready is deprecated and should not be used in newly-written code. since 0.UNRELEASED, use tp_proxy_prepare_async() instead
    
+
    
 Call the callback from the main loop when information about cm's
 supported protocols and parameters has been retrieved.
@@ -648,6 +729,11 @@
 
    
 
    tp_connection_manager_is_ready ()
    
 
    gboolean            tp_connection_manager_is_ready      (TpConnectionManager *self);
    
+
    
+
    Warning
    
+
    tp_connection_manager_is_ready is deprecated and should not be used in newly-written code. since 0.UNRELEASED, use tp_proxy_is_prepared()
+ with TP_CONNECTION_MANAGER_FEATURE_CORE instead
    
+
    
 
    
 If protocol and parameter information has been obtained from the connection
 manager or the cache in the .manager file, return TRUE. Otherwise,
@@ -822,6 +908,41 @@
 
    
+
    tp_connection_manager_dup_protocols ()
    
+
    GList *             tp_connection_manager_dup_protocols (TpConnectionManager *self);
    
+
    
+Return objects representing all protocols supported by this connection
+manager.
+
    
+
    
+If this function is called before the connection manager information has
+been obtained, the result is always NULL. Use tp_proxy_prepare_async()
+to wait for this.
+
    
+
    
+The caller must free the list, for instance with
+g_list_free_full (l, g_object_unref).
+
    
+
    
 

    
 
    error :
    		
 
-NULL on success, or the reason why tp_connection_manager_is_ready()
+NULL on success, or the reason why tp_connection_manager_is_ready()
 would return FALSE
 
 
    
 
 
 
    
++
+
+
+
+
+
+
+
+
+
+
    

    self :
    		a connection manager
    Returns :
    		a list
+of TpProtocol objects representing the protocols supported by self,
+owned by the caller. [transfer full][element-type TelepathyGLib.Protocol]
+
    
+
    Since 0.UNRELEASED
    
+
    +
    +

    tp_connection_manager_dup_protocol_names ()

    gchar **            tp_connection_manager_dup_protocol_names
                                                         (TpConnectionManager *self);
    @@ -833,8 +954,8 @@

    If this function is called before the connection manager information has -been obtained, the result is always NULL. Use -tp_connection_manager_call_when_ready() to wait for this. +been obtained, the result is always NULL. Use +tp_proxy_prepare_async() to wait for this.

    The result is copied and must be freed by the caller, but it is not @@ -866,8 +987,8 @@

    If this function is called before the connection manager information has -been obtained, the result is always FALSE. Use -tp_connection_manager_call_when_ready() to wait for this. +been obtained, the result is always FALSE. Use tp_proxy_prepare_async() +to wait for this.

    @@ -898,7 +1019,7 @@ (TpConnectionManager *self, const gchar *protocol);

    -Returns a structure representing a protocol, or NULL if this connection +Returns a structure representing a protocol, or NULL if this connection manager does not support the specified protocol.

    @@ -907,8 +1028,8 @@

    If this function is called before the connection manager information has -been obtained, the result is always NULL. Use -tp_connection_manager_call_when_ready() to wait for this. +been obtained, the result is always NULL. Use +tp_proxy_prepare_async() to wait for this.

    The result is not necessarily valid after the main loop is re-entered. @@ -943,12 +1064,12 @@ (TpConnectionManager *self, const gchar *protocol);

    -Returns an object representing a protocol, or NULL if this connection +Returns an object representing a protocol, or NULL if this connection manager does not support the specified protocol.

    If this function is called before the connection manager information has -been obtained, the result is always NULL. Use tp_proxy_prepare_async() +been obtained, the result is always NULL. Use tp_proxy_prepare_async() to wait for this.

    @@ -968,7 +1089,7 @@

    - @@ -998,7 +1119,7 @@ @@ -1110,7 +1231,7 @@ - @@ -1524,12 +1645,12 @@ - + +NULL on success, or an error on failure @@ -1579,28 +1700,28 @@ - @@ -1658,12 +1779,12 @@ - - - + +NULL on success, or an error on failure @@ -1749,28 +1870,28 @@ - @@ -1823,12 +1944,12 @@ - - - + - + +NULL on success, or an error on failure @@ -1929,28 +2050,28 @@ - @@ -2018,12 +2139,12 @@ - - @@ -2128,14 +2249,14 @@ - @@ -2186,7 +2307,7 @@

    The "manager-file" property

      "manager-file"             gchar*                : Read / Write / Construct

    -The absolute path of the .manager file. If set to NULL (the default), +The absolute path of the .manager file. If set to NULL (the default), the XDG data directories will be searched for a .manager file of the correct name.

    @@ -2252,8 +2373,8 @@ Emitted when the connection manager's capabilities have been discovered.

    -This signal is not very helpful. Since 0.7.26, using -tp_connection_manager_call_when_ready() instead is recommended. +This signal is not very helpful. Using +tp_proxy_prepare_async() instead is recommended.

    Returns :

    		an object representing the protocol, or NULL. [transfer none] +an object representing the protocol, or NULL. [transfer none]

    TpConnectionManagerParam *params;

    		 Array of TpConnectionManagerParam structures, terminated by -a structure whose name is NULL +a structure whose name is NULL

    Returns :

    		a structure representing the parameter param, or NULL if not +a structure representing the parameter param, or NULL if not supported

    out_Parameters :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> An array of structs representing possible parameters.Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> An array of structs representing possible parameters.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1699,12 +1820,12 @@

    out_Protocols :

    		Used to return an 'out' argument if error is NULL: The keys of the <tp:member-ref>Protocols</tp:member-ref> map.Used to return an 'out' argument if error is NULL: The keys of the <tp:member-ref>Protocols</tp:member-ref> map.

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1865,16 +1986,16 @@

    out_Bus_Name :

    		Used to return an 'out' argument if error is NULL: A D-Bus service name where the new Connection object can be foundUsed to return an 'out' argument if error is NULL: A D-Bus service name where the new Connection object can be found

    out_Object_Path :

    		Used to return an 'out' argument if error is NULL: The D-Bus object path to the Connection on this serviceUsed to return an 'out' argument if error is NULL: The D-Bus object path to the Connection on this service

    error :

    		 -NULL on success, or an error on failure

    user_data :

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2117,7 +2238,7 @@

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.
    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-powersaving.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-powersaving.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-powersaving.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-powersaving.html 2012-03-19 15:38:21.000000000 +0000 @@ -114,28 +114,28 @@ - @@ -170,7 +170,7 @@ +NULL on success, or an error on failure @@ -219,7 +219,7 @@ @@ -230,14 +230,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-presence.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-presence.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-presence.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-presence.html 2012-03-19 15:38:21.000000000 +0000 @@ -267,12 +267,12 @@ - - - - - - - - - - - - - - - - - @@ -807,28 +807,28 @@ - @@ -878,28 +878,28 @@ - @@ -944,28 +944,28 @@ - @@ -1015,28 +1015,28 @@ - @@ -1086,28 +1086,28 @@ - @@ -1157,28 +1157,28 @@ - @@ -1228,28 +1228,28 @@ - @@ -1284,7 +1284,7 @@ +NULL on success, or an error on failure @@ -1319,7 +1319,7 @@ +NULL on success, or an error on failure @@ -1354,12 +1354,12 @@ - + +NULL on success, or an error on failure @@ -1394,12 +1394,12 @@ - + +NULL on success, or an error on failure @@ -1434,7 +1434,7 @@ +NULL on success, or an error on failure @@ -1469,7 +1469,7 @@ +NULL on success, or an error on failure @@ -1504,7 +1504,7 @@ +NULL on success, or an error on failure @@ -1539,7 +1539,7 @@ +NULL on success, or an error on failure @@ -1588,7 +1588,7 @@ @@ -1599,14 +1599,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-requests.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-requests.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-requests.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-requests.html 2012-03-19 15:38:21.000000000 +0000 @@ -164,28 +164,28 @@ - @@ -235,28 +235,28 @@ - @@ -292,16 +292,16 @@ - + - + +NULL on success, or an error on failure @@ -338,20 +338,20 @@ - + - + - + +NULL on success, or an error on failure @@ -400,7 +400,7 @@ @@ -411,14 +411,14 @@ - @@ -460,7 +460,7 @@ @@ -471,14 +471,14 @@ - @@ -534,12 +534,12 @@ - - - - - - - - - @@ -351,28 +351,28 @@ - @@ -407,12 +407,12 @@ - + +NULL on success, or an error on failure @@ -447,7 +447,7 @@ +NULL on success, or an error on failure @@ -496,7 +496,7 @@ @@ -507,14 +507,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-contact.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-contact.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-contact.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-contact.html 2012-03-19 15:38:21.000000000 +0000 @@ -460,7 +460,7 @@

    If some or even all of the handles passed to tp_connection_get_contacts_by_handle() were not valid, this is not -considered to be a failure. error will be NULL in this situation, +considered to be a failure. error will be NULL in this situation, contacts will contain contact objects for those handles that were valid (possibly none of them), and invalid will contain the handles that were not valid. @@ -481,7 +481,7 @@

    @@ -501,7 +501,7 @@ @@ -533,7 +533,7 @@

    If tp_connection_has_immortal_handles() would return TRUE and -identifier is non-NULL, this function always succeeds. +identifier is non-NULL, this function always succeeds.

    On connections without immortal handles, it is not possible to guarantee @@ -543,7 +543,7 @@ tp_connection_get_contacts_by_id().

    -Similarly, if identifier is NULL, it might not be possible to find the +Similarly, if identifier is NULL, it might not be possible to find the identifier for handle without making asynchronous D-Bus calls, so it might be necessary to delay processing of messages or other events until a TpContact can be constructed asynchronously, for instance by using @@ -564,12 +564,12 @@

    - @@ -605,8 +605,8 @@ - + @@ -626,7 +626,7 @@ @@ -676,7 +676,7 @@

    If some or even all of the ids passed to tp_connection_get_contacts_by_id() were not valid, this is not -considered to be a fatal error. error will be NULL in this situation, +considered to be a fatal error. error will be NULL in this situation, contacts will contain contact objects for those IDs that were valid (it may be empty), and failed_id_errors will map the IDs that were not valid to a corresponding GError (if the connection manager @@ -708,7 +708,7 @@

    @@ -716,7 +716,7 @@ @@ -728,7 +728,7 @@ @@ -775,8 +775,8 @@ - + @@ -798,7 +798,7 @@ @@ -865,7 +865,7 @@ - + @@ -911,8 +911,8 @@ - + @@ -1014,7 +1014,7 @@ - @@ -1040,7 +1040,7 @@ +(possibly NULL)

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -321,12 +321,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -385,12 +385,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -444,12 +444,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -503,12 +503,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -562,12 +562,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -621,12 +621,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -680,12 +680,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -741,28 +741,28 @@

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Presence :

    		Used to return an 'out' argument if error is NULL: Presence information in the same format as for the <tp:member-ref>PresenceUpdate</tp:member-ref> signalUsed to return an 'out' argument if error is NULL: Presence information in the same format as for the <tp:member-ref>PresenceUpdate</tp:member-ref> signal

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Available_Statuses :

    		Used to return an 'out' argument if error is NULL: A dictionary of string identifiers mapped to a struct for each status, containing: <ul> <li>a type value from one of the values above</li> <li>a boolean to indicate if this status may be set on yourself</li> <li>a boolean to indicate if this is an exclusive status which you may not set alongside any other</li> <li>a dictionary of valid optional string argument names mapped to their types</li> </ul>Used to return an 'out' argument if error is NULL: A dictionary of string identifiers mapped to a struct for each status, containing: <ul> <li>a type value from one of the values above</li> <li>a boolean to indicate if this status may be set on yourself</li> <li>a boolean to indicate if this is an exclusive status which you may not set alongside any other</li> <li>a dictionary of valid optional string argument names mapped to their types</li> </ul>

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    out_Channel :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The Channel object, which MUST NOT be signalled with <tp:member-ref>NewChannels</tp:member-ref> until after this method returns.</p> <tp:rationale> <p>This allows the requester to alter its handling of NewChannels by knowing whether one of the channels satisfied a request it made.</p> </tp:rationale>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The Channel object, which MUST NOT be signalled with <tp:member-ref>NewChannels</tp:member-ref> until after this method returns.</p> <tp:rationale> <p>This allows the requester to alter its handling of NewChannels by knowing whether one of the channels satisfied a request it made.</p> </tp:rationale>

    out_Properties :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Properties of the channel that was produced, equivalent to the properties in <tp:type>Channel_Details</tp:type>. Connection managers MUST NOT include properties here whose values can change, for the same reasons as in <tp:type>Channel_Details</tp:type>.</p>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Properties of the channel that was produced, equivalent to the properties in <tp:type>Channel_Details</tp:type>. Connection managers MUST NOT include properties here whose values can change, for the same reasons as in <tp:type>Channel_Details</tp:type>.</p>

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out_Yours :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>If false, the caller of EnsureChannel MUST assume that some other process is handling this channel; if true, the caller of EnsureChannel SHOULD handle it themselves or delegate it to another client.</p> <p>If the creation of a channel makes several calls to EnsureChannel (and no other requests) successful, exactly one of those calls MUST return a true value for this argument.</p> <p>If the creation of a channel makes other requests successful, the value returned for this argument MUST be such that exactly one of the clients making requests ends up responsible for the channel. In particular, if <tp:member-ref>CreateChannel</tp:member-ref> returns a channel <em>C</em>, any EnsureChannel calls that also return <em>C</em> MUST return a false value for this argument.</p>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>If false, the caller of EnsureChannel MUST assume that some other process is handling this channel; if true, the caller of EnsureChannel SHOULD handle it themselves or delegate it to another client.</p> <p>If the creation of a channel makes several calls to EnsureChannel (and no other requests) successful, exactly one of those calls MUST return a true value for this argument.</p> <p>If the creation of a channel makes other requests successful, the value returned for this argument MUST be such that exactly one of the clients making requests ends up responsible for the channel. In particular, if <tp:member-ref>CreateChannel</tp:member-ref> returns a channel <em>C</em>, any EnsureChannel calls that also return <em>C</em> MUST return a false value for this argument.</p>

    out_Channel :

    		Used to return an 'out' argument if error is NULL: The Channel object. If it was created as a result of this method call, it MUST NOT be signalled by <tp:member-ref>NewChannels</tp:member-ref> until after this method returns. <tp:rationale> <p>This allows the requester to alter its handling of NewChannels by knowing whether one of the channels satisfied a request it made.</p> </tp:rationale>Used to return an 'out' argument if error is NULL: The Channel object. If it was created as a result of this method call, it MUST NOT be signalled by <tp:member-ref>NewChannels</tp:member-ref> until after this method returns. <tp:rationale> <p>This allows the requester to alter its handling of NewChannels by knowing whether one of the channels satisfied a request it made.</p> </tp:rationale>

    out_Properties :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Properties of the channel that was produced, equivalent to the properties in <tp:type>Channel_Details</tp:type>. Connection managers MUST NOT include properties here whose values can change, for the same reasons as in <tp:type>Channel_Details</tp:type>.</p>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Properties of the channel that was produced, equivalent to the properties in <tp:type>Channel_Details</tp:type>. Connection managers MUST NOT include properties here whose values can change, for the same reasons as in <tp:type>Channel_Details</tp:type>.</p>

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -608,12 +608,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-simple-presence.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-simple-presence.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-connection-simple-presence.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-connection-simple-presence.html 2012-03-19 15:38:21.000000000 +0000 @@ -155,12 +155,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -219,12 +219,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -275,28 +275,28 @@

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    out_Presence :

    		Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Presence information in the same format as for the <tp:member-ref>PresencesChanged</tp:member-ref> signal. The returned mapping MUST include an entry for each contact in the method's argument.</p> <p>The definition of the connection presence types Unknown and Offline means that if a connection manager will return Unknown for contacts not on the subscribe list, it MUST delay the reply to this method call until it has found out which contacts are, in fact, on the subscribe list.</p>Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Presence information in the same format as for the <tp:member-ref>PresencesChanged</tp:member-ref> signal. The returned mapping MUST include an entry for each contact in the method's argument.</p> <p>The definition of the connection presence types Unknown and Offline means that if a connection manager will return Unknown for contacts not on the subscribe list, it MUST delay the reply to this method call until it has found out which contacts are, in fact, on the subscribe list.</p>

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    contacts :

    		 An array of n_contacts TpContact objects (this callback is not given a reference to any of these objects, -and must call g_object_ref() on any that it will keep), or NULL on +and must call g_object_ref() on any that it will keep), or NULL on unrecoverable errors. [array length=n_contacts]

    error :

    		 -NULL on success, or an unrecoverable error that caused everything +NULL on success, or an unrecoverable error that caused everything to fail

    identifier :

    		 the normalized identifier (XMPP JID, etc.) -corresponding to handle, or NULL if not known. [transfer none] +corresponding to handle, or NULL if not known. [transfer none]

    Returns :

    		a contact or NULL. [transfer full] +a contact or NULL. [transfer full]

    self :

    		A connection, which must be ready ("connection-ready" -must be TRUE)A connection, which must have the TP_CONNECTION_FEATURE_CONNECTED +feature prepared

    n_handles :

    features :

    		 An array of features that must be ready for use (if supported) before the callback is called (may -be NULL if n_features is 0). [array length=n_features][allow-none][element-type uint] +be NULL if n_features is 0). [array length=n_features][allow-none][element-type uint]
    An array of n_contacts TpContact objects (this callback is not given a reference to any of these objects, and must call -g_object_ref() on any that it will keep), or NULL on unrecoverable errors. [array length=n_contacts] +g_object_ref() on any that it will keep), or NULL on unrecoverable errors. [array length=n_contacts]
    An array of n_contacts valid IDs (JIDs, SIP URIs etc.) that were passed to tp_connection_get_contacts_by_id(), in an order -corresponding to contacts, or NULL on unrecoverable errors. [array length=n_contacts] +corresponding to contacts, or NULL on unrecoverable errors. [array length=n_contacts]

    error :

    		 -NULL on success, or an unrecoverable error that caused everything +NULL on success, or an unrecoverable error that caused everything to fail

    self :

    		A connection, which must be ready ("connection-ready" -must be TRUE)A connection, which must have the TP_CONNECTION_FEATURE_CONNECTED +feature prepared

    n_ids :

    features :

    		 An array of features that must be ready for use (if supported) -before the callback is called (may be NULL if n_features is 0). [array length=n_features][allow-none] +before the callback is called (may be NULL if n_features is 0). [array length=n_features][allow-none]

    error :

    		An unrecoverable error, or NULL if the connection remains validAn unrecoverable error, or NULL if the connection remains valid

    user_data :

    self :

    		A connection, which must be ready ("connection-ready" -must be TRUE)A connection, which must have the TP_CONNECTION_FEATURE_CONNECTED +feature prepared

    n_contacts :

    Returns :

    		the same non-NULL alias as the "alias" +the same non-NULL alias as the "alias"

    Returns :

    		 the same token as the "avatar-token" property -(possibly NULL)
    @@ -1065,7 +1065,7 @@

    Returns :

    the same GFile as the "avatar-file" property -(possibly NULL). [transfer none] +(possibly NULL). [transfer none] @@ -1091,7 +1091,7 @@

    Returns :

    the same MIME type as the "avatar-mime-type" property -(possibly NULL) +(possibly NULL)
    @@ -1102,7 +1102,7 @@

    tp_contact_get_client_types ()

    const gchar * const * tp_contact_get_client_types       (TpContact *self);

    -Return the contact's client types or NULL if the client types are +Return the contact's client types or NULL if the client types are unspecified.

    @@ -1197,7 +1197,7 @@ - +

    Returns :

    		the same non-NULL identifier as the "identifier" propertythe same non-NULL identifier as the "identifier" property
    @@ -1222,7 +1222,7 @@

    Returns :

    -the same non-NULL message as the "presence-message" +the same non-NULL message as the "presence-message" property @@ -1248,7 +1248,7 @@

    Returns :

    -the same non-NULL status name as the "presence-status" +the same non-NULL status name as the "presence-status" property @@ -1287,7 +1287,7 @@

    tp_contact_get_location ()

    GHashTable *        tp_contact_get_location             (TpContact *self);

    -Return the contact's user-defined location or NULL if the location is +Return the contact's user-defined location or NULL if the location is unspecified. This remains valid until the main loop is re-entered; if the caller requires a hash table that will persist for longer than that, it must be @@ -1303,7 +1303,7 @@

    Returns :

    the same -GHashTable (or NULL) as the "location" property. [element-type utf8 GObject.Value][transfer none] +GHashTable (or NULL) as the "location" property. [element-type utf8 GObject.Value][transfer none] @@ -1326,7 +1326,7 @@

    Returns :

    -the same TpCapabilities (or NULL) as the +the same TpCapabilities (or NULL) as the "capabilities" property. [transfer none] @@ -1360,7 +1360,7 @@

    Returns :

    -a GList of TpContactInfoField, or NULL if the feature is not yet +a GList of TpContactInfoField, or NULL if the feature is not yet prepared. [element-type TelepathyGLib.ContactInfoField][transfer container] @@ -1430,7 +1430,7 @@

    cancellable :

    -optional GCancellable object, NULL to ignore. +optional GCancellable object, NULL to ignore.

    callback :

    @@ -1551,8 +1551,8 @@ persist for longer than that, it must be copied with g_strdup().

    -This is set to NULL until TP_CONTACT_FEATURE_SUBSCRIPTION_STATES has been -prepared, and it is guaranteed to be non-NULL afterward. +This is set to NULL until TP_CONTACT_FEATURE_SUBSCRIPTION_STATES has been +prepared, and it is guaranteed to be non-NULL afterward.

    @@ -1632,12 +1632,12 @@ - + @@ -2359,7 +2359,7 @@ However, it is suitable for use as a main "display name" for the contact.

    -This is never NULL for contact objects that are visible to library-user +This is never NULL for contact objects that are visible to library-user code.

    Default value: NULL

    @@ -2369,7 +2369,7 @@

    The "avatar-file" property

      "avatar-file"              GFile*                : Read

    -GFile to the latest cached avatar image, or NULL if this contact has +GFile to the latest cached avatar image, or NULL if this contact has no avatar, or if the avatar data is not yet retrieved.

    @@ -2379,7 +2379,7 @@ cached avatar image.

    -This is set to NULL if TP_CONTACT_FEATURE_AVATAR_DATA is not set on this +This is set to NULL if TP_CONTACT_FEATURE_AVATAR_DATA is not set on this contact. Note that setting TP_CONTACT_FEATURE_AVATAR_DATA will also implicitly set TP_CONTACT_FEATURE_AVATAR_TOKEN.

    @@ -2390,7 +2390,7 @@

    The "avatar-mime-type" property

      "avatar-mime-type"         gchar*                : Read

    -MIME type of the latest cached avatar image, or NULL if this contact has +MIME type of the latest cached avatar image, or NULL if this contact has no avatar, or if the avatar data is not yet retrieved.

    @@ -2409,7 +2409,7 @@ an empty string if there is no avatar.

    -This may be NULL if it is not known whether this contact has an avatar +This may be NULL if it is not known whether this contact has an avatar or not (either for network protocol reasons, or because this TpContact has not been set up to track TP_CONTACT_FEATURE_AVATAR_TOKEN).

    @@ -2427,7 +2427,7 @@ are specific to this TpContact or not.

    -This may be NULL if this TpContact object has not been set up to track +This may be NULL if this TpContact object has not been set up to track TP_CONTACT_FEATURE_CAPABILITIES.

    Since 0.11.3

    @@ -2440,8 +2440,8 @@ A GStrv containing the client types of this contact.

    -This is set to NULL if TP_CONTACT_FEATURE_CLIENT_TYPES is not -set on this contact; it may also be NULL if that feature is prepared, but +This is set to NULL if TP_CONTACT_FEATURE_CLIENT_TYPES is not +set on this contact; it may also be NULL if that feature is prepared, but the contact's client types are unknown.

    Since 0.13.1

    @@ -2462,7 +2462,7 @@ a GStrv with names of groups of which a contact is a member.

    -This is set to NULL if TP_CONTACT_FEATURE_CONTACT_GROUPS is not prepared +This is set to NULL if TP_CONTACT_FEATURE_CONTACT_GROUPS is not prepared on this contact, or if the connection does not implement ContactGroups interface.

    @@ -2476,7 +2476,7 @@ A GList of TpContactInfoField representing the vCard of this contact.

    -This is set to NULL if TP_CONTACT_FEATURE_CONTACT_INFO is not set on this +This is set to NULL if TP_CONTACT_FEATURE_CONTACT_INFO is not set on this contact.

    Since 0.11.7

    @@ -2515,7 +2515,7 @@ protocol uses to identify a user).

    -This is never NULL for contact objects that are visible to library-user +This is never NULL for contact objects that are visible to library-user code.

    Default value: NULL

    @@ -2541,12 +2541,12 @@ 
      "location"                 GHashTable_gchararray+GValue_*  : Read

    If this contact has set a user-defined location, a string to -GValue * hash table containing his location. If not, NULL. +GValue * hash table containing his location. If not, NULL. tp_asv_get_string() and similar functions can be used to access the contents.

    -This may be NULL even if the contact has set a location, +This may be NULL even if the contact has set a location, if this TpContact object has not been set up to track TP_CONTACT_FEATURE_LOCATION.

    @@ -2565,7 +2565,7 @@

    This may be an empty string even if the contact has set a message, if this TpContact object has not been set up to track -TP_CONTACT_FEATURE_PRESENCE. It is never NULL. +TP_CONTACT_FEATURE_PRESENCE. It is never NULL.

    Default value: ""

    @@ -2580,7 +2580,7 @@

    This may be an empty string if this TpContact object has not been set up -to track TP_CONTACT_FEATURE_PRESENCE. It is never NULL. +to track TP_CONTACT_FEATURE_PRESENCE. It is never NULL.

    Default value: ""

    @@ -2612,8 +2612,8 @@ TP_SUBSCRIPTION_STATE_ASK, an empty string ("") otherwise.

    -This is set to NULL until TP_CONTACT_FEATURE_SUBSCRIPTION_STATES has been -prepared, and it is guaranteed to be non-NULL afterward. +This is set to NULL until TP_CONTACT_FEATURE_SUBSCRIPTION_STATES has been +prepared, and it is guaranteed to be non-NULL afterward.

    Default value: NULL

    Since 0.13.12

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-contact-search.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-contact-search.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-contact-search.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-contact-search.html 2012-03-19 15:38:21.000000000 +0000 @@ -168,7 +168,7 @@ - @@ -206,12 +206,12 @@ - - @@ -242,7 +242,7 @@ - @@ -285,12 +285,12 @@ - - @@ -353,7 +353,7 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-contact-search-result.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-contact-search-result.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-contact-search-result.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-contact-search-result.html 2012-03-19 15:38:21.000000000 +0000 @@ -118,7 +118,7 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-dbus.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-dbus.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-dbus.html 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-dbus.html 2012-03-19 15:38:21.000000000 +0000 @@ -783,7 +783,7 @@ - @@ -938,7 +938,7 @@

    If it is not possible to connect to the appropriate bus, raise an error -and return NULL. +and return NULL.

    The returned TpDBusDaemon is cached; the same TpDBusDaemon object will @@ -950,12 +950,12 @@

    - + @@ -1161,12 +1161,12 @@ - + - + @@ -1214,7 +1214,7 @@ - @@ -1223,12 +1223,12 @@ - - @@ -1268,7 +1268,7 @@ - @@ -1277,12 +1277,12 @@ - - @@ -1473,28 +1473,28 @@ - @@ -1544,28 +1544,28 @@ - @@ -1615,28 +1615,28 @@ - @@ -1686,28 +1686,28 @@ - @@ -1751,28 +1751,28 @@ - @@ -1822,28 +1822,28 @@ - @@ -1887,28 +1887,28 @@ - @@ -1953,28 +1953,28 @@ - @@ -2018,28 +2018,28 @@ - @@ -2089,28 +2089,28 @@ - @@ -2160,28 +2160,28 @@ - @@ -2231,28 +2231,28 @@ - @@ -2297,28 +2297,28 @@ - @@ -2368,28 +2368,28 @@ - @@ -2444,28 +2444,28 @@ - @@ -2520,28 +2520,28 @@ - @@ -2593,12 +2593,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +NULL on success, or an error on failure @@ -3598,12 +3598,12 @@ - + +NULL on success, or an error on failure @@ -3638,12 +3638,12 @@ - + +NULL on success, or an error on failure @@ -3678,12 +3678,12 @@ - + +NULL on success, or an error on failure @@ -3718,12 +3718,12 @@ - + +NULL on success, or an error on failure @@ -3758,12 +3758,12 @@ - + +NULL on success, or an error on failure @@ -3798,12 +3798,12 @@ - + +NULL on success, or an error on failure @@ -3838,12 +3838,12 @@ - + +NULL on success, or an error on failure @@ -3878,12 +3878,12 @@ - + +NULL on success, or an error on failure @@ -3918,12 +3918,12 @@ - + +NULL on success, or an error on failure @@ -3958,12 +3958,12 @@ - + +NULL on success, or an error on failure @@ -3998,12 +3998,12 @@ - + +NULL on success, or an error on failure @@ -4038,7 +4038,7 @@ +NULL on success, or an error on failure @@ -4073,7 +4073,7 @@ +NULL on success, or an error on failure @@ -4108,12 +4108,12 @@ - + +NULL on success, or an error on failure @@ -4148,12 +4148,12 @@ - + +NULL on success, or an error on failure @@ -4202,7 +4202,7 @@ @@ -4213,14 +4213,14 @@ - @@ -4262,7 +4262,7 @@ @@ -4273,14 +4273,14 @@ - @@ -4322,7 +4322,7 @@ @@ -4333,14 +4333,14 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-dbus-properties-mixin.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-dbus-properties-mixin.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-dbus-properties-mixin.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-dbus-properties-mixin.html 2012-03-19 15:38:21.000000000 +0000 @@ -80,7 +80,7 @@ gpointer setter_data, GError **error); voidtp_dbus_properties_mixin_class_init (GObjectClass *cls, - gsize offset); + gsize offset); voidtp_dbus_properties_mixin_implement_interface (GObjectClass *cls, GQuark iface, @@ -238,7 +238,7 @@

    In addition to the documented members, there are two private pointers -for future expansion, which must always be initialized to NULL. +for future expansion, which must always be initialized to NULL.

    n_groups :

    		the number of groups, or -1 if groups is NULL-terminatedthe number of groups, or -1 if groups is NULL-terminated

    groups :

    		 the set of -groups which the contact should be in (may be NULL if n_groups is 0). [array length=n_groups][element-type utf8][allow-none] +groups which the contact should be in (may be NULL if n_groups is 0). [array length=n_groups][element-type utf8][allow-none]

    server :

    		the server on which to search for contacts, or NULL +the server on which to search for contacts, or NULL

    error :

    		a GError location to store an error, or NULL +a GError location to store an error, or NULL

    Returns :

    		a new contact search object, or NULL +a new contact search object, or NULL in case of error. [transfer full]

    server :

    		the server on which to search for contacts, or NULL +the server on which to search for contacts, or NULL

    error :

    		a GError location to store an error, or NULL +a GError location to store an error, or NULL

    Returns :

    		the new search keys, or NULL +the new search keys, or NULL in case of error. [transfer none]

    Returns :

    		the new search keys, or NULL. [transfer none] +the new search keys, or NULL. [transfer none]

    Returns :

    		the specified field, or NULL if the +the specified field, or NULL if the result doesn't have it. [transfer none]

    bytes :

    		location of an array of bytes to be copied (this may be NULL +location of an array of bytes to be copied (this may be NULL if and only if length is 0)

    error :

    		Used to indicate error if NULL is returnedUsed to indicate error if NULL is returned

    Returns :

    		 a reference to a proxy for signals and method -calls on the bus daemon, or NULL. [transfer full] +calls on the bus daemon, or NULL. [transfer full]

    names :

    		constant NULL-terminated array of constant strings representing -bus names, or NULL on errorconstant NULL-terminated array of constant strings representing +bus names, or NULL on error

    error :

    		the error that occurred, or NULL on successthe error that occurred, or NULL on success

    user_data :

    callback :

    		callback to be called on success or failure; must not be NULL +callback to be called on success or failure; must not be NULL

    destroy :

    		if not NULL, called with user_data as argument after the call +if not NULL, called with user_data as argument after the call has succeeded or failed, or after weak_object has been destroyed

    weak_object :

    		if not NULL, a GObject which will be weakly referenced; if +if not NULL, a GObject which will be weakly referenced; if it is destroyed, callback will not be called at all

    callback :

    		callback to be called on success or failure; must not be NULL +callback to be called on success or failure; must not be NULL

    destroy :

    		if not NULL, called with user_data as argument after the call +if not NULL, called with user_data as argument after the call has succeeded or failed, or after weak_object has been destroyed

    weak_object :

    		if not NULL, a GObject which will be weakly referenced; if +if not NULL, a GObject which will be weakly referenced; if it is destroyed, callback will not be called at all

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    callback :

    		 called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    		 user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    		 called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    		If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2657,12 +2657,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2721,12 +2721,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2785,12 +2785,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2843,12 +2843,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2907,12 +2907,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2965,12 +2965,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -3024,12 +3024,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -3082,12 +3082,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -3146,12 +3146,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -3210,12 +3210,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -3273,12 +3273,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -3327,12 +3327,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -3385,12 +3385,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -3453,12 +3453,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -3522,12 +3522,12 @@

    error :

    		If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    		If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -3563,7 +3563,7 @@

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out0 :

    		Used to return an 'out' argument if error is NULL: (Undocumented)Used to return an 'out' argument if error is NULL: (Undocumented)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out0 :

    		Used to return an 'out' argument if error is NULL: (Undocumented)Used to return an 'out' argument if error is NULL: (Undocumented)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out0 :

    		Used to return an 'out' argument if error is NULL: (Undocumented)Used to return an 'out' argument if error is NULL: (Undocumented)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out0 :

    		Used to return an 'out' argument if error is NULL: (Undocumented)Used to return an 'out' argument if error is NULL: (Undocumented)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out0 :

    		Used to return an 'out' argument if error is NULL: (Undocumented)Used to return an 'out' argument if error is NULL: (Undocumented)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out0 :

    		Used to return an 'out' argument if error is NULL: (Undocumented)Used to return an 'out' argument if error is NULL: (Undocumented)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out0 :

    		Used to return an 'out' argument if error is NULL: (Undocumented)Used to return an 'out' argument if error is NULL: (Undocumented)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out0 :

    		Used to return an 'out' argument if error is NULL: (Undocumented)Used to return an 'out' argument if error is NULL: (Undocumented)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out0 :

    		Used to return an 'out' argument if error is NULL: (Undocumented)Used to return an 'out' argument if error is NULL: (Undocumented)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out0 :

    		Used to return an 'out' argument if error is NULL: (Undocumented)Used to return an 'out' argument if error is NULL: (Undocumented)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out0 :

    		Used to return an 'out' argument if error is NULL: (Undocumented)Used to return an 'out' argument if error is NULL: (Undocumented)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out0 :

    		Used to return an 'out' argument if error is NULL: (Undocumented)Used to return an 'out' argument if error is NULL: (Undocumented)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    out0 :

    		Used to return an 'out' argument if error is NULL: (Undocumented)Used to return an 'out' argument if error is NULL: (Undocumented)

    error :

    		 -NULL on success, or an error on failure

    user_data :

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.

    destroy :

    		 Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL

    error :

    		If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    		 a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid.
    @@ -250,7 +250,7 @@ @@ -274,7 +274,7 @@

    In addition to the documented members, there are two private pointers -for future expansion, which must always be initialized to NULL. +for future expansion, which must always be initialized to NULL.

    TpDBusPropertiesMixinPropInfo *props;

    		 Array of property descriptions, terminated by one with -name == NULL +name == NULL
    @@ -349,7 +349,7 @@ - @@ -369,14 +369,14 @@

    In addition to the documented fields, there are 7 pointers reserved for -future use, which must be initialized to NULL. +future use, which must be initialized to NULL.

    Returns :

    		D-Bus property metadata for g_interface, or NULL if it has +D-Bus property metadata for g_interface, or NULL if it has none.

    TpDBusPropertiesMixinIfaceImpl *interfaces;

    		 An array of interface implementations, terminated by one with -name equal to NULL +name equal to NULL
    @@ -397,7 +397,7 @@

    In addition to the documented fields, there are four pointers which must -be initialized to NULL. +be initialized to NULL.

    This structure must either be statically allocated, or duplicated and never @@ -423,7 +423,7 @@

    TpDBusPropertiesMixinPropImpl *props;

    An array of property implementations, terminated by one with -name equal to NULL +name equal to NULL @@ -444,7 +444,7 @@

    In addition to the documented fields, there are three pointers which must -be initialized to NULL. +be initialized to NULL.

    This structure must either be statically allocated, or duplicated and never @@ -656,7 +656,7 @@

    tp_dbus_properties_mixin_class_init ()

    void                tp_dbus_properties_mixin_class_init (GObjectClass *cls,
-                                                         gsize offset);
    + gsize offset);

    Initialize the class cls to use the D-Bus Properties mixin. The given struct member, of size sizeof(TpDBusPropertiesMixinClass), @@ -670,14 +670,14 @@

    Before calling this function, the array interfaces must have been placed in the TpDBusPropertiesMixinClass structure; if it would be empty, -it may instead be NULL. +it may instead be NULL.

    This function should be called from the class_init callback in such a way that it will only be called once, even if the class is subclassed.

    -Changed in 0.7.9: TpDBusPropertiesMixinClass::interfaces may now be NULL, +Changed in 0.7.9: TpDBusPropertiesMixinClass::interfaces may now be NULL, which means that only interfaces whose properties are set up using tp_dbus_properties_mixin_implement_interface() will be used.

    @@ -685,7 +685,7 @@ Changed in 0.7.15: offset may now be 0, in which case the TpDBusPropertiesMixinClass can be omitted from cls. It is treated as if it were present, but with all fields (including -TpDBusPropertiesMixinClass::interfaces) being NULL, so only interfaces +TpDBusPropertiesMixinClass::interfaces) being NULL, so only interfaces whose properties are set using tp_dbus_properties_mixin_implement_interface() will be used.

    @@ -755,18 +755,18 @@

    getter :

    -a callback to get properties on this interface, or NULL if they +a callback to get properties on this interface, or NULL if they are all write-only

    setter :

    -a callback to set properties on this interface, or NULL if they +a callback to set properties on this interface, or NULL if they are all read-only

    props :

    an array of TpDBusPropertiesMixinPropImpl representing individual -properties, terminated by one with name == NULL +properties, terminated by one with name == NULL @@ -938,7 +938,7 @@

    ... :

    -more (interface name, property name) pairs, terminated by NULL. +more (interface name, property name) pairs, terminated by NULL.
    @@ -988,7 +988,7 @@

    ... :

    -more (interface name, property name) pairs, terminated by NULL. +more (interface name, property name) pairs, terminated by NULL.

    Returns :

    @@ -1028,10 +1028,10 @@ 2 3 4 - 
    const gchar *properties[] = { "CanEditTracks", "Tracks", NULL };
+        
    const gchar *properties[] = { "CanEditTracks", "Tracks", NULL };
 
-tp_dbus_properties_mixin_emit_properties_changed (G_OBJECT (self),
-    "org.mpris.MediaPlayer2.TrackList", properties);
    
+tp_dbus_properties_mixin_emit_properties_changed (G_OBJECT (self),
+    "org.mpris.MediaPlayer2.TrackList", properties);
    @@ -1057,7 +1057,7 @@

    properties :

    -a NULL-terminated array of (unqualified) +a NULL-terminated array of (unqualified) property names whose values have changed. [allow-none] @@ -1089,7 +1089,7 @@

    ... :

    (unqualified) property names whose values have changed, terminated by -NULL. +NULL. diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-dbus-tube-channel.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-dbus-tube-channel.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-dbus-tube-channel.html 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-dbus-tube-channel.html 2012-03-19 15:38:21.000000000 +0000 @@ -162,7 +162,7 @@ A string to GValue GHashTable representing the parameters of the tube.

    -Will be NULL for outgoing tubes until the tube has been offered. +Will be NULL for outgoing tubes until the tube has been offered.

    Since 0.15.6

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-debug.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-debug.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-debug.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-debug.html 2012-03-19 15:38:21.000000000 +0000 @@ -127,7 +127,7 @@

    flags_string :

    -The flags to set, comma-separated. If NULL or empty, +The flags to set, comma-separated. If NULL or empty, no additional flags are set. @@ -168,7 +168,7 @@ file is not truncated and output is added at the end of the file.

    -Passing NULL to this function is guaranteed to have no effect. This is +Passing NULL to this function is guaranteed to have no effect. This is so you can call it with the recommended usage tp_debug_divert_messages (g_getenv ("MYAPP_LOGFILE")) and it won't do anything if the environment variable is not set. @@ -181,7 +181,7 @@

    filename :

    -A file to which to divert stdout and stderr, or NULL to +A file to which to divert stdout and stderr, or NULL to do nothing @@ -210,8 +210,8 @@ 
    1
 2
    - 
    if (g_getenv ("MYPROG_TIMING") != NULL)
-  g_log_set_default_handler (tp_debug_timestamped_log_handler, NULL);
    + 
    if (g_getenv ("MYPROG_TIMING") != NULL)
+  g_log_set_default_handler (tp_debug_timestamped_log_handler, NULL);
    @@ -274,7 +274,7 @@

    flags_string :

    -The flags to set, comma-separated. If NULL or empty, +The flags to set, comma-separated. If NULL or empty, no additional flags are set. diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-debug-sender.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-debug-sender.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-debug-sender.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-debug-sender.html 2012-03-19 15:38:21.000000000 +0000 @@ -171,7 +171,7 @@

    timestamp :

    -Time of the message or NULL for right now +Time of the message or NULL for right now

    domain :

    @@ -213,11 +213,11 @@

    timestamp :

    -Time of the message, or NULL for right now +Time of the message, or NULL for right now

    formatted :

    -Place to store the formatted message, or NULL if not needed +Place to store the formatted message, or NULL if not needed

    domain :

    @@ -264,11 +264,11 @@

    timestamp :

    -Time of the message, or NULL for right now +Time of the message, or NULL for right now

    formatted :

    -Place to store the formatted message, or NULL if not required +Place to store the formatted message, or NULL if not required

    domain :

    @@ -338,19 +338,19 @@ 13 14 
    /* Create a main loop and debug sender */
-GMainLoop *loop = g_main_loop_new (NULL, FALSE);
-TpDebugSender *sender = tp_debug_sender_dup ();
+GMainLoop *loop = g_main_loop_new (NULL, FALSE);
+TpDebugSender *sender = tp_debug_sender_dup ();
 
 /* Set the default handler */
-g_log_set_default_handler (tp_debug_sender_log_handler, G_LOG_DOMAIN);
+g_log_set_default_handler (tp_debug_sender_log_handler, G_LOG_DOMAIN);
 
 /* Run the main loop, but keeping a ref on the TpDebugSender from
  * the beginning of this code sample. */
-g_main_loop_run (loop);
+g_main_loop_run (loop);
 
 /* g_main_loop_quit was called, so only now can we clean up the
  * TpDebugSender. */
-g_object_unref (sender);
    +g_object_unref (sender); @@ -392,7 +392,7 @@

    exclude :

    -a log domain string to exclude from the TpDebugSender, or NULL +a log domain string to exclude from the TpDebugSender, or NULL diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib.devhelp2 telepathy-glib-0.17.6/docs/reference/html/telepathy-glib.devhelp2 --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib.devhelp2 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib.devhelp2 2012-03-19 15:38:21.000000000 +0000 @@ -1279,20 +1279,23 @@ + + - - - + + + + @@ -1341,8 +1344,11 @@ + + + @@ -1386,9 +1392,9 @@ - - - + + + @@ -1634,6 +1640,9 @@ + + + @@ -1862,10 +1871,10 @@ - - + + - + @@ -2510,6 +2519,8 @@ + + @@ -2528,11 +2539,13 @@ + + @@ -2556,9 +2569,12 @@ + + + @@ -2599,6 +2615,7 @@ + @@ -2877,6 +2894,7 @@ + @@ -2889,9 +2907,13 @@ + + + + @@ -2916,6 +2938,7 @@ + @@ -2937,6 +2960,7 @@ + @@ -4727,6 +4751,7 @@ + @@ -4771,14 +4796,32 @@ + + + + + + + + + + + + + + + + + + @@ -4792,7 +4835,9 @@ + + diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-errors.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-errors.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-errors.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-errors.html 2012-03-19 15:38:21.000000000 +0000 @@ -659,7 +659,7 @@

    error :

    -Either NULL, or used to return an error (as for g_set_error) +Either NULL, or used to return an error (as for g_set_error) @@ -687,7 +687,7 @@

    error :

    -Either NULL, or used to return an error (as for g_set_error) +Either NULL, or used to return an error (as for g_set_error) diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-file-transfer-channel.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-file-transfer-channel.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-file-transfer-channel.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-file-transfer-channel.html 2012-03-19 15:38:21.000000000 +0000 @@ -61,8 +61,8 @@ (TpFileTransferChannel *self); const gchar * tp_file_transfer_channel_get_filename (TpFileTransferChannel *self); -guint64 tp_file_transfer_channel_get_size (TpFileTransferChannel *self); -guint64 tp_file_transfer_channel_get_transferred_bytes +guint64 tp_file_transfer_channel_get_size (TpFileTransferChannel *self); +guint64 tp_file_transfer_channel_get_transferred_bytes (TpFileTransferChannel *self); TpFileTransferState tp_file_transfer_channel_get_state (TpFileTransferChannel *self, TpFileTransferStateChangeReason *reason); @@ -73,7 +73,7 @@ void tp_file_transfer_channel_accept_file_async (TpFileTransferChannel *self, GFile *file, - guint64 offset, + guint64 offset, GAsyncReadyCallback callback, gpointer user_data); gboolean tp_file_transfer_channel_accept_file_finish @@ -113,13 +113,13 @@ "description" gchar* : Read "file" GFile* : Read "filename" gchar* : Read - "initial-offset" guint64 : Read + "initial-offset" guint64 : Read "metadata" GHashTable_gchararray+GStrv_* : Read "mime-type" gchar* : Read "service-name" gchar* : Read - "size" guint64 : Read + "size" guint64 : Read "state" guint : Read - "transferred-bytes" guint64 : Read + "transferred-bytes" guint64 : Read
    @@ -171,26 +171,26 @@ 18 19 20 - 
    GHashTable *request = tp_asv_new (
-    TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
-    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
-    TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, "foo@bar.com",
-    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_TYPE, G_TYPE_STRING, "text/plain",
-    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DATE, G_TYPE_INT64, 1320925992,
-    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION, G_TYPE_STRING, "",
-    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME, G_TYPE_STRING, "test.pdf",
-    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET, G_TYPE_UINT64, 0,
-    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE, G_TYPE_UINT64, 165710,
-    NULL);
+        
    GHashTable *request = tp_asv_new (
+    TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
+    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
+    TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, "foo@bar.com",
+    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_TYPE, G_TYPE_STRING, "text/plain",
+    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DATE, G_TYPE_INT64, 1320925992,
+    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION, G_TYPE_STRING, "",
+    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME, G_TYPE_STRING, "test.pdf",
+    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET, G_TYPE_UINT64, 0,
+    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE, G_TYPE_UINT64, 165710,
+    NULL);
 
-TpAccountChannelRequest *channel_request = tp_account_channel_request_new (
-    account, request,
-    TP_USER_ACTION_TIME_CURRENT_TIME);
+TpAccountChannelRequest *channel_request = tp_account_channel_request_new (
+    account, request,
+    TP_USER_ACTION_TIME_CURRENT_TIME);
 
-tp_account_channel_request_create_and_handle_channel_async (channel_request, NULL,
-    create_and_handle_cb, NULL);
+tp_account_channel_request_create_and_handle_channel_async (channel_request, NULL,
+    create_and_handle_cb, NULL);
 
-g_hash_table_unref (request);
    
+g_hash_table_unref (request);
    @@ -250,12 +250,12 @@

    conn :

    -a TpConnection; may not be NULL +a TpConnection; may not be NULL

    object_path :

    -the object path of the channel; may not be NULL +the object path of the channel; may not be NULL @@ -268,7 +268,7 @@

    error :

    -used to indicate the error if NULL is returned +used to indicate the error if NULL is returned

    Returns :

    @@ -403,7 +403,7 @@

    tp_file_transfer_channel_get_size ()

    -
    guint64             tp_file_transfer_channel_get_size   (TpFileTransferChannel *self);
    +
    guint64             tp_file_transfer_channel_get_size   (TpFileTransferChannel *self);

    Return the "size" property

    @@ -426,7 +426,7 @@

    tp_file_transfer_channel_get_transferred_bytes ()

    -
    guint64             tp_file_transfer_channel_get_transferred_bytes
+
    guint64             tp_file_transfer_channel_get_transferred_bytes
                                                         (TpFileTransferChannel *self);
    
 
    
 Return the "transferred-bytes" property
@@ -456,7 +456,7 @@
 Returns the "state" property.
 
    
 
    
-If reason is not NULL it is set to the reason why
+If reason is not NULL it is set to the reason why
 "state" changed to its current value.
 
    
 
    
@@ -469,7 +469,7 @@
 
-
@@ -536,7 +536,7 @@
 
    void                tp_file_transfer_channel_accept_file_async
                                                         (TpFileTransferChannel *self,
                                                          GFile *file,
-                                                         guint64 offset,
+                                                         guint64 offset,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);
    
@@ -766,7 +766,7 @@
 
    
 
    The "initial-offset" property
    
-
      "initial-offset"           guint64               : Read
    
+
      "initial-offset"           guint64               : Read
    
 
    
 The offset in bytes from where the file should be sent.
 
    
@@ -816,25 +816,25 @@
 17
 18
 19
-        
    
+...
    
 
    
 
    reason :
    		a TpFileTransferStateChangeReason, or NULL. [out]
+a TpFileTransferStateChangeReason, or NULL. [out]
 
 
    
 
    
 
 
    GHashTable *request;
-GHashTable *metadata = g_hash_table_new (g_str_hash, g_str_equal);
-const gchar * const values[] = { "Jason Derulo", "Tinie Tempah", NULL };
-g_hash_table_insert (metadata, "best buds", values);
+        
    GHashTable *request;
+GHashTable *metadata = g_hash_table_new (g_str_hash, g_str_equal);
+const gchar * const values[] = { "Jason Derulo", "Tinie Tempah", NULL };
+g_hash_table_insert (metadata, "best buds", values);
 
-request = tp_asv_new (
-    TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
-    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
-    TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, "foo@bar.com",
-    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_TYPE, G_TYPE_STRING, "text/plain",
-    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DATE, G_TYPE_INT64, 1320925992,
-    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION, G_TYPE_STRING, "",
-    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME, G_TYPE_STRING, "test.pdf",
-    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET, G_TYPE_UINT64, 0,
-    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE, G_TYPE_UINT64, 165710,
-    TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_METADATA, TP_TYPE_METADATA, metadata,
-    NULL);
+request = tp_asv_new (
+    TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
+    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
+    TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, "foo@bar.com",
+    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_TYPE, G_TYPE_STRING, "text/plain",
+    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DATE, G_TYPE_INT64, 1320925992,
+    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION, G_TYPE_STRING, "",
+    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME, G_TYPE_STRING, "test.pdf",
+    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET, G_TYPE_UINT64, 0,
+    TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE, G_TYPE_UINT64, 165710,
+    TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_METADATA, TP_TYPE_METADATA, metadata,
+    NULL);
 
-...
    		
       
    
         
   
    
@@ -864,7 +864,7 @@
 
      "service-name"             gchar*                : Read
    
 
    
 A string representing the name of the service suggested to handle
-this file transfer channel, or NULL if the initiator did not
+this file transfer channel, or NULL if the initiator did not
 provide one.
 
    
 
    
@@ -889,12 +889,12 @@
 4
 5
 6
    - 
    tp_base_client_take_handler_filter (handler, tp_asv_new (
-              TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
-              TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
-              TP_PROP_CHANNEL_REQUESTED, G_TYPE_BOOLEAN, FALSE,
-              TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME, G_TYPE_STRING, "service.name",
-              NULL));
    + 
    tp_base_client_take_handler_filter (handler, tp_asv_new (
+              TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
+              TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
+              TP_PROP_CHANNEL_REQUESTED, G_TYPE_BOOLEAN, FALSE,
+              TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME, G_TYPE_STRING, "service.name",
+              NULL));
    @@ -912,7 +912,7 @@

    The "size" property

    -
      "size"                     guint64               : Read
    +
      "size"                     guint64               : Read

    The size of the file to be transferred, or G_MAXUINT64 if not known. @@ -942,7 +942,7 @@

    The "transferred-bytes" property

    -
      "transferred-bytes"        guint64               : Read
    +
      "transferred-bytes"        guint64               : Read

    The number of bytes transferred so far in this file transfer. diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-gnio-util.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-gnio-util.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-gnio-util.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-gnio-util.html 2012-03-19 15:38:21.000000000 +0000 @@ -186,12 +186,12 @@

    byte :

    -if not NULL, used to return the byte. [out] +if not NULL, used to return the byte. [out]

    cancellable :

    -a GCancellable, or NULL. [allow-none] +a GCancellable, or NULL. [allow-none] @@ -201,7 +201,7 @@

    Returns :

    Received credentials on success (free with -g_object_unref()), NULL if error is set. [transfer full] +g_object_unref()), NULL if error is set. [transfer full] @@ -237,7 +237,7 @@

    cancellable :

    -optional GCancellable object, NULL to ignore. [allow-none] +optional GCancellable object, NULL to ignore. [allow-none] @@ -279,17 +279,17 @@

    byte :

    -if not NULL, used to return the byte. [out] +if not NULL, used to return the byte. [out]

    error :

    -a GError, or NULL +a GError, or NULL

    Returns :

    -a GCredentials, or NULL on error. +a GCredentials, or NULL on error. Free the returned object with g_object_unref(). [transfer full] @@ -323,7 +323,7 @@

    cancellable :

    -a GCancellable, or NULL. [allow-none] +a GCancellable, or NULL. [allow-none] @@ -373,7 +373,7 @@

    cancellable :

    -optional GCancellable object, NULL to ignore. [allow-none] +optional GCancellable object, NULL to ignore. [allow-none] @@ -414,7 +414,7 @@

    error :

    -a GError, or NULL +a GError, or NULL diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-gtypes.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-gtypes.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-gtypes.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-gtypes.html 2012-03-19 15:38:21.000000000 +0000 @@ -762,7 +762,9 @@

    A pair (contact handle, alias) as seen in the - <tp:member-ref>AliasesChanged</tp:member-ref> + <tp:member-ref> + AliasesChanged + </tp:member-ref> signal.

    @@ -836,32 +838,56 @@ An amount of money in a specified currency. For example, 3.21 British pounds would conventionally be represented by ( - <var>Amount</var> + <var> + Amount + </var> = - <tt>321</tt> + <tt> + 321 + </tt> , - <var>Scale</var> + <var> + Scale + </var> = - <tt>2</tt> + <tt> + 2 + </tt> , - <var>Currency</var> + <var> + Currency + </var> = - <tt>&quot;GBP&quot;</tt> + <tt> + &quot;GBP&quot; + </tt> ), but could be represented by ( - <var>Amount</var> + <var> + Amount + </var> = - <tt>3210</tt> + <tt> + 3210 + </tt> , - <var>Scale</var> + <var> + Scale + </var> = - <tt>3</tt> + <tt> + 3 + </tt> , - <var>Currency</var> + <var> + Currency + </var> = - <tt>&quot;GBP&quot;</tt> + <tt> + &quot;GBP&quot; + </tt> ) in a service that records balance in units of 0.001 pounds. </p> @@ -871,19 +897,31 @@ <p> As a special case, if - <var>Amount</var> + <var> + Amount + </var> = - <tt>0</tt> + <tt> + 0 + </tt> , - <var>Scale</var> + <var> + Scale + </var> = - <tt>2**32 - 1</tt> + <tt> + 2**32 - 1 + </tt> (i.e. the largest possible 32-bit unsigned integer) and - <var>Currency</var> + <var> + Currency + </var> = - <tt>&quot;&quot;</tt> + <tt> + &quot;&quot; + </tt> , this indicates an unknown amount. </p> @@ -1006,7 +1044,9 @@ new generic flags, old type-specific flags, new type-specific flags) representing a change to one of a contact's capabilities, as seen in the - <tp:member-ref>CapabilitiesChanged</tp:member-ref> + <tp:member-ref> + CapabilitiesChanged + </tp:member-ref> signal on the Capabilities interface.

    @@ -1070,7 +1110,9 @@

    A pair (channel type, type-specific flags) as passed to - <tp:member-ref>AdvertiseCapabilities</tp:member-ref> + <tp:member-ref> + AdvertiseCapabilities + </tp:member-ref> on the Capabilities interface.

    @@ -1112,7 +1154,9 @@ A struct (contact handle, channel type, generic flags, type-specific flags) representing a capability posessed by a contact, as returned by - <tp:member-ref>GetCapabilities</tp:member-ref> + <tp:member-ref> + GetCapabilities + </tp:member-ref> on the Capabilities interface.

    @@ -1298,9 +1342,11 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>Structure representing a class of channels that can be requested, + <p> + Structure representing a class of channels that can be requested, identified by a set of properties that identify that class of - channel.</p> + channel. + </p>

    @@ -1308,10 +1354,12 @@ <tp:rationale> - <p>This will often just be the channel type and the handle type, + <p> + This will often just be the channel type and the handle type, but can include other properties of the channel - for instance, encrypted channels might require properties that - unencrypted channels do not, like an encryption key.</p> + unencrypted channels do not, like an encryption key. + </p> </tp:rationale> @@ -1319,9 +1367,11 @@

    - <p>In some cases, these classes of channel may overlap, in the sense + <p> + In some cases, these classes of channel may overlap, in the sense that one class fixes all the properties that another class does, - plus some more properties.</p> + plus some more properties. + </p>

    @@ -1329,9 +1379,11 @@ <tp:rationale> - <p>For older clients to still be able to understand how to request + <p> + For older clients to still be able to understand how to request channels in the presence of a hypothetical &quot;encryption&quot; interface, - we'd need to represent it like this:</p> + we'd need to represent it like this: + </p>

    @@ -1339,12 +1391,16 @@ <ul> - <li>class 1: ChannelType = Text, TargetHandleType = CONTACT</li> + <li> + class 1: ChannelType = Text, TargetHandleType = CONTACT + </li> - <li>class 2: Channel.ChannelType = Text, + <li> + class 2: Channel.ChannelType = Text, Channel.TargetHandleType = CONTACT, - Encryption.Encrypted = TRUE</li> + Encryption.Encrypted = TRUE + </li> </ul> @@ -1512,10 +1568,12 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>An access control mode for extended presence items like geolocation. + <p> + An access control mode for extended presence items like geolocation. This type isn't actually used by the SimplePresence interface, but it's included here so it can be referenced by rich presence - interfaces.</p> + interfaces. + </p>

    @@ -1523,7 +1581,9 @@ <p> New interfaces should use this type, and NOT - <tp:type>Rich_Presence_Access_Control</tp:type> + <tp:type> + Rich_Presence_Access_Control + </tp:type> . </p> @@ -1561,7 +1621,9 @@ This type isn't actually used by the SimplePresence interface, but it's included here so it can be referenced by rich presence interfaces such as - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface">Location</tp:dbus-ref> + <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface"> + Location + </tp:dbus-ref> . </p> @@ -1569,11 +1631,15 @@

    <p> - <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface">Location</tp:dbus-ref> + <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface"> + Location + </tp:dbus-ref> uses this for historical reasons, new interfaces will use - <tp:type>Access_Control_Type</tp:type> + <tp:type> + Access_Control_Type + </tp:type> . </p> @@ -1879,7 +1945,9 @@

    A struct describing a vCard field, with parameters, that may be passed to - <tp:member-ref>SetContactInfo</tp:member-ref> + <tp:member-ref> + SetContactInfo + </tp:member-ref> on this Connection.

    @@ -2112,10 +2180,12 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>A pair (name, address) representing an e-mail address, + <p> + A pair (name, address) representing an e-mail address, such as (&quot;Nicolas Dufresne&quot;, &quot;nicolas.dufresnecollabora.co.uk&quot;). At least one of name and address MUST be provided. A missing element will - be represented by the empty string.</p> + be represented by the empty string. + </p> <tp:rationale> @@ -2126,7 +2196,9 @@ protocols provide both the displayed name and the address. (If a protocol doesn't provide either, it should omit the appropriate field from the - <tp:type>Mail</tp:type> + <tp:type> + Mail + </tp:type> entirely.) </p> @@ -2172,16 +2244,20 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>A structure containing the required information to open a web-based - e-mail UI, without needing re-authentication (if possible).</p> + <p> + A structure containing the required information to open a web-based + e-mail UI, without needing re-authentication (if possible). + </p>

    - <p>Because the URL and POST data frequently contain short-lived + <p> + Because the URL and POST data frequently contain short-lived credential tokens, a new URL should be requested (by calling one of the methods that returns a Mail_URL) for each visit to the web-based - UI, and the URL should be visited soon after it is returned.</p> + UI, and the URL should be visited soon after it is returned. + </p>

    @@ -2225,7 +2301,9 @@ the requirements of the <a href="http://www.w3.org/TR/html401/types.htmltype-cdata"> - HTML CDATA type</a> + + HTML CDATA type + </a> . The value MUST NOT be encoded with HTML entities. </p> @@ -2233,20 +2311,24 @@

    - <p>For example, if the POST data should contain a key &quot;less-than&quot; with value + <p> + For example, if the POST data should contain a key &quot;less-than&quot; with value &quot;&lt;&quot;, and a key &quot;percent&quot; with value &quot;%&quot;, this should be represented as two HTTP_Post_Data structures, (&quot;less-than&quot;, &quot;&lt;&quot;) and (&quot;percent&quot;, &quot;%&quot;), resulting in a POST request whose request body is &quot;less-than=&amp;lt;&amp;percent=25&quot;. If a client passes this to a browser by writing it into an HTML form, it - could do so by representing it as:</p> + could do so by representing it as: + </p>

    <pre> + &lt;input type=&quot;hidden&quot; name=&quot;less-than&quot;&gt;&amp;lt;&lt;/input&gt; &lt;input type=&quot;hidden&quot; name=&quot;percent&quot;&gt;%&lt;/input&gt; - </pre> + + </pre>

    @@ -2262,17 +2344,21 @@ instruct the browser how to load the URL (like the Netscape Plug-in API), in which case the client MUST escape - <a href="http://www.ietf.org/rfc/rfc1738.txt">characters that are - reserved in URLs</a> + <a href="http://www.ietf.org/rfc/rfc1738.txt"> + characters that are + reserved in URLs + </a> , if appropriate for that API. </p>

    - <p>An array of pairs is used instead of a map from keys to values, + <p> + An array of pairs is used instead of a map from keys to values, because it's valid to repeat keys in both HTML and - x-www-form-urlencoded data.</p> + x-www-form-urlencoded data. + </p> </tp:rationale> @@ -2316,7 +2402,9 @@ A structure representing a contact whose attempt to join a group is to be confirmed by the local user using - <tp:member-ref>AddMembers</tp:member-ref> + <tp:member-ref> + AddMembers + </tp:member-ref> .

    @@ -2452,10 +2540,14 @@ 1970-01-01 00:00 UTC, sender's handle, message type, flags, text) representing a pending text message, as returned by - <tp:member-ref>ListPendingMessages</tp:member-ref> + <tp:member-ref> + ListPendingMessages + </tp:member-ref> . The arguments of the - <tp:member-ref>Received</tp:member-ref> + <tp:member-ref> + Received + </tp:member-ref> signal also match this struct's signature.

    @@ -2703,10 +2795,14 @@

    Represents a participant in a multi-user D-Bus tube, as returned by - <tp:member-ref>GetDBusNames</tp:member-ref> + <tp:member-ref> + GetDBusNames + </tp:member-ref> and seen in the - <tp:member-ref>DBusNamesChanged</tp:member-ref> + <tp:member-ref> + DBusNamesChanged + </tp:member-ref> signal.

    @@ -2946,10 +3042,14 @@ <p> A description of the reason for a change to the - <tp:member-ref>CallState</tp:member-ref> + <tp:member-ref> + CallState + </tp:member-ref> and/or - <tp:member-ref>CallFlags</tp:member-ref> + <tp:member-ref> + CallFlags + </tp:member-ref> . </p> @@ -3378,7 +3478,9 @@

    Implementors and users of Call's - <tp:dbus-ref namespace="ofdT.Call1.Content.MediaDescription.Interface">RTCPFeedback</tp:dbus-ref> + <tp:dbus-ref namespace="ofdT.Call1.Content.MediaDescription.Interface"> + RTCPFeedback + </tp:dbus-ref> should not use the MAXUINT default. Instead, in RTP/AVP, the default should be 5000 (5 seconds). If using the RTP/AVPF profile, it can be set to a lower value, @@ -3702,8 +3804,10 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>A struct containing information regarding a single captcha - mechanism.</p> + <p> + A struct containing information regarding a single captcha + mechanism. + </p>

    @@ -3749,13 +3853,17 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>A struct containing avatar data marked with its MIME type.</p> + <p> + A struct containing avatar data marked with its MIME type. + </p>

    - <p>May be set to an empty byte-array and an empty string, indicating - no avatar.</p> + <p> + May be set to an empty byte-array and an empty string, indicating + no avatar. + </p>

    @@ -3876,7 +3984,9 @@

    A struct representing a debug message, as returned by - <tp:member-ref>GetMessages</tp:member-ref> + <tp:member-ref> + GetMessages + </tp:member-ref> .

    @@ -3928,13 +4038,17 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>Struct representing one reason why a TLS certificate was rejected.</p> + <p> + Struct representing one reason why a TLS certificate was rejected. + </p> - <p>Since there can be multiple things wrong with a TLS certificate, + <p> + Since there can be multiple things wrong with a TLS certificate, arrays of this type are used to represent lists of reasons for rejection. In that case, the most important reason SHOULD be placed - first in the list.</p> + first in the list. + </p>

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-handle-channels-context.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-handle-channels-context.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-handle-channels-context.html 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-handle-channels-context.html 2012-03-19 15:38:21.000000000 +0000 @@ -73,7 +73,7 @@ "dbus-context" gpointer : Write / Construct Only "handler-info" GHashTable_gchararray+GValue_* : Read / Write / Construct Only "requests-satisfied" GPtrArray* : Read / Write / Construct Only - "user-action-time" gint64 : Read / Write / Construct Only + "user-action-time" gint64 : Read / Write / Construct Only
    @@ -237,7 +237,7 @@ Read-only except during construction.

    -This property can't be NULL. +This property can't be NULL.

    Since 0.11.6

    @@ -251,7 +251,7 @@ Read-only except during construction.

    -This property can't be NULL. +This property can't be NULL.

    Since 0.11.6

    @@ -265,7 +265,7 @@ Read-only except during construction.

    -This property can't be NULL. +This property can't be NULL.

    Since 0.11.6

    @@ -290,7 +290,7 @@ HandleChannels.

    -This property can't be NULL. +This property can't be NULL.

    Since 0.11.6

    @@ -304,14 +304,14 @@ Read-only except during construction.

    -This property can't be NULL. +This property can't be NULL.

    Since 0.11.6

    The "user-action-time" property

    -
      "user-action-time"         gint64                : Read / Write / Construct Only
    +
      "user-action-time"         gint64                : Read / Write / Construct Only

    The time at which user action occurred, or one of the special values TP_USER_ACTION_TIME_NOT_USER_ACTION or diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-handle-repo.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-handle-repo.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-handle-repo.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-handle-repo.html 2012-03-19 15:38:21.000000000 +0000 @@ -276,7 +276,7 @@ GError **error);

    Return TRUE if the given handle type is supported (i.e. repos[handle_type] -is not NULL) and the given handles are all valid in that repository. +is not NULL) and the given handles are all valid in that repository. If not, set error and return FALSE.

    @@ -663,7 +663,7 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-media-interfaces.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-media-interfaces.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-media-interfaces.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-media-interfaces.html 2012-03-19 15:38:21.000000000 +0000 @@ -626,26 +626,26 @@ - - - - + - +

    Returns :

    		the data associated with a given key on a given handle; NULL +the data associated with a given key on a given handle; NULL if there is no associated data.

    dbus :

    		a D-Bus daemon; may not be NULL +a D-Bus daemon; may not be NULL

    unique_name :

    		the unique name of the connection process; may not be NULL +the unique name of the connection process; may not be NULL or a well-known name

    object_path :

    		the object path of the media session handler; may not be NULL +the object path of the media session handler; may not be NULL

    error :

    		used to indicate the error if NULL is returnedused to indicate the error if NULL is returned

    Returns :

    		a new media session handler proxy, or NULL on invalid argumentsa new media session handler proxy, or NULL on invalid arguments
    @@ -699,26 +699,26 @@

    dbus :

    -a D-Bus daemon; may not be NULL +a D-Bus daemon; may not be NULL

    unique_name :

    -the unique name of the connection process; may not be NULL +the unique name of the connection process; may not be NULL or a well-known name

    object_path :

    -the object path of the media stream handler; may not be NULL +the object path of the media stream handler; may not be NULL

    error :

    -used to indicate the error if NULL is returned +used to indicate the error if NULL is returned

    Returns :

    -a new media stream handler proxy, or NULL on invalid arguments +a new media stream handler proxy, or NULL on invalid arguments
    @@ -783,7 +783,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -842,28 +842,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -921,12 +921,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -962,7 +962,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -1007,28 +1007,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -1076,12 +1076,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1180,7 +1180,7 @@

    destroy :

    Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -1191,14 +1191,14 @@

    error :

    -If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -1226,7 +1226,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -1276,28 +1276,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -1350,12 +1350,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1391,7 +1391,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -1446,28 +1446,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -1525,12 +1525,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1566,7 +1566,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -1611,28 +1611,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -1680,12 +1680,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1721,7 +1721,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -1776,28 +1776,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -1855,12 +1855,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1896,7 +1896,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -1951,28 +1951,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -2030,12 +2030,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2071,7 +2071,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -2121,28 +2121,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -2195,12 +2195,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2236,7 +2236,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -2286,28 +2286,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -2360,12 +2360,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2401,7 +2401,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -2451,28 +2451,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -2525,12 +2525,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2566,7 +2566,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -2616,28 +2616,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -2690,12 +2690,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -2784,7 +2784,7 @@

    destroy :

    Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -2795,14 +2795,14 @@

    error :

    -If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -2873,7 +2873,7 @@

    destroy :

    Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -2884,14 +2884,14 @@

    error :

    -If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -2967,7 +2967,7 @@

    destroy :

    Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -2978,14 +2978,14 @@

    error :

    -If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -3066,7 +3066,7 @@

    destroy :

    Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -3077,14 +3077,14 @@

    error :

    -If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -3160,7 +3160,7 @@

    destroy :

    Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -3171,14 +3171,14 @@

    error :

    -If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -3254,7 +3254,7 @@

    destroy :

    Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -3265,14 +3265,14 @@

    error :

    -If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -3348,7 +3348,7 @@

    destroy :

    Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -3359,14 +3359,14 @@

    error :

    -If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -3442,7 +3442,7 @@

    destroy :

    Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -3453,14 +3453,14 @@

    error :

    -If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -3536,7 +3536,7 @@

    destroy :

    Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -3547,14 +3547,14 @@

    error :

    -If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -3625,7 +3625,7 @@

    destroy :

    Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -3636,14 +3636,14 @@

    error :

    -If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -3686,28 +3686,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -3752,28 +3752,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -3808,7 +3808,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -3843,7 +3843,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -3892,7 +3892,7 @@

    destroy :

    Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -3903,14 +3903,14 @@

    error :

    -If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -3956,12 +3956,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -4010,12 +4010,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -4100,28 +4100,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -4156,7 +4156,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -4209,12 +4209,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -4303,7 +4303,7 @@

    destroy :

    Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -4314,14 +4314,14 @@

    error :

    -If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -4397,7 +4397,7 @@

    destroy :

    Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -4408,14 +4408,14 @@

    error :

    -If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -4473,28 +4473,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -4529,7 +4529,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -4597,12 +4597,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -4653,28 +4653,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -4724,28 +4724,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -4780,7 +4780,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -4815,7 +4815,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -4864,7 +4864,7 @@

    destroy :

    Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -4875,14 +4875,14 @@

    error :

    -If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -4924,7 +4924,7 @@

    destroy :

    Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -4935,14 +4935,14 @@

    error :

    -If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -4988,12 +4988,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -5047,12 +5047,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-observe-channels-context.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-observe-channels-context.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-observe-channels-context.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-observe-channels-context.html 2012-03-19 15:38:21.000000000 +0000 @@ -223,7 +223,7 @@ Read-only except during construction.

    -This property can't be NULL. +This property can't be NULL.

    Since 0.11.5

    @@ -237,7 +237,7 @@ Read-only except during construction.

    -This property can't be NULL. +This property can't be NULL.

    Since 0.11.5

    @@ -251,7 +251,7 @@ Read-only except during construction.

    -This property can't be NULL. +This property can't be NULL.

    Since 0.11.5

    @@ -273,7 +273,7 @@

    A TpChannelDispatchOperation object representing the ChannelDispatchOperation that has been passed to ObserveChannels, -or NULL if none has been passed. +or NULL if none has been passed. Read-only except during construction.

    Since 0.11.5

    @@ -290,7 +290,7 @@ tp_observe_channels_context_is_recovering() to access to its content.

    -This property can't be NULL. +This property can't be NULL.

    Since 0.11.5

    @@ -304,7 +304,7 @@ Read-only except during construction.

    -This property can't be NULL. +This property can't be NULL.

    Since 0.11.5

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-protocol.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-protocol.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-protocol.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-protocol.html 2012-03-19 15:38:21.000000000 +0000 @@ -55,9 +55,14 @@ void tp_protocol_init_known_interfaces (void); #define TP_PROTOCOL_FEATURE_PARAMETERS +const TpConnectionManagerParam * tp_protocol_borrow_params + (TpProtocol *self); +GList * tp_protocol_dup_params (TpProtocol *self); GStrv tp_protocol_dup_param_names (TpProtocol *self); const TpConnectionManagerParam * tp_protocol_get_param (TpProtocol *self, const gchar *param); +TpConnectionManagerParam * tp_protocol_dup_param (TpProtocol *self, + const gchar *param); gboolean tp_protocol_has_param (TpProtocol *self, const gchar *param); gboolean tp_protocol_can_register (TpProtocol *self); @@ -198,7 +203,7 @@

    dbus :

    -proxy for the D-Bus daemon; may not be NULL +proxy for the D-Bus daemon; may not be NULL @@ -215,11 +220,11 @@

    error :

    -used to indicate the error if NULL is returned +used to indicate the error if NULL is returned

    Returns :

    -a new protocol proxy, or NULL on invalid arguments +a new protocol proxy, or NULL on invalid arguments @@ -288,6 +293,61 @@
    +

    tp_protocol_borrow_params ()

    +
    const TpConnectionManagerParam * tp_protocol_borrow_params
+                                                        (TpProtocol *self);
    +

    +Returns an array of parameters supported by this connection manager, +without additional memory allocations. The returned array is owned by +self, and must not be used after self has been freed. +

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

    self :

    		a protocol

    Returns :

    		an array of TpConnectionManagerParam structures, +terminated by one whose name is NULL. [transfer none] +
    +

    Since 0.UNRELEASED

    +
    +
    +
    +

    tp_protocol_dup_params ()

    +
    GList *             tp_protocol_dup_params              (TpProtocol *self);
    +

    +Returns a list of parameters supported by this connection manager. +

    +

    +The returned list must be freed by the caller, for instance with +g_list_free_full (l, +(GDestroyNotify) tp_connection_manager_param_free). +

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

    self :

    		a protocol

    Returns :

    		a list of TpConnectionManagerParam structures, owned by the caller. [transfer full][element-type TelepathyGLib.ConnectionManagerParam] +
    +

    Since 0.UNRELEASED

    +
    +
    +

    tp_protocol_dup_param_names ()

    GStrv               tp_protocol_dup_param_names         (TpProtocol *self);

    @@ -335,7 +395,7 @@

    Returns :

    -a structure representing the parameter param, or NULL if not +a structure representing the parameter param, or NULL if not supported @@ -344,6 +404,35 @@
    +

    tp_protocol_dup_param ()

    +
    TpConnectionManagerParam * tp_protocol_dup_param        (TpProtocol *self,
+                                                         const gchar *param);
    +

    + +

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

    self :

    		a protocol

    param :

    		a parameter name

    Returns :

    		a structure representing the parameter param, +or NULL if not supported. Free with tp_connection_manager_param_free(). [transfer full] +
    +

    Since 0.UNRELEASED

    +
    +
    +

    tp_protocol_has_param ()

    gboolean            tp_protocol_has_param               (TpProtocol *self,
                                                          const gchar *param);
    @@ -448,7 +537,7 @@

    Returns :

    "capabilities", which must be referenced -(if non-NULL) if it will be kept. [transfer none] +(if non-NULL) if it will be kept. [transfer none] @@ -471,7 +560,7 @@

    Returns :

    -the non-NULL, non-empty value of "english-name" +the non-NULL, non-empty value of "english-name" @@ -494,7 +583,7 @@

    Returns :

    -the non-NULL, non-empty value of "icon-name" +the non-NULL, non-empty value of "icon-name" @@ -610,28 +699,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -681,28 +770,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -737,12 +826,12 @@

    out_Account_ID :

    -Used to return an 'out' argument if error is NULL: <p>An opaque string suitable for use as the account-specific part of an <tp:dbus-ref namespace="org.freedesktop.Telepathy">Account</tp:dbus-ref>'s object path. This is not necessarily globally unique, but should represent a &quot;best-effort&quot; identification of the account.</p> <tp:rationale> <p>For a pathological case, consider a user signing in as 'meexample.com' with 'server' set to either jabber1.example.com or jabber2.example.com. Both of these should result in meexample.com being returned from this method, even if the user can actually be signed in to those two servers simultaneously.</p> </tp:rationale> +Used to return an 'out' argument if error is NULL: <p>An opaque string suitable for use as the account-specific part of an <tp:dbus-ref namespace="org.freedesktop.Telepathy">Account</tp:dbus-ref>'s object path. This is not necessarily globally unique, but should represent a &quot;best-effort&quot; identification of the account.</p> <tp:rationale> <p>For a pathological case, consider a user signing in as 'meexample.com' with 'server' set to either jabber1.example.com or jabber2.example.com. Both of these should result in meexample.com being returned from this method, even if the user can actually be signed in to those two servers simultaneously.</p> </tp:rationale>

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -777,12 +866,12 @@

    out_Normalized_Contact_ID :

    -Used to return an 'out' argument if error is NULL: The identifier of a contact in this protocol, normalized as much as possible +Used to return an 'out' argument if error is NULL: The identifier of a contact in this protocol, normalized as much as possible

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -832,28 +921,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -908,28 +997,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -964,12 +1053,12 @@

    out_Normalized_URI :

    -Used to return an 'out' argument if error is NULL: A URI, normalized as much as possible. +Used to return an 'out' argument if error is NULL: A URI, normalized as much as possible.

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -1004,12 +1093,12 @@

    out_Normalized_VCard_Address :

    -Used to return an 'out' argument if error is NULL: The vCard address, normalized as much as possible. +Used to return an 'out' argument if error is NULL: The vCard address, normalized as much as possible.

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -1029,9 +1118,9 @@

    The "authentication-types" property

      "authentication-types"     GStrv                 : Read

    -A non-NULL GStrv of interfaces which provide information as to +A non-NULL GStrv of interfaces which provide information as to what kind of authentication channels can possibly appear before -the connection reaches the CONNECTED state, or NULL if +the connection reaches the CONNECTED state, or NULL if TP_PROTOCOL_FEATURE_CORE has not been prepared.

    Since 0.13.9

    @@ -1042,7 +1131,7 @@ 
      "avatar-requirements"      gpointer              : Read

    A TpAvatarRequirements representing the avatar requirements on this -protocol, or NULL if TP_PROTOCOL_FEATURE_CORE has not been prepared or +protocol, or NULL if TP_PROTOCOL_FEATURE_CORE has not been prepared or if the protocol doesn't support avatars.

    Since 0.15.6

    @@ -1053,7 +1142,7 @@ 
      "capabilities"             TpCapabilities*       : Read

    The classes of channel that can be requested from connections to this -protocol, or NULL if this is unknown or the TP_PROTOCOL_FEATURE_CORE +protocol, or NULL if this is unknown or the TP_PROTOCOL_FEATURE_CORE feature has not been prepared.

    Since 0.11.11

    @@ -1098,7 +1187,7 @@ 
      "param-names"              GStrv                 : Read

    A list of parameter names supported by this connection manager -for this protocol, or NULL if TP_PROTOCOL_FEATURE_PARAMETERS has not +for this protocol, or NULL if TP_PROTOCOL_FEATURE_PARAMETERS has not been prepared.

    Since 0.11.11

    @@ -1136,7 +1225,7 @@ 
      "vcard-field"              gchar*                : Read

    The most common vCard field used for this protocol's contact -identifiers, normalized to lower case, or NULL if there is no such field +identifiers, normalized to lower case, or NULL if there is no such field or the TP_PROTOCOL_FEATURE_CORE feature has not been prepared.

    Default value: NULL

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-proxy-dbus-core.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-proxy-dbus-core.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-proxy-dbus-core.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-proxy-dbus-core.html 2012-03-19 15:38:21.000000000 +0000 @@ -210,28 +210,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -266,12 +266,12 @@

    out_XML_Data :

    -Used to return an 'out' argument if error is NULL: (Undocumented) +Used to return an 'out' argument if error is NULL: (Undocumented)

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -324,12 +324,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -375,28 +375,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -440,28 +440,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -496,12 +496,12 @@

    out_Machine_UUID :

    -Used to return an 'out' argument if error is NULL: (Undocumented) +Used to return an 'out' argument if error is NULL: (Undocumented)

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -536,7 +536,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -588,12 +588,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -641,12 +641,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -701,28 +701,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -772,28 +772,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -852,28 +852,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -908,12 +908,12 @@

    out_Value :

    -Used to return an 'out' argument if error is NULL: (Undocumented) +Used to return an 'out' argument if error is NULL: (Undocumented)

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -948,12 +948,12 @@

    out_Properties :

    -Used to return an 'out' argument if error is NULL: (Undocumented) +Used to return an 'out' argument if error is NULL: (Undocumented)

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -988,7 +988,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -1050,12 +1050,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1113,12 +1113,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -1212,7 +1212,7 @@

    destroy :

    Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -1223,14 +1223,14 @@

    error :

    -If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -1285,12 +1285,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-proxy.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-proxy.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-proxy.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-proxy.html 2012-03-19 15:38:21.000000000 +0000 @@ -447,9 +447,9 @@ 
    1
 2
 3
    - 
    TpChannel *channel = ...;
+        
    TpChannel *channel = ...;
 
-tp_proxy_prepare_async (channel, NULL, callback, user_data);
    
+tp_proxy_prepare_async (channel, NULL, callback, user_data);
    @@ -470,10 +470,10 @@ 2 3 4 - 
    TpChannel *channel = ...;
-GQuark features[] = { TP_CHANNEL_FEATURE_CORE, 0 };
+        
    TpChannel *channel = ...;
+GQuark features[] = { TP_CHANNEL_FEATURE_CORE, 0 };
 
-tp_proxy_prepare_async (channel, features, callback, user_data);
    
+tp_proxy_prepare_async (channel, features, callback, user_data);
    @@ -511,13 +511,13 @@

    features :

    an array -of desired features, ending with 0; NULL is equivalent to an array +of desired features, ending with 0; NULL is equivalent to an array containing only 0. [transfer none][array zero-terminated=1][allow-none]

    callback :

    -if not NULL, called exactly once, when the features have all +if not NULL, called exactly once, when the features have all been prepared or failed to prepare, or after the proxy is invalidated @@ -676,7 +676,7 @@

    Returns :

    a borrowed reference to the TpDBusDaemon for -this object, if any; always NULL if this object is itself a +this object, if any; always NULL if this object is itself a TpDBusDaemon. The caller must reference the returned object with g_object_ref() if it will be kept. [transfer none] @@ -771,7 +771,7 @@

    Returns :

    -the reason this proxy was invalidated, or NULL if has not been +the reason this proxy was invalidated, or NULL if has not been invalidated. The caller must copy the error, for instance with g_error_copy(), if it will be kept. @@ -807,7 +807,7 @@

    debug_message :

    -a debug message that accompanied the error name, or NULL +a debug message that accompanied the error name, or NULL @@ -991,7 +991,7 @@ 
      "factory"                  TpSimpleClientFactory*  : Read / Write / Construct Only

    The TpSimpleClientFactory used to create this proxy, -or NULL if this proxy was not created through a factory. +or NULL if this proxy was not created through a factory.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-proxy-subclass.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-proxy-subclass.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-proxy-subclass.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-proxy-subclass.html 2012-03-19 15:38:21.000000000 +0000 @@ -84,7 +84,7 @@ void tp_proxy_pending_call_v0_completed (gpointer p); void tp_proxy_pending_call_v0_take_pending_call (TpProxyPendingCall *pc, - DBusGProxyCall *pending_call); + DBusGProxyCall *pending_call); void tp_proxy_pending_call_v0_take_results (TpProxyPendingCall *pc, GError *error, @@ -149,7 +149,7 @@

    Returns :

    -either NULL or a borrowed DBusGProxy corresponding to iface, +either NULL or a borrowed DBusGProxy corresponding to iface, depending on implementation details. To reliably borrow the DBusGProxy, use tp_proxy_borrow_interface_by_id(). (This method should probably have returned void; sorry.) @@ -214,7 +214,7 @@

    Returns :

    a borrowed reference to a DBusGProxy for which the bus name and object path are the same as for self, but the -interface is as given (or NULL if an error is raised). +interface is as given (or NULL if an error is raised). The reference is only valid as long as self is. @@ -446,8 +446,8 @@ rather than from the callback for the reply.

    -At most one of args and error can be non-NULL (implementations may -assert this). args and error may both be NULL if a method with no +At most one of args and error can be non-NULL (implementations may +assert this). args and error may both be NULL if a method with no "out" arguments (i.e. a method that returns nothing) was called successfully.

    @@ -466,13 +466,13 @@

    error :

    -NULL if the method call succeeded, or a non-NULL error if the +NULL if the method call succeeded, or a non-NULL error if the method call failed

    args :

    array of "out" arguments (return values) for the D-Bus method, -or NULL if an error occurred or if there were no "out" arguments +or NULL if an error occurred or if there were no "out" arguments

    callback :

    @@ -573,7 +573,7 @@

    weak_object :

    -if not NULL, a GObject which will be weakly referenced by +if not NULL, a GObject which will be weakly referenced by the signal connection - if it is destroyed, the pending call will automatically be cancelled @@ -624,7 +624,7 @@

    tp_proxy_pending_call_v0_take_pending_call ()

    void                tp_proxy_pending_call_v0_take_pending_call
                                                         (TpProxyPendingCall *pc,
-                                                         DBusGProxyCall *pending_call);
    + DBusGProxyCall *pending_call);

    Set the underlying pending call to be used by this object. See also tp_proxy_pending_call_v0_new(). @@ -675,14 +675,14 @@

    error :

    -NULL if the call was successful, or an error (whose ownership +NULL if the call was successful, or an error (whose ownership is taken over by the pending call object). Because of dbus-glib idiosyncrasies, this must be the error produced by dbus-glib, not a copy.

    args :

    -NULL if the call failed or had no "out" arguments, or an array +NULL if the call failed or had no "out" arguments, or an array of "out" arguments (whose ownership is taken over by the pending call object) @@ -743,12 +743,12 @@ guaranteed to be called by future versions of telepathy-glib, which might be able to implement its functionality internally. If no arguments are expected at all (expected_types = { G_TYPE_INVALID }) then this callback -should instead be NULL +should instead be NULL

    invoke_callback :

    -a function which will be called with error = NULL, +a function which will be called with error = NULL, which should invoke callback with user_data, weak_object and other appropriate arguments taken from args @@ -770,17 +770,17 @@

    weak_object :

    -if not NULL, a GObject which will be weakly referenced by +if not NULL, a GObject which will be weakly referenced by the signal connection - if it is destroyed, the signal connection will automatically be disconnected

    error :

    -If not NULL, used to raise an error if NULL is returned +If not NULL, used to raise an error if NULL is returned

    Returns :

    -a signal connection structure, or NULL if the proxy does not +a signal connection structure, or NULL if the proxy does not have the desired interface or has become invalid diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-proxy-tp-properties.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-proxy-tp-properties.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-proxy-tp-properties.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-proxy-tp-properties.html 2012-03-19 15:38:21.000000000 +0000 @@ -160,12 +160,12 @@

    out_Values :

    -Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An array of structs containing:</p> <ul> <li>integer identifiers</li> <li>variant boxed values</li> </ul> +Used to return an 'out' argument if error is NULL: <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An array of structs containing:</p> <ul> <li>integer identifiers</li> <li>variant boxed values</li> </ul>

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -215,28 +215,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -294,12 +294,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -335,12 +335,12 @@

    out_Available_Properties :

    -Used to return an 'out' argument if error is NULL: An array of structs containing: <ul> <li>an integer identifier</li> <li>a string property name</li> <li>a string representing the D-Bus signature of this property</li> <li>a bitwise OR of the flags applicable to this property</li> </ul> +Used to return an 'out' argument if error is NULL: An array of structs containing: <ul> <li>an integer identifier</li> <li>a string property name</li> <li>a string representing the D-Bus signature of this property</li> <li>a bitwise OR of the flags applicable to this property</li> </ul>

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -385,28 +385,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -459,12 +459,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -500,7 +500,7 @@

    error :

    -NULL on success, or an error on failure +NULL on success, or an error on failure

    user_data :

    @@ -550,28 +550,28 @@

    callback :

    called when the method call succeeds or fails; -may be NULL to make a "fire and forget" call with no +may be NULL to make a "fire and forget" call with no reply tracking

    user_data :

    user-supplied data passed to the callback; -must be NULL if callback is NULL +must be NULL if callback is NULL

    destroy :

    called with the user_data as argument, after the call has succeeded, failed or been cancelled; -must be NULL if callback is NULL +must be NULL if callback is NULL

    weak_object :

    -If not NULL, a GObject which will be +If not NULL, a GObject which will be weakly referenced; if it is destroyed, this call -will automatically be cancelled. Must be NULL if -callback is NULL +will automatically be cancelled. Must be NULL if +callback is NULL @@ -624,12 +624,12 @@

    error :

    -If not NULL, used to return errors if FALSE +If not NULL, used to return errors if FALSE is returned

    loop :

    -If not NULL, set before re-entering +If not NULL, set before re-entering the main loop, to point to a GMainLoop which can be used to cancel this call with g_main_loop_quit(), causing a return of @@ -713,7 +713,7 @@

    destroy :

    Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -724,14 +724,14 @@

    error :

    -If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. @@ -807,7 +807,7 @@

    destroy :

    Destructor for the user-supplied data, which will be called when this signal is disconnected, or -before this function returns NULL +before this function returns NULL @@ -818,14 +818,14 @@

    error :

    -If not NULL, used to raise an error if NULL is +If not NULL, used to raise an error if NULL is returned

    Returns :

    a TpProxySignalConnection containing all of the above, which can be used to disconnect the signal; or -NULL if the proxy does not have the desired interface +NULL if the proxy does not have the desired interface or has become invalid. diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-simple-approver.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-simple-approver.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-simple-approver.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-simple-approver.html 2012-03-19 15:38:21.000000000 +0000 @@ -137,32 +137,32 @@ 24 25 26 - 
    static void
-my_add_dispatch_operation (TpSimpleApprover *approver,
-   TpAccount *account,
-   TpConnection *connection,
-   GList *channels,
-   TpChannelDispatchOperation *dispatch_operation,
-   TpAddDispatchOperationContext *context,
-   gpointer user_data)
-{
- /* call tp_channel_dispatch_operation_handle_with_async()
+        
    static void
+my_add_dispatch_operation (TpSimpleApprover *approver,
+   TpAccount *account,
+   TpConnection *connection,
+   GList *channels,
+   TpChannelDispatchOperation *dispatch_operation,
+   TpAddDispatchOperationContext *context,
+   gpointer user_data)
+{
+ /* call tp_channel_dispatch_operation_handle_with_async()
  if wanting to approve the channels */
 
- tp_add_dispatch_operation_context_accept (context);
-}
+ tp_add_dispatch_operation_context_accept (context);
+}
 
-factory = tp_automatic_client_factory_new (dbus);
-client = tp_simple_approver_new_with_factory (factory, "MyApprover", FALSE,
-   my_add_dispatch_operation, user_data);
-g_object_unref (factory);
+factory = tp_automatic_client_factory_new (dbus);
+client = tp_simple_approver_new_with_factory (factory, "MyApprover", FALSE,
+   my_add_dispatch_operation, user_data);
+g_object_unref (factory);
 
-tp_base_client_take_approver_filter (client, tp_asv_new (
-     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
-     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
-     NULL));
+tp_base_client_take_approver_filter (client, tp_asv_new (
+     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
+     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
+     NULL));
 
-tp_base_client_register (client, NULL);
    
+tp_base_client_register (client, NULL);
    @@ -227,7 +227,7 @@

    dispatch_operation :

    -a TpChannelDispatchOperation or NULL; +a TpChannelDispatchOperation or NULL; the dispatch_operation is not guaranteed to be prepared. [allow-none] @@ -271,7 +271,7 @@

    dbus :

    -a TpDBusDaemon object, may not be NULL +a TpDBusDaemon object, may not be NULL @@ -327,7 +327,7 @@

    account_manager :

    -an account manager, which may not be NULL +an account manager, which may not be NULL @@ -379,7 +379,7 @@

    factory :

    -an TpSimpleClientFactory, which may not be NULL +an TpSimpleClientFactory, which may not be NULL @@ -424,7 +424,7 @@ AddDispatchOperation D-Bus method.

    -This property can't be NULL. +This property can't be NULL.

    Since 0.11.5

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-simple-client-factory.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-simple-client-factory.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-simple-client-factory.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-simple-client-factory.html 2012-03-19 15:38:21.000000000 +0000 @@ -178,21 +178,21 @@ 13 14 15 - 
    int main(int argc, char *argv[])
-{
-  TpSimpleClientFactory *factory;
-  TpAccountManager *manager;
+        
    int main(int argc, char *argv[])
+{
+  TpSimpleClientFactory *factory;
+  TpAccountManager *manager;
 
-  g_type_init ();
+  g_type_init ();
 
-  factory = my_factory_new ();
-  manager = tp_account_manager_new_with_factory (factory);
-  tp_account_manager_set_default (manager);
+  factory = my_factory_new ();
+  manager = tp_account_manager_new_with_factory (factory);
+  tp_account_manager_set_default (manager);
 
-  ...
-  tp_proxy_prepare_async (manager, am_features, callback, user_data);
-  ...
-}
    
+  ...
+  tp_proxy_prepare_async (manager, am_features, callback, user_data);
+  ...
+}
    @@ -412,7 +412,7 @@

    immutable_properties :

    -the immutable properties of the account, or NULL. [transfer none][element-type utf8 GObject.Value] +the immutable properties of the account, or NULL. [transfer none][element-type utf8 GObject.Value] @@ -490,7 +490,7 @@

    features :

    an array -of desired features, ending with 0; NULL is equivalent to an array +of desired features, ending with 0; NULL is equivalent to an array containing only 0. [transfer none][array zero-terminated=1][allow-none] @@ -639,7 +639,7 @@

    features :

    an array -of desired features, ending with 0; NULL is equivalent to an array +of desired features, ending with 0; NULL is equivalent to an array containing only 0. [transfer none][array zero-terminated=1][allow-none] @@ -795,7 +795,7 @@

    features :

    an array -of desired features, ending with 0; NULL is equivalent to an array +of desired features, ending with 0; NULL is equivalent to an array containing only 0. [transfer none][array zero-terminated=1][allow-none] @@ -949,7 +949,7 @@

    features :

    an array of desired -features (may be NULL if n_features is 0). [array length=n_features][allow-none] +features (may be NULL if n_features is 0). [array length=n_features][allow-none] diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-simple-handler.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-simple-handler.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-simple-handler.html 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-simple-handler.html 2012-03-19 15:38:21.000000000 +0000 @@ -54,7 +54,7 @@ TpConnection *connection, GList *channels, GList *requests_satisfied, - gint64 user_action_time, + gint64 user_action_time, TpHandleChannelsContext *context, gpointer user_data); TpBaseClient * tp_simple_handler_new (TpDBusDaemon *dbus, @@ -147,33 +147,33 @@ 25 26 27 - 
    static void
-my_handle_channels (TpSimpleHandler *handler,
-   TpAccount *account,
-   TpConnection *connection,
-   GList *channels,
-   GList *requests_satisfied,
-   gint64 user_action_time,
-   GList *requests,
-   TpHandleChannelsContext *context,
-   gpointer user_data)
-{
- /* start handling the channels here */
+        
    static void
+my_handle_channels (TpSimpleHandler *handler,
+   TpAccount *account,
+   TpConnection *connection,
+   GList *channels,
+   GList *requests_satisfied,
+   gint64 user_action_time,
+   GList *requests,
+   TpHandleChannelsContext *context,
+   gpointer user_data)
+{
+ /* start handling the channels here */
 
- tp_handle_channels_context_accept (context);
-}
+ tp_handle_channels_context_accept (context);
+}
 
-factory = tp_automatic_client_factory_new (dbus);
-client = tp_simple_handler_new_with_factory (factory, FALSE, FALSE,
-    "MyHandler", FALSE, my_handle_channels, user_data);
-g_object_unref (factory);
+factory = tp_automatic_client_factory_new (dbus);
+client = tp_simple_handler_new_with_factory (factory, FALSE, FALSE,
+    "MyHandler", FALSE, my_handle_channels, user_data);
+g_object_unref (factory);
 
-tp_base_client_take_handler_filter (client, tp_asv_new (
-     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
-     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
-     NULL));
+tp_base_client_take_handler_filter (client, tp_asv_new (
+     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
+     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
+     NULL));
 
-tp_base_client_register (client, NULL);
    
+tp_base_client_register (client, NULL);
    @@ -204,7 +204,7 @@ TpConnection *connection, GList *channels, GList *requests_satisfied, - gint64 user_action_time, + gint64 user_action_time, TpHandleChannelsContext *context, gpointer user_data);

    @@ -293,7 +293,7 @@

    dbus :

    -a TpDBusDaemon object, may not be NULL +a TpDBusDaemon object, may not be NULL @@ -361,7 +361,7 @@

    account_manager :

    -an account manager, which may not be NULL +an account manager, which may not be NULL @@ -425,7 +425,7 @@

    factory :

    -a TpSimpleClientFactory, which may not be NULL +a TpSimpleClientFactory, which may not be NULL @@ -490,7 +490,7 @@ HandleChannels D-Bus method.

    -This property can't be NULL. +This property can't be NULL.

    Since 0.11.6

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-simple-observer.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-simple-observer.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-simple-observer.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-simple-observer.html 2012-03-19 15:38:21.000000000 +0000 @@ -142,32 +142,32 @@ 24 25 26 - 
    static void
-my_observe_channels (TpSimpleObserver *observer,
-   TpAccount *account,
-   TpConnection *connection,
-   GList *channels,
-   TpChannelDispatchOperation *dispatch_operation,
-   GList *requests,
-   TpObserveChannelsContext *context,
-   gpointer user_data)
-{
- /* do something useful with the channels here */
+        
    static void
+my_observe_channels (TpSimpleObserver *observer,
+   TpAccount *account,
+   TpConnection *connection,
+   GList *channels,
+   TpChannelDispatchOperation *dispatch_operation,
+   GList *requests,
+   TpObserveChannelsContext *context,
+   gpointer user_data)
+{
+ /* do something useful with the channels here */
 
- tp_observe_channels_context_accept (context);
-}
+ tp_observe_channels_context_accept (context);
+}
 
-factory = tp_automatic_client_factory_new (dbus);
-client = tp_simple_observer_new_with_factory (factory, TRUE, "MyObserver",
-    FALSE, my_observe_channels, user_data);
-g_object_unref (factory);
+factory = tp_automatic_client_factory_new (dbus);
+client = tp_simple_observer_new_with_factory (factory, TRUE, "MyObserver",
+    FALSE, my_observe_channels, user_data);
+g_object_unref (factory);
 
-tp_base_client_take_observer_filter (client, tp_asv_new (
-     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
-     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
-     NULL));
+tp_base_client_take_observer_filter (client, tp_asv_new (
+     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
+     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
+     NULL));
 
-tp_base_client_register (client, NULL);
    
+tp_base_client_register (client, NULL);
    @@ -233,7 +233,7 @@

    dispatch_operation :

    -a TpChannelDispatchOperation or NULL; +a TpChannelDispatchOperation or NULL; the dispatch_operation is not guaranteed to be prepared. [allow-none] @@ -285,7 +285,7 @@

    dbus :

    -a TpDBusDaemon object, may not be NULL +a TpDBusDaemon object, may not be NULL @@ -346,7 +346,7 @@

    account_manager :

    -an account manager, which may not be NULL +an account manager, which may not be NULL @@ -403,7 +403,7 @@

    factory :

    -a TpSimpleClientFactory, which may not be NULL +a TpSimpleClientFactory, which may not be NULL @@ -452,7 +452,7 @@ ObserveChannels D-Bus method.

    -This property can't be NULL. +This property can't be NULL.

    Since 0.11.5

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-simple-password-manager.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-simple-password-manager.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-simple-password-manager.html 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-simple-password-manager.html 2012-03-19 15:38:21.000000000 +0000 @@ -123,7 +123,7 @@ tp_simple_password_manager_prompt_async() is called and the connection should call tp_simple_password_manager_prompt_finish() to get the result of the process. If the GString returned from -said finish function is non-NULL, the connection can then proceed +said finish function is non-NULL, the connection can then proceed with that password, otherwise the connection must deal with the error reached.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-stream-tube-channel.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-stream-tube-channel.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-stream-tube-channel.html 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-stream-tube-channel.html 2012-03-19 15:38:21.000000000 +0000 @@ -262,12 +262,12 @@

    conn :

    -a TpConnection; may not be NULL +a TpConnection; may not be NULL

    object_path :

    -the object path of the channel; may not be NULL +the object path of the channel; may not be NULL @@ -280,7 +280,7 @@

    error :

    -used to indicate the error if NULL is returned +used to indicate the error if NULL is returned

    Returns :

    @@ -318,7 +318,7 @@

    params :

    -parameters of the tube, or NULL. [allow-none][transfer none] +parameters of the tube, or NULL. [allow-none][transfer none] @@ -379,7 +379,7 @@ A string to GValue GHashTable representing the parameters of the tube.

    -Will be NULL for outgoing tubes until the tube has been offered. +Will be NULL for outgoing tubes until the tube has been offered.

    Since 0.13.2

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-stream-tube-connection.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-stream-tube-connection.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-stream-tube-connection.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-stream-tube-connection.html 2012-03-19 15:38:21.000000000 +0000 @@ -187,7 +187,7 @@ The TpStreamTubeChannel channel associated with this connection

    -This property can't be NULL. +This property can't be NULL.

    Since 0.13.2

    @@ -197,10 +197,10 @@ 
      "contact"                  TpContact*            : Read / Write / Construct Only

    The TpContact with who we are exchanging data through this tube, or -NULL if we can't safely identify the contact. +NULL if we can't safely identify the contact.

    -If not NULL, the TpContact objects is guaranteed to have all of the +If not NULL, the TpContact objects is guaranteed to have all of the features previously passed to tp_simple_client_factory_add_contact_features() prepared.

    @@ -215,7 +215,7 @@ Read-only except during construction.

    -This property can't be NULL. +This property can't be NULL.

    Since 0.13.2

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-account.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-account.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-account.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-account.html 2012-03-19 15:38:21.000000000 +0000 @@ -443,7 +443,7 @@

    The class of TpSvcAccountInterfaceAvatar. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    @@ -480,7 +480,7 @@

    The class of TpSvcAccountInterfaceStorage. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-anonymity.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-anonymity.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-anonymity.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-anonymity.html 2012-03-19 15:38:21.000000000 +0000 @@ -101,7 +101,7 @@

    The class of TpSvcConnectionInterfaceAnonymity. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    @@ -145,7 +145,7 @@

    The class of TpSvcChannelInterfaceAnonymity. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-auth.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-auth.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-auth.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-auth.html 2012-03-19 15:38:21.000000000 +0000 @@ -218,7 +218,7 @@

    The class of TpSvcChannelTypeServerAuthentication. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-call.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-call.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-call.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-call.html 2012-03-19 15:38:21.000000000 +0000 @@ -582,6 +582,15 @@ TpSvcCallContentMediaDescription is implemented by TpCallContentMediaDescription.

    +TpSvcCallContentMediaDescriptionInterfaceRTCPExtendedReports is implemented by + TpCallContentMediaDescription.

    +

    +TpSvcCallContentMediaDescriptionInterfaceRTCPFeedback is implemented by + TpCallContentMediaDescription.

    +

    +TpSvcCallContentMediaDescriptionInterfaceRTPHeaderExtensions is implemented by + TpCallContentMediaDescription.

    +

    TpSvcCallStream is implemented by TpBaseCallStream and TpBaseMediaCallStream.

    @@ -1753,7 +1762,7 @@

    The class of TpSvcCallContentInterfaceVideoControl. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    @@ -2565,7 +2574,7 @@

    The class of TpSvcCallContentMediaDescriptionInterfaceRTCPExtendedReports. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    @@ -2585,7 +2594,7 @@

    The class of TpSvcCallContentMediaDescriptionInterfaceRTCPFeedback. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    @@ -2605,7 +2614,7 @@

    The class of TpSvcCallContentMediaDescriptionInterfaceRTPHeaderExtensions. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-contactlist.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-contactlist.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-contactlist.html 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-contactlist.html 2012-03-19 15:38:21.000000000 +0000 @@ -81,7 +81,7 @@

    The class of TpSvcChannelTypeContactList. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-dispatcher.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-dispatcher.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-dispatcher.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-dispatcher.html 2012-03-19 15:38:21.000000000 +0000 @@ -53,7 +53,7 @@ (TpSvcChannelDispatcher *self, const gchar *in_Account, GHashTable *in_Requested_Properties, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, const gchar *in_Preferred_Handler, DBusGMethodInvocation *context); void tp_svc_channel_dispatcher_implement_create_channel @@ -66,7 +66,7 @@ (TpSvcChannelDispatcher *self, const gchar *in_Account, GHashTable *in_Requested_Properties, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, const gchar *in_Preferred_Handler, GHashTable *in_Hints, DBusGMethodInvocation *context); @@ -80,7 +80,7 @@ (TpSvcChannelDispatcher *self, const gchar *in_Account, GHashTable *in_Requested_Properties, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, const gchar *in_Preferred_Handler, DBusGMethodInvocation *context); void tp_svc_channel_dispatcher_implement_ensure_channel @@ -93,7 +93,7 @@ (TpSvcChannelDispatcher *self, const gchar *in_Account, GHashTable *in_Requested_Properties, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, const gchar *in_Preferred_Handler, GHashTable *in_Hints, DBusGMethodInvocation *context); @@ -103,7 +103,7 @@ void (*tp_svc_channel_dispatcher_delegate_channels_impl) (TpSvcChannelDispatcher *self, const GPtrArray *in_Channels, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, const gchar *in_Preferred_Handler, DBusGMethodInvocation *context); void tp_svc_channel_dispatcher_implement_delegate_channels @@ -115,7 +115,7 @@ void (*tp_svc_channel_dispatcher_present_channel_impl) (TpSvcChannelDispatcher *self, const gchar *in_Channel, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, DBusGMethodInvocation *context); void tp_svc_channel_dispatcher_return_from_delegate_channels (DBusGMethodInvocation *context, @@ -244,7 +244,7 @@ (TpSvcChannelDispatcher *self, const gchar *in_Account, GHashTable *in_Requested_Properties, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, const gchar *in_Preferred_Handler, DBusGMethodInvocation *context);

    @@ -337,7 +337,7 @@ (TpSvcChannelDispatcher *self, const gchar *in_Account, GHashTable *in_Requested_Properties, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, const gchar *in_Preferred_Handler, GHashTable *in_Hints, DBusGMethodInvocation *context); @@ -435,7 +435,7 @@ (TpSvcChannelDispatcher *self, const gchar *in_Account, GHashTable *in_Requested_Properties, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, const gchar *in_Preferred_Handler, DBusGMethodInvocation *context);

    @@ -528,7 +528,7 @@ (TpSvcChannelDispatcher *self, const gchar *in_Account, GHashTable *in_Requested_Properties, - gint64 in_User_Action_Time, + gint64 in_User_Action_Time, const gchar *in_Preferred_Handler, GHashTable *in_Hints, DBusGMethodInvocation *context); @@ -601,7 +601,7 @@ 

    void                (*tp_svc_channel_dispatcher_delegate_channels_impl)
                                                         (TpSvcChannelDispatcher *self,
                                                          const GPtrArray *in_Channels,
-                                                         gint64 in_User_Action_Time,
+                                                         gint64 in_User_Action_Time,
                                                          const gchar *in_Preferred_Handler,
                                                          DBusGMethodInvocation *context);

    @@ -690,7 +690,7 @@ 

    void                (*tp_svc_channel_dispatcher_present_channel_impl)
                                                         (TpSvcChannelDispatcher *self,
                                                          const gchar *in_Channel,
-                                                         gint64 in_User_Action_Time,
+                                                         gint64 in_User_Action_Time,
                                                          DBusGMethodInvocation *context);

    The signature of an implementation of the D-Bus method @@ -779,7 +779,7 @@

    The class of TpSvcChannelDispatcherInterfaceOperationList. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-dispatch-operation.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-dispatch-operation.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-dispatch-operation.html 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-dispatch-operation.html 2012-03-19 15:38:21.000000000 +0000 @@ -66,7 +66,7 @@ void (*tp_svc_channel_dispatch_operation_handle_with_time_impl) (TpSvcChannelDispatchOperation *self, const gchar *in_Handler, - gint64 in_UserActionTime, + gint64 in_UserActionTime, DBusGMethodInvocation *context); void tp_svc_channel_dispatch_operation_implement_handle_with_time (TpSvcChannelDispatchOperationClass *klass, @@ -292,7 +292,7 @@ 
    void                (*tp_svc_channel_dispatch_operation_handle_with_time_impl)
                                                         (TpSvcChannelDispatchOperation *self,
                                                          const gchar *in_Handler,
-                                                         gint64 in_UserActionTime,
+                                                         gint64 in_UserActionTime,
                                                          DBusGMethodInvocation *context);

    The signature of an implementation of the D-Bus method diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-file-transfer.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-file-transfer.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-file-transfer.html 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-file-transfer.html 2012-03-19 15:38:21.000000000 +0000 @@ -51,7 +51,7 @@ guint in_Address_Type, guint in_Access_Control, const GValue *in_Access_Control_Param, - guint64 in_Offset, + guint64 in_Offset, DBusGMethodInvocation *context); void tp_svc_channel_type_file_transfer_emit_file_transfer_state_changed (gpointer instance, @@ -59,10 +59,10 @@ guint arg_Reason); void tp_svc_channel_type_file_transfer_emit_initial_offset_defined (gpointer instance, - guint64 arg_InitialOffset); + guint64 arg_InitialOffset); void tp_svc_channel_type_file_transfer_emit_transferred_bytes_changed (gpointer instance, - guint64 arg_Count); + guint64 arg_Count); void tp_svc_channel_type_file_transfer_emit_uri_defined (gpointer instance, const gchar *arg_URI); @@ -156,7 +156,7 @@ guint in_Address_Type, guint in_Access_Control, const GValue *in_Access_Control_Param, - guint64 in_Offset, + guint64 in_Offset, DBusGMethodInvocation *context);

    The signature of an implementation of the D-Bus method @@ -226,7 +226,7 @@

    tp_svc_channel_type_file_transfer_emit_initial_offset_defined ()

    void                tp_svc_channel_type_file_transfer_emit_initial_offset_defined
                                                         (gpointer instance,
-                                                         guint64 arg_InitialOffset);
    + guint64 arg_InitialOffset);

    Type-safe wrapper around g_signal_emit to emit the InitialOffsetDefined signal on interface org.freedesktop.Telepathy.Channel.Type.FileTransfer. @@ -250,7 +250,7 @@

    tp_svc_channel_type_file_transfer_emit_transferred_bytes_changed ()

    void                tp_svc_channel_type_file_transfer_emit_transferred_bytes_changed
                                                         (gpointer instance,
-                                                         guint64 arg_Count);
    + guint64 arg_Count);

    Type-safe wrapper around g_signal_emit to emit the TransferredBytesChanged signal on interface org.freedesktop.Telepathy.Channel.Type.FileTransfer. @@ -468,7 +468,7 @@

    The "initial-offset-defined" signal

    void                user_function                      (TpSvcChannelTypeFileTransfer *self,
-                                                        guint64                       arg_InitialOffset,
+                                                        guint64                       arg_InitialOffset,
                                                         gpointer                      user_data)              : Has Details

    The InitialOffsetDefined D-Bus signal is emitted whenever this GObject signal is. @@ -495,7 +495,7 @@

    The "transferred-bytes-changed" signal

    void                user_function                      (TpSvcChannelTypeFileTransfer *self,
-                                                        guint64                       arg_Count,
+                                                        guint64                       arg_Count,
                                                         gpointer                      user_data)      : Has Details

    The TransferredBytesChanged D-Bus signal is emitted whenever this GObject signal is. diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-ft-metadata.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-ft-metadata.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-ft-metadata.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-ft-metadata.html 2012-03-19 15:38:21.000000000 +0000 @@ -79,7 +79,7 @@

    The class of TpSvcChannelInterfaceFileTransferMetadata. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-group.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-group.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-group.html 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-group.html 2012-03-19 15:38:21.000000000 +0000 @@ -1332,7 +1332,7 @@

    The class of TpSvcChannelInterfaceConference. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-room.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-room.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-room.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-room.html 2012-03-19 15:38:21.000000000 +0000 @@ -135,7 +135,7 @@

    The class of TpSvcChannelInterfaceRoom. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-securable.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-securable.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-securable.html 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-securable.html 2012-03-19 15:38:21.000000000 +0000 @@ -76,7 +76,7 @@

    The class of TpSvcChannelInterfaceSecurable. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-tube.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-tube.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-channel-tube.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-channel-tube.html 2012-03-19 15:38:21.000000000 +0000 @@ -167,7 +167,7 @@

    The class of TpSvcChannelInterfaceTube. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-client.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-client.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-client.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-client.html 2012-03-19 15:38:21.000000000 +0000 @@ -71,7 +71,7 @@ const gchar *in_Connection, const GPtrArray *in_Channels, const GPtrArray *in_Requests_Satisfied, - guint64 in_User_Action_Time, + guint64 in_User_Action_Time, GHashTable *in_Handler_Info, DBusGMethodInvocation *context); void tp_svc_client_handler_implement_handle_channels @@ -188,7 +188,7 @@

    The class of TpSvcClient. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    @@ -374,7 +374,7 @@ const gchar *in_Connection, const GPtrArray *in_Channels, const GPtrArray *in_Requests_Satisfied, - guint64 in_User_Action_Time, + guint64 in_User_Action_Time, GHashTable *in_Handler_Info, DBusGMethodInvocation *context);

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-connection.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-connection.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-connection.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-connection.html 2012-03-19 15:38:21.000000000 +0000 @@ -4583,7 +4583,7 @@

    The class of TpSvcConnectionInterfaceBalance. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    @@ -7254,7 +7254,7 @@

    The class of TpSvcConnectionInterfaceCellular. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc.html 2012-03-19 15:38:21.000000000 +0000 @@ -60,14 +60,14 @@ 6 7 8 - 
    static void stream_handler_iface_init (gpointer, gpointer);
+        
    static void stream_handler_iface_init (gpointer, gpointer);
 
-G_DEFINE_TYPE_WITH_CODE(GabbleMediaStream,
-    gabble_media_stream,
-    G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_MEDIA_STREAM_HANDLER,
-      stream_handler_iface_init)
-    )
    
+G_DEFINE_TYPE_WITH_CODE(GabbleMediaStream,
+    gabble_media_stream,
+    G_TYPE_OBJECT,
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_MEDIA_STREAM_HANDLER,
+      stream_handler_iface_init)
+    )
    @@ -112,28 +112,28 @@ 22 23 
    /* in header files */
-void conn_aliasing_iface_init (gpointer, gpointer);
-void conn_avatars_iface_init (gpointer, gpointer);
-void conn_presence_iface_init (gpointer, gpointer);
+void conn_aliasing_iface_init (gpointer, gpointer);
+void conn_avatars_iface_init (gpointer, gpointer);
+void conn_presence_iface_init (gpointer, gpointer);
 
 /* in gabble-connection.c */
-static void conn_iface_init (gpointer, gpointer);
-static void capabilities_iface_init (gpointer, gpointer);
+static void conn_iface_init (gpointer, gpointer);
+static void capabilities_iface_init (gpointer, gpointer);
 
-G_DEFINE_TYPE_WITH_CODE(GabbleConnection,
-    gabble_connection,
-    TP_TYPE_BASE_CONNECTION,
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION,
-      conn_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING,
-      conn_aliasing_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_AVATARS,
-      conn_avatars_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CAPABILITIES,
-      capabilities_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE,
-      conn_presence_iface_init);
-    )
    +G_DEFINE_TYPE_WITH_CODE(GabbleConnection, + gabble_connection, + TP_TYPE_BASE_CONNECTION, + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION, + conn_iface_init); + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING, + conn_aliasing_iface_init); + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_AVATARS, + conn_avatars_iface_init); + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CAPABILITIES, + capabilities_init); + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE, + conn_presence_iface_init); + ) @@ -159,9 +159,9 @@ 
    1
 2
 3
    - 
    void (*tp_svc_media_session_handler_error_impl)
-  (TpSvcMediaSessionHandler *self, guint errno, const char *message,
-   DBusGMethodInvocation *context);
    + 
    void (*tp_svc_media_session_handler_error_impl)
+  (TpSvcMediaSessionHandler *self, guint errno, const char *message,
+   DBusGMethodInvocation *context);
    @@ -183,15 +183,15 @@ 7 8 9 - 
    static void
-gabble_media_session_error (TpSvcMediaSessionHandler *iface,
-                            guint errno,
-                            const char *message,
-                            DBusGMethodInvocation *context)
-{
-  GabbleMediaSession *self = GABBLE_MEDIA_SESSION (iface);
+        
    static void
+gabble_media_session_error (TpSvcMediaSessionHandler *iface,
+                            guint errno,
+                            const char *message,
+                            DBusGMethodInvocation *context)
+{
+  GabbleMediaSession *self = GABBLE_MEDIA_SESSION (iface);
 
-  /* do stuff with self here */
    
+  /* do stuff with self here */
    @@ -234,18 +234,18 @@ 10 11 12 - 
    static void
-gabble_media_session_error (TpSvcMediaSessionHandler *iface,
-                            guint errno,
-                            const char *message,
-                            DBusGMethodInvocation *context)
-{
-  GabbleMediaSession *self = GABBLE_MEDIA_SESSION (iface);
+        
    static void
+gabble_media_session_error (TpSvcMediaSessionHandler *iface,
+                            guint errno,
+                            const char *message,
+                            DBusGMethodInvocation *context)
+{
+  GabbleMediaSession *self = GABBLE_MEDIA_SESSION (iface);
 
-  /* do stuff with self here */
+  /* do stuff with self here */
 
-  tp_svc_media_session_handler_return_from_error (context);
-}
    
+  tp_svc_media_session_handler_return_from_error (context);
+}
    @@ -269,8 +269,8 @@ 
    1
 2
    - 
    tp_svc_media_session_handler_emit_new_stream_handler (session,
-  object_path, id, media_type, TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL);
    + 
    tp_svc_media_session_handler_emit_new_stream_handler (session,
+  object_path, id, media_type, TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL);
    @@ -301,17 +301,17 @@ 9 10 11 - 
    static void
-session_handler_iface_init (gpointer g_iface, gpointer iface_data)
-{
-  TpSvcMediaSessionHandlerClass *klass =
-    (TpSvcMediaSessionHandlerClass *)g_iface;
-
-  tp_svc_media_session_handler_implement_error (klass,
-      gabble_media_session_error);
-  tp_svc_media_session_handler_implement_ready (klass,
-      gabble_media_session_ready);
-}
    + 
    static void
+session_handler_iface_init (gpointer g_iface, gpointer iface_data)
+{
+  TpSvcMediaSessionHandlerClass *klass =
+    (TpSvcMediaSessionHandlerClass *)g_iface;
+
+  tp_svc_media_session_handler_implement_error (klass,
+      gabble_media_session_error);
+  tp_svc_media_session_handler_implement_ready (klass,
+      gabble_media_session_ready);
+}
    @@ -338,18 +338,18 @@ 10 11 12 - 
    static void
-session_handler_iface_init (gpointer g_iface, gpointer iface_data)
-{
-  TpSvcMediaSessionHandlerClass *klass =
-    (TpSvcMediaSessionHandlerClass *)g_iface;
-
-#define IMPLEMENT(x) tp_svc_media_session_handler_implement_##x (\
-    klass, gabble_media_session_##x)
-  IMPLEMENT(error);
-  IMPLEMENT(ready);
-#undef IMPLEMENT
-}
    + 
    static void
+session_handler_iface_init (gpointer g_iface, gpointer iface_data)
+{
+  TpSvcMediaSessionHandlerClass *klass =
+    (TpSvcMediaSessionHandlerClass *)g_iface;
+
+#define IMPLEMENT(x) tp_svc_media_session_handler_implement_##x (\
+    klass, gabble_media_session_##x)
+  IMPLEMENT(error);
+  IMPLEMENT(ready);
+#undef IMPLEMENT
+}
    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-protocol.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-protocol.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-protocol.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-protocol.html 2012-03-19 15:38:21.000000000 +0000 @@ -368,7 +368,7 @@

    The class of TpSvcProtocolInterfacePresence. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    @@ -388,7 +388,7 @@

    The class of TpSvcProtocolInterfaceAvatars. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-service-point.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-service-point.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-service-point.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-service-point.html 2012-03-19 15:38:21.000000000 +0000 @@ -106,7 +106,7 @@

    The class of TpSvcConnectionInterfaceServicePoint. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    @@ -150,7 +150,7 @@

    The class of TpSvcChannelInterfaceServicePoint. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-tls.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-tls.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-svc-tls.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-svc-tls.html 2012-03-19 15:38:21.000000000 +0000 @@ -116,7 +116,7 @@

    The class of TpSvcChannelTypeServerTLSConnection. This interface has no D-Bus methods, so an -implementation can typically pass NULL to +implementation can typically pass NULL to G_IMPLEMENT_INTERFACE() as the interface initialization function.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-text-channel.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-text-channel.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-text-channel.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-text-channel.html 2012-03-19 15:38:21.000000000 +0000 @@ -201,12 +201,12 @@

    conn :

    -a TpConnection; may not be NULL +a TpConnection; may not be NULL

    object_path :

    -the object path of the channel; may not be NULL +the object path of the channel; may not be NULL @@ -219,7 +219,7 @@

    error :

    -used to indicate the error if NULL is returned +used to indicate the error if NULL is returned

    Returns :

    @@ -436,7 +436,7 @@

    token can be used to match any incoming delivery or failure reports -against the sent message. If the returned token is NULL the +against the sent message. If the returned token is NULL the message is not readily identifiable.

    @@ -454,7 +454,7 @@ - @@ -962,13 +962,13 @@ - - - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-TpContactsMixin.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-TpContactsMixin.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-TpContactsMixin.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-TpContactsMixin.html 2012-03-19 15:38:21.000000000 +0000 @@ -53,7 +53,7 @@ voidtp_contacts_mixin_iface_init (gpointer g_iface, gpointer iface_data); voidtp_contacts_mixin_init (GObject *obj, - gsize offset); + gsize offset); voidtp_contacts_mixin_set_contact_attribute (GHashTable *contact_attributes, TpHandle handle, @@ -172,8 +172,8 @@ - +

    token :

    		if not NULL, used to return the +if not NULL, used to return the token of the sent message. [out][transfer full]

    chunks_required :

    		if not NULL used to return +if not NULL used to return the number of 140 octet chunks required to send the message. [out]

    remaining_characters :

    		if not NULL used to return +if not NULL used to return the number of further characters that can be fit in the final chunk. A negative value indicates that the message will be truncated by abs(remaining_characters). @@ -978,7 +978,7 @@

    estimated_cost :

    		if not NULL used to return +if not NULL used to return the estimated cost of sending this message. The currency and scale of this value are the same as the values of the "balance-scale" and @@ -1156,7 +1156,7 @@

    token :

    		 an opaque token used to match any incoming delivery or failure -reports against this message, or NULL if the message is not +reports against this message, or NULL if the message is not readily identifiable. 
    1
 2
    tp_contacts_mixin_class_init ((GObjectClass *) klass,
-                         G_STRUCT_OFFSET (SomeObjectClass, contacts_mixin));
    tp_contacts_mixin_class_init ((GObjectClass *) klass,
+                         G_STRUCT_OFFSET (SomeObjectClass, contacts_mixin));
    @@ -243,7 +243,7 @@

    tp_contacts_mixin_init ()

    void                tp_contacts_mixin_init              (GObject *obj,
-                                                         gsize offset);
    + gsize offset);

    Initialize the contacts mixin. Should be called from the implementation's instance init function like so: @@ -256,8 +256,8 @@ 

    1
 2
    - 
    tp_contacts_mixin_init ((GObject *) self,
-                    G_STRUCT_OFFSET (SomeObject, contacts_mixin));
    + 
    tp_contacts_mixin_init ((GObject *) self,
+                    G_STRUCT_OFFSET (SomeObject, contacts_mixin));
    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-TpGroupMixin.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-TpGroupMixin.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-TpGroupMixin.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-TpGroupMixin.html 2012-03-19 15:38:21.000000000 +0000 @@ -508,7 +508,7 @@

    rem_func :

    A callback to be used to remove contacts from this group. -This must be NULL if you will subsequently call +This must be NULL if you will subsequently call tp_group_mixin_class_set_remove_with_reason_func(). @@ -560,7 +560,7 @@ Set a callback to be used to implement RemoveMembers() and RemoveMembersWithReason(). If this function is called during class initialization, the given callback will be used instead of the remove -callback passed to tp_group_mixin_class_init() (which must be NULL +callback passed to tp_group_mixin_class_init() (which must be NULL in this case).

    @@ -1103,7 +1103,7 @@ a non-empty intersection, the result is undefined. Don't do that.

    -Each of the TpIntset arguments may be NULL, which is treated as +Each of the TpIntset arguments may be NULL, which is treated as equivalent to an empty set.

    @@ -1116,7 +1116,7 @@ +NULL is allowed, and is mapped to an empty string @@ -1182,7 +1182,7 @@ a non-empty intersection, the result is undefined. Don't do that.

    -Each of the TpIntset arguments may be NULL, which is treated as +Each of the TpIntset arguments may be NULL, which is treated as equivalent to an empty set.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-TpHeap.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-TpHeap.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-TpHeap.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-TpHeap.html 2012-03-19 15:38:21.000000000 +0000 @@ -87,7 +87,7 @@

    +or cleared, or NULL if this is not needed @@ -188,7 +188,7 @@ - +

    message :

    		 A message to be sent to the affected contacts if possible; -NULL is allowed, and is mapped to an empty string

    add :

    destructor :

    		 Function to call on the pointers when the heap is destroyed -or cleared, or NULL if this is not needed

    Returns :

    Returns :

    		The first item in the queue, or NULL if the queue is emptyThe first item in the queue, or NULL if the queue is empty
    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-TpMessageMixin.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-TpMessageMixin.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-TpMessageMixin.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-TpMessageMixin.html 2012-03-19 15:38:21.000000000 +0000 @@ -54,7 +54,7 @@ TpDeliveryReportingSupportFlags delivery_reporting_support_flags, const gchar * const *supported_content_types); void tp_message_mixin_init (GObject *obj, - gsize offset, + gsize offset, TpBaseConnection *connection); void tp_message_mixin_init_dbus_properties (GObjectClass *cls); @@ -108,10 +108,10 @@ 2 3 4 - 
    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_TEXT,
-  tp_message_mixin_text_iface_init);
-G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_MESSAGES,
-  tp_message_mixin_messages_iface_init);
    + 
    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_TEXT,
+  tp_message_mixin_text_iface_init);
+G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_MESSAGES,
+  tp_message_mixin_messages_iface_init);
    @@ -245,7 +245,7 @@

    tp_message_mixin_init ()

    void                tp_message_mixin_init               (GObject *obj,
-                                                         gsize offset,
+                                                         gsize offset,
                                                          TpBaseConnection *connection);

    Initialize the mixin. Should be called from the implementation's @@ -260,9 +260,9 @@ 

    1
 2
 3
    - 
    tp_message_mixin_init ((GObject *) self,
-    G_STRUCT_OFFSET (SomeObject, message_mixin),
-    self->connection);
    + 
    tp_message_mixin_init ((GObject *) self,
+    G_STRUCT_OFFSET (SomeObject, message_mixin),
+    self->connection);
    @@ -419,12 +419,12 @@

    token :

    A token representing the sent message (see the Telepathy D-Bus API specification), or an empty string if no suitable identifier is available, -or NULL on error +or NULL on error

    error :

    -NULL on success, or the error with which message submission failed +NULL on success, or the error with which message submission failed
    @@ -484,7 +484,7 @@ TpHandle *first_sender);

    Return whether the channel obj has unacknowledged messages. If so, and -first_sender is not NULL, the handle of the sender of the first message +first_sender is not NULL, the handle of the sender of the first message is placed in it, without incrementing the handle's reference count.

    @@ -496,7 +496,7 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-TpPresenceMixin.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-TpPresenceMixin.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-TpPresenceMixin.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-TpPresenceMixin.html 2012-03-19 15:38:21.000000000 +0000 @@ -108,7 +108,7 @@

    -Implementing SimplePresence

    +Implementing SimplePresence

    Since 0.7.13 this mixin supports the entire SimplePresence interface. You can implement TpSvcConnectionInterfaceSimplePresence as follows: @@ -131,13 +131,13 @@ 5 6 7 -

    +

    first_sender :

    		If not NULL, used to store the sender of the oldest pending +If not NULL, used to store the sender of the oldest pending message 
    G_DEFINE_TYPE_WITH_CODE (MyConnection, my_connection,
-    TP_TYPE_BASE_CONNECTION,
-    // ...
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE,
-        tp_presence_mixin_simple_presence_iface_init);
-    // ...
-    )
    G_DEFINE_TYPE_WITH_CODE (MyConnection, my_connection,
+    TP_TYPE_BASE_CONNECTION,
+    // ...
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE,
+        tp_presence_mixin_simple_presence_iface_init);
+    // ...
+    )
    @@ -160,7 +160,7 @@

    -Implementing old-style Presence

    +Implementing old-style Presence

    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 - 

    G_DEFINE_TYPE_WITH_CODE (MyConnection, my_connection,
-    TP_TYPE_BASE_CONNECTION,
-    // ...
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE,
-        tp_presence_mixin_iface_init);
-    // ...
-    )
    + 
    G_DEFINE_TYPE_WITH_CODE (MyConnection, my_connection,
+    TP_TYPE_BASE_CONNECTION,
+    // ...
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE,
+        tp_presence_mixin_iface_init);
+    // ...
+    )
    @@ -221,7 +221,7 @@

    In addition to the fields documented here, there are two gpointer fields -which must currently be NULL. A meaning may be defined for these in a +which must currently be NULL. A meaning may be defined for these in a future version of telepathy-glib.

    @@ -253,7 +253,7 @@

    In addition to the fields documented here, there are two gpointer fields -which must currently be NULL. A meaning may be defined for these in a +which must currently be NULL. A meaning may be defined for these in a future version of telepathy-glib.

    @@ -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 TpPresenceStatusSpec.self is enough to determine whether this is a -user-settable presence, so NULL should be passed to +user-settable presence, so NULL should be passed to tp_presence_mixin_class_init() for this callback.

    @@ -357,11 +357,11 @@

    - + - @@ -377,7 +377,7 @@

    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 NULL status +reset the user's own status back to the "default" one with a NULL status argument.

    @@ -455,7 +455,7 @@

    In addition to the fields documented here, there are two gpointer fields -which must currently be NULL. A meaning may be defined for these in a +which must currently be NULL. A meaning may be defined for these in a future version of telepathy-glib.

    error :

    		Used to return a Telepathy D-Bus error if NULL is returnedUsed to return a Telepathy D-Bus error if NULL is returned

    Returns :

    		The contact presence on success, NULL with +The contact presence on success, NULL with error set on error. [transfer full]
    @@ -568,13 +568,13 @@ 5 6 7 - +tp_presence_mixin_class_init ((GObjectClass *) klass, + G_STRUCT_OFFSET (SomeObjectClass, presence_mixin)); +mixin_class = TP_PRESENCE_MIXIN_CLASS (klass); +mixin_class->get_maximum_status_message_length = + some_object_get_maximum_status_message_length;
    TpPresenceMixinClass *mixin_class;
+        
    TpPresenceMixinClass *mixin_class;
 
-tp_presence_mixin_class_init ((GObjectClass *) klass,
-    G_STRUCT_OFFSET (SomeObjectClass, presence_mixin));
-mixin_class = TP_PRESENCE_MIXIN_CLASS (klass);
-mixin_class->get_maximum_status_message_length =
-    some_object_get_maximum_status_message_length;
    @@ -642,9 +642,9 @@ 
    1
 2
 3
    - 
    tp_presence_mixin_class_init ((GObjectClass *) klass,
-                              G_STRUCT_OFFSET (SomeObjectClass,
-                                               presence_mixin));
    + 
    tp_presence_mixin_class_init ((GObjectClass *) klass,
+                              G_STRUCT_OFFSET (SomeObjectClass,
+                                               presence_mixin));
    @@ -667,7 +667,7 @@

    status_available :

    A callback to be used to determine if a given presence -status can be set on a particular connection. Should usually be NULL, to +status can be set on a particular connection. Should usually be NULL, to consider all statuses with TpPresenceStatusSpec.self set to TRUE to be settable. @@ -708,8 +708,8 @@ 
    1
 2
    - 
    tp_presence_mixin_init ((GObject *) self,
-                        G_STRUCT_OFFSET (SomeObject, presence_mixin));
    + 
    tp_presence_mixin_init ((GObject *) self,
+                        G_STRUCT_OFFSET (SomeObject, presence_mixin));
    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-TpPropertiesMixin.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-TpPropertiesMixin.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-TpPropertiesMixin.html 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-TpPropertiesMixin.html 2012-03-19 15:38:21.000000000 +0000 @@ -336,9 +336,9 @@ 
    1
 2
 3
    - 
    tp_properties_mixin_class_init ((GObjectClass *) klass,
-                                G_STRUCT_OFFSET (SomeObjectClass,
-                                 properties_mixin));
    + 
    tp_properties_mixin_class_init ((GObjectClass *) klass,
+                                G_STRUCT_OFFSET (SomeObjectClass,
+                                 properties_mixin));
    @@ -392,9 +392,9 @@ 
    1
 2
 3
    - 
    tp_properties_mixin_init ((GObject *) self,
-                          G_STRUCT_OFFSET (SomeObject, properties_mixin),
-                          self->contact_repo);
    + 
    tp_properties_mixin_init ((GObject *) self,
+                          G_STRUCT_OFFSET (SomeObject, properties_mixin),
+                          self->contact_repo);
    @@ -553,7 +553,7 @@

    property :

    -either NULL, or a pointer to a location to receive the property +either NULL, or a pointer to a location to receive the property index @@ -710,7 +710,7 @@

    error :

    -If NULL, return successfully; otherwise return this error +If NULL, return successfully; otherwise return this error
    @@ -755,7 +755,7 @@ props is ignored. Otherwise, the following applies:

    -If props is NULL the PropertiesChanged signal is emitted for this one +If props is NULL the PropertiesChanged signal is emitted for this one property.

    @@ -780,7 +780,7 @@

    props :

    -either NULL, or a pointer to a TpIntset +either NULL, or a pointer to a TpIntset
    @@ -802,7 +802,7 @@ relied upon.

    -If props is NULL the PropertyFlagsChanged signal is emitted for this +If props is NULL the PropertyFlagsChanged signal is emitted for this single property.

    @@ -831,7 +831,7 @@

    props :

    -either NULL, or a pointer to a TpIntset +either NULL, or a pointer to a TpIntset
    diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-TpTextMixin.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-TpTextMixin.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-TpTextMixin.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-TpTextMixin.html 2012-03-19 15:38:21.000000000 +0000 @@ -181,8 +181,8 @@ 
    1
 2
    - 
    tp_text_mixin_class_init ((GObjectClass *) klass,
-                          G_STRUCT_OFFSET (SomeObjectClass, text_mixin));
    + 
    tp_text_mixin_class_init ((GObjectClass *) klass,
+                          G_STRUCT_OFFSET (SomeObjectClass, text_mixin));
    @@ -223,9 +223,9 @@ 
    1
 2
 3
    - 
    tp_text_mixin_init ((GObject *) self,
-                    G_STRUCT_OFFSET (SomeObject, text_mixin),
-                    self->contact_repo);
    + 
    tp_text_mixin_init ((GObject *) self,
+                    G_STRUCT_OFFSET (SomeObject, text_mixin),
+                    self->contact_repo);
    @@ -510,7 +510,7 @@ TpHandle *first_sender);

    Return whether the channel obj has unacknowledged messages. If so, and -first_sender is not NULL, the handle of the sender of the first message +first_sender is not NULL, the handle of the sender of the first message is placed in it, without incrementing the handle's reference count.

    @@ -522,7 +522,7 @@ - diff -Nru telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-util.html telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-util.html --- telepathy-glib-0.17.5/docs/reference/html/telepathy-glib-util.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/telepathy-glib-util.html 2012-03-19 15:38:21.000000000 +0000 @@ -61,12 +61,12 @@ gpointer p); GValue * tp_g_value_slice_new_double (double d); GValue * tp_g_value_slice_new_int (gint n); -GValue * tp_g_value_slice_new_int64 (gint64 n); +GValue * tp_g_value_slice_new_int64 (gint64 n); GValue * tp_g_value_slice_new_string (const gchar *string); GValue * tp_g_value_slice_new_static_string (const gchar *string); GValue * tp_g_value_slice_new_take_string (gchar *string); GValue * tp_g_value_slice_new_uint (guint n); -GValue * tp_g_value_slice_new_uint64 (guint64 n); +GValue * tp_g_value_slice_new_uint64 (guint64 n); GValue * tp_g_value_slice_new_byte (guchar n); voidtp_g_value_slice_free (GValue *value); GValue * tp_g_value_slice_dup (const GValue *value); @@ -82,11 +82,11 @@ gchar * tp_escape_as_identifier (const gchar *name); gbooleantp_strv_contains (const gchar * const *strv, const gchar *str); -gint64tp_g_key_file_get_int64 (GKeyFile *key_file, +gint64tp_g_key_file_get_int64 (GKeyFile *key_file, const gchar *group_name, const gchar *key, GError **error); -guint64tp_g_key_file_get_uint64 (GKeyFile *key_file, +guint64tp_g_key_file_get_uint64 (GKeyFile *key_file, const gchar *group_name, const gchar *key, GError **error); @@ -95,11 +95,11 @@ GCallback c_handler, gpointer gobject, GConnectFlags connect_flags); -GValueArray * tp_value_array_build (gsize length, +GValueArray * tp_value_array_build (gsize length, GType type, ...); voidtp_value_array_unpack (GValueArray *array, - gsize len, + gsize len, ...); TpWeakRef; TpWeakRef * tp_weak_ref_new (gpointer object, @@ -118,9 +118,9 @@ GAsyncReadyCallback callback, gpointer user_data, gpointer source_tag); -gint64tp_user_action_time_from_x11 (guint32 x11_time); -gbooleantp_user_action_time_should_present (gint64 user_action_time, - guint32 *x11_time); +gint64tp_user_action_time_from_x11 (guint32 x11_time); +gbooleantp_user_action_time_should_present (gint64 user_action_time, + guint32 *x11_time); gchar * tp_utf8_make_valid (const gchar *name); @@ -517,7 +517,7 @@

    tp_g_value_slice_new_int64 ()

    -
    GValue *            tp_g_value_slice_new_int64          (gint64 n);
    +
    GValue *            tp_g_value_slice_new_int64          (gint64 n);

    Slice-allocate and initialize a GValue. This function is convenient to use when constructing hash tables from string to GValue, for example. @@ -645,7 +645,7 @@

    tp_g_value_slice_new_uint64 ()

    -
    GValue *            tp_g_value_slice_new_uint64         (guint64 n);
    +
    GValue *            tp_g_value_slice_new_uint64         (guint64 n);

    Slice-allocate and initialize a GValue. This function is convenient to use when constructing hash tables from string to GValue, for example. @@ -739,7 +739,7 @@

    tp_str_empty ()

    gboolean            tp_str_empty                        (const gchar *s);

    -Return TRUE if s is empty, counting NULL as empty. +Return TRUE if s is empty, counting NULL as empty.

    first_sender :

    		If not NULL, used to store the sender of the oldest pending +If not NULL, used to store the sender of the oldest pending message
    @@ -752,7 +752,7 @@ @@ -783,8 +783,8 @@ +FALSE if left and right are both NULL, or if +neither is NULL and both have the same contents; TRUE otherwise

    Returns :

    		 -TRUE if s is either NULL or "". [type boolean] +TRUE if s is either NULL or "". [type boolean]

    Returns :

    		 -FALSE if left and right are both NULL, or if -neither is NULL and both have the same contents; TRUE otherwise
    @@ -946,7 +946,7 @@

    strv :

    -a NULL-terminated array of strings, or NULL (which is treated as an +a NULL-terminated array of strings, or NULL (which is treated as an empty strv) @@ -964,7 +964,7 @@

    tp_g_key_file_get_int64 ()

    -
    gint64              tp_g_key_file_get_int64             (GKeyFile *key_file,
+
    gint64              tp_g_key_file_get_int64             (GKeyFile *key_file,
                                                          const gchar *group_name,
                                                          const gchar *key,
                                                          GError **error);
    
@@ -978,16 +978,16 @@
 
 
 
    key_file :
    
-a non-NULL GKeyFile
+a non-NULL GKeyFile
 
 
 
 
    group_name :
    
-a non-NULL group name
+a non-NULL group name
 
 
 
    key :
    
-a non-NULL key
+a non-NULL key
 
 
 
    error :
    
@@ -1006,7 +1006,7 @@
 
    
 
    
 
    tp_g_key_file_get_uint64 ()
    
-
    guint64             tp_g_key_file_get_uint64            (GKeyFile *key_file,
+
    guint64             tp_g_key_file_get_uint64            (GKeyFile *key_file,
                                                          const gchar *group_name,
                                                          const gchar *key,
                                                          GError **error);
    
@@ -1020,16 +1020,16 @@
 
 
 
    key_file :
    
-a non-NULL GKeyFile
+a non-NULL GKeyFile
 
 
 
 
    group_name :
    
-a non-NULL group name
+a non-NULL group name
 
 
 
    key :
    
-a non-NULL key
+a non-NULL key
 
 
 
    error :
    
@@ -1111,7 +1111,7 @@
 
    
 
    
 
    tp_value_array_build ()
    
-
    GValueArray *       tp_value_array_build                (gsize length,
+
    GValueArray *       tp_value_array_build                (gsize length,
                                                          GType type,
                                                          ...);
    
 
    
@@ -1122,7 +1122,7 @@
 
    
 
    
 
    
-
    Example 3.  using tp_value_array_build
    
+
    Example 3.  using tp_value_array_build
    
 
    
   
@@ -1131,10 +1131,10 @@
 2
 3
 4
-        
+        
    
     
    GValueArray *array = tp_value_array_build (2,
-   G_TYPE_STRING, host,
-   G_TYPE_UINT, port,
-   G_TYPE_INVALID);
    GValueArray *array = tp_value_array_build (2,
+   G_TYPE_STRING, host,
+   G_TYPE_UINT, port,
+   G_TYPE_INVALID);
    		
       
    
         
   
    
@@ -1171,7 +1171,7 @@
 
    
 
    tp_value_array_unpack ()
    
 
    void                tp_value_array_unpack               (GValueArray *array,
-                                                         gsize len,
+                                                         gsize len,
                                                          ...);
    
 
    
 Unpacks a GValueArray into separate variables.
@@ -1183,7 +1183,7 @@
 
    
 
    
 
    
-
    Example 4. using tp_value_array_unpack
    
+
    Example 4. using tp_value_array_unpack
    
 
    
   
@@ -1194,12 +1194,12 @@
 4
 5
 6
-        
+tp_value_array_unpack (array, 2,
+   &host,
+   &port);
    
     
    const gchar *host;
-guint port;
+        
    const gchar *host;
+guint port;
 
-tp_value_array_unpack (array, 2,
-   &host,
-   &port);
    		
       
    
         
   
    
@@ -1290,7 +1290,7 @@
 
    gpointer            tp_weak_ref_dup_object              (TpWeakRef *self);
    
 
    
 If the weakly referenced object still exists, return a new reference to
-it. Otherwise, return NULL.
+it. Otherwise, return NULL.
 
    
 
    @@ -1301,7 +1301,7 @@
 
-
@@ -1325,7 +1325,7 @@
 
@@ -1355,16 +1355,16 @@
 
    tp_clear_pointer()
    #define             tp_clear_pointer(pp, destroy)
    
-Set a variable holding a pointer to NULL. If it was not already NULL,
+Set a variable holding a pointer to NULL. If it was not already NULL,
 unref or destroy the object it previously pointed to with destroy.
 
    
-More precisely, if *pp is non-NULL, set *pp to NULL, then
+More precisely, if *pp is non-NULL, set *pp to NULL, then
 call destroy on the object that *pp previously pointed to.
 
    
 This is analogous to g_clear_error() for non-error objects, but also
-ensures that pp is already NULL before the destructor is run.
+ensures that pp is already NULL before the destructor is run.
 
    
 Typical usage is something like this:
@@ -1389,20 +1389,20 @@
 12
 13
 14
-        
    
+tp_clear_object (&foo->conn);
+g_clear_error (&foo->error);
+tp_clear_boxed (G_TYPE_HASH_TABLE, &foo->table);
+tp_clear_pointer (&foo->misc, my_struct_destroy);
    
 

 
    
 
    Returns :
    		a new reference, or NULL. [type GObject.Object][transfer full]
+a new reference, or NULL. [type GObject.Object][transfer full]
 
 
    
 
    
 
    Returns :
    		
 the additional data supplied in tp_weak_ref_new(), which may be
-NULL
+NULL
 
 
    
     
 
 
 
 
 
    typedef struct {
-  TpConnection *conn;
-  GError *error;
-  GHashTable *table;
-  MyStruct *misc;
-} Foo;
-Foo *foo;
+        
    typedef struct {
+  TpConnection *conn;
+  GError *error;
+  GHashTable *table;
+  MyStruct *misc;
+} Foo;
+Foo *foo;
 
-...
+...
 
-tp_clear_object (&foo->conn);
-g_clear_error (&foo->error);
-tp_clear_boxed (G_TYPE_HASH_TABLE, &foo->table);
-tp_clear_pointer (&foo->misc, my_struct_destroy);
    		
       
    
         
   
    
@@ -1433,7 +1433,7 @@
 
    #define tp_clear_object(op) tp_clear_pointer ((op), g_object_unref)
 
    
 
    
-Set a variable holding a GObject to NULL. If it was not already NULL,
+Set a variable holding a GObject to NULL. If it was not already NULL,
 unref the object it previously pointed to.
 
    
 
    
@@ -1455,12 +1455,12 @@
 
    tp_clear_boxed()
    
 
    #define             tp_clear_boxed(gtype, pp)
    
 
    
-Set a variable holding a boxed object to NULL. If it was not already NULL,
+Set a variable holding a boxed object to NULL. If it was not already NULL,
 destroy the boxed object it previously pointed to, as appropriate for
 gtype.
 
    
 
    
-More precisely, if *pp is non-NULL, set *pp to NULL, then
+More precisely, if *pp is non-NULL, set *pp to NULL, then
 call g_boxed_free() on the object that *pp previously pointed to.
 
    
 
    
@@ -1532,7 +1532,7 @@
 
    
 
    
 
    tp_user_action_time_from_x11 ()
    
-
    gint64              tp_user_action_time_from_x11        (guint32 x11_time);
    
+
    gint64              tp_user_action_time_from_x11        (guint32 x11_time);
    
 
    
 Convert an X11 timestamp into a user action time as used in Telepathy.
 
    
@@ -1560,8 +1560,8 @@
 
    
 
    
 
    tp_user_action_time_should_present ()
    
-
    gboolean            tp_user_action_time_should_present  (gint64 user_action_time,
-                                                         guint32 *x11_time);
    
+
    gboolean            tp_user_action_time_should_present  (gint64 user_action_time,
+                                                         guint32 *x11_time);
    
 
    
 Interpret a Telepathy user action time to decide whether a Handler should
 attempt to gain focus. If TRUE is returned, it would be appropriate to
diff -Nru telepathy-glib-0.17.5/docs/reference/html/TpBaseCallChannel.html telepathy-glib-0.17.6/docs/reference/html/TpBaseCallChannel.html
--- telepathy-glib-0.17.5/docs/reference/html/TpBaseCallChannel.html	2012-02-20 17:31:30.000000000 +0000
+++ telepathy-glib-0.17.6/docs/reference/html/TpBaseCallChannel.html	2012-03-19 15:38:21.000000000 +0000
@@ -193,7 +193,7 @@
 
 
    TpBaseCallChannelAddContentFunc add_content;
    
 add content to the call. Implementation must call
-tp_base_call_channel_add_content(). Can be NULL if
+tp_base_call_channel_add_content(). Can be NULL if
 "mutable-contents" is FALSE.
 
 
diff -Nru telepathy-glib-0.17.5/docs/reference/html/TpBaseCallStream.html telepathy-glib-0.17.6/docs/reference/html/TpBaseCallStream.html
--- telepathy-glib-0.17.5/docs/reference/html/TpBaseCallStream.html	2012-02-20 17:31:30.000000000 +0000
+++ telepathy-glib-0.17.6/docs/reference/html/TpBaseCallStream.html	2012-03-19 15:38:21.000000000 +0000
@@ -106,7 +106,9 @@
 
    Properties
    
 
       "can-request-receiving"    gboolean              : Read
+  "channel"                  TpBaseCallChannel*    : Read
   "connection"               TpBaseConnection*     : Read / Write / Construct Only
+  "content"                  TpBaseCallContent*    : Read / Write / Construct Only
   "interfaces"               GStrv                 : Read
   "local-sending-state"      guint                 : Read / Write / Construct Only
   "object-path"              gchar*                : Read / Write / Construct Only
@@ -564,6 +566,15 @@
 
    
 
    
 
    
+
    The "channel" property
    
+
      "channel"                  TpBaseCallChannel*    : Read
    
+
    
+TpBaseChannel object that owns this call stream.
+
    
+
    Since 0.17.5
    
+
    
+
    
+
    
 
    The "connection" property
    
 
      "connection"               TpBaseConnection*     : Read / Write / Construct Only
    
 
    
@@ -573,6 +584,15 @@
 
    
 
    
 
    
+
    The "content" property
    
+
      "content"                  TpBaseCallContent*    : Read / Write / Construct Only
    
+
    
+TpBaseCallContent object that owns this call stream.
+
    
+
    Since 0.17.UNRELEASED
    
+
    
+
    
+
    
 
    The "interfaces" property
    
 
      "interfaces"               GStrv                 : Read
    
 
    
diff -Nru telepathy-glib-0.17.5/docs/reference/html/TpBaseChannel.html telepathy-glib-0.17.6/docs/reference/html/TpBaseChannel.html
--- telepathy-glib-0.17.5/docs/reference/html/TpBaseChannel.html	2012-02-20 17:31:30.000000000 +0000
+++ telepathy-glib-0.17.6/docs/reference/html/TpBaseChannel.html	2012-03-19 15:38:21.000000000 +0000
@@ -235,22 +235,22 @@
 14
 15
 16
    
-        
    static void
-my_search_channel_fill_properties (
-    TpBaseChannel *chan,
-    GHashTable *properties)
-{
-  TpBaseChannelClass *klass = TP_BASE_CHANNEL_CLASS (my_search_channel_parent_class);
-
-  klass->fill_immutable_properties (chan, properties);
-
-  tp_dbus_properties_mixin_fill_properties_hash (
-      G_OBJECT (chan), properties,
-      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH, "Limit",
-      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH, "AvailableSearchKeys",
-      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH, "Server",
-      NULL);
-}
    
+        
    static void
+my_search_channel_fill_properties (
+    TpBaseChannel *chan,
+    GHashTable *properties)
+{
+  TpBaseChannelClass *klass = TP_BASE_CHANNEL_CLASS (my_search_channel_parent_class);
+
+  klass->fill_immutable_properties (chan, properties);
+
+  tp_dbus_properties_mixin_fill_properties_hash (
+      G_OBJECT (chan), properties,
+      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH, "Limit",
+      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH, "AvailableSearchKeys",
+      TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH, "Server",
+      NULL);
+}
    
       
     
   
@@ -335,34 +335,34 @@
 26
 27
 28
    
-        
    static void
-my_channel_close (TpBaseChannel *chan)
-{
-  MyChannel *self = MY_CHANNEL (chan);
-
-  if (self->priv->closing)
-    return;
-
-  self->priv->closing = TRUE;
-
-  // some hypothetical channel-specific clean-up function:
-  clean_up (self, cleaned_up_cb);
-}
-
-static void
-cleaned_up_cb (MyChannel *self)
-{
-  // all done, we can finish closing now
-  tp_base_channel_destroyed (TP_BASE_CHANNEL (self));
-}
-static void
-my_channel_class_init (MyChannelClass *klass)
-{
-  TpBaseChannelClass *base_channel_class = TP_BASE_CHANNEL_CLASS (klass);
-
-  klass->close = my_channel_close;
-  // ...
-}
    
+        
    static void
+my_channel_close (TpBaseChannel *chan)
+{
+  MyChannel *self = MY_CHANNEL (chan);
+
+  if (self->priv->closing)
+    return;
+
+  self->priv->closing = TRUE;
+
+  // some hypothetical channel-specific clean-up function:
+  clean_up (self, cleaned_up_cb);
+}
+
+static void
+cleaned_up_cb (MyChannel *self)
+{
+  // all done, we can finish closing now
+  tp_base_channel_destroyed (TP_BASE_CHANNEL (self));
+}
+static void
+my_channel_class_init (MyChannelClass *klass)
+{
+  TpBaseChannelClass *base_channel_class = TP_BASE_CHANNEL_CLASS (klass);
+
+  klass->close = my_channel_close;
+  // ...
+}
    
       
     
   
@@ -389,14 +389,14 @@
 6
 7
 8
    - 
    static void
-my_channel_class_init (MyChannelClass *klass)
-{
-  TpBaseChannelClass *base_channel_class = TP_BASE_CHANNEL_CLASS (klass);
-
-  klass->close = tp_base_channel_destroyed;
-  // ...
-}
    + 
    static void
+my_channel_class_init (MyChannelClass *klass)
+{
+  TpBaseChannelClass *base_channel_class = TP_BASE_CHANNEL_CLASS (klass);
+
+  klass->close = tp_base_channel_destroyed;
+  // ...
+}
    @@ -467,17 +467,17 @@ 9 10 11 - 
    static GPtrArray *
-my_channel_get_interfaces (TpBaseChannel *self)
-{
-  GPtrArray *interfaces;
+        
    static GPtrArray *
+my_channel_get_interfaces (TpBaseChannel *self)
+{
+  GPtrArray *interfaces;
 
-  interfaces = TP_BASE_CHANNEL_CLASS (my_channel_parent_class)->get_interfaces (self);
+  interfaces = TP_BASE_CHANNEL_CLASS (my_channel_parent_class)->get_interfaces (self);
 
-  g_ptr_array_add (interfaces, TP_IFACE_BADGERS);
+  g_ptr_array_add (interfaces, TP_IFACE_BADGERS);
 
-  return interfaces;
-}
    
+  return interfaces;
+}
    diff -Nru telepathy-glib-0.17.5/docs/reference/html/TpBaseConnection.html telepathy-glib-0.17.6/docs/reference/html/TpBaseConnection.html --- telepathy-glib-0.17.5/docs/reference/html/TpBaseConnection.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/TpBaseConnection.html 2012-03-19 15:38:21.000000000 +0000 @@ -195,7 +195,7 @@

    In addition to the fields documented here, there are four gpointer fields -which must currently be NULL (a meaning may be defined for these in a +which must currently be NULL (a meaning may be defined for these in a future version of telepathy-glib), and a pointer to opaque private data.

    @@ -279,20 +279,20 @@ @@ -300,17 +300,17 @@ +changes to CONNECTING. May be NULL if nothing special needs to happen. +changes to CONNECTED. May be NULL if nothing special needs to happen. +changes to DISCONNECTED. May be NULL if nothing special needs to happen. @@ -318,13 +318,13 @@ connection. Must start the shutdown process for the underlying network connection, and arrange for tp_base_connection_finish_shutdown() to be called after the underlying connection has been closed. May not -be left as NULL. +be left as NULL. +details. May not be left as NULL. @@ -339,7 +339,7 @@ @@ -557,7 +557,7 @@ bus name, and will release it when destroyed.

    -Since 0.11.11, bus_name and object_path may be NULL if the +Since 0.11.11, bus_name and object_path may be NULL if the strings are not needed.

    TpBaseConnectionCreateHandleReposImpl create_handle_repos;

    		 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-NULL value; the function must create +Must be set by subclasses to a non-NULL value; the function must create at least a CONTACT handle repository (failing to do so will cause a crash).

    TpBaseConnectionCreateChannelFactoriesImpl create_channel_factories;

    		 Create an array of channel factories for this Connection. At least one of this or create_channel_managers must be set by -subclasses to a non-NULL value; in new code, setting this to NULL and +subclasses to a non-NULL value; in new code, setting this to NULL and using channel managers exclusively is recommended.

    TpBaseConnectionGetUniqueConnectionNameImpl get_unique_connection_name;

    		 Construct a unique name for this connection -(for example using the protocol's format for usernames). If NULL (the +(for example using the protocol's format for usernames). If NULL (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.

    TpBaseConnectionProc connecting;

    		 If set by subclasses, will be called just after the state -changes to CONNECTING. May be NULL if nothing special needs to happen.

    TpBaseConnectionProc connected;

    		 If set by subclasses, will be called just after the state -changes to CONNECTED. May be NULL if nothing special needs to happen.

    TpBaseConnectionProc disconnected;

    		 If set by subclasses, will be called just after the state -changes to DISCONNECTED. May be NULL if nothing special needs to happen.

    TpBaseConnectionProc shut_down;

    TpBaseConnectionStartConnectingImpl start_connecting;

    		 Asynchronously start connecting - called to implement the Connect D-Bus method. See TpBaseConnectionStartConnectingImpl for -details. May not be left as NULL.

    const gchar **interfaces_always_present;

    TpBaseConnectionCreateChannelManagersImpl create_channel_managers;

    		 Create an array of channel managers for this Connection. At least one of this or create_channel_factories must be set -by subclasses to a non-NULL value. +by subclasses to a non-NULL value. Since: 0.7.15
    @@ -585,7 +585,7 @@ - @@ -618,7 +618,7 @@ @@ -810,7 +810,7 @@ @@ -861,7 +861,7 @@ - - +tp_base_connection_channel_manager_iter_init (&iter, base_conn); +while (tp_base_connection_channel_manager_iter_next (&iter, &manager)) + { + ...do something with manager... + }

    error :

    		Used to return an error if FALSE is returned; may be NULL +Used to return an error if FALSE is returned; may be NULL

    Returns :

    		 the handle repository corresponding to the given -handle type, or NULL if it's unsupported or invalid. [transfer none] +handle type, or NULL if it's unsupported or invalid. [transfer none]

    details :

    		 Further details of the error, as a hash table where the keys are strings as defined in the Telepathy specification, and the -values are GValues. NULL is allowed, and treated as +values are GValues. NULL is allowed, and treated as an empty hash table.

    interfaces :

    		A NULL-terminated array of D-Bus interface names, which +A NULL-terminated array of D-Bus interface names, which must remain valid at least until the connection enters state TP_CONNECTION_STATUS_DISCONNECTED (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
    TpChannelManagerIter iter;
-TpChannelManager *manager;
+        
    TpChannelManagerIter iter;
+TpChannelManager *manager;
 
-tp_base_connection_channel_manager_iter_init (&iter, base_conn);
-while (tp_base_connection_channel_manager_iter_next (&iter, &manager))
-  {
-    ...do something with manager...
-  }
    @@ -1118,7 +1118,7 @@

    manager_out :

    -a location to store the channel manager, or NULL. +a location to store the channel manager, or NULL.

    Returns :

    @@ -1140,10 +1140,10 @@ Read-only except during construction.

    -If this property is NULL or omitted during construction, the object will +If this property is NULL or omitted during construction, the object will automatically attempt to connect to the starter or session bus with tp_dbus_daemon_dup() just after it is constructed; if this fails, this -property will remain NULL, and tp_base_connection_register() will fail. +property will remain NULL, and tp_base_connection_register() will fail.

    Since 0.11.3

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/TpBaseConnectionManager.html telepathy-glib-0.17.6/docs/reference/html/TpBaseConnectionManager.html --- telepathy-glib-0.17.5/docs/reference/html/TpBaseConnectionManager.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/TpBaseConnectionManager.html 2012-03-19 15:38:21.000000000 +0000 @@ -307,7 +307,7 @@

    In addition to the fields documented here, there is one gpointer field -which must currently be NULL. A meaning may be defined for it in a +which must currently be NULL. A meaning may be defined for it in a future version of telepathy-glib.

    @@ -335,10 +335,10 @@ +using GINT_TO_POINTER or GUINT_TO_POINTER for integer parameters - +

    gconstpointer def;

    		 Default value, as a (const gchar *) for string parameters, or -using GINT_TO_POINTER or GUINT_TO_POINTER for integer parameters

    gsize offset;

    gsize offset;

    		 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 gtype. The default @@ -377,7 +377,7 @@

    In addition to the fields documented here, there are three gpointer fields -which must currently be NULL. A meaning may be defined for these in a +which must currently be NULL. A meaning may be defined for these in a future version of telepathy-glib.

    @@ -410,7 +410,7 @@ @@ -445,7 +445,7 @@

    In addition to the fields documented here, there are some gpointer fields -which must currently be NULL (a meaning may be defined for these in a +which must currently be NULL (a meaning may be defined for these in a future version of telepathy-glib).

    @@ -454,7 +454,7 @@

    Changed in 0.11.11: protocol_params and new_connection may both be -NULL. If so, this connection manager is assumed to use Protocol objects +NULL. If so, this connection manager is assumed to use Protocol objects instead.

    TpCMParamSetter set_param;

    		 A function which sets a parameter within the opaque data -structure provided by params_new. If NULL, +structure provided by params_new. If NULL, tp_cm_param_setter_offset() will be used. (New in 0.7.0 - previously, code equivalent to tp_cm_param_setter_offset() was always used.)
    @@ -475,12 +475,12 @@ +whose name member is NULL; or NULL if this CM uses Protocol objects. +new connections, or NULL if this CM uses Protocol objects. @@ -534,11 +534,11 @@ - + - +

    const TpCMProtocolSpec *protocol_params;

    		 An array of TpCMProtocolSpec structures representing the protocols this connection manager supports, terminated by a structure -whose name member is NULL; or NULL if this CM uses Protocol objects.

    TpBaseConnectionManagerNewConnFunc new_connection;

    		 A TpBaseConnectionManagerNewConnFunc used to construct -new connections, or NULL if this CM uses Protocol objects.

    const gchar * const  *interfaces;

    error :

    		if not NULL, used to indicate the error if NULL is returnedif not NULL, used to indicate the error if NULL is returned

    Returns :

    		the new connection object, or NULL on error.the new connection object, or NULL on error.
    @@ -630,11 +630,11 @@ Read-only except during construction.

    -If this property is NULL or omitted during construction, the object will +If this property is NULL or omitted during construction, the object will automatically attempt to connect to the starter or session bus with tp_dbus_daemon_dup() just after it is constructed; if this fails, a warning will be logged with g_warning(), and this property will remain -NULL. +NULL.

    Since 0.11.3

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/TpBaseMediaCallChannel.html telepathy-glib-0.17.6/docs/reference/html/TpBaseMediaCallChannel.html --- telepathy-glib-0.17.5/docs/reference/html/TpBaseMediaCallChannel.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/TpBaseMediaCallChannel.html 2012-03-19 15:38:21.000000000 +0000 @@ -51,6 +51,9 @@ TpLocalHoldState hold_state, TpLocalHoldStateReason hold_state_reason); void (*TpBaseMediaCallChannelVoidFunc) (TpBaseMediaCallChannel *self); +TpLocalHoldState tp_base_media_call_channel_get_local_hold_state + (TpBaseMediaCallChannel *channel, + TpLocalHoldStateReason *reason);
    @@ -161,6 +164,36 @@

    Since 0.17.5

    +
    +
    +

    tp_base_media_call_channel_get_local_hold_state ()

    +
    TpLocalHoldState    tp_base_media_call_channel_get_local_hold_state
+                                                        (TpBaseMediaCallChannel *channel,
+                                                         TpLocalHoldStateReason *reason);
    +

    + +

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

    channel :

    		a TpBaseMediaCallChannel +

    reason :

    		pointer to a location where to store the reason, or NULL +

    Returns :

    		The current hold state
    +

    Since 0.17.UNRELEASED

    +

    See Also

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/TpBaseRoomConfig.html telepathy-glib-0.17.6/docs/reference/html/TpBaseRoomConfig.html --- telepathy-glib-0.17.5/docs/reference/html/TpBaseRoomConfig.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/TpBaseRoomConfig.html 2012-03-19 15:38:21.000000000 +0000 @@ -131,13 +131,13 @@ 5 6 7 - 
    G_DEFINE_TYPE_WITH_CODE (MyMucChannel, my_muc_channel,
-    TP_TYPE_BASE_CHANNEL,
-    // ...
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_ROOM_CONFIG,
-        tp_base_room_config_iface_init)
-    // ...
-    )
    + 
    G_DEFINE_TYPE_WITH_CODE (MyMucChannel, my_muc_channel,
+    TP_TYPE_BASE_CHANNEL,
+    // ...
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_ROOM_CONFIG,
+        tp_base_room_config_iface_init)
+    // ...
+    )
    @@ -158,13 +158,13 @@ 5 6 7 - 
    static void
-my_muc_channel_class_init (MyMucChannelClass *klass)
-{
-  // ...
-  tp_base_room_config_register_class (TP_BASE_CHANNEL_CLASS (klass));
-  // ...
-}
    + 
    static void
+my_muc_channel_class_init (MyMucChannelClass *klass)
+{
+  // ...
+  tp_base_room_config_register_class (TP_BASE_CHANNEL_CLASS (klass));
+  // ...
+}
    @@ -198,11 +198,11 @@ 3 4 5 - 
    g_object_self (room_config,
-   "description", "A place to bury strangers",
-   "private", TRUE,
-   NULL);
-tp_base_room_config_emit_properties_changed (room_config);
    + 
    g_object_self (room_config,
+   "description", "A place to bury strangers",
+   "private", TRUE,
+   NULL);
+tp_base_room_config_emit_properties_changed (room_config);
    @@ -236,7 +236,7 @@ };

    -Class structure for TpBaseRoomConfig. By default, update_async is NULL, +Class structure for TpBaseRoomConfig. By default, update_async is NULL, indicating that updating room configuration is not implemented; subclasses should override it if they wish to support updating room configuration.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/TpCallContentMediaDescription.html telepathy-glib-0.17.6/docs/reference/html/TpCallContentMediaDescription.html --- telepathy-glib-0.17.5/docs/reference/html/TpCallContentMediaDescription.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/TpCallContentMediaDescription.html 2012-03-19 15:38:21.000000000 +0000 @@ -70,6 +70,40 @@ (TpCallContentMediaDescription *self, TpHandle contact, guint ssrc); +void tp_call_content_media_description_add_rtp_header_extension + (TpCallContentMediaDescription *self, + guint id, + TpMediaStreamDirection direction, + const gchar *uri, + const gchar *parameters); +void tp_call_content_media_description_add_rtcp_feedback_message + (TpCallContentMediaDescription *self, + guint codec_identifier, + const gchar *type, + const gchar *subtype, + const gchar *parameters); +void tp_call_content_media_description_set_rtcp_feedback_minimum_interval + (TpCallContentMediaDescription *self, + guint codec_identifier, + guint rtcp_minimum_interval); +void tp_call_content_media_description_set_does_avpf + (TpCallContentMediaDescription *self, + gboolean does_avpf); +void tp_call_content_media_description_set_rtcp_extended_reports + (TpCallContentMediaDescription *self, + guint loss_rle_max_size, + guint duplicate_rle_max_size, + guint packet_receipt_times_max_size, + guint dlrr_max_size, + TpRCPTXRRTTMode rtt_mode, + TpRTCPXRStatisticsFlags statistic_flags, + gboolean enable_metrics); +void tp_call_content_media_description_add_rtcp_extended_reports_interface + (TpCallContentMediaDescription *self); +void tp_call_content_media_description_add_rtcp_feedback_interface + (TpCallContentMediaDescription *self); +void tp_call_content_media_description_add_rtp_header_extensions_interface + (TpCallContentMediaDescription *self);
    @@ -83,19 +117,29 @@

    Implemented Interfaces

    TpCallContentMediaDescription implements - TpSvcCallContentMediaDescription and TpSvcDBusProperties.

    + TpSvcCallContentMediaDescription, TpSvcDBusProperties, TpSvcCallContentMediaDescriptionInterfaceRTPHeaderExtensions, TpSvcCallContentMediaDescriptionInterfaceRTCPFeedback and TpSvcCallContentMediaDescriptionInterfaceRTCPExtendedReports.

    Properties

       "codecs"                   GPtrArray_GValueArray_guint+gchararray+guint+guint+gboolean+GHashTable_gchararray+gchararray___*  : Read
   "dbus-daemon"              TpDBusDaemon*         : Read / Write / Construct Only
+  "dlrr-max-size"            guint                 : Read
+  "does-avpf"                gboolean              : Read
+  "duplicate-rle-max-size"   guint                 : Read
+  "enable-metrics"           gboolean              : Read
+  "feedback-messages"        GHashTable_guint+GValueArray_guint+GPtrArray_GValueArray_gchararray+gchararray+gchararray____*  : Read
   "further-negotiation-required" gboolean              : Read / Write / Construct Only
   "has-remote-information"   gboolean              : Read / Write / Construct Only
+  "header-extensions"        GPtrArray_GValueArray_guint+guint+gchararray+gchararray__*  : Read
   "interfaces"               GStrv                 : Read
+  "loss-rle-max-size"        guint                 : Read
   "object-path"              gchar*                : Read / Write / Construct Only
+  "packet-receipt-times-max-size" guint                 : Read
   "remote-contact"           guint                 : Read / Write / Construct Only
+  "rtt-mode"                 guint                 : Read
   "ssrcs"                    GHashTable_guint+GArray_guint__*  : Read
+  "statistics-flags"         guint                 : Read
    @@ -309,6 +353,296 @@

    Since 0.17.5

    +
    +
    +

    tp_call_content_media_description_add_rtp_header_extension ()

    +
    void                tp_call_content_media_description_add_rtp_header_extension
+                                                        (TpCallContentMediaDescription *self,
+                                                         guint id,
+                                                         TpMediaStreamDirection direction,
+                                                         const gchar *uri,
+                                                         const gchar *parameters);
    +

    +Add an element to the "rtp-header-extensions" +property. +

    +

    +Implement +TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS +interface. +

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

    self :

    		a TpCallContentMediaDescription +

    id :

    		identifier to be negotiated.

    direction :

    		a TpMediaStreamDirection in which the Header Extension is +negotiated.

    uri :

    		URI defining the extension.

    parameters :

    		Feedback parameters as a string. Format is defined in the +relevant RFC.
    +

    Since 0.UNRELEASED

    +
    +
    +
    +

    tp_call_content_media_description_add_rtcp_feedback_message ()

    +
    void                tp_call_content_media_description_add_rtcp_feedback_message
+                                                        (TpCallContentMediaDescription *self,
+                                                         guint codec_identifier,
+                                                         const gchar *type,
+                                                         const gchar *subtype,
+                                                         const gchar *parameters);
    +

    +Add a message for a given codec. This ensures codec_identifier is +in the "feedback-messages" map. The +rtcp-minimum-interval is set to G_MAXUINT and can then be changed using +tp_call_content_media_description_set_rtcp_feedback_minimum_interval(). +

    +

    +Implement +TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK +interface. +

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

    self :

    		a TpCallContentMediaDescription +

    codec_identifier :

    		Numeric identifier for the codec. This will be used as the +PT in the SDP or content description.

    type :

    		feedback type, for example "ack", "nack", or "ccm".

    subtype :

    		feedback subtype, according to the Type, can be an empty string +(""), if there is no subtype. For example, generic nack is Type="nack" +Subtype="".

    parameters :

    		feedback parameters as a string. Format is defined in the +relevant RFC.
    +

    Since 0.UNRELEASED

    +
    +
    +
    +

    tp_call_content_media_description_set_rtcp_feedback_minimum_interval ()

    +
    void                tp_call_content_media_description_set_rtcp_feedback_minimum_interval
+                                                        (TpCallContentMediaDescription *self,
+                                                         guint codec_identifier,
+                                                         guint rtcp_minimum_interval);
    +

    +Set the minimum interval for a given codec. This ensures codec_identifier is +in the "feedback-messages" map. The messages +can then be added using +tp_call_content_media_description_add_rtcp_feedback_message(). +

    +

    +Implement +TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK +interface. +

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

    self :

    		a TpCallContentMediaDescription +

    codec_identifier :

    		Numeric identifier for the codec. This will be used as the +PT in the SDP or content description.

    rtcp_minimum_interval :

    		The minimum interval between two regular RTCP packets +in milliseconds for this content. If no special value is desired, one should +put MAXUINT (0xFFFFFFFF). Implementors and users of Call's RTCPFeedback +should not use the MAXUINT default. Instead, in RTP/AVP, the default should +be 5000 (5 seconds). If using the RTP/AVPF profile, it can be set to a lower +value, the default being 0.
    +

    Since 0.UNRELEASED

    +
    +
    +
    +

    tp_call_content_media_description_set_does_avpf ()

    +
    void                tp_call_content_media_description_set_does_avpf
+                                                        (TpCallContentMediaDescription *self,
+                                                         gboolean does_avpf);
    +

    +Implement properties for +TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK +interface +

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

    self :

    		a TpCallContentMediaDescription +

    does_avpf :

    		the value for +"does-avpf" property.
    +

    Since 0.UNRELEASED

    +
    +
    +
    +

    tp_call_content_media_description_set_rtcp_extended_reports ()

    +
    void                tp_call_content_media_description_set_rtcp_extended_reports
+                                                        (TpCallContentMediaDescription *self,
+                                                         guint loss_rle_max_size,
+                                                         guint duplicate_rle_max_size,
+                                                         guint packet_receipt_times_max_size,
+                                                         guint dlrr_max_size,
+                                                         TpRCPTXRRTTMode rtt_mode,
+                                                         TpRTCPXRStatisticsFlags statistic_flags,
+                                                         gboolean enable_metrics);
    +

    +Implement +TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS +interface. +

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

    self :

    		a TpCallContentMediaDescription +

    loss_rle_max_size :

    		the value for +"loss-rle-max-size" property.

    duplicate_rle_max_size :

    		the value for +"duplicate-rle-max-size" property.

    packet_receipt_times_max_size :

    		the value for +"packet-receipt-times-max-size" property.

    dlrr_max_size :

    		the value for +"dlrr-max-size" property.

    rtt_mode :

    		the value for +"rtt-mpde" property.

    statistic_flags :

    		the value for +"statistic-flags" property.

    enable_metrics :

    		the value for +"enable-metrics" property.
    +

    Since 0.UNRELEASED

    +
    +
    +
    +

    tp_call_content_media_description_add_rtcp_extended_reports_interface ()

    +
    void                tp_call_content_media_description_add_rtcp_extended_reports_interface
+                                                        (TpCallContentMediaDescription *self);
    +

    +Adds the RTCPExtendedReports interface to the list of supported interfaces +

    +
    ++ + + + +

    self :

    		a TpCallContentMediaDescription +
    +

    Since 0.UNRELEASED

    +
    +
    +
    +

    tp_call_content_media_description_add_rtcp_feedback_interface ()

    +
    void                tp_call_content_media_description_add_rtcp_feedback_interface
+                                                        (TpCallContentMediaDescription *self);
    +

    +Adds the RTCPFeedback interface to the list of supported interfaces +

    +
    ++ + + + +

    self :

    		a TpCallContentMediaDescription +
    +

    Since 0.UNRELEASED

    +
    +
    +
    +

    tp_call_content_media_description_add_rtp_header_extensions_interface ()

    +
    void                tp_call_content_media_description_add_rtp_header_extensions_interface
+                                                        (TpCallContentMediaDescription *self);
    +

    +Adds the RTPHeaderExtensions interface to the list of supported interfaces +

    +
    ++ + + + +

    self :

    		a TpCallContentMediaDescription +
    +

    Since 0.UNRELEASED

    +

    Property Details

    @@ -332,6 +666,63 @@
    +

    The "dlrr-max-size" property

    +
      "dlrr-max-size"            guint                 : Read
    +

    +If non-zero, enable Receiver Reference Time and Delay since Last Receiver +Report Blocks (for estimating Round Trip Times between non-senders and +other parties in the call. The value of this integer represents the +max-size of report blocks, as specified in RFC 3611 section 5.1. MAXUINT32 +is used to indicate that there is no limit. +

    +

    Default value: 0

    +

    Since 0.UNRELEASED

    +
    +
    +
    +

    The "does-avpf" property

    +
      "does-avpf"                gboolean              : Read
    +

    +TRUE if the remote contact supports Audio-Visual Profile Feedback (AVPF), +otherwise FALSE. +

    +

    Default value: FALSE

    +

    Since 0.UNRELEASED

    +
    +
    +
    +

    The "duplicate-rle-max-size" property

    +
      "duplicate-rle-max-size"   guint                 : Read
    +

    +If non-zero, enable Duplicate Run-Length-Encoded Report Blocks. The value +of this integer represents the max-size of report blocks, as specified in +RFC 3611 section 5.1. MAXUINT32 is used to indicate that there is no limit. +

    +

    Default value: 0

    +

    Since 0.UNRELEASED

    +
    +
    +
    +

    The "enable-metrics" property

    +
      "enable-metrics"           gboolean              : Read
    +

    +Whether to enable VoIP Metrics Report Blocks. These blocks are of a fixed +size. +

    +

    Default value: FALSE

    +

    Since 0.UNRELEASED

    +
    +
    +
    +

    The "feedback-messages" property

    +
      "feedback-messages"        GHashTable_guint+GValueArray_guint+GPtrArray_GValueArray_gchararray+gchararray+gchararray____*  : Read
    +

    +A map of remote feedback codec properties that are supported. +

    +

    Since 0.UNRELEASED

    +
    +
    +

    The "further-negotiation-required" property

      "further-negotiation-required" gboolean              : Read / Write / Construct Only

    @@ -349,6 +740,15 @@

    +

    The "header-extensions" property

    +
      "header-extensions"        GPtrArray_GValueArray_guint+guint+gchararray+gchararray__*  : Read
    +

    +A list of remote header extensions which are supported. +

    +

    Since 0.UNRELEASED

    +
    +
    +

    The "interfaces" property

      "interfaces"               GStrv                 : Read

    @@ -358,6 +758,18 @@

    +

    The "loss-rle-max-size" property

    +
      "loss-rle-max-size"        guint                 : Read
    +

    +If non-zero, enable Loss Run Length Encoded Report Blocks. The value of +this integer represents the max-size of report blocks, as specified in +RFC 3611 section 5.1. MAXUINT32 is used to indicate that there is no limit. +

    +

    Default value: 0

    +

    Since 0.UNRELEASED

    +
    +
    +

    The "object-path" property

      "object-path"              gchar*                : Read / Write / Construct Only

    @@ -368,6 +780,18 @@

    +

    The "packet-receipt-times-max-size" property

    +
      "packet-receipt-times-max-size" guint                 : Read
    +

    +If non-zero, enable Packet Receipt Times Report Blocks. The value of this +integer represents the max-size of report blocks, as specified in RFC 3611 +section 5.1. MAXUINT32 is used to indicate that there is no limit. +

    +

    Default value: 0

    +

    Since 0.UNRELEASED

    +
    +
    +

    The "remote-contact" property

      "remote-contact"           guint                 : Read / Write / Construct Only

    @@ -378,6 +802,17 @@

    +

    The "rtt-mode" property

    +
      "rtt-mode"                 guint                 : Read
    +

    +Who is allowed to send Delay since Last Receiver Reports. Value from +TpRCPTXRRTTMode. +

    +

    Default value: 0

    +

    Since 0.UNRELEASED

    +
    +
    +

    The "ssrcs" property

      "ssrcs"                    GHashTable_guint+GArray_guint__*  : Read

    @@ -386,6 +821,18 @@

    Since 0.17.5

    +
    +
    +

    The "statistics-flags" property

    +
      "statistics-flags"         guint                 : Read
    +

    +Which fields SHOULD be included in the statistics summary report blocks +that are sent, and whether to send VoIP Metrics Report Blocks. There can +be zero or more flags set. Value from TpRTCPXRStatisticsFlags. +

    +

    Default value: 0

    +

    Since 0.UNRELEASED

    +

    See Also

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/TpChannelFactoryIface.html telepathy-glib-0.17.6/docs/reference/html/TpChannelFactoryIface.html --- telepathy-glib-0.17.5/docs/reference/html/TpChannelFactoryIface.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/TpChannelFactoryIface.html 2012-03-19 15:38:21.000000000 +0000 @@ -627,7 +627,7 @@

    Otherwise, request may either be -NULL or a request that led to the channel's creation; callers are expected +NULL 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.

    @@ -649,7 +649,7 @@

    request :

    A request context as passed to tp_channel_factory_iface_request(), -or NULL +or NULL @@ -696,7 +696,7 @@

    request :

    A request context as passed to tp_channel_factory_iface_request(), -or NULL +or NULL @@ -739,7 +739,7 @@

    request_context :

    a request context as passed to -tp_channel_factory_iface_request(), or NULL +tp_channel_factory_iface_request(), or NULL @@ -766,7 +766,7 @@ tp_channel_factory_iface_request().

    -Otherwise, request may either be NULL or a request that led to +Otherwise, request may either be NULL or a request that led to channel's creation; callers are expected to determine which channels satisfy which requests based on the handle and handle-type.

    @@ -785,7 +785,7 @@

    request_context :

    a request context as passed to -tp_channel_factory_iface_request(), or NULL +tp_channel_factory_iface_request(), or NULL diff -Nru telepathy-glib-0.17.5/docs/reference/html/TpChannelIface.html telepathy-glib-0.17.6/docs/reference/html/TpChannelIface.html --- telepathy-glib-0.17.5/docs/reference/html/TpChannelIface.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/TpChannelIface.html 2012-03-19 15:38:21.000000000 +0000 @@ -142,9 +142,9 @@

    In TpChannel this property is read-only except during construction; -if NULL during construction (the default), we ask the remote D-Bus +if NULL during construction (the default), we ask the remote D-Bus object what its channel type is, and reading this property will yield -NULL until a reply is received. This is not guaranteed to have happened +NULL until a reply is received. This is not guaranteed to have happened until tp_proxy_prepare_async() has finished preparing TP_CHANNEL_FEATURE_CORE.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/TpChannelManager.html telepathy-glib-0.17.6/docs/reference/html/TpChannelManager.html --- telepathy-glib-0.17.5/docs/reference/html/TpChannelManager.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/TpChannelManager.html 2012-03-19 15:38:21.000000000 +0000 @@ -202,7 +202,7 @@

    allowed_properties :

    -A NULL-terminated array of property names which may +A NULL-terminated array of property names which may appear in requests for a particular channel class. @@ -272,7 +272,7 @@

    allowed_properties :

    -A NULL-terminated array of property names which may +A NULL-terminated array of property names which may appear in requests for a particular channel class. @@ -453,7 +453,7 @@

    In addition to the fields documented here there are several GCallback -fields which must currently be NULL. +fields which must currently be NULL.

    @@ -535,11 +535,11 @@ - + - + diff -Nru telepathy-glib-0.17.5/docs/reference/html/TpDynamicHandleRepo.html telepathy-glib-0.17.6/docs/reference/html/TpDynamicHandleRepo.html --- telepathy-glib-0.17.5/docs/reference/html/TpDynamicHandleRepo.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/TpDynamicHandleRepo.html 2012-03-19 15:38:21.000000000 +0000 @@ -172,13 +172,13 @@ +or NULL to accept all handles as-is @@ -238,9 +238,9 @@ 
      "default-normalize-context" gpointer              : Read / Write / Construct Only

    An optional default context given to the -"normalize-function" if NULL is passed as context to +"normalize-function" if NULL is passed as context to the ensure or lookup functions, e.g. when RequestHandle is called via -D-Bus. The default is NULL. +D-Bus. The default is NULL.

    @@ -249,7 +249,7 @@ 
      "normalize-function"       gpointer              : Read / Write / Construct Only

    An optional TpDynamicHandleRepoNormalizeFunc used to validate and -normalize handle IDs. If NULL (which is the default), any handle ID is +normalize handle IDs. If NULL (which is the default), any handle ID is accepted as-is (equivalent to supplying a pointer to a function that just calls g_strdup).

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/TpExportableChannel.html telepathy-glib-0.17.6/docs/reference/html/TpExportableChannel.html --- telepathy-glib-0.17.5/docs/reference/html/TpExportableChannel.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/TpExportableChannel.html 2012-03-19 15:38:21.000000000 +0000 @@ -206,25 +206,25 @@ 17 18 19 - +

    fixed :

    		a NULL-terminated array of property namesa NULL-terminated array of property names

    allowed :

    		a NULL-terminated array of property namesa NULL-terminated array of property names

    error :

    normalize_func :

    		 The function to be used to normalize and validate handles, -or NULL to accept all handles as-is

    default_normalize_context :

    		 The context pointer to be passed to the -normalize_func if a NULL context is passed to tp_handle_lookup() and -tp_handle_ensure(); this may itself be NULL +normalize_func if a NULL context is passed to tp_handle_lookup() and +tp_handle_ensure(); this may itself be NULL 
    case PROP_CHANNEL_PROPERTIES:
-  g_value_take_boxed (value,
-    tp_dbus_properties_mixin_make_properties_hash (object,
-        // The spec says these properties MUST be included:
-        TP_IFACE_CHANNEL, "TargetHandle",
-        TP_IFACE_CHANNEL, "TargetHandleType",
-        TP_IFACE_CHANNEL, "ChannelType",
-        TP_IFACE_CHANNEL, "TargetID",
-        TP_IFACE_CHANNEL, "Requested",
-        // These aren't mandatory as of spec 0.17.17
-        // (but they should be):
-        TP_IFACE_CHANNEL, "InitiatorHandle",
-        TP_IFACE_CHANNEL, "InitiatorID",
-        TP_IFACE_CHANNEL, "Interfaces",
-        // Perhaps your channel has some other immutable properties:
-        TP_IFACE_CHANNEL_INTERFACE_MESSAGES, "SupportedContentTypes",
-        // etc.
-        NULL));
-  break;
    case PROP_CHANNEL_PROPERTIES:
+  g_value_take_boxed (value,
+    tp_dbus_properties_mixin_make_properties_hash (object,
+        // The spec says these properties MUST be included:
+        TP_IFACE_CHANNEL, "TargetHandle",
+        TP_IFACE_CHANNEL, "TargetHandleType",
+        TP_IFACE_CHANNEL, "ChannelType",
+        TP_IFACE_CHANNEL, "TargetID",
+        TP_IFACE_CHANNEL, "Requested",
+        // These aren't mandatory as of spec 0.17.17
+        // (but they should be):
+        TP_IFACE_CHANNEL, "InitiatorHandle",
+        TP_IFACE_CHANNEL, "InitiatorID",
+        TP_IFACE_CHANNEL, "Interfaces",
+        // Perhaps your channel has some other immutable properties:
+        TP_IFACE_CHANNEL_INTERFACE_MESSAGES, "SupportedContentTypes",
+        // etc.
+        NULL));
+  break;
    diff -Nru telepathy-glib-0.17.5/docs/reference/html/TpIntset.html telepathy-glib-0.17.6/docs/reference/html/TpIntset.html --- telepathy-glib-0.17.5/docs/reference/html/TpIntset.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/TpIntset.html 2012-03-19 15:38:21.000000000 +0000 @@ -707,15 +707,15 @@ 7 8 9 - 
    TpIntsetFastIter iter;
-guint element;
+        
    TpIntsetFastIter iter;
+guint element;
 
-tp_intset_fast_iter_init (&iter, intset);
+tp_intset_fast_iter_init (&iter, intset);
 
-while (tp_intset_fast_iter_next (&iter, &element))
-{
-  printf ("%u is in the intset\n", element);
-}
    
+while (tp_intset_fast_iter_next (&iter, &element))
+{
+  printf ("%u is in the intset\n", element);
+}
    @@ -798,12 +798,12 @@ 4 5 6 - 
    void
-do_something (const TpIntset *intset)
-{
-  TpIntsetIter iter = TP_INTSET_ITER_INIT (intset);
-  /* ... do something with iter ... */
-}
    + 
    void
+do_something (const TpIntset *intset)
+{
+  TpIntsetIter iter = TP_INTSET_ITER_INIT (intset);
+  /* ... do something with iter ... */
+}
    @@ -903,11 +903,11 @@ 3 4 5 - 
    TpIntsetIter iter = TP_INTSET_INIT (intset);
-while (tp_intset_iter_next (&iter))
-{
-  printf ("%u is in the intset\n", iter.element);
-}
    + 
    TpIntsetIter iter = TP_INTSET_INIT (intset);
+while (tp_intset_iter_next (&iter))
+{
+  printf ("%u is in the intset\n", iter.element);
+}
    diff -Nru telepathy-glib-0.17.5/docs/reference/html/TpMessage.html telepathy-glib-0.17.6/docs/reference/html/TpMessage.html --- telepathy-glib-0.17.5/docs/reference/html/TpMessage.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/TpMessage.html 2012-03-19 15:38:21.000000000 +0000 @@ -49,8 +49,8 @@ gchar * tp_message_to_text (TpMessage *message, TpChannelTextMessageFlags *out_flags); TpChannelTextMessageType tp_message_get_message_type (TpMessage *self); -gint64 tp_message_get_received_timestamp (TpMessage *self); -gint64 tp_message_get_sent_timestamp (TpMessage *self); +gint64 tp_message_get_received_timestamp (TpMessage *self); +gint64 tp_message_get_sent_timestamp (TpMessage *self); const gchar * tp_message_get_specific_to_interface (TpMessage *self); const gchar * tp_message_get_supersedes (TpMessage *self); @@ -58,7 +58,7 @@ gboolean tp_message_is_delivery_report (TpMessage *self); gboolean tp_message_is_rescued (TpMessage *self); gboolean tp_message_is_scrollback (TpMessage *self); -guint32 tp_message_get_pending_message_id (TpMessage *self, +guint32 tp_message_get_pending_message_id (TpMessage *self, gboolean *valid); gboolean tp_message_is_mutable (TpMessage *self); @@ -88,11 +88,11 @@ void tp_message_set_int32 (TpMessage *self, guint part, const gchar *key, - gint32 i); + gint32 i); void tp_message_set_int64 (TpMessage *self, guint part, const gchar *key, - gint64 i); + gint64 i); void tp_message_set_string (TpMessage *self, guint part, const gchar *key, @@ -109,11 +109,11 @@ void tp_message_set_uint32 (TpMessage *self, guint part, const gchar *key, - guint32 u); + guint32 u); void tp_message_set_uint64 (TpMessage *self, guint part, const gchar *key, - guint64 u); + guint64 u); TpMessage * tp_message_new (TpBaseConnection *connection, guint initial_parts, @@ -217,7 +217,7 @@

    Returns :

    -the GHashTable used to implement the given part, or NULL if the +the GHashTable used to implement the given part, or NULL 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. [transfer none][element-type utf8 GObject.Value] @@ -244,7 +244,7 @@

    out_flags :

    -(out) : if not NULL, the TpChannelTextMessageFlags of message +(out) : if not NULL, the TpChannelTextMessageFlags of message @@ -282,7 +282,7 @@

    tp_message_get_received_timestamp ()

    -
    gint64              tp_message_get_received_timestamp   (TpMessage *self);
    +
    gint64              tp_message_get_received_timestamp   (TpMessage *self);

    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 @@

    tp_message_get_sent_timestamp ()

    -
    gint64              tp_message_get_sent_timestamp       (TpMessage *self);
    +
    gint64              tp_message_get_sent_timestamp       (TpMessage *self);

    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.

    -If this message is an ordinary message or delivery report, return NULL. +If this message is an ordinary message or delivery report, return NULL.

    @@ -354,7 +354,7 @@ - @@ -368,7 +368,7 @@ 
    const gchar *       tp_message_get_supersedes           (TpMessage *self);

    If this message replaces a previous message, return the value of -tp_message_get_token() for that previous message. Otherwise, return NULL. +tp_message_get_token() for that previous message. Otherwise, return NULL.

    For instance, a user interface could replace the superseded @@ -383,7 +383,7 @@

    - @@ -401,7 +401,7 @@ messages with different non-empty tokens are different messages.

    -If there is no suitable token, return NULL. +If there is no suitable token, return NULL.

    Returns :

    		a D-Bus interface name, or NULL for ordinary +a D-Bus interface name, or NULL for ordinary messages and delivery reports. [transfer none]

    Returns :

    		a non-empty opaque identifier, or NULL if none. [transfer none] +a non-empty opaque identifier, or NULL if none. [transfer none]
    @@ -412,7 +412,7 @@ - @@ -500,7 +500,7 @@

    tp_message_get_pending_message_id ()

    -
    guint32             tp_message_get_pending_message_id   (TpMessage *self,
+
    guint32             tp_message_get_pending_message_id   (TpMessage *self,
                                                          gboolean *valid);
    
 
    
 Return the incoming message ID of self. Only incoming messages have such
@@ -515,7 +515,7 @@
    - @@ -786,7 +786,7 @@ 
    void                tp_message_set_int32                (TpMessage *self,
                                                          guint part,
                                                          const gchar *key,
-                                                         gint32 i);
    + gint32 i);

    Set key in part part of self to have i as a signed integer value.

    @@ -821,7 +821,7 @@ 
    void                tp_message_set_int64                (TpMessage *self,
                                                          guint part,
                                                          const gchar *key,
-                                                         gint64 i);
    + gint64 i);

    Set key in part part of self to have i as a signed integer value.

    @@ -964,7 +964,7 @@ 
    void                tp_message_set_uint32               (TpMessage *self,
                                                          guint part,
                                                          const gchar *key,
-                                                         guint32 u);
    + guint32 u);

    Set key in part part of self to have u as an unsigned integer value.

    @@ -999,7 +999,7 @@ 
    void                tp_message_set_uint64               (TpMessage *self,
                                                          guint part,
                                                          const gchar *key,
-                                                         guint64 u);
    + guint64 u);

    Set key in part part of self to have u as an unsigned integer value.

    diff -Nru telepathy-glib-0.17.5/docs/reference/html/TpSignalledMessage.html telepathy-glib-0.17.6/docs/reference/html/TpSignalledMessage.html --- telepathy-glib-0.17.5/docs/reference/html/TpSignalledMessage.html 2012-02-20 17:31:30.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/html/TpSignalledMessage.html 2012-03-19 15:38:21.000000000 +0000 @@ -88,7 +88,7 @@

    tp_signalled_message_get_sender ()

    TpContact *         tp_signalled_message_get_sender     (TpMessage *message);

    -Returns a TpContact representing the sender of message if known, NULL +Returns a TpContact representing the sender of message if known, NULL otherwise.

    Returns :

    		a non-empty opaque identifier, or NULL if none. [transfer none] +a non-empty opaque identifier, or NULL if none. [transfer none]

    valid :

    		either NULL, or a location in which to store TRUE if self +either NULL, or a location in which to store TRUE if self contains a pending message ID. [out]
    @@ -115,7 +115,7 @@

    The "sender" property

      "sender"                   TpContact*            : Read / Write / Construct Only

    -A TpContact representing the sender of the message, if known, or NULL +A TpContact representing the sender of the message, if known, or NULL otherwise.

    Since 0.13.9

    diff -Nru telepathy-glib-0.17.5/docs/reference/Makefile.am telepathy-glib-0.17.6/docs/reference/Makefile.am --- telepathy-glib-0.17.5/docs/reference/Makefile.am 2012-02-20 16:56:41.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/Makefile.am 2012-03-12 12:37:25.000000000 +0000 @@ -124,6 +124,13 @@ # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt #DISTCLEANFILES += +# Work around gtk-doc using an outdated -sections.txt in out-of-tree builds: +# redo the copy every time the files in the srcdir change +setup-build.stamp: $(srcdir)/$(DOC_MODULE)-overrides.txt +setup-build.stamp: $(srcdir)/$(DOC_MODULE)-sections.txt +setup-build.stamp: $(srcdir)/$(DOC_MAIN_SGML_FILE) +setup-build.stamp: $(srcdir)/tp-svc.xml + if ENABLE_GTK_DOC check-local: @err=0; \ diff -Nru telepathy-glib-0.17.5/docs/reference/Makefile.in telepathy-glib-0.17.6/docs/reference/Makefile.in --- telepathy-glib-0.17.5/docs/reference/Makefile.in 2012-02-20 17:31:08.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/Makefile.in 2012-03-19 15:34:29.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,11 +57,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version.xml CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -419,7 +419,6 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/gtk-doc.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -493,15 +492,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: @@ -789,6 +783,13 @@ # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt #DISTCLEANFILES += +# Work around gtk-doc using an outdated -sections.txt in out-of-tree builds: +# redo the copy every time the files in the srcdir change +setup-build.stamp: $(srcdir)/$(DOC_MODULE)-overrides.txt +setup-build.stamp: $(srcdir)/$(DOC_MODULE)-sections.txt +setup-build.stamp: $(srcdir)/$(DOC_MAIN_SGML_FILE) +setup-build.stamp: $(srcdir)/tp-svc.xml + @ENABLE_GTK_DOC_TRUE@check-local: @ENABLE_GTK_DOC_TRUE@ @err=0; \ @ENABLE_GTK_DOC_TRUE@ if grep '^0 symbols incomplete' \ diff -Nru telepathy-glib-0.17.5/docs/reference/telepathy-glib-sections.txt telepathy-glib-0.17.6/docs/reference/telepathy-glib-sections.txt --- telepathy-glib-0.17.5/docs/reference/telepathy-glib-sections.txt 2012-02-20 17:31:29.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/telepathy-glib-sections.txt 2012-03-19 15:38:21.000000000 +0000 @@ -4633,6 +4633,8 @@ connection-managertelepathy-glib/connection-manager.h TpConnectionManagerListCb +tp_list_connection_managers_async +tp_list_connection_managers_finish tp_list_connection_managers TpConnectionManager TpConnectionManagerClass @@ -4647,6 +4649,7 @@ tp_connection_manager_get_info_source tp_connection_manager_activate tp_connection_manager_is_running +tp_connection_manager_dup_protocols tp_connection_manager_dup_protocol_names tp_connection_manager_has_protocol tp_connection_manager_get_protocol @@ -4946,6 +4949,9 @@ tp_capabilities_is_specific_to_contact tp_capabilities_supports_text_chatrooms tp_capabilities_supports_text_chats +tp_capabilities_supports_audio_call +tp_capabilities_supports_audio_video_call +tp_capabilities_supports_file_transfer tp_capabilities_supports_stream_tubes tp_capabilities_supports_dbus_tubes tp_capabilities_supports_contact_search @@ -5062,6 +5068,8 @@ tp_account_is_valid tp_account_update_parameters_async tp_account_update_parameters_finish +tp_account_update_parameters_vardict_async +tp_account_update_parameters_vardict_finish tp_account_remove_async tp_account_remove_finish tp_account_set_display_name_async @@ -5080,11 +5088,13 @@ tp_account_get_has_been_online tp_account_get_connection_status tp_account_get_detailed_error +tp_account_dup_detailed_error_vardict tp_account_get_changing_presence tp_account_get_current_presence tp_account_get_requested_presence tp_account_get_automatic_presence tp_account_get_parameters +tp_account_dup_parameters_vardict tp_account_get_nickname tp_account_set_nickname_async tp_account_set_nickname_finish @@ -5111,9 +5121,12 @@ TP_ACCOUNT_FEATURE_STORAGE tp_account_get_storage_provider tp_account_get_storage_identifier +tp_account_dup_storage_identifier_variant tp_account_get_storage_restrictions tp_account_get_storage_specific_information_async tp_account_get_storage_specific_information_finish +tp_account_dup_storage_specific_information_vardict_async +tp_account_dup_storage_specific_information_vardict_finish tp_account_get_feature_quark_core tp_account_get_feature_quark_connection @@ -5881,8 +5894,11 @@ tp_protocol_init_known_interfaces TP_PROTOCOL_FEATURE_PARAMETERS +tp_protocol_borrow_params +tp_protocol_dup_params tp_protocol_dup_param_names tp_protocol_get_param +tp_protocol_dup_param tp_protocol_has_param tp_protocol_can_register @@ -6558,6 +6574,7 @@ tp_call_channel_get_members tp_call_channel_has_dtmf +tp_call_channel_has_hold tp_call_channel_send_tones_async tp_call_channel_send_tones_finish @@ -6571,6 +6588,8 @@ tp_call_channel_hangup_finish tp_call_channel_add_content_async tp_call_channel_add_content_finish +tp_call_channel_request_hold_async +tp_call_channel_request_hold_finish TpCallChannelPrivate tp_call_channel_get_type @@ -6998,6 +7017,14 @@ tp_call_content_media_description_get_remote_contact tp_call_content_media_description_append_codec tp_call_content_media_description_add_ssrc +tp_call_content_media_description_add_rtp_header_extension +tp_call_content_media_description_add_rtcp_feedback_message +tp_call_content_media_description_set_rtcp_feedback_minimum_interval +tp_call_content_media_description_set_does_avpf +tp_call_content_media_description_set_rtcp_extended_reports +tp_call_content_media_description_add_rtcp_extended_reports_interface +tp_call_content_media_description_add_rtcp_feedback_interface +tp_call_content_media_description_add_rtp_header_extensions_interface TP_CALL_CONTENT_MEDIA_DESCRIPTION TP_CALL_CONTENT_MEDIA_DESCRIPTION_CLASS @@ -7081,6 +7108,7 @@ TpBaseMediaCallChannelClass TpBaseMediaCallChannelHoldStateChangedFunc TpBaseMediaCallChannelVoidFunc +tp_base_media_call_channel_get_local_hold_state TP_BASE_MEDIA_CALL_CHANNEL TP_BASE_MEDIA_CALL_CHANNEL_CLASS diff -Nru telepathy-glib-0.17.5/docs/reference/version.xml telepathy-glib-0.17.6/docs/reference/version.xml --- telepathy-glib-0.17.5/docs/reference/version.xml 2012-02-20 17:31:14.000000000 +0000 +++ telepathy-glib-0.17.6/docs/reference/version.xml 2012-03-19 15:34:37.000000000 +0000 @@ -1 +1 @@ -0.17.5 +0.17.6 diff -Nru telepathy-glib-0.17.5/examples/client/extended-client.c telepathy-glib-0.17.6/examples/client/extended-client.c --- telepathy-glib-0.17.5/examples/client/extended-client.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/examples/client/extended-client.c 2012-03-07 11:51:11.000000000 +0000 @@ -168,11 +168,21 @@ } static void -conn_ready (TpConnection *conn, - GParamSpec *unused, - gpointer user_data) +conn_ready (GObject *source, + GAsyncResult *result, + gpointer user_data) { + GError *error = NULL; static const gchar * const names[] = { "myself@server", "other@server" }; + TpConnection *conn = TP_CONNECTION (source); + + if (!tp_proxy_prepare_finish (conn, result, &error)) + { + g_warning ("%s", error->message); + g_main_loop_quit (mainloop); + g_clear_error (&error); + return; + } if (!tp_proxy_has_interface_by_id (conn, EXAMPLE_IFACE_QUARK_CONNECTION_INTERFACE_HATS)) @@ -214,7 +224,6 @@ GError *e = NULL; TpConnection *conn; TpProxy *proxy = (TpProxy *) manager; - gboolean ready; if (die_if (error, "RequestConnection()")) return; @@ -235,16 +244,7 @@ tp_cli_connection_connect_to_status_changed (conn, conn_status_changed, NULL, NULL, NULL, NULL); - g_object_get (conn, - "connection-ready", &ready, - NULL); - - if (ready) - conn_ready (conn, NULL, NULL); - else - g_signal_connect (conn, "notify::connection-ready", - G_CALLBACK (conn_ready), NULL); - + tp_proxy_prepare_async (conn, NULL, conn_ready, NULL); tp_cli_connection_call_connect (conn, -1, NULL, NULL, NULL, NULL); } diff -Nru telepathy-glib-0.17.5/examples/client/inspect-channel.c telepathy-glib-0.17.6/examples/client/inspect-channel.c --- telepathy-glib-0.17.5/examples/client/inspect-channel.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/examples/client/inspect-channel.c 2012-03-07 11:51:11.000000000 +0000 @@ -22,20 +22,23 @@ } InspectChannelData; static void -channel_ready_cb (TpChannel *channel, - const GError *error, +channel_ready_cb (GObject *source, + GAsyncResult *result, gpointer user_data) { + TpChannel *channel = TP_CHANNEL (source); InspectChannelData *data = user_data; guint handle_type, handle; gchar *channel_type; gchar **interfaces, **iter; + GError *error = NULL; - if (error != NULL) + if (!tp_proxy_prepare_finish (channel, result, &error)) { g_warning ("%s", error->message); data->exit_status = 1; g_main_loop_quit (data->main_loop); + g_clear_error (&error); return; } @@ -80,19 +83,22 @@ } static void -connection_ready_cb (TpConnection *connection, - const GError *ready_error, +connection_ready_cb (GObject *source, + GAsyncResult *result, gpointer user_data) { InspectChannelData *data = user_data; GError *error = NULL; + TpConnection *connection = TP_CONNECTION (source); TpChannel *channel = NULL; - if (ready_error != NULL) + + if (!tp_proxy_prepare_finish (connection, result, &error)) { - g_warning ("%s", ready_error->message); + g_warning ("%s", error->message); data->exit_status = 1; g_main_loop_quit (data->main_loop); + g_clear_error (&error); return; } @@ -108,7 +114,7 @@ return; } - tp_channel_call_when_ready (channel, channel_ready_cb, data); + tp_proxy_prepare_async (channel, NULL, channel_ready_cb, user_data); /* the channel will remain referenced as long as it has calls pending on * it */ @@ -172,7 +178,7 @@ * else has called (or will call) Connect(), so we won't call Connect() * on it ourselves */ - tp_connection_call_when_ready (connection, connection_ready_cb, &data); + tp_proxy_prepare_async (connection, NULL, connection_ready_cb, &data); g_main_loop_run (data.main_loop); diff -Nru telepathy-glib-0.17.5/examples/client/inspect-cm.c telepathy-glib-0.17.6/examples/client/inspect-cm.c --- telepathy-glib-0.17.5/examples/client/inspect-cm.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/examples/client/inspect-cm.c 2012-03-07 11:51:11.000000000 +0000 @@ -28,25 +28,29 @@ #include static void -ready (TpConnectionManager *cm, - const GError *error, - gpointer user_data, - GObject *weak_object G_GNUC_UNUSED) +ready (GObject *source, + GAsyncResult *result, + gpointer user_data) { + TpConnectionManager *cm = TP_CONNECTION_MANAGER (source); GMainLoop *mainloop = user_data; + GError *error = NULL; - if (error != NULL) + if (!tp_proxy_prepare_finish (cm, result, &error)) { - g_assert (!tp_connection_manager_is_ready (cm)); + g_assert (!tp_proxy_is_prepared (cm, + TP_CONNECTION_MANAGER_FEATURE_CORE)); g_warning ("Error getting CM info: %s", error->message); + g_error_free (error); } else { gchar **protocols; guint i; - g_assert (tp_connection_manager_is_ready (cm)); + g_assert (tp_proxy_is_prepared (cm, + TP_CONNECTION_MANAGER_FEATURE_CORE)); g_message ("Connection manager name: %s", tp_connection_manager_get_name (cm)); @@ -165,7 +169,7 @@ goto out; } - tp_connection_manager_call_when_ready (cm, ready, mainloop, NULL, NULL); + tp_proxy_prepare_async (cm, NULL, ready, mainloop); g_main_loop_run (mainloop); ret = 0; diff -Nru telepathy-glib-0.17.5/examples/client/inspect-connection.c telepathy-glib-0.17.6/examples/client/inspect-connection.c --- telepathy-glib-0.17.5/examples/client/inspect-connection.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/examples/client/inspect-connection.c 2012-03-07 11:51:11.000000000 +0000 @@ -53,16 +53,19 @@ } static void -connection_ready_cb (TpConnection *connection, - const GError *error, +connection_ready_cb (GObject *source, + GAsyncResult *result, gpointer user_data) { GMainLoop *mainloop = user_data; + GError *error = NULL; + TpConnection *connection = TP_CONNECTION (source); - if (error != NULL) + if (!tp_proxy_prepare_finish (connection, result, &error)) { g_warning ("%s", error->message); g_main_loop_quit (mainloop); + g_clear_error (&error); return; } @@ -131,7 +134,7 @@ * else has called (or will call) Connect(), so we won't call Connect() * on it ourselves */ - tp_connection_call_when_ready (connection, connection_ready_cb, mainloop); + tp_proxy_prepare_async (connection, NULL, connection_ready_cb, mainloop); g_main_loop_run (mainloop); diff -Nru telepathy-glib-0.17.5/examples/client/inspect-contact.c telepathy-glib-0.17.6/examples/client/inspect-contact.c --- telepathy-glib-0.17.5/examples/client/inspect-contact.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/examples/client/inspect-contact.c 2012-03-07 11:51:11.000000000 +0000 @@ -127,8 +127,8 @@ } static void -connection_ready_cb (TpConnection *connection, - const GError *error, +connection_ready_cb (GObject *source, + GAsyncResult *result, gpointer user_data) { static TpContactFeature features[] = { @@ -137,12 +137,15 @@ TP_CONTACT_FEATURE_PRESENCE }; InspectContactData *data = user_data; + TpConnection *connection = TP_CONNECTION (source); + GError *error = NULL; - if (error != NULL) + if (!tp_proxy_prepare_finish (connection, result, &error)) { g_warning ("%s", error->message); data->exit_status = 1; g_main_loop_quit (data->main_loop); + g_clear_error (&error); return; } @@ -227,7 +230,7 @@ * else has called (or will call) Connect(), so we won't call Connect() * on it ourselves */ - tp_connection_call_when_ready (connection, connection_ready_cb, &data); + tp_proxy_prepare_async (connection, NULL, connection_ready_cb, &data); g_main_loop_run (data.main_loop); diff -Nru telepathy-glib-0.17.5/examples/client/js/Makefile.in telepathy-glib-0.17.6/examples/client/js/Makefile.in --- telepathy-glib-0.17.5/examples/client/js/Makefile.in 2012-02-20 17:31:09.000000000 +0000 +++ telepathy-glib-0.17.6/examples/client/js/Makefile.in 2012-03-19 15:34:29.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -50,11 +50,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -320,15 +320,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru telepathy-glib-0.17.5/examples/client/Makefile.in telepathy-glib-0.17.6/examples/client/Makefile.in --- telepathy-glib-0.17.5/examples/client/Makefile.in 2012-02-20 17:31:09.000000000 +0000 +++ telepathy-glib-0.17.6/examples/client/Makefile.in 2012-03-19 15:34:29.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -74,8 +74,8 @@ telepathy_example_approver_DEPENDENCIES = \ $(top_builddir)/telepathy-glib/libtelepathy-glib.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent am_telepathy_example_contact_list_OBJECTS = contact-list.$(OBJEXT) telepathy_example_contact_list_OBJECTS = \ @@ -165,21 +165,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(telepathy_example_approver_SOURCES) \ $(telepathy_example_contact_list_SOURCES) \ @@ -545,37 +545,37 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -telepathy-example-approver$(EXEEXT): $(telepathy_example_approver_OBJECTS) $(telepathy_example_approver_DEPENDENCIES) $(EXTRA_telepathy_example_approver_DEPENDENCIES) +telepathy-example-approver$(EXEEXT): $(telepathy_example_approver_OBJECTS) $(telepathy_example_approver_DEPENDENCIES) @rm -f telepathy-example-approver$(EXEEXT) $(AM_V_CCLD)$(LINK) $(telepathy_example_approver_OBJECTS) $(telepathy_example_approver_LDADD) $(LIBS) -telepathy-example-contact-list$(EXEEXT): $(telepathy_example_contact_list_OBJECTS) $(telepathy_example_contact_list_DEPENDENCIES) $(EXTRA_telepathy_example_contact_list_DEPENDENCIES) +telepathy-example-contact-list$(EXEEXT): $(telepathy_example_contact_list_OBJECTS) $(telepathy_example_contact_list_DEPENDENCIES) @rm -f telepathy-example-contact-list$(EXEEXT) $(AM_V_CCLD)$(LINK) $(telepathy_example_contact_list_OBJECTS) $(telepathy_example_contact_list_LDADD) $(LIBS) -telepathy-example-extended-client$(EXEEXT): $(telepathy_example_extended_client_OBJECTS) $(telepathy_example_extended_client_DEPENDENCIES) $(EXTRA_telepathy_example_extended_client_DEPENDENCIES) +telepathy-example-extended-client$(EXEEXT): $(telepathy_example_extended_client_OBJECTS) $(telepathy_example_extended_client_DEPENDENCIES) @rm -f telepathy-example-extended-client$(EXEEXT) $(AM_V_CCLD)$(LINK) $(telepathy_example_extended_client_OBJECTS) $(telepathy_example_extended_client_LDADD) $(LIBS) -telepathy-example-inspect-channel$(EXEEXT): $(telepathy_example_inspect_channel_OBJECTS) $(telepathy_example_inspect_channel_DEPENDENCIES) $(EXTRA_telepathy_example_inspect_channel_DEPENDENCIES) +telepathy-example-inspect-channel$(EXEEXT): $(telepathy_example_inspect_channel_OBJECTS) $(telepathy_example_inspect_channel_DEPENDENCIES) @rm -f telepathy-example-inspect-channel$(EXEEXT) $(AM_V_CCLD)$(LINK) $(telepathy_example_inspect_channel_OBJECTS) $(telepathy_example_inspect_channel_LDADD) $(LIBS) -telepathy-example-inspect-cm$(EXEEXT): $(telepathy_example_inspect_cm_OBJECTS) $(telepathy_example_inspect_cm_DEPENDENCIES) $(EXTRA_telepathy_example_inspect_cm_DEPENDENCIES) +telepathy-example-inspect-cm$(EXEEXT): $(telepathy_example_inspect_cm_OBJECTS) $(telepathy_example_inspect_cm_DEPENDENCIES) @rm -f telepathy-example-inspect-cm$(EXEEXT) $(AM_V_CCLD)$(LINK) $(telepathy_example_inspect_cm_OBJECTS) $(telepathy_example_inspect_cm_LDADD) $(LIBS) -telepathy-example-inspect-connection$(EXEEXT): $(telepathy_example_inspect_connection_OBJECTS) $(telepathy_example_inspect_connection_DEPENDENCIES) $(EXTRA_telepathy_example_inspect_connection_DEPENDENCIES) +telepathy-example-inspect-connection$(EXEEXT): $(telepathy_example_inspect_connection_OBJECTS) $(telepathy_example_inspect_connection_DEPENDENCIES) @rm -f telepathy-example-inspect-connection$(EXEEXT) $(AM_V_CCLD)$(LINK) $(telepathy_example_inspect_connection_OBJECTS) $(telepathy_example_inspect_connection_LDADD) $(LIBS) -telepathy-example-inspect-contact$(EXEEXT): $(telepathy_example_inspect_contact_OBJECTS) $(telepathy_example_inspect_contact_DEPENDENCIES) $(EXTRA_telepathy_example_inspect_contact_DEPENDENCIES) +telepathy-example-inspect-contact$(EXEEXT): $(telepathy_example_inspect_contact_OBJECTS) $(telepathy_example_inspect_contact_DEPENDENCIES) @rm -f telepathy-example-inspect-contact$(EXEEXT) $(AM_V_CCLD)$(LINK) $(telepathy_example_inspect_contact_OBJECTS) $(telepathy_example_inspect_contact_LDADD) $(LIBS) -telepathy-example-list-connections$(EXEEXT): $(telepathy_example_list_connections_OBJECTS) $(telepathy_example_list_connections_DEPENDENCIES) $(EXTRA_telepathy_example_list_connections_DEPENDENCIES) +telepathy-example-list-connections$(EXEEXT): $(telepathy_example_list_connections_OBJECTS) $(telepathy_example_list_connections_DEPENDENCIES) @rm -f telepathy-example-list-connections$(EXEEXT) $(AM_V_CCLD)$(LINK) $(telepathy_example_list_connections_OBJECTS) $(telepathy_example_list_connections_LDADD) $(LIBS) -telepathy-example-list-managers$(EXEEXT): $(telepathy_example_list_managers_OBJECTS) $(telepathy_example_list_managers_DEPENDENCIES) $(EXTRA_telepathy_example_list_managers_DEPENDENCIES) +telepathy-example-list-managers$(EXEEXT): $(telepathy_example_list_managers_OBJECTS) $(telepathy_example_list_managers_DEPENDENCIES) @rm -f telepathy-example-list-managers$(EXEEXT) $(AM_V_CCLD)$(LINK) $(telepathy_example_list_managers_OBJECTS) $(telepathy_example_list_managers_LDADD) $(LIBS) -telepathy-example-media-observer$(EXEEXT): $(telepathy_example_media_observer_OBJECTS) $(telepathy_example_media_observer_DEPENDENCIES) $(EXTRA_telepathy_example_media_observer_DEPENDENCIES) +telepathy-example-media-observer$(EXEEXT): $(telepathy_example_media_observer_OBJECTS) $(telepathy_example_media_observer_DEPENDENCIES) @rm -f telepathy-example-media-observer$(EXEEXT) $(AM_V_CCLD)$(LINK) $(telepathy_example_media_observer_OBJECTS) $(telepathy_example_media_observer_LDADD) $(LIBS) -telepathy-example-text-handler$(EXEEXT): $(telepathy_example_text_handler_OBJECTS) $(telepathy_example_text_handler_DEPENDENCIES) $(EXTRA_telepathy_example_text_handler_DEPENDENCIES) +telepathy-example-text-handler$(EXEEXT): $(telepathy_example_text_handler_OBJECTS) $(telepathy_example_text_handler_DEPENDENCIES) @rm -f telepathy-example-text-handler$(EXEEXT) $(AM_V_CCLD)$(LINK) $(telepathy_example_text_handler_OBJECTS) $(telepathy_example_text_handler_LDADD) $(LIBS) @@ -600,23 +600,26 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -835,15 +838,10 @@ installcheck: installcheck-recursive install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru telepathy-glib-0.17.5/examples/client/python/inspect-cm.py telepathy-glib-0.17.6/examples/client/python/inspect-cm.py --- telepathy-glib-0.17.5/examples/client/python/inspect-cm.py 1970-01-01 00:00:00.000000000 +0000 +++ telepathy-glib-0.17.6/examples/client/python/inspect-cm.py 2012-03-12 12:37:25.000000000 +0000 @@ -0,0 +1,60 @@ +#!/usr/bin/env python + +import sys +from gi.repository import GObject +from gi.repository import TelepathyGLib as Tp + +def describe(cm): + print("Connection manager: %s" % cm.get_name()) + print("") + + for protocol in cm.dup_protocols(): + print("Protocol: %s" % protocol.get_name()) + print("\tEnglish name: %s" % protocol.get_english_name()) + print("\tvCard field: %s" % protocol.get_vcard_field()) + + for param in protocol.dup_params(): + print("\tParameter: %s" % param.get_name()) + + if param.is_required(): + print("\t\tIs required") + + if param.is_secret(): + print("\t\tIs a password or equivalent") + + if param.flags & Tp.ConnMgrParamFlags.HAS_DEFAULT: + print("\t\tDefault value: %s" % param.default_value) + else: + print("\t\tNo default") + +def manager_prepared_cb(cm, result, loop): + cm.prepare_finish(result) + describe(cm) + loop.quit() + +def inspect(name): + cm = Tp.ConnectionManager( + dbus_daemon=Tp.DBusDaemon.dup(), + bus_name=Tp.CM_BUS_NAME_BASE + name, + object_path=Tp.CM_OBJECT_PATH_BASE + name, + ) + cm.prepare_async(None, cm, loop) + +def cms_cb(source, result, loop): + cms = Tp.list_connection_managers_finish(result) + + for cm in cms: + describe(cm) + print("") + + loop.quit() + +if __name__ == '__main__': + loop = GObject.MainLoop() + + if len(sys.argv) >= 2: + inspect(sys.argv[1]) + else: + Tp.list_connection_managers_async(Tp.DBusDaemon.dup(), cms_cb, loop) + + loop.run() diff -Nru telepathy-glib-0.17.5/examples/client/python/Makefile.am telepathy-glib-0.17.6/examples/client/python/Makefile.am --- telepathy-glib-0.17.5/examples/client/python/Makefile.am 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/examples/client/python/Makefile.am 2012-03-12 12:37:25.000000000 +0000 @@ -1,6 +1,7 @@ EXTRA_DIST = \ contact-list.py \ ensure-channel.py \ + inspect-cm.py \ text-handler.py \ file-transfer.py \ ft-handler.py diff -Nru telepathy-glib-0.17.5/examples/client/python/Makefile.in telepathy-glib-0.17.6/examples/client/python/Makefile.in --- telepathy-glib-0.17.5/examples/client/python/Makefile.in 2012-02-20 17:31:09.000000000 +0000 +++ telepathy-glib-0.17.6/examples/client/python/Makefile.in 2012-03-19 15:34:29.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -50,11 +50,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -230,6 +230,7 @@ EXTRA_DIST = \ contact-list.py \ ensure-channel.py \ + inspect-cm.py \ text-handler.py \ file-transfer.py \ ft-handler.py @@ -324,15 +325,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru telepathy-glib-0.17.5/examples/client/stream-tubes/Makefile.in telepathy-glib-0.17.6/examples/client/stream-tubes/Makefile.in --- telepathy-glib-0.17.5/examples/client/stream-tubes/Makefile.in 2012-02-20 17:31:09.000000000 +0000 +++ telepathy-glib-0.17.6/examples/client/stream-tubes/Makefile.in 2012-03-19 15:34:29.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -58,8 +58,8 @@ accepter_LDADD = $(LDADD) accepter_DEPENDENCIES = \ $(top_builddir)/telepathy-glib/libtelepathy-glib.la -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent am_offerer_OBJECTS = offerer.$(OBJEXT) offerer_OBJECTS = $(am_offerer_OBJECTS) @@ -76,21 +76,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(accepter_SOURCES) $(offerer_SOURCES) DIST_SOURCES = $(accepter_SOURCES) $(offerer_SOURCES) @@ -328,10 +328,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -accepter$(EXEEXT): $(accepter_OBJECTS) $(accepter_DEPENDENCIES) $(EXTRA_accepter_DEPENDENCIES) +accepter$(EXEEXT): $(accepter_OBJECTS) $(accepter_DEPENDENCIES) @rm -f accepter$(EXEEXT) $(AM_V_CCLD)$(LINK) $(accepter_OBJECTS) $(accepter_LDADD) $(LIBS) -offerer$(EXEEXT): $(offerer_OBJECTS) $(offerer_DEPENDENCIES) $(EXTRA_offerer_DEPENDENCIES) +offerer$(EXEEXT): $(offerer_OBJECTS) $(offerer_DEPENDENCIES) @rm -f offerer$(EXEEXT) $(AM_V_CCLD)$(LINK) $(offerer_OBJECTS) $(offerer_LDADD) $(LIBS) @@ -347,23 +347,26 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -467,15 +470,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru telepathy-glib-0.17.5/examples/cm/call/conn.c telepathy-glib-0.17.6/examples/cm/call/conn.c --- telepathy-glib-0.17.5/examples/cm/call/conn.c 2012-02-20 16:56:41.000000000 +0000 +++ telepathy-glib-0.17.6/examples/cm/call/conn.c 2012-03-07 11:51:11.000000000 +0000 @@ -416,8 +416,7 @@ * available */ signals[SIGNAL_AVAILABLE] = g_signal_new ("available", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__STRING, - G_TYPE_NONE, 1, G_TYPE_STRING); + NULL, G_TYPE_NONE, 1, G_TYPE_STRING); tp_contacts_mixin_class_init (object_class, G_STRUCT_OFFSET (ExampleCallConnectionClass, contacts_mixin)); diff -Nru telepathy-glib-0.17.5/examples/cm/call/example_call.manager telepathy-glib-0.17.6/examples/cm/call/example_call.manager --- telepathy-glib-0.17.5/examples/cm/call/example_call.manager 2012-02-20 16:56:41.000000000 +0000 +++ telepathy-glib-0.17.6/examples/cm/call/example_call.manager 2012-02-22 11:48:01.000000000 +0000 @@ -13,13 +13,13 @@ Icon=face-smile [audio] -org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Call.DRAFT +org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Call1 org.freedesktop.Telepathy.Channel.TargetHandleType u=1 -org.freedesktop.Telepathy.Channel.Type.Call.DRAFT.InitialAudio b=1 -allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy.Channel.TargetID;org.freedesktop.Telepathy.Channel.Type.Call.DRAFT.InitialVideo; +org.freedesktop.Telepathy.Channel.Type.Call1.InitialAudio b=1 +allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy.Channel.TargetID;org.freedesktop.Telepathy.Channel.Type.Call1.InitialVideo; [video] -org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Call.DRAFT +org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Call1 org.freedesktop.Telepathy.Channel.TargetHandleType u=1 -org.freedesktop.Telepathy.Channel.Type.Call.DRAFT.InitialVideo b=1 -allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy.Channel.TargetID;org.freedesktop.Telepathy.Channel.Type.Call.DRAFT.InitialAudio; +org.freedesktop.Telepathy.Channel.Type.Call1.InitialVideo b=1 +allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy.Channel.TargetID;org.freedesktop.Telepathy.Channel.Type.Call1.InitialAudio; diff -Nru telepathy-glib-0.17.5/examples/cm/call/Makefile.in telepathy-glib-0.17.6/examples/cm/call/Makefile.in --- telepathy-glib-0.17.5/examples/cm/call/Makefile.in 2012-02-20 17:31:09.000000000 +0000 +++ telepathy-glib-0.17.6/examples/cm/call/Makefile.in 2012-03-19 15:34:29.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -67,8 +67,8 @@ am_libexample_cm_call_la_OBJECTS = cm.lo conn.lo call-channel.lo \ call-manager.lo call-content.lo call-stream.lo protocol.lo libexample_cm_call_la_OBJECTS = $(am_libexample_cm_call_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent am__EXEEXT_1 = telepathy-example-cm-call$(EXEEXT) am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(managerdir)" \ @@ -88,21 +88,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libexample_cm_call_la_SOURCES) \ $(telepathy_example_cm_call_SOURCES) @@ -130,12 +130,6 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } DATA = $(dist_manager_DATA) $(service_DATA) ETAGS = etags CTAGS = ctags @@ -404,7 +398,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libexample-cm-call.la: $(libexample_cm_call_la_OBJECTS) $(libexample_cm_call_la_DEPENDENCIES) $(EXTRA_libexample_cm_call_la_DEPENDENCIES) +libexample-cm-call.la: $(libexample_cm_call_la_OBJECTS) $(libexample_cm_call_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libexample_cm_call_la_OBJECTS) $(libexample_cm_call_la_LIBADD) $(LIBS) install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) @@ -458,7 +452,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -telepathy-example-cm-call$(EXEEXT): $(telepathy_example_cm_call_OBJECTS) $(telepathy_example_cm_call_DEPENDENCIES) $(EXTRA_telepathy_example_cm_call_DEPENDENCIES) +telepathy-example-cm-call$(EXEEXT): $(telepathy_example_cm_call_OBJECTS) $(telepathy_example_cm_call_DEPENDENCIES) @rm -f telepathy-example-cm-call$(EXEEXT) $(AM_V_CCLD)$(LINK) $(telepathy_example_cm_call_OBJECTS) $(telepathy_example_cm_call_LDADD) $(LIBS) @@ -480,23 +474,26 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -520,7 +517,9 @@ @$(NORMAL_UNINSTALL) @list='$(dist_manager_DATA)'; test -n "$(managerdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(managerdir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(managerdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(managerdir)" && rm -f $$files install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @@ -538,7 +537,9 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(servicedir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -639,15 +640,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru telepathy-glib-0.17.5/examples/cm/channelspecific/Makefile.in telepathy-glib-0.17.6/examples/cm/channelspecific/Makefile.in --- telepathy-glib-0.17.5/examples/cm/channelspecific/Makefile.in 2012-02-20 17:31:09.000000000 +0000 +++ telepathy-glib-0.17.6/examples/cm/channelspecific/Makefile.in 2012-03-19 15:34:29.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -68,8 +68,8 @@ am_libexample_cm_csh_la_OBJECTS = conn.lo connection-manager.lo \ protocol.lo room.lo room-manager.lo libexample_cm_csh_la_OBJECTS = $(am_libexample_cm_csh_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent am__EXEEXT_1 = telepathy-example-cm-csh$(EXEEXT) am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(managerdir)" \ @@ -89,21 +89,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libexample_cm_csh_la_SOURCES) \ $(telepathy_example_cm_csh_SOURCES) @@ -131,12 +131,6 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } DATA = $(dist_manager_DATA) $(service_DATA) ETAGS = etags CTAGS = ctags @@ -401,7 +395,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libexample-cm-csh.la: $(libexample_cm_csh_la_OBJECTS) $(libexample_cm_csh_la_DEPENDENCIES) $(EXTRA_libexample_cm_csh_la_DEPENDENCIES) +libexample-cm-csh.la: $(libexample_cm_csh_la_OBJECTS) $(libexample_cm_csh_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libexample_cm_csh_la_OBJECTS) $(libexample_cm_csh_la_LIBADD) $(LIBS) install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) @@ -455,7 +449,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -telepathy-example-cm-csh$(EXEEXT): $(telepathy_example_cm_csh_OBJECTS) $(telepathy_example_cm_csh_DEPENDENCIES) $(EXTRA_telepathy_example_cm_csh_DEPENDENCIES) +telepathy-example-cm-csh$(EXEEXT): $(telepathy_example_cm_csh_OBJECTS) $(telepathy_example_cm_csh_DEPENDENCIES) @rm -f telepathy-example-cm-csh$(EXEEXT) $(AM_V_CCLD)$(LINK) $(telepathy_example_cm_csh_OBJECTS) $(telepathy_example_cm_csh_LDADD) $(LIBS) @@ -475,23 +469,26 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -515,7 +512,9 @@ @$(NORMAL_UNINSTALL) @list='$(dist_manager_DATA)'; test -n "$(managerdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(managerdir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(managerdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(managerdir)" && rm -f $$files install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @@ -533,7 +532,9 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(servicedir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -634,15 +635,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru telepathy-glib-0.17.5/examples/cm/contactlist/contact-list.c telepathy-glib-0.17.6/examples/cm/contactlist/contact-list.c --- telepathy-glib-0.17.5/examples/cm/contactlist/contact-list.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/examples/cm/contactlist/contact-list.c 2012-03-07 11:51:11.000000000 +0000 @@ -1675,14 +1675,14 @@ G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT); + NULL, G_TYPE_NONE, 1, G_TYPE_UINT); signals[PRESENCE_UPDATED] = g_signal_new ("presence-updated", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT); + NULL, G_TYPE_NONE, 1, G_TYPE_UINT); } static void diff -Nru telepathy-glib-0.17.5/examples/cm/contactlist/Makefile.in telepathy-glib-0.17.6/examples/cm/contactlist/Makefile.in --- telepathy-glib-0.17.5/examples/cm/contactlist/Makefile.in 2012-02-20 17:31:09.000000000 +0000 +++ telepathy-glib-0.17.6/examples/cm/contactlist/Makefile.in 2012-03-19 15:34:29.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -68,8 +68,8 @@ connection-manager.lo contact-list.lo protocol.lo libexample_cm_contactlist_la_OBJECTS = \ $(am_libexample_cm_contactlist_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent am__EXEEXT_1 = telepathy-example-cm-contactlist$(EXEEXT) am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(managerdir)" \ @@ -89,21 +89,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libexample_cm_contactlist_la_SOURCES) \ $(telepathy_example_cm_contactlist_SOURCES) @@ -131,12 +131,6 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } DATA = $(dist_manager_DATA) $(service_DATA) ETAGS = etags CTAGS = ctags @@ -395,7 +389,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libexample-cm-contactlist.la: $(libexample_cm_contactlist_la_OBJECTS) $(libexample_cm_contactlist_la_DEPENDENCIES) $(EXTRA_libexample_cm_contactlist_la_DEPENDENCIES) +libexample-cm-contactlist.la: $(libexample_cm_contactlist_la_OBJECTS) $(libexample_cm_contactlist_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libexample_cm_contactlist_la_OBJECTS) $(libexample_cm_contactlist_la_LIBADD) $(LIBS) install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) @@ -449,7 +443,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -telepathy-example-cm-contactlist$(EXEEXT): $(telepathy_example_cm_contactlist_OBJECTS) $(telepathy_example_cm_contactlist_DEPENDENCIES) $(EXTRA_telepathy_example_cm_contactlist_DEPENDENCIES) +telepathy-example-cm-contactlist$(EXEEXT): $(telepathy_example_cm_contactlist_OBJECTS) $(telepathy_example_cm_contactlist_DEPENDENCIES) @rm -f telepathy-example-cm-contactlist$(EXEEXT) $(AM_V_CCLD)$(LINK) $(telepathy_example_cm_contactlist_OBJECTS) $(telepathy_example_cm_contactlist_LDADD) $(LIBS) @@ -468,23 +462,26 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -508,7 +505,9 @@ @$(NORMAL_UNINSTALL) @list='$(dist_manager_DATA)'; test -n "$(managerdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(managerdir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(managerdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(managerdir)" && rm -f $$files install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @@ -526,7 +525,9 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(servicedir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -627,15 +628,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru telepathy-glib-0.17.5/examples/cm/echo-message-parts/Makefile.in telepathy-glib-0.17.6/examples/cm/echo-message-parts/Makefile.in --- telepathy-glib-0.17.5/examples/cm/echo-message-parts/Makefile.in 2012-02-20 17:31:09.000000000 +0000 +++ telepathy-glib-0.17.6/examples/cm/echo-message-parts/Makefile.in 2012-03-19 15:34:29.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,8 +66,8 @@ connection-manager.lo im-manager.lo libexample_cm_echo_2_la_OBJECTS = \ $(am_libexample_cm_echo_2_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent am__EXEEXT_1 = telepathy-example-cm-echo-2$(EXEEXT) am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(managerdir)" \ @@ -87,21 +87,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libexample_cm_echo_2_la_SOURCES) \ $(telepathy_example_cm_echo_2_SOURCES) @@ -129,12 +129,6 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } DATA = $(dist_manager_DATA) $(service_DATA) ETAGS = etags CTAGS = ctags @@ -399,7 +393,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libexample-cm-echo-2.la: $(libexample_cm_echo_2_la_OBJECTS) $(libexample_cm_echo_2_la_DEPENDENCIES) $(EXTRA_libexample_cm_echo_2_la_DEPENDENCIES) +libexample-cm-echo-2.la: $(libexample_cm_echo_2_la_OBJECTS) $(libexample_cm_echo_2_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libexample_cm_echo_2_la_OBJECTS) $(libexample_cm_echo_2_la_LIBADD) $(LIBS) install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) @@ -453,7 +447,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -telepathy-example-cm-echo-2$(EXEEXT): $(telepathy_example_cm_echo_2_OBJECTS) $(telepathy_example_cm_echo_2_DEPENDENCIES) $(EXTRA_telepathy_example_cm_echo_2_DEPENDENCIES) +telepathy-example-cm-echo-2$(EXEEXT): $(telepathy_example_cm_echo_2_OBJECTS) $(telepathy_example_cm_echo_2_DEPENDENCIES) @rm -f telepathy-example-cm-echo-2$(EXEEXT) $(AM_V_CCLD)$(LINK) $(telepathy_example_cm_echo_2_OBJECTS) $(telepathy_example_cm_echo_2_LDADD) $(LIBS) @@ -473,23 +467,26 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -513,7 +510,9 @@ @$(NORMAL_UNINSTALL) @list='$(dist_manager_DATA)'; test -n "$(managerdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(managerdir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(managerdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(managerdir)" && rm -f $$files install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @@ -531,7 +530,9 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(servicedir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -632,15 +633,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru telepathy-glib-0.17.5/examples/cm/extended/Makefile.in telepathy-glib-0.17.6/examples/cm/extended/Makefile.in --- telepathy-glib-0.17.5/examples/cm/extended/Makefile.in 2012-02-20 17:31:09.000000000 +0000 +++ telepathy-glib-0.17.6/examples/cm/extended/Makefile.in 2012-03-19 15:34:29.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -69,8 +69,8 @@ $(top_builddir)/examples/extensions/libexample-extensions.la \ $(top_builddir)/telepathy-glib/libtelepathy-glib.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -82,21 +82,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(telepathy_example_cm_extended_SOURCES) DIST_SOURCES = $(telepathy_example_cm_extended_SOURCES) @@ -122,12 +122,6 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } DATA = $(dist_manager_DATA) $(service_DATA) ETAGS = etags CTAGS = ctags @@ -425,7 +419,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -telepathy-example-cm-extended$(EXEEXT): $(telepathy_example_cm_extended_OBJECTS) $(telepathy_example_cm_extended_DEPENDENCIES) $(EXTRA_telepathy_example_cm_extended_DEPENDENCIES) +telepathy-example-cm-extended$(EXEEXT): $(telepathy_example_cm_extended_OBJECTS) $(telepathy_example_cm_extended_DEPENDENCIES) @rm -f telepathy-example-cm-extended$(EXEEXT) $(AM_V_CCLD)$(LINK) $(telepathy_example_cm_extended_OBJECTS) $(telepathy_example_cm_extended_LDADD) $(LIBS) @@ -443,23 +437,26 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -483,7 +480,9 @@ @$(NORMAL_UNINSTALL) @list='$(dist_manager_DATA)'; test -n "$(managerdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(managerdir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(managerdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(managerdir)" && rm -f $$files install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @@ -501,7 +500,9 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(servicedir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -602,15 +603,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru telepathy-glib-0.17.5/examples/cm/Makefile.in telepathy-glib-0.17.6/examples/cm/Makefile.in --- telepathy-glib-0.17.5/examples/cm/Makefile.in 2012-02-20 17:31:09.000000000 +0000 +++ telepathy-glib-0.17.6/examples/cm/Makefile.in 2012-03-19 15:34:29.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -50,11 +50,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -523,15 +523,10 @@ installcheck: installcheck-recursive install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru telepathy-glib-0.17.5/examples/cm/no-protocols/Makefile.in telepathy-glib-0.17.6/examples/cm/no-protocols/Makefile.in --- telepathy-glib-0.17.5/examples/cm/no-protocols/Makefile.in 2012-02-20 17:31:09.000000000 +0000 +++ telepathy-glib-0.17.6/examples/cm/no-protocols/Makefile.in 2012-03-19 15:34:30.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -68,8 +68,8 @@ telepathy_example_no_protocols_DEPENDENCIES = \ $(top_builddir)/telepathy-glib/libtelepathy-glib.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -81,21 +81,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(telepathy_example_no_protocols_SOURCES) DIST_SOURCES = $(telepathy_example_no_protocols_SOURCES) @@ -121,12 +121,6 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } DATA = $(dist_manager_DATA) $(service_DATA) ETAGS = etags CTAGS = ctags @@ -419,7 +413,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -telepathy-example-no-protocols$(EXEEXT): $(telepathy_example_no_protocols_OBJECTS) $(telepathy_example_no_protocols_DEPENDENCIES) $(EXTRA_telepathy_example_no_protocols_DEPENDENCIES) +telepathy-example-no-protocols$(EXEEXT): $(telepathy_example_no_protocols_OBJECTS) $(telepathy_example_no_protocols_DEPENDENCIES) @rm -f telepathy-example-no-protocols$(EXEEXT) $(AM_V_CCLD)$(LINK) $(telepathy_example_no_protocols_OBJECTS) $(telepathy_example_no_protocols_LDADD) $(LIBS) @@ -435,23 +429,26 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -475,7 +472,9 @@ @$(NORMAL_UNINSTALL) @list='$(dist_manager_DATA)'; test -n "$(managerdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(managerdir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(managerdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(managerdir)" && rm -f $$files install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @@ -493,7 +492,9 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(servicedir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -594,15 +595,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru telepathy-glib-0.17.5/examples/extensions/extensions.c telepathy-glib-0.17.6/examples/extensions/extensions.c --- telepathy-glib-0.17.5/examples/extensions/extensions.c 2011-10-18 12:55:37.000000000 +0000 +++ telepathy-glib-0.17.6/examples/extensions/extensions.c 2012-03-07 11:51:11.000000000 +0000 @@ -3,4 +3,3 @@ /* include auto-generated stubs for things common to service and client */ #include "_gen/gtypes-body.h" #include "_gen/interfaces-body.h" -#include "_gen/signals-marshal.h" diff -Nru telepathy-glib-0.17.5/examples/extensions/extensions-cli.c telepathy-glib-0.17.6/examples/extensions/extensions-cli.c --- telepathy-glib-0.17.5/examples/extensions/extensions-cli.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/examples/extensions/extensions-cli.c 2012-03-07 11:51:11.000000000 +0000 @@ -8,7 +8,6 @@ static void _example_ext_register_dbus_glib_marshallers (void); /* include auto-generated stubs for client-specific code */ -#include "_gen/signals-marshal.h" #include "_gen/cli-connection-body.h" #include "_gen/register-dbus-glib-marshallers-body.h" diff -Nru telepathy-glib-0.17.5/examples/extensions/Makefile.am telepathy-glib-0.17.6/examples/extensions/Makefile.am --- telepathy-glib-0.17.5/examples/extensions/Makefile.am 2012-02-09 15:05:12.000000000 +0000 +++ telepathy-glib-0.17.6/examples/extensions/Makefile.am 2012-03-12 12:37:25.000000000 +0000 @@ -41,9 +41,6 @@ extensions.h nodist_libexample_extensions_la_SOURCES = \ - _gen/signals-marshal.c \ - _gen/signals-marshal.h \ - _gen/signals-marshal.list \ _gen/register-dbus-glib-marshallers-body.h \ _gen/enums.h \ _gen/gtypes.h \ @@ -79,22 +76,15 @@ $(tools_dir)/doc-generator.xsl \ $< > $@ -_gen/gtypes.h _gen/gtypes-body.h: _gen/all.xml \ +# do nothing, output as a side-effect +_gen/gtypes.h: _gen/gtypes-body.h + @: + +_gen/gtypes-body.h: _gen/all.xml \ $(top_srcdir)/tools/glib-gtypes-generator.py $(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \ $< _gen/gtypes Example -_gen/signals-marshal.list: _gen/all.xml \ - $(tools_dir)/glib-signals-marshal-gen.py - $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@ - -_gen/signals-marshal.h: _gen/signals-marshal.list Makefile.am - $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_example_ext_marshal $< > $@ - -_gen/signals-marshal.c: _gen/signals-marshal.list Makefile.am - $(AM_V_GEN){ echo '#include "_gen/signals-marshal.h"' && \ - $(GLIB_GENMARSHAL) --body --prefix=_example_ext_marshal $< ; } > $@ - _gen/register-dbus-glib-marshallers-body.h: _gen/all.xml \ $(tools_dir)/glib-client-marshaller-gen.py $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \ @@ -106,7 +96,11 @@ Example \ $< _gen/enums -_gen/interfaces-body.h _gen/interfaces.h: _gen/all.xml \ +# do nothing, output as a side-effect +_gen/interfaces-body.h: _gen/interfaces.h + @: + +_gen/interfaces.h: _gen/all.xml \ $(tools_dir)/glib-interfaces-gen.py $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \ Example _gen/interfaces-body.h _gen/interfaces.h $< @@ -119,7 +113,11 @@ $(mkdir_p) _gen $(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@ -_gen/cli-connection-body.h _gen/cli-connection.h: _gen/connection.xml \ +# do nothing, output as a side-effect +_gen/cli-connection.h: _gen/cli-connection-body.h + @: + +_gen/cli-connection-body.h: _gen/connection.xml \ $(tools_dir)/glib-client-gen.py Makefile.am $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \ --group=connection \ @@ -129,13 +127,16 @@ --tp-proxy-api=0.7.6 \ $< Example_Cli _gen/cli-connection -_gen/svc-connection.c _gen/svc-connection.h: _gen/connection.xml \ +# do nothing, output as a side-effect +_gen/svc-connection.h: _gen/svc-connection.c + @: + +_gen/svc-connection.c: _gen/connection.xml \ $(tools_dir)/glib-ginterface-gen.py $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \ --filename=_gen/svc-connection \ --signal-marshal-prefix=_example_ext \ --include='' \ - --include='"_gen/signals-marshal.h"' \ --not-implemented-func='tp_dbus_g_method_return_not_implemented' \ --allow-unstable \ $< Example_Svc_ diff -Nru telepathy-glib-0.17.5/examples/extensions/Makefile.in telepathy-glib-0.17.6/examples/extensions/Makefile.in --- telepathy-glib-0.17.5/examples/extensions/Makefile.in 2012-02-20 17:31:09.000000000 +0000 +++ telepathy-glib-0.17.6/examples/extensions/Makefile.in 2012-03-19 15:34:30.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -66,13 +66,12 @@ $(am__DEPENDENCIES_1) \ $(top_builddir)/telepathy-glib/libtelepathy-glib.la am_libexample_extensions_la_OBJECTS = extensions.lo extensions-cli.lo -nodist_libexample_extensions_la_OBJECTS = signals-marshal.lo \ - svc-connection.lo +nodist_libexample_extensions_la_OBJECTS = svc-connection.lo libexample_extensions_la_OBJECTS = \ $(am_libexample_extensions_la_OBJECTS) \ $(nodist_libexample_extensions_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -84,21 +83,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libexample_extensions_la_SOURCES) \ $(nodist_libexample_extensions_la_SOURCES) @@ -309,9 +308,6 @@ extensions.h nodist_libexample_extensions_la_SOURCES = \ - _gen/signals-marshal.c \ - _gen/signals-marshal.h \ - _gen/signals-marshal.list \ _gen/register-dbus-glib-marshallers-body.h \ _gen/enums.h \ _gen/gtypes.h \ @@ -375,7 +371,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libexample-extensions.la: $(libexample_extensions_la_OBJECTS) $(libexample_extensions_la_DEPENDENCIES) $(EXTRA_libexample_extensions_la_DEPENDENCIES) +libexample-extensions.la: $(libexample_extensions_la_OBJECTS) $(libexample_extensions_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libexample_extensions_la_OBJECTS) $(libexample_extensions_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -386,43 +382,39 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extensions-cli.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extensions.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signals-marshal.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svc-connection.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -signals-marshal.lo: _gen/signals-marshal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT signals-marshal.lo -MD -MP -MF $(DEPDIR)/signals-marshal.Tpo -c -o signals-marshal.lo `test -f '_gen/signals-marshal.c' || echo '$(srcdir)/'`_gen/signals-marshal.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/signals-marshal.Tpo $(DEPDIR)/signals-marshal.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/signals-marshal.c' object='signals-marshal.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o signals-marshal.lo `test -f '_gen/signals-marshal.c' || echo '$(srcdir)/'`_gen/signals-marshal.c +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< svc-connection.lo: _gen/svc-connection.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT svc-connection.lo -MD -MP -MF $(DEPDIR)/svc-connection.Tpo -c -o svc-connection.lo `test -f '_gen/svc-connection.c' || echo '$(srcdir)/'`_gen/svc-connection.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/svc-connection.Tpo $(DEPDIR)/svc-connection.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/svc-connection.c' object='svc-connection.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/svc-connection.c' object='svc-connection.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o svc-connection.lo `test -f '_gen/svc-connection.c' || echo '$(srcdir)/'`_gen/svc-connection.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o svc-connection.lo `test -f '_gen/svc-connection.c' || echo '$(srcdir)/'`_gen/svc-connection.c mostlyclean-libtool: -rm -f *.lo @@ -528,15 +520,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: @@ -652,22 +639,15 @@ $(tools_dir)/doc-generator.xsl \ $< > $@ -_gen/gtypes.h _gen/gtypes-body.h: _gen/all.xml \ +# do nothing, output as a side-effect +_gen/gtypes.h: _gen/gtypes-body.h + @: + +_gen/gtypes-body.h: _gen/all.xml \ $(top_srcdir)/tools/glib-gtypes-generator.py $(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \ $< _gen/gtypes Example -_gen/signals-marshal.list: _gen/all.xml \ - $(tools_dir)/glib-signals-marshal-gen.py - $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@ - -_gen/signals-marshal.h: _gen/signals-marshal.list Makefile.am - $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_example_ext_marshal $< > $@ - -_gen/signals-marshal.c: _gen/signals-marshal.list Makefile.am - $(AM_V_GEN){ echo '#include "_gen/signals-marshal.h"' && \ - $(GLIB_GENMARSHAL) --body --prefix=_example_ext_marshal $< ; } > $@ - _gen/register-dbus-glib-marshallers-body.h: _gen/all.xml \ $(tools_dir)/glib-client-marshaller-gen.py $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \ @@ -679,7 +659,11 @@ Example \ $< _gen/enums -_gen/interfaces-body.h _gen/interfaces.h: _gen/all.xml \ +# do nothing, output as a side-effect +_gen/interfaces-body.h: _gen/interfaces.h + @: + +_gen/interfaces.h: _gen/all.xml \ $(tools_dir)/glib-interfaces-gen.py $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \ Example _gen/interfaces-body.h _gen/interfaces.h $< @@ -692,7 +676,11 @@ $(mkdir_p) _gen $(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@ -_gen/cli-connection-body.h _gen/cli-connection.h: _gen/connection.xml \ +# do nothing, output as a side-effect +_gen/cli-connection.h: _gen/cli-connection-body.h + @: + +_gen/cli-connection-body.h: _gen/connection.xml \ $(tools_dir)/glib-client-gen.py Makefile.am $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-gen.py \ --group=connection \ @@ -702,13 +690,16 @@ --tp-proxy-api=0.7.6 \ $< Example_Cli _gen/cli-connection -_gen/svc-connection.c _gen/svc-connection.h: _gen/connection.xml \ +# do nothing, output as a side-effect +_gen/svc-connection.h: _gen/svc-connection.c + @: + +_gen/svc-connection.c: _gen/connection.xml \ $(tools_dir)/glib-ginterface-gen.py $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \ --filename=_gen/svc-connection \ --signal-marshal-prefix=_example_ext \ --include='' \ - --include='"_gen/signals-marshal.h"' \ --not-implemented-func='tp_dbus_g_method_return_not_implemented' \ --allow-unstable \ $< Example_Svc_ diff -Nru telepathy-glib-0.17.5/examples/Makefile.in telepathy-glib-0.17.6/examples/Makefile.in --- telepathy-glib-0.17.5/examples/Makefile.in 2012-02-20 17:31:09.000000000 +0000 +++ telepathy-glib-0.17.6/examples/Makefile.in 2012-03-19 15:34:29.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -50,11 +50,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -519,15 +519,10 @@ installcheck: installcheck-recursive install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru telepathy-glib-0.17.5/INSTALL telepathy-glib-0.17.6/INSTALL --- telepathy-glib-0.17.5/INSTALL 2012-02-01 12:09:16.000000000 +0000 +++ telepathy-glib-0.17.6/INSTALL 2012-01-12 14:34:18.000000000 +0000 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, -Inc. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008, 2009 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -226,11 +226,6 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended diff -Nru telepathy-glib-0.17.5/install-sh telepathy-glib-0.17.6/install-sh --- telepathy-glib-0.17.5/install-sh 2012-02-01 12:09:13.000000000 +0000 +++ telepathy-glib-0.17.6/install-sh 2012-01-12 14:34:15.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2009-04-28.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -156,10 +156,6 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # Protect names problematic for `test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac shift;; -T) no_target_directory=true;; @@ -190,10 +186,6 @@ fi shift # arg dst_arg=$arg - # Protect names problematic for `test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac done fi @@ -208,11 +200,7 @@ fi if test -z "$dir_arg"; then - do_exit='(exit $ret); exit $ret' - trap "ret=129; $do_exit" 1 - trap "ret=130; $do_exit" 2 - trap "ret=141; $do_exit" 13 - trap "ret=143; $do_exit" 15 + trap '(exit $?); exit' 1 2 13 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -240,9 +228,9 @@ for src do - # Protect names problematic for `test' and other utilities. + # Protect names starting with `-'. case $src in - -* | [=\(\)!]) src=./$src;; + -*) src=./$src;; esac if test -n "$dir_arg"; then @@ -264,7 +252,12 @@ echo "$0: no destination specified." >&2 exit 1 fi + dst=$dst_arg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst;; + esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -392,7 +385,7 @@ case $dstdir in /*) prefix='/';; - [-=\(\)!]*) prefix='./';; + -*) prefix='./';; *) prefix='';; esac @@ -410,7 +403,7 @@ for d do - test X"$d" = X && continue + test -z "$d" && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru telepathy-glib-0.17.5/ltmain.sh telepathy-glib-0.17.6/ltmain.sh --- telepathy-glib-0.17.5/ltmain.sh 2012-02-01 12:09:06.000000000 +0000 +++ telepathy-glib-0.17.6/ltmain.sh 2012-01-12 14:34:09.000000000 +0000 @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4.2 +# libtool (GNU libtool) 2.4 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -41,7 +41,6 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) -# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -70,7 +69,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1 +# $progname: (GNU libtool) 2.4 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,9 +79,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1" +VERSION=2.4 TIMESTAMP="" -package_revision=1.3337 +package_revision=1.3293 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -137,10 +136,15 @@ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${EGREP="/bin/grep -E"} +: ${FGREP="/bin/grep -F"} +: ${GREP="/bin/grep"} +: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} +: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -383,7 +387,7 @@ ;; *) save_IFS="$IFS" - IFS=${PATH_SEPARATOR-:} + IFS=: for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -767,8 +771,8 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1048,7 +1052,6 @@ opt_help=false opt_help_all=false opt_silent=: -opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1117,10 +1120,6 @@ opt_silent=false func_append preserve_args " $opt" ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; --no-verbose) opt_verbose=false func_append preserve_args " $opt" @@ -2060,7 +2059,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3202,13 +3201,11 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $tool_oldlib" 'exit $?' + func_show_eval "$old_striplib $oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3473,7 +3470,7 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3985,17 +3982,14 @@ # launches target application with the remaining arguments. func_exec_program () { - case \" \$* \" in - *\\ --lt-*) - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done ;; - esac + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done func_exec_program_core \${1+\"\$@\"} } @@ -5063,15 +5057,9 @@ { EOF func_emit_wrapper yes | - $SED -n -e ' -s/^\(.\{79\}\)\(..*\)/\1\ -\2/ -h -s/\([\\"]\)/\\\1/g -s/$/\\n/ -s/\([^\n]*\).*/ fputs ("\1", f);/p -g -D' + $SED -e 's/\([\\"]\)/\\\1/g' \ + -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' + cat <<"EOF" } EOF @@ -5655,8 +5643,7 @@ continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6124,10 +6111,7 @@ case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -6163,8 +6147,7 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6447,19 +6430,19 @@ # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done continue fi # $pass = conv @@ -6848,7 +6831,7 @@ test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + add_dir="-L$dir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7333,7 +7316,6 @@ # which has an extra 1 added just for fun # case $version_type in - # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7352,9 +7334,6 @@ revision="$number_minor" lt_irix_increment=no ;; - *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" - ;; esac ;; no) @@ -7453,7 +7432,7 @@ versuffix="$major.$revision" ;; - linux) # correct to gnu/linux during the next big refactor + linux) func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8041,11 +8020,6 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. - # FIXME: should test the right _cmds variable. - case $archive_cmds in - *\$LD\ *) wl= ;; - esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8076,7 +8050,7 @@ elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; + *) func_apped perm_rpath " $libdir" ;; esac fi done @@ -8084,7 +8058,11 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" + if test -n "$hardcode_libdir_flag_spec_ld"; then + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + else + eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9174,8 +9152,6 @@ esac done fi - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9285,8 +9261,7 @@ *.la) func_basename "$deplib" name="$func_basename_result" - func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" diff -Nru telepathy-glib-0.17.5/m4/libtool.m4 telepathy-glib-0.17.6/m4/libtool.m4 --- telepathy-glib-0.17.5/m4/libtool.m4 2012-02-01 12:09:06.000000000 +0000 +++ telepathy-glib-0.17.6/m4/libtool.m4 2012-01-12 14:34:09.000000000 +0000 @@ -1,8 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -11,8 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, +# Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -146,8 +146,6 @@ AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl -_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl -dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -639,7 +637,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2011 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -803,7 +801,6 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], - [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -825,31 +822,6 @@ ])# _LT_LANG -m4_ifndef([AC_PROG_GO], [ -############################################################ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_GO. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -############################################################ -m4_defun([AC_PROG_GO], -[AC_LANG_PUSH(Go)dnl -AC_ARG_VAR([GOC], [Go compiler command])dnl -AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl -_AC_ARG_VAR_LDFLAGS()dnl -AC_CHECK_TOOL(GOC, gccgo) -if test -z "$GOC"; then - if test -n "$ac_tool_prefix"; then - AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) - fi -fi -if test -z "$GOC"; then - AC_CHECK_PROG(GOC, gccgo, gccgo, false) -fi -])#m4_defun -])#m4_ifndef - - # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -880,10 +852,6 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) -AC_PROVIDE_IFELSE([AC_PROG_GO], - [LT_LANG(GO)], - [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) - AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -986,13 +954,7 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1000,7 +962,6 @@ rm -rf libconftest.dylib* rm -f conftest.* fi]) - AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -1012,7 +973,6 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) - AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -1030,9 +990,7 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1077,8 +1035,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES([TAG]) -# --------------------------------- +# _LT_DARWIN_LINKER_FEATURES +# -------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1089,8 +1047,6 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], - [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -1374,27 +1330,14 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -*-*solaris*) +sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; + yes*) LD="${LD-ld} -m elf64_sparc" ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1471,13 +1414,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi case $host_os in @@ -1657,11 +1600,6 @@ lt_cv_sys_max_cmd_len=196608 ;; - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -1701,7 +1639,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2247,7 +2185,7 @@ case $host_os in aix3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2256,7 +2194,7 @@ ;; aix[[4-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2321,7 +2259,7 @@ ;; bsdi[[45]]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux 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' @@ -2460,7 +2398,7 @@ ;; dgux*) - version_type=linux # correct to gnu/linux during the next big refactor + 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' @@ -2468,6 +2406,10 @@ shlibpath_var=LD_LIBRARY_PATH ;; +freebsd1*) + dynamic_linker=no + ;; + freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2475,7 +2417,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[23]].*) objformat=aout ;; + freebsd[[123]]*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2493,7 +2435,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2.*) + freebsd2*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2513,18 +2455,17 @@ ;; gnu*) - version_type=linux # correct to gnu/linux during the next big refactor + 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 ;; haiku*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -2585,7 +2526,7 @@ ;; interix[[3-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -2601,7 +2542,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux else version_type=irix fi ;; @@ -2638,9 +2579,9 @@ dynamic_linker=no ;; -# This must be glibc/ELF. +# This must be Linux ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -2669,10 +2610,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 @@ -2684,18 +2629,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 @@ -2715,7 +2648,7 @@ ;; newsos6) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -2784,7 +2717,7 @@ ;; solaris*) - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -2809,7 +2742,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux 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 @@ -2833,7 +2766,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -2864,7 +2797,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor + 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}' @@ -2874,7 +2807,7 @@ ;; uts4*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux 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 @@ -3296,12 +3229,12 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be glibc/ELF. +# This must be Linux ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) 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 @@ -3716,7 +3649,6 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -4113,7 +4045,7 @@ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4301,9 +4233,7 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" - fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' ;; esac else @@ -4395,33 +4325,18 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) + *Sun\ F* | *Sun*Fortran*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; - *Sun\ F* | *Sun*Fortran*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; - *Intel*\ [[CF]]*Compiler*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - *Portland\ Group*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; esac ;; esac @@ -4581,18 +4496,13 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - ;; + cl*) ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4611,6 +4521,7 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -4655,9 +4566,6 @@ openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4864,7 +4772,8 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -4879,7 +4788,7 @@ fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5056,7 +4965,6 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5160,7 +5068,6 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' @@ -5207,6 +5114,10 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; + freebsd1*) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -5219,7 +5130,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) + freebsd2*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5258,6 +5169,7 @@ fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5361,7 +5273,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -5699,6 +5611,9 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], + [[If ld is used when linking, flag to hardcode $libdir into a binary + during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5856,6 +5771,7 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -6225,7 +6141,7 @@ esac ;; - freebsd2.*) + freebsd[[12]]*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6986,18 +6902,12 @@ } }; _LT_EOF -], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF -package foo -func foo() { -} -_LT_EOF ]) _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac dnl Parse the compiler output and extract the necessary @@ -7194,6 +7104,7 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7326,6 +7237,7 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7512,77 +7424,6 @@ ])# _LT_LANG_GCJ_CONFIG -# _LT_LANG_GO_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Go compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GO_CONFIG], -[AC_REQUIRE([LT_PROG_GO])dnl -AC_LANG_SAVE - -# Source file extension for Go test sources. -ac_ext=go - -# Object file extension for compiled Go test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="package main; func main() { }" - -# Code to be used in simple link tests -lt_simple_link_test_code='package main; func main() { }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GOC-"gccgo"} -CFLAGS=$GOFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# Go did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GO_CONFIG - - # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -7652,13 +7493,6 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) -# LT_PROG_GO -# ---------- -AC_DEFUN([LT_PROG_GO], -[AC_CHECK_TOOL(GOC, gccgo,) -]) - - # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], diff -Nru telepathy-glib-0.17.5/m4/ltoptions.m4 telepathy-glib-0.17.6/m4/ltoptions.m4 --- telepathy-glib-0.17.5/m4/ltoptions.m4 2012-02-01 12:09:07.000000000 +0000 +++ telepathy-glib-0.17.6/m4/ltoptions.m4 2012-01-12 14:34:09.000000000 +0000 @@ -326,24 +326,9 @@ # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], + [AS_HELP_STRING([--with-pic], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], + [pic_mode="$withval"], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) diff -Nru telepathy-glib-0.17.5/m4/ltversion.m4 telepathy-glib-0.17.6/m4/ltversion.m4 --- telepathy-glib-0.17.5/m4/ltversion.m4 2012-02-01 12:09:07.000000000 +0000 +++ telepathy-glib-0.17.6/m4/ltversion.m4 2012-01-12 14:34:09.000000000 +0000 @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3337 ltversion.m4 +# serial 3293 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.4]) +m4_define([LT_PACKAGE_REVISION], [1.3293]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.4' +macro_revision='1.3293' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru telepathy-glib-0.17.5/m4/Makefile.in telepathy-glib-0.17.6/m4/Makefile.in --- telepathy-glib-0.17.5/m4/Makefile.in 2012-02-20 17:31:10.000000000 +0000 +++ telepathy-glib-0.17.6/m4/Makefile.in 2012-03-19 15:34:30.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -50,11 +50,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -324,15 +324,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru telepathy-glib-0.17.5/Makefile.in telepathy-glib-0.17.6/Makefile.in --- telepathy-glib-0.17.5/Makefile.in 2012-02-20 17:31:11.000000000 +0000 +++ telepathy-glib-0.17.6/Makefile.in 2012-03-19 15:34:31.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,11 +57,11 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -84,11 +84,9 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - if test -d "$(distdir)"; then \ - find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -rf "$(distdir)" \ - || { sleep 5 && rm -rf "$(distdir)"; }; \ - else :; fi + { test ! -d "$(distdir)" \ + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr "$(distdir)"; }; } am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -117,8 +115,6 @@ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print -am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ - | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -305,7 +301,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: Makefile +am--refresh: @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/tools/lcov.am $(srcdir)/tools/telepathy.am $(am__configure_deps) @for dep in $?; do \ @@ -330,7 +326,6 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/tools/lcov.am $(srcdir)/tools/telepathy.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -342,8 +337,10 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @if test ! -f $@; then \ + rm -f stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ + else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -575,11 +572,7 @@ $(am__remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-lzip: distdir - tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) dist-lzma: distdir @@ -587,7 +580,7 @@ $(am__remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz $(am__remove_distdir) dist-tarZ: distdir @@ -618,8 +611,6 @@ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.lz*) \ - lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -640,7 +631,6 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -669,16 +659,8 @@ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @test -n '$(distuninstallcheck_dir)' || { \ - echo 'ERROR: trying to run $@ with an empty' \ - '$$(distuninstallcheck_dir)' >&2; \ - exit 1; \ - }; \ - $(am__cd) '$(distuninstallcheck_dir)' || { \ - echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ - exit 1; \ - }; \ - test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ + @$(am__cd) '$(distuninstallcheck_dir)' \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -710,15 +692,10 @@ installcheck: installcheck-recursive install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: @@ -807,8 +784,8 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am check-local clean \ clean-generic clean-libtool ctags ctags-recursive dist \ - dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma \ - dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ distclean-generic distclean-hdr distclean-libtool \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ diff -Nru telepathy-glib-0.17.5/NEWS telepathy-glib-0.17.6/NEWS --- telepathy-glib-0.17.5/NEWS 2012-02-20 17:31:02.000000000 +0000 +++ telepathy-glib-0.17.6/NEWS 2012-03-19 15:38:06.000000000 +0000 @@ -1,3 +1,68 @@ +telepathy-glib 0.17.6 (19/03/2012) +================================== + +Requirements: + +• GLib >= 2.30 is now required for telepathy-glib, and for code generated + by tools copied from this version. + +• dbus-glib >= 0.90 is now required. + +Deprecations: + +• tp_connection_is_ready(), tp_connection_call_when_ready, + TpConnection:connection-ready and the TpChannel and TpConnectionManager + equivalents are deprecated. Use tp_proxy_prepare_async() and + tp_proxy_is_ready() instead. For connections, remember to ask for + TP_CONNECTION_FEATURE_CONNECTED if required. + +Enhancements: + +• TpCapabilities: add API to check for Call and FileTransfer support + (Xavier) + +• Use GObject's FFI-based generic marshaller instead of generating our own + marshallers (fd.o #46523, Simon) + +• Add tp_list_connection_managers_async, tp_protocol_dup_params, + tp_protocol_dup_param, tp_protocol_borrow_params, + tp_connection_manager_dup_protocols (Simon) + +• Add accessors for TpAccount properties, parameters and storage identifier + represented as a GVariant (fd.o #30422, Simon) + +• TpCallChannel: add API to put the call on hold. (Olivier) + +• TpCallContentMediaDescription now implements the RTPHeaderExtensions, + RTCPFeedback and RTCPExtendedReports interfaces. (Olivier) + +Fixes: + +• Don't change the direction of Call streams because of a Hold (Olivier) + +• Use the right error when rejecting incompatible codecs (Olivier) + +• Reject local updates to a media description while an offer is pending + (Olivier) + +• Avoid forward-declaring Call classes, fixing compilation on clang, + older gcc, and other compilers not targeting C1x (Simon) + +• Fix namespaces in example_call.manager (George) + +• Produce self-contained header files from glib-interfaces-gen.py + (fd.o #46835, Simon) + +• Correctly implement and document tp_call_channel_has_dtmf() (Xavier) + +• Fix various build failures in out-of-tree or parallel builds, + and don't rebuild everything whenever the documentation changes + (fd.o #36398, Simon) + +• Improve test coverage for the connection manager test (fd.o #46358, Simon) + +• TpCallChannel::state-changed is properly annotate (fdo.o #47410 Guillaume) + telepathy-glib 0.17.5 (2012-02-20) ================================== diff -Nru telepathy-glib-0.17.5/spec/Makefile.in telepathy-glib-0.17.6/spec/Makefile.in --- telepathy-glib-0.17.5/spec/Makefile.in 2012-02-20 17:31:10.000000000 +0000 +++ telepathy-glib-0.17.6/spec/Makefile.in 2012-03-19 15:34:30.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -50,11 +50,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -437,15 +437,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru telepathy-glib-0.17.5/telepathy-glib/abi.am telepathy-glib-0.17.6/telepathy-glib/abi.am --- telepathy-glib-0.17.5/telepathy-glib/abi.am 2012-02-20 16:56:41.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/abi.am 2012-03-19 15:33:56.000000000 +0000 @@ -82,6 +82,7 @@ versions/0.17.2.abi \ versions/0.17.3.abi \ versions/0.17.5.abi \ + versions/0.17.6.abi \ $(NULL) # The quoting here is unnecessary but harmless, and has the useful side-effect diff -Nru telepathy-glib-0.17.5/telepathy-glib/account.c telepathy-glib-0.17.6/telepathy-glib/account.c --- telepathy-glib-0.17.5/telepathy-glib/account.c 2012-02-20 17:31:02.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/account.c 2012-03-19 15:33:56.000000000 +0000 @@ -36,12 +36,12 @@ #define DEBUG_FLAG TP_DEBUG_ACCOUNTS #include "telepathy-glib/connection-internal.h" +#include "telepathy-glib/dbus-internal.h" #include "telepathy-glib/debug-internal.h" #include "telepathy-glib/proxy-internal.h" #include "telepathy-glib/simple-client-factory-internal.h" #include -#include "telepathy-glib/_gen/signals-marshal.h" #include "telepathy-glib/_gen/tp-cli-account-body.h" /** @@ -175,6 +175,7 @@ PROP_NORMALIZED_NAME, PROP_STORAGE_PROVIDER, PROP_STORAGE_IDENTIFIER, + PROP_STORAGE_IDENTIFIER_VARIANT, PROP_STORAGE_RESTRICTIONS, PROP_SUPERSEDES, N_PROPS @@ -1138,6 +1139,10 @@ case PROP_STORAGE_IDENTIFIER: g_value_set_boxed (value, self->priv->storage_identifier); break; + case PROP_STORAGE_IDENTIFIER_VARIANT: + g_value_take_variant (value, + tp_account_dup_storage_identifier_variant (self)); + break; case PROP_STORAGE_RESTRICTIONS: g_value_set_uint (value, self->priv->storage_restrictions); break; @@ -1892,6 +1897,34 @@ G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); /** + * TpAccount:storage-identifier-variant: + * + * Provider-specific information used to identify this + * account. Use g_variant_get_type() to check that the type + * is what you expect. For instance, if you use a + * #TpAccount:storage-provider with numeric identifiers for accounts, + * this variant might have type %G_VARIANT_TYPE_UINT32; + * if the storage provider has string-based identifiers, it should + * have type %G_VARIANT_TYPE_STRING. + * + * This property cannot change once an Account has been created. + * + * This is not guaranteed to have been retrieved until the + * %TP_ACCOUNT_FEATURE_STORAGE feature has been prepared; until then, + * the value is %NULL. + * + * Since: 0.13.2 + */ + g_object_class_install_property (object_class, + PROP_STORAGE_IDENTIFIER_VARIANT, + g_param_spec_variant ("storage-identifier-variant", + "StorageIdentifier as variant", + "The storage identifier for this account", + G_VARIANT_TYPE_ANY, + NULL, + G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); + + /** * TpAccount:storage-restrictions * * The storage restrictions for this account. @@ -1956,8 +1989,7 @@ signals[STATUS_CHANGED] = g_signal_new ("status-changed", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - _tp_marshal_VOID__UINT_UINT_UINT_STRING_BOXED, + 0, NULL, NULL, NULL, G_TYPE_NONE, 5, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_HASH_TABLE); @@ -1975,8 +2007,7 @@ signals[PRESENCE_CHANGED] = g_signal_new ("presence-changed", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - _tp_marshal_VOID__UINT_STRING_STRING, + 0, NULL, NULL, NULL, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING); proxy_class->interface = TP_IFACE_QUARK_ACCOUNT; @@ -2322,6 +2353,36 @@ } /** + * tp_account_dup_parameters_vardict: + * @account: a #TpAccount + * + * Returns the parameters of the account, in a variant of type + * %G_VARIANT_TYPE_VARDICT where the keys + * are parameter names (account, password, require-encryption etc.). + * Use g_variant_lookup() or g_variant_lookup_value() for convenient + * access to the values. + * + * The allowed parameters depend on the connection manager, and can be found + * via tp_connection_manager_get_protocol() and + * tp_connection_manager_protocol_get_param(). Well-known parameters are + * listed + * in + * the Telepathy D-Bus Interface Specification. + * + * Returns: (transfer full): the dictionary of + * parameters on @account, of type %G_VARIANT_TYPE_VARDICT + * + * Since: 0.17.6 + */ +GVariant * +tp_account_dup_parameters_vardict (TpAccount *account) +{ + g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL); + + return _tp_asv_to_vardict (account->priv->parameters); +} + +/** * tp_account_is_enabled: * @account: a #TpAccount * @@ -2691,6 +2752,74 @@ } /** + * tp_account_update_parameters_vardict_async: + * @account: a #TpAccount + * @parameters: (transfer none): a variant of type %G_VARIANT_TYPE_VARDICT + * containing new parameters to set on @account + * @unset_parameters: list of parameters to unset on @account + * @callback: a callback to call when the request is satisfied + * @user_data: data to pass to @callback + * + * Requests an asynchronous update of parameters of @account. When the + * operation is finished, @callback will be called. You can then call + * tp_account_update_parameters_finish() to get the result of the operation. + * + * If @parameters is a floating reference (see g_variant_ref_sink()), + * ownership of @parameters is taken by this function. This means + * you can pass the result of g_variant_new() or g_variant_new_parsed() + * directly to this function without additional reference-count management. + * + * Since: 0.17.6 + */ +void +tp_account_update_parameters_vardict_async (TpAccount *account, + GVariant *parameters, + const gchar **unset_parameters, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GValue v = G_VALUE_INIT; + + g_return_if_fail (parameters != NULL); + g_return_if_fail (g_variant_is_of_type (parameters, G_VARIANT_TYPE_VARDICT)); + + g_variant_ref_sink (parameters); + + dbus_g_value_parse_g_variant (parameters, &v); + g_assert (G_VALUE_HOLDS (&v, TP_HASH_TYPE_STRING_VARIANT_MAP)); + + tp_account_update_parameters_async (account, g_value_get_boxed (&v), + unset_parameters, callback, user_data); + g_value_unset (&v); + g_variant_unref (parameters); +} + +/** + * tp_account_update_parameters_vardict_finish: + * @account: a #TpAccount + * @result: a #GAsyncResult + * @reconnect_required: (out) (type GObject.Strv) (transfer full): a #GStrv to + * fill with properties that need a reconnect to take effect + * @error: a #GError to fill + * + * Finishes an async update of the parameters on @account. + * + * Returns: %TRUE if the request succeeded, otherwise %FALSE + * + * Since: 0.17.6 + */ +gboolean +tp_account_update_parameters_vardict_finish (TpAccount *account, + GAsyncResult *result, + gchar ***reconnect_required, + GError **error) +{ + /* share an implementation with the non-vardict version */ + return tp_account_update_parameters_finish (account, result, + reconnect_required, error); +} + +/** * tp_account_set_display_name_async: * @account: a #TpAccount * @display_name: a new display name, or %NULL to unset the display name @@ -3651,6 +3780,45 @@ } /** + * tp_account_dup_detailed_error_vardict: + * @self: an account + * @details: (out) (allow-none) (transfer full): + * optionally used to return a variant of type %G_VARIANT_TYPE_VARDICT, + * which must be unreffed by the caller with g_variant_unref() + * + * If the account's connection is not connected, return the D-Bus error name + * with which it last disconnected or failed to connect (in particular, this + * is %TP_ERROR_STR_CANCELLED if it was disconnected by a user request). + * This is the same as #TpAccount:connection-error. + * + * If @details is not %NULL, it will be used to return additional details about + * the error (the same as #TpAccount:connection-error-details). + * + * Otherwise, return %NULL, without altering @details. + * + * The returned string and @details may become invalid when the main loop is + * re-entered or the account is destroyed. + * + * Returns: (transfer full) (allow-none): a D-Bus error name, or %NULL. + * + * Since: 0.17.6 + */ +gchar * +tp_account_dup_detailed_error_vardict (TpAccount *self, + GVariant **details) +{ + g_return_val_if_fail (TP_IS_ACCOUNT (self), NULL); + + if (self->priv->connection_status == TP_CONNECTION_STATUS_CONNECTED) + return NULL; + + if (details != NULL) + *details = _tp_asv_to_vardict (self->priv->error_details); + + return g_strdup (self->priv->error); +} + +/** * tp_account_get_storage_provider: * @self: a #TpAccount * @@ -3668,6 +3836,7 @@ return self->priv->storage_provider; } +/* FIXME: in 1.0, remove */ /** * tp_account_get_storage_identifier: * @self: a #TpAccount @@ -3686,6 +3855,31 @@ return self->priv->storage_identifier; } +/* FIXME: in 1.0, rename to tp_account_get_storage_identifier */ +/** + * tp_account_dup_storage_identifier_variant: + * @self: a #TpAccount + * + * Return provider-specific information used to identify this + * account. Use g_variant_get_type() to check that the type + * is what you expect; for instance, if the + * #TpAccount:storage-provider has string-based user identifiers, + * this variant should have type %G_VARIANT_TYPE_STRING. + * + * Returns: (transfer full): the same as the + * #TpAccount:storage-identifier-variant property + * + * Since: 0.13.2 + */ +GVariant * +tp_account_dup_storage_identifier_variant (TpAccount *self) +{ + g_return_val_if_fail (TP_IS_ACCOUNT (self), NULL); + + return g_variant_ref_sink (dbus_g_value_build_g_variant ( + self->priv->storage_identifier)); +} + /** * tp_account_get_storage_restrictions: * @self: a #TpAccount @@ -3730,6 +3924,7 @@ g_object_unref (result); } +/* FIXME: in Telepathy 1.0, remove this */ /** * tp_account_get_storage_specific_information_async: * @self: a #TpAccount @@ -3762,6 +3957,33 @@ _tp_account_get_storage_specific_information_cb, result, NULL, NULL); } +/* FIXME: in Telepathy 1.0, rename to ...get_storage_specific_information... */ +/** + * tp_account_dup_storage_specific_information_vardict_async: + * @self: a #TpAccount + * @callback: a callback to call when the request is satisfied + * @user_data: data to pass to @callback + * + * Makes an asynchronous request of @self's StorageSpecificInformation + * property (part of the Account.Interface.Storage interface). + * + * When the operation is finished, @callback will be called. You must then + * call tp_account_dup_storage_specific_information_vardict_finish() to get the + * result of the request. + * + * Since: 0.17.6 + */ +void +tp_account_dup_storage_specific_information_vardict_async (TpAccount *self, + GAsyncReadyCallback callback, + gpointer user_data) +{ + /* we share an implementation */ + tp_account_get_storage_specific_information_async (self, callback, + user_data); +} + +/* FIXME: in Telepathy 1.0, remove this */ /** * tp_account_get_storage_specific_information_finish: * @self: a #TpAccount @@ -3788,6 +4010,31 @@ tp_account_get_storage_specific_information_async, /* do not copy */); } +/* FIXME: in Telepathy 1.0, rename to ...get_storage_specific_information... */ +/** + * tp_account_dup_storage_specific_information_vardict_finish: + * @self: a #TpAccount + * @result: a #GAsyncResult + * @error: a #GError to fill + * + * Retrieve the value of the request begun with + * tp_account_dup_storage_specific_information_vardict_async(). + * + * Returns: (transfer full): a map from strings to variants, + * of type %G_VARIANT_TYPE_VARDICT + * + * Since: 0.13.2 + */ +GVariant * +tp_account_dup_storage_specific_information_vardict_finish (TpAccount *self, + GAsyncResult *result, + GError **error) +{ + /* we share the source tag with the non-vardict version */ + _tp_implement_finish_return_copy_pointer (self, + tp_account_get_storage_specific_information_async, _tp_asv_to_vardict); +} + static void _tp_account_got_all_addressing_cb (TpProxy *proxy, GHashTable *properties, diff -Nru telepathy-glib-0.17.5/telepathy-glib/account-channel-request.c telepathy-glib-0.17.6/telepathy-glib/account-channel-request.c --- telepathy-glib-0.17.5/telepathy-glib/account-channel-request.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/account-channel-request.c 2012-03-07 11:51:11.000000000 +0000 @@ -87,7 +87,6 @@ #include "telepathy-glib/debug-internal.h" #include "telepathy-glib/deprecated-internal.h" #include "telepathy-glib/simple-client-factory-internal.h" -#include "telepathy-glib/_gen/signals-marshal.h" struct _TpAccountChannelRequestClass { /**/ @@ -440,8 +439,7 @@ "re-handled", G_OBJECT_CLASS_TYPE (cls), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__OBJECT_INT64_OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 3, TP_TYPE_CHANNEL, G_TYPE_INT64, TP_TYPE_HANDLE_CHANNELS_CONTEXT); } diff -Nru telepathy-glib-0.17.5/telepathy-glib/account.h telepathy-glib-0.17.6/telepathy-glib/account.h --- telepathy-glib-0.17.5/telepathy-glib/account.h 2012-02-20 16:57:07.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/account.h 2012-03-12 12:37:25.000000000 +0000 @@ -125,9 +125,13 @@ void tp_account_update_parameters_async (TpAccount *account, GHashTable *parameters, const gchar **unset_parameters, GAsyncReadyCallback callback, gpointer user_data); - gboolean tp_account_update_parameters_finish (TpAccount *account, GAsyncResult *result, gchar ***reconnect_required, GError **error); +void tp_account_update_parameters_vardict_async (TpAccount *account, + GVariant *parameters, const gchar **unset_parameters, + GAsyncReadyCallback callback, gpointer user_data); +gboolean tp_account_update_parameters_vardict_finish (TpAccount *account, + GAsyncResult *result, gchar ***reconnect_required, GError **error); void tp_account_remove_async (TpAccount *account, GAsyncReadyCallback callback, gpointer user_data); @@ -186,6 +190,8 @@ const gchar *tp_account_get_detailed_error (TpAccount *self, const GHashTable **details); +gchar *tp_account_dup_detailed_error_vardict (TpAccount *self, + GVariant **details); TpConnectionPresenceType tp_account_get_current_presence (TpAccount *account, gchar **status, gchar **status_message); @@ -197,6 +203,7 @@ TpAccount *self, gchar **status, gchar **status_message); const GHashTable *tp_account_get_parameters (TpAccount *account); +GVariant *tp_account_dup_parameters_vardict (TpAccount *account); const gchar *tp_account_get_nickname (TpAccount *account); @@ -242,11 +249,20 @@ const gchar *tp_account_get_storage_provider (TpAccount *self); const GValue *tp_account_get_storage_identifier (TpAccount *self); +GVariant *tp_account_dup_storage_identifier_variant (TpAccount *self); TpStorageRestrictionFlags tp_account_get_storage_restrictions (TpAccount *self); void tp_account_get_storage_specific_information_async (TpAccount *self, GAsyncReadyCallback callback, gpointer user_data); GHashTable *tp_account_get_storage_specific_information_finish (TpAccount *self, GAsyncResult *result, GError **error); +void tp_account_dup_storage_specific_information_vardict_async ( + TpAccount *self, + GAsyncReadyCallback callback, + gpointer user_data); +GVariant *tp_account_dup_storage_specific_information_vardict_finish ( + TpAccount *self, + GAsyncResult *result, + GError **error); const gchar * const * /* ugh, gtk-doc */ diff -Nru telepathy-glib-0.17.5/telepathy-glib/account-manager.c telepathy-glib-0.17.6/telepathy-glib/account-manager.c --- telepathy-glib-0.17.5/telepathy-glib/account-manager.c 2012-02-20 16:56:41.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/account-manager.c 2012-03-07 11:51:11.000000000 +0000 @@ -32,7 +32,6 @@ #include #include "telepathy-glib/account-manager.h" -#include "telepathy-glib/_gen/signals-marshal.h" #define DEBUG_FLAG TP_DEBUG_ACCOUNTS #include "telepathy-glib/dbus-internal.h" @@ -600,8 +599,7 @@ G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - _tp_marshal_VOID__OBJECT_BOOLEAN, + NULL, NULL, NULL, G_TYPE_NONE, 2, TP_TYPE_ACCOUNT, G_TYPE_BOOLEAN); @@ -618,8 +616,7 @@ G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, TP_TYPE_ACCOUNT); @@ -640,8 +637,7 @@ G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, TP_TYPE_ACCOUNT); @@ -658,8 +654,7 @@ G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 1, TP_TYPE_ACCOUNT); @@ -679,8 +674,7 @@ G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - _tp_marshal_VOID__UINT_STRING_STRING, + NULL, NULL, NULL, G_TYPE_NONE, 3, G_TYPE_UINT, /* Presence type */ G_TYPE_STRING, /* status */ diff -Nru telepathy-glib-0.17.5/telepathy-glib/base-call-content.c telepathy-glib-0.17.6/telepathy-glib/base-call-content.c --- telepathy-glib-0.17.5/telepathy-glib/base-call-content.c 2012-02-20 17:31:02.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/base-call-content.c 2012-03-12 12:37:25.000000000 +0000 @@ -139,6 +139,7 @@ #include "telepathy-glib/svc-call.h" #include "telepathy-glib/svc-generic.h" #include "telepathy-glib/util.h" +#include "telepathy-glib/util-internal.h" static void call_content_iface_init (gpointer g_iface, gpointer iface_data); static void call_content_dtmf_iface_init (gpointer g_iface, @@ -216,12 +217,6 @@ } static void -stream_list_destroy (GList *streams) -{ - g_list_free_full (streams, g_object_unref); -} - -static void tp_base_call_content_deinit_real (TpBaseCallContent *self) { TpDBusDaemon *bus = tp_base_connection_get_dbus_daemon ( @@ -229,7 +224,7 @@ tp_dbus_daemon_unregister_object (bus, G_OBJECT (self)); - tp_clear_pointer (&self->priv->streams, stream_list_destroy); + tp_clear_pointer (&self->priv->streams, _tp_object_list_free); } static GPtrArray * @@ -248,7 +243,7 @@ g_assert (self->priv->deinit_has_run); - tp_clear_pointer (&self->priv->streams, stream_list_destroy); + tp_clear_pointer (&self->priv->streams, _tp_object_list_free); g_object_notify (G_OBJECT (self), "streams"); tp_clear_object (&self->priv->conn); diff -Nru telepathy-glib-0.17.5/telepathy-glib/base-call-content.h telepathy-glib-0.17.6/telepathy-glib/base-call-content.h --- telepathy-glib-0.17.5/telepathy-glib/base-call-content.h 2012-02-20 16:56:41.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/base-call-content.h 2012-02-22 11:48:01.000000000 +0000 @@ -31,9 +31,6 @@ G_BEGIN_DECLS -/* forward declaration */ -typedef struct _TpBaseCallChannel TpBaseCallChannel; - typedef struct _TpBaseCallContent TpBaseCallContent; typedef struct _TpBaseCallContentPrivate TpBaseCallContentPrivate; typedef struct _TpBaseCallContentClass TpBaseCallContentClass; diff -Nru telepathy-glib-0.17.5/telepathy-glib/base-call-internal.h telepathy-glib-0.17.6/telepathy-glib/base-call-internal.h --- telepathy-glib-0.17.5/telepathy-glib/base-call-internal.h 2012-02-20 16:56:41.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/base-call-internal.h 2012-03-16 15:28:32.000000000 +0000 @@ -22,20 +22,18 @@ #ifndef __TP_BASE_CALL_INTERNAL_H__ #define __TP_BASE_CALL_INTERNAL_H__ +#include +#include +#include #include +#include +#include +#include +#include +#include G_BEGIN_DECLS -/* Forward declaration */ -typedef struct _TpBaseCallChannel TpBaseCallChannel; -typedef struct _TpBaseCallContent TpBaseCallContent; -typedef struct _TpBaseCallStream TpBaseCallStream; -typedef struct _TpCallContentMediaDescription TpCallContentMediaDescription; -typedef struct _TpBaseMediaCallChannel TpBaseMediaCallChannel; -typedef struct _TpBaseMediaCallContent TpBaseMediaCallContent; -typedef struct _TpBaseMediaCallStream TpBaseMediaCallStream; -typedef struct _TpCallStreamEndpoint TpCallStreamEndpoint; - /* Implemented in base-call-content.c */ void _tp_base_call_content_set_channel (TpBaseCallContent *self, TpBaseCallChannel *channel); @@ -88,10 +86,10 @@ void _tp_base_media_call_channel_endpoint_state_changed ( TpBaseMediaCallChannel *self); gboolean _tp_base_media_channel_is_held (TpBaseMediaCallChannel *self); -void _tp_base_media_call_channel_streams_sending_state_changed ( +gboolean _tp_base_media_call_channel_streams_sending_state_changed ( TpBaseMediaCallChannel *self, gboolean success); -void _tp_base_media_call_channel_streams_receiving_state_changed ( +gboolean _tp_base_media_call_channel_streams_receiving_state_changed ( TpBaseMediaCallChannel *self, gboolean success); diff -Nru telepathy-glib-0.17.5/telepathy-glib/base-call-stream.c telepathy-glib-0.17.6/telepathy-glib/base-call-stream.c --- telepathy-glib-0.17.5/telepathy-glib/base-call-stream.c 2012-02-20 17:31:02.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/base-call-stream.c 2012-03-19 15:33:56.000000000 +0000 @@ -125,6 +125,8 @@ { PROP_OBJECT_PATH = 1, PROP_CONNECTION, + PROP_CONTENT, + PROP_CHANNEL, /* Call interface properties */ PROP_INTERFACES, @@ -225,6 +227,12 @@ case PROP_OBJECT_PATH: g_value_set_string (value, self->priv->object_path); break; + case PROP_CONTENT: + g_value_set_object (value, self->priv->content); + break; + case PROP_CHANNEL: + g_value_set_object (value, self->priv->channel); + break; case PROP_REMOTE_MEMBERS: g_value_set_boxed (value, self->priv->remote_members); break; @@ -277,6 +285,13 @@ self->priv->conn = g_value_dup_object (value); g_assert (self->priv->conn != NULL); break; + case PROP_CONTENT: + { + TpBaseCallContent *content = g_value_get_object (value); + if (content) + _tp_base_call_stream_set_content (self, content); + } + break; case PROP_OBJECT_PATH: g_free (self->priv->object_path); self->priv->object_path = g_value_dup_string (value); @@ -349,6 +364,32 @@ g_object_class_install_property (object_class, PROP_OBJECT_PATH, param_spec); /** + * TpBaseCallStream:content: + * + * #TpBaseCallContent object that owns this call stream. + * + * Since: 0.17.6 + */ + param_spec = g_param_spec_object ("content", "TpBaseCallContent object", + "Tp Content object that owns this call stream", + TP_TYPE_BASE_CALL_CONTENT, + G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + g_object_class_install_property (object_class, PROP_CONTENT, param_spec); + + /** + * TpBaseCallStream:channel: + * + * #TpBaseChannel object that owns this call stream. + * + * Since: 0.17.5 + */ + param_spec = g_param_spec_object ("channel", "TpBaseCallChannel object", + "Tp base call channel object that owns this call stream", + TP_TYPE_BASE_CALL_CHANNEL, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_object_class_install_property (object_class, PROP_CHANNEL, param_spec); + + /** * TpBaseCallStream:interfaces: * * Additional interfaces implemented by this stream. @@ -592,7 +633,8 @@ const gchar *dbus_reason, const gchar *message) { - gpointer state_p; + gpointer old_state_p = NULL; + TpSendingState old_state; gboolean exists; GHashTable *updates; GHashTable *identifiers; @@ -608,13 +650,14 @@ new_state = TP_SENDING_STATE_PENDING_SEND; exists = g_hash_table_lookup_extended (self->priv->remote_members, - GUINT_TO_POINTER (contact), NULL, &state_p); + GUINT_TO_POINTER (contact), NULL, &old_state_p); + old_state = GPOINTER_TO_UINT (old_state_p); - if (exists && GPOINTER_TO_UINT (state_p) == new_state) + if (exists && old_state == new_state) return FALSE; DEBUG ("Updating remote member %d state: %d => %d for stream %s", - contact, GPOINTER_TO_UINT (state_p), new_state, self->priv->object_path); + contact, old_state, new_state, self->priv->object_path); g_hash_table_insert (self->priv->remote_members, GUINT_TO_POINTER (contact), @@ -807,10 +850,14 @@ { g_return_if_fail (TP_IS_BASE_CALL_STREAM (self)); g_return_if_fail (TP_IS_BASE_CALL_CONTENT (content)); - g_return_if_fail (self->priv->content == NULL); + g_return_if_fail (self->priv->content == NULL || + self->priv->content == content); self->priv->content = content; self->priv->channel = _tp_base_call_content_get_channel (content); + + g_object_notify (G_OBJECT (self), "content"); + g_object_notify (G_OBJECT (self), "channel"); } TpBaseCallContent * diff -Nru telepathy-glib-0.17.5/telepathy-glib/base-call-stream.h telepathy-glib-0.17.6/telepathy-glib/base-call-stream.h --- telepathy-glib-0.17.5/telepathy-glib/base-call-stream.h 2012-02-20 16:56:41.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/base-call-stream.h 2012-02-22 11:48:01.000000000 +0000 @@ -30,8 +30,6 @@ G_BEGIN_DECLS -typedef struct _TpBaseCallChannel TpBaseCallChannel; - typedef struct _TpBaseCallStream TpBaseCallStream; typedef struct _TpBaseCallStreamPrivate TpBaseCallStreamPrivate; typedef struct _TpBaseCallStreamClass TpBaseCallStreamClass; diff -Nru telepathy-glib-0.17.5/telepathy-glib/base-client.c telepathy-glib-0.17.6/telepathy-glib/base-client.c --- telepathy-glib-0.17.5/telepathy-glib/base-client.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/base-client.c 2012-03-07 11:51:11.000000000 +0000 @@ -202,7 +202,6 @@ #include "telepathy-glib/debug-internal.h" #include "telepathy-glib/deprecated-internal.h" #include "telepathy-glib/simple-client-factory-internal.h" -#include "telepathy-glib/_gen/signals-marshal.h" #include "telepathy-glib/util-internal.h" static void observer_iface_init (gpointer, gpointer); @@ -1511,8 +1510,7 @@ "request-added", G_OBJECT_CLASS_TYPE (cls), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__OBJECT_OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 2, TP_TYPE_ACCOUNT, TP_TYPE_CHANNEL_REQUEST); @@ -1535,8 +1533,7 @@ "request-removed", G_OBJECT_CLASS_TYPE (cls), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__OBJECT_STRING_STRING, + NULL, NULL, NULL, G_TYPE_NONE, 3, TP_TYPE_CHANNEL_REQUEST, G_TYPE_STRING, G_TYPE_STRING); diff -Nru telepathy-glib-0.17.5/telepathy-glib/base-connection.c telepathy-glib-0.17.6/telepathy-glib/base-connection.c --- telepathy-glib-0.17.5/telepathy-glib/base-connection.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/base-connection.c 2012-03-07 11:51:11.000000000 +0000 @@ -1637,8 +1637,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); /** @@ -1661,8 +1660,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - g_cclosure_marshal_VOID__STRING, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING); /** @@ -1686,8 +1684,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - g_cclosure_marshal_VOID__STRING, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING); tp_dbus_properties_mixin_class_init (object_class, 0); diff -Nru telepathy-glib-0.17.5/telepathy-glib/base-connection-manager.c telepathy-glib-0.17.6/telepathy-glib/base-connection-manager.c --- telepathy-glib-0.17.5/telepathy-glib/base-connection-manager.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/base-connection-manager.c 2012-03-07 11:51:11.000000000 +0000 @@ -533,8 +533,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); tp_dbus_properties_mixin_class_init (object_class, 0); diff -Nru telepathy-glib-0.17.5/telepathy-glib/base-media-call-channel.c telepathy-glib-0.17.6/telepathy-glib/base-media-call-channel.c --- telepathy-glib-0.17.5/telepathy-glib/base-media-call-channel.c 2012-02-20 17:31:02.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/base-media-call-channel.c 2012-03-19 15:33:56.000000000 +0000 @@ -552,24 +552,59 @@ } } -void +gboolean _tp_base_media_call_channel_streams_sending_state_changed ( TpBaseMediaCallChannel *self, gboolean success) { + gboolean was_unholding = + (self->priv->hold_state == TP_LOCAL_HOLD_STATE_PENDING_UNHOLD); + if (success) update_hold_state (self); else hold_change_failed (self); + + return was_unholding; } -void +gboolean _tp_base_media_call_channel_streams_receiving_state_changed ( TpBaseMediaCallChannel *self, gboolean success) { + gboolean was_unholding = + (self->priv->hold_state == TP_LOCAL_HOLD_STATE_PENDING_UNHOLD); + if (success) update_hold_state (self); else hold_change_failed (self); + + return was_unholding; +} + +/** + * tp_base_media_call_channel_get_local_hold_state: + * @channel: a #TpBaseMediaCallChannel + * @reason: pointer to a location where to store the @reason, or %NULL + * + * + * + * Returns: The current hold state + * + * Since: 0.17.6 + */ + +TpLocalHoldState +tp_base_media_call_channel_get_local_hold_state ( + TpBaseMediaCallChannel *channel, TpLocalHoldStateReason *reason) +{ + g_return_val_if_fail (TP_IS_BASE_MEDIA_CALL_CHANNEL (channel), + TP_LOCAL_HOLD_STATE_UNHELD); + + if (reason) + *reason = channel->priv->hold_state_reason; + + return channel->priv->hold_state; } diff -Nru telepathy-glib-0.17.5/telepathy-glib/base-media-call-channel.h telepathy-glib-0.17.6/telepathy-glib/base-media-call-channel.h --- telepathy-glib-0.17.5/telepathy-glib/base-media-call-channel.h 2012-02-20 16:56:41.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/base-media-call-channel.h 2012-03-16 15:28:32.000000000 +0000 @@ -74,6 +74,9 @@ TP_TYPE_BASE_MEDIA_CALL_CHANNEL, TpBaseMediaCallChannelClass)) +TpLocalHoldState tp_base_media_call_channel_get_local_hold_state ( + TpBaseMediaCallChannel *channel, TpLocalHoldStateReason *reason); + G_END_DECLS #endif /* #ifndef __TP_BASE_MEDIA_CALL_CHANNEL_H__*/ diff -Nru telepathy-glib-0.17.5/telepathy-glib/base-media-call-content.c telepathy-glib-0.17.6/telepathy-glib/base-media-call-content.c --- telepathy-glib-0.17.5/telepathy-glib/base-media-call-content.c 2012-02-20 17:31:02.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/base-media-call-content.c 2012-03-07 11:51:11.000000000 +0000 @@ -72,7 +72,6 @@ #include "telepathy-glib/svc-properties-interface.h" #include "telepathy-glib/util.h" #include "telepathy-glib/util-internal.h" -#include "telepathy-glib/_gen/signals-marshal.h" #define DTMF_PAUSE_MS (3000) @@ -453,8 +452,7 @@ "local-media-description-updated", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - _tp_marshal_VOID__UINT_BOXED, + 0, NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_HASH_TABLE); @@ -728,6 +726,16 @@ return; } + if (self->priv->current_offer != NULL && + tp_call_content_media_description_get_remote_contact (self->priv->current_offer) == GPOINTER_TO_UINT (contact)) + { + GError error = { TP_ERRORS, TP_ERROR_NOT_AVAILABLE, + "Can not update the media description while there is" + " an outstanding offer for this contact." }; + dbus_g_method_return_error (context, &error); + return; + } + set_local_properties (self, GPOINTER_TO_UINT (contact), properties); tp_svc_call_content_interface_media_return_from_update_local_media_description diff -Nru telepathy-glib-0.17.5/telepathy-glib/base-media-call-stream.c telepathy-glib-0.17.6/telepathy-glib/base-media-call-stream.c --- telepathy-glib-0.17.5/telepathy-glib/base-media-call-stream.c 2012-02-20 17:31:02.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/base-media-call-stream.c 2012-03-16 15:28:32.000000000 +0000 @@ -161,6 +161,7 @@ #include "telepathy-glib/svc-properties-interface.h" #include "telepathy-glib/svc-call.h" #include "telepathy-glib/util.h" +#include "telepathy-glib/util-internal.h" static void call_stream_media_iface_init (gpointer, gpointer); @@ -209,6 +210,9 @@ gboolean local_sending; gboolean remotely_held; + gboolean sending_stop_requested; + gboolean sending_failure; + gboolean receiving_failure; }; static GPtrArray *tp_base_media_call_stream_get_interfaces ( @@ -238,12 +242,10 @@ g_signal_connect (self, "notify::remote-members", G_CALLBACK (tp_base_media_call_stream_update_receiving_state), NULL); -} - -static void -endpoints_list_destroy (GList *endpoints) -{ - g_list_free_full (endpoints, g_object_unref); + g_signal_connect (self, "notify::channel", + G_CALLBACK (tp_base_media_call_stream_update_receiving_state), NULL); + g_signal_connect (self, "notify::channel", + G_CALLBACK (tp_base_media_call_stream_update_sending_state), NULL); } static void @@ -251,7 +253,7 @@ { TpBaseMediaCallStream *self = TP_BASE_MEDIA_CALL_STREAM (object); - tp_clear_pointer (&self->priv->endpoints, endpoints_list_destroy); + tp_clear_pointer (&self->priv->endpoints, _tp_object_list_free); if (G_OBJECT_CLASS (tp_base_media_call_stream_parent_class)->dispose) G_OBJECT_CLASS (tp_base_media_call_stream_parent_class)->dispose (object); @@ -844,9 +846,15 @@ goto done; } + if (!tp_base_call_channel_is_accepted (TP_BASE_CALL_CHANNEL (channel))) + goto done; + if (self->priv->remotely_held) goto done; + if (self->priv->sending_failure) + goto done; + sending = self->priv->local_sending; done: @@ -951,6 +959,9 @@ if (channel == NULL || !_tp_base_call_channel_is_locally_accepted (channel)) goto done; + if (self->priv->receiving_failure) + goto done; + if (TP_IS_BASE_MEDIA_CALL_CHANNEL (channel)) { TpBaseMediaCallChannel *mediachan = TP_BASE_MEDIA_CALL_CHANNEL (channel); @@ -1049,6 +1060,8 @@ if (self->priv->sending_state == TP_STREAM_FLOW_STATE_STOPPED && klass->set_sending != NULL) return klass->set_sending (self, sending, error); + else + self->priv->sending_stop_requested = TRUE; } return TRUE; @@ -1160,9 +1173,12 @@ TP_BASE_MEDIA_CALL_CHANNEL (channel), TRUE); if (state == TP_STREAM_FLOW_STATE_STOPPED && - klass->set_sending != NULL) + klass->set_sending != NULL && + self->priv->sending_stop_requested) klass->set_sending (self, FALSE, NULL); + self->priv->sending_stop_requested = FALSE; + tp_svc_call_stream_interface_media_emit_sending_state_changed (self, state); tp_svc_call_stream_interface_media_return_from_complete_sending_state_change (context); @@ -1182,24 +1198,29 @@ TpStreamFlowState old_state = self->priv->sending_state; TpBaseCallChannel *channel = _tp_base_call_stream_get_channel ( TP_BASE_CALL_STREAM (self)); + gboolean was_unholding = FALSE; if (self->priv->sending_state == TP_STREAM_FLOW_STATE_STOPPED) goto done; + self->priv->sending_failure = TRUE; + self->priv->sending_stop_requested = FALSE; self->priv->sending_state = TP_STREAM_FLOW_STATE_STOPPED; - g_object_notify (G_OBJECT (self), "sending-state"); if (channel != NULL && TP_IS_BASE_MEDIA_CALL_CHANNEL (channel)) - _tp_base_media_call_channel_streams_sending_state_changed ( + was_unholding = _tp_base_media_call_channel_streams_sending_state_changed ( TP_BASE_MEDIA_CALL_CHANNEL (channel), FALSE); - if (klass->report_sending_failure != NULL) + if (klass->report_sending_failure != NULL && !was_unholding) klass->report_sending_failure (self, old_state, reason, dbus_reason, message); + g_object_notify (G_OBJECT (self), "sending-state"); tp_svc_call_stream_interface_media_emit_sending_state_changed (self, self->priv->sending_state); + self->priv->sending_failure = FALSE; + done: tp_svc_call_stream_interface_media_return_from_report_sending_failure ( context); @@ -1266,6 +1287,7 @@ TpStreamFlowState old_state = self->priv->receiving_state; TpBaseCallChannel *channel = _tp_base_call_stream_get_channel ( TP_BASE_CALL_STREAM (self)); + gboolean was_unholding = FALSE; /* Clear all receving requests, we can't receive */ tp_intset_clear (self->priv->receiving_requests); @@ -1274,19 +1296,23 @@ goto done; self->priv->receiving_state = TP_STREAM_FLOW_STATE_STOPPED; + self->priv->receiving_failure = TRUE; g_object_notify (G_OBJECT (self), "receiving-state"); if (channel != NULL && TP_IS_BASE_MEDIA_CALL_CHANNEL (channel)) - _tp_base_media_call_channel_streams_receiving_state_changed ( - TP_BASE_MEDIA_CALL_CHANNEL (channel), FALSE); + was_unholding = + _tp_base_media_call_channel_streams_receiving_state_changed ( + TP_BASE_MEDIA_CALL_CHANNEL (channel), FALSE); - if (klass->report_receiving_failure != NULL) + if (klass->report_receiving_failure != NULL && !was_unholding) klass->report_receiving_failure (self, old_state, reason, dbus_reason, message); tp_svc_call_stream_interface_media_emit_receiving_state_changed (self, self->priv->receiving_state); + self->priv->receiving_failure = FALSE; + done: tp_svc_call_stream_interface_media_return_from_report_receiving_failure ( context); diff -Nru telepathy-glib-0.17.5/telepathy-glib/base-password-channel.c telepathy-glib-0.17.6/telepathy-glib/base-password-channel.c --- telepathy-glib-0.17.5/telepathy-glib/base-password-channel.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/base-password-channel.c 2012-03-07 11:51:11.000000000 +0000 @@ -65,8 +65,6 @@ #define DEBUG_FLAG TP_DEBUG_SASL #include "telepathy-glib/debug-internal.h" -#include "telepathy-glib/_gen/signals-marshal.h" - static void sasl_auth_iface_init (gpointer g_iface, gpointer iface_data); G_DEFINE_TYPE_WITH_CODE (TpBasePasswordChannel, tp_base_password_channel, @@ -405,8 +403,7 @@ G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - _tp_marshal_VOID__BOXED_UINT_INT_STRING, + NULL, NULL, NULL, G_TYPE_NONE, 4, G_TYPE_GSTRING, G_TYPE_UINT, G_TYPE_INT, G_TYPE_STRING); diff -Nru telepathy-glib-0.17.5/telepathy-glib/call-channel.c telepathy-glib-0.17.6/telepathy-glib/call-channel.c --- telepathy-glib-0.17.5/telepathy-glib/call-channel.c 2012-02-20 17:31:02.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/call-channel.c 2012-03-19 15:33:56.000000000 +0000 @@ -65,7 +65,6 @@ #include "telepathy-glib/debug-internal.h" #include "telepathy-glib/proxy-internal.h" #include "telepathy-glib/util-internal.h" -#include "telepathy-glib/_gen/signals-marshal.h" G_DEFINE_TYPE (TpCallChannel, tp_call_channel, TP_TYPE_CHANNEL) @@ -85,10 +84,13 @@ gchar *initial_audio_name; gchar *initial_video_name; gboolean mutable_contents; + TpLocalHoldState hold_state; + TpLocalHoldStateReason hold_state_reason; GSimpleAsyncResult *core_result; gboolean properties_retrieved; gboolean initial_members_retrieved; + gboolean hold_state_retrieved; }; enum /* props */ @@ -104,6 +106,8 @@ PROP_INITIAL_AUDIO_NAME, PROP_INITIAL_VIDEO_NAME, PROP_MUTABLE_CONTENTS, + PROP_HOLD_STATE, + PROP_HOLD_STATE_REASON, }; enum /* signals */ @@ -127,6 +131,7 @@ "dbus-connection", tp_proxy_get_dbus_connection (self), "object-path", object_path, "connection", tp_channel_borrow_connection ((TpChannel *) self), + "channel", self, NULL); } @@ -390,6 +395,22 @@ TpCallStateReason *reason; } UpdateCallMembersData; + +static void +channel_maybe_core_prepared (TpCallChannel *self) +{ + if (self->priv->core_result == NULL) + return; + + if (self->priv->initial_members_retrieved && + self->priv->properties_retrieved && + self->priv->hold_state_retrieved) + { + g_simple_async_result_complete (self->priv->core_result); + g_clear_object (&self->priv->core_result); + } +} + static void update_call_members_prepared_cb (GObject *object, GAsyncResult *result, @@ -424,9 +445,7 @@ { self->priv->initial_members_retrieved = TRUE; - g_assert (self->priv->core_result != NULL); - g_simple_async_result_complete (self->priv->core_result); - g_clear_object (&self->priv->core_result); + channel_maybe_core_prepared (self); } else { @@ -566,7 +585,47 @@ } /* core_result will be complete in update_call_members_prepared_cb() when - * the initial members are prepared. */ + * the initial members are prepared or when the hold state is retrived. */ +} + +static void +hold_state_changed_cb (TpChannel *proxy, + guint arg_HoldState, + guint arg_Reason, + gpointer user_data, GObject *weak_object) +{ + TpCallChannel *self = TP_CALL_CHANNEL (proxy); + + if (!self->priv->hold_state_retrieved) + return; + + self->priv->hold_state = arg_HoldState; + self->priv->hold_state_reason = arg_Reason; + + g_object_notify (G_OBJECT (proxy), "hold-state"); + g_object_notify (G_OBJECT (proxy), "hold-state-reason"); +} + +static void +got_hold_state_cb (TpChannel *proxy, guint arg_HoldState, guint arg_Reason, + const GError *error, gpointer user_data, GObject *weak_object) +{ + TpCallChannel *self = TP_CALL_CHANNEL (proxy); + + if (error != NULL) + { + DEBUG ("Could not get the call channel hold state: %s", error->message); + g_simple_async_result_set_from_error (self->priv->core_result, error); + g_simple_async_result_complete (self->priv->core_result); + g_clear_object (&self->priv->core_result); + return; + } + + self->priv->hold_state = arg_HoldState; + self->priv->hold_state_reason = arg_Reason; + self->priv->hold_state_retrieved = TRUE; + + channel_maybe_core_prepared (self); } static void @@ -594,6 +653,16 @@ tp_cli_dbus_properties_call_get_all (self, -1, TP_IFACE_CHANNEL_TYPE_CALL, got_all_properties_cb, NULL, NULL, NULL); + + if (tp_proxy_has_interface_by_id (proxy, + TP_IFACE_QUARK_CHANNEL_INTERFACE_HOLD)) + { + tp_cli_channel_interface_hold_connect_to_hold_state_changed (channel, + hold_state_changed_cb, NULL, NULL, NULL, NULL); + + tp_cli_channel_interface_hold_call_get_hold_state (channel, -1, + got_hold_state_cb, NULL, NULL, NULL); + } } static void @@ -696,7 +765,15 @@ g_value_set_boolean (value, self->priv->mutable_contents); break; - default: + case PROP_HOLD_STATE: + g_value_set_uint (value, self->priv->hold_state); + break; + + case PROP_HOLD_STATE_REASON: + g_value_set_uint (value, self->priv->hold_state_reason); + break; + + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; } @@ -795,7 +872,8 @@ /** * TpCallChannel:state-details: * - * Detailed information about #TpCallChannel:state. + * Detailed infoermation about #TpCallChannel:state. It is a #GHashTable + * mapping gchar*->GValue, it can be accessed using the tp_asv_* functions. * * Since: 0.17.5 */ @@ -906,6 +984,36 @@ g_object_class_install_property (gobject_class, PROP_MUTABLE_CONTENTS, param_spec); + + /** + * TpCallChannel:hold-state: + * + * A #TpLocalHoldState specifying if the Call is currently held + * + * Since: 0.17.6 + */ + param_spec = g_param_spec_uint ("hold-state", "Hold State", + "The Hold state of the call", + 0, G_MAXUINT, TP_LOCAL_HOLD_STATE_UNHELD, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_object_class_install_property (gobject_class, PROP_HOLD_STATE, param_spec); + + + /** + * TpCallChannel:hold-state-reason: + * + * A #TpLocalHoldStateReason specifying why the Call is currently held. + * + * Since: 0.17.6 + */ + param_spec = g_param_spec_uint ("hold-state-reason", "Hold State Reason", + "The reason for the current hold state", + 0, G_MAXUINT, TP_LOCAL_HOLD_STATE_REASON_NONE, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_object_class_install_property (gobject_class, PROP_HOLD_STATE_REASON, + param_spec); + + /** * TpCallChannel::content-added * @self: the #TpCallChannel @@ -922,8 +1030,7 @@ _signals[CONTENT_ADDED] = g_signal_new ("content-added", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_OBJECT); @@ -944,8 +1051,7 @@ _signals[CONTENT_REMOVED] = g_signal_new ("content-removed", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - _tp_marshal_VOID__OBJECT_BOXED, + 0, NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_OBJECT, TP_TYPE_CALL_STATE_REASON); @@ -955,7 +1061,8 @@ * @state: the new #TpCallState * @flags: the new #TpCallFlags * @reason: the #TpCallStateReason for the change - * @details: additional details + * @details: (element-type utf8 GObject.Value): additional details as a + * #GHashTable readable using the tp_asv_* functions. * * The ::state-changed signal is emitted whenever the * call state changes. @@ -965,8 +1072,7 @@ _signals[STATE_CHANGED] = g_signal_new ("state-changed", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - _tp_marshal_VOID__UINT_UINT_BOXED_BOXED, + 0, NULL, NULL, NULL, G_TYPE_NONE, 4, G_TYPE_UINT, G_TYPE_UINT, TP_TYPE_CALL_STATE_REASON, G_TYPE_HASH_TABLE); @@ -992,8 +1098,7 @@ _signals[MEMBERS_CHANGED] = g_signal_new ("members-changed", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - _tp_marshal_VOID__BOXED_BOXED_BOXED, + 0, NULL, NULL, NULL, G_TYPE_NONE, 3, G_TYPE_HASH_TABLE, G_TYPE_PTR_ARRAY, TP_TYPE_CALL_STATE_REASON); } @@ -1208,19 +1313,53 @@ * tp_call_channel_has_dtmf: * @self: a #TpCallChannel * - * Whether or not %self has the %TP_IFACE_CHANNEL_INTERFACE_DTMF - * interfaces + * Whether or not %self can send DTMF tones using + * tp_call_channel_send_tones_async(). To be able to send DTMF tones, at least + * one of @self's #TpCallChannel:contents must implement + * %TP_IFACE_CALL_CONTENT_INTERFACE_DTMF interface. * - * Returns: whether or not @self supports DTMF + * Returns: whether or not @self can send DTMF tones. * Since: 0.17.5 */ gboolean tp_call_channel_has_dtmf (TpCallChannel *self) { + guint i; + + g_return_val_if_fail (TP_IS_CALL_CHANNEL (self), FALSE); + + for (i = 0; i < self->priv->contents->len; i++) + { + TpCallContent *content = g_ptr_array_index (self->priv->contents, i); + + if (tp_proxy_has_interface_by_id (content, + TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_DTMF)) + return TRUE; + } + + return FALSE; +} + + +/** + * tp_call_channel_has_hold: + * @self: a #TpCallChannel + * + * Whether or not %self has the %TP_IFACE_CHANNEL_INTERFACE_HOLD + * interfaces + * + * Returns: whether or not @self supports Hold + * Since: 0.17.6 + */ +gboolean +tp_call_channel_has_hold (TpCallChannel *self) +{ g_return_val_if_fail (TP_IS_CALL_CHANNEL (self), FALSE); + g_return_val_if_fail ( + tp_proxy_is_prepared (self, TP_CALL_CHANNEL_FEATURE_CORE), FALSE); return tp_proxy_has_interface_by_id (self, - TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF); + TP_IFACE_QUARK_CHANNEL_INTERFACE_HOLD); } static void @@ -1398,8 +1537,8 @@ void tp_call_channel_hangup_async (TpCallChannel *self, TpCallStateChangeReason reason, - gchar *detailed_reason, - gchar *message, + const gchar *detailed_reason, + const gchar *message, GAsyncReadyCallback callback, gpointer user_data) { @@ -1476,7 +1615,7 @@ */ void tp_call_channel_add_content_async (TpCallChannel *self, - gchar *name, + const gchar *name, TpMediaStreamType type, TpMediaStreamDirection initial_direction, GAsyncReadyCallback callback, @@ -1568,6 +1707,7 @@ guint count = 0; g_return_if_fail (TP_IS_CALL_CHANNEL (self)); + g_return_if_fail (tp_call_channel_has_dtmf (self)); result = g_simple_async_result_new (G_OBJECT (self), callback, user_data, tp_call_channel_send_tones_async); @@ -1585,18 +1725,9 @@ send_tones_cb, g_object_ref (result)); } - if (count == 0) - { - g_simple_async_result_set_error (result, - TP_ERRORS, TP_ERROR_NOT_CAPABLE, - "Channel has no content implementing DTMF interface"); - g_simple_async_result_complete_in_idle (result); - } - else - { - g_simple_async_result_set_op_res_gpointer (result, - GUINT_TO_POINTER (count), NULL); - } + g_assert (count > 0); + g_simple_async_result_set_op_res_gpointer (result, + GUINT_TO_POINTER (count), NULL); g_object_unref (result); } @@ -1619,3 +1750,67 @@ { _tp_implement_finish_void (self, tp_call_channel_send_tones_async) } + +/** + * tp_call_channel_request_hold_async: + * @self: a #TpCallChannel + * @hold: Whether to request a hold or a unhold + * @callback: a callback to call when the operation finishes + * @user_data: data to pass to @callback + * + * Requests that the connection manager holds or unholds the call. Watch + * #TpCallChannel::hold-state property to know when the channel goes on + * hold or is unheld. Unholding may fail if the streaming implementation + * can not obtain all the resources needed to restart the call. + * + * Since: 0.17.6 + */ + +void +tp_call_channel_request_hold_async (TpCallChannel *self, + gboolean hold, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *result; + + g_return_if_fail (TP_IS_CALL_CHANNEL (self)); + + result = g_simple_async_result_new (G_OBJECT (self), callback, user_data, + tp_call_channel_request_hold_async); + + if (tp_call_channel_has_hold (self)) + { + tp_cli_channel_interface_hold_call_request_hold (TP_CHANNEL (self), -1, + hold, generic_async_cb, g_object_ref (result), g_object_unref, + G_OBJECT (self)); + } + else + { + g_simple_async_result_set_error (result, + TP_ERRORS, TP_ERROR_NOT_CAPABLE, + "Channel does NOT implement the Hold interface"); + g_simple_async_result_complete_in_idle (result); + } + + g_object_unref (result); +} + + +/** + * tp_call_channel_request_hold_finish: + * @self: a #TpCallChannel + * @result: a #GAsyncResult + * @error: a #GError to fill + * + * Finishes tp_call_channel_request_hold_async + * + * Since: 0.17.6 + */ +gboolean +tp_call_channel_request_hold_finish (TpCallChannel *self, + GAsyncResult *result, + GError **error) +{ + _tp_implement_finish_void (self, tp_call_channel_request_hold_async); +} diff -Nru telepathy-glib-0.17.5/telepathy-glib/call-channel.h telepathy-glib-0.17.6/telepathy-glib/call-channel.h --- telepathy-glib-0.17.5/telepathy-glib/call-channel.h 2012-02-20 16:56:41.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/call-channel.h 2012-03-16 15:28:32.000000000 +0000 @@ -87,6 +87,7 @@ GHashTable *tp_call_channel_get_members (TpCallChannel *self); gboolean tp_call_channel_has_dtmf (TpCallChannel *self); +gboolean tp_call_channel_has_hold (TpCallChannel *self); void tp_call_channel_set_ringing_async (TpCallChannel *self, GAsyncReadyCallback callback, @@ -111,8 +112,8 @@ void tp_call_channel_hangup_async (TpCallChannel *self, TpCallStateChangeReason reason, - gchar *detailed_reason, - gchar *message, + const gchar *detailed_reason, + const gchar *message, GAsyncReadyCallback callback, gpointer user_data); gboolean tp_call_channel_hangup_finish (TpCallChannel *self, @@ -120,7 +121,7 @@ GError **error); void tp_call_channel_add_content_async (TpCallChannel *self, - gchar *name, + const gchar *name, TpMediaStreamType type, TpMediaStreamDirection initial_direction, GAsyncReadyCallback callback, @@ -138,6 +139,14 @@ GAsyncResult *result, GError **error); +void tp_call_channel_request_hold_async (TpCallChannel *self, + gboolean hold, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean tp_call_channel_request_hold_finish (TpCallChannel *self, + GAsyncResult *result, + GError **error); + G_END_DECLS #endif diff -Nru telepathy-glib-0.17.5/telepathy-glib/call-content.c telepathy-glib-0.17.6/telepathy-glib/call-content.c --- telepathy-glib-0.17.5/telepathy-glib/call-content.c 2012-02-20 17:31:02.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/call-content.c 2012-03-19 15:33:56.000000000 +0000 @@ -47,6 +47,7 @@ #include "telepathy-glib/call-content.h" +#include #include #include #include @@ -63,7 +64,6 @@ #include "telepathy-glib/call-internal.h" #include "telepathy-glib/proxy-internal.h" #include "telepathy-glib/util-internal.h" -#include "telepathy-glib/_gen/signals-marshal.h" #include "_gen/tp-cli-call-content-body.h" @@ -74,6 +74,7 @@ struct _TpCallContentPrivate { TpConnection *connection; + TpCallChannel *channel; gchar *name; TpMediaStreamType media_type; @@ -92,7 +93,8 @@ PROP_NAME, PROP_MEDIA_TYPE, PROP_DISPOSITION, - PROP_STREAMS + PROP_STREAMS, + PROP_CHANNEL }; enum @@ -115,6 +117,7 @@ "dbus-connection", tp_proxy_get_dbus_connection (self), "object-path", object_path, "connection", self->priv->connection, + "content", self, NULL); } @@ -480,6 +483,9 @@ case PROP_STREAMS: g_value_set_boxed (value, self->priv->streams); break; + case PROP_CHANNEL: + g_value_set_object (value, self->priv->channel); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -500,6 +506,10 @@ g_assert (self->priv->connection == NULL); /* construct-only */ self->priv->connection = g_value_dup_object (value); break; + case PROP_CHANNEL: + g_assert (self->priv->channel == NULL); /* construct-only */ + self->priv->channel = g_value_dup_object (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -628,6 +638,21 @@ param_spec); /** + * TpCallContent:channel: + * + * The parent #TpCallChannel of the content. + * + * Since: 0.17.6 + */ + param_spec = g_param_spec_object ("channel", "Channel", + "The channel of this content", + TP_TYPE_CALL_CHANNEL, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); + g_object_class_install_property (gobject_class, PROP_CHANNEL, + param_spec); + + + /** * TpCallContent::removed * @self: the #TpCallContent * @@ -639,8 +664,7 @@ _signals[REMOVED] = g_signal_new ("removed", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, + 0, NULL, NULL, NULL, G_TYPE_NONE, 0); @@ -661,8 +685,7 @@ _signals[STREAMS_ADDED] = g_signal_new ("streams-added", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - g_cclosure_marshal_VOID__BOXED, + 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_PTR_ARRAY); @@ -684,8 +707,7 @@ _signals[STREAMS_REMOVED] = g_signal_new ("streams-removed", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - _tp_marshal_VOID__BOXED_BOXED, + 0, NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_PTR_ARRAY, TP_TYPE_CALL_STATE_REASON); diff -Nru telepathy-glib-0.17.5/telepathy-glib/call-content-media-description.c telepathy-glib-0.17.6/telepathy-glib/call-content-media-description.c --- telepathy-glib-0.17.5/telepathy-glib/call-content-media-description.c 2012-02-20 17:31:02.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/call-content-media-description.c 2012-03-19 15:33:56.000000000 +0000 @@ -64,21 +64,26 @@ #include "telepathy-glib/util.h" #include "telepathy-glib/util-internal.h" -static void call_content_media_description_iface_init (gpointer, gpointer); +static void call_content_media_description_iface_init (gpointer iface, + gpointer data); +static void call_content_media_description_extra_iface_init (gpointer iface, + gpointer data); G_DEFINE_TYPE_WITH_CODE(TpCallContentMediaDescription, - tp_call_content_media_description, - G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL_CONTENT_MEDIA_DESCRIPTION, + tp_call_content_media_description, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL_CONTENT_MEDIA_DESCRIPTION, call_content_media_description_iface_init); - G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES, - tp_dbus_properties_mixin_iface_init); + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES, + tp_dbus_properties_mixin_iface_init); + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS, + call_content_media_description_extra_iface_init); + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK, + call_content_media_description_extra_iface_init); + G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS, + call_content_media_description_extra_iface_init); ); -static const gchar *tp_call_content_media_description_interfaces[] = { - NULL -}; - /* properties */ enum { @@ -90,7 +95,20 @@ PROP_HAS_REMOTE_INFORMATION, PROP_CODECS, PROP_REMOTE_CONTACT, - PROP_SSRCS + PROP_SSRCS, + + PROP_HEADER_EXTENSIONS, + + PROP_FEEDBACK_MESSAGES, + PROP_DOES_AVPF, + + PROP_LOSS_RLE_MAX_SIZE, + PROP_DUPLICATE_RLE_MAX_SIZE, + PROP_PACKET_RECEIPT_TIMES_MAX_SIZE, + PROP_DLRR_MAX_SIZE, + PROP_RTT_MODE, + PROP_STATISTIC_FLAGS, + PROP_ENABLE_METRICS, }; /* private structure */ @@ -99,6 +117,8 @@ TpDBusDaemon *dbus_daemon; gchar *object_path; + /* GPtrArray of static strings, NULL-terminated */ + GPtrArray *interfaces; gboolean further_negotiation_required; gboolean has_remote_information; /* GPtrArray of owned GValueArray */ @@ -107,6 +127,18 @@ /* TpHandle -> reffed GArray */ GHashTable *ssrcs; + /* GPtrArray of owned GValueArray (dbus-struct) */ + GPtrArray *header_extensions; + GHashTable *feedback_messages; + gboolean does_avpf; + guint loss_rle_max_size; + guint duplicate_rle_max_size; + guint packet_receipt_times_max_size; + guint dlrr_max_size; + TpRCPTXRRTTMode rtt_mode; + TpRTCPXRStatisticsFlags statistic_flags; + gboolean enable_metrics; + GSimpleAsyncResult *result; GCancellable *cancellable; guint handler_id; @@ -119,10 +151,18 @@ TP_TYPE_CALL_CONTENT_MEDIA_DESCRIPTION, TpCallContentMediaDescriptionPrivate); + self->priv->interfaces = g_ptr_array_new (); + g_ptr_array_add (self->priv->interfaces, NULL); + self->priv->ssrcs = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) g_array_unref); self->priv->codecs = g_ptr_array_new_with_free_func ( (GDestroyNotify) g_value_array_free); + + self->priv->header_extensions = g_ptr_array_new_with_free_func ( + (GDestroyNotify) g_value_array_free); + self->priv->feedback_messages = g_hash_table_new_full (NULL, NULL, NULL, + (GDestroyNotify) g_value_array_free); } static void @@ -136,6 +176,9 @@ tp_clear_pointer (&self->priv->ssrcs, g_hash_table_unref); g_clear_object (&self->priv->dbus_daemon); + tp_clear_pointer (&self->priv->header_extensions, g_ptr_array_unref); + tp_clear_pointer (&self->priv->feedback_messages, g_hash_table_unref); + /* release any references held by the object here */ if (G_OBJECT_CLASS (tp_call_content_media_description_parent_class)->dispose) G_OBJECT_CLASS (tp_call_content_media_description_parent_class)->dispose ( @@ -148,6 +191,7 @@ TpCallContentMediaDescription *self = (TpCallContentMediaDescription *) object; g_free (self->priv->object_path); + g_ptr_array_unref (self->priv->interfaces); G_OBJECT_CLASS (tp_call_content_media_description_parent_class)->finalize ( object); @@ -170,7 +214,7 @@ g_value_set_object (value, self->priv->dbus_daemon); break; case PROP_INTERFACES: - g_value_set_boxed (value, tp_call_content_media_description_interfaces); + g_value_set_boxed (value, self->priv->interfaces->pdata); break; case PROP_FURTHER_NEGOTIATION_REQUIRED: g_value_set_boolean (value, self->priv->further_negotiation_required); @@ -187,6 +231,36 @@ case PROP_SSRCS: g_value_set_boxed (value, self->priv->ssrcs); break; + case PROP_HEADER_EXTENSIONS: + g_value_set_boxed (value, self->priv->header_extensions); + break; + case PROP_FEEDBACK_MESSAGES: + g_value_set_boxed (value, self->priv->feedback_messages); + break; + case PROP_DOES_AVPF: + g_value_set_boolean (value, self->priv->does_avpf); + break; + case PROP_LOSS_RLE_MAX_SIZE: + g_value_set_uint (value, self->priv->loss_rle_max_size); + break; + case PROP_DUPLICATE_RLE_MAX_SIZE: + g_value_set_uint (value, self->priv->duplicate_rle_max_size); + break; + case PROP_PACKET_RECEIPT_TIMES_MAX_SIZE: + g_value_set_uint (value, self->priv->packet_receipt_times_max_size); + break; + case PROP_DLRR_MAX_SIZE: + g_value_set_uint (value, self->priv->dlrr_max_size); + break; + case PROP_RTT_MODE: + g_value_set_uint (value, self->priv->rtt_mode); + break; + case PROP_STATISTIC_FLAGS: + g_value_set_uint (value, self->priv->statistic_flags); + break; + case PROP_ENABLE_METRICS: + g_value_set_boolean (value, self->priv->enable_metrics); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -241,12 +315,46 @@ { "SSRCs", "ssrcs", NULL }, { NULL } }; + static TpDBusPropertiesMixinPropImpl rtp_header_extensions_props[] = { + { "HeaderExtensions", "header-extensions", NULL }, + { NULL } + }; + static TpDBusPropertiesMixinPropImpl rtcp_feedback_props[] = { + { "FeedbackMessages", "feedback-messages", NULL }, + { "DoesAVPF", "does-avpf", NULL }, + { NULL } + }; + static TpDBusPropertiesMixinPropImpl rtcp_extended_reports_props[] = { + { "LossRLEMaxSize", "loss-rle-max-size", NULL }, + { "DuplicateRLEMaxSize", "duplicate-rle-max-size", NULL }, + { "PacketReceiptTimesMaxSize", "packet-receipt-times-max-size", NULL }, + { "DLRRMaxSize", "dlrr-max-size", NULL }, + { "RTTMode", "rtt-mode", NULL }, + { "StatisticsFlags", "statistics-flags", NULL }, + { "EnableMetrics", "enable-metrics", NULL }, + { NULL } + }; static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = { { TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION, tp_dbus_properties_mixin_getter_gobject_properties, NULL, media_description_props, }, + { TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS, + tp_dbus_properties_mixin_getter_gobject_properties, + NULL, + rtp_header_extensions_props, + }, + { TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK, + tp_dbus_properties_mixin_getter_gobject_properties, + NULL, + rtcp_feedback_props, + }, + { TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS, + tp_dbus_properties_mixin_getter_gobject_properties, + NULL, + rtcp_extended_reports_props, + }, { NULL } }; @@ -378,6 +486,160 @@ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_SSRCS, spec); + /** + * TpCallContentMediaDescription:header-extensions: + * + * A list of remote header extensions which are supported. + * + * Since: 0.17.6 + */ + spec = g_param_spec_boxed ("header-extensions", "Header Extentions", + "A list of remote header extensions which are supported.", + TP_ARRAY_TYPE_RTP_HEADER_EXTENSIONS_LIST, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_object_class_install_property (object_class, PROP_HEADER_EXTENSIONS, spec); + + /** + * TpCallContentMediaDescription:feedback-messages: + * + * A map of remote feedback codec properties that are supported. + * + * Since: 0.17.6 + */ + spec = g_param_spec_boxed ("feedback-messages", "Feedback Messages", + "A map of remote feedback codec properties that are supported.", + TP_HASH_TYPE_RTCP_FEEDBACK_MESSAGE_MAP, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_object_class_install_property (object_class, PROP_FEEDBACK_MESSAGES, spec); + + /** + * TpCallContentMediaDescription:does-avpf: + * + * %TRUE if the remote contact supports Audio-Visual Profile Feedback (AVPF), + * otherwise %FALSE. + * + * Since: 0.17.6 + */ + spec = g_param_spec_boolean ("does-avpf", "Does AVPF", + "True if the remote contact supports Audio-Visual Profile Feedback " + "(AVPF), otherwise False.", + FALSE, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_object_class_install_property (object_class, PROP_DOES_AVPF, spec); + + /** + * TpCallContentMediaDescription:loss-rle-max-size: + * + * If non-zero, enable Loss Run Length Encoded Report Blocks. The value of + * this integer represents the max-size of report blocks, as specified in + * RFC 3611 section 5.1. MAXUINT32 is used to indicate that there is no limit. + * + * Since: 0.17.6 + */ + spec = g_param_spec_uint ("loss-rle-max-size", "Loss RLE max size", + "If non-zero, enable Loss Run Length Encoded Report Blocks.", + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_object_class_install_property (object_class, PROP_LOSS_RLE_MAX_SIZE, spec); + + /** + * TpCallContentMediaDescription:duplicate-rle-max-size: + * + * If non-zero, enable Duplicate Run-Length-Encoded Report Blocks. The value + * of this integer represents the max-size of report blocks, as specified in + * RFC 3611 section 5.1. MAXUINT32 is used to indicate that there is no limit. + * + * Since: 0.17.6 + */ + spec = g_param_spec_uint ("duplicate-rle-max-size", + "Duplicate Run-Length-Encoded max size", + "If non-zero, enable Duplicate Run-Length-Encoded Report Blocks.", + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_object_class_install_property (object_class, PROP_DUPLICATE_RLE_MAX_SIZE, + spec); + + /** + * TpCallContentMediaDescription:packet-receipt-times-max-size: + * + * If non-zero, enable Packet Receipt Times Report Blocks. The value of this + * integer represents the max-size of report blocks, as specified in RFC 3611 + * section 5.1. MAXUINT32 is used to indicate that there is no limit. + * + * Since: 0.17.6 + */ + spec = g_param_spec_uint ("packet-receipt-times-max-size", + "Packet Receipt Times max size", + "If non-zero, enable Packet Receipt Times Report Blocks.", + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_object_class_install_property (object_class, + PROP_PACKET_RECEIPT_TIMES_MAX_SIZE, spec); + + /** + * TpCallContentMediaDescription:dlrr-max-size: + * + * If non-zero, enable Receiver Reference Time and Delay since Last Receiver + * Report Blocks (for estimating Round Trip Times between non-senders and + * other parties in the call. The value of this integer represents the + * max-size of report blocks, as specified in RFC 3611 section 5.1. MAXUINT32 + * is used to indicate that there is no limit. + * + * Since: 0.17.6 + */ + spec = g_param_spec_uint ("dlrr-max-size", + "Receiver Reference Time and Delay since Last Receiver max size", + "If non-zero, enable Receiver Reference Time and Delay since Last " + "Receiver Report Blocks.", + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_object_class_install_property (object_class, PROP_DLRR_MAX_SIZE, spec); + + /** + * TpCallContentMediaDescription:rtt-mode: + * + * Who is allowed to send Delay since Last Receiver Reports. Value from + * #TpRCPTXRRTTMode. + * + * Since: 0.17.6 + */ + spec = g_param_spec_uint ("rtt-mode", "RTT Mode", + "Who is allowed to send Delay since Last Receiver Reports.", + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_object_class_install_property (object_class, PROP_RTT_MODE, spec); + + /** + * TpCallContentMediaDescription:statistics-flags: + * + * Which fields SHOULD be included in the statistics summary report blocks + * that are sent, and whether to send VoIP Metrics Report Blocks. There can + * be zero or more flags set. Value from #TpRTCPXRStatisticsFlags. + * + * Since: 0.17.6 + */ + spec = g_param_spec_uint ("statistics-flags", "Statistics Flags", + "Which fields SHOULD be included in the statistics summary report blocks " + "that are sent, and whether to send VoIP Metrics Report Blocks.", + 0, G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_object_class_install_property (object_class, PROP_STATISTIC_FLAGS, spec); + + /** + * TpCallContentMediaDescription:enable-metrics: + * + * Whether to enable VoIP Metrics Report Blocks. These blocks are of a fixed + * size. + * + * Since: 0.17.6 + */ + spec = g_param_spec_boolean ("enable-metrics", "Enable Metrics", + "Whether to enable VoIP Metrics Report Blocks. These blocks are of a " + "fixed size.", + FALSE, + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + g_object_class_install_property (object_class, PROP_ENABLE_METRICS, spec); + klass->dbus_props_class.interfaces = prop_interfaces; tp_dbus_properties_mixin_class_init (object_class, G_STRUCT_OFFSET (TpCallContentMediaDescriptionClass, dbus_props_class)); @@ -538,6 +800,304 @@ } static void +add_interface (TpCallContentMediaDescription *self, + const gchar *interface) +{ + if (tp_g_ptr_array_contains (self->priv->interfaces, (gchar *) interface)) + return; + + /* Remove terminating NULL, add interface, then add the NULL back */ + g_ptr_array_remove_index_fast (self->priv->interfaces, + self->priv->interfaces->len - 1); + g_ptr_array_add (self->priv->interfaces, (gchar *) interface); + g_ptr_array_add (self->priv->interfaces, NULL); +} + +/** + * tp_call_content_media_description_add_rtp_header_extensions_interface: + * @self: a #TpCallContentMediaDescription + * + * Adds the RTPHeaderExtensions interface to the list of supported interfaces + * + * Since: 0.17.6 + */ + +void +tp_call_content_media_description_add_rtp_header_extensions_interface ( + TpCallContentMediaDescription *self) +{ + add_interface (self, + TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS); +} + + +/** + * tp_call_content_media_description_add_rtcp_feedback_interface: + * @self: a #TpCallContentMediaDescription + * + * Adds the RTCPFeedback interface to the list of supported interfaces + * + * Since: 0.17.6 + */ + +void +tp_call_content_media_description_add_rtcp_feedback_interface ( + TpCallContentMediaDescription *self) +{ + add_interface (self, + TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK); +} + + +/** + * tp_call_content_media_description_add_rtcp_extended_reports_interface: + * @self: a #TpCallContentMediaDescription + * + * Adds the RTCPExtendedReports interface to the list of supported interfaces + * + * Since: 0.17.6 + */ + +void +tp_call_content_media_description_add_rtcp_extended_reports_interface ( + TpCallContentMediaDescription *self) +{ + add_interface (self, + TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS); +} + + +/** + * tp_call_content_media_description_add_rtp_header_extension: + * @self: a #TpCallContentMediaDescription + * @id: identifier to be negotiated. + * @direction: a #TpMediaStreamDirection in which the Header Extension is + * negotiated. + * @uri: URI defining the extension. + * @parameters: Feedback parameters as a string. Format is defined in the + * relevant RFC. + * + * Add an element to the #TpCallContentMediaDescription:rtp-header-extensions + * property. + * + * Implement + * %TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSIONS + * interface. + * + * Since: 0.17.6 + */ +void +tp_call_content_media_description_add_rtp_header_extension ( + TpCallContentMediaDescription *self, + guint id, + TpMediaStreamDirection direction, + const gchar *uri, + const gchar *parameters) +{ + g_return_if_fail (TP_IS_CALL_CONTENT_MEDIA_DESCRIPTION (self)); + + g_ptr_array_add (self->priv->header_extensions, tp_value_array_build (4, + G_TYPE_UINT, id, + G_TYPE_UINT, direction, + G_TYPE_STRING, uri, + G_TYPE_STRING, parameters, + G_TYPE_INVALID)); + + tp_call_content_media_description_add_rtp_header_extensions_interface (self); +} + +static GValueArray * +ensure_rtcp_feedback_properties (TpCallContentMediaDescription *self, + guint codec_identifier) +{ + GValueArray *properties; + GPtrArray *messages_array; + + properties = g_hash_table_lookup (self->priv->feedback_messages, + GUINT_TO_POINTER (codec_identifier)); + + if (properties == NULL) + { + messages_array = g_ptr_array_new_with_free_func ( + (GDestroyNotify) g_value_array_free); + properties = tp_value_array_build (2, + G_TYPE_UINT, G_MAXUINT, + G_TYPE_PTR_ARRAY, messages_array, + G_TYPE_INVALID); + + g_hash_table_insert (self->priv->feedback_messages, + GUINT_TO_POINTER (codec_identifier), properties); + + g_ptr_array_unref (messages_array); + } + + return properties; +} + +/** + * tp_call_content_media_description_add_rtcp_feedback_message: + * @self: a #TpCallContentMediaDescription + * @codec_identifier: Numeric identifier for the codec. This will be used as the + * PT in the SDP or content description. + * @type: feedback type, for example "ack", "nack", or "ccm". + * @subtype: feedback subtype, according to the Type, can be an empty string + * (""), if there is no subtype. For example, generic nack is Type="nack" + * Subtype="". + * @parameters: feedback parameters as a string. Format is defined in the + * relevant RFC. + * + * Add a message for a given codec. This ensures @codec_identifier is + * in the #TpCallContentMediaDescription:feedback-messages map. The + * rtcp-minimum-interval is set to %G_MAXUINT and can then be changed using + * tp_call_content_media_description_set_rtcp_feedback_minimum_interval(). + * + * Implement + * %TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK + * interface. + * + * Since: 0.17.6 + */ +void +tp_call_content_media_description_add_rtcp_feedback_message ( + TpCallContentMediaDescription *self, + guint codec_identifier, + const gchar *type, + const gchar *subtype, + const gchar *parameters) +{ + GValueArray *properties; + GValue *value; + GPtrArray *messages_array; + + g_return_if_fail (TP_IS_CALL_CONTENT_MEDIA_DESCRIPTION (self)); + + properties = ensure_rtcp_feedback_properties (self, codec_identifier); + value = g_value_array_get_nth (properties, 1); + messages_array = g_value_get_boxed (value); + + g_ptr_array_add (messages_array, tp_value_array_build (3, + G_TYPE_STRING, type, + G_TYPE_STRING, subtype, + G_TYPE_STRING, parameters, + G_TYPE_INVALID)); + + tp_call_content_media_description_add_rtcp_feedback_interface (self); +} + +/** + * tp_call_content_media_description_set_rtcp_feedback_minimum_interval: + * @self: a #TpCallContentMediaDescription + * @codec_identifier: Numeric identifier for the codec. This will be used as the + * PT in the SDP or content description. + * @rtcp_minimum_interval: The minimum interval between two regular RTCP packets + * in milliseconds for this content. If no special value is desired, one should + * put MAXUINT (0xFFFFFFFF). Implementors and users of Call's RTCPFeedback + * should not use the MAXUINT default. Instead, in RTP/AVP, the default should + * be 5000 (5 seconds). If using the RTP/AVPF profile, it can be set to a lower + * value, the default being 0. + * + * Set the minimum interval for a given codec. This ensures @codec_identifier is + * in the #TpCallContentMediaDescription:feedback-messages map. The messages + * can then be added using + * tp_call_content_media_description_add_rtcp_feedback_message(). + * + * Implement + * %TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK + * interface. + * + * Since: 0.17.6 + */ +void +tp_call_content_media_description_set_rtcp_feedback_minimum_interval ( + TpCallContentMediaDescription *self, + guint codec_identifier, + guint rtcp_minimum_interval) +{ + GValueArray *properties; + GValue *value; + + g_return_if_fail (TP_IS_CALL_CONTENT_MEDIA_DESCRIPTION (self)); + + properties = ensure_rtcp_feedback_properties (self, codec_identifier); + value = g_value_array_get_nth (properties, 0); + g_value_set_uint (value, rtcp_minimum_interval); + + tp_call_content_media_description_add_rtcp_feedback_interface (self); +} + +/** + * tp_call_content_media_description_set_does_avpf: + * @self: a #TpCallContentMediaDescription + * @does_avpf: the value for + * #TpCallContentMediaDescription:does-avpf property. + * + * Implement properties for + * %TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK + * interface + * + * Since: 0.17.6 + */ +void +tp_call_content_media_description_set_does_avpf ( + TpCallContentMediaDescription *self, + gboolean does_avpf) +{ + g_return_if_fail (TP_IS_CALL_CONTENT_MEDIA_DESCRIPTION (self)); + + self->priv->does_avpf = does_avpf; + + tp_call_content_media_description_add_rtcp_feedback_interface (self); +} + +/** + * tp_call_content_media_description_set_rtcp_extended_reports: + * @self: a #TpCallContentMediaDescription + * @loss_rle_max_size: the value for + * #TpCallContentMediaDescription:loss-rle-max-size property. + * @duplicate_rle_max_size: the value for + * #TpCallContentMediaDescription:duplicate-rle-max-size property. + * @packet_receipt_times_max_size: the value for + * #TpCallContentMediaDescription:packet-receipt-times-max-size property. + * @dlrr_max_size: the value for + * #TpCallContentMediaDescription:dlrr-max-size property. + * @rtt_mode: the value for + * #TpCallContentMediaDescription:rtt-mpde property. + * @statistic_flags: the value for + * #TpCallContentMediaDescription:statistic-flags property. + * @enable_metrics: the value for + * #TpCallContentMediaDescription:enable-metrics property. + * + * Implement + * %TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPORTS + * interface. + * + * Since: 0.17.6 + */ +void +tp_call_content_media_description_set_rtcp_extended_reports ( + TpCallContentMediaDescription *self, + guint loss_rle_max_size, + guint duplicate_rle_max_size, + guint packet_receipt_times_max_size, + guint dlrr_max_size, + TpRCPTXRRTTMode rtt_mode, + TpRTCPXRStatisticsFlags statistic_flags, + gboolean enable_metrics) +{ + g_return_if_fail (TP_IS_CALL_CONTENT_MEDIA_DESCRIPTION (self)); + + self->priv->loss_rle_max_size = loss_rle_max_size; + self->priv->duplicate_rle_max_size = duplicate_rle_max_size; + self->priv->packet_receipt_times_max_size = packet_receipt_times_max_size; + self->priv->dlrr_max_size = dlrr_max_size; + self->priv->rtt_mode = rtt_mode; + self->priv->statistic_flags = statistic_flags; + self->priv->enable_metrics = enable_metrics; + + tp_call_content_media_description_add_rtcp_extended_reports_interface (self); +} + +static void cancelled_cb (GCancellable *cancellable, gpointer user_data) { @@ -601,7 +1161,7 @@ return tp_asv_new ( TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACES, - G_TYPE_STRV, tp_call_content_media_description_interfaces, + G_TYPE_STRV, self->priv->interfaces->pdata, TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_FURTHER_NEGOTIATION_REQUIRED, G_TYPE_BOOLEAN, self->priv->further_negotiation_required, TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_HAS_REMOTE_INFORMATION, @@ -692,7 +1252,8 @@ } g_simple_async_result_set_error (self->priv->result, - G_IO_ERROR, G_IO_ERROR_FAILED, "Media description was rejected"); + TP_ERRORS, TP_ERROR_MEDIA_CODECS_INCOMPATIBLE, + "Media description was rejected"); g_simple_async_result_complete (self->priv->result); g_clear_object (&self->priv->result); @@ -713,3 +1274,8 @@ IMPLEMENT(reject); #undef IMPLEMENT } + +static void +call_content_media_description_extra_iface_init (gpointer iface, gpointer data) +{ +} diff -Nru telepathy-glib-0.17.5/telepathy-glib/call-content-media-description.h telepathy-glib-0.17.6/telepathy-glib/call-content-media-description.h --- telepathy-glib-0.17.5/telepathy-glib/call-content-media-description.h 2012-02-20 16:56:41.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/call-content-media-description.h 2012-03-16 15:28:32.000000000 +0000 @@ -98,6 +98,49 @@ gboolean updated, GHashTable *parameters); +void tp_call_content_media_description_add_rtp_header_extension ( + TpCallContentMediaDescription *self, + guint id, + TpMediaStreamDirection direction, + const gchar *uri, + const gchar *parameters); + +void tp_call_content_media_description_add_rtcp_feedback_message ( + TpCallContentMediaDescription *self, + guint codec_identifier, + const gchar *type, + const gchar *subtype, + const gchar *parameters); + +void tp_call_content_media_description_set_rtcp_feedback_minimum_interval ( + TpCallContentMediaDescription *self, + guint codec_identifier, + guint rtcp_minimum_interval); + +void tp_call_content_media_description_set_does_avpf ( + TpCallContentMediaDescription *self, + gboolean does_avpf); + +void tp_call_content_media_description_set_rtcp_extended_reports ( + TpCallContentMediaDescription *self, + guint loss_rle_max_size, + guint duplicate_rle_max_size, + guint packet_receipt_times_max_size, + guint dlrr_max_size, + TpRCPTXRRTTMode rtt_mode, + TpRTCPXRStatisticsFlags statistic_flags, + gboolean enable_metrics); + +void tp_call_content_media_description_add_rtp_header_extensions_interface ( + TpCallContentMediaDescription *self); + +void tp_call_content_media_description_add_rtcp_feedback_interface ( + TpCallContentMediaDescription *self); + +void tp_call_content_media_description_add_rtcp_extended_reports_interface ( + TpCallContentMediaDescription *self); + + G_END_DECLS #endif /* #ifndef __TP_CALL_CONTENT_MEDIA_DESCRIPTION_H__*/ diff -Nru telepathy-glib-0.17.5/telepathy-glib/call-stream.c telepathy-glib-0.17.6/telepathy-glib/call-stream.c --- telepathy-glib-0.17.5/telepathy-glib/call-stream.c 2012-02-20 17:31:02.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/call-stream.c 2012-03-19 15:33:56.000000000 +0000 @@ -48,6 +48,7 @@ #include "telepathy-glib/call-stream.h" #include +#include #include #include #include @@ -61,7 +62,6 @@ #include "telepathy-glib/call-internal.h" #include "telepathy-glib/proxy-internal.h" #include "telepathy-glib/util-internal.h" -#include "telepathy-glib/_gen/signals-marshal.h" #include "_gen/tp-cli-call-stream-body.h" @@ -71,6 +71,8 @@ { TpConnection *connection; + TpCallContent *content; + /* TpContact -> TpSendingState */ GHashTable *remote_members; TpSendingState local_sending_state; @@ -84,6 +86,7 @@ PROP_CONNECTION = 1, PROP_LOCAL_SENDING_STATE, PROP_CAN_REQUEST_RECEIVING, + PROP_CONTENT }; enum /* signals */ @@ -241,6 +244,7 @@ { TpCallStream *self = (TpCallStream *) object; + g_clear_object (&self->priv->content); g_clear_object (&self->priv->connection); tp_clear_pointer (&self->priv->remote_members, g_hash_table_unref); @@ -267,6 +271,9 @@ case PROP_CAN_REQUEST_RECEIVING: g_value_set_boolean (value, priv->can_request_receiving); break; + case PROP_CONTENT: + g_value_set_object (value, self->priv->content); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -287,6 +294,10 @@ g_assert (self->priv->connection == NULL); /* construct-only */ self->priv->connection = g_value_dup_object (value); break; + case PROP_CONTENT: + g_assert (self->priv->content == NULL); /* construct-only */ + self->priv->content = g_value_dup_object (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -342,7 +353,7 @@ * Since: 0.17.5 */ param_spec = g_param_spec_object ("connection", "Connection", - "The connection of this content", + "The connection of this stream", TP_TYPE_CONNECTION, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); g_object_class_install_property (gobject_class, PROP_CONNECTION, @@ -380,6 +391,21 @@ param_spec); /** + * TpCallStream:content: + * + * The Content that this streams belongs to + * + * Since: 0.17.6 + */ + param_spec = g_param_spec_object ("content", + "Content", + "The content that this Stream belongs to", + TP_TYPE_CALL_CONTENT, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); + g_object_class_install_property (gobject_class, PROP_CONTENT, + param_spec); + + /** * TpCallStream::local-sending-state-changed * @self: the #TpCallStream * @state: the new #TpSendingState @@ -393,8 +419,7 @@ _signals[LOCAL_SENDING_STATE_CHANGED] = g_signal_new ("local-sending-state-changed", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - _tp_marshal_VOID__UINT_BOXED, + 0, NULL, NULL, NULL, G_TYPE_NONE, 4, G_TYPE_UINT, G_TYPE_UINT, TP_TYPE_CALL_STATE_REASON, G_TYPE_HASH_TABLE); @@ -418,8 +443,7 @@ _signals[REMOTE_MEMBERS_CHANGED] = g_signal_new ("remote-members-changed", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - _tp_marshal_VOID__BOXED_BOXED_BOXED, + 0, NULL, NULL, NULL, G_TYPE_NONE, 3, G_TYPE_HASH_TABLE, G_TYPE_PTR_ARRAY, TP_TYPE_CALL_STATE_REASON); } diff -Nru telepathy-glib-0.17.5/telepathy-glib/call-stream-endpoint.c telepathy-glib-0.17.6/telepathy-glib/call-stream-endpoint.c --- telepathy-glib-0.17.5/telepathy-glib/call-stream-endpoint.c 2012-02-20 17:31:02.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/call-stream-endpoint.c 2012-03-07 11:51:11.000000000 +0000 @@ -67,7 +67,6 @@ #include "telepathy-glib/svc-properties-interface.h" #include "telepathy-glib/util.h" #include "telepathy-glib/util-internal.h" -#include "telepathy-glib/_gen/signals-marshal.h" static void call_stream_endpoint_iface_init (gpointer, gpointer); @@ -447,8 +446,7 @@ _signals[CANDIDATE_SELECTED] = g_signal_new ("candidate-selected", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - _tp_marshal_VOID__BOXED_BOXED, + 0, NULL, NULL, NULL, G_TYPE_NONE, 2, TP_STRUCT_TYPE_CANDIDATE, TP_STRUCT_TYPE_CANDIDATE); @@ -466,8 +464,7 @@ _signals[CANDIDATE_ACCEPTED] = g_signal_new ("candidate-accepted", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - _tp_marshal_VOID__BOXED_BOXED, + 0, NULL, NULL, NULL, G_TYPE_NONE, 2, TP_STRUCT_TYPE_CANDIDATE, TP_STRUCT_TYPE_CANDIDATE); @@ -485,8 +482,7 @@ _signals[CANDIDATE_REJECTED] = g_signal_new ("candidate-rejected", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - _tp_marshal_VOID__BOXED_BOXED, + 0, NULL, NULL, NULL, G_TYPE_NONE, 2, TP_STRUCT_TYPE_CANDIDATE, TP_STRUCT_TYPE_CANDIDATE); } diff -Nru telepathy-glib-0.17.5/telepathy-glib/capabilities.c telepathy-glib-0.17.6/telepathy-glib/capabilities.c --- telepathy-glib-0.17.5/telepathy-glib/capabilities.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/capabilities.c 2012-03-19 15:33:56.000000000 +0000 @@ -361,6 +361,125 @@ } static gboolean +supports_call_full (TpCapabilities *self, + TpHandleType expected_handle_type, + gboolean expected_initial_audio, + gboolean expected_initial_video) +{ + guint i; + + g_return_val_if_fail (TP_IS_CAPABILITIES (self), FALSE); + + for (i = 0; i < self->priv->classes->len; i++) + { + GValueArray *arr = g_ptr_array_index (self->priv->classes, i); + GHashTable *fixed_prop; + const gchar * const *allowed_prop; + const gchar *chan_type; + TpHandleType handle_type; + gboolean valid; + + tp_value_array_unpack (arr, 2, + &fixed_prop, + &allowed_prop); + + chan_type = tp_asv_get_string (fixed_prop, TP_PROP_CHANNEL_CHANNEL_TYPE); + if (tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_CALL)) + continue; + + handle_type = tp_asv_get_uint32 (fixed_prop, + TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, &valid); + if (!valid || handle_type != expected_handle_type) + continue; + + if (expected_initial_audio && + !tp_asv_get_boolean (fixed_prop, + TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, NULL) && + !tp_strv_contains (allowed_prop, + TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO)) + continue; + + if (expected_initial_video && + !tp_asv_get_boolean (fixed_prop, + TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, NULL) && + !tp_strv_contains (allowed_prop, + TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO)) + continue; + + /* We found the right class */ + return TRUE; + } + + return FALSE; +} + +/** + * tp_capabilities_supports_audio_call: + * @self: a #TpCapabilities object + * @handle_type: the handle type of the call; #TP_HANDLE_TYPE_CONTACT for + * private, #TP_HANDLE_TYPE_ROOM or #TP_HANDLE_TYPE_NONE for conference + * (depending on the protocol) + * + * Return whether audio call can be established. + * + * Returns: %TRUE if a channel request containing Call as ChannelType, + * @handle_type as TargetHandleType, a True value for InitialAudio and an + * identifier of the appropriate type can be expected to work, %FALSE otherwise. + * + * Since: 0.17.6 + */ +gboolean +tp_capabilities_supports_audio_call (TpCapabilities *self, + TpHandleType handle_type) +{ + return supports_call_full (self, handle_type, TRUE, FALSE); +} + +/** + * tp_capabilities_supports_audio_video_call: + * @self: a #TpCapabilities object + * @handle_type: the handle type of the call; #TP_HANDLE_TYPE_CONTACT for + * private, #TP_HANDLE_TYPE_ROOM or #TP_HANDLE_TYPE_NONE for conference + * (depending on the protocol) + * + * Return whether audio/video call can be established. + * + * Returns: %TRUE if a channel request containing Call as ChannelType, + * @handle_type as TargetHandleType, a True value for + * InitialAudio/InitialVideo and an identifier of the appropriate type can be + * expected to work, + * %FALSE otherwise. + * + * Since: 0.17.6 + */ +gboolean +tp_capabilities_supports_audio_video_call (TpCapabilities *self, + TpHandleType handle_type) +{ + return supports_call_full (self, handle_type, TRUE, TRUE); +} + +/** + * tp_capabilities_supports_file_transfer: + * @self: a #TpCapabilities object + * + * Return whether private file transfer can be established by providing + * a contact identifier. + * + * Returns: %TRUE if a channel request containing FileTransfer as ChannelType, + * HandleTypeContact as TargetHandleType and a contact identifier can be + * expected to work, %FALSE otherwise. + * + * Since: 0.17.6 + */ +gboolean +tp_capabilities_supports_file_transfer (TpCapabilities *self) +{ + return supports_simple_channel (self, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, + TP_HANDLE_TYPE_CONTACT); +} + +static gboolean tp_capabilities_supports_tubes_common (TpCapabilities *self, const gchar *expected_channel_type, TpHandleType expected_handle_type, diff -Nru telepathy-glib-0.17.5/telepathy-glib/capabilities.h telepathy-glib-0.17.6/telepathy-glib/capabilities.h --- telepathy-glib-0.17.5/telepathy-glib/capabilities.h 2012-02-09 14:22:50.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/capabilities.h 2012-03-07 11:51:11.000000000 +0000 @@ -54,6 +54,11 @@ gboolean tp_capabilities_supports_text_chats (TpCapabilities *self); gboolean tp_capabilities_supports_text_chatrooms (TpCapabilities *self); +gboolean tp_capabilities_supports_audio_call (TpCapabilities *self, + TpHandleType handle_type); +gboolean tp_capabilities_supports_audio_video_call (TpCapabilities *self, + TpHandleType handle_type); +gboolean tp_capabilities_supports_file_transfer (TpCapabilities *self); gboolean tp_capabilities_supports_stream_tubes (TpCapabilities *self, TpHandleType handle_type, diff -Nru telepathy-glib-0.17.5/telepathy-glib/channel.c telepathy-glib-0.17.6/telepathy-glib/channel.c --- telepathy-glib-0.17.5/telepathy-glib/channel.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/channel.c 2012-03-19 15:33:56.000000000 +0000 @@ -35,7 +35,6 @@ #include "telepathy-glib/debug-internal.h" #include "telepathy-glib/proxy-internal.h" #include "telepathy-glib/simple-client-factory-internal.h" -#include "telepathy-glib/_gen/signals-marshal.h" #include "_gen/tp-cli-channel-body.h" @@ -373,6 +372,8 @@ * * Returns: %TRUE if introspection has completed * Since: 0.7.12 + * Deprecated: 0.17.6: use tp_proxy_is_prepared() with + * %TP_CHANNEL_FEATURE_CORE */ gboolean tp_channel_is_ready (TpChannel *self) @@ -1606,10 +1607,14 @@ * invalidated - but tp_proxy_is_prepared() returns %FALSE for all features. * * Change notification is via notify::channel-ready. + * + * Deprecated: 0.17.6: use tp_proxy_is_prepared() with + * %TP_CHANNEL_FEATURE_CORE for checks, or tp_proxy_prepare_async() for + * notification */ param_spec = g_param_spec_boolean ("channel-ready", "Channel ready?", "Initially FALSE; changes to TRUE when introspection finishes", FALSE, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS | G_PARAM_DEPRECATED); g_object_class_install_property (object_class, PROP_CHANNEL_READY, param_spec); @@ -1779,8 +1784,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__UINT_UINT, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); /** @@ -1805,8 +1809,7 @@ "group-members-changed", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__STRING_BOXED_BOXED_BOXED_BOXED_UINT_UINT, + NULL, NULL, NULL, G_TYPE_NONE, 7, G_TYPE_STRING, au_type, au_type, au_type, au_type, G_TYPE_UINT, G_TYPE_UINT); @@ -1838,8 +1841,7 @@ "group-members-changed-detailed", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__BOXED_BOXED_BOXED_BOXED_BOXED, + NULL, NULL, NULL, G_TYPE_NONE, 5, au_type, au_type, au_type, au_type, TP_HASH_TYPE_STRING_VARIANT_MAP); @@ -1858,8 +1860,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__UINT_UINT, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); /** @@ -1962,8 +1963,7 @@ "group-contacts-changed", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__BOXED_BOXED_BOXED_BOXED_OBJECT_BOXED, + NULL, NULL, NULL, G_TYPE_NONE, 6, G_TYPE_PTR_ARRAY, G_TYPE_PTR_ARRAY, G_TYPE_PTR_ARRAY, G_TYPE_PTR_ARRAY, TP_TYPE_CONTACT, TP_HASH_TYPE_STRING_VARIANT_MAP); @@ -2124,9 +2124,9 @@ * %FALSE if the channel has become invalid. * * Since: 0.7.1 - * Deprecated: 0.11.0: Use tp_connection_call_when_ready, - * or restructure your program in such a way as to avoid re-entering the - * main loop. + * Deprecated: 0.11.0: Use tp_proxy_prepare_async() and re-enter the main + * loop yourself, or restructure your program in such a way as to avoid + * re-entering the main loop. */ gboolean tp_channel_run_until_ready (TpChannel *self, @@ -2241,6 +2241,8 @@ * Signature of a callback passed to tp_channel_call_when_ready(), which * will be called exactly once, when the channel becomes ready or * invalid (whichever happens first) + * + * Deprecated: 0.17.6 */ /** @@ -2261,6 +2263,7 @@ * calls @callback from the main loop.) * * Since: 0.7.7 + * Deprecated: 0.17.6: Use tp_proxy_prepare_async() */ void tp_channel_call_when_ready (TpChannel *self, diff -Nru telepathy-glib-0.17.5/telepathy-glib/channel-dispatch-operation.c telepathy-glib-0.17.6/telepathy-glib/channel-dispatch-operation.c --- telepathy-glib-0.17.5/telepathy-glib/channel-dispatch-operation.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/channel-dispatch-operation.c 2012-03-07 11:51:11.000000000 +0000 @@ -39,7 +39,6 @@ #include "telepathy-glib/dbus-internal.h" #include "telepathy-glib/debug-internal.h" #include "telepathy-glib/simple-client-factory-internal.h" -#include "telepathy-glib/_gen/signals-marshal.h" #include "telepathy-glib/_gen/tp-cli-channel-dispatch-operation-body.h" @@ -830,8 +829,7 @@ "channel-lost", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__OBJECT_UINT_INT_STRING, + NULL, NULL, NULL, G_TYPE_NONE, 4, TP_TYPE_CHANNEL, G_TYPE_UINT, G_TYPE_INT, G_TYPE_STRING); diff -Nru telepathy-glib-0.17.5/telepathy-glib/channel-factory-iface.c telepathy-glib-0.17.6/telepathy-glib/channel-factory-iface.c --- telepathy-glib-0.17.5/telepathy-glib/channel-factory-iface.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/channel-factory-iface.c 2012-03-07 11:51:11.000000000 +0000 @@ -43,8 +43,6 @@ #include -#include "_gen/signals-marshal.h" - enum { NEW_CHANNEL, CHANNEL_ERROR, @@ -83,8 +81,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__OBJECT_POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_POINTER); /** @@ -104,8 +101,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__OBJECT_POINTER_POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 3, G_TYPE_OBJECT, G_TYPE_POINTER, G_TYPE_POINTER); } diff -Nru telepathy-glib-0.17.5/telepathy-glib/channel.h telepathy-glib-0.17.6/telepathy-glib/channel.h --- telepathy-glib-0.17.5/telepathy-glib/channel.h 2012-02-13 18:08:50.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/channel.h 2012-03-07 11:51:11.000000000 +0000 @@ -85,17 +85,20 @@ #ifndef TP_DISABLE_DEPRECATED gboolean tp_channel_run_until_ready (TpChannel *self, GError **error, GMainLoop **loop) _TP_GNUC_DEPRECATED; -#endif typedef void (*TpChannelWhenReadyCb) (TpChannel *channel, const GError *error, gpointer user_data); void tp_channel_call_when_ready (TpChannel *self, - TpChannelWhenReadyCb callback, gpointer user_data); + TpChannelWhenReadyCb callback, + gpointer user_data) _TP_GNUC_DEPRECATED_FOR (tp_proxy_prepare_async); + +gboolean tp_channel_is_ready (TpChannel *self) + _TP_GNUC_DEPRECATED_FOR (tp_proxy_is_ready); +#endif void tp_channel_init_known_interfaces (void); -gboolean tp_channel_is_ready (TpChannel *self); const gchar *tp_channel_get_channel_type (TpChannel *self); GQuark tp_channel_get_channel_type_id (TpChannel *self); TpHandle tp_channel_get_handle (TpChannel *self, TpHandleType *handle_type); diff -Nru telepathy-glib-0.17.5/telepathy-glib/channel-manager.c telepathy-glib-0.17.6/telepathy-glib/channel-manager.c --- telepathy-glib-0.17.5/telepathy-glib/channel-manager.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/channel-manager.c 2012-03-07 11:51:11.000000000 +0000 @@ -204,8 +204,6 @@ #include #include -#include "_gen/signals-marshal.h" - enum { S_NEW_CHANNELS, S_REQUEST_ALREADY_SATISFIED, @@ -244,8 +242,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - g_cclosure_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); /** @@ -265,8 +262,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__POINTER_OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_OBJECT); /** @@ -289,8 +285,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__POINTER_UINT_INT_STRING, + NULL, NULL, NULL, G_TYPE_NONE, 4, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_INT, G_TYPE_STRING); @@ -306,8 +301,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - g_cclosure_marshal_VOID__STRING, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRING); } diff -Nru telepathy-glib-0.17.5/telepathy-glib/channel-request.c telepathy-glib-0.17.6/telepathy-glib/channel-request.c --- telepathy-glib-0.17.5/telepathy-glib/channel-request.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/channel-request.c 2012-03-07 11:51:11.000000000 +0000 @@ -42,8 +42,6 @@ #include "telepathy-glib/simple-client-factory-internal.h" #include "telepathy-glib/_gen/tp-cli-channel-request-body.h" -#include "_gen/signals-marshal.h" - /** * SECTION:channel-request * @title: TpChannelRequest @@ -490,8 +488,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); /** @@ -518,8 +515,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__OBJECT_OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 2, TP_TYPE_CONNECTION, TP_TYPE_CHANNEL); } diff -Nru telepathy-glib-0.17.5/telepathy-glib/codegen.am telepathy-glib-0.17.6/telepathy-glib/codegen.am --- telepathy-glib-0.17.5/telepathy-glib/codegen.am 2012-02-20 16:56:41.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/codegen.am 2012-03-12 12:37:25.000000000 +0000 @@ -82,10 +82,6 @@ nodist_libtelepathy_glib_internal_la_SOURCES = \ _gen/error-str.c \ - _gen/signals-marshal.c \ - _gen/signals-marshal.h \ - _gen/signals-marshal.list \ - _gen/tp-signals-marshal.list \ _gen/interfaces-body.h \ _gen/genums.c \ _gen/gtypes-body.h \ @@ -143,18 +139,24 @@ touch $@ _gen/stable-spec.xml: stable-interfaces.xml _gen/stable-stamp $(tools_dir)/xincludator.py - $(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@ + $(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@.tmp + @mv $@.tmp $@ # Grab a list of re-entrant tp_cli_*_run_* methods we are committed to # generating for backwards compatibility. -_gen/reentrant-methods.list: \ - $(top_srcdir)/docs/reference/telepathy-glib-sections.txt \ - _gen/spec-stamp - $(AM_V_GEN)$(GREP) 'tp_cli_.*_run_.*' $< > $@ +# grep --no-filename is not portable :-( +_gen/reentrant-methods.list: $(ABI_LISTS) codegen.am + $(AM_V_GEN)( cd $(srcdir) && cat $(ABI_LISTS) ) | \ + $(GREP) '^tp_cli_.*_run_.*' > $@.tmp + @mv $@.tmp $@ # Things generated from the whole spec at once -_gen/gtypes.h _gen/gtypes-body.h: _gen/stable-spec.xml \ +# do nothing, output as a side-effect +_gen/gtypes.h: _gen/gtypes-body.h + @: + +_gen/gtypes-body.h: _gen/stable-spec.xml \ $(tools_dir)/glib-gtypes-generator.py $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-gtypes-generator.py \ _gen/stable-spec.xml \ @@ -165,7 +167,11 @@ $(AM_V_GEN)$(PYTHON) $(tools_dir)/c-constants-gen.py \ Tp $< _gen/telepathy-enums -_gen/interfaces-body.h _gen/telepathy-interfaces.h: _gen/stable-spec.xml \ +# do nothing, output as a side-effect +_gen/interfaces-body.h: _gen/telepathy-interfaces.h + @: + +_gen/telepathy-interfaces.h: _gen/stable-spec.xml \ $(tools_dir)/glib-interfaces-gen.py $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \ Tp _gen/interfaces-body.h _gen/telepathy-interfaces.h $< @@ -174,21 +180,6 @@ $(tools_dir)/glib-client-marshaller-gen.py $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< _tp > $@ -_gen/tp-signals-marshal.list: $(tools_dir)/glib-signals-marshal-gen.py \ - _gen/stable-spec.xml - $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py \ - _gen/stable-spec.xml > $@ - -_gen/signals-marshal.list: signals-marshal.list _gen/tp-signals-marshal.list - $(AM_V_GEN)sort -u $^ > $@ - -_gen/signals-marshal.h: _gen/signals-marshal.list codegen.am - $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_tp_marshal $< > $@ - -_gen/signals-marshal.c: _gen/signals-marshal.list codegen.am - $(AM_V_GEN){ echo '#include "_gen/signals-marshal.h"' && \ - $(GLIB_GENMARSHAL) --body --prefix=_tp_marshal $< ; } > $@ - _gen/genums.c: _gen/spec-stamp genums.c.template $(our_headers) codegen.am $(AM_V_GEN)( cd $(srcdir) && \ $(GLIB_MKENUMS) --template genums.c.template $(our_headers) \ @@ -199,7 +190,10 @@ $(GLIB_MKENUMS) --template genums.h.template $(our_headers) \ ) > $@ -_gen/error-str.h _gen/error-str.c: _gen/stable-spec.xml \ +_gen/error-str.h: _gen/error-str.c + @: # do nothing, output as a side-effect + +_gen/error-str.c: _gen/stable-spec.xml \ $(tools_dir)/glib-errors-str-gen.py $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-errors-str-gen.py \ _gen/error-str $< @@ -207,20 +201,28 @@ # Things generated per interface _gen/tp-spec-%.xml: %.xml _gen/spec-stamp $(tools_dir)/xincludator.py - $(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@ + $(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@.tmp + @mv $@.tmp $@ + +# do nothing, output as a side-effect +_gen/tp-svc-%.h: _gen/tp-svc-%.c + @: -_gen/tp-svc-%.c _gen/tp-svc-%.h: _gen/tp-spec-%.xml \ +_gen/tp-svc-%.c: _gen/tp-spec-%.xml \ $(tools_dir)/glib-ginterface-gen.py \ codegen.am $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \ --filename=_gen/tp-svc-$* \ --signal-marshal-prefix=_tp \ --include='' \ - --include="\"_gen/signals-marshal.h\"" \ --not-implemented-func='tp_dbus_g_method_return_not_implemented' \ $< Tp_Svc_ -_gen/tp-cli-%-body.h _gen/tp-cli-%.h: _gen/tp-spec-%.xml \ +# do nothing, output as a side-effect +_gen/tp-cli-%.h: _gen/tp-cli-%-body.h + @: + +_gen/tp-cli-%-body.h: _gen/tp-spec-%.xml \ _gen/reentrant-methods.list \ $(tools_dir)/glib-client-gen.py \ codegen.am diff -Nru telepathy-glib-0.17.5/telepathy-glib/connection.c telepathy-glib-0.17.6/telepathy-glib/connection.c --- telepathy-glib-0.17.5/telepathy-glib/connection.c 2012-02-20 16:56:41.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/connection.c 2012-03-19 15:33:56.000000000 +0000 @@ -47,7 +47,6 @@ #include "telepathy-glib/proxy-internal.h" #include "telepathy-glib/simple-client-factory-internal.h" #include "telepathy-glib/util-internal.h" -#include "telepathy-glib/_gen/signals-marshal.h" #include "_gen/tp-cli-connection-body.h" @@ -1845,10 +1844,14 @@ * This is similar to %TP_CONNECTION_FEATURE_CONNECTED, except that once * it has changed to %TRUE, it remains %TRUE even if the connection has * been invalidated. + * + * Deprecated: 0.17.6: use tp_proxy_is_prepared() with + * %TP_CHANNEL_FEATURE_CONNECTED for checks, or tp_proxy_prepare_async() for + * notification */ param_spec = g_param_spec_boolean ("connection-ready", "Connection ready?", "Initially FALSE; changes to TRUE when introspection finishes", FALSE, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); + G_PARAM_READABLE | G_PARAM_STATIC_STRINGS | G_PARAM_DEPRECATED); g_object_class_install_property (object_class, PROP_CONNECTION_READY, param_spec); @@ -1954,8 +1957,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__INT_UINT_STRING, + NULL, NULL, NULL, G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_UINT, G_TYPE_STRING); /** @@ -2181,8 +2183,7 @@ G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - _tp_marshal_VOID__BOXED, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRV); /** @@ -2207,8 +2208,7 @@ G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - _tp_marshal_VOID__BOXED, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_STRV); /** @@ -2242,8 +2242,7 @@ G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - _tp_marshal_VOID__STRING_STRING, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); /** * TpConnection::contact-list-changed: @@ -2272,8 +2271,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - _tp_marshal_VOID__BOXED_BOXED, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_PTR_ARRAY, G_TYPE_PTR_ARRAY); /** @@ -2303,8 +2301,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - _tp_marshal_VOID__BOXED_BOXED, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_PTR_ARRAY, G_TYPE_PTR_ARRAY); } @@ -2549,9 +2546,9 @@ * %FALSE if the connection has become invalid. * * Since: 0.7.1 - * Deprecated: 0.11.0: Use tp_connection_call_when_ready, - * or restructure your program in such a way as to avoid re-entering the - * main loop. + * Deprecated: 0.11.0: Use tp_proxy_prepare_async() and re-enter the main + * loop yourself, or restructure your program in such a way as to avoid + * re-entering the main loop. */ typedef struct { @@ -2984,6 +2981,8 @@ * Signature of a callback passed to tp_connection_call_when_ready(), which * will be called exactly once, when the connection becomes ready or * invalid (whichever happens first) + * + * Deprecated: 0.17.6 */ /** @@ -3005,6 +3004,7 @@ * Call tp_cli_connection_call_connect() too, if you want to do that. * * Since: 0.7.7 + * Deprecated: 0.17.6: Use tp_proxy_prepare_async() */ void tp_connection_call_when_ready (TpConnection *self, @@ -3189,6 +3189,8 @@ * * Returns: %TRUE if introspection has completed * Since: 0.7.17 + * Deprecated: 0.17.6: use tp_proxy_is_prepared() with + * %TP_CONNECTION_FEATURE_CONNECTED */ gboolean tp_connection_is_ready (TpConnection *self) diff -Nru telepathy-glib-0.17.5/telepathy-glib/connection.h telepathy-glib-0.17.6/telepathy-glib/connection.h --- telepathy-glib-0.17.5/telepathy-glib/connection.h 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/connection.h 2012-03-07 11:51:11.000000000 +0000 @@ -152,19 +152,21 @@ gboolean tp_connection_set_contact_info_finish (TpConnection *self, GAsyncResult *result, GError **error); -gboolean tp_connection_is_ready (TpConnection *self); - #ifndef TP_DISABLE_DEPRECATED +gboolean tp_connection_is_ready (TpConnection *self) + _TP_GNUC_DEPRECATED_FOR (tp_proxy_is_prepared); + gboolean tp_connection_run_until_ready (TpConnection *self, gboolean connect, GError **error, GMainLoop **loop) _TP_GNUC_DEPRECATED; -#endif typedef void (*TpConnectionWhenReadyCb) (TpConnection *connection, const GError *error, gpointer user_data); void tp_connection_call_when_ready (TpConnection *self, - TpConnectionWhenReadyCb callback, gpointer user_data); + TpConnectionWhenReadyCb callback, + gpointer user_data) _TP_GNUC_DEPRECATED_FOR (tp_proxy_prepare_async); +#endif typedef void (*TpConnectionNameListCb) (const gchar * const *names, gsize n, const gchar * const *cms, const gchar * const *protocols, diff -Nru telepathy-glib-0.17.5/telepathy-glib/connection-manager.c telepathy-glib-0.17.6/telepathy-glib/connection-manager.c --- telepathy-glib-0.17.5/telepathy-glib/connection-manager.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/connection-manager.c 2012-03-19 15:33:56.000000000 +0000 @@ -37,6 +37,7 @@ #define DEBUG_FLAG TP_DEBUG_MANAGER #include "telepathy-glib/debug-internal.h" #include "telepathy-glib/protocol-internal.h" +#include "telepathy-glib/util-internal.h" #include "telepathy-glib/_gen/tp-cli-connection-manager-body.h" @@ -82,10 +83,10 @@ * on a #TpConnectionManager. * * After this feature is prepared, basic information about the connection - * manager's protocols (tp_connection_manager_get_protocol() and - * tp_connection_manager_dup_protocol_names()), and their available parameters, - * will have been retrieved, either by activating the connection manager over - * D-Bus or by reading the .manager file in which that information is cached. + * manager's protocols (tp_connection_manager_dup_protocols()), and their + * available parameters, will have been retrieved, either by activating the + * connection manager over D-Bus or by reading the .manager file in which + * that information is cached. * * Since 0.11.11, this feature also finds any extra interfaces that * this connection manager has, and adds them to #TpProxy:interfaces (where @@ -556,6 +557,8 @@ * connection manager's protocol and parameter information could be retrieved, * @error is %NULL and @cm is considered to be ready. Otherwise, @error is * non-%NULL and @cm is not ready. + * + * Deprecated: since 0.17.6, use tp_proxy_prepare_async() instead */ /** @@ -572,6 +575,7 @@ * supported protocols and parameters has been retrieved. * * Since: 0.7.26 + * Deprecated: since 0.17.6, use tp_proxy_prepare_async() instead */ void tp_connection_manager_call_when_ready (TpConnectionManager *self, @@ -1521,8 +1525,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); /** @@ -1536,8 +1539,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); /** @@ -1547,15 +1549,14 @@ * * Emitted when the connection manager's capabilities have been discovered. * - * This signal is not very helpful. Since 0.7.26, using - * tp_connection_manager_call_when_ready() instead is recommended. + * This signal is not very helpful. Using + * tp_proxy_prepare_async() instead is recommended. */ signals[SIGNAL_GOT_INFO] = g_signal_new ("got-info", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - g_cclosure_marshal_VOID__UINT, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_UINT); } @@ -1569,7 +1570,7 @@ * * Convenience function to create a new connection manager proxy. If * its protocol and parameter information are required, you should call - * tp_connection_manager_call_when_ready() on the result. + * tp_proxy_prepare_async() on the result. * * Returns: a new reference to a connection manager proxy, or %NULL if @error * is set. @@ -1671,14 +1672,17 @@ { GHashTable *table; GPtrArray *arr; + GSimpleAsyncResult *result; TpConnectionManagerListCb callback; gpointer user_data; GDestroyNotify destroy; + gpointer weak_object; TpProxyPendingCall *pending_call; size_t base_len; gsize refcount; gsize cms_to_ready; unsigned getting_names:1; + unsigned had_weak_object:1; } _ListContext; static void @@ -1689,6 +1693,10 @@ if (--list_context->refcount > 0) return; + if (list_context->weak_object != NULL) + g_object_remove_weak_pointer (list_context->weak_object, + &list_context->weak_object); + if (list_context->destroy != NULL) list_context->destroy (list_context->user_data); @@ -1710,14 +1718,13 @@ } static void -tp_list_connection_managers_cm_ready (TpConnectionManager *cm, - const GError *error, - gpointer user_data, - GObject *weak_object) +tp_list_connection_managers_cm_prepared (GObject *source G_GNUC_UNUSED, + GAsyncResult *result G_GNUC_UNUSED, + gpointer user_data) { _ListContext *list_context = user_data; - /* ignore errors here - all we guarantee is that the CM is ready + /* ignore the result here - all we guarantee is that the CM is ready * *if possible* */ if ((--list_context->cms_to_ready) == 0) @@ -1730,10 +1737,19 @@ g_ptr_array_add (list_context->arr, NULL); cms = (TpConnectionManager **) list_context->arr->pdata; - list_context->callback (cms, n_cms, NULL, list_context->user_data, - weak_object); + /* If we never had a weak object anyway, call the callback. + * If we had a weak object when we started, only call the callback + * if it hasn't died yet. */ + if (!list_context->had_weak_object || list_context->weak_object != NULL) + { + list_context->callback (cms, n_cms, NULL, list_context->user_data, + list_context->weak_object); + } + list_context->callback = NULL; } + + list_context_unref (list_context); } static void @@ -1746,6 +1762,9 @@ _ListContext *list_context = user_data; const gchar * const *name_iter; + /* The TpProxy APIs we use guarantee this */ + g_assert (weak_object != NULL || !list_context->had_weak_object); + if (error != NULL) { list_context->callback (NULL, 0, error, list_context->user_data, @@ -1791,9 +1810,8 @@ { TpConnectionManager *cm = g_ptr_array_index (list_context->arr, i); - tp_connection_manager_call_when_ready (cm, - tp_list_connection_managers_cm_ready, list_context, - (GDestroyNotify) list_context_unref, weak_object); + tp_proxy_prepare_async (cm, NULL, + tp_list_connection_managers_cm_prepared, list_context); } } else @@ -1822,8 +1840,8 @@ * callback when done. * * Since 0.7.26, this function will wait for each #TpConnectionManager - * to be ready, so all connection managers passed to @callback will be ready - * (tp_connection_manager_is_ready() will return %TRUE) unless an error + * to be ready, so all connection managers passed to @callback will have + * their %TP_CONNECTION_MANAGER_FEATURE_CORE feature prepared, unless an error * occurred while launching that connection manager. * * Since: 0.7.1 @@ -1849,11 +1867,116 @@ list_context->arr = NULL; list_context->cms_to_ready = 0; + if (weak_object != NULL) + { + list_context->weak_object = weak_object; + list_context->had_weak_object = TRUE; + g_object_add_weak_pointer (weak_object, &list_context->weak_object); + } + tp_dbus_daemon_list_activatable_names (bus_daemon, 2000, tp_list_connection_managers_got_names, list_context, (GDestroyNotify) list_context_unref, weak_object); } +static void +list_connection_managers_async_cb (TpConnectionManager * const *cms, + gsize n_cms, + const GError *error, + gpointer user_data, + GObject *weak_object) +{ + GSimpleAsyncResult *result = user_data; + + if (error != NULL) + { + g_simple_async_result_set_from_error (result, error); + } + else + { + GList *l = NULL; + gsize i; + + for (i = 0; i < n_cms; i++) + l = g_list_prepend (l, g_object_ref (cms[i])); + + l = g_list_reverse (l); + + g_simple_async_result_set_op_res_gpointer (result, l, + (GDestroyNotify) _tp_object_list_free); + } + + g_simple_async_result_complete_in_idle (result); + + /* result is unreffed by GDestroyNotify */ +} + +/** + * tp_list_connection_managers_async: + * @dbus_daemon: (allow-none): a #TpDBusDaemon, or %NULL to use + * tp_dbus_daemon_dup() + * @callback: a callback to call with a list of CMs + * @user_data: data to pass to @callback + * + * List the available (running or installed) connection managers, + * asynchronously, and wait for their %TP_CONNECTION_MANAGER_FEATURE_CORE + * feature to be ready. + * + * Since: 0.17.6 + */ +void +tp_list_connection_managers_async (TpDBusDaemon *dbus_daemon, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *result; + GError *error = NULL; + + if (dbus_daemon == NULL) + dbus_daemon = tp_dbus_daemon_dup (&error); + else + g_object_ref (dbus_daemon); + + result = g_simple_async_result_new (NULL, callback, user_data, + tp_list_connection_managers_async); + + if (dbus_daemon == NULL) + { + g_simple_async_result_take_error (result, error); + g_simple_async_result_complete_in_idle (result); + g_object_unref (result); + } + else + { + tp_list_connection_managers (dbus_daemon, + list_connection_managers_async_cb, result, g_object_unref, NULL); + g_object_unref (dbus_daemon); + } +} + +/** + * tp_list_connection_managers_finish: + * @result: the result of tp_list_connection_managers_async() + * @error: used to raise an error if the operation failed + * + * Finish listing the available connection managers. + * + * Free the list after use, for instance with + * g_list_free_full (list, g_object_unref). + * + * Returns: (transfer full) (element-type TelepathyGLib.ConnectionManager): a + * newly allocated list of references to #TpConnectionManager objects + * Since: 0.17.6 + */ +GList * +tp_list_connection_managers_finish (GAsyncResult *result, + GError **error) +{ + _tp_implement_finish_return_copy_pointer (NULL, + tp_list_connection_managers_async, + _tp_object_list_copy); +} + /** * tp_connection_manager_check_valid_name: * @name: a possible connection manager name @@ -1988,6 +2111,8 @@ * Returns: %TRUE, unless the #TpConnectionManager:info-source property is * %TP_CM_INFO_SOURCE_NONE * Since: 0.7.26 + * Deprecated: since 0.17.6, use tp_proxy_is_prepared() + * with %TP_CONNECTION_MANAGER_FEATURE_CORE instead */ gboolean tp_connection_manager_is_ready (TpConnectionManager *self) @@ -2050,7 +2175,7 @@ * * If this function is called before the connection manager information has * been obtained, the result is always %NULL. Use - * tp_connection_manager_call_when_ready() to wait for this. + * tp_proxy_prepare_async() to wait for this. * * The result is copied and must be freed by the caller, but it is not * necessarily still true after the main loop is re-entered. @@ -2101,7 +2226,7 @@ * * If this function is called before the connection manager information has * been obtained, the result is always %NULL. Use - * tp_connection_manager_call_when_ready() to wait for this. + * tp_proxy_prepare_async() to wait for this. * * The result is not necessarily valid after the main loop is re-entered. * Since 0.11.3, it can be copied with tp_connection_manager_protocol_copy() @@ -2156,6 +2281,43 @@ return g_hash_table_lookup (self->priv->protocol_objects, protocol); } +/* FIXME: in Telepathy 1.0, rename to get_protocols */ +/** + * tp_connection_manager_dup_protocols: + * @self: a connection manager + * + * Return objects representing all protocols supported by this connection + * manager. + * + * If this function is called before the connection manager information has + * been obtained, the result is always %NULL. Use tp_proxy_prepare_async() + * to wait for this. + * + * The caller must free the list, for instance with + * g_list_free_full (l, g_object_unref). + * + * Returns: (transfer full) (element-type TelepathyGLib.Protocol): a list + * of #TpProtocol objects representing the protocols supported by @self, + * owned by the caller + * + * Since: 0.17.6 + */ +GList * +tp_connection_manager_dup_protocols (TpConnectionManager *self) +{ + GList *l; + + g_return_val_if_fail (TP_IS_CONNECTION_MANAGER (self), NULL); + + if (self->priv->protocol_objects == NULL) + return NULL; + + l = g_hash_table_get_values (self->priv->protocol_objects); + + g_list_foreach (l, (GFunc) g_object_ref, NULL); + return l; +} + /** * tp_connection_manager_has_protocol: * @self: a connection manager @@ -2165,8 +2327,8 @@ * Return whether @protocol is supported by this connection manager. * * If this function is called before the connection manager information has - * been obtained, the result is always %FALSE. Use - * tp_connection_manager_call_when_ready() to wait for this. + * been obtained, the result is always %FALSE. Use tp_proxy_prepare_async() + * to wait for this. * * Returns: %TRUE if this connection manager supports @protocol * Since: 0.7.26 diff -Nru telepathy-glib-0.17.5/telepathy-glib/connection-manager.h telepathy-glib-0.17.6/telepathy-glib/connection-manager.h --- telepathy-glib-0.17.5/telepathy-glib/connection-manager.h 2012-02-09 14:22:50.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/connection-manager.h 2012-03-12 12:37:25.000000000 +0000 @@ -117,15 +117,26 @@ gpointer user_data, GDestroyNotify destroy, GObject *weak_object); +void tp_list_connection_managers_async (TpDBusDaemon *dbus_daemon, + GAsyncReadyCallback callback, + gpointer user_data); +GList *tp_list_connection_managers_finish (GAsyncResult *result, + GError **error); + +#ifndef TP_DISABLE_DEPRECATED typedef void (*TpConnectionManagerWhenReadyCb) (TpConnectionManager *cm, const GError *error, gpointer user_data, GObject *weak_object); void tp_connection_manager_call_when_ready (TpConnectionManager *self, TpConnectionManagerWhenReadyCb callback, - gpointer user_data, GDestroyNotify destroy, GObject *weak_object); + gpointer user_data, GDestroyNotify destroy, GObject *weak_object) + _TP_GNUC_DEPRECATED_FOR (tp_proxy_prepare_async); + +gboolean tp_connection_manager_is_ready (TpConnectionManager *self) + _TP_GNUC_DEPRECATED_FOR (tp_proxy_is_prepared); +#endif const gchar *tp_connection_manager_get_name (TpConnectionManager *self); -gboolean tp_connection_manager_is_ready (TpConnectionManager *self); gboolean tp_connection_manager_is_running (TpConnectionManager *self); TpCMInfoSource tp_connection_manager_get_info_source ( TpConnectionManager *self); @@ -144,6 +155,8 @@ TpConnectionManager *self, const gchar *protocol); TpProtocol *tp_connection_manager_get_protocol_object ( TpConnectionManager *self, const gchar *protocol); +GList *tp_connection_manager_dup_protocols (TpConnectionManager *self) + G_GNUC_WARN_UNUSED_RESULT; gchar **tp_connection_manager_protocol_dup_param_names ( const TpConnectionManagerProtocol *protocol) diff -Nru telepathy-glib-0.17.5/telepathy-glib/contact.c telepathy-glib-0.17.6/telepathy-glib/contact.c --- telepathy-glib-0.17.5/telepathy-glib/contact.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/contact.c 2012-03-07 11:51:11.000000000 +0000 @@ -38,8 +38,6 @@ #include "telepathy-glib/debug-internal.h" #include "telepathy-glib/util-internal.h" -#include "telepathy-glib/_gen/signals-marshal.h" - /** * SECTION:contact * @title: TpContact @@ -1337,8 +1335,7 @@ G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - _tp_marshal_VOID__BOXED_BOXED, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_STRV, G_TYPE_STRV); /** @@ -1357,8 +1354,7 @@ G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - _tp_marshal_VOID__UINT_UINT_STRING, + NULL, NULL, NULL, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING); /** @@ -1376,8 +1372,7 @@ G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - _tp_marshal_VOID__UINT_STRING_STRING, + NULL, NULL, NULL, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING); } @@ -4106,8 +4101,8 @@ /** * tp_connection_get_contacts_by_handle: - * @self: A connection, which must be ready (#TpConnection:connection-ready - * must be %TRUE) + * @self: A connection, which must have the %TP_CONNECTION_FEATURE_CONNECTED + * feature prepared * @n_handles: The number of handles in @handles (must be at least 1) * @handles: (array length=n_handles) (element-type uint): An array of handles * of type %TP_HANDLE_TYPE_CONTACT representing the desired contacts @@ -4228,8 +4223,8 @@ /** * tp_connection_upgrade_contacts: - * @self: A connection, which must be ready (#TpConnection:connection-ready - * must be %TRUE) + * @self: A connection, which must have the %TP_CONNECTION_FEATURE_CONNECTED + * feature prepared * @n_contacts: The number of contacts in @contacts (must be at least 1) * @contacts: (array length=n_contacts): An array of #TpContact objects * associated with @self @@ -4270,8 +4265,8 @@ ContactsContext *context; guint i; - g_return_if_fail (tp_connection_is_ready (self)); - g_return_if_fail (tp_proxy_get_invalidated (self) == NULL); + g_return_if_fail (tp_proxy_is_prepared (self, + TP_CONNECTION_FEATURE_CONNECTED)); g_return_if_fail (n_contacts >= 1); g_return_if_fail (contacts != NULL); g_return_if_fail (n_features == 0 || features != NULL); @@ -4441,8 +4436,8 @@ /** * tp_connection_get_contacts_by_id: - * @self: A connection, which must be ready (#TpConnection:connection-ready - * must be %TRUE) + * @self: A connection, which must have the %TP_CONNECTION_FEATURE_CONNECTED + * feature prepared * @n_ids: The number of IDs in @ids (must be at least 1) * @ids: (array length=n_ids) (transfer none): An array of strings representing * the desired contacts by their @@ -4486,8 +4481,8 @@ ContactsContext *context; guint i; - g_return_if_fail (tp_connection_is_ready (self)); - g_return_if_fail (tp_proxy_get_invalidated (self) == NULL); + g_return_if_fail (tp_proxy_is_prepared (self, + TP_CONNECTION_FEATURE_CONNECTED)); g_return_if_fail (n_ids >= 1); g_return_if_fail (ids != NULL); g_return_if_fail (ids[0] != NULL); diff -Nru telepathy-glib-0.17.5/telepathy-glib/contact-search.c telepathy-glib-0.17.6/telepathy-glib/contact-search.c --- telepathy-glib-0.17.5/telepathy-glib/contact-search.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/contact-search.c 2012-03-07 11:51:11.000000000 +0000 @@ -474,8 +474,7 @@ G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, - NULL, NULL, - g_cclosure_marshal_VOID__POINTER, + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); diff -Nru telepathy-glib-0.17.5/telepathy-glib/dbus.c telepathy-glib-0.17.6/telepathy-glib/dbus.c --- telepathy-glib-0.17.5/telepathy-glib/dbus.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/dbus.c 2012-03-12 12:37:25.000000000 +0000 @@ -64,6 +64,7 @@ #include #include +#include #include #define DEBUG_FLAG TP_DEBUG_MISC @@ -1951,3 +1952,25 @@ g_debug ("}"); } + +/* + * _tp_asv_to_vardict: + * + * Returns: (transfer full): a #GVariant of type %G_VARIANT_TYPE_VARDICT + */ +GVariant * +_tp_asv_to_vardict (const GHashTable *asv) +{ + GValue v = G_VALUE_INIT; + GVariant *ret; + + g_value_init (&v, TP_HASH_TYPE_STRING_VARIANT_MAP); + g_value_set_boxed (&v, asv); + + ret = dbus_g_value_build_g_variant (&v); + g_assert (!tp_strdiff (g_variant_get_type_string (ret), "a{sv}")); + + g_value_unset (&v); + + return g_variant_ref_sink (ret); +} diff -Nru telepathy-glib-0.17.5/telepathy-glib/dbus-daemon.c telepathy-glib-0.17.6/telepathy-glib/dbus-daemon.c --- telepathy-glib-0.17.5/telepathy-glib/dbus-daemon.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/dbus-daemon.c 2012-03-07 11:51:11.000000000 +0000 @@ -32,8 +32,6 @@ #include #include -#include "telepathy-glib/_gen/signals-marshal.h" - #include "telepathy-glib/_gen/tp-cli-dbus-daemon-body.h" #define DEBUG_FLAG TP_DEBUG_PROXY diff -Nru telepathy-glib-0.17.5/telepathy-glib/dbus-internal.h telepathy-glib-0.17.6/telepathy-glib/dbus-internal.h --- telepathy-glib-0.17.5/telepathy-glib/dbus-internal.h 2012-02-09 14:22:50.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/dbus-internal.h 2012-03-12 12:37:25.000000000 +0000 @@ -36,6 +36,8 @@ gboolean _tp_dbus_daemon_is_the_shared_one (TpDBusDaemon *self); +GVariant *_tp_asv_to_vardict (const GHashTable *asv); + G_END_DECLS #endif /* __TP_INTERNAL_DBUS_GLIB_H__ */ diff -Nru telepathy-glib-0.17.5/telepathy-glib/dbus-tube-channel.c telepathy-glib-0.17.6/telepathy-glib/dbus-tube-channel.c --- telepathy-glib-0.17.5/telepathy-glib/dbus-tube-channel.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/dbus-tube-channel.c 2012-03-07 11:51:11.000000000 +0000 @@ -63,8 +63,6 @@ #include "telepathy-glib/automatic-client-factory-internal.h" #include "telepathy-glib/debug-internal.h" -#include "_gen/signals-marshal.h" - #include #include diff -Nru telepathy-glib-0.17.5/telepathy-glib/dtmf.c telepathy-glib-0.17.6/telepathy-glib/dtmf.c --- telepathy-glib-0.17.5/telepathy-glib/dtmf.c 2012-02-20 16:56:41.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/dtmf.c 2012-03-07 11:51:11.000000000 +0000 @@ -479,7 +479,7 @@ */ sig_id_started_tone = g_signal_new ("started-tone", G_OBJECT_CLASS_TYPE (cls), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, G_TYPE_UINT); + NULL, G_TYPE_NONE, 1, G_TYPE_UINT); /** * TpDTMFPlayer::stopped-tone: @@ -491,7 +491,7 @@ */ sig_id_stopped_tone = g_signal_new ("stopped-tone", G_OBJECT_CLASS_TYPE (cls), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + NULL, G_TYPE_NONE, 0); /** * TpDTMFPlayer::finished: @@ -506,7 +506,7 @@ */ sig_id_finished = g_signal_new ("finished", G_OBJECT_CLASS_TYPE (cls), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); + NULL, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); /** * TpDTMFPlayer::tones-deferred: @@ -523,7 +523,7 @@ */ sig_id_tones_deferred = g_signal_new ("tones-deferred", G_OBJECT_CLASS_TYPE (cls), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); + NULL, G_TYPE_NONE, 1, G_TYPE_STRING); } /** diff -Nru telepathy-glib-0.17.5/telepathy-glib/file-transfer-channel.c telepathy-glib-0.17.6/telepathy-glib/file-transfer-channel.c --- telepathy-glib-0.17.5/telepathy-glib/file-transfer-channel.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/file-transfer-channel.c 2012-03-07 11:51:11.000000000 +0000 @@ -110,7 +110,6 @@ #define DEBUG_FLAG TP_DEBUG_CHANNEL #include "telepathy-glib/automatic-client-factory-internal.h" #include "telepathy-glib/debug-internal.h" -#include "_gen/signals-marshal.h" #include #include diff -Nru telepathy-glib-0.17.5/telepathy-glib/group-mixin.c telepathy-glib-0.17.6/telepathy-glib/group-mixin.c --- telepathy-glib-0.17.5/telepathy-glib/group-mixin.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/group-mixin.c 2012-03-07 11:51:11.000000000 +0000 @@ -74,8 +74,6 @@ #include "debug-internal.h" -#include "_gen/signals-marshal.h" - static const char * group_change_reason_str (guint reason) { diff -Nru telepathy-glib-0.17.5/telepathy-glib/handle-channels-context.c telepathy-glib-0.17.6/telepathy-glib/handle-channels-context.c --- telepathy-glib-0.17.5/telepathy-glib/handle-channels-context.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/handle-channels-context.c 2012-03-07 11:51:11.000000000 +0000 @@ -60,7 +60,6 @@ #define DEBUG_FLAG TP_DEBUG_CLIENT #include "telepathy-glib/debug-internal.h" -#include "telepathy-glib/_gen/signals-marshal.h" struct _TpHandleChannelsContextClass { /**/ @@ -433,8 +432,7 @@ "done", G_OBJECT_CLASS_TYPE (cls), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); } diff -Nru telepathy-glib-0.17.5/telepathy-glib/Makefile.am telepathy-glib-0.17.6/telepathy-glib/Makefile.am --- telepathy-glib-0.17.5/telepathy-glib/Makefile.am 2012-02-20 16:56:41.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/Makefile.am 2012-03-07 11:51:11.000000000 +0000 @@ -273,7 +273,6 @@ proxy-methods.c \ proxy-signals.c \ run.c \ - signals-marshal.list \ signalled-message.c \ signalled-message-internal.h \ simple-approver.c \ diff -Nru telepathy-glib-0.17.5/telepathy-glib/Makefile.in telepathy-glib-0.17.6/telepathy-glib/Makefile.in --- telepathy-glib-0.17.5/telepathy-glib/Makefile.in 2012-02-20 17:31:10.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/Makefile.in 2012-03-19 15:34:30.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -96,12 +96,6 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" \ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibsdir)" \ "$(DESTDIR)$(genincludedir)" "$(DESTDIR)$(tpgincludedir)" @@ -144,9 +138,9 @@ simple-observer.lo simple-password-manager.lo \ stream-tube-channel.lo stream-tube-connection.lo \ text-channel.lo text-mixin.lo util.lo -nodist_libtelepathy_glib_internal_la_OBJECTS = error-str.lo \ - signals-marshal.lo genums.lo tp-svc-account.lo \ - tp-svc-account-manager.lo tp-svc-call-content.lo \ +nodist_libtelepathy_glib_internal_la_OBJECTS = error-str.lo genums.lo \ + tp-svc-account.lo tp-svc-account-manager.lo \ + tp-svc-call-content.lo \ tp-svc-call-content-media-description.lo tp-svc-call-stream.lo \ tp-svc-call-stream-endpoint.lo tp-svc-channel.lo \ tp-svc-channel-dispatcher.lo \ @@ -158,8 +152,8 @@ libtelepathy_glib_internal_la_OBJECTS = \ $(am_libtelepathy_glib_internal_la_OBJECTS) \ $(nodist_libtelepathy_glib_internal_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent am__objects_1 = nodist_libtelepathy_glib_la_OBJECTS = $(am__objects_1) @@ -178,21 +172,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libtelepathy_glib_internal_la_SOURCES) \ $(nodist_libtelepathy_glib_internal_la_SOURCES) \ @@ -631,7 +625,6 @@ proxy-methods.c \ proxy-signals.c \ run.c \ - signals-marshal.list \ signalled-message.c \ signalled-message-internal.h \ simple-approver.c \ @@ -746,6 +739,7 @@ versions/0.17.2.abi \ versions/0.17.3.abi \ versions/0.17.5.abi \ + versions/0.17.6.abi \ $(NULL) @@ -849,10 +843,6 @@ nodist_libtelepathy_glib_internal_la_SOURCES = \ _gen/error-str.c \ - _gen/signals-marshal.c \ - _gen/signals-marshal.h \ - _gen/signals-marshal.list \ - _gen/tp-signals-marshal.list \ _gen/interfaces-body.h \ _gen/genums.c \ _gen/gtypes-body.h \ @@ -1021,7 +1011,6 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/tools/flymake.mk $(top_srcdir)/tools/check-coding-style.mk $(srcdir)/abi.am $(srcdir)/codegen.am $(srcdir)/introspection.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1075,9 +1064,9 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libtelepathy-glib-internal.la: $(libtelepathy_glib_internal_la_OBJECTS) $(libtelepathy_glib_internal_la_DEPENDENCIES) $(EXTRA_libtelepathy_glib_internal_la_DEPENDENCIES) +libtelepathy-glib-internal.la: $(libtelepathy_glib_internal_la_OBJECTS) $(libtelepathy_glib_internal_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libtelepathy_glib_internal_la_OBJECTS) $(libtelepathy_glib_internal_la_LIBADD) $(LIBS) -libtelepathy-glib.la: $(libtelepathy_glib_la_OBJECTS) $(libtelepathy_glib_la_DEPENDENCIES) $(EXTRA_libtelepathy_glib_la_DEPENDENCIES) +libtelepathy-glib.la: $(libtelepathy_glib_la_OBJECTS) $(libtelepathy_glib_la_DEPENDENCIES) $(AM_V_CCLD)$(libtelepathy_glib_la_LINK) -rpath $(libdir) $(libtelepathy_glib_la_OBJECTS) $(libtelepathy_glib_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -1176,7 +1165,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signalled-message.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signals-marshal.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple-approver.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple-client-factory.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple-handler.Plo@am__quote@ @@ -1210,177 +1198,194 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< error-str.lo: _gen/error-str.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT error-str.lo -MD -MP -MF $(DEPDIR)/error-str.Tpo -c -o error-str.lo `test -f '_gen/error-str.c' || echo '$(srcdir)/'`_gen/error-str.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/error-str.Tpo $(DEPDIR)/error-str.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/error-str.c' object='error-str.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/error-str.c' object='error-str.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o error-str.lo `test -f '_gen/error-str.c' || echo '$(srcdir)/'`_gen/error-str.c - -signals-marshal.lo: _gen/signals-marshal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT signals-marshal.lo -MD -MP -MF $(DEPDIR)/signals-marshal.Tpo -c -o signals-marshal.lo `test -f '_gen/signals-marshal.c' || echo '$(srcdir)/'`_gen/signals-marshal.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/signals-marshal.Tpo $(DEPDIR)/signals-marshal.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/signals-marshal.c' object='signals-marshal.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o signals-marshal.lo `test -f '_gen/signals-marshal.c' || echo '$(srcdir)/'`_gen/signals-marshal.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o error-str.lo `test -f '_gen/error-str.c' || echo '$(srcdir)/'`_gen/error-str.c genums.lo: _gen/genums.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT genums.lo -MD -MP -MF $(DEPDIR)/genums.Tpo -c -o genums.lo `test -f '_gen/genums.c' || echo '$(srcdir)/'`_gen/genums.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/genums.Tpo $(DEPDIR)/genums.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/genums.c' object='genums.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/genums.c' object='genums.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o genums.lo `test -f '_gen/genums.c' || echo '$(srcdir)/'`_gen/genums.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o genums.lo `test -f '_gen/genums.c' || echo '$(srcdir)/'`_gen/genums.c tp-svc-account.lo: _gen/tp-svc-account.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tp-svc-account.lo -MD -MP -MF $(DEPDIR)/tp-svc-account.Tpo -c -o tp-svc-account.lo `test -f '_gen/tp-svc-account.c' || echo '$(srcdir)/'`_gen/tp-svc-account.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tp-svc-account.Tpo $(DEPDIR)/tp-svc-account.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/tp-svc-account.c' object='tp-svc-account.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/tp-svc-account.c' object='tp-svc-account.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-account.lo `test -f '_gen/tp-svc-account.c' || echo '$(srcdir)/'`_gen/tp-svc-account.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-account.lo `test -f '_gen/tp-svc-account.c' || echo '$(srcdir)/'`_gen/tp-svc-account.c tp-svc-account-manager.lo: _gen/tp-svc-account-manager.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tp-svc-account-manager.lo -MD -MP -MF $(DEPDIR)/tp-svc-account-manager.Tpo -c -o tp-svc-account-manager.lo `test -f '_gen/tp-svc-account-manager.c' || echo '$(srcdir)/'`_gen/tp-svc-account-manager.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tp-svc-account-manager.Tpo $(DEPDIR)/tp-svc-account-manager.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/tp-svc-account-manager.c' object='tp-svc-account-manager.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/tp-svc-account-manager.c' object='tp-svc-account-manager.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-account-manager.lo `test -f '_gen/tp-svc-account-manager.c' || echo '$(srcdir)/'`_gen/tp-svc-account-manager.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-account-manager.lo `test -f '_gen/tp-svc-account-manager.c' || echo '$(srcdir)/'`_gen/tp-svc-account-manager.c tp-svc-call-content.lo: _gen/tp-svc-call-content.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tp-svc-call-content.lo -MD -MP -MF $(DEPDIR)/tp-svc-call-content.Tpo -c -o tp-svc-call-content.lo `test -f '_gen/tp-svc-call-content.c' || echo '$(srcdir)/'`_gen/tp-svc-call-content.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tp-svc-call-content.Tpo $(DEPDIR)/tp-svc-call-content.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/tp-svc-call-content.c' object='tp-svc-call-content.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/tp-svc-call-content.c' object='tp-svc-call-content.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-call-content.lo `test -f '_gen/tp-svc-call-content.c' || echo '$(srcdir)/'`_gen/tp-svc-call-content.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-call-content.lo `test -f '_gen/tp-svc-call-content.c' || echo '$(srcdir)/'`_gen/tp-svc-call-content.c tp-svc-call-content-media-description.lo: _gen/tp-svc-call-content-media-description.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tp-svc-call-content-media-description.lo -MD -MP -MF $(DEPDIR)/tp-svc-call-content-media-description.Tpo -c -o tp-svc-call-content-media-description.lo `test -f '_gen/tp-svc-call-content-media-description.c' || echo '$(srcdir)/'`_gen/tp-svc-call-content-media-description.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tp-svc-call-content-media-description.Tpo $(DEPDIR)/tp-svc-call-content-media-description.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/tp-svc-call-content-media-description.c' object='tp-svc-call-content-media-description.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/tp-svc-call-content-media-description.c' object='tp-svc-call-content-media-description.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-call-content-media-description.lo `test -f '_gen/tp-svc-call-content-media-description.c' || echo '$(srcdir)/'`_gen/tp-svc-call-content-media-description.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-call-content-media-description.lo `test -f '_gen/tp-svc-call-content-media-description.c' || echo '$(srcdir)/'`_gen/tp-svc-call-content-media-description.c tp-svc-call-stream.lo: _gen/tp-svc-call-stream.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tp-svc-call-stream.lo -MD -MP -MF $(DEPDIR)/tp-svc-call-stream.Tpo -c -o tp-svc-call-stream.lo `test -f '_gen/tp-svc-call-stream.c' || echo '$(srcdir)/'`_gen/tp-svc-call-stream.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tp-svc-call-stream.Tpo $(DEPDIR)/tp-svc-call-stream.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/tp-svc-call-stream.c' object='tp-svc-call-stream.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/tp-svc-call-stream.c' object='tp-svc-call-stream.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-call-stream.lo `test -f '_gen/tp-svc-call-stream.c' || echo '$(srcdir)/'`_gen/tp-svc-call-stream.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-call-stream.lo `test -f '_gen/tp-svc-call-stream.c' || echo '$(srcdir)/'`_gen/tp-svc-call-stream.c tp-svc-call-stream-endpoint.lo: _gen/tp-svc-call-stream-endpoint.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tp-svc-call-stream-endpoint.lo -MD -MP -MF $(DEPDIR)/tp-svc-call-stream-endpoint.Tpo -c -o tp-svc-call-stream-endpoint.lo `test -f '_gen/tp-svc-call-stream-endpoint.c' || echo '$(srcdir)/'`_gen/tp-svc-call-stream-endpoint.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tp-svc-call-stream-endpoint.Tpo $(DEPDIR)/tp-svc-call-stream-endpoint.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/tp-svc-call-stream-endpoint.c' object='tp-svc-call-stream-endpoint.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/tp-svc-call-stream-endpoint.c' object='tp-svc-call-stream-endpoint.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-call-stream-endpoint.lo `test -f '_gen/tp-svc-call-stream-endpoint.c' || echo '$(srcdir)/'`_gen/tp-svc-call-stream-endpoint.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-call-stream-endpoint.lo `test -f '_gen/tp-svc-call-stream-endpoint.c' || echo '$(srcdir)/'`_gen/tp-svc-call-stream-endpoint.c tp-svc-channel.lo: _gen/tp-svc-channel.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tp-svc-channel.lo -MD -MP -MF $(DEPDIR)/tp-svc-channel.Tpo -c -o tp-svc-channel.lo `test -f '_gen/tp-svc-channel.c' || echo '$(srcdir)/'`_gen/tp-svc-channel.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tp-svc-channel.Tpo $(DEPDIR)/tp-svc-channel.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/tp-svc-channel.c' object='tp-svc-channel.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/tp-svc-channel.c' object='tp-svc-channel.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-channel.lo `test -f '_gen/tp-svc-channel.c' || echo '$(srcdir)/'`_gen/tp-svc-channel.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-channel.lo `test -f '_gen/tp-svc-channel.c' || echo '$(srcdir)/'`_gen/tp-svc-channel.c tp-svc-channel-dispatcher.lo: _gen/tp-svc-channel-dispatcher.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tp-svc-channel-dispatcher.lo -MD -MP -MF $(DEPDIR)/tp-svc-channel-dispatcher.Tpo -c -o tp-svc-channel-dispatcher.lo `test -f '_gen/tp-svc-channel-dispatcher.c' || echo '$(srcdir)/'`_gen/tp-svc-channel-dispatcher.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tp-svc-channel-dispatcher.Tpo $(DEPDIR)/tp-svc-channel-dispatcher.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/tp-svc-channel-dispatcher.c' object='tp-svc-channel-dispatcher.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/tp-svc-channel-dispatcher.c' object='tp-svc-channel-dispatcher.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-channel-dispatcher.lo `test -f '_gen/tp-svc-channel-dispatcher.c' || echo '$(srcdir)/'`_gen/tp-svc-channel-dispatcher.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-channel-dispatcher.lo `test -f '_gen/tp-svc-channel-dispatcher.c' || echo '$(srcdir)/'`_gen/tp-svc-channel-dispatcher.c tp-svc-channel-dispatch-operation.lo: _gen/tp-svc-channel-dispatch-operation.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tp-svc-channel-dispatch-operation.lo -MD -MP -MF $(DEPDIR)/tp-svc-channel-dispatch-operation.Tpo -c -o tp-svc-channel-dispatch-operation.lo `test -f '_gen/tp-svc-channel-dispatch-operation.c' || echo '$(srcdir)/'`_gen/tp-svc-channel-dispatch-operation.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tp-svc-channel-dispatch-operation.Tpo $(DEPDIR)/tp-svc-channel-dispatch-operation.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/tp-svc-channel-dispatch-operation.c' object='tp-svc-channel-dispatch-operation.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/tp-svc-channel-dispatch-operation.c' object='tp-svc-channel-dispatch-operation.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-channel-dispatch-operation.lo `test -f '_gen/tp-svc-channel-dispatch-operation.c' || echo '$(srcdir)/'`_gen/tp-svc-channel-dispatch-operation.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-channel-dispatch-operation.lo `test -f '_gen/tp-svc-channel-dispatch-operation.c' || echo '$(srcdir)/'`_gen/tp-svc-channel-dispatch-operation.c tp-svc-channel-request.lo: _gen/tp-svc-channel-request.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tp-svc-channel-request.lo -MD -MP -MF $(DEPDIR)/tp-svc-channel-request.Tpo -c -o tp-svc-channel-request.lo `test -f '_gen/tp-svc-channel-request.c' || echo '$(srcdir)/'`_gen/tp-svc-channel-request.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tp-svc-channel-request.Tpo $(DEPDIR)/tp-svc-channel-request.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/tp-svc-channel-request.c' object='tp-svc-channel-request.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/tp-svc-channel-request.c' object='tp-svc-channel-request.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-channel-request.lo `test -f '_gen/tp-svc-channel-request.c' || echo '$(srcdir)/'`_gen/tp-svc-channel-request.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-channel-request.lo `test -f '_gen/tp-svc-channel-request.c' || echo '$(srcdir)/'`_gen/tp-svc-channel-request.c tp-svc-client.lo: _gen/tp-svc-client.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tp-svc-client.lo -MD -MP -MF $(DEPDIR)/tp-svc-client.Tpo -c -o tp-svc-client.lo `test -f '_gen/tp-svc-client.c' || echo '$(srcdir)/'`_gen/tp-svc-client.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tp-svc-client.Tpo $(DEPDIR)/tp-svc-client.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/tp-svc-client.c' object='tp-svc-client.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/tp-svc-client.c' object='tp-svc-client.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-client.lo `test -f '_gen/tp-svc-client.c' || echo '$(srcdir)/'`_gen/tp-svc-client.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-client.lo `test -f '_gen/tp-svc-client.c' || echo '$(srcdir)/'`_gen/tp-svc-client.c tp-svc-connection.lo: _gen/tp-svc-connection.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tp-svc-connection.lo -MD -MP -MF $(DEPDIR)/tp-svc-connection.Tpo -c -o tp-svc-connection.lo `test -f '_gen/tp-svc-connection.c' || echo '$(srcdir)/'`_gen/tp-svc-connection.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tp-svc-connection.Tpo $(DEPDIR)/tp-svc-connection.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/tp-svc-connection.c' object='tp-svc-connection.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/tp-svc-connection.c' object='tp-svc-connection.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-connection.lo `test -f '_gen/tp-svc-connection.c' || echo '$(srcdir)/'`_gen/tp-svc-connection.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-connection.lo `test -f '_gen/tp-svc-connection.c' || echo '$(srcdir)/'`_gen/tp-svc-connection.c tp-svc-connection-manager.lo: _gen/tp-svc-connection-manager.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tp-svc-connection-manager.lo -MD -MP -MF $(DEPDIR)/tp-svc-connection-manager.Tpo -c -o tp-svc-connection-manager.lo `test -f '_gen/tp-svc-connection-manager.c' || echo '$(srcdir)/'`_gen/tp-svc-connection-manager.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tp-svc-connection-manager.Tpo $(DEPDIR)/tp-svc-connection-manager.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/tp-svc-connection-manager.c' object='tp-svc-connection-manager.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/tp-svc-connection-manager.c' object='tp-svc-connection-manager.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-connection-manager.lo `test -f '_gen/tp-svc-connection-manager.c' || echo '$(srcdir)/'`_gen/tp-svc-connection-manager.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-connection-manager.lo `test -f '_gen/tp-svc-connection-manager.c' || echo '$(srcdir)/'`_gen/tp-svc-connection-manager.c tp-svc-debug.lo: _gen/tp-svc-debug.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tp-svc-debug.lo -MD -MP -MF $(DEPDIR)/tp-svc-debug.Tpo -c -o tp-svc-debug.lo `test -f '_gen/tp-svc-debug.c' || echo '$(srcdir)/'`_gen/tp-svc-debug.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tp-svc-debug.Tpo $(DEPDIR)/tp-svc-debug.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/tp-svc-debug.c' object='tp-svc-debug.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/tp-svc-debug.c' object='tp-svc-debug.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-debug.lo `test -f '_gen/tp-svc-debug.c' || echo '$(srcdir)/'`_gen/tp-svc-debug.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-debug.lo `test -f '_gen/tp-svc-debug.c' || echo '$(srcdir)/'`_gen/tp-svc-debug.c tp-svc-generic.lo: _gen/tp-svc-generic.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tp-svc-generic.lo -MD -MP -MF $(DEPDIR)/tp-svc-generic.Tpo -c -o tp-svc-generic.lo `test -f '_gen/tp-svc-generic.c' || echo '$(srcdir)/'`_gen/tp-svc-generic.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tp-svc-generic.Tpo $(DEPDIR)/tp-svc-generic.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/tp-svc-generic.c' object='tp-svc-generic.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/tp-svc-generic.c' object='tp-svc-generic.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-generic.lo `test -f '_gen/tp-svc-generic.c' || echo '$(srcdir)/'`_gen/tp-svc-generic.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-generic.lo `test -f '_gen/tp-svc-generic.c' || echo '$(srcdir)/'`_gen/tp-svc-generic.c tp-svc-media-session-handler.lo: _gen/tp-svc-media-session-handler.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tp-svc-media-session-handler.lo -MD -MP -MF $(DEPDIR)/tp-svc-media-session-handler.Tpo -c -o tp-svc-media-session-handler.lo `test -f '_gen/tp-svc-media-session-handler.c' || echo '$(srcdir)/'`_gen/tp-svc-media-session-handler.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tp-svc-media-session-handler.Tpo $(DEPDIR)/tp-svc-media-session-handler.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/tp-svc-media-session-handler.c' object='tp-svc-media-session-handler.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/tp-svc-media-session-handler.c' object='tp-svc-media-session-handler.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-media-session-handler.lo `test -f '_gen/tp-svc-media-session-handler.c' || echo '$(srcdir)/'`_gen/tp-svc-media-session-handler.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-media-session-handler.lo `test -f '_gen/tp-svc-media-session-handler.c' || echo '$(srcdir)/'`_gen/tp-svc-media-session-handler.c tp-svc-media-stream-handler.lo: _gen/tp-svc-media-stream-handler.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tp-svc-media-stream-handler.lo -MD -MP -MF $(DEPDIR)/tp-svc-media-stream-handler.Tpo -c -o tp-svc-media-stream-handler.lo `test -f '_gen/tp-svc-media-stream-handler.c' || echo '$(srcdir)/'`_gen/tp-svc-media-stream-handler.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tp-svc-media-stream-handler.Tpo $(DEPDIR)/tp-svc-media-stream-handler.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/tp-svc-media-stream-handler.c' object='tp-svc-media-stream-handler.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/tp-svc-media-stream-handler.c' object='tp-svc-media-stream-handler.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-media-stream-handler.lo `test -f '_gen/tp-svc-media-stream-handler.c' || echo '$(srcdir)/'`_gen/tp-svc-media-stream-handler.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-media-stream-handler.lo `test -f '_gen/tp-svc-media-stream-handler.c' || echo '$(srcdir)/'`_gen/tp-svc-media-stream-handler.c tp-svc-protocol.lo: _gen/tp-svc-protocol.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tp-svc-protocol.lo -MD -MP -MF $(DEPDIR)/tp-svc-protocol.Tpo -c -o tp-svc-protocol.lo `test -f '_gen/tp-svc-protocol.c' || echo '$(srcdir)/'`_gen/tp-svc-protocol.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tp-svc-protocol.Tpo $(DEPDIR)/tp-svc-protocol.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/tp-svc-protocol.c' object='tp-svc-protocol.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/tp-svc-protocol.c' object='tp-svc-protocol.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-protocol.lo `test -f '_gen/tp-svc-protocol.c' || echo '$(srcdir)/'`_gen/tp-svc-protocol.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-protocol.lo `test -f '_gen/tp-svc-protocol.c' || echo '$(srcdir)/'`_gen/tp-svc-protocol.c tp-svc-tls-cert.lo: _gen/tp-svc-tls-cert.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tp-svc-tls-cert.lo -MD -MP -MF $(DEPDIR)/tp-svc-tls-cert.Tpo -c -o tp-svc-tls-cert.lo `test -f '_gen/tp-svc-tls-cert.c' || echo '$(srcdir)/'`_gen/tp-svc-tls-cert.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tp-svc-tls-cert.Tpo $(DEPDIR)/tp-svc-tls-cert.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/tp-svc-tls-cert.c' object='tp-svc-tls-cert.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/tp-svc-tls-cert.c' object='tp-svc-tls-cert.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-tls-cert.lo `test -f '_gen/tp-svc-tls-cert.c' || echo '$(srcdir)/'`_gen/tp-svc-tls-cert.c +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tp-svc-tls-cert.lo `test -f '_gen/tp-svc-tls-cert.c' || echo '$(srcdir)/'`_gen/tp-svc-tls-cert.c mostlyclean-libtool: -rm -f *.lo @@ -1404,7 +1409,9 @@ @$(NORMAL_UNINSTALL) @list='$(dist_gir_DATA)'; test -n "$(girdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(girdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(girdir)" && rm -f $$files install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @@ -1422,7 +1429,9 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files install-typelibsDATA: $(typelibs_DATA) @$(NORMAL_INSTALL) test -z "$(typelibsdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibsdir)" @@ -1440,7 +1449,9 @@ @$(NORMAL_UNINSTALL) @list='$(typelibs_DATA)'; test -n "$(typelibsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(typelibsdir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(typelibsdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(typelibsdir)" && rm -f $$files install-nodist_genincludeHEADERS: $(nodist_geninclude_HEADERS) @$(NORMAL_INSTALL) test -z "$(genincludedir)" || $(MKDIR_P) "$(DESTDIR)$(genincludedir)" @@ -1458,7 +1469,9 @@ @$(NORMAL_UNINSTALL) @list='$(nodist_geninclude_HEADERS)'; test -n "$(genincludedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(genincludedir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(genincludedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(genincludedir)" && rm -f $$files install-tpgincludeHEADERS: $(tpginclude_HEADERS) @$(NORMAL_INSTALL) test -z "$(tpgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(tpgincludedir)" @@ -1476,7 +1489,9 @@ @$(NORMAL_UNINSTALL) @list='$(tpginclude_HEADERS)'; test -n "$(tpgincludedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(tpgincludedir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(tpgincludedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(tpgincludedir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -1580,15 +1595,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: @@ -1763,18 +1773,24 @@ touch $@ _gen/stable-spec.xml: stable-interfaces.xml _gen/stable-stamp $(tools_dir)/xincludator.py - $(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@ + $(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@.tmp + @mv $@.tmp $@ # Grab a list of re-entrant tp_cli_*_run_* methods we are committed to # generating for backwards compatibility. -_gen/reentrant-methods.list: \ - $(top_srcdir)/docs/reference/telepathy-glib-sections.txt \ - _gen/spec-stamp - $(AM_V_GEN)$(GREP) 'tp_cli_.*_run_.*' $< > $@ +# grep --no-filename is not portable :-( +_gen/reentrant-methods.list: $(ABI_LISTS) codegen.am + $(AM_V_GEN)( cd $(srcdir) && cat $(ABI_LISTS) ) | \ + $(GREP) '^tp_cli_.*_run_.*' > $@.tmp + @mv $@.tmp $@ # Things generated from the whole spec at once -_gen/gtypes.h _gen/gtypes-body.h: _gen/stable-spec.xml \ +# do nothing, output as a side-effect +_gen/gtypes.h: _gen/gtypes-body.h + @: + +_gen/gtypes-body.h: _gen/stable-spec.xml \ $(tools_dir)/glib-gtypes-generator.py $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-gtypes-generator.py \ _gen/stable-spec.xml \ @@ -1785,7 +1801,11 @@ $(AM_V_GEN)$(PYTHON) $(tools_dir)/c-constants-gen.py \ Tp $< _gen/telepathy-enums -_gen/interfaces-body.h _gen/telepathy-interfaces.h: _gen/stable-spec.xml \ +# do nothing, output as a side-effect +_gen/interfaces-body.h: _gen/telepathy-interfaces.h + @: + +_gen/telepathy-interfaces.h: _gen/stable-spec.xml \ $(tools_dir)/glib-interfaces-gen.py $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \ Tp _gen/interfaces-body.h _gen/telepathy-interfaces.h $< @@ -1794,21 +1814,6 @@ $(tools_dir)/glib-client-marshaller-gen.py $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< _tp > $@ -_gen/tp-signals-marshal.list: $(tools_dir)/glib-signals-marshal-gen.py \ - _gen/stable-spec.xml - $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py \ - _gen/stable-spec.xml > $@ - -_gen/signals-marshal.list: signals-marshal.list _gen/tp-signals-marshal.list - $(AM_V_GEN)sort -u $^ > $@ - -_gen/signals-marshal.h: _gen/signals-marshal.list codegen.am - $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_tp_marshal $< > $@ - -_gen/signals-marshal.c: _gen/signals-marshal.list codegen.am - $(AM_V_GEN){ echo '#include "_gen/signals-marshal.h"' && \ - $(GLIB_GENMARSHAL) --body --prefix=_tp_marshal $< ; } > $@ - _gen/genums.c: _gen/spec-stamp genums.c.template $(our_headers) codegen.am $(AM_V_GEN)( cd $(srcdir) && \ $(GLIB_MKENUMS) --template genums.c.template $(our_headers) \ @@ -1819,7 +1824,10 @@ $(GLIB_MKENUMS) --template genums.h.template $(our_headers) \ ) > $@ -_gen/error-str.h _gen/error-str.c: _gen/stable-spec.xml \ +_gen/error-str.h: _gen/error-str.c + @: # do nothing, output as a side-effect + +_gen/error-str.c: _gen/stable-spec.xml \ $(tools_dir)/glib-errors-str-gen.py $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-errors-str-gen.py \ _gen/error-str $< @@ -1827,20 +1835,28 @@ # Things generated per interface _gen/tp-spec-%.xml: %.xml _gen/spec-stamp $(tools_dir)/xincludator.py - $(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@ + $(AM_V_GEN)$(PYTHON) $(tools_dir)/xincludator.py $< > $@.tmp + @mv $@.tmp $@ -_gen/tp-svc-%.c _gen/tp-svc-%.h: _gen/tp-spec-%.xml \ +# do nothing, output as a side-effect +_gen/tp-svc-%.h: _gen/tp-svc-%.c + @: + +_gen/tp-svc-%.c: _gen/tp-spec-%.xml \ $(tools_dir)/glib-ginterface-gen.py \ codegen.am $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \ --filename=_gen/tp-svc-$* \ --signal-marshal-prefix=_tp \ --include='' \ - --include="\"_gen/signals-marshal.h\"" \ --not-implemented-func='tp_dbus_g_method_return_not_implemented' \ $< Tp_Svc_ -_gen/tp-cli-%-body.h _gen/tp-cli-%.h: _gen/tp-spec-%.xml \ +# do nothing, output as a side-effect +_gen/tp-cli-%.h: _gen/tp-cli-%-body.h + @: + +_gen/tp-cli-%-body.h: _gen/tp-spec-%.xml \ _gen/reentrant-methods.list \ $(tools_dir)/glib-client-gen.py \ codegen.am diff -Nru telepathy-glib-0.17.5/telepathy-glib/protocol.c telepathy-glib-0.17.6/telepathy-glib/protocol.c --- telepathy-glib-0.17.5/telepathy-glib/protocol.c 2012-02-20 16:57:08.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/protocol.c 2012-03-19 15:33:56.000000000 +0000 @@ -45,7 +45,6 @@ #include "telepathy-glib/debug-internal.h" #include "telepathy-glib/proxy-internal.h" -#include "telepathy-glib/_gen/signals-marshal.h" #include "telepathy-glib/_gen/tp-cli-protocol-body.h" #include @@ -878,6 +877,7 @@ return (tp_protocol_get_param (self, param) != NULL); } +/* FIXME: in Telepathy 1.0, rename to tp_protocol_borrow_param or remove */ /** * tp_protocol_get_param: * @self: a protocol @@ -898,6 +898,30 @@ &self->priv->protocol_struct, param); } +/* FIXME: in Telepathy 1.0, rename to tp_protocol_get_param */ +/** + * tp_protocol_dup_param: + * @self: a protocol + * @param: a parameter name + * + * + * + * Returns: (transfer full): a structure representing the parameter @param, + * or %NULL if not supported. Free with tp_connection_manager_param_free() + * + * Since: 0.17.6 + */ +TpConnectionManagerParam * +tp_protocol_dup_param (TpProtocol *self, + const gchar *param) +{ + g_return_val_if_fail (TP_IS_PROTOCOL (self), NULL); + + return tp_connection_manager_param_copy ( + tp_connection_manager_protocol_get_param ( + &self->priv->protocol_struct, param)); +} + /** * tp_protocol_can_register: * @self: a protocol @@ -938,6 +962,60 @@ } /** + * tp_protocol_borrow_params: (skip) + * @self: a protocol + * + * Returns an array of parameters supported by this connection manager, + * without additional memory allocations. The returned array is owned by + * @self, and must not be used after @self has been freed. + * + * Returns: (transfer none): an array of #TpConnectionManagerParam structures, + * terminated by one whose @name is %NULL + * + * Since: 0.17.6 + */ +const TpConnectionManagerParam * +tp_protocol_borrow_params (TpProtocol *self) +{ + g_return_val_if_fail (TP_IS_PROTOCOL (self), NULL); + + return self->priv->protocol_struct.params; +} + +/** + * tp_protocol_dup_params: + * @self: a protocol + * + * Returns a list of parameters supported by this connection manager. + * + * The returned list must be freed by the caller, for instance with + * g_list_free_full (l, + * (GDestroyNotify) tp_connection_manager_param_free). + * + * Returns: (transfer full) (element-type TelepathyGLib.ConnectionManagerParam): + * a list of #TpConnectionManagerParam structures, owned by the caller + * + * Since: 0.17.6 + */ +GList * +tp_protocol_dup_params (TpProtocol *self) +{ + guint i; + GList *ret = NULL; + + g_return_val_if_fail (TP_IS_PROTOCOL (self), NULL); + + for (i = 0; self->priv->protocol_struct.params[i].name != NULL; i++) + { + ret = g_list_prepend (ret, + tp_connection_manager_param_copy ( + &(self->priv->protocol_struct.params[i]))); + } + + return g_list_reverse (ret); +} + +/** * tp_protocol_get_vcard_field: * @self: a protocol object * diff -Nru telepathy-glib-0.17.5/telepathy-glib/protocol.h telepathy-glib-0.17.6/telepathy-glib/protocol.h --- telepathy-glib-0.17.5/telepathy-glib/protocol.h 2012-02-09 14:22:50.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/protocol.h 2012-03-12 12:37:25.000000000 +0000 @@ -85,10 +85,15 @@ const TpConnectionManagerParam *tp_protocol_get_param (TpProtocol *self, const gchar *param); +TpConnectionManagerParam *tp_protocol_dup_param (TpProtocol *self, + const gchar *param); gboolean tp_protocol_has_param (TpProtocol *self, const gchar *param); gboolean tp_protocol_can_register (TpProtocol *self); GStrv tp_protocol_dup_param_names (TpProtocol *self) G_GNUC_WARN_UNUSED_RESULT; +GList *tp_protocol_dup_params (TpProtocol *self) G_GNUC_WARN_UNUSED_RESULT; +const TpConnectionManagerParam *tp_protocol_borrow_params (TpProtocol *self) + G_GNUC_WARN_UNUSED_RESULT; const gchar * const * /* gtk-doc sucks */ diff -Nru telepathy-glib-0.17.5/telepathy-glib/proxy.c telepathy-glib-0.17.6/telepathy-glib/proxy.c --- telepathy-glib-0.17.5/telepathy-glib/proxy.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/proxy.c 2012-03-07 11:51:11.000000000 +0000 @@ -36,8 +36,6 @@ #include "simple-client-factory-internal.h" #include "util-internal.h" -#include "_gen/signals-marshal.h" - #include "_gen/tp-cli-generic-body.h" #if 0 @@ -1366,8 +1364,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__UINT_OBJECT, + NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_UINT, DBUS_TYPE_G_PROXY); /** @@ -1392,8 +1389,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - _tp_marshal_VOID__UINT_INT_STRING, + NULL, NULL, NULL, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_INT, G_TYPE_STRING); } diff -Nru telepathy-glib-0.17.5/telepathy-glib/signals-marshal.list telepathy-glib-0.17.6/telepathy-glib/signals-marshal.list --- telepathy-glib-0.17.5/telepathy-glib/signals-marshal.list 2012-02-20 16:56:41.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/signals-marshal.list 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -VOID:BOXED -VOID:BOXED,BOXED -VOID:BOXED,BOXED,BOXED,BOXED,OBJECT,BOXED -VOID:BOXED,UINT,INT,STRING -VOID:INT,UINT,STRING -VOID:OBJECT,BOOLEAN -VOID:OBJECT,BOXED -VOID:OBJECT,INT,UINT,UINT -VOID:OBJECT,INT64,OBJECT -VOID:OBJECT,OBJECT -VOID:OBJECT,POINTER -VOID:OBJECT,POINTER,POINTER -VOID:OBJECT,STRING,STRING -VOID:OBJECT,UINT,INT,STRING -VOID:OBJECT,UINT,STRING -VOID:POINTER,OBJECT -VOID:POINTER,UINT,INT,STRING -VOID:STRING,UINT,UINT,BOXED -VOID:UINT,BOXED -VOID:UINT,INT,STRING -VOID:UINT,OBJECT -VOID:UINT,STRING,STRING -VOID:UINT,UINT,BOXED,BOXED -VOID:UINT,UINT,UINT,STRING,BOXED -VOID:VOID diff -Nru telepathy-glib-0.17.5/telepathy-glib/stream-tube-channel.c telepathy-glib-0.17.6/telepathy-glib/stream-tube-channel.c --- telepathy-glib-0.17.5/telepathy-glib/stream-tube-channel.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/stream-tube-channel.c 2012-03-07 11:51:11.000000000 +0000 @@ -64,8 +64,6 @@ #include "telepathy-glib/debug-internal.h" #include "telepathy-glib/automatic-client-factory-internal.h" -#include "_gen/signals-marshal.h" - #include #include @@ -454,8 +452,7 @@ _signals[INCOMING] = g_signal_new ("incoming", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + 0, NULL, NULL, NULL, G_TYPE_NONE, 1, TP_TYPE_STREAM_TUBE_CONNECTION); diff -Nru telepathy-glib-0.17.5/telepathy-glib/stream-tube-connection.c telepathy-glib-0.17.6/telepathy-glib/stream-tube-connection.c --- telepathy-glib-0.17.5/telepathy-glib/stream-tube-connection.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/stream-tube-connection.c 2012-03-07 11:51:11.000000000 +0000 @@ -252,8 +252,7 @@ _signals[CLOSED] = g_signal_new ("closed", G_OBJECT_CLASS_TYPE (cls), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - g_cclosure_marshal_VOID__POINTER, + 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_POINTER); } diff -Nru telepathy-glib-0.17.5/telepathy-glib/TelepathyGLib-0.12.gir telepathy-glib-0.17.6/telepathy-glib/TelepathyGLib-0.12.gir --- telepathy-glib-0.17.5/telepathy-glib/TelepathyGLib-0.12.gir 2012-02-20 17:31:23.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/TelepathyGLib-0.12.gir 2012-03-19 15:34:50.000000000 +0000 @@ -267,6 +267,119 @@ + + If the account's connection is not connected, return the D-Bus error name +with which it last disconnected or failed to connect (in particular, this +is %TP_ERROR_STR_CANCELLED if it was disconnected by a user request). +This is the same as #TpAccount:connection-error. + +If @details is not %NULL, it will be used to return additional details about +the error (the same as #TpAccount:connection-error-details). + +Otherwise, return %NULL, without altering @details. + +The returned string and @details may become invalid when the main loop is +re-entered or the account is destroyed. + + a D-Bus error name, or %NULL. + + + + + optionally used to return a variant of type %G_VARIANT_TYPE_VARDICT, which must be unreffed by the caller with g_variant_unref() + + + + + + Returns the parameters of the account, in a variant of type +%G_VARIANT_TYPE_VARDICT where the keys +are parameter names (account, password, require-encryption etc.). +Use g_variant_lookup() or g_variant_lookup_value() for convenient +access to the values. + +The allowed parameters depend on the connection manager, and can be found +via tp_connection_manager_get_protocol() and +tp_connection_manager_protocol_get_param(). Well-known parameters are +listed +<ulink url="http://telepathy.freedesktop.org/spec/org.freedesktop.Telepathy.ConnectionManager.html#org.freedesktop.Telepathy.ConnectionManager.RequestConnection">in +the Telepathy D-Bus Interface Specification</ulink>. + +parameters on @account, of type %G_VARIANT_TYPE_VARDICT + + the dictionary of + + + + + Return provider-specific information used to identify this +account. Use g_variant_get_type() to check that the type +is what you expect; for instance, if the +#TpAccount:storage-provider has string-based user identifiers, +this variant should have type %G_VARIANT_TYPE_STRING. + +#TpAccount:storage-identifier-variant property + + the same as the + + + + + Makes an asynchronous request of @self's StorageSpecificInformation +property (part of the Account.Interface.Storage interface). + +When the operation is finished, @callback will be called. You must then +call tp_account_dup_storage_specific_information_vardict_finish() to get the +result of the request. + + + + + + a callback to call when the request is satisfied + + + + data to pass to @callback + + + + + + Retrieve the value of the request begun with +tp_account_dup_storage_specific_information_vardict_async(). + +of type %G_VARIANT_TYPE_VARDICT + + a map from strings to variants, + + + + + a #GAsyncResult + + + + @@ -1456,6 +1569,67 @@ + + Requests an asynchronous update of parameters of @account. When the +operation is finished, @callback will be called. You can then call +tp_account_update_parameters_finish() to get the result of the operation. + +If @parameters is a floating reference (see g_variant_ref_sink()), +ownership of @parameters is taken by this function. This means +you can pass the result of g_variant_new() or g_variant_new_parsed() +directly to this function without additional reference-count management. + + + + + + a variant of type %G_VARIANT_TYPE_VARDICT containing new parameters to set on @account + + + + list of parameters to unset on @account + + + + a callback to call when the request is satisfied + + + + data to pass to @callback + + + + + + Finishes an async update of the parameters on @account. + + %TRUE if the request succeeded, otherwise %FALSE + + + + + a #GAsyncResult + + + + a #GStrv to fill with properties that need a reconnect to take effect + + + + @@ -1857,6 +2031,24 @@ the value is %NULL. + + Provider-specific information used to identify this +account. Use g_variant_get_type() to check that the type +is what you expect. For instance, if you use a +#TpAccount:storage-provider with numeric identifiers for accounts, +this variant might have type %G_VARIANT_TYPE_UINT32; +if the storage provider has string-based identifiers, it should +have type %G_VARIANT_TYPE_STRING. + +This property cannot change once an Account has been created. + +This is not guaranteed to have been retrieved until the +%TP_ACCOUNT_FEATURE_STORAGE feature has been prepared; until then, +the value is %NULL. + + @@ -5854,10 +6046,12 @@ - Whether or not %self has the %TP_IFACE_CHANNEL_INTERFACE_DTMF -interfaces + Whether or not %self can send DTMF tones using +tp_call_channel_send_tones_async(). To be able to send DTMF tones, at least +one of @self's #TpCallChannel:contents must implement +%TP_IFACE_CALL_CONTENT_INTERFACE_DTMF interface. - whether or not @self supports DTMF + whether or not @self can send DTMF tones. @@ -5870,6 +6064,16 @@ + + Whether or not %self has the %TP_IFACE_CHANNEL_INTERFACE_HOLD +interfaces + + whether or not @self supports Hold + + + @@ -5917,6 +6121,50 @@ + + Requests that the connection manager holds or unholds the call. Watch +#TpCallChannel::hold-state property to know when the channel goes on +hold or is unheld. Unholding may fail if the streaming implementation +can not obtain all the resources needed to restart the call. + + + + + + Whether to request a hold or a unhold + + + + a callback to call when the operation finishes + + + + data to pass to @callback + + + + + + Finishes tp_call_channel_request_hold_async + + + + + + a #GAsyncResult + + + + @@ -6063,6 +6311,16 @@ Whether or not the streaming is done by dedicated hardware. + + A #TpLocalHoldState specifying if the Call is currently held + + + + A #TpLocalHoldStateReason specifying why the Call is currently held. + + @@ -6102,7 +6360,8 @@ - Detailed information about #TpCallChannel:state. + Detailed infoermation about #TpCallChannel:state. It is a #GHashTable +mapping gchar*->GValue, it can be accessed using the tp_asv_* functions. @@ -6204,10 +6463,10 @@ - additional details + additional details as a #GHashTable readable using the tp_asv_* functions. - - + + @@ -6388,6 +6647,14 @@ + + The parent #TpCallChannel of the content. + + The #TpConnection of the call. + + The Content that this streams belongs to + + @@ -6926,6 +7201,44 @@ + + Return whether audio call can be established. + +@handle_type as TargetHandleType, a True value for InitialAudio and an +identifier of the appropriate type can be expected to work, %FALSE otherwise. + + %TRUE if a channel request containing Call as ChannelType, + + + + + the handle type of the call; #TP_HANDLE_TYPE_CONTACT for private, #TP_HANDLE_TYPE_ROOM or #TP_HANDLE_TYPE_NONE for conference (depending on the protocol) + + + + + + Return whether audio/video call can be established. + +@handle_type as TargetHandleType, a True value for +InitialAudio/InitialVideo and an identifier of the appropriate type can be +expected to work, +%FALSE otherwise. + + %TRUE if a channel request containing Call as ChannelType, + + + + + the handle type of the call; #TP_HANDLE_TYPE_CONTACT for private, #TP_HANDLE_TYPE_ROOM or #TP_HANDLE_TYPE_NONE for conference (depending on the protocol) + + + + @@ -6984,6 +7297,19 @@ + + Return whether private file transfer can be established by providing +a contact identifier. + +HandleTypeContact as TargetHandleType and a contact identifier can be +expected to work, %FALSE otherwise. + + %TRUE if a channel request containing FileTransfer as ChannelType, + + + @@ -7332,7 +7658,9 @@ + introspectable="0" + deprecated="Use tp_proxy_prepare_async()" + deprecated-version="0.17.6"> If @self is ready for use or has been invalidated, call @callback immediately, then return. Otherwise, arrange for @callback to be called when @self either becomes ready for use @@ -7914,7 +8242,9 @@ + introspectable="0" + deprecated="use tp_proxy_is_prepared() with" + deprecated-version="0.17.6"> Returns the same thing as the #TpChannel:channel-ready property. New code should use tp_proxy_is_prepared(), which is a more general form of @@ -7928,7 +8258,9 @@ One important difference is that after #TpProxy::invalidated is signalled, #TpChannel:channel-ready keeps its current value - which might be %TRUE, if the channel was successfully prepared before it became -invalidated - but tp_proxy_is_prepared() returns %FALSE for all features. +invalidated - but tp_proxy_is_prepared() returns %FALSE for all features. + +%TP_CHANNEL_FEATURE_CORE %TRUE if introspection has completed @@ -8105,7 +8437,7 @@ c:identifier="tp_channel_run_until_ready" version="0.7.1" introspectable="0" - deprecated="Use tp_connection_call_when_ready," + deprecated="Use tp_proxy_prepare_async() and re-enter the main" deprecated-version="0.11.0"> If @self is ready for use (introspection has finished, etc.), return immediately. Otherwise, re-enter the main loop until the channel either @@ -8114,8 +8446,8 @@ %FALSE if the channel has become invalid. -or restructure your program in such a way as to avoid re-entering the -main loop. +loop yourself, or restructure your program in such a way as to avoid +re-entering the main loop. %TRUE if the channel has been introspected and is ready for use, @@ -8147,7 +8479,10 @@ tp_proxy_prepare_async() has finished preparing %TP_CHANNEL_FEATURE_CORE. - + Initially %FALSE; changes to %TRUE when tp_proxy_prepare_async() has finished preparing %TP_CHANNEL_FEATURE_CORE, and if the channel is a group, %TP_CHANNEL_FEATURE_GROUP. @@ -8160,7 +8495,10 @@ be %TRUE, if the channel was successfully prepared before it became invalidated - but tp_proxy_is_prepared() returns %FALSE for all features. -Change notification is via notify::channel-ready. +Change notification is via notify::channel-ready. + +%TP_CHANNEL_FEATURE_CORE for checks, or tp_proxy_prepare_async() for +notification - + Signature of a callback passed to tp_channel_call_when_ready(), which will be called exactly once, when the channel becomes ready or invalid (whichever happens first) @@ -10565,7 +10905,9 @@ + introspectable="0" + deprecated="Use tp_proxy_prepare_async()" + deprecated-version="0.17.6"> If @self is ready for use or has been invalidated, call @callback immediately, then return. Otherwise, arrange for @callback to be called when @self either becomes ready for use @@ -11335,8 +11677,12 @@ - Returns the same thing as the #TpConnection:connection-ready property. + introspectable="0" + deprecated="use tp_proxy_is_prepared() with" + deprecated-version="0.17.6"> + Returns the same thing as the #TpConnection:connection-ready property. + +%TP_CONNECTION_FEATURE_CONNECTED %TRUE if introspection has completed @@ -11711,7 +12057,7 @@ c:identifier="tp_connection_run_until_ready" version="0.7.1" introspectable="0" - deprecated="Use tp_connection_call_when_ready," + deprecated="Use tp_proxy_prepare_async() and re-enter the main" deprecated-version="0.11.0"> If @self is connected and ready for use, return immediately. Otherwise, call Connect() (unless @connect is %FALSE) and re-enter the main loop @@ -11720,8 +12066,8 @@ %FALSE if the connection has become invalid. -or restructure your program in such a way as to avoid re-entering the -main loop. +loop yourself, or restructure your program in such a way as to avoid +re-entering the main loop. %TRUE if the connection is now connected and ready for use, @@ -12174,7 +12520,10 @@ This connection's connection manager name. - + Initially %FALSE; changes to %TRUE when the connection has gone to CONNECTED status, introspection has finished and it's ready for use. @@ -12184,7 +12533,10 @@ This is similar to %TP_CONNECTION_FEATURE_CONNECTED, except that once it has changed to %TRUE, it remains %TRUE even if the connection has -been invalidated. +been invalidated. + +%TP_CHANNEL_FEATURE_CONNECTED for checks, or tp_proxy_prepare_async() for +notification Convenience function to create a new connection manager proxy. If its protocol and parameter information are required, you should call -tp_connection_manager_call_when_ready() on the result. +tp_proxy_prepare_async() on the result. is set. @@ -12855,7 +13207,8 @@ + introspectable="0" + deprecated="since 0.17.6, use tp_proxy_prepare_async() instead"> Call the @callback from the main loop when information about @cm's supported protocols and parameters has been retrieved. @@ -12896,7 +13249,7 @@ If this function is called before the connection manager information has been obtained, the result is always %NULL. Use -tp_connection_manager_call_when_ready() to wait for this. +tp_proxy_prepare_async() to wait for this. The result is copied and must be freed by the caller, but it is not necessarily still true after the main loop is re-entered. @@ -12905,6 +13258,28 @@ + + Return objects representing all protocols supported by this connection +manager. + +If this function is called before the connection manager information has +been obtained, the result is always %NULL. Use tp_proxy_prepare_async() +to wait for this. + +The caller must free the list, for instance with +<literal>g_list_free_full (l, g_object_unref)</literal>. + +of #TpProtocol objects representing the protocols supported by @self, +owned by the caller + + a list + + + + + @@ -12946,7 +13321,7 @@ If this function is called before the connection manager information has been obtained, the result is always %NULL. Use -tp_connection_manager_call_when_ready() to wait for this. +tp_proxy_prepare_async() to wait for this. The result is not necessarily valid after the main loop is re-entered. Since 0.11.3, it can be copied with tp_connection_manager_protocol_copy() @@ -12991,8 +13366,8 @@ Return whether @protocol is supported by this connection manager. If this function is called before the connection manager information has -been obtained, the result is always %FALSE. Use -tp_connection_manager_call_when_ready() to wait for this. +been obtained, the result is always %FALSE. Use tp_proxy_prepare_async() +to wait for this. %TRUE if this connection manager supports @protocol @@ -13007,7 +13382,8 @@ + introspectable="0" + deprecated="since 0.17.6, use tp_proxy_is_prepared()"> If protocol and parameter information has been obtained from the connection manager or the cache in the .manager file, return %TRUE. Otherwise, return %FALSE. @@ -13016,7 +13392,8 @@ running; the #GObject::notify signal is emitted for the #TpConnectionManager:info-source property. -%TP_CM_INFO_SOURCE_NONE +%TP_CM_INFO_SOURCE_NONE +with %TP_CONNECTION_MANAGER_FEATURE_CORE instead %TRUE, unless the #TpConnectionManager:info-source property is @@ -13109,8 +13486,8 @@ Emitted when the connection manager's capabilities have been discovered. -This signal is not very helpful. Since 0.7.26, using -tp_connection_manager_call_when_ready() instead is recommended. +This signal is not very helpful. Using +tp_proxy_prepare_async() instead is recommended. @@ -13387,7 +13764,8 @@ + c:type="TpConnectionManagerWhenReadyCb" + deprecated="since 0.17.6, use tp_proxy_prepare_async() instead"> Called as the result of tp_connection_manager_call_when_ready(). If the connection manager's protocol and parameter information could be retrieved, @error is %NULL and @cm is considered to be ready. Otherwise, @error is @@ -13655,7 +14033,9 @@ - + Signature of a callback passed to tp_connection_call_when_ready(), which will be called exactly once, when the connection becomes ready or invalid (whichever happens first) @@ -22417,6 +22797,21 @@ + + Returns an array of parameters supported by this connection manager, +without additional memory allocations. The returned array is owned by +@self, and must not be used after @self has been freed. + +terminated by one whose @name is %NULL + + an array of #TpConnectionManagerParam structures, + + + @@ -22427,6 +22822,24 @@ + + <!-- no more to say --> + +or %NULL if not supported. Free with tp_connection_manager_param_free() + + a structure representing the parameter @param, + + + + + a parameter name + + + + + + Returns a list of parameters supported by this connection manager. + +The returned list must be freed by the caller, for instance with +<literal>g_list_free_full (l, +(GDestroyNotify) tp_connection_manager_param_free)</literal>. + +a list of #TpConnectionManagerParam structures, owned by the caller + + + + + + @@ -30147,8 +30576,8 @@ callback when done. Since 0.7.26, this function will wait for each #TpConnectionManager -to be ready, so all connection managers passed to @callback will be ready -(tp_connection_manager_is_ready() will return %TRUE) unless an error +to be ready, so all connection managers passed to @callback will have +their %TP_CONNECTION_MANAGER_FEATURE_CORE feature prepared, unless an error occurred while launching that connection manager. @@ -30181,6 +30610,57 @@ + + List the available (running or installed) connection managers, +asynchronously, and wait for their %TP_CONNECTION_MANAGER_FEATURE_CORE +feature to be ready. + + + + + + a #TpDBusDaemon, or %NULL to use tp_dbus_daemon_dup() + + + + a callback to call with a list of CMs + + + + data to pass to @callback + + + + + + Finish listing the available connection managers. + +Free the list after use, for instance with +<literal>g_list_free_full (list, g_object_unref)</literal>. + +newly allocated list of references to #TpConnectionManager objects + + a + + + + + + + the result of tp_list_connection_managers_async() + + + + diff -Nru telepathy-glib-0.17.5/telepathy-glib/telepathy-glib.pc.in telepathy-glib-0.17.6/telepathy-glib/telepathy-glib.pc.in --- telepathy-glib-0.17.5/telepathy-glib/telepathy-glib.pc.in 2012-02-09 14:22:50.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/telepathy-glib.pc.in 2012-03-16 15:28:32.000000000 +0000 @@ -7,6 +7,6 @@ Description: GLib utility library for the Telepathy framework Version: @VERSION@ Requires: pkg-config >= 0.21 -Requires.private: dbus-glib-1 >= 0.82, glib-2.0 >= 2.24, gobject-2.0 >= 2.24, gio-2.0 >= 2.24 +Requires.private: dbus-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30 Libs: -L${libdir} -ltelepathy-glib Cflags: -I${includedir}/telepathy-1.0 diff -Nru telepathy-glib-0.17.5/telepathy-glib/telepathy-glib-uninstalled.pc.in telepathy-glib-0.17.6/telepathy-glib/telepathy-glib-uninstalled.pc.in --- telepathy-glib-0.17.5/telepathy-glib/telepathy-glib-uninstalled.pc.in 2012-02-09 14:22:50.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/telepathy-glib-uninstalled.pc.in 2012-03-16 15:28:32.000000000 +0000 @@ -7,6 +7,6 @@ Description: GLib utility library for the Telepathy framework Version: @VERSION@ Requires: pkg-config >= 0.21 -Requires.private: dbus-glib-1 >= 0.82, glib-2.0 >= 2.24, gobject-2.0 >= 2.24, gio-2.0 >= 2.24 +Requires.private: dbus-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30 Libs: ${abs_top_builddir}/telepathy-glib/libtelepathy-glib.la Cflags: -I${abs_top_srcdir} -I${abs_top_builddir} diff -Nru telepathy-glib-0.17.5/telepathy-glib/text-channel.c telepathy-glib-0.17.6/telepathy-glib/text-channel.c --- telepathy-glib-0.17.5/telepathy-glib/text-channel.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/text-channel.c 2012-03-07 11:51:11.000000000 +0000 @@ -65,8 +65,6 @@ #include "telepathy-glib/automatic-client-factory-internal.h" #include "telepathy-glib/channel-internal.h" -#include "_gen/signals-marshal.h" - #include #include @@ -971,8 +969,7 @@ signals[SIG_MESSAGE_RECEIVED] = g_signal_new ("message-received", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + 0, NULL, NULL, NULL, G_TYPE_NONE, 1, TP_TYPE_SIGNALLED_MESSAGE); @@ -997,8 +994,7 @@ "pending-message-removed", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + 0, NULL, NULL, NULL, G_TYPE_NONE, 1, TP_TYPE_SIGNALLED_MESSAGE); @@ -1024,8 +1020,7 @@ "message-sent", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - _tp_marshal_VOID__OBJECT_UINT_STRING, + 0, NULL, NULL, NULL, G_TYPE_NONE, 3, TP_TYPE_SIGNALLED_MESSAGE, G_TYPE_UINT, G_TYPE_STRING); diff -Nru telepathy-glib-0.17.5/telepathy-glib/util.c telepathy-glib-0.17.6/telepathy-glib/util.c --- telepathy-glib-0.17.5/telepathy-glib/util.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/util.c 2012-03-12 12:37:26.000000000 +0000 @@ -2039,3 +2039,33 @@ return contacts; } + +/* + * @l: (transfer none) (element-type GLib.Object): a list of #GObject or + * any subclass + * + * Returns: (transfer full): a copy of @l + */ +GList * +_tp_object_list_copy (GList *l) +{ + GList *new_l; + + new_l = g_list_copy (l); + g_list_foreach (new_l, (GFunc) g_object_ref, NULL); + return new_l; +} + +/* + * @l: (transfer full) (element-type GLib.Object): a list of #GObject or + * any subclass + * + * Unref each item of @l and free the list. + * + * This function can be cast to #GDestroyNotify. + */ +void +_tp_object_list_free (GList *l) +{ + g_list_free_full (l, g_object_unref); +} diff -Nru telepathy-glib-0.17.5/telepathy-glib/util-internal.h telepathy-glib-0.17.6/telepathy-glib/util-internal.h --- telepathy-glib-0.17.5/telepathy-glib/util-internal.h 2012-02-09 14:22:50.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/util-internal.h 2012-03-12 12:37:26.000000000 +0000 @@ -105,4 +105,7 @@ GPtrArray *_tp_contacts_from_values (GHashTable *table); +GList *_tp_object_list_copy (GList *l); +void _tp_object_list_free (GList *l); + #endif /* __TP_UTIL_INTERNAL_H__ */ diff -Nru telepathy-glib-0.17.5/telepathy-glib/versions/0.17.6.abi telepathy-glib-0.17.6/telepathy-glib/versions/0.17.6.abi --- telepathy-glib-0.17.5/telepathy-glib/versions/0.17.6.abi 1970-01-01 00:00:00.000000000 +0000 +++ telepathy-glib-0.17.6/telepathy-glib/versions/0.17.6.abi 2012-03-19 15:10:04.000000000 +0000 @@ -0,0 +1,32 @@ +Version: TELEPATHY_GLIB_0.17.6 +Extends: TELEPATHY_GLIB_0.17.5 +Release: 0.17.6 + +tp_account_dup_detailed_error_vardict +tp_account_dup_parameters_vardict +tp_account_dup_storage_identifier_variant +tp_account_dup_storage_specific_information_vardict_async +tp_account_dup_storage_specific_information_vardict_finish +tp_account_update_parameters_vardict_async +tp_account_update_parameters_vardict_finish +tp_base_media_call_channel_get_local_hold_state +tp_call_channel_has_hold +tp_call_channel_request_hold_async +tp_call_channel_request_hold_finish +tp_call_content_media_description_add_rtcp_extended_reports_interface +tp_call_content_media_description_add_rtcp_feedback_interface +tp_call_content_media_description_add_rtcp_feedback_message +tp_call_content_media_description_add_rtp_header_extension +tp_call_content_media_description_add_rtp_header_extensions_interface +tp_call_content_media_description_set_does_avpf +tp_call_content_media_description_set_rtcp_extended_reports +tp_call_content_media_description_set_rtcp_feedback_minimum_interval +tp_capabilities_supports_audio_call +tp_capabilities_supports_audio_video_call +tp_capabilities_supports_file_transfer +tp_connection_manager_dup_protocols +tp_list_connection_managers_async +tp_list_connection_managers_finish +tp_protocol_borrow_params +tp_protocol_dup_param +tp_protocol_dup_params diff -Nru telepathy-glib-0.17.5/tests/dbus/account.c telepathy-glib-0.17.6/tests/dbus/account.c --- telepathy-glib-0.17.5/tests/dbus/account.c 2012-02-20 16:57:08.000000000 +0000 +++ telepathy-glib-0.17.6/tests/dbus/account.c 2012-03-12 12:37:26.000000000 +0000 @@ -257,22 +257,38 @@ static void test_reconnect (Test *test, - gconstpointer data G_GNUC_UNUSED) + gconstpointer data) { - GHashTable *set = tp_asv_new ( - "set", G_TYPE_STRING, "value", - NULL); - const gchar *unset[] = { "unset", NULL }; GStrv reconnect_required; + const gchar *unset[] = { "unset", NULL }; test->account = tp_account_new (test->dbus, ACCOUNT_PATH, NULL); g_assert (test->account != NULL); - tp_account_update_parameters_async (test->account, set, unset, - tp_tests_result_ready_cb, &test->result); - tp_tests_run_until_result (&test->result); - tp_account_update_parameters_finish (test->account, test->result, - &reconnect_required, &test->error); + if (!tp_strdiff (data, "vardict")) + { + tp_account_update_parameters_vardict_async (test->account, + g_variant_new_parsed ("{ 'set': <%s> }", "value"), unset, + tp_tests_result_ready_cb, &test->result); + tp_tests_run_until_result (&test->result); + tp_account_update_parameters_vardict_finish (test->account, test->result, + &reconnect_required, &test->error); + } + else + { + GHashTable *set = tp_asv_new ( + "set", G_TYPE_STRING, "value", + NULL); + + tp_account_update_parameters_async (test->account, set, unset, + tp_tests_result_ready_cb, &test->result); + tp_tests_run_until_result (&test->result); + tp_account_update_parameters_finish (test->account, test->result, + &reconnect_required, &test->error); + + g_hash_table_unref (set); + } + g_assert_no_error (test->error); /* check that reconnect_required survives longer than result */ tp_clear_object (&test->result); @@ -308,31 +324,31 @@ #define assert_strprop(self, prop, val) \ {\ - gchar *s; \ + gchar *_s; \ \ g_object_get (self, \ - prop, &s, \ + prop, &_s, \ NULL); \ - g_assert_cmpstr (s, ==, val);\ - g_free (s); \ + g_assert_cmpstr (_s, ==, val);\ + g_free (_s); \ } #define assert_uintprop(self, prop, val) \ {\ - guint u; \ + guint _u; \ \ g_object_get (self, \ - prop, &u, \ + prop, &_u, \ NULL); \ - g_assert_cmpuint (u, ==, val);\ + g_assert_cmpuint (_u, ==, val);\ } #define assert_boolprop(self, prop, val) \ {\ - gboolean b; \ + gboolean _b; \ \ g_object_get (self, \ - prop, &b, \ + prop, &_b, \ NULL); \ - g_assert_cmpint (b, ==, val);\ + g_assert_cmpint (_b, ==, val);\ } static void @@ -346,6 +362,7 @@ const GHashTable *details = GUINT_TO_POINTER (666); GStrv strv; const gchar * const *cstrv; + GVariant *variant; test->account = tp_account_new (test->dbus, ACCOUNT_PATH, NULL); g_assert (test->account != NULL); @@ -367,6 +384,10 @@ assert_strprop (test->account, "nickname", "badger"); g_assert_cmpuint (tp_asv_size (tp_account_get_parameters (test->account)), ==, 0); + variant = tp_account_dup_parameters_vardict (test->account); + g_assert_cmpstr (g_variant_get_type_string (variant), ==, "a{sv}"); + g_assert_cmpuint (g_variant_n_children (variant), ==, 0); + g_variant_unref (variant); g_assert (!tp_account_get_connect_automatically (test->account)); assert_boolprop (test->account, "connect-automatically", FALSE); g_assert (tp_account_get_has_been_online (test->account)); @@ -475,8 +496,13 @@ { GQuark account_features[] = { TP_ACCOUNT_FEATURE_STORAGE, 0 }; GValue *gvalue; + GVariant *gvariant; GHashTable *info; GError *error = NULL; + gboolean found; + gint32 i; + guint32 u; + const gchar *s; test->account = tp_account_new (test->dbus, ACCOUNT_PATH, NULL); g_assert (test->account != NULL); @@ -496,6 +522,11 @@ "storage-identifier", &gvalue, NULL); g_assert (gvalue == NULL); + g_assert (tp_account_get_storage_identifier (test->account) == NULL); + g_object_get (test->account, + "storage-identifier", &gvariant, + NULL); + g_assert (gvariant == NULL); g_assert_cmpuint (tp_account_get_storage_restrictions (test->account), ==, 0); assert_uintprop (test->account, "storage-restrictions", 0); @@ -510,6 +541,7 @@ "org.freedesktop.Telepathy.glib.test"); assert_strprop (test->account, "storage-provider", "org.freedesktop.Telepathy.glib.test"); + g_assert_cmpstr ( g_value_get_string (tp_account_get_storage_identifier (test->account)), ==, "unique-identifier"); @@ -518,6 +550,20 @@ NULL); g_assert_cmpstr (g_value_get_string (gvalue), ==, "unique-identifier"); g_boxed_free (G_TYPE_VALUE, gvalue); + + gvariant = tp_account_dup_storage_identifier_variant (test->account); + g_assert_cmpstr (g_variant_get_type_string (gvariant), ==, "s"); + g_assert_cmpstr (g_variant_get_string (gvariant, NULL), ==, + "unique-identifier"); + g_variant_unref (gvariant); + g_object_get (test->account, + "storage-identifier-variant", &gvariant, + NULL); + g_assert_cmpstr (g_variant_get_type_string (gvariant), ==, "s"); + g_assert_cmpstr (g_variant_get_string (gvariant, NULL), ==, + "unique-identifier"); + g_variant_unref (gvariant); + g_assert_cmpuint (tp_account_get_storage_restrictions (test->account), ==, TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_ENABLED | TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PARAMETERS); @@ -541,6 +587,31 @@ g_assert_cmpstr (tp_asv_get_string (info, "marco"), ==, "polo"); tp_clear_object (&test->result); + + /* the same, but with 100% more GVariant */ + tp_account_dup_storage_specific_information_vardict_async (test->account, + tp_tests_result_ready_cb, &test->result); + tp_tests_run_until_result (&test->result); + + gvariant = tp_account_dup_storage_specific_information_vardict_finish ( + test->account, test->result, &error); + g_assert_no_error (error); + + g_assert_cmpstr (g_variant_get_type_string (gvariant), ==, "a{sv}"); + found = g_variant_lookup (gvariant, "one", "i", &i); + g_assert (found); + g_assert_cmpint (i, ==, 1); + found = g_variant_lookup (gvariant, "two", "u", &u); + g_assert (found); + g_assert_cmpint (u, ==, 2); + found = g_variant_lookup (gvariant, "marco", "&s", &s); + g_assert (found); + g_assert_cmpstr (s, ==, "polo"); + found = g_variant_lookup (gvariant, "barisione", "&s", &s); + g_assert (!found); + + g_variant_unref (gvariant); + tp_clear_object (&test->result); } static void @@ -624,6 +695,10 @@ GHashTable *change = tp_asv_new (NULL, NULL); TpConnection *conn; const GHashTable *details; + GVariant *details_v; + gboolean found; + gchar *s; + guint32 u; test->account = tp_account_new (test->dbus, ACCOUNT_PATH, NULL); g_assert (test->account != NULL); @@ -766,6 +841,20 @@ g_assert_cmpuint (tp_asv_get_uint32 (details, "bits-of-entropy", NULL), ==, 15); + s = tp_account_dup_detailed_error_vardict (test->account, &details_v); + g_assert_cmpstr (s, ==, "org.debian.packages.OpenSSL.NotRandomEnough"); + g_free (s); + g_assert_cmpuint (g_variant_n_children (details_v), >=, 2); + g_assert_cmpstr (g_variant_get_type_string (details_v), ==, "a{sv}"); + found = g_variant_lookup (details_v, "debug-message", "s", &s); + g_assert (found); + g_assert_cmpstr (s, ==, "shiiiiii-"); + g_free (s); + found = g_variant_lookup (details_v, "bits-of-entropy", "u", &u); + g_assert (found); + g_assert_cmpint (u, ==, 15); + g_variant_unref (details_v); + /* staple on a Connection (this is intended for use in e.g. observers, * if they're told about a Connection that the Account hasn't told them * about yet) */ @@ -833,6 +922,8 @@ g_test_add ("/account/reconnect", Test, NULL, setup_service, test_reconnect, teardown_service); + g_test_add ("/account/reconnect", Test, "vardict", setup_service, + test_reconnect, teardown_service); g_test_add ("/account/prepare/success", Test, NULL, setup_service, test_prepare_success, teardown_service); diff -Nru telepathy-glib-0.17.5/tests/dbus/cm.c telepathy-glib-0.17.6/tests/dbus/cm.c --- telepathy-glib-0.17.5/tests/dbus/cm.c 2012-02-20 16:57:08.000000000 +0000 +++ telepathy-glib-0.17.6/tests/dbus/cm.c 2012-03-12 12:37:26.000000000 +0000 @@ -15,12 +15,20 @@ #include "tests/lib/echo-cm.h" #include "tests/lib/util.h" +typedef enum { + ACTIVATE_CM = (1 << 0), + USE_CWR = (1 << 1), + USE_OLD_LIST = (1 << 2) +} TestFlags; + typedef struct { GMainLoop *mainloop; TpDBusDaemon *dbus; TpTestsEchoConnectionManager *service_cm; TpConnectionManager *cm; + TpConnectionManager *echo; + TpConnectionManager *spurious; GError *error /* initialized where needed */; } Test; @@ -118,10 +126,11 @@ teardown (Test *test, gconstpointer data) { - g_object_unref (test->service_cm); - test->service_cm = NULL; - g_object_unref (test->dbus); - test->dbus = NULL; + g_clear_object (&test->service_cm); + g_clear_object (&test->dbus); + g_clear_object (&test->cm); + g_clear_object (&test->echo); + g_clear_object (&test->spurious); g_main_loop_unref (test->mainloop); test->mainloop = NULL; } @@ -168,8 +177,7 @@ test->cm = tp_connection_manager_new (test->dbus, "not_actually_there", NULL, &error); g_assert (TP_IS_CONNECTION_MANAGER (test->cm)); - g_assert (error == NULL); - g_test_queue_unref (test->cm); + g_assert_no_error (error); /* Spin the mainloop until we get the got-info signal. This API is rubbish, * but it's better than it used to be... */ @@ -183,6 +191,7 @@ g_assert_cmpuint (test->cm->running, ==, FALSE); g_assert_cmpuint (test->cm->info_source, ==, TP_CM_INFO_SOURCE_NONE); g_assert (test->cm->protocols == NULL); + g_assert (tp_connection_manager_dup_protocols (test->cm) == NULL); } static void @@ -214,8 +223,7 @@ test->cm = tp_connection_manager_new (test->dbus, "spurious", NULL, &error); g_assert (TP_IS_CONNECTION_MANAGER (test->cm)); - g_assert (error == NULL); - g_test_queue_unref (test->cm); + g_assert_no_error (error); g_test_bug ("18207"); id = g_signal_connect (test->cm, "got-info", @@ -355,8 +363,7 @@ test->cm = tp_connection_manager_new (test->dbus, "test_manager_file", NULL, &error); g_assert (TP_IS_CONNECTION_MANAGER (test->cm)); - g_assert (error == NULL); - g_test_queue_unref (test->cm); + g_assert_no_error (error); g_test_bug ("18207"); id = g_signal_connect (test->cm, "got-info", @@ -710,8 +717,7 @@ TP_BASE_CONNECTION_MANAGER_GET_CLASS (test->service_cm)->cm_dbus_name, NULL, &error); g_assert (TP_IS_CONNECTION_MANAGER (test->cm)); - g_assert (error == NULL); - g_test_queue_unref (test->cm); + g_assert_no_error (error); g_test_bug ("18207"); id = g_signal_connect (test->cm, "got-info", @@ -736,29 +742,42 @@ static void test_nothing_ready (Test *test, - gconstpointer data G_GNUC_UNUSED) + gconstpointer data) { gchar *name; guint info_source; + TestFlags flags = GPOINTER_TO_INT (data); test->error = NULL; test->cm = tp_connection_manager_new (test->dbus, "nonexistent_cm", NULL, &test->error); g_assert (TP_IS_CONNECTION_MANAGER (test->cm)); - g_assert (test->error == NULL); - g_test_queue_unref (test->cm); + g_assert_no_error (test->error); g_test_bug ("18291"); - tp_connection_manager_call_when_ready (test->cm, ready_or_not, - test, NULL, NULL); - g_main_loop_run (test->mainloop); - g_assert (test->error != NULL); - g_clear_error (&test->error); + if (flags & USE_CWR) + { + tp_connection_manager_call_when_ready (test->cm, ready_or_not, + test, NULL, NULL); + g_main_loop_run (test->mainloop); + g_assert (test->error != NULL); + g_clear_error (&test->error); + } + else + { + tp_tests_proxy_run_until_prepared_or_failed (test->cm, NULL, + &test->error); + + g_assert_error (test->error, DBUS_GERROR, DBUS_GERROR_SERVICE_UNKNOWN); + } g_assert_cmpstr (tp_connection_manager_get_name (test->cm), ==, "nonexistent_cm"); g_assert_cmpuint (tp_connection_manager_is_ready (test->cm), ==, FALSE); + g_assert_cmpuint (tp_proxy_is_prepared (test->cm, + TP_CONNECTION_MANAGER_FEATURE_CORE), ==, FALSE); + g_assert (tp_proxy_get_invalidated (test->cm) == NULL); g_assert_cmpuint (tp_connection_manager_is_running (test->cm), ==, FALSE); g_assert_cmpuint (tp_connection_manager_get_info_source (test->cm), ==, TP_CM_INFO_SOURCE_NONE); @@ -774,29 +793,40 @@ static void test_file_ready (Test *test, - gconstpointer data G_GNUC_UNUSED) + gconstpointer data) { gchar *name; guint info_source; + TestFlags flags = GPOINTER_TO_INT (data); + GList *l; test->error = NULL; test->cm = tp_connection_manager_new (test->dbus, "spurious", NULL, &test->error); g_assert (TP_IS_CONNECTION_MANAGER (test->cm)); - g_assert (test->error == NULL); - g_test_queue_unref (test->cm); + g_assert_no_error (test->error); g_test_bug ("18291"); - tp_connection_manager_call_when_ready (test->cm, ready_or_not, - test, NULL, NULL); - g_main_loop_run (test->mainloop); - g_assert (test->error == NULL); + if (flags & USE_CWR) + { + tp_connection_manager_call_when_ready (test->cm, ready_or_not, + test, NULL, NULL); + g_main_loop_run (test->mainloop); + g_assert_no_error (test->error); + } + else + { + tp_tests_proxy_run_until_prepared (test->cm, NULL); + } g_assert_cmpstr (tp_connection_manager_get_name (test->cm), ==, "spurious"); g_assert_cmpuint (tp_connection_manager_is_ready (test->cm), ==, TRUE); g_assert_cmpuint (tp_connection_manager_is_running (test->cm), ==, FALSE); + g_assert_cmpuint (tp_proxy_is_prepared (test->cm, + TP_CONNECTION_MANAGER_FEATURE_CORE), ==, TRUE); + g_assert (tp_proxy_get_invalidated (test->cm) == NULL); g_assert_cmpuint (tp_connection_manager_get_info_source (test->cm), ==, TP_CM_INFO_SOURCE_FILE); @@ -808,31 +838,46 @@ g_assert_cmpuint (info_source, ==, TP_CM_INFO_SOURCE_FILE); g_free (name); + l = tp_connection_manager_dup_protocols (test->cm); + g_assert_cmpuint (g_list_length (l), ==, 2); + g_assert (TP_IS_PROTOCOL (l->data)); + g_assert (TP_IS_PROTOCOL (l->next->data)); + g_list_free_full (l, g_object_unref); } static void test_complex_file_ready (Test *test, - gconstpointer data G_GNUC_UNUSED) + gconstpointer data) { gchar *name; guint info_source; + TestFlags flags = GPOINTER_TO_INT (data); test->error = NULL; test->cm = tp_connection_manager_new (test->dbus, "test_manager_file", NULL, &test->error); g_assert (TP_IS_CONNECTION_MANAGER (test->cm)); - g_assert (test->error == NULL); - g_test_queue_unref (test->cm); + g_assert_no_error (test->error); g_test_bug ("18291"); - tp_connection_manager_call_when_ready (test->cm, ready_or_not, - test, NULL, NULL); - g_main_loop_run (test->mainloop); - g_assert (test->error == NULL); + if (flags & USE_CWR) + { + tp_connection_manager_call_when_ready (test->cm, ready_or_not, + test, NULL, NULL); + g_main_loop_run (test->mainloop); + g_assert_no_error (test->error); + } + else + { + tp_tests_proxy_run_until_prepared (test->cm, NULL); + } g_assert_cmpstr (tp_connection_manager_get_name (test->cm), ==, "test_manager_file"); + g_assert_cmpuint (tp_proxy_is_prepared (test->cm, + TP_CONNECTION_MANAGER_FEATURE_CORE), ==, TRUE); + g_assert (tp_proxy_get_invalidated (test->cm) == NULL); g_assert_cmpuint (tp_connection_manager_is_ready (test->cm), ==, TRUE); g_assert_cmpuint (tp_connection_manager_is_running (test->cm), ==, FALSE); g_assert_cmpuint (tp_connection_manager_get_info_source (test->cm), ==, @@ -860,17 +905,17 @@ { gchar *name; guint info_source; - const gboolean activate = GPOINTER_TO_INT (data); + const TestFlags flags = GPOINTER_TO_INT (data); + GList *l; test->error = NULL; test->cm = tp_connection_manager_new (test->dbus, TP_BASE_CONNECTION_MANAGER_GET_CLASS (test->service_cm)->cm_dbus_name, NULL, &test->error); g_assert (TP_IS_CONNECTION_MANAGER (test->cm)); - g_assert (test->error == NULL); - g_test_queue_unref (test->cm); + g_assert_no_error (test->error); - if (activate) + if (flags & ACTIVATE_CM) { g_test_bug ("23524"); @@ -887,13 +932,23 @@ g_test_bug ("18291"); } - tp_connection_manager_call_when_ready (test->cm, ready_or_not, - test, NULL, NULL); - g_main_loop_run (test->mainloop); - g_assert (test->error == NULL); + if (flags & USE_CWR) + { + tp_connection_manager_call_when_ready (test->cm, ready_or_not, + test, NULL, NULL); + g_main_loop_run (test->mainloop); + g_assert_no_error (test->error); + } + else + { + tp_tests_proxy_run_until_prepared (test->cm, NULL); + } g_assert_cmpstr (tp_connection_manager_get_name (test->cm), ==, "example_echo"); + g_assert_cmpuint (tp_proxy_is_prepared (test->cm, + TP_CONNECTION_MANAGER_FEATURE_CORE), ==, TRUE); + g_assert (tp_proxy_get_invalidated (test->cm) == NULL); g_assert_cmpuint (tp_connection_manager_is_ready (test->cm), ==, TRUE); g_assert_cmpuint (tp_connection_manager_is_running (test->cm), ==, TRUE); g_assert_cmpuint (tp_connection_manager_get_info_source (test->cm), ==, @@ -906,6 +961,11 @@ g_assert_cmpstr (name, ==, "example_echo"); g_assert_cmpuint (info_source, ==, TP_CM_INFO_SOURCE_LIVE); g_free (name); + + l = tp_connection_manager_dup_protocols (test->cm); + g_assert_cmpuint (g_list_length (l), ==, 1); + g_assert_cmpstr (tp_protocol_get_name (l->data), ==, "example"); + g_list_free_full (l, g_object_unref); } static void @@ -914,7 +974,7 @@ { gchar *name; guint info_source; - const gboolean activate = GPOINTER_TO_INT (data); + const TestFlags flags = GPOINTER_TO_INT (data); TpBaseConnectionManager *service_cm_as_base; gboolean ok; @@ -936,10 +996,9 @@ TP_BASE_CONNECTION_MANAGER_GET_CLASS (test->service_cm)->cm_dbus_name, NULL, &test->error); g_assert (TP_IS_CONNECTION_MANAGER (test->cm)); - g_assert (test->error == NULL); - g_test_queue_unref (test->cm); + g_assert_no_error (test->error); - if (activate) + if (flags & ACTIVATE_CM) { g_test_bug ("23524"); @@ -956,13 +1015,23 @@ g_test_bug ("18291"); } - tp_connection_manager_call_when_ready (test->cm, ready_or_not, - test, NULL, NULL); - g_main_loop_run (test->mainloop); - g_assert (test->error == NULL); + if (flags & USE_CWR) + { + tp_connection_manager_call_when_ready (test->cm, ready_or_not, + test, NULL, NULL); + g_main_loop_run (test->mainloop); + g_assert_no_error (test->error); + } + else + { + tp_tests_proxy_run_until_prepared (test->cm, NULL); + } g_assert_cmpstr (tp_connection_manager_get_name (test->cm), ==, "example_echo"); + g_assert_cmpuint (tp_proxy_is_prepared (test->cm, + TP_CONNECTION_MANAGER_FEATURE_CORE), ==, TRUE); + g_assert (tp_proxy_get_invalidated (test->cm) == NULL); g_assert_cmpuint (tp_connection_manager_is_ready (test->cm), ==, TRUE); g_assert_cmpuint (tp_connection_manager_is_running (test->cm), ==, TRUE); g_assert_cmpuint (tp_connection_manager_get_info_source (test->cm), ==, @@ -985,46 +1054,85 @@ GObject *weak_object G_GNUC_UNUSED) { Test *test = user_data; - TpConnectionManager *spurious; - TpConnectionManager *echo; g_assert_cmpuint ((guint) n_cms, ==, 2); g_assert (cms[2] == NULL); if (tp_connection_manager_is_running (cms[0])) { - echo = cms[0]; - spurious = cms[1]; + test->echo = g_object_ref (cms[0]); + test->spurious = g_object_ref (cms[1]); } else { - spurious = cms[0]; - echo = cms[1]; + test->spurious = g_object_ref (cms[0]); + test->echo = g_object_ref (cms[1]); } - g_assert (tp_connection_manager_is_running (echo)); - g_assert (!tp_connection_manager_is_running (spurious)); - - g_assert (tp_connection_manager_is_ready (echo)); - g_assert (tp_connection_manager_is_ready (spurious)); - - g_assert_cmpuint (tp_connection_manager_get_info_source (echo), - ==, TP_CM_INFO_SOURCE_LIVE); - g_assert_cmpuint (tp_connection_manager_get_info_source (spurious), - ==, TP_CM_INFO_SOURCE_FILE); - - g_assert (tp_connection_manager_has_protocol (echo, "example")); - g_assert (tp_connection_manager_has_protocol (spurious, "normal")); - g_main_loop_quit (test->mainloop); } static void test_list (Test *test, - gconstpointer data G_GNUC_UNUSED) + gconstpointer data) { - tp_list_connection_managers (test->dbus, on_listed_connection_managers, - test, NULL, NULL); + TestFlags flags = GPOINTER_TO_INT (data); + + if (flags & USE_OLD_LIST) + { + tp_list_connection_managers (test->dbus, on_listed_connection_managers, + test, NULL, NULL); + g_main_loop_run (test->mainloop); + } + else + { + GAsyncResult *res = NULL; + GList *cms; + + tp_list_connection_managers_async (test->dbus, tp_tests_result_ready_cb, + &res); + tp_tests_run_until_result (&res); + cms = tp_list_connection_managers_finish (res, &test->error); + g_assert_no_error (test->error); + g_assert_cmpuint (g_list_length (cms), ==, 2); + + /* transfer ownership */ + if (tp_connection_manager_is_running (cms->data)) + { + test->echo = cms->data; + test->spurious = cms->next->data; + } + else + { + test->spurious = cms->data; + test->echo = cms->next->data; + } + + g_object_unref (res); + g_list_free (cms); + } + + g_assert (tp_connection_manager_is_running (test->echo)); + g_assert (!tp_connection_manager_is_running (test->spurious)); + + g_assert (tp_proxy_is_prepared (test->echo, + TP_CONNECTION_MANAGER_FEATURE_CORE)); + g_assert (tp_proxy_is_prepared (test->spurious, + TP_CONNECTION_MANAGER_FEATURE_CORE)); + + g_assert (tp_proxy_get_invalidated (test->echo) == NULL); + g_assert (tp_proxy_get_invalidated (test->spurious) == NULL); + + g_assert (tp_connection_manager_is_ready (test->echo)); + g_assert (tp_connection_manager_is_ready (test->spurious)); + + g_assert_cmpuint (tp_connection_manager_get_info_source (test->echo), + ==, TP_CM_INFO_SOURCE_LIVE); + g_assert_cmpuint (tp_connection_manager_get_info_source (test->spurious), + ==, TP_CM_INFO_SOURCE_FILE); + + g_assert (tp_connection_manager_has_protocol (test->echo, "example")); + g_assert (tp_connection_manager_has_protocol (test->spurious, "normal")); } int @@ -1045,21 +1153,42 @@ g_test_add ("/cm/dbus (old)", Test, NULL, setup, test_dbus_got_info, teardown); - g_test_add ("/cm/nothing", Test, NULL, setup, test_nothing_ready, - teardown); - g_test_add ("/cm/file", Test, NULL, setup, test_file_ready, teardown); - g_test_add ("/cm/file (complex)", Test, NULL, setup, + g_test_add ("/cm/nothing", Test, GINT_TO_POINTER (0), + setup, test_nothing_ready, teardown); + g_test_add ("/cm/nothing/cwr", Test, GINT_TO_POINTER (USE_CWR), + setup, test_nothing_ready, teardown); + g_test_add ("/cm/file", Test, GINT_TO_POINTER (0), + setup, test_file_ready, teardown); + g_test_add ("/cm/file/cwr", Test, GINT_TO_POINTER (USE_CWR), + setup, test_file_ready, teardown); + g_test_add ("/cm/file/complex", Test, GINT_TO_POINTER (0), setup, test_complex_file_ready, teardown); - g_test_add ("/cm/dbus", Test, GINT_TO_POINTER (FALSE), setup, + g_test_add ("/cm/file/complex/cwr", Test, GINT_TO_POINTER (USE_CWR), setup, + test_complex_file_ready, teardown); + g_test_add ("/cm/dbus", Test, GINT_TO_POINTER (0), setup, test_dbus_ready, teardown); - g_test_add ("/cm/dbus-and-activate", Test, GINT_TO_POINTER (TRUE), setup, + g_test_add ("/cm/dbus/cwr", Test, GINT_TO_POINTER (USE_CWR), setup, test_dbus_ready, teardown); - g_test_add ("/cm/dbus-fallback", Test, GINT_TO_POINTER (FALSE), setup, + g_test_add ("/cm/dbus/activate", Test, GINT_TO_POINTER (ACTIVATE_CM), + setup, test_dbus_ready, teardown); + g_test_add ("/cm/dbus/activate/cwr", Test, + GINT_TO_POINTER (USE_CWR|ACTIVATE_CM), + setup, test_dbus_ready, teardown); + g_test_add ("/cm/dbus-fallback", Test, GINT_TO_POINTER (0), setup, + test_dbus_fallback, teardown); + g_test_add ("/cm/dbus-fallback/cwr", Test, GINT_TO_POINTER (USE_CWR), setup, test_dbus_fallback, teardown); - g_test_add ("/cm/dbus-fallback-activate", Test, GINT_TO_POINTER (TRUE), + g_test_add ("/cm/dbus-fallback/activate", Test, + GINT_TO_POINTER (ACTIVATE_CM), + setup, test_dbus_fallback, teardown); + g_test_add ("/cm/dbus-fallback/activate/cwr", Test, + GINT_TO_POINTER (ACTIVATE_CM | USE_CWR), setup, test_dbus_fallback, teardown); - g_test_add ("/cm/list", Test, NULL, setup, test_list, teardown); + g_test_add ("/cm/list", Test, GINT_TO_POINTER (0), + setup, test_list, teardown); + g_test_add ("/cm/list", Test, GINT_TO_POINTER (USE_OLD_LIST), + setup, test_list, teardown); return g_test_run (); } diff -Nru telepathy-glib-0.17.5/tests/dbus/dbus-uninstalled/session.conf.in telepathy-glib-0.17.6/tests/dbus/dbus-uninstalled/session.conf.in --- telepathy-glib-0.17.5/tests/dbus/dbus-uninstalled/session.conf.in 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/tests/dbus/dbus-uninstalled/session.conf.in 2012-03-12 12:37:26.000000000 +0000 @@ -12,7 +12,7 @@ unix:tmpdir=/tmp - @abs_top_builddir@/tests/dbus/dbus-installed/services/ + @abs_top_srcdir@/tests/dbus/dbus-uninstalled/services diff -Nru telepathy-glib-0.17.5/tests/dbus/Makefile.am telepathy-glib-0.17.6/tests/dbus/Makefile.am --- telepathy-glib-0.17.5/tests/dbus/Makefile.am 2012-02-20 16:56:41.000000000 +0000 +++ telepathy-glib-0.17.6/tests/dbus/Makefile.am 2012-03-12 12:37:26.000000000 +0000 @@ -330,7 +330,10 @@ dbus-uninstalled/%.conf: $(srcdir)/dbus-uninstalled/%.conf.in $(AM_V_at)$(mkdir_p) dbus-uninstalled - $(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@ + $(AM_V_GEN)sed \ + -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" \ + -e "s|[@]abs_top_srcdir[@]|@abs_top_srcdir@|g" \ + $< > $@ dbus-installed/%.conf: $(srcdir)/dbus-installed/%.conf.in $(AM_V_at)$(mkdir_p) dbus-installed @@ -348,7 +351,10 @@ dbusconfig_DATA = $(conf_files) endif -_gen/svc.c _gen/svc.h: with-properties.xml \ +_gen/svc.h: _gen/svc.c + @: + +_gen/svc.c: with-properties.xml \ $(top_srcdir)/tools/glib-ginterface-gen.py \ Makefile.am $(AM_V_at)$(mkdir_p) _gen diff -Nru telepathy-glib-0.17.5/tests/dbus/Makefile.in telepathy-glib-0.17.6/tests/dbus/Makefile.in --- telepathy-glib-0.17.5/tests/dbus/Makefile.in 2012-02-20 17:31:10.000000000 +0000 +++ telepathy-glib-0.17.6/tests/dbus/Makefile.in 2012-03-19 15:34:30.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -109,8 +109,8 @@ $(top_builddir)/tests/lib/libtp-glib-tests.la \ $(top_builddir)/telepathy-glib/libtelepathy-glib.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent am_test_account_channel_request_OBJECTS = \ account-channel-request.$(OBJEXT) @@ -563,12 +563,6 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } SCRIPTS = $(tests_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -580,21 +574,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(test_account_SOURCES) \ $(test_account_channel_request_SOURCES) \ @@ -1155,7 +1149,6 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/tools/check-coding-style.mk $(top_srcdir)/tools/valgrind.mk: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1217,184 +1210,184 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -test-account$(EXEEXT): $(test_account_OBJECTS) $(test_account_DEPENDENCIES) $(EXTRA_test_account_DEPENDENCIES) +test-account$(EXEEXT): $(test_account_OBJECTS) $(test_account_DEPENDENCIES) @rm -f test-account$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_account_OBJECTS) $(test_account_LDADD) $(LIBS) -test-account-channel-request$(EXEEXT): $(test_account_channel_request_OBJECTS) $(test_account_channel_request_DEPENDENCIES) $(EXTRA_test_account_channel_request_DEPENDENCIES) +test-account-channel-request$(EXEEXT): $(test_account_channel_request_OBJECTS) $(test_account_channel_request_DEPENDENCIES) @rm -f test-account-channel-request$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_account_channel_request_OBJECTS) $(test_account_channel_request_LDADD) $(LIBS) -test-account-manager$(EXEEXT): $(test_account_manager_OBJECTS) $(test_account_manager_DEPENDENCIES) $(EXTRA_test_account_manager_DEPENDENCIES) +test-account-manager$(EXEEXT): $(test_account_manager_OBJECTS) $(test_account_manager_DEPENDENCIES) @rm -f test-account-manager$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_account_manager_OBJECTS) $(test_account_manager_LDADD) $(LIBS) -test-base-client$(EXEEXT): $(test_base_client_OBJECTS) $(test_base_client_DEPENDENCIES) $(EXTRA_test_base_client_DEPENDENCIES) +test-base-client$(EXEEXT): $(test_base_client_OBJECTS) $(test_base_client_DEPENDENCIES) @rm -f test-base-client$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_base_client_OBJECTS) $(test_base_client_LDADD) $(LIBS) -test-call-cancellation$(EXEEXT): $(test_call_cancellation_OBJECTS) $(test_call_cancellation_DEPENDENCIES) $(EXTRA_test_call_cancellation_DEPENDENCIES) +test-call-cancellation$(EXEEXT): $(test_call_cancellation_OBJECTS) $(test_call_cancellation_DEPENDENCIES) @rm -f test-call-cancellation$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_call_cancellation_OBJECTS) $(test_call_cancellation_LDADD) $(LIBS) -test-call-channel$(EXEEXT): $(test_call_channel_OBJECTS) $(test_call_channel_DEPENDENCIES) $(EXTRA_test_call_channel_DEPENDENCIES) +test-call-channel$(EXEEXT): $(test_call_channel_OBJECTS) $(test_call_channel_DEPENDENCIES) @rm -f test-call-channel$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_call_channel_OBJECTS) $(test_call_channel_LDADD) $(LIBS) -test-channel$(EXEEXT): $(test_channel_OBJECTS) $(test_channel_DEPENDENCIES) $(EXTRA_test_channel_DEPENDENCIES) +test-channel$(EXEEXT): $(test_channel_OBJECTS) $(test_channel_DEPENDENCIES) @rm -f test-channel$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_channel_OBJECTS) $(test_channel_LDADD) $(LIBS) -test-channel-dispatch-operation$(EXEEXT): $(test_channel_dispatch_operation_OBJECTS) $(test_channel_dispatch_operation_DEPENDENCIES) $(EXTRA_test_channel_dispatch_operation_DEPENDENCIES) +test-channel-dispatch-operation$(EXEEXT): $(test_channel_dispatch_operation_OBJECTS) $(test_channel_dispatch_operation_DEPENDENCIES) @rm -f test-channel-dispatch-operation$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_channel_dispatch_operation_OBJECTS) $(test_channel_dispatch_operation_LDADD) $(LIBS) -test-channel-dispatcher$(EXEEXT): $(test_channel_dispatcher_OBJECTS) $(test_channel_dispatcher_DEPENDENCIES) $(EXTRA_test_channel_dispatcher_DEPENDENCIES) +test-channel-dispatcher$(EXEEXT): $(test_channel_dispatcher_OBJECTS) $(test_channel_dispatcher_DEPENDENCIES) @rm -f test-channel-dispatcher$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_channel_dispatcher_OBJECTS) $(test_channel_dispatcher_LDADD) $(LIBS) -test-channel-introspect$(EXEEXT): $(test_channel_introspect_OBJECTS) $(test_channel_introspect_DEPENDENCIES) $(EXTRA_test_channel_introspect_DEPENDENCIES) +test-channel-introspect$(EXEEXT): $(test_channel_introspect_OBJECTS) $(test_channel_introspect_DEPENDENCIES) @rm -f test-channel-introspect$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_channel_introspect_OBJECTS) $(test_channel_introspect_LDADD) $(LIBS) -test-channel-manager-request-properties$(EXEEXT): $(test_channel_manager_request_properties_OBJECTS) $(test_channel_manager_request_properties_DEPENDENCIES) $(EXTRA_test_channel_manager_request_properties_DEPENDENCIES) +test-channel-manager-request-properties$(EXEEXT): $(test_channel_manager_request_properties_OBJECTS) $(test_channel_manager_request_properties_DEPENDENCIES) @rm -f test-channel-manager-request-properties$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_channel_manager_request_properties_OBJECTS) $(test_channel_manager_request_properties_LDADD) $(LIBS) -test-channel-request$(EXEEXT): $(test_channel_request_OBJECTS) $(test_channel_request_DEPENDENCIES) $(EXTRA_test_channel_request_DEPENDENCIES) +test-channel-request$(EXEEXT): $(test_channel_request_OBJECTS) $(test_channel_request_DEPENDENCIES) @rm -f test-channel-request$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_channel_request_OBJECTS) $(test_channel_request_LDADD) $(LIBS) -test-cli-group$(EXEEXT): $(test_cli_group_OBJECTS) $(test_cli_group_DEPENDENCIES) $(EXTRA_test_cli_group_DEPENDENCIES) +test-cli-group$(EXEEXT): $(test_cli_group_OBJECTS) $(test_cli_group_DEPENDENCIES) @rm -f test-cli-group$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_cli_group_OBJECTS) $(test_cli_group_LDADD) $(LIBS) -test-client$(EXEEXT): $(test_client_OBJECTS) $(test_client_DEPENDENCIES) $(EXTRA_test_client_DEPENDENCIES) +test-client$(EXEEXT): $(test_client_OBJECTS) $(test_client_DEPENDENCIES) @rm -f test-client$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_client_OBJECTS) $(test_client_LDADD) $(LIBS) -test-client-channel-factory$(EXEEXT): $(test_client_channel_factory_OBJECTS) $(test_client_channel_factory_DEPENDENCIES) $(EXTRA_test_client_channel_factory_DEPENDENCIES) +test-client-channel-factory$(EXEEXT): $(test_client_channel_factory_OBJECTS) $(test_client_channel_factory_DEPENDENCIES) @rm -f test-client-channel-factory$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_client_channel_factory_OBJECTS) $(test_client_channel_factory_LDADD) $(LIBS) -test-cm$(EXEEXT): $(test_cm_OBJECTS) $(test_cm_DEPENDENCIES) $(EXTRA_test_cm_DEPENDENCIES) +test-cm$(EXEEXT): $(test_cm_OBJECTS) $(test_cm_DEPENDENCIES) @rm -f test-cm$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_cm_OBJECTS) $(test_cm_LDADD) $(LIBS) -test-cm-message$(EXEEXT): $(test_cm_message_OBJECTS) $(test_cm_message_DEPENDENCIES) $(EXTRA_test_cm_message_DEPENDENCIES) +test-cm-message$(EXEEXT): $(test_cm_message_OBJECTS) $(test_cm_message_DEPENDENCIES) @rm -f test-cm-message$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_cm_message_OBJECTS) $(test_cm_message_LDADD) $(LIBS) -test-connection$(EXEEXT): $(test_connection_OBJECTS) $(test_connection_DEPENDENCIES) $(EXTRA_test_connection_DEPENDENCIES) +test-connection$(EXEEXT): $(test_connection_OBJECTS) $(test_connection_DEPENDENCIES) @rm -f test-connection$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_connection_OBJECTS) $(test_connection_LDADD) $(LIBS) -test-connection-aliasing$(EXEEXT): $(test_connection_aliasing_OBJECTS) $(test_connection_aliasing_DEPENDENCIES) $(EXTRA_test_connection_aliasing_DEPENDENCIES) +test-connection-aliasing$(EXEEXT): $(test_connection_aliasing_OBJECTS) $(test_connection_aliasing_DEPENDENCIES) @rm -f test-connection-aliasing$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_connection_aliasing_OBJECTS) $(test_connection_aliasing_LDADD) $(LIBS) -test-connection-balance$(EXEEXT): $(test_connection_balance_OBJECTS) $(test_connection_balance_DEPENDENCIES) $(EXTRA_test_connection_balance_DEPENDENCIES) +test-connection-balance$(EXEEXT): $(test_connection_balance_OBJECTS) $(test_connection_balance_DEPENDENCIES) @rm -f test-connection-balance$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_connection_balance_OBJECTS) $(test_connection_balance_LDADD) $(LIBS) -test-connection-bug-18845$(EXEEXT): $(test_connection_bug_18845_OBJECTS) $(test_connection_bug_18845_DEPENDENCIES) $(EXTRA_test_connection_bug_18845_DEPENDENCIES) +test-connection-bug-18845$(EXEEXT): $(test_connection_bug_18845_OBJECTS) $(test_connection_bug_18845_DEPENDENCIES) @rm -f test-connection-bug-18845$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_connection_bug_18845_OBJECTS) $(test_connection_bug_18845_LDADD) $(LIBS) -test-connection-error$(EXEEXT): $(test_connection_error_OBJECTS) $(test_connection_error_DEPENDENCIES) $(EXTRA_test_connection_error_DEPENDENCIES) +test-connection-error$(EXEEXT): $(test_connection_error_OBJECTS) $(test_connection_error_DEPENDENCIES) @rm -f test-connection-error$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_connection_error_OBJECTS) $(test_connection_error_LDADD) $(LIBS) -test-connection-getinterfaces-failure$(EXEEXT): $(test_connection_getinterfaces_failure_OBJECTS) $(test_connection_getinterfaces_failure_DEPENDENCIES) $(EXTRA_test_connection_getinterfaces_failure_DEPENDENCIES) +test-connection-getinterfaces-failure$(EXEEXT): $(test_connection_getinterfaces_failure_OBJECTS) $(test_connection_getinterfaces_failure_DEPENDENCIES) @rm -f test-connection-getinterfaces-failure$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_connection_getinterfaces_failure_OBJECTS) $(test_connection_getinterfaces_failure_LDADD) $(LIBS) -test-connection-handles$(EXEEXT): $(test_connection_handles_OBJECTS) $(test_connection_handles_DEPENDENCIES) $(EXTRA_test_connection_handles_DEPENDENCIES) +test-connection-handles$(EXEEXT): $(test_connection_handles_OBJECTS) $(test_connection_handles_DEPENDENCIES) @rm -f test-connection-handles$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_connection_handles_OBJECTS) $(test_connection_handles_LDADD) $(LIBS) -test-connection-inject-bug16307$(EXEEXT): $(test_connection_inject_bug16307_OBJECTS) $(test_connection_inject_bug16307_DEPENDENCIES) $(EXTRA_test_connection_inject_bug16307_DEPENDENCIES) +test-connection-inject-bug16307$(EXEEXT): $(test_connection_inject_bug16307_OBJECTS) $(test_connection_inject_bug16307_DEPENDENCIES) @rm -f test-connection-inject-bug16307$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_connection_inject_bug16307_OBJECTS) $(test_connection_inject_bug16307_LDADD) $(LIBS) -test-connection-interests$(EXEEXT): $(test_connection_interests_OBJECTS) $(test_connection_interests_DEPENDENCIES) $(EXTRA_test_connection_interests_DEPENDENCIES) +test-connection-interests$(EXEEXT): $(test_connection_interests_OBJECTS) $(test_connection_interests_DEPENDENCIES) @rm -f test-connection-interests$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_connection_interests_OBJECTS) $(test_connection_interests_LDADD) $(LIBS) -test-contact-list-client$(EXEEXT): $(test_contact_list_client_OBJECTS) $(test_contact_list_client_DEPENDENCIES) $(EXTRA_test_contact_list_client_DEPENDENCIES) +test-contact-list-client$(EXEEXT): $(test_contact_list_client_OBJECTS) $(test_contact_list_client_DEPENDENCIES) @rm -f test-contact-list-client$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_contact_list_client_OBJECTS) $(test_contact_list_client_LDADD) $(LIBS) -test-contact-lists$(EXEEXT): $(test_contact_lists_OBJECTS) $(test_contact_lists_DEPENDENCIES) $(EXTRA_test_contact_lists_DEPENDENCIES) +test-contact-lists$(EXEEXT): $(test_contact_lists_OBJECTS) $(test_contact_lists_DEPENDENCIES) @rm -f test-contact-lists$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_contact_lists_OBJECTS) $(test_contact_lists_LDADD) $(LIBS) -test-contacts$(EXEEXT): $(test_contacts_OBJECTS) $(test_contacts_DEPENDENCIES) $(EXTRA_test_contacts_DEPENDENCIES) +test-contacts$(EXEEXT): $(test_contacts_OBJECTS) $(test_contacts_DEPENDENCIES) @rm -f test-contacts$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_contacts_OBJECTS) $(test_contacts_LDADD) $(LIBS) -test-contacts-bug-19101$(EXEEXT): $(test_contacts_bug_19101_OBJECTS) $(test_contacts_bug_19101_DEPENDENCIES) $(EXTRA_test_contacts_bug_19101_DEPENDENCIES) +test-contacts-bug-19101$(EXEEXT): $(test_contacts_bug_19101_OBJECTS) $(test_contacts_bug_19101_DEPENDENCIES) @rm -f test-contacts-bug-19101$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_contacts_bug_19101_OBJECTS) $(test_contacts_bug_19101_LDADD) $(LIBS) -test-contacts-mixin$(EXEEXT): $(test_contacts_mixin_OBJECTS) $(test_contacts_mixin_DEPENDENCIES) $(EXTRA_test_contacts_mixin_DEPENDENCIES) +test-contacts-mixin$(EXEEXT): $(test_contacts_mixin_OBJECTS) $(test_contacts_mixin_DEPENDENCIES) @rm -f test-contacts-mixin$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_contacts_mixin_OBJECTS) $(test_contacts_mixin_LDADD) $(LIBS) -test-contacts-slow-path$(EXEEXT): $(test_contacts_slow_path_OBJECTS) $(test_contacts_slow_path_DEPENDENCIES) $(EXTRA_test_contacts_slow_path_DEPENDENCIES) +test-contacts-slow-path$(EXEEXT): $(test_contacts_slow_path_OBJECTS) $(test_contacts_slow_path_DEPENDENCIES) @rm -f test-contacts-slow-path$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_contacts_slow_path_OBJECTS) $(test_contacts_slow_path_LDADD) $(LIBS) -test-dbus$(EXEEXT): $(test_dbus_OBJECTS) $(test_dbus_DEPENDENCIES) $(EXTRA_test_dbus_DEPENDENCIES) +test-dbus$(EXEEXT): $(test_dbus_OBJECTS) $(test_dbus_DEPENDENCIES) @rm -f test-dbus$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_dbus_OBJECTS) $(test_dbus_LDADD) $(LIBS) -test-dbus-tube$(EXEEXT): $(test_dbus_tube_OBJECTS) $(test_dbus_tube_DEPENDENCIES) $(EXTRA_test_dbus_tube_DEPENDENCIES) +test-dbus-tube$(EXEEXT): $(test_dbus_tube_OBJECTS) $(test_dbus_tube_DEPENDENCIES) @rm -f test-dbus-tube$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_dbus_tube_OBJECTS) $(test_dbus_tube_LDADD) $(LIBS) -test-disconnection$(EXEEXT): $(test_disconnection_OBJECTS) $(test_disconnection_DEPENDENCIES) $(EXTRA_test_disconnection_DEPENDENCIES) +test-disconnection$(EXEEXT): $(test_disconnection_OBJECTS) $(test_disconnection_DEPENDENCIES) @rm -f test-disconnection$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_disconnection_OBJECTS) $(test_disconnection_LDADD) $(LIBS) -test-error-enum$(EXEEXT): $(test_error_enum_OBJECTS) $(test_error_enum_DEPENDENCIES) $(EXTRA_test_error_enum_DEPENDENCIES) +test-error-enum$(EXEEXT): $(test_error_enum_OBJECTS) $(test_error_enum_DEPENDENCIES) @rm -f test-error-enum$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_error_enum_OBJECTS) $(test_error_enum_LDADD) $(LIBS) -test-example-no-protocols$(EXEEXT): $(test_example_no_protocols_OBJECTS) $(test_example_no_protocols_DEPENDENCIES) $(EXTRA_test_example_no_protocols_DEPENDENCIES) +test-example-no-protocols$(EXEEXT): $(test_example_no_protocols_OBJECTS) $(test_example_no_protocols_DEPENDENCIES) @rm -f test-example-no-protocols$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_example_no_protocols_OBJECTS) $(test_example_no_protocols_LDADD) $(LIBS) -test-file-transfer-channel$(EXEEXT): $(test_file_transfer_channel_OBJECTS) $(test_file_transfer_channel_DEPENDENCIES) $(EXTRA_test_file_transfer_channel_DEPENDENCIES) +test-file-transfer-channel$(EXEEXT): $(test_file_transfer_channel_OBJECTS) $(test_file_transfer_channel_DEPENDENCIES) @rm -f test-file-transfer-channel$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_file_transfer_channel_OBJECTS) $(test_file_transfer_channel_LDADD) $(LIBS) -test-finalized-in-invalidated-handler$(EXEEXT): $(test_finalized_in_invalidated_handler_OBJECTS) $(test_finalized_in_invalidated_handler_DEPENDENCIES) $(EXTRA_test_finalized_in_invalidated_handler_DEPENDENCIES) +test-finalized-in-invalidated-handler$(EXEEXT): $(test_finalized_in_invalidated_handler_OBJECTS) $(test_finalized_in_invalidated_handler_DEPENDENCIES) @rm -f test-finalized-in-invalidated-handler$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_finalized_in_invalidated_handler_OBJECTS) $(test_finalized_in_invalidated_handler_LDADD) $(LIBS) -test-get-interface-after-invalidate$(EXEEXT): $(test_get_interface_after_invalidate_OBJECTS) $(test_get_interface_after_invalidate_DEPENDENCIES) $(EXTRA_test_get_interface_after_invalidate_DEPENDENCIES) +test-get-interface-after-invalidate$(EXEEXT): $(test_get_interface_after_invalidate_OBJECTS) $(test_get_interface_after_invalidate_DEPENDENCIES) @rm -f test-get-interface-after-invalidate$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_get_interface_after_invalidate_OBJECTS) $(test_get_interface_after_invalidate_LDADD) $(LIBS) -test-group-mixin$(EXEEXT): $(test_group_mixin_OBJECTS) $(test_group_mixin_DEPENDENCIES) $(EXTRA_test_group_mixin_DEPENDENCIES) +test-group-mixin$(EXEEXT): $(test_group_mixin_OBJECTS) $(test_group_mixin_DEPENDENCIES) @rm -f test-group-mixin$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_group_mixin_OBJECTS) $(test_group_mixin_LDADD) $(LIBS) -test-handle-repo$(EXEEXT): $(test_handle_repo_OBJECTS) $(test_handle_repo_DEPENDENCIES) $(EXTRA_test_handle_repo_DEPENDENCIES) +test-handle-repo$(EXEEXT): $(test_handle_repo_OBJECTS) $(test_handle_repo_DEPENDENCIES) @rm -f test-handle-repo$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_handle_repo_OBJECTS) $(test_handle_repo_LDADD) $(LIBS) -test-handle-set$(EXEEXT): $(test_handle_set_OBJECTS) $(test_handle_set_DEPENDENCIES) $(EXTRA_test_handle_set_DEPENDENCIES) +test-handle-set$(EXEEXT): $(test_handle_set_OBJECTS) $(test_handle_set_DEPENDENCIES) @rm -f test-handle-set$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_handle_set_OBJECTS) $(test_handle_set_LDADD) $(LIBS) -test-invalidated-while-invoking-signals$(EXEEXT): $(test_invalidated_while_invoking_signals_OBJECTS) $(test_invalidated_while_invoking_signals_DEPENDENCIES) $(EXTRA_test_invalidated_while_invoking_signals_DEPENDENCIES) +test-invalidated-while-invoking-signals$(EXEEXT): $(test_invalidated_while_invoking_signals_OBJECTS) $(test_invalidated_while_invoking_signals_DEPENDENCIES) @rm -f test-invalidated-while-invoking-signals$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_invalidated_while_invoking_signals_OBJECTS) $(test_invalidated_while_invoking_signals_LDADD) $(LIBS) -test-long-connection-name$(EXEEXT): $(test_long_connection_name_OBJECTS) $(test_long_connection_name_DEPENDENCIES) $(EXTRA_test_long_connection_name_DEPENDENCIES) +test-long-connection-name$(EXEEXT): $(test_long_connection_name_OBJECTS) $(test_long_connection_name_DEPENDENCIES) @rm -f test-long-connection-name$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_long_connection_name_OBJECTS) $(test_long_connection_name_LDADD) $(LIBS) -test-message-mixin$(EXEEXT): $(test_message_mixin_OBJECTS) $(test_message_mixin_DEPENDENCIES) $(EXTRA_test_message_mixin_DEPENDENCIES) +test-message-mixin$(EXEEXT): $(test_message_mixin_OBJECTS) $(test_message_mixin_DEPENDENCIES) @rm -f test-message-mixin$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_message_mixin_OBJECTS) $(test_message_mixin_LDADD) $(LIBS) -test-params-cm$(EXEEXT): $(test_params_cm_OBJECTS) $(test_params_cm_DEPENDENCIES) $(EXTRA_test_params_cm_DEPENDENCIES) +test-params-cm$(EXEEXT): $(test_params_cm_OBJECTS) $(test_params_cm_DEPENDENCIES) @rm -f test-params-cm$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_params_cm_OBJECTS) $(test_params_cm_LDADD) $(LIBS) -test-properties$(EXEEXT): $(test_properties_OBJECTS) $(test_properties_DEPENDENCIES) $(EXTRA_test_properties_DEPENDENCIES) +test-properties$(EXEEXT): $(test_properties_OBJECTS) $(test_properties_DEPENDENCIES) @rm -f test-properties$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_properties_OBJECTS) $(test_properties_LDADD) $(LIBS) -test-protocol-objects$(EXEEXT): $(test_protocol_objects_OBJECTS) $(test_protocol_objects_DEPENDENCIES) $(EXTRA_test_protocol_objects_DEPENDENCIES) +test-protocol-objects$(EXEEXT): $(test_protocol_objects_OBJECTS) $(test_protocol_objects_DEPENDENCIES) @rm -f test-protocol-objects$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_protocol_objects_OBJECTS) $(test_protocol_objects_LDADD) $(LIBS) -test-proxy-preparation$(EXEEXT): $(test_proxy_preparation_OBJECTS) $(test_proxy_preparation_DEPENDENCIES) $(EXTRA_test_proxy_preparation_DEPENDENCIES) +test-proxy-preparation$(EXEEXT): $(test_proxy_preparation_OBJECTS) $(test_proxy_preparation_DEPENDENCIES) @rm -f test-proxy-preparation$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_proxy_preparation_OBJECTS) $(test_proxy_preparation_LDADD) $(LIBS) -test-self-handle$(EXEEXT): $(test_self_handle_OBJECTS) $(test_self_handle_DEPENDENCIES) $(EXTRA_test_self_handle_DEPENDENCIES) +test-self-handle$(EXEEXT): $(test_self_handle_OBJECTS) $(test_self_handle_DEPENDENCIES) @rm -f test-self-handle$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_self_handle_OBJECTS) $(test_self_handle_LDADD) $(LIBS) -test-self-presence$(EXEEXT): $(test_self_presence_OBJECTS) $(test_self_presence_DEPENDENCIES) $(EXTRA_test_self_presence_DEPENDENCIES) +test-self-presence$(EXEEXT): $(test_self_presence_OBJECTS) $(test_self_presence_DEPENDENCIES) @rm -f test-self-presence$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_self_presence_OBJECTS) $(test_self_presence_LDADD) $(LIBS) -test-simple-approver$(EXEEXT): $(test_simple_approver_OBJECTS) $(test_simple_approver_DEPENDENCIES) $(EXTRA_test_simple_approver_DEPENDENCIES) +test-simple-approver$(EXEEXT): $(test_simple_approver_OBJECTS) $(test_simple_approver_DEPENDENCIES) @rm -f test-simple-approver$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_simple_approver_OBJECTS) $(test_simple_approver_LDADD) $(LIBS) -test-simple-handler$(EXEEXT): $(test_simple_handler_OBJECTS) $(test_simple_handler_DEPENDENCIES) $(EXTRA_test_simple_handler_DEPENDENCIES) +test-simple-handler$(EXEEXT): $(test_simple_handler_OBJECTS) $(test_simple_handler_DEPENDENCIES) @rm -f test-simple-handler$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_simple_handler_OBJECTS) $(test_simple_handler_LDADD) $(LIBS) -test-simple-observer$(EXEEXT): $(test_simple_observer_OBJECTS) $(test_simple_observer_DEPENDENCIES) $(EXTRA_test_simple_observer_DEPENDENCIES) +test-simple-observer$(EXEEXT): $(test_simple_observer_OBJECTS) $(test_simple_observer_DEPENDENCIES) @rm -f test-simple-observer$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_simple_observer_OBJECTS) $(test_simple_observer_LDADD) $(LIBS) -test-stream-tube$(EXEEXT): $(test_stream_tube_OBJECTS) $(test_stream_tube_DEPENDENCIES) $(EXTRA_test_stream_tube_DEPENDENCIES) +test-stream-tube$(EXEEXT): $(test_stream_tube_OBJECTS) $(test_stream_tube_DEPENDENCIES) @rm -f test-stream-tube$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_stream_tube_OBJECTS) $(test_stream_tube_LDADD) $(LIBS) -test-text-channel$(EXEEXT): $(test_text_channel_OBJECTS) $(test_text_channel_DEPENDENCIES) $(EXTRA_test_text_channel_DEPENDENCIES) +test-text-channel$(EXEEXT): $(test_text_channel_OBJECTS) $(test_text_channel_DEPENDENCIES) @rm -f test-text-channel$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_text_channel_OBJECTS) $(test_text_channel_LDADD) $(LIBS) -test-text-mixin$(EXEEXT): $(test_text_mixin_OBJECTS) $(test_text_mixin_DEPENDENCIES) $(EXTRA_test_text_mixin_DEPENDENCIES) +test-text-mixin$(EXEEXT): $(test_text_mixin_OBJECTS) $(test_text_mixin_DEPENDENCIES) @rm -f test-text-mixin$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_text_mixin_OBJECTS) $(test_text_mixin_LDADD) $(LIBS) -test-text-respawn$(EXEEXT): $(test_text_respawn_OBJECTS) $(test_text_respawn_DEPENDENCIES) $(EXTRA_test_text_respawn_DEPENDENCIES) +test-text-respawn$(EXEEXT): $(test_text_respawn_OBJECTS) $(test_text_respawn_DEPENDENCIES) @rm -f test-text-respawn$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_text_respawn_OBJECTS) $(test_text_respawn_LDADD) $(LIBS) -test-unsupported-interface$(EXEEXT): $(test_unsupported_interface_OBJECTS) $(test_unsupported_interface_DEPENDENCIES) $(EXTRA_test_unsupported_interface_DEPENDENCIES) +test-unsupported-interface$(EXEEXT): $(test_unsupported_interface_OBJECTS) $(test_unsupported_interface_DEPENDENCIES) @rm -f test-unsupported-interface$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_unsupported_interface_OBJECTS) $(test_unsupported_interface_LDADD) $(LIBS) install-testsSCRIPTS: $(tests_SCRIPTS) @@ -1428,7 +1421,9 @@ @list='$(tests_SCRIPTS)'; test -n "$(testsdir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(testsdir)'; $(am__uninstall_files_from_dir) + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(testsdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(testsdir)" && rm -f $$files mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1501,37 +1496,42 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< svc.o: _gen/svc.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT svc.o -MD -MP -MF $(DEPDIR)/svc.Tpo -c -o svc.o `test -f '_gen/svc.c' || echo '$(srcdir)/'`_gen/svc.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/svc.Tpo $(DEPDIR)/svc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/svc.c' object='svc.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/svc.c' object='svc.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o svc.o `test -f '_gen/svc.c' || echo '$(srcdir)/'`_gen/svc.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o svc.o `test -f '_gen/svc.c' || echo '$(srcdir)/'`_gen/svc.c svc.obj: _gen/svc.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT svc.obj -MD -MP -MF $(DEPDIR)/svc.Tpo -c -o svc.obj `if test -f '_gen/svc.c'; then $(CYGPATH_W) '_gen/svc.c'; else $(CYGPATH_W) '$(srcdir)/_gen/svc.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/svc.Tpo $(DEPDIR)/svc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/svc.c' object='svc.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/svc.c' object='svc.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o svc.obj `if test -f '_gen/svc.c'; then $(CYGPATH_W) '_gen/svc.c'; else $(CYGPATH_W) '$(srcdir)/_gen/svc.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o svc.obj `if test -f '_gen/svc.c'; then $(CYGPATH_W) '_gen/svc.c'; else $(CYGPATH_W) '$(srcdir)/_gen/svc.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -1555,7 +1555,9 @@ @$(NORMAL_UNINSTALL) @list='$(dbusconfig_DATA)'; test -n "$(dbusconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(dbusconfigdir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(dbusconfigdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(dbusconfigdir)" && rm -f $$files install-dbusserviceDATA: $(dbusservice_DATA) @$(NORMAL_INSTALL) test -z "$(dbusservicedir)" || $(MKDIR_P) "$(DESTDIR)$(dbusservicedir)" @@ -1573,7 +1575,9 @@ @$(NORMAL_UNINSTALL) @list='$(dbusservice_DATA)'; test -n "$(dbusservicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(dbusservicedir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(dbusservicedir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(dbusservicedir)" && rm -f $$files install-managersDATA: $(managers_DATA) @$(NORMAL_INSTALL) test -z "$(managersdir)" || $(MKDIR_P) "$(DESTDIR)$(managersdir)" @@ -1591,7 +1595,9 @@ @$(NORMAL_UNINSTALL) @list='$(managers_DATA)'; test -n "$(managersdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(managersdir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(managersdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(managersdir)" && rm -f $$files install-testsDATA: $(tests_DATA) @$(NORMAL_INSTALL) test -z "$(testsdir)" || $(MKDIR_P) "$(DESTDIR)$(testsdir)" @@ -1609,7 +1615,9 @@ @$(NORMAL_UNINSTALL) @list='$(tests_DATA)'; test -n "$(testsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(testsdir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(testsdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(testsdir)" && rm -f $$files ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -1744,15 +1752,14 @@ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - col="$$grn"; \ + echo "$$grn$$dashes"; \ else \ - col="$$red"; \ + echo "$$red$$dashes"; \ fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ + echo "$$dashes$$std"; \ test "$$failed" -eq 0; \ else :; fi @@ -1806,15 +1813,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: @@ -1970,13 +1972,19 @@ dbus-uninstalled/%.conf: $(srcdir)/dbus-uninstalled/%.conf.in $(AM_V_at)$(mkdir_p) dbus-uninstalled - $(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@ + $(AM_V_GEN)sed \ + -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" \ + -e "s|[@]abs_top_srcdir[@]|@abs_top_srcdir@|g" \ + $< > $@ dbus-installed/%.conf: $(srcdir)/dbus-installed/%.conf.in $(AM_V_at)$(mkdir_p) dbus-installed $(AM_V_GEN)sed -e "s|[@]tpglibtestsdir[@]|@tpglibtestsdir@|g" $< > $@ -_gen/svc.c _gen/svc.h: with-properties.xml \ +_gen/svc.h: _gen/svc.c + @: + +_gen/svc.c: with-properties.xml \ $(top_srcdir)/tools/glib-ginterface-gen.py \ Makefile.am $(AM_V_at)$(mkdir_p) _gen diff -Nru telepathy-glib-0.17.5/tests/dbus/protocol-objects.c telepathy-glib-0.17.6/tests/dbus/protocol-objects.c --- telepathy-glib-0.17.5/tests/dbus/protocol-objects.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/tests/dbus/protocol-objects.c 2012-03-12 12:37:26.000000000 +0000 @@ -388,6 +388,8 @@ gconstpointer data G_GNUC_UNUSED) { TpAvatarRequirements *req; + GList *l; + TpConnectionManagerParam *param; g_assert_cmpstr (tp_connection_manager_get_name (test->cm), ==, "example_echo_2"); @@ -424,6 +426,26 @@ g_object_get (test->protocol, "avatar-requirements", &req, NULL); check_avatar_requirements (req); + + l = tp_protocol_dup_params (test->protocol); + g_assert_cmpuint (g_list_length (l), ==, 1); + param = l->data; + g_assert_cmpstr (param->name, ==, "account"); + g_list_free_full (l, (GDestroyNotify) tp_connection_manager_param_free); + + g_assert_cmpstr (tp_protocol_get_param (test->protocol, "account")->name, ==, + "account"); + + param = tp_protocol_dup_param (test->protocol, "account"); + /* it's a copy */ + g_assert (param != tp_protocol_get_param (test->protocol, "account")); + g_assert_cmpstr (param->name, ==, "account"); + tp_connection_manager_param_free (param); + + g_assert_cmpstr (tp_protocol_borrow_params (test->protocol)[0].name, ==, + "account"); + g_assert_cmpstr (tp_protocol_borrow_params (test->protocol)[1].name, ==, + NULL); } static void diff -Nru telepathy-glib-0.17.5/tests/dbus/unsupported-interface.c telepathy-glib-0.17.6/tests/dbus/unsupported-interface.c --- telepathy-glib-0.17.5/tests/dbus/unsupported-interface.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/tests/dbus/unsupported-interface.c 2012-03-07 11:51:11.000000000 +0000 @@ -1,129 +1,270 @@ +/* Regression test for unsupported interfaces on objects. + * + * Copyright © 2007-2012 Collabora Ltd. + * Copyright © 2007-2008 Nokia Corporation + * + * Copying and distribution of this file, with or without modification, + * are permitted in any medium without royalty provided the copyright + * notice and this notice are preserved. No warranty. + */ + #include "config.h" +#include #include #include +#include #include -#include "tests/lib/myassert.h" +#include "tests/lib/contacts-conn.h" #include "tests/lib/util.h" -static gboolean had_unsupported = FALSE; -static gboolean had_supported = FALSE; -static GMainLoop *mainloop = NULL; -static gboolean freed_user_data[] = { FALSE, FALSE, FALSE, FALSE }; +typedef struct { + TpDBusDaemon *dbus; + TpTestsSimpleConnection *service_conn; + TpBaseConnection *service_conn_as_base; + gchar *conn_name; + gchar *conn_path; + TpConnection *conn; + + guint wait; + gboolean reentrant; + gboolean freed; + GError *error /* initialized by GTest */; +} Fixture; + +static void +setup (Fixture *f, + gconstpointer data) +{ + g_type_init (); + tp_debug_set_flags ("all"); + f->dbus = tp_tests_dbus_daemon_dup_or_die (); + + f->service_conn = TP_TESTS_SIMPLE_CONNECTION ( + tp_tests_object_new_static_class ( + TP_TESTS_TYPE_CONTACTS_CONNECTION, + "account", "me@example.com", + "protocol", "simple-protocol", + NULL)); + f->service_conn_as_base = TP_BASE_CONNECTION (f->service_conn); + g_assert (f->service_conn != NULL); + g_assert (f->service_conn_as_base != NULL); + + g_assert (tp_base_connection_register (f->service_conn_as_base, "simple", + &f->conn_name, &f->conn_path, &f->error)); + g_assert_no_error (f->error); + + f->conn = tp_connection_new (f->dbus, f->conn_name, f->conn_path, + &f->error); + g_assert_no_error (f->error); +} + +static void +test_supported_run (Fixture *f, + gconstpointer nil G_GNUC_UNUSED) +{ + gboolean ok; + + ok = tp_cli_connection_run_connect (f->conn, -1, &f->error, NULL); + g_assert_no_error (f->error); + g_assert (ok); +} static void -supported_cb (TpDBusDaemon *bus_daemon, - const gchar **names, - const GError *error, - gpointer user_data, - GObject *weak_object) +test_unsupported_run (Fixture *f, + gconstpointer nil G_GNUC_UNUSED) { - MYASSERT (user_data != NULL, ""); - MYASSERT (weak_object == NULL, ""); - MYASSERT (names != NULL, ""); - MYASSERT (bus_daemon != NULL, ""); - MYASSERT (error == NULL, ""); - MYASSERT (mainloop != NULL, ""); + gboolean ok; + + ok = tp_cli_connection_interface_mail_notification_run_request_inbox_url ( + f->conn, -1, NULL /* "out" arg */, &f->error, NULL); + g_assert_error (f->error, TP_DBUS_ERRORS, TP_DBUS_ERROR_NO_INTERFACE); + g_assert (!ok); +} - MYASSERT (!had_supported, ""); - had_supported = TRUE; +static void +pretend_to_free (gpointer p) +{ + Fixture *f = p; - if (had_unsupported && had_supported) - g_main_loop_quit (mainloop); + g_assert (!f->freed); + f->freed = TRUE; } static void -unsupported_cb (TpProxy *proxy, - const GPtrArray *out0, - const GError *error, - gpointer user_data, - GObject *weak_object) +connect_cb (TpConnection *conn, + const GError *error, + gpointer user_data, + GObject *weak_object) { - MYASSERT (weak_object == NULL, ""); - MYASSERT (user_data != NULL, ""); - MYASSERT (proxy != NULL, ""); - MYASSERT (out0 == NULL, ""); - MYASSERT (error != NULL, ""); - MYASSERT (mainloop != NULL, ""); + Fixture *f = user_data; + + g_assert_no_error (f->error); + g_assert (!f->reentrant); + g_assert (!f->freed); - MYASSERT (!had_unsupported, ""); - had_unsupported = TRUE; + if (error != NULL) + f->error = g_error_copy (error); - if (had_unsupported && had_supported) - g_main_loop_quit (mainloop); + f->wait--; } static void -do_nothing (void) +test_supported_async (Fixture *f, + gconstpointer nil G_GNUC_UNUSED) { + TpProxyPendingCall *call; + + f->reentrant = TRUE; + f->wait = 1; + call = tp_cli_connection_call_connect (f->conn, -1, connect_cb, + f, pretend_to_free, NULL); + f->reentrant = FALSE; + + g_assert (call != NULL); + g_assert (!f->freed); + + while (f->wait) + g_main_context_iteration (NULL, TRUE); + + g_assert_no_error (f->error); + g_assert (f->freed); } static void -free_user_data (gpointer user_data) +inbox_url_cb (TpConnection *conn, + const GValueArray *va, + const GError *error, + gpointer user_data, + GObject *weak_object) { - gboolean *ptr = user_data; + Fixture *f = user_data; + + g_assert_no_error (f->error); + /* Unsupported interfaces are signalled by a re-entrant callback in 0.x */ + g_assert (f->reentrant); + g_assert (!f->freed); + + if (error != NULL) + f->error = g_error_copy (error); - *ptr = TRUE; + f->wait--; } -int -main (int argc, - char **argv) +static void +test_unsupported_async (Fixture *f, + gconstpointer nil G_GNUC_UNUSED) { - TpDBusDaemon *bus_daemon; - GError *error = NULL; + TpProxyPendingCall *call; - tp_tests_abort_after (10); - g_type_init (); - tp_debug_set_flags ("all"); + f->reentrant = TRUE; + f->wait = 1; + call = tp_cli_connection_interface_mail_notification_call_request_inbox_url ( + f->conn, -1, inbox_url_cb, f, pretend_to_free, NULL); + f->reentrant = FALSE; + + /* Unsupported interfaces are signalled by a re-entrant callback in 0.x */ + g_assert (call == NULL); + g_assert (f->freed); - bus_daemon = tp_tests_dbus_daemon_dup_or_die (); + while (f->wait) + g_main_context_iteration (NULL, TRUE); + + g_assert_error (f->error, TP_DBUS_ERRORS, TP_DBUS_ERROR_NO_INTERFACE); +} - /* this interface is automatically supported... */ - MYASSERT (tp_cli_dbus_daemon_run_list_names (bus_daemon, -1, NULL, - NULL, NULL), ""); - - /* ... but this one is not */ - MYASSERT (!tp_cli_properties_interface_run_list_properties (bus_daemon, -1, - NULL, &error, NULL), ""); - MYASSERT (error != NULL, ""); - g_error_free (error); - error = NULL; - - /* the same, but with async API */ - - mainloop = g_main_loop_new (NULL, FALSE); - - MYASSERT (tp_cli_dbus_daemon_call_list_names (bus_daemon, -1, supported_cb, - freed_user_data + 0, free_user_data, NULL) != NULL, ""); - MYASSERT (tp_cli_properties_interface_call_list_properties (bus_daemon, -1, - unsupported_cb, freed_user_data + 1, free_user_data, NULL) == NULL, - ""); - - /* the same, but with signals */ - MYASSERT (tp_cli_dbus_daemon_connect_to_name_acquired (bus_daemon, - (tp_cli_dbus_daemon_signal_callback_name_acquired) do_nothing, - freed_user_data + 2, free_user_data, NULL, NULL) != NULL, ""); - MYASSERT (tp_cli_properties_interface_connect_to_property_flags_changed - (bus_daemon, - (tp_cli_properties_interface_signal_callback_property_flags_changed) - do_nothing, - freed_user_data + 3, free_user_data, NULL, &error) == NULL, ""); - MYASSERT (error != NULL, ""); - g_error_free (error); - error = NULL; - - g_main_loop_run (mainloop); - g_main_loop_unref (mainloop); - mainloop = NULL; - - MYASSERT (freed_user_data[0], " (async call, supported)"); - MYASSERT (freed_user_data[1], " (async call, unsupported)"); - MYASSERT (!freed_user_data[2], " (signal connection, supported)"); - MYASSERT (freed_user_data[3], " (signal connection, unsupported)"); +static void +do_nothing (TpConnection *conn, + ...) +{ +} + +static void +test_supported_signal (Fixture *f, + gconstpointer nil G_GNUC_UNUSED) +{ + TpProxySignalConnection *sc; + + sc = tp_cli_connection_connect_to_status_changed (f->conn, + (void (*)(TpConnection *, guint, guint, gpointer, GObject *)) do_nothing, + f, pretend_to_free, NULL, &f->error); + + g_assert_no_error (f->error); + g_assert (sc != NULL); + g_assert (!f->freed); + + tp_proxy_signal_connection_disconnect (sc); + g_assert (f->freed); +} + +static void +test_unsupported_signal (Fixture *f, + gconstpointer nil G_GNUC_UNUSED) +{ + TpProxySignalConnection *sc; + + sc = tp_cli_connection_interface_mail_notification_connect_to_mails_received ( + f->conn, + (void (*)(TpConnection *, const GPtrArray *, gpointer, GObject *)) do_nothing, + f, pretend_to_free, NULL, &f->error); + + g_assert_error (f->error, TP_DBUS_ERRORS, TP_DBUS_ERROR_NO_INTERFACE); + g_assert (sc == NULL); + g_assert (f->freed); +} + +static void +teardown (Fixture *f, + gconstpointer data) +{ + TpConnection *conn; + + g_clear_error (&f->error); + + g_clear_object (&f->conn); + + /* disconnect the connection so we don't leak it */ + conn = tp_connection_new (f->dbus, f->conn_name, f->conn_path, + &f->error); + g_assert (conn != NULL); + g_assert_no_error (f->error); + + tp_tests_connection_assert_disconnect_succeeds (conn); + tp_tests_proxy_run_until_prepared_or_failed (conn, NULL, &f->error); + g_assert_error (f->error, TP_ERRORS, TP_ERROR_CANCELLED); + g_clear_error (&f->error); + + g_object_unref (conn); + + /* borrowed from service_conn */ + f->service_conn_as_base = NULL; + + g_clear_object (&f->service_conn); + g_free (f->conn_name); + g_free (f->conn_path); + + g_clear_object (&f->dbus); +} + +int +main (int argc, + char **argv) +{ + tp_tests_init (&argc, &argv); - g_object_unref (bus_daemon); + g_test_add ("/supported/run", Fixture, NULL, + setup, test_supported_run, teardown); + g_test_add ("/supported/async", Fixture, NULL, + setup, test_supported_async, teardown); + g_test_add ("/supported/signal", Fixture, NULL, + setup, test_supported_signal, teardown); + g_test_add ("/unsupported/run", Fixture, NULL, + setup, test_unsupported_run, teardown); + g_test_add ("/unsupported/async", Fixture, NULL, + setup, test_unsupported_async, teardown); + g_test_add ("/unsupported/signal", Fixture, NULL, + setup, test_unsupported_signal, teardown); - return 0; + return g_test_run (); } diff -Nru telepathy-glib-0.17.5/tests/lib/bug16307-conn.c telepathy-glib-0.17.6/tests/lib/bug16307-conn.c --- telepathy-glib-0.17.5/tests/lib/bug16307-conn.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/tests/lib/bug16307-conn.c 2012-03-07 11:51:11.000000000 +0000 @@ -169,8 +169,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); /* break the Connection D-Bus properties implementation, so that we always diff -Nru telepathy-glib-0.17.5/tests/lib/Makefile.in telepathy-glib-0.17.6/tests/lib/Makefile.in --- telepathy-glib-0.17.5/tests/lib/Makefile.in 2012-02-20 17:31:10.000000000 +0000 +++ telepathy-glib-0.17.6/tests/lib/Makefile.in 2012-03-19 15:34:31.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -71,8 +71,8 @@ am_libtp_glib_tests_internal_la_OBJECTS = $(am__objects_1) libtp_glib_tests_internal_la_OBJECTS = \ $(am_libtp_glib_tests_internal_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent libtp_glib_tests_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) \ @@ -99,21 +99,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libtp_glib_tests_internal_la_SOURCES) \ $(libtp_glib_tests_la_SOURCES) @@ -413,7 +413,6 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/tools/check-coding-style.mk: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -432,9 +431,9 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libtp-glib-tests-internal.la: $(libtp_glib_tests_internal_la_OBJECTS) $(libtp_glib_tests_internal_la_DEPENDENCIES) $(EXTRA_libtp_glib_tests_internal_la_DEPENDENCIES) +libtp-glib-tests-internal.la: $(libtp_glib_tests_internal_la_OBJECTS) $(libtp_glib_tests_internal_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libtp_glib_tests_internal_la_OBJECTS) $(libtp_glib_tests_internal_la_LIBADD) $(LIBS) -libtp-glib-tests.la: $(libtp_glib_tests_la_OBJECTS) $(libtp_glib_tests_la_DEPENDENCIES) $(EXTRA_libtp_glib_tests_la_DEPENDENCIES) +libtp-glib-tests.la: $(libtp_glib_tests_la_OBJECTS) $(libtp_glib_tests_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libtp_glib_tests_la_OBJECTS) $(libtp_glib_tests_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -475,23 +474,26 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -596,15 +598,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru telepathy-glib-0.17.5/tests/lib/simple-channel-dispatcher.c telepathy-glib-0.17.6/tests/lib/simple-channel-dispatcher.c --- telepathy-glib-0.17.5/tests/lib/simple-channel-dispatcher.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/tests/lib/simple-channel-dispatcher.c 2012-03-07 11:51:11.000000000 +0000 @@ -429,8 +429,7 @@ signals[CHANNEL_REQUEST_CREATED] = g_signal_new ("channel-request-created", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + 0, NULL, NULL, NULL, G_TYPE_NONE, 1, TP_TESTS_TYPE_SIMPLE_CHANNEL_REQUEST); klass->dbus_props_class.interfaces = prop_interfaces; diff -Nru telepathy-glib-0.17.5/tests/lib/simple-channel-manager.c telepathy-glib-0.17.6/tests/lib/simple-channel-manager.c --- telepathy-glib-0.17.5/tests/lib/simple-channel-manager.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/tests/lib/simple-channel-manager.c 2012-03-07 11:51:11.000000000 +0000 @@ -37,8 +37,7 @@ signals[REQUEST] = g_signal_new ("request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - g_cclosure_marshal_VOID__BOXED, + 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_HASH_TABLE); } diff -Nru telepathy-glib-0.17.5/tests/lib/simple-conn.c telepathy-glib-0.17.6/tests/lib/simple-conn.c --- telepathy-glib-0.17.5/tests/lib/simple-conn.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/tests/lib/simple-conn.c 2012-03-07 11:51:11.000000000 +0000 @@ -329,8 +329,7 @@ G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED, 0, - NULL, NULL, - g_cclosure_marshal_VOID__VOID, + NULL, NULL, NULL, G_TYPE_NONE, 0); } diff -Nru telepathy-glib-0.17.5/tests/lib/stream-tube-chan.c telepathy-glib-0.17.6/tests/lib/stream-tube-chan.c --- telepathy-glib-0.17.5/tests/lib/stream-tube-chan.c 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/tests/lib/stream-tube-chan.c 2012-03-07 11:51:11.000000000 +0000 @@ -304,8 +304,7 @@ signals[SIG_INCOMING_CONNECTION] = g_signal_new ("incoming-connection", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, + 0, NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_IO_STREAM); diff -Nru telepathy-glib-0.17.5/tests/Makefile.in telepathy-glib-0.17.6/tests/Makefile.in --- telepathy-glib-0.17.5/tests/Makefile.in 2012-02-20 17:31:10.000000000 +0000 +++ telepathy-glib-0.17.6/tests/Makefile.in 2012-03-19 15:34:30.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -77,8 +77,8 @@ test_asv_DEPENDENCIES = \ $(top_builddir)/telepathy-glib/libtelepathy-glib.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent am_test_availability_cmp_OBJECTS = availability-cmp.$(OBJEXT) test_availability_cmp_OBJECTS = $(am_test_availability_cmp_OBJECTS) @@ -170,18 +170,18 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) am__v_CCLD_0 = @echo " CCLD " $@; CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -189,18 +189,18 @@ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) -AM_V_CXX = $(am__v_CXX_@AM_V@) -am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +AM_V_CXX = $(am__v_CXX_$(V)) +am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY)) am__v_CXX_0 = @echo " CXX " $@; CXXLD = $(CXX) CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) -am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +AM_V_CXXLD = $(am__v_CXXLD_$(V)) +am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY)) am__v_CXXLD_0 = @echo " CXXLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(test_asv_SOURCES) $(test_availability_cmp_SOURCES) \ $(test_capabilities_SOURCES) \ @@ -246,12 +246,6 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } DATA = $(tests_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -613,7 +607,6 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/tools/valgrind.mk $(top_srcdir)/tools/check-coding-style.mk: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -675,46 +668,46 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -test-asv$(EXEEXT): $(test_asv_OBJECTS) $(test_asv_DEPENDENCIES) $(EXTRA_test_asv_DEPENDENCIES) +test-asv$(EXEEXT): $(test_asv_OBJECTS) $(test_asv_DEPENDENCIES) @rm -f test-asv$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_asv_OBJECTS) $(test_asv_LDADD) $(LIBS) -test-availability-cmp$(EXEEXT): $(test_availability_cmp_OBJECTS) $(test_availability_cmp_DEPENDENCIES) $(EXTRA_test_availability_cmp_DEPENDENCIES) +test-availability-cmp$(EXEEXT): $(test_availability_cmp_OBJECTS) $(test_availability_cmp_DEPENDENCIES) @rm -f test-availability-cmp$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_availability_cmp_OBJECTS) $(test_availability_cmp_LDADD) $(LIBS) -test-capabilities$(EXEEXT): $(test_capabilities_OBJECTS) $(test_capabilities_DEPENDENCIES) $(EXTRA_test_capabilities_DEPENDENCIES) +test-capabilities$(EXEEXT): $(test_capabilities_OBJECTS) $(test_capabilities_DEPENDENCIES) @rm -f test-capabilities$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_capabilities_OBJECTS) $(test_capabilities_LDADD) $(LIBS) -test-contact-search-result$(EXEEXT): $(test_contact_search_result_OBJECTS) $(test_contact_search_result_DEPENDENCIES) $(EXTRA_test_contact_search_result_DEPENDENCIES) +test-contact-search-result$(EXEEXT): $(test_contact_search_result_OBJECTS) $(test_contact_search_result_DEPENDENCIES) @rm -f test-contact-search-result$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_contact_search_result_OBJECTS) $(test_contact_search_result_LDADD) $(LIBS) -test-debug-domain$(EXEEXT): $(test_debug_domain_OBJECTS) $(test_debug_domain_DEPENDENCIES) $(EXTRA_test_debug_domain_DEPENDENCIES) +test-debug-domain$(EXEEXT): $(test_debug_domain_OBJECTS) $(test_debug_domain_DEPENDENCIES) @rm -f test-debug-domain$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_debug_domain_OBJECTS) $(test_debug_domain_LDADD) $(LIBS) -test-dtmf-player$(EXEEXT): $(test_dtmf_player_OBJECTS) $(test_dtmf_player_DEPENDENCIES) $(EXTRA_test_dtmf_player_DEPENDENCIES) +test-dtmf-player$(EXEEXT): $(test_dtmf_player_OBJECTS) $(test_dtmf_player_DEPENDENCIES) @rm -f test-dtmf-player$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_dtmf_player_OBJECTS) $(test_dtmf_player_LDADD) $(LIBS) -test-enums$(EXEEXT): $(test_enums_OBJECTS) $(test_enums_DEPENDENCIES) $(EXTRA_test_enums_DEPENDENCIES) +test-enums$(EXEEXT): $(test_enums_OBJECTS) $(test_enums_DEPENDENCIES) @rm -f test-enums$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_enums_OBJECTS) $(test_enums_LDADD) $(LIBS) -test-gnio-util$(EXEEXT): $(test_gnio_util_OBJECTS) $(test_gnio_util_DEPENDENCIES) $(EXTRA_test_gnio_util_DEPENDENCIES) +test-gnio-util$(EXEEXT): $(test_gnio_util_OBJECTS) $(test_gnio_util_DEPENDENCIES) @rm -f test-gnio-util$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_gnio_util_OBJECTS) $(test_gnio_util_LDADD) $(LIBS) -test-heap$(EXEEXT): $(test_heap_OBJECTS) $(test_heap_DEPENDENCIES) $(EXTRA_test_heap_DEPENDENCIES) +test-heap$(EXEEXT): $(test_heap_OBJECTS) $(test_heap_DEPENDENCIES) @rm -f test-heap$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_heap_OBJECTS) $(test_heap_LDADD) $(LIBS) -test-internal-debug$(EXEEXT): $(test_internal_debug_OBJECTS) $(test_internal_debug_DEPENDENCIES) $(EXTRA_test_internal_debug_DEPENDENCIES) +test-internal-debug$(EXEEXT): $(test_internal_debug_OBJECTS) $(test_internal_debug_DEPENDENCIES) @rm -f test-internal-debug$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_internal_debug_OBJECTS) $(test_internal_debug_LDADD) $(LIBS) -test-intset$(EXEEXT): $(test_intset_OBJECTS) $(test_intset_DEPENDENCIES) $(EXTRA_test_intset_DEPENDENCIES) +test-intset$(EXEEXT): $(test_intset_OBJECTS) $(test_intset_DEPENDENCIES) @rm -f test-intset$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_intset_OBJECTS) $(test_intset_LDADD) $(LIBS) -test-signal-connect-object$(EXEEXT): $(test_signal_connect_object_OBJECTS) $(test_signal_connect_object_DEPENDENCIES) $(EXTRA_test_signal_connect_object_DEPENDENCIES) +test-signal-connect-object$(EXEEXT): $(test_signal_connect_object_OBJECTS) $(test_signal_connect_object_DEPENDENCIES) @rm -f test-signal-connect-object$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_signal_connect_object_OBJECTS) $(test_signal_connect_object_LDADD) $(LIBS) -test-util$(EXEEXT): $(test_util_OBJECTS) $(test_util_DEPENDENCIES) $(EXTRA_test_util_DEPENDENCIES) +test-util$(EXEEXT): $(test_util_OBJECTS) $(test_util_DEPENDENCIES) @rm -f test-util$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_util_OBJECTS) $(test_util_LDADD) $(LIBS) -test-util-cxx$(EXEEXT): $(test_util_cxx_OBJECTS) $(test_util_cxx_DEPENDENCIES) $(EXTRA_test_util_cxx_DEPENDENCIES) +test-util-cxx$(EXEEXT): $(test_util_cxx_OBJECTS) $(test_util_cxx_DEPENDENCIES) @rm -f test-util-cxx$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(test_util_cxx_OBJECTS) $(test_util_cxx_LDADD) $(LIBS) @@ -742,44 +735,50 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< .cpp.o: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cpp.obj: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -803,7 +802,9 @@ @$(NORMAL_UNINSTALL) @list='$(tests_DATA)'; test -n "$(testsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(testsdir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(testsdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(testsdir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -1021,15 +1022,14 @@ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - col="$$grn"; \ + echo "$$grn$$dashes"; \ else \ - col="$$red"; \ + echo "$$red$$dashes"; \ fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ + echo "$$dashes$$std"; \ test "$$failed" -eq 0; \ else :; fi @@ -1110,15 +1110,10 @@ installcheck: installcheck-recursive install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru telepathy-glib-0.17.5/tests/tools/Makefile.in telepathy-glib-0.17.6/tests/tools/Makefile.in --- telepathy-glib-0.17.5/tests/tools/Makefile.in 2012-02-20 17:31:10.000000000 +0000 +++ telepathy-glib-0.17.6/tests/tools/Makefile.in 2012-03-19 15:34:31.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -53,11 +53,11 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SCRIPTS = $(dist_noinst_SCRIPTS) -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -383,15 +383,14 @@ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - col="$$grn"; \ + echo "$$grn$$dashes"; \ else \ - col="$$red"; \ + echo "$$red$$dashes"; \ fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ + echo "$$dashes$$std"; \ test "$$failed" -eq 0; \ else :; fi @@ -440,15 +439,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: diff -Nru telepathy-glib-0.17.5/tools/c-constants-gen.py telepathy-glib-0.17.6/tools/c-constants-gen.py --- telepathy-glib-0.17.5/tools/c-constants-gen.py 2011-10-18 12:55:37.000000000 +0000 +++ telepathy-glib-0.17.6/tools/c-constants-gen.py 2012-03-19 15:03:55.000000000 +0000 @@ -3,6 +3,7 @@ from sys import argv, stdout, stderr import xml.dom.minidom +from libtpcodegen import file_set_contents from libglibcodegen import NS_TP, get_docstring, \ get_descendant_text, get_by_path @@ -11,19 +12,23 @@ self.prefix = prefix + '_' self.spec = get_by_path(dom, "spec")[0] - self.__header = open(output_base + '.h', 'w') - self.__docs = open(output_base + '-gtk-doc.h', 'w') + self.output_base = output_base + self.__header = [] + self.__docs = [] def __call__(self): self.do_header() self.do_body() self.do_footer() + file_set_contents(self.output_base + '.h', ''.join(self.__header)) + file_set_contents(self.output_base + '-gtk-doc.h', ''.join(self.__docs)) + def write(self, code): - self.__header.write(code.encode('utf-8')) + self.__header.append(code.encode('utf-8')) def d(self, code): - self.__docs.write(code.encode('utf-8')) + self.__docs.append(code.encode('utf-8')) # Header def do_header(self): diff -Nru telepathy-glib-0.17.5/tools/glib-client-gen.py telepathy-glib-0.17.6/tools/glib-client-gen.py --- telepathy-glib-0.17.5/tools/glib-client-gen.py 2012-02-09 15:05:12.000000000 +0000 +++ telepathy-glib-0.17.6/tools/glib-client-gen.py 2012-03-12 12:37:26.000000000 +0000 @@ -27,6 +27,7 @@ import xml.dom.minidom from getopt import gnu_getopt +from libtpcodegen import file_set_contents from libglibcodegen import Signature, type_to_gtype, cmp_by_name, \ get_docstring, xml_escape, get_deprecated @@ -1228,10 +1229,9 @@ self.h('G_END_DECLS') self.h('') - open(self.basename + '.h', 'w').write('\n'.join(self.__header)) - open(self.basename + '-body.h', 'w').write('\n'.join(self.__body)) - open(self.basename + '-gtk-doc.h', 'w').write('\n'.join(self.__docs)) - + file_set_contents(self.basename + '.h', '\n'.join(self.__header)) + file_set_contents(self.basename + '-body.h', '\n'.join(self.__body)) + file_set_contents(self.basename + '-gtk-doc.h', '\n'.join(self.__docs)) def types_to_gtypes(types): return [type_to_gtype(t)[1] for t in types] diff -Nru telepathy-glib-0.17.5/tools/glib-client-marshaller-gen.py telepathy-glib-0.17.6/tools/glib-client-marshaller-gen.py --- telepathy-glib-0.17.5/tools/glib-client-marshaller-gen.py 2011-10-18 12:55:37.000000000 +0000 +++ telepathy-glib-0.17.6/tools/glib-client-marshaller-gen.py 2012-03-19 15:03:55.000000000 +0000 @@ -40,7 +40,8 @@ for marshaller in all: rhs = self.marshallers[marshaller] - print ' dbus_g_object_register_marshaller (%s,' % marshaller + print ' dbus_g_object_register_marshaller (' + print ' g_cclosure_marshal_generic,' print ' G_TYPE_NONE, /* return */' for type in rhs: print ' G_TYPE_%s,' % type.replace('VOID', 'NONE') diff -Nru telepathy-glib-0.17.5/tools/glib-errors-str-gen.py telepathy-glib-0.17.6/tools/glib-errors-str-gen.py --- telepathy-glib-0.17.5/tools/glib-errors-str-gen.py 2011-10-18 12:55:37.000000000 +0000 +++ telepathy-glib-0.17.6/tools/glib-errors-str-gen.py 2012-03-12 12:37:26.000000000 +0000 @@ -3,6 +3,7 @@ import sys import xml.dom.minidom +from libtpcodegen import file_set_contents from libglibcodegen import NS_TP, get_docstring, xml_escape class Generator(object): @@ -71,9 +72,9 @@ self.h('') self.b('') - open(self.basename + '.h', 'w').write('\n'.join(self.__header)) - open(self.basename + '.c', 'w').write('\n'.join(self.__body)) - open(self.basename + '-gtk-doc.h', 'w').write('\n'.join(self.__docs)) + file_set_contents(self.basename + '.h', '\n'.join(self.__header)) + file_set_contents(self.basename + '.c', '\n'.join(self.__body)) + file_set_contents(self.basename + '-gtk-doc.h', '\n'.join(self.__docs)) if __name__ == '__main__': argv = sys.argv[1:] diff -Nru telepathy-glib-0.17.5/tools/glib-ginterface-gen.py telepathy-glib-0.17.6/tools/glib-ginterface-gen.py --- telepathy-glib-0.17.5/tools/glib-ginterface-gen.py 2011-10-18 12:55:37.000000000 +0000 +++ telepathy-glib-0.17.6/tools/glib-ginterface-gen.py 2012-03-19 15:03:55.000000000 +0000 @@ -26,9 +26,9 @@ import os.path import xml.dom.minidom +from libtpcodegen import file_set_contents from libglibcodegen import Signature, type_to_gtype, cmp_by_name, \ - NS_TP, dbus_gutils_wincaps_to_uscore, \ - signal_to_marshal_name, method_to_glue_marshal_name + NS_TP, dbus_gutils_wincaps_to_uscore NS_TP = "http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0" @@ -421,8 +421,7 @@ 'not match' % (method.getAttribute('name'), lc_name)) lc_name = lc_name.lower() - marshaller = method_to_glue_marshal_name(method, - self.signal_marshal_prefix) + marshaller = 'g_cclosure_marshal_generic' wrapper = self.prefix_ + self.node_name_lc + '_' + lc_name self.b(" { (GCallback) %s, %s, %d }," % (wrapper, marshaller, offset)) @@ -717,8 +716,7 @@ in_base_init.append(' G_SIGNAL_RUN_LAST|G_SIGNAL_DETAILED,') in_base_init.append(' 0,') in_base_init.append(' NULL, NULL,') - in_base_init.append(' %s,' - % signal_to_marshal_name(signal, self.signal_marshal_prefix)) + in_base_init.append(' g_cclosure_marshal_generic,') in_base_init.append(' G_TYPE_NONE,') tmp = ['%d' % len(args)] + [gtype for (ctype, name, gtype) in args] in_base_init.append(' %s);' % ',\n '.join(tmp)) @@ -765,10 +763,9 @@ self.h('') self.b('') - open(self.basename + '.h', 'w').write('\n'.join(self.__header)) - open(self.basename + '.c', 'w').write('\n'.join(self.__body)) - open(self.basename + '-gtk-doc.h', 'w').write('\n'.join(self.__docs)) - + file_set_contents(self.basename + '.h', '\n'.join(self.__header)) + file_set_contents(self.basename + '.c', '\n'.join(self.__body)) + file_set_contents(self.basename + '-gtk-doc.h', '\n'.join(self.__docs)) def cmdline_error(): print """\ diff -Nru telepathy-glib-0.17.5/tools/glib-gtypes-generator.py telepathy-glib-0.17.6/tools/glib-gtypes-generator.py --- telepathy-glib-0.17.5/tools/glib-gtypes-generator.py 2011-10-18 12:55:37.000000000 +0000 +++ telepathy-glib-0.17.6/tools/glib-gtypes-generator.py 2012-03-19 15:03:55.000000000 +0000 @@ -23,6 +23,7 @@ import sys import xml.dom.minidom +from libtpcodegen import file_set_contents from libglibcodegen import escape_as_identifier, \ get_docstring, \ NS_TP, \ @@ -42,15 +43,16 @@ self.PREFIX_ = self.Prefix.upper() + '_' self.prefix_ = self.Prefix.lower() + '_' - self.header = open(output + '.h', 'w') - self.body = open(output + '-body.h', 'w') - self.docs = open(output + '-gtk-doc.h', 'w') + self.header = [] + self.body = [] + self.docs = [] + self.output = output for f in (self.header, self.body, self.docs): - f.write('/* Auto-generated, do not edit.\n *\n' - ' * This file may be distributed under the same terms\n' - ' * as the specification from which it was generated.\n' - ' */\n\n') + f.append('/* Auto-generated, do not edit.\n *\n' + ' * This file may be distributed under the same terms\n' + ' * as the specification from which it was generated.\n' + ' */\n\n') # keys are e.g. 'sv', values are the key escaped self.need_mappings = {} @@ -66,13 +68,13 @@ self.need_other_arrays = {} def h(self, code): - self.header.write(code.encode("utf-8")) + self.header.append(code.encode("utf-8")) def c(self, code): - self.body.write(code.encode("utf-8")) + self.body.append(code.encode("utf-8")) def d(self, code): - self.docs.write(code.encode('utf-8')) + self.docs.append(code.encode('utf-8')) def do_mapping_header(self, mapping): members = mapping.getElementsByTagNameNS(NS_TP, 'member') @@ -290,6 +292,10 @@ self.c(' return t;\n') self.c('}\n\n') + file_set_contents(self.output + '.h', ''.join(self.header)) + file_set_contents(self.output + '-body.h', ''.join(self.body)) + file_set_contents(self.output + '-gtk-doc.h', ''.join(self.docs)) + if __name__ == '__main__': argv = sys.argv[1:] diff -Nru telepathy-glib-0.17.5/tools/glib-interfaces-gen.py telepathy-glib-0.17.6/tools/glib-interfaces-gen.py --- telepathy-glib-0.17.5/tools/glib-interfaces-gen.py 2011-10-18 12:55:37.000000000 +0000 +++ telepathy-glib-0.17.6/tools/glib-interfaces-gen.py 2012-03-19 15:03:55.000000000 +0000 @@ -3,6 +3,7 @@ from sys import argv, stdout, stderr import xml.dom.minidom +from libtpcodegen import file_set_contents from libglibcodegen import NS_TP, get_docstring, \ get_descendant_text, get_by_path @@ -13,25 +14,33 @@ assert declfile.endswith('.h') docfile = declfile[:-2] + '-gtk-doc.h' - self.impls = open(implfile, 'w') - self.decls = open(declfile, 'w') - self.docs = open(docfile, 'w') + self.implfile = implfile + self.declfile = declfile + self.docfile = docfile + + self.impls = [] + self.decls = [] + self.docs = [] self.spec = get_by_path(dom, "spec")[0] def h(self, code): - self.decls.write(code.encode('utf-8')) + self.decls.append(code.encode('utf-8')) def c(self, code): - self.impls.write(code.encode('utf-8')) + self.impls.append(code.encode('utf-8')) def d(self, code): - self.docs.write(code.encode('utf-8')) + self.docs.append(code.encode('utf-8')) def __call__(self): for f in self.h, self.c: self.do_header(f) self.do_body() + file_set_contents(self.implfile, ''.join(self.impls)) + file_set_contents(self.declfile, ''.join(self.decls)) + file_set_contents(self.docfile, ''.join(self.docs)) + # Header def do_header(self, f): f('/* Generated from: ') @@ -49,6 +58,7 @@ f(""" */ +#include """) # Body diff -Nru telepathy-glib-0.17.5/tools/glib-signals-marshal-gen.py telepathy-glib-0.17.6/tools/glib-signals-marshal-gen.py --- telepathy-glib-0.17.5/tools/glib-signals-marshal-gen.py 2011-10-18 12:55:37.000000000 +0000 +++ telepathy-glib-0.17.6/tools/glib-signals-marshal-gen.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -#!/usr/bin/python - -import sys -import xml.dom.minidom -from string import ascii_letters, digits - - -from libglibcodegen import signal_to_marshal_name, method_to_glue_marshal_name - - -class Generator(object): - - def __init__(self, dom): - self.dom = dom - self.marshallers = {} - - def do_method(self, method): - marshaller = method_to_glue_marshal_name(method, 'PREFIX') - - assert '__' in marshaller - rhs = marshaller.split('__', 1)[1].split('_') - - self.marshallers[marshaller] = rhs - - def do_signal(self, signal): - marshaller = signal_to_marshal_name(signal, 'PREFIX') - - assert '__' in marshaller - rhs = marshaller.split('__', 1)[1].split('_') - - self.marshallers[marshaller] = rhs - - def __call__(self): - methods = self.dom.getElementsByTagName('method') - - for method in methods: - self.do_method(method) - - signals = self.dom.getElementsByTagName('signal') - - for signal in signals: - self.do_signal(signal) - - all = self.marshallers.keys() - all.sort() - for marshaller in all: - rhs = self.marshallers[marshaller] - if not marshaller.startswith('g_cclosure'): - print 'VOID:' + ','.join(rhs) - -if __name__ == '__main__': - argv = sys.argv[1:] - dom = xml.dom.minidom.parse(argv[0]) - - Generator(dom)() diff -Nru telepathy-glib-0.17.5/tools/libtpcodegen.py telepathy-glib-0.17.6/tools/libtpcodegen.py --- telepathy-glib-0.17.5/tools/libtpcodegen.py 2011-10-18 12:55:37.000000000 +0000 +++ telepathy-glib-0.17.6/tools/libtpcodegen.py 2012-03-12 12:37:26.000000000 +0000 @@ -20,7 +20,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +import os from string import ascii_letters, digits @@ -28,6 +28,18 @@ _ASCII_ALNUM = ascii_letters + digits +def file_set_contents(filename, contents): + try: + os.remove(filename) + except OSError: + pass + try: + os.remove(filename + '.tmp') + except OSError: + pass + + open(filename + '.tmp', 'w').write(contents) + os.rename(filename + '.tmp', filename) def cmp_by_name(node1, node2): return cmp(node1.getAttributeNode("name").nodeValue, diff -Nru telepathy-glib-0.17.5/tools/Makefile.am telepathy-glib-0.17.6/tools/Makefile.am --- telepathy-glib-0.17.5/tools/Makefile.am 2012-02-20 16:55:59.000000000 +0000 +++ telepathy-glib-0.17.6/tools/Makefile.am 2012-03-12 12:37:26.000000000 +0000 @@ -32,7 +32,6 @@ glib-ginterface-gen.py \ glib-gtypes-generator.py \ glib-interfaces-gen.py \ - glib-signals-marshal-gen.py \ gobject-foo.py \ lcov.am \ libtpcodegen.py \ @@ -53,23 +52,21 @@ all: $(EXTRA_DIST) libglibcodegen.py: libtpcodegen.py - $(AM_V_GEN)touch $@ + $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@ c-constants-gen.py: libglibcodegen.py - $(AM_V_GEN)touch $@ + $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@ glib-client-marshaller-gen.py: libglibcodegen.py - $(AM_V_GEN)touch $@ + $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@ glib-errors-enum-body-gen.py: libglibcodegen.py - $(AM_V_GEN)touch $@ + $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@ glib-errors-enum-header-gen.py: libglibcodegen.py - $(AM_V_GEN)touch $@ + $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@ glib-ginterface-gen.py: libglibcodegen.py - $(AM_V_GEN)touch $@ + $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@ glib-gtypes-generator.py: libglibcodegen.py - $(AM_V_GEN)touch $@ + $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@ glib-interfaces-gen.py: libglibcodegen.py - $(AM_V_GEN)touch $@ -glib-signals-marshal-gen.py: libglibcodegen.py - $(AM_V_GEN)touch $@ + $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@ TELEPATHY_SPEC_SRCDIR = $(top_srcdir)/../telepathy-spec maintainer-update-from-telepathy-spec: diff -Nru telepathy-glib-0.17.5/tools/Makefile.in telepathy-glib-0.17.6/tools/Makefile.in --- telepathy-glib-0.17.5/tools/Makefile.in 2012-02-20 17:31:11.000000000 +0000 +++ telepathy-glib-0.17.6/tools/Makefile.in 2012-03-19 15:34:31.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -72,19 +72,13 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } am__installdirs = "$(DESTDIR)$(toolsdir)" SCRIPTS = $(noinst_SCRIPTS) $(tools_SCRIPTS) -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -282,7 +276,6 @@ glib-ginterface-gen.py \ glib-gtypes-generator.py \ glib-interfaces-gen.py \ - glib-signals-marshal-gen.py \ gobject-foo.py \ lcov.am \ libtpcodegen.py \ @@ -364,7 +357,9 @@ @list='$(tools_SCRIPTS)'; test -n "$(toolsdir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(toolsdir)'; $(am__uninstall_files_from_dir) + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(toolsdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(toolsdir)" && rm -f $$files mostlyclean-libtool: -rm -f *.lo @@ -425,15 +420,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: @@ -534,23 +524,21 @@ all: $(EXTRA_DIST) libglibcodegen.py: libtpcodegen.py - $(AM_V_GEN)touch $@ + $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@ c-constants-gen.py: libglibcodegen.py - $(AM_V_GEN)touch $@ + $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@ glib-client-marshaller-gen.py: libglibcodegen.py - $(AM_V_GEN)touch $@ + $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@ glib-errors-enum-body-gen.py: libglibcodegen.py - $(AM_V_GEN)touch $@ + $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@ glib-errors-enum-header-gen.py: libglibcodegen.py - $(AM_V_GEN)touch $@ + $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@ glib-ginterface-gen.py: libglibcodegen.py - $(AM_V_GEN)touch $@ + $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@ glib-gtypes-generator.py: libglibcodegen.py - $(AM_V_GEN)touch $@ + $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@ glib-interfaces-gen.py: libglibcodegen.py - $(AM_V_GEN)touch $@ -glib-signals-marshal-gen.py: libglibcodegen.py - $(AM_V_GEN)touch $@ + $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@ maintainer-update-from-telepathy-spec: set -e && cd $(srcdir) && \ for x in $(EXTRA_DIST); do \ diff -Nru telepathy-glib-0.17.5/tools/manager-file.py telepathy-glib-0.17.6/tools/manager-file.py --- telepathy-glib-0.17.5/tools/manager-file.py 2012-02-09 15:05:12.000000000 +0000 +++ telepathy-glib-0.17.6/tools/manager-file.py 2012-03-12 12:37:26.000000000 +0000 @@ -163,13 +163,25 @@ environment = {} execfile(sys.argv[1], environment) - f = open('%s/%s.manager' % (sys.argv[2], environment['MANAGER']), 'w') + filename = '%s/%s.manager' % (sys.argv[2], environment['MANAGER']) + try: + os.remove(filename) + except OSError: + pass + f = open(filename + '.tmp', 'w') write_manager(f, environment['MANAGER'], environment['PARAMS']) f.close() + os.rename(filename + '.tmp', filename) - f = open('%s/param-spec-struct.h' % sys.argv[2], 'w') + filename = '%s/param-spec-struct.h' % sys.argv[2] + try: + os.remove(filename) + except OSError: + pass + f = open(filename + '.tmp', 'w') for protocol in environment['PARAMS']: write_c_params(f, environment['MANAGER'], protocol, environment['STRUCTS'][protocol], environment['PARAMS'][protocol]) f.close() + os.rename(filename + '.tmp', filename) diff -Nru telepathy-glib-0.17.5/vala/Makefile.in telepathy-glib-0.17.6/vala/Makefile.in --- telepathy-glib-0.17.5/vala/Makefile.in 2012-02-20 17:31:11.000000000 +0000 +++ telepathy-glib-0.17.6/vala/Makefile.in 2012-03-19 15:34:31.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -52,11 +52,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -81,12 +81,6 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } am__installdirs = "$(DESTDIR)$(vapidir)" "$(DESTDIR)$(vapidir)" DATA = $(dist_vapi_DATA) $(vapi_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -338,7 +332,9 @@ @$(NORMAL_UNINSTALL) @list='$(dist_vapi_DATA)'; test -n "$(vapidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(vapidir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(vapidir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(vapidir)" && rm -f $$files install-vapiDATA: $(vapi_DATA) @$(NORMAL_INSTALL) test -z "$(vapidir)" || $(MKDIR_P) "$(DESTDIR)$(vapidir)" @@ -356,7 +352,9 @@ @$(NORMAL_UNINSTALL) @list='$(vapi_DATA)'; test -n "$(vapidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(vapidir)'; $(am__uninstall_files_from_dir) + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(vapidir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(vapidir)" && rm -f $$files tags: TAGS TAGS: @@ -413,15 +411,10 @@ installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: