diff -Nru telepathy-salut-0.7.2/aclocal.m4 telepathy-salut-0.8.0/aclocal.m4 --- telepathy-salut-0.7.2/aclocal.m4 2012-03-26 17:19:20.000000000 +0000 +++ telepathy-salut-0.8.0/aclocal.m4 2012-04-04 16:37:33.000000000 +0000 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -247,12 +248,15 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 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 @@ -262,7 +266,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.1], [], +m4_if([$1], [1.11.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -278,7 +282,7 @@ # 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.1])dnl +[AM_AUTOMAKE_VERSION([1.11.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -307,12 +311,14 @@ # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 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/../..'. @@ -394,14 +400,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 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 10 +# serial 12 # 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, @@ -441,6 +447,7 @@ # 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. @@ -505,7 +512,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | 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. @@ -570,10 +577,13 @@ 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 -*- @@ -807,12 +817,15 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 2011 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. @@ -944,12 +957,15 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 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'. @@ -972,13 +988,14 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 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 4 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -986,13 +1003,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)])]) @@ -1003,13 +1020,15 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009, +# 2011 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 @@ -1037,8 +1056,10 @@ 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.0 python2.5 python2.4 python2.3 python2.2 dnl -python2.1 python2.0]) +[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]) m4_if([$1],[],[ dnl No version check is needed. @@ -1110,9 +1131,7 @@ 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. distutils does not exist in - dnl Python 1.5, so we fall back to the hardcoded directory if it - dnl doesn't work. + dnl Query distutils for this directory. AC_CACHE_CHECK([for $am_display_PYTHON script directory], [am_cv_python_pythondir], [if test "x$prefix" = xNONE @@ -1121,8 +1140,7 @@ 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 || - echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + 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` case $am_cv_python_pythondir in $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` @@ -1148,9 +1166,7 @@ dnl pyexecdir -- directory for installing python extension modules dnl (shared libraries) - 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. + dnl Query distutils for this directory. AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], [am_cv_python_pyexecdir], [if test "x$exec_prefix" = xNONE @@ -1159,8 +1175,7 @@ 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 || - echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + 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` case $am_cv_python_pyexecdir in $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` @@ -1208,12 +1223,14 @@ sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 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. @@ -1290,13 +1307,13 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009, 2011 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 +# serial 2 # AM_SILENT_RULES([DEFAULT]) # -------------------------- @@ -1311,18 +1328,50 @@ 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 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 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 @@ -1345,13 +1394,13 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 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 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -1360,13 +1409,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 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1388,10 +1437,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [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}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) diff -Nru telepathy-salut-0.7.2/ChangeLog telepathy-salut-0.8.0/ChangeLog --- telepathy-salut-0.7.2/ChangeLog 2012-03-26 17:22:40.000000000 +0000 +++ telepathy-salut-0.8.0/ChangeLog 2012-04-04 16:39:39.000000000 +0000 @@ -1,3 +1,90 @@ +commit aa7c846dd852ec7eb3900e90e1ed449a813e0d64 +Author: Jonny Lamb +Date: 2012-04-04 12:36:24 -0400 + + version 0.8.0 + + Signed-off-by: Jonny Lamb + +commit 8957692941212a9b2ff7bf078d5af90396aa2aca +Author: Jonny Lamb +Date: 2012-04-04 12:36:02 -0400 + + update NEWS for 0.8.0 + + Signed-off-by: Jonny Lamb + +commit d3da65a4aa110a75c83c90b731a6d274be993c63 +Author: Jonny Lamb +Date: 2012-04-03 21:23:51 -0400 + + ft test: add more assertion failure debug output + + I am trying to debug this failing test on the buildbot. + + Signed-off-by: Jonny Lamb + +commit 3a5c302994130f7ea3ad41b4d6abc9386000f627 +Author: Jonny Lamb +Date: 2012-04-03 21:07:18 -0400 + + ft-channel: don't call gibber_ft_send unless the remote is accepted already + + This should fixe all the annoying TimeoutErrors in the outgoing file + transfer tests waiting for TransferredBytesChanged (salut was actually + asserting). \o/ + + Signed-off-by: Jonny Lamb + +commit 85fbec36ec2a24872383bc52b91e34ab79d435d0 +Author: Jonny Lamb +Date: 2012-04-03 21:02:04 -0400 + + gibber-oob-file-transfer: assert we have a message before using it + + If we g_signal_connect (NULL, ...), it will not work, so let's fail + earlier. + + Signed-off-by: Jonny Lamb + +commit 0a5092500b67d70217a9ce361f660d54f8c842b2 +Author: Jonny Lamb +Date: 2012-04-03 17:31:01 -0400 + + muc-channel: re-add 'creator' property + + Turns out I misunderstood this property before when porting to + TpBaseChannel in 2e6d62f0e735bf4f774f and thought it meant + requested. Let's re-add it to make avahi/tubes/two-muc-stream-tubes.py + pass again. + + Signed-off-by: Jonny Lamb + +commit dd68cade4b99f9ff8ae865e8e4a09eb87dfadfdb +Author: Jonny Lamb +Date: 2012-04-03 09:58:18 -0400 + + muc-channel: fix reference to SalutConnection in OLPC code + + Signed-off-by: Jonny Lamb + +commit 3886d5677d37277dea95a3a07d9987cb767a0160 +Author: Simon McVittie +Date: 2012-03-26 12:35:22 +0100 + + Compile everything before we test it + + Without this change, sidecars.py fails under "make check" in a clean tree, + because the plugins haven't been built when we recurse into tests. + + Reviewed-by: Jonny Lamb + +commit f4dcbd1019c60b2688e46f0822ce9f4adeb87618 +Author: Olli Salli +Date: 2012-03-26 20:32:46 +0300 + + Start 0.7.3 dev + commit 096914a312598fb07812322a76430cf5f41b9265 Author: Olli Salli Date: 2012-03-26 20:20:56 +0300 diff -Nru telepathy-salut-0.7.2/config.guess telepathy-salut-0.8.0/config.guess --- telepathy-salut-0.7.2/config.guess 2012-03-15 18:43:30.000000000 +0000 +++ telepathy-salut-0.8.0/config.guess 2012-04-04 16:37:35.000000000 +0000 @@ -2,9 +2,9 @@ # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-05-11' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -57,8 +55,8 @@ Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +143,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -792,13 +790,12 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -807,6 +804,9 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -861,6 +861,13 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -895,13 +902,16 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -943,7 +953,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -978,13 +988,13 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-tilera-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -1315,6 +1325,9 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -Nru telepathy-salut-0.7.2/config.sub telepathy-salut-0.8.0/config.sub --- telepathy-salut-0.7.2/config.sub 2012-03-15 18:43:30.000000000 +0000 +++ telepathy-salut-0.8.0/config.sub 2012-04-04 16:37:35.000000000 +0000 @@ -2,9 +2,9 @@ # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-03-23' +timestamp='2012-02-10' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -76,8 +74,8 @@ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -132,6 +130,10 @@ os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -247,17 +249,22 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -291,7 +298,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -300,7 +307,7 @@ | spu \ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -315,8 +322,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -329,7 +335,10 @@ strongarm | thumb | xscale) basic_machine=arm-unknown ;; - + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; xscaleeb) basic_machine=armeb-unknown ;; @@ -352,11 +361,13 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ @@ -365,8 +376,10 @@ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -400,7 +413,7 @@ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ @@ -408,10 +421,11 @@ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -711,7 +725,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -808,10 +821,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -1120,13 +1141,8 @@ basic_machine=t90-cray os=-unicos ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1336,7 +1352,7 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1548,9 +1564,6 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout diff -Nru telepathy-salut-0.7.2/configure telepathy-salut-0.8.0/configure --- telepathy-salut-0.7.2/configure 2012-03-26 17:19:21.000000000 +0000 +++ telepathy-salut-0.8.0/configure 2012-04-04 16:37:34.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 Salut 0.7.2. +# Generated by GNU Autoconf 2.68 for Telepathy Salut 0.8.0. # # Report bugs to . # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='Telepathy Salut' PACKAGE_TARNAME='telepathy-salut' -PACKAGE_VERSION='0.7.2' -PACKAGE_STRING='Telepathy Salut 0.7.2' +PACKAGE_VERSION='0.8.0' +PACKAGE_STRING='Telepathy Salut 0.8.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=telepathy-salut' PACKAGE_URL='' @@ -746,6 +746,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -770,6 +771,8 @@ LIBTOOL AM_BACKSLASH AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -875,6 +878,7 @@ PKG_CONFIG_LIBDIR VALGRIND_CFLAGS VALGRIND_LIBS +PYTHON GTKDOC_DEPS_CFLAGS GTKDOC_DEPS_LIBS GLIB_CFLAGS @@ -1445,7 +1449,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 Salut 0.7.2 to adapt to many kinds of systems. +\`configure' configures Telepathy Salut 0.8.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1515,7 +1519,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Telepathy Salut 0.7.2:";; + short | recursive ) echo "Configuration of Telepathy Salut 0.8.0:";; esac cat <<\_ACEOF @@ -1554,7 +1558,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] 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 @@ -1585,6 +1589,7 @@ C compiler flags for VALGRIND, overriding pkg-config VALGRIND_LIBS linker flags for VALGRIND, overriding pkg-config + PYTHON the Python interpreter GTKDOC_DEPS_CFLAGS C compiler flags for GTKDOC_DEPS, overriding pkg-config GTKDOC_DEPS_LIBS @@ -1700,7 +1705,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Telepathy Salut configure 0.7.2 +Telepathy Salut configure 0.8.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1978,7 +1983,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 Salut $as_me 0.7.2, which was +It was created by Telepathy Salut $as_me 0.8.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2810,7 +2815,7 @@ # Define the identity of the package. PACKAGE='telepathy-salut' - VERSION='0.7.2' + VERSION='0.8.0' cat >>confdefs.h <<_ACEOF @@ -2840,9 +2845,9 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} +# 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}' { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 @@ -2941,6 +2946,33 @@ 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='\' case `pwd` in @@ -2951,8 +2983,8 @@ -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -3160,6 +3192,7 @@ 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= @@ -3973,6 +4006,7 @@ # 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. @@ -4032,7 +4066,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | 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. @@ -4776,6 +4810,11 @@ 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 @@ -4815,7 +4854,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"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -5244,7 +5283,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -5885,13 +5924,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -6038,6 +6077,7 @@ # 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};"\ @@ -6426,7 +6466,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*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 @@ -6437,7 +6477,20 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + 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 + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -7077,7 +7130,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # 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 lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7088,6 +7147,7 @@ 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 : @@ -7120,6 +7180,7 @@ 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 : @@ -7141,7 +7202,9 @@ 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 -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + 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 lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -7546,7 +7609,22 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + 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 else pic_mode=default fi @@ -7624,6 +7702,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -8083,7 +8165,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -8174,18 +8258,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # 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 @@ -8547,7 +8646,6 @@ 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 @@ -8800,8 +8898,7 @@ 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= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$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~ @@ -9181,6 +9278,7 @@ # 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' @@ -9226,6 +9324,7 @@ 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 @@ -9254,10 +9353,6 @@ 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 @@ -9270,7 +9365,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 @@ -9309,7 +9404,6 @@ 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 @@ -9933,11 +10027,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -10027,7 +10116,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -10036,7 +10125,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -10101,7 +10190,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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' @@ -10240,7 +10329,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -10248,10 +10337,6 @@ 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. @@ -10259,7 +10344,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -10277,7 +10362,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -10297,7 +10382,7 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' @@ -10308,7 +10393,7 @@ ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -10369,7 +10454,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -10385,7 +10470,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -10422,9 +10507,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10518,7 +10603,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -10587,7 +10672,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10612,7 +10697,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -10636,7 +10721,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -10667,7 +10752,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10677,7 +10762,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -11459,6 +11544,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -12023,6 +12110,7 @@ # 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. @@ -12082,7 +12170,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | 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. @@ -12450,6 +12538,7 @@ # 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. @@ -12507,7 +12596,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | 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. @@ -13448,6 +13537,8 @@ + + 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 @@ -13481,7 +13572,7 @@ $as_echo_n "(cached) " >&6 else - 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 + 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 test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros @@ -13590,7 +13681,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 @@ -13601,8 +13692,7 @@ 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 || - echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + 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` case $am_cv_python_pythondir in $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` @@ -13628,7 +13718,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 @@ -13639,8 +13729,7 @@ 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 || - echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + 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` case $am_cv_python_pyexecdir in $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` @@ -16335,7 +16424,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Telepathy Salut $as_me 0.7.2, which was +This file was extended by Telepathy Salut $as_me 0.8.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16401,7 +16490,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 Salut config.status 0.7.2 +Telepathy Salut config.status 0.8.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -16538,6 +16627,7 @@ 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"`' @@ -16620,7 +16710,6 @@ 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"`' @@ -16676,6 +16765,7 @@ # Quote evaled strings. for var in SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -16726,7 +16816,6 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -17539,8 +17628,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 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -17594,6 +17683,9 @@ # 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 @@ -17895,10 +17987,6 @@ # 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 diff -Nru telepathy-salut-0.7.2/configure.ac telepathy-salut-0.8.0/configure.ac --- telepathy-salut-0.7.2/configure.ac 2012-03-26 17:18:56.000000000 +0000 +++ telepathy-salut-0.8.0/configure.ac 2012-04-04 16:36:21.000000000 +0000 @@ -8,8 +8,8 @@ # set salut_nano_version to 0. m4_define([salut_major_version], [0]) -m4_define([salut_minor_version], [7]) -m4_define([salut_micro_version], [2]) +m4_define([salut_minor_version], [8]) +m4_define([salut_micro_version], [0]) m4_define([salut_nano_version], [0]) # Some magic diff -Nru telepathy-salut-0.7.2/data/Makefile.in telepathy-salut-0.8.0/data/Makefile.in --- telepathy-salut-0.7.2/data/Makefile.in 2012-03-26 17:19:21.000000000 +0000 +++ telepathy-salut-0.8.0/data/Makefile.in 2012-04-04 16:37:35.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -82,6 +82,12 @@ 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)$(managerdir)" "$(DESTDIR)$(servicedir)" DATA = $(manager_DATA) $(service_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -329,9 +335,7 @@ @$(NORMAL_UNINSTALL) @list='$(manager_DATA)'; test -n "$(managerdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(managerdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(managerdir)" && rm -f $$files + dir='$(DESTDIR)$(managerdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @@ -349,9 +353,7 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(servicedir)" && rm -f $$files + dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -406,10 +408,15 @@ installcheck: installcheck-am install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/debian/changelog telepathy-salut-0.8.0/debian/changelog --- telepathy-salut-0.7.2/debian/changelog 2012-04-03 16:23:08.000000000 +0000 +++ telepathy-salut-0.8.0/debian/changelog 2012-04-05 16:30:44.000000000 +0000 @@ -1,3 +1,13 @@ +telepathy-salut (0.8.0-0ubuntu1) precise; urgency=low + + * New upstream release. + - Fix MUC code to announce the user as a member of the MUC if it is + the creator. + - Fix race in file transfer code which was giving the IO channel to + Gibber before it knew how to deal with it. + + -- Ken VanDine Thu, 05 Apr 2012 12:30:41 -0400 + telepathy-salut (0.7.2-0ubuntu1) precise; urgency=low * New upstream release. diff -Nru telepathy-salut-0.7.2/depcomp telepathy-salut-0.8.0/depcomp --- telepathy-salut-0.7.2/depcomp 2012-03-15 18:43:31.000000000 +0000 +++ telepathy-salut-0.8.0/depcomp 2012-04-04 16:37:36.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-12-04.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011 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 outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -90,10 +90,18 @@ # 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 @@ -158,10 +166,12 @@ ' < "$tmpdepfile" | ## Some versions of gcc put a space before the `:'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -405,6 +415,52 @@ 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. @@ -503,7 +559,9 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$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" sed '1,2d' "$tmpdepfile" | tr ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation diff -Nru telepathy-salut-0.7.2/docs/Makefile.in telepathy-salut-0.8.0/docs/Makefile.in --- telepathy-salut-0.7.2/docs/Makefile.in 2012-03-26 17:19:21.000000000 +0000 +++ telepathy-salut-0.8.0/docs/Makefile.in 2012-04-04 16:37:35.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -82,6 +82,12 @@ 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; }; \ + } man8dir = $(mandir)/man8 am__installdirs = "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(htmldir)" NROFF = nroff @@ -355,9 +361,7 @@ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man8dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) install-htmlDATA: $(html_DATA) @$(NORMAL_INSTALL) test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" @@ -375,9 +379,7 @@ @$(NORMAL_UNINSTALL) @list='$(html_DATA)'; test -n "$(htmldir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(htmldir)" && rm -f $$files + dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -445,10 +447,15 @@ installcheck: installcheck-am install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/extensions/Makefile.in telepathy-salut-0.8.0/extensions/Makefile.in --- telepathy-salut-0.7.2/extensions/Makefile.in 2012-03-26 17:19:21.000000000 +0000 +++ telepathy-salut-0.8.0/extensions/Makefile.in 2012-04-04 16:37:35.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -59,8 +59,8 @@ nodist_libsalut_extensions_la_OBJECTS = signals-marshal.lo svc.lo libsalut_extensions_la_OBJECTS = $(am_libsalut_extensions_la_OBJECTS) \ $(nodist_libsalut_extensions_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -72,21 +72,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) 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_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libsalut_extensions_la_SOURCES) \ $(nodist_libsalut_extensions_la_SOURCES) @@ -364,7 +364,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libsalut-extensions.la: $(libsalut_extensions_la_OBJECTS) $(libsalut_extensions_la_DEPENDENCIES) +libsalut-extensions.la: $(libsalut_extensions_la_OBJECTS) $(libsalut_extensions_la_DEPENDENCIES) $(EXTRA_libsalut_extensions_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libsalut_extensions_la_OBJECTS) $(libsalut_extensions_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -380,42 +380,37 @@ .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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/signals-marshal.c' object='signals-marshal.lo' libtool=yes @AMDEPBACKSLASH@ +@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@ $(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@ $(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 svc.lo: _gen/svc.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.lo -MD -MP -MF $(DEPDIR)/svc.Tpo -c -o svc.lo `test -f '_gen/svc.c' || echo '$(srcdir)/'`_gen/svc.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/svc.Tpo $(DEPDIR)/svc.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/svc.c' object='svc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='_gen/svc.c' object='svc.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@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.lo `test -f '_gen/svc.c' || echo '$(srcdir)/'`_gen/svc.c +@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.lo `test -f '_gen/svc.c' || echo '$(srcdir)/'`_gen/svc.c mostlyclean-libtool: -rm -f *.lo @@ -521,10 +516,15 @@ installcheck: installcheck-am install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/INSTALL telepathy-salut-0.8.0/INSTALL --- telepathy-salut-0.7.2/INSTALL 2012-03-15 18:43:31.000000000 +0000 +++ telepathy-salut-0.8.0/INSTALL 2012-04-04 16:37:36.000000000 +0000 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 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,6 +226,11 @@ 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-salut-0.7.2/install-sh telepathy-salut-0.8.0/install-sh --- telepathy-salut-0.7.2/install-sh 2012-03-15 18:43:30.000000000 +0000 +++ telepathy-salut-0.8.0/install-sh 2012-04-04 16:37:35.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-01-19.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -156,6 +156,10 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -200,7 +208,11 @@ fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for `test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -385,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru telepathy-salut-0.7.2/lib/ext/Makefile.in telepathy-salut-0.8.0/lib/ext/Makefile.in --- telepathy-salut-0.7.2/lib/ext/Makefile.in 2012-03-26 17:19:21.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/Makefile.in 2012-04-04 16:37:35.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -532,10 +532,15 @@ installcheck: installcheck-recursive install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/aclocal.m4 telepathy-salut-0.8.0/lib/ext/wocky/aclocal.m4 --- telepathy-salut-0.7.2/lib/ext/wocky/aclocal.m4 2012-03-15 18:43:36.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/aclocal.m4 2012-04-04 16:37:42.000000000 +0000 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -179,12 +180,15 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 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 @@ -194,7 +198,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.1], [], +m4_if([$1], [1.11.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -210,7 +214,7 @@ # 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.1])dnl +[AM_AUTOMAKE_VERSION([1.11.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -239,12 +243,14 @@ # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 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/../..'. @@ -326,14 +332,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 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 10 +# serial 12 # 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, @@ -373,6 +379,7 @@ # 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. @@ -437,7 +444,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | 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. @@ -502,10 +509,13 @@ 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 -*- @@ -739,12 +749,15 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 2011 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. @@ -876,12 +889,15 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 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'. @@ -904,13 +920,14 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 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 4 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -918,13 +935,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)])]) @@ -935,12 +952,14 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 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. @@ -1017,13 +1036,13 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009, 2011 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 +# serial 2 # AM_SILENT_RULES([DEFAULT]) # -------------------------- @@ -1038,18 +1057,50 @@ 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 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 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 @@ -1072,13 +1123,13 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 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 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -1087,13 +1138,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 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1115,10 +1166,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [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}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/ChangeLog telepathy-salut-0.8.0/lib/ext/wocky/ChangeLog --- telepathy-salut-0.7.2/lib/ext/wocky/ChangeLog 2012-03-26 17:22:39.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/ChangeLog 2012-01-31 23:06:33.000000000 +0000 @@ -1,26262 +0,0 @@ -commit fe5b396b46d963cd1fa8c2e6cd9d36012edd5867 -Author: Olli Salli -Date: Fri Mar 16 19:22:54 2012 +0200 - - Add wocky_send_ll_pep_event utility function - - This is essentially salut_send_ll_pep_event, but using WockyXep0115Capabilities to decide who to - send the stanza to. - - wocky/wocky-pubsub-helpers.c | 78 +++++++++++++++++++++++++++++++++++++++++- - wocky/wocky-pubsub-helpers.h | 5 ++- - 2 files changed, 81 insertions(+), 2 deletions(-) - -commit 8c31eb275050fd62e2c486211c4cb34b10cd8fe4 -Author: Olli Salli -Date: Fri Mar 16 19:08:49 2012 +0200 - - Add has_feature to the WockyXep0115Capabilities interface - - wocky/wocky-xep-0115-capabilities.c | 17 ++++++++++++++++- - wocky/wocky-xep-0115-capabilities.h | 13 +++++++++++-- - 2 files changed, 27 insertions(+), 3 deletions(-) - -commit a8011aa7e549cfde28adad41d1a1c6f39fafba69 -Author: Guillaume Desmottes -Date: Thu Mar 15 10:01:45 2012 +0100 - - connector: display the port when falling back to HOST - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 707bf14a43bf41739f1fd126c301a4a1c88b7a37 -Author: Mikhail Zabaluev -Date: Fri Mar 9 17:09:20 2012 +0200 - - Delist the internal headers from installed headers - - Reviewed-By: Simon McVittie - - wocky/Makefile.am | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 520016c06c3c7440c925bde233842deafce76208 -Author: Simon McVittie -Date: Thu Feb 23 11:52:59 2012 +0000 - - If configured with --enable-shared-suffix=*, install a shared library - - The suffix should be something like gabble-0.15.4, to yield - libwocky-gabble-0.15.4.so ("the Wocky from Gabble 0.15.4"). - - configure.ac | 10 ++++++++++ - wocky/Makefile.am | 9 +++++++++ - 2 files changed, 19 insertions(+), 0 deletions(-) - -commit 8db06f5deefc6dd61504e769ee4d534f182c3a77 -Author: Simon McVittie -Date: Thu Feb 23 11:50:28 2012 +0000 - - Use LIBADD properly, rather than putting libraries in LDFLAGS - - wocky/Makefile.am | 11 +++++++++-- - 1 files changed, 9 insertions(+), 2 deletions(-) - -commit 81fe73ceb5b0693a92c2247bdb1da11b363b79dd -Author: Simon McVittie -Date: Tue Feb 21 13:25:24 2012 +0000 - - GNUTLS backend: don't use 0 as an error domain - - It's never been considered valid, and since GLib 2.31.something - it issues a warning, which breaks the Gabble regression tests. - - We're still using 0 as the error code because WockyTLSError has - apparently never actually defined what its error enum is, and in its - existing uses in the OpenSSL backend it's an OpenSSL error code, - which is obviously not applicable here. - - Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46379 - Reviewed-by: Vivek Dasmohapatra - - wocky/Makefile.am | 1 + - wocky/wocky-openssl.c | 22 ------------------- - wocky/wocky-tls-common.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-tls.c | 17 ++++---------- - 4 files changed, 58 insertions(+), 34 deletions(-) - -commit 17af336d3fe42109e9ab067c27bd9f20a915f9e5 -Author: Will Thompson -Date: Mon Feb 6 14:56:27 2012 +0000 - - Namespace debug flags. - - For better or worse, we expose these to applications, so we should - namespace them. (This isn't purely theoretical: the names clash with the - same ones in Gibber within Salut.) - - tests/wocky-test-connector-server.c | 2 +- - wocky/wocky-auth-registry.c | 2 +- - wocky/wocky-bare-contact.c | 2 +- - wocky/wocky-c2s-porter.c | 2 +- - wocky/wocky-caps-cache.c | 2 +- - wocky/wocky-caps-hash.c | 2 +- - wocky/wocky-connector.c | 2 +- - wocky/wocky-contact-factory.c | 2 +- - wocky/wocky-contact.c | 2 +- - wocky/wocky-data-form.c | 2 +- - wocky/wocky-debug-internal.h | 16 ++++++------ - wocky/wocky-debug.c | 44 +++++++++++++++++----------------- - wocky/wocky-debug.h | 44 +++++++++++++++++----------------- - wocky/wocky-disco-identity.c | 2 +- - wocky/wocky-heartbeat-source.c | 2 +- - wocky/wocky-jabber-auth-digest.c | 2 +- - wocky/wocky-jabber-auth-password.c | 2 +- - wocky/wocky-jabber-auth.c | 2 +- - wocky/wocky-ll-connection-factory.c | 2 +- - wocky/wocky-ll-connector.c | 2 +- - wocky/wocky-meta-porter.c | 2 +- - wocky/wocky-muc.c | 2 +- - wocky/wocky-openssl.c | 2 +- - wocky/wocky-pep-service.c | 2 +- - wocky/wocky-ping.c | 2 +- - wocky/wocky-pubsub-node.c | 2 +- - wocky/wocky-pubsub-service.c | 2 +- - wocky/wocky-resource-contact.c | 2 +- - wocky/wocky-roster.c | 2 +- - wocky/wocky-sasl-auth.c | 2 +- - wocky/wocky-sasl-digest-md5.c | 2 +- - wocky/wocky-sasl-plain.c | 2 +- - wocky/wocky-sasl-scram.c | 2 +- - wocky/wocky-tls-connector.c | 2 +- - wocky/wocky-tls-handler.c | 2 +- - wocky/wocky-tls.c | 2 +- - wocky/wocky-xmpp-reader.c | 4 +- - wocky/wocky-xmpp-writer.c | 4 +- - 38 files changed, 89 insertions(+), 89 deletions(-) - -commit 132d73e09abb9c08f61cebe1cd0ca6d7cbc8b7c0 -Merge: bcf78e4 6de1714 -Author: Will Thompson -Date: Mon Feb 6 13:27:00 2012 +0000 - - Merge branch 'headers' - - https://bugs.freedesktop.org/show_bug.cgi?id=27489 - - Reviewed-by: Simon McVittie - -commit 6de1714422763cb4b96be9dd9085b8745b19d18a -Author: Will Thompson -Date: Wed Feb 1 16:19:15 2012 +0000 - - Move some of pubsub-node-protected.h to internal.h - - As Simon mentions on - and comments in - that file specify, some bits of wocky-pubsub-node-protected.h are - intended for applications, and other bits are internal to Wocky. So - let's split the later bits into a new header, - wocky-pubsub-node-internal.h, which is not included by wocky.h and has - internal-only header guards. - - wocky/Makefile.am | 1 + - wocky/wocky-pubsub-node-internal.h | 44 +++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-node-protected.h | 20 +--------------- - wocky/wocky-pubsub-node.c | 1 + - wocky/wocky-pubsub-service.c | 1 + - 5 files changed, 48 insertions(+), 19 deletions(-) - -commit 25cc1aba2e10faa7d85030a57331c541a04cbe4d -Author: Will Thompson -Date: Wed Feb 1 15:55:03 2012 +0000 - - Include wocky-debug.h from wocky.h - - wocky/wocky-debug.h | 4 ++-- - wocky/wocky.h | 1 + - 2 files changed, 3 insertions(+), 2 deletions(-) - -commit 33b31b5d6be1b46b3e8d28e3f38b15f94ae1401f -Author: Will Thompson -Date: Wed Feb 1 15:47:18 2012 +0000 - - Always define WockyDebugFlags and wocky_debug_set_flags() - - If wocky-debug.h is to contain API for applications, that API should - probably always be defined. - - wocky/wocky-debug.c | 6 ++++++ - wocky/wocky-debug.h | 8 -------- - 2 files changed, 6 insertions(+), 8 deletions(-) - -commit 2beb6fe89dac878b1a786033bf452d10b3f8ad56 -Author: Will Thompson -Date: Wed Feb 1 15:31:26 2012 +0000 - - Move most of debug.h to debug-internal.h - - Gabble uses a couple of bits of this API to turn on a little bit of - Wocky's debug output for the purposes of the D-Bus debugging interface, - so making debug.h internal-only is not going to fly. However, most of it - really is internal-only. - - tests/wocky-test-connector-server.c | 2 +- - wocky/Makefile.am | 1 + - wocky/wocky-auth-registry.c | 2 +- - wocky/wocky-bare-contact.c | 2 +- - wocky/wocky-c2s-porter.c | 2 +- - wocky/wocky-caps-cache.c | 2 +- - wocky/wocky-caps-hash.c | 2 +- - wocky/wocky-connector.c | 2 +- - wocky/wocky-contact-factory.c | 2 +- - wocky/wocky-contact.c | 2 +- - wocky/wocky-data-form.c | 2 +- - wocky/wocky-debug-internal.h | 86 +++++++++++++++++++++++++++++++++++ - wocky/wocky-debug.c | 2 +- - wocky/wocky-debug.h | 64 -------------------------- - wocky/wocky-disco-identity.c | 2 +- - wocky/wocky-heartbeat-source.c | 2 +- - wocky/wocky-jabber-auth-digest.c | 2 +- - wocky/wocky-jabber-auth-password.c | 2 +- - wocky/wocky-jabber-auth.c | 2 +- - wocky/wocky-ll-connection-factory.c | 2 +- - wocky/wocky-ll-connector.c | 2 +- - wocky/wocky-meta-porter.c | 2 +- - wocky/wocky-muc.c | 2 +- - wocky/wocky-openssl.c | 2 +- - wocky/wocky-pep-service.c | 2 +- - wocky/wocky-ping.c | 2 +- - wocky/wocky-pubsub-node.c | 2 +- - wocky/wocky-pubsub-service.c | 2 +- - wocky/wocky-resource-contact.c | 2 +- - wocky/wocky-roster.c | 2 +- - wocky/wocky-sasl-auth.c | 2 +- - wocky/wocky-sasl-digest-md5.c | 2 +- - wocky/wocky-sasl-plain.c | 2 +- - wocky/wocky-sasl-scram.c | 2 +- - wocky/wocky-stanza.c | 2 +- - wocky/wocky-tls-connector.c | 2 +- - wocky/wocky-tls-handler.c | 2 +- - wocky/wocky-tls.c | 2 +- - wocky/wocky-xmpp-reader.c | 2 +- - wocky/wocky-xmpp-writer.c | 2 +- - 40 files changed, 124 insertions(+), 101 deletions(-) - -commit 2f0be660cd161f5abcb2ab57331e85d0415415ea -Author: Will Thompson -Date: Tue Jan 31 16:58:02 2012 +0000 - - Make #include the only legal import. - - examples/receive-messages.c | 4 -- - examples/register.c | 3 +- - examples/send-message.c | 4 -- - examples/unregister.c | 3 +- - tests/wocky-bare-contact-test.c | 4 +-- - tests/wocky-caps-hash-test.c | 3 +- - tests/wocky-connector-test.c | 6 +--- - tests/wocky-contact-factory-test.c | 3 +- - tests/wocky-data-form-test.c | 5 +-- - tests/wocky-http-proxy-test.c | 8 ++++- - tests/wocky-jid-validation-test.c | 2 +- - tests/wocky-loopback-test.c | 3 +- - tests/wocky-node-tree-test.c | 3 +- - tests/wocky-pep-service-test.c | 4 +-- - tests/wocky-ping-test.c | 5 +-- - tests/wocky-porter-test.c | 5 +-- - tests/wocky-pubsub-node-test.c | 4 +-- - tests/wocky-pubsub-service-test.c | 6 +--- - tests/wocky-pubsub-test-helpers.c | 2 +- - tests/wocky-pubsub-test-helpers.h | 2 +- - tests/wocky-resource-contact-test.c | 3 +- - tests/wocky-roster-test.c | 8 +---- - tests/wocky-sasl-utils-test.c | 2 +- - tests/wocky-scram-sha1-test.c | 2 +- - tests/wocky-session-test.c | 3 +- - tests/wocky-stanza-test.c | 5 +-- - tests/wocky-test-connector-server.c | 13 +++---- - tests/wocky-test-helper.c | 2 - - tests/wocky-test-helper.h | 4 +-- - tests/wocky-test-sasl-auth-server.c | 3 -- - tests/wocky-test-sasl-auth-server.h | 3 +- - tests/wocky-test-sasl-auth.c | 4 +-- - tests/wocky-test-sasl-handler.c | 2 +- - tests/wocky-tls-test.c | 3 +- - tests/wocky-utils-test.c | 2 +- - tests/wocky-xmpp-connection-test.c | 3 +- - tests/wocky-xmpp-node-test.c | 5 +-- - tests/wocky-xmpp-reader-test.c | 2 - - tests/wocky-xmpp-readwrite-test.c | 4 +-- - wocky/Makefile.am | 4 ++- - wocky/wocky-auth-handler.h | 3 ++ - wocky/wocky-auth-registry.h | 5 ++- - wocky/wocky-bare-contact.h | 3 ++ - wocky/wocky-c2s-porter.h | 3 ++ - wocky/wocky-caps-cache.h | 3 ++ - wocky/wocky-caps-hash.h | 3 ++ - wocky/wocky-connector.h | 3 ++ - wocky/wocky-contact-factory.h | 3 ++ - wocky/wocky-contact.h | 3 ++ - wocky/wocky-data-form.h | 3 ++ - wocky/wocky-debug.h | 3 ++ - wocky/wocky-disco-identity.h | 3 ++ - wocky/wocky-heartbeat-source.h | 4 ++ - wocky/wocky-http-proxy.h | 3 ++ - wocky/wocky-jabber-auth-digest.h | 4 ++ - wocky/wocky-jabber-auth-password.h | 4 ++ - wocky/wocky-jabber-auth.h | 3 ++ - wocky/wocky-ll-connection-factory.h | 3 ++ - wocky/wocky-ll-connector.h | 3 ++ - wocky/wocky-ll-contact.h | 3 ++ - wocky/wocky-loopback-stream.h | 3 ++ - wocky/wocky-meta-porter.h | 3 ++ - wocky/wocky-muc.h | 4 ++ - wocky/wocky-namespaces.h | 3 ++ - wocky/wocky-node-private.h | 3 ++ - wocky/wocky-node-tree.h | 3 ++ - wocky/wocky-node.h | 3 ++ - wocky/wocky-pep-service.h | 3 ++ - wocky/wocky-ping.h | 3 ++ - wocky/wocky-porter.h | 3 ++ - wocky/wocky-pubsub-helpers.h | 3 ++ - wocky/wocky-pubsub-node-protected.h | 3 ++ - wocky/wocky-pubsub-node.h | 3 ++ - wocky/wocky-pubsub-service-protected.h | 3 ++ - wocky/wocky-pubsub-service.h | 3 ++ - wocky/wocky-resource-contact.h | 3 ++ - wocky/wocky-roster.h | 3 ++ - wocky/wocky-sasl-auth.h | 3 ++ - wocky/wocky-sasl-digest-md5.h | 4 ++ - wocky/wocky-sasl-plain.h | 4 ++ - wocky/wocky-sasl-scram.h | 5 ++- - wocky/wocky-session.h | 3 ++ - wocky/wocky-stanza.h | 3 ++ - wocky/wocky-tls-connector.h | 3 ++ - wocky/wocky-tls-handler.h | 3 ++ - wocky/wocky-tls.h | 3 ++ - wocky/wocky-types.h | 3 ++ - wocky/wocky-utils.h | 3 ++ - wocky/wocky-xep-0115-capabilities.h | 3 ++ - wocky/wocky-xmpp-connection.h | 3 ++ - wocky/wocky-xmpp-error.h | 3 ++ - wocky/wocky-xmpp-reader.h | 3 ++ - wocky/wocky-xmpp-writer.h | 3 ++ - wocky/wocky.h | 53 ++++++++++++++++++++++++++++++++ - 94 files changed, 268 insertions(+), 110 deletions(-) - -commit 4c8a53c6d00231203cab1f9f14959825a2adedb3 -Author: Will Thompson -Date: Tue Jan 31 16:26:57 2012 +0000 - - Include foo-enumtypes.h from each foo.h - - I think it's reasonable to assume that importing the header which gives - you WockyXmppError should also give you WOCKY_TYPE_XMPP_ERROR. - - wocky/wocky-auth-registry.h | 1 + - wocky/wocky-connector.c | 1 - - wocky/wocky-connector.h | 2 +- - wocky/wocky-data-form.c | 1 - - wocky/wocky-data-form.h | 1 + - wocky/wocky-jabber-auth.c | 1 - - wocky/wocky-muc.c | 2 -- - wocky/wocky-muc.h | 1 + - wocky/wocky-openssl.c | 1 - - wocky/wocky-pubsub-node.c | 1 - - wocky/wocky-pubsub-node.h | 1 + - wocky/wocky-pubsub-service.c | 1 - - wocky/wocky-pubsub-service.h | 1 + - wocky/wocky-sasl-auth.c | 1 - - wocky/wocky-tls.c | 1 - - wocky/wocky-tls.h | 2 ++ - wocky/wocky-xmpp-error.c | 1 - - wocky/wocky-xmpp-error.h | 1 + - wocky/wocky-xmpp-reader.h | 1 + - 19 files changed, 10 insertions(+), 12 deletions(-) - -commit fe9b08f15f346676c67c798f6f626839a0f5f71b -Author: Will Thompson -Date: Tue Jan 31 14:39:56 2012 +0000 - - AuthHandler: add a bit of documentation. - - wocky/wocky-auth-handler.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-auth-handler.h | 19 +++++++------ - 2 files changed, 69 insertions(+), 9 deletions(-) - -commit fcf4ab9b107a3a3d25a129dc86fd2edcd5188a38 -Author: Will Thompson -Date: Tue Jan 31 14:39:40 2012 +0000 - - Remove prototype for wocky_auth_handler_free() - - This function doesn't exist. - - wocky/wocky-auth-handler.h | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit b7310bd0535931fd9afa76b124981d23ae71207f -Author: Will Thompson -Date: Tue Jan 31 11:25:49 2012 +0000 - - docs: use @... not @Varargs - - Apparently the latter stopped being recognized by gtk-doc at some point. - :( - - wocky/wocky-c2s-porter.c | 2 +- - wocky/wocky-node-tree.c | 2 +- - wocky/wocky-node.c | 4 ++-- - wocky/wocky-porter.c | 6 +++--- - wocky/wocky-stanza.c | 4 ++-- - 5 files changed, 9 insertions(+), 9 deletions(-) - -commit bcf78e4f3de03921f72b783c1f86f18da716fa70 -Merge: f5adf2d 8a4afe1 -Author: Jonny Lamb -Date: Wed Feb 1 13:36:43 2012 -0500 - - Merge remote-tracking branch 'siraj/mingw32-warn' - -commit f5adf2d1141e4dfd3aeb9ca043825e66ba4a556e -Author: Will Thompson -Date: Wed Feb 1 13:10:50 2012 +0000 - - test-helper: give sched_close_cb a more debuggable assertion - - Asserting that wocky_porter_close_finish() returns TRUE is fine and all, - but when it fails you get no information about why it failed. By passing - a non-NULL GError ** parameter and asserting on that error first, we get - the details of what actually happened immediately. - - tests/wocky-test-helper.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit eecef2669555c65c20a01c55b7166593bac1d96b -Author: Will Thompson -Date: Wed Feb 1 13:05:08 2012 +0000 - - porter-test: fix /handler-stanza - - test_close_porter() assumes test->sched_in has not been started, and - calls wocky_xmpp_connection_recv_stanza_async() on test->in; the - callback assumes that the call has failed with an error indicating that - the stream has been closed. This would be fine if the test was sure - there were no stanzas in the queue in test->in, but since my change to - make WockyC2SPorter send back an error in response to unhandled IQs, - this assumption is no longer true: there are error replies sitting - around waiting to be handled. - - So this patch just makes this test turn both porters on and then use - test_close_both_porters(). - - tests/wocky-porter-test.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 43d93377facac1a7b9bae8e898c29b245ec476f5 -Author: Will Thompson -Date: Fri Mar 4 10:36:26 2011 +0000 - - C2SPorter: reply to unhandled IQ get/sets. - - XMPP Core requires that we reply to all IQs we receive. If no handler - claims responsibility for an incoming IQ, the porter should send back a - error. (Currently, Gabble does this.) - - https://bugs.freedesktop.org/show_bug.cgi?id=34975 - - tests/wocky-porter-test.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-c2s-porter.c | 20 ++++++++++--- - 2 files changed, 79 insertions(+), 5 deletions(-) - -commit d1896284653c29577b3ecb037406a9ab84a810df -Merge: fef0ba2 f481ea9 -Author: Will Thompson -Date: Tue Jan 31 17:06:00 2012 +0000 - - Merge branch '45400-pep-service-rummage-for-items' - -commit fef0ba21349c8f1434ed93766b6e35c787cbbbae -Author: Simon McVittie -Date: Thu Jan 26 16:00:23 2012 +0000 - - Remove and other remnants of gcrypt - - This doesn't seem to be used for anything, and creates an artificial - dependency on gcrypt, which GNUTLS 3 no longer uses. - - Verified to pass tests on Debian's gnutls26 2.12.16-1 package, but - insufficient to make tests pass on gnutls28 3.0.12-1. - - Reviewed-by: Will Thompson - Bug: https://bugs.freedesktop.org/show_bug.cgi?id=43992 - Bug-Debian: http://bugs.debian.org/638420 - - Android.mk | 2 +- - wocky/Makefile.am | 2 +- - wocky/wocky-tls.c | 1 - - 3 files changed, 2 insertions(+), 3 deletions(-) - -commit 982b60b0b64704a84cbfa6d0156187622a73c611 -Author: Simon McVittie -Date: Thu Jan 26 15:08:31 2012 +0000 - - Use g_getenv and g_strtoull instead of getenv and atoi - - We don't include stdlib.h (except accidentally, via gcrypt.h), which we - should if we're going to use its functions. In both cases GLib has a - portable version, and our coding style is generally to prefer the GLib - versions of things, so let's use those. - - Reviewed-by: Will Thompson - Bug: https://bugs.freedesktop.org/show_bug.cgi?id=43992 - - wocky/wocky-tls.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit f481ea91d5278178ca25abd9fd1f95283d2b0794 -Author: Will Thompson -Date: Mon Jan 30 17:08:23 2012 +0000 - - PepService: update © years. - - wocky/wocky-pep-service.c | 2 +- - wocky/wocky-pep-service.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 5cd7e850bbd71605cf9e954c6a13afe8f5560dea -Author: Will Thompson -Date: Mon Jan 30 16:05:34 2012 +0000 - - PepService::changed: pass element to callback - - tests/wocky-pep-service-test.c | 60 +++++++++++++++++++++++++++++++-------- - wocky/wocky-pep-service.c | 16 ++++++++-- - 2 files changed, 60 insertions(+), 16 deletions(-) - -commit 10e528fb92452b21ac67a0685ed16c24ea66cba7 -Author: Will Thompson -Date: Mon Jan 30 15:41:24 2012 +0000 - - PepService: return node from get() - - tests/wocky-pep-service-test.c | 9 +++++++-- - wocky/wocky-pep-service.c | 22 +++++++++++++++++++++- - wocky/wocky-pep-service.h | 1 + - 3 files changed, 29 insertions(+), 3 deletions(-) - -commit 2a8023ac04fdd4a3321f08c9664e63998e8689a3 -Author: Will Thompson -Date: Mon Jan 30 15:31:47 2012 +0000 - - PepService: use G_GNUC_WARN_UNUSED_RESULT as needed. - - wocky/wocky-pep-service.h | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 8a4afe112d4a61ffe9fa0fd629dd92fdc90e68b7 -Author: Siraj Razick -Date: Thu Jan 26 16:20:04 2012 -0500 - - Fix warnings from wocky-connector-test.c under mingw32 - - In windows socket API setsockopt takes a const char * as the fourth - parameter, while on Linux it takes a void * so we cast to - const char * which will work under both the platforms. This patch - also move flags veriable in client_connected to the unix part of the - ifdef, to remove warnings which shows up with mingw32. - - tests/wocky-connector-test.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 97a5823f03850f70bbd1da12af1364adc925e494 -Author: Siraj Razick -Date: Thu Jan 26 16:13:18 2012 -0500 - - TLS: replace gsize and gssize with size_t and ssize_t - - gnutls_transport_set_push_function expects a function of - ssize_t (*gnutls_push_func)(gnutls_transport_ptr_t, const void*, size_t); - and in mingw32 gsize and gssize doesn't expend to size_t or ssize_t. - this results in mingw32 builds fail due to the warning. - - https://bugs.freedesktop.org/show_bug.cgi?id=45272 - - wocky/wocky-tls.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 3b6bae256972241e12a7c47b1bb821dda348b409 -Author: Siraj Razick -Date: Thu Jan 26 15:14:02 2012 -0500 - - TLS: Rename _stat variable to peer_cert_status - - _stat shadows a global variable defined in mingw32 so this patch - renames it to peer_cert_status in wocky_tls_session_verify_peer - - https://bugs.freedesktop.org/show_bug.cgi?id=45272 - - wocky/wocky-tls.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit f7d8ff028c63447e67efe87a5224419ca89bb715 -Author: Simon McVittie -Date: Thu Jan 26 15:07:02 2012 +0000 - - Fix coding style so the tests can pass - - tests/wocky-connector-test.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 44a326f3ab2aafea7a78df6ac75e9b4c014fe0e8 -Author: Siraj Razick -Date: Wed Dec 21 12:29:29 2011 -0500 - - Build fixes for Windows - - These changes enables us to cross-compile wocky for windows with mingw32 - - tests/Makefile.am | 2 +- - tests/test-resolver.c | 6 ++++++ - tests/wocky-connector-test.c | 24 ++++++++++++++++++++---- - wocky/wocky-meta-porter.c | 8 ++++++++ - 4 files changed, 35 insertions(+), 5 deletions(-) - -commit 8a1a8d94d40d731a8045d4fb2a67a65484a7983c -Author: Alban Crequy -Date: Fri Dec 16 16:15:09 2011 +0000 - - wocky_data_form_set_type: add default value and raw content - - They are needed for wocky_caps_hash_compute_from_lists(). - - https://bugs.freedesktop.org/show_bug.cgi?id=43891 - - wocky/wocky-data-form.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit 9e38356210772956d1d05e5eed2e485df962ceee -Author: Xavier Claessens -Date: Wed Dec 14 15:33:03 2011 +0100 - - Use G_GINT64_FORMAT instead of %li - - wocky/wocky-heartbeat-source.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 244dd4e32315ba79d2ff340e7a87a4be3b9dd5e8 -Author: Xavier Claessens -Date: Wed Dec 14 12:28:36 2011 +0100 - - Add tests/wocky-dummy-xmpp-server.c to build system and fix it - - Code that we don't build won't build. - - .gitignore | 1 + - tests/Makefile.am | 13 +++++++++++++ - tests/wocky-dummy-xmpp-server.c | 15 ++++++++++----- - 3 files changed, 24 insertions(+), 5 deletions(-) - -commit 85556079abd82cc6d86a395e5b3e9e35da1482a8 -Author: Xavier Claessens -Date: Wed Dec 14 10:51:58 2011 +0100 - - Fix build warnings with glib 2.32 - - tests/wocky-http-proxy-test.c | 4 ++++ - tests/wocky-sasl-utils-test.c | 4 ++++ - tests/wocky-test-helper.c | 3 +++ - 3 files changed, 11 insertions(+), 0 deletions(-) - -commit d1ebf26eb23a307d8e45f7b49770481151c0ab26 -Author: Xavier Claessens -Date: Mon Nov 7 13:00:31 2011 +0100 - - g_source_get_current_time() is replaced by g_source_get_time() - - configure.ac | 2 +- - wocky/wocky-heartbeat-source.c | 52 +++++++++++++++++----------------------- - 2 files changed, 23 insertions(+), 31 deletions(-) - -commit 194c14c2b244eeec197261b1063e75d6f21e996c -Author: Alban Crequy -Date: Wed Dec 7 18:19:14 2011 +0000 - - test: dataforms: add a test for bug fdo#43584 - - https://bugs.freedesktop.org/show_bug.cgi?id=43584 - - tests/wocky-data-form-test.c | 47 ++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 47 insertions(+), 0 deletions(-) - -commit b0a398bc4f75bf86e4e4df171df79b52e9fd3503 -Author: Alban Crequy -Date: Wed Dec 7 16:50:02 2011 +0000 - - dataforms: fix crash in add_field_to_node_using_default() - - field->raw_value_contents was not initialized when the field was not coming - from a WockyNode. It leads to a segfault in add_field_to_node_using_default(). - - The following code was triggering the crash: - - form = g_object_new (WOCKY_TYPE_DATA_FORM, NULL); - wocky_data_form_set_string (form, "field", "value", TRUE); - wocky_data_form_add_to_node (form, ...); - - This patch initializes field->raw_value_contents when the WockyNode is created - through data_form_set_value(). - - The unit tests are updated to check this. - - https://bugs.freedesktop.org/show_bug.cgi?id=43584 - - wocky/wocky-data-form.c | 31 +++++++++++++++++++++++++++++++ - 1 files changed, 31 insertions(+), 0 deletions(-) - -commit 1cb38f6d3ceba586e3a98be285f172fc8448becd -Author: Alban Crequy -Date: Wed Dec 7 16:49:40 2011 +0000 - - wocky_data_form_set_string: fix documentation - - wocky/wocky-data-form.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 509688872eb7df6c38e1efcebc4a7eea032cfcac -Merge: 1628149 9905ee7 -Author: Sjoerd Simons -Date: Tue Nov 29 12:51:54 2011 +0100 - - Merge branch 'invalid-character-test' - -commit 9905ee72891d4e16898f70d37a5bf4da65b438ec -Author: Sjoerd Simons -Date: Mon Nov 28 11:16:15 2011 +0100 - - Add a test for filtering non-character unicode codepoints - - tests/wocky-xmpp-reader-test.c | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) - -commit f4900b0325ef211a0cef27620f436daeb6ecf6d3 -Author: Sjoerd Simons -Date: Mon Nov 28 10:47:11 2011 +0100 - - Ensure all data in a WockyNode is validated according to the rules in g_utf8_validate - - In some cases valid utf-8, but for non-character codepoints gets send - through xmpp. Other parts of the system can get confused by those (e.g. - D-Bus doesn't allow them in strings). So we need to ensure that they get - filtered out as soon as possible. - - There are two obvious places to do this, either in the XmppReader or - the Nodes. Doing it in the nodes has the advantage of ensuring - consistency for all data going into the Node, not just what was read - from xmpp directly. Furthermore the Node api calls already copy the - strings internally, which is a good place place to do the conversions if - needed. - - wocky/wocky-node.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++----- - 1 files changed, 102 insertions(+), 10 deletions(-) - -commit 16281498c3613e237b4096ee99789f80d02076c8 -Author: Alvaro Soliverez -Date: Fri Nov 11 15:20:06 2011 -0300 - - Support building under Android, modified from an original patch by Derek Foreman - - https://bugs.freedesktop.org/show_bug.cgi?id=42509 - - .gitignore | 1 + - Android.mk | 32 ++++++++++++++++++++++++++++++++ - wocky/Makefile.am | 9 ++++++++- - 3 files changed, 41 insertions(+), 1 deletions(-) - -commit bcce213e495424684e2cda11f6e5559032e481b4 -Author: Will Thompson -Date: Fri Nov 18 13:47:51 2011 +0000 - - Use wocky_node_matches() in a couple of places - - wocky/wocky-connector.c | 3 +-- - wocky/wocky-data-form.c | 3 +-- - wocky/wocky-tls-connector.c | 3 +-- - 3 files changed, 3 insertions(+), 6 deletions(-) - -commit ac6bfbe70f5ac35d0b998854d3d5ae17ee55be78 -Author: Will Thompson -Date: Fri Nov 18 12:40:47 2011 +0000 - - Add wocky_node_matches{,_q} - - This makes it easier to verify that a node has the name and namespace - you expect. - - Reviewed-by: Jonny Lamb - - wocky/wocky-node.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-node.h | 10 ++++++++++ - 2 files changed, 59 insertions(+), 0 deletions(-) - -commit 79008a4927792ddda8720d70d09948951e1b8423 -Author: Will Thompson -Date: Wed Nov 16 09:05:59 2011 +0000 - - meta-porter: emit ::sending when a child porter does - - wocky/wocky-meta-porter.c | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit e34be9ed3748699425ee4c4565c6a01a65f4d6d5 -Author: Will Thompson -Date: Wed Nov 16 08:59:33 2011 +0000 - - Porter: add stanza being sent to ::sending - - This is useful in writing an XMPP console for Gabble. - - wocky/wocky-c2s-porter.c | 4 ++-- - wocky/wocky-porter.c | 6 ++++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - -commit 502b3aa449dc9a2bfafd68eedf46531f31071432 -Author: Will Thompson -Date: Mon Jun 27 19:47:08 2011 +0100 - - Porter: support matching STANZA_TYPE_NONE - - For really specialised cases, like an XML console in Gabble, you want to - be able to match stanzas of any type. The docs claim you can do this, - but they lie. - - I could be convinced that the correct way to do this is to add a fourth - method, wocky_porter_register_handler_for_any_stanza (), and that the - server/anyone/from variants are unnecessary. Thoughts? - - https://bugs.freedesktop.org/show_bug.cgi?id=38577 - - tests/wocky-porter-test.c | 100 +++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-c2s-porter.c | 43 +++++++++++++++----- - wocky/wocky-meta-porter.c | 7 ++- - wocky/wocky-porter.c | 56 ++++++++++++++++++++----- - 4 files changed, 182 insertions(+), 24 deletions(-) - -commit fb661a1c9edfd362cb367535c477650f50c50889 -Author: Xavier Claessens -Date: Wed Nov 16 16:27:37 2011 +0100 - - Also replace g_byte_array_free with g_byte_array_unref - - tests/wocky-sasl-utils-test.c | 2 +- - wocky/wocky-sasl-scram.c | 16 ++++++++-------- - 2 files changed, 9 insertions(+), 9 deletions(-) - -commit 97c206797c9bb0f1893f845c01f28c301b92200e -Author: Xavier Claessens -Date: Wed Nov 16 15:55:42 2011 +0100 - - Use _unref instead of _free _destroy when possible.unref - - Replace g_(ptr_)array_free (foo, TRUE) and g_hash_table_destroy - with respectively g_(ptr_)array_unref (foo) and g_hash_table_unref. - - I used this command to generate this patch: - for f in `find -name "*.c"`; do sed -i $f -re 's/g_ptr_array_free \(([^ ,]+), TRUE\)/g_ptr_array_unref \(\1\)/'; done - - See Danielle's blog for explanation of possible bug _free can do: - http://blogs.gnome.org/danni/2011/11/16/mistakes-with-g_value_set_boxed/ - - tests/wocky-roster-test.c | 2 +- - tests/wocky-test-stream.c | 4 ++-- - wocky/wocky-bare-contact.c | 4 ++-- - wocky/wocky-c2s-porter.c | 4 ++-- - wocky/wocky-caps-hash.c | 12 ++++++------ - wocky/wocky-contact-factory.c | 6 +++--- - wocky/wocky-disco-identity.c | 2 +- - wocky/wocky-loopback-stream.c | 4 ++-- - wocky/wocky-meta-porter.c | 6 +++--- - wocky/wocky-pubsub-service.c | 2 +- - wocky/wocky-roster.c | 8 ++++---- - wocky/wocky-sasl-digest-md5.c | 4 ++-- - 12 files changed, 29 insertions(+), 29 deletions(-) - -commit c216947c02b161eb4ab11ec8ae1b2e9b99a703ed -Author: Xavier Claessens -Date: Wed Nov 16 15:55:32 2011 +0100 - - Add coding style check for g_hash_table_destroy and g_array_free usage - - tools/check-c-style.sh | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) - -commit a0e74a1cd04ab5e35922536f047664a5ce69c114 -Author: Jonny Lamb -Date: Tue Nov 15 10:04:54 2011 +0000 - - sasl test: fix build failure on older libsasl2s - - A second try. - - Signed-off-by: Jonny Lamb - - tests/wocky-test-sasl-auth-server.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit 7216cb27349d336dfdedf571fd0923324bce2ead -Author: Jonny Lamb -Date: Tue Nov 15 09:10:13 2011 +0000 - - sasl test: define sasl_callback_ft if not already done so - - We could have upped the dependency on libsasl2 but given this is just - a test I thought it wasn't worth the bother of having to make sure - everyone had the newer library version and blah blah blah, so I just - did this. - - Signed-off-by: Jonny Lamb - - tests/wocky-test-sasl-auth-server.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit c4e19a478599d12824dddcba83de907fa8adf310 -Author: Xavier Claessens -Date: Tue Oct 25 16:44:36 2011 +0200 - - Accept from="server.com" as stanzas coming from server - - Some servers does not set the full/bare jid. - - Fixes fdo#39057 - - tests/wocky-porter-test.c | 80 ++++++++++++++++++++++++++++++++++++++++++-- - wocky/wocky-c2s-porter.c | 14 ++++--- - 2 files changed, 84 insertions(+), 10 deletions(-) - -commit ac0030bef952d974c9a6c64f73f2710add65a5fa -Merge: 1db5b28 1ee6695 -Author: Danielle Madeley -Date: Mon Nov 7 21:54:06 2011 +1100 - - Merge branch 'trivia' - -commit 1ee66951f5cf501d139477fcff940306446520d3 -Author: Danielle Madeley -Date: Mon Nov 7 21:43:11 2011 +1100 - - wocky-muc: return NULL if a timestamp can't be determined - - Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=42652 - - wocky/wocky-muc.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit 1db5b28824c279308adb8c110dd69c9915a6726f -Merge: f0b6203 1f29491 -Author: Danielle Madeley -Date: Mon Nov 7 20:52:24 2011 +1100 - - Merge branch 'wocky-muc-gdatetime' - -commit f0b6203d4d50055a73680ad606f47c29f8a80525 -Merge: db8b2b0 4d5b82b -Author: Jonny Lamb -Date: Wed Nov 2 09:19:57 2011 +0000 - - Merge branch 'caps-forms' - -commit db8b2b02c0f8e6f1f33c96a0559d2c006c765b98 -Author: Sjoerd Simons -Date: Tue Nov 1 09:25:22 2011 +0100 - - tests: Fix compilation error with libsasl2 - - wocky-test-sasl-auth-server.c: In function ‘test_sasl_auth_server_new’: - wocky-test-sasl-auth-server.c:932:17: error: expected ‘)’ before ‘proc’ - wocky-test-sasl-auth-server.c:932:22: error: expected ‘)’ before ‘(’ token - wocky-test-sasl-auth-server.c:932:30: error: expected ‘}’ before ‘test_sasl_server_auth_log’ - wocky-test-sasl-auth-server.c:933:5: error: initialization from incompatible pointer type [-Werror] - wocky-test-sasl-auth-server.c:933:5: error: (near initialization for ‘callbacks[1].proc’) [-Werror] - wocky-test-sasl-auth-server.c: At top level: wocky-test-sasl-auth-server.c:886:1: error: ‘test_sasl_server_auth_log’ - defined but not used [-Werror=unused-function] - - tests/wocky-test-sasl-auth-server.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 1f2949120297e4ac2b3abbbe916a8f9b34f702ce -Author: Danielle Madeley -Date: Mon Oct 17 22:39:00 2011 +1100 - - [muc] Port time_t to GDateTime - - wocky/wocky-muc.c | 22 ++++++++++++++-------- - 1 files changed, 14 insertions(+), 8 deletions(-) - -commit 4d5b82ba40d0481aed58ec8c19c8fc605da03379 -Author: Jonny Lamb -Date: Thu Oct 13 15:11:20 2011 +0100 - - caps-hash-test: update tests for new hashing behaviour - - Signed-off-by: Jonny Lamb - - tests/wocky-caps-hash-test.c | 32 ++++++++++++++++++++++++++------ - 1 files changed, 26 insertions(+), 6 deletions(-) - -commit 8426f1ecd75fb086b803dffd58e7ef7a2a2b0600 -Author: Jonny Lamb -Date: Thu Oct 13 14:50:46 2011 +0100 - - caps-hash: ignore data forms with non-hidden FORM_TYPE fields - - Related to: fd.o#41719 - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 2b9d9a1371af12ee95235a8cbad36747372abcdd -Author: Jonny Lamb -Date: Thu Oct 13 14:49:28 2011 +0100 - - caps-hash: don't bail on hashing if there's no FORM_TYPE - - Fixes: fd.o#41719 - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 3c43751dc90e4cdb08f57f48e2a8e6adf715ed8e -Author: Cosimo Cecchi -Date: Wed Oct 12 17:45:49 2011 +0100 - - test-resolver: don't include glib/types.h directly - - Use the glib.h header instead. - - tests/test-resolver.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6cc87601d31cbe365d3d51a8c91bfbca4cbd14f6 -Author: Will Thompson -Date: Wed Oct 12 16:06:21 2011 +0100 - - C2SPorter: correct _enable_power_saving docs - - was being interpreted as a docbook tag; and the second - bullet is no longer true: only PEP updates in particular known - namespaces are considered unimportant. - - wocky/wocky-c2s-porter.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 400035360b8f6463c362ea35f4b4580cb52e9e77 -Author: Will Thompson -Date: Wed Oct 12 16:08:49 2011 +0100 - - gtk-doc: Fix out-of-tree builds with 1.17 - - configure.ac | 2 +- - docs/reference/Makefile.am | 12 ++++++------ - 2 files changed, 7 insertions(+), 7 deletions(-) - -commit 4f0c186180cf64f56072c30bca05a4272b06d2cf -Author: Will Thompson -Date: Wed Oct 12 16:06:42 2011 +0100 - - gtk-doc: use no-tmpl flavour. - - This stops gtk-doc even generating the legacy .tmpl files, for a - marginally faster (and less crufty) documentation build process. - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8b8603bb3bf0258b05ef8ed9051d9922d80c6753 -Author: Xavier Claessens -Date: Sat Oct 1 13:42:31 2011 +0200 - - Add wocky_auth_registry_supports_one_of() - - Reviewed-by: Will Thompson - - wocky/wocky-auth-registry.c | 147 +++++++++++++++++++++++++++++-------------- - wocky/wocky-auth-registry.h | 5 ++ - 2 files changed, 105 insertions(+), 47 deletions(-) - -commit 069d5d347be1f97e4408cf8e59017911a50de2d3 -Author: Will Thompson -Date: Fri Sep 30 16:41:24 2011 +0100 - - NodeTree: fix _new example - - It was legal before, but the tree it built made no sense! - - wocky/wocky-node-tree.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit 28da3d1e5e94635a9ac7a0e886ed20dae87d8556 -Author: Jonny Lamb -Date: Wed Sep 7 14:57:28 2011 +0100 - - pubsub-helpers: add node name as attribute on items node - - Previously I had erroneously done this: - - ... - - ... - - Where actually, it should be: - - ... - - ... - - Bad me. - - Signed-off-by: Jonny Lamb - - wocky/wocky-pubsub-helpers.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit cac7727c18341e977c12e42e5dcea4a86c4b90a4 -Author: Will Thompson -Date: Mon Sep 5 18:10:27 2011 +0100 - - C2SPorter: clear up English properly. - - I feel threatened. - - wocky/wocky-c2s-porter.c | 14 ++++++++------ - 1 files changed, 8 insertions(+), 6 deletions(-) - -commit 3d05bdac0d8bf77f310ecb6558121cd50bed7fbb -Author: Will Thompson -Date: Mon Sep 5 18:06:55 2011 +0100 - - C2SPorter: correctly conjugate the verb "to threaten" - - wocky/wocky-c2s-porter.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 6d5932dcfc171de0b9169449c965d89e94cd797e -Author: Will Thompson -Date: Thu Sep 1 09:30:23 2011 +0100 - - Connector: change misleading “Bad SRV record” message - - Failing to connect to the server specified by an SRV record doesn't mean - the record is wrong: it could well be that the server is broken. - - Reviewed-by: Danielle Madeley - - wocky/wocky-connector.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit d37c814b0ac7a38f3820a6e0d273e0b50303c373 -Author: Will Thompson -Date: Wed Aug 31 10:33:33 2011 +0100 - - connector-test: use !=, not |= - - Thanks, clang! - - Reviewed-by: Jonny Lamb - - tests/wocky-connector-test.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 891dfc761b465f5c195917b60d9fbcede54ee6d8 -Author: Marco Barisione -Date: Wed Aug 17 13:25:03 2011 +0100 - - sasl-digest-md5: the response needs both the realm and server - - Some of the fields in the response wocky sends to the server require - the realm (like the "realm" field) while others require the server name - (like the "digest-uri" field). Usually this bug is not noticeable as the - realm and the server name are the same. - - Reviewed-by: Vivek Dasmohapatra - - wocky/wocky-sasl-digest-md5.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit c6850584919e4f2f1ab2644c67e6a2ee024d61a9 -Merge: 5ba6fef 0396dd2 -Author: Marco Barisione -Date: Fri Aug 5 15:19:53 2011 +0100 - - Merge branch 'gabble-0.12' - -commit 0396dd2a97f3dcf3709ed3fe0582262df04bd95e -Author: Siraj Razick -Date: Wed Jul 20 22:10:14 2011 +0530 - - Use GQueue instead of GList* for queueable_stanza_pattern - - wocky/wocky-c2s-porter.c | 17 ++++++----------- - 1 files changed, 6 insertions(+), 11 deletions(-) - -commit 051a35f63b42d6d5ef274b12a606ec30821ab1b7 -Author: Siraj Razick -Date: Wed Jul 20 20:38:52 2011 +0530 - - Avoid filtering all PEP messages - - This patch filters only a fixed set of PEP messages, with - +notify - - wocky/wocky-c2s-porter.c | 34 ++++++++++++++++++++++++---------- - 1 files changed, 24 insertions(+), 10 deletions(-) - -commit 5ba6fef79f37d1dd1f112db12e539fc8e74c23e3 -Merge: 73d9ace e1c92e2 -Author: Marco Barisione -Date: Wed Aug 3 14:28:26 2011 +0100 - - Merge branch 'whitespace-ping' - - Reviewed-by: Will Thompson - Fixes: - -commit e1c92e217e7e2ada88333047f18fd1150b1b2299 -Author: Marco Barisione -Date: Mon Aug 1 13:28:06 2011 +0100 - - ping: send whitespace pings instead of XMPP ones - - Whitespace pings can save power on cellular connections. The code to - reply to XMPP pings is left untouched as other clients or the server - could ping us. - - tests/wocky-ping-test.c | 34 ++++++++++++++++++++-------------- - wocky/wocky-ping.c | 23 +++++++++-------------- - 2 files changed, 29 insertions(+), 28 deletions(-) - -commit dc03988d9d55d02a941c2c89fdaa4324f1b3f18c -Author: Marco Barisione -Date: Tue Aug 2 14:36:06 2011 +0100 - - wocky-test-stream: allow to get notified directly whenever data is read - - The callback passed to wocky_test_stream_set_direct_read_callback() is - called whenever data is read by-passing all the other layers on top. - - tests/wocky-test-stream.c | 16 ++++++++++++++++ - tests/wocky-test-stream.h | 6 ++++++ - 2 files changed, 22 insertions(+), 0 deletions(-) - -commit 461cc42da79bbc77d24a13577deed477440b3493 -Author: Marco Barisione -Date: Mon Aug 1 13:10:15 2011 +0100 - - c2s-porter: add send_whitespace_ping_(async|finish) methods - - wocky/wocky-c2s-porter.c | 143 +++++++++++++++++++++++++++++++++++++++++++--- - wocky/wocky-c2s-porter.h | 11 ++++ - 2 files changed, 145 insertions(+), 9 deletions(-) - -commit 4bbb2d9ad5293dc717c06c3999d5576969051793 -Author: Marco Barisione -Date: Mon Aug 1 13:17:18 2011 +0100 - - c2s-porter: share the code to terminate the pending operations - - wocky/wocky-c2s-porter.c | 42 +++++++++++++++++++++--------------------- - 1 files changed, 21 insertions(+), 21 deletions(-) - -commit 8fa37b29cc4399ac69c33c4ae4f196e38fa68892 -Author: Marco Barisione -Date: Mon Aug 1 13:01:58 2011 +0100 - - xmpp-connection: add send_whitespace_ping_(async|finish) methods - - wocky/wocky-xmpp-connection.c | 93 +++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-connection.h | 10 ++++ - 2 files changed, 103 insertions(+), 0 deletions(-) - -commit e18970ce5108903b412fd95f94c38bd3e987e480 -Author: Marco Barisione -Date: Fri Jul 29 14:32:56 2011 +0100 - - ping: make the "porter" property a WockyC2SPorter - - Keepalives don't make sense on meta porters. - - tests/wocky-ping-test.c | 6 ++++-- - wocky/wocky-ping.c | 19 +++++++++++-------- - wocky/wocky-ping.h | 4 ++-- - 3 files changed, 17 insertions(+), 12 deletions(-) - -commit 73d9acef993e4bc1ca4709815fef390eb324eb58 -Merge: 4a16e1c f46210d -Author: Marco Barisione -Date: Wed Aug 3 14:25:49 2011 +0100 - - Merge branch 'stream-ciphers' - - Reviewed-by: Will Thompson - Fixes: - -commit f46210d0fb3a7333b61ba3d02b6760d398be7b49 -Author: Marco Barisione -Date: Mon Aug 1 17:03:02 2011 +0100 - - openssl: prefer stream ciphers when --enable-stream-ciphers is used - - wocky/wocky-openssl.c | 28 +++++++++++++++++++++++----- - 1 files changed, 23 insertions(+), 5 deletions(-) - -commit 3f091f2ff4e97a533142b88f8b8844c53e579ea4 -Author: Marco Barisione -Date: Mon Aug 1 16:59:22 2011 +0100 - - tls: prefer stream ciphers when --enable-stream-ciphers is used - - In case this option is used gnutls 2.12.0 is needed. - - configure.ac | 7 +++++++ - wocky/wocky-tls.c | 27 +++++++++++++++++++++++---- - 2 files changed, 30 insertions(+), 4 deletions(-) - -commit e71f2054f4e6a593b9296ba761fcf6d94c8f980c -Author: Marco Barisione -Date: Mon Aug 1 16:56:31 2011 +0100 - - configure: add an --enable-prefer-stream-ciphers option - - configure.ac | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -commit 4a16e1cb80ad124726f7e517b0d141bf5b921788 -Merge: 5f5db5c faf9011 -Author: Will Thompson -Date: Wed Jul 27 14:29:18 2011 +0100 - - Merge branch 'gabble-0.12' - - Conflicts: - wocky/wocky-muc.c - -commit faf9011d6d9ee075deaee3ff4ea77a73c17561cd -Author: Sjoerd Simons -Date: Tue Jul 26 11:01:11 2011 +0100 - - s/WockyTestSTreamReadMode/WockyTestStreamReadMode/ - - tests/wocky-test-stream.c | 4 ++-- - tests/wocky-test-stream.h | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 4518b2c17508ff427aa6d4f253e660b0da98a2b0 -Author: Sjoerd Simons -Date: Tue Jul 26 10:31:22 2011 +0100 - - Rename the tls test from /openssl to /tls to avoid confusion - - tests/wocky-tls-test.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 2dfc0356903962e457b185135f0122ac18f99254 -Author: Sjoerd Simons -Date: Tue Jul 26 10:28:39 2011 +0100 - - Make the tls test send a big chunk of data - - To make sure we stress some more codepaths, send more data then what - will fit in an SSL Record (16k in gnutls it seems). Randomly generate - the data to make sure it doesn't compress well enough such that what - needs to be sent out is actually small enough - - tests/wocky-tls-test.c | 58 ++++++++++++++++++++++++++++++++++++++--------- - 1 files changed, 47 insertions(+), 11 deletions(-) - -commit 1051de8fc4fdb26ed08f7029a1ff9a571775708c -Author: Sjoerd Simons -Date: Tue Jul 26 10:05:41 2011 +0100 - - Add an incomplete write mode to the test-stream - - To stress the various bit of code a bit more, make writes by default - never succeed completely. Only write half the buffer that is given to - us as this causes some more code-paths to be tested. - - Unfortunately some tests seem to be too sensitive to this. So switch - them back to the old write mode. - - tests/wocky-porter-test.c | 10 +++++++++- - tests/wocky-test-stream.c | 18 +++++++++++++++--- - tests/wocky-test-stream.h | 10 ++++++++++ - 3 files changed, 34 insertions(+), 4 deletions(-) - -commit 502a365c34c9b684bb586e0761c0ce762fcd5d2b -Author: Sjoerd Simons -Date: Tue Jul 26 10:40:17 2011 +0100 - - Always write out all data gnutls requested - - Because of a bug in the gnutls backend our outgoing stream would get - stalled if we couldn't write enough data as _try_operation doesn't - properly check what caused GNUTLS_E_AGAIN. - - Unfortunately if we fix that, we trigger bugs in GnuTLS (now fixed in - gnutls git), which break the invariants of the push function. To keep - compatibility with older gnutls, simply make our backend always try to - write out all data gnutls asked us for. Doing so guarantees that - GNUTLS_E_AGAIN will never be caused by a partial write. - - wocky/wocky-tls.c | 41 +++++++++++++++++++++++++++++++++++++---- - 1 files changed, 37 insertions(+), 4 deletions(-) - -commit 5f5db5c78ee12adc08e36d3bede1b10615838715 -Author: Will Thompson -Date: Fri Jul 8 14:43:28 2011 +0100 - - Connector tests: always check return when expecting failure - - Previously, when we were expecting a specific error code to be returned, - we would not check that the connector had returned NULL rather than a - WockyXmppConnection. - - This had the side-effect that, when these cases failed, the test would - segfault (because 'error' was NULL) rather than producing a meaningful - assertion failure. - - tests/wocky-connector-test.c | 29 +++++++++++++++-------------- - 1 files changed, 15 insertions(+), 14 deletions(-) - -commit 511c0b934912a5591ed16346bd0dd35f76edf601 -Author: Will Thompson -Date: Fri Jul 8 14:29:44 2011 +0100 - - configure: set HAVE_LIBSASL2=no if we don't have it - - This fixes the configure summary. Previously it would say (for - instance): - - Features: - TLS Backend..........: openssl - SASL2 Tests..........: - gtk-doc documentation: no - libiphb integration..: no - - With this change, it reads: - - Features: - TLS Backend..........: openssl - SASL2 Tests..........: no - gtk-doc documentation: no - libiphb integration..: no - - configure.ac | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 6386d79ceae96fd26de83de8f3747e628005ca77 -Author: Will Thompson -Date: Fri Jul 8 14:24:52 2011 +0100 - - Fix GnuTLS build with --disable-debug - - Sorry, I must have missed this while juggling unneeded patches. - - wocky/wocky-tls.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit b3cbfa07168c8721c7874e0e76b62b5443f280cc -Merge: 35b2171 8245688 -Author: Will Thompson -Date: Fri Jul 8 14:10:01 2011 +0100 - - Merge branch 'debug-stubs' - - https://bugs.freedesktop.org/show_bug.cgi?id=39046 - - Reviewed-by: Guillaume Desmottes - -commit 824568824e078ce57df6841aeb54ca90a7865667 -Author: Will Thompson -Date: Thu Jul 7 16:50:20 2011 +0100 - - Replace stub DEBUG macros with no-op static inline functions - - Previously, if --disable-debug was passed to configure, DEBUG (and - DEBUG_STANZA and DEBUG_NODE_TREE) were defined to expand to - 'do { } while (0)'. This meant that the arguments passed to them were - not actually present in the pre-processed C source, which often - triggered warnings about assigning to variables and never reading from - them. - - Instead, we define them to be variadic static inline functions. The - compiler should optimize this away, but since we do not use - -Wunused-arguments the call should still count as reading from the - variable, and thus set-but-unused warnings will not be triggered. This - means we don't have to mess around wrapping code to initialize variables - only used in debug messages with #ifdef ENABLE_DEBUG any more. It's true - that, if the compiler is insufficiently smart, this might cause a small - amount of unnecessary work to be done at runtime—for instance, - ping_iq_cb retrieves the from='' attribute of the stanza it's replying - to—but none of these are likely to be too expensive (compared to the - cost of constantly calling wocky_debug(), which is the real reason that - --disable-debug exists). - - I am proud of this trick. - - wocky/wocky-debug.h | 28 +++++++++++++++++++--------- - wocky/wocky-ping.c | 2 -- - wocky/wocky-xmpp-reader.c | 2 -- - 3 files changed, 19 insertions(+), 13 deletions(-) - -commit 87388e9a381bac19d9ebcd900d1382f4ea37b13a -Author: Will Thompson -Date: Thu Jul 7 16:29:56 2011 +0100 - - TLS: use GEnum for WockyTLSVerificationLevel names - - This both simplifies the code, and squashes a set-but-unused warning - when building with --disable-debug. - - wocky/wocky-openssl.c | 11 +++-------- - wocky/wocky-tls.c | 10 ++++------ - 2 files changed, 7 insertions(+), 14 deletions(-) - -commit 4c0dacf431b9e3da2296b9a1d3918f03734b7c96 -Author: Will Thompson -Date: Thu Jul 7 15:41:48 2011 +0100 - - GnuTLS: remove a massive row of asterisks - - This function defines a static lookup table mapping GnuTLS certificate - status enum members to Wocky's equivalent. It is prefixed by a comment - containing English prose, and is followed by a comment containing a row - of seventy-one asterisks. - - This patch removes seventy-three asterisks, two forward slashes, four - spaces and a newline. - - wocky/wocky-tls.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 35b217123b9cde48ba7a3e963c8c172fb0c91591 -Merge: c5b4ef6 bdcaaaa -Author: Marco Barisione -Date: Thu Jul 7 14:17:00 2011 +0100 - - Merge branch 'extra-certificate-identities' - - Reviewed-by: Will Thompson - -commit bdcaaaa767974d1a0ea80f6c068616e80938b7da -Author: Marco Barisione -Date: Tue Jun 28 15:34:33 2011 +0100 - - openssl: check the certificate name against the extra identities too - - wocky/wocky-openssl.c | 39 ++++++++++++++++++++++++++++++++++++++- - 1 files changed, 38 insertions(+), 1 deletions(-) - -commit 34dd84db74d67b9072620afe14c82a7da12b6086 -Author: Marco Barisione -Date: Tue Jun 28 15:34:03 2011 +0100 - - tls: check the certificate name against the extra identities too - - wocky/wocky-tls.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 58 insertions(+), 4 deletions(-) - -commit 31d6355ec34bda6862c90a9b355dfc63339f34ad -Author: Marco Barisione -Date: Tue Jul 5 17:30:56 2011 +0100 - - tls: rename the variable for the number of peers for clarity - - wocky/wocky-tls.c | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -commit e2cbe9608be709a4c7a6b9be2edcd46622ec440f -Author: Marco Barisione -Date: Tue Jun 28 15:33:34 2011 +0100 - - tls: rearrange wocky_tls_session_verify_peer() to reduce code duplication - - wocky/wocky-tls.c | 26 ++++++++++++-------------- - 1 files changed, 12 insertions(+), 14 deletions(-) - -commit c6a14a4806128310cdfaaf406f241efa2175dcf2 -Author: Marco Barisione -Date: Tue Jun 28 15:33:12 2011 +0100 - - tls: style fix; add missing braces around a long if block - - wocky/wocky-tls.c | 82 +++++++++++++++++++++++++++-------------------------- - 1 files changed, 42 insertions(+), 40 deletions(-) - -commit ecfb927b8685729fdcb8faa2fba48874c307276b -Author: Marco Barisione -Date: Tue Jun 28 15:32:42 2011 +0100 - - Add an extra_identify argument to the TLS verification functions - - We need to be able to pass extra host names that we consider valid to - the code that verifies TLS certificates. - This is useful, for instance, when using Google apps. Rather than - providing a certificate for the JID’s domain part, the server provides a - certificate for talk.google.com; if the user has explicitly configured a - ‘Google Talk’ account, it's reasonable to accept certificates for this - domain. - - wocky/wocky-connector.c | 4 ++-- - wocky/wocky-openssl.c | 1 + - wocky/wocky-tls-connector.c | 6 +++++- - wocky/wocky-tls-connector.h | 1 + - wocky/wocky-tls-handler.c | 26 ++++++++++++++++++-------- - wocky/wocky-tls-handler.h | 2 ++ - wocky/wocky-tls.c | 1 + - wocky/wocky-tls.h | 1 + - 8 files changed, 31 insertions(+), 11 deletions(-) - -commit c5b4ef67402decceb4ab70537292cdb3bc75ccff -Author: Will Thompson -Date: Thu Jun 2 11:43:16 2011 +0100 - - OpenSSL: squash GCC 4.6 -Wunused-but-set-variable warnings - - Ironically these variables were added to squash warnings from static - analysis … - - Reviewed-by: Jonny Lamb - Fixes: - - wocky/wocky-openssl.c | 11 ++++------- - 1 files changed, 4 insertions(+), 7 deletions(-) - -commit 97f469e3b33c3d8c5ec4505096fce06539a421d7 -Author: Jonny Lamb -Date: Thu Jul 7 08:12:58 2011 +0100 - - meta-porter: deal with bad addresses on incoming connections - - Someone was running "nmap localhost" (get out more) and Salut was - asserting because g_socket_connection_get_remote_address was returning - NULL but we weren't dealing with it. Let's deal with it properly. - - Fixes: fd.o#39018 - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 17 ++++++++++++++--- - 1 files changed, 14 insertions(+), 3 deletions(-) - -commit 262c7b199e4b02285be38505727e64c3796e4b79 -Author: Will Thompson -Date: Thu Jun 9 16:56:17 2011 +0100 - - Connector: clarify debug in host fallback path. - - wocky/wocky-connector.c | 14 ++++++++------ - 1 files changed, 8 insertions(+), 6 deletions(-) - -commit 1260c3dd450241307043b2c4c66addf38bdb4e48 -Author: Will Thompson -Date: Thu Jun 9 16:52:09 2011 +0100 - - Connector: make XMPP version='' debug message NULL-safe - - This is safe on Linux, but will inevitably slip through unnoticed on a - hypothetical Win32 port and crash for some poor user. - - wocky/wocky-connector.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 243c846e0abc10884e484ee6c0de95147ad28bf3 -Author: Will Thompson -Date: Thu Jun 9 16:49:24 2011 +0100 - - Connector: clarify legacy auth selection - - I think this is clearer than a goto. - - wocky/wocky-connector.c | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -commit 1704ac6716e2b983f3c53bc609bdce6f35a17739 -Author: Will Thompson -Date: Thu Jun 9 16:36:17 2011 +0100 - - Legacy auth: document jabberd 1.4 workaround - - While debugging a completely unrelated issue, I was pretty surprised to - see that the username was included in the initial get. Some git - archaeology turned up the reason. - - So let's document this in the code and in the regression test. - - tests/wocky-test-connector-server.c | 12 +++++++++--- - wocky/wocky-jabber-auth.c | 5 +++++ - 2 files changed, 14 insertions(+), 3 deletions(-) - -commit 955e09193a3935ea496545b507a9ce667b2693fe -Author: Will Thompson -Date: Wed Jun 1 13:43:41 2011 +0100 - - MUC: allow own presence to be passed to other handlers - - This is, roughly speaking, a backport of 9064ddf. - - Fixes: - - wocky/wocky-muc.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 9064ddfd7afd83c892f65be8365dec242dcce880 -Author: Will Thompson -Date: Wed Jun 1 13:43:41 2011 +0100 - - MUC: allow own presence to be passed to other handlers - - Fixes: - - wocky/wocky-muc.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit e3b3e06417dd95e9b36b0bcc4a2ca8d8a437fd5c -Author: Will Thompson -Date: Wed Jun 1 11:49:32 2011 +0100 - - MUC: remove now-unnecessary goto - - This does not modify the values returned by handle_presence_standard() - in each case. - - wocky/wocky-muc.c | 21 +++++++++------------ - 1 files changed, 9 insertions(+), 12 deletions(-) - -commit 961ab6f804ef504b7d0555fd1932d0d66785f22b -Author: Will Thompson -Date: Tue May 31 18:16:40 2011 +0100 - - MUC: early-return for presence without - - There are no code changes in this commit: it's just turning a big if - block into an early return. - - wocky/wocky-muc.c | 174 ++++++++++++++++++++++++++-------------------------- - 1 files changed, 87 insertions(+), 87 deletions(-) - -commit 191337045819cbdd2781c03e652ca2551ce3ede9 -Author: Will Thompson -Date: Tue May 31 18:05:05 2011 +0100 - - MUC: hoist JID decoding up to main handler - - The sub-handler actually didn't use the JID - components at all, it just parsed it for fun. And the other sub-handler - only uses the resource. It's neater to pull extracting that into the top - handler: it'll save us needing a 'goto' for cleanup. - - wocky/wocky-muc.c | 50 +++++++++++++++++--------------------------------- - 1 files changed, 17 insertions(+), 33 deletions(-) - -commit bf3d194a15e5efd870a8df48873564897c06270e -Author: Will Thompson -Date: Tue May 31 17:53:35 2011 +0100 - - MUC: remove redundant checks - - We know that presence stanzas passed to this callback have a from='', - and that it's right, because we specified it when calling - wocky_porter_register_handler_from(). And we know that they're presence - stanzas, for the same reason. - - wocky/wocky-muc.c | 22 +--------------------- - 1 files changed, 1 insertions(+), 21 deletions(-) - -commit b37d550628783049c3cbb36e7d4c775e2269c068 -Author: Will Thompson -Date: Tue May 31 17:44:24 2011 +0100 - - MUC: simplify extracting from - - It's technically legal to have more than one within : - - Multiple instances of the element MAY be included but only - if each instance possesses an 'xml:lang' attribute with a distinct - language value. - - — http://xmpp.org/rfcs/rfc3921.html#rfc.section.2.2.2.2 - - So what we were doing before (concatenating the contents of all of them) - is even more wrong than just picking the first one. - - wocky/wocky-muc.c | 27 ++------------------------- - 1 files changed, 2 insertions(+), 25 deletions(-) - -commit 6c1e30ecb10ff10391437d16275fb1e20ff52915 -Author: Will Thompson -Date: Tue May 31 17:18:57 2011 +0100 - - MUC: represent status code set as a bitfield - - wocky/wocky-muc.c | 124 ++++++++++++++++++++++------------------------------- - 1 files changed, 51 insertions(+), 73 deletions(-) - -commit 80289030646436225c6f6e8cc9ce5fd9025238ab -Author: Will Thompson -Date: Tue May 31 16:56:18 2011 +0100 - - MUC: use a node iterator when parsing status codes - - wocky/wocky-muc.c | 56 ++++++++++++++++++++++++++++------------------------ - 1 files changed, 30 insertions(+), 26 deletions(-) - -commit 0a764d2151bdda2d6d5314122110faf0fd2f4dc8 -Author: Will Thompson -Date: Tue May 31 16:48:13 2011 +0100 - - MUC: remove weird casts when parsing status codes - - wocky/wocky-muc.c | 12 +++--------- - 1 files changed, 3 insertions(+), 9 deletions(-) - -commit 4e4ad3674b7f96f4fdfc39375715aff6b703ef7c -Author: Will Thompson -Date: Tue May 31 16:39:46 2011 +0100 - - MUC: document WockyMucStatusCode marginally more usefully - - wocky/wocky-muc.h | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 0d7c58ce7fcf3b909857147afc38571bdd0bf689 -Author: Will Thompson -Date: Tue May 31 16:34:40 2011 +0100 - - MUC: turn status code enum into bit flags - - wocky/wocky-muc.h | 38 +++++++++++++++++++------------------- - 1 files changed, 19 insertions(+), 19 deletions(-) - -commit 3db3ab03828b5d953a8cf05c95f995e5cb8e27b9 -Merge: 07a2269 161e973 -Author: Marco Barisione -Date: Mon May 16 16:37:39 2011 +0100 - - Merge branch 'iphb-system-sync' - - Reviewed-by: Simon McVittie - Fixes: - -commit 161e97327b1cf1b3013801f86c9e86f2a945017f -Author: Marco Barisione -Date: Wed May 11 18:29:24 2011 +0100 - - Heartbeat: synchronise the wakeups with other applications - - wocky/wocky-heartbeat-source.c | 61 ++++++++++++++++++++++++++++++---------- - 1 files changed, 46 insertions(+), 15 deletions(-) - -commit 06e8d6978a7a9a28b1d34b1d079e8e33d48e1267 -Author: Marco Barisione -Date: Mon May 16 15:01:57 2011 +0100 - - configure: depend on libiphb >= 0.61.31 - - The newer libiphb is needed to help synchronisation between multiple - applications. - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 07a226925f7fccad7d38dc165318858f76f36bd3 -Merge: 7608a03 3c2ab01 -Author: Jonny Lamb -Date: Wed May 4 09:50:59 2011 +0100 - - Merge branch 'ns' - -commit 3c2ab0158eabc1e82e1cadb457719ffddc6cc3d5 -Author: Jonny Lamb -Date: Wed May 4 09:07:08 2011 +0100 - - namespaces: include both jabber:iq:oob and jabber:x:oob - - Nothing appears to use the old WOCKY_XMPP_NS_OOB, so I don't think - this will break anything. - - Signed-off-by: Jonny Lamb - - wocky/wocky-namespaces.h | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 7608a038991602233a146e3fa8d2d770d599ca34 -Author: Will Thompson -Date: Tue May 3 16:00:55 2011 +0100 - - MetaPorter: fix chaining up to constructed. - - (I'd forgotten to actually amend the patch. Whoops.) - - wocky/wocky-meta-porter.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit f7b2930b22d9bcb1d964b12110ee5d320694400e -Author: Will Thompson -Date: Tue May 3 15:40:58 2011 +0100 - - Porters: chain up in constructed - - Reviewed-by: Jonny Lamb - - wocky/wocky-c2s-porter.c | 3 +++ - wocky/wocky-meta-porter.c | 3 +++ - 2 files changed, 6 insertions(+), 0 deletions(-) - -commit d4f7e060c7e967bc0d78a823e88b3b45390dcff6 -Author: Jonny Lamb -Date: Tue May 3 10:03:22 2011 +0100 - - ll-connector: remove set but unused variable - - Signed-off-by: Jonny Lamb - - wocky/wocky-ll-connector.c | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit 3d127bedd7da28a6af3e32334ce8545f1cb7369e -Author: Marco Barisione -Date: Thu Apr 28 17:50:28 2011 +0100 - - openssl: maintain compatibility with OpenSSL < 1.0 too - - Reviewed-by: Sjoerd Simons - - wocky/wocky-openssl.c | 16 +++++++++++----- - 1 files changed, 11 insertions(+), 5 deletions(-) - -commit 471b25356420d33670a18b8310cfd2c7bfd9efdd -Author: Jonny Lamb -Date: Thu Apr 28 14:32:32 2011 +0100 - - xmpp-reader: ifdef out a variable that's only used in a DEBUG call - - Signed-off-by: Jonny Lamb - - wocky/wocky-xmpp-reader.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 5455a6c494e2f65e8a3ba7cd0f955e02f3d65af9 -Author: Jonny Lamb -Date: Fri Apr 22 12:12:25 2011 +0100 - - data-form: add more docs for add_to_node() - - Signed-off-by: Jonny Lamb - - wocky/wocky-data-form.c | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) - -commit a56c69c450c0062797903a1a468f3db2399108f1 -Author: Jonny Lamb -Date: Fri Apr 22 11:56:05 2011 +0100 - - data-form: add a add_to_node function - - This is for adding a data form to an existing node like the query node - of a disco response. - - Signed-off-by: Jonny Lamb - - wocky/wocky-data-form.c | 35 +++++++++++++++++++++++++++++++++++ - wocky/wocky-data-form.h | 2 ++ - 2 files changed, 37 insertions(+), 0 deletions(-) - -commit 65d4af1972fc4b7d3519421ec7080b07c23a88ae -Author: Jonny Lamb -Date: Fri Apr 22 11:54:53 2011 +0100 - - xep-0115-capabilities: add TODO for features and identities - - Signed-off-by: Jonny Lamb - - wocky/wocky-xep-0115-capabilities.h | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 7462be59c033f03804c754ddb13c80e2f97c88aa -Author: Jonny Lamb -Date: Fri Apr 22 09:18:28 2011 +0100 - - session: add get_jid() function - - Signed-off-by: Jonny Lamb - - wocky/wocky-session.c | 8 ++++++++ - wocky/wocky-session.h | 2 ++ - 2 files changed, 10 insertions(+), 0 deletions(-) - -commit d118866339f92736be01b7bdf10ef48694f77037 -Author: Jonny Lamb -Date: Tue Apr 19 13:17:32 2011 +0100 - - XEP-0115 capabilities: add interface - - Signed-off-by: Jonny Lamb - - wocky/Makefile.am | 2 + - wocky/wocky-xep-0115-capabilities.c | 60 ++++++++++++++++++++++++++++++++ - wocky/wocky-xep-0115-capabilities.h | 65 +++++++++++++++++++++++++++++++++++ - 3 files changed, 127 insertions(+), 0 deletions(-) - -commit c3f7e85443d95a762cd804adeb42c13f0f9b2a43 -Merge: a36dd1f deb4840 -Author: Jonny Lamb -Date: Fri Apr 22 08:57:16 2011 +0100 - - Merge branch 'caps-hash' - - Conflicts: - docs/reference/wocky-docs.sgml - wocky/Makefile.am - - Signed-off-by: Jonny Lamb - -commit deb4840972ef760c2c24d03c81e73f4d060adfb6 -Author: Jonny Lamb -Date: Tue Apr 19 12:10:41 2011 +0100 - - data-form: rename default_value_str to raw_value_contents - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 6 +++--- - wocky/wocky-data-form.c | 30 +++++++++++++++--------------- - wocky/wocky-data-form.h | 2 +- - 3 files changed, 19 insertions(+), 19 deletions(-) - -commit 7567223d6898d9b52e2ca4e7dcf913dd07f01763 -Author: Jonny Lamb -Date: Mon Apr 11 17:07:18 2011 +0100 - - data-form: change the default_value_str field struct member to hold a strv - - This moves the converting different GValue types to strings from the - caps hash code back into the data form code and simplifies things. - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 90 ++++++++++------------------------------------- - wocky/wocky-data-form.c | 63 ++++++++++++++++++++------------- - wocky/wocky-data-form.h | 6 ++-- - 3 files changed, 60 insertions(+), 99 deletions(-) - -commit b1b031b49febb4323679cbb3f64d6f1c4611393a -Author: Jonny Lamb -Date: Mon Apr 4 12:53:51 2011 +0100 - - caps-hash: use the actual string value when hashing boolean default values - - Signed-off-by: Jonny Lamb - - tests/wocky-caps-hash-test.c | 74 ++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-caps-hash.c | 11 ++---- - 2 files changed, 77 insertions(+), 8 deletions(-) - -commit c2a09a2edac255c0e1fa592cfd4ae8a582fd138d -Author: Jonny Lamb -Date: Mon Apr 4 12:53:20 2011 +0100 - - data-form: add another member to Field struct for actual boolean values - - Signed-off-by: Jonny Lamb - - wocky/wocky-data-form.c | 47 ++++++++++++++++++++++++++++++++++------------- - wocky/wocky-data-form.h | 3 +++ - 2 files changed, 37 insertions(+), 13 deletions(-) - -commit f26dd38b1a97e34093e009b633cad54b43141d8b -Author: Jonny Lamb -Date: Mon Apr 4 13:27:47 2011 +0100 - - caps-hash: check whether there are multiple forms with the same name during, not before - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 41 ++++++++++++++++++----------------------- - 1 files changed, 18 insertions(+), 23 deletions(-) - -commit a36dd1fec168abf1924757aeba7124172b9a79f5 -Author: Jonny Lamb -Date: Thu Apr 7 10:47:31 2011 +0100 - - meta-porter: use a union to avoid strict aliasing problems - - This solution was taken from my solution to the same thing in - https://bugzilla.gnome.org/show_bug.cgi?id=646082. - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 31 ++++++++++++++++++------------- - 1 files changed, 18 insertions(+), 13 deletions(-) - -commit 697698e42a67057d176dd45d6b5f6cb98bb7b9ee -Author: Sjoerd Simons -Date: Thu Apr 7 11:01:27 2011 +0200 - - Save const returns in const variables - - wocky/wocky-openssl.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit b032eb73fe610b0e90e1f7bcd3a361607b607aa9 -Author: Jonny Lamb -Date: Thu Apr 7 10:10:43 2011 +0100 - - meta-porter: add a FIXME for the v6-in-v4 functions - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit a4db103910f0e9768945c8ae222778bdda59ca7b -Author: Jonny Lamb -Date: Thu Apr 7 09:34:03 2011 +0100 - - c2s-porter: don't blindly disconnect the IQ handler cancellable - - Signed-off-by: Jonny Lamb - - wocky/wocky-c2s-porter.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 7c920ba2ac8cf5c9757c2c39a4fc0b2e61f707eb -Author: Jonny Lamb -Date: Wed Apr 6 14:39:16 2011 +0100 - - meta-porter: hack around v6-in-v4 addresses being exposed - - This commit should be reverted when we depend on a GLib new enough to - fix bgo#646082. - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 54 +++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 52 insertions(+), 2 deletions(-) - -commit 3b75abc45c51f18be79ac15685efc28ecc822851 -Author: Jonny Lamb -Date: Wed Apr 6 10:34:02 2011 +0100 - - meta-porter: disconnect porter signal handlers before trying to close it - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit d208ffca52be5d0a0e585db8ea6d592ce84edfaa -Author: Jonny Lamb -Date: Wed Apr 6 10:32:58 2011 +0100 - - meta-porter: clean up porter closing callbacks - - They all share more code now, the signal handler disconnection is in - its own function and the porter timeouts are no longer removed. - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 45 ++++++++++++++++++++++----------------------- - 1 files changed, 22 insertions(+), 23 deletions(-) - -commit b2304457ef55403509d7c4df85d968dc12410be1 -Author: Jonny Lamb -Date: Wed Apr 6 10:22:20 2011 +0100 - - contact-factory: weak unref an existing LL contact if we're replacing it - - Also, stop making more dups of JIDs than necessary, again. - - Signed-off-by: Jonny Lamb - - wocky/wocky-contact-factory.c | 21 ++++++++++++++------- - 1 files changed, 14 insertions(+), 7 deletions(-) - -commit 9d4802deb229e4a104c5dabea9fb1575c4cdd106 -Author: Jonny Lamb -Date: Tue Apr 5 16:57:11 2011 +0100 - - meta-porter: don't start multiple timeouts for freeing the PorterData - - 1. open a connection to a contact - 2. create a PorterData struct, the timeout starts - 3. call hold, the timeout stops - 4. remote contact closes connection, the porter disappears and the - timeout stops - 5. call unhold, the refcount is now 0 so the timeout starts - 6. a new connection appears for the contact so it's referenced by the - PorterData struct and a timeout is started - - BINGO! THAT'S TWO TIMEOUTS STARTED! - - 7. the first timeout is called, the porter is closed and struct - freed - 8. the second timeout is called, the struct is already freed so we - crash here - - I think this is the right fix, because this means that if you hold() - the PorterData struct will stay around, but if you unhold() it will - disappear. - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 63b8269d73a285dd35873a843d52674869c6ddf3 -Author: Jonny Lamb -Date: Tue Apr 5 13:36:43 2011 +0100 - - contact-factory: don't dup a string twice when once will do - - Signed-off-by: Jonny Lamb - - wocky/wocky-contact-factory.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b93eb03e0ba117392ecdc40b23ad9a54af1ce3a7 -Author: Jonny Lamb -Date: Tue Apr 5 11:51:41 2011 +0100 - - gitignore: ignore more emacs rubbish - - Signed-off-by: Jonny Lamb - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 35dd2dc08c83bd24af209b952dff8f6f9c075161 -Author: Jonny Lamb -Date: Fri Apr 1 14:48:10 2011 +0100 - - meta-porter: don't assert if we have another connection - - It turns out this assertion was being hit a little too often and it - was actually somewhat feasible. Let's clear up new connections when - they're not needed. I thought about adding some kind of support for - multiple porters for this case but it got a bit hairy and I feel that - if you already have an open connection to a contact and another - appears, this is possibly a bug elsewhere. - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 17 ++++++++++++++--- - 1 files changed, 14 insertions(+), 3 deletions(-) - -commit 1769216bed3a8633cebd1e15bc79d0cb72bb3088 -Author: Jonny Lamb -Date: Fri Apr 1 14:48:00 2011 +0100 - - meta-porter: stamp on a from contact for IQ replies too - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit c74ca7ea411cca7ee49b77532a5aa2611e8f9faa -Author: Jonny Lamb -Date: Fri Apr 1 09:54:43 2011 +0100 - - meta-porter: also connect to WockyC2SPorter::remote-error - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) - -commit c7db5937c099717d508c488c724531131293f4c7 -Merge: 637c8b2 3507a19 -Author: Jonny Lamb -Date: Thu Mar 31 13:14:02 2011 +0100 - - Merge branch 'meta-fixes' - -commit 637c8b2ebe4df64bf2733efb3ca15a2033254f69 -Author: Jonny Lamb -Date: Wed Mar 23 16:44:28 2011 +0000 - - stanza: add wocky_stanza_copy - - Signed-off-by: Jonny Lamb - - tests/wocky-stanza-test.c | 34 ++++++++++++++++++++++++++++++++++ - wocky/wocky-stanza.c | 14 ++++++++++++++ - wocky/wocky-stanza.h | 2 ++ - 3 files changed, 50 insertions(+), 0 deletions(-) - -commit 3507a196e2f72a1693c24f03339260ba52d0e195 -Author: Jonny Lamb -Date: Thu Mar 31 11:05:50 2011 +0100 - - meta-porter: unref async result after calling a method on the source object - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 3db9f852cb1cef9fea984cc52bbe8b24a9903237 -Author: Jonny Lamb -Date: Thu Mar 31 09:32:42 2011 +0100 - - meta-porter: store the contact JID on the actual C2S porter object - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) - -commit afcf1727d6fe7a5a0123c47034165bd87e7679ca -Author: Jonny Lamb -Date: Thu Mar 31 09:32:09 2011 +0100 - - meta-porter: use g_clear_error - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 49a90d75db307249e41311b796092d91f9f2f90c -Author: Jonny Lamb -Date: Thu Mar 31 09:30:59 2011 +0100 - - meta-porter: close a porter properly before disposing it - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 01548dd48a90b8f56a6a0d8763a26b1a71b0f9d2 -Author: Jonny Lamb -Date: Thu Mar 31 09:30:13 2011 +0100 - - meta-porter: keep a ref on self during connecting a connection - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit 37da8370cac07133af6d36a3b8403b70405ef220 -Author: Jonny Lamb -Date: Thu Mar 31 09:29:30 2011 +0100 - - meta-porter: also debug what IP a new connection is from - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 14 +++++++++++--- - 1 files changed, 11 insertions(+), 3 deletions(-) - -commit 9c4b6aaabcd57a48c8ae7c2e734e419336347c61 -Author: Jonny Lamb -Date: Thu Mar 31 09:27:38 2011 +0100 - - meta-porter: unref async result after calling a method on the source object - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit dcfc45feb4373968989fd3e1cd9ffe3d0d5786da -Author: Jonny Lamb -Date: Thu Mar 31 09:26:57 2011 +0100 - - meta-porter: get the property name for the socket connection right - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b796e6c3a625a86c71c3928426f79b07a91d2b7a -Author: Jonny Lamb -Date: Thu Mar 31 09:23:56 2011 +0100 - - ll-connector: remove unnecessary unrefs of self - - Whoops, added by mistake. - - Signed-off-by: Jonny Lamb - - wocky/wocky-ll-connector.c | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit 8b2fcd085171fe72c368595ed4aa8808c52af047 -Author: Jonny Lamb -Date: Thu Mar 31 09:23:03 2011 +0100 - - contact-factory: ensure we don't get a NULL when ensuring a LL contact - - This crashes inside GHashTable as it's looking for a NULL key. - - Signed-off-by: Jonny Lamb - - wocky/wocky-contact-factory.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit c75d42181919d270da1c2ef2b9139781dbed1517 -Merge: f13a64a 8e47aa9 -Author: Will Thompson -Date: Tue Mar 29 14:28:54 2011 +0100 - - Merge branch 'whitespace-only-bodies' - - Reviewed-by: Jonny Lamb - Fixes: - -commit 8e47aa9b34b7fb8957e3b7be74d7c8dc7f49f39e -Author: Will Thompson -Date: Tue Mar 29 13:43:33 2011 +0100 - - Morse and Lewis were Oxfordshire police. - - I'm truly ashamed that I got this wrong. - - tests/wocky-xmpp-reader-test.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit f13a64ac9a75a44b0542df3b8a9ce49a0ebc1f9f -Author: Will Thompson -Date: Fri Mar 25 12:01:03 2011 +0000 - - MUC: remove content-free headers and unused returns - - Reviewed-by: Jonny Lamb - - wocky/wocky-muc.c | 25 ++----------------------- - 1 files changed, 2 insertions(+), 23 deletions(-) - -commit c4cd1516b38df51d50f8be9f207fc0933e805584 -Author: Jonny Lamb -Date: Fri Mar 25 15:23:16 2011 +0000 - - ll-connector: check the cancellable for !NULL before unreffing it - - Signed-off-by: Jonny Lamb - - wocky/wocky-ll-connector.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit f06ca27d72c18f2c77b010a4c1083e56b372f51f -Author: Jonny Lamb -Date: Fri Mar 25 15:13:43 2011 +0000 - - ll-connector: free the async result before the connector itself - - We need to allow the LL connector to dispose properly by dropping its - last ref held by the GSimpleAsyncResult before actually unreffing - itself. - - Signed-off-by: Jonny Lamb - - wocky/wocky-ll-connector.c | 18 +++++++++++++----- - 1 files changed, 13 insertions(+), 5 deletions(-) - -commit 7be06a577234e467a82f259b4db81b14c7a801fd -Author: Stef Walter -Date: Wed Mar 23 10:58:43 2011 +0100 - - Hold off on depending on gio 2.28 just for one function. - - Replace g_simple_async_result_take_error() with - g_simple_async_result_set_error() and g_simple_async_result_set_from_error() - - configure.ac | 2 +- - wocky/wocky-ll-connection-factory.c | 11 +++++------ - wocky/wocky-ll-connector.c | 27 +++++++++++---------------- - wocky/wocky-meta-porter.c | 14 +++++++++----- - wocky/wocky-uninstalled.pc.in | 2 +- - 5 files changed, 27 insertions(+), 29 deletions(-) - -commit 59ac2219bd44399949c6732dafa402786b317404 -Author: Jonny Lamb -Date: Fri Mar 11 10:38:33 2011 +0000 - - pubsub-helpers: add make_event_stanza helper function - - Signed-off-by: Jonny Lamb - - wocky/wocky-pubsub-helpers.c | 50 ++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-helpers.h | 5 ++++ - 2 files changed, 55 insertions(+), 0 deletions(-) - -commit 506ffdf83b335175e037385b6cf323c6c94f0728 -Author: Jonny Lamb -Date: Tue Mar 22 15:40:22 2011 +0000 - - examples: use wocky_session_new_with_connection - - wocky_session_new() was renamed to this in my meta-porter branch. - - Signed-off-by: Jonny Lamb - - examples/receive-messages.c | 2 +- - examples/send-message.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 1343f70de56c6917a224b3c2618eaf654a9fc958 -Merge: 9165184 901aca4 -Author: Jonny Lamb -Date: Tue Mar 22 15:31:20 2011 +0000 - - Merge branch 'meta-porter' - - Conflicts: - docs/reference/wocky-docs.sgml - wocky/wocky-debug.h - - Signed-off-by: Jonny Lamb - Reviewed-by: Will Thompson - -commit 901aca41915146f450842d7ab41071d5dd0e4f46 -Author: Jonny Lamb -Date: Tue Mar 22 15:08:41 2011 +0000 - - meta-porter: ensure the ClosePorter closure if freed even if there are none to close - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -commit 018286b9c3f881fe35f2facfb5f52264dd99e231 -Author: Jonny Lamb -Date: Tue Mar 22 15:02:32 2011 +0000 - - meta-porter: fix tallying up calls to the close_async function - - PorterData* can have a NULL porter, which means the meta-porter - doesn't need to close it. However, previously, the close_all_porters - function didn't care about that and treated as that a remaining - porter anyway. - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 17 ++++++++--------- - 1 files changed, 8 insertions(+), 9 deletions(-) - -commit 5dd3fcd91d00332f126d447bdc76cecfd0b355ce -Author: Jonny Lamb -Date: Tue Mar 22 10:04:57 2011 +0000 - - configure: depend on gio >= 2.28 - - At least g_simple_async_result_take_error needs this. - - Signed-off-by: Jonny Lamb - - configure.ac | 2 +- - wocky/wocky-uninstalled.pc.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 807c680b413dbef620a9ee560493f56cfc945184 -Author: Jonny Lamb -Date: Mon Mar 21 09:27:15 2011 +0000 - - meta-porter: don't leak the stanza if send_iq_finish wasn't called - - We get a new ref to the new stanza from the c2s porter's - send_iq_finish. We now set that as the simple async result's gpointer - with free func of g_object_unref. The finish func returns a new ref to - the stanza so that when the simple async result is completed it unrefs - the stanza leaving the only ref in the callback (unless it has already - been unreffed there). - - Bingo. - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit ff6037a2a24288d80fa201bd00b0dc9b5d668971 -Author: Jonny Lamb -Date: Mon Mar 21 09:23:12 2011 +0000 - - meta-porter: clarify closing all porters code - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 32 +++++++++++++++----------------- - 1 files changed, 15 insertions(+), 17 deletions(-) - -commit 5a13d595205c0a5dacff0eb8a29063e8dd4c0554 -Author: Jonny Lamb -Date: Mon Mar 21 09:20:17 2011 +0000 - - meta-porter: don't create a new GList twice needlessly - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 4d31698c7664b828ce19d559ec782df6a5df5b20 -Author: Jonny Lamb -Date: Mon Mar 21 09:18:26 2011 +0000 - - meta-porter: bail out of start if the socket listener fails to listen - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 00dd8fc007dec252f6255bdcc0e31821d94aedcd -Author: Jonny Lamb -Date: Mon Mar 21 09:16:49 2011 +0000 - - meta-porter: add the other arguments to stanza_handler_new - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 35 ++++++++++++++++++----------------- - 1 files changed, 18 insertions(+), 17 deletions(-) - -commit bf09868c378b95bd0f2eb48c534d72a1352b9d42 -Author: Jonny Lamb -Date: Mon Mar 21 09:13:36 2011 +0000 - - meta-porter: critical on setting the JID twice - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 7 ++----- - 1 files changed, 2 insertions(+), 5 deletions(-) - -commit 916518447065436474ddd0d86462dafa3e28815e -Author: Marco Barisione -Date: Fri Mar 18 18:26:49 2011 +0000 - - SaslAuth: fix a wrong variable name (it's "sasl", not "self") - - Reviewed-by: Will Thompson - - wocky/wocky-sasl-auth.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 683d2cf1c5d4095b9413442d4cafb4e850c47952 -Author: Marco Barisione -Date: Fri Mar 18 17:35:09 2011 +0000 - - SaslAuth: Don't process stanzas received after disconnection - - Fixes: - Reviewed-by: Will Thompson - - wocky/wocky-sasl-auth.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 27252c32885bcc057654dcbc3191812b745238a2 -Merge: d3354fd c0638dd -Author: Will Thompson -Date: Thu Mar 17 16:29:27 2011 +0000 - - Merge branch 'examples' - - Reviewed-by: Jonny Lamb - Fixes: - -commit c0638dd2dfc88c5d8404618fe359f5a1185d13d0 -Author: Will Thompson -Date: Thu Mar 17 15:33:40 2011 +0000 - - examples: correctly publish 'chat' presence - - examples/receive-messages.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 43cd47e8868587e6304dbf305135424443f11cc1 -Author: Will Thompson -Date: Thu Mar 17 15:27:47 2011 +0000 - - porter-test: remove stray g_print (G_STRFUNC)s - - tests/wocky-porter-test.c | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 4766171bc6a764c5cb49a341595fff96fd66fec6 -Author: Will Thompson -Date: Wed Mar 16 18:57:04 2011 +0000 - - Connector: simplify building a debug string - - wocky/wocky-connector.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 1d3db8d669e73f6d18f3130891e53d19913ad0f2 -Author: Will Thompson -Date: Wed Mar 16 18:25:44 2011 +0000 - - SaslAuth: use WockyNodeIter to iterate mechanisms - - wocky/wocky-sasl-auth.c | 19 ++++++------------- - 1 files changed, 6 insertions(+), 13 deletions(-) - -commit 08d26f1f52da184266301a76030e75b94cdd953f -Author: Will Thompson -Date: Wed Feb 16 16:37:23 2011 +0000 - - Stanza: Improve error message on type/subtype mismatch - - Previously, if you tried to build a stanza of TYPE_MESSAGE with - SUB_TYPE_GET (say), you got this super-clear critical: - - wocky-CRITICAL **: check_sub_type: assertion - `sub_type_names[sub_type].type == WOCKY_STANZA_TYPE_NONE || - sub_type_names[sub_type].type == type' failed - - Luddite quotes and all. It's much clearer if we include the - human-readable names. - - wocky/wocky-stanza.c | 15 ++++++++++++--- - 1 files changed, 12 insertions(+), 3 deletions(-) - -commit c3b05e3331b883eb192ebca87be393be047944fd -Author: Will Thompson -Date: Wed Mar 16 18:52:48 2011 +0000 - - Add a simple example of receiving incoming messages. - - .gitignore | 1 + - examples/Makefile.am | 5 + - examples/receive-messages.c | 195 +++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 201 insertions(+), 0 deletions(-) - -commit 7920415a3f3434c755a120d3e5c050ef8762b506 -Author: Will Thompson -Date: Wed Mar 16 18:31:54 2011 +0000 - - Remove connect example. - - The vast, vast majority of this example dealt with connecting before the - connector existed. Now it does, that part's unnecessary—it's just a poor - clone of the connector—and the remainder is subsumed by send-message. - - .gitignore | 1 - - examples/Makefile.am | 7 +- - examples/connect.c | 432 -------------------------------------------------- - 3 files changed, 1 insertions(+), 439 deletions(-) - -commit 5f37fa362ee2dcf3995f8a9a7ba8506b2c9777a6 -Author: Will Thompson -Date: Tue Feb 15 15:51:46 2011 +0000 - - Add a simple example of sending a message. - - .gitignore | 1 + - examples/Makefile.am | 5 ++ - examples/send-message.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 144 insertions(+), 0 deletions(-) - -commit de8d20d065f554f6ae7fd1945649dbf0322b2971 -Author: Will Thompson -Date: Thu Mar 17 14:04:01 2011 +0000 - - Porter: test sending from send_async() callback. - - When I was briefly hunting the bug Jonny fixed, I though that the - following (untested) scenario might not work: - - • Tell the porter to send two messages; - • In the callback for the first one having been sent, tell the porter to - send a third. - - So I wrote the test, and it does work. Hooray. - - tests/wocky-porter-test.c | 103 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 103 insertions(+), 0 deletions(-) - -commit 902aa24b5d9519fbc6ec3fcbd7c353cbbc42930d -Author: Will Thompson -Date: Wed Feb 16 17:56:59 2011 +0000 - - Add a test case for closing a porter from a send_async callback - - This is a regression test for the bug fixed in the previous commit. - - tests/wocky-porter-test.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 68 insertions(+), 0 deletions(-) - -commit cf8b0dbabe4b153f0e62c5483507cef89a30177f -Author: Jonny Lamb -Date: Fri Mar 11 09:54:19 2011 +0000 - - porter: don't close twice if we close in a send callback - - We need to decide before we complete the "send stanza" asynchronous - operation whether we have a close result pending. If we don't, we can - get into a pickle if the callback to send_async calls close_async. The - problem is that close_async doesn't use the same stanza queue as - send_async so needs special-casing. - - For example: Previously, we send a stanza using send_async. The simple - async result would be completed with g_simple_async_result_complete() - and the callback to send_async would be called. However, if in the - callback close_async is called, the stream close is sent directly with - wocky_xmpp_connection_send_close_async and priv->close_result is - assigned. Once the callback returns, send_stanza_cb continues BUT at - the end there is a test for whether there is a close result - pending. This is for when you send a whole bunch of stanzas followed - by a close request, so the porter waits until all the stanzas are sent - before sending the stream close, which is cool. However, - priv->close_result is now != NULL so the porter thinks we're in - exactly that case -- that we're waiting until all the stanzas are sent - and will try and send a stream close afterwards. As we've already done - that the xmpp connection will say "hey another send operation pending" - and everything will fall apart. - - Signed-off-by: Jonny Lamb - - wocky/wocky-c2s-porter.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit d3354fd9c095a2c7c1f381e62a4d7b8481fd9edc -Merge: cf9bb4a 45bb1dc -Author: Jonny Lamb -Date: Thu Mar 17 09:09:57 2011 +0000 - - Merge remote branch 'ptlo/stanza-queueing-c2s' - -commit 45bb1dc9fcd3171983e785b238a0e35c3e72a294 -Author: Senko Rasic -Date: Tue Mar 15 13:20:15 2011 +0100 - - WockyC2SPorter: queue unimportant stanza in power saving mode - - wocky/wocky-c2s-porter.c | 148 +++++++++++++++++++++++++++++++++++++++++++++- - wocky/wocky-c2s-porter.h | 3 + - 2 files changed, 150 insertions(+), 1 deletions(-) - -commit 4bb6e6fc14c8014e653a4cb812a220fdc5f14147 -Author: Jonny Lamb -Date: Wed Mar 16 10:46:21 2011 +0000 - - meta-porter: clarify borrow_connection docstring - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 10 +++++++--- - 1 files changed, 7 insertions(+), 3 deletions(-) - -commit e46d8083b9a7401b9080c37e4c06b48c9f511b62 -Author: Jonny Lamb -Date: Wed Mar 16 10:29:31 2011 +0000 - - meta-porter: don't refer to missing arguments in documentation - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 544956df89dbad2d0712a4d736a08eff0becfa19 -Author: Jonny Lamb -Date: Wed Mar 16 10:27:36 2011 +0000 - - meta-porter: give functions who require ll contacts that signature - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 8 ++++---- - wocky/wocky-meta-porter.h | 4 ++-- - 2 files changed, 6 insertions(+), 6 deletions(-) - -commit 7cb02519648fea65317a51f5e3ebe85f79b668b8 -Author: Jonny Lamb -Date: Wed Mar 16 10:20:48 2011 +0000 - - meta-porter: add a stanza_handler_new to stop duplicating code - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 24 +++++++++++++++++------- - 1 files changed, 17 insertions(+), 7 deletions(-) - -commit 3d616a5da98686ff68c7ec73f78169e5ec2f3597 -Author: Jonny Lamb -Date: Wed Mar 16 10:15:13 2011 +0000 - - meta-porter: continue using wocky_stanza_get_ functions - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c357d3309905b4b35e9541c9899dd49ace00e2bd -Author: Jonny Lamb -Date: Wed Mar 16 10:11:34 2011 +0000 - - meta-porter: use better callback names when using open_porter_if_necessary - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 25 +++++++++++++------------ - 1 files changed, 13 insertions(+), 12 deletions(-) - -commit 20c50ed7dea3b03bcfb17b917b0f73527ebc51e8 -Author: Jonny Lamb -Date: Wed Mar 16 10:03:23 2011 +0000 - - meta-porter: use wocky_stanza_get_from - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit c0c789bc14dd1a4c3220f4bb6a53eaeb803433a4 -Author: Jonny Lamb -Date: Wed Mar 16 10:00:15 2011 +0000 - - meta-porter: change variable name to be a little less confusing - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 27260ccf388c1f9a6b498561658d8aa2971fa004 -Author: Jonny Lamb -Date: Wed Mar 16 09:58:00 2011 +0000 - - meta-porter: make open_porter_if_necessary take a async result and user data - - Turns out two user datas wasn't necessary! - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 51 +++++++++++++++++++++++---------------------- - 1 files changed, 26 insertions(+), 25 deletions(-) - -commit 4cbc9642b23585d8aa85abfae578c80af004c4f6 -Author: Jonny Lamb -Date: Wed Mar 16 09:51:32 2011 +0000 - - meta-porter: don't leak and report more errors when setting up the loopback porter - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 20 ++++++++++++++++---- - 1 files changed, 16 insertions(+), 4 deletions(-) - -commit 25ef4db47a538827397c6bc5fe0feeca16a25b8b -Author: Jonny Lamb -Date: Wed Mar 16 09:44:01 2011 +0000 - - meta-porter: remove NewConnectionData - - We can get the socket address later. - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 47 +++++++++++++++++++------------------------- - 1 files changed, 20 insertions(+), 27 deletions(-) - -commit daf1a426a6e2dd7079ee7b5e99934fbe55bcd896 -Author: Jonny Lamb -Date: Wed Mar 16 09:37:48 2011 +0000 - - meta-porter: refactor duplicated code into another function - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 22 ++++++++++++---------- - 1 files changed, 12 insertions(+), 10 deletions(-) - -commit 55acacdf14ece714bfeb74b5554303ddc1687264 -Author: Jonny Lamb -Date: Wed Mar 16 09:30:34 2011 +0000 - - meta-porter: clarify porter disposed weak ref callback name - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit e1ab0e953cfe66aa4d20c318c47b985d2802703a -Author: Jonny Lamb -Date: Wed Mar 16 09:24:35 2011 +0000 - - meta-porter: remove unnecessary weak reffing of the c2s porter - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 18 +----------------- - 1 files changed, 1 insertions(+), 17 deletions(-) - -commit ec72ecf69ad36a96ebbb028af1a7d83a2f36b7f7 -Author: Jonny Lamb -Date: Wed Mar 16 09:16:56 2011 +0000 - - meta-porter: include missing porter recipient in debug message - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0537e42cb88fa664178bed703cb66ee3304cd4dd -Author: Jonny Lamb -Date: Wed Mar 16 09:07:43 2011 +0000 - - meta-porter: only allow set_jid to be called once - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 16 ++++++++++++---- - 1 files changed, 12 insertions(+), 4 deletions(-) - -commit 6e484c8d874a36c95f07b31a114f879c453ae072 -Author: Jonny Lamb -Date: Wed Mar 16 08:58:25 2011 +0000 - - meta-porter: stop talking about references in docstrings - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit cf9bb4a08d6ba577937603b2c899d5e00408115a -Author: Will Thompson -Date: Tue Mar 15 18:22:35 2011 +0000 - - Roster: remove dead google_roster code. - - We don't use this class at all. I'm tempted to remove it entirely. But - this was triggering unused variable warnings. - - Reviewed-by: Sjoerd Simons - - wocky/wocky-roster.c | 15 --------------- - 1 files changed, 0 insertions(+), 15 deletions(-) - -commit 37fe2e992fa482c36abae85ed07df49a3a307937 -Author: Jonny Lamb -Date: Mon Mar 14 14:40:15 2011 +0000 - - ll-connector: use GAsyncInitable and make API easier to understand. - - Signed-off-by: Jonny Lamb - - wocky/wocky-ll-connector.c | 225 +++++++++++++++++++++++++------------------ - wocky/wocky-ll-connector.h | 16 ++-- - wocky/wocky-meta-porter.c | 26 ++--- - 3 files changed, 150 insertions(+), 117 deletions(-) - -commit bbaeb4a4ce8e02c364c93949a041be369bd0466c -Author: Jonny Lamb -Date: Mon Mar 14 12:06:59 2011 +0000 - - loopback-connection: rename to loopback-stream - - Signed-off-by: Jonny Lamb - - tests/wocky-loopback-test.c | 4 +- - wocky/Makefile.am | 4 +- - wocky/wocky-loopback-connection.c | 544 ------------------------------------- - wocky/wocky-loopback-connection.h | 67 ----- - wocky/wocky-loopback-stream.c | 544 +++++++++++++++++++++++++++++++++++++ - wocky/wocky-loopback-stream.h | 67 +++++ - wocky/wocky-meta-porter.c | 4 +- - 7 files changed, 617 insertions(+), 617 deletions(-) - -commit 5cc57e7166807b911a5ea1cbcfa0b4cb28688fc5 -Author: Jonny Lamb -Date: Mon Mar 14 12:02:48 2011 +0000 - - meta-porter: rename ref/unref to hold/unhold - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 24 ++++++++++++------------ - wocky/wocky-meta-porter.h | 4 ++-- - 2 files changed, 14 insertions(+), 14 deletions(-) - -commit b230d9aa66b6835cc5688b8bf9dc2dec233e5657 -Author: Jonny Lamb -Date: Mon Mar 14 11:51:39 2011 +0000 - - ll-connector: send stream features in incoming connections too - - Signed-off-by: Jonny Lamb - - wocky/wocky-ll-connector.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit 05caefc9bac290525b8be7d5c75034fb27fe7cca -Author: Jonny Lamb -Date: Mon Mar 14 11:49:33 2011 +0000 - - ll-connector: chain up to constructed first - - Signed-off-by: Jonny Lamb - - wocky/wocky-ll-connector.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 9cb140595d2d163810d72768075f2a9178b1413c -Author: Jonny Lamb -Date: Mon Mar 14 10:56:24 2011 +0000 - - ll-connector: reference _new functions in connect_async docstring - - Signed-off-by: Jonny Lamb - - wocky/wocky-ll-connector.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 83fceb9a01975163bb65c4c081ad182051ba1a97 -Author: Jonny Lamb -Date: Mon Mar 14 10:40:24 2011 +0000 - - ll-connection-factory: use a GQueue - - It's more clear than a couple of GList pointers. - - Signed-off-by: Jonny Lamb - - wocky/wocky-ll-connection-factory.c | 34 +++++++++++++++++++++++----------- - 1 files changed, 23 insertions(+), 11 deletions(-) - -commit 92bda0a09cf5b9fd282b6a63171d01fd0f6c7351 -Author: Jonny Lamb -Date: Mon Mar 14 10:17:35 2011 +0000 - - ll-connection-factory: check whether the cancellable has been cancelled - - Signed-off-by: Jonny Lamb - - wocky/wocky-ll-connection-factory.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit d87861c3af468b1a66b862c69b8f09ab677169c8 -Author: Jonny Lamb -Date: Mon Mar 14 10:12:35 2011 +0000 - - connection-factory: rename to ll-connection-factory - - Signed-off-by: Jonny Lamb - - wocky/Makefile.am | 4 +- - wocky/wocky-connection-factory.c | 266 ----------------------------------- - wocky/wocky-connection-factory.h | 89 ------------ - wocky/wocky-ll-connection-factory.c | 266 +++++++++++++++++++++++++++++++++++ - wocky/wocky-ll-connection-factory.h | 89 ++++++++++++ - wocky/wocky-meta-porter.c | 12 +- - 6 files changed, 363 insertions(+), 363 deletions(-) - -commit e3f1e091e087942944b38a66554716ba316e30d9 -Author: Jonny Lamb -Date: Mon Mar 14 10:00:39 2011 +0000 - - ll-contact: re-word get_addresses docstring - - Signed-off-by: Jonny Lamb - - wocky/wocky-ll-contact.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit 37b5701f9c7d99c077e3286881992af11a883f7e -Author: Jonny Lamb -Date: Mon Mar 14 09:59:32 2011 +0000 - - ll-contact: annotate return type of get_addresses - - Signed-off-by: Jonny Lamb - - wocky/wocky-ll-contact.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 3280a8dde69ddfe5e3853b2cbf8068232fa1652b -Author: Jonny Lamb -Date: Mon Mar 14 09:57:34 2011 +0000 - - ll-contact: spell out ll acronym in docstring - - Signed-off-by: Jonny Lamb - - wocky/wocky-ll-contact.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e9f5d05edddcf678d2fb143c5332705e6b406719 -Author: Jonny Lamb -Date: Mon Mar 14 09:42:07 2011 +0000 - - stanza: separate contact object into to and from objects - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 8 +++--- - wocky/wocky-stanza.c | 59 ++++++++++++++++++++++++++++++++++---------- - wocky/wocky-stanza.h | 7 ++++- - 3 files changed, 54 insertions(+), 20 deletions(-) - -commit 2a4c323c0d490f863728c48c79333edc0a99ed82 -Author: Jonny Lamb -Date: Mon Mar 14 09:22:58 2011 +0000 - - utils: use G_STMT_{START,END} in new implement macro - - Signed-off-by: Jonny Lamb - - wocky/wocky-utils.h | 18 ++++++++++-------- - 1 files changed, 10 insertions(+), 8 deletions(-) - -commit 13bd32864d690f61267b61389b1f414754f44f6c -Author: Jonny Lamb -Date: Fri Mar 11 15:22:39 2011 +0000 - - caps-hash: fix up some code after running it through the style checker - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 72ad9c1e37fd05fbda8549a3b14ddb2a77da418e -Author: Jonny Lamb -Date: Fri Mar 11 15:17:00 2011 +0000 - - caps-hash: test having bad nodes in data form fields - - Signed-off-by: Jonny Lamb - - tests/wocky-caps-hash-test.c | 93 ++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-caps-hash.c | 41 ++++++++++++++++-- - 2 files changed, 129 insertions(+), 5 deletions(-) - -commit 9d50b575a41fc5e3648023fbae372c06168ce983 -Author: Jonny Lamb -Date: Fri Mar 11 14:27:33 2011 +0000 - - caps-hash: fail if there are multiple data forms with the same type - - Signed-off-by: Jonny Lamb - - tests/wocky-caps-hash-test.c | 84 ++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-caps-hash.c | 24 ++++++++++++ - 2 files changed, 108 insertions(+), 0 deletions(-) - -commit 21d7db7c112b3397416a4ccb660243d218816fa1 -Author: Jonny Lamb -Date: Fri Mar 11 14:26:12 2011 +0000 - - caps-hash: add more debugging for a missing FORM_TYPE field - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit f4562b8d5588f7bb18d3618af447aef735928833 -Author: Jonny Lamb -Date: Fri Mar 11 14:15:31 2011 +0000 - - caps-hash-test: add a test for a dataform without FORM_TYPE - - Signed-off-by: Jonny Lamb - - tests/wocky-caps-hash-test.c | 29 ++++++++++++++++++++++++++++- - 1 files changed, 28 insertions(+), 1 deletions(-) - -commit 59d84e5eb286595ee5b4f68f1c280c07479f2c45 -Author: Jonny Lamb -Date: Fri Mar 11 14:08:18 2011 +0000 - - caps-hash: bail if there is no FORM_TYPE field in the data form - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 3d2d30ef018a16ec7d80c055eddf734ea0f56007 -Author: Jonny Lamb -Date: Fri Mar 11 14:07:52 2011 +0000 - - caps-hash: free sha1'd string - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 7b640b914b214fc9c3248652e4af07d3a9d94e93 -Author: Jonny Lamb -Date: Fri Mar 11 13:58:10 2011 +0000 - - caps-hash: also handle booleans - - Signed-off-by: Jonny Lamb - - tests/wocky-caps-hash-test.c | 10 ++++++++++ - wocky/wocky-caps-hash.c | 6 +++++- - 2 files changed, 15 insertions(+), 1 deletions(-) - -commit 116af1e57c66bc2183cc667e5970ec8f93860965 -Author: Jonny Lamb -Date: Fri Mar 11 13:57:48 2011 +0000 - - caps-hash: ensure multi-text values are sorted - - Signed-off-by: Jonny Lamb - - tests/wocky-caps-hash-test.c | 2 +- - wocky/wocky-caps-hash.c | 20 +++++++++++++++++++- - 2 files changed, 20 insertions(+), 2 deletions(-) - -commit 4e4226dfef22e367dd7eb153f44578b7fc6bf67e -Author: Jonny Lamb -Date: Fri Mar 11 13:42:39 2011 +0000 - - caps-hash: use a switch and deal with all dataform field types - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 49 +++++++++++++++++++++++++++++++++------------- - 1 files changed, 35 insertions(+), 14 deletions(-) - -commit 3f0a9c6a3d03e6dd92874fb328e637aecce782e4 -Author: Jonny Lamb -Date: Fri Mar 11 10:28:18 2011 +0000 - - meta-porter: add more interesting debug messages - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 14 ++++++++++---- - 1 files changed, 10 insertions(+), 4 deletions(-) - -commit e763571868f715378a51acee823ebde65891998b -Merge: 5cd5394 a17332c -Author: Will Thompson -Date: Thu Mar 10 15:33:16 2011 +0000 - - Merge remote-tracking branch 'stefw/error-always-specialized-node' - - Fixes: - Fixes: - Reviewed-by: Will Thompson - -commit a17332c8441b3e5dddb46ff50987bb1f38def647 -Author: Stef Walter -Date: Thu Mar 10 15:55:29 2011 +0100 - - Refine behavior of wocky_xmpp_error_extract() for specialized errors. - - We return the first specialized error. There should only be one - according to the XMPP specs. @specialized and @specialized_node always - match. - - https://bugs.freedesktop.org/show_bug.cgi?id=35086 - - tests/wocky-stanza-test.c | 68 +++++++++++++++++++++++++++++++++++++++++---- - wocky/wocky-xmpp-error.c | 11 ++++--- - 2 files changed, 68 insertions(+), 11 deletions(-) - -commit 71303eba13770a8628b8af62c3b08e9c6fb79954 -Author: Stef Walter -Date: Mon Mar 7 16:55:20 2011 +0100 - - wocky_xmpp_error_extract() fills in @specialized_node for any app error. - - Don't just limit parsing/setting of @specialized_node to error codes - which have been specifically registered with a WockyXmppErrorSpecialization. - - Fill in @specialized when the error code has been specifically - registered. Fill in @specialized_node when a registered error domain - matches, whether or not the specific code has been registered. - - https://bugs.freedesktop.org/show_bug.cgi?id=35086 - - wocky/wocky-xmpp-error.c | 15 ++++++++++----- - 1 files changed, 10 insertions(+), 5 deletions(-) - -commit 441f5c02e8a930d07ed81d93ff2f04eb95ab51f7 -Author: Stef Walter -Date: Thu Mar 10 15:28:43 2011 +0100 - - Fix memory leak in tests. - - tests/wocky-stanza-test.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 5cd5394a90ebefb95171aff007c073b2fd2fece6 -Author: Will Thompson -Date: Thu Mar 10 13:38:21 2011 +0000 - - Make PubsubAffiliation and PubsubSubscription docs appear - - Wtf! - - Reviewed-by: Jonny Lamb - - wocky/wocky-pubsub-node.h | 1 + - wocky/wocky-pubsub-service.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit 02f235609a9cfc4df076c3d4fc1d01e39c91b9e5 -Author: Stef Walter -Date: Thu Mar 10 14:20:20 2011 +0100 - - Split up the XMPP stanza tests, so each test tests one thing. - - https://bugs.freedesktop.org/show_bug.cgi?id=35175 - - tests/wocky-stanza-test.c | 155 +++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 144 insertions(+), 11 deletions(-) - -commit 4c557f412d52ed121d04eec4a3e10b2511cf11a8 -Author: Jonny Lamb -Date: Thu Mar 10 11:58:48 2011 +0000 - - openssl: stop using OPAQUE_TYPE_ prefixes here too - - Like in 9984d84ea288b4c but I forgot about to build the openssl - backend so only just noticed it had broken. - - Signed-off-by: Jonny Lamb - - wocky/wocky-openssl.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 1eec342d97afb81c77c0377d6ba964b41101d804 -Author: Jonny Lamb -Date: Thu Mar 10 11:54:38 2011 +0000 - - porter: initialize GError* to NULL to fix coding style checks - - Signed-off-by: Jonny Lamb - - wocky/wocky-porter.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 20a857391a832077ebfd48fe3503ef737bde8c49 -Merge: dbf5020 3961b80 -Author: Jonny Lamb -Date: Thu Mar 10 11:42:21 2011 +0000 - - Merge branch 'gee-tee-kay-doc' - -commit dbf50208beffa638fb814bdb1b42aac919eadbea -Merge: 99018a2 84edb4f -Author: Will Thompson -Date: Thu Mar 10 10:51:36 2011 +0000 - - Merge branch 'ack-and-nak' - - Fixes: - Reviewed-by: Jonny Lamb - -commit 3961b809f22f532541b73fe332d9465fb1032c3e -Author: Jonny Lamb -Date: Wed Mar 9 16:21:38 2011 +0000 - - pep-service: document everything - - Signed-off-by: Jonny Lamb - - wocky/wocky-pep-service.c | 82 ++++++++++++++++++++++++++++++++++++++++++++- - wocky/wocky-pep-service.h | 13 +++++-- - 2 files changed, 90 insertions(+), 5 deletions(-) - -commit cd6ceec9b550ceb30782954244ad3c3a7869e83d -Author: Jonny Lamb -Date: Wed Mar 9 09:58:03 2011 +0000 - - xmpp-error: fix WockyXmppErrorSpecialization docs - - Signed-off-by: Jonny Lamb - - wocky/wocky-xmpp-error.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit ab85e5a992c59b8a42d163a4a0d645a7e5b8bb25 -Author: Jonny Lamb -Date: Wed Mar 9 09:52:24 2011 +0000 - - node: add note about the gtk-doc bug we're hitting - - Signed-off-by: Jonny Lamb - - wocky/wocky-node.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 60ee6333a7a7637eb482b04f2fe581dc1c4f9694 -Author: Jonny Lamb -Date: Wed Mar 9 09:43:01 2011 +0000 - - node: document NodeIter's members as private - - Signed-off-by: Jonny Lamb - - wocky/wocky-node.h | 8 +++----- - 1 files changed, 3 insertions(+), 5 deletions(-) - -commit c2772ff7d0a832dc34ebaa0585f66e7be7de190d -Author: Jonny Lamb -Date: Wed Mar 9 09:42:05 2011 +0000 - - node: remove confusing comment describing nodes - - Signed-off-by: Jonny Lamb - - wocky/wocky-node.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit e1530e0b18976468920a40d8cc3436e896f1485c -Author: Jonny Lamb -Date: Tue Mar 8 15:43:13 2011 +0000 - - contact: no need to forward-define WockyContact - - Signed-off-by: Jonny Lamb - - wocky/wocky-contact.h | 4 ++-- - wocky/wocky-types.h | 1 - - 2 files changed, 2 insertions(+), 3 deletions(-) - -commit d11a8114a1cb547eaf4ca12b3df59d81724a1ae7 -Author: Jonny Lamb -Date: Tue Mar 8 15:38:55 2011 +0000 - - jabber-auth-digest: make class and object struct members private - - Signed-off-by: Jonny Lamb - - wocky/wocky-jabber-auth-digest.h | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 97fffc5f6ee3638352f10eca71a9507484822279 -Author: Jonny Lamb -Date: Tue Mar 8 15:38:37 2011 +0000 - - wocky-docs.sgml: add some other missing files - - Signed-off-by: Jonny Lamb - - docs/reference/wocky-docs.sgml | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit da3e300a56c1decd2e1a599b1cfb0dbfd6d2da9a -Author: Jonny Lamb -Date: Tue Mar 8 15:22:46 2011 +0000 - - wocky-docs.sgml: use Wocky, not wocky - - Happy, not sad. :-) - - Signed-off-by: Jonny Lamb - - docs/reference/wocky-docs.sgml | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3909ea620aaf579ee6a0e35ee9850d8553a40a4b -Author: Jonny Lamb -Date: Tue Mar 8 15:22:02 2011 +0000 - - wocky-docs.sgml: re-add the enumtypes files - - Signed-off-by: Jonny Lamb - - docs/reference/wocky-docs.sgml | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 60e3415f308f568089ca49791d657ace6500e811 -Author: Jonny Lamb -Date: Tue Mar 8 15:18:45 2011 +0000 - - xmpp-error: don't typedef the structs directly - - Like a few commits ago. - - Signed-off-by: Jonny Lamb - - wocky/wocky-xmpp-error.h | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit 363c5a62159eed5e48c096b34f5b9e15cfd978e4 -Author: Jonny Lamb -Date: Tue Mar 8 15:18:35 2011 +0000 - - porter: fix reference to porter error - - Signed-off-by: Jonny Lamb - - wocky/wocky-porter.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit dadc629fc9e262ed448fa0ed886e23ea16447d4d -Author: Jonny Lamb -Date: Tue Mar 8 15:18:17 2011 +0000 - - c2s-porter: fix link to register_handler_from_server - - Signed-off-by: Jonny Lamb - - wocky/wocky-c2s-porter.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit ba23c83032462081fee5414bf5d1f77d13b4cab2 -Author: Jonny Lamb -Date: Tue Mar 8 15:13:21 2011 +0000 - - data-form: add a section header - - Signed-off-by: Jonny Lamb - - wocky/wocky-data-form.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit eb3a37018975eae1905ac7069e0899f44fbaae4c -Author: Jonny Lamb -Date: Tue Mar 8 15:12:26 2011 +0000 - - data-form: don't typedef the struct directly - - This way gtk-doc picks up the struct. Not sure why. - - Signed-off-by: Jonny Lamb - - wocky/wocky-data-form.h | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit d4055e010d0a8e6b033362590cc36f0d0991b7cb -Author: Jonny Lamb -Date: Tue Mar 8 15:11:53 2011 +0000 - - tls-connector: document :tls-handler - - Signed-off-by: Jonny Lamb - - wocky/wocky-tls-connector.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit f239831aa994934d93a41fc06b4feb9110049c32 -Author: Jonny Lamb -Date: Tue Mar 8 15:11:22 2011 +0000 - - auth-registry: fix typos when referencing other functions - - Signed-off-by: Jonny Lamb - - wocky/wocky-auth-registry.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit e95a93d98030f8b5dfe5f680ade44b94133142c5 -Author: Jonny Lamb -Date: Tue Mar 8 15:11:02 2011 +0000 - - wocky-docs.sgml: add missing include of wocky-tls-handler.xml - - Signed-off-by: Jonny Lamb - - docs/reference/wocky-docs.sgml | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit da25e325df1b2973e0f2ec1f2258f7796388fd73 -Author: Jonny Lamb -Date: Tue Mar 8 14:56:24 2011 +0000 - - all: document Class structs - - Mostly with dummy text. - - Signed-off-by: Jonny Lamb - - wocky/wocky-auth-registry.h | 29 +++++++++++++++++++++++++++++ - wocky/wocky-bare-contact.h | 7 +++++++ - wocky/wocky-c2s-porter.h | 8 ++++++++ - wocky/wocky-caps-cache.h | 8 ++++++++ - wocky/wocky-connector.h | 8 ++++++++ - wocky/wocky-contact-factory.h | 8 ++++++++ - wocky/wocky-contact.h | 7 +++++++ - wocky/wocky-data-form.h | 22 ++++++++++++++++++++++ - wocky/wocky-jabber-auth.h | 8 ++++++++ - wocky/wocky-muc.h | 8 ++++++++ - wocky/wocky-node-tree.h | 9 ++++++++- - wocky/wocky-pep-service.h | 8 ++++++++ - wocky/wocky-ping.h | 8 ++++++++ - wocky/wocky-pubsub-node.h | 7 +++++++ - wocky/wocky-resource-contact.h | 7 +++++++ - wocky/wocky-roster.h | 8 ++++++++ - wocky/wocky-sasl-auth.h | 8 ++++++++ - wocky/wocky-session.h | 7 +++++++ - wocky/wocky-stanza.h | 10 +++++++++- - wocky/wocky-tls-connector.h | 8 ++++++++ - wocky/wocky-tls-handler.h | 15 +++++++++++++++ - wocky/wocky-xmpp-connection.h | 8 ++++++++ - wocky/wocky-xmpp-reader.h | 8 ++++++++ - wocky/wocky-xmpp-writer.h | 8 ++++++++ - 24 files changed, 230 insertions(+), 2 deletions(-) - -commit a2780e30ba820c926098a2459f9dda06b86ee90a -Author: Jonny Lamb -Date: Tue Mar 8 14:16:31 2011 +0000 - - xmpp-error: document more enums and structs - - Signed-off-by: Jonny Lamb - - wocky/wocky-xmpp-error.h | 63 +++++++++++++++++++++++++++++++++++++++------ - 1 files changed, 54 insertions(+), 9 deletions(-) - -commit 1b8831d4485c0000282aa67aa5e3fbb31f0da7d3 -Author: Jonny Lamb -Date: Tue Mar 8 13:58:56 2011 +0000 - - node: add a workaround for gtk-doc's parser being broken - - I'll file a bug, like, way soon. - - Signed-off-by: Jonny Lamb - - wocky/wocky-node.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit db7308a6632c01ba654f1fba03e54c0824544ce5 -Author: Jonny Lamb -Date: Tue Mar 8 13:42:36 2011 +0000 - - pubsub-service: fix typo in argument docs - - Signed-off-by: Jonny Lamb - - wocky/wocky-pubsub-service.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bcd82c253ca516132cbaeeb93868f5aeb1026fe3 -Author: Jonny Lamb -Date: Tue Mar 8 13:40:10 2011 +0000 - - debug: make flag enum values private - - Signed-off-by: Jonny Lamb - - wocky/wocky-debug.h | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 1ef35279fade3b1f29ca9677b22146a89aa893ec -Author: Jonny Lamb -Date: Tue Mar 8 13:38:46 2011 +0000 - - porter: document the interface struct - - Signed-off-by: Jonny Lamb - - wocky/wocky-porter.h | 39 +++++++++++++++++++++++++++++++++++++++ - 1 files changed, 39 insertions(+), 0 deletions(-) - -commit 2ae30124e5e87ab8d8b81b216ae4100831b0f350 -Author: Jonny Lamb -Date: Tue Mar 8 13:09:48 2011 +0000 - - docs: escape XML tags in gtk-doc properly - - Signed-off-by: Jonny Lamb - - wocky/wocky-auth-handler.h | 40 +++++++++++++++++++++------------------- - wocky/wocky-stanza.h | 22 +++++++++++----------- - wocky/wocky-xmpp-error.c | 9 +++++---- - 3 files changed, 37 insertions(+), 34 deletions(-) - -commit c6b93921eb831840e913837f6939f688eace639b -Author: Jonny Lamb -Date: Tue Mar 8 12:03:05 2011 +0000 - - wocky-docs.sgml: include annotation-glossary.xml to silence more warnings - - Signed-off-by: Jonny Lamb - - docs/reference/wocky-docs.sgml | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 9984d84ea288b4c5b0a2bac24c608745ee890c9e -Author: Jonny Lamb -Date: Tue Mar 8 11:52:01 2011 +0000 - - tls: stop using OPAQUE_TYPE_ prefixes; it confuses gtk-doc - - Signed-off-by: Jonny Lamb - - wocky/wocky-tls.c | 4 ++-- - wocky/wocky-tls.h | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit b0ae9960ef300f141ec317e1c2524fc3dcc7dad2 -Author: Jonny Lamb -Date: Tue Mar 8 11:49:15 2011 +0000 - - wocky-docs.sgml: remove unnessary includes - - Signed-off-by: Jonny Lamb - - docs/reference/wocky-docs.sgml | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit ddd7608a27a56c966640a06cead18a6fb9f16617 -Author: Jonny Lamb -Date: Tue Mar 8 11:40:47 2011 +0000 - - data-form: don't use gtk-doc style comments for static functions - - Signed-off-by: Jonny Lamb - - wocky/wocky-data-form.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit b2efe47fb0707c860e25f406ca024cfeb771c0a8 -Author: Jonny Lamb -Date: Tue Mar 8 11:35:19 2011 +0000 - - namespaces: ensure all have wocky prefix - - Signed-off-by: Jonny Lamb - - wocky/wocky-muc.c | 4 ++-- - wocky/wocky-namespaces.h | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 6843d76c8849a7bfdede53bb2b6f328356faf2a7 -Author: Jonny Lamb -Date: Tue Mar 8 11:32:39 2011 +0000 - - wocky-docs.sgml: re-arrange docs and include missing files - - Signed-off-by: Jonny Lamb - - docs/reference/wocky-docs.sgml | 23 ++++++++++++++--------- - 1 files changed, 14 insertions(+), 9 deletions(-) - -commit 8b55bc0137bfdaaf9039d75e16393a4cdda0d524 -Author: Jonny Lamb -Date: Tue Mar 8 11:32:21 2011 +0000 - - xmpp-error: document error type and stream error type enums - - Signed-off-by: Jonny Lamb - - wocky/wocky-xmpp-error.c | 6 -- - wocky/wocky-xmpp-error.h | 161 ++++++++++++++++++++++++++++++++++++++++++++-- - 2 files changed, 155 insertions(+), 12 deletions(-) - -commit 78122f3a67d29792a5879628e67f210788d20cc9 -Author: Jonny Lamb -Date: Tue Mar 8 10:53:39 2011 +0000 - - xmpp-error: make function argument name consistent between definition and declaration - - Signed-off-by: Jonny Lamb - - wocky/wocky-xmpp-error.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e26c1bdf34b61c7af9f62a658aa166a5adbadf46 -Author: Jonny Lamb -Date: Tue Mar 8 10:52:26 2011 +0000 - - debug: rename DebugFlags enum to WockyDebugFlags - - Signed-off-by: Jonny Lamb - - wocky/wocky-debug.c | 16 ++++++++-------- - wocky/wocky-debug.h | 14 +++++++------- - 2 files changed, 15 insertions(+), 15 deletions(-) - -commit cf0dd58b0d1cc19d619244819dae6964288eb3df -Author: Jonny Lamb -Date: Tue Mar 8 10:50:25 2011 +0000 - - data-form: document more enums and structs - - Signed-off-by: Jonny Lamb - - wocky/wocky-data-form.h | 48 +++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 48 insertions(+), 0 deletions(-) - -commit f9f1b00b5991ebca4edb80991207aed8b3413438 -Author: Jonny Lamb -Date: Tue Mar 8 10:50:11 2011 +0000 - - node: document more enums and structs - - Signed-off-by: Jonny Lamb - - wocky/wocky-node.h | 32 ++++++++++++++++++++++++++++++-- - 1 files changed, 30 insertions(+), 2 deletions(-) - -commit 9e423113aad41b86a63d3cce1291f9ffbe8e118a -Author: Jonny Lamb -Date: Tue Mar 8 10:18:15 2011 +0000 - - xmpp-connection: fix name of argument in gtk-doc - - Signed-off-by: Jonny Lamb - - wocky/wocky-xmpp-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4c6680f5ecb11d1cc6632c12b9c7d97fa3b638cd -Author: Jonny Lamb -Date: Tue Mar 8 10:17:25 2011 +0000 - - pubsub-service: document PubsubServiceError - - Signed-off-by: Jonny Lamb - - wocky/wocky-pubsub-service.h | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit ab5503eff37f086809f01ba08a7424e0b193d1cd -Author: Jonny Lamb -Date: Tue Mar 8 10:15:56 2011 +0000 - - muc: fix up documentation of enums - - Signed-off-by: Jonny Lamb - - wocky/wocky-muc.h | 163 +++++++++++++++++++++++++++++++++++++++++------------ - 1 files changed, 127 insertions(+), 36 deletions(-) - -commit 01669f3bbd4bf9466b4c05bf75235a85e436ed28 -Author: Jonny Lamb -Date: Tue Mar 8 09:13:00 2011 +0000 - - stanza: document StanzaType and StanzaSubType enums - - Signed-off-by: Jonny Lamb - - wocky/wocky-stanza.h | 42 ++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 42 insertions(+), 0 deletions(-) - -commit dbd2c93d0d777091df23d16239d51032b90f20a7 -Author: Jonny Lamb -Date: Tue Mar 8 09:08:16 2011 +0000 - - connector: make WockyConnectorError conform a little more - - Signed-off-by: Jonny Lamb - - wocky/wocky-connector.h | 66 +++++++++++++++++++++++++++-------------------- - 1 files changed, 38 insertions(+), 28 deletions(-) - -commit ccc668e882edb10c635c6e3282e4af0d63853ef8 -Author: Jonny Lamb -Date: Tue Mar 8 09:07:45 2011 +0000 - - auth-handler: re-add < and > characters to show tags - - gtk-doc apparently deals with them. - - Signed-off-by: Jonny Lamb - - wocky/wocky-auth-handler.h | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit 133a2c5f0e0a71dccfa8c18a209632ac072e4642 -Author: Jonny Lamb -Date: Tue Mar 8 08:42:55 2011 +0000 - - roster: document WockyRosterSubscriptionFlags - - Signed-off-by: Jonny Lamb - - wocky/wocky-roster.h | 19 +++++++++++++++++++ - 1 files changed, 19 insertions(+), 0 deletions(-) - -commit 3e49397df467c25830e1c4b36f732743b588a841 -Author: Jonny Lamb -Date: Tue Mar 8 08:36:20 2011 +0000 - - auth-registry: fix up all gtk-doc docs - - What a generic commit message. - - Signed-off-by: Jonny Lamb - - wocky/wocky-auth-registry.h | 114 +++++++++++++++++++++++++++++++------------ - 1 files changed, 83 insertions(+), 31 deletions(-) - -commit da5d9fada6922b43a0ac1a58385c82613ad5bb02 -Author: Jonny Lamb -Date: Mon Mar 7 15:33:59 2011 +0000 - - auth-handler: fix up documentation of class functions - - ...in most ways possible. - - Signed-off-by: Jonny Lamb - - wocky/wocky-auth-handler.h | 52 ++++++++++++++++++++++++++++++------------- - 1 files changed, 36 insertions(+), 16 deletions(-) - -commit 5172562d92d85e65204dfa447acb190dfd0f7dc3 -Author: Jonny Lamb -Date: Mon Mar 7 15:33:13 2011 +0000 - - connector: add missing argument docs - - Signed-off-by: Jonny Lamb - - wocky/wocky-connector.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 3af290067b782c53d6b1a4e55e10cbe75c5405e3 -Author: Jonny Lamb -Date: Mon Mar 7 15:32:57 2011 +0000 - - connector: don't put comments where annotations are meant to go - - Signed-off-by: Jonny Lamb - - wocky/wocky-connector.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 2ef37a93ca0e845824c6b681a4e49d7ac1761439 -Author: Jonny Lamb -Date: Mon Mar 7 15:22:40 2011 +0000 - - connector: remove enum member docs as they've been removed - - Signed-off-by: Jonny Lamb - - wocky/wocky-connector.h | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -commit d8d98b898148076d4b346c1d0a3b61999a4e3faa -Author: Jonny Lamb -Date: Wed Mar 2 16:25:05 2011 +0000 - - porter: G_GNUC_WARN_UNUSED_RESULT need not be in the interface vfunc - - Signed-off-by: Jonny Lamb - - wocky/wocky-porter.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4f91ede6ddd14ee67b818726e32b561bcd4a50fa -Author: Jonny Lamb -Date: Mon Mar 7 14:41:39 2011 +0000 - - meta-porter: create a loopback porter for stanzas for yourself - - Signed-off-by: Jonny Lamb - - wocky/wocky-meta-porter.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 69 insertions(+), 0 deletions(-) - -commit b1168ad194943eadd8bb1381ef9392b80492e7ba -Author: Jonny Lamb -Date: Mon Mar 7 14:41:17 2011 +0000 - - loopback-connection: dispose the in/out streams only after they've been closed - - Signed-off-by: Jonny Lamb - - wocky/wocky-loopback-connection.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 68243ab51601302d79c17e1cfba53fc45340f86c -Author: Jonny Lamb -Date: Mon Mar 7 11:57:23 2011 +0000 - - tests: add a simple test for the loopback connection - - Signed-off-by: Jonny Lamb - - tests/Makefile.am | 7 ++ - tests/wocky-loopback-test.c | 191 +++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 198 insertions(+), 0 deletions(-) - -commit 91cdffaaa241f8595d65111edb75dde440b5fc95 -Author: Jonny Lamb -Date: Mon Mar 7 11:56:55 2011 +0000 - - loopback-connection: added files - - Perhaps this should be called WockyLoopbackStream? - - Signed-off-by: Jonny Lamb - - wocky/Makefile.am | 2 + - wocky/wocky-loopback-connection.c | 544 +++++++++++++++++++++++++++++++++++++ - wocky/wocky-loopback-connection.h | 67 +++++ - 3 files changed, 613 insertions(+), 0 deletions(-) - -commit 5e62f6126ec0101c30c9b154d57bcd9a134ec055 -Author: Jonny Lamb -Date: Wed Mar 2 16:27:45 2011 +0000 - - session: add set_jid function - - This is useful for being able to create a link-local session (and - therefore the meta porter) and start listening on a port without - knowing your JID properly yet. E.g. - - session = wocky_session_new_ll (NULL); - wocky_session_start (session); - - porter = wocky_session_get_porter (session); - port = wocky_meta_porter_get_port (WOCKY_META_PORTER (porter)); - - /* announce through mdns that we're listening on this port */ - - /* avahi tells us our fqdn */ - jid = avahi_now_that_we_are_connected_tell_me_my_jid (); - - wocky_session_set_jid (jid); - - Signed-off-by: Jonny Lamb - - wocky/wocky-session.c | 16 ++++++++++++++++ - wocky/wocky-session.h | 2 ++ - 2 files changed, 18 insertions(+), 0 deletions(-) - -commit de95c177539fddc613efa0fdede675e6b9b376ce -Author: Jonny Lamb -Date: Wed Mar 2 16:27:22 2011 +0000 - - session: add new_ll function for link-local sessions - - Signed-off-by: Jonny Lamb - - wocky/wocky-session.c | 26 ++++++++++++++++++++++---- - wocky/wocky-session.h | 2 ++ - 2 files changed, 24 insertions(+), 4 deletions(-) - -commit dba6805a40435d690061d24ad5c6936b32eb71ea -Author: Jonny Lamb -Date: Wed Mar 2 16:27:01 2011 +0000 - - docs: added c2s-porter to docs - - Signed-off-by: Jonny Lamb - - docs/reference/wocky-docs.sgml | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit ad2d79eb7a11acc68f0e741e3b2722339b9ca489 -Author: Jonny Lamb -Date: Wed Mar 2 16:26:50 2011 +0000 - - meta-porter: added files - - Signed-off-by: Jonny Lamb - - docs/reference/wocky-docs.sgml | 1 + - wocky/Makefile.am | 2 + - wocky/wocky-meta-porter.c | 1611 ++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-meta-porter.h | 97 +++ - 4 files changed, 1711 insertions(+), 0 deletions(-) - -commit 84edb4f0db762517eaec1790a2e6b7821f9ba332 -Author: Will Thompson -Date: Mon Mar 7 14:12:30 2011 +0000 - - Add wocky_xmpp_stanza_error_to_string() - - wocky/wocky-xmpp-error.c | 33 +++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-error.h | 1 + - 2 files changed, 34 insertions(+), 0 deletions(-) - -commit 3edc55b42a4fdc2a5829bad5e4f137118a84ba36 -Author: Will Thompson -Date: Mon Mar 7 12:05:20 2011 +0000 - - Add wocky_porter_send_iq_gerror() - - tests/wocky-porter-test.c | 95 +++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-porter.c | 57 +++++++++++++++++++++++---- - wocky/wocky-porter.h | 5 ++ - 3 files changed, 148 insertions(+), 9 deletions(-) - -commit 7d10fad8b09220baaa8a83a7897f28d1342bd68c -Author: Will Thompson -Date: Thu Mar 3 17:12:50 2011 +0000 - - build_iq_error(): clarify RFC3920 reference - - wocky/wocky-stanza.c | 21 ++++++++++++--------- - 1 files changed, 12 insertions(+), 9 deletions(-) - -commit a398a8bb8b5604b563089b459f6ffade96f66eda -Author: Will Thompson -Date: Wed Mar 2 15:03:14 2011 +0000 - - Add wocky_porter_send_iq_error() - - This new helper function makes it easier to nak an IQ. - - tests/wocky-porter-test.c | 134 +++++++++++++++++++++++++++++++++++++++++++- - wocky/wocky-porter.c | 54 ++++++++++++++++++ - wocky/wocky-porter.h | 6 ++ - 3 files changed, 190 insertions(+), 4 deletions(-) - -commit 1b5139b290641a23d0a413f352343615a7810bcc -Author: Will Thompson -Date: Mon Sep 6 13:45:26 2010 +0100 - - Add a regression test for whitespace-only bodies. - - This tests for the bug fixed in the previous commit, namely - . The first part of - the test—checking that whitespace surrounding non-whitespace isn't - stripped—already worked, but was untested. The second part was the bug - in question. - - tests/wocky-xmpp-reader-test.c | 54 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 54 insertions(+), 0 deletions(-) - -commit a9e55164d226568a9a2a85d8974e84e0783af01b -Author: Will Thompson -Date: Thu Mar 3 16:12:04 2011 +0000 - - WockyXmppReader: Don't drop whitespace-only contents - - For some reason, Wocky went out of its way to drop the contents of nodes - if they were purely whitespace. I don't see the point of this, and it - causes user-visible changes. If I send a contact a message containing - only spaces, I'd expect them to receive my message; but because the - as passed up to Gabble has no contents, Gabble doesn't show it - to the user. Arguably Gabble should show an empty message even if the - body is empty, but if we're doing that we shouldn't mangle - whitespace-only bodies. (Besides, how else am I going to do the - whitespace-only OTR handshake?) - - Fixes: - - wocky/wocky-xmpp-reader.c | 10 ---------- - 1 files changed, 0 insertions(+), 10 deletions(-) - -commit 21003231466b39ba3acb30f827f5ac5c70304f0c -Author: Will Thompson -Date: Wed Mar 2 15:01:20 2011 +0000 - - wocky_stanza_build_iq_error(): include query. - - XMPP Core says that IQ errors SHOULD include the query from the original - request. wocky_stanza_build_iq_error() should do this for us. - - tests/wocky-pubsub-service-test.c | 13 --------- - tests/wocky-stanza-test.c | 6 ++-- - wocky/wocky-stanza.c | 54 +++++++++++++++++++++++++++++++++++++ - 3 files changed, 57 insertions(+), 16 deletions(-) - -commit 98111e64216f98434dd09e7b9e1c4ed8e0ab8520 -Author: Will Thompson -Date: Wed Mar 2 15:00:30 2011 +0000 - - Rename send-iq-error test to error-while-sending-iq - - This is a clearer name for this test case, and also doesn't clash with a - test I'm adding. - - tests/wocky-porter-test.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 0a7538e718f2eb88a55374c6bb84082475ea1ddb -Author: Will Thompson -Date: Wed Mar 2 14:57:39 2011 +0000 - - wocky_node_get_first_child(): allow childless nodes. - - Previously, this function criticalled if the node passed to it had no - children. This seems unnecessary: there's a perfectly good value we can - return in this situation, namely NULL. - - wocky/wocky-node.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit a6a2caf114f9db9e9b4c2b0ce81a65e83da0080a -Author: Will Thompson -Date: Wed Mar 2 14:32:56 2011 +0000 - - stanza-test: fix error structure. - - The "more complex reply" test_build_iq_error had a broken structure: it - put the inside the query element, rather than alongside it. - - tests/wocky-stanza-test.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -commit 6b1229d4579cba10d51485d4d8d5ce6c8e4bb529 -Author: Will Thompson -Date: Wed Mar 2 13:32:09 2011 +0000 - - Add wocky_stanza_build_iq_error_va - - This is just for symmetry with wocky_stanza_build_iq_result_va(); we - don't actually need it yet. - - wocky/wocky-stanza.c | 8 ++++++++ - wocky/wocky-stanza.h | 3 +++ - 2 files changed, 11 insertions(+), 0 deletions(-) - -commit 19e6e1278c4787cca1adc72943868dcfd6165b6a -Author: Will Thompson -Date: Wed Mar 2 13:22:45 2011 +0000 - - Add wocky_node_prepend_node_tree() - - This is akin to wocky_node_add_node_tree() - - wocky/wocky-node.c | 22 ++++++++++++++++++++++ - wocky/wocky-node.h | 3 +++ - 2 files changed, 25 insertions(+), 0 deletions(-) - -commit a80461b731ef946f96102fc88cc7badd77aeca3e -Author: Will Thompson -Date: Wed Mar 2 13:22:26 2011 +0000 - - Tweak wocky_node_add_node_tree()'s docstring - - wocky/wocky-node.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 64969415af3b45ef61a75040201b42a23433e377 -Author: Will Thompson -Date: Tue Mar 1 16:26:22 2011 +0000 - - Add wocky_porter_acknowledge_iq() - - tests/wocky-porter-test.c | 149 +++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-ping.c | 11 +--- - wocky/wocky-porter.c | 41 ++++++++++++ - wocky/wocky-porter.h | 5 ++ - wocky/wocky-stanza.c | 8 +++ - wocky/wocky-stanza.h | 3 + - 6 files changed, 207 insertions(+), 10 deletions(-) - -commit 4926bcc6e2bd5845025da138925427eb69f2d7cd -Author: Will Thompson -Date: Mon Feb 28 21:52:32 2011 +0000 - - Make build_iq_{reply,error} cope with NULL ids. - - Although it violates XMPP Core, some servers send IQs without an id='' - attribute. Rather than requiring the handlers to check for the id='' - attribute, this patch makes wocky_stanza_build_iq_{reply,error} return - NULL—rather than criticalling and returning NULL—if the stanza being - replied to has no id=''. - - wocky/wocky-ping.c | 8 ++++++-- - wocky/wocky-roster.c | 7 +++++-- - wocky/wocky-stanza.c | 4 +++- - 3 files changed, 14 insertions(+), 5 deletions(-) - -commit 99018a2410a6fe72fa881f9fd8bd54dcc02c41fb -Merge: 5e748b2 87f2783 -Author: Will Thompson -Date: Thu Mar 3 17:21:25 2011 +0000 - - Merge branch 'misc' - - Reviewed-by: Jonny Lamb - -commit 87f278396aa690142ad57e3c8ccfdc8cc7abeb55 -Author: Will Thompson -Date: Thu Mar 3 16:03:30 2011 +0000 - - XmppReader: clarify handling regular nodes' attributes - - This brings this loop in line with the corresponding loop for attributes - in the stream opening. - - wocky/wocky-xmpp-reader.c | 34 ++++++++++++++++++---------------- - 1 files changed, 18 insertions(+), 16 deletions(-) - -commit b997e46000b70f2e05368eec3f52e0e183df98c5 -Author: Will Thompson -Date: Thu Mar 3 15:38:03 2011 +0000 - - XmppReader: Split _start_element_ns in half. - - This function had two entirely distinct sections: handling the stream - open, and handling the start of a normal, mid-stream element. This - suggests that they should be two functions! - - wocky/wocky-xmpp-reader.c | 179 +++++++++++++++++++++++++------------------- - 1 files changed, 102 insertions(+), 77 deletions(-) - -commit 22642c634a4f0ecc21fae76c0af049fa6277aeee -Author: Jonny Lamb -Date: Thu Mar 3 13:14:59 2011 +0000 - - caps-hash: bail on making the caps hash if parsing a dataform fails - - Also add a test! zomg! - - Signed-off-by: Jonny Lamb - - tests/wocky-caps-hash-test.c | 28 ++++++++++++++++++++++++++++ - wocky/wocky-caps-hash.c | 5 +++-- - 2 files changed, 31 insertions(+), 2 deletions(-) - -commit e0bd0226312ac485e6b635e97593502d5537d86a -Author: Jonny Lamb -Date: Thu Mar 3 11:06:35 2011 +0000 - - disco-identity: don't critical when trying to copy NULL - - Signed-off-by: Jonny Lamb - - wocky/wocky-disco-identity.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 6790d6b9e64104fdc6aea6df994ccc4117a35d92 -Author: Jonny Lamb -Date: Thu Mar 3 10:35:24 2011 +0000 - - caps-hash: display a warning when hitting an unknown data field type - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit a83447a22c090cfbf078849998a19a1979e474ea -Author: Jonny Lamb -Date: Thu Mar 3 10:28:41 2011 +0000 - - caps-hash: remove assertion that we have a FORM_TYPE field - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit df42485b6257086d177e92b326926934c1be4a68 -Author: Jonny Lamb -Date: Thu Mar 3 10:26:14 2011 +0000 - - data-form: clean up code for determining data form field types - - Thanks to William Thompson for the suggestion. - - Signed-off-by: Jonny Lamb - - wocky/wocky-data-form.c | 23 ++++++----------------- - 1 files changed, 6 insertions(+), 17 deletions(-) - -commit 55b4db92591ecc72bd5393d2ae66d84fbc8e9063 -Author: Will Thompson -Date: Mon Feb 7 14:21:13 2011 +0100 - - XmppReader: don't crash on - - Previously, if the stream header contained a 'lang' attribute with no - namespace prefix, we'd pass NULL to strcmp, and crash. - - tests/wocky-xmpp-reader-test.c | 26 ++++++++++++++++++++++++++ - wocky/wocky-xmpp-reader.c | 5 ++++- - 2 files changed, 30 insertions(+), 1 deletions(-) - -commit 33195c80d34dce29a466dabfa3bb494f7b3554ae -Author: Will Thompson -Date: Sat Feb 5 13:33:25 2011 +0100 - - Fix hypothetical NULL dereference on stream open. - - clang --analyze pointed out that, technically, 'uri' can be NULL here. - This would mean that the server sending us a stream open without a - namespace would crash us! - - So, we use wocky_strdiff rather than strcmp. - - wocky/wocky-xmpp-reader.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit f2456f33b940e5526746eff86cec41e3e967b3ef -Author: Will Thompson -Date: Mon Feb 7 14:03:14 2011 +0100 - - Clarify parsing stream opening - - wocky/wocky-xmpp-reader.c | 50 +++++++++++++++++++++++--------------------- - 1 files changed, 26 insertions(+), 24 deletions(-) - -commit 8136e1381e660088800d0fd8538c518c84f77618 -Author: Will Thompson -Date: Mon Feb 7 13:51:58 2011 +0100 - - Add more assertions to stanza build interpreter - - clang complained that we were dereferencing 'stack', which may be NULL. - It was right: previously we could get into this situation with only a - warning before a NULL pointer dereference. This patch adds assertions at - the points where we would crash anyway. - - wocky/wocky-node.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 09eb96d7a0f8ab60ec08c293f3d3bdca10355833 -Author: Will Thompson -Date: Mon Feb 7 13:35:12 2011 +0100 - - auth: Remove unneeded assignments and variables. - - These were found by the excellent clang --analyze. - - wocky/wocky-jabber-auth.c | 4 ---- - wocky/wocky-sasl-scram.c | 2 +- - 2 files changed, 1 insertions(+), 5 deletions(-) - -commit d855ca88c2bde3c0bf0c01d11117475f46d41de9 -Author: Will Thompson -Date: Sat Feb 5 15:18:02 2011 +0100 - - Fix overriding type='' when creating error nodes. - - Wocky has support for turning GErrors into nodes; using - wocky_xmpp_error_register_domain() you can define your own specializations - of standard stanza errors. By default the standard type='' for the - ‘parent’ stanza error is used, but you can override this when - registering a mapping. - - However, the code to generate error nodes didn't actually use the - overridden type. (clang --analyze noticed this). - - (We don't actually use this code, but …) - - wocky/wocky-xmpp-error.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 70496f785fefe6e5593c51f8c1b3d2ab79fa0c73 -Author: Will Thompson -Date: Fri Feb 4 13:27:02 2011 +0100 - - wocky_caps_cache_dup_shared(): correct docs - - The docstring refers to an argument that doesn't exist on this function. - - wocky/wocky-caps-cache.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 860185ca57e338aa1954ecb723925b84ed7b191a -Author: Jonny Lamb -Date: Mon Feb 28 13:58:55 2011 +0000 - - ll-connector: wait for features to be sent before continuing - - Signed-off-by: Jonny Lamb - - wocky/wocky-ll-connector.c | 29 +++++++++++++++++++++++++---- - 1 files changed, 25 insertions(+), 4 deletions(-) - -commit 5bafc9b5c4a762c3835a83d5eeae8dd44ef779a9 -Author: Jonny Lamb -Date: Fri Feb 25 14:55:11 2011 +0000 - - ll-connector: added new files - - Signed-off-by: Jonny Lamb - - wocky/Makefile.am | 2 + - wocky/wocky-ll-connector.c | 453 ++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-ll-connector.h | 92 +++++++++ - 3 files changed, 547 insertions(+), 0 deletions(-) - -commit d9e5561e60485ff61c10715cb662998326fbc79c -Author: Jonny Lamb -Date: Fri Feb 25 14:34:41 2011 +0000 - - connection-factory: add files - - Perhaps this should be called ll-connection-factory, to emphasize the - link-local emphasis? - - Signed-off-by: Jonny Lamb - - wocky/Makefile.am | 2 + - wocky/wocky-connection-factory.c | 266 ++++++++++++++++++++++++++++++++++++++ - wocky/wocky-connection-factory.h | 89 +++++++++++++ - wocky/wocky-debug.c | 1 + - wocky/wocky-debug.h | 1 + - 5 files changed, 359 insertions(+), 0 deletions(-) - -commit 27808b494f65ae5fdc8b97e05b58032dd27068b4 -Author: Jonny Lamb -Date: Fri Feb 25 14:19:52 2011 +0000 - - session: rename new to new_with_connection - - Signed-off-by: Jonny Lamb - - tests/wocky-pubsub-node-test.c | 4 ++-- - tests/wocky-pubsub-service-test.c | 2 +- - tests/wocky-roster-test.c | 2 +- - tests/wocky-session-test.c | 6 +++--- - tests/wocky-test-helper.c | 4 ++-- - wocky/wocky-session.c | 2 +- - wocky/wocky-session.h | 2 +- - 7 files changed, 11 insertions(+), 11 deletions(-) - -commit 90e9a9e664d7878fa7a169d85ee9b58eac325c62 -Author: Jonny Lamb -Date: Fri Feb 25 14:18:23 2011 +0000 - - contact-factory: add support for LL contacts - - Signed-off-by: Jonny Lamb - - wocky/wocky-contact-factory.c | 121 ++++++++++++++++++++++++++++++++++++++++- - wocky/wocky-contact-factory.h | 14 +++++ - 2 files changed, 133 insertions(+), 2 deletions(-) - -commit c2fada22e35de44101faa8e7eaf0b31b2a46b6d0 -Author: Jonny Lamb -Date: Fri Feb 25 14:14:35 2011 +0000 - - ll-contact: added new files - - Signed-off-by: Jonny Lamb - - wocky/Makefile.am | 2 + - wocky/wocky-ll-contact.c | 288 ++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-ll-contact.h | 81 +++++++++++++ - wocky/wocky-types.h | 1 + - 4 files changed, 372 insertions(+), 0 deletions(-) - -commit 93ef951516b1339a6417014f1d4b87f25aed9bea -Author: Jonny Lamb -Date: Fri Feb 25 14:06:51 2011 +0000 - - stanza: fix argument indentation - - Signed-off-by: Jonny Lamb - - wocky/wocky-stanza.c | 19 ++++++++++--------- - 1 files changed, 10 insertions(+), 9 deletions(-) - -commit 1f9ab7cd3614534cbc1bcbd53e4f025f58ee5f5e -Author: Jonny Lamb -Date: Fri Feb 25 14:05:51 2011 +0000 - - stanza: add build_to_contact function - - Signed-off-by: Jonny Lamb - - wocky/wocky-stanza.c | 26 ++++++++++++++++++++++++++ - wocky/wocky-stanza.h | 4 ++++ - 2 files changed, 30 insertions(+), 0 deletions(-) - -commit 342fee05e569ddc80b0a5de51f0d537aa4c0acb5 -Author: Jonny Lamb -Date: Fri Feb 25 14:04:59 2011 +0000 - - stanza: associate a WockyContact with each stanza - - Signed-off-by: Jonny Lamb - - wocky/wocky-stanza.c | 41 +++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-stanza.h | 6 ++++++ - 2 files changed, 47 insertions(+), 0 deletions(-) - -commit b459853883dd1d4c3c47c42647aebe305200fce5 -Author: Jonny Lamb -Date: Fri Feb 25 14:03:45 2011 +0000 - - stanza: make dispose and finalize static - - Signed-off-by: Jonny Lamb - - wocky/wocky-stanza.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 13191d4866acea9607c3c29093a40c774878d79f -Author: Jonny Lamb -Date: Fri Feb 25 13:58:42 2011 +0000 - - resource-contact: implement dup_jid - - Signed-off-by: Jonny Lamb - - wocky/wocky-resource-contact.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit 68d21d640869d57a9720eec76fe02c08f13da880 -Author: Jonny Lamb -Date: Fri Feb 25 13:58:29 2011 +0000 - - bare-contact: implement dup_jid - - Signed-off-by: Jonny Lamb - - wocky/wocky-bare-contact.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit f48ced6ecdb775763fbf8adcd59130540071a756 -Author: Jonny Lamb -Date: Fri Feb 25 13:58:13 2011 +0000 - - contact: add dup_jid function - - Signed-off-by: Jonny Lamb - - wocky/wocky-contact.c | 11 +++++++++++ - wocky/wocky-contact.h | 6 ++++++ - 2 files changed, 17 insertions(+), 0 deletions(-) - -commit c71df0e0b513dab7f291d6152a9f7f6bd0eca456 -Author: Jonny Lamb -Date: Fri Feb 25 13:51:08 2011 +0000 - - utils: add implement_finish_return_pointer macro - - No copy function. - - Signed-off-by: Jonny Lamb - - wocky/wocky-utils.h | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit 5e748b2edcba058a40e547656cd898f56ae48784 -Author: Jonny Lamb -Date: Tue Mar 1 13:45:58 2011 +0000 - - porter: add reference to from_server register variant - - Signed-off-by: Jonny Lamb - - wocky/wocky-porter.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 71c7aa98ef45f8dcf97492dedc8886a4384837a7 -Author: Jonny Lamb -Date: Tue Mar 1 13:24:16 2011 +0000 - - porter: fix gtk-doc of @from in all from register variants - - Signed-off-by: Jonny Lamb - - wocky/wocky-porter.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 294396b441b0c6c628a8d3f421c118ba732eb692 -Author: Jonny Lamb -Date: Tue Mar 1 13:24:03 2011 +0000 - - porter: move from_server register variant to c2s porter - - Signed-off-by: Jonny Lamb - - tests/wocky-porter-test.c | 3 +- - wocky/wocky-c2s-porter.c | 145 ++++++++++++++++++++++++++++++++++++++-- - wocky/wocky-c2s-porter.h | 27 ++++++++ - wocky/wocky-porter.c | 162 +-------------------------------------------- - wocky/wocky-porter.h | 36 ---------- - wocky/wocky-roster.c | 4 +- - 6 files changed, 173 insertions(+), 204 deletions(-) - -commit dd4e2a24438739475537bff267a66175ca2e8227 -Author: Jonny Lamb -Date: Tue Mar 1 08:25:21 2011 +0000 - - porter: use g_once_init_enter instead of a initialized gboolean - - Signed-off-by: Jonny Lamb - - wocky/wocky-porter.c | 182 +++++++++++++++++++++++++------------------------- - 1 files changed, 91 insertions(+), 91 deletions(-) - -commit 39b1a9431f4d96f8b8daa836ac6fbf848005b787 -Author: Jonny Lamb -Date: Tue Mar 1 08:25:12 2011 +0000 - - porter: rename _stanza variants to _by_stanza - - Signed-off-by: Jonny Lamb - - wocky/wocky-c2s-porter.c | 18 +++++++++--------- - wocky/wocky-porter.c | 30 +++++++++++++++--------------- - wocky/wocky-porter.h | 12 ++++++------ - 3 files changed, 30 insertions(+), 30 deletions(-) - -commit aed067fca404d2a70b871dab90201cf5540388da -Author: Jonny Lamb -Date: Tue Mar 1 08:14:02 2011 +0000 - - {,c2s-}porter: fix copyright years - - Signed-off-by: Jonny Lamb - - wocky/wocky-c2s-porter.c | 2 +- - wocky/wocky-c2s-porter.h | 4 ++-- - wocky/wocky-porter.c | 2 +- - wocky/wocky-porter.h | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -commit 4577a263f7c8548913691a6fc7b014255051e209 -Author: Jonny Lamb -Date: Mon Feb 28 14:34:42 2011 +0000 - - porter: fix typo in ::sending gtk-doc - - Signed-off-by: Jonny Lamb - - wocky/wocky-porter.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0474633d7a79d33235388962bf76cf3845f2d27b -Author: Jonny Lamb -Date: Mon Feb 28 14:28:51 2011 +0000 - - porter: make sure register_handler_*_stanza functions take good stanzas - - Signed-off-by: Jonny Lamb - - wocky/wocky-porter.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 668c72d36b8698283d3be5ef2e7f9f8e81609457 -Author: Jonny Lamb -Date: Mon Feb 28 14:27:33 2011 +0000 - - porter: move c2s properties and signals to the interface - - Signed-off-by: Jonny Lamb - - wocky/wocky-c2s-porter.c | 129 +++++----------------------------------------- - wocky/wocky-porter.c | 105 +++++++++++++++++++++++++++++++++++++ - 2 files changed, 118 insertions(+), 116 deletions(-) - -commit 2f308d251ee95504e05b17c98799a3ac131c24bc -Author: Jonny Lamb -Date: Mon Feb 28 08:58:06 2011 +0000 - - wocky: fix header guard comment - - Signed-off-by: Jonny Lamb - - wocky/wocky.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0e5371a5abae18f737b18670fcd89d61a59e29f1 -Author: Jonny Lamb -Date: Mon Feb 28 08:55:51 2011 +0000 - - porter: turn the porter into an interface and implement it in a C2S porter - - This will be a pretty horrible patch, soz. - - Signed-off-by: Jonny Lamb - - tests/wocky-porter-test.c | 4 +- - wocky/Makefile.am | 2 + - wocky/wocky-c2s-porter.c | 1896 ++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-c2s-porter.h | 75 ++ - wocky/wocky-porter.c | 1930 +++++---------------------------------------- - wocky/wocky-porter.h | 178 +++-- - wocky/wocky-session.c | 3 +- - 7 files changed, 2291 insertions(+), 1797 deletions(-) - -commit 95dab3a1aa7a0e0823ca7bf175d1a84440031450 -Author: Jonny Lamb -Date: Fri Feb 25 16:00:25 2011 +0000 - - porter: add register_handler_from{,_anyone,_server}_stanza functions - - Also small documentation fixes in the _va functions. - - Signed-off-by: Jonny Lamb - - wocky/wocky-porter.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++---- - wocky/wocky-porter.h | 27 ++++++++ - 2 files changed, 192 insertions(+), 12 deletions(-) - -commit 035cf150fdf4558930ce88ca393f6a5d360c1b66 -Author: Jonny Lamb -Date: Mon Feb 14 13:15:16 2011 +0000 - - wocky: don't use absolute paths in enumtypes headers - - Signed-off-by: Jonny Lamb - - wocky/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bed7014377bb94e9933063c346c86c2989df5e3c -Merge: 7adf35f 3aab9dd -Author: Will Thompson -Date: Fri Feb 25 15:25:15 2011 +0000 - - Merge branch 'register-handler-from' - - Reviewed-by: Jonny Lamb - -commit 7adf35f585b92ac1ee1d562b36473dcfc4433966 -Merge: 913dc10 6a13743 -Author: Will Thompson -Date: Fri Feb 25 13:31:03 2011 +0000 - - Merge remote-tracking branch 'jonny/blow-away-corrupt-caps-caches' - - Reviewed-by: Simon McVittie - Fixes: - -commit 3aab9dd609906b62247c32621e3b93186b69bc44 -Author: Will Thompson -Date: Mon Feb 7 21:07:27 2011 +0000 - - Porter: make sender matching for handlers explicit. - - Previously, passing from=NULL to wocky_porter_register_handler() made - the handler match stanzas with any sender. Unfortunately, this was - confused in a few places in Gabble—and once in WockyRoster, complete - with a FIXME—with matching messages from the server, which should have - no from='' attribute, or your own bare or full JID. - - tests/wocky-pep-service-test.c | 4 +- - tests/wocky-ping-test.c | 4 +- - tests/wocky-porter-test.c | 246 +++++++++++++++++++---- - tests/wocky-pubsub-node-test.c | 28 ++-- - tests/wocky-pubsub-service-test.c | 20 +- - tests/wocky-roster-test.c | 68 +++--- - wocky/wocky-muc.c | 4 +- - wocky/wocky-pep-service.c | 6 +- - wocky/wocky-ping.c | 4 +- - wocky/wocky-porter.c | 400 +++++++++++++++++++++++++++++++------ - wocky/wocky-porter.h | 40 ++++- - wocky/wocky-pubsub-service.c | 2 +- - wocky/wocky-roster.c | 14 +- - 13 files changed, 650 insertions(+), 190 deletions(-) - -commit 342f820a211b01c1fba6e264ced8e71a8032ceea -Author: Will Thompson -Date: Sat Feb 5 15:44:03 2011 +0100 - - Porter: refactor matching stanzas from the server. - - wocky/wocky-porter.c | 14 +++++++++++--- - 1 files changed, 11 insertions(+), 3 deletions(-) - -commit 9cc779ecb64823357c20f53072231a0616ec9744 -Author: Will Thompson -Date: Sat Feb 5 04:21:59 2011 +0100 - - Porter: fix matching handlers from JIDs sans node part - - Previously, registering a handler for a JID with no node part was - accidentally equivalent to registering a handler with from=NULL; that - is, we'd erroneously pass stanzas from *any* server to the handler - function even if it explicitly specified a JID which was just a domain, - as opposed to a JID with an '@' sign in it. - - This patch corrects this error, and adds a simple regression test. - - tests/wocky-porter-test.c | 59 +++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-porter.c | 4 +-- - 2 files changed, 60 insertions(+), 3 deletions(-) - -commit 95ff513fe1f5252a7b7fa4af338fc793b4775ce2 -Author: Will Thompson -Date: Fri Feb 4 18:03:19 2011 +0100 - - Add wocky_porter_register_handler_va(). - - wocky/wocky-porter.c | 80 ++++++++++++++++++++++++++++++++++++++++---------- - wocky/wocky-porter.h | 9 +++++ - 2 files changed, 73 insertions(+), 16 deletions(-) - -commit 913dc10f79a5717ee2995056e1a2c07425e29ebc -Author: Jonny Lamb -Date: Fri Feb 4 15:37:37 2011 +0000 - - node: add set_attributes function - - Signed-off-by: Jonny Lamb - - wocky/wocky-node.c | 30 ++++++++++++++++++++++++++++++ - wocky/wocky-node.h | 3 +++ - 2 files changed, 33 insertions(+), 0 deletions(-) - -commit 58d08be6bdbe119add2a6fb0ebe2298bb383c857 -Author: Jonny Lamb -Date: Fri Feb 4 11:15:12 2011 +0000 - - caps-hash: allow @dataforms be NULL - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 19a7d037cc4e1be0666e1f6528e09a58490d0524 -Author: Jonny Lamb -Date: Fri Feb 4 11:09:06 2011 +0000 - - caps-hash-test: add a complex sorting test - - Signed-off-by: Jonny Lamb - - tests/wocky-caps-hash-test.c | 161 +++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 159 insertions(+), 2 deletions(-) - -commit 4386247cefa33464c7730c172bfe92ac6b0a4d3e -Author: Jonny Lamb -Date: Fri Feb 4 11:08:40 2011 +0000 - - caps-hash: fix creating hash from node with multiple data forms - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bfd5f5383dc9288e2f1e9ecaab0fdce846dc6553 -Author: Jonny Lamb -Date: Fri Feb 4 11:08:25 2011 +0000 - - caps-hash: remove silly free function - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 24 +++++++----------------- - 1 files changed, 7 insertions(+), 17 deletions(-) - -commit 8ff62bd7353593783f5c59f5b07720fc9ac1a146 -Author: Jonny Lamb -Date: Fri Feb 4 10:42:08 2011 +0000 - - caps-hash: clarify dataforms_cmp - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 20 ++++++-------------- - 1 files changed, 6 insertions(+), 14 deletions(-) - -commit 9955dd81eba5477cecc2f321547dbc954971c8df -Author: Jonny Lamb -Date: Fri Feb 4 09:50:15 2011 +0000 - - caps-hash: also sort dataform fields - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 10 ++++++++-- - wocky/wocky-data-form.c | 9 +++++++++ - wocky/wocky-data-form.h | 3 +++ - 3 files changed, 20 insertions(+), 2 deletions(-) - -commit be9f692fd9e535b405e6835c17a9d8141d884cf7 -Author: Jonny Lamb -Date: Fri Feb 4 09:49:18 2011 +0000 - - caps-hash: fix typo in dataform sorting code - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1905ed28823b119eb0d290cc9a1ed79a50712963 -Author: Jonny Lamb -Date: Thu Feb 3 11:33:56 2011 +0000 - - caps-hash: ensure the features, identities and dataforms are sorted - - ...and add a test for it. - - Signed-off-by: Jonny Lamb - - tests/wocky-caps-hash-test.c | 53 ++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-caps-hash.c | 47 +++++++++++++++++++++++++++++-------- - 2 files changed, 90 insertions(+), 10 deletions(-) - -commit 6a1374307087ae19db8df3059ac8c1057290e3e8 -Author: Will Thompson -Date: Wed Dec 1 19:16:39 2010 +0000 - - CapsCache: remove an unneeded assertion. - - If caps_cache_open() returns TRUE but self->priv->db is NULL, the worst - that happens is that we don't use a caps cache this session. Besides, by - inspection that will never happen, except if sqlite3_open is broken, in - which case we're dead a long time ago. - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-cache.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit d11983ffe837e912a0580a6447a1dc7504dccad7 -Author: Will Thompson -Date: Thu Nov 25 17:44:00 2010 +0000 - - CapsCache: don't potentially double-free statement - - caps_cache_bind_*() call sqlite3_finalize() on the statement you pass in - if binding fails. So we should not 'goto OUT' (which also finalizes the - statement) when they fail. - - Note that binding a query parameter failing indicates a programming - error, not a runtime error. Thus, this is a pretty academic fix. - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-cache.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit f591217805cdb3eccfaaec8a8c8899d1f8ddf55a -Author: Will Thompson -Date: Thu Nov 25 17:43:43 2010 +0000 - - CapsCache: add a satity check to prepare() - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-cache.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit cfd0c2def4833dc6c1849f452f00e712bc604a11 -Author: Will Thompson -Date: Thu Jun 24 12:03:40 2010 +0100 - - Blow away corrupt caps caches - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-cache.c | 75 ++++++++++++++++++++++++++++++++++----------- - 1 files changed, 56 insertions(+), 19 deletions(-) - -commit 863a47e086152ed72df3e59dec69bfb9266014c4 -Author: Jonny Lamb -Date: Wed Jan 26 13:06:40 2011 +0000 - - disco-identity: add WOCKY_TYPE_... macro - - Signed-off-by: Jonny Lamb - - wocky/wocky-disco-identity.h | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit efa313340ff1b5ed53030b8d23057f3e59e9a7df -Author: Jonny Lamb -Date: Wed Jan 26 10:31:16 2011 +0000 - - data-form: fix default type and text-multi detection - - The type defaults to text-single regardless of the existance of a - child. - - Signed-off-by: Jonny Lamb - - wocky/wocky-data-form.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit cbc8ff8fa5d8acedeadb0ba18f313711ce661a47 -Author: Jonny Lamb -Date: Wed Jan 26 09:47:10 2011 +0000 - - caps-hash: turn caps_hash_compute into wocky_caps_hash_compute_from_lists - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 18 +++++++++++++++--- - wocky/wocky-caps-hash.h | 6 +++++- - 2 files changed, 20 insertions(+), 4 deletions(-) - -commit 837b31eeef93f1c46692a76befa7f600c6594e65 -Author: Jonny Lamb -Date: Wed Jan 26 09:32:48 2011 +0000 - - caps-hash: support multiple data forms - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 77 ++++++++++++++++++++++++++++++++++++---------- - 1 files changed, 60 insertions(+), 17 deletions(-) - -commit aac6f882e8bab79e51e20bf0fbee80ae86f9fd98 -Author: Jonny Lamb -Date: Wed Jan 26 09:30:19 2011 +0000 - - data-form: add new_from_node function - - Signed-off-by: Jonny Lamb - - wocky/wocky-data-form.c | 30 ++++++++++++++++++++++++------ - wocky/wocky-data-form.h | 3 +++ - 2 files changed, 27 insertions(+), 6 deletions(-) - -commit 578a1b74e9743d7a60373fb5074924a3108f49a0 -Author: Jonny Lamb -Date: Wed Jan 26 09:17:08 2011 +0000 - - caps-hash: removed "wocky does not do..." comment - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 5de07e3513f662160233165712fe5b9358f9a676 -Author: Jonny Lamb -Date: Wed Jan 26 09:15:01 2011 +0000 - - caps-hash: fixed typo - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2270ffc468ae4358144f10a0f8c2b3423b0d1ba8 -Author: Jonny Lamb -Date: Wed Jan 26 09:14:21 2011 +0000 - - disco-identity: add cmp function - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 15 +++++---------- - wocky/wocky-disco-identity.c | 30 ++++++++++++++++++++++++++++++ - wocky/wocky-disco-identity.h | 2 ++ - 3 files changed, 37 insertions(+), 10 deletions(-) - -commit 27de40f87c5620f3cbf27ececfa30ccbe66b8124 -Author: Jonny Lamb -Date: Tue Jan 25 17:35:24 2011 +0000 - - disco-identity: fix header guard - - Signed-off-by: Jonny Lamb - - wocky/wocky-disco-identity.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit ca4e3f7ad0a6ef89b641f694258f0baf4fad7e7c -Author: Jonny Lamb -Date: Tue Jan 25 17:32:49 2011 +0000 - - caps-hash: fix year - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 2 +- - wocky/wocky-caps-hash.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit b388359cecab1c354580fa98561fcff2534180c0 -Author: Jonny Lamb -Date: Tue Jan 25 17:31:50 2011 +0000 - - disco-identity: style trivia - - Signed-off-by: Jonny Lamb - - wocky/wocky-disco-identity.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 521cc33c40ec568c54dc2ad3a46d19a6596e2d59 -Author: Jonny Lamb -Date: Tue Jan 25 17:28:21 2011 +0000 - - disco-identity: remove getters - - Signed-off-by: Jonny Lamb - - wocky/wocky-disco-identity.c | 56 ------------------------------------------ - wocky/wocky-disco-identity.h | 10 +++---- - 2 files changed, 4 insertions(+), 62 deletions(-) - -commit 37f9038739938e8a6f2a339b81a34a32137cd7cd -Author: Jonny Lamb -Date: Tue Jan 25 17:02:40 2011 +0000 - - caps-cache: use WockyDataForm to parse the data forms - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 215 +++++++++-------------------------------------- - 1 files changed, 41 insertions(+), 174 deletions(-) - -commit 0f44eccae95249ecaec69715c380eb9707f24496 -Author: Jonny Lamb -Date: Tue Jan 25 16:42:56 2011 +0000 - - data-form: detect whether we're actually text-multi - - We need this for this: - - http://xmpp.org/extensions/xep-0115.html#ver-gen-complex - - Signed-off-by: Jonny Lamb - - wocky/wocky-data-form.c | 22 ++++++++++++++++++++-- - 1 files changed, 20 insertions(+), 2 deletions(-) - -commit 9e5f94f4d87818126ca69988689ef66ba7d4dace -Author: Jonny Lamb -Date: Tue Jan 25 15:54:26 2011 +0000 - - data-form: allow type="result" as well as type="form" - - Signed-off-by: Jonny Lamb - - wocky/wocky-data-form.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 2f3f9c890a76d630f72991f071819cac8ebf3fb9 -Author: Jonny Lamb -Date: Tue Jan 25 14:34:10 2011 +0000 - - tests: add caps hash test - - ...from Gabble. - - Signed-off-by: Jonny Lamb - - tests/Makefile.am | 9 +++- - tests/wocky-caps-hash-test.c | 114 ++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 121 insertions(+), 2 deletions(-) - -commit 9e15a33f9c8ac94448b33d7088f7a93cef8121a6 -Author: Jonny Lamb -Date: Tue Jan 25 14:33:33 2011 +0000 - - node: add attribute build tag for wocky_stanza_build - - Signed-off-by: Jonny Lamb - - wocky/wocky-node.c | 9 +++++++++ - wocky/wocky-node.h | 3 ++- - 2 files changed, 11 insertions(+), 1 deletions(-) - -commit f3c69e238ea1683a88978ac4c59031edd8af0870 -Author: Jonny Lamb -Date: Tue Jan 25 10:54:23 2011 +0000 - - disco-identity: make a boxed type - - Signed-off-by: Jonny Lamb - - wocky/wocky-disco-identity.c | 3 +++ - wocky/wocky-disco-identity.h | 4 +++- - 2 files changed, 6 insertions(+), 1 deletions(-) - -commit a37948c77254c53fc830e527c3d6718e91df7ba9 -Author: Jonny Lamb -Date: Tue Jan 25 10:54:07 2011 +0000 - - disco-identity: rename _get_type to _get_identity_type - - Signed-off-by: Jonny Lamb - - wocky/wocky-disco-identity.c | 4 ++-- - wocky/wocky-disco-identity.h | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit 1efddcfc52f46202a516c97c754938528f635d83 -Author: Jonny Lamb -Date: Mon Jan 24 11:29:49 2011 +0000 - - disco-identity: add more documentation - - Signed-off-by: Jonny Lamb - - docs/reference/wocky-docs.sgml | 1 + - wocky/wocky-disco-identity.c | 87 ++++++++++++++++++++++++++++++++++++---- - wocky/wocky-disco-identity.h | 11 ++++- - 3 files changed, 89 insertions(+), 10 deletions(-) - -commit 72657801003469feab10665b32a582fbc6c08218 -Author: Jonny Lamb -Date: Mon Jan 24 11:26:38 2011 +0000 - - disco-identity: add some WARN_UNUSED_RESULTs - - Signed-off-by: Jonny Lamb - - wocky/wocky-disco-identity.h | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit 704ce8ef6aac173f67164ab23e216cfd2afe5e2b -Author: Jonny Lamb -Date: Mon Jan 24 10:57:05 2011 +0000 - - caps-hash: add documentation - - Signed-off-by: Jonny Lamb - - docs/reference/wocky-docs.sgml | 1 + - wocky/wocky-caps-hash.c | 28 ++++++++++++++++------------ - wocky/wocky-caps-hash.h | 2 +- - 3 files changed, 18 insertions(+), 13 deletions(-) - -commit c08c0f7c002a8a1755f198367ced6858bdbf2253 -Author: Jonny Lamb -Date: Mon Jan 24 10:50:35 2011 +0000 - - caps-cache: remove copy-paste error in documentation - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-cache.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 339635a4b2129f585ae720dde3af8ccfc81730ea -Author: Jonny Lamb -Date: Fri Jan 21 16:34:53 2011 +0000 - - caps-hash: use wocky_node convenience functions - - WockyNode knows that xml:lang and xmlns attributes mean a bit more - than an attribute with those names. - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 469d81f9f36fb35ab2947eaadbc452bf00b6418a -Author: Jonny Lamb -Date: Fri Jan 21 16:34:42 2011 +0000 - - caps-hash: fix typo - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit dbcc556adcf59612ee231ab410ff6115b83c0d6f -Author: Jonny Lamb -Date: Thu Jan 20 14:13:39 2011 +0000 - - caps-hash: make build in Wocky and rename s/gabble/wocky/g - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 218 +++++++++++++++++------------------------------ - wocky/wocky-caps-hash.h | 10 +-- - 2 files changed, 81 insertions(+), 147 deletions(-) - -commit 8ebef4c221f56c55d175af880b1bda99cf0efcfe -Author: Jonny Lamb -Date: Thu Jan 20 14:13:29 2011 +0000 - - disco-identity: add from Gabble - - Signed-off-by: Jonny Lamb - - wocky/Makefile.am | 4 + - wocky/wocky-disco-identity.c | 160 ++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-disco-identity.h | 58 +++++++++++++++ - 3 files changed, 222 insertions(+), 0 deletions(-) - -commit 2c648be4944d3f65032fe2c5ad96ddcf58aaf852 -Author: Jonny Lamb -Date: Thu Jan 20 13:34:10 2011 +0000 - - caps-hash: add caps-hash.[ch] from gabble - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-hash.c | 439 +++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-caps-hash.h | 32 ++++ - 2 files changed, 471 insertions(+), 0 deletions(-) - -commit b3812fad955afdbf21602039035ae9c377e99d5d -Author: Jonny Lamb -Date: Tue Jan 18 11:36:38 2011 +0000 - - caps-cache: store caps cache in .cache/caps/caps-cache.db - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-cache.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit cc4e726670d37ecbe68069e2b8af79454bedf7e4 -Author: Jonny Lamb -Date: Tue Jan 18 08:59:19 2011 +0000 - - caps-cache: add documentation - - Signed-off-by: Jonny Lamb - - docs/reference/wocky-docs.sgml | 1 + - wocky/wocky-caps-cache.c | 60 ++++++++++++++++++++++++++++++++++++++-- - wocky/wocky-caps-cache.h | 2 +- - 3 files changed, 59 insertions(+), 4 deletions(-) - -commit 27c0a93f851917334ce0177daf3eadfc0ac7a007 -Author: Jonny Lamb -Date: Tue Jan 18 08:58:27 2011 +0000 - - caps-cache: stop declaring a non-existent get_singleton function - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-cache.h | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit 3f42c9a47510557b718f5c5e162f3bb34032e1fe -Author: Jonny Lamb -Date: Tue Jan 18 08:56:51 2011 +0000 - - wocky: link to sqlite3 - - Signed-off-by: Jonny Lamb - - configure.ac | 10 +++++++--- - docs/reference/Makefile.am | 4 ++-- - wocky/Makefile.am | 4 ++-- - 3 files changed, 11 insertions(+), 7 deletions(-) - -commit ac5467999fd4d202bf69d9d41899fd142f935e24 -Author: Jonny Lamb -Date: Tue Jan 18 08:27:39 2011 +0000 - - caps-cache: typedef object and class structs - - ... for consistency. - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-cache.h | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit 58e062587ccb4940420a0e52817569cae9d193dd -Author: Jonny Lamb -Date: Tue Jan 18 08:24:42 2011 +0000 - - caps-cache: misc. style changes - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-cache.c | 52 ++++++++++++++++++++++----------------------- - wocky/wocky-caps-cache.h | 24 +++++++++----------- - 2 files changed, 36 insertions(+), 40 deletions(-) - -commit d97129d0ab8ad1abd72a3d4f80ab993be7e0db72 -Author: Jonny Lamb -Date: Tue Jan 18 08:24:23 2011 +0000 - - caps-cache: don't save caps cache into a telepathy directory - - Signed-off-by: Jonny Lamb - - wocky/wocky-caps-cache.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8b19a91ed6b0bf4d6ccfbd1425c36ed08895c01e -Author: Jonny Lamb -Date: Tue Jan 18 08:20:17 2011 +0000 - - caps-cache: copy over from Gabble with s/gabble/wocky/g - - Signed-off-by: Jonny Lamb - - wocky/Makefile.am | 2 + - wocky/wocky-caps-cache.c | 716 ++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-caps-cache.h | 88 ++++++ - wocky/wocky-debug.c | 1 + - wocky/wocky-debug.h | 1 + - 5 files changed, 808 insertions(+), 0 deletions(-) - -commit 6e64eff081fa59ce533728b2b1838cf0c798d968 -Author: Will Thompson -Date: Mon Jan 10 11:12:42 2011 +0000 - - Muc: correctly parse the 'composing' chat state. - - In 6b6f09d97f91de66c11a4b6a7e28222e8dc911f6 I replaced a lookup table - for parsing these with GEnum. What I (and the reviewer) didn't notice is - that the WockyMucMsgState enum doesn't actually correspond to the names - used in XEP-0085! Since 'typing' isn't a thing in XMPP, the 'composing' - state was misparsed. - - wocky/wocky-muc.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 14bdb7c316028b9df67ebe6ad2e9f729d024ff74 -Author: Sjoerd Simons -Date: Fri Dec 24 20:54:53 2010 +0100 - - DEBUG once per mainloop iteration is bad, remove - - wocky/wocky-heartbeat-source.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 8db5c13fe1895625a80d66ce2aef376cae6e9f8f -Author: Nicolas Dufresne -Date: Tue Sep 28 18:41:58 2010 -0400 - - Add assertions to ensure async resources are freed - - Add assertions to make sure async resources GCancellable and - GSimpleAsyncResult are freed before a new async calls are attempted. - - wocky/wocky-openssl.c | 1 + - wocky/wocky-porter.c | 4 ++++ - wocky/wocky-tls-connector.c | 1 + - wocky/wocky-tls.c | 1 + - 4 files changed, 7 insertions(+), 0 deletions(-) - -commit 6c92f00e745f65e05bc8379410ef096be2699b77 -Author: Nicolas Dufresne -Date: Mon Sep 27 18:28:40 2010 -0400 - - Fix wocky_implement_finish_*() macro - - * Fixed missing scope (G_STMT_START/G_STMT_END) and missing parenthesis - * Don't call copy_func if the result is NULL (enabling use of g_object_ref - as copy_func). - * Added missing ; now required when those macro are called. - - wocky/wocky-pubsub-node.c | 12 ++++---- - wocky/wocky-pubsub-service.c | 2 +- - wocky/wocky-utils.h | 66 ++++++++++++++++++++++++++--------------- - 3 files changed, 49 insertions(+), 31 deletions(-) - -commit f38f22015aa144614c2d7295b59af3ae017bf313 -Author: Will Thompson -Date: Wed Dec 15 19:32:47 2010 +0000 - - Heartbeat: safely stop polling iphb FD. - - wocky_heartbeat_source_degrade() is also used to clean up in - wocky_heartbeat_source_finalize(). By the time the latter is called, - WockyHeartbeatSource (which is-a GSource) has been destroyed in the - GSource sense, which implicitly removes all poll FDs. So we need to - guard our call to g_source_remove_poll with a check for whether we've - been destroyed or not. - - We could alternatively have two different cleanup functions, one for - when we're degrading and one for when we're being destroyed, but I think - this is simpler. - - wocky/wocky-heartbeat-source.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit 5a119a61e8e19741bd5a26333f4f54c12296943e -Author: Will Thompson -Date: Tue Aug 17 16:38:29 2010 +0100 - - MUC: only include when joining. - - Fixes: - - wocky/wocky-muc.c | 15 +++++++-------- - wocky/wocky-muc.h | 3 +-- - 2 files changed, 8 insertions(+), 10 deletions(-) - -commit 51dd1729f561058153e1a98f03be24c0228e5747 -Author: Will Thompson -Date: Tue Aug 17 16:27:48 2010 +0100 - - Inline wocky_muc_send_presence() - - It's only used in one place for now, and that one place is going to have - to use wocky_muc_create_presence() directly anyway when the latter - doesn't add the node. - - wocky/wocky-muc.c | 19 ++++--------------- - 1 files changed, 4 insertions(+), 15 deletions(-) - -commit e8c68ba002bf94862a94e90e29fa223b05815a74 -Author: Will Thompson -Date: Sat Nov 20 11:38:48 2010 +0000 - - connector-test: fix a typo of 'sasl' - - /connector/problem/sas/no-mechanisms should read - /connector/problem/sasl/no-mechanisms. - - tests/wocky-connector-test.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 877802c153392f272d9708a0f15c81b679c51042 -Author: Will Thompson -Date: Sat Nov 20 11:31:32 2010 +0000 - - examples/connect: always call wocky_init(). - - The previous fix, in d0977e8, only called wocky_init() on one branch. - Thus, the example worked in 'connector' mode, but not in 'raw' mode (the - default)... - - We should just call it up-front alongside g_type_init(). - - examples/connect.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 94240be7cef4d878410cb0843063d4f75b270edb -Author: Simon McVittie -Date: Tue Nov 23 16:00:59 2010 +0000 - - Add maintainer-upload-docs target to Makefile.am - - Makefile.am | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 4ea0e486e9b40d64b16dc566714f613b6b430e77 -Author: Jonny Lamb -Date: Mon Nov 15 13:10:23 2010 +0000 - - auth-registry: add a namespace to auth mechanism constants - - Signed-off-by: Jonny Lamb - - wocky/wocky-auth-registry.c | 8 ++++---- - wocky/wocky-auth-registry.h | 8 ++++---- - wocky/wocky-jabber-auth-digest.c | 2 +- - wocky/wocky-jabber-auth-password.c | 2 +- - wocky/wocky-jabber-auth.c | 4 ++-- - wocky/wocky-sasl-digest-md5.c | 2 +- - wocky/wocky-sasl-plain.c | 2 +- - 7 files changed, 14 insertions(+), 14 deletions(-) - -commit 29ac49f0cd6f052bf7ab29010853e37510af1437 -Merge: 5b6ea68 5ec9c99 -Author: Will Thompson -Date: Wed Nov 10 15:56:59 2010 +0000 - - Merge branch 'iphb' - -commit 5b6ea68ad8300919341d30fc4b35303b65258e93 -Author: Will Thompson -Date: Wed Nov 10 14:47:02 2010 +0000 - - OpenSSL: improve debugging output for ignored errors - - We reasonably frequently hit UNABLE_TO_GET_CRL. Currently, the debug - output is kind of surprising: - - check_peer_name: wocky-openssl.c:877: got cname 'ovi.com' from x509 name, nid #0 - compare_wildcarded_hostname: wocky-openssl.c:831: ovi.com ~ ovi.com - wocky_tls_session_verify_peer: wocky-openssl.c:1058: cert verification error: 3 - xmpp_init: wocky-connector.c:1056: sending XMPP stream open to server - - What's actually happening here is that we're ignoring error 3 - (UNABLE_TO_GET_CRL) because it's completely harmless. But to the - uninformed reader it looks like an error should have occurred. - - wocky/wocky-openssl.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 4ce13bb2306dc8da26a9bf21dedc279a3f472dd9 -Author: Will Thompson -Date: Wed Nov 10 14:37:31 2010 +0000 - - OpenSSL: don't erroneously truncate X509_NAMEs. - - The manpage for X509_NAME_get_text_by_NID() says: - - At most len bytes will be written and the text written to buf will be - null terminated. - - And: - - If buf is then the amount of space needed in buf (excluding the - final null) is returned. - - So we call X509_NAME_get_text_by_NID() once, passing a NULL buffer, to - discover how long a buffer we have to allocate. Then we allocate that - buffer, and pass it back in. But while the returned length excludes the - null terminator, the length we pass in should include it. - - This fixes an issue where, when connecting to (for example) door.com, - we'd erroneously believe that its certificate is for "door.co" and - reject it. - - Reviewed-by: Simon McVittie - - wocky/wocky-openssl.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b0ebed783ce4c2b27ad5d35f6cf847d9f5363962 -Author: Will Thompson -Date: Wed Nov 10 14:36:48 2010 +0000 - - OpenSSL: add debug output to check_peer_name() - - It'd be useful to be able to see from a debug log where in the - certificate the name being examined was found. - - Reviewed-by: Simon McVittie - - wocky/wocky-openssl.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -commit 5ec9c99b5b7bc7179df62ad31e2af1d9ef7a5f87 -Author: Will Thompson -Date: Mon Oct 25 12:34:13 2010 +0100 - - Clarify that moving next_wakeup into the past is okay - - wocky/wocky-heartbeat-source.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 01811a4a6ed0ac6ad5f9439d12560d787c97570d -Author: Will Thompson -Date: Mon Oct 25 11:58:52 2010 +0100 - - Ping test: reduce the number of pings sent and time waited - - I think it's important that we send more than one ping in a row, to - ensure that scheduling the next wakeup works. It's also important that - we wait longer than one ping interval when checking that no more pings - are sent. Finally, we do need to test turning pings back on after - turning them off. - - But previously we waited for three pings, turned off pings and waited - three seconds to check we don't get any pings we don't expect, and then - turned them back on and waited for three more. This is overkill; this - patch makes us wait for two pings, wait for two seconds after turning - them off, and only wait for one more ping after turning them back on. - - tests/wocky-ping-test.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 2aef513cca19ecf74475c8058ed1f272c69c083e -Author: Will Thompson -Date: Mon Oct 25 11:58:35 2010 +0100 - - Heartbeat: add this/next wakeup timestamps to debug output - - wocky/wocky-heartbeat-source.c | 19 +++++++++++++++++-- - 1 files changed, 17 insertions(+), 2 deletions(-) - -commit 803f671f4e1421c5d8ead77babab97e98a7e0a0a -Author: Will Thompson -Date: Thu Oct 21 18:55:20 2010 +0100 - - Heartbeat: explain why _new() doesn't use update_interval() - - I just tried refactoring things to make wocky_heartbeat_source_new() - call wocky_heartbeat_source_update_interval(). It broke, because the - latter uses g_source_get_current_time(). Maybe it shouldn't... but it - seems reasonable to assume we're attached to a main context when someone - calls wocky_heartbeat_source_update_interval(). - - wocky/wocky-heartbeat-source.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 83494b109f1ac08777c8a49ed82aa0d4c127bb77 -Author: Will Thompson -Date: Thu Oct 21 18:37:27 2010 +0100 - - Ping: flag ping-interval property as CONSTRUCT - - This means it's set by the time that we construct the heartbeat. It - shouldn't make a difference, but it reduces spurious debug output. - - wocky/wocky-ping.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4e9f9530383d1162619c7e214dc18c64d64a1468 -Author: Will Thompson -Date: Tue Oct 19 19:04:57 2010 +0100 - - Improve WockyPing's debugging output. - - wocky/wocky-ping.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit 7cb68e637937b67866d2f17effb5de728e516c27 -Author: Will Thompson -Date: Tue Oct 19 14:17:25 2010 +0100 - - Heartbeat: handle max_interval = 0 - - This is used to indicate that the heartbeat should be disabled. - - tests/wocky-ping-test.c | 32 ++++++++++++++++++++- - wocky/wocky-heartbeat-source.c | 61 +++++++++++++++++++++++++++++++++------ - 2 files changed, 82 insertions(+), 11 deletions(-) - -commit 38445ac40d4ad5c4bda86f491ffa11f3d0de6313 -Author: Will Thompson -Date: Tue Oct 19 14:52:21 2010 +0100 - - Add more debugging to the heartbeat - - wocky/wocky-heartbeat-source.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit 8704ea463278220f1514b981a8feafc448b4e3e1 -Author: Will Thompson -Date: Tue Oct 19 14:42:59 2010 +0100 - - Heartbeat: split degrading out of finalize - - Previously, we called wocky_heartbeat_source_finalize() whenever the - heartbeat service had failed for any reason, which happened to do - nothing more harmful than closing the connection to the heartbeat - service. But this isn't particularly easy to read. Splitting the - guts of the function out into wocky_heartbeat_source_degrade() makes the - code more self-documenting. - - wocky/wocky-heartbeat-source.c | 24 ++++++++++++++++-------- - 1 files changed, 16 insertions(+), 8 deletions(-) - -commit edbe19e12ae0350309b22126767428a5f623d7a6 -Author: Will Thompson -Date: Tue Oct 19 14:21:16 2010 +0100 - - Replace WockyPing's timeouts with WockyHeartbeat - - This strictly speaking introduces a regression: we no longer delay the - next ping whenever we send data. But actually, I don't think this is - all that necessary: if we want to do something in response to getting no - replies to our pings, we have to be sure we're sending them in the first - place. They're only tiny. - - wocky/wocky-ping.c | 78 ++++++++++++--------------------------------------- - 1 files changed, 19 insertions(+), 59 deletions(-) - -commit dae40a8fc8a9b3449bf532a59d2169bd3e894470 -Author: Will Thompson -Date: Tue Oct 19 14:17:53 2010 +0100 - - Document heartbeat methods. - - wocky/wocky-heartbeat-source.c | 25 +++++++++++++++++++++++++ - 1 files changed, 25 insertions(+), 0 deletions(-) - -commit 408ee992c698e195428fb976180de1563cf44834 -Author: Will Thompson -Date: Mon Oct 18 16:59:11 2010 +0100 - - Bake iphb interval policy into WockyHeartbeatSource - - Ultimately, the choice of how much earlier than the desired keepalive - interval we're happy to be woken up by the system heartbeat service is - pretty much arbitrary. So let's just bake it into the place where iphb - is directly used. - - wocky/wocky-heartbeat-source.c | 18 ++++++++++++------ - wocky/wocky-heartbeat-source.h | 2 -- - 2 files changed, 12 insertions(+), 8 deletions(-) - -commit ed4f81dfda49ea0aab5d90dcf67439a2857a8d35 -Author: Will Thompson -Date: Fri Oct 15 16:10:01 2010 +0100 - - Heartbeat: support updating the interval on the fly - - wocky/wocky-heartbeat-source.c | 24 ++++++++++++++++++++++++ - wocky/wocky-heartbeat-source.h | 5 +++++ - 2 files changed, 29 insertions(+), 0 deletions(-) - -commit 57e76648dd5024be789ecf3b4bfc2441198f97ac -Author: Will Thompson -Date: Mon Oct 18 13:49:13 2010 +0100 - - Heartbeat: extract common iphb_wait()-calling code - - wocky/wocky-heartbeat-source.c | 43 ++++++++++++++++++++++----------------- - 1 files changed, 24 insertions(+), 19 deletions(-) - -commit 83ca63974353febaaf5afcbb9e2734820a4182da -Author: Will Thompson -Date: Mon Oct 18 11:34:23 2010 +0100 - - Heartbeat: fall back to internal timeouts - - If we're not built with libiphb support, or if we get any errors in the - course of using libiphb, this patch makes WockyHeartbeatSource simply - act as a timeout source. - - wocky/wocky-heartbeat-source.c | 147 +++++++++++++++++++++++++++------------- - 1 files changed, 99 insertions(+), 48 deletions(-) - -commit 64540f03af6182f537959637a803a47554b4dcda -Author: Will Thompson -Date: Fri Oct 15 15:52:04 2010 +0100 - - Add a GSource wrapping libiphb. - - The Loudmouth patch to add libiphb support for Maemo 5 intertwingled it - with other keepalive logic, but I think separating it out makes it - cleaner. - - libiphb is part of DSME (http://gitorious.org/dsme/) which is now LGPL - v2.1 (note: not "or later"). This is an optional dependency, so doesn't - impact Wocky's license in general. - - Currently the source is completely inert if we don't have iphb support; - it'll be fixed to fall back to acting as a timeout source later. - - configure.ac | 9 ++ - wocky/Makefile.am | 5 +- - wocky/wocky-debug.c | 1 + - wocky/wocky-debug.h | 1 + - wocky/wocky-heartbeat-source.c | 190 ++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-heartbeat-source.h | 37 ++++++++ - 6 files changed, 242 insertions(+), 1 deletions(-) - -commit add1c55989ef3d3fa4a871d4ad217a49d301d2dc -Author: Will Thompson -Date: Mon Oct 25 11:39:28 2010 +0100 - - Fix DEBUGGING macro to call wocky_debug_flag_is_set() - - Hey, looks like no-one's used this before in Wocky. ;-) - - wocky/wocky-debug.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e54631ff2db562b0b104ef9a7f949d3fb2fb8df2 -Author: Will Thompson -Date: Tue Oct 19 16:56:02 2010 +0100 - - Test sending a stanza just before destroying porter. - - I'm astonished that this didn't have a test already. - - If we call wocky_porter_send_async(), then destroy the porter, and only - then spin the main loop, we'd crash. This is because after the porter - died, it'd take the xmpp connection down, which would then fire a - callback to tell the porter that sending a stanza failed. The fix is - simple: ref the porter across calls to - wocky_xmpp_connection_send_stanza_async(). - - Reviewed-by: Nicolas Dufresne - Fixes: - - tests/wocky-porter-test.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-porter.c | 4 ++- - 2 files changed, 52 insertions(+), 1 deletions(-) - -commit cc5c5309c21694a4c120c4ba9f01fb12f27cb7ef -Author: Will Thompson -Date: Wed Oct 20 15:53:06 2010 +0100 - - OpenSSL: report hostname mismatch over other errors. - - I think this is more useful behaviour. Who cares if you can't find the - CA for a certificate, if the certificate isn't even for the right - domain? :) - - The GnuTLS backend already has this behaviour. - - tests/wocky-connector-test.c | 18 ++++++++++++++++++ - wocky/wocky-openssl.c | 27 ++++++++------------------- - 2 files changed, 26 insertions(+), 19 deletions(-) - -commit 5079a1ec30235c76f5b2b18655799849d26f90bf -Author: Will Thompson -Date: Wed Oct 20 15:44:14 2010 +0100 - - OpenSSL: clarify anonymous certificate handling - - wocky/wocky-openssl.c | 26 +++++++++++++++----------- - 1 files changed, 15 insertions(+), 11 deletions(-) - -commit 36af8b71fdd7ee9869ebdc584631cb51fe589aac -Author: Will Thompson -Date: Wed Oct 20 12:46:52 2010 +0100 - - TestConnectorServer: use '*' in a _build() call - - tests/wocky-test-connector-server.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 86046ac87936bbadc0b6d7a4679d85a0f094e407 -Author: Will Thompson -Date: Wed Oct 20 00:09:17 2010 +0100 - - Remove unnecessary MUC namespace abbreviations. - - I like avoiding typing as much as the next person, but. (This will break - Gabble, which uses WOCKY_NS_MUC_OWN.) - - wocky/wocky-muc.c | 2 +- - wocky/wocky-namespaces.h | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -commit e25cc2a0c89ce9270da04199d4be73ec9c6b5dcf -Author: Will Thompson -Date: Tue Oct 19 19:01:13 2010 +0100 - - Use wocky_stanza_get_{from,to} - - tests/wocky-porter-test.c | 3 +-- - tests/wocky-roster-test.c | 3 +-- - wocky/wocky-muc.c | 5 ++--- - wocky/wocky-pep-service.c | 3 +-- - wocky/wocky-porter.c | 9 +++------ - wocky/wocky-roster.c | 3 +-- - 6 files changed, 9 insertions(+), 17 deletions(-) - -commit 181a042eb85a59497d6361b68d125df0db4ed092 -Author: Will Thompson -Date: Tue Oct 19 18:55:55 2010 +0100 - - Add wocky_stanza_get_{from,to} - - wocky/wocky-stanza.c | 34 ++++++++++++++++++++++++++++++++++ - wocky/wocky-stanza.h | 3 +++ - 2 files changed, 37 insertions(+), 0 deletions(-) - -commit 8924acd99e33b5fce0bcf395fe4ad25470417f21 -Author: Will Thompson -Date: Tue Oct 19 13:45:47 2010 +0100 - - Check debug flags correctly when logging stanzas - - These two stray 's's drove me extra crazy while debugging a bizarre - memory corruption bug. - - wocky/wocky-debug.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 635df31cbd8f9d7302b694bbf59157f58101a950 -Author: Will Thompson -Date: Thu Oct 14 23:49:13 2010 +0100 - - Fix up wocky-utils comment trivia. - - The introductory comments in wocky-utils.[ch] claimed the files to be - called gibber-util.[ch]. Also, the header guard was singular, not - plural. This offends me. - - wocky/wocky-utils.c | 4 ++-- - wocky/wocky-utils.h | 10 +++++----- - 2 files changed, 7 insertions(+), 7 deletions(-) - -commit 5c4c8ecf1656cc593b0af19cd1a9b2db940f601c -Author: Will Thompson -Date: Tue Apr 20 16:42:15 2010 +0100 - - Correct documentation of wocky_node_is_superset - - wocky/wocky-node.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit caece2b087b505f1be4637dbff89679295d83e61 -Author: Will Thompson -Date: Tue Apr 13 22:46:28 2010 +0100 - - Give a useful critical when you mess up _stanza_build() - - wocky/wocky-node.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit bfcdeadf0781d6d2cb2d7e1b9a93756dc4ecce5c -Author: Nicolas Dufresne -Date: Thu Oct 14 19:20:30 2010 -0400 - - Fixe last bad comparision in OpenSSL code - - wocky/wocky-openssl.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2e7d77f14f3404ade60431cad82fc8a91eabb145 -Author: Nicolas Dufresne -Date: Thu Oct 14 19:08:21 2010 -0400 - - Fix boolean comparision in OpenSSL code - - This change was introduced by accident in leak-fix branch while doing some - refactoring. This will hopefully solve OpenSSL build errors. - - wocky/wocky-openssl.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 66e264e385cf2cbbd09a2d9723720d5c5bd4ec57 -Merge: d339fbc d67a032 -Author: Nicolas Dufresne -Date: Thu Oct 14 18:44:43 2010 -0400 - - Merge branch 'wocky-0.10' - -commit d67a032e68d08825b0aa7eb42673393ba68a1403 -Author: Nicolas Dufresne -Date: Thu Oct 14 11:33:04 2010 -0400 - - Use G_N_ELEMENT to get array size - - tests/wocky-http-proxy-test.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 78c7d6cd96a44d3aa2235a0640be18e9979c6f54 -Author: Nicolas Dufresne -Date: Thu Oct 14 11:32:20 2010 -0400 - - Avoid magic numbers implementing str_has_prefix_case() - - tests/wocky-http-proxy-test.c | 13 ++++++++++--- - 1 files changed, 10 insertions(+), 3 deletions(-) - -commit 3989fcaa2dad9dbf689c29729a11cb731e9264ca -Author: Nicolas Dufresne -Date: Thu Oct 14 11:27:02 2010 -0400 - - Use g_assert_cmpstr() for better output - - tests/wocky-http-proxy-test.c | 9 ++++----- - 1 files changed, 4 insertions(+), 5 deletions(-) - -commit 850cb5a5c849322a71b08304b69d2214250ecaa3 -Author: Nicolas Dufresne -Date: Thu Oct 14 11:25:40 2010 -0400 - - Use g_assert_cmpuint for better output - - tests/wocky-http-proxy-test.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit d339fbcabd6b1aabcac52817e2cb5480ff9d3e31 -Merge: 2cf2577 e957e75 -Author: Nicolas Dufresne -Date: Wed Oct 13 11:56:44 2010 -0400 - - Merge branch 'leak-fix' - - Reviewed-by: Will Thompson - -commit e957e75e785200991b3f346298a7d3c0f4e3584e -Author: Nicolas Dufresne -Date: Wed Oct 13 11:49:31 2010 -0400 - - More style fix when doing if on pointers - - tests/wocky-connector-test.c | 2 +- - tests/wocky-test-connector-server.c | 2 +- - wocky/wocky-muc.c | 8 ++++---- - wocky/wocky-openssl.c | 18 +++++++++--------- - wocky/wocky-tls.c | 16 ++++++++-------- - wocky/wocky-utils.c | 4 ++-- - wocky/wocky-xmpp-writer.c | 2 +- - 7 files changed, 26 insertions(+), 26 deletions(-) - -commit ae8abda698643d2d9b7ef9c962f3c5e0d5ff81a8 -Author: Nicolas Dufresne -Date: Wed Oct 13 11:23:20 2010 -0400 - - Fix coding style error introduced in leak fixes - - tests/wocky-test-connector-server.c | 4 ++-- - tests/wocky-test-sasl-auth-server.c | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - -commit 7a5ebbd8a6b160cd3b65e66b12c55892dff47c92 -Author: Nicolas Dufresne -Date: Tue Oct 12 15:50:45 2010 -0400 - - Don't leak tls_connection on error - - wocky/wocky-tls-connector.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit d65e92b2637718e9af2b85416bd354c911dac55f -Author: Nicolas Dufresne -Date: Tue Oct 12 15:30:30 2010 -0400 - - Don't leak last read buffer - - wocky/wocky-tls.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 88938428ad9152e02eff643ec412a3154cf1658a -Author: Nicolas Dufresne -Date: Tue Oct 12 15:01:02 2010 -0400 - - Don't leak errors in TLS tests - - tests/wocky-test-connector-server.c | 8 ++++++-- - wocky/wocky-tls-connector.c | 1 + - 2 files changed, 7 insertions(+), 2 deletions(-) - -commit b54b111ac40c996896181a2f0b43fac8eb7b51c3 -Author: Nicolas Dufresne -Date: Fri Oct 8 17:50:55 2010 -0400 - - Only ref the cancellable if a callback is provided - - tests/wocky-test-sasl-auth-server.c | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) - -commit 4461be9b3cb5776b55e4fe8f1ef2d9939d160d20 -Author: Nicolas Dufresne -Date: Fri Oct 8 17:21:06 2010 -0400 - - Don't leak GSocket - - tests/wocky-connector-test.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 97dbbfad80b373586e6d37d4a4e664e7b78b56d0 -Author: Nicolas Dufresne -Date: Fri Oct 8 17:19:51 2010 -0400 - - Don't leak errors - - tests/wocky-test-connector-server.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 14df6aef00ab2880bb86ac86f88b9193ea8848cc -Author: Nicolas Dufresne -Date: Fri Oct 8 17:10:27 2010 -0400 - - Don't leak SASLServer by overwriting it - - tests/wocky-test-connector-server.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit f4e0ce027040dff5c7ddcb0cec62b2e4d3c02cf5 -Author: Nicolas Dufresne -Date: Fri Oct 8 17:10:05 2010 -0400 - - Don't leak TLSSession - - tests/wocky-test-connector-server.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 7c4468651d85d3904a7f2365c1d55e862cc44c7d -Author: Nicolas Dufresne -Date: Fri Oct 8 17:09:44 2010 -0400 - - Don't leak TLSConnection - - tests/wocky-test-connector-server.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit d8b8d403234d177b9ab1f7aed29569c1f434bca5 -Author: Nicolas Dufresne -Date: Fri Oct 8 16:58:32 2010 -0400 - - Don't leak error in test resolver - - tests/test-resolver.c | 64 +++++++++++++++++++++++------------------------- - 1 files changed, 31 insertions(+), 33 deletions(-) - -commit 6246d9ad7290b86b3cbf29c2ad829bc8fdad7f68 -Author: Nicolas Dufresne -Date: Thu Oct 7 14:03:11 2010 -0400 - - Keep GCancellable alive during the async calls - - Keep a reference on GCancellable for the time of the async calls. This is - important to allow simple cancel and forget of cancellable by caller. Most - call were already implemented correctly, this patch fixes the remaining. - - tests/wocky-test-sasl-auth-server.c | 21 +++++++++++++++- - tests/wocky-test-stream.c | 9 +++++- - wocky/wocky-openssl.c | 11 ++++++- - wocky/wocky-porter.c | 32 ++++++++++++++++++++--- - wocky/wocky-tls.c | 9 +++++- - wocky/wocky-xmpp-connection.c | 47 +++++++++++++++++++++++++++++++--- - 6 files changed, 112 insertions(+), 17 deletions(-) - -commit 8e254f7f3e571d739e233034682facbf63efc51c -Author: Nicolas Dufresne -Date: Fri Oct 8 16:41:37 2010 -0400 - - Don't leak current path string - - wocky/wocky-utils.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit f13a2c8e9af91762d86b6cd26cba57f2f0cb47fd -Author: Nicolas Dufresne -Date: Fri Oct 8 13:01:11 2010 -0400 - - Fix function implementation coding style - - wocky/wocky-porter.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit bb9b190f87db3eb60d1748f399fcd298c31d2c8c -Author: Nicolas Dufresne -Date: Fri Oct 8 12:30:53 2010 -0400 - - Don't leak a ref on TlsConnection in verify_async - - wocky/wocky-tls-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bb167324fb0a1c9b21b7a7d7d1146ca8753c0d65 -Author: Nicolas Dufresne -Date: Thu Oct 7 19:10:09 2010 -0400 - - Add explicit _stop() to test SASL auth server - - The test SASL auth server did not have a _stop() method. As the call to - new() starts an infinit async call on internal XmppConnection, the Xmpp - Connection get leaked. Adding an explici _stop(), fixes this issue. - - tests/wocky-test-sasl-auth-server.c | 29 ++++++++++++++++++++++++----- - tests/wocky-test-sasl-auth-server.h | 2 ++ - tests/wocky-test-sasl-auth.c | 2 ++ - 3 files changed, 28 insertions(+), 5 deletions(-) - -commit 2cf2577a5465d8b13fa3d72e73cc384a68dd488d -Author: Will Thompson -Date: Fri Oct 8 13:45:43 2010 +0100 - - OpenSSL: add a missing 'break'. - - This was broken in 9a3f3bc8, which added the case for UNABLE_TO_GET_CRL. - - Reviewed-by: Simon McVittie - - wocky/wocky-openssl.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit a70a56c6f232bb9bffc91b68898f4d2b396a503f -Author: Will Thompson -Date: Fri Oct 8 13:44:04 2010 +0100 - - Clarify extracting error type. - - wocky_enum_from_nick() doesn't modify its final parameter if it returns - FALSE, so this code already did the right thing for unrecognised error - types. But this patch rearranges the code to make this clearer. - - Reviewed-by: Simon McVittie - - wocky/wocky-xmpp-error.c | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -commit 7e22acb544bffb4bae9fd13da72e20f3f438d87d -Author: Nicolas Dufresne -Date: Thu Oct 7 19:09:35 2010 -0400 - - Don't leak a GAsyncResult in WockyPorter - - wocky/wocky-porter.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit f8c72df24c89f839f1819c78e3de3f5e03529b61 -Author: Nicolas Dufresne -Date: Thu Oct 7 16:46:28 2010 -0400 - - Fixed memmory leak in WockySaslScam - - wocky/wocky-sasl-scram.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 30166aeb891b0ceca7995268846fe900fd13b06a -Author: Nicolas Dufresne -Date: Tue Oct 5 15:12:12 2010 -0400 - - Unit tests for HTTP Proxy support - - This implements unit test for the wocky internal implementation of HTTP - Connect. - - tests/Makefile.am | 9 + - tests/wocky-http-proxy-test.c | 385 +++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 394 insertions(+), 0 deletions(-) - -commit 60278f0fef9a5075f91c3dffe56352448695fb5e -Author: Nicolas Dufresne -Date: Tue Oct 5 15:10:27 2010 -0400 - - Implement HTTP basic proxy authentication - - This adds HTTP basic proxy authentication as requesting in bugs.fd.o - #16034 - - wocky/wocky-http-proxy.c | 109 ++++++++++++++++++++++++++------------------- - 1 files changed, 63 insertions(+), 46 deletions(-) - -commit 210523aab3532d2c77bffa933aea8d761e08d0ab -Author: Nicolas Dufresne -Date: Tue Oct 5 15:06:40 2010 -0400 - - Handle EOS gracefully by manually generating error - - GIO does not return an error on EOS so we need to manually generate an - error when the EOS arrived too soon. - - wocky/wocky-http-proxy.c | 13 +++++++++++-- - 1 files changed, 11 insertions(+), 2 deletions(-) - -commit 953d5a19779ad88f0cf44b08d2f1851dea3b8ce5 -Author: Nicolas Dufresne -Date: Tue Oct 5 15:03:03 2010 -0400 - - Remove HTTP error code for known errors - - The HTTP error code is not that usefull for error that we know about. - - wocky/wocky-http-proxy.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 13e657288e24ab640560dbaf44d7853678c793da -Author: Nicolas Dufresne -Date: Thu Sep 30 15:25:59 2010 -0400 - - Improve error message in HTTPProxy - - Adds error code to message and nicier handling of broken reply. - - wocky/wocky-http-proxy.c | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 31a75968dfc980bb9267db3e0da251f1b9332707 -Author: Nicolas Dufresne -Date: Thu Sep 30 15:25:00 2010 -0400 - - Free variables as soon as they are no longer needed - - This allow reducing the amount of dupplicated free/unref in the error - label. - - wocky/wocky-http-proxy.c | 12 ++++-------- - 1 files changed, 4 insertions(+), 8 deletions(-) - -commit 7f12560eb5ddedad674a5a9421ef3193b3cfa96d -Author: Nicolas Dufresne -Date: Thu Sep 30 15:23:30 2010 -0400 - - Fix coding style - - * Use explicit comparision - * Unified GDataInputStream variable as data_in - * Add missing white space before/after if - - wocky/wocky-http-proxy.c | 46 ++++++++++++++++++++++++---------------------- - 1 files changed, 24 insertions(+), 22 deletions(-) - -commit 2ba0e569c9953651f800372cd2f7f3638dee09e3 -Author: Nicolas Dufresne -Date: Thu Sep 30 15:11:03 2010 -0400 - - Remove unsuded wocky_http_proxy_finalize() - - WockyHttpProxy does not have any internal resources so - wocky_http_proxy_finalize() is not used at all, removing it. - - wocky/wocky-http-proxy.c | 11 ----------- - 1 files changed, 0 insertions(+), 11 deletions(-) - -commit 38e1a9077d0f9cd90c3d41635485956d3ca8cbae -Author: Nicolas Dufresne -Date: Thu Sep 30 15:09:44 2010 -0400 - - Don't use double underscore - - Double underscores variable and macro are reserved for compilers. - - wocky/wocky-http-proxy.h | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 92d16af8158bd45263f38db1d8b1787e661b4ca9 -Author: Nicolas Dufresne -Date: Thu Sep 30 14:12:59 2010 -0400 - - Added proxy sources to extra dist - - When GIO does not support proxy we need to put the proxy specific - sources in the EXTRA_DIST list to ensure it is being shipped. - - wocky/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 668837041c03de92be41bd70247bde4b733dc6e8 -Author: Nicolas Dufresne -Date: Thu Aug 26 11:29:12 2010 -0400 - - Added support for HTTP Connect Proxy - - This patch registers an HTTP Connect extension to GLib proxy facility. - This extension is triggered (whenever an HTTPS proxy is set) when - legacy_ssl is being by providing a https:// base URI to the GSocketClient - connect method. - - configure.ac | 8 + - wocky/Makefile.am | 8 + - wocky/wocky-connector.c | 33 ++++- - wocky/wocky-http-proxy.c | 414 ++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-http-proxy.h | 43 +++++ - 5 files changed, 502 insertions(+), 4 deletions(-) - -commit 3d8bd1bd1e3857f1a14dbba92a8fe6bf7f790054 -Author: Nicolas Dufresne -Date: Thu Sep 23 14:22:11 2010 -0400 - - GSimpleAsyncResult source tags should be _async - - This makes Wocky closer to GAsyncResult conventions by using the _async - function as source tag instead of _finish. (Bug #26770) - - tests/wocky-test-connector-server.c | 2 +- - tests/wocky-test-sasl-auth-server.c | 4 +- - tests/wocky-test-stream.c | 84 +++++++++++++++++----------------- - wocky/wocky-auth-registry.c | 12 +++--- - wocky/wocky-jabber-auth.c | 4 +- - wocky/wocky-muc.c | 2 +- - wocky/wocky-pep-service.c | 4 +- - wocky/wocky-porter.c | 16 +++--- - wocky/wocky-pubsub-service.c | 4 +- - wocky/wocky-roster.c | 24 +++++----- - wocky/wocky-sasl-auth.c | 4 +- - wocky/wocky-tls-connector.c | 4 +- - wocky/wocky-tls-handler.c | 4 +- - wocky/wocky-xmpp-connection.c | 24 +++++----- - 14 files changed, 96 insertions(+), 96 deletions(-) - -commit 1b2804c9fd2d46bdc01a43a004183ea1c5d8957d -Author: Sjoerd Simons -Date: Fri Oct 1 15:19:59 2010 +0100 - - Increase test timeout to 10 seconds - - tests/wocky-test-helper.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f7531b2e77056471a0a0cb089346b4d8f15dc945 -Author: Sjoerd Simons -Date: Fri Oct 1 14:52:31 2010 +0100 - - Update the CRL to only expect a new update in 2038 - - tests/certs/ca-0-crl.cfg | 1 + - tests/certs/ca-0-crl.pem | 16 ++++++++-------- - tests/certs/crl/ca-0-crl.pem | 16 ++++++++-------- - 3 files changed, 17 insertions(+), 16 deletions(-) - -commit 81d91749669806cb0e05954af26a75778bbf1fe8 -Author: Sjoerd Simons -Date: Fri Oct 1 12:21:02 2010 +0100 - - Fix compilation with older glib - - tests/wocky-connector-test.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit f2cb0f6fc98b7d75b08516710046977195e26faa -Author: Sjoerd Simons -Date: Thu Sep 30 17:46:06 2010 +0100 - - Accept recoverable errors and fixup namespaces with extra spaces - - tests/wocky-xmpp-reader-test.c | 33 +++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-reader.c | 21 ++++++++++++++++----- - 2 files changed, 49 insertions(+), 5 deletions(-) - -commit d3e68d03f79625f695601b3b69dd853785fc14f3 -Author: Sjoerd Simons -Date: Wed Sep 29 16:22:19 2010 +0100 - - Handle the connection being disconnected by the remote side more gracefully - - wocky/wocky-tls.c | 22 +++++++++++++++------- - 1 files changed, 15 insertions(+), 7 deletions(-) - -commit 9d74bc20a9ad3118f28a896483f6a36e46b036eb -Author: Sjoerd Simons -Date: Thu Sep 30 16:52:25 2010 +0100 - - Cope with new GIO giving more precise error information - - tests/wocky-connector-test.c | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) - -commit 7d33e5c6d2499c2cad0e476d646feb548fb25d5b -Author: Sjoerd Simons -Date: Thu Sep 30 16:41:53 2010 +0100 - - Always use enum values for codes, not 0... - - tests/wocky-connector-test.c | 28 ++++++++++++++-------------- - 1 files changed, 14 insertions(+), 14 deletions(-) - -commit 69ce5d52e44bf1fcf9b420a1a91031714188f4ac -Author: Sjoerd Simons -Date: Thu Sep 30 16:34:07 2010 +0100 - - Support fallback error codes - - Over time GIO got more precise about its error codes, so add support for - a fallback error code that's also accepted - - tests/wocky-connector-test.c | 472 ++++++++++++++++++++++------------------- - 1 files changed, 253 insertions(+), 219 deletions(-) - -commit fb2f241fce7f7c106c16519c5e2be4eca4fbc34a -Author: Sjoerd Simons -Date: Thu Sep 30 13:50:13 2010 +0100 - - Use an internal enum to error code mapping instead of hardcoding quark strings - - tests/wocky-connector-test.c | 490 ++++++++++++++++++++++-------------------- - 1 files changed, 256 insertions(+), 234 deletions(-) - -commit 4816b2d65de1c66bb95de02c55e138264c28dbc7 -Author: Will Thompson -Date: Thu Sep 30 14:17:31 2010 +0100 - - Ignore gtkdoc scanner. - - Reviewed-by: Simon McVittie - - .gitignore | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit a8002b2bbfbd259961c59a7f714e25ad14fc521f -Author: Will Thompson -Date: Thu Sep 30 10:33:00 2010 +0100 - - OpenSSL: include error domain in debug, too - - There's really no point in including the error code if we don't include - the domain it belongs to, too. - - Reviewed-by: Jonny Lamb - - wocky/wocky-openssl.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 790bf30d1832ac8f678d3e5f0dc051dd392a3f26 -Author: Will Thompson -Date: Thu Sep 30 10:27:55 2010 +0100 - - OpenSSL: fix a debug format string. - - There are four parameters after this format string, but the string only - contains three placeholders. GCC, quite rightly, gets upset. This was - broken in 551e3ad. - - Reviewed-by: Jonny Lamb - - wocky/wocky-openssl.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit 61764f3912aa1f3b2d881fe518a701253fe4249c -Merge: dbbea11 0b104ce -Author: Will Thompson -Date: Fri Sep 24 12:05:07 2010 +0100 - - Merge branch 'wocky-0.10' - -commit 0b104ceae9edd2fa860f5ddb193d5b077da7b9f6 -Author: Will Thompson -Date: Fri Sep 24 11:38:56 2010 +0100 - - Check return of wocky_xmpp_connection_send_stanza_finish - - Reviewed-by: Simon McVittie - - wocky/wocky-tls-connector.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit e4842e8ac07922c51a790be12ddc59c286727d36 -Author: Guillaume Desmottes -Date: Thu Sep 23 16:23:56 2010 +0200 - - check if the result contains an error *before* g_simple_async_result_is_valid - - That's the usual pattern. If we early return in the _async function and raise - an error using g_simple_async_report_error_in_idle(), then the result doesn't - have a source tag. - - wocky/wocky-utils.h | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit b8db8f2e648a27e9020a99e027041cafb29e0c20 -Author: Guillaume Desmottes -Date: Thu Sep 23 16:22:51 2010 +0200 - - wocky_implement_finish_return_copy_pointer: return NULL and not FALSE - - wocky/wocky-utils.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit dbbea11d86d0f154c3b5728803f8e237fe5acad8 -Author: Guillaume Desmottes -Date: Thu Sep 23 16:23:56 2010 +0200 - - check if the result contains an error *before* g_simple_async_result_is_valid - - That's the usual pattern. If we early return in the _async function and raise - an error using g_simple_async_report_error_in_idle(), then the result doesn't - have a source tag. - - wocky/wocky-utils.h | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit 0c6c1d659ffc51e03de97f7e9fdc97648e5eb1e2 -Author: Guillaume Desmottes -Date: Thu Sep 23 16:22:51 2010 +0200 - - wocky_implement_finish_return_copy_pointer: return NULL and not FALSE - - wocky/wocky-utils.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit cb7d242e9f771b5d4af8f5fc8aa35304a038a810 -Author: Vivek Dasmohapatra -Date: Wed Sep 22 12:14:45 2010 +0100 - - Explain why ignore_warning is there in the write_op implementation - - wocky/wocky-openssl.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 551e3ad46325674015503049d2908d59df407efc -Author: Vivek Dasmohapatra -Date: Tue Sep 21 00:09:59 2010 +0100 - - Don't retry indefinitely on failed OpenSSL writes - - Previously, the response to any partial write was to try again later, even if - the error returned indicated that it would never succeed. Instead, we should - only retry later if WOULD_BLOCK is returned (indicating only that the write - buffer is full, as opposed to an actual error). - - This error was only in the OpenSSL backend; gnutls does not require us to - implement this logic at all. - - wocky/wocky-openssl.c | 40 +++++++++++++++++++++++++++++++--------- - 1 files changed, 31 insertions(+), 9 deletions(-) - -commit 87a64d465283ab01baceca9aefbb15a80b391b7f -Author: Cosimo Cecchi -Date: Tue Sep 14 19:27:57 2010 +0200 - - Update examples and tests to new API - - examples/connect.c | 2 +- - examples/register.c | 2 +- - examples/unregister.c | 2 +- - tests/wocky-connector-test.c | 9 ++++++--- - 4 files changed, 9 insertions(+), 6 deletions(-) - -commit 66689d2b261e442cdec52a42acd259beb2f0ed00 -Author: Cosimo Cecchi -Date: Tue Sep 14 19:27:28 2010 +0200 - - connector: use a GCancellable for async operations - - And pass it when we send/receive stanzas. - - wocky/wocky-connector.c | 100 ++++++++++++++++++++++++++++++++++------------ - wocky/wocky-connector.h | 3 + - 2 files changed, 77 insertions(+), 26 deletions(-) - -commit 4d228e61d6068291e8281440aab729d5e4a216ba -Author: Cosimo Cecchi -Date: Tue Sep 14 19:26:00 2010 +0200 - - sasl-auth: use the GCancellable if available - - wocky/wocky-sasl-auth.c | 35 +++++++++++++++++++++++++++++++---- - 1 files changed, 31 insertions(+), 4 deletions(-) - -commit 286e88f6fb3f3ec451c71bfb361b993d7b37eb8f -Author: Cosimo Cecchi -Date: Tue Sep 14 19:25:34 2010 +0200 - - jabber-auth: use the GCancellable if it's available - - wocky/wocky-jabber-auth.c | 17 +++++++++++++---- - 1 files changed, 13 insertions(+), 4 deletions(-) - -commit 0d4b3ff855fef2732cf024a7bdb6574d3b45ad7a -Author: Cosimo Cecchi -Date: Tue Sep 14 19:24:48 2010 +0200 - - tls-connector: add a GCancellable argument - - And use it if available when sending/receiving stanzas. - - wocky/wocky-tls-connector.c | 34 +++++++++++++++++++++++++++++----- - wocky/wocky-tls-connector.h | 1 + - 2 files changed, 30 insertions(+), 5 deletions(-) - -commit b2ad17044f1cadf61aa7d3df51660221ea775720 -Author: Will Thompson -Date: Mon Sep 6 18:07:56 2010 +0100 - - Fix tests for chat.facebook.com workaround. - - The test case matching the chat.facebook.com situation was expected to - fail to connect, but the workaround made connecting succeed, breaking - the test suite. I'm a bad person. - - So. I repurposed that test case to be one which is supposed to succeed, - and made a clone for a slightly different situation which should still - fail to connect. - - tests/wocky-connector-test.c | 32 +++++++++++++++++++++++++++++--- - 1 files changed, 29 insertions(+), 3 deletions(-) - -commit 96b18769a65b9c46d02137d496091f9f0e74e23f -Author: Will Thompson -Date: Mon Sep 6 17:33:14 2010 +0100 - - Remove redundant error-checking from connector test. - - g_assert_error() gives us all the same information the previous - fprintf() calls did, and performs all the same checks. - - tests/wocky-connector-test.c | 13 +------------ - 1 files changed, 1 insertions(+), 12 deletions(-) - -commit db37ac7a706d8fcdb45374ba9cbc22e02e9a65b0 -Author: Will Thompson -Date: Mon Sep 6 17:31:57 2010 +0100 - - Trick the coding style checker - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0f04327f892ecd3fcb1cfb411cd8c0eefc4aaf25 -Author: Will Thompson -Date: Sat Aug 28 18:03:11 2010 +0100 - - Work around chat.facebook.com's broken SRV record. - - _xmpp-client._tcp.chat.facebook.com returns a CNAME record, not a SRV - record. (But only on some connections! Apparently some people just get - nothing back, or something.) Anyway, if you get unlucky, this mean Wocky - just gave up and threw an error. - - Instead, if a domain has an SRV record and we fail to connect to it, we - now fall back to connecting to the domain directly; if the latter fails - too, we report the original error. If a domain has no SRV record, we - fall back fully, and the behaviour is unchanged. - - Fixes: - Reviewed-by: Simon McVittie - - wocky/wocky-connector.c | 47 ++++++++++++++++++++++++++++++++++------------- - 1 files changed, 34 insertions(+), 13 deletions(-) - -commit 9a3f3bc862a4ab368b231e96633326f4cafe4c6e -Author: Vivek Dasmohapatra -Date: Thu Sep 2 19:50:25 2010 +0100 - - Not having a CRL for a cert that advertises one is not necessarily an error - - Only stop if the user has requested strict checking. All it means is we - haven't downloaded the CRL and installed it on our system somewhere. - - wocky/wocky-openssl.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit 34d4cea28542b11507c096e3d56120ee0972b62b -Author: Cosimo Cecchi -Date: Mon Aug 30 11:36:35 2010 +0200 - - configure: add configure output - - configure.ac | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) - -commit 75219825d61edec6e2b1ad5efe29d8fbf0540d6e -Author: Cosimo Cecchi -Date: Mon Aug 30 11:36:07 2010 +0200 - - configure: always set the right value to $enable_coverage - - configure.ac | 10 +++++++--- - 1 files changed, 7 insertions(+), 3 deletions(-) - -commit 80a14a93939cf9125a91f4698bdc91a61ac67e19 -Author: Cosimo Cecchi -Date: Mon Aug 30 11:35:33 2010 +0200 - - configure: always set the right value to $with_tls - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit f049ff52818a36d1f69a79d045c6ab34b12b5807 -Author: Cosimo Cecchi -Date: Mon Aug 30 11:33:48 2010 +0200 - - configure: cleanup debug checks - - configure.ac | 12 +++++------- - 1 files changed, 5 insertions(+), 7 deletions(-) - -commit d1445f724ddb0ce70ce3a73c9a7fe307f3cfc8e2 -Author: Will Thompson -Date: Tue Aug 24 22:42:08 2010 +0100 - - Pubsub: unleak calls to g_simple_async_result_get_source_object() - - I tracked down a bug in Gabble to not unreffing the result of - g_simple_async_result_get_source_object() and thought I'd check Wocky. - I'm proud to report that I am responsible for all instances of this - error in Wocky. I'm even prouder to report that I found it once before, - added a comment explaining it, and then promptly forgot about it IN THE - SAME FILE. Dunce hat for me. - - Reviewed-by: Simon McVittie - - wocky/wocky-pubsub-node.c | 3 +++ - wocky/wocky-pubsub-service.c | 2 +- - 2 files changed, 4 insertions(+), 1 deletions(-) - -commit cfe1bd86d1143631218e97396122c7f4b4d8cf85 -Author: Adam Conrad -Date: Thu Aug 19 18:52:25 2010 +0100 - - Update wocky-uninstalled.pc.in to match the previous out-of-tree build fix - - wocky/wocky-uninstalled.pc.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 12f2eff683846e3a72ad04eb9921b1c1a85e0c44 -Author: Adam Conrad -Date: Thu Aug 19 17:02:18 2010 +0100 - - Fix out-of-tree builds for examples and tests with an explicit include to wocky's generated headers - - examples/Makefile.am | 2 ++ - tests/Makefile.am | 1 + - 2 files changed, 3 insertions(+), 0 deletions(-) - -commit 46b00685f4725b5a297b4364b72edfa255245d3e -Author: Sjoerd Simons -Date: Tue Aug 17 19:10:37 2010 +0100 - - Don't use a va_list twice - - wocky/wocky-tls-connector.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 38298718b84682941e0b98d68884a561511ca08f -Author: Sjoerd Simons -Date: Wed Aug 11 12:35:05 2010 +0100 - - Improve debugging output slightly - - tests/wocky-tls-test.c | 2 +- - wocky/wocky-tls.c | 13 +++++++------ - 2 files changed, 8 insertions(+), 7 deletions(-) - -commit eacb3e4f7baa6e361fbd88373212cb5ec4b0c7d2 -Author: Sjoerd Simons -Date: Wed Aug 11 12:29:50 2010 +0100 - - Use NORMAL instead of SECURE as the priority string - - NORMAL priority implies all secure algorithms, the only thing SECURE adds in - gnutls 2.8 is that it orders 256 ciphers before 128 ones. In 2.10 SECURE also - implies using only SHA512 bit signatures, which breaks our test-suite (as our - certificate aren't 512 bits :( ). - - For compatibility reasons switch to NORMAL as the priority string, there is no - reason to try to be more secure then what is considered normal by the gnutls - people. - - wocky/wocky-tls.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 357a928cf8c1f6a20077225c30d21fdfaf66e500 -Author: Cosimo Cecchi -Date: Thu Jul 22 18:29:56 2010 +0200 - - Set the cert type to X509 when using OpenSSL - - wocky/wocky-openssl.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit fb31331fa0061df833dd6913c27828b72f729d3d -Author: Cosimo Cecchi -Date: Wed Jul 21 17:32:33 2010 +0200 - - Don't use the removed property in the test. - - tests/wocky-connector-test.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit ea901a00b11989a59222e870e4bd59636f5170c5 -Author: Cosimo Cecchi -Date: Wed Jul 21 17:32:11 2010 +0200 - - Remove an unused property. - - wocky/wocky-connector.c | 19 ------------------- - 1 files changed, 0 insertions(+), 19 deletions(-) - -commit 42a1e4f227ac6c2415c28403243000e33b7f638d -Author: Cosimo Cecchi -Date: Wed Jul 21 17:29:43 2010 +0200 - - Don't change error types for some errors. - - We use them e.g. in the tests to verify critical conditions. - - wocky/wocky-tls-connector.c | 23 ++++++++++++++++++----- - 1 files changed, 18 insertions(+), 5 deletions(-) - -commit 59d826492c2c1fabdf5edb5c7d5151e1f94e5d38 -Author: Cosimo Cecchi -Date: Wed Jul 21 17:25:13 2010 +0200 - - Don't verify the peername when we're lenient. - - Fixes a regression from the split of the TLS connector. - - wocky/wocky-tls-handler.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit dbfd01acf41c35a5268cfa54d01bd98b0069db02 -Author: Cosimo Cecchi -Date: Fri Jul 16 12:21:55 2010 +0200 - - Update tests to the new API. - - examples/connect.c | 2 +- - examples/register.c | 2 +- - examples/unregister.c | 2 +- - tests/wocky-connector-test.c | 12 +++++++++--- - 4 files changed, 12 insertions(+), 6 deletions(-) - -commit 119ae9ea12998c0ee35a80fdb97afed7a172c5bd -Author: Cosimo Cecchi -Date: Fri Jul 16 12:20:48 2010 +0200 - - Add a way to get certificates from the session. - - wocky/wocky-openssl.c | 43 +++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-tls.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- - wocky/wocky-tls.h | 15 ++++++++++++--- - 3 files changed, 99 insertions(+), 4 deletions(-) - -commit 5195ba48b5c59a7147c7bfa177df8c4a55af569d -Author: Cosimo Cecchi -Date: Fri Jul 16 12:19:33 2010 +0200 - - Use WockyTLS[Handler, Module] in the connector - - wocky/wocky-connector.c | 418 +++++++++++------------------------------------ - wocky/wocky-connector.h | 11 +- - 2 files changed, 97 insertions(+), 332 deletions(-) - -commit 1af3dbb353f609b51c4084a84d485252d351fe7f -Author: Cosimo Cecchi -Date: Fri Jul 16 12:11:55 2010 +0200 - - Add WockyTLSConnector. - - wocky/Makefile.am | 2 + - wocky/wocky-tls-connector.c | 444 +++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-tls-connector.h | 78 ++++++++ - 3 files changed, 524 insertions(+), 0 deletions(-) - -commit ca1eb15d3252817f61d42443f5ff1ff021dbcd1f -Author: Cosimo Cecchi -Date: Fri Jul 16 12:11:29 2010 +0200 - - Add WockyTLSHandler. - - wocky/Makefile.am | 2 + - wocky/wocky-tls-handler.c | 346 +++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-tls-handler.h | 95 ++++++++++++ - 3 files changed, 443 insertions(+), 0 deletions(-) - -commit f43255812862592c2d46bb89b274e03a521ba9d7 -Author: Cosimo Cecchi -Date: Fri Jul 16 17:46:07 2010 +0200 - - Add utility to print debug from varargs. - - wocky/wocky-debug.c | 18 ++++++++++++------ - wocky/wocky-debug.h | 4 ++++ - 2 files changed, 16 insertions(+), 6 deletions(-) - -commit bf208dbc50a9660465387d39ed9768ee30ebca71 -Merge: 294e7a7 93c156d -Author: Will Thompson -Date: Fri Jul 16 16:27:43 2010 +0100 - - Merge branch 'coverity' - - Reviewed-by: Simon McVittie - -commit 93c156d5d95dd424cd67ca697d6750c7a511035f -Author: Will Thompson -Date: Fri Jul 16 16:00:35 2010 +0100 - - Don't leak if start_auth() fails. - - wocky/wocky-jabber-auth.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0384177b10a9bf5046da4e7bdec8eb1a1fed1e23 -Author: Will Thompson -Date: Fri Jul 16 15:58:20 2010 +0100 - - Fix a NULL check in digest_md5_make_initial_response - - wocky/wocky-sasl-digest-md5.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit d6c65173e096dc9fe3d3d03bc1be39f6a5439536 -Author: Will Thompson -Date: Fri Jul 16 15:55:46 2010 +0100 - - Simplify building resource binding stanza - - wocky/wocky-connector.c | 8 +++----- - 1 files changed, 3 insertions(+), 5 deletions(-) - -commit 7296028c4c562e76f91e637daecda96bec5ef73c -Author: Will Thompson -Date: Fri Jul 16 15:38:39 2010 +0100 - - Remove unused Node variable. - - wocky/wocky-xmpp-error.c | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit 294e7a70f2ed28fe712983a5b2a9ad6a327f133b -Author: Cosimo Cecchi -Date: Fri Jul 2 12:16:42 2010 +0200 - - Correct a typo in gtk-doc header. - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8a362a2b4406542b7f7ec2c68379fa8bc7f0c1a7 -Author: Sjoerd Simons -Date: Fri Jun 25 17:19:22 2010 +0100 - - Make the server salt a proper base64 string - - tests/wocky-scram-sha1-test.c | 14 ++++++++------ - 1 files changed, 8 insertions(+), 6 deletions(-) - -commit c4799c2ca67ba57229d61d426b99d3a611da44cd -Author: Sjoerd Simons -Date: Fri Jun 25 17:19:06 2010 +0100 - - Properly initialze base64 state and save - - wocky/wocky-sasl-scram.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 8f74264e32fe3f0df01fbb9e34e47a4223e9d279 -Author: Sjoerd Simons -Date: Fri Jun 25 15:19:12 2010 +0100 - - Add some static tests for scram-sha1 - - tests/Makefile.am | 9 +++- - tests/wocky-scram-sha1-test.c | 131 +++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 139 insertions(+), 1 deletions(-) - -commit 34516056bc94690be77c5106af3b0c54d9dfcc52 -Author: Sjoerd Simons -Date: Fri Jun 25 15:15:24 2010 +0100 - - Log the difference between actual and expected verification result - - wocky/wocky-sasl-scram.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 67bf3f27316f53a1c4e28db563a3c7af0520a320 -Author: Sjoerd Simons -Date: Thu Jun 24 12:49:26 2010 +0100 - - Test resetting the reader at odd times - - tests/wocky-xmpp-reader-test.c | 44 ++++++++++++++++++++++++++++++++++++--- - 1 files changed, 40 insertions(+), 4 deletions(-) - -commit b85abc7144808a77f7d20015514e36ff7c1c1ab8 -Author: Sjoerd Simons -Date: Thu Jun 24 12:48:52 2010 +0100 - - Completely clear the parser state when resetting - - wocky/wocky-xmpp-reader.c | 85 +++++++++++++++++++++------------------------ - 1 files changed, 40 insertions(+), 45 deletions(-) - -commit 8cda83781b95f7f63a8062e76f153ed012e95cb3 -Author: Simon McVittie -Date: Wed Jun 23 13:52:16 2010 +0100 - - Build enum types for all error domains - - Reviewed-by: Sjoerd Simons - - wocky/Makefile.am | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit e41093fb12ccc84078507aaf84d215ddb2cb163f -Author: Lars Noschinski -Date: Tue Jun 22 19:06:05 2010 +0100 - - Remove GNUTLS_VERIFY_DO_NOT_ALLOW_SAME from VERIFY_NORMAL mode - - wocky/wocky-tls.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 87ceeac46a1db5e2e3f4a4a04e3fb9a52ffca4ea -Merge: 59668c5 cd298b2 -Author: Simon McVittie -Date: Tue Jun 22 18:27:20 2010 +0100 - - Merge branch 'spoofing' - - Reviewed-by: Sjoerd Simons - -commit cd298b2941d137c1e921d8ee257ffbeb3a7e6c21 -Author: Simon McVittie -Date: Tue Jun 22 18:24:00 2010 +0100 - - Add simple tests for wocky_porter_get_full_jid and friends - - tests/wocky-porter-test.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit d2aa806d75caff61a061b727b25865b8de5fca7b -Author: Simon McVittie -Date: Tue Jun 22 16:08:59 2010 +0100 - - Test what happens when the server replies with a different version of our bare JID - - tests/wocky-porter-test.c | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) - -commit f255b7efe02fe2110397baeb72cf44e9817d9967 -Author: Simon McVittie -Date: Tue Jun 22 15:38:28 2010 +0100 - - fd.o #28647: adjust spoofing detection to be aware of our own JIDs - - wocky/wocky-porter.c | 82 +++++++++++++++++++++++++++++++++++++------------ - 1 files changed, 62 insertions(+), 20 deletions(-) - -commit b4c4da28daabc2b443f53820787222b2d28d8fa3 -Author: Simon McVittie -Date: Tue Jun 22 15:37:51 2010 +0100 - - fd.o #26961: WockyPorter: have a full JID property, and derive the bare JID and resource - - tests/wocky-porter-test.c | 2 +- - wocky/wocky-porter.c | 123 ++++++++++++++++++++++++++++++++++++++++++++- - wocky/wocky-porter.h | 7 ++- - wocky/wocky-session.c | 2 +- - 4 files changed, 130 insertions(+), 4 deletions(-) - -commit 9f8ea758535bcb67cdcdb4b10f4c39b99c817e0f -Author: Simon McVittie -Date: Tue Jun 22 18:19:45 2010 +0100 - - WockySession: have a full JID construct-time property - - tests/wocky-porter-test.c | 7 +++++-- - tests/wocky-pubsub-node-test.c | 4 ++-- - tests/wocky-pubsub-service-test.c | 2 +- - tests/wocky-roster-test.c | 2 +- - tests/wocky-session-test.c | 6 +++--- - tests/wocky-test-helper.c | 25 ++++++++++++++++++++----- - tests/wocky-test-helper.h | 1 + - wocky/wocky-session.c | 28 ++++++++++++++++++++++++---- - wocky/wocky-session.h | 3 ++- - 9 files changed, 59 insertions(+), 19 deletions(-) - -commit b72e4774c2bc0adbff7167695d70151bccc3955a -Author: Simon McVittie -Date: Tue Jun 22 15:34:02 2010 +0100 - - Test wocky_compose_jid - - tests/Makefile.am | 6 ++++- - tests/wocky-utils-test.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 59 insertions(+), 1 deletions(-) - -commit 4dc7976016d8fbd638ac2a16724fc541e3c4b13c -Author: Simon McVittie -Date: Tue Jun 22 15:33:19 2010 +0100 - - Factor out the end of wocky_normalise_jid into wocky_compose_jid - - wocky/wocky-utils.c | 56 +++++++++++++++++++++++++++++++++----------------- - wocky/wocky-utils.h | 3 ++ - 2 files changed, 40 insertions(+), 19 deletions(-) - -commit 0e9d5cd64967535cc060c2a8848685293bd6ce69 -Author: Simon McVittie -Date: Tue Jun 22 15:32:48 2010 +0100 - - .gitignore: ignore all test binaries by naming convention - - .gitignore | 24 +----------------------- - 1 files changed, 1 insertions(+), 23 deletions(-) - -commit 59668c53aac6b181d9708d2f7ec7cbeb6229f214 -Author: Will Thompson -Date: Tue Jun 15 23:13:12 2010 +0100 - - Use a better workaround for GTalk server SSL bugs - - The Google Talk server gets upset if you use TLSv1_client_method (). You - can either use SSLv23, or set the NO_TICKET option. Allegedly, the - former may stop SSL compression working, which is bad, and allows - falling back to SSLv2, which is also bad. - - While we're here, let's throw in the standard set of bug workaround - options. - - Reviewed-by: Vivek Dasmohapatra - - wocky/wocky-openssl.c | 27 ++++++++++++++++++++++----- - 1 files changed, 22 insertions(+), 5 deletions(-) - -commit 0207bfd23fcb1ce3e118aeba7cc03e57d1a13993 -Author: Will Thompson -Date: Wed Jun 16 12:42:50 2010 +0100 - - Fix test coding style checks in out-of-tree builds - - Reviewed-by: Simon McVittie - - tests/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 32c5022a02e12c102a3a0bf4a0f2d72015189fdc -Author: Simon McVittie -Date: Tue Jun 15 14:55:19 2010 +0100 - - fd.o #27488: wocky_connector_connect_finish, _register_finish: put GError last - - This is more conventional, and (eventually) nicer for bindings. - - Reviewed-by: Sjoerd Simons - - examples/connect.c | 2 +- - examples/register.c | 2 +- - tests/wocky-connector-test.c | 8 ++++---- - wocky/wocky-connector.c | 12 ++++++------ - wocky/wocky-connector.h | 8 ++++---- - 5 files changed, 16 insertions(+), 16 deletions(-) - -commit 42f58783611f23d4210a09d1039b31170ec75c4d -Author: Simon McVittie -Date: Tue Jun 15 14:49:47 2010 +0100 - - .gitignore: add gtkdoc's sections.txt, which is autogenerated in this project - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit a57811f15b08d3b23d059de42b5fe0c39c11833c -Author: Simon McVittie -Date: Tue Jun 15 14:49:23 2010 +0100 - - .gitignore: add another test - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 51affd5099e4178cbd07dc379c3970a9986da74a -Author: Will Thompson -Date: Mon Jun 14 15:03:35 2010 +0100 - - Check wocky_porter_send_iq_finish()'s return is used - - wocky/wocky-porter.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1394d8694c3c064587586aa84ce8631c3473d91a -Author: Sjoerd Simons -Date: Sun Jun 13 13:48:39 2010 +0100 - - Add support for SCRAM-SHA1 - - wocky/Makefile.am | 2 + - wocky/wocky-auth-registry.c | 12 +- - wocky/wocky-sasl-scram.c | 590 +++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-sasl-scram.h | 72 ++++++ - 4 files changed, 675 insertions(+), 1 deletions(-) - -commit e1eec240c432419d8b3d39c904bfe6b1a93b7508 -Author: Sjoerd Simons -Date: Sun Jun 13 13:41:58 2010 +0100 - - Test our HMAC-SHA1 implementation - - .gitignore | 1 + - tests/Makefile.am | 10 ++- - tests/wocky-sasl-utils-test.c | 163 +++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 172 insertions(+), 2 deletions(-) - -commit 4fa923f35c99a3b5e404c22cab9ee36e1fbdd416 -Author: Sjoerd Simons -Date: Sun Jun 13 13:37:33 2010 +0100 - - Add utilities for nonce generation and HMAC-SHA1 - - wocky/Makefile.am | 2 + - wocky/wocky-sasl-digest-md5.c | 19 +------- - wocky/wocky-sasl-utils.c | 103 +++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-sasl-utils.h | 36 ++++++++++++++ - 4 files changed, 143 insertions(+), 17 deletions(-) - -commit 5a1976e7de0701f4fd71844833a45b7b01e57361 -Author: Sjoerd Simons -Date: Mon Jun 14 12:22:27 2010 +0100 - - Use wildcard for coding style checks to catch everything - - tests/Makefile.am | 23 +---------------------- - tests/wocky-dummy-xmpp-server.c | 6 +++--- - 2 files changed, 4 insertions(+), 25 deletions(-) - -commit 32feaf82621dbfeeedf3e17b81b7140a3f02b8ae -Author: Sjoerd Simons -Date: Sun Jun 13 12:50:23 2010 +0100 - - Turn on coding style checking - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 49a9539dc42da2ceb3266bee9e2a13bba51a6ae3 -Merge: a676233 60800a4 -Author: Will Thompson -Date: Mon Jun 14 12:22:55 2010 +0100 - - Merge branch 'domain-validation' - - Reviewed-by: Sjoerd Simons - -commit 60800a465f33693ed9aeb42630974d60e6465bf8 -Author: Will Thompson -Date: Fri Jun 11 16:49:08 2010 +0100 - - Squash warnings about uninitialized GError *s - - wocky/wocky-jabber-auth.c | 6 ++---- - wocky/wocky-sasl-auth.c | 6 ++---- - 2 files changed, 4 insertions(+), 8 deletions(-) - -commit cba01d1776b8e2193ddd5dc0d3f741807bda61d8 -Author: Will Thompson -Date: Fri Jun 11 16:39:00 2010 +0100 - - Accept valid Unicode domains - - Previously we did not accept any non-ASCII domains, which meant we - dropped perfectly valid messages from perfectly valid contacts. :o - - This patch accepts any non-ASCII characters in domains. This is still - not right — for instance, the freshly-added test case demonstrates that - spaces in domains are properly rejected, but non-breaking spaces are - improperly accepted — but it's better than no validation at all (which - was my previous attempt at fixing this) and avoids us dropping messages. - - tests/Makefile.am | 12 ++++++- - tests/wocky-jid-validation-test.c | 56 +++++++++++++++++++++++++++++++++++++ - wocky/wocky-utils.c | 17 ++++++++--- - 3 files changed, 78 insertions(+), 7 deletions(-) - -commit 4cce83a850b1f1f950de9c3d8aa00d11875aacab -Author: Will Thompson -Date: Fri Jun 11 16:38:44 2010 +0100 - - Add missing include to test helper code. - - tests/wocky-test-helper.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit a676233d662dfd993cdb4f5183fd61cba990b9e3 -Author: Will Thompson -Date: Fri Jun 11 15:45:34 2010 +0100 - - Revert "Don't forbid valid non-ASCII domains." - - This reverts commit cc01b390f4c64c253d911da688e9c71cd7e026f1, which - broke tests that check that invalid domains are rejected. I'll add - slightly more than no validation. - - wocky/wocky-utils.c | 14 ++++++++++---- - 1 files changed, 10 insertions(+), 4 deletions(-) - -commit cc01b390f4c64c253d911da688e9c71cd7e026f1 -Author: Will Thompson -Date: Fri Jun 11 15:17:46 2010 +0100 - - Don't forbid valid non-ASCII domains. - - Previously perfectly valid IDNs in their Unicode form (rather than their - "xn--"-prefixed ASCII form) were rejected. Not only did this mean that - users could not sign in with JIDs on IDN domains, it also meant that we - rejected incoming messages from IDN-y JIDs. - - This patch corrects that, at the cost of performing no validation beyond - checking that the string is non-empty. - - wocky/wocky-utils.c | 14 ++++---------- - 1 files changed, 4 insertions(+), 10 deletions(-) - -commit 4c31c7003d554c18740e5a4c1aaf364c41b2f50b -Merge: 642d874 d82d98f -Author: Eitan Isaacson -Date: Tue Jun 8 08:18:22 2010 -0700 - - Merge branch 'auth-is-secure' - -commit d82d98f0234a753a226ec18b0c7b065a61f8d3e0 -Author: Eitan Isaacson -Date: Tue May 25 12:11:12 2010 -0700 - - Properly use is_secure argument in wocky_auth_registry_start_auth_async. - - examples/connect.c | 4 ++-- - tests/wocky-test-sasl-auth.c | 2 +- - wocky/wocky-connector.c | 7 ++++--- - wocky/wocky-jabber-auth.c | 6 +++++- - wocky/wocky-jabber-auth.h | 1 + - wocky/wocky-sasl-auth.c | 8 +++++--- - wocky/wocky-sasl-auth.h | 1 + - 7 files changed, 19 insertions(+), 10 deletions(-) - -commit 642d874431617fffa170c48cfdb8cabe5510041f -Merge: 8158b75 1c9443b -Author: Will Thompson -Date: Thu Jun 3 19:33:02 2010 +0100 - - Merge remote branch 'maiku/install-headers' - -commit 8158b754bda64f123d804ba6700846b90f069ff3 -Merge: ff03a5e 221d287 -Author: Will Thompson -Date: Thu Jun 3 19:00:48 2010 +0100 - - Merge branch 'muc' - - Reviewed-by: Sjoerd Simons - -commit ff03a5e7254c8586cf72016634a6b3a6c47eb492 -Merge: 9cdcd09 1c16879 -Author: Will Thompson -Date: Thu Jun 3 19:00:36 2010 +0100 - - Merge branch 'coverity' - - Reviewed-by: Sjoerd Simons - -commit 1c9443b6c8d78d800f2e470d1b0431519eb29951 -Author: Mike Ruprecht -Date: Sun May 30 12:00:15 2010 -0500 - - Add wocky-tls.h to the list of handwritten headers. - - The wocky-tls.h file is used for both GnuTLS and OpenSSL options. - Therefore there's no need to keep it separate from the main list - of headers. Also, it wasn't being installed with the other headers. - This patch moves it into the list of handwritten headers. - - wocky/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit aad3e48e1333bfe8659b2eb70c89081233856428 -Author: Will Thompson -Date: Mon Mar 22 15:37:29 2010 +0000 - - Add a configure switch to install headers - - Previously, Gabble hard-coded a list of Wocky headers to install if it - was built with --enable-plugin-api. This is fragile in the face of the - list of headers changing. With this patch, passing - --with-installed-headers=/path/to/headers to Wocky's configure will - cause `make install` to put headers there. - - I had to split BUILT_SOURCES and HANDWRITTEN_SOURCES into sources and - headers, and lowercase them because FOO_HEADERS is magic in Automake. I - took the liberty of sorting the lists while I was at it. - - configure.ac | 10 +++ - wocky/Makefile.am | 169 ++++++++++++++++++++++++++++------------------------ - 2 files changed, 101 insertions(+), 78 deletions(-) - -commit 9cdcd094234ebfe40429d827c2ec2b6bb5d917a6 -Author: Guillaume Desmottes -Date: Mon May 24 15:50:48 2010 +0200 - - pep-service: discard suspicious event messsages (fdo #28232) - - For some reason recent ejabberd are sending 'error' messages when we publish - to a PEP node. That's probably an ejabberd bug (EJAB-1239) but Wocky should - ignore those rather than parsing them as actual PEP updates. - - wocky/wocky-pep-service.c | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -commit 51ee0b1e860c99ae8dbaa58909d247ab54d834c1 -Author: Sjoerd Simons -Date: Wed May 26 17:17:47 2010 +0100 - - Remove certificate re-creation rules, they tend to break - - The Makefile had some voodoo to re-create the various certificates used for - testing if needed.. Unfortunately they tend to break. Also these rules will - only be needed in 2037. If we're still using SSL and Wocky at that point, then - figuring out how to update the certificates to be valid a little bit longer - shouldn't be that much work :) - - tests/Makefile.am | 106 +---------------------------------------------------- - 1 files changed, 1 insertions(+), 105 deletions(-) - -commit a9a52910d54c5d5f84bf9707eba7ab58192c2a07 -Author: Eitan Isaacson -Date: Fri May 21 15:10:10 2010 -0700 - - Unref reply stanza. - - wocky/wocky-sasl-auth.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit bfa6ed32139edb1b783f180219fbe933f12db625 -Author: Eitan Isaacson -Date: Fri May 21 15:09:34 2010 -0700 - - Unref auth registry on dispose. - - wocky/wocky-connector.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 64b4f204238fbaf6247e0094810d92a3417abc67 -Author: Eitan Isaacson -Date: Fri May 21 11:35:17 2010 -0700 - - Be more linient towards 0 length and NULL GStrings in base64 encode/decode. - - wocky/wocky-sasl-auth.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit a217fd071742abf8ba3cd526e012dcd2bda6df4d -Author: Mike Ruprecht -Date: Mon May 24 05:16:47 2010 -0500 - - Make sure all sources are in tests/Makefile.am's check_c_sources. - - tests/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 8f1d78dea085447a237160c4a528a48cc699f31c -Merge: 57e7d3a 89f115e -Author: Eitan Isaacson -Date: Wed May 19 10:39:23 2010 -0700 - - Merge branch 'more-auth-work' - -commit 89f115e5cfa8a3423bd085af3f611ac476c6705f -Author: Eitan Isaacson -Date: Wed May 19 10:33:24 2010 -0700 - - Changed wocky_implement_finish_void to work with g_simple_async_report_*. - - wocky/wocky-utils.h | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit d4482bd89440022d7fc25b485e50f3b01fa61066 -Author: Eitan Isaacson -Date: Tue May 18 10:29:57 2010 -0700 - - Added new API to gtk-doc index. - - docs/reference/wocky-docs.sgml | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 6481be551052eec6661a40ef89f2bd917e699a23 -Author: Eitan Isaacson -Date: Mon May 17 12:06:22 2010 -0700 - - Added documentation to virtual functions. - - wocky/wocky-auth-registry.h | 52 +++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 52 insertions(+), 0 deletions(-) - -commit 29e43824ab7b104ab8ad30e1a78505c30e09b47e -Author: Eitan Isaacson -Date: Mon May 17 11:47:10 2010 -0700 - - Use wocky_implement_finish_void macro in wocky_sasl_auth_authenticate_finish - - wocky/wocky-sasl-auth.c | 9 +-------- - 1 files changed, 1 insertions(+), 8 deletions(-) - -commit a5b28c34ab43fb8d56ef808a62874a73d1f01e04 -Author: Eitan Isaacson -Date: Mon May 17 11:45:17 2010 -0700 - - Call wocky_auth_registry_failure in auth_fail functions and not in _finish. - - wocky/wocky-jabber-auth.c | 23 +++++++++-------------- - wocky/wocky-sasl-auth.c | 16 +++++++++------- - 2 files changed, 18 insertions(+), 21 deletions(-) - -commit d7134f06472b4db2b7857e4d5409866ef2615698 -Author: Eitan Isaacson -Date: Mon May 17 10:25:59 2010 -0700 - - made _finish functions virtual - - wocky/wocky-auth-registry.c | 55 +++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-auth-registry.h | 23 ++++++++++++++++++ - 2 files changed, 78 insertions(+), 0 deletions(-) - -commit 556fb4cce9618ae6ce21792ee01f73d267714099 -Author: Eitan Isaacson -Date: Mon May 17 10:07:06 2010 -0700 - - Allocate GAsyncResult in implementation. In essence, they are now public. - - wocky/wocky-auth-registry.c | 69 ++++++++++++++++++++++-------------------- - wocky/wocky-auth-registry.h | 21 +++++++----- - 2 files changed, 48 insertions(+), 42 deletions(-) - -commit fa0ab5344f5469c64ce498f2e79de6bedff45322 -Author: Eitan Isaacson -Date: Thu May 13 11:46:53 2010 -0700 - - Added virtual public method wocky_auth_registry_failure - - wocky/wocky-auth-registry.c | 11 +++++++++++ - wocky/wocky-auth-registry.h | 7 +++++++ - wocky/wocky-jabber-auth.c | 12 +++++++++++- - wocky/wocky-sasl-auth.c | 5 ++++- - 4 files changed, 33 insertions(+), 2 deletions(-) - -commit 14bf70b7992cf868ce6a1a86f59ad84fb9b86ecd -Author: Eitan Isaacson -Date: Thu May 13 11:26:47 2010 -0700 - - allow NULL passwords - - wocky/wocky-connector.c | 9 +-------- - 1 files changed, 1 insertions(+), 8 deletions(-) - -commit 0079e46ab973602c3030173327bb8f5c9d6e4977 -Author: Eitan Isaacson -Date: Thu May 13 10:17:37 2010 -0700 - - Moved g_string copy/free functions to wocky-utils - - wocky/wocky-auth-registry.c | 25 ++++--------------------- - wocky/wocky-utils.c | 16 ++++++++++++++++ - wocky/wocky-utils.h | 4 ++++ - 3 files changed, 24 insertions(+), 21 deletions(-) - -commit b73f84bda27bcf9aaf0a6db581ee52f82bacb39c -Author: Eitan Isaacson -Date: Tue May 11 13:06:28 2010 -0700 - - Made new struct for holding initial auth data (mechanism and initial response). - - This further seals the base class and allows subclasses to override regardless of what obj->handler is pointing at. - - wocky/wocky-auth-registry.c | 74 ++++++++++++++++++++++++++++-------------- - wocky/wocky-auth-registry.h | 20 ++++++++++-- - wocky/wocky-jabber-auth.c | 16 ++++----- - wocky/wocky-sasl-auth.c | 14 +++----- - 4 files changed, 79 insertions(+), 45 deletions(-) - -commit a581c940cef08fb121fa142f5a689a6264c3fdc4 -Author: Eitan Isaacson -Date: Fri May 7 13:23:08 2010 -0700 - - Added private virtual functions to WockyAuthRegistry. - - wocky/wocky-auth-registry.c | 107 +++++++++++++++++++++++++++++++++--------- - wocky/wocky-auth-registry.h | 21 ++++++++ - 2 files changed, 105 insertions(+), 23 deletions(-) - -commit 57e7d3a7a58bad9d8b3d5edbb8c8506a32a6fddd -Author: Senko Rasic -Date: Thu May 13 15:09:01 2010 +0200 - - adding wocky-ping-test - - .gitignore | 1 + - tests/Makefile.am | 9 +++- - tests/wocky-ping-test.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 136 insertions(+), 1 deletions(-) - -commit 208826117cc8cc6fdda7509bd71038983b939750 -Author: Senko Rasic -Date: Thu May 13 15:07:44 2010 +0200 - - wocky-test-helper: support custom timeouts - - tests/wocky-test-helper.c | 8 +++++++- - tests/wocky-test-helper.h | 1 + - 2 files changed, 8 insertions(+), 1 deletions(-) - -commit 7cbd4644294b974750c85da06f2c9fe0633f5e2c -Author: Senko Rasic -Date: Thu May 13 15:06:32 2010 +0200 - - wocky-test-helper: cancel timeouts after each test - - tests/wocky-test-helper.c | 4 ++-- - tests/wocky-test-helper.h | 1 + - 2 files changed, 3 insertions(+), 2 deletions(-) - -commit 5aff834affadaa473b5c82082fa0ca8b44c83893 -Author: Senko Rasic -Date: Thu May 13 15:03:40 2010 +0200 - - wocky_test_input_stream_read: fixed 1-byte reads in COMBINE_SLICE mode - - tests/wocky-test-stream.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 372cfeecafd26191021768003c8341dd38dbb44d -Author: Senko Rasic -Date: Thu May 13 15:03:19 2010 +0200 - - adding WockyPing - - wocky/Makefile.am | 4 +- - wocky/wocky-ping.c | 282 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-ping.h | 69 +++++++++++++ - 3 files changed, 354 insertions(+), 1 deletions(-) - -commit 0ee03b1e59ad2a1a2908409e94d692cafefc204c -Author: Senko Rasic -Date: Thu May 13 14:54:02 2010 +0200 - - adding "ping" debug flag - - wocky/wocky-debug.c | 3 ++- - wocky/wocky-debug.h | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -commit 0e8c567439807f80cc90d376ceb5b8982163152a -Author: Senko Rasic -Date: Thu May 13 14:53:29 2010 +0200 - - adding "urn:xmpp:ping" to namespaces - - wocky/wocky-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit e6bdcc7b9dc234bb64dffcd17641209831925116 -Author: Senko Rasic -Date: Thu May 13 14:52:30 2010 +0200 - - adding WockyPorter::sending signal - - wocky/wocky-porter.c | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -commit dcefd5d4c8cf1948a602f83fe29176abce74801e -Merge: 543bb86 3fb3b76 -Author: Eitan Isaacson -Date: Fri May 7 13:54:03 2010 -0700 - - Merge branch 'jabber-auth-refactor' - -commit 3fb3b7626930d5ca94a54bb8394ee6d2d819a761 -Author: Eitan Isaacson -Date: Fri May 7 10:39:34 2010 -0700 - - Use wocky_xmpp_stream_error_from_node for parsing stream errors. - - wocky/wocky-jabber-auth.c | 27 ++++++++------------------- - wocky/wocky-sasl-auth.c | 27 ++++++++------------------- - 2 files changed, 16 insertions(+), 38 deletions(-) - -commit e33a9720af53312836d3e1be403a6402d6b7d203 -Author: Eitan Isaacson -Date: Wed May 5 14:32:21 2010 -0700 - - Make mechanism names preprocessor macros. - - wocky/wocky-auth-registry.c | 8 ++++---- - wocky/wocky-auth-registry.h | 5 +++++ - wocky/wocky-jabber-auth-digest.c | 2 +- - wocky/wocky-jabber-auth-password.c | 2 +- - wocky/wocky-jabber-auth.c | 6 ++---- - wocky/wocky-sasl-digest-md5.c | 2 +- - wocky/wocky-sasl-plain.c | 2 +- - 7 files changed, 15 insertions(+), 12 deletions(-) - -commit e9cacbb7ce557fbcfc0d523eaaa50237ebfa3276 -Author: Eitan Isaacson -Date: Wed May 5 14:13:14 2010 -0700 - - Cleaned up stream_error in both wocky-sasl-auth.c wocky-jabber-auth.c. - - wocky/wocky-jabber-auth.c | 36 ++++++++++++++---------------------- - wocky/wocky-sasl-auth.c | 36 ++++++++++++++---------------------- - 2 files changed, 28 insertions(+), 44 deletions(-) - -commit 75d45bef817fc0236fb657604e526d6206473b54 -Author: Eitan Isaacson -Date: Wed May 5 13:36:07 2010 -0700 - - make WockyJabberAuthDigest a non-plain handler. - - wocky/wocky-jabber-auth-digest.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 5928970c86a282de5350010068459801e4a8f002 -Author: Eitan Isaacson -Date: Tue May 4 22:11:44 2010 -0700 - - rename sasl debug flag to auth - - wocky/wocky-auth-registry.c | 2 +- - wocky/wocky-debug.c | 2 +- - wocky/wocky-debug.h | 2 +- - wocky/wocky-jabber-auth-digest.c | 2 +- - wocky/wocky-jabber-auth-password.c | 2 +- - wocky/wocky-jabber-auth.c | 2 +- - wocky/wocky-sasl-auth.c | 2 +- - wocky/wocky-sasl-digest-md5.c | 2 +- - wocky/wocky-sasl-plain.c | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) - -commit 78057813fccdd70f0a626687a406ae8e9898675a -Author: Eitan Isaacson -Date: Tue May 4 22:08:13 2010 -0700 - - rename DOMAIN_SASL to DOMAIN_AUTH - - tests/wocky-connector-test.c | 76 +++++++++++++++++++++--------------------- - 1 files changed, 38 insertions(+), 38 deletions(-) - -commit 7722fae294a23684c1e5559ce1d1cf038389d063 -Author: Eitan Isaacson -Date: Tue May 4 22:01:54 2010 -0700 - - Renamed WockySaslHandler to WockyAuthHandler - - tests/wocky-test-sasl-auth.c | 4 +- - tests/wocky-test-sasl-handler.c | 14 ++-- - wocky/Makefile.am | 4 +- - wocky/wocky-auth-handler.c | 100 ++++++++++++++++++++++++++++++ - wocky/wocky-auth-handler.h | 120 ++++++++++++++++++++++++++++++++++++ - wocky/wocky-auth-registry.c | 30 +++++----- - wocky/wocky-auth-registry.h | 6 +- - wocky/wocky-jabber-auth-digest.c | 12 ++-- - wocky/wocky-jabber-auth-digest.h | 2 +- - wocky/wocky-jabber-auth-password.c | 12 ++-- - wocky/wocky-jabber-auth-password.h | 2 +- - wocky/wocky-jabber-auth.h | 4 +- - wocky/wocky-sasl-auth.h | 4 +- - wocky/wocky-sasl-digest-md5.c | 16 +++--- - wocky/wocky-sasl-digest-md5.h | 2 +- - wocky/wocky-sasl-handler.c | 100 ------------------------------ - wocky/wocky-sasl-handler.h | 120 ------------------------------------ - wocky/wocky-sasl-plain.c | 12 ++-- - wocky/wocky-sasl-plain.h | 2 +- - 19 files changed, 283 insertions(+), 283 deletions(-) - -commit 2b0b9262008ffdb6b0b1db44441cd4a27c17aca6 -Author: Eitan Isaacson -Date: Fri Apr 30 15:37:43 2010 -0700 - - Added WockyJabberAuth, WockyJabberAuthPassword and WockyJabberAuthDigest. - - tests/wocky-connector-test.c | 48 ++-- - tests/wocky-test-sasl-auth.c | 2 +- - wocky/Makefile.am | 9 +- - wocky/wocky-auth-registry.c | 22 +- - wocky/wocky-auth-registry.h | 9 +- - wocky/wocky-connector.c | 382 ++++----------------- - wocky/wocky-connector.h | 5 - - wocky/wocky-jabber-auth-digest.c | 171 +++++++++ - wocky/wocky-jabber-auth-digest.h | 51 +++ - wocky/wocky-jabber-auth-password.c | 139 ++++++++ - wocky/wocky-jabber-auth-password.h | 51 +++ - wocky/wocky-jabber-auth.c | 672 ++++++++++++++++++++++++++++++++++++ - wocky/wocky-jabber-auth.h | 88 +++++ - wocky/wocky-sasl-auth.c | 4 +- - 14 files changed, 1295 insertions(+), 358 deletions(-) - -commit 68af7efd6de961ab2512d4960c5c2a343ea12e8b -Author: Eitan Isaacson -Date: Wed May 5 13:31:05 2010 -0700 - - Don't g_assert on text node contents not being NULL. - - wocky/wocky-node.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit e66e40bdd6ee634b70d023af0575d493db46cf71 -Author: Eitan Isaacson -Date: Tue May 4 22:16:45 2010 -0700 - - unref auth_registry in WockySaslAuth dispose - - wocky/wocky-sasl-auth.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 543bb86b6b7b130a27ed6e4153e47137c6fc43e6 -Author: Will Thompson -Date: Thu May 6 18:54:39 2010 +0100 - - Remove misleading full stop from xml debug message - - wocky/wocky-xmpp-writer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 438f0f35b8703390701b263d5d8668cf4348aa23 -Author: Eitan Isaacson -Date: Tue May 4 13:22:56 2010 -0700 - - Moved g_assert so it does a real sanity check. - - wocky/wocky-auth-registry.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 7d7bf0450c70c8d9d1fe78ee595bb2eab5e37d1d -Merge: a844c4c 5450bf0 -Author: Eitan Isaacson -Date: Tue May 4 13:13:35 2010 -0700 - - Merge branch 'sasl-once-again' - -commit 5450bf0ac8524e95fadf62c998256f9303daa9eb -Author: Eitan Isaacson -Date: Mon May 3 12:11:58 2010 -0700 - - Removed wocky_auth_registry_failure_notify, will add when we implement. - - wocky/wocky-auth-registry.c | 5 ----- - wocky/wocky-auth-registry.h | 3 --- - 2 files changed, 0 insertions(+), 8 deletions(-) - -commit cacf08c4de606512414550b32fa842bcc2c3604d -Author: Eitan Isaacson -Date: Mon May 3 12:08:03 2010 -0700 - - Use wocky_implement_finish_* macros in WockyAuthRegistry. - Changed the flow of wocky_auth_registry_start_auth_finish to match the macros - even though we cannot use any of them because we use two out params. - - wocky/wocky-auth-registry.c | 71 ++++++++++++++++--------------------------- - 1 files changed, 26 insertions(+), 45 deletions(-) - -commit 27de8fd6dc7ea50919de1a71905cb2074a467e5d -Author: Eitan Isaacson -Date: Mon May 3 11:34:33 2010 -0700 - - Default WockyAuthRegistry upon construction. - - New WockyAuthRegistry arg in both wocky_connector_new() and - wocky_sasl_auth_new(). If NULL is passed in either, the default WockyAuthRegisty - is used. - - examples/connect.c | 8 ++------ - examples/register.c | 2 +- - examples/unregister.c | 2 +- - tests/wocky-connector-test.c | 2 +- - tests/wocky-test-sasl-auth.c | 6 +++--- - wocky/wocky-connector.c | 17 +++++------------ - wocky/wocky-connector.h | 3 ++- - wocky/wocky-sasl-auth.c | 5 ++++- - 8 files changed, 19 insertions(+), 26 deletions(-) - -commit f11a7a3774b1ce8204c421703210706b65ba984f -Author: Eitan Isaacson -Date: Mon May 3 10:56:42 2010 -0700 - - Initiaze GErrors to NULL. - - wocky/wocky-auth-registry.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 64ace03b65515adb44117629ceffb4f1b123c712 -Author: Eitan Isaacson -Date: Thu Apr 29 16:27:06 2010 -0700 - - Added WockyAuthRegistry. - - WockyAuthRegistry selects the authentication mechanism based on - it's available handlers, and arbitrates challenge/responses between the handler - and the connector (via Wocky[Sasl|Jabber]Auth). - - Got rid of WOCKY_SASL_AUTH_ERROR* replaced with WOCKY_AUTH_ERROR - - examples/connect.c | 6 +- - tests/wocky-connector-test.c | 36 ++-- - tests/wocky-test-sasl-auth.c | 32 ++- - tests/wocky-test-sasl-handler.c | 6 +- - wocky/Makefile.am | 4 +- - wocky/wocky-auth-registry.c | 374 ++++++++++++++++++++++++++++++++++ - wocky/wocky-auth-registry.h | 122 +++++++++++ - wocky/wocky-connector.c | 39 ++++- - wocky/wocky-connector.h | 3 + - wocky/wocky-sasl-auth.c | 423 +++++++++++++++++++-------------------- - wocky/wocky-sasl-auth.h | 31 +--- - wocky/wocky-sasl-digest-md5.c | 71 +++---- - wocky/wocky-sasl-handler.c | 12 +- - wocky/wocky-sasl-handler.h | 12 +- - wocky/wocky-sasl-plain.c | 17 +- - 15 files changed, 845 insertions(+), 343 deletions(-) - -commit 221d2879fea6439429bd7d7384934eee49c9ca1b -Author: Will Thompson -Date: Tue May 4 13:11:35 2010 +0100 - - muc: rearrange handle_message - - I think this makes it easier to follow. - - wocky/wocky-muc.c | 45 ++++++++++++++++++--------------------------- - 1 files changed, 18 insertions(+), 27 deletions(-) - -commit 9be6e6952c635788ff0cf5ac3ec0da8da05195dc -Author: Will Thompson -Date: Tue May 4 13:06:53 2010 +0100 - - muc: extract determining chat state - - wocky/wocky-muc.c | 20 ++++++++++++++------ - 1 files changed, 14 insertions(+), 6 deletions(-) - -commit bc27c8c96c92b736fe649490cc4894b9685d5c4d -Author: Will Thompson -Date: Tue May 4 13:05:05 2010 +0100 - - muc: extract looking up message sender - - wocky/wocky-muc.c | 90 ++++++++++++++++++++++++++++++++-------------------- - 1 files changed, 55 insertions(+), 35 deletions(-) - -commit c4ff3d43f31db2328cb42f312e16192ed1e5e47a -Author: Will Thompson -Date: Tue May 4 12:56:11 2010 +0100 - - muc: don't drop backlog messages from former members - - If the message is from a full MUC JID, then we certainly do care about - it, even if the sender isn't currently in the MUC, because it might be - scrollback from someone no longer in the room. - - Fixes https://bugs.freedesktop.org/show_bug.cgi?id=27913 - - wocky/wocky-muc.c | 52 ++++++++++++++++++++++++++++------------------------ - 1 files changed, 28 insertions(+), 24 deletions(-) - -commit 47c13b5d97b470cb236c37e08641fcee94c22231 -Author: Will Thompson -Date: Tue May 4 12:30:39 2010 +0100 - - muc: refactor determining message type - - wocky/wocky-muc.c | 55 ++++++++++++++++++++++++++++++++-------------------- - 1 files changed, 34 insertions(+), 21 deletions(-) - -commit 87daf7313d6da0d6c0f61ed87b1be7d00a0e0f2e -Author: Will Thompson -Date: Tue May 4 12:24:40 2010 +0100 - - muc: refactor extracting timestamp from messages. - - wocky/wocky-muc.c | 61 +++++++++++++++++++++++++++++++--------------------- - 1 files changed, 36 insertions(+), 25 deletions(-) - -commit ac48945876299a55a41976c4321ab38be8e0b7ec -Author: Will Thompson -Date: Tue May 4 01:18:01 2010 +0100 - - muc: Remove Google message-without-type kludge. - - So, looking at gabble's gabble_message_util_parse_incoming_message(), we - see that offline messages from Google are assumed to have Telepathy type - Normal, which corresponds to XMPP's type='chat'. So this kludge is - wrong. - - In any case, Google's MUCs don't *have* scrollback! - - So let's just bin it. - - wocky/wocky-muc.c | 10 ---------- - 1 files changed, 0 insertions(+), 10 deletions(-) - -commit 6b6f09d97f91de66c11a4b6a7e28222e8dc911f6 -Author: Will Thompson -Date: Tue May 4 00:52:42 2010 +0100 - - muc: use GEnum to look up chat states - - wocky/wocky-muc.c | 21 +++++---------------- - 1 files changed, 5 insertions(+), 16 deletions(-) - -commit 2298c0b513a4a4f379ee42b65af16cb0bb275594 -Author: Will Thompson -Date: Tue May 4 00:48:38 2010 +0100 - - node: add helper to get the first child for a ns - - tests/wocky-xmpp-node-test.c | 35 +++++++++++++++++++++++++++++++++++ - wocky/wocky-node.c | 31 ++++++++++++++++++++++++++++--- - wocky/wocky-node.h | 2 ++ - 3 files changed, 65 insertions(+), 3 deletions(-) - -commit 1c168790a9dbf9efcdb3272edcbaf0709af7dd2c -Author: Will Thompson -Date: Tue May 4 13:18:22 2010 +0100 - - muc: don't leak new_jid when we change our nick - - REPLACE_STR() does not take ownership of its second argument. - - Also, I expanded another use of REPLACE_STR because it seems stupid to - diff the nicks twice in immediate succession. - - wocky/wocky-muc.c | 13 ++++++++++--- - 1 files changed, 10 insertions(+), 3 deletions(-) - -commit d7a27bd3da61dcd8b612359dbaf2636dc412a816 -Author: Will Thompson -Date: Mon May 3 21:22:07 2010 +0100 - - muc: expunge 'gone' from the known chat states - - A client SHOULD ignore notifications received from other - room occupants. - - — XEP-0045 §5.5 Use in Groupchat - - - As and when Wocky handles chat states for anything other than MUC we can - reinstate this and make MUC map Gone to None. - - wocky/wocky-muc.c | 1 - - wocky/wocky-muc.h | 1 - - 2 files changed, 0 insertions(+), 2 deletions(-) - -commit 3065a6329f44e078243e12f2718b7f8cc978bc7f -Author: Will Thompson -Date: Mon May 3 20:59:50 2010 +0100 - - muc: don't fall through between properties in _set - - wocky/wocky-muc.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 85a891fecb9cef18e1fd675543a9e9b5954772eb -Author: Will Thompson -Date: Tue May 4 13:44:03 2010 +0100 - - Document deliberate fall-throughs. - - Coverity picked these up as possible errors; they're not, but they - should be marked as such. - - wocky/wocky-connector.c | 4 ++++ - wocky/wocky-openssl.c | 6 ++++++ - 2 files changed, 10 insertions(+), 0 deletions(-) - -commit d61e85d691a93d326d0fb1f17c1b558e87c7aa91 -Author: Will Thompson -Date: Tue May 4 13:38:33 2010 +0100 - - openssl: die if we can't create BIOs - - As far as I can tell, failing to create these means OOM. So let's die - properly, rather than logging a debug message and then crashing later in - the function when we use them anyway. - - wocky/wocky-openssl.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 8994f5092dd11aa12cfb9b1a536546219a8e94f6 -Author: Will Thompson -Date: Tue May 4 13:35:40 2010 +0100 - - connector: assert that connect_to_service_finish() isn't broken. - - Coverity was upset because we dereferenced 'error' just before checking - if it's NULL. I think it's right to be upset. But if - g_socket_client_connect_to_service_finish() returned NULL, either it set - 'error', or it's buggy, or we're buggy and called it inappropriately. So - let's blow up if it's NULL in this case. - - wocky/wocky-connector.c | 31 +++++++++++++++++-------------- - 1 files changed, 17 insertions(+), 14 deletions(-) - -commit a9bc4ad499ae27ec354740f82a25386ec8614a01 -Author: Will Thompson -Date: Mon May 3 18:23:05 2010 +0100 - - connector: Clean up GSimpleAsyncResult usage - - • Don't use the op_res at all. If the operation failed, we always set an - error. - • Use _async functions as source tags, not _finish. - • Remove weird spooky action at a distance to change the tag based on - priv->reg_op. - • Actually use a different source tag for _connect_async and - _register_async. - - wocky/wocky-connector.c | 127 +++++++++++++++++++++++++---------------------- - 1 files changed, 67 insertions(+), 60 deletions(-) - -commit 49eb9c93f363ab9a5f97445b977f7bdf758b48b3 -Author: Will Thompson -Date: Mon May 3 18:15:28 2010 +0100 - - Cry a little if CRYPTO_malloc_init() fails - - wocky/wocky-openssl.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit ccbddb5deb7b2eccf04c690c9266b4c0e4970e84 -Author: Will Thompson -Date: Mon May 3 18:10:42 2010 +0100 - - Check return value of SSL_CTX_set_default_verify_paths() - - wocky/wocky-openssl.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 98635423ec684d981a39f3dd852db8949099841b -Author: Will Thompson -Date: Mon May 3 18:01:45 2010 +0100 - - Sanity-check return of extract_stream_error - - wocky/wocky-porter.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -commit a844c4c65ffdc2f860fbecf263caee3efd53b943 -Author: Sjoerd Simons -Date: Thu Apr 29 12:40:02 2010 +0100 - - Plug some memory and refcounting leaks - - wocky/wocky-muc.c | 11 +++++++---- - 1 files changed, 7 insertions(+), 4 deletions(-) - -commit 202699fdeabe15bc230a75ce211eff0762baa603 -Author: Will Thompson -Date: Wed Apr 28 20:38:54 2010 +0100 - - Revert "Add a configure switch to install headers" - - This reverts commit 9148378692967fbcc8b75ce8822a2ab58b3dee66, which - didn't work because of broken Make dependencies that I can't figure out - right now. - - configure.ac | 10 ---- - wocky/Makefile.am | 142 ++++++++++++++++++++++++---------------------------- - 2 files changed, 66 insertions(+), 86 deletions(-) - -commit 9148378692967fbcc8b75ce8822a2ab58b3dee66 -Author: Will Thompson -Date: Mon Mar 22 15:37:29 2010 +0000 - - Add a configure switch to install headers - - Previously, Gabble hard-coded a list of Wocky headers to install if it - was built with --enable-plugin-api. This is fragile in the face of the - list of headers changing. With this patch, passing - --with-installed-headers=/path/to/headers to Wocky's configure will - cause `make install` to put headers there. - - I had to split BUILT_SOURCES and HANDWRITTEN_SOURCES into sources and - headers, and lowercase them because FOO_HEADERS is magic in Automake. I - took the liberty of sorting the lists while I was at it. - - This patch originally didn't work, and was made to work by Mike Ruprecht - , but his fixes languished waiting for me - to review them for long enough that wocky/Makefile.am had changed so - much that the patch needed rewriting. Sorry. :( - - configure.ac | 10 ++++ - wocky/Makefile.am | 142 ++++++++++++++++++++++++++++------------------------ - 2 files changed, 86 insertions(+), 66 deletions(-) - -commit 6ecfe095bb7178adea752d8a30d3f4a125f8f10f -Author: Will Thompson -Date: Thu Apr 22 23:31:34 2010 +0100 - - Return node trees from the distillery - - Previously all these functions were technically incorrect: they were - calling wocky_porter_send_iq_finish(), and if it yielded a stanza, - they'd grab a WockyNode * out of the stanza, *unref the stanza*, and - then return the pointer to the caller. So, this relied on the stanza - happening to stay alive long enough for the caller to frob the nodes. - - This makes some code a bit more verbose, but not much. - - wocky/wocky-pubsub-helpers.c | 28 +++++++++-------- - wocky/wocky-pubsub-helpers.h | 6 ++-- - wocky/wocky-pubsub-node.c | 46 ++++++++++++++++++--------- - wocky/wocky-pubsub-service-protected.h | 2 +- - wocky/wocky-pubsub-service.c | 53 ++++++++++++++++++------------- - 5 files changed, 81 insertions(+), 54 deletions(-) - -commit 513d075b5bfbdb0dc1038c947b360912d3fd8e5d -Author: Will Thompson -Date: Thu Apr 22 23:12:06 2010 +0100 - - Deconstruct the PubSub distillery a bit. - - This exposes a function which accepts a stanza that you've already - verified is an iq type=result, and pulls out a child node. Previously, - if you weren't happy with wocky_pubsub_distill_iq_reply() and friends' - conversion from an element to a GError, you had to re-do the - breakdown, because these guts weren't exposed. - - wocky/wocky-pubsub-helpers.c | 98 +++++++++++++++++++++++++++++++---------- - wocky/wocky-pubsub-helpers.h | 7 +++ - 2 files changed, 81 insertions(+), 24 deletions(-) - -commit 58a14ddab2a60819050542ee2345473a1f2a5a9d -Author: Mike Ruprecht -Date: Fri Apr 23 23:46:26 2010 -0500 - - Fix example program listing for wocky_node_tree_new. - - wocky/wocky-node-tree.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 3aeeababb953192e6846c01c81497f6e64daf2d2 -Author: Will Thompson -Date: Thu Apr 22 14:25:36 2010 +0100 - - Coding style: space after cast - - wocky/wocky-node.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 04deb877174b42ccd19ec7473c523d5af8a49cfd -Merge: efb168b 47b9aac -Author: Will Thompson -Date: Thu Apr 22 14:21:54 2010 +0100 - - Merge branch 'pubsub-modify-affiliates-and-node-config' - - Reviewed-by: Sjoerd Simons - -commit efb168b1eb7d20da6b83eacdf3a5a19398eed9ac -Author: Sjoerd Simons -Date: Tue Apr 20 17:14:05 2010 +0100 - - Document when we would have to fallback to a dummy namespace - - wocky/wocky-xmpp-reader.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 47b9aac9083fe57984822b94bdfa7e417100f194 -Author: Will Thompson -Date: Tue Apr 20 16:41:47 2010 +0100 - - Document WockyPubsubSubscriptionState - - wocky/wocky-pubsub-service.c | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+), 0 deletions(-) - -commit c2ecec40c3e82d44d34c7ff3cd50d8ee61f3b303 -Author: Will Thompson -Date: Mon Apr 19 19:41:15 2010 +0100 - - Refactor handling reply - - All the WockyPubsubNode helpers for handling replies start from a node - you've retrieved (presumably with a _distill_ function). - wocky_pubsub_service_handle_create_node_reply() did not; this patch - brings it in line with the others. - - wocky/wocky-pubsub-service-protected.h | 3 +- - wocky/wocky-pubsub-service.c | 42 ++++++++++++++++++++++---------- - 2 files changed, 30 insertions(+), 15 deletions(-) - -commit 3388359119c424236db9a4813b1a1d9a96c7abfb -Author: Will Thompson -Date: Mon Apr 19 17:30:32 2010 +0100 - - Implement retrieving a node's configuration - - tests/wocky-pubsub-node-test.c | 129 +++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-node-protected.h | 5 ++ - wocky/wocky-pubsub-node.c | 96 ++++++++++++++++++++++++++ - wocky/wocky-pubsub-node.h | 11 +++ - 4 files changed, 241 insertions(+), 0 deletions(-) - -commit 8072b3d85b9f6ddd6729c0b18bcb1c869871dbcb -Author: Will Thompson -Date: Mon Apr 19 17:30:08 2010 +0100 - - Add a _finish macro that returns a copy of a pointer - - wocky/wocky-utils.h | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit 0b22a79a042f3ab3f1b284b52030b4c21231a399 -Author: Will Thompson -Date: Mon Apr 19 15:14:25 2010 +0100 - - Implement modifying affiliates - - tests/wocky-pubsub-node-test.c | 115 +++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-node-protected.h | 6 ++ - wocky/wocky-pubsub-node.c | 122 +++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-node.h | 12 ++++ - 4 files changed, 255 insertions(+), 0 deletions(-) - -commit 3aa9ac4cd18ecdce04bdd2ad3d528377c82284b7 -Author: Sjoerd Simons -Date: Tue Apr 20 15:45:29 2010 +0100 - - Update .gitignore - - .gitignore | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) - -commit e5b3f9dd089521582d652dda8fe442e066ec7bae -Author: Sjoerd Simons -Date: Tue Apr 20 15:20:56 2010 +0100 - - Can't have tags with spaces - - tests/wocky-node-tree-test.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 871837f00a03a6b833430ae60f5b4677126395c7 -Author: Sjoerd Simons -Date: Tue Apr 20 15:19:26 2010 +0100 - - Fix wocky_node_tree_new example - - wocky/wocky-node-tree.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit abedf45b2cc49ef54a582a3547d94a42dddac9bf -Author: Will Thompson -Date: Mon Apr 19 15:25:07 2010 +0100 - - pubsub_affiliation_new: log more clearly if @node is NULL - - Ahem. - - wocky/wocky-pubsub-node.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit aa2858852d3c4496e0d3cf9a5ad3fdb328ce2377 -Author: Will Thompson -Date: Mon Apr 19 15:14:07 2010 +0100 - - Document WockyPubsubAffiliation and related methods. - - wocky/wocky-pubsub-node.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 69 insertions(+), 0 deletions(-) - -commit cde08a5279cd9dad033a456a2043e70395375441 -Author: Will Thompson -Date: Mon Apr 19 13:38:41 2010 +0100 - - Generalize returning TRUE or an error from _finish() - - wocky/wocky-pubsub-node.c | 18 ++---------------- - wocky/wocky-utils.h | 8 ++++++++ - 2 files changed, 10 insertions(+), 16 deletions(-) - -commit 028f7ad09c8afe242acc9a30c0e32f741b2bcee0 -Author: Will Thompson -Date: Mon Apr 19 12:00:25 2010 +0100 - - PubsubNode: Generalize void IQ reply handler - - wocky/wocky-pubsub-node.c | 30 ++++-------------------------- - 1 files changed, 4 insertions(+), 26 deletions(-) - -commit df2d8f060ae37d2ced635b54407b944d64425673 -Author: Sjoerd Simons -Date: Tue Apr 20 14:42:51 2010 +0100 - - Add a test for wocky_node_add_node_tree - - tests/wocky-node-tree-test.c | 33 +++++++++++++++++++++++++++++++++ - 1 files changed, 33 insertions(+), 0 deletions(-) - -commit 93459fda35b00a0be13e732ffcce90261c16d41b -Author: Sjoerd Simons -Date: Tue Apr 20 14:42:23 2010 +0100 - - Add API to insert a NodeTree under a node - - wocky/wocky-node-tree.h | 2 +- - wocky/wocky-node.c | 20 ++++++++++++++++++++ - wocky/wocky-node.h | 4 ++++ - wocky/wocky-types.h | 1 + - 4 files changed, 26 insertions(+), 1 deletions(-) - -commit 993ce5af20442183443594d09d467d53c9f3df45 -Author: Sjoerd Simons -Date: Mon Apr 19 18:18:41 2010 +0100 - - Add API to serialize node trees - - wocky/wocky-xmpp-writer.c | 64 ++++++++++++++++++++++++++++++++++---------- - wocky/wocky-xmpp-writer.h | 6 ++++ - 2 files changed, 55 insertions(+), 15 deletions(-) - -commit 535645889d2c94673518da10282d1007eb9eac48 -Author: Sjoerd Simons -Date: Mon Apr 19 18:18:25 2010 +0100 - - Add debug helpers for node trees - - wocky/wocky-debug.c | 39 +++++++++++++++++++++++++++++++-------- - wocky/wocky-debug.h | 10 ++++++++++ - 2 files changed, 41 insertions(+), 8 deletions(-) - -commit 57a525b9032020ade15fa0311498997716f0a2ef -Author: Sjoerd Simons -Date: Mon Apr 19 17:48:26 2010 +0100 - - Add API to make new NodeTrees with copies of a given node - - tests/wocky-node-tree-test.c | 23 +++++++++++++++++++++++ - wocky/wocky-node-tree.c | 18 ++++++++++++++++++ - wocky/wocky-node-tree.h | 2 ++ - 3 files changed, 43 insertions(+), 0 deletions(-) - -commit f8b9994ad7b31b7b4d1e2df7603c2083e60932e1 -Author: Sjoerd Simons -Date: Mon Apr 19 17:42:08 2010 +0100 - - Add an internal node copy function - - wocky/Makefile.am | 1 + - wocky/wocky-node-private.h | 33 +++++++++++++++++++++++++++++++++ - wocky/wocky-node.c | 31 +++++++++++++++++++++++++++++++ - 3 files changed, 65 insertions(+), 0 deletions(-) - -commit 53e19d288d9d453d8c3df88b442495d22d7014af -Author: Sjoerd Simons -Date: Mon Apr 19 17:11:24 2010 +0100 - - Add a simple test for the nodetree building functions - - tests/Makefile.am | 7 +++++ - tests/wocky-node-tree-test.c | 54 ++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 61 insertions(+), 0 deletions(-) - -commit 842b0082806d9ed928d19f59ae38b045d09f7dad -Author: Sjoerd Simons -Date: Mon Apr 19 16:46:56 2010 +0100 - - Add API to access the top node of a WockyNodeTree - - wocky/wocky-node-tree.c | 18 +++++++++++------- - wocky/wocky-node-tree.h | 3 ++- - wocky/wocky-stanza.c | 2 +- - 3 files changed, 14 insertions(+), 9 deletions(-) - -commit 360d7e1a3183932dcc0198e4ec94fe553cdc4e97 -Author: Sjoerd Simons -Date: Mon Apr 19 16:43:33 2010 +0100 - - Add API to create node-trees - - wocky/wocky-node-tree.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-node-tree.h | 8 +++++++ - 2 files changed, 60 insertions(+), 0 deletions(-) - -commit c22f6ccec7eeac006ca4cd1b85bffc6be7aa9bc2 -Author: Sjoerd Simons -Date: Mon Apr 19 15:58:20 2010 +0100 - - Disallow changing the namespace of a node - - As we assert that a node should always have a namespace allowing the API - user to set it later doesn't make that much sense. Remove the API to set - and add some utility API to make setting the correct namespace at node - creation time easier. - - wocky/wocky-node.c | 72 +++++++++++++++++++++++++++++++++------------------ - wocky/wocky-node.h | 11 ++++++-- - 2 files changed, 54 insertions(+), 29 deletions(-) - -commit ba3be5104d9e30fb74d9d61fd992db7bb11e0c1d -Author: Sjoerd Simons -Date: Mon Apr 19 15:57:48 2010 +0100 - - Always directly set the namespace when adding children - - wocky/wocky-xmpp-error.c | 9 ++++----- - 1 files changed, 4 insertions(+), 5 deletions(-) - -commit 969a12f4e13a46f0ccef3f125232811a32b94aa0 -Author: Sjoerd Simons -Date: Mon Apr 19 15:39:23 2010 +0100 - - Require nodes to always have a namespace - - wocky/wocky-node.c | 33 +++++++++++++++++++++++---------- - 1 files changed, 23 insertions(+), 10 deletions(-) - -commit 4f0b7b2163b1b0e9666189ad9cddc90d52cba96b -Author: Sjoerd Simons -Date: Mon Apr 19 15:38:49 2010 +0100 - - Make sure nodes/stanzas we create always have a namespace - - tests/wocky-test-connector-server.c | 4 +++- - tests/wocky-xmpp-node-test.c | 2 +- - wocky/wocky-xmpp-reader.c | 11 ++++++++++- - 3 files changed, 14 insertions(+), 3 deletions(-) - -commit 97268cafb36e19ca0b1fe21662ac6a36f444b26c -Author: Sjoerd Simons -Date: Fri Apr 16 19:04:58 2010 +0100 - - Add a top-node constuct time property to NodeTree - - wocky/wocky-node-tree.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-stanza.c | 5 ++- - 2 files changed, 58 insertions(+), 2 deletions(-) - -commit 4829c453b09a295d634bfff2bf152dbf0c1bca5a -Author: Sjoerd Simons -Date: Mon Apr 19 19:59:43 2010 +0100 - - Add a test for wocky_node_add_build - - tests/wocky-xmpp-node-test.c | 27 +++++++++++++++++++++++++++ - 1 files changed, 27 insertions(+), 0 deletions(-) - -commit a058dde837493cbf9fe3ae0923904e8ff77fd69e -Author: Sjoerd Simons -Date: Mon Apr 19 19:57:39 2010 +0100 - - Remove the first_tag argument from node_add_build - - Because of the first_tag argument we can't pass things on nicely to _build_va, - but given that this is the same pattern as several other function leaving it - out should be fine. - - wocky/wocky-node.c | 4 +--- - wocky/wocky-node.h | 3 +-- - 2 files changed, 2 insertions(+), 5 deletions(-) - -commit af2c1fbf65edd1936a50e3cf89bd1270840f6ae5 -Author: Sjoerd Simons -Date: Mon Apr 19 19:10:42 2010 +0100 - - Let gtk-doc take care of building the sections file - - docs/reference/Makefile.am | 4 +- - docs/reference/wocky-sections.txt | 833 ------------------------------------- - 2 files changed, 2 insertions(+), 835 deletions(-) - -commit 3de8b93eee0c99e70af5795f253bf509aeb67ede -Author: Sjoerd Simons -Date: Mon Apr 19 19:10:10 2010 +0100 - - Documentation tweaks - - wocky/wocky-node.c | 9 ++++----- - 1 files changed, 4 insertions(+), 5 deletions(-) - -commit c33a0fc75ba253de97c69b0f462400b29ca01644 -Author: Sjoerd Simons -Date: Mon Apr 19 19:09:56 2010 +0100 - - g_quark_from_string is NULL safe - - wocky/wocky-node.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit eddd4264a08422a72f88b1f70004a3062801d567 -Author: Sjoerd Simons -Date: Mon Apr 19 19:09:29 2010 +0100 - - Remove unimplemented functions - - wocky/wocky-node-tree.h | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -commit 125e505715d1f4d8a4148627d8d17c6c4dba0296 -Author: Sjoerd Simons -Date: Mon Apr 19 18:33:06 2010 +0100 - - Correct copyright years - - wocky/wocky-node-tree.c | 2 +- - wocky/wocky-node-tree.h | 2 +- - wocky/wocky-node.c | 2 +- - wocky/wocky-node.h | 2 +- - wocky/wocky-stanza.c | 2 +- - wocky/wocky-stanza.h | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -commit 2f934083b56111eb99ff6039d876282d2f5b13da -Author: Sjoerd Simons -Date: Fri Apr 16 15:54:29 2010 +0100 - - Add documentation for wocky_node_add_build - - wocky/wocky-node.c | 25 +++++++++++++++++++++++++ - 1 files changed, 25 insertions(+), 0 deletions(-) - -commit 9fb0f63eb4967cd0aa752b2ff70ac6ab84ee6006 -Author: Sjoerd Simons -Date: Fri Apr 16 15:50:34 2010 +0100 - - Fixup the documentation of wocky_stanza_build - - wocky/wocky-stanza.c | 8 +++----- - 1 files changed, 3 insertions(+), 5 deletions(-) - -commit f3d7246436753078db1093e5ea5ad28946c01c77 -Author: Sjoerd Simons -Date: Thu Apr 15 14:56:13 2010 +0100 - - Update wocky-docs.sgml - - docs/reference/wocky-docs.sgml | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit c9aaac580d008d7f1c0e110f5cdd8706741dc72f -Author: Sjoerd Simons -Date: Thu Apr 15 14:41:44 2010 +0100 - - Rename WockyXmppNode to WockyNode - - examples/connect.c | 14 +- - tests/wocky-data-form-test.c | 28 +- - tests/wocky-pep-service-test.c | 10 +- - tests/wocky-porter-test.c | 20 +- - tests/wocky-pubsub-node-test.c | 62 +- - tests/wocky-pubsub-service-test.c | 42 +- - tests/wocky-pubsub-test-helpers.c | 12 +- - tests/wocky-pubsub-test-helpers.h | 2 +- - tests/wocky-roster-test.c | 86 ++-- - tests/wocky-stanza-test.c | 2 +- - tests/wocky-test-connector-server.c | 82 ++-- - tests/wocky-test-helper.h | 24 +- - tests/wocky-test-sasl-auth-server.c | 22 +- - tests/wocky-xmpp-node-test.c | 98 ++-- - tests/wocky-xmpp-readwrite-test.c | 28 +- - wocky/Makefile.am | 4 +- - wocky/wocky-connector.c | 58 +- - wocky/wocky-data-form.c | 126 ++-- - wocky/wocky-data-form.h | 8 +- - wocky/wocky-debug.c | 2 +- - wocky/wocky-muc.c | 98 ++-- - wocky/wocky-node-tree.c | 2 +- - wocky/wocky-node-tree.h | 4 +- - wocky/wocky-node.c | 1240 ++++++++++++++++++++++++++++++++ - wocky/wocky-node.h | 206 ++++++ - wocky/wocky-pep-service.c | 4 +- - wocky/wocky-pep-service.h | 2 +- - wocky/wocky-porter.c | 16 +- - wocky/wocky-pubsub-helpers.c | 32 +- - wocky/wocky-pubsub-helpers.h | 14 +- - wocky/wocky-pubsub-node-protected.h | 26 +- - wocky/wocky-pubsub-node.c | 90 ++-- - wocky/wocky-pubsub-node.h | 6 +- - wocky/wocky-pubsub-service-protected.h | 12 +- - wocky/wocky-pubsub-service.c | 70 +- - wocky/wocky-roster.c | 52 +- - wocky/wocky-sasl-auth.c | 34 +- - wocky/wocky-stanza.c | 30 +- - wocky/wocky-stanza.h | 4 +- - wocky/wocky-xmpp-error.c | 46 +- - wocky/wocky-xmpp-error.h | 12 +- - wocky/wocky-xmpp-node.c | 1240 -------------------------------- - wocky/wocky-xmpp-node.h | 206 ------ - wocky/wocky-xmpp-reader.c | 16 +- - wocky/wocky-xmpp-writer.c | 14 +- - wocky/wocky.c | 6 +- - 46 files changed, 2106 insertions(+), 2106 deletions(-) - -commit 7b4549cf87a279d157d09618f3b39f702ae475ce -Author: Sjoerd Simons -Date: Thu Apr 15 13:24:51 2010 +0100 - - Split out a base NodeTree object from Stanza - - Add a seperate NodeTree object as a parent to Stanza. This NodeTree object can - later be used as a container for subtrees to copy out or into Stanzas - - Also move add_build* to WockyXmppNode as it can be useful in user code as well - - wocky/Makefile.am | 2 + - wocky/wocky-node-tree.c | 85 +++++++++++++++++++++++++++++++++++ - wocky/wocky-node-tree.h | 73 ++++++++++++++++++++++++++++++ - wocky/wocky-stanza.c | 114 ++--------------------------------------------- - wocky/wocky-stanza.h | 18 +------ - wocky/wocky-xmpp-node.c | 105 +++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-node.h | 18 +++++++ - 7 files changed, 290 insertions(+), 125 deletions(-) - -commit 7487f34f12c940e332b52277098c59186f3a5eb5 -Author: Sjoerd Simons -Date: Thu Apr 15 12:40:20 2010 +0100 - - Check all tests for coding style and fix the style a bit - - tests/Makefile.am | 21 ++++++++++++++++++--- - tests/wocky-contact-factory-test.c | 4 ++-- - tests/wocky-stanza-test.c | 4 ++-- - tests/wocky-tls-test.c | 4 ++-- - 4 files changed, 24 insertions(+), 9 deletions(-) - -commit b596cd12bb602dd95e610de82b7a3c119fede879 -Author: Sjoerd Simons -Date: Thu Apr 15 12:38:01 2010 +0100 - - Use wocky_stanza_get_top_node instead of ->node - - examples/connect.c | 24 ++++++++++++------ - tests/wocky-data-form-test.c | 43 ++++++++++++++++++++++------------ - tests/wocky-pep-service-test.c | 4 +- - tests/wocky-porter-test.c | 28 +++++++++++++-------- - tests/wocky-pubsub-node-test.c | 2 +- - tests/wocky-pubsub-service-test.c | 23 +++++++++-------- - tests/wocky-roster-test.c | 32 ++++++++++++++----------- - tests/wocky-stanza-test.c | 4 +- - tests/wocky-test-connector-server.c | 26 +++++++++++--------- - tests/wocky-test-helper.c | 3 +- - tests/wocky-test-helper.h | 12 +++++---- - tests/wocky-test-sasl-auth-server.c | 39 +++++++++++++++++------------- - tests/wocky-xmpp-node-test.c | 35 ++++++++++++++++------------ - tests/wocky-xmpp-readwrite-test.c | 11 +++++--- - wocky/wocky-connector.c | 25 ++++++++++++-------- - wocky/wocky-debug.c | 3 +- - wocky/wocky-muc.c | 21 ++++++++++------ - wocky/wocky-pep-service.c | 3 +- - wocky/wocky-porter.c | 20 +++++++++------ - wocky/wocky-pubsub-helpers.c | 3 +- - wocky/wocky-pubsub-service.c | 5 ++- - wocky/wocky-roster.c | 10 ++++--- - wocky/wocky-sasl-auth.c | 44 ++++++++++++++++++++-------------- - wocky/wocky-stanza.c | 33 ++++++++++++++++---------- - wocky/wocky-xmpp-node.c | 2 +- - wocky/wocky-xmpp-writer.c | 2 +- - 26 files changed, 271 insertions(+), 186 deletions(-) - -commit 71d195fd71886cdea3275dd9a2763ba26bbf6e6b -Author: Sjoerd Simons -Date: Wed Apr 14 14:19:18 2010 +0100 - - Add a namespace argument to wocky_stanza_new - - examples/connect.c | 3 +-- - tests/wocky-test-connector-server.c | 14 +++++--------- - tests/wocky-test-sasl-auth-server.c | 15 +++++---------- - tests/wocky-xmpp-node-test.c | 2 +- - wocky/wocky-connector.c | 3 +-- - wocky/wocky-sasl-auth.c | 7 ++----- - wocky/wocky-stanza.c | 7 +++---- - wocky/wocky-stanza.h | 2 +- - wocky/wocky-xmpp-node.c | 12 ++++++------ - wocky/wocky-xmpp-node.h | 2 +- - wocky/wocky-xmpp-reader.c | 9 +++++---- - 11 files changed, 31 insertions(+), 45 deletions(-) - -commit 8368ca138c8b0a39cb07598a2001cbb83bff7228 -Author: Sjoerd Simons -Date: Wed Apr 14 14:08:42 2010 +0100 - - Add shorthand for testing (in)equality of stanzas - - tests/wocky-porter-test.c | 4 ++-- - tests/wocky-pubsub-node-test.c | 2 +- - tests/wocky-stanza-test.c | 14 +++++++------- - tests/wocky-test-helper.h | 7 +++++++ - tests/wocky-xmpp-node-test.c | 22 ++++++++++++---------- - tests/wocky-xmpp-readwrite-test.c | 6 +++--- - 6 files changed, 32 insertions(+), 23 deletions(-) - -commit a7ae4097134b1d2078689c192000f93e48e17aad -Author: Sjoerd Simons -Date: Wed Apr 14 13:56:46 2010 +0100 - - Introduce wocky_stanza_get_top_node - - wocky/wocky-stanza.c | 12 ++++++++++++ - wocky/wocky-stanza.h | 4 +++- - 2 files changed, 15 insertions(+), 1 deletions(-) - -commit 8c9b3ae6101cea9187741d6794ee984483275555 -Author: Sjoerd Simons -Date: Wed Apr 14 11:30:25 2010 +0100 - - Rename _stanzas_equal to _stanzas_equal_no_id - - tests/wocky-data-form-test.c | 2 +- - tests/wocky-pubsub-node-test.c | 4 ++-- - tests/wocky-pubsub-service-test.c | 2 +- - tests/wocky-test-helper.h | 3 ++- - 4 files changed, 6 insertions(+), 5 deletions(-) - -commit 3d6c227b84555e16a0fafea4839ef7debda1299e -Author: Sjoerd Simons -Date: Tue Apr 13 16:23:20 2010 +0100 - - Rename WockyXmppStanza to WockyStanza - - docs/reference/wocky-docs.sgml | 2 +- - docs/reference/wocky-sections.txt | 38 +- - examples/connect.c | 10 +- - tests/Makefile.am | 8 +- - tests/wocky-connector-test.c | 4 +- - tests/wocky-data-form-test.c | 34 +- - tests/wocky-pep-service-test.c | 22 +- - tests/wocky-porter-test.c | 234 ++++++------ - tests/wocky-pubsub-node-test.c | 62 ++-- - tests/wocky-pubsub-service-test.c | 58 ++-- - tests/wocky-roster-test.c | 56 ++-- - tests/wocky-stanza-test.c | 579 ++++++++++++++++++++++++++++ - tests/wocky-test-connector-server.c | 128 ++++---- - tests/wocky-test-helper.c | 8 +- - tests/wocky-test-helper.h | 2 +- - tests/wocky-test-sasl-auth-server.c | 36 +- - tests/wocky-test-sasl-auth-server.h | 6 +- - tests/wocky-test-sasl-auth.c | 4 +- - tests/wocky-xmpp-connection-test.c | 32 +- - tests/wocky-xmpp-node-test.c | 32 +- - tests/wocky-xmpp-reader-test.c | 4 +- - tests/wocky-xmpp-readwrite-test.c | 10 +- - tests/wocky-xmpp-stanza-test.c | 579 ---------------------------- - wocky/Makefile.am | 4 +- - wocky/wocky-connector.c | 94 +++--- - wocky/wocky-connector.h | 2 +- - wocky/wocky-debug.c | 2 +- - wocky/wocky-debug.h | 4 +- - wocky/wocky-muc.c | 62 ++-- - wocky/wocky-muc.h | 4 +- - wocky/wocky-pep-service.c | 12 +- - wocky/wocky-pep-service.h | 6 +- - wocky/wocky-porter.c | 60 ++-- - wocky/wocky-porter.h | 18 +- - wocky/wocky-pubsub-helpers.c | 16 +- - wocky/wocky-pubsub-helpers.h | 6 +- - wocky/wocky-pubsub-node-protected.h | 12 +- - wocky/wocky-pubsub-node.c | 44 ++-- - wocky/wocky-pubsub-node.h | 2 +- - wocky/wocky-pubsub-service-protected.h | 4 +- - wocky/wocky-pubsub-service.c | 30 +- - wocky/wocky-pubsub-service.h | 2 +- - wocky/wocky-roster.c | 48 ++-- - wocky/wocky-sasl-auth.c | 18 +- - wocky/wocky-sasl-auth.h | 4 +- - wocky/wocky-sasl-handler.h | 2 +- - wocky/wocky-stanza.c | 650 +++++++++++++++++++++++++++++++ - wocky/wocky-stanza.h | 147 +++++++ - wocky/wocky-xmpp-connection.c | 18 +- - wocky/wocky-xmpp-connection.h | 6 +- - wocky/wocky-xmpp-error.c | 2 +- - wocky/wocky-xmpp-reader.c | 22 +- - wocky/wocky-xmpp-reader.h | 6 +- - wocky/wocky-xmpp-stanza.c | 652 -------------------------------- - wocky/wocky-xmpp-stanza.h | 147 ------- - wocky/wocky-xmpp-writer.c | 4 +- - wocky/wocky-xmpp-writer.h | 4 +- - 57 files changed, 2030 insertions(+), 2032 deletions(-) - -commit 9c489c118b7aa339d9a08cd7e749b486c412650c -Author: Will Thompson -Date: Tue Apr 13 15:58:45 2010 +0100 - - Use G_TYPE_INSTANCE_GET_PRIVATE() correctly. - - Rather than repeatedly calling that macro (which is reasonably - expensive), it should be called once in the object's _init() function - and stored in a pointer in the public structure. This patch changes the - whole of Wocky to do this correctly! - - tests/wocky-test-connector-server.c | 73 ++++++++++++------------- - tests/wocky-test-connector-server.h | 3 + - tests/wocky-test-sasl-auth-server.c | 57 +++++++++---------- - tests/wocky-test-sasl-auth-server.h | 4 ++ - wocky/wocky-bare-contact.c | 56 +++++++++----------- - wocky/wocky-bare-contact.h | 3 + - wocky/wocky-connector.c | 101 +++++++++++++++++------------------ - wocky/wocky-connector.h | 2 + - wocky/wocky-contact-factory.c | 27 ++++----- - wocky/wocky-contact-factory.h | 2 + - wocky/wocky-contact.c | 22 +++----- - wocky/wocky-contact.h | 3 + - wocky/wocky-data-form.c | 30 ++++------ - wocky/wocky-data-form.h | 3 + - wocky/wocky-muc.c | 54 +++++++++---------- - wocky/wocky-muc.h | 2 + - wocky/wocky-pep-service.c | 32 ++++------- - wocky/wocky-pep-service.h | 4 ++ - wocky/wocky-porter.c | 68 +++++++++++------------ - wocky/wocky-porter.h | 2 + - wocky/wocky-pubsub-node.c | 48 +++++++---------- - wocky/wocky-pubsub-node.h | 4 ++ - wocky/wocky-pubsub-service.c | 46 +++++++--------- - wocky/wocky-pubsub-service.h | 3 + - wocky/wocky-resource-contact.c | 32 ++++------- - wocky/wocky-resource-contact.h | 4 ++ - wocky/wocky-roster.c | 54 +++++++++---------- - wocky/wocky-roster.h | 3 + - wocky/wocky-sasl-auth.c | 35 +++++------- - wocky/wocky-sasl-auth.h | 4 ++ - wocky/wocky-session.c | 34 +++++------- - wocky/wocky-session.h | 4 ++ - wocky/wocky-xmpp-connection.c | 56 +++++++++---------- - wocky/wocky-xmpp-connection.h | 3 + - wocky/wocky-xmpp-reader.c | 49 ++++++++--------- - wocky/wocky-xmpp-reader.h | 3 + - wocky/wocky-xmpp-stanza.c | 14 ++--- - wocky/wocky-xmpp-stanza.h | 4 ++ - wocky/wocky-xmpp-writer.c | 35 ++++++------- - wocky/wocky-xmpp-writer.h | 4 ++ - 40 files changed, 480 insertions(+), 507 deletions(-) - -commit 2e47a76da94cc4945fc32fc6b8c2c56b99a156cf -Merge: 970a4d6 ff4b9ff -Author: Will Thompson -Date: Tue Apr 13 15:59:52 2010 +0100 - - Merge branch 'dsl' - - Reviewed-by: Sjoerd Simons - -commit ff4b9ff64dc9af98ccd39d4d4a852d711cee271d -Author: Will Thompson -Date: Sat Apr 10 01:23:22 2010 +0100 - - Use ASCII mnemonics throughout. - - tests/wocky-data-form-test.c | 406 +++++++++++++++++----------------- - tests/wocky-pep-service-test.c | 40 ++-- - tests/wocky-porter-test.c | 142 ++++++------ - tests/wocky-pubsub-node-test.c | 230 ++++++++++---------- - tests/wocky-pubsub-service-test.c | 198 +++++++++--------- - tests/wocky-roster-test.c | 172 ++++++++-------- - tests/wocky-test-connector-server.c | 218 ++++++++++---------- - tests/wocky-test-sasl-auth-server.c | 2 +- - tests/wocky-xmpp-connection-test.c | 10 +- - tests/wocky-xmpp-node-test.c | 52 +++--- - tests/wocky-xmpp-readwrite-test.c | 10 +- - tests/wocky-xmpp-stanza-test.c | 276 ++++++++++++------------ - wocky/wocky-connector.c | 66 +++--- - wocky/wocky-muc.c | 6 +- - wocky/wocky-pep-service.c | 24 +- - wocky/wocky-porter.c | 8 +- - wocky/wocky-pubsub-helpers.c | 14 +- - wocky/wocky-pubsub-service.c | 8 +- - wocky/wocky-roster.c | 40 ++-- - 19 files changed, 961 insertions(+), 961 deletions(-) - -commit 4e1c0ad275c1a7c3cb4f225e845cac73ab10ffb7 -Author: Will Thompson -Date: Sat Apr 10 01:18:31 2010 +0100 - - Use G_GNUC_NULL_TERMINATED for build spec-cy functions - - Unfortunately, the functions' previous signatures were awkward for - NULL-termination: because the first tag in the specification was an - explicit non-pointer argument, if you didn't actually want the stanza to - have a body you had to say: - - wocky_xmpp_stanza_build_iq_result (..., WOCKY_STANZA_END, NULL); - - You couldn't use NULL in place of WOCKY_STANZA_END because WockyBuildTag - isn't a pointer type; and you couldn't omit it because then the varargs - aren't NULL-terminated. So, this patch removes the explicit first tag - argument. While this may be slightly worse from a documentation point of - view, I think it's better than having to document the special case - above. - - tests/wocky-data-form-test.c | 16 ++-- - tests/wocky-pep-service-test.c | 6 +- - tests/wocky-porter-test.c | 146 +++++++++++++++++----------------- - tests/wocky-pubsub-node-test.c | 32 ++++---- - tests/wocky-pubsub-service-test.c | 30 ++++---- - tests/wocky-roster-test.c | 42 +++++----- - tests/wocky-test-connector-server.c | 52 ++++++------ - tests/wocky-test-sasl-auth-server.c | 2 +- - tests/wocky-xmpp-connection-test.c | 12 ++-- - tests/wocky-xmpp-node-test.c | 16 ++-- - tests/wocky-xmpp-readwrite-test.c | 2 +- - tests/wocky-xmpp-stanza-test.c | 58 +++++++------- - wocky/wocky-connector.c | 16 ++-- - wocky/wocky-muc.c | 8 +- - wocky/wocky-pep-service.c | 4 +- - wocky/wocky-porter.c | 22 ++--- - wocky/wocky-porter.h | 3 +- - wocky/wocky-pubsub-helpers.c | 2 +- - wocky/wocky-pubsub-service.c | 2 +- - wocky/wocky-roster.c | 12 ++-- - wocky/wocky-xmpp-stanza.c | 39 ++++------ - wocky/wocky-xmpp-stanza.h | 10 +-- - 22 files changed, 258 insertions(+), 274 deletions(-) - -commit 6fb6e88edc7542a209e547796f5827a6af0af5be -Author: Will Thompson -Date: Tue Mar 16 22:11:05 2010 +0000 - - Permit ASCII mnemonics for stanza build specs - - wocky/wocky-xmpp-stanza.c | 18 ++++++++++++++++++ - wocky/wocky-xmpp-stanza.h | 14 +++++++------- - 2 files changed, 25 insertions(+), 7 deletions(-) - -commit 244e55ba32a6ed4ad6b9709167332d671cc5e752 -Author: Will Thompson -Date: Tue Mar 16 22:04:44 2010 +0000 - - Detect (and fix) misbalanced stanza build specs - - tests/wocky-data-form-test.c | 1 + - tests/wocky-pubsub-service-test.c | 14 ++++++++++---- - tests/wocky-test-connector-server.c | 11 +++++++++-- - tests/wocky-xmpp-node-test.c | 1 + - wocky/wocky-xmpp-stanza.c | 17 +++++++++++++++++ - 5 files changed, 38 insertions(+), 6 deletions(-) - -commit 970a4d6f9c2c2f59d78d9e6b8e347b31440d0088 -Author: Will Thompson -Date: Wed Apr 7 15:14:56 2010 +0100 - - Correctly scan generated code in out-of-tree builds - - docs/reference/Makefile.am | 13 +++++++++++-- - 1 files changed, 11 insertions(+), 2 deletions(-) - -commit f2dc3d965438fb69fcb516a76926dbf2671d0fd3 -Author: Will Thompson -Date: Wed Apr 7 15:13:16 2010 +0100 - - Fix typoes and missing params in pubsub documentation - - wocky/wocky-pubsub-node.c | 24 +++++++++++++++++++----- - wocky/wocky-pubsub-service.c | 10 ++++++---- - 2 files changed, 25 insertions(+), 9 deletions(-) - -commit ec25e9372fd4fba4de419bffa6140b2861c0c17b -Author: Will Thompson -Date: Wed Apr 7 15:09:16 2010 +0100 - - Consistently use 'self' in DataForm, PubsubNode, PubsubService - - These classes sometimes used 'self' as the first parameter to object - methods, and sometimes used 'form', 'node', 'service', etc. In some - cases, the parameter name was different between the declaration and - definition. This patch makes them always use 'self', and tweaks the - gtkdoc comments to match (some of which matched the definition rather - than the declaration, which makes gtkdoc cry). - - wocky/wocky-data-form.c | 52 +++++++++++++++++++++--------------------- - wocky/wocky-data-form.h | 16 ++++++------ - wocky/wocky-pubsub-node.h | 8 +++--- - wocky/wocky-pubsub-service.c | 4 +- - wocky/wocky-pubsub-service.h | 16 ++++++------ - 5 files changed, 48 insertions(+), 48 deletions(-) - -commit 6c18473e57612f9dc475ba79f5339b7f32a3bbfd -Author: Will Thompson -Date: Wed Apr 7 15:03:38 2010 +0100 - - Add a bunch of new symbols to wocky-sections.txt - - docs/reference/wocky-sections.txt | 26 ++++++++++++++++++++++++++ - 1 files changed, 26 insertions(+), 0 deletions(-) - -commit a3646b39d2a493ed8d818f55b23d6cc9cc4b5503 -Author: Will Thompson -Date: Wed Apr 7 15:00:05 2010 +0100 - - Remove non-existent sections from wocky-docs.sgml - - The WockyPubsubService enums are included in the WockyPubsubService - section, and wocky-types.h doesn't have any documentation of its own. - - docs/reference/wocky-docs.sgml | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 6f5db6650014120076eff8e915a5ec666740ed6e -Merge: 31ccb4e 8e6649d -Author: Will Thompson -Date: Tue Apr 6 19:53:32 2010 +0100 - - Merge branch 'pubsub-notifications-subscribers-affiliates' - - Conflicts: - wocky/wocky-utils.c - wocky/wocky-utils.h - - Reviewed-by: Simon McVittie - -commit 8e6649df9869c7db67e80136bca3d759c652c1ac -Author: Will Thompson -Date: Tue Apr 6 17:45:20 2010 +0100 - - Escape XMPP tags used in gtk-doc comments - - wocky/wocky-pubsub-helpers.c | 36 +++++++++++++++++++----------------- - 1 files changed, 19 insertions(+), 17 deletions(-) - -commit 11a0b942304d367871606ccc3f3f929a3ba36155 -Author: Will Thompson -Date: Tue Apr 6 17:35:58 2010 +0100 - - Un-magic-number the number of pubsub events - - wocky/wocky-pubsub-node-protected.h | 3 ++- - wocky/wocky-pubsub-node.c | 5 ++++- - wocky/wocky-pubsub-service.c | 8 ++++---- - 3 files changed, 10 insertions(+), 6 deletions(-) - -commit d4567f97cf4d99648281676c9b84fff59d33dbe8 -Author: Will Thompson -Date: Thu Apr 1 15:05:16 2010 +0100 - - Add API for retrieving affiliates to a node - - tests/wocky-pubsub-node-test.c | 125 +++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-node-protected.h | 9 ++ - wocky/wocky-pubsub-node.c | 139 +++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-node.h | 12 +++ - 4 files changed, 285 insertions(+), 0 deletions(-) - -commit 817566a768ae00128d805e278c3a433599c085c8 -Author: Will Thompson -Date: Thu Apr 1 14:21:35 2010 +0100 - - Use GQueue in subscription-parsing code. - - This looks more obviously right than prepend-and-reverse code, and is - shorter! - - wocky/wocky-pubsub-service.c | 20 +++++++++----------- - 1 files changed, 9 insertions(+), 11 deletions(-) - -commit b9915ab9c21df0c5773cc1cd8f67524b1a237c21 -Author: Will Thompson -Date: Thu Apr 1 11:48:55 2010 +0100 - - Macro-ify implementing a simple _finish() function - - I've written this function tens of times. - - wocky/wocky-pubsub-node.c | 19 +++---------------- - wocky/wocky-pubsub-service.c | 19 +++---------------- - wocky/wocky-utils.h | 22 ++++++++++++++++++++++ - 3 files changed, 28 insertions(+), 32 deletions(-) - -commit 3ab22ce66ab818fe6cfb58f121424110a65d63bc -Author: Will Thompson -Date: Thu Apr 1 11:33:56 2010 +0100 - - Add types representing pubsub affiliations - - wocky/Makefile.am | 2 + - wocky/wocky-pubsub-node.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-node.h | 32 ++++++++++++++++++++++++ - 3 files changed, 94 insertions(+), 0 deletions(-) - -commit 198f445aa1aba6812cc5812e9419e3c0ee18fdaf -Author: Will Thompson -Date: Thu Apr 1 11:31:10 2010 +0100 - - Add a GList deep-copy convenience function - - wocky/wocky-pubsub-service.c | 8 ++------ - wocky/wocky-utils.c | 15 +++++++++++++++ - wocky/wocky-utils.h | 2 ++ - 3 files changed, 19 insertions(+), 6 deletions(-) - -commit af5f25d61f36e18755570fdea82e198ba74fa3d7 -Author: Will Thompson -Date: Wed Mar 31 20:23:57 2010 +0100 - - Add API for listing subscribers to a node. - - tests/Makefile.am | 1 + - tests/wocky-pubsub-node-test.c | 127 ++++++++++++++++++++++++++++++++++- - wocky/wocky-pubsub-node-protected.h | 5 ++ - wocky/wocky-pubsub-node.c | 109 ++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-node.h | 12 +++ - 5 files changed, 253 insertions(+), 1 deletions(-) - -commit f8db89859134b119413c37b5f95120350b1967a5 -Author: Will Thompson -Date: Wed Mar 31 20:22:31 2010 +0100 - - Extract test helper code for checking subscriptions - - This'll be needed in the node test in a moment... - - tests/Makefile.am | 1 + - tests/wocky-pubsub-service-test.c | 47 +++---------------------------- - tests/wocky-pubsub-test-helpers.c | 54 +++++++++++++++++++++++++++++++++++++ - tests/wocky-pubsub-test-helpers.h | 24 ++++++++++++++++ - 4 files changed, 84 insertions(+), 42 deletions(-) - -commit bd9ee1b6d58e3bec839a0abeb626d7bd3da68e94 -Author: Will Thompson -Date: Wed Mar 31 17:49:51 2010 +0100 - - Reduce code duplication in creating pubsub stanzas - - wocky/wocky-pubsub-helpers.c | 67 ++++++++++++++++++++++++++++++++---------- - wocky/wocky-pubsub-helpers.h | 8 +++++ - wocky/wocky-pubsub-node.c | 54 ++++++++------------------------- - wocky/wocky-pubsub-service.c | 49 +++++------------------------- - 4 files changed, 81 insertions(+), 97 deletions(-) - -commit ffbce9096ed2e437ce31100bc5bdb0c5af38887a -Author: Will Thompson -Date: Wed Mar 31 16:28:15 2010 +0100 - - Add signals for node deletion notifications - - tests/wocky-pubsub-node-test.c | 127 ++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-node.c | 29 +++++++++ - wocky/wocky-pubsub-service.c | 33 ++++++++++ - 3 files changed, 189 insertions(+), 0 deletions(-) - -commit 40ece87dfbd7e0c68665bffaf9ae804a838217fb -Author: Will Thompson -Date: Wed Mar 31 16:43:49 2010 +0100 - - Make node event handlers return void - - They all just returned TRUE anyway, which is conceptually correct: even - if they can't parse the stanza, they *are* handling it. And in any case - the stanza handler in WockyPubsubService ignored their return value and - returned TRUE too, for the same reason. - - wocky/wocky-pubsub-node-protected.h | 2 +- - wocky/wocky-pubsub-node.c | 11 ++--------- - 2 files changed, 3 insertions(+), 10 deletions(-) - -commit 420ba1b755ade33e612703e65f57a31f380eabef -Author: Will Thompson -Date: Wed Mar 31 16:41:32 2010 +0100 - - Move list of event handlers into WockyPubsubNode - - wocky/wocky-pubsub-node-protected.h | 20 ++++++++++-------- - wocky/wocky-pubsub-node.c | 20 +++++++++++++++--- - wocky/wocky-pubsub-service.c | 37 ++++++++++++++++------------------ - 3 files changed, 44 insertions(+), 33 deletions(-) - -commit 1ffedc50a6d73dc2b8823b2da36e3f3a0c1a4360 -Author: Will Thompson -Date: Wed Mar 31 15:48:41 2010 +0100 - - Remove duplicated handlers for PubSub events - - Given that the WockyPubsubService has to match these events *anyway* to - make the corresponding WockyPubsubNodes appear when necessary, there's - really no point in the nodes registering higher-priority handlers and - duplicating the stanza breakdown code. - - wocky/wocky-pubsub-node.c | 79 +-------------------------------------------- - 1 files changed, 1 insertions(+), 78 deletions(-) - -commit 8b7ef53909e58bc5f4cbcc55ec6ca9afba5dfdbb -Author: Will Thompson -Date: Wed Mar 31 15:45:22 2010 +0100 - - Reduce repeated breakdown of event stanzas. - - wocky/wocky-pubsub-node-protected.h | 15 +++++++++--- - wocky/wocky-pubsub-node.c | 43 ++++++++++++++++++++-------------- - wocky/wocky-pubsub-service.c | 2 +- - 3 files changed, 37 insertions(+), 23 deletions(-) - -commit f20b421e773a65a25dfdeb4f07c3cd0713e8c119 -Author: Will Thompson -Date: Wed Mar 31 13:43:52 2010 +0100 - - Generalize event propagation from PubsubService to Node - - wocky/wocky-pubsub-node-protected.h | 3 + - wocky/wocky-pubsub-service.c | 129 ++++++++++++++++------------------ - 2 files changed, 64 insertions(+), 68 deletions(-) - -commit 2a5f4f613af27951bd5f5833583e28a8ce1ec99d -Author: Will Thompson -Date: Tue Mar 30 20:42:52 2010 +0100 - - Add WockyPubsubService::subscription-state-changed - - This works just like event-received. The slight duplication in handler - code between Service and Node bothers me a bit, as does the similarity - between pubsub_service_handle_subscription_event and the one for items - events. Maybe I'll extract some common code. - - tests/wocky-pubsub-node-test.c | 52 ++++++++++++++++++++-- - wocky/wocky-pubsub-service.c | 93 +++++++++++++++++++++++++++++++++++++-- - 2 files changed, 135 insertions(+), 10 deletions(-) - -commit dd7d70d0a2475052246213e87d7f7aa361f79ca3 -Author: Will Thompson -Date: Tue Mar 30 20:20:42 2010 +0100 - - Add WockyPubsubNode::subscription-state-changed signal - - tests/wocky-pubsub-node-test.c | 102 +++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-node-protected.h | 3 + - wocky/wocky-pubsub-node.c | 99 ++++++++++++++++++++++++++++++++- - 3 files changed, 201 insertions(+), 3 deletions(-) - -commit 31ccb4e3fcf90786da915228a6b579a6b457f914 -Merge: b1512ce f314881 -Author: Simon McVittie -Date: Tue Apr 6 15:52:56 2010 +0100 - - Merge branch 'trivia' - - Reviewed-by: Will Thompson - -commit f3148819fa97949461532ae37d603d10a28b6909 -Author: Simon McVittie -Date: Tue Apr 6 15:47:22 2010 +0100 - - Add missing bits of Wocky to sections.txt, docs.sgml - - docs/reference/wocky-docs.sgml | 24 ++++++++++++++++++++---- - docs/reference/wocky-sections.txt | 29 +++++++++++++++++++++++++++++ - 2 files changed, 49 insertions(+), 4 deletions(-) - -commit 54499584f15f7609698d08cb152af6e603fd4ffa -Author: Simon McVittie -Date: Tue Apr 6 15:39:15 2010 +0100 - - Sort wocky-docs.sgml alphabetically by section, in the absence of any other obvious organisation - - docs/reference/wocky-docs.sgml | 30 ++++++++++++++++-------------- - 1 files changed, 16 insertions(+), 14 deletions(-) - -commit a4b03a44f568fd8cf33531bf65972ae056bb28a6 -Author: Simon McVittie -Date: Tue Apr 6 15:36:51 2010 +0100 - - Revert "docs: ignore internal headers" - - This reverts commit 50d58d7fc610fa884f849df6103b533400bed52b. - Will tells me that *-protected.h are intended to be used in subclasses - (potentially external to Wocky), and pubsub-helpers.h is public too. - - docs/reference/Makefile.am | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -commit b1512ce640bcd4eb23ba52b35457676378bea376 -Merge: e55140b 2565916 -Author: Simon McVittie -Date: Tue Apr 6 15:28:44 2010 +0100 - - Merge branch 'oleavr-windows' - - Reviewed-by: Ole André Vadla Ravnås - Reviewed-by: Sjoerd Simons - -commit 8ffde7f7b28635b308db32a35e316af33b0f4226 -Author: Simon McVittie -Date: Tue Apr 6 15:17:00 2010 +0100 - - docs: add more recent API - - unused.txt is now empty. - - docs/reference/wocky-sections.txt | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 50d58d7fc610fa884f849df6103b533400bed52b -Author: Simon McVittie -Date: Tue Apr 6 15:15:21 2010 +0100 - - docs: ignore internal headers - - From usage, I infer that wocky-pubsub-helpers.h is probably meant to - be internal? - - docs/reference/Makefile.am | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 9d0ab4f57ecf752aedac931deb78f01fb66b5f14 -Author: Simon McVittie -Date: Tue Apr 6 15:14:31 2010 +0100 - - docs: add some of the recent API - - docs/reference/wocky-sections.txt | 19 +++++++++++++++++++ - 1 files changed, 19 insertions(+), 0 deletions(-) - -commit 4bc0a267fec5864fca09bfcd31e0d1d2176b88ac -Author: Simon McVittie -Date: Tue Apr 6 15:14:11 2010 +0100 - - docs: adapt to WockyDataForm being singular - - docs/reference/wocky-sections.txt | 54 ++++++++++++++++++++----------------- - 1 files changed, 29 insertions(+), 25 deletions(-) - -commit 16e729516b8f2a12e552a858005a70646497ee06 -Author: Simon McVittie -Date: Tue Apr 6 14:53:21 2010 +0100 - - Remove wocky_pubsub_node_new from documentation - - docs/reference/wocky-sections.txt | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit c0a5054d4ce403cd5fe8e8f97659da31fbf581cd -Author: Simon McVittie -Date: Tue Apr 6 14:48:14 2010 +0100 - - Don't distribute generated sources in the tarball - - wocky/Makefile.am | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit f4be843b46d8fd78008300005811517944623ca9 -Author: Will Thompson -Date: Mon Mar 29 19:19:50 2010 +0100 - - Rename handlers for - - We'll be handling other kinds of events soon, so these need less generic - names. - - wocky/wocky-pubsub-node-protected.h | 2 +- - wocky/wocky-pubsub-node.c | 10 +++++----- - wocky/wocky-pubsub-service.c | 8 ++++---- - 3 files changed, 10 insertions(+), 10 deletions(-) - -commit e55140b3c4599221e3be9fa28bab21ae6ee22e21 -Merge: f22cfb5 c05459d -Author: Youness Alaoui -Date: Wed Mar 31 18:03:05 2010 -0400 - - Merge branch 'master' of git+ssh://git.collabora.co.uk/git/wocky - -commit c05459dd72d0fbc2c1f26ca75bf38a7a4802c946 -Author: Sjoerd Simons -Date: Wed Mar 31 16:54:02 2010 +0100 - - Add debugging for the stream opening and closing we sent - - wocky/wocky-xmpp-writer.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit 2fb60d44bd9266d0847b99b0188ac3dbe461ebfa -Author: Sjoerd Simons -Date: Wed Mar 31 16:53:41 2010 +0100 - - Add debugging for the stream opening we receive - - wocky/wocky-xmpp-reader.c | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) - -commit fec294eab0b20b654616f4496c271f18679fb199 -Author: Ole André Vadla Ravnås -Date: Wed Mar 31 13:04:06 2010 +0200 - - Avoid redundant newlines in open stream stanza - - Openfire doesn't like them. - - wocky/wocky-xmpp-writer.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -commit f22cfb549c19eb25e6f027a626c2133f60494def -Author: Youness Alaoui -Date: Tue Mar 30 19:32:59 2010 -0400 - - Remove g_error_free after g_propagate_error. - g_propagate_error doesn't copy the error, it just sets it from dst - to src. So by freeing it here, it causes a double free later on which - causes wocky to segfault. - - wocky/wocky-xmpp-connection.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit e9d31f1d3f075090dd3c18deda8112f7dca38cc2 -Author: Youness Alaoui -Date: Tue Mar 30 11:54:59 2010 -0400 - - Adding tests/wocky-data-form-test into .gitignore - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 01a69bedb2b77e31c60c9e489e99b625c59b7959 -Merge: bc9ae90 9d70d77 -Author: Will Thompson -Date: Thu Mar 25 18:29:00 2010 +0000 - - Merge branch 'pubsub-create-delete-blind-form-submission' - - Reviewed-by: Simon McVittie - -commit 9d70d77cdb13aa56e989e52436cdc3dd9ba303e9 -Author: Will Thompson -Date: Thu Mar 25 18:01:53 2010 +0000 - - State that data form GValues are slice-allocated - - wocky/wocky-data-form.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit b557c4daeab438588d6f75b2ead63d0e52f71abc -Author: Will Thompson -Date: Thu Mar 25 17:59:45 2010 +0000 - - Correct over-zealous depluralizing of Data Forms - - tests/wocky-data-form-test.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 921370d18d5633282c6d2e872879de691c215f58 -Author: Will Thompson -Date: Thu Mar 25 15:01:51 2010 +0000 - - Add API for setting FORM_TYPE when blindly submitting - - tests/wocky-data-form-test.c | 25 +++++++++++++++++++++---- - wocky/wocky-data-form.c | 37 +++++++++++++++++++++++++++++++++++++ - wocky/wocky-data-form.h | 3 +++ - 3 files changed, 61 insertions(+), 4 deletions(-) - -commit 74072d08ab03f6f70513542728d5b0fdbfe33229 -Author: Will Thompson -Date: Thu Mar 25 12:46:22 2010 +0000 - - Use get_content_from_child a bunch. - - I actually thought it would be useful in more places than this. Oh well. - - wocky/wocky-data-form.c | 36 ++++++++++-------------------------- - wocky/wocky-muc.c | 18 ++++-------------- - wocky/wocky-xmpp-error.c | 7 ++----- - 3 files changed, 16 insertions(+), 45 deletions(-) - -commit e3b19005cc7512ae8bb37a6c949c08ce343b01ae -Author: Will Thompson -Date: Thu Mar 25 12:33:13 2010 +0000 - - Add helpers to get content from a child node. - - I've noticed a lot of code following this pattern: - - WockyXmppNode *foo_node; - const gchar *foo = NULL; - - foo_node = wocky_xmpp_node_get_child (parent, "foo"); - - if (foo_node != NULL) - foo = foo_node->content; - - These helpers reduce the above to one line. - - docs/reference/wocky-sections.txt | 2 + - wocky/wocky-xmpp-node.c | 40 +++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-node.h | 8 +++++++ - 3 files changed, 50 insertions(+), 0 deletions(-) - -commit f0d71429ea4111170f667868c3d161554da4a600 -Author: Will Thompson -Date: Wed Mar 24 21:18:18 2010 +0000 - - Make form field generation data-driven. - - It's safer to drive this based on the type of the GValue rather than the - type of the field. If the API user messes up and sets a list of values - rather than a boolean, then, well, the server will get upset and tell - them they're wrong. - - wocky/wocky-data-form.c | 111 ++++++++++++++-------------------------------- - 1 files changed, 34 insertions(+), 77 deletions(-) - -commit d9cb86374cf098863de68e25b3b29c899d1d3044 -Author: Will Thompson -Date: Wed Mar 24 20:36:16 2010 +0000 - - Add helpers to set data form fields' values - - Rootling around in a hash table to fish out the right struct and then - replacing one of its members looked kind of strange. This is more - obvious and easier. The API also supports filling in fields that the - WockyDataForm object doesn't know about; this is to support blindly - submitting forms with well-known fields (such as PubSub configuration) - without having to first ask the server for the form. - - This patch also adds a test for such blind submission. - - tests/wocky-data-form-test.c | 123 +++++++++++++++++++++++++++++++----- - tests/wocky-pubsub-service-test.c | 15 +++-- - wocky/wocky-data-form.c | 124 ++++++++++++++++++++++++++++++++++--- - wocky/wocky-data-form.h | 15 +++++ - 4 files changed, 244 insertions(+), 33 deletions(-) - -commit e97bf5cba32d8b8bbb28a6be23c8f547d751129d -Author: Will Thompson -Date: Wed Mar 24 19:52:21 2010 +0000 - - Parse each form field using a node iterator. - - I think this makes the code a lot clearer. - - wocky/wocky-data-form.c | 59 +++++++++++++++++++++++++++------------------- - 1 files changed, 35 insertions(+), 24 deletions(-) - -commit 6ab8b7622f8e00a0c100fa5a218b932f67530dd1 -Author: Will Thompson -Date: Wed Mar 24 19:08:57 2010 +0000 - - Allow fields' type to be unspecified when submitting. - - When we parse incoming forms, we never produce fields with unspecified - type: if the XML doesn't specify the type, we default to text-single as - specified by XEP-0004. This is not completely satisfactory: when parsing - a form result, we should be able to pre-seed the WockyDataForm object - with prior knowledge about the types of fields. But it'll do for now. - - When submitting a form, we allow fields to have unspecified type, and - submit them with no type='' attribute. Quoth XEP-0004: - - > For data forms of type "submit", inclusion of the 'type' attribute is - > OPTIONAL, since the form-processing entity is assumed to understand - > the data types associated with forms that it processes. - - wocky/wocky-data-form.c | 38 ++++++++++++++++++++++++++++++++++++-- - wocky/wocky-data-form.h | 1 + - 2 files changed, 37 insertions(+), 2 deletions(-) - -commit 889fa983b3a959c15de2a24debb8457f783c1f11 -Author: Will Thompson -Date: Wed Mar 24 19:04:49 2010 +0000 - - Support parsing fields with no type='' - - XEP-0004 specifies that fields in forms of type='form' (that is, the - form being presented to you by the server) which have no type='' - attribute default to being text-single. - - tests/wocky-data-form-test.c | 18 ++++++++++++++++-- - wocky/wocky-data-form.c | 14 ++++++++------ - 2 files changed, 24 insertions(+), 8 deletions(-) - -commit 9499619a157cd9003491f355ff12e0df45d9a00d -Author: Will Thompson -Date: Wed Mar 24 16:09:25 2010 +0000 - - Rename WockyDataForms to WockyDataForm - - While XEP-0004 is plural, the class in Wocky represents a singular form. - - tests/Makefile.am | 8 +- - tests/wocky-data-form-test.c | 712 ++++++++++++++++++++++++++++ - tests/wocky-data-forms-test.c | 712 ---------------------------- - tests/wocky-pubsub-service-test.c | 36 +- - wocky/Makefile.am | 8 +- - wocky/wocky-data-form.c | 811 ++++++++++++++++++++++++++++++++ - wocky/wocky-data-form.h | 130 +++++ - wocky/wocky-data-forms.c | 811 -------------------------------- - wocky/wocky-data-forms.h | 130 ----- - wocky/wocky-debug.c | 2 +- - wocky/wocky-debug.h | 2 +- - wocky/wocky-pubsub-service-protected.h | 2 +- - wocky/wocky-pubsub-service.c | 16 +- - wocky/wocky-pubsub-service.h | 6 +- - 14 files changed, 1693 insertions(+), 1693 deletions(-) - -commit f902b05fd579f30ed35114e95a5f60eeb1991646 -Author: Will Thompson -Date: Wed Mar 24 13:37:20 2010 +0000 - - Extract wocky_pubsub_node_make_delete_stanza() - - wocky/wocky-pubsub-node-protected.h | 4 +++ - wocky/wocky-pubsub-node.c | 36 +++++++++++++++++++++++++++------- - 2 files changed, 32 insertions(+), 8 deletions(-) - -commit 2c7531fed7abf7ea154cf69ab7516d282f52ad3f -Author: Will Thompson -Date: Wed Mar 24 13:07:23 2010 +0000 - - Refactor the bulk of parsing create node replies - - This allows subclasses to reuse it. - - wocky/wocky-pubsub-service-protected.h | 7 +++ - wocky/wocky-pubsub-service.c | 86 +++++++++++++++++++------------ - 2 files changed, 60 insertions(+), 33 deletions(-) - -commit 525126fe39bb4aa48e1546336d6d82f3dea29e3b -Author: Will Thompson -Date: Wed Mar 24 02:13:14 2010 +0000 - - Deal with empty replies to create_node() - - When you ask a pubsub server to create you a node, in some circumstances - the IQ result contains , and in some - circumstances it does not: - - • If you included a NodeID in your request, and the server did exactly - as you asked and created that node, there's no need to include any - information in the result's body as you already know what it would - contain. (XEP-0060 actually goes further than this, and says that the - result MUST NOT have a body in this case, which seems overzealous.) - - • If you included a NodeID in your request, but the server created a - node with a different NodeID, then it MUST include a body in the - result to tell you the node's actual ID. - - • If you did not include a NodeID in your request (to create an "instant - node"), the server MUST include a body in the result to tell you the - ID it decided to use. - - We previously assumed that the result contains a body, so the first case - above wouldn't work with a fully-pedantic server. This patch fixes the - tests to test that case, fixes the implementation to support that case, - and adds a test for the second case. - - tests/wocky-pubsub-service-test.c | 76 +++++++++++++++++++++++++++++++------ - wocky/wocky-pubsub-service.c | 36 +++++++++++++---- - 2 files changed, 92 insertions(+), 20 deletions(-) - -commit f6f96522cc9ff0e7541f6087f254e62900454fbf -Author: Will Thompson -Date: Wed Mar 24 02:09:21 2010 +0000 - - Add and use new variants of pubsub_distill_iq_reply - - Often, you don't care at all about what the iq reply contains, only - whether it's a result or an error. wocky_pubsub_distill_void_iq_reply() - deals with that case more clearly than the caller passing three NULL - arguments to wocky_pubsub_distill_iq_reply(). - - Additionally, there exist cases where you're interested in the reply's - body if it's present, but the reply being empty is not an error. - wocky_pubsub_distill_ambivalent_iq_reply() handles this case. - - They are all implemented in terms of a slightly enhanced version of the - former body of wocky_pubsub_distill_iq_reply(). - - wocky/wocky-pubsub-helpers.c | 126 ++++++++++++++++++++++++++++++++++++++---- - wocky/wocky-pubsub-helpers.h | 11 ++++ - wocky/wocky-pubsub-node.c | 4 +- - 3 files changed, 127 insertions(+), 14 deletions(-) - -commit ef53f61d5354999d0d934d4eacdc83d76fdde4ca -Author: Will Thompson -Date: Tue Mar 23 18:32:03 2010 +0000 - - Don't include empty when creating a node - - XEP-0060 §8.1.2 Create a Node With Default Configuration says we should - just send if we don't want to deviate from the - default configuration. - - wocky/wocky-pubsub-service.c | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) - -commit 1913db9081a8f3269d4287294f2ec45fedc8fba7 -Author: Will Thompson -Date: Tue Mar 23 18:29:25 2010 +0000 - - Extract a create_create_node_stanza() helper - - I'm so happy these helpers create complete stanzas rather than just - WockyXmppNodes or the name would be ridiculous. - - wocky/wocky-pubsub-service-protected.h | 7 +++++ - wocky/wocky-pubsub-service.c | 43 +++++++++++++++++++++++--------- - 2 files changed, 38 insertions(+), 12 deletions(-) - -commit d9fa8f017ae22875a126b46d313b7bb097b509b9 -Author: Will Thompson -Date: Tue Mar 23 18:27:53 2010 +0000 - - Rename an internal PubsubService helper function - - create_node() clashed with a name I wanted to use for a WockyXmppNode * - for a element. It is unfortunate that node means two things. - :( - - wocky/wocky-pubsub-service.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit f03f7f02d34ed55e9c2d5dc56f5f606d064088a6 -Author: Will Thompson -Date: Tue Mar 23 17:59:02 2010 +0000 - - Properly initialize an out parameter - - wocky/wocky-pubsub-service.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 256591691c38f7b6fa99c18e71fb4ec764373a84 -Author: Simon McVittie -Date: Tue Mar 23 15:17:34 2010 +0000 - - wocky_absolutize_path: check for errors and perhaps return NULL - - Both callers already check for NULL, so this is OK - - wocky/wocky-utils.c | 17 +++++++++++++++-- - 1 files changed, 15 insertions(+), 2 deletions(-) - -commit 875970a858a8a3769af9e0266ac6db274fb49f74 -Author: Simon McVittie -Date: Tue Mar 23 15:10:42 2010 +0000 - - Replace uses of realpath() with a portable GFile-based version - - This doesn't resolve symlinks, because we don't really need to; it just - makes the filename absolute. - - Loosely based on code from Ole André Vadla Ravnås - on fd.o #27244. - - wocky/wocky-connector.c | 4 ++-- - wocky/wocky-utils.c | 30 ++++++++++++++++++++++++++++-- - wocky/wocky-utils.h | 2 ++ - 3 files changed, 32 insertions(+), 4 deletions(-) - -commit 2dbbccf6744b448edda23b3f7acb666e70667a74 -Author: Simon McVittie -Date: Tue Mar 23 14:52:34 2010 +0000 - - Parse MUC timestamps using g_time_val_from_iso8601, for portability - - Windows doesn't have strptime. - - Based on code from Ole André Vadla Ravnås , - and on code I wrote in a telepathy-gabble branch. - - wocky/wocky-muc.c | 16 +++++++++++----- - 1 files changed, 11 insertions(+), 5 deletions(-) - -commit 5b4a65885d363e228c3a848407bfc1d6fb5664c4 -Author: Simon McVittie -Date: Tue Mar 23 14:35:23 2010 +0000 - - wocky-openssl: in error_to_string, remove casts made unnecessary by Ole Andre's patch - - wocky/wocky-openssl.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 224b568589a851924b6a2ee1a27065ae8d98e84e -Author: Ole André Vadla Ravnås -Date: Mon Mar 22 16:28:33 2010 +0100 - - Fix error_to_string() crash - - Declaring the static ssl_error array as const means that it may be read- - only at runtime, which is not what you want in this case. - - Reviewed-by: Simon McVittie - - wocky/wocky-openssl.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a4a5211f12699cf85ad43d839254d2dc97132a0f -Author: Ole André Vadla Ravnås -Date: Mon Mar 22 16:26:35 2010 +0100 - - Replace isXXX() with g_ascii_isXXX() to improve portability - - Reviewed-by: Simon McVittie - - wocky/wocky-openssl.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1e370d3be9ea5e14f0b24464cec387c78c9977ab -Author: Ole André Vadla Ravnås -Date: Mon Mar 22 16:25:56 2010 +0100 - - Avoid C99 named initializers - - MSVC doesn't support C99. - - Reviewed-by: Simon McVittie - - wocky/wocky-sasl-handler.c | 19 ++++++++++--------- - wocky/wocky-xmpp-reader.c | 37 ++++++++++++++++++++++++++++++++----- - 2 files changed, 42 insertions(+), 14 deletions(-) - -commit 336bbbb4d1ca1dc04161307544939131c54e9f1e -Author: Ole André Vadla Ravnås -Date: Mon Mar 22 16:25:20 2010 +0100 - - Replace CA/CRL stat logic with g_file_test to improve portability - - Reviewed-by: Simon McVittie - - wocky/wocky-openssl.c | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit 2b974812dd00dac400db215c42b9dfa283ac56f8 -Author: Ole André Vadla Ravnås -Date: Mon Mar 22 16:24:08 2010 +0100 - - Fix OpenSSL include issue on Windows - - OpenSSL's Windows headers apparently require windows.h to be included - before including them. Yikes. - - Reviewed-by: Simon McVittie - - wocky/wocky-openssl.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 4d8143fae323fd81331811024a694f855ff7ce30 -Author: Ole André Vadla Ravnås -Date: Mon Mar 22 16:21:14 2010 +0100 - - Fix warnings related to DEBUG() usage without arguments - - Reviewed-by: Simon McVittie - - wocky/wocky-openssl.c | 26 +++++++++++++------------- - 1 files changed, 13 insertions(+), 13 deletions(-) - -commit b103a1940c2719123fff4e3ce79d4b76d21b70ce -Author: Ole André Vadla Ravnås -Date: Mon Mar 22 16:19:44 2010 +0100 - - Add a missing cast to make MSVC a bit happier warning-wise - - Reviewed-by: Simon McVittie - - wocky/wocky-muc.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 5669b94e7d0f22e5b7b0df861368a5228723fda7 -Author: Ole André Vadla Ravnås -Date: Mon Mar 22 16:19:00 2010 +0100 - - Fix a trivial warning where guint was used instead of WockyTLSCertStatus - - Reviewed-by: Simon McVittie - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit fac774c5a3d09d51a16680eb7422f73b87bb86c2 -Author: Simon McVittie -Date: Tue Mar 23 14:32:33 2010 +0000 - - In the files touched by Ole Andre's patch, put headers in the preferred order - - * config.h first of all - * header corresponding to the source next, to verify self-containedness - * system headers next, followed by conditional system headers (with a - bit more whitespace for clarity) - * library and internal headers last - - wocky/wocky-bare-contact.c | 12 +++++++----- - wocky/wocky-connector.c | 10 ++++++---- - wocky/wocky-contact-factory.c | 8 +++++--- - wocky/wocky-contact.c | 10 ++++++---- - wocky/wocky-openssl.c | 7 ++++--- - wocky/wocky-porter.c | 10 ++++++---- - wocky/wocky-resource-contact.c | 10 ++++++---- - wocky/wocky-session.c | 9 +++++---- - wocky/wocky-xmpp-connection.c | 10 ++++++---- - 9 files changed, 51 insertions(+), 35 deletions(-) - -commit a4747da6af62731cbb5b77261064bef212691f29 -Author: Ole André Vadla Ravnås -Date: Mon Mar 22 16:15:37 2010 +0100 - - Don't include unistd.h unless available - - Reviewed-by: Simon McVittie - - wocky/wocky-bare-contact.c | 6 ++++++ - wocky/wocky-connector.c | 6 ++++++ - wocky/wocky-contact-factory.c | 6 ++++++ - wocky/wocky-contact.c | 6 ++++++ - wocky/wocky-openssl.c | 6 ++++++ - wocky/wocky-porter.c | 5 +++++ - wocky/wocky-resource-contact.c | 6 ++++++ - wocky/wocky-session.c | 6 ++++++ - wocky/wocky-xmpp-connection.c | 5 +++++ - 9 files changed, 52 insertions(+), 0 deletions(-) - -commit a59c4bf130f689e60c8a9ec4ce5e987aa00b7d83 -Author: Simon McVittie -Date: Tue Mar 23 14:30:59 2010 +0000 - - configure.ac: check for unistd.h - - configure.ac | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit aeac3aa08def7fd47e1a432005706433ff281440 -Author: Simon McVittie -Date: Tue Mar 23 14:30:51 2010 +0000 - - configure.ac: work around mis-syntax-highlighting of apostrophe - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bc9ae907cacffde000bb7daecaa4069cb00d5d83 -Author: Will Thompson -Date: Thu Mar 18 16:19:48 2010 +0000 - - Make multi-line variables consistent - - The right-aligned backslashes are great and all, but when you add a new - header that's longer (as I did with wocky-pubsub-service-protected.h) - you have to adjust the whole list or it becomes inconsistent. - - Also the wocky-muc.c entry had a whole bunch of tabs rather than spaces - which made it not line up anyway. - - wocky/Makefile.am | 118 ++++++++++++++++++++++++++-------------------------- - 1 files changed, 59 insertions(+), 59 deletions(-) - -commit 6fdcb861bd5d01093b0ce2c2d5998df0595410cb -Author: Will Thompson -Date: Tue Mar 16 19:32:16 2010 +0000 - - pep-service: don't crash on disconnect during retrieval - - If 'reply' is NULL, we shouldn't set it as the operation result with - g_object_unref() as its destructor, since the latter doesn't like being - passed NULL. I've checked other uses of - g_simple_async_result_set_op_res_gpointer() in Wocky, and they're fine. - - Reviewed-by: Simon McVittie - - tests/wocky-pep-service-test.c | 33 +++++++++++++++++++++++++++++++-- - wocky/wocky-pep-service.c | 5 ++++- - 2 files changed, 35 insertions(+), 3 deletions(-) - -commit 9252f908ac24709e3b0486a5d6617d6f07a80eaf -Merge: 8f2fc98 582b5bb -Author: Will Thompson -Date: Tue Mar 16 17:14:44 2010 +0000 - - Merge branch 'moar-pubsub' - - Reviewed-by: Guillaume Desmottes - -commit 8f2fc98a0f82ef29d26b59421299a121449ee70b -Merge: c83b003 adf2974 -Author: Simon McVittie -Date: Mon Mar 15 16:42:09 2010 +0000 - - Merge branch 'trivia' - - Reviewed-by: Will Thompson - -commit adf29749f3e858df506cbe1cabcf1f4ca289352c -Author: Simon McVittie -Date: Mon Mar 15 16:37:17 2010 +0000 - - Ignore the distcheck working directory as well as the tarball - - .gitignore | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 6eb4cfea44bf8d76325e4aa16dfe82cf5ba9481f -Author: Simon McVittie -Date: Mon Mar 15 16:35:53 2010 +0000 - - Distribute some missing files - - Adding summarise-tests.py fixes distcheck; the others might not be needed, - but it's easier to add them than to think about whether they're desirable. - - This patch results in everything in git, except .gitignore, being - distributed. - - Makefile.am | 2 ++ - tests/Makefile.am | 3 +++ - 2 files changed, 5 insertions(+), 0 deletions(-) - -commit c83b0039e531eaf940a7fb458b6a2d7d02630ec4 -Merge: a6a9213 bf6a955 -Author: Simon McVittie -Date: Mon Mar 15 16:22:16 2010 +0000 - - Merge branch 'docs' - - Reviewed-by: Will Thompson - Bug: http://bugs.freedesktop.org/show_bug.cgi?id=24941 - -commit bf6a95513fa1d8b7e37a7cff7e87a7f786a270c4 -Author: Simon McVittie -Date: Mon Mar 15 14:42:32 2010 +0000 - - wocky_xmpp_node_each_child_func: use correct English - - Spotted during wjt's review - - wocky/wocky-xmpp-node.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 49b110c06e8fb005757820db1e9933ca6df186ef -Author: Simon McVittie -Date: Mon Mar 15 14:41:50 2010 +0000 - - WockyPorter: clarify refcounting/returns as per wjt's review - - wocky/wocky-porter.c | 3 ++- - wocky/wocky-porter.h | 10 ++++++++++ - 2 files changed, 12 insertions(+), 1 deletions(-) - -commit 582b5bba4aa5e0fbc90c8f58178cc396712ccb14 -Author: Will Thompson -Date: Sat Mar 13 12:42:45 2010 +0000 - - Style: newline after return type in definition - - wocky/wocky-pubsub-service.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 2938044744c8ea032c505c4b8fcd620e0f49507d -Author: Will Thompson -Date: Sat Mar 13 12:42:32 2010 +0000 - - Document and sanity-check node_object_type - - wocky/wocky-pubsub-service.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit 28ef5c184ce86717f7ee4144ca75473e830e2768 -Author: Will Thompson -Date: Sat Mar 13 12:42:22 2010 +0000 - - Document WockyPubsubSubscription - - wocky/wocky-pubsub-service.c | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit 00e0984b208b6653baa50f804578b202d8c2a419 -Author: Will Thompson -Date: Tue Mar 9 15:42:45 2010 +0000 - - pubsub_distill_iq_reply(): understand empty replies - - A bunch of pubsub actions don't need to actually return you anything in - the iq result if they succeed; making wocky_pubsub_distill_iq_reply() - deal with this case allows me to delete even more code! - - Maybe WockyPubsubService should deal with this stuff, with a - _send_action_async() method or something. - - wocky/wocky-pubsub-helpers.c | 13 +++++++------ - wocky/wocky-pubsub-node.c | 29 +++++------------------------ - 2 files changed, 12 insertions(+), 30 deletions(-) - -commit 126bb67ee3553542df79e178fe7edf825b18b108 -Author: Will Thompson -Date: Tue Mar 9 15:28:46 2010 +0000 - - Give WockyPubsub* subclasses access to porter - - wocky/wocky-pubsub-node-protected.h | 2 ++ - wocky/wocky-pubsub-node.c | 8 ++++++++ - wocky/wocky-pubsub-service-protected.h | 2 ++ - wocky/wocky-pubsub-service.c | 8 ++++++++ - 4 files changed, 20 insertions(+), 0 deletions(-) - -commit ac2ffa3b9d07e874c58037a62c93d55308ab69fe -Author: Will Thompson -Date: Tue Mar 9 14:24:20 2010 +0000 - - _make_publish_stanza(): also return the node - - This brings it into line with the other make_foo_stanza() methods. - - tests/wocky-pubsub-node-test.c | 12 ++++++++---- - wocky/wocky-pep-service.c | 2 +- - wocky/wocky-pubsub-helpers.c | 8 +++++++- - wocky/wocky-pubsub-helpers.h | 1 + - wocky/wocky-pubsub-node.c | 3 ++- - wocky/wocky-pubsub-node.h | 1 + - 6 files changed, 20 insertions(+), 7 deletions(-) - -commit 9fe32f1815427ca3f118247a71d136b3f35192bc -Author: Will Thompson -Date: Mon Mar 8 17:58:05 2010 +0000 - - Support unsubscribing from PubSub nodes - - tests/wocky-pubsub-node-test.c | 110 +++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-node-protected.h | 7 ++ - wocky/wocky-pubsub-node.c | 105 +++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-node.h | 12 ++++ - 4 files changed, 234 insertions(+), 0 deletions(-) - -commit f1133390bfa38378f98e9dce38380cb083daf8f4 -Author: Will Thompson -Date: Mon Mar 8 17:49:16 2010 +0000 - - Generalize making a pubsub action for a node - - wocky/wocky-pubsub-node.c | 45 ++++++++++++++++++++++++++++++--------------- - 1 files changed, 30 insertions(+), 15 deletions(-) - -commit 21f4cf4787b638d4117883853adbbc964d8dc5d4 -Author: Will Thompson -Date: Mon Mar 8 15:35:39 2010 +0000 - - Implement subscribing to nodes. - - tests/wocky-pubsub-node-test.c | 93 ++++++++++++++++++++++++++ - wocky/wocky-pubsub-node-protected.h | 5 ++ - wocky/wocky-pubsub-node.c | 126 +++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-node.h | 11 +++ - 4 files changed, 235 insertions(+), 0 deletions(-) - -commit 2f8b25b801abf2d644896beb38e12c0c576049e0 -Author: Will Thompson -Date: Fri Mar 5 19:53:43 2010 +0000 - - Allow _parse_subscription() to return an error - - wocky/wocky-pubsub-service-protected.h | 3 ++- - wocky/wocky-pubsub-service.c | 29 ++++++++++++++++++++--------- - 2 files changed, 22 insertions(+), 10 deletions(-) - -commit b3dcc54540cd156541ead7ab3701453bc9991ddc -Author: Will Thompson -Date: Fri Mar 5 18:36:33 2010 +0000 - - Expose parsing a node - - This will be needed by wocky_pubsub_node_subscribe, since a - request returns a node. - - wocky/wocky-pubsub-service-protected.h | 5 ++ - wocky/wocky-pubsub-service.c | 93 +++++++++++++++++++------------- - 2 files changed, 60 insertions(+), 38 deletions(-) - -commit 1553b3db8841fb5b70b8bd1ab7687e06b2dc4e47 -Author: Will Thompson -Date: Fri Mar 5 00:57:16 2010 +0000 - - Allow PubsubService subclasses to use PubsubNode subclasses - - wocky/wocky-pubsub-service.c | 5 ++++- - wocky/wocky-pubsub-service.h | 1 + - 2 files changed, 5 insertions(+), 1 deletions(-) - -commit a52dc2d83659da4d83447376c6fdb25561b4ba52 -Author: Will Thompson -Date: Fri Mar 5 00:38:06 2010 +0000 - - Remove wocky_pubsub_node_new() - - WockyPubsubNodes should only be made through - wocky_pubsub_service_ensure_node(); otherwise you could end up with two - objects for one node on a service, and only one of them would work. - - tests/wocky-pubsub-node-test.c | 4 ++-- - wocky/wocky-pubsub-node.c | 10 ---------- - wocky/wocky-pubsub-node.h | 3 --- - wocky/wocky-pubsub-service.c | 5 ++++- - 4 files changed, 6 insertions(+), 16 deletions(-) - -commit a7e722758ae4cc01817ca66f12d91d2265e88251 -Author: Will Thompson -Date: Thu Mar 4 17:56:29 2010 +0000 - - Return nodes from parse_subscriptions - - wocky/wocky-pubsub-service-protected.h | 3 ++- - wocky/wocky-pubsub-service.c | 12 ++++++++++-- - 2 files changed, 12 insertions(+), 3 deletions(-) - -commit b6d5b2863eb3a20f46d4d4f47f0b5907879431b2 -Author: Will Thompson -Date: Thu Mar 4 16:12:00 2010 +0000 - - Make helpers for listing/parsing pubsub subscriptions - - The intention is that subclasses of WockyPubsubService that need to add - and understand additional service-specific metadata for subscriptions - can use these helpers to implement variations on the theme of - _retrieve_subscriptions_async(). - - wocky/Makefile.am | 1 + - wocky/wocky-pubsub-service-protected.h | 35 ++++++++++++++++++++++++ - wocky/wocky-pubsub-service.c | 46 ++++++++++++++++++++++++------- - 3 files changed, 71 insertions(+), 11 deletions(-) - -commit 1be89ca78a495002a3ee4b7fa27bc25f736b34c8 -Author: Will Thompson -Date: Mon Mar 1 19:24:40 2010 +0000 - - Support retrieving pubsub subscriptions - - tests/wocky-pubsub-service-test.c | 268 +++++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-service.c | 144 ++++++++++++++++++++ - wocky/wocky-pubsub-service.h | 13 ++ - 3 files changed, 425 insertions(+), 0 deletions(-) - -commit f5218415dba8e876ef88855df13f3be85ecc85ea -Author: Will Thompson -Date: Mon Mar 1 19:24:27 2010 +0000 - - Add types representing PubSub subscriptions - - wocky/Makefile.am | 2 + - wocky/wocky-pubsub-service.c | 69 ++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-service.h | 31 +++++++++++++++++++ - 3 files changed, 102 insertions(+), 0 deletions(-) - -commit c480a70d0951ec143bda26013c47536ad8dfeec6 -Author: Will Thompson -Date: Mon Mar 1 14:02:51 2010 +0000 - - Add a test helper to compare two stanzas - - This is a slightly evil macro that asserts that two stanzas are equal, - except if they differ only in that one has no id and the other has an - id. It achieves this by, erm, copying the id onto the other stanza. - Whatever, this is test code. - - tests/wocky-test-helper.h | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) - -commit 3ea6d54ec8f087dec2d36072f7addeee6df219db -Author: Will Thompson -Date: Mon Mar 1 11:38:31 2010 +0000 - - Refactor common pubsub reply-handling code - - wocky/wocky-pubsub-helpers.c | 81 +++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-helpers.h | 9 ++++ - wocky/wocky-pubsub-service.c | 101 +++++++++-------------------------------- - 3 files changed, 112 insertions(+), 79 deletions(-) - -commit e15c0d1f633fe62f64a48a7b118ca4f5d8abf07a -Author: Will Thompson -Date: Sun Feb 28 15:05:52 2010 +0000 - - Add WockyPubsubService::event-received - - This signal proxies the corresponding signal on the node, so that - clients that care about events on all nodes can just listen once to the - service. - - tests/wocky-pubsub-node-test.c | 78 ++++++++++++++++++++++----- - wocky/Makefile.am | 3 +- - wocky/wocky-pubsub-node-protected.h | 29 ++++++++++ - wocky/wocky-pubsub-node.c | 9 +++ - wocky/wocky-pubsub-service.c | 103 +++++++++++++++++++++++++++++++++-- - 5 files changed, 204 insertions(+), 18 deletions(-) - -commit cadd1057187cad127033db7bbf8d2942d56727de -Merge: 7543638 a6a9213 -Author: Simon McVittie -Date: Tue Mar 9 17:44:33 2010 +0000 - - Merge remote branch 'origin/master' into docs - -commit 7543638c250da89b04531de68e7c3e3507f179d5 -Author: Simon McVittie -Date: Tue Mar 9 17:44:31 2010 +0000 - - wocky_xmpp_node_attribute_ns_get_prefix_from_quark: improve description of @ns - - wocky/wocky-xmpp-node.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6b16fa44543830f8359c9acfdecd3f5138ab45ca -Author: Simon McVittie -Date: Tue Mar 9 17:28:58 2010 +0000 - - Add WockyPubsubNode, WockyPubsubService to docs - - docs/reference/wocky-sections.txt | 45 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 45 insertions(+), 0 deletions(-) - -commit 6756c8bd458be280507ed93711b793d44e29df09 -Author: Simon McVittie -Date: Tue Mar 9 17:28:44 2010 +0000 - - Don't hide wocky_data_forms_get_instructions (etc.) in a - - docs/reference/wocky-sections.txt | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit c3c496e5e54fcdb623f0cfb087cbf671dbfffbf1 -Author: Simon McVittie -Date: Tue Mar 9 17:28:26 2010 +0000 - - Add misc missing stuff to wocky-sections - - docs/reference/wocky-sections.txt | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit 4a10284ff6439933a9e6d9bfcb80b15b737e86f4 -Author: Simon McVittie -Date: Tue Mar 9 17:24:14 2010 +0000 - - docs: s/in case/if/ for better en_GB - - "In case" generally implies preparation for a future event that might - break things if we don't prepare for it; that's not what's happening - here. - - wocky/wocky-contact-factory.c | 4 ++-- - wocky/wocky-sasl-handler.h | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit a6a921374deedb2446d27f81f2dbaf2fd5999ede -Author: Cosimo Cecchi -Date: Fri Nov 6 16:27:03 2009 +0100 - - Fix a typo. - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 94915ea0c31ab844f0182c03c39652c724e0267b -Author: Cosimo Cecchi -Date: Wed Nov 4 17:52:32 2009 +0100 - - Write gtk-doc entries for WockyBareContact. - - wocky/wocky-bare-contact.c | 82 +++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 78 insertions(+), 4 deletions(-) - -commit be66d223e4368789176457f06aafedc0610d4b97 -Author: Simon McVittie -Date: Tue Mar 9 17:18:21 2010 +0000 - - wocky_porter_force_close_async: use pedantically-correct gtk-doc markup - - wocky/wocky-porter.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ea435c1231415ada3bf1a94a15c20f92a4bb71ef -Author: Simon McVittie -Date: Tue Mar 9 17:18:05 2010 +0000 - - Fix typo matchig -> matching as per my review - - wocky/wocky-porter.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 230cfe7ec0ae458058eff969b1cc147dfad8c1f1 -Author: Simon McVittie -Date: Tue Mar 9 17:17:51 2010 +0000 - - WockyPorter::remote-error: clarify that the error domain is indeed a quark - - As per my review of cosimoc's branches - - wocky/wocky-porter.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit af2e70ba023e176eb42dac2d16f9072f216264b5 -Author: Simon McVittie -Date: Tue Mar 9 17:17:26 2010 +0000 - - WockyContactFactory: make object ownership explicit, fix typo (an -> a) as per my review - - wocky/wocky-contact-factory.c | 15 ++++++++++----- - 1 files changed, 10 insertions(+), 5 deletions(-) - -commit 04b0445c24a9dbccaa5fff514f8ba9e76946b221 -Author: Simon McVittie -Date: Tue Mar 9 17:09:47 2010 +0000 - - Misc doc fixes. - - (cherry picked from commit 76db761b404f8c2817e8d87fc07dce8645ac6e92) - - Conflicts: - wocky/wocky-porter.c (wocky_porter_register_handler) - wocky/wocky-utils.c (discarded cosimoc's change in favour of master) - Merged: by smcv - - wocky/wocky-porter.c | 3 ++- - wocky/wocky-xmpp-connection.c | 6 +++--- - 2 files changed, 5 insertions(+), 4 deletions(-) - -commit 8762453c06e150161c952e15947a59263ee91df5 -Author: Cosimo Cecchi -Date: Fri Nov 6 16:27:03 2009 +0100 - - Fix a typo. - (cherry picked from commit 0492a6e7ccd09d7f0ef3ece36c66619f602ed5e5) - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 10671c67412210b11d3e81eb0f16b134f7a80f86 -Author: Simon McVittie -Date: Tue Mar 9 17:04:00 2010 +0000 - - Add docs for WockyXmppNode. - - (cherry picked from commit 14e4892c3e53bf629c641bded38d70508b09b43c) - - Conflicts: - wocky/wocky-xmpp-node.c - - wocky/wocky-xmpp-node.c | 301 ++++++++++++++++++++++++++++++++++++++++++++++- - wocky/wocky-xmpp-node.h | 23 ++++- - 2 files changed, 319 insertions(+), 5 deletions(-) - -commit a8e1ce40d8ee132cd86ec2372a38ae4e3b3fb473 -Merge: 158e7fd e1a9100 -Author: Simon McVittie -Date: Tue Mar 9 17:01:42 2010 +0000 - - Merge remote branch 'cosimoc/doc-contactfactory' into docs - - Conflicts: - wocky/wocky-porter.c (wocky_porter_register_handler) - -commit 158e7fdeae13a42bfa3c386f3a4a18df4c5ae98a -Merge: 4b94801 d79eac9 -Author: Simon McVittie -Date: Tue Mar 9 16:39:04 2010 +0000 - - Merge remote branch 'cosimoc/doc-barecontact' - -commit ec8d9c1d8fa0f9eda898ab5678369dea39a83c58 -Author: Will Thompson -Date: Sat Feb 27 16:54:56 2010 +0000 - - Fix leaks in PubsubService tests - - tests/wocky-pubsub-service-test.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 86a98d16d3ef721ff3e8b7d61cb627add84fcc8e -Author: Will Thompson -Date: Fri Feb 26 16:37:18 2010 +0000 - - Don't leak porters and test in PubsubNode test - - tests/wocky-pubsub-node-test.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit f5f0528f7b2bc3b680f4e909d23388130bb39618 -Author: Will Thompson -Date: Fri Feb 26 16:35:44 2010 +0000 - - Add WockyPubsubNode::event-received - - tests/wocky-pubsub-node-test.c | 2 ++ - wocky/wocky-pubsub-node.c | 18 ++++++++++++++---- - 2 files changed, 16 insertions(+), 4 deletions(-) - -commit 0da5ed9215c627f9152f91ebd12f01f54bac2c7c -Author: Will Thompson -Date: Fri Feb 26 16:18:32 2010 +0000 - - Add an event-received signal to WockyPubsubNode - - tests/wocky-pubsub-node-test.c | 106 ++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-node.c | 74 ++++++++++++++++++++++++++-- - 2 files changed, 176 insertions(+), 4 deletions(-) - -commit 395b194f25f9418a7f7a110991042166a0fe5c66 -Author: Will Thompson -Date: Fri Feb 26 12:43:16 2010 +0000 - - Add wocky_pubsub_node_make_publish_stanza() - - tests/wocky-pubsub-node-test.c | 61 ++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-node.c | 16 +++++++++- - wocky/wocky-pubsub-node.h | 4 ++ - 3 files changed, 79 insertions(+), 2 deletions(-) - -commit 173c3b26217d7b4c4471b4f25193b5a593b40aa3 -Author: Will Thompson -Date: Thu Feb 25 14:49:16 2010 +0000 - - Extract publish stanza construction to a helper - - This will be useful in WockyPubsubNode as well as in WockyPepService. - - wocky/Makefile.am | 2 + - wocky/wocky-pep-service.c | 14 +------- - wocky/wocky-pubsub-helpers.c | 70 ++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-helpers.h | 32 +++++++++++++++++++ - 4 files changed, 106 insertions(+), 12 deletions(-) - -commit 4b9480119aded3de3cf7d2e68f6eeb7c885289f7 -Author: Simon McVittie -Date: Wed Mar 3 19:57:12 2010 +0000 - - Correct typos detected by Lintian (separate, received) - - Reviewed-by: Youness Alaoui - - wocky/wocky-muc.c | 2 +- - wocky/wocky-xmpp-connection.c | 2 +- - wocky/wocky-xmpp-reader.c | 2 +- - wocky/wocky-xmpp-writer.c | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -commit cd607211b1973b88e1683b762e22105618eab35f -Author: Will Thompson -Date: Mon Mar 1 16:27:53 2010 +0000 - - Don't crash on stanzas with type='error' but no - - Reviewed-by: Sjoerd Simons - - tests/wocky-xmpp-stanza-test.c | 20 +++++++++++++++++++- - wocky/wocky-xmpp-stanza.c | 19 ++++++++++++++++++- - 2 files changed, 37 insertions(+), 2 deletions(-) - -commit 8430bc66063c3dbcd26d23296e3c10cff7c25dd9 -Merge: 6f2ee42 1a030af -Author: Will Thompson -Date: Fri Feb 26 12:40:32 2010 +0000 - - Merge branch 'trivia' - - Reviewed-by: Sjoerd Simons - -commit 6f2ee429d5a56122f8b37ab7d070cc8be4a72ab7 -Merge: ef42dd2 54eac57 -Author: Will Thompson -Date: Fri Feb 26 11:18:22 2010 +0000 - - Merge branch 'pubsub' - - Reviewed-by: Sjoerd Simons - Reviewed-by: Will Thompson - -commit 1a030afaf4f71c93b42a12f7eb5aca0b552f4ffa -Author: Will Thompson -Date: Thu Feb 25 15:42:17 2010 +0000 - - Use test_assert_nodes_[not_]equal() in tests - - This makes the assertion failures more useful - - tests/wocky-porter-test.c | 4 ++-- - tests/wocky-test-helper.c | 2 +- - tests/wocky-xmpp-node-test.c | 28 ++++++++++++++-------------- - tests/wocky-xmpp-readwrite-test.c | 6 +++--- - tests/wocky-xmpp-stanza-test.c | 10 +++++----- - 5 files changed, 25 insertions(+), 25 deletions(-) - -commit 62508123b46ab8ed3e8fa9199a2ee63b219bc7d4 -Author: Will Thompson -Date: Thu Feb 25 15:37:20 2010 +0000 - - Add test_assert_nodes_not_equal() - - tests/wocky-test-helper.h | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit f9a42286e5f376afd32f270ce28d51330284fee3 -Author: Will Thompson -Date: Thu Feb 25 15:34:50 2010 +0000 - - Move assert_nodes_equal to test-helper - - tests/wocky-test-helper.h | 9 +++++++++ - tests/wocky-xmpp-stanza-test.c | 13 ++----------- - 2 files changed, 11 insertions(+), 11 deletions(-) - -commit 99774c25e12869fa12a5ee49b306609f534e97bc -Author: Will Thompson -Date: Thu Feb 25 17:47:16 2010 +0000 - - Don't leave a porter_close_async() waiting - - tests/wocky-porter-test.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit ef42dd2a68567774cc970a4d6b1918f3f9a5a640 -Merge: ef691f6 98d0bfa -Author: Simon McVittie -Date: Thu Feb 25 17:24:13 2010 +0000 - - Merge branch 'trivia' - - Reviewed-by: Sjoerd Simons - -commit 98d0bfa540b24083673126125339664ebf0ddd3e -Author: Simon McVittie -Date: Thu Feb 25 17:20:47 2010 +0000 - - wocky-connector-test: use g_get_current_dir instead of getcwd() - - PATH_MAX isn't defined on Hurd, so this was causing Gabble build failures - on the Debian Hurd buildds. - - Similarly, use g_stat() and g_unlink() instead of plain stat() and - unlink(), so that all of these consistently use the GLib filename - encoding if/when Wocky is built on Windows. - - tests/wocky-connector-test.c | 21 ++++++++++++++------- - 1 files changed, 14 insertions(+), 7 deletions(-) - -commit 014c1b70b252a5094dc51d3d4798e9b8245e894e -Author: Simon McVittie -Date: Thu Feb 25 17:14:08 2010 +0000 - - Don't try to include FIXME.out in git - - .gitignore | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 93c6d27b0930a0f72e2de7bc824e74592fcfb657 -Author: Simon McVittie -Date: Thu Feb 25 17:13:48 2010 +0000 - - Fix various minor gtk-doc nits - - wocky/wocky-porter.h | 2 +- - wocky/wocky-sasl-auth.c | 1 + - wocky/wocky-sasl-handler.h | 12 +++++++++--- - wocky/wocky-utils.c | 2 ++ - wocky/wocky-xmpp-connection.c | 2 +- - wocky/wocky-xmpp-connection.h | 2 +- - wocky/wocky-xmpp-error.c | 4 ++-- - wocky/wocky-xmpp-stanza.c | 8 +++++++- - 8 files changed, 24 insertions(+), 9 deletions(-) - -commit 33ea2a8fc7baa62401820a9d73a57dff6f08be4b -Author: Simon McVittie -Date: Thu Feb 25 17:13:08 2010 +0000 - - wocky-docs.sgml: don't include XML for wocky-types, which is no longer of interest - - Everything in it is (almost by definition) documented somewhere else. - - docs/reference/wocky-docs.sgml | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit f0eced5cab2c84ade9739447409886477966989a -Author: Simon McVittie -Date: Thu Feb 25 17:12:36 2010 +0000 - - wocky-sections.txt: catch up with the current state of Wocky - - docs/reference/wocky-sections.txt | 270 +++++++++++++++++++++++++++++++++++-- - 1 files changed, 257 insertions(+), 13 deletions(-) - -commit 5ea4b794e19c655f89c6717e6398ef513f003930 -Author: Simon McVittie -Date: Thu Feb 25 16:25:09 2010 +0000 - - autogen.sh: prefer Automake 1.11 if we have it - - Same process and rationale as for Gabble, tp-glib, etc. - - autogen.sh | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) - -commit d38daeeccafcf18eaf3857ac38875ea2efd19a6d -Author: Simon McVittie -Date: Wed Jan 13 18:22:04 2010 +0000 - - wocky-muc.h: don't include config.h - - config.h is not installed, so it's inappropriate to include it in public - headers. - - wocky/wocky-muc.h | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 54eac5724786d8d2bb6fed491e95b44831ddea21 -Author: Will Thompson -Date: Thu Feb 25 14:20:15 2010 +0000 - - Correct _async/_finish implementations in WockyPubsub* - - Conventionally, the _async function is used as the source tag, not the - _finish function. It is also valid for the _finish() function not to be - called; the previous implementation of create_node would leak the - WockyPubsubNode * in that case. - - wocky/wocky-pubsub-node.c | 12 ++++++------ - wocky/wocky-pubsub-service.c | 24 +++++++++++++++--------- - 2 files changed, 21 insertions(+), 15 deletions(-) - -commit d24be5005f34564de2f47eafa8c5e7b443d3b085 -Author: Will Thompson -Date: Wed Feb 24 18:58:32 2010 +0000 - - Document pubsub_service_{ensure,lookup}_node - - wocky/wocky-pubsub-service.c | 27 +++++++++++++++++++++++++-- - 1 files changed, 25 insertions(+), 2 deletions(-) - -commit 5056aca0697871f94cfc304b0bfcdaf0ac5220d4 -Author: Will Thompson -Date: Tue Feb 23 15:39:50 2010 +0000 - - Fix en_FR - - tests/wocky-pubsub-node-test.c | 2 +- - tests/wocky-pubsub-service-test.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 5999ed11d9bfbf6bcff572fc40f6425b16ab62ce -Author: Guillaume Desmottes -Date: Wed Sep 30 17:00:44 2009 +0100 - - test wocky_pubsub_node_delete_async - - tests/wocky-pubsub-node-test.c | 70 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 70 insertions(+), 0 deletions(-) - -commit 50bf1002f93915d86045eb39d38bf974757630ef -Author: Guillaume Desmottes -Date: Wed Sep 30 17:00:30 2009 +0100 - - wocky-pubsub-node: add wocky_pubsub_node_delete_{async,finish} - - wocky/wocky-pubsub-node.c | 77 +++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-node.h | 9 +++++ - 2 files changed, 86 insertions(+), 0 deletions(-) - -commit d6b835bb6acc7ba29689efefed7f135bea0828c9 -Author: Guillaume Desmottes -Date: Wed Sep 30 16:59:30 2009 +0100 - - wocky-pubsub-node: get the service jid and the porter - - wocky/wocky-pubsub-node.c | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) - -commit 450508bf5c96c84c3e5deae6806ac8a8bcfe78e3 -Author: Guillaume Desmottes -Date: Wed Sep 30 15:56:15 2009 +0100 - - wocky-pubsub-service-test: create a node with configuration - - tests/wocky-pubsub-service-test.c | 142 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 142 insertions(+), 0 deletions(-) - -commit 86223733beb7d98cfccc1fe6f17f578e56c05c60 -Author: Guillaume Desmottes -Date: Wed Sep 30 15:54:12 2009 +0100 - - wocky_pubsub_service_create_node_async: set config of the node if needed - - wocky/wocky-pubsub-service.c | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 6e2bf9f6fb751f3a7ae7cd70eaa7c68d65e87605 -Author: Guillaume Desmottes -Date: Wed Sep 30 14:54:55 2009 +0100 - - wocky-pubsub-service-test: create an instant node - - tests/wocky-pubsub-service-test.c | 74 +++++++++++++++++++++++++++++++++--- - 1 files changed, 67 insertions(+), 7 deletions(-) - -commit d8177462ee4aadc06eb12b0c897b60027cac63d8 -Author: Guillaume Desmottes -Date: Wed Sep 30 14:35:59 2009 +0100 - - wocky_pubsub_service_create_node_async: support instant node creation - - Instant nodes are created without specifying their name. So we need to - parse the result stanza to get the name they received. - - tests/wocky-pubsub-service-test.c | 7 +++++- - wocky/wocky-pubsub-service.c | 43 ++++++++++++++++++++++++++++++------- - 2 files changed, 41 insertions(+), 9 deletions(-) - -commit 75171c4b2fd1d87d938e64c5b9bf067d00ce0fcd -Author: Guillaume Desmottes -Date: Wed Sep 30 13:07:37 2009 +0100 - - create node IQ is a 'set', not a 'get' - - tests/wocky-pubsub-service-test.c | 2 +- - wocky/wocky-pubsub-service.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 31da79fdccf3980f6f35fa36aa1fc03f0086cdeb -Author: Guillaume Desmottes -Date: Tue Sep 29 17:47:22 2009 +0100 - - fix includes of Wocky files - - wocky/wocky-pubsub-node.c | 8 ++++---- - wocky/wocky-pubsub-node.h | 7 ++++--- - wocky/wocky-pubsub-service.c | 10 +++++----- - wocky/wocky-pubsub-service.h | 9 +++++---- - 4 files changed, 18 insertions(+), 16 deletions(-) - -commit 46f8b6856bb5ccec696b2b154ee284d09e163c9d -Author: Guillaume Desmottes -Date: Tue Sep 29 17:11:17 2009 +0100 - - wocky-pubsub-service-test: try to get default node conf and server returns a 'forbidden' error - - tests/wocky-pubsub-service-test.c | 62 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 62 insertions(+), 0 deletions(-) - -commit 98ad3a56a2a8fd4742dd98b99077bc1d9e1f848c -Author: Guillaume Desmottes -Date: Tue Sep 29 17:10:48 2009 +0100 - - default_configuration_iq_cb: raise an error if server returned an error - - wocky/wocky-pubsub-service.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 9e03ceafcc7c5cb61ae32ce4bcd14538657034d9 -Author: Guillaume Desmottes -Date: Tue Sep 29 16:57:16 2009 +0100 - - wocky-pubsub-service-test: factor out get_default_node_configuration_test - - tests/wocky-pubsub-service-test.c | 15 ++++++++++++--- - 1 files changed, 12 insertions(+), 3 deletions(-) - -commit 1efe4d57736eeb45605a9155c880f4f27a718c01 -Author: Guillaume Desmottes -Date: Tue Sep 29 16:47:58 2009 +0100 - - wocky-pubsub-service-test: try to create a node and server returns an 'unsupported' error - - tests/wocky-pubsub-service-test.c | 67 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 67 insertions(+), 0 deletions(-) - -commit 14bac97ce3675b1559219a931ab078d86f66e79d -Author: Guillaume Desmottes -Date: Tue Sep 29 16:47:03 2009 +0100 - - create_node_iq_cb: raise an error if server returned an error - - wocky/wocky-pubsub-service.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit 89811fce9caeac315cc32c93b4d77d90284ef187 -Author: Guillaume Desmottes -Date: Tue Sep 29 16:46:12 2009 +0100 - - wocky-namespaces: add WOCKY_XMPP_NS_PUBSUB_ERRORS - - wocky/wocky-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 6819d046813de3e88e8ea0ea20f9c40a961c97d3 -Author: Guillaume Desmottes -Date: Tue Sep 29 16:26:29 2009 +0100 - - wocky-pubsub-service-test: factor out create_node_test - - tests/wocky-pubsub-service-test.c | 14 +++++++++++--- - 1 files changed, 11 insertions(+), 3 deletions(-) - -commit f76c88c41da053a36924c6842a8bbf62ef8999f7 -Author: Guillaume Desmottes -Date: Tue Sep 29 16:02:00 2009 +0100 - - wocky-pubsub-service-test: test to create a node with default configuration - - tests/wocky-pubsub-service-test.c | 74 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 74 insertions(+), 0 deletions(-) - -commit 60d677e16bbd056cb0ec531de6269f4acf3b48ae -Author: Guillaume Desmottes -Date: Tue Sep 29 16:01:29 2009 +0100 - - add wocky_pubsub_service_create_node_{async,finish} to create a new node - - wocky/wocky-pubsub-service.c | 94 ++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-service.h | 12 +++++ - 2 files changed, 106 insertions(+), 0 deletions(-) - -commit a0c5ea4b8a677efc647bf9837a872bbc354844df -Author: Guillaume Desmottes -Date: Tue Sep 29 15:49:39 2009 +0100 - - wocky-pubsub-node: add wocky_pubsub_node_get_name - - tests/wocky-pubsub-node-test.c | 2 ++ - wocky/wocky-pubsub-node.c | 8 ++++++++ - wocky/wocky-pubsub-node.h | 2 ++ - 3 files changed, 12 insertions(+), 0 deletions(-) - -commit 689449298ceb08c82c5469296128d92acb5d2401 -Author: Guillaume Desmottes -Date: Tue Sep 29 14:22:50 2009 +0100 - - wocky-pubsub-service-test: test wocky_pubsub_service_get_default_node_configuration_async - - tests/wocky-pubsub-service-test.c | 101 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 101 insertions(+), 0 deletions(-) - -commit 0730d29b7b42d0291f7262dd834c86dcde1b7ac2 -Author: Guillaume Desmottes -Date: Tue Sep 29 14:22:29 2009 +0100 - - add wocky_pubsub_service_get_default_node_configuration_{async,finish} - - wocky/wocky-pubsub-service.c | 114 ++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-service.h | 20 +++++++ - 2 files changed, 134 insertions(+), 0 deletions(-) - -commit dd03536c9dbb1dc992d56d028426dc1c0daded14 -Author: Guillaume Desmottes -Date: Tue Sep 29 14:18:08 2009 +0100 - - wocky-pubsub-service: get the porter from the session - - wocky/wocky-pubsub-service.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 60ea8f5cc2cd4685f8fbdf30cffefd212f8c0040 -Author: Guillaume Desmottes -Date: Tue Sep 29 14:17:23 2009 +0100 - - wocky-namespaces.h: add NS_PUBSUB_OWNER and NS_PUBSUB_NODE_CONFIG - - wocky/wocky-namespaces.h | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit a7f5b70e57d420c0c1e5b8838d224ce0a35a95a2 -Author: Guillaume Desmottes -Date: Tue Sep 22 13:32:12 2009 +0100 - - test wocky_pubsub_service_ensure_node - - tests/wocky-pubsub-service-test.c | 50 +++++++++++++++++++++++++++++++++--- - 1 files changed, 45 insertions(+), 5 deletions(-) - -commit 11cae978448ca2a080c5cb41699798b53fa1b1a5 -Author: Guillaume Desmottes -Date: Tue Sep 22 13:32:06 2009 +0100 - - add wocky_pubsub_service_{ensure,lookup}_node - - wocky/wocky-pubsub-service.c | 66 ++++++++++++++++++++++++++++++++++++++++- - wocky/wocky-pubsub-service.h | 7 ++++ - 2 files changed, 71 insertions(+), 2 deletions(-) - -commit 3289d40c3213ca725184fba2c6397ddcb86855f3 -Author: Guillaume Desmottes -Date: Tue Sep 22 11:48:06 2009 +0100 - - add wocky-pubsub-node-test.c - - .gitignore | 2 + - tests/Makefile.am | 7 +++++ - tests/wocky-pubsub-node-test.c | 54 ++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 63 insertions(+), 0 deletions(-) - -commit 426c96d4592cce2d967ed81677798e6a9076e6b4 -Author: Guillaume Desmottes -Date: Tue Sep 22 11:47:41 2009 +0100 - - add wocky-pubsub-node.[ch] - - wocky/Makefile.am | 4 +- - wocky/wocky-pubsub-node.c | 199 +++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-node.h | 64 +++++++++++++++ - wocky/wocky-types.h | 1 + - 4 files changed, 267 insertions(+), 1 deletions(-) - -commit f44b14786d2d55886896182967a796c1b5155156 -Author: Guillaume Desmottes -Date: Tue Sep 22 11:23:51 2009 +0100 - - add wocky-pubsub-service-test.c - - .gitignore | 2 +- - tests/Makefile.am | 7 +++++ - tests/wocky-pubsub-service-test.c | 49 +++++++++++++++++++++++++++++++++++++ - 3 files changed, 57 insertions(+), 1 deletions(-) - -commit 8ea80a23dda679d8d4511762974b9d8af7d5b90b -Author: Guillaume Desmottes -Date: Tue Sep 22 11:23:08 2009 +0100 - - add wocky-pubsub-service.[ch] - - wocky/Makefile.am | 4 +- - wocky/wocky-pubsub-service.c | 197 ++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-pubsub-service.h | 64 ++++++++++++++ - 3 files changed, 264 insertions(+), 1 deletions(-) - -commit ef691f605ccbb7306963aae03da33c3958f87e87 -Merge: 67c3401 1a12dad -Author: Will Thompson -Date: Wed Feb 24 18:07:27 2010 +0000 - - Merge branch 'dataforms' - - Reviewed-by: Will Thompson - Reviewed-by: Guillaume Desmottes - -commit 93b16266d53a8b4f19e823f63a8b1e1e6861440d -Author: Will Thompson -Date: Wed Feb 24 15:33:34 2010 +0000 - - Ignore more vim swapfiles - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit eaa9abf1e519919b1ec42979e701f5f2dfec06e8 -Author: Will Thompson -Date: Wed Feb 24 15:32:16 2010 +0000 - - Add a README for the tests - - tests/Makefile.am | 1 + - tests/README | 14 ++++++++++++++ - 2 files changed, 15 insertions(+), 0 deletions(-) - -commit 811ea8c29de9bfc484b74f90dd779ee0733d520c -Author: Will Thompson -Date: Wed Feb 24 15:31:40 2010 +0000 - - Support passing arguments to tests when valgrinding - - tests/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 543454e457ee692ec34973ef0574c6756fab8e98 -Author: Will Thompson -Date: Wed Feb 24 15:20:25 2010 +0000 - - Don't leak a stanza in node iterator test - - tests/wocky-xmpp-node-test.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 62d4fc906aedbee014b910d65a17423df410d394 -Author: Will Thompson -Date: Wed Feb 24 15:19:12 2010 +0000 - - Don't leak stanzas in the extract_errors test - - tests/wocky-xmpp-stanza-test.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 5cbc1c725ad60f059e3df869e6c71ad7a00644d7 -Author: Will Thompson -Date: Wed Feb 24 15:19:00 2010 +0000 - - Make valgrind suppressions work in out-of-tree builds - - tests/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0238e9f74ef6220825d84f01db8fd52a90236f78 -Author: Will Thompson -Date: Wed Feb 24 15:18:06 2010 +0000 - - Import tp-glib and gabble's valgrind suppressions - - These include a lot of tp-glib- and gabble-specific suppressions, but - also have really extensive suppressions for things in glib and gobject. - I don't really feel like separating them out... :-) - - tests/Makefile.am | 5 +- - tests/gabble.supp | 210 +++++++++++++++++++++++++++++++++++++++++++ - tests/tp-glib.supp | 250 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 464 insertions(+), 1 deletions(-) - -commit 11578da38fca331f62db359852fe23d61c715470 -Author: Will Thompson -Date: Tue Feb 23 19:54:24 2010 +0000 - - Correct a source tag - - tests/test-resolver.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 727eca561d376c8a5ec4339b965ac16370f67c36 -Author: Will Thompson -Date: Tue Feb 23 19:54:07 2010 +0000 - - test-resolver: don't leak if _finish() aren't called - - tests/test-resolver.c | 42 ++++++++++++++++++++++++++++++++++++++---- - 1 files changed, 38 insertions(+), 4 deletions(-) - -commit 9bec938e524236c43089e3b8aff05def5cfac957 -Author: Will Thompson -Date: Tue Feb 23 18:28:36 2010 +0000 - - PEP: don't leak if pep_service_get_finish() isn't called - - wocky/wocky-pep-service.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 60d7a62d5f7a13d8786a768c6ee2e7ebd4d8dccf -Author: Will Thompson -Date: Tue Feb 23 18:12:42 2010 +0000 - - Don't leak the WockyMuc in the disco CB - - g_async_result_get_source_object () returns a new ref. - - wocky/wocky-muc.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 67c34019bacaa8b0ae907dedca92ce5c23e95034 -Author: Will Thompson -Date: Tue Feb 23 17:51:30 2010 +0000 - - Fix coding style violations - - wocky/wocky-muc.c | 6 +++--- - wocky/wocky-sasl-handler.h | 2 +- - wocky/wocky-xmpp-node.c | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -commit f903a2add6f875356b59d2647ea700cf14d524e4 -Author: Will Thompson -Date: Tue Feb 23 17:46:28 2010 +0000 - - Generate FIXME.out - - Makefile.am | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 1a12dad94dce8207b2b17b0c176f94e3cd2bc152 -Author: Will Thompson -Date: Mon Feb 22 17:22:49 2010 +0000 - - Document wocky_data_forms_submit() - - wocky/wocky-data-forms.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 37b2f7b8e22c9689ccced93c95511bfa3e70c7ed -Author: Will Thompson -Date: Mon Feb 22 17:08:42 2010 +0000 - - Use iterators when parsing results - - wocky/wocky-data-forms.c | 69 ++++++++++++++++++++++------------------------ - 1 files changed, 33 insertions(+), 36 deletions(-) - -commit aad59510b15685168cad5147dee3aa0d44b4f305 -Author: Will Thompson -Date: Mon Feb 22 16:46:11 2010 +0000 - - Use WockyXmppNodeIter in a couple of places. - - wocky/wocky-data-forms.c | 32 +++++++++++++------------------- - 1 files changed, 13 insertions(+), 19 deletions(-) - -commit 40107996ad14c16029474e21f5afa516be2307dc -Author: Will Thompson -Date: Mon Feb 22 16:36:29 2010 +0000 - - Use g_slist_foreach as appropriate. - - This makes the code clearer (there's less boilerplate clutter) and - shorter! - - wocky/wocky-data-forms.c | 40 ++++++++++++---------------------------- - 1 files changed, 12 insertions(+), 28 deletions(-) - -commit ee927a89e9c90e714a57890d92db3627230fd3f5 -Author: Will Thompson -Date: Mon Feb 22 16:11:15 2010 +0000 - - Use g_assert_cmpstr () in data forms test - - tests/wocky-data-forms-test.c | 83 ++++++++++++++++++---------------------- - 1 files changed, 37 insertions(+), 46 deletions(-) - -commit 20e068bcbbd120ea93559f6535a37833dc36e562 -Author: Will Thompson -Date: Mon Feb 22 17:13:39 2010 +0000 - - Improve and correct documentation - - wocky/wocky-data-forms.c | 20 +++++++++++++++----- - wocky/wocky-data-forms.h | 9 +++++---- - 2 files changed, 20 insertions(+), 9 deletions(-) - -commit e5272a71e7f9f5be3c56e1fae618ec78708703da -Author: Will Thompson -Date: Mon Feb 22 14:58:56 2010 +0000 - - Use GEnum for WockyDataFormsFieldType - - This saves manually writing the code to (de)stringify them. Also, get - rid of the unused INVALID member. - - wocky/Makefile.am | 10 +++-- - wocky/wocky-data-forms.c | 85 ++++++++++------------------------------------ - wocky/wocky-data-forms.h | 11 +++--- - 3 files changed, 30 insertions(+), 76 deletions(-) - -commit 6fd4076b68e764b1481e8a12b6a2dfd15f93067d -Author: Guillaume Desmottes -Date: Tue Sep 29 17:42:19 2009 +0100 - - fix includes of Wocky files - - wocky/wocky-data-forms.c | 4 ++-- - wocky/wocky-data-forms.h | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit 471c0a869338f4c3c20bae28c1e8ad79264b71f1 -Author: Guillaume Desmottes -Date: Tue Sep 29 14:38:13 2009 +0100 - - wocky_data_forms_new_from_form: set an error if data forms can't be created - - tests/wocky-data-forms-test.c | 27 +++++++++++++++++++-------- - wocky/wocky-data-forms.c | 8 +++++++- - wocky/wocky-data-forms.h | 3 ++- - 3 files changed, 28 insertions(+), 10 deletions(-) - -commit 71fe96395e186c2e5a42845521469b930cd5abf7 -Author: Guillaume Desmottes -Date: Tue Sep 29 14:34:17 2009 +0100 - - rename WOCKY_DATA_FORMS_ERROR_NOT_RESULT error to WOCKY_DATA_FORMS_ERROR_WRONG_TYPE - - wocky/wocky-data-forms.c | 2 +- - wocky/wocky-data-forms.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 89c6ec74defc5036edb138a9268eb9d5c6bf7ac2 -Author: Guillaume Desmottes -Date: Tue Sep 29 12:38:02 2009 +0100 - - pass the owernship of the value and default value to wocky_data_forms_field_new - - wocky/wocky-data-forms.c | 15 +++------------ - 1 files changed, 3 insertions(+), 12 deletions(-) - -commit 96df75e4793267c5f995e3b3c164843d573e46f4 -Author: Guillaume Desmottes -Date: Tue Sep 29 12:23:08 2009 +0100 - - rename wocky_data_forms_field and wocky_data_forms_field_option to be camel-cased - - tests/wocky-data-forms-test.c | 18 ++++++++-------- - wocky/wocky-data-forms.c | 46 ++++++++++++++++++++-------------------- - wocky/wocky-data-forms.h | 6 ++-- - 3 files changed, 35 insertions(+), 35 deletions(-) - -commit d9cbe8b6f245ca0e17eda91b184d2b10c59ac9ca -Author: Guillaume Desmottes -Date: Tue Sep 29 12:15:45 2009 +0100 - - fix typos - - wocky/wocky-data-forms.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit a02edf09d4d37a86bccb9c543274d9dd6e77641e -Author: Guillaume Desmottes -Date: Tue Sep 29 12:15:36 2009 +0100 - - support '1' and '0' has boolean values - - wocky/wocky-data-forms.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 806e012db9e6accc9e3ea7a6b042b45f7f3e660d -Author: Guillaume Desmottes -Date: Mon Sep 28 15:47:32 2009 +0100 - - wocky-data-forms-test: test wocky_data_forms_parse_result with a single result - - tests/wocky-data-forms-test.c | 68 +++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 68 insertions(+), 0 deletions(-) - -commit 3eca00b5a1433ad529189c424c12a592b00a5288 -Author: Guillaume Desmottes -Date: Mon Sep 28 15:45:37 2009 +0100 - - wocky-data-forms: support result stanzas without item nodes - - If there is only one result, it can be reported as a child of the x - node, without reported and item nodes. - - wocky/wocky-data-forms.c | 41 +++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 39 insertions(+), 2 deletions(-) - -commit 9c8ea2d5d9647ab7e689ff8b25bb6fad33e16e84 -Author: Guillaume Desmottes -Date: Mon Sep 28 14:57:41 2009 +0100 - - wocky-data-forms: foreach_item: don't leak the value - - wocky/wocky-data-forms.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 52add0d77c63efd30ee649d6f0948951c78cf1d2 -Author: Guillaume Desmottes -Date: Mon Sep 28 14:57:23 2009 +0100 - - wocky-data-forms-test: test wocky_data_forms_parse_result - - tests/wocky-data-forms-test.c | 125 +++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 125 insertions(+), 0 deletions(-) - -commit daeda3372cb764d9121c433641758d4c7982cdf4 -Author: Guillaume Desmottes -Date: Mon Sep 28 14:29:06 2009 +0100 - - wocky-data-forms-test: rename create_form_stanza to create_bot_creation_form_stanza - - tests/wocky-data-forms-test.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit d6de371dcc583c79245b5d9bfad423a7b58314b7 -Author: Guillaume Desmottes -Date: Mon Sep 28 13:58:14 2009 +0100 - - wocky-data-forms-test: test wocky_data_forms_submit - - tests/wocky-data-forms-test.c | 174 +++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 174 insertions(+), 0 deletions(-) - -commit b1a520e7848cd7276d97fc0eaee77e24c0a73348 -Author: Guillaume Desmottes -Date: Mon Sep 28 12:31:44 2009 +0100 - - wocky-data-forms-test: factor out create_form_stanza - - tests/wocky-data-forms-test.c | 101 +++++++++++++++++++++------------------- - 1 files changed, 53 insertions(+), 48 deletions(-) - -commit 2be4d00d5e02756aa4e59944df24fa8c8b5eb729 -Author: Guillaume Desmottes -Date: Mon Sep 28 12:28:45 2009 +0100 - - wocky-data-forms-test: set a default value to the boolean field - - tests/wocky-data-forms-test.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 5c0c968e5c3c94ce9636b6ad8cfce9f5ee506ad7 -Author: Guillaume Desmottes -Date: Mon Sep 28 12:15:56 2009 +0100 - - wocky-data-forms-test: add a jid-single field node in the form - - tests/wocky-data-forms-test.c | 18 ++++++++++++++++-- - 1 files changed, 16 insertions(+), 2 deletions(-) - -commit 35b316cc8a4c0a60a27fe4aa7aa1b103dfa53222 -Author: Guillaume Desmottes -Date: Mon Sep 28 12:09:00 2009 +0100 - - wocky-data-forms: fix style typo - - wocky/wocky-data-forms.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 7f4a542db21d2e95bda64912bd0e2b9828934d21 -Author: Guillaume Desmottes -Date: Mon Sep 28 11:59:47 2009 +0100 - - wocky-data-forms-test: test wocky_data_forms_new_from_form - - tests/wocky-data-forms-test.c | 259 +++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 259 insertions(+), 0 deletions(-) - -commit 0208279021b93783f651c7d5e75ad55380fec860 -Author: Guillaume Desmottes -Date: Mon Sep 28 11:20:59 2009 +0100 - - wocky_data_forms_field_new: set the description - - wocky/wocky-data-forms.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 0c21af1956d6adfb4943f6d1063ac2d2aa83096c -Author: Guillaume Desmottes -Date: Mon Sep 28 11:19:04 2009 +0100 - - foreach_x_child: add the type of the field in the debug msg - - wocky/wocky-data-forms.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9ec21828b84654f4d7cb9d1de7122807d1d465c7 -Author: Guillaume Desmottes -Date: Mon Sep 28 10:49:11 2009 +0100 - - extract_value_list: add trailing NULL to the strings array - - wocky/wocky-data-forms.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 367137bd68baf3f6c41159e082cda0c076407f38 -Author: Guillaume Desmottes -Date: Mon Sep 28 10:42:59 2009 +0100 - - extract_options_list: add debug option - - wocky/wocky-data-forms.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 9a1b02f8c35d4a31a17f1f3b06e805758a35bf15 -Author: Guillaume Desmottes -Date: Fri Sep 25 16:22:45 2009 +0100 - - wocky-data-forms: fix a typo in str_to_type - - wocky/wocky-data-forms.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit cdf71f869bd972db052744ecddf058e5f53a1708 -Author: Guillaume Desmottes -Date: Fri Sep 25 16:04:28 2009 +0100 - - wocky-data-forms: add wocky_data_forms_get_{title,instructions} - - wocky/wocky-data-forms.c | 16 ++++++++++++++++ - wocky/wocky-data-forms.h | 4 ++++ - 2 files changed, 20 insertions(+), 0 deletions(-) - -commit 38f36dd907fdade1756cb1bb82f0a05b91092fe6 -Author: Guillaume Desmottes -Date: Fri Sep 25 16:02:58 2009 +0100 - - wocky-data-forms; transfer ownership of the fields to the list - - The hash table doesn't contain fixed fields (as they don't have a 'var' - attribute). Transfer the ownership of the fields to the list so the - fixed fields are properly freed. - - wocky/wocky-data-forms.c | 5 +++-- - wocky/wocky-data-forms.h | 4 ++-- - 2 files changed, 5 insertions(+), 4 deletions(-) - -commit 432db6d2df4d54606f267d94195d4ab3af09203d -Author: Guillaume Desmottes -Date: Fri Sep 25 15:52:50 2009 +0100 - - wocky-data-forms: check if var is NULL before adding the field to the hash table - - wocky/wocky-data-forms.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit 93cca1c0b5797487c512ea6c7987d4d3978bf768 -Author: Guillaume Desmottes -Date: Fri Sep 25 14:56:17 2009 +0100 - - add wocky-data-forms-test.c - - .gitignore | 1 + - tests/Makefile.am | 8 ++++- - tests/wocky-data-forms-test.c | 63 +++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 71 insertions(+), 1 deletions(-) - -commit a00881f8d5ae67fef9230985bb44115b1447e272 -Author: Guillaume Desmottes -Date: Fri Sep 25 14:39:43 2009 +0100 - - build wocky-data-forms - - wocky/Makefile.am | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 7c0f242b6f61744689714b15d64202bd35959f6d -Author: Guillaume Desmottes -Date: Fri Sep 25 14:39:38 2009 +0100 - - wocky-data-forms: use wocky debug domain - - wocky/wocky-data-forms.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 7e600fe989ce14dc8dcdd0c6a780bd13f3ad416c -Author: Guillaume Desmottes -Date: Fri Sep 25 14:39:20 2009 +0100 - - add dataforms debug domain - - wocky/wocky-debug.c | 1 + - wocky/wocky-debug.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit 8c275b7c4f6a424a80c08b37417835fa02057705 -Author: Guillaume Desmottes -Date: Fri Sep 25 14:34:58 2009 +0100 - - import wocky-data-forms.[ch] from Gabble - - wocky/wocky-data-forms.c | 805 ++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-data-forms.h | 123 +++++++ - 2 files changed, 928 insertions(+), 0 deletions(-) - -commit 2be5deaeac50cc6d5d42b268dd815cee3b31fefd -Author: Sjoerd Simons -Date: Tue Feb 16 11:59:02 2010 +0000 - - Make the added Jingle namespaces more correct and consistent - - wocky/wocky-namespaces.h | 16 +++++++--------- - wocky/wocky-xmpp-node.c | 2 +- - 2 files changed, 8 insertions(+), 10 deletions(-) - -commit b18c56f9e2b1ff27e5838d7a7afee9b0b03be7d5 -Author: Sjoerd Simons -Date: Tue Feb 16 11:58:13 2010 +0000 - - Document that name and namespace are allowed to be NULL - - wocky/wocky-xmpp-node.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit ee4b5cbcbf8f6db7d1d0cdf41f53b61a1de1c48a -Author: Sjoerd Simons -Date: Tue Feb 16 11:42:28 2010 +0000 - - Fix typo - - tests/wocky-xmpp-node-test.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4732bab637b4d836e9c8a3c869374ba664428a14 -Author: Sjoerd Simons -Date: Mon Feb 15 14:57:36 2010 +0000 - - Add a node iteration test - - tests/wocky-xmpp-node-test.c | 94 ++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 94 insertions(+), 0 deletions(-) - -commit 50dbea42a8002bd76aa6c368c06c739bef4fb5a3 -Author: Sjoerd Simons -Date: Mon Feb 15 14:56:50 2010 +0000 - - Add the note iterator stuff in the documentation - - docs/reference/wocky-sections.txt | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit e31b279f10e9b8a73bdeb66385f63dbdc35e475d -Author: Sjoerd Simons -Date: Mon Feb 15 14:56:32 2010 +0000 - - Add node iterator utility functions - - wocky/wocky-xmpp-node.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-node.h | 17 +++++++++++- - 2 files changed, 85 insertions(+), 1 deletions(-) - -commit a8aef4efc124d2932301cd7634606ba505b53b77 -Author: Sjoerd Simons -Date: Mon Feb 15 14:54:57 2010 +0000 - - Add jingle namespaces - - wocky/wocky-namespaces.h | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) - -commit e70f6fc191bc3516dfeb9f7dedf28cb70bb5d3f7 -Author: Sjoerd Simons -Date: Fri Feb 12 19:18:28 2010 +0000 - - Add google jingle session namespaces for use in tests later - - wocky/wocky-namespaces.h | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 83221b4b791d2e00fc286694d9912832cca8305e -Merge: db56fa0 f6842a6 -Author: Will Thompson -Date: Mon Feb 15 13:06:43 2010 +0000 - - Merge branch 'error-wrangling' - - Reviewed-by: Sjoerd Simons - -commit f6842a68d853cf6b364fabc264a04b6d8193a0b1 -Author: Will Thompson -Date: Mon Feb 15 12:50:00 2010 +0000 - - Document assumption about _enum_from_nick's behaviour - - wocky/wocky-utils.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 533bbdcb916215dd38ff3573a1221e843d8d912a -Author: Will Thompson -Date: Mon Feb 15 12:45:37 2010 +0000 - - Consistently use "quark == 0" - - wocky/wocky-xmpp-error.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 33c6f6da5eeb13e7fdf591efc2cc9411e86051fe -Author: Will Thompson -Date: Wed Feb 3 15:10:54 2010 +0000 - - Reorder and better document wocky-xmpp-error.c - - This patch contains no code changes, but tries to make - wocky-xmpp-error.c easier to understand by adding documentation and - arranging the file to be roughly: - - • Core stanza errors, and parsing/production thereof; - • Core stream errors, and parsing thereof; - • Application-specific stanza errors. - - wocky/wocky-xmpp-error.c | 271 ++++++++++++++++++++++++++-------------------- - 1 files changed, 153 insertions(+), 118 deletions(-) - -commit fe2b96bf50e47815c888167910e4e12cbcc46081 -Author: Will Thompson -Date: Wed Feb 3 14:44:00 2010 +0000 - - Improve documentation of new error-y functions - - wocky/wocky-xmpp-error.c | 25 +++++++++++++++++++++++++ - wocky/wocky-xmpp-stanza.c | 20 ++++++++++++++++---- - 2 files changed, 41 insertions(+), 4 deletions(-) - -commit fa9560b0ac44df71d048416cd64903900d3e84c2 -Author: Will Thompson -Date: Wed Feb 3 01:35:19 2010 +0000 - - Remove superseded error wrangling functions. - - The functionality of these functions has been subsumed and improved upon - by wocky_stanza_error_to_node(), wocky_xmpp_error_extract() and - wocky_xmpp_stream_error_from_node(). - - tests/wocky-xmpp-stanza-test.c | 28 ----------------------- - wocky/wocky-xmpp-error.c | 29 ------------------------ - wocky/wocky-xmpp-error.h | 4 --- - wocky/wocky-xmpp-stanza.c | 47 ---------------------------------------- - wocky/wocky-xmpp-stanza.h | 1 - - 5 files changed, 0 insertions(+), 109 deletions(-) - -commit c05e22a652d6c2faa729edb2842f6cc36fb2b315 -Author: Will Thompson -Date: Wed Feb 3 01:23:06 2010 +0000 - - Add and use _stanza_extract_stream_error() - - By analogy to wocky_xmpp_stanza_extract_errors(), this function parses a - stream error stanza, yielding an error in the WOCKY_XMPP_STANZA_ERROR - domain. - - Note that the test for parsing stanza errors was wrong: was not - in the correct namespace. - - tests/wocky-xmpp-stanza-test.c | 20 +++++++++++--------- - wocky/wocky-connector.c | 19 +++---------------- - wocky/wocky-porter.c | 2 +- - wocky/wocky-xmpp-error.c | 26 ++++++++++++++++++-------- - wocky/wocky-xmpp-error.h | 2 +- - wocky/wocky-xmpp-stanza.c | 16 ++++++++++++++++ - wocky/wocky-xmpp-stanza.h | 3 +++ - 7 files changed, 53 insertions(+), 35 deletions(-) - -commit 814c778603c3c3ebcd8dca9f7bfcdf28e3bb6381 -Author: Will Thompson -Date: Wed Feb 3 01:06:48 2010 +0000 - - Use _stanza_extract_errors() not _stanza_to_gerror() - - wocky_xmpp_stanza_to_gerror() works on both stream errors and stanzas - with type='error'. I think this is confusing, and unnecessary: there are - no real situations where you don't know which of the two you have. - - wocky/wocky-muc.c | 2 +- - wocky/wocky-roster.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 5a2b25047722c8ffb4fac28941c2e4d55f26dc75 -Author: Will Thompson -Date: Wed Feb 3 00:59:27 2010 +0000 - - connector: use _extract_errors, not manual parsing - - wocky/wocky-connector.c | 72 +++++++++++++++++++++++----------------------- - 1 files changed, 36 insertions(+), 36 deletions(-) - -commit 34265393559bf22073eda1f5fe784600bfaf8d10 -Author: Will Thompson -Date: Wed Feb 3 00:55:17 2010 +0000 - - Return gboolean from _stanza_extract_errors() - - This is probably more useful behaviour than having to explicitly check - whether the stanza has type='error' before calling the function. - - tests/wocky-xmpp-stanza-test.c | 22 ++++++++++++++++++++-- - wocky/wocky-xmpp-stanza.c | 12 ++++++++---- - wocky/wocky-xmpp-stanza.h | 2 +- - 3 files changed, 29 insertions(+), 7 deletions(-) - -commit 660aa9916918e71819b2e54a0f335f14477c3b28 -Author: Will Thompson -Date: Tue Feb 2 20:39:48 2010 +0000 - - Remove wocky_xmpp_error_unpack_node() - - Its functionality is subsumed by wocky_xmpp_error_extract (via - wocky_xmpp_stanza_extract_errors). - - tests/wocky-xmpp-node-test.c | 182 ------------------------------------------ - wocky/wocky-connector.c | 90 +++++++-------------- - wocky/wocky-muc.c | 47 ++++------- - wocky/wocky-xmpp-error.c | 100 +----------------------- - wocky/wocky-xmpp-error.h | 9 -- - 5 files changed, 46 insertions(+), 382 deletions(-) - -commit 27671766aa63e51ac4a31fb261f02e15e35ea14d -Author: Will Thompson -Date: Tue Feb 2 19:46:36 2010 +0000 - - Test wocky_stanza_error_to_node() - - tests/wocky-xmpp-stanza-test.c | 108 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 108 insertions(+), 0 deletions(-) - -commit 70c50735ea77358f13b72551512089f0b9943eb7 -Author: Will Thompson -Date: Tue Feb 2 19:40:23 2010 +0000 - - Correctly namespace element in . - - wocky/wocky-xmpp-error.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit dba37a26dc50450b6ca88b42f2c7e9ad29bfaf6d -Author: Will Thompson -Date: Tue Feb 2 19:28:12 2010 +0000 - - Fix ordering of legacy error codes - - remote-server-timeout and service-unavailable are the only stanza errors - with multiple old-style codes. The codes were listed in numerical order, - but in both cases this conflicted with the suggested mapping in XEP-0086 - §2. - - wocky/wocky-xmpp-error.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit d75437300e3a9bd093b277d13a9531d2218f8cd7 -Author: Will Thompson -Date: Tue Feb 2 16:07:35 2010 +0000 - - Add wocky_xmpp_stanza_extract_errors() - - tests/wocky-xmpp-stanza-test.c | 197 ++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-error.c | 90 ++++++++++++++++++ - wocky/wocky-xmpp-error.h | 10 ++- - wocky/wocky-xmpp-stanza.c | 35 +++++++ - wocky/wocky-xmpp-stanza.h | 6 + - 5 files changed, 337 insertions(+), 1 deletions(-) - -commit e02c36e01765f020658592a879adf07f5f08ae4b -Author: Will Thompson -Date: Tue Feb 2 15:53:03 2010 +0000 - - Also guess error type for legacy error codes - - wocky/wocky-xmpp-error.c | 18 ++++++++++++++---- - 1 files changed, 14 insertions(+), 4 deletions(-) - -commit 6ca7b814db6a11c9d7bffc1a56b324d6b5862c04 -Author: Will Thompson -Date: Tue Feb 2 13:20:24 2010 +0000 - - Extract parsing legacy error codes to a function - - wocky/wocky-xmpp-error.c | 61 +++++++++++++++++++++++++--------------------- - 1 files changed, 33 insertions(+), 28 deletions(-) - -commit b6847d202e5a850e47291d56ec47a90a28556ece -Author: Will Thompson -Date: Sun Jan 31 15:37:02 2010 +0000 - - Remove redundant fields of XmppErrorSpec - - This structure does need to be distinct from - WockyXmppErrorSpecialization because it needs to include legacy error - codes. However, errors' element names can be obtained from the - enumeration, and all errors in this table are core stanza errors, in the - stanzas namespace. - - wocky/wocky-xmpp-error.c | 102 +++++++++++++--------------------------------- - 1 files changed, 29 insertions(+), 73 deletions(-) - -commit dec2c87413b23453388baf4b61c23839a28cbaef -Author: Will Thompson -Date: Sun Jan 31 15:31:21 2010 +0000 - - Support converting GErrors to stanza errors - - wocky/wocky-xmpp-error.c | 98 ++++++++++++++++++++++++++++++++++++++------- - wocky/wocky-xmpp-error.h | 3 + - 2 files changed, 85 insertions(+), 16 deletions(-) - -commit 94763836b6eeae075deeb2a72d27528e6f8e47e4 -Author: Will Thompson -Date: Sun Jan 31 15:10:35 2010 +0000 - - Add wocky_xmpp_node_set_ns_q() - - wocky/wocky-xmpp-node.c | 8 +++++++- - wocky/wocky-xmpp-node.h | 1 + - 2 files changed, 8 insertions(+), 1 deletions(-) - -commit 90ede56d63480021a572facb37c2c4c5545dd409 -Author: Will Thompson -Date: Fri Jan 29 23:59:31 2010 +0000 - - Register Jingle and SI error domains - - wocky/wocky-xmpp-error.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-error.h | 1 + - 2 files changed, 79 insertions(+), 0 deletions(-) - -commit 7dcdc9146c4283bec55e9272e438d4f87d2b9584 -Author: Will Thompson -Date: Fri Jan 29 23:34:25 2010 +0000 - - Update Jingle error codes to the current XEP - - wocky/wocky-xmpp-error.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit fd9c14279f4359b1e2bcb5e17f4fab2cabacbd5d -Author: Will Thompson -Date: Fri Jan 29 23:51:41 2010 +0000 - - Add a hook for registering new stanza error domains - - wocky/wocky-xmpp-error.c | 24 ++++++++++++++++++++++++ - wocky/wocky-xmpp-error.h | 19 +++++++++++++++++++ - wocky/wocky.c | 3 +++ - 3 files changed, 46 insertions(+), 0 deletions(-) - -commit 86490fc3bcf9c87b0b7be9d6eaadadbc9cbf1c01 -Author: Will Thompson -Date: Fri Jan 29 23:14:09 2010 +0000 - - Add and use WockyXmppErrorType - - tests/wocky-xmpp-node-test.c | 6 ++-- - wocky/wocky-muc.c | 6 ++-- - wocky/wocky-xmpp-error.c | 68 ++++++++++++++++++++++++------------------ - wocky/wocky-xmpp-error.h | 11 ++++++- - 4 files changed, 55 insertions(+), 36 deletions(-) - -commit 6788145886837957ce2ef404027257ae9c15ddc0 -Author: Will Thompson -Date: Fri Jan 29 19:36:00 2010 +0000 - - Look up stanza errors from GEnum - - We still need the fallback case for error numbers, but we don't need the - "start at the end" stuff any more because WockyXmppError only contains - the basic stanza errors (rather than having Jingle and SI smushed in at - the end). - - wocky/wocky-xmpp-error.c | 18 ++++-------------- - wocky/wocky-xmpp-error.h | 3 ++- - 2 files changed, 6 insertions(+), 15 deletions(-) - -commit 4da39e6569b55ab29610e3f27c2de3ade4db5acd -Author: Will Thompson -Date: Fri Jan 29 19:30:26 2010 +0000 - - Generalize looking up error code from node and ns - - wocky/wocky-xmpp-error.c | 53 ++++++++++++++++++++++++++++++++++----------- - 1 files changed, 40 insertions(+), 13 deletions(-) - -commit a028aac7a8e877d2062373f67a91ccb66e0382b8 -Author: Will Thompson -Date: Fri Jan 29 18:52:38 2010 +0000 - - Use XMPP namespaces for Xmpp[Stream]Error quark - - This involves changing a test which hardcodes the string corresponding - to the stream error quark. I was surprised that it did so, but it's - because you can't use the quark in a static table of test data. - - tests/wocky-connector-test.c | 16 ++++++++-------- - wocky/wocky-xmpp-error.c | 4 ++-- - 2 files changed, 10 insertions(+), 10 deletions(-) - -commit 5c88062e9470be54720a5bca1a4a3276f028e578 -Author: Will Thompson -Date: Fri Jan 29 17:32:03 2010 +0000 - - Remove non-stanza errors from WockyXmppError - - They belong in their own domains. - - wocky/wocky-xmpp-error.c | 77 +++++++++++++-------------------------------- - wocky/wocky-xmpp-error.h | 26 +++++++++++----- - 2 files changed, 40 insertions(+), 63 deletions(-) - -commit d915abf0858f13c000203685bbfce8368803dd60 -Author: Will Thompson -Date: Fri Jan 29 17:08:36 2010 +0000 - - Convert to WockyXmppStreamError using GEnum - - wocky/wocky-xmpp-error.c | 56 +++++++++------------------------------------- - wocky/wocky-xmpp-error.h | 1 + - 2 files changed, 12 insertions(+), 45 deletions(-) - -commit a6fbbd4f2200563dde0fa9b26fcdc7390adf5435 -Author: Will Thompson -Date: Fri Jan 29 17:16:57 2010 +0000 - - Add wocky_xmpp_node_has_ns() and _has_ns_q() - - wocky/wocky-xmpp-node.c | 12 ++++++++++++ - wocky/wocky-xmpp-node.h | 2 ++ - 2 files changed, 14 insertions(+), 0 deletions(-) - -commit 3cc413cf14ebb097b9a717eefd6020dc074bb004 -Author: Will Thompson -Date: Fri Jan 29 17:08:11 2010 +0000 - - Correct generation of GEnum nicknames - - wocky/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 67a3f5cb295b266dd40a61bcb9fe617c5191280b -Author: Will Thompson -Date: Fri Jan 29 16:34:31 2010 +0000 - - Add helpers to convert enums to/from nicks - - wocky/wocky-utils.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-utils.h | 3 ++ - 2 files changed, 70 insertions(+), 0 deletions(-) - -commit db56fa02c425d04ae12dd686942f5303d700fc15 -Author: Sjoerd Simons -Date: Mon Feb 1 15:10:02 2010 +0000 - - Signal our own presence when we receive it - - wocky/wocky-muc.c | 14 +++++++++++++- - 1 files changed, 13 insertions(+), 1 deletions(-) - -commit 556c16b9fcf1f869e37622a043c0707d34e9e4c2 -Author: Sjoerd Simons -Date: Mon Feb 1 15:08:59 2010 +0000 - - Add an accessor for the state of the WockyMuc - - wocky/wocky-muc.c | 34 +++++++++++++++++----------------- - wocky/wocky-muc.h | 10 ++++++++++ - 2 files changed, 27 insertions(+), 17 deletions(-) - -commit c1044f07d71abd3df64337832ce489f390794140 -Merge: 4abda60 d839ade -Author: Sjoerd Simons -Date: Wed Jan 27 14:27:56 2010 +0000 - - Merge branch 'auth-data-with-success' - -commit d839ade59a843b44ca65129df810f244cfe90d54 -Author: Sjoerd Simons -Date: Wed Jan 27 14:22:00 2010 +0000 - - Update documentation - - wocky/wocky-sasl-handler.h | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 4abda602a728fdcf057cad9f759c746fd219007f -Author: Will Thompson -Date: Thu Jan 21 15:24:21 2010 +0000 - - Squash warnings about failing to normalise NULL recipient - - It's valid to send IQs with no recipient, so stanza_iq_handler_new() - will often be called with recipient == NULL. Previously, it would try to - normalize NULL, fail, emit a debug message, and fall back to using NULL; - this patch stops it trying to normalize NULL in the first place. - - Reviewed-by: Sjoerd Simons - - wocky/wocky-porter.c | 13 +++++++++---- - 1 files changed, 9 insertions(+), 4 deletions(-) - -commit 6825ce8cd16843166d950779e32d1d15714377ff -Author: Sjoerd Simons -Date: Thu Jan 21 14:49:03 2010 +0000 - - More readme tweaks (actually buildbot testing) - - README | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9f6b8ec2a3dd2cb440a9f3dc8a1223d4b0e29d24 -Author: Sjoerd Simons -Date: Thu Jan 21 14:24:51 2010 +0000 - - Tweak the README - - README | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9d0e91c4a7fe6e88e0009a26f49e3b8866c2c2c1 -Author: Vivek Dasmohapatra -Date: Thu Jan 21 13:30:23 2010 +0000 - - Turn off OpenSSL SSLv2 supprt (this allows deflate compression to be negotiated) - - wocky/wocky-openssl.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 5a515d7d52ad05c84e320787269fba6fa7913757 -Author: Simon McVittie -Date: Wed Jan 13 15:47:38 2010 +0000 - - Generate header guards for *-enumtypes.h properly - - Reviewed-by: Vivek Dasmohapatra - - wocky/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b0989e5f85f8982de112fa89993dc1b12de4a02d -Author: Simon McVittie -Date: Wed Jan 13 15:20:32 2010 +0000 - - Tighten up rule for generating *-enumtypes.h - - It turns out that an implicit rule for %-enumtypes.h can be a bad idea - - % matches slashes, so when the equivalent of this code in src/ runs, it - can be run with /home/smcv/.../wocky/wocky-foo-enumtypes.h as target, - resulting in highly undesirable action-at-a-distance. - - Since we require GNU make already, use static pattern rules to avoid that - sort of thing. - - Reviewed-by: Vivek Dasmohapatra - - wocky/Makefile.am | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit 58079b010d3bd3e192c5317e68e2b0d42efcb4e5 -Merge: 8d9008c 28a8d7e -Author: Simon McVittie -Date: Wed Jan 13 13:21:00 2010 +0000 - - Merge branch 'misc' - - Reviewed-by: Vivek Dasmohapatra - -commit 28a8d7e17d7d8624f89f0cfdd3378c28dc92f261 -Author: Simon McVittie -Date: Wed Jan 13 13:14:31 2010 +0000 - - wocky/Makefile.am: fix generation of *-enumtypes.h - - Previously, if foo-enumtypes.h was built as a result of a dependency from - another directory, we'd try to use the full path - (/home/smcv/.../wocky/foo) in the macro names, which is both syntactically - invalid and not what we want. The GNU make $(notdir) operator fixes this. - - Also, the previous rule was somewhat illegible; factoring out the string - manipulation into temporary variables improves this, I think. - - wocky/Makefile.am | 13 +++++++++---- - 1 files changed, 9 insertions(+), 4 deletions(-) - -commit bb3195e5540313ab46bcc2f890a0accf648e9ce7 -Author: Simon McVittie -Date: Wed Jan 13 13:11:27 2010 +0000 - - .gitignore: add more cruft - - .gitignore | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 165cf4a0d7439d439f9d3890791af40ab78279d3 -Author: Simon McVittie -Date: Wed Jan 13 13:10:24 2010 +0000 - - wocky_xmpp_stanza_build: adjust docstring so gtkdoc will work - - wocky/wocky-xmpp-stanza.c | 22 ++++++++++++---------- - 1 files changed, 12 insertions(+), 10 deletions(-) - -commit ad9071dabf2c1ab771e54097f283b2893129a692 -Author: Sjoerd Simons -Date: Mon Jan 11 13:40:48 2010 +0000 - - Make the handling of additional data with success generic - - When receiving initial data with success from the server we pass it to the - normal auth data handler for checking. If this was indeed the final data the - handler will not give us a response to the server, otherwise the server is - doing it wrong. - - wocky/wocky-sasl-auth.c | 32 ++++++++++++++++++--------- - wocky/wocky-sasl-digest-md5.c | 46 +++++++--------------------------------- - wocky/wocky-sasl-handler.c | 3 +- - wocky/wocky-sasl-handler.h | 4 +- - 4 files changed, 32 insertions(+), 53 deletions(-) - -commit eeca31c3e40727f8e8e5ba9ea9bc7db17e3dfb86 -Author: Sjoerd Simons -Date: Mon Jan 11 13:36:22 2010 +0000 - - Use an auth data function instead of the challenge function - - Instead of the old challenge function, have an auth data function which can - return an *optional* response and directly gets the data that's interesting for - sasl instead of the complete stanza. - - Specifically if the server sends correct final authentication data the handler - must not set a response, but should return successfull - - wocky/wocky-sasl-auth.c | 51 ++++++++-------------- - wocky/wocky-sasl-digest-md5.c | 95 +++++++++++++++++++++++------------------ - wocky/wocky-sasl-handler.c | 18 +++++--- - wocky/wocky-sasl-handler.h | 27 +++++++----- - 4 files changed, 99 insertions(+), 92 deletions(-) - -commit 1bde461e90aa2f3bf616d4ee96781f9732192283 -Author: Sjoerd Simons -Date: Mon Jan 11 13:33:32 2010 +0000 - - Generalize the failure handling - - tests/wocky-test-sasl-handler.c | 12 ----------- - wocky/wocky-sasl-auth.c | 41 ++++++++++++++++++++++++++++++-------- - wocky/wocky-sasl-digest-md5.c | 28 +------------------------- - wocky/wocky-sasl-handler.c | 10 --------- - wocky/wocky-sasl-handler.h | 16 --------------- - wocky/wocky-sasl-plain.c | 28 -------------------------- - 6 files changed, 33 insertions(+), 102 deletions(-) - -commit 1a9e10ab4c014408b75160a311bc133b6e8620a6 -Author: Sjoerd Simons -Date: Mon Jan 11 12:41:33 2010 +0000 - - Add a default implementation for the success handler - - tests/wocky-test-sasl-handler.c | 12 ------------ - wocky/wocky-sasl-handler.c | 9 +++++++-- - wocky/wocky-sasl-plain.c | 12 ------------ - 3 files changed, 7 insertions(+), 26 deletions(-) - -commit b77b321c393935426791c0d22f96c030e57aec55 -Author: Sjoerd Simons -Date: Mon Jan 11 12:36:19 2010 +0000 - - Use the new initial response function API - - tests/wocky-test-sasl-handler.c | 19 +++++++++++-------- - wocky/wocky-sasl-auth.c | 8 +++----- - wocky/wocky-sasl-digest-md5.c | 5 ----- - wocky/wocky-sasl-plain.c | 38 ++++++++++++++++++-------------------- - 4 files changed, 32 insertions(+), 38 deletions(-) - -commit fac1d18fa5b9e61c8f65f9b1c585ca575fbb1bb2 -Author: Sjoerd Simons -Date: Mon Jan 11 12:32:56 2010 +0000 - - Add a seperate function to get an initial response - - Split out the function to get the initial response so that we don't have to - special case stanza == NULL in every challenge handler. Also allow a mechanism - to not implement a challenge handler, for mechanisms that only use initial - data. - - wocky/wocky-sasl-handler.c | 32 ++++++++++++++++++++++++++++++-- - wocky/wocky-sasl-handler.h | 30 +++++++++++++++++++++--------- - 2 files changed, 51 insertions(+), 11 deletions(-) - -commit aa5d2aab1dfccdfc026b1d9e7564807fe68dcc81 -Author: Sjoerd Simons -Date: Sun Jan 10 15:40:46 2010 +0000 - - Test final auth data in success for md5 - - tests/wocky-test-sasl-auth.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit afd61e84ce0ab39e23519c5ece11ee7dca721aab -Author: Sjoerd Simons -Date: Sun Jan 10 15:40:10 2010 +0000 - - Add support for the sasl test server to put the final auth data in success - - tests/wocky-test-sasl-auth-server.c | 30 +++++++++++++++++++----------- - tests/wocky-test-sasl-auth-server.h | 3 +++ - 2 files changed, 22 insertions(+), 11 deletions(-) - -commit 34ae0ca0ecbe917fa593fb3372a90d952132a500 -Author: Sjoerd Simons -Date: Sun Jan 10 15:39:18 2010 +0000 - - Cope with final auth data in success for digest-md5 - - wocky/wocky-sasl-digest-md5.c | 78 ++++++++++++++++++++++++++++------------ - 1 files changed, 54 insertions(+), 24 deletions(-) - -commit 0d2135c2bdb54074fda36f44c2e3f6b22bc6c274 -Author: Sjoerd Simons -Date: Sun Jan 10 15:37:37 2010 +0000 - - Change the success handler signature so it retuns a boolean - - tests/wocky-test-sasl-handler.c | 5 +++-- - wocky/wocky-sasl-digest-md5.c | 8 +++++--- - wocky/wocky-sasl-handler.c | 4 ++-- - wocky/wocky-sasl-handler.h | 6 +++--- - wocky/wocky-sasl-plain.c | 5 +++-- - 5 files changed, 16 insertions(+), 12 deletions(-) - -commit 8d9008cdb052c437f0a38b1b17b3e419a784a035 -Author: Sjoerd Simons -Date: Thu Jan 7 15:58:42 2010 +0000 - - Slice allocate wocky muc members - - wocky/wocky-muc.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 64434b0de131ebd0bbbe87085d67929c926c6925 -Author: Sjoerd Simons -Date: Thu Jan 7 15:57:23 2010 +0000 - - Use the from jid and not the nick to get leaving members - - wocky/wocky-muc.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit b4f660754626a374feed054d204875951cb9d737 -Author: Sjoerd Simons -Date: Thu Jan 7 15:55:59 2010 +0000 - - Streamline some code - - wocky/wocky-muc.c | 20 ++++++++------------ - 1 files changed, 8 insertions(+), 12 deletions(-) - -commit 5a4477045d01180d078d577a50bedaab8a55fb4b -Author: Sjoerd Simons -Date: Thu Jan 7 15:54:43 2010 +0000 - - Correct the signal marshaller signatures - - wocky/wocky-muc.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 5b8bce9d97a0537c50474d3e936dcbbbe601e200 -Author: Sjoerd Simons -Date: Thu Jan 7 15:52:01 2010 +0000 - - Keep track of the last presence stanza for each member - - wocky/wocky-muc.c | 9 +++++++++ - wocky/wocky-muc.h | 1 + - 2 files changed, 10 insertions(+), 0 deletions(-) - -commit 20ce01944ba6fcde5c28f42669afd7007195778e -Author: Sjoerd Simons -Date: Thu Jan 7 15:51:18 2010 +0000 - - Fix reference counting and unregister handlers on dispose - - wocky/wocky-muc.c | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -commit d2954fcfd6235d43f4895324ba8a755ec7c87d3d -Author: Sjoerd Simons -Date: Wed Jan 6 16:18:50 2010 +0000 - - Don't be anal about having in muc presences - - wocky/wocky-muc.c | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -commit 129fcf4abc5223186b161883f099f2238b43cea7 -Author: Sjoerd Simons -Date: Mon Jan 4 13:01:27 2010 +0100 - - Only allow setting status directly when sending an unavailable presence - - wocky/wocky-muc.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit 6e9b58f106702ca5c2298328c218261a5043ca30 -Author: Sjoerd Simons -Date: Mon Jan 4 13:00:52 2010 +0100 - - Add a signal to allow other components to add presence information - - wocky/wocky-muc.c | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -commit a0382c282bc21aa155a3a975ddce4767c9443279 -Author: Sjoerd Simons -Date: Mon Jan 4 11:12:19 2010 +0100 - - When emitting a signal, use the right arguments - - wocky/wocky-muc.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 5f00c4d2ce5801797897fcd19e6b6a6d35041377 -Author: Sjoerd Simons -Date: Mon Jan 4 11:08:03 2010 +0100 - - Use GSimpleAsyncResult instead of inventing a pointless callback type - - wocky/wocky-muc.c | 44 ++++++++++++++++++++------------------------ - 1 files changed, 20 insertions(+), 24 deletions(-) - -commit 2508b0faa488f23af68a08e60a22ff4b439590d1 -Author: Sjoerd Simons -Date: Mon Jan 4 11:06:18 2010 +0100 - - Don't disco mucs when joining them - - wocky/wocky-muc.c | 99 ++++------------------------------------------------ - 1 files changed, 8 insertions(+), 91 deletions(-) - -commit f9bdc0a2b3cbb20e55018fa05a02d40c2d5d3116 -Author: Sjoerd Simons -Date: Mon Jan 4 11:05:47 2010 +0100 - - Keep track of members by their full muc jid - - wocky/wocky-muc.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 1308247b8e6819877438bcfc7c35d78b64e13cea -Author: Sjoerd Simons -Date: Mon Jan 4 11:04:56 2010 +0100 - - A presence is of type presence, not of type iq - - wocky/wocky-muc.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 84059726e5a9a9ca37c0458b842fc8a44756c6c7 -Author: Sjoerd Simons -Date: Mon Jan 4 11:04:21 2010 +0100 - - Fix definition of various signals and properties - - wocky/wocky-muc.c | 29 +++++++++++++++-------------- - 1 files changed, 15 insertions(+), 14 deletions(-) - -commit a26a191f0c4bd37654e4be31bd95719267c46dc2 -Author: Sjoerd Simons -Date: Mon Jan 4 11:02:23 2010 +0100 - - Build various enumtypes - - wocky/Makefile.am | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit b0e38741d6b75edb8f9e139950f53bd3c3c374ed -Author: Sjoerd Simons -Date: Mon Jan 4 11:01:32 2010 +0100 - - When putting the resource in the jid, do not put in the domain - - wocky/wocky-utils.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 37638d53e361f0349d5795161ba2a7b456909331 -Merge: 25c2e26 ffbe1a9 -Author: Sjoerd Simons -Date: Tue Dec 29 14:49:59 2009 +0100 - - Merge remote branch 'vivek/muc' into muc - -commit 25c2e26d2b20d9f58495f8871452f8d51bdc65d5 -Author: Will Thompson -Date: Mon Dec 28 18:11:12 2009 +0000 - - Correctly ship test certificates in out-of-tree builds - - Previously the wildcards were matching no files, because they were being - applied to the builddir (where the Makefile is) rather than the srcdir. - - I tried to do someting fancy involving $(CERTS), but $(CERTS) contains - absolute paths (for reasonably good reasons: they're passed as #defines - into a test binary) so then I tried mangling them back into relative - paths in $(EXTRA_DIST) but then I decided this was clearer. - - Including directories in $(EXTRA_DIST) is discouraged by the Automake - documentation, and is unnecessary in this case because the contents of - certs/cas and certs/crl that we want are in $(EXTRA_DIST) anyway. - - tests/Makefile.am | 14 ++++++-------- - 1 files changed, 6 insertions(+), 8 deletions(-) - -commit ffbe1a90049cd609fc57fa8f98b9cb59617dad66 -Author: Vivek Dasmohapatra -Date: Sun Dec 27 19:41:58 2009 +0000 - - First stab at implementing muc support for gabble. - - wocky/wocky-muc.c | 571 ++++++++++++++++++++++++++++++++++++++++------------- - wocky/wocky-muc.h | 48 +++-- - 2 files changed, 464 insertions(+), 155 deletions(-) - -commit 04680884a563b0d4e2e7b6d1f3d6fd57dae19e75 -Author: Vivek Dasmohapatra -Date: Sun Dec 27 19:41:30 2009 +0000 - - Add some missing MUC related XMPP namespaces. - - wocky/wocky-namespaces.h | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 97682078013710c7ad6e02d5b0c6fcfa9b241e01 -Author: Will Thompson -Date: Tue Dec 22 12:02:52 2009 +0000 - - Rename verification level variable from 'flags' - - It's no longer a set of flags, it's a single enum member. - - wocky/wocky-openssl.c | 8 ++++---- - wocky/wocky-tls.c | 4 ++-- - wocky/wocky-tls.h | 2 +- - 3 files changed, 7 insertions(+), 7 deletions(-) - -commit c5342b10ab9067b975edebaa02d57ef9fbdfe964 -Author: Will Thompson -Date: Tue Dec 22 11:57:39 2009 +0000 - - Correctly fall back to VERIFY_STRICT. - - wocky/wocky-openssl.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2a63eaf938da05886758f46d2c5f83811d649a8d -Author: Sjoerd Simons -Date: Mon Dec 21 11:58:44 2009 +0000 - - Use a simple enum for the tls verification level - - wocky/wocky-openssl.c | 6 ++++-- - wocky/wocky-tls.c | 8 +++++--- - wocky/wocky-tls.h | 11 +++++++---- - 3 files changed, 16 insertions(+), 9 deletions(-) - -commit 5d494cc07923b0b1da09aaa95b53180889cebda6 -Author: Sjoerd Simons -Date: Sun Dec 20 17:51:40 2009 +0000 - - Use wocky's debugging in the more traditional way - - tests/wocky-test-connector-server.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 0505ac47351f59dd962cdfa502fb54823d7a284e -Author: Sjoerd Simons -Date: Sun Dec 20 17:49:13 2009 +0000 - - Don't use a temporary variable just in DEBUG - - wocky/wocky-connector.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 255c63eeffe1ae3d223b8959152dcc71783f8ac0 -Author: Sjoerd Simons -Date: Sun Dec 20 17:48:44 2009 +0000 - - Don't call wocky_debug if debugging isn't enabled - - wocky/wocky-xmpp-writer.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit dc1918699e06befa204b458a8f6eb07c42c72018 -Author: Sjoerd Simons -Date: Sun Dec 20 17:47:38 2009 +0000 - - only define hdesc_to_string when debugging is enabled - - wocky/wocky-tls.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 7987cc80119759523561cb7d60595b9d96e426cd -Author: Sjoerd Simons -Date: Fri Dec 18 14:01:55 2009 +0000 - - Don't summarize if python isn't there - - tests/Makefile.am | 12 ++++++++++-- - 1 files changed, 10 insertions(+), 2 deletions(-) - -commit e7ccc4314201ca7cb84c89753ee08e7e5702d31a -Author: Sjoerd Simons -Date: Fri Dec 18 14:01:36 2009 +0000 - - Don't assume python is in /usr/bin - - tests/summarise-tests.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit dbe94b97a0117b92a2146f77b5ade4aa28918b25 -Author: Sjoerd Simons -Date: Fri Dec 18 13:04:00 2009 +0000 - - Various improvements to the python summary - - Let the python summary cope with skipped and restarted tests and in case of - failures print the cases that failed. - - tests/summarise-tests.py | 25 +++++++++++++++++-------- - 1 files changed, 17 insertions(+), 8 deletions(-) - -commit 4d89d5a2bee0e2cab0095aa9cee7e842538318f4 -Author: Will Thompson -Date: Thu Dec 17 13:41:08 2009 +0000 - - Reimplement summarize-tests in Python - - This lets us use a real XML parser, and makes the whole thing shorter - and more legible. - - tests/Makefile.am | 6 +- - tests/summarise-tests.py | 46 ++++++++++++++++++++ - tests/summarise-tests.sh | 104 ---------------------------------------------- - 3 files changed, 49 insertions(+), 107 deletions(-) - -commit 4a29668ca4fd8500fa2e59d7a593a8fc49904207 -Author: Sjoerd Simons -Date: Fri Dec 18 10:50:33 2009 +0000 - - Rethink iq cancellation to ensure we don't use freed memory - - Some valgrind testing on gabble indicated that quite often the StanzaIqHandlers - were used after being freed. This redoes the handling in such a way that the - handlers get removed when there was a result _and_ the send operation has - finished. - - wocky/wocky-porter.c | 147 +++++++++++++++++++++++++++++--------------------- - 1 files changed, 86 insertions(+), 61 deletions(-) - -commit 4fff9be936824e6c5b4e61768db1332e2fd3b164 -Author: Will Thompson -Date: Thu Dec 17 15:43:36 2009 +0000 - - Use G_G[S]SIZE_FORMAT for g[s]size in printf - - These aren't both %ld on all platforms. - - wocky/wocky-openssl.c | 19 +++++++++++-------- - 1 files changed, 11 insertions(+), 8 deletions(-) - -commit 0bd6d0dd44ba5a880f3fdb5679aa200af41fc3c1 -Author: Will Thompson -Date: Thu Dec 17 13:40:06 2009 +0000 - - Fix coding style checks in out-of-tree builds. - - This is already fixed in Gabble's copy of the script; this just updates - Wocky's copy to match. - - tools/check-coding-style.mk | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 440fd94bf01530163ada2b247fbbb56e59904286 -Author: Will Thompson -Date: Thu Dec 17 13:28:28 2009 +0000 - - test-sasl-auth-server: fix no-libsasl compilation - - tests/wocky-test-sasl-auth-server.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2dae85b150264b60b9b4b3e12939288078a6ca30 -Author: Will Thompson -Date: Wed Dec 16 20:39:41 2009 +0000 - - connector-test: include wocky-utils for _strdiff. - - This is only used on the no-libsasl path, hence why it compiles for - everyone working on it! - - tests/wocky-connector-test.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 76cb2dcae9697bd246b1faa562d4a795712ea7a5 -Author: Will Thompson -Date: Wed Dec 16 19:09:26 2009 +0000 - - Document wocky_xmpp_stanza_build - - wocky/wocky-xmpp-stanza.c | 12 +++++++++--- - 1 files changed, 9 insertions(+), 3 deletions(-) - -commit a02011ab948ad57ee5eff23e05293e4dd3898555 -Author: Will Thompson -Date: Wed Dec 16 19:09:07 2009 +0000 - - Fix out-of-tree compilation with OpenSSL - - wocky/wocky-openssl.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1298577c5a25f38054fa8262b9ecaf8c3a75f115 -Author: Vivek Dasmohapatra -Date: Thu Dec 17 16:51:41 2009 +0000 - - Remove wocky-openssl.h, no headers use the USING_OPENSSL #define (or config.h) - - tests/wocky-test-connector-server.c | 4 -- - wocky/Makefile.am | 2 +- - wocky/wocky-connector.h | 6 -- - wocky/wocky-openssl.c | 4 +- - wocky/wocky-openssl.h | 102 ----------------------------------- - wocky/wocky-tls.c | 21 +++++++- - wocky/wocky-tls.h | 19 +++---- - 7 files changed, 31 insertions(+), 127 deletions(-) - -commit 999d81c4ab30d11ae2d8a9fd684c21e8a83d21ce -Author: Vivek Dasmohapatra -Date: Tue Dec 8 15:49:38 2009 +0000 - - Missing include for wocky_strdiff prototype. - - wocky/wocky-xmpp-error.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit b04504d5a128295c3f00580a2128a34b10254a87 -Author: Vivek Dasmohapatra -Date: Tue Dec 8 15:49:11 2009 +0000 - - Initial implementation of MUC - - wocky/Makefile.am | 2 + - wocky/wocky-muc.c | 1366 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-muc.h | 189 ++++++++ - 3 files changed, 1557 insertions(+), 0 deletions(-) - -commit ce72fdaedee70dc717da2851f82d8c6dcf7c5aec -Author: Vivek Dasmohapatra -Date: Tue Dec 8 15:48:50 2009 +0000 - - Add MUC namespaces. - - wocky/wocky-namespaces.h | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -commit 9b827aa71552d051bf28ac60d8bb66181d200063 -Author: Vivek Dasmohapatra -Date: Tue Nov 24 17:45:32 2009 +0000 - - wocky_xmpp_node_unpack_error -> wocky_xmpp_error_unpack_node - - Function renamed and moved because it now needs definitions from - both wocky-xmpp-node.h and wocky-xmpp-error.h in its signature. - - This allows the function to extract the WockyXmppError enum value - matching the error stanza as well, which means users can switch() - on the canonical enum value rather than wocky_strdiff()ing the error. - - tests/wocky-xmpp-node-test.c | 8 ++- - wocky/wocky-connector.c | 77 ++++++++++++++++++++++++------------- - wocky/wocky-xmpp-error.c | 86 ++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-error.h | 9 ++++ - wocky/wocky-xmpp-node.c | 81 --------------------------------------- - wocky/wocky-xmpp-node.h | 8 ---- - 6 files changed, 150 insertions(+), 119 deletions(-) - -commit e468cb3f562ba0298863dd323f25785ff288237c -Author: Vivek Dasmohapatra -Date: Fri Nov 13 19:17:00 2009 +0000 - - Make sure the lowest handler id returned by wocky_porter_register_handler is 1. - - wocky/wocky-porter.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit e0231c9df2264a6d182efd9485e3fa5070bf8838 -Author: Vivek Dasmohapatra -Date: Thu Nov 12 20:33:03 2009 +0000 - - Document wocky_porter_register_handler as it is subtle. - - We depend on the bare-jid-matches-all-resources behaviour, as do other parts - of wocky and/or gabble, so make sure it is recorded explicitly in the docs. - - wocky/wocky-porter.c | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+), 0 deletions(-) - -commit 9de9e9e066e9f30a934fbf821962458c4442cec9 -Author: Vivek Dasmohapatra -Date: Tue Dec 8 14:38:51 2009 +0000 - - Indentation trivia. - - tests/wocky-tls-test.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -commit 64f7c3b7390d9362f06de42019ff486a583b6f1b -Author: Vivek Dasmohapatra -Date: Tue Dec 8 14:34:37 2009 +0000 - - Elide comments which no longer apply as we no longer use SSL_ pending/peek. - - wocky/wocky-openssl.c | 12 +----------- - 1 files changed, 1 insertions(+), 11 deletions(-) - -commit ba418e28897c300eb569d39dc94ba745f70f4c64 -Author: Vivek Dasmohapatra -Date: Tue Dec 8 14:25:38 2009 +0000 - - Fix an infinite io pseudo-read case in the OpenSSL backend. - - wocky/wocky-openssl.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit 8205a202f384717e84ae0673bb9e3565d08c5343 -Author: Vivek Dasmohapatra -Date: Tue Dec 8 14:25:02 2009 +0000 - - Write 5 records and alternate the payloads, to catch the SSL_peek infinite loop. - - tests/wocky-tls-test.c | 43 ++++++++++++++++++++++++++++++------------- - 1 files changed, 30 insertions(+), 13 deletions(-) - -commit b656cea75f64b9668608196f9743a06c9dcbde74 -Author: Vivek Dasmohapatra -Date: Mon Dec 7 16:57:39 2009 +0000 - - Tweak result error/gssize setting logic slightly. - - wocky/wocky-openssl.c | 16 +++++++--------- - 1 files changed, 7 insertions(+), 9 deletions(-) - -commit 702cf932702d80950b41ae1c5566e0f253477b2d -Author: Vivek Dasmohapatra -Date: Mon Dec 7 15:56:03 2009 +0000 - - Unnecessary error == NULL test removed, use g_set_error. - - wocky/wocky-openssl.c | 7 ++----- - 1 files changed, 2 insertions(+), 5 deletions(-) - -commit 5e835ee2b717c467e6a639a69e6cb26ec423f61e -Author: Vivek Dasmohapatra -Date: Mon Dec 7 15:50:29 2009 +0000 - - There are, in fact, no errors we want to ignore/retry in _ready_ready. - - wocky/wocky-openssl.c | 17 +++-------------- - 1 files changed, 3 insertions(+), 14 deletions(-) - -commit f939baf19d6a8954f75c6be72991715a0639f3a2 -Author: Vivek Dasmohapatra -Date: Mon Dec 7 15:28:12 2009 +0000 - - Move code from _result_boolean to _try_operation, reduce logic duplication. - - wocky/wocky-openssl.c | 21 +++++++-------------- - 1 files changed, 7 insertions(+), 14 deletions(-) - -commit 0277c07727561f56e8e2f8c7e7920cb5f78d3f4a -Author: Vivek Dasmohapatra -Date: Mon Dec 7 15:17:34 2009 +0000 - - Detect renegotiation attempts when trying SSL_peek as well as SSL_read. - - wocky/wocky-openssl.c | 86 ++++++++++++++++++++++++++++++------------------ - 1 files changed, 54 insertions(+), 32 deletions(-) - -commit dec48abfe9390655299a8f717b3510c6c8632923 -Author: Sjoerd Simons -Date: Mon Dec 7 12:36:07 2009 +0000 - - Make the openssl test not be openssl specific - - Change the test to use the new modes in the WockyTestStream to force the way - the openssl backend reads in the various records. This allows us to mostly use - the test in case we're using the GnuTLS backend as well - - Also test for that the operation actually completes asynchronously. - - tests/Makefile.am | 15 +- - tests/wocky-openssl-test.c | 225 ----- - tests/wocky-test-openssl-server.c | 1915 ------------------------------------- - tests/wocky-test-openssl-server.h | 123 --- - tests/wocky-tls-test.c | 266 +++++ - 5 files changed, 271 insertions(+), 2273 deletions(-) - -commit d80a5a003aa42122fb5fea973c4e07596a925bf8 -Author: Sjoerd Simons -Date: Mon Dec 7 12:23:30 2009 +0000 - - Don't reimplement g_simple_async_result_is_valid - - wocky/wocky-openssl.c | 11 ++--------- - 1 files changed, 2 insertions(+), 9 deletions(-) - -commit e725b215f4490b04035b33dcf8ea171a88940213 -Author: Sjoerd Simons -Date: Mon Dec 7 12:22:47 2009 +0000 - - If there is data to read directly make sure we still return asynchronously - - wocky/wocky-openssl.c | 52 ++++++++++++++++++++++++++++-------------------- - 1 files changed, 30 insertions(+), 22 deletions(-) - -commit 5c349ed383080afbf634a8322e3aba56b94ef7f0 -Author: Sjoerd Simons -Date: Mon Dec 7 12:17:07 2009 +0000 - - Add API to enable different reading modes - - tests/wocky-test-stream.c | 47 ++++++++++++++++++++++++++++++++++---------- - tests/wocky-test-stream.h | 13 ++++++++++++ - 2 files changed, 49 insertions(+), 11 deletions(-) - -commit 9546b329c81630a8e20c016ea1ae63642a2cf50f -Author: Sjoerd Simons -Date: Mon Dec 7 12:10:48 2009 +0000 - - Fix the logic for detecting when there is more to read - - tests/wocky-test-stream.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b5a514d57985f4b3ed9fd8bce39cca5695eef952 -Author: Sjoerd Simons -Date: Mon Dec 7 12:05:13 2009 +0000 - - Add the ability to cork input streams - - tests/wocky-test-stream.c | 16 ++++++++++++++++ - tests/wocky-test-stream.h | 2 ++ - 2 files changed, 18 insertions(+), 0 deletions(-) - -commit 5fbaccae83d908a434aca9c9b90a88ac1748fe52 -Author: Sjoerd Simons -Date: Mon Dec 7 11:58:35 2009 +0000 - - Force close the porter after cancelling close - - tests/wocky-porter-test.c | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+), 0 deletions(-) - -commit 890c40f40b37064b8b28d2c417e9a3aedddb4bdf -Author: Vivek Dasmohapatra -Date: Fri Dec 4 14:31:56 2009 +0000 - - Test for 1.x records buffered n+1 records buffered edge cases for OpenSSL. - - tests/Makefile.am | 13 + - tests/wocky-openssl-test.c | 225 +++++ - tests/wocky-test-openssl-server.c | 1915 +++++++++++++++++++++++++++++++++++++ - tests/wocky-test-openssl-server.h | 123 +++ - 4 files changed, 2276 insertions(+), 0 deletions(-) - -commit 382e4218dc82c669f430b5f1c5fae15c9a9ddd75 -Author: Vivek Dasmohapatra -Date: Fri Dec 4 01:58:58 2009 +0000 - - SSL_pending is unreliable: Use SSL_peek instead. - - wocky/wocky-openssl.c | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) - -commit 7a34217b5e011ee189978ea19b7cd020f4127bb1 -Author: Vivek Dasmohapatra -Date: Wed Dec 2 15:26:32 2009 +0000 - - Clean up OpenSSL/gio error handling logic (misc bugs). - - wocky/wocky-openssl.c | 85 ++++++++++++++++++++++++++++++++++++++++++++----- - 1 files changed, 77 insertions(+), 8 deletions(-) - -commit a5dd54410e64ad76eabcf19f0ca42c17bb81fd05 -Author: Vivek Dasmohapatra -Date: Wed Dec 2 15:22:41 2009 +0000 - - OpenSSL BIO's may have records left after SSL_read, detect to avoid blocking. - - wocky/wocky-openssl.c | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) - -commit d2d7917c673fbe0f10cc54a3f3876dd4d41b285b -Author: Vivek Dasmohapatra -Date: Thu Nov 26 17:34:59 2009 +0000 - - Implement close_fn class method for openssl based tls conn as well as gnutls. - - wocky/wocky-openssl.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit 3852a8a1076453800aa3ee8d46cfae3a1e1d01e3 -Author: Vivek Dasmohapatra -Date: Thu Nov 26 17:33:54 2009 +0000 - - Detect async EOF conditions as well as read errors (gssize of 0 => EOF). - - wocky/wocky-openssl.c | 32 ++++++++++++++++++++++++++++++-- - 1 files changed, 30 insertions(+), 2 deletions(-) - -commit 7bf33fafd29360523bb51405f85dceb3be3ac9ca -Author: Vivek Dasmohapatra -Date: Wed Nov 25 18:24:30 2009 +0000 - - Generated DH parameter functions need protos to stop a -Werror failure. - - wocky/wocky-openssl-dh1024.c | 1 + - wocky/wocky-openssl-dh2048.c | 1 + - wocky/wocky-openssl-dh4096.c | 1 + - wocky/wocky-openssl-dh512.c | 1 + - 4 files changed, 4 insertions(+), 0 deletions(-) - -commit eeef0d2e4c27228316c6c1b7c163c96d328dc5a1 -Author: Sjoerd Simons -Date: Mon Dec 7 11:36:14 2009 +0000 - - Check for the right definition - - wocky/wocky-xmpp-reader.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 5e662895f7c0249f58fb2f8dd4082c721426522c -Author: Vivek Dasmohapatra -Date: Fri Nov 27 16:21:02 2009 +0000 - - Remove unused cancellable support in callback, rename according to convention. - - tests/wocky-porter-test.c | 17 ++++------------- - 1 files changed, 4 insertions(+), 13 deletions(-) - -commit e8c90f37dff8e7a0a4627c3357256cf1d2219bc2 -Author: Vivek Dasmohapatra -Date: Fri Nov 27 15:40:17 2009 +0000 - - Debug should contain expected JID as well as the mismatched JID we actually got. - - wocky/wocky-porter.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit a561b6587ffc3a8e55048fe5d8a115249fba54e7 -Author: Vivek Dasmohapatra -Date: Fri Nov 27 14:55:55 2009 +0000 - - Normalise handler's copy of the 'to' JID and the 'from' JID we compare it to. - - wocky/wocky-porter.c | 21 ++++++++++++++++++--- - 1 files changed, 18 insertions(+), 3 deletions(-) - -commit 83fe481855f9e4eb891ea4077aa7ba8d11972362 -Author: Vivek Dasmohapatra -Date: Fri Nov 27 14:52:49 2009 +0000 - - Test the iq-recipient/sender-JIDs-are-not-normalised case. - - tests/wocky-porter-test.c | 90 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 90 insertions(+), 0 deletions(-) - -commit 4a157c055d645bb2b975250b3386c5506c7024e4 -Author: Vivek Dasmohapatra -Date: Fri Nov 27 14:51:37 2009 +0000 - - wocky_normalise_jid implemented in -utils. - - wocky/wocky-utils.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-utils.h | 2 ++ - 2 files changed, 52 insertions(+), 0 deletions(-) - -commit 195db67317d726d6d14c8e5c07056bd877dc17b4 -Author: Vivek Dasmohapatra -Date: Wed Nov 25 17:32:54 2009 +0000 - - Style trivia flagged by check. - - wocky/wocky-sasl-digest-md5.h | 2 +- - wocky/wocky-sasl-plain.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit d56ba71a576a08f6dda5a1c18081e7d61367b08f -Author: Vivek Dasmohapatra -Date: Wed Nov 25 17:18:52 2009 +0000 - - Cope with alternate format on test failure, exit 1 if any tests failed. - - The gtester report contains a transition in between each failed test and subsequent tests. Cope with that when generating the summary. - - Exit with non-zero status of any tests failed so make can pick up on the error. - - tests/summarise-tests.sh | 86 ++++++++++++++++++++++++++++++---------------- - 1 files changed, 56 insertions(+), 30 deletions(-) - -commit 6efb1dd1650c20723a8f57445be96b5e427cc648 -Author: Vivek Dasmohapatra -Date: Wed Nov 25 16:27:35 2009 +0000 - - Summarise test results at end (to help catch early failures). - - tests/Makefile.am | 3 ++ - tests/summarise-tests.sh | 78 ++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 81 insertions(+), 0 deletions(-) - -commit 13fe3ce29b5dab130ef3a79fdaa2e0e1c9e9cd1e -Author: Sjoerd Simons -Date: Tue Nov 24 22:03:44 2009 +0000 - - Never chain up to the real resolver, tests shouldn't hit the network - - tests/test-resolver.c | 13 ++++++++----- - 1 files changed, 8 insertions(+), 5 deletions(-) - -commit 52068812840405391668f201d81bc1103c084ce7 -Author: Sjoerd Simons -Date: Mon Nov 23 17:40:52 2009 +0000 - - Don't assert that there is no error when there should be errors - - tests/wocky-xmpp-reader-test.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 64271a34056ce93014c07bdcb903a44c869071d2 -Author: Sjoerd Simons -Date: Mon Nov 23 17:07:31 2009 +0000 - - Reset the authentication status before calling the callback - - We can't rely on the user to call our _finish method, so depending on that for - resetting is wrong. Also at the point when the operation has finished the - object should always be in the same state, ready to authenticate again (Not - useful for the success case, but good for consistency) - - wocky/wocky-sasl-auth.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 145c376a5e3d9c288722af37a7b8cb9a3afa519d -Author: Sjoerd Simons -Date: Mon Nov 23 17:06:37 2009 +0000 - - Remove unused state member - - wocky/wocky-sasl-auth.c | 11 ----------- - 1 files changed, 0 insertions(+), 11 deletions(-) - -commit 88834a8539c975d97b441a0a2d95742c2f3834a9 -Author: Sjoerd Simons -Date: Mon Nov 23 17:04:12 2009 +0000 - - Remove api to get the used sasl mechanism - - As it stands this API was broken, but futhermore it's not useful for a - client to check after the fact which mechanism was used. - - wocky/wocky-connector.c | 18 ------------------ - wocky/wocky-connector.h | 2 -- - wocky/wocky-sasl-auth.c | 18 ++---------------- - wocky/wocky-sasl-auth.h | 3 --- - 4 files changed, 2 insertions(+), 39 deletions(-) - -commit da9fdc7d053e562a1470f0861c98280e77367e0d -Author: Sjoerd Simons -Date: Mon Nov 23 16:57:26 2009 +0000 - - The bind should always succeed immediately as SO_REUSEADDR is set - - tests/wocky-connector-test.c | 8 +------- - 1 files changed, 1 insertions(+), 7 deletions(-) - -commit 17a33a93fc761199c61e246c73901a1776c70d51 -Author: Sjoerd Simons -Date: Mon Nov 23 16:56:54 2009 +0000 - - Check the mechanism from what went on the wire, not what the connector thinks - - tests/wocky-connector-test.c | 24 +++++++++++++++++++----- - 1 files changed, 19 insertions(+), 5 deletions(-) - -commit 9eeb7a6db8d412545cab7aa9ce7bb6d57bfc868b -Author: Sjoerd Simons -Date: Mon Nov 23 16:50:18 2009 +0000 - - Add API to get the last used SASL mechanism from the test server - - tests/wocky-test-connector-server.c | 14 ++++++++++++++ - tests/wocky-test-connector-server.h | 2 ++ - 2 files changed, 16 insertions(+), 0 deletions(-) - -commit f8aa7c3656204929620a8fc07011f5568655ab27 -Author: Sjoerd Simons -Date: Mon Nov 23 16:49:36 2009 +0000 - - Add API to get the last selected mechanism from the Sasl server - - tests/wocky-test-sasl-auth-server.c | 21 +++++++++++++++++---- - tests/wocky-test-sasl-auth-server.h | 2 ++ - 2 files changed, 19 insertions(+), 4 deletions(-) - -commit ed0c55901d06448223f841b301ec12f5dc5934b7 -Author: Sjoerd Simons -Date: Mon Nov 23 16:27:36 2009 +0000 - - Run the test server in process - - tests/wocky-connector-test.c | 121 ++++++++++++++++++++---------------------- - 1 files changed, 57 insertions(+), 64 deletions(-) - -commit 16f32f490409f9bf27882ae4c21211f6f31144fa -Author: Sjoerd Simons -Date: Mon Nov 23 16:20:25 2009 +0000 - - Add an async teardown server to the server - - tests/wocky-connector-test.c | 2 +- - tests/wocky-test-connector-server.c | 261 ++++++++++++++++++++++++++++++----- - tests/wocky-test-connector-server.h | 10 ++- - 3 files changed, 239 insertions(+), 34 deletions(-) - -commit b176b4aec466773e9c85e67a26737bd9dc999672 -Author: Sjoerd Simons -Date: Mon Nov 23 15:58:21 2009 +0000 - - Make the ssl handshaking async - - tests/wocky-test-connector-server.c | 95 ++++++++++++++++++++--------------- - 1 files changed, 54 insertions(+), 41 deletions(-) - -commit 97ae8fb5f40ab45aa0641fda49044b2a70fa3223 -Author: Sjoerd Simons -Date: Mon Nov 23 15:40:04 2009 +0000 - - Also complete the auth operation on failure - - The _finish operation should probably return an operation if the authentication - failed, but nothing currently checks this and the test connector server would - be unhappy if we start doing this. Should be refactored at some point though. - - tests/wocky-test-sasl-auth-server.c | 13 ++++++++++++- - 1 files changed, 12 insertions(+), 1 deletions(-) - -commit c5d3ffcb64e12762df6d73b4ec4667f0aa317f7f -Author: Sjoerd Simons -Date: Mon Nov 23 15:38:46 2009 +0000 - - Make the sasl completion race free - - tests/wocky-test-sasl-auth-server.c | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -commit 4fa140cc5943bd7368b40a5dc39d308ef758e23c -Author: Sjoerd Simons -Date: Mon Nov 23 15:07:23 2009 +0000 - - Let _start take a cancellable and weave it through - - tests/wocky-test-connector-server.c | 5 +++- - tests/wocky-test-sasl-auth-server.c | 38 +++++++++++++++++++++++------------ - tests/wocky-test-sasl-auth-server.h | 8 +++++- - 3 files changed, 35 insertions(+), 16 deletions(-) - -commit 27db2fdc7865d1cbfe0320ac6671c06be5ff4178 -Author: Sjoerd Simons -Date: Mon Nov 23 15:05:45 2009 +0000 - - Warn if we have an outstanding result on dispose - - tests/wocky-test-sasl-auth-server.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 79f36bfbe8c21750763759fcd1f05be7471faa95 -Author: Sjoerd Simons -Date: Mon Nov 23 15:03:47 2009 +0000 - - Implement the close virtual function - - wocky/wocky-tls.c | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -commit b3857a610ec0e0fd62f46675ea9133857867ba9b -Author: Sjoerd Simons -Date: Mon Nov 23 15:03:20 2009 +0000 - - warn if there are outstanding input or output operations when disposing - - wocky/wocky-xmpp-connection.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 426167511e8bcc82350ccfd8748098bc0aa8ec97 -Author: Sjoerd Simons -Date: Fri Nov 20 12:19:18 2009 +0000 - - Fix coding style - - tests/wocky-test-sasl-handler.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit be827a7aae280daf91d5a9b81debef16316f3a22 -Author: Sjoerd Simons -Date: Fri Nov 20 12:19:06 2009 +0000 - - This is not python, there is no == for strings - - tests/wocky-connector-test.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 7ec6eb82587f414677cbb438d897bbd0b5d99d0a -Author: Sjoerd Simons -Date: Fri Nov 20 11:57:08 2009 +0000 - - Fix typo in documentation - - wocky/wocky-sasl-handler.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f52707f94ecf18df1f559dc6b1b034c2261fb32e -Merge: 822cb9c 2ce5d30 -Author: Sjoerd Simons -Date: Tue Nov 24 17:53:44 2009 +0000 - - Merge remote branch 'daf/sasl' - -commit 822cb9c779e34884774be12600779e21325586e6 -Author: Vivek Dasmohapatra -Date: Mon Nov 23 20:15:25 2009 +0000 - - Change g_message to DEBUG, explain number logged is DH bit size. - - wocky/wocky-tls.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2f61ae80679071a9eeae699d3b9f20754313a974 -Author: Vivek Dasmohapatra -Date: Mon Nov 23 19:40:14 2009 +0000 - - Cache DH parameters on generation (for each valid DH param size) - - This speeds up setup of subsequent wocky TLS server sessions significantly. - (GnuTLS only, OpenSSL can't generate DH params on the fly and so uses - a completely static set of DH parameters for servers anyway). - - Has no effect whatsoever on wocky TLS clients. - - wocky/wocky-tls.c | 44 ++++++++++++++++++++++++++++++++++++++++---- - 1 files changed, 40 insertions(+), 4 deletions(-) - -commit 2ce5d30c5914780c41e0fe62d32613e82ee65ea5 -Author: Dafydd Harries -Date: Thu Nov 19 14:11:04 2009 -0500 - - give SASL handlers a plain flag and skip handlers based on it - - tests/wocky-test-sasl-handler.c | 1 + - wocky/wocky-sasl-auth.c | 3 +++ - wocky/wocky-sasl-digest-md5.c | 1 + - wocky/wocky-sasl-handler.c | 6 ++++++ - wocky/wocky-sasl-handler.h | 6 ++++++ - wocky/wocky-sasl-plain.c | 1 + - 6 files changed, 18 insertions(+), 0 deletions(-) - -commit 661aba6e06097ca073acdf157159befb00251bbf -Author: Dafydd Harries -Date: Thu Nov 19 14:02:57 2009 -0500 - - document how handler/mechanism selection works - - wocky/wocky-sasl-auth.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 867ff3daca3abe47a0d602dffe5fe776ebfa8e05 -Author: Dafydd Harries -Date: Thu Nov 19 13:58:04 2009 -0500 - - simplify SASL handler error logic - - wocky/wocky-sasl-auth.c | 21 ++++++++------------- - 1 files changed, 8 insertions(+), 13 deletions(-) - -commit 89640d31d00746407d552e5f694e544a5f878e38 -Author: Dafydd Harries -Date: Thu Nov 19 13:49:36 2009 -0500 - - put "Server send" into the past tense where appropriate - - wocky/wocky-sasl-auth.c | 4 ++-- - wocky/wocky-sasl-auth.h | 2 +- - wocky/wocky-sasl-digest-md5.c | 10 +++++----- - wocky/wocky-sasl-plain.c | 2 +- - 4 files changed, 9 insertions(+), 9 deletions(-) - -commit 6a51d50816f6d7b987437905351195b202b76b07 -Author: Dafydd Harries -Date: Thu Nov 19 13:45:07 2009 -0500 - - add some documentation for the WockySaslHandler interface - - wocky/wocky-sasl-handler.h | 35 +++++++++++++++++++++++++++++++++++ - 1 files changed, 35 insertions(+), 0 deletions(-) - -commit da936335d0919445a7ef9830d9c135ae4f592918 -Author: Dafydd Harries -Date: Thu Nov 19 13:25:35 2009 -0500 - - use wocky_strdiff instead of strcmp - - tests/wocky-test-sasl-auth-server.c | 10 +++++----- - wocky/wocky-sasl-auth.c | 16 ++++++++-------- - 2 files changed, 13 insertions(+), 13 deletions(-) - -commit 78885334038f201e9a4dbaf1bd04d004fd35b32a -Author: Dafydd Harries -Date: Tue Nov 17 20:02:22 2009 -0500 - - allow adding extra handlers to WockySaslAuth instances - - tests/Makefile.am | 2 + - tests/wocky-test-sasl-auth-server.c | 44 +++++++++++++-------- - tests/wocky-test-sasl-auth.c | 15 +++++++ - tests/wocky-test-sasl-handler.c | 70 +++++++++++++++++++++++++++++++++++ - tests/wocky-test-sasl-handler.h | 42 +++++++++++++++++++++ - wocky/wocky-sasl-auth.c | 35 +++++++++++++++++ - wocky/wocky-sasl-auth.h | 3 + - 7 files changed, 194 insertions(+), 17 deletions(-) - -commit 9dfc9defae7aa003a8ce4a49338fab710c7f6ce0 -Author: Dafydd Harries -Date: Tue Nov 17 20:03:04 2009 -0500 - - allow SASL handler failure callbacks to not set errors - - wocky/wocky-sasl-auth.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit c4fa4828be9e33528a23a3ece6238ee60f7e47aa -Author: Dafydd Harries -Date: Tue Nov 17 20:02:52 2009 -0500 - - double check SASL test results - - tests/wocky-test-sasl-auth.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit 81ea6725fb69b09be86e5e0412b2cd893a52613a -Author: Dafydd Harries -Date: Tue Nov 17 15:55:12 2009 -0500 - - factor out SASL handler selection - - wocky/wocky-sasl-auth.c | 50 ++++++++++++++++++++++++++++++---------------- - 1 files changed, 32 insertions(+), 18 deletions(-) - -commit 82af20ab6aabc3c4fe8571496534b3f3b8779879 -Author: Dafydd Harries -Date: Tue Nov 17 11:56:46 2009 -0500 - - declare WockySaslHandlerIface properly - - wocky/wocky-sasl-handler.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 71b215e0b41f78efef67f35160fb8e256ac8b2ad -Author: Dafydd Harries -Date: Fri Nov 13 02:00:36 2009 -0500 - - make WockySaslHandler a GInterface - - Make WockySaslDigestMd5 and WockySaslPlain implementations of it. - - wocky/Makefile.am | 4 + - wocky/wocky-sasl-auth.c | 532 +-------------------------------------- - wocky/wocky-sasl-digest-md5.c | 556 +++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-sasl-digest-md5.h | 53 ++++ - wocky/wocky-sasl-handler.c | 56 +++-- - wocky/wocky-sasl-handler.h | 40 ++-- - wocky/wocky-sasl-plain.c | 214 ++++++++++++++++ - wocky/wocky-sasl-plain.h | 50 ++++ - 8 files changed, 938 insertions(+), 567 deletions(-) - -commit 7a1cd447ce46b11912019466c23c06b3100ee193 -Author: Dafydd Harries -Date: Thu Nov 12 20:52:46 2009 -0500 - - generalize provision of initial response - - By which I mean the response sent with the authentication initiation, as per - the SASL RFC. The digest MD5 code also refers to an initial response but it - means the response to the first challenge from the server. The RFC term is - poor, but probably best to follow it. - - wocky/wocky-sasl-auth.c | 47 +++++++++++++++++++++++++++++++++-------------- - 1 files changed, 33 insertions(+), 14 deletions(-) - -commit 79c31ca8cda88a553f550858731e86718e09d378 -Author: Dafydd Harries -Date: Thu Nov 12 20:27:32 2009 -0500 - - give SASL handlers independent private state - - wocky/wocky-sasl-auth.c | 137 ++++++++++++++++++++++++++++++-------------- - wocky/wocky-sasl-auth.h | 3 + - wocky/wocky-sasl-handler.c | 5 +- - wocky/wocky-sasl-handler.h | 2 + - 4 files changed, 102 insertions(+), 45 deletions(-) - -commit 3c058fc7756dac85f1414d35cf987b777327046b -Author: Dafydd Harries -Date: Thu Nov 12 20:14:45 2009 -0500 - - remove code for impossible case - - wocky/wocky-sasl-auth.c | 9 --------- - 1 files changed, 0 insertions(+), 9 deletions(-) - -commit 378e38877dd72b5108811ea857992ddbfb222fe9 -Author: Dafydd Harries -Date: Thu Nov 12 20:13:48 2009 -0500 - - auth_reset(): free and clear handler - - wocky/wocky-sasl-auth.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 561db1c2b0d1981b38aba6a65a9a543eb5e48ee1 -Author: Dafydd Harries -Date: Thu Nov 12 18:25:57 2009 -0500 - - make WockySaslChallengeFunc return the response to send - - wocky/wocky-sasl-auth.c | 88 ++++++++++++++++++++++++++------------------ - wocky/wocky-sasl-handler.c | 4 +- - wocky/wocky-sasl-handler.h | 4 +- - 3 files changed, 56 insertions(+), 40 deletions(-) - -commit 1634e77b712036d82f3d0080b466cc93dd2b5523 -Author: Dafydd Harries -Date: Sun Nov 8 10:24:54 2009 -0500 - - introduce WockySaslHandler abstraction and use it in WockySaslAuth - - wocky/Makefile.am | 2 + - wocky/wocky-sasl-auth.c | 141 +++++++++++++++++++++++-------------------- - wocky/wocky-sasl-auth.h | 1 + - wocky/wocky-sasl-handler.c | 58 ++++++++++++++++++ - wocky/wocky-sasl-handler.h | 64 ++++++++++++++++++++ - 5 files changed, 200 insertions(+), 66 deletions(-) - -commit 50c2bd9a0d0d2091ad71e9c6ee541cc42f0e1e1f -Author: Dafydd Harries -Date: Tue Nov 10 18:32:18 2009 -0500 - - factor out setting mechanism name on stanza - - wocky/wocky-sasl-auth.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 87be0be5449ab592db1688c2034bab6f8431de14 -Author: Dafydd Harries -Date: Mon Nov 9 15:28:35 2009 -0500 - - call auth_succeeded implicitly if success handler didn't return an error - - wocky/wocky-sasl-auth.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit b65faa10d8de11feb00c4bf2196f76c7f7e2bf90 -Author: Dafydd Harries -Date: Mon Nov 9 15:12:03 2009 -0500 - - replace usage of auth_failed with GErrors - - wocky/wocky-sasl-auth.c | 90 ++++++++++++++++++++++++++++------------------ - 1 files changed, 55 insertions(+), 35 deletions(-) - -commit 4ba6a316ac5ecfa6b2f408bc7aba6500e2e38a66 -Author: Dafydd Harries -Date: Mon Nov 9 14:03:07 2009 -0500 - - use string instead of enum to identify SASL mechanisms - - tests/wocky-connector-test.c | 183 +++++++++++++++++++++--------------------- - wocky/wocky-connector.c | 9 +- - wocky/wocky-connector.h | 2 +- - wocky/wocky-sasl-auth.c | 86 ++++++++++++-------- - wocky/wocky-sasl-auth.h | 8 +-- - 5 files changed, 149 insertions(+), 139 deletions(-) - -commit 6f4a02d6c9856445b33b166a778116e94675fa25 -Author: Dafydd Harries -Date: Mon Nov 9 12:09:33 2009 -0500 - - factor out generation of initial SASL PLAIN response - - wocky/wocky-sasl-auth.c | 25 ++++++++++++++++--------- - 1 files changed, 16 insertions(+), 9 deletions(-) - -commit 197d5d733dfebf66d823c2996a71463595535c8a -Author: Will Thompson -Date: Tue Nov 17 14:33:28 2009 +0000 - - Don't explicitly define the "all" debug flag - - g_parse_debug_string () does this for us: - - > If string is equal to "all", all flags are set. If string is equal to - > "help", all the available keys in keys are printed out to standard - > error. - - wocky/wocky-debug.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 0dff81f9c868bb1801ba8bfa36bbd78bfa90e275 -Author: Sjoerd Simons -Date: Fri Nov 13 18:14:57 2009 +0000 - - nprefix should be gchar * - - wocky/wocky-xmpp-node.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bdbf0c690a3f10f6549b04003521cf95709d1541 -Author: Sjoerd Simons -Date: Thu Nov 12 16:09:22 2009 +0000 - - Make it easier to debug incoming/outgoing stanzas - - Use the stanza debugging function when the xmpp debug flag is used. This is a - lot more readable then the non-pretty printed data that comes over the network. - To see the raw network data, use the net debug flag instead - - wocky/wocky-xmpp-reader.c | 6 ++++-- - wocky/wocky-xmpp-writer.c | 8 ++++++-- - 2 files changed, 10 insertions(+), 4 deletions(-) - -commit 3eef43e7d584f87e6eb5912f5b75912e3186b339 -Author: Sjoerd Simons -Date: Thu Nov 12 16:05:58 2009 +0000 - - Actually implement wocky_debug_stanza - - wocky/wocky-debug.c | 26 ++++++++++++++++++++++++++ - 1 files changed, 26 insertions(+), 0 deletions(-) - -commit f134d2374df47ccc5389224d69763e219dbbbda6 -Author: Sjoerd Simons -Date: Thu Nov 12 15:59:11 2009 +0000 - - Make the stanza to string conversion not be xml - - The stanza to string utility function is meant to be used - for debugging purposes. Make it be unlike XML so it can't - be confused with the data that's actually send over the wire. - - wocky/wocky-xmpp-node.c | 73 ++++++++++++++++++++-------------------------- - 1 files changed, 32 insertions(+), 41 deletions(-) - -commit dafa5824563b3bcaa4d7a8ea3d6c0662a5174cad -Merge: e1fe6a1 81898f6 -Author: Dafydd Harries -Date: Thu Nov 12 12:26:14 2009 -0500 - - Merge branch 'misc' - - Reviewed-by: Vivek Dasmohapatra - -commit 81898f6a98a668f8ecf7c6247498c9cb76a7bbc4 -Author: Dafydd Harries -Date: Thu Nov 12 12:11:09 2009 -0500 - - use AC_HELP_STRING for --with-tls configure option - - configure.ac | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit b0a93575dad899e1fa71b144ae7773f3cec8648d -Author: Dafydd Harries -Date: Wed Nov 11 21:11:29 2009 -0500 - - use g_assert_no_error() - - tests/wocky-connector-test.c | 2 +- - tests/wocky-test-sasl-auth.c | 2 +- - tests/wocky-xmpp-reader-test.c | 6 +++--- - 3 files changed, 5 insertions(+), 5 deletions(-) - -commit de59db1f75b7c1f54009f7d3e65c720893a7393a -Author: Dafydd Harries -Date: Wed Nov 11 21:13:55 2009 -0500 - - configure.ac: override official release logic - - Because the current version, 0.0.0.0, ends in a zero, it's assumed that this - is a release version, so -Werror is disabled. For now, just declare that it's - not a release. - - Possibly an explicit release flag would be better than nano version which are always - 0 or 1. - - configure.ac | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 56c29352f61a95090b6bbe87dea0e8a388fbce54 -Author: Dafydd Harries -Date: Tue Nov 3 14:01:25 2009 -0500 - - test SASL server: pass cancellable to _recv_stanza - - This avoids a memory leak where the connection is closed while a message - receive is pending. - - tests/wocky-test-sasl-auth-server.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit e1a9100ec4e4de9bb1cfde9dc4e759608f50a2c9 -Author: Cosimo Cecchi -Date: Thu Nov 5 15:45:24 2009 +0100 - - Expand docs for WockyContactFactory - - wocky/wocky-contact-factory.c | 59 ++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 56 insertions(+), 3 deletions(-) - -commit ea6276c3ed46d69ef4da3f2d43babfcb904c4ac1 -Author: Cosimo Cecchi -Date: Wed Nov 4 18:21:16 2009 +0100 - - Fix some typos and missing refs in the WockyPorter doc. - - wocky/wocky-porter.c | 43 ++++++++++++++++++++++--------------------- - wocky/wocky-porter.h | 4 ++-- - 2 files changed, 24 insertions(+), 23 deletions(-) - -commit 756952ce4c7443ae3e97ee2f131a08d820904d58 -Author: Guillaume Desmottes -Date: Wed Aug 26 11:11:30 2009 +0100 - - document the WockyPorter struct - - wocky/wocky-porter.h | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit f4f42983f3acad26df1a54777790a034893d210a -Author: Guillaume Desmottes -Date: Wed Aug 26 11:10:47 2009 +0100 - - porter: document stanza handlers - - wocky/wocky-porter.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-porter.h | 11 ++++++++++ - 2 files changed, 62 insertions(+), 0 deletions(-) - -commit b5bbe72bfb05803c571da6802bbbd46f6fed9e29 -Author: Guillaume Desmottes -Date: Tue Aug 25 17:46:38 2009 +0100 - - porter: document close methods - - wocky/wocky-porter.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 49 insertions(+), 0 deletions(-) - -commit d5a099b4aa86ca64e66d24510131bca84d52af57 -Author: Guillaume Desmottes -Date: Tue Aug 25 17:12:32 2009 +0100 - - porter: document stanza sending functions - - wocky/wocky-porter.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 63 insertions(+), 0 deletions(-) - -commit c1caea0c9fc86296c93864ddba81eb4bf17313a8 -Author: Guillaume Desmottes -Date: Tue Aug 25 16:20:57 2009 +0100 - - document WockyPorterError - - wocky/wocky-porter.h | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -commit e5ceb1a3ee07d569e74e82b4caf750f818c14aaa -Author: Guillaume Desmottes -Date: Tue Aug 25 16:13:41 2009 +0100 - - porter: document property and signals - - wocky/wocky-porter.c | 30 ++++++++++++++++++++++++++++++ - 1 files changed, 30 insertions(+), 0 deletions(-) - -commit d79eac9089777fb52279ecca81f73b609814beb7 -Author: Cosimo Cecchi -Date: Wed Nov 4 17:52:32 2009 +0100 - - Write gtk-doc entries for WockyBareContact. - - wocky/wocky-bare-contact.c | 82 +++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 78 insertions(+), 4 deletions(-) - -commit e1fe6a1a8ca841efca7c9f7bd409f4a76e68d65a -Author: Cosimo Cecchi -Date: Wed Nov 4 17:04:38 2009 +0100 - - Fix some typos in the gtk-doc annotations. - - wocky/wocky-xmpp-reader.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit d02987e47e4a4a9e967365a06799449c85f43ec9 -Author: Vivek Dasmohapatra -Date: Tue Nov 3 15:59:14 2009 +0000 - - Expand + comment the \ escape parsing logic for " quoted SASL challenge values. - - wocky/wocky-sasl-auth.c | 11 +++++++++-- - 1 files changed, 9 insertions(+), 2 deletions(-) - -commit 6727760976ff85623cbf19c1f10bcbaff94a8cb5 -Author: Vivek Dasmohapatra -Date: Tue Nov 3 15:21:42 2009 +0000 - - Handle \ escapes in quoted SASL challenge parameters. - - wocky/wocky-sasl-auth.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 1eac8915ae3dea0d8134a75aac29282828b13686 -Author: Vivek Dasmohapatra -Date: Tue Nov 3 15:08:29 2009 +0000 - - Test for \ escapes in " quoted challenge values. - - tests/wocky-test-sasl-auth-server.c | 70 +++++++++++++++++++++++++++++++++++ - tests/wocky-test-sasl-auth-server.h | 1 + - tests/wocky-test-sasl-auth.c | 13 ++++-- - 3 files changed, 79 insertions(+), 5 deletions(-) - -commit 65ec8f42aa1d59c06cfe6ef5c0659666d9132b2a -Author: Vivek Dasmohapatra -Date: Mon Nov 2 18:17:11 2009 +0000 - - Implement server-adds-wacky-whitespace-to-challenge problem, test SASL with it. - - tests/wocky-test-sasl-auth-server.c | 103 ++++++++++++++++++++++++++++++++++- - tests/wocky-test-sasl-auth-server.h | 1 + - tests/wocky-test-sasl-auth.c | 7 ++- - 3 files changed, 108 insertions(+), 3 deletions(-) - -commit 59c6a1d57893ccebebf1e410f12c4c3b21df01e7 -Author: Vivek Dasmohapatra -Date: Mon Nov 2 15:37:50 2009 +0000 - - SASL challenge tokens may be separated by optional whitespace, cope with these. - - wocky/wocky-sasl-auth.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit 69679f560c5490668840f29c582d946bd7f0ee70 -Author: Vivek Dasmohapatra -Date: Thu Oct 22 17:49:22 2009 +0100 - - Comments explaining the new avoid-double-close test. - - tests/wocky-porter-test.c | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -commit 5a80eeac888503d53b5569e173269d4b32f9573c -Author: Vivek Dasmohapatra -Date: Thu Oct 22 16:19:08 2009 +0100 - - Comment explaining the importance of the timing of when remote_closed is set. - - wocky/wocky-porter.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 1cba28f9b5cdb45fa98acee8c5f75f13e81bf939 -Author: Vivek Dasmohapatra -Date: Thu Oct 22 15:56:28 2009 +0100 - - Test for the double-force-close on remote-error case. - - tests/wocky-porter-test.c | 37 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 37 insertions(+), 0 deletions(-) - -commit 871b439aa9de4f4ed5f837352f88756f8164423d -Author: Vivek Dasmohapatra -Date: Tue Oct 20 19:54:32 2009 +0100 - - Fixes calls to wocky_xmpp_connection_force_close_async. DEBUG gives file+line. - - Never put more than 1 wocky_xmpp_connection_force_close_async in flight for a - given connection. - - g_object_ref the wocky porter passed in as the user_data to the call so that - it is guaranteed to still be alive when the callback happens. - - Report an error in idle if we try to force a shutdown twice. - - DEBUG gives file + line now. - - wocky/wocky-debug.h | 3 +- - wocky/wocky-porter.c | 56 +++++++++++++++++++++++++++++++++++++++++-------- - 2 files changed, 49 insertions(+), 10 deletions(-) - -commit 3ac75cc16227e4dc39aecd9d9fa659c5d5cf1698 -Author: Vivek Dasmohapatra -Date: Wed Oct 21 12:21:40 2009 +0100 - - Put some actual aborted-iq-node info in the debug output. - - wocky/wocky-porter.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -commit 1f2e07aab5c7d57d6aa3021a529376125dab2912 -Author: Vivek Dasmohapatra -Date: Wed Oct 21 12:19:27 2009 +0100 - - Value tested in if condition clause is a pointer, not a boolean. - - wocky/wocky-porter.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 3ab69e056517fac671e3f1db06f4973538c42584 -Author: Vivek Dasmohapatra -Date: Wed Oct 21 12:18:04 2009 +0100 - - 'forget' the stashed async result earlier, use the local copy i nthe callback. - - wocky/wocky-porter.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit dfc0e61089f9db3946aa53251d7fe5745b202712 -Author: Vivek Dasmohapatra -Date: Wed Oct 21 12:14:58 2009 +0100 - - Flag should be set _before_ the signal is fired or some callbacks may not fire. - - wocky/wocky-porter.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 62d54ca0a6e338987f363f0ef979b00e8b6a6a99 -Author: Vivek Dasmohapatra -Date: Tue Oct 20 19:54:32 2009 +0100 - - Remove handlers as we abort IQs, and check iq handlers before invoking them. - - NULL out each handler->result after freeing it. - Check handler and/or handler->result before using them. - Remove handler form the hash when we abort all pending IQs. - - wocky/wocky-porter.c | 19 +++++++++++++++---- - 1 files changed, 15 insertions(+), 4 deletions(-) - -commit 04c77df70f46ecf1386d2d9b24f273d43c953a00 -Author: Vivek Dasmohapatra -Date: Mon Oct 19 15:17:38 2009 +0100 - - Certs should not be removed on distclean anymore: nothing to do on clean-local - - tests/Makefile.am | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit a7d02c2a6b9811fe63e80bc681933cf52ce0ea25 -Author: Vivek Dasmohapatra -Date: Mon Oct 19 13:08:38 2009 +0100 - - Turn openpgp cert support back off. - - wocky/wocky-tls.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 774eeec1ba1933537897d6d6da4ca14754000924 -Author: Vivek Dasmohapatra -Date: Fri Oct 16 16:48:08 2009 +0100 - - Comments explaining gnutls default protocol options we use. - - wocky/wocky-tls.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -commit 3cfb88f8e8cb76f54b11bab6bd8dde9b798a3c81 -Author: Vivek Dasmohapatra -Date: Fri Oct 16 15:58:53 2009 +0100 - - Activate deflate compression, openpgp certs and secure (slow) crypto by default. - - wocky/wocky-tls.c | 14 +++++++++----- - 1 files changed, 9 insertions(+), 5 deletions(-) - -commit 3f65748a178c5b7445f58ea21cf38bb2f09646a0 -Author: Vivek Dasmohapatra -Date: Fri Oct 16 15:44:08 2009 +0100 - - Fix gnutls session protocol detail setup. - - Don't set the details then immediately set them back to the defaults. - Complain if we can't set the various session options. - Complain if we can't set the session credentials. - Allow default options to be set via an environment variable. - Prio_cache storage not used anymore, using gnutls_priority_set_direct. - - wocky/wocky-tls.c | 38 ++++++++++++++++++++++++++++++++------ - 1 files changed, 32 insertions(+), 6 deletions(-) - -commit 42441d6581b8eccb0cd81bf080c60b9336d72edd -Author: Vivek Dasmohapatra -Date: Mon Oct 5 18:24:39 2009 +0100 - - Overriding gnutls autodetection to use openssl was broken. - - configure.ac | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 1f0a57f6dd8b75c97eb1087e0ff0d7b966fbff8b -Author: Vivek Dasmohapatra -Date: Thu Oct 1 19:45:31 2009 +0100 - - Don't check certtool/datefudge until actually needed to generate a certificate. - - tests/Makefile.am | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) - -commit 1beb3ec922476241462ea046ece2acfad0d09234 -Author: Vivek Dasmohapatra -Date: Mon Oct 5 15:46:57 2009 +0100 - - Ship openssl files in dist tarball even when building w gnutls and vice versa. - - wocky/Makefile.am | 23 ++++++++++++++++------- - 1 files changed, 16 insertions(+), 7 deletions(-) - -commit 03787b9f06af91ac0acd8f6b52e0b7783fc794d7 -Author: Vivek Dasmohapatra -Date: Mon Oct 5 15:07:14 2009 +0100 - - Typos: environnement -> environment; updated doc section title. - - wocky/wocky-openssl.c | 2 +- - wocky/wocky-tls.c | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 65b6b5fb802c884120428021bbf74edf88758c4b -Author: Vivek Dasmohapatra -Date: Mon Oct 5 14:48:15 2009 +0100 - - Comment around SSL_CTX_set_cipher_list explaining how to use it if we want to. - - wocky/wocky-openssl.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit 1e6461d57cc555b087111873cbce46e6a36644ac -Author: Vivek Dasmohapatra -Date: Mon Oct 5 14:12:33 2009 +0100 - - Coding style fix. - - wocky/wocky-openssl.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit e2ba67289c6711fe84fe137e97ec9d0df80ed185 -Author: Vivek Dasmohapatra -Date: Mon Oct 5 13:10:08 2009 +0100 - - Reduce debugging unless WOCKY_TLS_DEBUG_LEVEL exceeds the async detail level. - - wocky/wocky-openssl.c | 33 ++++++++++++++++++++++----------- - 1 files changed, 22 insertions(+), 11 deletions(-) - -commit 258c62ea0b95c43fabe9c1777d64dfc76280a1cc -Author: Vivek Dasmohapatra -Date: Mon Oct 5 12:41:26 2009 +0100 - - Comment explaining arcane reasons behind structure of error_to_string() - - wocky/wocky-openssl.c | 20 ++++++++++++++++++-- - 1 files changed, 18 insertions(+), 2 deletions(-) - -commit 69e631b51d7a812d4d0d04dd7e9164d752e74847 -Author: Vivek Dasmohapatra -Date: Fri Oct 2 16:35:46 2009 +0100 - - Removed tmp comments tagging functions for review, warn if BIO alloc fails. - - wocky/wocky-openssl.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit e3fb29ad6a586bfcb2fa8006d66024dde466631e -Author: Vivek Dasmohapatra -Date: Thu Oct 1 19:05:33 2009 +0100 - - Check in cert dir copies of certs as well as the openssl hash symlinks thereto. - - .gitignore | 4 ++-- - tests/Makefile.am | 4 +++- - tests/certs/cas/a7481a9e.0 | 1 + - tests/certs/cas/bb7d74ae.0 | 1 + - tests/certs/cas/c5d5c0da.0 | 1 + - tests/certs/cas/ca-0-cert.pem | 23 +++++++++++++++++++++++ - tests/certs/cas/ca-1-cert.pem | 23 +++++++++++++++++++++++ - tests/certs/cas/ca-2-cert.pem | 23 +++++++++++++++++++++++ - tests/certs/crl/c5d5c0da.r0 | 1 + - tests/certs/crl/ca-0-crl.pem | 13 +++++++++++++ - 10 files changed, 91 insertions(+), 3 deletions(-) - -commit d0977e8aed68ec2169534c35e396b6be0df4146c -Author: Vivek Dasmohapatra -Date: Thu Oct 1 18:32:48 2009 +0100 - - Example connect program was missing wocky_init() call, prevented testing. - - examples/connect.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 2d5e141cd3030077a5d532d3becd7562f844b760 -Author: Vivek Dasmohapatra -Date: Thu Oct 1 18:31:39 2009 +0100 - - Use WOCKY_TEST_SERVER_DEBUG env var to control test server debug independently. - - tests/wocky-connector-test.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 6325c54e019d535495f59c4a29b9864f0ae16c11 -Author: Vivek Dasmohapatra -Date: Thu Oct 1 18:30:34 2009 +0100 - - Pick one of gnutls and openssl automatically, unless the user choose explicitly. - - configure.ac | 24 ++++++++++++++++++++++-- - tests/Makefile.am | 5 +++-- - tests/wocky-test-connector-server.c | 6 ++++++ - wocky/Makefile.am | 20 +++++++++++++++----- - wocky/wocky-connector.h | 7 +++++++ - 5 files changed, 53 insertions(+), 9 deletions(-) - -commit f57076bcd5865e39b4ccc61881b539dec0689175 -Author: Vivek Dasmohapatra -Date: Thu Oct 1 18:25:15 2009 +0100 - - WockyTLSSession et al based on OpenSSL (in addition to existing gnutls version) - - wocky/wocky-openssl-dh1024.c | 30 + - wocky/wocky-openssl-dh2048.c | 41 + - wocky/wocky-openssl-dh4096.c | 62 ++ - wocky/wocky-openssl-dh512.c | 25 + - wocky/wocky-openssl.c | 1698 ++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-openssl.h | 102 +++ - 6 files changed, 1958 insertions(+), 0 deletions(-) - -commit bc04e13d7fb4a48b291e0117fef24f220620e6b9 -Author: Vivek Dasmohapatra -Date: Wed Sep 30 13:04:06 2009 +0100 - - certtool/datefudge errors should be warnings, tweaked warning messages. - - tests/Makefile.am | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit f9601a319d69fd59124c68a0f8be57d4399df0da -Author: Guillaume Desmottes -Date: Tue Sep 29 17:21:31 2009 +0100 - - wocky-pep-service: fix include of Wocky files - - wocky/wocky-pep-service.c | 8 ++++---- - wocky/wocky-pep-service.h | 4 ++-- - 2 files changed, 6 insertions(+), 6 deletions(-) - -commit 198e665a5b8bce4bdfac9cadcaf0eb0f054046d7 -Author: Jonny Lamb -Date: Fri Sep 25 12:39:16 2009 +0100 - - Make building the marshal.list quieter. - - Signed-off-by: Jonny Lamb - - wocky/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit d0146e0d3e3e295b9711ab9681c81d05e3224f93 -Author: Jonny Lamb -Date: Thu Sep 24 19:45:00 2009 +0100 - - Move from shave to automake 1.11's silent rules system. - - Signed-off-by: Jonny Lamb - - .gitignore | 5 +-- - autogen.sh | 9 ---- - configure.ac | 8 +-- - m4/Makefile.am | 3 +- - m4/shave.m4 | 102 ------------------------------------------------- - shave-libtool.in | 109 ----------------------------------------------------- - shave.in | 109 ----------------------------------------------------- - tools/Makefile.am | 1 - - tools/shave.mk | 1 - - wocky/Makefile.am | 9 ++-- - 10 files changed, 9 insertions(+), 347 deletions(-) - -commit b90ce738c61f084ca4854709cda3103c9ef7eff6 -Author: Guillaume Desmottes -Date: Mon Sep 21 17:48:00 2009 +0100 - - test wocky_pep_service_make_publish_stanza - - tests/wocky-pep-service-test.c | 39 +++++++++++++++++++++++++++++++++++++++ - 1 files changed, 39 insertions(+), 0 deletions(-) - -commit bd958bdb099057e25dcfcdf0cf4997fdc2c9693b -Author: Guillaume Desmottes -Date: Mon Sep 21 17:40:12 2009 +0100 - - test wocky_pep_service_get_async - - tests/wocky-pep-service-test.c | 90 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 90 insertions(+), 0 deletions(-) - -commit e1c1d273cca722b280e7cc41969a82e78dcf4d3a -Author: Guillaume Desmottes -Date: Mon Sep 21 17:28:30 2009 +0100 - - wocky-pep-service-test: test 'changed' signal - - tests/wocky-pep-service-test.c | 83 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 83 insertions(+), 0 deletions(-) - -commit 2223be661d6a5e1d015f5ba9d08b94a2a2d9e911 -Author: Guillaume Desmottes -Date: Mon Sep 21 17:17:31 2009 +0100 - - wocky-pep-service: add a debug msg - - wocky/wocky-pep-service.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit a75a44766c6451b3789b7ec3461efa1d1d32d3b9 -Author: Guillaume Desmottes -Date: Thu Sep 17 15:13:54 2009 +0100 - - add pubsub debug flag - - wocky/wocky-debug.c | 1 + - wocky/wocky-debug.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit a0c102d5ff551eaca0b96de0584dd69f129da036 -Author: Guillaume Desmottes -Date: Mon Sep 21 16:14:20 2009 +0100 - - add wocky-pep-service-test.c - - .gitignore | 1 + - tests/Makefile.am | 7 +++++++ - tests/wocky-pep-service-test.c | 38 ++++++++++++++++++++++++++++++++++++++ - 3 files changed, 46 insertions(+), 0 deletions(-) - -commit 853f1f634e40a2a2b72b9409036ebf90e54368ea -Author: Guillaume Desmottes -Date: Mon Sep 21 16:09:25 2009 +0100 - - build wocky-pep-service - - wocky/Makefile.am | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 2974927e81d77dc2223e31dbc04edb05feeadaf2 -Author: Guillaume Desmottes -Date: Mon Sep 21 16:09:15 2009 +0100 - - wocky-pep-service: use Wocky's signal marshallers - - wocky/wocky-pep-service.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 2274057dbb094016e86a42fcd2c4d47f91d14807 -Author: Guillaume Desmottes -Date: Fri Sep 25 10:34:27 2009 +0100 - - import wocky-pep-service.[ch] from Gabble - - wocky/wocky-pep-service.c | 362 +++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-pep-service.h | 80 ++++++++++ - 2 files changed, 442 insertions(+), 0 deletions(-) - -commit 76cf91722c1e1826750b9e396e119caddd675311 -Author: Guillaume Desmottes -Date: Thu Sep 24 18:07:23 2009 +0100 - - factor out common code of test_wait_iq_reply_close and test_wait_iq_reply_force_close to a function - - tests/wocky-porter-test.c | 80 ++++++++++++++++++-------------------------- - 1 files changed, 33 insertions(+), 47 deletions(-) - -commit b54f1004fa279e184162130834d1609cce5791b0 -Author: Guillaume Desmottes -Date: Thu Sep 24 18:00:05 2009 +0100 - - rename complete_pending_send_iq to abort_pending_iqs - - wocky/wocky-porter.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 7ececb0027aa22b504b81917caaf51b6bc2024dc -Author: Guillaume Desmottes -Date: Thu Sep 24 17:53:46 2009 +0100 - - rename WOCKY_PORTER_ERROR_FORCE_CLOSING to WOCKY_PORTER_ERROR_FORCIBLY_CLOSED - - tests/wocky-porter-test.c | 8 +++++--- - wocky/wocky-porter.c | 4 ++-- - wocky/wocky-porter.h | 2 +- - 3 files changed, 8 insertions(+), 6 deletions(-) - -commit 6903df4c7c6b3545101b6d879134c4cb6d515684 -Author: Guillaume Desmottes -Date: Thu Sep 24 15:49:05 2009 +0100 - - wocky_porter_force_close_async: re-use the same GError to set the error on all the results - - wocky/wocky-porter.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit 03d2273f68a9bf49746740a959f10b940eb50570 -Author: Guillaume Desmottes -Date: Thu Sep 24 15:47:57 2009 +0100 - - error code when terminating send operations because of a force closing should be WOCKY_PORTER_ERROR_FORCE_CLOSING - - tests/wocky-porter-test.c | 2 +- - wocky/wocky-porter.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit c8f08025cda5419be3c011c5b338cbbc8841900e -Author: Guillaume Desmottes -Date: Thu Sep 24 15:43:47 2009 +0100 - - test that pending send IQ operation are complete when we force the closing of our porter - - tests/wocky-porter-test.c | 72 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 72 insertions(+), 0 deletions(-) - -commit 8eef61f1f410763625904ba419b47ce79727d785 -Author: Guillaume Desmottes -Date: Thu Sep 24 15:42:33 2009 +0100 - - complete pending send IQ operations when we force the closing of the porter - - wocky/wocky-porter.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 3fbce0242bfe600227e77d1edfd4402426dd5be6 -Author: Guillaume Desmottes -Date: Thu Sep 24 15:42:07 2009 +0100 - - factor out complete_pending_send_iq - - wocky/wocky-porter.c | 27 ++++++++++++++++++--------- - 1 files changed, 18 insertions(+), 9 deletions(-) - -commit 104bae4b182ade5d2942bfcd18511f7eb927572d -Author: Guillaume Desmottes -Date: Thu Sep 24 15:14:48 2009 +0100 - - pass the reason of the disconnection to the send IQ callback - - tests/wocky-porter-test.c | 3 ++- - wocky/wocky-porter.c | 4 +--- - 2 files changed, 3 insertions(+), 4 deletions(-) - -commit 481054a85e50a0c5b584d2a6e95b2fff33ccb604 -Author: Guillaume Desmottes -Date: Thu Sep 24 15:08:44 2009 +0100 - - complete send IQ operations before signalling the closing of the remote connection - - wocky/wocky-porter.c | 26 +++++++++++++------------- - 1 files changed, 13 insertions(+), 13 deletions(-) - -commit 7a91dcc4b4f9a39c99d839b72745ee367c97719e -Author: Guillaume Desmottes -Date: Thu Sep 24 14:58:50 2009 +0100 - - test that pending send IQ operation are complete when the remote connection is closed - - tests/wocky-porter-test.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 70 insertions(+), 0 deletions(-) - -commit 340cb5a7d92bbc91b186597827ad9b92c25fa5cf -Author: Guillaume Desmottes -Date: Thu Sep 24 14:57:12 2009 +0100 - - porter: complete pending send IQ operations when the remote connection is closed - - We won't be able to receive the IQ reply so we have to complete the - operation. - - wocky/wocky-porter.c | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -commit a797ccc3b304be3a662e349189896dab2777fa31 -Merge: 16ce7be 76a008f -Author: Dafydd Harries -Date: Wed Sep 23 22:05:25 2009 +0100 - - Merge branch 'cosmetics' - - Reviewed-by: Sjoerd Simons - -commit 76a008fd90eeb1f5ca92f866c76029ed9650449c -Author: Dafydd Harries -Date: Wed Sep 23 18:29:48 2009 +0100 - - cosmetics: remove adscititious newlines - - tests/wocky-test-connector-server.c | 24 ++++++++++++------------ - wocky/wocky-connector.c | 6 +++--- - wocky/wocky-porter.c | 2 +- - 3 files changed, 16 insertions(+), 16 deletions(-) - -commit 16ce7be592b94c5f50c3ca4010f90247ef1d48f4 -Author: Guillaume Desmottes -Date: Tue Sep 22 17:08:36 2009 +0100 - - copy wocky_g_value_slice_* helpers from telepathy-glib - - wocky/wocky-utils.c | 331 +++++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-utils.h | 22 ++++ - 2 files changed, 353 insertions(+), 0 deletions(-) - -commit 9b3de37e9b99af2abaf4cee045ba42a548d970b2 -Author: Vivek Dasmohapatra -Date: Mon Sep 21 16:21:17 2009 +0100 - - Make sure we include the username in the jabber auth iq get stanza. - - tests/wocky-test-connector-server.c | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -commit 252c938262d0ddab12fff62c226700354a8f11cf -Author: Vivek Dasmohapatra -Date: Mon Sep 21 16:16:07 2009 +0100 - - Include ... in jabber auth iq get stanza. (Bug #24013) - - Not required by XEP 0078 but required by some implementations. - Not forbidden by XEP 0078. - Conforms to Gabble 0.8.x behaviour. - - wocky/wocky-connector.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit a2ec0dbefa807527190dd46bd5d5044f1eb2d09e -Merge: 7b80feb b30b339 -Author: Vivek Dasmohapatra -Date: Mon Sep 21 17:31:43 2009 +0100 - - Merge build-system-fixes branch (certtool, sasl.h dependency fixes) - -commit b30b3398e687918114dfa9fe37b47c230782d8e9 -Author: Vivek Dasmohapatra -Date: Mon Sep 21 17:19:52 2009 +0100 - - Deleted blank lines undeleted. - - tests/wocky-test-sasl-auth-server.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 1d291e099d4798f4894b8f3b1e3250ee16a4210a -Author: Vivek Dasmohapatra -Date: Mon Sep 21 12:41:12 2009 +0100 - - CA and CRL directories should also be prerequisites of the connector test suite. - - tests/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 242830f3765fecd9d7d8000b29069fa0cc965ca2 -Author: Vivek Dasmohapatra -Date: Mon Sep 21 12:37:40 2009 +0100 - - challenge is not free()d, so need not be assigned from g_strdup(). - - tests/wocky-test-sasl-auth-server.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e00fc6ee1e51ada35f07ec44796a3c0454630a4e -Author: Vivek Dasmohapatra -Date: Mon Sep 21 12:35:51 2009 +0100 - - Remove #warnings about missing libsasl2, use g_message instead. - - tests/wocky-connector-test.c | 7 ++++++- - tests/wocky-test-sasl-auth-server.c | 1 - - 2 files changed, 6 insertions(+), 2 deletions(-) - -commit 8cf3f5ddaf64c4548b769f4fec4405796892b069 -Author: Vivek Dasmohapatra -Date: Mon Sep 21 11:44:08 2009 +0100 - - Git ignore wocky dist tarball. - - .gitignore | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 4a3b664a89db37d7826784da8d5fb5a465cca9b8 -Author: Vivek Dasmohapatra -Date: Fri Sep 18 18:20:04 2009 +0100 - - Add certs/cas dir to variable to keep distcheck happy. - - tests/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 9be3ec00e4abbdf349286073bd9aed5da47af3c0 -Author: Vivek Dasmohapatra -Date: Fri Sep 18 18:16:56 2009 +0100 - - fake PLAIN SASL and ignore other mechs when libsasl2 is unavailable. - - tests/wocky-connector-test.c | 15 ++++++++ - tests/wocky-test-sasl-auth-server.c | 68 +++++++++++++++++++++++++++++++--- - 2 files changed, 77 insertions(+), 6 deletions(-) - -commit cd2defdc0dceb507f1a7cbf209ce300c329a3a69 -Author: Vivek Dasmohapatra -Date: Fri Sep 18 18:16:15 2009 +0100 - - sasl/sasl.h not needed here. - - tests/wocky-test-connector-server.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 4194158aca737f2b19995355399fb822d40b6626 -Author: Vivek Dasmohapatra -Date: Fri Sep 18 18:15:51 2009 +0100 - - Patterns must match both short and full qualified paths. - - This is down to use of @abs_top_srcdir@ conflicting with distcheck. - - tests/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 767530fcf1e4bbcb5ea3605c782060ad599e3427 -Author: Vivek Dasmohapatra -Date: Fri Sep 18 18:02:56 2009 +0100 - - Populate the CA certificates and CRL subdirectories correctly. - - tests/Makefile.am | 21 ++++++++++----------- - 1 files changed, 10 insertions(+), 11 deletions(-) - -commit d0507e7471660f7cf73ef7ed37e8cb45dd882309 -Author: Vivek Dasmohapatra -Date: Fri Sep 18 17:44:30 2009 +0100 - - More Makefile.am fixes to cope now that certificates are preserved by default. - - .PRECIOUS rule simplified to all PEM files - Binary check deps converted to order only prerequisites (to avoid rebuilding - certs just because we re-ran the certtool/datefudge binary checks) - Don't delete CRLs or PEM files at all. - - tests/Makefile.am | 11 ++++------- - 1 files changed, 4 insertions(+), 7 deletions(-) - -commit ddc8177f5514685505121d51f9d02d9df1bdb6b8 -Author: Vivek Dasmohapatra -Date: Fri Sep 18 14:35:17 2009 +0100 - - Update make system to preserve generated certificates. - - Ability to generate certificates remains, but may depend on availability - of gnutls certtool and/or datefudge, which are checked for at runtime. - - tests/Makefile.am | 47 ++++++++++++++++++++++++++++++++--------------- - 1 files changed, 32 insertions(+), 15 deletions(-) - -commit c2cbc5346062e9260ab30e7c67bebc4a8f5460e3 -Author: Vivek Dasmohapatra -Date: Fri Sep 18 14:14:00 2009 +0100 - - Check in generated certs as we preserve these now. - - Note that this will all fall apart in 2037 some time; This change - means downstream won't need to include the cert generation tools - just to run the test suite. - - .gitignore | 34 ++++++++++++++------------ - tests/certs/ca-0-cert.pem | 30 ++++++++++++------------ - tests/certs/ca-0-crl.pem | 13 ++++++++++ - tests/certs/ca-0-key.pem | 50 ++++++++++++++++++++-------------------- - tests/certs/ca-1-cert.pem | 23 ++++++++++++++++++ - tests/certs/ca-1-key.pem | 27 +++++++++++++++++++++ - tests/certs/ca-2-cert.pem | 23 ++++++++++++++++++ - tests/certs/ca-2-key.pem | 27 +++++++++++++++++++++ - tests/certs/exp-cert.pem | 30 ++++++++++++------------ - tests/certs/exp-key.pem | 27 +++++++++++++++++++++ - tests/certs/new-cert.pem | 30 ++++++++++++------------ - tests/certs/new-key.pem | 27 +++++++++++++++++++++ - tests/certs/rev-cert.pem | 24 +++++++++++++++++++ - tests/certs/rev-key.pem | 27 +++++++++++++++++++++ - tests/certs/ss-cert.pem | 24 +++++++++++++++++++ - tests/certs/ss-key.pem | 27 +++++++++++++++++++++ - tests/certs/tls-cert.pem | 24 +++++++++++++++++++ - tests/certs/tls-key.pem | 27 +++++++++++++++++++++ - tests/certs/unknown-ca-key.pem | 27 +++++++++++++++++++++ - tests/certs/unknown-cert.pem | 25 ++++++++++++++++++++ - tests/certs/unknown-key.pem | 27 +++++++++++++++++++++ - 21 files changed, 487 insertions(+), 86 deletions(-) - -commit 81f9f5c01fa2de1b8e18a94095dc9fa14422e66f -Author: Vivek Dasmohapatra -Date: Fri Sep 18 14:10:22 2009 +0100 - - Certificates last "forever" now, extend their expiry in the config templates. - - tests/certs/ca-0-crl.cfg | 2 +- - tests/certs/ca-1-cert.cfg | 2 +- - tests/certs/ca-2-cert.cfg | 2 +- - tests/certs/rev-cert.cfg | 2 +- - tests/certs/ss-cert.cfg | 2 +- - tests/certs/tls-cert.cfg | 2 +- - tests/certs/unknown-ca-cert.cfg | 2 +- - tests/certs/unknown-cert.cfg | 2 +- - 8 files changed, 8 insertions(+), 8 deletions(-) - -commit 450b8108b718e406e2b34669f1b24e9aad48ee3f -Author: Vivek Dasmohapatra -Date: Fri Sep 18 14:08:54 2009 +0100 - - Typo: temporary DEBUG2 macro no longer exists. - - tests/wocky-test-connector-server.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit 7c4e232f11cdb0bc0b5c1900a6d16e1d3698365e -Author: Vivek Dasmohapatra -Date: Fri Sep 18 14:07:36 2009 +0100 - - Permit server initialiasation without an x509 certificate/key pair. - - wocky/wocky-tls.c | 13 ++++++++----- - 1 files changed, 8 insertions(+), 5 deletions(-) - -commit f07d5bdfb587b2941265e29878b6d70d66b38868 -Author: Vivek Dasmohapatra -Date: Fri Sep 18 14:03:51 2009 +0100 - - Now preserving generated certs, so don't check for certtool at configure time. - - configure.ac | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -commit 0974c93aef7b46caee9552350d6ca0aa4d29912e -Author: Vivek Dasmohapatra -Date: Thu Sep 17 17:32:44 2009 +0100 - - Add check for gnutls certtool in configure.ac - - configure.ac | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 42e9edd8c5ee54203fed2fec384a465403e470f6 -Author: Vivek Dasmohapatra -Date: Thu Sep 17 16:46:11 2009 +0100 - - Check for sasl/sasl.h as well as libsasl2.so (no .pc, so no pkg-config) - - configure.ac | 15 ++++++++------- - 1 files changed, 8 insertions(+), 7 deletions(-) - -commit 7b80feb0be0daf92e3e14079082c019bfc1386ab -Author: Guillaume Desmottes -Date: Mon Sep 21 15:55:19 2009 +0100 - - run wocky-connector-test last as it takes age to run - - tests/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 230ec0678e0fb55aeb30678f103ff89d37e56a1a -Author: Guillaume Desmottes -Date: Thu Sep 17 15:14:11 2009 +0100 - - wocky-namespaces: add WOCKY_XMPP_NS_PUBSUB_EVENT - - wocky/wocky-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 3822ffd5739951a48f18b0cfa4f7892418227084 -Author: Sjoerd Simons -Date: Sun Sep 20 12:44:47 2009 +0100 - - Namespace wocky-debug header file #ifdef - - wocky/wocky-debug.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 5ae3040a2eefcde286c60af9afc40e075ccd6c8e -Author: Sjoerd Simons -Date: Sun Sep 20 11:59:38 2009 +0100 - - Remove debug message that make the logging less useful - - Unfortunately wocky only has one debug level. Outputting two lines for every - node in the tree completely overwhelms everything else, so remove these for - now. - - wocky/wocky-xmpp-reader.c | 19 ------------------- - 1 files changed, 0 insertions(+), 19 deletions(-) - -commit 9f7b18408dab61b0e35810719f1edfa86c9d4b5f -Author: Sjoerd Simons -Date: Sun Sep 20 11:38:53 2009 +0100 - - Set G_LOG_DOMAIN to wocky - - wocky/Makefile.am | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit f2973853cb582547505bd1284cf261d064f6db97 -Merge: e249ed8 c20db39 -Author: Vivek Dasmohapatra -Date: Tue Sep 15 17:50:50 2009 +0100 - - Merge branch 'keep-old-new-test-certs' - -commit c20db39f0c6d71bd895c9e17bc14001ad9bb1e04 -Author: Vivek Dasmohapatra -Date: Tue Sep 15 17:42:55 2009 +0100 - - Temporary debug target 'moose' in Makefile.am shouldn't have been checked in. - - tests/Makefile.am | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit f79654645ae0f3a314f8d6f4ea6e86bc22f3eaf5 -Author: Vivek Dasmohapatra -Date: Tue Sep 15 17:15:38 2009 +0100 - - Preserve inactive, expired (and CA cert for same) to avoid datefudge build dep. - - .gitignore | 23 ++++++++++++++++++++++- - tests/Makefile.am | 21 +++++++++++++-------- - tests/certs/ca-0-cert.cfg | 2 +- - tests/certs/ca-0-cert.pem | 23 +++++++++++++++++++++++ - tests/certs/ca-0-key.pem | 27 +++++++++++++++++++++++++++ - tests/certs/exp-cert.pem | 24 ++++++++++++++++++++++++ - tests/certs/new-cert.pem | 24 ++++++++++++++++++++++++ - 7 files changed, 134 insertions(+), 10 deletions(-) - -commit e249ed86915cf38663abbbcd328f6ad1321ef4c8 -Author: Guillaume Desmottes -Date: Tue Sep 15 11:04:33 2009 +0100 - - configure.ac: don't call GTK_DOC_CHECK twice (fd.o #23943) - - configure.ac | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit 1a9e13714a4758eb5e73fe166aa42632feb2bad8 -Author: Vivek Dasmohapatra -Date: Mon Sep 14 15:21:06 2009 +0100 - - Update docstring with corrected canonical locations for CA certificates. - - wocky/wocky-connector.c | 16 ++++++++++++++-- - 1 files changed, 14 insertions(+), 2 deletions(-) - -commit 95aec41185e17f0f7b59ef3a7cf1f2b775617e88 -Author: Vivek Dasmohapatra -Date: Mon Sep 14 13:29:15 2009 +0100 - - git ignore generated test CRLs. - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 3736688c6a71db7185722e41ef6404a7156a6ab3 -Author: Vivek Dasmohapatra -Date: Mon Sep 14 12:59:57 2009 +0100 - - Make distcheck happy again (generated test crls weren't handled properly) - - tests/Makefile.am | 14 +++++++++++--- - 1 files changed, 11 insertions(+), 3 deletions(-) - -commit cc335c30eacf0c5f28974a6d319651d1e23f0658 -Author: Vivek Dasmohapatra -Date: Fri Sep 11 20:05:52 2009 +0100 - - Add tests for CRL verification. - - tests/wocky-connector-test.c | 49 +++++++++++++++++++++++++++++++++++ - tests/wocky-test-connector-server.c | 1 + - tests/wocky-test-connector-server.h | 3 +- - 3 files changed, 52 insertions(+), 1 deletions(-) - -commit 2a4f18eafb29eba0137d2286cf5fe8d80006f22a -Author: Vivek Dasmohapatra -Date: Fri Sep 11 20:04:45 2009 +0100 - - Generate revoked certificate + crl for tests. - - tests/Makefile.am | 27 +++++++++++++- - tests/certs/ca-0-crl.cfg | 1 + - tests/certs/rev-cert.cfg | 89 ++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 115 insertions(+), 2 deletions(-) - -commit 2708fc257679324f67445963319d2bcaa88ced5e -Author: Vivek Dasmohapatra -Date: Fri Sep 11 18:45:58 2009 +0100 - - Update example connect program to new API for adding CAs. - - examples/connect.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b657eaa0861e64cc428adce99fa611e16ce0f763 -Author: Vivek Dasmohapatra -Date: Fri Sep 11 18:45:31 2009 +0100 - - Update tests to new API (CAs not added in constructor any more). - - tests/wocky-connector-test.c | 3 ++- - tests/wocky-test-connector-server.c | 15 +++++++-------- - 2 files changed, 9 insertions(+), 9 deletions(-) - -commit 1c6b431e6fbc2413f1e2c7557caf15a02048d399 -Author: Vivek Dasmohapatra -Date: Fri Sep 11 18:44:52 2009 +0100 - - CA and CRL lists not properties any more: added via public method instead. - - wocky/wocky-connector.c | 111 ++++++++++++++++++++++++------ - wocky/wocky-connector.h | 6 ++ - wocky/wocky-tls.c | 173 ++++++++++++++++++++--------------------------- - wocky/wocky-tls.h | 14 ++-- - 4 files changed, 174 insertions(+), 130 deletions(-) - -commit fd244a61ae5c6b58759978de49f7960e071f76de -Author: Vivek Dasmohapatra -Date: Fri Sep 11 16:02:52 2009 +0100 - - Catch more cert verification failures from gnutls and alter return accordingly. - - wocky/wocky-tls.c | 34 ++++++++++++++++++++++++++++++++-- - wocky/wocky-tls.h | 3 +++ - 2 files changed, 35 insertions(+), 2 deletions(-) - -commit 96aa57b55afbb0c39920eb9f9a0f6c55438dd4d6 -Author: Vivek Dasmohapatra -Date: Fri Sep 11 16:01:56 2009 +0100 - - Wocky specific error on TLS handshake failure, don't propagate the gnutls one. - - wocky/wocky-connector.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 00d906384defb0b283ea05c8fbb00e8853780368 -Author: Vivek Dasmohapatra -Date: Fri Sep 11 15:47:32 2009 +0100 - - git ignore multi-ca certs built by tests. - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 6cfab2cec199cfe88585ee3781b9ad63c91c1437 -Author: Vivek Dasmohapatra -Date: Thu Sep 10 18:52:09 2009 +0100 - - Typo, missing arg in last checkin. - - wocky/wocky-tls.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b8d2ee6f6975374984551b2bf3f8bdf6ed9a1206 -Author: Vivek Dasmohapatra -Date: Thu Sep 10 18:50:10 2009 +0100 - - Update tests to include loading multiple ca certs from a directory. - - tests/Makefile.am | 41 ++++++++++++------- - tests/certs/ca-0-cert.cfg | 89 ++++++++++++++++++++++++++++++++++++++++++ - tests/certs/ca-1-cert.cfg | 89 ++++++++++++++++++++++++++++++++++++++++++ - tests/certs/ca-2-cert.cfg | 89 ++++++++++++++++++++++++++++++++++++++++++ - tests/certs/ca-cert.cfg | 89 ------------------------------------------ - tests/wocky-connector-test.c | 19 ++++++++- - 6 files changed, 310 insertions(+), 106 deletions(-) - -commit 98039f72a3edacf48a40cf60f39a6075f4ebc108 -Author: Vivek Dasmohapatra -Date: Thu Sep 10 18:48:43 2009 +0100 - - Debugging now reports total certs loaded from dir. - - wocky/wocky-tls.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit dc0f398d347e0c3f6520b36b84a2fa5f8b830010 -Author: Vivek Dasmohapatra -Date: Thu Sep 10 17:57:16 2009 +0100 - - Abort with GError with wockytls-cert-error quark on cert verification problem. - - tests/wocky-connector-test.c | 25 +++++++++++++------------ - wocky/wocky-connector.c | 7 +++++-- - 2 files changed, 18 insertions(+), 14 deletions(-) - -commit 6a8e5b48efe481ff0462259c8edd5a6e9193cb25 -Author: Vivek Dasmohapatra -Date: Thu Sep 10 17:31:59 2009 +0100 - - Define tls cert status quark. - - wocky/wocky-tls.c | 11 +++++++++++ - wocky/wocky-tls.h | 3 +++ - 2 files changed, 14 insertions(+), 0 deletions(-) - -commit 56ceea3886aa5633bbdecff225fd85ae988e0c9c -Author: Vivek Dasmohapatra -Date: Thu Sep 10 14:57:44 2009 +0100 - - { } around if in for loop (only statement in loop) (starttls) - - tests/wocky-test-connector-server.c | 14 ++++++++------ - 1 files changed, 8 insertions(+), 6 deletions(-) - -commit c61df5036b33b67136d168efef456ced5405231d -Author: Vivek Dasmohapatra -Date: Thu Sep 10 14:56:08 2009 +0100 - - { } around if (only statement in for loop) (handle_starttls). - - tests/wocky-test-connector-server.c | 14 ++++++++------ - 1 files changed, 8 insertions(+), 6 deletions(-) - -commit e5c5aaff32ce3774468de790ef9e938270699ada -Author: Vivek Dasmohapatra -Date: Thu Sep 10 14:52:45 2009 +0100 - - DEBUG when stat of candidate ca/crl file or dir fails. - - wocky/wocky-tls.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit e57f5c4f29c753e64b48f19fd4cb5c2a3e23b725 -Author: Vivek Dasmohapatra -Date: Thu Sep 10 14:44:38 2009 +0100 - - Change signature to specifically be WockyTLSCertStatus *, not guint *. - - wocky/wocky-tls.c | 8 ++++---- - wocky/wocky-tls.h | 8 ++++---- - 2 files changed, 8 insertions(+), 8 deletions(-) - -commit d030e836b5e10fd661f9a2b23b443ad3aa9242ac -Author: Vivek Dasmohapatra -Date: Thu Sep 10 14:38:24 2009 +0100 - - Follow gnio style for wocky-tls (code borrowed from there) - - wocky/wocky-tls.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 142bcfcc27a32db2833640e2fa3df582a56e5841 -Author: Vivek Dasmohapatra -Date: Thu Sep 10 14:36:58 2009 +0100 - - Tweak "$binary not installed" make error message. - - tests/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit b8b76837f273ff1d40d3e71eb916e25f6ae19466 -Author: Vivek Dasmohapatra -Date: Thu Sep 10 14:16:11 2009 +0100 - - Tests for certificate strict/lenient verification. - - tests/wocky-connector-test.c | 308 ++++++++++++++++++++++++++++++++++- - tests/wocky-test-connector-server.c | 53 ++++++- - tests/wocky-test-connector-server.h | 13 ++- - 3 files changed, 363 insertions(+), 11 deletions(-) - -commit 6264c62f742834361fdf5030fb6358a212293e26 -Author: Vivek Dasmohapatra -Date: Thu Sep 10 14:15:35 2009 +0100 - - Update example to conform to new wocky_tls_session_new API. - - examples/connect.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 5a2f92a47b18fb1402c5f7b07c2677b3b23af88e -Author: Vivek Dasmohapatra -Date: Thu Sep 10 14:14:40 2009 +0100 - - Support certificate verification via wocky_tls_session - new API for wocky_tls_session_new used - correctly handle results of wocky_tls_session_verify_peer when lenient/strict - - wocky/wocky-connector.c | 60 +++++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 56 insertions(+), 4 deletions(-) - -commit a9d71475175ec7dbcbd088036dd3e2d429171a8c -Author: Vivek Dasmohapatra -Date: Thu Sep 10 14:12:34 2009 +0100 - - wocky_tls_sessions can now do cert verification. - debugging tweaks to make wocky-tls debugging tunable via WOCKY_TLS_DEBUG_LEVEL - extra parameters to wocky_tls_session_new (ca and crl files/dirs) - variable named stat -> _stat (conflict with stat(2)) - tweak WOCKY_TLS_VERIFY_NORMAL flags (subject to review anyway) - - wocky/wocky-tls.c | 167 ++++++++++++++++++++++++++++++++++++++++++---------- - wocky/wocky-tls.h | 8 ++- - 2 files changed, 141 insertions(+), 34 deletions(-) - -commit 7b6b176e957745e5786c490a1f7888613f9417ce -Author: Vivek Dasmohapatra -Date: Thu Sep 10 14:05:48 2009 +0100 - - Generate extra invalid certs for testing. - - tests/Makefile.am | 89 +++++++++++++++++++++++++++++---------- - tests/certs/exp-cert.cfg | 89 +++++++++++++++++++++++++++++++++++++++ - tests/certs/new-cert.cfg | 89 +++++++++++++++++++++++++++++++++++++++ - tests/certs/ss-cert.cfg | 89 +++++++++++++++++++++++++++++++++++++++ - tests/certs/unknown-ca-cert.cfg | 89 +++++++++++++++++++++++++++++++++++++++ - tests/certs/unknown-cert.cfg | 89 +++++++++++++++++++++++++++++++++++++++ - 6 files changed, 512 insertions(+), 22 deletions(-) - -commit 07dbdd3dad71d7739b32c94aae0d0dfbaadc6944 -Author: Vivek Dasmohapatra -Date: Wed Sep 9 14:49:08 2009 +0100 - - Build helper programs in all target. Filter out the cert generation bits noise. - - tests/Makefile.am | 17 ++++++++++------- - 1 files changed, 10 insertions(+), 7 deletions(-) - -commit b6122b7bc81f97da438c8e11cf2f2445f227e963 -Author: Vivek Dasmohapatra -Date: Wed Sep 9 12:32:07 2009 +0100 - - Tidy up the cert verification error selection code. - - wocky/wocky-tls.c | 39 ++++++++++++++++++++++++++------------- - 1 files changed, 26 insertions(+), 13 deletions(-) - -commit f0c194cb25e28172f0c12531ac425ab9d3ecfcb8 -Author: Vivek Dasmohapatra -Date: Tue Sep 8 19:46:53 2009 +0100 - - Basic server cert verification tests (more to follow) - - tests/wocky-connector-test.c | 100 ++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 100 insertions(+), 0 deletions(-) - -commit 2cb3c8694ab690bd410efd05b34a15d13cd47ee6 -Author: Vivek Dasmohapatra -Date: Tue Sep 8 19:46:28 2009 +0100 - - Use the new certificate cerification function to check the server cert. - - wocky/wocky-connector.c | 56 +++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 54 insertions(+), 2 deletions(-) - -commit 47f24d6387c3968cac25b80134e6d2ad4cb44291 -Author: Vivek Dasmohapatra -Date: Tue Sep 8 19:46:04 2009 +0100 - - Add a certificate verification function (checks expiry, peer name etc) - - wocky/wocky-tls.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-tls.h | 35 +++++++++++++++++++++- - 2 files changed, 119 insertions(+), 1 deletions(-) - -commit 1346b9cca915c16a095dfbe92172cdf2d151fb00 -Author: Guillaume Desmottes -Date: Tue Sep 8 11:48:31 2009 +0100 - - wocky-connector-test: check the right error code now that decode_jis is actually smarter - - tests/wocky-connector-test.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 07938cf687762add30978d72bf3623e8e8d5a320 -Author: Guillaume Desmottes -Date: Tue Sep 8 11:13:01 2009 +0100 - - sync wocky_decode_jid implementation with Gabble - - wocky_decode_jid now does some validity checks on the JID. - - wocky/wocky-utils.c | 135 ++++++++++++++++++++++++++++++++++----------------- - wocky/wocky-utils.h | 2 +- - 2 files changed, 92 insertions(+), 45 deletions(-) - -commit 47a91ac7e2ddaee74532f10f8e2ba51511e2a5ba -Author: Guillaume Desmottes -Date: Thu Sep 3 13:39:15 2009 +0100 - - add WOCKY_XMPP_NS_PUBSUB - - wocky/wocky-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit f6ff602880d07de6df6e6dac66574b44f580ccf5 -Author: Guillaume Desmottes -Date: Wed Sep 2 15:45:45 2009 +0100 - - Don't create a WockyRoster in WockySession for now. - - We don't want to create it automatically for now as Gabble isn't ported - to use WockyRoster yet. - - This reverts commit 74288a9802e56cf3404c95d9c3a28603d0b1bf41 and - 438140e5c05da82c030fc53b08d8fa9d43779d84. - - tests/wocky-roster-test.c | 7 ++++--- - tests/wocky-session-test.c | 17 ----------------- - wocky/wocky-session.c | 23 ----------------------- - wocky/wocky-session.h | 3 --- - 4 files changed, 4 insertions(+), 46 deletions(-) - -commit 5b9839ebe93637a4a6e72c18b3683ad8ec9d449c -Author: Sjoerd Simons -Date: Wed Sep 2 14:54:51 2009 +0100 - - Remove unnecessary gnio dependency - - wocky/wocky-uninstalled.pc.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 438140e5c05da82c030fc53b08d8fa9d43779d84 -Author: Guillaume Desmottes -Date: Tue Sep 1 18:20:28 2009 +0100 - - wocky-roster-test: use the roster created by the session - - tests/wocky-roster-test.c | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit 74288a9802e56cf3404c95d9c3a28603d0b1bf41 -Author: Guillaume Desmottes -Date: Tue Sep 1 18:18:32 2009 +0100 - - session: create a roster object - - tests/wocky-session-test.c | 17 +++++++++++++++++ - wocky/wocky-session.c | 23 +++++++++++++++++++++++ - wocky/wocky-session.h | 3 +++ - 3 files changed, 43 insertions(+), 0 deletions(-) - -commit acd9668386046417eca0ca2ab14de495326f8f5e -Author: Guillaume Desmottes -Date: Tue Sep 1 18:15:09 2009 +0100 - - fix identation - - wocky/wocky-session.c | 36 ++++++++++++++++++------------------ - 1 files changed, 18 insertions(+), 18 deletions(-) - -commit da1782aa17377b086aa69a1eead10de7b9a97a48 -Author: Guillaume Desmottes -Date: Tue Sep 1 18:13:13 2009 +0100 - - porter: don't create a contact factory anymore - - That's the job of the session now. - - wocky/wocky-porter.c | 18 ------------------ - 1 files changed, 0 insertions(+), 18 deletions(-) - -commit ba9d1ee743fa8a8b79871bcae928c18eb43dd453 -Author: Guillaume Desmottes -Date: Tue Sep 1 18:11:55 2009 +0100 - - pass a session instead of a porter to wocky_roster_new - - tests/wocky-roster-test.c | 17 ++++++++------- - wocky/wocky-roster.c | 47 ++++++++++++++++++++++++-------------------- - wocky/wocky-roster.h | 3 +- - 3 files changed, 36 insertions(+), 31 deletions(-) - -commit 899770c4f5e2455e1e299ea577c0ef68c770009d -Author: Guillaume Desmottes -Date: Tue Sep 1 18:11:03 2009 +0100 - - instantiate wocky sessions in tests - - tests/wocky-porter-test.c | 4 ++-- - tests/wocky-test-helper.c | 15 +++++++++------ - tests/wocky-test-helper.h | 3 +++ - 3 files changed, 14 insertions(+), 8 deletions(-) - -commit 2dd8e98031a100437a1d2e95845b6641082cab1e -Author: Guillaume Desmottes -Date: Tue Sep 1 18:09:08 2009 +0100 - - add wocky_session_start - - wocky/wocky-session.c | 7 +++++++ - wocky/wocky-session.h | 2 ++ - 2 files changed, 9 insertions(+), 0 deletions(-) - -commit 569176a4df56da2e8dda637d1a3e5f39a1549f47 -Author: Guillaume Desmottes -Date: Tue Sep 1 17:07:29 2009 +0100 - - wocky-session: create a contact-factory - - tests/wocky-session-test.c | 17 +++++++++++++++++ - wocky/wocky-session.c | 24 ++++++++++++++++++++++-- - wocky/wocky-session.h | 3 +++ - 3 files changed, 42 insertions(+), 2 deletions(-) - -commit 0b71b1ad5eefb26b3bb1bc8dfcc41f8c63f6ccfd -Author: Guillaume Desmottes -Date: Tue Sep 1 17:00:42 2009 +0100 - - session: create a Porter for the connection - - tests/wocky-session-test.c | 17 +++++++++++++++++ - wocky/wocky-session.c | 24 ++++++++++++++++++++++++ - wocky/wocky-session.h | 3 +++ - 3 files changed, 44 insertions(+), 0 deletions(-) - -commit c901bceb51ccb818d7ce4e793d1432cf46bdfa16 -Author: Guillaume Desmottes -Date: Tue Sep 1 16:51:27 2009 +0100 - - add wocky-session-test.c - - .gitignore | 1 + - tests/Makefile.am | 9 ++++++++- - tests/wocky-session-test.c | 43 +++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 52 insertions(+), 1 deletions(-) - -commit 6b7ea9560ccc670ebe7b1deacc9cc814541c4010 -Author: Guillaume Desmottes -Date: Tue Sep 1 16:50:58 2009 +0100 - - add wocky-session.[ch] - - wocky/Makefile.am | 4 +- - wocky/wocky-session.c | 186 +++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-session.h | 63 +++++++++++++++++ - wocky/wocky-types.h | 1 + - 4 files changed, 253 insertions(+), 1 deletions(-) - -commit 86beae82d585b7aa9cfdbce7b9b905108f57760a -Author: Jonny Lamb -Date: Mon Aug 31 15:53:11 2009 +0100 - - codegen: only touch wocky-signals-marshal.list if it's actually changed - - Previously, if you edit any file in $(HANDWRITTEN_SOURCES), then - wocky-signals-marshal.list would be recreated, meaning - wocky-signals-marshal.{c,h} would also be recreated, meaning half of - wocky would be rebuilt. This is not cool. - - Signed-off-by: Jonny Lamb - - wocky/Makefile.am | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 99bfadba1b0c35afffb58c7191e5a053c46e56de -Author: Guillaume Desmottes -Date: Fri Aug 28 17:30:08 2009 +0100 - - contact-factory: fire signal when contacts are added - - tests/wocky-contact-factory-test.c | 30 ++++++++++++++++++++++++++++++ - wocky/wocky-contact-factory.c | 20 ++++++++++++++++++-- - 2 files changed, 48 insertions(+), 2 deletions(-) - -commit 3d7e98a1731ef40cc316b448dacff2a296ac8104 -Author: Guillaume Desmottes -Date: Fri Aug 28 16:10:54 2009 +0100 - - Create the contact factory in the porter instead of the roster - - The factory should probably be created in a top-level object (as - WockySession or something) but for now the Porter is the best candidate - as it's used by most components. - - wocky/wocky-porter.c | 20 +++++++++++++++++++- - wocky/wocky-roster.c | 11 +++++++---- - 2 files changed, 26 insertions(+), 5 deletions(-) - -commit ec18c467014369b5fd358a67f26db1a42e73c8a8 -Author: Guillaume Desmottes -Date: Fri Aug 28 12:23:05 2009 +0100 - - wocky-docs.sgml: add WockyResourceContact and WockyContactFactory - - docs/reference/wocky-docs.sgml | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 22d14329604378c093b7baa00d9674b903b7511d -Author: Guillaume Desmottes -Date: Fri Aug 28 12:22:44 2009 +0100 - - add missing symbols to wocky-sections.txt - - docs/reference/wocky-sections.txt | 39 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 39 insertions(+), 0 deletions(-) - -commit 4a59204d21a0a69dc23bffa9c37eabd5c44bc9b5 -Author: Guillaume Desmottes -Date: Fri Aug 28 12:01:53 2009 +0100 - - run wocky-connector-test last as it takes the age of the universe to run - - tests/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit c7f37782d54100a90e64c84b076bff4756e18e98 -Author: Guillaume Desmottes -Date: Fri Aug 28 12:00:00 2009 +0100 - - don't assert if both contacts are NULL in equal functions - - wocky/wocky-bare-contact.c | 2 -- - wocky/wocky-resource-contact.c | 2 -- - 2 files changed, 0 insertions(+), 4 deletions(-) - -commit 2648e92b077a9222328b8178cf3f7b8148f3d198 -Author: Guillaume Desmottes -Date: Fri Aug 28 11:57:59 2009 +0100 - - merge resource_contact_disposed_cb and bare_contact_disposed_cb together - - wocky/wocky-contact-factory.c | 33 +++++++++++++-------------------- - 1 files changed, 13 insertions(+), 20 deletions(-) - -commit bdb453ee77012ab9d3a8c527f6e405cf3bb7d30b -Author: Guillaume Desmottes -Date: Thu Aug 27 17:41:23 2009 +0100 - - wocky_contact_factory_ensure_resource_contact: associate the new resource with the bare contact - - tests/wocky-contact-factory-test.c | 14 +++++++++++--- - wocky/wocky-contact-factory.c | 2 ++ - 2 files changed, 13 insertions(+), 3 deletions(-) - -commit 4915edf114c4e6d59e939c55dcf5b9035c946814 -Author: Guillaume Desmottes -Date: Thu Aug 27 17:33:16 2009 +0100 - - test wocky_bare_contact_get_resources and wocky_bare_contact_add_resource - - tests/wocky-bare-contact-test.c | 44 +++++++++++++++++++++++++++++++++++++++ - 1 files changed, 44 insertions(+), 0 deletions(-) - -commit 46dad8e0d967afbe42dd08442bb8ea509a4e7a7c -Author: Guillaume Desmottes -Date: Thu Aug 27 17:32:59 2009 +0100 - - bare-contact: keep a list of the WockyResourceContact associated with this bare contact - - wocky/wocky-bare-contact.c | 45 ++++++++++++++++++++++++++++++++++++++++++- - wocky/wocky-bare-contact.h | 7 ++++++ - 2 files changed, 50 insertions(+), 2 deletions(-) - -commit 86391664f8e35c4e8235117502ba288c57e15f48 -Author: Guillaume Desmottes -Date: Thu Aug 27 17:07:07 2009 +0100 - - test wocky_contact_factory_lookup_resource_contact - - tests/wocky-contact-factory-test.c | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) - -commit 0652d1d15bb58efa924c016942d8980b798aca6e -Author: Guillaume Desmottes -Date: Thu Aug 27 17:06:57 2009 +0100 - - add wocky_contact_factory_lookup_resource_contact - - wocky/wocky-contact-factory.c | 9 +++++++++ - wocky/wocky-contact-factory.h | 4 ++++ - 2 files changed, 13 insertions(+), 0 deletions(-) - -commit 514ba77365eca0b98d1502a233414c927092a2f6 -Author: Guillaume Desmottes -Date: Thu Aug 27 16:49:28 2009 +0100 - - roster: use the contact factory to create bare contacts - - wocky/wocky-bare-contact.c | 4 ++-- - wocky/wocky-roster.c | 16 ++++++++++++---- - 2 files changed, 14 insertions(+), 6 deletions(-) - -commit bd32e4b5890bfb89348daccd563c908f9b60c5d1 -Author: Guillaume Desmottes -Date: Thu Aug 27 16:17:50 2009 +0100 - - test wocky_contact_factory_ensure_resource_contact - - tests/wocky-contact-factory-test.c | 34 ++++++++++++++++++++++++++++++++++ - 1 files changed, 34 insertions(+), 0 deletions(-) - -commit 0bb46b877364cea6ca8536e397c35cd18b31f42c -Author: Guillaume Desmottes -Date: Thu Aug 27 16:17:08 2009 +0100 - - test wocky_resource_contact_equal - - tests/wocky-resource-contact-test.c | 29 +++++++++++++++++++++++++++++ - 1 files changed, 29 insertions(+), 0 deletions(-) - -commit 290d7c19352ec88d113be42772107894343db48f -Author: Guillaume Desmottes -Date: Thu Aug 27 16:15:42 2009 +0100 - - add wocky_resource_contact_equal - - wocky/wocky-resource-contact.c | 17 +++++++++++++++++ - wocky/wocky-resource-contact.h | 3 +++ - 2 files changed, 20 insertions(+), 0 deletions(-) - -commit cf4f136dfd09d9dcab342483d07633b260da7913 -Author: Guillaume Desmottes -Date: Thu Aug 27 15:55:39 2009 +0100 - - add wocky_contact_factory_ensure_resource_contact - - wocky/wocky-contact-factory.c | 55 +++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-contact-factory.h | 5 +++ - 2 files changed, 60 insertions(+), 0 deletions(-) - -commit a6da9047512845872e0ad7a041ab93245c79975c -Author: Guillaume Desmottes -Date: Thu Aug 27 15:30:38 2009 +0100 - - fix wocky_contact_factory_lookup_bare_contact style - - wocky/wocky-contact-factory.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 27a673970917f4fd9814be8a9bfb6a5cfb26cff6 -Author: Guillaume Desmottes -Date: Thu Aug 27 13:11:53 2009 +0100 - - test wocky_contact_factory_lookup_bare_contact - - tests/wocky-contact-factory-test.c | 28 ++++++++++++++++++++++++++++ - 1 files changed, 28 insertions(+), 0 deletions(-) - -commit 7b32de66252ed864860ee86653d2238c002ff962 -Author: Guillaume Desmottes -Date: Thu Aug 27 13:11:45 2009 +0100 - - add wocky_contact_factory_lookup_bare_contact - - wocky/wocky-contact-factory.c | 10 ++++++++++ - wocky/wocky-contact-factory.h | 4 ++++ - 2 files changed, 14 insertions(+), 0 deletions(-) - -commit 085c06d29ae59e05515b285eeaea160fcf17a9c2 -Author: Guillaume Desmottes -Date: Thu Aug 27 13:05:56 2009 +0100 - - contact-factory: keep a weak ref on bare contact objects - - That way they are removed from the factory as soon other components - stopped to use them. - - wocky/wocky-contact-factory.c | 34 ++++++++++++++++++++++++++++++---- - 1 files changed, 30 insertions(+), 4 deletions(-) - -commit 103b34419f9cdf09478dec1eb3f9b16b8cbe9a3b -Author: Guillaume Desmottes -Date: Thu Aug 27 12:39:33 2009 +0100 - - test wocky_contact_factory_ensure_bare_contact - - tests/wocky-contact-factory-test.c | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+), 0 deletions(-) - -commit 7ab7e8ba3db05e74f4e92cb25d7b223e007bf313 -Author: Guillaume Desmottes -Date: Thu Aug 27 12:38:37 2009 +0100 - - add wocky_contact_factory_ensure_bare_contact - - wocky/wocky-contact-factory.c | 19 +++++++++++++++++++ - wocky/wocky-contact-factory.h | 6 +++++- - 2 files changed, 24 insertions(+), 1 deletions(-) - -commit bef77130d6a6eea1ee94dbefc1cb777642bf19a4 -Author: Guillaume Desmottes -Date: Thu Aug 27 11:59:10 2009 +0100 - - add wocky_bare_contact_new - - tests/wocky-bare-contact-test.c | 6 +++++- - wocky/wocky-bare-contact.c | 8 ++++++++ - wocky/wocky-bare-contact.h | 2 ++ - 3 files changed, 15 insertions(+), 1 deletions(-) - -commit 70e7ef61ac52cbf9d235cc63911e4485296e93d4 -Author: Guillaume Desmottes -Date: Thu Aug 27 11:43:53 2009 +0100 - - add wocky-contact-factory-test.c - - .gitignore | 1 + - tests/Makefile.am | 9 ++++++++- - tests/wocky-contact-factory-test.c | 34 ++++++++++++++++++++++++++++++++++ - 3 files changed, 43 insertions(+), 1 deletions(-) - -commit 678a68e813cc43267b286c9224e09fc2f22a1e27 -Author: Guillaume Desmottes -Date: Thu Aug 27 11:24:12 2009 +0100 - - add wocky-contact-factory.[ch] - - wocky/Makefile.am | 4 +- - wocky/wocky-contact-factory.c | 167 +++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-contact-factory.h | 63 +++++++++++++++ - 3 files changed, 233 insertions(+), 1 deletions(-) - -commit 16df0d82689c0d916c1657ca987a7265eddf7eb8 -Author: Guillaume Desmottes -Date: Thu Aug 27 13:24:05 2009 +0100 - - add and test wocky_resource_contact_get_bare_contact - - tests/wocky-resource-contact-test.c | 20 ++++++++++++++++++++ - wocky/wocky-resource-contact.c | 8 ++++++++ - wocky/wocky-resource-contact.h | 3 +++ - 3 files changed, 31 insertions(+), 0 deletions(-) - -commit 0e35b89efafb1f8f7c9cac4110fd348bfcafa285 -Author: Guillaume Desmottes -Date: Thu Aug 27 13:21:19 2009 +0100 - - add and test wocky_resource_contact_get_resource - - tests/wocky-resource-contact-test.c | 20 ++++++++++++++++++++ - wocky/wocky-resource-contact.c | 8 ++++++++ - wocky/wocky-resource-contact.h | 3 +++ - 3 files changed, 31 insertions(+), 0 deletions(-) - -commit 0fed93aa2df5d8c514b2108023351892b7ee875d -Author: Guillaume Desmottes -Date: Thu Aug 27 11:00:44 2009 +0100 - - add wocky-resource-contact-test.c - - .gitignore | 1 + - tests/Makefile.am | 9 +++++- - tests/wocky-resource-contact-test.c | 52 +++++++++++++++++++++++++++++++++++ - 3 files changed, 61 insertions(+), 1 deletions(-) - -commit 7b873034f33f7828ab5bec0bdadefab26b6d2ff8 -Author: Guillaume Desmottes -Date: Thu Aug 27 10:59:52 2009 +0100 - - add wocky-resource-contact.[ch] - - wocky/Makefile.am | 2 + - wocky/wocky-resource-contact.c | 219 ++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-resource-contact.h | 66 ++++++++++++ - wocky/wocky-types.h | 1 + - 4 files changed, 288 insertions(+), 0 deletions(-) - -commit 53d9184bc0a332a02c7c1c47ee697d9da67c1a89 -Author: Guillaume Desmottes -Date: Wed Aug 26 14:37:39 2009 +0100 - - wocky-bare-contact: wrap some big lines - - wocky/wocky-bare-contact.c | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 63cafe6e56b1369fd38f6048e08e5fb40771b3de -Author: Guillaume Desmottes -Date: Wed Aug 26 14:21:05 2009 +0100 - - add missing WokcyRoster methods to wocky-sections.txt - - docs/reference/wocky-sections.txt | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -commit f0f0b39ccf729203d5eebbefd09601334825e1f6 -Author: Guillaume Desmottes -Date: Wed Aug 26 14:13:36 2009 +0100 - - add wocky-contact symbols to wocky-sections.txt - - docs/reference/wocky-sections.txt | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) - -commit 642c27dcd500fd1887568b8a47e3523daa79c078 -Author: Guillaume Desmottes -Date: Wed Aug 26 14:09:40 2009 +0100 - - fix WockyBareContact doc and add missing symbols - - docs/reference/wocky-docs.sgml | 1 + - docs/reference/wocky-sections.txt | 39 +++++++++++++++++++++--------------- - 2 files changed, 24 insertions(+), 16 deletions(-) - -commit a0fa9d9ebe90d5644c6c1b7adc1de6e0e75d5432 -Author: Guillaume Desmottes -Date: Wed Aug 26 13:56:54 2009 +0100 - - wocky-bare-contact-test: test instantiation - - tests/wocky-bare-contact-test.c | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit 7cc87a65bf4ebcf177f738d5d514db08482f321c -Author: Guillaume Desmottes -Date: Wed Aug 26 13:53:17 2009 +0100 - - WockyBareContact is now a subclass of WockyContact - - wocky/wocky-bare-contact.c | 2 +- - wocky/wocky-bare-contact.h | 5 +++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - -commit ffa7dac943af0bba37420f1d4df1d23f80daa734 -Author: Guillaume Desmottes -Date: Wed Aug 26 12:47:32 2009 +0100 - - add WockyContact which will be used as a base class for all contact objects - - wocky/Makefile.am | 2 + - wocky/wocky-contact.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-contact.h | 60 +++++++++++++++++++ - wocky/wocky-types.h | 1 + - 4 files changed, 221 insertions(+), 0 deletions(-) - -commit 7b9bff7159e5fdb9b7e8e7032d9d8073a03c05df -Author: Guillaume Desmottes -Date: Wed Aug 26 12:46:51 2009 +0100 - - wocky-bare-contact: fix doc section - - wocky/wocky-bare-contact.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit c2cadffcb73b9869cd3439ba3fd7bcd63675f5ad -Author: Guillaume Desmottes -Date: Wed Aug 26 12:35:18 2009 +0100 - - rename WockyContact to WockyBareContact - - tests/wocky-bare-contact-test.c | 138 +++++++++++++------------- - tests/wocky-roster-test.c | 160 ++++++++++++++-------------- - wocky/wocky-bare-contact.c | 216 +++++++++++++++++++------------------- - wocky/wocky-bare-contact.h | 76 +++++++------- - wocky/wocky-roster.c | 86 ++++++++-------- - wocky/wocky-roster.h | 10 +- - wocky/wocky-types.h | 2 +- - 7 files changed, 344 insertions(+), 344 deletions(-) - -commit 803cd9cc6bc424871f949b7d11a83a832967ef06 -Author: Guillaume Desmottes -Date: Wed Aug 26 12:28:54 2009 +0100 - - rename wocky-contact-test.c to wocky-bare-contact-test.c - - .gitignore | 2 +- - tests/Makefile.am | 8 +- - tests/wocky-bare-contact-test.c | 317 +++++++++++++++++++++++++++++++++++++++ - tests/wocky-contact-test.c | 317 --------------------------------------- - 4 files changed, 322 insertions(+), 322 deletions(-) - -commit 5659b40c747817bcdf841ea1d6e208da6382758b -Author: Guillaume Desmottes -Date: Wed Aug 26 12:26:06 2009 +0100 - - rename wocky-contact.[ch] to wocky-bare-contact.[ch] - - tests/wocky-contact-test.c | 2 +- - tests/wocky-roster-test.c | 2 +- - wocky/Makefile.am | 4 +- - wocky/wocky-bare-contact.c | 618 ++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-bare-contact.h | 93 +++++++ - wocky/wocky-contact.c | 618 -------------------------------------------- - wocky/wocky-contact.h | 93 ------- - wocky/wocky-roster.c | 2 +- - 8 files changed, 716 insertions(+), 716 deletions(-) - -commit 9a5e32f52df7712faef82edf929d14f6b1db0c9a -Merge: 69ec13a f72e909 -Author: Guillaume Desmottes -Date: Fri Aug 28 11:03:18 2009 +0100 - - Merge branch 'roster+edit+flying' - -commit f72e9099378fca8821869e6c406e090f7394f5d7 -Author: Guillaume Desmottes -Date: Fri Aug 28 10:32:52 2009 +0100 - - test_roster_add_contact: call add_contact with an existing contact but different details - - tests/wocky-roster-test.c | 33 +++++++++++++++++++++++++++++++-- - 1 files changed, 31 insertions(+), 2 deletions(-) - -commit 30f1a723266c6555369c8c8d48eb7f4e982c25e5 -Author: Guillaume Desmottes -Date: Fri Aug 28 10:31:24 2009 +0100 - - wocky_roster_add_contact_async: replace current details if needed - - When we have an add contact and the contact is already on the roster, - we should check the details are the same, and if they are not, update - the contact, _replacing_ the current details (name, group) with - those from the add call. - - wocky/wocky-roster.c | 29 ++++++++++++++++++----------- - 1 files changed, 18 insertions(+), 11 deletions(-) - -commit 475c9104cf7a9d875141d25a205f4f1293f51f32 -Author: Guillaume Desmottes -Date: Fri Aug 28 10:15:48 2009 +0100 - - roster: fix a typo - - wocky/wocky-roster.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d368de837f1acdf4087f776cf52cee95c95d0b62 -Author: Guillaume Desmottes -Date: Fri Aug 28 10:14:36 2009 +0100 - - test_contact_copy: fix a comment - - tests/wocky-contact-test.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d77e579856adc2f30bb7410613a4b4ca8f7720a6 -Author: Guillaume Desmottes -Date: Thu Aug 27 17:54:02 2009 +0100 - - change_roster_iq_cb: remove FIXME about upgrade stanza and explain the rational - - wocky/wocky-roster.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 69ec13a5764686c3eb1e42a5c5c10f661ea3ede3 -Author: Vivek Dasmohapatra -Date: Thu Aug 27 14:56:16 2009 +0100 - - Add missing gtk-doc markup, note when args can be NULL to ignore. - - wocky/wocky-connector.c | 32 ++++++++++++++++---------------- - 1 files changed, 16 insertions(+), 16 deletions(-) - -commit b079d8b3c45ab865a52864becb11bdac830ee3cd -Author: Vivek Dasmohapatra -Date: Thu Aug 27 13:21:52 2009 +0100 - - Add missing connector entry in sgml file. - - docs/reference/wocky-docs.sgml | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 8296dc56b00369e4fbe30fa64b2ea8f3ca34c47e -Author: Vivek Dasmohapatra -Date: Thu Aug 27 13:13:37 2009 +0100 - - Returns markup needs to be last in a function doc. - - wocky/wocky-connector.c | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) - -commit 07a6ff240df931f1d3af5319e1e8eb59c580f3c1 -Author: Vivek Dasmohapatra -Date: Wed Aug 26 18:05:47 2009 +0100 - - Documentation fixes and gtk-doc-bug workarounds. - Documented remaining WockyConnectorError enum values - Names of args in header file must match names in doc string: C file signatures are ignored for this: Make header file names match C file arg names to avoid confusion and make gtk-doc shut up. - Code flow diagram should be treated as a code example by gtk-doc. - - wocky/wocky-connector.c | 4 ++++ - wocky/wocky-connector.h | 44 ++++++++++++++++++++++++++++++++++---------- - 2 files changed, 38 insertions(+), 10 deletions(-) - -commit d2b1dc9ae9139877f6aa93dd4470bd76c075fbe7 -Author: Vivek Dasmohapatra -Date: Wed Aug 26 17:59:52 2009 +0100 - - Minor doc whitespace, typo and content fixes. - - wocky/wocky-connector.c | 29 ++++++++++++++++------------- - 1 files changed, 16 insertions(+), 13 deletions(-) - -commit f1662d06e093a94eb5bf3aab2f8e7320f649536b -Author: Vivek Dasmohapatra -Date: Wed Aug 26 16:12:44 2009 +0100 - - Docs added for wocky-connector.c - - wocky/wocky-connector.c | 193 +++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 188 insertions(+), 5 deletions(-) - -commit aa19dda9e0a91139c3042828d1cd096a62ca2bff -Author: Guillaume Desmottes -Date: Wed Aug 26 15:07:07 2009 +0100 - - wocky-xmpp-connection: add missing arg in the doc of some functions - - wocky/wocky-xmpp-connection.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 84eba0b981557f364e4b9718fbcfa808b9ca2406 -Author: Guillaume Desmottes -Date: Wed Aug 26 15:00:04 2009 +0100 - - fix wocky_decode_jid doc - - wocky/wocky-utils.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 3e5c7bc73425720b4ecee04bdb7c1c08e97fad4a -Author: Guillaume Desmottes -Date: Wed Aug 26 14:50:47 2009 +0100 - - fix WockyRosterError doc - - wocky/wocky-roster.h | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 213032b24421c9ab2244a44ba7e4977f48a8c572 -Author: Guillaume Desmottes -Date: Wed Aug 26 14:55:04 2009 +0100 - - fix wocky_tls_session_server_new doc - - wocky/wocky-tls.c | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit c524818f6f93b1b0fb5ec85553e4e8c6c4c8a7e4 -Author: Guillaume Desmottes -Date: Wed Aug 26 14:51:43 2009 +0100 - - fix wocky_xmpp_node_unpack_error doc - - wocky/wocky-xmpp-node.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit 027daab444c52cdb8c4c6deedbebc8c9166ee2b7 -Author: Guillaume Desmottes -Date: Wed Aug 26 14:28:49 2009 +0100 - - add Class to wocky-sections.txt - - docs/reference/wocky-sections.txt | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit efa42b0a4e2505307dfa88a2219e57c83da89cac -Author: Guillaume Desmottes -Date: Wed Aug 19 14:38:51 2009 +0100 - - wocky-roster-test: add test_add_contact_twice - - tests/wocky-roster-test.c | 65 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 65 insertions(+), 0 deletions(-) - -commit 612e04824c25069688878e68f47d71ff94d7f2b5 -Author: Guillaume Desmottes -Date: Wed Aug 19 14:23:07 2009 +0100 - - roster_update: print added contact in debug info - - wocky/wocky-roster.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 9c61c83e61785959687e804ec97d0716c6f060a1 -Author: Guillaume Desmottes -Date: Wed Aug 19 14:22:47 2009 +0100 - - add wocky_contact_debug_print - - wocky/wocky-contact.c | 14 ++++++++++++++ - wocky/wocky-contact.h | 2 ++ - 2 files changed, 16 insertions(+), 0 deletions(-) - -commit fe3f868bb5acedc676e7fa770e04867f906872f7 -Author: Guillaume Desmottes -Date: Wed Aug 19 14:19:29 2009 +0100 - - make wocky_roster_subscription_to_string public. That can be useful for debugging print - - wocky/wocky-roster.c | 6 +++--- - wocky/wocky-roster.h | 4 ++++ - 2 files changed, 7 insertions(+), 3 deletions(-) - -commit 9ab532ddb545a6454c1ec51fe2f04063da4c796f -Author: Guillaume Desmottes -Date: Wed Aug 19 14:14:11 2009 +0100 - - wocky-roster-test: add test_remove_two_groups - - tests/wocky-roster-test.c | 85 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 85 insertions(+), 0 deletions(-) - -commit f0018d788796cae5c0ec386f7af2ab7e55950ce5 -Author: Guillaume Desmottes -Date: Wed Aug 19 12:47:10 2009 +0100 - - wocky-roster-test: add test_add_two_groups - - tests/wocky-roster-test.c | 87 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 87 insertions(+), 0 deletions(-) - -commit 513f7188aabe1ba440cda3f968d94ab886847ce4 -Author: Guillaume Desmottes -Date: Wed Aug 19 12:28:57 2009 +0100 - - factor out pending_operation_has_changes - - wocky/wocky-roster.c | 27 ++++++++++++++++++++++----- - 1 files changed, 22 insertions(+), 5 deletions(-) - -commit 817e9ad57283dcbe656c9249f6b2400972e6ce6b -Author: Guillaume Desmottes -Date: Wed Aug 19 12:06:25 2009 +0100 - - wocky-roster-test: add test_change_name_remove_add - - tests/wocky-roster-test.c | 79 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 79 insertions(+), 0 deletions(-) - -commit ebe66f894d4c92ad89bc10ef4ba0d6c2c128c809 -Author: Guillaume Desmottes -Date: Wed Aug 19 11:48:04 2009 +0100 - - wocky-roster-test: add test_remove_contact_twice - - tests/wocky-roster-test.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 68 insertions(+), 0 deletions(-) - -commit 275fe5abe2faa5e0fe070fc026738c5cb34e0616 -Author: Guillaume Desmottes -Date: Wed Aug 19 11:47:34 2009 +0100 - - build_iq_for_pending: if there is no contact, check first if we want to remove it - - wocky/wocky-roster.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit b62f77a4ea3eb402b55ed162f4e95d013b022c89 -Author: Guillaume Desmottes -Date: Wed Aug 19 11:33:36 2009 +0100 - - wocky-roster-test: add test_change_name_twice - - tests/wocky-roster-test.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 70 insertions(+), 0 deletions(-) - -commit 025d7d82bad9a1ff580270f1be8d6081615ec746 -Author: Guillaume Desmottes -Date: Tue Aug 18 18:56:20 2009 +0100 - - wocky-roster-test: add test_edit_contact_remove - - tests/wocky-roster-test.c | 83 ++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 82 insertions(+), 1 deletions(-) - -commit d8628e8b1cd47349eb670dbebf94b5606e70b22f -Author: Guillaume Desmottes -Date: Tue Aug 18 18:55:59 2009 +0100 - - wocky_roster_remove_contact_async: queue operation if another one is flying - - wocky/wocky-roster.c | 71 ++++++++++++++++++++++++++++++++++++++----------- - 1 files changed, 55 insertions(+), 16 deletions(-) - -commit 51632617b791c9c4daf6e65edc2b19965bf8414a -Author: Guillaume Desmottes -Date: Tue Aug 18 16:07:53 2009 +0100 - - test_multi_contact_edit: try to re-add a group we just removed - - tests/wocky-roster-test.c | 24 ++++++++++++++++++------ - 1 files changed, 18 insertions(+), 6 deletions(-) - -commit 2128425835d244bdbb4bb35b5aecdbcec465f118 -Author: Guillaume Desmottes -Date: Tue Aug 18 16:07:37 2009 +0100 - - pending_operation_add_group: remove group from groups_to_remove if needed - - wocky/wocky-roster.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit a2bfdca62f52b860ae44627b2dcdaf16fa14bc8e -Author: Guillaume Desmottes -Date: Tue Aug 18 16:01:30 2009 +0100 - - test_multi_contact_edit: use Juliet instead of Romeo as example - - She has 2 groups so allow us to test more stuffs - - tests/wocky-roster-test.c | 32 ++++++++++++++++---------------- - 1 files changed, 16 insertions(+), 16 deletions(-) - -commit ecfcfb3c912be2c0e28d1868870dab427e6af1a9 -Author: Guillaume Desmottes -Date: Tue Aug 18 15:55:00 2009 +0100 - - test_multi_contact_edit: remove a group we just added - - tests/wocky-roster-test.c | 12 +++++++++--- - 1 files changed, 9 insertions(+), 3 deletions(-) - -commit 11df25b03403979b4a628d8ba8f0667baeab7132 -Author: Guillaume Desmottes -Date: Tue Aug 18 15:51:28 2009 +0100 - - wocky_roster_contact_remove_group_async: queue operation if another one is flying - - wocky/wocky-roster.c | 19 +++++++++++++++---- - 1 files changed, 15 insertions(+), 4 deletions(-) - -commit 213986f24589a3392de19a25fef2e1751e22ffed -Author: Guillaume Desmottes -Date: Tue Aug 18 14:23:13 2009 +0100 - - wocky-roster-test: add test_multi_contact_edit - - tests/wocky-roster-test.c | 99 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 99 insertions(+), 0 deletions(-) - -commit a6026abaebfd850ebdc6a6446fd2b66daa57291e -Author: Guillaume Desmottes -Date: Tue Aug 18 15:41:24 2009 +0100 - - wocky_roster_contact_add_group_async: queue operation if another one is flying - - wocky/wocky-roster.c | 18 ++++++++++++++---- - 1 files changed, 14 insertions(+), 4 deletions(-) - -commit 37dc05e30aa4f0a0e96f2b7c55879d886d423737 -Author: Guillaume Desmottes -Date: Tue Aug 18 15:22:47 2009 +0100 - - use hash tables to store groups_to_add and groups_to_remove - - wocky/wocky-roster.c | 50 +++++++++++++++++++++++++++++++------------------- - 1 files changed, 31 insertions(+), 19 deletions(-) - -commit 2e274f18860854781215976d52192f49dbd0e148 -Author: Guillaume Desmottes -Date: Tue Aug 18 14:18:02 2009 +0100 - - wocky-roster-test: factor out check_edit_roster_stanza - - tests/wocky-roster-test.c | 58 ++++++++++++++++++++++++-------------------- - 1 files changed, 32 insertions(+), 26 deletions(-) - -commit fe22244e7c306cb482dab17ec56619aca4cb9a18 -Author: Guillaume Desmottes -Date: Tue Aug 18 13:25:15 2009 +0100 - - wocky-roster-test: add test_remove_contact_edit - - tests/wocky-roster-test.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 70 insertions(+), 0 deletions(-) - -commit ded5f82bd7761b97cc91d9175f3216695f627bfb -Author: Guillaume Desmottes -Date: Tue Aug 18 13:24:58 2009 +0100 - - wocky_roster_change_contact_name_async: queue operation if another one is flying - - wocky/wocky-roster.c | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit 7682ff097d5d720412d3beb54300864a4cc18aab -Author: Guillaume Desmottes -Date: Tue Aug 18 13:24:20 2009 +0100 - - implement waiting_operations_completed - - wocky/wocky-roster.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -commit 4b962cb33bd77b5bc9a27899fcd8ff4b5d8189a7 -Author: Guillaume Desmottes -Date: Tue Aug 18 13:23:53 2009 +0100 - - build_iq_for_pending: set WOCKY_ROSTER_ERROR_NOT_IN_ROSTER if contact is not roster anymore and there is no add action pending - - wocky/wocky-roster.c | 13 ++++++++++++- - 1 files changed, 12 insertions(+), 1 deletions(-) - -commit 00884eb5679df8f46a9f7dca0974bb7c7f4477f6 -Author: Guillaume Desmottes -Date: Tue Aug 18 10:57:59 2009 +0100 - - add test_remove_contact_re_add - - tests/wocky-roster-test.c | 103 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 103 insertions(+), 0 deletions(-) - -commit ad29eac246b9c4dc2b0b26fcef81b2b72d8cb546 -Author: Guillaume Desmottes -Date: Tue Aug 18 10:57:28 2009 +0100 - - start to implement flying requests support - - wocky/wocky-roster.c | 422 ++++++++++++++++++++++++++++++++++++++++++++------ - 1 files changed, 375 insertions(+), 47 deletions(-) - -commit 21299f70699e597119ea48394d05bb40866b90ad -Author: Guillaume Desmottes -Date: Mon Aug 17 18:28:28 2009 +0100 - - wocky-roster-test: factor out check_add_contact_stanza - - tests/wocky-roster-test.c | 49 +++++++++++++++++++++++++++----------------- - 1 files changed, 30 insertions(+), 19 deletions(-) - -commit a2a5d2752142c773a7b277cb9cffcd6c4b72a8d3 -Author: Guillaume Desmottes -Date: Mon Aug 17 18:11:07 2009 +0100 - - wocky-roster-test: factor out check_remove_contact_stanza - - tests/wocky-roster-test.c | 25 +++++++++++++++++-------- - 1 files changed, 17 insertions(+), 8 deletions(-) - -commit 301fb4bb31cba1ce5f2013878109736edd6fe8d0 -Author: Guillaume Desmottes -Date: Mon Aug 17 18:03:16 2009 +0100 - - wocky-roster-test: factor out ack_iq - - tests/wocky-roster-test.c | 90 ++++++++++++-------------------------------- - 1 files changed, 25 insertions(+), 65 deletions(-) - -commit 0c00e45ab0033b8153631778637ac3e9e63fa0c1 -Author: Guillaume Desmottes -Date: Mon Aug 17 17:04:47 2009 +0100 - - test wocky_contact_copy - - tests/wocky-contact-test.c | 55 ++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 55 insertions(+), 0 deletions(-) - -commit 87ea543caf3779e810c64d5d2ef37cbcf65edd1a -Author: Guillaume Desmottes -Date: Mon Aug 17 17:02:23 2009 +0100 - - add wocky_contact_copy - - wocky/wocky-contact.c | 11 +++++++++++ - wocky/wocky-contact.h | 2 ++ - 2 files changed, 13 insertions(+), 0 deletions(-) - -commit f9cf534a227831fa76dacdb46b088ef7d3d0db4d -Author: Guillaume Desmottes -Date: Mon Aug 17 12:23:19 2009 +0100 - - wocky-roster-test: add comments for each section of tests - - tests/wocky-roster-test.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 7a095da184600d39dde570ce5dcffbac6166da50 -Author: Guillaume Desmottes -Date: Fri Aug 14 17:50:50 2009 +0100 - - pass jid, name and groups to wocky_roster_add_contact_async instead of a WockyContact object - - WockyContact will be renamed to WockyRosterContact at some point and - user shouldn't have to create one just to add a contact to the roster. - - tests/wocky-roster-test.c | 9 +++++---- - wocky/wocky-roster.c | 25 ++++++++++++++++++------- - wocky/wocky-roster.h | 4 +++- - 3 files changed, 26 insertions(+), 12 deletions(-) - -commit 15cab9324466a7cbff0f9bf07f3ad61daee00ed3 -Author: Guillaume Desmottes -Date: Fri Aug 14 15:41:30 2009 +0100 - - test_roster_remove_contact: try to remove twice the same contact - - tests/wocky-roster-test.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit 60601de354886a4a0762d801145189f6688554de -Author: Guillaume Desmottes -Date: Fri Aug 14 15:41:14 2009 +0100 - - wocky_roster_remove_contact_async: don't raise an error if contact is not in roster - - wocky/wocky-roster.c | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) - -commit 5bffa35f8194c7d2645c2cfe219c7a1dff7a47c1 -Author: Guillaume Desmottes -Date: Fri Aug 14 15:31:41 2009 +0100 - - test_roster_add_contact: try to add twice the same contact - - tests/wocky-roster-test.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit cb0b24ba21ff4963e16f6a7da061c9ec64870d59 -Author: Guillaume Desmottes -Date: Fri Aug 14 15:31:24 2009 +0100 - - wocky_roster_add_contact_async: don't raise an error if contact is already in the roster - - wocky/wocky-roster.c | 13 +++++++------ - wocky/wocky-roster.h | 1 - - 2 files changed, 7 insertions(+), 7 deletions(-) - -commit 7b64e80e2c66ae9610f12444d32eb48fcf43ca70 -Author: Guillaume Desmottes -Date: Fri Aug 14 15:25:51 2009 +0100 - - wocky_roster_add_contact_async: contacts are garanteed to have a jid - - wocky/wocky-roster.c | 8 +------- - wocky/wocky-roster.h | 1 - - 2 files changed, 1 insertions(+), 8 deletions(-) - -commit 8fe120e8ded8415c81583b063640ed94c2cb5a98 -Author: Guillaume Desmottes -Date: Fri Aug 14 15:23:59 2009 +0100 - - wocky_contact_constructed: assert that a jid has been defined - - It doesn't make sense to create a contact without a jid - - wocky/wocky-contact.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 67a93b68a4c224b8d16c13a0fe6ec541cd93d992 -Author: Guillaume Desmottes -Date: Fri Aug 14 12:40:26 2009 +0100 - - wocky-contact-test: test_remove_group: test with a contact having no group defined - - tests/wocky-contact-test.c | 14 +++++++++++++- - 1 files changed, 13 insertions(+), 1 deletions(-) - -commit 3c3690615b1227bfd5b8b8cf9cfac1417905d138 -Author: Guillaume Desmottes -Date: Fri Aug 14 12:39:58 2009 +0100 - - wocky-contact-test: test with a contact having no group defined - - tests/wocky-contact-test.c | 12 +++++++++++- - 1 files changed, 11 insertions(+), 1 deletions(-) - -commit 275e8125a16c5f973d3f089a17cfc41a2a9eed4c -Author: Guillaume Desmottes -Date: Fri Aug 14 12:32:24 2009 +0100 - - wocky-contact-test: test_add_group: test with a contact having no group defined - - tests/wocky-contact-test.c | 24 +++++++++++++++++++++++- - 1 files changed, 23 insertions(+), 1 deletions(-) - -commit 8e33b30b7678c9280a6a90bc484a9b619875ec13 -Author: Guillaume Desmottes -Date: Fri Aug 14 16:05:56 2009 +0100 - - wocky-roster-test: test wocky_roster_contact_remove_group_async - - tests/wocky-roster-test.c | 148 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 148 insertions(+), 0 deletions(-) - -commit e10d996b2b32014bf2899e3375e95fc8d64e0f64 -Author: Guillaume Desmottes -Date: Fri Aug 14 12:05:23 2009 +0100 - - add wocky_roster_contact_remove_group_async - - wocky/wocky-roster.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-roster.h | 11 +++++++ - 2 files changed, 88 insertions(+), 0 deletions(-) - -commit 873f687f88876f78d0adb6a5f48f386f23e82d9c -Author: Guillaume Desmottes -Date: Fri Aug 14 11:45:05 2009 +0100 - - wocky-contact-test: test wocky_contact_remove_group - - tests/wocky-contact-test.c | 37 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 37 insertions(+), 0 deletions(-) - -commit e95e242ccb9431bf8226ef08e93f7f6c4ad548e7 -Author: Guillaume Desmottes -Date: Fri Aug 14 11:44:26 2009 +0100 - - add wocky_contact_remove_group - - wocky/wocky-contact.c | 30 ++++++++++++++++++++++++++++++ - wocky/wocky-contact.h | 3 +++ - 2 files changed, 33 insertions(+), 0 deletions(-) - -commit aa712d91f9a5fb0e6b2fc1afbd11c0f7e960770d -Author: Guillaume Desmottes -Date: Fri Aug 14 16:06:37 2009 +0100 - - wocky-roster-test: test wocky_roster_contact_add_group_async - - tests/wocky-roster-test.c | 162 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 162 insertions(+), 0 deletions(-) - -commit 2dd8b3d97507535ec469c0dc1f327d3d232f0099 -Author: Guillaume Desmottes -Date: Fri Aug 14 11:32:09 2009 +0100 - - add wocky_roster_contact_add_group_async - - wocky/wocky-roster.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-roster.h | 11 ++++++++ - 2 files changed, 74 insertions(+), 0 deletions(-) - -commit 1752e147afde625fc6c701a2cc84c1ff991f0ac2 -Author: Guillaume Desmottes -Date: Fri Aug 14 11:29:33 2009 +0100 - - wocky-contact-test: test wocky_contact_in_group - - tests/wocky-contact-test.c | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+), 0 deletions(-) - -commit a96e072994339344181fb2193574ad13649be1b6 -Author: Guillaume Desmottes -Date: Fri Aug 14 11:29:16 2009 +0100 - - add wocky_contact_in_group - - wocky/wocky-contact.c | 19 +++++++++++++++++++ - wocky/wocky-contact.h | 3 +++ - 2 files changed, 22 insertions(+), 0 deletions(-) - -commit 0d37ced42ef8da8e18c28403a3b18addceb9962f -Author: Guillaume Desmottes -Date: Fri Aug 14 11:09:57 2009 +0100 - - wocky-contact-test: test wocky_contact_add_group - - tests/wocky-contact-test.c | 37 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 37 insertions(+), 0 deletions(-) - -commit c393cc0f62299f1cab865dfb05657c50c6ebf84b -Author: Guillaume Desmottes -Date: Fri Aug 14 11:09:35 2009 +0100 - - add wocky_contact_add_group - - wocky/wocky-contact.c | 40 ++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-contact.h | 3 +++ - 2 files changed, 43 insertions(+), 0 deletions(-) - -commit fd1f44cf1355f8a2af12780c2d4cdaddef1c99aa -Author: Guillaume Desmottes -Date: Fri Aug 14 16:07:21 2009 +0100 - - wocky-roster-test: add test_roster_change_name - - tests/wocky-roster-test.c | 149 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 149 insertions(+), 0 deletions(-) - -commit a1261a0950fd12b180d3291f179e033e4b4f4117 -Author: Guillaume Desmottes -Date: Thu Aug 13 17:43:59 2009 +0100 - - add wocky_roster_change_contact_name_async - - wocky/wocky-roster.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-roster.h | 11 +++++++++ - 2 files changed, 72 insertions(+), 0 deletions(-) - -commit d2621a79329c1545c1f2e3f2cb572175d479a06c -Author: Guillaume Desmottes -Date: Thu Aug 13 17:43:34 2009 +0100 - - build_iq_for_contact: include subscription - - wocky/wocky-roster.c | 27 +++++++++++++++++++++++++++ - 1 files changed, 27 insertions(+), 0 deletions(-) - -commit 21c6363251fa1ad57096b477e6974003cec6dd00 -Author: Guillaume Desmottes -Date: Thu Aug 13 17:40:24 2009 +0100 - - wocky-roster-test: ensure that the 'add contact' request doesn't have a subscription attribute - - tests/wocky-roster-test.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit b608e6957f20f3a4f4126fb885f3178bf1ddf57a -Author: Guillaume Desmottes -Date: Thu Aug 13 17:17:02 2009 +0100 - - roster: merge roster_add_contact_cb and roster_remove_contact_cb to change_roster_iq_cb - - There is no point to have 2 different callbacks containing exactly the - same code. Merge them in a single callback. - - wocky/wocky-roster.c | 36 ++++++++---------------------------- - 1 files changed, 8 insertions(+), 28 deletions(-) - -commit 1e2124fe8e3c5a7e8fbc1c20d06fc047512f45d9 -Author: Guillaume Desmottes -Date: Thu Aug 13 17:04:10 2009 +0100 - - factor out build_iq_for_contact - - wocky/wocky-roster.c | 72 ++++++++++++++++++++++++++++++++------------------ - 1 files changed, 46 insertions(+), 26 deletions(-) - -commit b566e746aed0937a17f2813029850a80a7e81244 -Author: Guillaume Desmottes -Date: Thu Aug 13 16:46:23 2009 +0100 - - fix typo in code - - wocky/wocky-roster.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c45f5a884028df38851a234021228bf21ca5076f -Author: Guillaume Desmottes -Date: Thu Aug 13 15:40:20 2009 +0100 - - wocky-roster-test: add test_roster_remove_contact - - tests/wocky-roster-test.c | 105 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 105 insertions(+), 0 deletions(-) - -commit b292d3f827aca059def10203820141fdf5cb62bb -Author: Guillaume Desmottes -Date: Thu Aug 13 15:39:38 2009 +0100 - - add wocky_roster_remove_contact_async - - wocky/wocky-roster.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-roster.h | 11 ++++++ - 2 files changed, 95 insertions(+), 0 deletions(-) - -commit 047055d94343f212a1241178cec58066c0646b32 -Author: Guillaume Desmottes -Date: Thu Aug 13 15:38:23 2009 +0100 - - roster: factor out change_roster_operation_complete - - wocky/wocky-roster.c | 23 ++++++++++++++++------- - 1 files changed, 16 insertions(+), 7 deletions(-) - -commit 72ab4a40163dc836c84743e41396bc465046cc73 -Author: Guillaume Desmottes -Date: Wed Aug 12 12:40:47 2009 +0100 - - wocky-roster-test: add test_roster_add_contact - - tests/wocky-roster-test.c | 134 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 134 insertions(+), 0 deletions(-) - -commit e3ca343bacd5d3d49a56d7b3aa82ca9cdc0fe37f -Author: Guillaume Desmottes -Date: Wed Aug 12 12:39:48 2009 +0100 - - add wocky_roster_add_contact_async - - wocky/wocky-roster.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-roster.h | 12 +++++ - 2 files changed, 135 insertions(+), 0 deletions(-) - -commit 24f57602a015802dc426dd6371912c088bffee63 -Author: Guillaume Desmottes -Date: Tue Aug 25 15:19:48 2009 +0100 - - s/SURPRESSIONS/SUPPRESSIONS - - tests/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 24dd62085abd4c2a2d897f2925e87b2abd089ccc -Author: Guillaume Desmottes -Date: Fri Aug 21 13:58:10 2009 +0100 - - Ship generated certificats and keys - - There is no real point to generate them on each machine and that confuse - distcheck. - - tests/Makefile.am | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit 17af558c331cee49550590e61871d0115d4d3e88 -Author: Guillaume Desmottes -Date: Fri Aug 21 13:53:30 2009 +0100 - - add test-report.xml and sasl-test.db to CLEANFILES - - tests/Makefile.am | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit b2fd687cc698d7e2a6b6a1b67986d055e32f8d6b -Author: Guillaume Desmottes -Date: Fri Aug 21 14:01:10 2009 +0100 - - tests/Makefile.am: keys and certs are actually in top_srcdir - - tests/Makefile.am | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 1cbaad1503cac313dcae262fa089e4f48bbff528 -Author: Guillaume Desmottes -Date: Fri Aug 21 13:52:51 2009 +0100 - - define DISTCHECK_CONFIGURE_FLAGS as distcheck has to build with --enable-gtk-doc - - Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 909e2d097ce5e672cb7a485f5d90d527b3f90eab -Author: Guillaume Desmottes -Date: Fri Aug 21 12:19:54 2009 +0100 - - tests/Makefile.am: add WOCKY_CFLAGS to AM_CFLAGS - - This allow to build examples when running distcheck. - - tests/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 92d8ae8bcc3ca80dee96b5db7d1795af984959a6 -Author: Guillaume Desmottes -Date: Fri Aug 21 12:19:17 2009 +0100 - - examples/Makefile.am: add WOCKY_CFLAGS to AM_CFLAGS - - This allow to build examples when running distcheck. - - examples/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 2a8edcd50f8548e02e5382bb66459df35ca4c41d -Author: Guillaume Desmottes -Date: Fri Aug 21 12:19:01 2009 +0100 - - configure.ac: define WOCKY_CFLAGS which will be used to build tests and examples - - configure.ac | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit f4464e4b0f3deb0e5b8f26a046d7eb9fefa84076 -Author: Guillaume Desmottes -Date: Fri Aug 21 12:10:06 2009 +0100 - - include wocky-xmpp-reader.h: include "wocky-xmpp-stanza.h" instead of - - This is what other header files do and make distcheck happier. - - wocky/wocky-xmpp-reader.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9fb456482fc5869d1fc3233ae4e344780188b069 -Author: Guillaume Desmottes -Date: Fri Aug 21 11:58:29 2009 +0100 - - add certs/ca-cert.cfg and certs/tls-cert.cfg to EXTRA_DIST - - tests/Makefile.am | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 9736949f6c51260bd5a30d365acce6cbed07ea92 -Author: Guillaume Desmottes -Date: Fri Aug 21 10:59:42 2009 +0100 - - add wocky-types.h to wocky/Makefile.am - - wocky/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 39fe8324a21e88fb1bff31c079f13264b37f5b05 -Author: Guillaume Desmottes -Date: Fri Aug 21 10:58:30 2009 +0100 - - remove tabs - - wocky/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 73e60fbcecca2db717379d653c15af0c7375a6db -Author: Guillaume Desmottes -Date: Thu Aug 20 12:40:56 2009 +0100 - - add wocky.types to gitignore as we generate it now - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 2110a2b2e2ab09d3746c8a5e57f5fac1287c1bf3 -Author: Guillaume Desmottes -Date: Thu Aug 20 12:39:48 2009 +0100 - - add wocky-overrides.txt - - This file can be used to manually override scanned declarations. - - 0 files changed, 0 insertions(+), 0 deletions(-) - -commit 847bd927bda1ab2b00c50f11bf382c9a166c6908 -Author: Guillaume Desmottes -Date: Thu Aug 20 12:39:06 2009 +0100 - - add generated wocky-sections.txt - - This file is supposed to be generated once and then manually edited. - - docs/reference/wocky-sections.txt | 375 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 375 insertions(+), 0 deletions(-) - -commit 87ee84c6126e73578219b8a8451dfc90da644a0c -Author: Guillaume Desmottes -Date: Thu Aug 20 12:37:14 2009 +0100 - - tweak wocky-docs.sgml a bit - - - Remove releaseinfo section, doc is not uploaded anywhere atm - - Set main chapter's title to "API Reference" - - Remove Glossary - - docs/reference/wocky-docs.sgml | 13 ++++--------- - 1 files changed, 4 insertions(+), 9 deletions(-) - -commit 0b330f21ad19a3ef89c481cd4061515f2c996078 -Author: Guillaume Desmottes -Date: Thu Aug 20 12:33:15 2009 +0100 - - add generated wocky-docs.sgml - - This file is supposed to be generated once and then manually edited. - - docs/reference/wocky-docs.sgml | 49 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 49 insertions(+), 0 deletions(-) - -commit 31c7a20ff0c37c3304462d01422c4bedab2e37ba -Merge: bfe67ce 51742b0 -Author: Guillaume Desmottes -Date: Tue Aug 25 13:06:07 2009 +0100 - - Merge branch 'tls-handshake-async' - - Conflicts: - configure.ac - -commit bfe67ce54111082c5c60f66dffe2654ad79181cf -Author: Guillaume Desmottes -Date: Thu Aug 20 15:44:32 2009 +0100 - - depend on gio 2.21.x as we use gnio - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 868cb53ce2895b4eb674fb6318fb76663920ab52 -Author: Guillaume Desmottes -Date: Thu Aug 20 12:19:52 2009 +0100 - - remove wocky.types from git as it's now generated when building doc - - docs/reference/wocky.types | 11 ----------- - 1 files changed, 0 insertions(+), 11 deletions(-) - -commit 8035a9fe05321eaad4f104a349e5ee90bf08a3ae -Author: Guillaume Desmottes -Date: Thu Aug 20 12:19:16 2009 +0100 - - docs/reference/Makefile.am: pass magic option to SCAN_OPTIONS to generate the types file - - docs/reference/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit aa757890431d07d93e848d902a50c96bf845df2b -Author: Guillaume Desmottes -Date: Thu Aug 20 11:40:25 2009 +0100 - - add generated doc files to gitignore - - .gitignore | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) - -commit 51742b08e3b58ad9e563a138f6e545762ad87d57 -Author: Guillaume Desmottes -Date: Wed Aug 19 18:35:48 2009 +0100 - - wocky-tls: document WOCKY_TLS_DEBUG_LEVEL - - wocky/wocky-tls.c | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -commit 4e991acf6e66e7033211989a48457cd2fdd54316 -Author: Guillaume Desmottes -Date: Wed Aug 19 15:31:40 2009 +0100 - - re-implement error_to_string using gnutls_strerror_name - - wocky/wocky-tls.c | 117 ++--------------------------------------------------- - 1 files changed, 4 insertions(+), 113 deletions(-) - -commit d81e3e2465b83bba927febed814684dd6d208e9b -Author: Guillaume Desmottes -Date: Wed Aug 19 15:08:10 2009 +0100 - - style fixes - - wocky/wocky-tls.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit f8a20b929d45cbbcce568d42113416c536c596a5 -Author: Guillaume Desmottes -Date: Wed Aug 19 15:00:00 2009 +0100 - - wocky-tls: DON'T SHOUT IN DEBUG MESSAGES - - wocky/wocky-tls.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit aa74587f0022690b318fdb06def841cd91d534b4 -Author: Vivek Dasmohapatra -Date: Mon Aug 17 18:44:05 2009 +0100 - - gnutls async handshake bug was actually fixed in 2.8.2 - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b3cc7012ddc5ba141c01b3db279c558b3b328004 -Author: Vivek Dasmohapatra -Date: Mon Aug 17 16:19:02 2009 +0100 - - Whitespace fixes. - - wocky/wocky-connector.c | 2 +- - wocky/wocky-tls.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit dc7dd80b7e088014a8ed7fa6811cdd84ff65b339 -Author: Vivek Dasmohapatra -Date: Mon Aug 17 12:14:07 2009 +0100 - - Make old ssl connect async as well. - - wocky/wocky-connector.c | 18 ++---------------- - 1 files changed, 2 insertions(+), 16 deletions(-) - -commit e9e96b4d2761468615283e675d6a12400a314d2b -Author: Vivek Dasmohapatra -Date: Thu Aug 6 12:26:13 2009 +0100 - - DEBUG to let us see the endpoint of sync as well as async handshakes. - - wocky/wocky-tls.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit e704fcc7497bb2f04e90ba4517eae0281ea9d870 -Author: Vivek Dasmohapatra -Date: Thu Aug 6 12:22:25 2009 +0100 - - Adapt starttls_handshake_cb so that it can be the endpoint of both - old-style SSL and new TLS encryption negotiation. - - wocky/wocky-connector.c | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -commit f1deece9af1930ca1b3ca9fbe554daf114c6ebcd -Author: Guillaume Desmottes -Date: Wed Aug 19 15:10:43 2009 +0100 - - wocky-connector: call wocky_tls_session_handshake_async with a high priority - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6ac2973ab54340318d05284b128fca4de8f7519a -Author: Guillaume Desmottes -Date: Wed Aug 19 15:10:07 2009 +0100 - - wocky-tls debugging via DEBUG - - wocky/wocky-connector.c | 2 +- - wocky/wocky-debug.c | 1 + - wocky/wocky-debug.h | 1 + - wocky/wocky-tls.c | 182 +++++++++++++++++++++++++++++++++++++++++++++-- - 4 files changed, 179 insertions(+), 7 deletions(-) - -commit 1bb89abf346c3da438005d17a32956fc6dac728d -Author: Vivek Dasmohapatra -Date: Wed Aug 5 12:02:31 2009 +0100 - - Make the TLS handshake use the async calls (possible deadlock found in tests). - - wocky/wocky-connector.c | 47 ++++++++++++++++++++++++++++++++--------------- - 1 files changed, 32 insertions(+), 15 deletions(-) - -commit dee4e5d56916f60b4ff047dd2dd7e4a05a19251c -Author: Guillaume Desmottes -Date: Wed Aug 19 14:14:56 2009 +0100 - - wocky-test-helper: increase timeout to 3 seconds - - 2 seconds isn't enough when valgriding some complex tests. - - tests/wocky-test-helper.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit cb691cbbdd05f738768ac04ded40d2ed8cf76a94 -Author: Guillaume Desmottes -Date: Wed Aug 19 18:45:53 2009 +0100 - - rebuild gtk-doc when source files are changed - - docs/reference/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 122bf6f738a52d57b275acf00ce51f9c052e1c1a -Author: Guillaume Desmottes -Date: Mon Aug 17 16:02:32 2009 +0100 - - wocky-contact-test: fix a typo - - tests/wocky-contact-test.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ca2ed687b63d8e7b702d36cbba91b8b632b2f171 -Author: Guillaume Desmottes -Date: Mon Aug 17 16:00:28 2009 +0100 - - wocky-roster-test: unref contacts returned by wocky_roster_get_all_contacts - - tests/wocky-roster-test.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 5682af540b6bcb86064a8b45285e28a0f25cb7cc -Author: Guillaume Desmottes -Date: Mon Aug 17 15:59:31 2009 +0100 - - wocky_roster_get_all_contacts ref the contacts - - Contacts could be unreffed by an async op while user still use the - GSList. - - wocky/wocky-roster.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9d4406fb86a8bc97478a6e41644fa193dc30f976 -Author: Guillaume Desmottes -Date: Fri Aug 14 17:18:52 2009 +0100 - - wocky_contact_set_subscription: fix type check ordering - - wocky/wocky-contact.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit bc39d1e285d025511a3a0aff7bdffdff4253ade5 -Author: Guillaume Desmottes -Date: Fri Aug 14 17:13:05 2009 +0100 - - wocky-contact-test: test_contact_equal: add regression test for buggy old group comparaison algorithm - - tests/wocky-contact-test.c | 19 ++++++++++++++++++- - 1 files changed, 18 insertions(+), 1 deletions(-) - -commit 70a08d897b2ca2e825e9995c6bd0620fd8198d5b -Author: Guillaume Desmottes -Date: Fri Aug 14 17:12:40 2009 +0100 - - wocky-contact: fix groups_equal - - wocky/wocky-contact.c | 57 ++++++++++++++++++++++++++++++------------------- - 1 files changed, 35 insertions(+), 22 deletions(-) - -commit c44ec1644338ebe3102867f02dc3d51c86c90e78 -Author: Guillaume Desmottes -Date: Fri Aug 14 16:13:05 2009 +0100 - - wocky_contact_set_name: fix type check ordering - - There is no point to check that the contact is actually a WockyContact - object *after* calling WOCKY_CONTACT_GET_PRIVATE. - - wocky/wocky-contact.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 29dd25c6120e05e02207df6c1b422c7652746b3a -Author: Guillaume Desmottes -Date: Fri Aug 14 12:31:48 2009 +0100 - - wocky-contect-test: test_contact_equal: test with a contact having not group defined - - tests/wocky-contact-test.c | 12 +++++++++++- - 1 files changed, 11 insertions(+), 1 deletions(-) - -commit 77c3cd8fbaddffec2dfb403d74f908971efa0cc2 -Author: Guillaume Desmottes -Date: Fri Aug 14 12:29:53 2009 +0100 - - wocky-contact: groups_equal: deal with groups being NULL - - wocky/wocky-contact.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 15dbdce5f095efadc584a5bbf9c56e7a0984e941 -Author: Guillaume Desmottes -Date: Wed Aug 12 12:43:28 2009 +0100 - - rename WOCKY_ROSTER_INVALID_STANZA to WOCKY_ROSTER_ERROR_INVALID_STANZA - - wocky/wocky-roster.c | 2 +- - wocky/wocky-roster.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit aca82a6c5db3ef600eceeaec8ac84027e006778e -Author: Guillaume Desmottes -Date: Wed Aug 12 11:44:29 2009 +0100 - - wocky-roster-test: factor out send_roster_update - - tests/wocky-roster-test.c | 149 +++++++++++++++++---------------------------- - 1 files changed, 56 insertions(+), 93 deletions(-) - -commit ae09b98ec9ff7a7f0617d4b22a07bffc74e6bd13 -Author: Guillaume Desmottes -Date: Tue Aug 11 16:48:26 2009 +0100 - - wocky-roster-test: add test_roster_upgrade_change - - tests/wocky-roster-test.c | 125 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 125 insertions(+), 0 deletions(-) - -commit 387f02a68ad659e8272834d9015dc0d347e9f055 -Author: Guillaume Desmottes -Date: Tue Aug 11 16:47:39 2009 +0100 - - wocky-contact: fire notify change when a property is changed - - wocky/wocky-contact.c | 22 +++++++++++++--------- - 1 files changed, 13 insertions(+), 9 deletions(-) - -commit c8446d78ac6ede0f0cea4e268f2e1ee77b03c916 -Author: Guillaume Desmottes -Date: Tue Aug 11 16:41:00 2009 +0100 - - wocky-contact: factor out groups_equal - - wocky/wocky-contact.c | 67 ++++++++++++++++++++++++++++++------------------- - 1 files changed, 41 insertions(+), 26 deletions(-) - -commit d30780ae4836830a730d88107c33eb040b42eeee -Author: Guillaume Desmottes -Date: Tue Aug 11 16:05:01 2009 +0100 - - Simplify wocky_contact_set_* setters - - They are supposed to be simple wocky-only setters, so they shouldn't - fail. - - wocky/wocky-contact.c | 43 ++++++++++++------------------------------- - wocky/wocky-contact.h | 10 ++++------ - wocky/wocky-roster.c | 7 +++---- - 3 files changed, 19 insertions(+), 41 deletions(-) - -commit 54fd7625c3e7d1effdb493b110ebb8b63ff03e47 -Author: Guillaume Desmottes -Date: Tue Aug 11 15:25:58 2009 +0100 - - wocky-roster-test: add test_roster_upgrade_remove - - tests/wocky-roster-test.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 64 insertions(+), 0 deletions(-) - -commit 91ced7648bbc8273463a05798e1c872a97651b32 -Author: Guillaume Desmottes -Date: Tue Aug 11 15:23:53 2009 +0100 - - roster: fire the 'removed' signal when a contact is removed from the roster - - wocky/wocky-roster.c | 42 +++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 41 insertions(+), 1 deletions(-) - -commit df074b890151ca1c9200df8a04f5c954cb4de55a -Author: Guillaume Desmottes -Date: Tue Aug 11 15:03:41 2009 +0100 - - roster_update: don't fire the added signal when fetching the roster - - wocky/wocky-roster.c | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit e0d0284048126aae2f3e696247ebb1b86a8e5cb6 -Author: Guillaume Desmottes -Date: Tue Aug 11 14:34:23 2009 +0100 - - wocky-roster-test: add test_roster_upgrade_add - - tests/wocky-roster-test.c | 119 +++++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 114 insertions(+), 5 deletions(-) - -commit 66dfe096026869dad4247443cc59b8dd9cae3b1b -Author: Guillaume Desmottes -Date: Tue Aug 11 14:33:47 2009 +0100 - - roster.c: fire 'added' signal when a contact is added - - wocky/wocky-roster.c | 11 +++++++++-- - 1 files changed, 9 insertions(+), 2 deletions(-) - -commit c9adc573007df14e2a9da72882c3e0dd9ba1ccfc -Author: Guillaume Desmottes -Date: Tue Aug 11 14:33:20 2009 +0100 - - roster_iq_handler_set_cb: ack the IQ - - wocky/wocky-roster.c | 11 +++++++++-- - 1 files changed, 9 insertions(+), 2 deletions(-) - -commit 9ffe3b8cbe7923cc3d40273170632f6b8108fb3d -Author: Guillaume Desmottes -Date: Tue Aug 11 13:19:39 2009 +0100 - - test wocky_roster_get_all_contacts - - tests/wocky-roster-test.c | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit 102310d622e5d34f3a3c95a524b2507e1414de32 -Author: Guillaume Desmottes -Date: Tue Aug 11 13:19:31 2009 +0100 - - add wocky_roster_get_all_contacts - - wocky/wocky-roster.c | 17 +++++++++++++++++ - wocky/wocky-roster.h | 2 ++ - 2 files changed, 19 insertions(+), 0 deletions(-) - -commit 7879703b3efd70e31689fcb41e370ffe8f350ac4 -Author: Guillaume Desmottes -Date: Tue Aug 11 11:57:11 2009 +0100 - - fetch_roster_reply_cb: test to send more than one contact - - tests/wocky-roster-test.c | 33 ++++++++++++++++++++++++++++++++- - 1 files changed, 32 insertions(+), 1 deletions(-) - -commit 26511487953c847f37adfe7ce245395b0b44e98f -Author: Guillaume Desmottes -Date: Tue Aug 11 11:54:33 2009 +0100 - - fetch_roster_reply_roster_cb: use wocky_contact_equal to check contact - - tests/wocky-roster-test.c | 28 ++++++++++++++++++---------- - 1 files changed, 18 insertions(+), 10 deletions(-) - -commit 18b4ae6dcda5ebab64de8bde4df58e9375678e57 -Author: Guillaume Desmottes -Date: Tue Aug 11 11:48:52 2009 +0100 - - add wocky-contact-test.c to test wocky_contact_equal - - .gitignore | 1 + - tests/Makefile.am | 9 ++++- - tests/wocky-contact-test.c | 95 ++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 104 insertions(+), 1 deletions(-) - -commit fed52b8d0021c293617a592d3a59966c75edf459 -Author: Guillaume Desmottes -Date: Tue Aug 11 11:48:21 2009 +0100 - - add wocky_contact_equal - - wocky/wocky-contact.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-contact.h | 3 ++ - 2 files changed, 62 insertions(+), 0 deletions(-) - -commit 5da9be52405a5ff215c1f660b57dfc3824fcc601 -Author: Guillaume Desmottes -Date: Tue Aug 11 10:51:51 2009 +0100 - - wocky-roster-test: test if the contact fetched is the right one - - tests/wocky-roster-test.c | 18 +++++++++++++++--- - 1 files changed, 15 insertions(+), 3 deletions(-) - -commit 82330ddba30e267eccf614fc0cb94115c764120a -Author: Guillaume Desmottes -Date: Tue Aug 11 10:51:04 2009 +0100 - - roster_update: fix parsing of groups - - wocky/wocky-roster.c | 32 +++++++++++++------------------- - 1 files changed, 13 insertions(+), 19 deletions(-) - -commit 0bf8a01eec2b93d4177e68be0b203287e2f12a09 -Author: Guillaume Desmottes -Date: Tue Aug 11 10:24:37 2009 +0100 - - add wocky_roster_get_contact - - wocky/wocky-roster.c | 9 +++++++++ - wocky/wocky-roster.h | 4 ++++ - 2 files changed, 13 insertions(+), 0 deletions(-) - -commit a953e9743647991653eab2d80340ffabdf9b630e -Author: Guillaume Desmottes -Date: Tue Aug 11 10:24:19 2009 +0100 - - move WockyContact definition to a newly created wocky-types.h to avoid circular includes - - wocky/wocky-contact.h | 2 +- - wocky/wocky-types.h | 31 +++++++++++++++++++++++++++++++ - 2 files changed, 32 insertions(+), 1 deletions(-) - -commit d68f0b29c5333fa89b54f5b9b31515bd85eaa221 -Author: Guillaume Desmottes -Date: Mon Aug 10 17:25:39 2009 +0100 - - roster_fetch_roster_cb: unref the IQ reply once we're done with it - - wocky/wocky-roster.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit b1b095eea2c31c6bffb10c696bb477d40c126070 -Author: Guillaume Desmottes -Date: Mon Aug 10 17:14:57 2009 +0100 - - test_fetch_roster_send_iq: call wocky_roster_fetch_roster_finish to free to memory used by the fetch call - - tests/wocky-roster-test.c | 43 +++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 41 insertions(+), 2 deletions(-) - -commit 8104c0654a11e26dccd96149eb7088c41aabf173 -Author: Guillaume Desmottes -Date: Mon Aug 10 17:14:36 2009 +0100 - - wocky-roster-test: unref the roster when tests are done - - tests/wocky-roster-test.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 30748490b45b002ca2746dd4ffceb2df998def61 -Author: Guillaume Desmottes -Date: Mon Aug 10 17:13:43 2009 +0100 - - wocky_contact_set_property: copy the groups array - - wocky/wocky-contact.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f7a69bb212a572e68e005726ba2b65049089bec4 -Author: Guillaume Desmottes -Date: Mon Aug 10 16:43:59 2009 +0100 - - wocky-roster-test.c: use test_init and test_deinit - - tests/wocky-roster-test.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit 9eaaaf74a922cbb008e79242b3c6096d645946d2 -Author: Guillaume Desmottes -Date: Mon Aug 10 16:42:54 2009 +0100 - - roster_update: use a temporary GPtrArray to store groups for easier memory management - - wocky/wocky-roster.c | 22 +++++++++++++--------- - 1 files changed, 13 insertions(+), 9 deletions(-) - -commit ef080800a739d969e324ef0bba1a48d472104319 -Author: Guillaume Desmottes -Date: Mon Aug 10 16:40:36 2009 +0100 - - wocky_roster_fetch_roster_async: don't leak the IQ - - wocky/wocky-roster.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit dd11d5db67a56c23284ce0f137f3849adad86e7f -Author: Guillaume Desmottes -Date: Mon Aug 10 16:24:36 2009 +0100 - - wocky-roster-test.c: add a small comment describing each test - - tests/wocky-roster-test.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 6c1088ffce48ce101fadaae6801057054dc03f08 -Author: Guillaume Desmottes -Date: Mon Aug 10 16:20:25 2009 +0100 - - wocky-roster: add some TODO/FIXME - - wocky/wocky-roster.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit e0ae09791c0c9aef1a702f744b3568cc0627b4e0 -Author: Guillaume Desmottes -Date: Mon Aug 10 16:18:31 2009 +0100 - - wocky_roster_fetch_roster_async: store the result as an object variable and raise an error if another operation is pending - - wocky/wocky-roster.c | 26 ++++++++++++++++++-------- - 1 files changed, 18 insertions(+), 8 deletions(-) - -commit 210319918ffb27538b3aa91729963b3ef23882d4 -Author: Guillaume Desmottes -Date: Mon Aug 10 16:01:06 2009 +0100 - - change WockyRosterSubscriptionType to WockyRosterSubscriptionFlags - - wocky/wocky-contact.c | 10 +++++----- - wocky/wocky-contact.h | 4 ++-- - wocky/wocky-roster.c | 2 +- - wocky/wocky-roster.h | 13 +++++++------ - 4 files changed, 15 insertions(+), 14 deletions(-) - -commit e13f16ee2d9fcd14ef6616289a2a742fd7e5beb1 -Author: Guillaume Desmottes -Date: Mon Aug 10 15:42:30 2009 +0100 - - use g_set_error_literal instead of g_error_new_literal - - wocky/wocky-roster.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9973bd9feed4cbb95803203dd8c268715effa59b -Author: Guillaume Desmottes -Date: Mon Aug 10 15:21:56 2009 +0100 - - wocky_roster_dispose: unregister the handler when disposing - - wocky/wocky-roster.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 9ff0b89bd2122f59bd5131c890e2fecbee020a40 -Author: Guillaume Desmottes -Date: Mon Aug 10 15:20:10 2009 +0100 - - wocky-roster: document the items hash table - - wocky/wocky-roster.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit a1732efd732b1fc31613ce5beab35680e818af6a -Author: Guillaume Desmottes -Date: Mon Aug 10 15:16:09 2009 +0100 - - No need to pass the WockyXmppConnection to the Roster object; the Porter is enough - - tests/wocky-roster-test.c | 6 +++--- - wocky/wocky-roster.c | 25 ++----------------------- - wocky/wocky-roster.h | 3 +-- - 3 files changed, 6 insertions(+), 28 deletions(-) - -commit c05e29dbdc0ec697ecf650bdbc9f1ff1d8bddeaf -Author: Jonny Lamb -Date: Tue Jul 14 16:32:57 2009 +0100 - - Add fetch-roster-reply test. - - Signed-off-by: Jonny Lamb - - tests/wocky-roster-test.c | 91 +++++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 87 insertions(+), 4 deletions(-) - -commit ee5dd26f5d0b700cad280dd3037f576c032c32e5 -Author: Jonny Lamb -Date: Sat Jul 11 19:28:56 2009 +0100 - - Set new information on an existing roster item on update. - - Signed-off-by: Jonny Lamb - - wocky/wocky-roster.c | 75 ++++++++++++++++++++++++++++--------------------- - 1 files changed, 43 insertions(+), 32 deletions(-) - -commit b801a14a8197b52dd7e1b6f18ffe669154665dc5 -Author: Jonny Lamb -Date: Sat Jul 11 19:27:13 2009 +0100 - - Implement several functions of WockyContact and document them. - - Signed-off-by: Jonny Lamb - - wocky/wocky-contact.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++++- - wocky/wocky-contact.h | 8 ++- - 2 files changed, 188 insertions(+), 6 deletions(-) - -commit 4f80c17ed6819b922339f4ebe6d511087891354b -Author: Jonny Lamb -Date: Sat Jul 11 18:49:52 2009 +0100 - - Implement partial roster stanza parsing and creating WockyContacts. - - Signed-off-by: Jonny Lamb - - wocky/wocky-roster.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 123 insertions(+), 8 deletions(-) - -commit 2bcac6bd59e90647752569b6819e8e2e3e4a4ca5 -Author: Jonny Lamb -Date: Sat Jul 11 18:47:42 2009 +0100 - - Free data held by WockyContact on finalize. - - Signed-off-by: Jonny Lamb - - wocky/wocky-contact.c | 11 +++++++++-- - 1 files changed, 9 insertions(+), 2 deletions(-) - -commit 556dd7f5fa2c4a41b7d0ac358f4cf4e82faaa55e -Author: Jonny Lamb -Date: Sat Jul 11 15:37:26 2009 +0100 - - Updated WockyContact to include some properties. - - Signed-off-by: Jonny Lamb - - wocky/wocky-contact.c | 109 ++++++++++++++++++++++++++++++++++++------------- - wocky/wocky-contact.h | 15 +++++-- - 2 files changed, 91 insertions(+), 33 deletions(-) - -commit 89e5c9af51f98e98a9eea7c06a5cf4e71aef15d7 -Author: Jonny Lamb -Date: Sat Jul 11 14:12:59 2009 +0100 - - Added WockyRosterSubscriptionType enum. - - Signed-off-by: Jonny Lamb - - wocky/wocky-roster.h | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 6cf6fb79510acd9428e3262922e1163d0bd36b06 -Author: Jonny Lamb -Date: Sat Jul 4 17:31:18 2009 +0100 - - Add roster error quark function. - - Signed-off-by: Jonny Lamb - - wocky/wocky-roster.c | 18 ++++++++++++++++++ - wocky/wocky-roster.h | 19 +++++++++++++++++++ - 2 files changed, 37 insertions(+), 0 deletions(-) - -commit d8d833bca6744719834b074193e41d70ecb5b039 -Author: Jonny Lamb -Date: Fri Jul 3 14:53:12 2009 +0100 - - Make the reply from roster fetch or set IQ call the same code. - - Signed-off-by: Jonny Lamb - - wocky/wocky-roster.c | 30 +++++++++++++++--------------- - 1 files changed, 15 insertions(+), 15 deletions(-) - -commit 7282e0a939947a23ba82c2e3e232c6aad1268c10 -Author: Jonny Lamb -Date: Fri Jul 3 14:37:50 2009 +0100 - - Make wocky_roster_fetch_roster an async function. - - Signed-off-by: Jonny Lamb - - tests/wocky-roster-test.c | 2 +- - wocky/wocky-roster.c | 39 +++++++++++++++++++++++++++++++++------ - wocky/wocky-roster.h | 7 ++++++- - 3 files changed, 40 insertions(+), 8 deletions(-) - -commit 511b139ef99e7f342007d6a42c9c0f0b0e25241c -Author: Jonny Lamb -Date: Fri Jul 3 12:47:13 2009 +0100 - - Only listen to set IQs in the roster. - - Signed-off-by: Jonny Lamb - - wocky/wocky-roster.c | 36 ++++++------------------------------ - 1 files changed, 6 insertions(+), 30 deletions(-) - -commit 59fb09db7ff67aa9d18b11ea5a5a59b14534118a -Author: Jonny Lamb -Date: Thu Jul 2 20:54:55 2009 +0100 - - Implement more of roster IQ stanza handler. - - Signed-off-by: Jonny Lamb - - wocky/wocky-roster.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 62 insertions(+), 0 deletions(-) - -commit 36fa7099d59eafe8ac755907c20d3ac171437e9f -Author: Jonny Lamb -Date: Thu Jul 2 19:32:38 2009 +0100 - - Add test for fetch-roster. - - Signed-off-by: Jonny Lamb - - tests/wocky-roster-test.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 56 insertions(+), 0 deletions(-) - -commit 292875acf870942e33373ee96bfc35485edffe77 -Author: Jonny Lamb -Date: Thu Jul 2 18:53:18 2009 +0100 - - test_initialisation: unref the porter after use. - - Signed-off-by: Jonny Lamb - - tests/wocky-roster-test.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit b5cf9e934faa7af8825eb317da18939a44a092b2 -Author: Jonny Lamb -Date: Thu Jul 2 18:51:27 2009 +0100 - - Keep references to the connection and porter in the roster. - - Signed-off-by: Jonny Lamb - - wocky/wocky-roster.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit cc123321ef6259f03ee6da25c9c5d7118cb4b009 -Author: Jonny Lamb -Date: Thu Jul 2 18:38:07 2009 +0100 - - from attribute is not needed when fetching roster. - - Signed-off-by: Jonny Lamb - - wocky/wocky-roster.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 3017de1df49b227248416778ab384cebc5d2331f -Author: Jonny Lamb -Date: Thu Jul 2 18:27:30 2009 +0100 - - Add back wocky_roster_fetch_roster function. - - Signed-off-by: Jonny Lamb - - wocky/wocky-roster.c | 71 +++++++++++++++++++++++++++++--------------------- - wocky/wocky-roster.h | 2 + - 2 files changed, 43 insertions(+), 30 deletions(-) - -commit 8857fd536b518a65adb419af8304d02bffe379e3 -Author: Jonny Lamb -Date: Thu Jul 2 18:22:30 2009 +0100 - - Use the porter to send the iq instead of the connection. - - Signed-off-by: Jonny Lamb - - wocky/wocky-roster.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit f7850d4ade0cc7dc413e423490f3565ef2ec0601 -Author: Jonny Lamb -Date: Thu Jul 2 17:23:09 2009 +0100 - - Add properties to roster GObject. - - Signed-off-by: Jonny Lamb - - wocky/wocky-roster.c | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) - -commit 140813d13cdd2cba63286efc5268926236803040 -Author: Jonny Lamb -Date: Thu Jul 2 17:22:17 2009 +0100 - - Add wocky-roster-test. - - Signed-off-by: Jonny Lamb - - .gitignore | 2 +- - tests/Makefile.am | 8 ++++++- - tests/wocky-roster-test.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 54 insertions(+), 2 deletions(-) - -commit 37c0160e97b8e0f76f756cc45166d3aeb3841b2e -Author: Jonny Lamb -Date: Thu Jul 2 16:35:42 2009 +0100 - - Move recv_items into constructed. - - Signed-off-by: Jonny Lamb - - wocky/wocky-roster.c | 67 +++++++++++++++++++++----------------------------- - wocky/wocky-roster.h | 2 - - 2 files changed, 28 insertions(+), 41 deletions(-) - -commit b0de5c42576571b75fc6c406e0cb9b54e833c7f4 -Author: Jonny Lamb -Date: Thu Jul 2 16:29:33 2009 +0100 - - Initial WockyRoster implementation. - - Signed-off-by: Jonny Lamb - - wocky/Makefile.am | 4 +- - wocky/wocky-roster.c | 248 ++++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-roster.h | 69 ++++++++++++++ - 3 files changed, 320 insertions(+), 1 deletions(-) - -commit c5c649f6c06178cd33c5404b0bed9603f6404a85 -Author: Jonny Lamb -Date: Thu Jul 2 14:49:58 2009 +0100 - - wocky-namespaces: Add jabber:iq:roster. - - Signed-off-by: Jonny Lamb - - wocky/wocky-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 966a248237c6c3e419201f0548746e2592ae26b0 -Author: Jonny Lamb -Date: Wed Jul 1 17:55:50 2009 +0100 - - Add barebones of WockyContact class. - - Signed-off-by: Jonny Lamb - - wocky/Makefile.am | 4 +- - wocky/wocky-contact.c | 184 +++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-contact.h | 72 +++++++++++++++++++ - wocky/wocky-debug.c | 1 + - wocky/wocky-debug.h | 1 + - 5 files changed, 261 insertions(+), 1 deletions(-) - -commit 3173cb6db6e21367e46fe0ee5af088360adadf54 -Author: Guillaume Desmottes -Date: Thu Aug 13 10:22:49 2009 +0100 - - stream_error_abort: ignore non stream errors - - wocky_xmpp_stanza_to_gerror is not limited to stream errors anymore. - Ignore the others error as this function is supposed to detect stream - errors only. - Code could be improved to gain use of the new functionnality of - wocky_xmpp_stanza_to_gerror, I added a FIXME about that. - - wocky/wocky-connector.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit ecb54ef69ced7750dc3b1eb0936adc909146b34a -Author: Guillaume Desmottes -Date: Wed Aug 12 17:10:23 2009 +0100 - - stream_error_to_gerror: use wocky_xmpp_stream_error_from_node - - wocky/wocky-xmpp-stanza.c | 51 +------------------------------------------- - 1 files changed, 2 insertions(+), 49 deletions(-) - -commit 9db920ee913f7871011eaf5928b6065bea9bd252 -Author: Guillaume Desmottes -Date: Wed Aug 12 17:09:59 2009 +0100 - - wocky-xmpp-error: add wocky_xmpp_stream_error_from_node - - wocky/wocky-xmpp-error.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-error.h | 2 + - 2 files changed, 56 insertions(+), 0 deletions(-) - -commit 6ef54efa1f0ca88b214269a80cbdab6ec71def49 -Author: Guillaume Desmottes -Date: Wed Aug 12 16:54:52 2009 +0100 - - move stream errors definition to wocky-xmpp-stanza.h - - tests/wocky-connector-test.c | 1 + - tests/wocky-porter-test.c | 1 + - wocky/wocky-connector.c | 1 + - wocky/wocky-xmpp-error.c | 18 ++++++++++++++++++ - wocky/wocky-xmpp-error.h | 37 +++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-stanza.c | 18 ------------------ - wocky/wocky-xmpp-stanza.h | 37 ------------------------------------- - 7 files changed, 58 insertions(+), 55 deletions(-) - -commit 889a445498ee8c96e545008d12d997f2227b2155 -Author: Guillaume Desmottes -Date: Wed Aug 12 16:51:12 2009 +0100 - - wocky-xmpp-error: fix style - - wocky/wocky-xmpp-error.c | 4 ++-- - wocky/wocky-xmpp-error.h | 3 ++- - 2 files changed, 4 insertions(+), 3 deletions(-) - -commit 2fa6f6f43ecd53b75bebda9f617e008015d7ec95 -Author: Guillaume Desmottes -Date: Wed Aug 12 16:47:18 2009 +0100 - - rename XMPP_ERROR_* to WOCKY_XMPP_ERROR_* - - tests/wocky-xmpp-stanza-test.c | 2 +- - wocky/wocky-xmpp-error.c | 31 +++++++++++---------- - wocky/wocky-xmpp-error.h | 58 ++++++++++++++++++++-------------------- - wocky/wocky-xmpp-stanza.c | 4 +- - 4 files changed, 48 insertions(+), 47 deletions(-) - -commit 28ee115f4d09d0f1d357dd45f039e21adb8086f2 -Author: Guillaume Desmottes -Date: Wed Aug 12 16:40:38 2009 +0100 - - wocky-xmpp-stanza-test: add test_xmpp_error_to_gerror - - Based on test_message_get_xmpp_error from Gibber tests suite. - - tests/wocky-xmpp-stanza-test.c | 29 +++++++++++++++++++++++++++++ - 1 files changed, 29 insertions(+), 0 deletions(-) - -commit b1d4161c28db9b4b7ea7d6a235299472616c6031 -Author: Guillaume Desmottes -Date: Wed Aug 12 16:37:13 2009 +0100 - - merge functionnality of wocky_message_get_xmpp_error to wocky_xmpp_stanza_to_gerror - - wocky/wocky-xmpp-error.c | 40 ---------------------------------------- - wocky/wocky-xmpp-error.h | 1 - - wocky/wocky-xmpp-stanza.c | 24 +++++++++++++++++++++++- - 3 files changed, 23 insertions(+), 42 deletions(-) - -commit b7a549aba4706f85c12ff1f0268ac56db3774a15 -Author: Guillaume Desmottes -Date: Wed Aug 12 16:22:37 2009 +0100 - - import wocky-xmpp-error.[ch] from Gibber - - wocky/Makefile.am | 2 + - wocky/wocky-xmpp-error.c | 481 ++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-error.h | 86 ++++++++ - 3 files changed, 569 insertions(+), 0 deletions(-) - -commit 1dacc6a83cc9930d0fe8b13e2d6816cd73c8f48b -Author: Guillaume Desmottes -Date: Wed Aug 12 15:15:52 2009 +0100 - - wocky-xmpp-stanza-test: improve test descriptions and rename test_to_gerror to test_stream_error_to_gerror - - tests/wocky-xmpp-stanza-test.c | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -commit 652da3fa35d72a9e8bfd5a5e4041b1cea59efa60 -Author: Guillaume Desmottes -Date: Wed Aug 12 15:11:19 2009 +0100 - - wocky_xmpp_stanza_to_gerror: factor out stream_error_to_gerror - - wocky/wocky-xmpp-stanza.c | 22 +++++++++++++++------- - 1 files changed, 15 insertions(+), 7 deletions(-) - -commit 2e43ec8790a7d542c0d9493583e04fb6c8ac6412 -Author: Vivek Dasmohapatra -Date: Thu Aug 13 13:25:15 2009 +0100 - - Convert attr ns prefix system to hash tables: add init/deinit functions. - Also added a comment explaining the auto-generation of prefixes. - - wocky/wocky-xmpp-node.c | 136 ++++++++++++++++++++++++++++++++++------------- - wocky/wocky-xmpp-node.h | 3 + - wocky/wocky.c | 3 + - 3 files changed, 105 insertions(+), 37 deletions(-) - -commit 6d7d0f0863154c2545f43369ebe4c2f7f0e8a906 -Author: Vivek Dasmohapatra -Date: Wed Aug 12 18:07:19 2009 +0100 - - g_slice_new0 instead of g_new0 in ns_prefix_new. - - wocky/wocky-xmpp-node.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4b67c1a0300f9ca71e15c26689b2e377f7d26be6 -Author: Vivek Dasmohapatra -Date: Wed Aug 12 18:06:44 2009 +0100 - - Missing function return type. - - tests/wocky-xmpp-node-test.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit bed46ad061870307443b2b9bcc452a7fcefcc79d -Author: Vivek Dasmohapatra -Date: Wed Aug 12 17:05:01 2009 +0100 - - Adapt tests to new API. - - tests/wocky-xmpp-node-test.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 808f44a807c1b1fe05d98a4adc5ac3453f1d10ff -Author: Vivek Dasmohapatra -Date: Wed Aug 12 17:04:51 2009 +0100 - - Split get_prefix functions into from_quark and from_urn versions. - Move common functionality into static helper functions to tidy up code. - Add comments describing what each stage does. - - wocky/wocky-xmpp-node.c | 87 ++++++++++++++++++++++++++++++++-------------- - wocky/wocky-xmpp-node.h | 6 ++-- - 2 files changed, 63 insertions(+), 30 deletions(-) - -commit e456e3cfef20403446bfce9838d3ace2e74b246a -Author: Vivek Dasmohapatra -Date: Wed Aug 12 15:22:46 2009 +0100 - - Whitespace cleanup. - - wocky/wocky-connector.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 3f863c7918ffc18e868329b6250a29504b6a87d0 -Author: Vivek Dasmohapatra -Date: Wed Aug 12 13:05:59 2009 +0100 - - Stray debugging #include removed. - - wocky/wocky-xmpp-node.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit bc93f3f07cc33165c7709a7a212e8bf835ffbbcb -Author: Vivek Dasmohapatra -Date: Wed Aug 12 13:05:40 2009 +0100 - - Improve test coverage of new namespaced attribute support. - - tests/wocky-xmpp-node-test.c | 53 ++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 51 insertions(+), 2 deletions(-) - -commit 3306f6f71dd534c8622e27e79eb33cff385dac49 -Author: Vivek Dasmohapatra -Date: Tue Aug 11 19:31:11 2009 +0100 - - Adjust the API so that attribute namespace prefixes are automatically assigned. - Users can override attribute namespace prefixes if they so desire, and there - is a built-in list of pre-assigned prefixes. - - tests/wocky-xmpp-node-test.c | 18 ++++-- - tests/wocky-xmpp-readwrite-test.c | 2 +- - wocky/wocky-sasl-auth.c | 2 +- - wocky/wocky-xmpp-node.c | 101 ++++++++++++++++++++++++++++++++++--- - wocky/wocky-xmpp-node.h | 10 +++- - wocky/wocky-xmpp-reader.c | 10 +++- - 6 files changed, 124 insertions(+), 19 deletions(-) - -commit a1cbb8be19ccd619cff7cd176b1c48f883f539aa -Author: Vivek Dasmohapatra -Date: Thu Jul 30 14:30:56 2009 +0100 - - Test namespaced attributes (creating, changing and readwrite tests) - - tests/wocky-xmpp-node-test.c | 102 +++++++++++++++++++++++++++++++++++++ - tests/wocky-xmpp-readwrite-test.c | 28 ++++++++++ - 2 files changed, 130 insertions(+), 0 deletions(-) - -commit 313ce82cdc630ce71a6ddc83c2e6935abf7150fb -Author: Vivek Dasmohapatra -Date: Thu Jul 30 12:35:04 2009 +0100 - - Make Google JID Domain Discovery always-on. - - tests/wocky-connector-test.c | 17 ----------------- - wocky/wocky-connector.c | 17 ----------------- - wocky/wocky-sasl-auth.c | 21 +++------------------ - 3 files changed, 3 insertions(+), 52 deletions(-) - -commit 0d24e00092482693993dad0e7923ff34eee928e7 -Author: Vivek Dasmohapatra -Date: Thu Jul 30 11:52:05 2009 +0100 - - Stray // comment removed. - - wocky/wocky-xmpp-node.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit b2fdf23244935e8ff426f67d7a64778e06b7f85a -Author: Vivek Dasmohapatra -Date: Wed Jul 29 19:37:59 2009 +0100 - - Test new google JID domain discovery quirk support. - - tests/wocky-connector-test.c | 42 +++++++++++++++++++++++++++++++++++ - tests/wocky-test-connector-server.h | 1 - - tests/wocky-test-sasl-auth-server.c | 24 ++++++++++++++++++++ - tests/wocky-test-sasl-auth-server.h | 2 + - 4 files changed, 68 insertions(+), 1 deletions(-) - -commit 74e93063095a99bd2b7946be0cb167ff4a1b928a -Author: Vivek Dasmohapatra -Date: Wed Jul 29 19:37:05 2009 +0100 - - Expose google-domain-discovery sasl feature through a wocky-connector property. - - wocky/wocky-connector.c | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) - -commit fed88a33ef1550e667164b78f9cf473075995504 -Author: Vivek Dasmohapatra -Date: Tue Jul 28 17:27:52 2009 +0100 - - Google JID domain-discovery extension, controlled by a property. - - wocky/wocky-namespaces.h | 3 +++ - wocky/wocky-sasl-auth.c | 22 +++++++++++++++++++++- - 2 files changed, 24 insertions(+), 1 deletions(-) - -commit d78e7101e154613c5904fdf1b20ed32fa57068f7 -Author: Vivek Dasmohapatra -Date: Tue Jul 28 17:04:37 2009 +0100 - - Fix (I think) namespaced attribute handling in wocky-xmpp-* - There was no way to specify the PREFIX in a - xmlns:PREFIX="URI" PREFIX:tag="value" - node attribute: the existing code just duplicated the tag. - - wocky/wocky-xmpp-node.c | 30 +++++++++++++++++++++--------- - wocky/wocky-xmpp-node.h | 6 +++--- - wocky/wocky-xmpp-reader.c | 8 +++++--- - wocky/wocky-xmpp-writer.c | 5 +++-- - 4 files changed, 32 insertions(+), 17 deletions(-) - -commit 3204163c0d770aedfcb222588aea868b45b43c97 -Author: Vivek Dasmohapatra -Date: Wed Aug 12 17:39:53 2009 +0100 - - Async result should have ...connect_finish as the finish func for XEP77_SIGNUP. - - wocky/wocky-connector.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 4aa07be0eb70d58ee265f4e0f197b98a07bbb448 -Merge: ba584a1 f5e4e4f -Author: Vivek Dasmohapatra -Date: Wed Aug 12 15:05:11 2009 +0100 - - Merge branch 'master' of git+ssh://git.collabora.co.uk/git/wocky - -commit ba584a1241063fb0e3a57de4b83a60611ad041eb -Author: Vivek Dasmohapatra -Date: Wed Aug 12 14:51:24 2009 +0100 - - Comment explaining WockyConnectorXEP77Op enum and usage in priv struct. - - wocky/wocky-connector.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 0cf7b439ce469df9218affc78e23ce6dc86aa3a9 -Author: Vivek Dasmohapatra -Date: Wed Aug 12 14:46:59 2009 +0100 - - Record the correct finish function in the async result when registering. - - wocky/wocky-connector.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit b27393f1892ae27e3c033aff6fc3ab31010d5f35 -Author: Vivek Dasmohapatra -Date: Wed Aug 12 14:35:22 2009 +0100 - - Amended XEP77/cancel comment. Will email standards list for clarification. - Code as written worka when cancelling an account on a real (ejabberd) server. - - wocky/wocky-connector.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit a2f855841e72f3d9ef389696e47ead6eff7cd97d -Author: Vivek Dasmohapatra -Date: Wed Aug 12 14:31:13 2009 +0100 - - Add DEBUG statements to track path through connector code. - - wocky/wocky-connector.c | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) - -commit 439157469da2b6bfe44fbaad722750f7e0e02002 -Author: Vivek Dasmohapatra -Date: Tue Aug 11 14:46:42 2009 +0100 - - Ignore individual example programmes explicitly (ie not with globbing) - - .gitignore | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 37bef919cf4e11bfc750ba1af6c6294a715b0182 -Author: Vivek Dasmohapatra -Date: Tue Aug 11 14:45:07 2009 +0100 - - Whitespace cleanup. - - wocky/wocky-namespaces.h | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit b56f2fad002cb673425694a45ccf3303f7c43bd8 -Author: Vivek Dasmohapatra -Date: Tue Aug 11 14:40:03 2009 +0100 - - Add prop set/get test for new property. - - tests/wocky-connector-test.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 7a174fe38e0f0b52c7d60defa8da556304f4b43d -Author: Vivek Dasmohapatra -Date: Tue Aug 11 14:39:44 2009 +0100 - - Eliminate mem leak in dummy resolver when the server has to abort for a test. - - tests/test-resolver.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 6ff06cff74afee70d9a5defc0e41ae4d6f86d371 -Author: Vivek Dasmohapatra -Date: Mon Aug 10 20:38:48 2009 +0100 - - XEP 0077 Registration/Cancellation tests. - - tests/wocky-connector-test.c | 353 +++++++++++++++++++++++++++++++++-- - tests/wocky-test-connector-server.c | 265 +++++++++++++++++++++++++- - tests/wocky-test-connector-server.h | 19 ++ - 3 files changed, 608 insertions(+), 29 deletions(-) - -commit c7645384313de5b6778a031c0d393d0bf2cc5ba6 -Author: Vivek Dasmohapatra -Date: Mon Aug 10 20:38:10 2009 +0100 - - Add some DEBUG (); renamed namespace constant according to existing pattern. - - wocky/wocky-connector.c | 18 +++++++++++++----- - wocky/wocky-namespaces.h | 2 +- - 2 files changed, 14 insertions(+), 6 deletions(-) - -commit 76f18c05ef5eb7532c10eb9414e0dfdf0e830588 -Author: Vivek Dasmohapatra -Date: Mon Aug 10 20:36:44 2009 +0100 - - Ignore the test-generated sasl DB file. - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 93046cc5bf62143763130623bb4f1f0cdbcecce0 -Author: Vivek Dasmohapatra -Date: Thu Aug 6 12:27:45 2009 +0100 - - Typo fixed, leaks in xep77_signup_send fixed (from cassidy). - - wocky/wocky-connector.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit b1b2bebf688d407cd942c06a6c739d389d51ef35 -Author: Vivek Dasmohapatra -Date: Wed Aug 5 16:56:04 2009 +0100 - - Make email a settable parameter in the connector instead of a mandatory param. - - examples/register.c | 5 +++-- - wocky/wocky-connector.c | 37 ++++++++++++++++++++++++++++++++----- - wocky/wocky-connector.h | 7 ++++++- - 3 files changed, 41 insertions(+), 8 deletions(-) - -commit b3a50f94445aaf504d45d04294aed7fbf2cbbbed -Author: Vivek Dasmohapatra -Date: Wed Aug 5 12:12:19 2009 +0100 - - Don't care about contents, presence or absence of "instructions" tag for now. - XEP0077 implies that the "instructions" tag must always be present in the reply - to the jabber:iq:register iq get request, but unless we are supporting - redirection-based registration (which we are not, at present) we don't care - about its presence: We only care about tags that are _not_ "instructions". - - wocky/wocky-connector.c | 8 -------- - 1 files changed, 0 insertions(+), 8 deletions(-) - -commit 4b473dfbeb39f96702db35148e3e473ba191a09b -Author: Vivek Dasmohapatra -Date: Tue Aug 4 19:07:27 2009 +0100 - - Ignore the example binaries for vcs purposes. - - .gitignore | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c51cc014131ccf6018debbf4fe42c23b466f1d2b -Author: Vivek Dasmohapatra -Date: Tue Aug 4 19:05:51 2009 +0100 - - Example registration and unregistration binaries. - - examples/Makefile.am | 15 ++++++++- - examples/register.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++ - examples/unregister.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 170 insertions(+), 1 deletions(-) - -commit 6ab62ee512532ff31bc387bed87a1a6c5744be3d -Author: Vivek Dasmohapatra -Date: Tue Aug 4 19:05:26 2009 +0100 - - Implement XEP0077 In-Band Registration/Cancellation - - wocky/wocky-connector.c | 583 +++++++++++++++++++++++++++++++++++++++++++++- - wocky/wocky-connector.h | 22 ++ - wocky/wocky-namespaces.h | 5 + - 3 files changed, 598 insertions(+), 12 deletions(-) - -commit f5e4e4f4ace88a66e56fae13dd2993c15fd77275 -Author: Guillaume Desmottes -Date: Wed Jul 22 12:06:06 2009 +0100 - - test wocky_xmpp_node_append_content_n - - tests/wocky-xmpp-node-test.c | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+), 0 deletions(-) - -commit d8d3beaa745297ea45e24708138c4235bca89ba2 -Author: Jonny Lamb -Date: Tue Jul 14 14:15:37 2009 +0100 - - The "from" attribute is also not required for a reply IQ to be built. - - Signed-off-by: Jonny Lamb - - wocky/wocky-xmpp-stanza.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 0c320e2d6fa1106276fdbc4394156ef686d889b0 -Author: Guillaume Desmottes -Date: Wed Aug 5 17:27:05 2009 +0100 - - add test_close_force_after_close_sent - - tests/wocky-porter-test.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 56 insertions(+), 0 deletions(-) - -commit 9f39944bc339634d36c6695c730113bdeed43d35 -Author: Guillaume Desmottes -Date: Wed Aug 5 17:23:53 2009 +0100 - - wocky_porter_force_close_async: check if the receive_cancellable is NULL before raising the CLOSED error - - local_closed could have been set to TRUE because our close stanza has - been set but we were still waiting for the close from the peer. In such - case, we shouldn't raise an error and allow user to call force_close. - - wocky/wocky-porter.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2a35a4062da27417b4bf22d640d6621eee4d6b90 -Author: Guillaume Desmottes -Date: Wed Jul 29 12:27:30 2009 +0100 - - test_close_force: test that the closing signal is not fired more than once - - tests/wocky-porter-test.c | 17 ++++++++++++++++- - 1 files changed, 16 insertions(+), 1 deletions(-) - -commit 87cfff5986e1329eca880a637e1c19f8e55a5fe3 -Author: Guillaume Desmottes -Date: Wed Jul 29 12:27:13 2009 +0100 - - wocky_porter_force_close_async: don't fire the closing signal twice - - wocky/wocky-porter.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit e43eb2ab2fbadfeca5adeb3c172b0412e7344f30 -Author: Guillaume Desmottes -Date: Wed Jul 29 12:22:15 2009 +0100 - - porter: use WOCKY_PORTER_ERROR_CLOSING when completing a close operation because of a forced close - - tests/wocky-porter-test.c | 2 +- - wocky/wocky-porter.c | 2 +- - wocky/wocky-porter.h | 1 + - 3 files changed, 3 insertions(+), 2 deletions(-) - -commit dc1d27b9c2e7394f3b74d31941ae54acf4be09f6 -Author: Guillaume Desmottes -Date: Wed Jul 29 12:18:44 2009 +0100 - - wocky_porter_force_close_async: set the right error domain when raising G_IO_ERROR_PENDING - - wocky/wocky-porter.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b2a8ae6c49a37eb317d0639b5608d030e125db5b -Author: Vivek Dasmohapatra -Date: Tue Aug 4 15:14:21 2009 +0100 - - Default xmpp-port property value should be 0, not 5222. - - This allows us to distinguish between explicit user parameters (which imply SRV records should be ignored) and unspecified values (which mean "do the right thing"). - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 45699bd0090984bf0dfd5de617c873c2de4cb197 -Author: Vivek Dasmohapatra -Date: Tue Aug 4 15:14:21 2009 +0100 - - Default xmpp-port property value should be 0, not 5222. - This allows us to distinguish between explicit user parameters (which imply SRV records should be ignored) and unspecified values (which mean "so the right thing"). - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3a705cc906e154a3e77fabd55c16f42ae11191a6 -Author: Guillaume Desmottes -Date: Tue Aug 4 14:02:19 2009 +0100 - - use test_init and test_deinit in tests so memory is properly freed and valgrind is happy - - tests/Makefile.am | 11 +++++++++++ - tests/wocky-connector-test.c | 10 ++++++---- - tests/wocky-porter-test.c | 10 ++++++---- - tests/wocky-test-sasl-auth.c | 11 ++++++----- - tests/wocky-xmpp-connection-test.c | 10 ++++++---- - tests/wocky-xmpp-node-test.c | 11 +++++++---- - tests/wocky-xmpp-reader-test.c | 12 ++++++++---- - tests/wocky-xmpp-readwrite-test.c | 11 +++++++---- - tests/wocky-xmpp-stanza-test.c | 13 ++++++++----- - 9 files changed, 65 insertions(+), 34 deletions(-) - -commit fd61e2ac48113b5eb5b9f60f1ef83564be7788a2 -Author: Guillaume Desmottes -Date: Tue Aug 4 14:01:28 2009 +0100 - - add test_init and test_deinit helpers - - tests/wocky-test-helper.c | 17 +++++++++++++++++ - tests/wocky-test-helper.h | 5 +++++ - 2 files changed, 22 insertions(+), 0 deletions(-) - -commit ac511b43ae9f37ef33fc0fe5fdf7029c8e354bce -Author: Guillaume Desmottes -Date: Tue Jul 28 11:54:13 2009 +0100 - - add wocky_init and wocky_deinit - - wocky/Makefile.am | 2 + - wocky/wocky.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky.h | 34 +++++++++++++++++++++++++++++++++ - 3 files changed, 90 insertions(+), 0 deletions(-) - -commit 50201f619f1b75d8df9bec106d5e91fe22b1f91b -Author: Guillaume Desmottes -Date: Tue Aug 4 12:30:25 2009 +0100 - - connector: 'legacy' and 'old-ssl' properties shouldn't be construct only - - wocky/wocky-connector.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 5dd031fd5f4408e39d232e35317fdd8d3d423b8c -Author: Vivek Dasmohapatra -Date: Wed Jul 29 18:06:28 2009 +0100 - - Use local wocky_tls_* instead of g_tls_* and gio instead of gnio. - - examples/connect.c | 10 +++++----- - tests/wocky-test-connector-server.c | 19 ++++++++++--------- - tests/wocky-test-connector-server.h | 2 +- - tests/wocky-test-sasl-auth-server.c | 2 +- - tests/wocky-test-sasl-auth-server.h | 2 +- - tests/wocky-test-stream.h | 2 +- - wocky/wocky-connector.c | 12 ++++++------ - wocky/wocky-connector.h | 2 +- - wocky/wocky-sasl-auth.h | 2 +- - wocky/wocky-xmpp-connection.h | 3 +-- - 10 files changed, 28 insertions(+), 28 deletions(-) - -commit b9ee8409f1ecbd1c28b79754ca5b45ffdf4a5738 -Author: Vivek Dasmohapatra -Date: Wed Jul 29 18:05:42 2009 +0100 - - Remove gnio from package deps, add gnutls and gio. - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit fdad53d43d9c7edcd24db0c69108b689b7b05847 -Author: Vivek Dasmohapatra -Date: Wed Jul 29 18:04:51 2009 +0100 - - Add wocky-tls to build list, exclude from style check as it is a gnio import. - - wocky/Makefile.am | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 18d70158bf35f91165adde167a8d7c20fe296d0e -Author: Vivek Dasmohapatra -Date: Wed Jul 29 18:03:22 2009 +0100 - - Check in copy of gnio TLS support + collabora patches to add server side TLS. - - wocky/wocky-tls.c | 1230 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-tls.h | 68 +++ - 2 files changed, 1298 insertions(+), 0 deletions(-) - -commit 9d73236146ea2846a380f59090b249d6e7a35280 -Author: Vivek Dasmohapatra -Date: Fri Jul 31 17:44:25 2009 +0100 - - Bogus goto, should have just been a label. - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit fa985c20e28fd1aae2b9bfd49550cbebbee177ae -Author: Vivek Dasmohapatra -Date: Fri Jul 31 17:39:04 2009 +0100 - - Stanza memory leaks on error bailouts. - - wocky/wocky-connector.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit 3213cfa55bc654779602866f991efdd2a1fc3730 -Author: Vivek Dasmohapatra -Date: Thu Jul 30 11:29:29 2009 +0100 - - Bogus if condition removed. - - tests/wocky-xmpp-node-test.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 79f3f6482a6594c6175401909698d2fad1c649ce -Author: Vivek Dasmohapatra -Date: Wed Jul 29 16:36:06 2009 +0100 - - Minor (english) syntax changes in doc string. - - wocky/wocky-xmpp-node.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit d22b1d9004f622ba58f4f71352631a4587ea7e86 -Author: Vivek Dasmohapatra -Date: Wed Jul 29 16:32:09 2009 +0100 - - Test the wocky_xmpp_node_unpack_error function. - - tests/wocky-xmpp-node-test.c | 184 ++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 184 insertions(+), 0 deletions(-) - -commit 54f204acb753f3081c0082382c3522d30e7fc165 -Author: Vivek Dasmohapatra -Date: Wed Jul 29 16:31:16 2009 +0100 - - Extract the stanza error type. Make sure unset original stanza => NULL result. - - wocky/wocky-xmpp-node.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit 34f6d59f1f87794e67ff3837d06edf9d92e62df0 -Author: Vivek Dasmohapatra -Date: Tue Jul 28 18:08:51 2009 +0100 - - Document wocky_xmpp_node_unpack_error. - - wocky/wocky-xmpp-node.c | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+), 0 deletions(-) - -commit f28d0fb657f9371b59e41bcc064d06e85b4abe1a -Author: Vivek Dasmohapatra -Date: Tue Jul 28 17:49:51 2009 +0100 - - Session ID property not writable anymore. - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit aa7ab0ce93f7219e51a9e063251f174b6dc77eca -Author: Vivek Dasmohapatra -Date: Tue Jul 28 17:49:19 2009 +0100 - - Cleanup some old DEBUG we don't need any more. - - tests/wocky-test-connector-server.c | 13 +------------ - 1 files changed, 1 insertions(+), 12 deletions(-) - -commit 6ba3953607660c70aa4ddaadb8b1fc742c8a362e -Author: Vivek Dasmohapatra -Date: Tue Jul 28 17:39:35 2009 +0100 - - Memory leak in example connect.c program. - - examples/connect.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 327326a9e1d0cf60e7a1d8d1a51daacfae860756 -Author: Vivek Dasmohapatra -Date: Tue Jul 28 12:05:11 2009 +0100 - - Duplicate applicable XMPP+TLS tests for the XMPP+SSL code path(s). - - tests/wocky-connector-test.c | 334 ++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 334 insertions(+), 0 deletions(-) - -commit 0a9d76b1be294fc26ac097f59935c45cdf0c923a -Author: Vivek Dasmohapatra -Date: Tue Jul 28 12:04:07 2009 +0100 - - Tweak the timing of some of the server-death tests (also, sleep not needed) - - tests/wocky-test-connector-server.c | 12 ++++-------- - 1 files changed, 4 insertions(+), 8 deletions(-) - -commit 266f6c74fd2d258c6bdda4e3ea08ff50e080abdb -Author: Vivek Dasmohapatra -Date: Tue Jul 28 11:32:40 2009 +0100 - - Removed some stray empty comments + a couple of tests were misnamed - - tests/wocky-connector-test.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 245cb4099a141cf7dd084628281706a13f671108 -Author: Vivek Dasmohapatra -Date: Mon Jul 27 20:50:03 2009 +0100 - - TLS_REQUIRED/PLAINTEXT_OK vs TRUE/FALSE. More old-SSL tests. - - tests/wocky-connector-test.c | 538 +++++++++++++++++++++++++++++++++--------- - 1 files changed, 426 insertions(+), 112 deletions(-) - -commit ceda37cbc1092ed8d28d656876b2c029042f2c10 -Author: Vivek Dasmohapatra -Date: Mon Jul 27 19:56:57 2009 +0100 - - Fix comment describing test-spec structure. Use PLAIN/DIGEST vs TRUE/FALSE. - - tests/wocky-connector-test.c | 114 +++++++++++++++++++++--------------------- - 1 files changed, 57 insertions(+), 57 deletions(-) - -commit d4604ea3b0ad904eff471639e72caafe6fda0413 -Author: Vivek Dasmohapatra -Date: Mon Jul 27 19:42:26 2009 +0100 - - First batch of old-style SSL tests - - tests/wocky-connector-test.c | 205 +++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 203 insertions(+), 2 deletions(-) - -commit c33e6c778fc5dfa2ca8d7c2426a5d26e9fcd5636 -Author: Vivek Dasmohapatra -Date: Mon Jul 27 19:39:52 2009 +0100 - - Implement old-style SSL in test XMPP server. - - tests/wocky-test-connector-server.c | 51 +++++++++++++++++++++++++++++++--- - 1 files changed, 46 insertions(+), 5 deletions(-) - -commit 54582866d61c9a8ea7900ff8b7ab87fc546ca8ff -Author: Vivek Dasmohapatra -Date: Mon Jul 27 19:39:02 2009 +0100 - - Old style SSL (ie immediately on TCP connection established) - - wocky/wocky-connector.c | 75 +++++++++++++++++++++++++++++++++++++++++----- - wocky/wocky-connector.h | 1 + - 2 files changed, 67 insertions(+), 9 deletions(-) - -commit 865cb935844292e9d7c1207dc0abd3238749bfbb -Author: Vivek Dasmohapatra -Date: Mon Jul 27 12:59:28 2009 +0100 - - Update flow-control description comment at start of wocky-connector.c - - wocky/wocky-connector.c | 58 ++++++++++++++++++++++++++++------------------ - 1 files changed, 35 insertions(+), 23 deletions(-) - -commit 3d765ebdd873a390fde19b1c13e6d903c8e11ba5 -Author: Vivek Dasmohapatra -Date: Fri Jul 24 19:46:47 2009 +0100 - - Improve test coverage in corner cases. - - tests/wocky-connector-test.c | 66 +++++++++++++++++++++++++++++++++++ - tests/wocky-test-connector-server.c | 20 ++++++++++ - tests/wocky-test-connector-server.h | 16 +++++---- - 3 files changed, 95 insertions(+), 7 deletions(-) - -commit c585552ad207a2194d306d9b9211859d535e3436 -Author: Vivek Dasmohapatra -Date: Fri Jul 24 18:45:24 2009 +0100 - - Memory leak: free old session id string when the session re-initialises - - wocky/wocky-connector.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 1741f0b8e19e0234bd72fba3ee04cfc4fa4c00f1 -Author: Vivek Dasmohapatra -Date: Fri Jul 24 16:51:35 2009 +0100 - - Split connector-problems into smaller logical groups - Problem flags sometimes need to be ORable together, but we had exceeded 32 of them, so have split the problems into logical groups to prevent problems as the enm size might be exceeded on some platforms otherwise, aiui. - - tests/wocky-connector-test.c | 230 ++++++++++++++++++++--------------- - tests/wocky-test-connector-server.c | 126 +++++++++---------- - tests/wocky-test-connector-server.h | 108 +++++++++++------ - 3 files changed, 260 insertions(+), 204 deletions(-) - -commit fb7d680d68048ca3f0db4c58d01d7156d7140760 -Author: Vivek Dasmohapatra -Date: Thu Jul 23 20:00:05 2009 +0100 - - Typo in comment. - - wocky/wocky-sasl-auth.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d1620c44db2ba34a369de12bdbe1fdc445d569e0 -Author: Vivek Dasmohapatra -Date: Thu Jul 23 19:49:27 2009 +0100 - - Old style jabber-auth tests. - - tests/wocky-connector-test.c | 148 +++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 147 insertions(+), 1 deletions(-) - -commit 86acf37b4089ef1f472bb929fdf19daa2ca501ba -Author: Vivek Dasmohapatra -Date: Thu Jul 23 19:41:55 2009 +0100 - - Miscellaneous mem leak/uninitialised var/debug fixes - session_id free()d in cleanup. - DEBUG("") messages so we can track progress - assignment + declaration for variable declared in switch block wasn't working, assign separately from declaration. - Make sure jabber auth stanzas have IDs - - wocky/wocky-connector.c | 35 ++++++++++++++++++++++++++++++----- - 1 files changed, 30 insertions(+), 5 deletions(-) - -commit f9cac60bdb9f0dfc6d4f7337a275fd058f60efe1 -Author: Vivek Dasmohapatra -Date: Thu Jul 23 19:32:33 2009 +0100 - - Implement old-style jabber auth in the test server. - - tests/wocky-test-connector-server.c | 267 +++++++++++++++++++++++++++++++++-- - tests/wocky-test-connector-server.h | 8 + - wocky/wocky-namespaces.h | 3 + - 3 files changed, 263 insertions(+), 15 deletions(-) - -commit 27e2f0fc175a73661d6bdb603ea9b3e5bac987ec -Author: Vivek Dasmohapatra -Date: Wed Jul 22 12:18:57 2009 +0100 - - Comment explaining why we proceed to "establish_session" after a successful - old-style jabber auth exchange. - - wocky/wocky-connector.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 51b0ebb58d27dd6fb7a011a851b2b5ecfce6fb93 -Author: Vivek Dasmohapatra -Date: Tue Jul 21 19:25:38 2009 +0100 - - Old-style jabber auth implementation. - - wocky/wocky-connector.c | 343 +++++++++++++++++++++++++++++++++++++++++++++- - wocky/wocky-connector.h | 5 + - wocky/wocky-namespaces.h | 4 + - 3 files changed, 348 insertions(+), 4 deletions(-) - -commit cb635f6af447c0444d5832cb58a81e9e57ba7afe -Author: Vivek Dasmohapatra -Date: Tue Jul 21 19:24:53 2009 +0100 - - Util method to extract stanza error details - - wocky/wocky-xmpp-node.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-node.h | 8 +++++++ - 2 files changed, 61 insertions(+), 0 deletions(-) - -commit 8ce7c458e0b6a2ef5f568a6e10a0e08ac6c866ae -Author: Vivek Dasmohapatra -Date: Tue Jul 21 19:24:18 2009 +0100 - - Comment typos. - - wocky/wocky-sasl-auth.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 3d415b6806790622086d3df10b562c484af35230 -Author: Vivek Dasmohapatra -Date: Tue Jul 21 19:15:44 2009 +0100 - - Add ID paramater to stream open methods (needed for server stream open) - - examples/connect.c | 6 +++--- - tests/wocky-test-connector-server.c | 2 +- - tests/wocky-test-helper.c | 2 +- - tests/wocky-test-sasl-auth-server.c | 4 ++-- - tests/wocky-test-sasl-auth.c | 4 ++-- - tests/wocky-xmpp-connection-test.c | 10 +++++----- - tests/wocky-xmpp-readwrite-test.c | 2 +- - wocky/wocky-xmpp-connection.c | 3 ++- - wocky/wocky-xmpp-connection.h | 1 + - wocky/wocky-xmpp-writer.c | 10 ++++++++++ - wocky/wocky-xmpp-writer.h | 1 + - 11 files changed, 29 insertions(+), 16 deletions(-) - -commit 75fc9f5fc79dad7a325d2e9bab366879bdf5389d -Author: Vivek Dasmohapatra -Date: Mon Jul 20 16:02:54 2009 +0100 - - Store and return the XMPP Stream Session ID - The XMPP Session ID from the server stream open is needed for some client actions (including old-style Jabber auth): Make it a standard connector return item. - - examples/connect.c | 17 +++++++++++--- - tests/wocky-connector-test.c | 27 ++++++++++++++++++++--- - tests/wocky-test-connector-server.c | 2 +- - tests/wocky-test-helper.c | 2 +- - tests/wocky-test-sasl-auth-server.c | 4 +- - tests/wocky-test-sasl-auth.c | 4 +- - tests/wocky-xmpp-connection-test.c | 15 +++++++----- - wocky/wocky-connector.c | 40 +++++++++++++++++++++++++++++++--- - wocky/wocky-connector.h | 3 +- - wocky/wocky-xmpp-connection.c | 8 ++++++- - wocky/wocky-xmpp-connection.h | 1 + - wocky/wocky-xmpp-reader.c | 29 +++++++++++++++++++++---- - 12 files changed, 121 insertions(+), 31 deletions(-) - -commit 3d2b6bb99615703fd9ccf6daa086396db3468040 -Author: Guillaume Desmottes -Date: Wed Jul 29 12:10:45 2009 +0100 - - stanza_received_cb: unref ourself at the end of the function - - It's not safe to unref ourself and then use the priv pointer - - wocky/wocky-porter.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 3569d70d19a50e49379c0c112c5ab31db0d13ed7 -Author: Guillaume Desmottes -Date: Wed Jul 29 12:00:46 2009 +0100 - - wocky_porter_force_close_async: add a comment explaining why it's safe to release the ref at this stage - - wocky/wocky-porter.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 9df6395ca9d6660c660878849458ae8b0da91b78 -Author: Guillaume Desmottes -Date: Wed Jul 22 16:41:48 2009 +0100 - - wocky_porter_force_close_async: unref ourself once the async result has been created - - wocky/wocky-porter.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit d473cecb3164ebac975e491e0050d4dd67a68c20 -Author: Guillaume Desmottes -Date: Wed Jul 22 16:41:04 2009 +0100 - - connection_force_close_cb: unref the receive_cancellable once the connection has been closed - - wocky/wocky-porter.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 18e690252a2fcc5090504ecdf05787a558077cfe -Author: Guillaume Desmottes -Date: Wed Jul 22 16:07:08 2009 +0100 - - wocky-porter-test: add test_close_force_after_error - - tests/wocky-porter-test.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 56 insertions(+), 0 deletions(-) - -commit 0b6dd9bf0b3cfb7dc3f195506e2ef9e86171e97d -Author: Guillaume Desmottes -Date: Wed Jul 22 16:06:29 2009 +0100 - - test_close_force: we have to wait for 3 events, not 2 - - Three callbacks have to called: - - test_close_force_stanza_sent_cb - - test_close_force_closed_cb - - test_close_force_force_closed_cb - - tests/wocky-porter-test.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8595ff413485eb81824817b7c52ac21e886d4584 -Author: Guillaume Desmottes -Date: Wed Jul 22 15:51:55 2009 +0100 - - wocky_porter_force_close_async: close XMPP connection right away if remote is already closed - - wocky/wocky-porter.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit c721b6614add94cb84af4987c1a9848a7330377c -Author: Guillaume Desmottes -Date: Wed Jul 22 15:23:21 2009 +0100 - - wocky-porter-test: test to call force_close in the remote-error callback - - tests/wocky-porter-test.c | 21 +++++++++++++++++++-- - 1 files changed, 19 insertions(+), 2 deletions(-) - -commit f51bffd3593d0911267ed419df706a4c08d9d192 -Author: Guillaume Desmottes -Date: Wed Jul 22 15:21:22 2009 +0100 - - stanza_received_cb: complete the force close operation, if any, if handling the stanza closed the remote connection - - wocky/wocky-porter.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit ac8d9edd90936efe938f6f1998b3bbe90cf4f534 -Author: Guillaume Desmottes -Date: Wed Jul 22 14:58:43 2009 +0100 - - wocky_porter_close_async: raise an error if there is a force close operation running - - wocky/wocky-porter.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 79ebc9f3819541656d5239c09cff7968be626e63 -Author: Guillaume Desmottes -Date: Wed Jul 22 14:52:33 2009 +0100 - - wocky-porter: add some debug messages - - wocky/wocky-porter.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 1af25e22869aaa484972bff9cea51eea0bdffcfe -Author: Guillaume Desmottes -Date: Fri Jul 17 17:24:47 2009 +0100 - - test wocky_porter_force_close_async - - tests/wocky-porter-test.c | 85 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 85 insertions(+), 0 deletions(-) - -commit 1f68ed348b2a9a90fd803a2b74e1ecd52af4325c -Author: Guillaume Desmottes -Date: Mon Jul 20 14:08:58 2009 +0100 - - add wocky_porter_force_close_async - - wocky/wocky-porter.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++++-- - wocky/wocky-porter.h | 10 ++++ - 2 files changed, 150 insertions(+), 4 deletions(-) - -commit 5569ae92c24541e8db3f525008c91d7789d85106 -Author: Guillaume Desmottes -Date: Mon Jul 20 12:31:10 2009 +0100 - - test wocky_xmpp_connection_force_close_async - - tests/wocky-xmpp-connection-test.c | 41 ++++++++++++++++++++++++++++++++++++ - 1 files changed, 41 insertions(+), 0 deletions(-) - -commit 8cff0b3f4ea9aaa4caa995a48754fc2817d34852 -Author: Guillaume Desmottes -Date: Mon Jul 20 12:31:03 2009 +0100 - - add wocky_xmpp_connection_force_close_async - - wocky/wocky-xmpp-connection.c | 64 +++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-connection.h | 10 ++++++ - 2 files changed, 74 insertions(+), 0 deletions(-) - -commit 637f9631cb50ed80656f9e479fa2670e1f8290f0 -Author: Guillaume Desmottes -Date: Wed Jul 22 12:07:14 2009 +0100 - - wocky-connector: xmpp_features_cb: don't leak our previous reference on priv->features if any - - wocky/wocky-connector.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit c16e59035a26f04d3d766fd6c19e7dec74dbc9a0 -Author: Guillaume Desmottes -Date: Tue Jul 21 13:54:28 2009 +0100 - - wocky-connector: use WockyXmppStreamError errors instead of a generic one - - tests/wocky-connector-test.c | 9 +++++---- - wocky/wocky-connector.c | 3 +-- - wocky/wocky-connector.h | 1 - - 3 files changed, 6 insertions(+), 7 deletions(-) - -commit bee972c1d0b5036a25980f84d3f9f761f2937389 -Author: Guillaume Desmottes -Date: Tue Jul 21 13:44:50 2009 +0100 - - wocky-connector: factor out abort_connect - - wocky/wocky-connector.c | 30 +++++++++++++++++++----------- - 1 files changed, 19 insertions(+), 11 deletions(-) - -commit 369848c9f5191f78c7bf01628acae7dc1f50f0a6 -Author: Guillaume Desmottes -Date: Mon Jul 20 16:19:36 2009 +0100 - - wocky_xmpp_stanza_to_gerror: set a default message if there is no text node - - tests/wocky-xmpp-stanza-test.c | 4 ++-- - wocky/wocky-xmpp-stanza.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit 316ef2a8e1443ac98c71d37801515b92ab505900 -Author: Guillaume Desmottes -Date: Mon Jul 20 11:59:15 2009 +0100 - - stanza_received_cb: don't wait for the next stanza if an error has been detected while handling the stanza - - wocky/wocky-porter.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 200c886a7425aef4f09f138f56c5b8cc2cfeb0bd -Author: Guillaume Desmottes -Date: Fri Jul 17 14:28:45 2009 +0100 - - wocky-porter-test.c: add test_stream_error - - tests/wocky-porter-test.c | 52 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 52 insertions(+), 0 deletions(-) - -commit 74877dc48a787d5a58d9e2348a3b23786c906307 -Author: Guillaume Desmottes -Date: Fri Jul 17 14:29:39 2009 +0100 - - wocky-porter: fire the remote-error signal when a stream error is received - - wocky/wocky-porter.c | 24 ++++++++++++++++++++++++ - 1 files changed, 24 insertions(+), 0 deletions(-) - -commit 0d32ff5a1af807728b26aaf868f601d057ca910d -Author: Guillaume Desmottes -Date: Fri Jul 17 14:29:24 2009 +0100 - - wocky-porter: factor out remote_connection_closed function - - wocky/wocky-porter.c | 90 +++++++++++++++++++++++++++++++------------------- - 1 files changed, 56 insertions(+), 34 deletions(-) - -commit 8776e27eb1d20cab9d8f96b34cb9689f9661735d -Author: Guillaume Desmottes -Date: Mon Jul 20 16:02:26 2009 +0100 - - wocky-connector: stream_error_abort: use wocky_xmpp_stanza_to_gerror instead of parsing the stanza manually - - wocky/wocky-connector.c | 42 +++++++++--------------------------------- - 1 files changed, 9 insertions(+), 33 deletions(-) - -commit 57df600754da4db32b5a0728cc303266f252ba49 -Author: Guillaume Desmottes -Date: Mon Jul 20 15:57:24 2009 +0100 - - test wocky_xmpp_stanza_to_gerror - - tests/wocky-xmpp-stanza-test.c | 75 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 75 insertions(+), 0 deletions(-) - -commit c250be88f8047e1132cfa6c03cbaea93eafeed7b -Author: Guillaume Desmottes -Date: Fri Jul 17 14:27:19 2009 +0100 - - add wocky_xmpp_stanza_to_gerror - - wocky/wocky-xmpp-stanza.c | 83 +++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-stanza.h | 39 +++++++++++++++++++++ - 2 files changed, 122 insertions(+), 0 deletions(-) - -commit 8f1148a0bf8d5635079c5e405adb22c720566d14 -Author: Guillaume Desmottes -Date: Mon Jul 20 10:24:37 2009 +0100 - - iq_sent_cb: remove useless \n in debug message - - wocky/wocky-porter.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 76b4b99e7be774de2ede7b2c1d7313de9ab66ffe -Author: Vivek Dasmohapatra -Date: Thu Jul 16 18:43:04 2009 +0100 - - Removed extra / in resource string. - - tests/wocky-test-connector-server.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d2a2f185dbcc1d75ede4e774dce8661455289709 -Author: Vivek Dasmohapatra -Date: Thu Jul 16 17:06:37 2009 +0100 - - Elided unnecessary includes (added for stream error support, now elsewhere) - - wocky/wocky-xmpp-connection.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 5e5bdd67f38c0b1100257c82c84f285df87ba9de -Author: Vivek Dasmohapatra -Date: Thu Jul 16 17:06:01 2009 +0100 - - WockyConnectorPrivate->result was overwritten while potentially unsafe - priv->result is not necessarily safe to access/write after a g_simple_async_result_complete has been called on it: If the result held the last ref to its parent connector object, the priv->result slot will have been freed by the time we return. - - wocky/wocky-connector.c | 28 +++++++++++++++------------- - 1 files changed, 15 insertions(+), 13 deletions(-) - -commit 74b2945aa8e9d0dc68f9aa95b0c6e2558f259abb -Author: Vivek Dasmohapatra -Date: Thu Jul 16 16:48:29 2009 +0100 - - Handle stream errors/disconnects in the sasl module. - - wocky/wocky-sasl-auth.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++- - wocky/wocky-sasl-auth.h | 4 +++ - 2 files changed, 58 insertions(+), 1 deletions(-) - -commit 7516fb14e42095eaf0838ee1c8c3f939ed2e9786 -Author: Vivek Dasmohapatra -Date: Thu Jul 16 15:26:42 2009 +0100 - - Extend test coverage to a few more corner cases. - - tests/wocky-connector-test.c | 12 ++++++++ - tests/wocky-test-connector-server.c | 49 ++++++++++++++++++++++------------- - tests/wocky-test-connector-server.h | 31 +++++++++++---------- - 3 files changed, 59 insertions(+), 33 deletions(-) - -commit 37ee90aca57cfed830ad5bc6877d854bad1bace6 -Author: Vivek Dasmohapatra -Date: Wed Jul 15 19:43:31 2009 +0100 - - Ignore valgrind log files - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 87dd13fd7bf319a3f4e3f46f6233b309ef180f4a -Author: Vivek Dasmohapatra -Date: Thu Jul 16 13:42:40 2009 +0100 - - set the encoding on coverage html reports to UTF-8 (hardwired in lcov, - so have to post-process) - - rules/lcov.mak | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 0b0701d559d64086f972bfcf87f0c56757342444 -Author: Vivek Dasmohapatra -Date: Wed Jul 15 19:43:31 2009 +0100 - - Handle XMPP stream errors in the connector. - Tests which trigger XMPP stream errors at the key stages of connection. - - tests/wocky-connector-test.c | 49 ++++++++++++++++++++++++++++++++- - wocky/wocky-connector.c | 61 ++++++++++++++++++++++++++++++++++++++++- - wocky/wocky-connector.h | 1 + - wocky/wocky-namespaces.h | 3 ++ - wocky/wocky-xmpp-connection.c | 2 + - 5 files changed, 114 insertions(+), 2 deletions(-) - -commit d1060b610d802dc789e862b711aded98682e3735 -Author: Vivek Dasmohapatra -Date: Wed Jul 15 19:30:37 2009 +0100 - - Implement XMPP errors at the various stages where we receive a stanza. - - tests/wocky-test-connector-server.c | 63 +++++++++++++++++++++++++++++++---- - tests/wocky-test-connector-server.h | 4 ++ - 2 files changed, 60 insertions(+), 7 deletions(-) - -commit 6e6492cce4999ba85b02c16de023568f4e077676 -Author: Guillaume Desmottes -Date: Fri Jul 17 16:00:47 2009 +0100 - - wocky-porter-test: check that the 'closing' signal is fired - - tests/wocky-porter-test.c | 13 ++++++++++++- - 1 files changed, 12 insertions(+), 1 deletions(-) - -commit 68db52832b9a2a16cc89034a75f282c762cd328c -Author: Guillaume Desmottes -Date: Fri Jul 17 16:00:30 2009 +0100 - - wocky-porter.c: fire closing signal when starting to close the Porter - - wocky/wocky-porter.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 7122422739e62e4354a392a9d22975b965c7c226 -Author: Guillaume Desmottes -Date: Wed Jul 15 18:07:35 2009 +0100 - - add test_cancel_iq_closing - - tests/wocky-porter-test.c | 33 +++++++++++++++++++++++++++++++++ - 1 files changed, 33 insertions(+), 0 deletions(-) - -commit 777375f681cc91c86b5653bac7dbd5df97f1ab82 -Author: Guillaume Desmottes -Date: Wed Jul 15 18:05:39 2009 +0100 - - wocky_porter_send_iq_async: early return if the porter is closing - - There is no point to go further as the sending will fail any way. - - wocky/wocky-porter.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 636063aa2d431265a1db48f67c587b0e7484dc63 -Author: Guillaume Desmottes -Date: Wed Jul 15 18:04:47 2009 +0100 - - iq_sent_cb: display a debug message if sending failed - - wocky/wocky-porter.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit b761642931b2500d18af0c418abdd7037c9eb6e4 -Author: Guillaume Desmottes -Date: Wed Jul 15 18:03:01 2009 +0100 - - wocky-connector.c: establish_session: set priv->result to NULL before unreffing - - This avoid to try to unref it a second time if the result was owning the - last ref on the connector. - - wocky/wocky-connector.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 46e93878e86290a2fc1ce3b703f8d8ccb201569c -Author: Guillaume Desmottes -Date: Wed Jul 15 12:51:29 2009 +0100 - - wocky-porter-test: add test_close_error - - tests/wocky-porter-test.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 49 insertions(+), 0 deletions(-) - -commit 15f00e5c93a64f148a6910804ed20569fd81cf95 -Author: Guillaume Desmottes -Date: Wed Jul 15 12:50:11 2009 +0100 - - stanza_received_cb: complete the close operation if our sent has been sent and the connection is broken - - wocky/wocky-porter.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 5b63b6b7495923fa0925848856bd73934b7aa7c6 -Author: Guillaume Desmottes -Date: Wed Jul 15 12:48:28 2009 +0100 - - wocky_test_input_stream_set_read_error: if there is a pending read operation, complete it with an error - - tests/wocky-test-stream.c | 13 +++++++++++-- - 1 files changed, 11 insertions(+), 2 deletions(-) - -commit f5a6b2438988af2ccfa93dd21ab27861de40c146 -Author: Vivek Dasmohapatra -Date: Wed Jul 15 11:26:58 2009 +0100 - - NULL out priv members after unref()ing them. - - wocky/wocky-connector.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit ee645a6b78742638b860ca3824ba0246f034a069 -Author: Vivek Dasmohapatra -Date: Tue Jul 14 19:31:45 2009 +0100 - - Missing _unref()s of simple async results. - - wocky/wocky-connector.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit 015fdc8bdc6ee550f5d3b648aa90aa6bad0da86d -Author: Vivek Dasmohapatra -Date: Tue Jul 14 19:28:15 2009 +0100 - - priv->conn should never be set if we ask for a new one. - - wocky/wocky-connector.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit f318666d2e9b3b74a0639620330dd5e0aef21470 -Author: Vivek Dasmohapatra -Date: Tue Jul 14 19:25:08 2009 +0100 - - unref the channel, not the socket in the test. - Use the JID slicing function from wocky_utils - Amend the Invalid JID test sincw the behaviour of the JID slicer is - different to naive @ slicing (arguably it needs to be less tolerant, - but right now it isn't which means we fail in a different place - with a different error than we did before). - - tests/wocky-connector-test.c | 10 ++++--- - wocky/wocky-connector.c | 53 ++++++++++++++++++++++++++++++++--------- - 2 files changed, 47 insertions(+), 16 deletions(-) - -commit d34f32ab570abb131e69316c58bd9a5a9c35da4e -Author: Vivek Dasmohapatra -Date: Tue Jul 14 17:37:59 2009 +0100 - - Break out long if condition. - - tests/wocky-connector-test.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit 8853540bce12d438b5fe440dbdcf160ed5409813 -Author: Vivek Dasmohapatra -Date: Tue Jul 14 17:33:11 2009 +0100 - - Minor leak in the test suite. - - tests/wocky-connector-test.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit da8fa0de237bbd1d3ccf12fcc9b51cc01d32a23d -Author: Vivek Dasmohapatra -Date: Tue Jul 14 15:52:35 2009 +0100 - - The SASL object was getting unref'd too early in sasl_auth_stanza_received, - hold a ref to it while we pass it out to any handlers so that this does not - happen. - - wocky/wocky-sasl-auth.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 621212acade5aa4abd28aaa6a7a3ae385acc50a3 -Author: Vivek Dasmohapatra -Date: Tue Jul 14 15:05:53 2009 +0100 - - Casting style (whitespace) - Move the sleep() after a bind() failure to a nested if, it shouldn't happen - unless we enter the second iteration of the loop but the optimiser decided - it should happen anyway (I think). Speeds up tests a bit. - - tests/wocky-connector-test.c | 9 ++++----- - 1 files changed, 4 insertions(+), 5 deletions(-) - -commit ea0a271654d179cf7b734628be3557bacee4a7bf -Author: Vivek Dasmohapatra -Date: Tue Jul 14 14:41:04 2009 +0100 - - Store, check and free the returned jid. - Typo in comment. - Check return value of listen() as well as bind. - - tests/wocky-connector-test.c | 14 +++++++++----- - 1 files changed, 9 insertions(+), 5 deletions(-) - -commit 75e0df17da3165f57528dd10655d0c5c1bb7ec08 -Author: Vivek Dasmohapatra -Date: Tue Jul 14 14:36:16 2009 +0100 - - Memory leak in digest_md5 handling. - - wocky/wocky-sasl-auth.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit a83dbe6538d42b02864058752501a84be9671856 -Author: Vivek Dasmohapatra -Date: Tue Jul 14 13:17:23 2009 +0100 - - Memory leak in DEBUG/state_message use. - - wocky/wocky-connector.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit e5ab24aa23dfa23d98297ad9a34623dcbd29877d -Author: Vivek Dasmohapatra -Date: Tue Jul 14 13:02:05 2009 +0100 - - Add brief comments desribing first block of test cases. - - tests/wocky-connector-test.c | 26 ++++++++++++++++++++++++++ - 1 files changed, 26 insertions(+), 0 deletions(-) - -commit 3eb6ca60feb2265aada49d17d4354933881a8c1a -Author: Vivek Dasmohapatra -Date: Tue Jul 14 12:15:41 2009 +0100 - - Kick off the test in a g_idle… - this prevents a race where a very early - return via callback from the connector can happen before the mainloop has - started (since an idle can by definition only happen in a running mainloop). - - tests/wocky-connector-test.c | 18 ++++++++++++------ - 1 files changed, 12 insertions(+), 6 deletions(-) - -commit 7809a0341d4544ce92d6b5375fd68b03148dd5f0 -Author: Vivek Dasmohapatra -Date: Tue Jul 14 11:59:47 2009 +0100 - - Delete any __db. BDB tmp/lock files, they cause SASL deadlocks in - subsequent tests. - - tests/wocky-connector-test.c | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -commit f2339277d9b0511c2ad24285d8bcb060681aaec2 -Author: Vivek Dasmohapatra -Date: Tue Jul 14 11:38:11 2009 +0100 - - Wait for the server process (if any) to exit before proceeding to the next test. - - tests/wocky-connector-test.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit b4717962c54aa386576c53ec366f2d1820291418 -Author: Vivek Dasmohapatra -Date: Tue Jul 14 11:14:54 2009 +0100 - - Style typo. Add comment explaining why stderr is redirected in this case. - - tests/wocky-connector-test.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit be29dd08fb5a6be8508931c42b089f135d50ad84 -Author: Vivek Dasmohapatra -Date: Mon Jul 13 20:03:53 2009 +0100 - - Mask an error from the dummy xmpp server in the TLS-failed test. - - tests/wocky-connector-test.c | 92 +++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 90 insertions(+), 2 deletions(-) - -commit b7040f801c6c7ad6d6373c4f6f9533d8cc22977b -Author: Vivek Dasmohapatra -Date: Mon Jul 13 18:48:51 2009 +0100 - - All the test binaries should depend on libwocky.la, - which should in turn be located via $(top_builddir) - - tests/Makefile.am | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -commit db684838101af4957e96ff1c309270eab9cb7b8a -Author: Vivek Dasmohapatra -Date: Mon Jul 13 18:48:02 2009 +0100 - - Need to pause a little longer when the bind fails before retrying. - - tests/wocky-connector-test.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d3ab888b24925ed57721724815b639f0a704accb -Author: Vivek Dasmohapatra -Date: Mon Jul 13 18:17:23 2009 +0100 - - remove #if/#endif used to comment tests out during test development. - - tests/wocky-connector-test.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit fb0b8461f88d12fffe7315ec3198bc8ac31c57ec -Author: Vivek Dasmohapatra -Date: Mon Jul 13 18:15:44 2009 +0100 - - Comment to explain exit w/o error reporting in the dummy XMPP server. - (we're already past the point at which errors are interesting). - - tests/wocky-test-connector-server.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit bdbdcd5a1a1d8da7d82b7d64da8340cbba71fe97 -Author: Vivek Dasmohapatra -Date: Mon Jul 13 17:33:25 2009 +0100 - - Make a couple of repeat attempts to bind in case the last test - hasn't relinquished the test server listen socket yet. - - tests/wocky-connector-test.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -commit 2ba19bdc3688021b32bd7bd710b794b97032d20d -Author: Vivek Dasmohapatra -Date: Mon Jul 13 17:32:21 2009 +0100 - - Mismerge. - - tests/wocky-test-connector-server.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 02a21ef1f5e042a9c69eb73e6d397bc574962e4e -Author: Sjoerd Simons -Date: Thu Jul 2 19:44:32 2009 +0100 - - Add a servername argument - - tests/wocky-test-connector-server.c | 4 ++-- - tests/wocky-test-sasl-auth-server.c | 5 +++-- - tests/wocky-test-sasl-auth-server.h | 2 +- - 3 files changed, 6 insertions(+), 5 deletions(-) - -commit f3924655e7690080c06e21800c02efa1d285ff5f -Author: Sjoerd Simons -Date: Thu Jul 2 19:47:31 2009 +0100 - - Cope with a null byte in the A1 hash - - wocky/wocky-sasl-auth.c | 15 +++++++-------- - 1 files changed, 7 insertions(+), 8 deletions(-) - -commit 94991a5d4fa0de22e446c1884ce283e976c3da2a -Author: Sjoerd Simons -Date: Thu Jul 2 19:46:22 2009 +0100 - - Test if the sasl auth copes with a null byte in the A1 MD5 hash - - Allow the test cases to define username, password and servername for the - various testcases and add a test where the username, password and servername - generates a null byte in the hash - - tests/wocky-test-sasl-auth.c | 63 ++++++++++++++++++++++++++---------------- - 1 files changed, 39 insertions(+), 24 deletions(-) - -commit 5da6c6d306a96d36921835f4afa5a62ee561c8b1 -Author: Vivek Dasmohapatra -Date: Mon Jul 13 17:00:13 2009 +0100 - - Free items fetched vie g_object_get in tests. - - tests/wocky-connector-test.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 9c6a1c3f29b943b93f6a012481ea03de7748da6c -Author: Vivek Dasmohapatra -Date: Mon Jul 13 13:59:27 2009 +0100 - - Change declaration style of wocky_connector_connect_finish - - wocky/wocky-connector.h | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 1d707beec95ba76b2f2d42506a81fc201b667b94 -Author: Vivek Dasmohapatra -Date: Mon Jul 13 13:58:09 2009 +0100 - - Fail tests if we can't get the port we want for the dummy XMPP server: - Either something else is already listening there or we have even - bigger problems. - - tests/wocky-connector-test.c | 27 ++++++++++++++++++++++++--- - 1 files changed, 24 insertions(+), 3 deletions(-) - -commit 6cffb03ff8a6acf4c1ad7e069ea6d643f432725f -Author: Vivek Dasmohapatra -Date: Thu Jul 9 18:59:48 2009 +0100 - - whitespace typo. - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit eefabf3a68a80da5976d32a3f04f2d1e9cacae49 -Author: Vivek Dasmohapatra -Date: Thu Jul 9 18:58:09 2009 +0100 - - Server sudden-death tests + TLS negotiation error test. - - tests/wocky-connector-test.c | 67 ++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 64 insertions(+), 3 deletions(-) - -commit d514cbadbeb84094637ac91445c1ecfb0d6cf843 -Author: Vivek Dasmohapatra -Date: Thu Jul 9 18:57:32 2009 +0100 - - More verbose debug message: which stage exactly did we bail out in? - - wocky/wocky-connector.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 75f7818af12f79ac1f94504e10f7ec4a4d8e609d -Author: Vivek Dasmohapatra -Date: Thu Jul 9 18:56:55 2009 +0100 - - Dummy server sudden-death conditions + TLS negotiation error implemented. - - tests/wocky-test-connector-server.c | 39 ++++++++++++++++++++++++++-------- - tests/wocky-test-connector-server.h | 5 ++++ - 2 files changed, 35 insertions(+), 9 deletions(-) - -commit 557ae61ab6842b1be39a11c99a4d5e18733843d4 -Author: Vivek Dasmohapatra -Date: Thu Jul 9 17:41:51 2009 +0100 - - Tests for session error conditions/sessionless xmpp. - Improve coverage of wocky-connector.c - - tests/wocky-connector-test.c | 139 +++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 137 insertions(+), 2 deletions(-) - -commit 657ffb95e2bd8f7a0edf9bff514424e2fd09f1f2 -Author: Vivek Dasmohapatra -Date: Thu Jul 9 17:41:04 2009 +0100 - - Stomp on some memory leaks. - Add a missing break; - Remove set_prop cases for unsettable properties. - - wocky/wocky-connector.c | 28 ++++++++++++++++------------ - 1 files changed, 16 insertions(+), 12 deletions(-) - -commit 0f3c1cc97b29fd9257656d86dbeed0ea59f47b11 -Author: Vivek Dasmohapatra -Date: Thu Jul 9 17:39:51 2009 +0100 - - Implement session related error conditions. - (and sessionless xmpp) - - tests/wocky-test-connector-server.c | 97 +++++++++++++++++++++++++---------- - tests/wocky-test-connector-server.h | 28 ++++++---- - 2 files changed, 87 insertions(+), 38 deletions(-) - -commit 474b23cb4e81866ef0bc423aad47694eb28e949d -Author: Vivek Dasmohapatra -Date: Wed Jul 8 20:16:19 2009 +0100 - - Implement tests for error conditions. - - tests/wocky-connector-test.c | 78 ++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 72 insertions(+), 6 deletions(-) - -commit 0868311be468b45d86dc5eef546b27b82324be44 -Author: Vivek Dasmohapatra -Date: Wed Jul 8 20:15:16 2009 +0100 - - Implement problems in dummy server. - - tests/wocky-test-connector-server.c | 92 +++++++++++++++++++++++++++++------ - tests/wocky-test-connector-server.h | 18 +++++-- - 2 files changed, 90 insertions(+), 20 deletions(-) - -commit e50dfa60adb743113a0bfa73d8a4bf361065533f -Author: Vivek Dasmohapatra -Date: Wed Jul 8 17:55:06 2009 +0100 - - More symbolic declararions in the test definitions to help with readability. - - Implement XMPP bad version and Bad feature stanza tests. - - Unlinking sasl db every time seems to cause sasl to fail unpredictably. - Work around SASL problems in bad-user and bad-pass tests a differnet way. - Unlink sasl DB just once at the start of the test. - - tests/wocky-connector-test.c | 236 +++++++++++++++++++++++++----------------- - 1 files changed, 140 insertions(+), 96 deletions(-) - -commit d8049ff8c43fa96374fc240d8bb2872b4a3c0653 -Author: Vivek Dasmohapatra -Date: Wed Jul 8 17:52:15 2009 +0100 - - Allow user to set XMPP version in dummy server. - Implement bad features and tls refused conditions. - - tests/wocky-test-connector-server.c | 23 +++++++++++++++++------ - tests/wocky-test-connector-server.h | 2 ++ - 2 files changed, 19 insertions(+), 6 deletions(-) - -commit 5aea3723697ad15a45be199696b2da9451705977 -Author: Vivek Dasmohapatra -Date: Wed Jul 8 17:46:13 2009 +0100 - - Initialise a couple of pointers to NULL. - Log feature stanza version in DEBUG. - - wocky/wocky-connector.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 02134164ac9436fcd2a2c3856688b50c1008ae54 -Author: Vivek Dasmohapatra -Date: Wed Jul 8 15:20:06 2009 +0100 - - TLS refused and bad-JID tests added. - Fixed race condition in run_test. - Changed way in which TLS support in the test server was turned on/off. - - tests/wocky-connector-test.c | 70 ++++++++++++++++++++++++++++++++++++----- - 1 files changed, 61 insertions(+), 9 deletions(-) - -commit 8cb784f04101a107d50607323d810d70efa5bf2a -Author: Vivek Dasmohapatra -Date: Wed Jul 8 15:13:23 2009 +0100 - - Connector problems can now be ORed toegether. - Implement TLS refused condition. - - tests/wocky-test-connector-server.c | 71 +++++++++++++++++++++++++++------- - tests/wocky-test-connector-server.h | 8 ++-- - 2 files changed, 60 insertions(+), 19 deletions(-) - -commit 89dca400878606b1926f3159e60b365bd163862c -Author: Vivek Dasmohapatra -Date: Tue Jul 7 19:53:30 2009 +0100 - - Clean up the sasl-db to make sure our bad password tests will pass. - Add SASL tests. - - tests/wocky-connector-test.c | 74 ++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 71 insertions(+), 3 deletions(-) - -commit 926d3dea455d54432c87c9bad95492d2a7faaf88 -Author: Vivek Dasmohapatra -Date: Tue Jul 7 17:39:54 2009 +0100 - - Another block of tests. - All 48 basic connecion/auth tests against a correctly functioning - XMPP server now pass. - - tests/wocky-connector-test.c | 139 +++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 136 insertions(+), 3 deletions(-) - -commit b04f5031ffaa0144aabf0d570562c91416eef240 -Author: Vivek Dasmohapatra -Date: Tue Jul 7 17:25:30 2009 +0100 - - More tests. - Make test declarations more symbolic so they are a bit easier to interpret. - Test for correct auth mechanism used. - - tests/wocky-connector-test.c | 324 +++++++++++++++++++++++++++++++----------- - 1 files changed, 242 insertions(+), 82 deletions(-) - -commit 9da297ee487904298d72cf1c61c9ca5f3c7d0a81 -Author: Vivek Dasmohapatra -Date: Tue Jul 7 16:08:00 2009 +0100 - - Remember and expose the sasl auth mechanism actually used via the - wock sasl and connector APIs. - - unref the sasl object when we are done with it. - - wocky/wocky-connector.c | 16 ++++++++++++++-- - wocky/wocky-connector.h | 3 +++ - wocky/wocky-sasl-auth.c | 13 +++++++------ - wocky/wocky-sasl-auth.h | 9 +++++++++ - 4 files changed, 33 insertions(+), 8 deletions(-) - -commit e878d844f3f0aba7462c3a1e298898131f8b5428 -Author: Vivek Dasmohapatra -Date: Fri Jul 3 17:54:27 2009 +0100 - - Whitespace fix. - Compiler warning about type of test_func. - - tests/wocky-connector-test.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit 04fa73cd6aaf998ab30e3d06f43ffc4f69bad34f -Author: Vivek Dasmohapatra -Date: Fri Jul 3 17:49:33 2009 +0100 - - First block of 24 basic tests that check the connectors logic wrt - SRV rcords vs A records vs user-specified hosts is sound. - - tests/wocky-connector-test.c | 362 ++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 335 insertions(+), 27 deletions(-) - -commit 7a067167711901a56de1d40bdc63989c3ba2bd56 -Author: Vivek Dasmohapatra -Date: Fri Jul 3 17:48:37 2009 +0100 - - typo. - - tests/connector-test-plan.txt | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 84cd0e1527ca8e2594cff8666209f45da52f276d -Author: Vivek Dasmohapatra -Date: Fri Jul 3 17:26:21 2009 +0100 - - Do not fall back to A records if there is a SRV record but we failed to - connect to the spcified host. - - Silence a "discarding qualifiers" warning. - - wocky/wocky-connector.c | 21 +++++++++++++++++++-- - 1 files changed, 19 insertions(+), 2 deletions(-) - -commit 6eacf17c3f9f69aa822688c9ff88e86acd284658 -Author: Vivek Dasmohapatra -Date: Fri Jul 3 17:23:40 2009 +0100 - - Update test plan with new expected outcomes. - - tests/connector-test-plan.txt | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit a47f813adfcee2010c1bcd5d578b9836594c9edd -Author: Vivek Dasmohapatra -Date: Fri Jul 3 17:23:06 2009 +0100 - - If libwocky.la has been rebuilt, wocky-connector-test also needs rebuilding - - tests/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0e83d2a65b74be44a3327df5b538e0b6fde4ad40 -Author: Vivek Dasmohapatra -Date: Fri Jul 3 15:00:21 2009 +0100 - - Ignore the SRV record (if any) if _either_ HOST or PORT is supplied. - - wocky/wocky-connector.c | 24 +++++++++++++++--------- - 1 files changed, 15 insertions(+), 9 deletions(-) - -commit 5fa9d1bfa829d5233303f04c0c7ddfb6e30407d2 -Author: Vivek Dasmohapatra -Date: Fri Jul 3 14:59:32 2009 +0100 - - Copyright date corrected. - Kill the server if the stanza is NULL after a receive in xmpp_handler. - - tests/wocky-test-connector-server.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit e023a31e8f3aaea915eb13f6f2a4eaa1248d618e -Author: Vivek Dasmohapatra -Date: Fri Jul 3 14:58:12 2009 +0100 - - Register DEBUG_CONNECTOR so WOCKY_DEBUG can be used to set it on its own - - wocky/wocky-debug.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 6bc6da0bf0f9bf2e6f1da6840394e8c4df0bf11f -Author: Vivek Dasmohapatra -Date: Thu Jul 2 11:52:30 2009 +0100 - - Slight screw-up in conflict resolution, lines doubled up. - - tests/Makefile.am | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit ccb9cb7410115bbf1eb023ad6bc67416303e211b -Author: Guillaume Desmottes -Date: Thu Jul 2 10:47:35 2009 +0100 - - test_sasl_auth_server_new: ref the stream as we keep our own ref on it - - tests/wocky-test-sasl-auth-server.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0011d1ef50b99232b14304c36d62426efb5928b9 -Author: Vivek Dasmohapatra -Date: Wed Jul 1 18:22:11 2009 +0100 - - Clean up generated pem files. - Bail out iwht an error if certtool is not installed. - - tests/Makefile.am | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit f7b03e95eb6bb399a6b4f38405f28d301f4aa93c -Author: Vivek Dasmohapatra -Date: Wed Jul 1 17:25:26 2009 +0100 - - Add loopback IP address to cert config. - - tests/certs/tls-cert.cfg | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ac33f6850cf1e6fb4de9c964393b73c6b1cb4e4e -Author: Vivek Dasmohapatra -Date: Wed Jul 1 17:25:02 2009 +0100 - - Need to use abspath, not realpath, files might not exist yet. - - tests/Makefile.am | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 4c439506aa436b146bb600eb8892deacc45d9482 -Author: Vivek Dasmohapatra -Date: Wed Jul 1 17:06:32 2009 +0100 - - Generate x509 key and cert PEM files automatically. - Use generated PEM files in connector tests. - Ignore PEM files in git. - - .gitignore | 2 + - tests/Makefile.am | 40 +++++++++++++++- - tests/certs/ca-cert.cfg | 89 +++++++++++++++++++++++++++++++++++ - tests/certs/tls-cert.cfg | 89 +++++++++++++++++++++++++++++++++++ - tests/wocky-test-connector-server.c | 12 ++-- - 5 files changed, 224 insertions(+), 8 deletions(-) - -commit 37e4a629ea89b01d744c73b5ead5b4886e0334a2 -Author: Vivek Dasmohapatra -Date: Wed Jul 1 17:05:05 2009 +0100 - - Remove noisy debug messsage. - - tests/wocky-connector-test.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 70a7d400fb89c83ef680cc1a2b96b0faca756af0 -Author: Vivek Dasmohapatra -Date: Wed Jul 1 16:12:00 2009 +0100 - - Wrong constant used for property. - - wocky/wocky-connector.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit d72b9ccf7a0cc8408d6f28264b288137a7bac1e0 -Author: Vivek Dasmohapatra -Date: Wed Jul 1 11:51:25 2009 +0100 - - Removed header signature for dead function wocky_connector_new_full - Allow resource to be set in wocky_connector_new as it is CONSTRUCT_ONLY now. - Update example connect,c to match new API. - - examples/connect.c | 2 +- - wocky/wocky-connector.c | 9 +++++++-- - wocky/wocky-connector.h | 11 +---------- - 3 files changed, 9 insertions(+), 13 deletions(-) - -commit 152fe152ab7ccb0bdff1ef3b3b3fbdbbe52a5502 -Author: Vivek Dasmohapatra -Date: Tue Jun 30 19:36:21 2009 +0100 - - Remove obsolete error codes now that we propagate low level errors up the chain - - wocky/wocky-connector.h | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -commit 39a38ad6ba2f19605ce08d8c317f4fe76d6526cb -Author: Vivek Dasmohapatra -Date: Tue Jun 30 19:31:46 2009 +0100 - - Split abort_connect into two cases: abort_connect_error for lower level - GErrors propagating up, and abort_c for errors originating in the connector. - - wocky/wocky-connector.c | 107 +++++++++++++++++++++++++--------------------- - 1 files changed, 58 insertions(+), 49 deletions(-) - -commit 3955e98dedd1ef01f7a46c72c467a1e9b9cab735 -Author: Vivek Dasmohapatra -Date: Tue Jun 30 17:49:00 2009 +0100 - - Sprinkle DEBUG statments liberally through the code so we can see what's - going on while working on it. - - wocky/wocky-connector.c | 22 ++++++++++++++++++++-- - 1 files changed, 20 insertions(+), 2 deletions(-) - -commit 0636a92e94bd3bea4c76f7bc290663bcedfc97e5 -Author: Vivek Dasmohapatra -Date: Tue Jun 30 16:31:23 2009 +0100 - - Change the way the error *tag is assigned. - strdup the node name when storing it as it is a temporary value. - - wocky/wocky-connector.c | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 64935e950f299bdbfe4b3040983746e5dd9166fa -Author: Vivek Dasmohapatra -Date: Tue Jun 30 16:27:55 2009 +0100 - - Change the way the ... section is added to the bind - iq stanza. - - wocky/wocky-connector.c | 24 ++++++++++++------------ - 1 files changed, 12 insertions(+), 12 deletions(-) - -commit 1f51b19483ca88bcf4293618292e4e045c33ef87 -Author: Vivek Dasmohapatra -Date: Tue Jun 30 16:18:14 2009 +0100 - - stanza is mandatory at this point. - - wocky/wocky-connector.c | 7 ++----- - 1 files changed, 2 insertions(+), 5 deletions(-) - -commit 20be1e4e14d5af05c91353db9e0a348630738336 -Author: Vivek Dasmohapatra -Date: Tue Jun 30 16:16:04 2009 +0100 - - Cast of object first in function. - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 36a31c8b4c6ccec4f990522adb3245ca8f3c68e2 -Author: Vivek Dasmohapatra -Date: Tue Jun 30 16:15:04 2009 +0100 - - Amended error message on missing/bogus feature stanza. - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 99fdb845fe6b029b1861443101d3b6fb9e030c51 -Author: Vivek Dasmohapatra -Date: Tue Jun 30 16:13:41 2009 +0100 - - Password must be set (but it can be empty). - Emit a warning if it is NULL, and set it to "". - - wocky/wocky-connector.c | 11 ++++++++--- - 1 files changed, 8 insertions(+), 3 deletions(-) - -commit b63d235a96c9dbf926447e0b8d866043517bbb3a -Author: Vivek Dasmohapatra -Date: Tue Jun 30 16:05:38 2009 +0100 - - resource is construct only - resource must be non-empty as well as non-NULL - - wocky/wocky-connector.c | 16 ++++++---------- - 1 files changed, 6 insertions(+), 10 deletions(-) - -commit ffb1ed9ced0574675fb61ef45af2486e6a4d65d4 -Author: Vivek Dasmohapatra -Date: Tue Jun 30 15:23:01 2009 +0100 - - remove time(NULL) component from random resource. - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 299f755966af70a37d948a25bc0d6328460c05a8 -Author: Vivek Dasmohapatra -Date: Tue Jun 30 15:21:27 2009 +0100 - - g_strdup_printf in make_resource. - - wocky/wocky-connector.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 5d7ef8477ca16fe62bbf75e77a053086470f8d35 -Author: Vivek Dasmohapatra -Date: Tue Jun 30 15:19:02 2009 +0100 - - Change to state_message + comment from review. - - wocky/wocky-connector.c | 23 ++++++++++++----------- - 1 files changed, 12 insertions(+), 11 deletions(-) - -commit 4cd1069dcf04677cc2e426d45dbe6dc2a6c91a8f -Author: Vivek Dasmohapatra -Date: Tue Jun 30 15:12:26 2009 +0100 - - Change base for auto-generated resources. - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 353c15fc1df8c6b8d8f7c0749d85a97a149f0cd9 -Author: Vivek Dasmohapatra -Date: Tue Jun 30 15:11:11 2009 +0100 - - Add ids to the iq set stanzas for bind and session - - wocky/wocky-connector.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit 65ca5081880dc5a730f4b6e51cf74dcdfcf79255 -Author: Vivek Dasmohapatra -Date: Tue Jun 30 14:54:35 2009 +0100 - - Implement bind/session feature advert support + handle iqs for same. - - tests/wocky-test-connector-server.c | 194 ++++++++++++++++++++++++++++++++--- - 1 files changed, 181 insertions(+), 13 deletions(-) - -commit a0a44e8a21f49493d620a61bfe2a8101ac74b145 -Author: Vivek Dasmohapatra -Date: Tue Jun 30 14:53:37 2009 +0100 - - follow _async/_finish convention, allow SASL test server to hand back - control so that the connector test server can re-use the SASL implementation. - - tests/wocky-test-sasl-auth-server.c | 62 ++++++++++++++++++++++++++++------ - tests/wocky-test-sasl-auth-server.h | 8 +++- - 2 files changed, 57 insertions(+), 13 deletions(-) - -commit 990e0d82901923632adc68815b6a5c754517a8dd -Author: Vivek Dasmohapatra -Date: Tue Jun 30 14:51:55 2009 +0100 - - Initialise char * to NULL. - - tests/wocky-connector-test.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit fd4eccc6d775244b4eede451142666d062cbff31 -Author: Vivek Dasmohapatra -Date: Mon Jun 29 16:01:49 2009 +0100 - - Unref the feature stanza in the dispose handler. - - wocky/wocky-connector.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit adc3b5dbc45050f02eb06edde48e2c8773f13ea2 -Author: Vivek Dasmohapatra -Date: Mon Jun 29 14:22:18 2009 +0100 - - Establish an XMPP session if required by the server. - - wocky/wocky-connector.c | 129 +++++++++++++++++++++++++++++++++++++++++++++- - wocky/wocky-connector.h | 4 ++ - wocky/wocky-namespaces.h | 3 + - 3 files changed, 135 insertions(+), 1 deletions(-) - -commit eaabec09df985b62acad3795a9b5e5c9145af8bc -Author: Vivek Dasmohapatra -Date: Mon Jun 29 13:24:34 2009 +0100 - - Connector test partially modified to match API changes. - Test does not work yet as test server does not advertise/support resource - binding, in progress. - - tests/wocky-connector-test.c | 26 +++++++++++++++----------- - 1 files changed, 15 insertions(+), 11 deletions(-) - -commit f0a4777ef61874bb09135806cc17fad4ec18ac00 -Author: Vivek Dasmohapatra -Date: Mon Jun 29 13:15:06 2009 +0100 - - Specific error for TLS negotiation failure - - wocky/wocky-connector.c | 2 +- - wocky/wocky-connector.h | 1 + - 2 files changed, 2 insertions(+), 1 deletions(-) - -commit 1c9b71771d8ff8ef4cd873113bf6877a7841f891 -Author: Vivek Dasmohapatra -Date: Mon Jun 29 13:14:30 2009 +0100 - - xmpp_init re-used every time we (re-)initialise the stream insteadt of - calling wocky_xmpp_connection_send_open_async directly. - - Added features property to cache XMPP features stanza - - Erase cached features whenever we (re-)initialise the stream. - - wocky/wocky-connector.c | 42 +++++++++++++++++++++++++++--------------- - 1 files changed, 27 insertions(+), 15 deletions(-) - -commit fa79d6a25d06f990719087fbf433836a72ddb140 -Author: Vivek Dasmohapatra -Date: Fri Jun 26 18:15:02 2009 +0100 - - Return jid received from server in _finish call. - Update example code for new _finish signature. - - examples/connect.c | 6 ++++-- - wocky/wocky-connector.c | 10 +++++++++- - wocky/wocky-connector.h | 3 ++- - 3 files changed, 15 insertions(+), 4 deletions(-) - -commit 89ed5c796e8828b56adb4febcc872c36e12e67fa -Author: Vivek Dasmohapatra -Date: Fri Jun 26 17:53:58 2009 +0100 - - Correct description of XMPP login flow at top of file. - Add extra section to end of login process to handle XMPP resource binding. - - wocky/wocky-connector.c | 217 +++++++++++++++++++++++++++++++++++++++------- - wocky/wocky-connector.h | 8 ++- - wocky/wocky-namespaces.h | 3 + - 3 files changed, 194 insertions(+), 34 deletions(-) - -commit 0150ab7df5d7694aca126b51db803f8e9317c044 -Author: Vivek Dasmohapatra -Date: Fri Jun 26 17:53:00 2009 +0100 - - Fix style issues in wocky_xmpp_node_get_first_child - - wocky/wocky-xmpp-node.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit edeae35e5f457801eba4b3f7105086e7ac487f74 -Author: Vivek Dasmohapatra -Date: Fri Jun 26 17:48:55 2009 +0100 - - Add core, TAGS *report.xml to gitignore - - .gitignore | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 779a995a4488b1d6d1fbb54e7a899cd2094206bd -Author: Vivek Dasmohapatra -Date: Fri Jun 26 17:32:00 2009 +0100 - - Utility function: get first node child. - - wocky/wocky-xmpp-node.c | 8 ++++++++ - wocky/wocky-xmpp-node.h | 2 ++ - 2 files changed, 10 insertions(+), 0 deletions(-) - -commit 03663c6d95a5a6fe8c20391798a401965724075d -Author: Vivek Dasmohapatra -Date: Thu Jun 25 18:59:51 2009 +0100 - - Fixed abort_connect infrastructure to be more in-line with normal usage. - Addressed various mem leaks on calls to abort_connect. - - wocky/wocky-connector.c | 182 ++++++++++++++++++++++++++-------------------- - 1 files changed, 103 insertions(+), 79 deletions(-) - -commit d85c65c5c1acd81ce6f9a09bbfa279eef4b6e201 -Author: Vivek Dasmohapatra -Date: Thu Jun 25 18:56:49 2009 +0100 - - Update example to match new API signatures. - - examples/connect.c | 10 +++------- - 1 files changed, 3 insertions(+), 7 deletions(-) - -commit 5ebbcbc5c82bc1372919e9f454c07a3b459cd397 -Author: Vivek Dasmohapatra -Date: Thu Jun 25 14:47:33 2009 +0100 - - Style, whitespace, naming convention and function signature changes from review. - - wocky/wocky-connector.c | 413 ++++++++++++++++++++++------------------------- - wocky/wocky-connector.h | 39 +++-- - 2 files changed, 213 insertions(+), 239 deletions(-) - -commit 30563d5d57753139d23747302e9a9070c5c50a57 -Author: Vivek Dasmohapatra -Date: Thu Jun 25 14:46:38 2009 +0100 - - Typo in .gitignore - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit aa4d242f886e01522142b80be255209a496a8f5d -Author: Vivek Dasmohapatra -Date: Wed Jun 24 14:28:59 2009 +0100 - - ifdef out the fakedns debugging, pretty sure it's working as advertised. - - tests/test-resolver.c | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -commit 897887f5e5b10905ce2b4d514216b2af7e06741a -Author: Vivek Dasmohapatra -Date: Wed Jun 24 14:19:33 2009 +0100 - - Duff header file entry removed. - - tests/Makefile.am | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 6a6920e91b10e0cf1814f8797fddd7f9d8fe23c2 -Author: Vivek Dasmohapatra -Date: Wed Jun 24 14:19:13 2009 +0100 - - Style & whitespace fixes. - - tests/test-resolver.c | 11 ++++++----- - tests/wocky-connector-test.c | 10 +++++----- - tests/wocky-test-sasl-auth-server.c | 4 ++-- - 3 files changed, 13 insertions(+), 12 deletions(-) - -commit 04f7f9f13c980aac1969290464027befd23c8468 -Author: Vivek Dasmohapatra -Date: Wed Jun 24 14:09:33 2009 +0100 - - Add new connector test suite (only first test so far) - Let Makefile.am know about new connector test - Pattern rule to allow individual test-suites to be run. - - tests/Makefile.am | 20 ++++- - tests/wocky-connector-test.c | 235 ++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 254 insertions(+), 1 deletions(-) - -commit 0793348f6af655869a4f232637b402d85ceabb84 -Author: Vivek Dasmohapatra -Date: Wed Jun 24 14:07:42 2009 +0100 - - More DEBUG statements. - Check more internal members for NULL before unrefing. - Only free the xml stanza in the handler dispatcher if we didn't find - a suitable handler, otherwise it's the handler's job to clean it up. - - tests/wocky-test-connector-server.c | 25 +++++++++++++++++-------- - 1 files changed, 17 insertions(+), 8 deletions(-) - -commit 27a5d96a4c08f8051a50c74a8f9d6e500939832f -Author: Vivek Dasmohapatra -Date: Wed Jun 24 14:05:54 2009 +0100 - - Check the error member is set before unrefing it. - - wocky/wocky-connector.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 340d86988a4ed892eb42d160549de270ecb6b31c -Author: Vivek Dasmohapatra -Date: Wed Jun 24 14:04:58 2009 +0100 - - Check some priv-> members for NULL before unrefing them. - - tests/wocky-test-sasl-auth-server.c | 18 ++++++++++++------ - 1 files changed, 12 insertions(+), 6 deletions(-) - -commit 92517034b508caece0ebe13ca7ff253d3e07985e -Author: Vivek Dasmohapatra -Date: Fri Jun 19 18:35:11 2009 +0100 - - Resolver class that lets us patch in fake SRV and A records for a domain - on the fly. Needed for the connector tests. - - tests/test-resolver.c | 325 +++++++++++++++++++++++++++++++++++++++++++++++++ - tests/test-resolver.h | 68 ++++++++++ - 2 files changed, 393 insertions(+), 0 deletions(-) - -commit 3dd3b2e7b83081d6cffb5c8631493efd04f55de4 -Author: Vivek Dasmohapatra -Date: Fri Jun 19 17:46:52 2009 +0100 - - Check in test plan for connector. - - tests/connector-test-plan.txt | 77 +++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 77 insertions(+), 0 deletions(-) - -commit 88702faf56df2a1683eb21bb651085fe09d0b494 -Author: Vivek Dasmohapatra -Date: Tue Jun 16 19:32:33 2009 +0100 - - Reference use of new test-connector-server code. - - tests/wocky-dummy-xmpp-server.c | 103 +++++++++++++++++++++++++++++++++++++++ - 1 files changed, 103 insertions(+), 0 deletions(-) - -commit f7d9bcd29eb61ab08099fb8225995d8a273e6c3a -Author: Vivek Dasmohapatra -Date: Tue Jun 16 19:31:38 2009 +0100 - - Implement a simplistic TLS/SASL capable server for use in tests. - (Implementation of problem conditions not implemented yet, to be added). - - tests/wocky-test-connector-server.c | 89 ++++++++++++++++++++++++---------- - 1 files changed, 63 insertions(+), 26 deletions(-) - -commit 025f94637f7ea5c277cccd55d4ba04db97460251 -Author: Vivek Dasmohapatra -Date: Tue Jun 16 19:29:31 2009 +0100 - - Test for xml stanza validity was reversed. - DEBUG the host/port connect details. - - wocky/wocky-connector.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 32cd7a984868ba704ba618acf7d374ee8d2f7664 -Author: Vivek Dasmohapatra -Date: Tue Jun 16 19:19:17 2009 +0100 - - Use new wocky_connector_new constructor. - Minor debugging tidyups. - - examples/connect.c | 9 +++------ - 1 files changed, 3 insertions(+), 6 deletions(-) - -commit 7d32a1aac743733aacb95dc95ae88e880f4f9a4c -Author: Vivek Dasmohapatra -Date: Mon Jun 15 14:20:15 2009 +0100 - - g_object_new needs its arglist to be NULL terminated. - - wocky/wocky-connector.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit cf4b65601d09f81821f8ee726d567eeeff52626f -Author: Vivek Dasmohapatra -Date: Thu Jun 11 18:49:50 2009 +0100 - - 1 arg per line in function signatures. - - tests/wocky-test-connector-server.c | 20 ++++++++++++++------ - tests/wocky-test-connector-server.h | 7 +++++-- - 2 files changed, 19 insertions(+), 8 deletions(-) - -commit 3084eae34c36f0aca0e5f08fcdcccb62b0d6e652 -Author: Vivek Dasmohapatra -Date: Thu Jun 11 18:41:12 2009 +0100 - - Removed 'tls' node variable from xmpp_features_cb - - wocky/wocky-connector.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit 8b39bee9a61c3a276fe3877e723fa33943814399 -Author: Vivek Dasmohapatra -Date: Thu Jun 11 18:36:16 2009 +0100 - - Function signatures reformatted to be 1 arg per line. - - wocky/wocky-connector.c | 36 ++++++++++++++++++++++++++---------- - wocky/wocky-connector.h | 6 ++++-- - 2 files changed, 30 insertions(+), 12 deletions(-) - -commit 6fde7bb9a614c86a9c8d240d22e57cedc3cde941 -Author: Vivek Dasmohapatra -Date: Thu Jun 11 18:29:04 2009 +0100 - - Rename error constant more accurately. - Abort on connect_async if our state indicates we are already underway. - - wocky/wocky-connector.c | 10 +++++++++- - wocky/wocky-connector.h | 2 +- - 2 files changed, 10 insertions(+), 2 deletions(-) - -commit caa4950f376eb6287d9747aa627500c375737681 -Author: Vivek Dasmohapatra -Date: Thu Jun 11 18:13:45 2009 +0100 - - g_assert_not_reached + explanatory comment in xmpp_init_recv_cb - - minor whitespace cleanup. - - wocky/wocky-connector.c | 10 +++++++--- - 1 files changed, 7 insertions(+), 3 deletions(-) - -commit f26489168df374fca73918673f7fd8b7616c0350 -Author: Vivek Dasmohapatra -Date: Thu Jun 11 18:06:18 2009 +0100 - - Comments explaining the logic by which we choose XMPP server hosts to talk to. - - wocky/wocky-connector.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit f6350456ab3a76aa6cbfa2138064b55e96c2d3df -Author: Vivek Dasmohapatra -Date: Thu Jun 11 17:59:30 2009 +0100 - - Renamed finalise to match incorrect spelling in glib standard. - - wocky/wocky-connector.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 357e3a1591e123a267d13814f8235d2bcc4e131c -Author: Vivek Dasmohapatra -Date: Thu Jun 11 17:58:11 2009 +0100 - - Define _new and _new_full constructors as per review. - - wocky/wocky-connector.c | 33 ++++++++++++++++++++++++++++++++- - wocky/wocky-connector.h | 11 +++++++++++ - 2 files changed, 43 insertions(+), 1 deletions(-) - -commit 597f870b6028156c9dd0d533eace2ae46b535149 -Author: Vivek Dasmohapatra -Date: Thu Jun 11 16:50:55 2009 +0100 - - Style cleanups. - Use new server-side starttls support to initialise TLS upon - receipt of client request. - Hand over to sasl auth server on receipt of -Date: Thu Jun 11 16:46:53 2009 +0100 - - Finish modifying wocky-test-sasl-auth-server.c so that it can take - over an existing WockyXmppConnection at the point where an -Date: Thu Jun 11 16:02:57 2009 +0100 - - Unnecessary if () removed. - - wocky/wocky-connector.c | 11 +++-------- - 1 files changed, 3 insertions(+), 8 deletions(-) - -commit 883038030d8ea49fd1c7f238de9f7a351603ff54 -Author: Vivek Dasmohapatra -Date: Thu Jun 11 16:02:18 2009 +0100 - - whitespace cleanup. - - examples/connect.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2b9277ba2d080219e5ef3e1343841cad48aceed7 -Author: Vivek Dasmohapatra -Date: Thu Jun 11 15:07:02 2009 +0100 - - Begin modification of wocky-test-sasl-auth… et al to allow its - funcitonality to be shared by wocky-test-connector… and any other - tests that need it: Exposed feature sasl mechanism population - to externl users, altered test_sasl_auth_server_new so it does not - immediately try to take over the test XMPP connection. - - tests/wocky-test-sasl-auth-server.c | 103 ++++++++++++++++++++++------------- - tests/wocky-test-sasl-auth-server.h | 8 +++- - tests/wocky-test-sasl-auth.c | 4 +- - 3 files changed, 73 insertions(+), 42 deletions(-) - -commit 9c44590b67848d35a65fe72b9542a97b32fd5bdd -Author: Vivek Dasmohapatra -Date: Thu Jun 11 12:06:07 2009 +0100 - - Renamed next_state to more descriptive xmpp_init, added comments describing - XMPP stream init stages therein. - - tests/wocky-test-connector-server.c | 16 ++++++++++------ - 1 files changed, 10 insertions(+), 6 deletions(-) - -commit 38e422bae84cec26e0259c0fe49890160bbd0356 -Author: Vivek Dasmohapatra -Date: Wed Jun 10 18:57:20 2009 +0100 - - Dummy XMPP Server for Connector tests (not complete yet) - Will eventually absorb the sasl server, which will provide - the sasl portion of the tests, but will no longer need to - do the rest of the stream open etc. - - tests/Makefile.am | 2 + - tests/wocky-test-connector-server.c | 308 +++++++++++++++++++++++++++++++++++ - tests/wocky-test-connector-server.h | 74 +++++++++ - 3 files changed, 384 insertions(+), 0 deletions(-) - -commit 23d996360c91b43b182158a3a81dde97d0c23e11 -Author: Vivek Dasmohapatra -Date: Wed Jun 10 18:54:57 2009 +0100 - - Add debug flag for connector - Last round of cleanups introduced a couple of build warnings/breakages. Fixed. - - wocky/wocky-connector.c | 12 ++++++++++-- - wocky/wocky-debug.h | 1 + - 2 files changed, 11 insertions(+), 2 deletions(-) - -commit 6c45f6736242b19d86d03b33bc4b2dce685309c4 -Author: Vivek Dasmohapatra -Date: Tue Jun 9 18:24:32 2009 +0100 - - abort_connect uses g_simple_async_result_complete_in_idle now. - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 965083217bffc0ed9a91e7f382200b43f31ed484 -Author: Vivek Dasmohapatra -Date: Tue Jun 9 18:21:30 2009 +0100 - - DEBUG preferred over g_warning - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 177d9677564f0de019152bfbef0f4fe9e7ad2881 -Author: Vivek Dasmohapatra -Date: Tue Jun 9 18:20:29 2009 +0100 - - Stray whitespace. - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 87b723a54bc7be661e3fd1cfa54c6290d2b64b79 -Author: Vivek Dasmohapatra -Date: Tue Jun 9 18:18:58 2009 +0100 - - wocky_strdiff preferred over strcmp - - wocky/wocky-connector.c | 18 ++++++++++++------ - 1 files changed, 12 insertions(+), 6 deletions(-) - -commit d9402fe39326b7ee330a5ad19a6545a5ce6124e8 -Author: Vivek Dasmohapatra -Date: Tue Jun 9 18:07:24 2009 +0100 - - Explicit test for ptr == NULL - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a2eef74bdb45c4ed1c58d0e0e2148a5921956388 -Author: Vivek Dasmohapatra -Date: Tue Jun 9 18:06:15 2009 +0100 - - Removed domain and numeric code from error messages (per review). - - wocky/wocky-connector.c | 10 +++------- - 1 files changed, 3 insertions(+), 7 deletions(-) - -commit 19e4414a6d3addae37c2bebfa225ea5730688956 -Author: Vivek Dasmohapatra -Date: Tue Jun 9 18:02:26 2009 +0100 - - DEBUG preferred over g_message - - wocky/wocky-connector.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 452146fc1d6052b8156d761a4c72d5fb7b0b77b6 -Author: Vivek Dasmohapatra -Date: Tue Jun 9 18:01:15 2009 +0100 - - Comment explaining 'host' in wocky_connector_connect_async - - wocky/wocky-connector.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit e6dcb5a2ef999c158c82e72117312205017d6c52 -Author: Vivek Dasmohapatra -Date: Tue Jun 9 17:59:45 2009 +0100 - - Typo in comment. - - Moved gfree() calls to finalise method (from dispose). - - wocky/wocky-connector.c | 18 +++++++++++------- - 1 files changed, 11 insertions(+), 7 deletions(-) - -commit 9c16b186fa774ec0b1c45bd9565093db7c77c4e5 -Author: Vivek Dasmohapatra -Date: Tue Jun 9 17:47:08 2009 +0100 - - More style changes per review. - - wocky/wocky-connector.c | 101 ++++++++++++++++++++++++----------------------- - 1 files changed, 52 insertions(+), 49 deletions(-) - -commit 382ef04cb5fd1af9e0535c68c4207b67e300a467 -Author: Vivek Dasmohapatra -Date: Tue Jun 9 17:33:47 2009 +0100 - - Explain WOCKY_CONNECTOR_CHOOSE_BY_STATE macro. - - wocky/wocky-connector.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit 858060449b818bb8f4223a28a4c9fdcd53f821e6 -Author: Vivek Dasmohapatra -Date: Tue Jun 9 17:26:28 2009 +0100 - - Use g_object_new now that wocky_connector_new is gone. - - examples/connect.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 8c98ef4cd5c1378c33004a6d48e987fc72fe14e2 -Author: Vivek Dasmohapatra -Date: Tue Jun 9 17:26:05 2009 +0100 - - finalise and dispose methods should be static. - - wocky/wocky-connector.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit a5ff119131f8309691635742af685861be799e14 -Author: Vivek Dasmohapatra -Date: Tue Jun 9 17:25:36 2009 +0100 - - Style changes from review, unexport a couple of functions - which should have been private. - - Remove wocky_connector_new as per review. - - wocky/wocky-connector.h | 30 +++++++++++------------------- - 1 files changed, 11 insertions(+), 19 deletions(-) - -commit 6c0b35c2c0fa0c194ccb4abc1cbefcec9dbf6cc8 -Author: Vivek Dasmohapatra -Date: Thu Jun 4 19:14:15 2009 +0100 - - Add command line parameter to choose 'raw' vs 'connector' XMPP connect. - Add code for 'connector' XMPP connect using wocky connector object. - - examples/connect.c | 32 ++++++++++++++++++-------------- - 1 files changed, 18 insertions(+), 14 deletions(-) - -commit 3790fb59b23c02299339ff73e767a318fbc9b919 -Author: Vivek Dasmohapatra -Date: Thu Jun 4 19:12:51 2009 +0100 - - Fix wocky_connector_new to correctly call g_object_new - Fix xmpp_features_cb logic for case when we have already starttls'd - password/jid property overwrite bug fixed - default XMPP port set to 5222 - - wocky/wocky-connector.c | 42 +++++++++++++++++++++++++++++------------- - wocky/wocky-connector.h | 3 ++- - 2 files changed, 31 insertions(+), 14 deletions(-) - -commit cfcb2772dcba0c227ecf11ee247f179030fd1b1b -Author: Vivek Dasmohapatra -Date: Thu Jun 4 13:43:20 2009 +0100 - - First (working?) draft of connector with standard async/finish - connect mechanism and updated exmaple connect script. - - examples/connect.c | 51 ++++++++++++-- - wocky/wocky-connector.c | 172 ++++++++++++++++++++++++++--------------------- - wocky/wocky-connector.h | 7 +- - 3 files changed, 142 insertions(+), 88 deletions(-) - -commit 475d37909db72097cfec759b2b01d43a77c88af2 -Author: Vivek Dasmohapatra -Date: Wed Jun 3 19:57:20 2009 +0100 - - Use standard gasync callback mechanism for aborts, with GErrors - check in header file for connector - Add to makefile. - Nearly working. - - wocky/Makefile.am | 2 + - wocky/wocky-connector.c | 540 ++++++++++++++++++++++++++++++----------------- - wocky/wocky-connector.h | 113 ++++++++++ - 3 files changed, 457 insertions(+), 198 deletions(-) - -commit 7ff5c9dd7fbe707a53d060c3c7654b1c4ff0a98c -Author: Vivek Dasmohapatra -Date: Tue Jun 2 11:33:43 2009 +0100 - - Add the quark for connector's error domain. - - wocky/wocky-connector.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit c5a2627ea66a7f4ef9f5107d5e67577e6dc3de49 -Author: Vivek Dasmohapatra -Date: Mon Jun 1 16:48:03 2009 +0100 - - Fix conditionals to be explicit comparisons for non booleans, - except where prior examples indicate this is not house style. - - More paren style fixups. - - wocky/wocky-connector.c | 37 +++++++++++++++++++------------------ - 1 files changed, 19 insertions(+), 18 deletions(-) - -commit 2e845740d5053db97c35cc9ac5e26e4a00b8d527 -Author: Vivek Dasmohapatra -Date: Mon Jun 1 16:06:48 2009 +0100 - - Typo, missing member in LHS of assignment. - - wocky/wocky-connector.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 19c37059f9831ff2a43fe6152fef3d8558217002 -Author: Vivek Dasmohapatra -Date: Mon Jun 1 15:56:43 2009 +0100 - - Whitespace cleanup. - Paren style cleanup. - - wocky/wocky-connector.c | 292 +++++++++++++++++++++++----------------------- - 1 files changed, 146 insertions(+), 146 deletions(-) - -commit a9b92bc922f94e33f06d6ca9f195a4471a3f515a -Author: Vivek Dasmohapatra -Date: Mon Jun 1 15:29:18 2009 +0100 - - comment style // → /* */ - removed WOCKY_CONNECTOR_UNPACK macro. - - wocky/wocky-connector.c | 117 ++++++++++++++++++++++++++--------------------- - 1 files changed, 65 insertions(+), 52 deletions(-) - -commit 36c461f9c3da62b179e5581cc8e8262eff88e8ec -Author: Vivek Dasmohapatra -Date: Mon Jun 1 11:23:46 2009 +0100 - - Rough (almost complete) draft of wocky connector. - - wocky/wocky-connector.c | 608 +++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 608 insertions(+), 0 deletions(-) - -commit b16a9a948ce8086aa9aeec9c14ccbb1762cce335 -Author: Guillaume Desmottes -Date: Tue Jul 14 17:20:51 2009 +0100 - - add test_close_simultanously - - tests/wocky-porter-test.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 54 insertions(+), 0 deletions(-) - -commit af30ecf5fad7d8f975ec24fa8f0d051454e0c4fd -Author: Guillaume Desmottes -Date: Tue Jul 14 17:20:06 2009 +0100 - - Don't complete close operation if the close stanza has not been sent yet - - wocky/wocky-porter.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1e02cd7bdc0536dba4402c67663963484bacd819 -Author: Guillaume Desmottes -Date: Tue Jul 14 17:18:37 2009 +0100 - - complete_close: set close_result to NULL before unreffing it - - If the result owns the last reference on the porter, it will be - destroyed and the dispose function will try to unref it too. - - wocky/wocky-porter.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 38bee928e048f9d5fd5d04590a52a06f2a05c7e7 -Author: Guillaume Desmottes -Date: Mon Jul 13 15:00:48 2009 +0100 - - wocky-porter-test: add test_unref_when_closed - - tests/wocky-porter-test.c | 40 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 40 insertions(+), 0 deletions(-) - -commit 52b07eda1b27c3d77dda2ed233e321497081e510 -Author: Guillaume Desmottes -Date: Tue Jul 14 11:57:38 2009 +0100 - - stanza_received_cb: ensure that the porter stays alive during the treatment of the error or stanza - - wocky/wocky-porter.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 91bfd7438e4f14ee8f7859d58e38b2be5a6c9d45 -Author: Guillaume Desmottes -Date: Mon Jul 13 14:49:25 2009 +0100 - - teardown_test: check if porters have already been unreffed - - tests/wocky-test-helper.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit bc8c40454043b536867fb763148897f309ea8076 -Author: Jonny Lamb -Date: Tue Jul 14 12:07:17 2009 +0100 - - Test sending an reply to an IQ with no "to" attribute. - - Signed-off-by: Jonny Lamb - - tests/wocky-xmpp-stanza-test.c | 24 ++++++++++++++++++++++++ - 1 files changed, 24 insertions(+), 0 deletions(-) - -commit 9d815d0d07ffa2f4bec084e41999e6980928b4a9 -Author: Jonny Lamb -Date: Tue Jul 14 12:01:04 2009 +0100 - - It's fine for IQs to have no "to" attribute. - - Signed-off-by: Jonny Lamb - - wocky/wocky-xmpp-stanza.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 43ddc3fbc7e02c7905361d749ae9c606cc944a70 -Author: Guillaume Desmottes -Date: Thu Jul 2 17:23:14 2009 +0100 - - test_send_iq: test sending a reply without id - - tests/wocky-porter-test.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -commit d436196deca91660702aca5d3d4930e4ff17290a -Author: Guillaume Desmottes -Date: Thu Jul 2 17:23:01 2009 +0100 - - handle_iq_reply: ignore reply without id - - wocky/wocky-porter.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 5b472f2cc0ec48664702b067981bc06cfd97fe4d -Author: Guillaume Desmottes -Date: Thu Jul 2 14:46:35 2009 +0100 - - add test_send_iq_server - - tests/wocky-porter-test.c | 88 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 88 insertions(+), 0 deletions(-) - -commit b96a2e212eefacbd0faf77d9beb795aece37000a -Author: Guillaume Desmottes -Date: Thu Jul 2 14:46:23 2009 +0100 - - Allow to send IQ without a recipient - - wocky/wocky-porter.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 75ac0432ad2d6cab23607eaa2b087569bc74401b -Author: Guillaume Desmottes -Date: Thu Jul 2 12:34:16 2009 +0100 - - test_send_invalid_iq: sending an IQ without a recipient is actually valid - - tests/wocky-porter-test.c | 10 ---------- - 1 files changed, 0 insertions(+), 10 deletions(-) - -commit 4717b4ea04f5e4c17b71ff8a6c1960d737fc0803 -Author: Sjoerd Simons -Date: Thu Jul 2 15:03:03 2009 +0100 - - Ignore warnings from the parser - - wocky/wocky-xmpp-reader.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 3419d60c7e3dc24dd2b6f6c77d0155c6f65c990d -Author: Sjoerd Simons -Date: Thu Jul 2 14:49:33 2009 +0100 - - Add a test for parsing the vcard namespace - - tests/wocky-xmpp-reader-test.c | 46 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 46 insertions(+), 0 deletions(-) - -commit fa10cb3d750f503492aace17320761f95202aa26 -Author: Jonny Lamb -Date: Thu Jul 2 14:57:31 2009 +0100 - - wocky_xmpp_stanza_build's spec argument should be of type WockyBuildTag, not guint. - - Signed-off-by: Jonny Lamb - - wocky/wocky-xmpp-stanza.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 33e5bf5b1f9597322b671761d6d2bd79f09e43b7 -Author: Jonny Lamb -Date: Thu Jul 2 12:52:25 2009 +0100 - - Updated .gitignore. - - Signed-off-by: Jonny Lamb - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit e27678c589afa336366bfa02dd15679285648ba3 -Author: Jonny Lamb -Date: Thu Jul 2 12:09:14 2009 +0100 - - Add some porter tests to test handling unset from attribute stanzas. - - Signed-off-by: Jonny Lamb - - tests/wocky-porter-test.c | 72 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 72 insertions(+), 0 deletions(-) - -commit c6dc106c85ea2931b52d426e81ce2e9db7244bf7 -Author: Jonny Lamb -Date: Thu Jul 2 11:10:07 2009 +0100 - - Don't discard the stanza if the from attribute is missing. - - Signed-off-by: Jonny Lamb - - wocky/wocky-porter.c | 12 +++++------- - 1 files changed, 5 insertions(+), 7 deletions(-) - -commit 43d8fcaae57d93ea2fb3dc0a8939dce0b068d392 -Author: Guillaume Desmottes -Date: Thu Jul 2 11:39:04 2009 +0100 - - send_cancelled_cb: gio convention is to complete cancel callback in idle - - wocky/wocky-porter.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bf24846fa5d8220cdfe5b451c97ffe5cf808f628 -Merge: 2f77013 9d41bac -Author: Guillaume Desmottes -Date: Wed Jul 1 15:36:14 2009 +0100 - - Merge branch 'master' of git+ssh://git.collabora.co.uk/git/wocky - -commit 2f77013fb3f9a56b7d698969dcfffa8e3d4f14ea -Author: Guillaume Desmottes -Date: Wed Jul 1 14:35:33 2009 +0100 - - wocky_porter_send_iq_finish returns a reffed stanza - - tests/wocky-porter-test.c | 1 + - wocky/wocky-porter.c | 6 +++++- - 2 files changed, 6 insertions(+), 1 deletions(-) - -commit 9d41bac3ef7bc2932cf0b6b6c7fa47615362d7d4 -Author: Jonny Lamb -Date: Wed Jul 1 15:16:16 2009 +0100 - - Add flymake rules to wocky Makefiles. - - Signed-off-by: Jonny Lamb - - tools/Makefile.am | 3 ++- - tools/flymake.mk | 4 ++++ - wocky/Makefile.am | 1 + - 3 files changed, 7 insertions(+), 1 deletions(-) - -commit 8828e61ed4d33c48ba8457c9de296b783de865dc -Author: Jonny Lamb -Date: Sat Apr 25 15:22:28 2009 +0100 - - Shave wocky's build. - - Signed-off-by: Jonny Lamb - - .gitignore | 3 + - autogen.sh | 9 ++++ - configure.ac | 4 ++ - m4/Makefile.am | 3 +- - m4/shave.m4 | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ - shave-libtool.in | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - shave.in | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - tools/Makefile.am | 3 +- - tools/shave.mk | 1 + - wocky/Makefile.am | 12 +++-- - 10 files changed, 348 insertions(+), 7 deletions(-) - -commit 356c1ab206aa8a84e2635d170ca9ba2bb3e7a433 -Author: Guillaume Desmottes -Date: Tue Jun 30 17:49:00 2009 +0100 - - wocky-xmpp-connection-test: add test_recv_simple_message_in_one_chunk - - tests/wocky-xmpp-connection-test.c | 37 ++++++++++++++++++++++++++++++++++++ - 1 files changed, 37 insertions(+), 0 deletions(-) - -commit 32395928ff99abc56083896e7d6ac8d0d4e743a7 -Author: Guillaume Desmottes -Date: Wed Jul 1 10:24:03 2009 +0100 - - use input_is_closed function instead of the priv->input_closed variable - - wocky/wocky-xmpp-connection.c | 21 +++++++++++---------- - 1 files changed, 11 insertions(+), 10 deletions(-) - -commit 3f2743e4a0e799765ab99ba413ab9b0e9ddc6ff0 -Author: Guillaume Desmottes -Date: Tue Jun 30 17:32:04 2009 +0100 - - wocky_xmpp_connection_recv_stanza_async: succeed immediately if there is already a stanza ready - - wocky/wocky-xmpp-connection.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit 84198bf2e9198ecd864a8c334ad145f5edeea513 -Author: Guillaume Desmottes -Date: Mon Jun 29 13:40:51 2009 +0100 - - add FIXME about g_cancellable_disconnect - - wocky/wocky-porter.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 371ad0e3356de514c5f780b407e94716cc0d5552 -Author: Sjoerd Simons -Date: Sat Jun 27 19:41:26 2009 +0100 - - Implement async writing to prevent race conditions - - tests/wocky-test-stream.c | 73 ++++++++++++++++++++++++++++++++------------- - 1 files changed, 52 insertions(+), 21 deletions(-) - -commit eb76a78ad499aa6a513fc567b9abd053e8a5c481 -Author: Guillaume Desmottes -Date: Mon Jun 29 13:34:57 2009 +0100 - - wocky_porter_send_async: don't connect the cancelled signal if we just sent the stanza - - wocky/wocky-porter.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 2f32243f9db6cc4e75aec29ff1e75ee9b9fc6081 -Author: Guillaume Desmottes -Date: Mon Jun 29 13:29:13 2009 +0100 - - Use g_cancellable_connect - - We don't use g_cancellable_disconnect for now because it raises a - deadlock in our code (#587300) - - wocky/wocky-porter.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 569fb339bf8cfa772aae53e72c51f2c7ae24734f -Author: Guillaume Desmottes -Date: Mon Jun 29 12:33:57 2009 +0100 - - test_cancel_sent_stanza_cancelled: wocky_porter_send_finish returns success if the stanza was actually sent - - tests/wocky-porter-test.c | 8 +++----- - 1 files changed, 3 insertions(+), 5 deletions(-) - -commit d34c92758323300164afd5b09a22932cc1823ae4 -Author: Guillaume Desmottes -Date: Mon Jun 29 12:32:02 2009 +0100 - - send_head_stanza: delegate the handling of the cancellable to lower layer when we start sending the stanza - - wocky/wocky-porter.c | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) - -commit 63fb71126dc28e35acfe30a6fa6dd09d4a19a597 -Author: Guillaume Desmottes -Date: Mon Jun 29 12:34:48 2009 +0100 - - rename WockyXmppScheduler to WockyPorter - - .gitignore | 2 +- - tests/Makefile.am | 6 +- - tests/wocky-porter-test.c | 1596 +++++++++++++++++++++++++++++++++++++ - tests/wocky-test-helper.c | 20 +- - tests/wocky-test-helper.h | 10 +- - tests/wocky-xmpp-scheduler-test.c | 1596 ------------------------------------- - wocky/Makefile.am | 4 +- - wocky/wocky-debug.c | 2 +- - wocky/wocky-debug.h | 2 +- - wocky/wocky-porter.c | 1115 ++++++++++++++++++++++++++ - wocky/wocky-porter.h | 141 ++++ - wocky/wocky-xmpp-scheduler.c | 1115 -------------------------- - wocky/wocky-xmpp-scheduler.h | 141 ---- - 13 files changed, 2875 insertions(+), 2875 deletions(-) - -commit ddaea75f12183945f9ecf545d96fa644c9a82c3a -Author: Guillaume Desmottes -Date: Thu Jun 25 17:56:40 2009 +0100 - - update gitignore - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 1da8026c90d86494ded5cb1d50f8fb5023296d4a -Author: Guillaume Desmottes -Date: Thu Jun 25 17:56:19 2009 +0100 - - generate wocky/wocky-uninstalled.pc - - configure.ac | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 8599e4f0b48f75ae8030bdd01eb1095e4a186c03 -Author: Guillaume Desmottes -Date: Thu Jun 25 17:56:10 2009 +0100 - - add wocky-uninstalled.pc.in - - wocky/wocky-uninstalled.pc.in | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit d1f37075cb7104cedb21fdcfa81ac807d881b4e9 -Author: Guillaume Desmottes -Date: Thu Jun 25 17:37:20 2009 +0100 - - configure.ac: fix version - - configure.ac | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit bcba747e07b1f425bbd505222e80a3f1d7902a97 -Author: Guillaume Desmottes -Date: Fri Jun 26 10:13:13 2009 +0100 - - rename wocky_xmpp_scheduler_send_full_finish to wocky_xmpp_scheduler_send_finish - - tests/wocky-xmpp-scheduler-test.c | 14 +++++++------- - wocky/wocky-xmpp-scheduler.c | 8 ++++---- - wocky/wocky-xmpp-scheduler.h | 2 +- - 3 files changed, 12 insertions(+), 12 deletions(-) - -commit 24ce2601032a498a9d87c9e0bde9cbc89f3be9ec -Author: Guillaume Desmottes -Date: Thu Jun 25 12:01:25 2009 +0100 - - add test_send_invalid_iq - - tests/wocky-xmpp-scheduler-test.c | 68 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 68 insertions(+), 0 deletions(-) - -commit ac3ce92c60f34ef3a7e21cdf4260dc3615af7021 -Author: Guillaume Desmottes -Date: Thu Jun 25 12:01:20 2009 +0100 - - wocky_xmpp_scheduler_send_iq_async: check the recipient before the ID so we won't leak it if recipient is invalid - - wocky/wocky-xmpp-scheduler.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit e2145cf38054ae1ba6089a0c7dabfb472e22539a -Author: Guillaume Desmottes -Date: Thu Jun 25 11:44:42 2009 +0100 - - add test_handler_filter - - tests/wocky-xmpp-scheduler-test.c | 80 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 80 insertions(+), 0 deletions(-) - -commit 946cfd90a9726928b5750c7836fc540a353263be -Author: Guillaume Desmottes -Date: Thu Jun 25 11:44:30 2009 +0100 - - handlers now return TRUE if they actually handled the stanza - - tests/wocky-xmpp-scheduler-test.c | 42 ++++++++++++++++++++++++------------ - wocky/wocky-xmpp-scheduler.c | 13 ++++++----- - wocky/wocky-xmpp-scheduler.h | 2 +- - 3 files changed, 36 insertions(+), 21 deletions(-) - -commit e4a63e4c97552204c4709ae756809784c7114e3b -Author: Guillaume Desmottes -Date: Thu Jun 25 11:23:07 2009 +0100 - - register the IQ reply handler as a normal handler - - wocky/wocky-xmpp-scheduler.c | 29 ++++++++++++++++++----------- - 1 files changed, 18 insertions(+), 11 deletions(-) - -commit 0af1eccebdb8d550970794db0db1d5fc6cbe1ee6 -Author: Guillaume Desmottes -Date: Thu Jun 25 11:15:15 2009 +0100 - - add some handler priority presets - - wocky/wocky-xmpp-scheduler.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 3c49a7e075450f6a9370cd2b03dfd17b8f1da2c0 -Author: Guillaume Desmottes -Date: Thu Jun 25 14:29:01 2009 +0100 - - wocky_xmpp_scheduler_send_iq_async: ignore preset ID attribute if there is one - - wocky/wocky-xmpp-scheduler.c | 17 ++++++----------- - 1 files changed, 6 insertions(+), 11 deletions(-) - -commit 7b3542c17531cbfc2c55f4456b63f6bf6f7a30c8 -Author: Guillaume Desmottes -Date: Thu Jun 25 12:11:52 2009 +0100 - - wocky_xmpp_scheduler_send_iq_async: check if ID isn't used yet - - wocky/wocky-xmpp-scheduler.c | 16 ++++++++++------ - 1 files changed, 10 insertions(+), 6 deletions(-) - -commit 328690baea6ccb5da08fa1d48c19f4252e87968c -Author: Guillaume Desmottes -Date: Thu Jun 25 12:08:22 2009 +0100 - - use wocky_xmpp_connection_new_id instead of generating the ID in the scheduler - - wocky/wocky-xmpp-scheduler.c | 6 +----- - 1 files changed, 1 insertions(+), 5 deletions(-) - -commit 9b929be645f1578df04300b0b225e7c895968dc6 -Author: Guillaume Desmottes -Date: Thu Jun 25 12:05:01 2009 +0100 - - iq_sent_cb: check the error code instead of relying of the presence of the iq handler in the hash table - - wocky/wocky-xmpp-scheduler.c | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -commit 6222ddbc595eddbd1670371bb2df5833b171b8e4 -Author: Guillaume Desmottes -Date: Thu Jun 25 10:56:55 2009 +0100 - - test_send_iq: send an IQ without ID - - tests/wocky-xmpp-scheduler-test.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 21be24c2d4f8f3635fca9cb42398222d55c79dbf -Author: Guillaume Desmottes -Date: Thu Jun 25 10:56:40 2009 +0100 - - wocky_xmpp_scheduler_send_iq_async: generate an ID if the IQ doesn't have one yet - - wocky/wocky-xmpp-scheduler.c | 23 +++++++++++++++++------ - 1 files changed, 17 insertions(+), 6 deletions(-) - -commit 4e7cefbf56f54a340821e4deec8a12a9b98deb63 -Author: Guillaume Desmottes -Date: Thu Jun 25 10:49:00 2009 +0100 - - test_send_iq: rely on the type of IQ instead of its id to check if we cancel it or not - - tests/wocky-xmpp-scheduler-test.c | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 1e0e3a4a8fd20074f9238d584c28ff9a3c0b770a -Author: Guillaume Desmottes -Date: Wed Jun 24 15:13:04 2009 +0100 - - test that spoofed IQ replies are ignored - - tests/wocky-xmpp-scheduler-test.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 8cb93b4f85eb15e954bf7b11426dbaf32acfae1d -Author: Guillaume Desmottes -Date: Wed Jun 24 15:12:48 2009 +0100 - - prevent IQ reply spoofing - - wocky/wocky-xmpp-scheduler.c | 24 ++++++++++++++++++++---- - 1 files changed, 20 insertions(+), 4 deletions(-) - -commit 545c2dfec60df7d649d371242c5aa6a95ab47887 -Author: Guillaume Desmottes -Date: Wed Jun 24 15:02:41 2009 +0100 - - Use only the IQ ID as handler IQ key - - wocky/wocky-xmpp-scheduler.c | 79 +++++++++++++++--------------------------- - 1 files changed, 28 insertions(+), 51 deletions(-) - -commit 8bc8965e10b1fbf7c5d1fa5a29e1919fb60549ed -Author: Guillaume Desmottes -Date: Wed Jun 24 14:31:58 2009 +0100 - - add test_send_iq_error - - tests/wocky-xmpp-scheduler-test.c | 45 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 45 insertions(+), 0 deletions(-) - -commit ddc3d553cd3fd4537be871bb1c8a60551cee128c -Author: Guillaume Desmottes -Date: Wed Jun 24 14:31:48 2009 +0100 - - wocky_xmpp_scheduler_send_iq_async: raise an error if sending goes wrong - - wocky/wocky-xmpp-scheduler.c | 46 ++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 44 insertions(+), 2 deletions(-) - -commit 109d9abcb38bad4e37003afd2129cea4263bc4fc -Author: Guillaume Desmottes -Date: Mon Jun 22 18:37:36 2009 +0200 - - test_send_iq: test cancelling an already sent IQ - - tests/wocky-xmpp-scheduler-test.c | 43 +++++++++++++++++++++++++++++++++++- - 1 files changed, 41 insertions(+), 2 deletions(-) - -commit 4ec779993857867d868a8a6d2e5ebc5ffd91056a -Author: Guillaume Desmottes -Date: Mon Jun 22 18:35:34 2009 +0200 - - remove the iq handler when its cancellable is cancelled - - wocky/wocky-xmpp-scheduler.c | 47 +++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 44 insertions(+), 3 deletions(-) - -commit 2b01e589b85efc858b507fe6a85a719ffcdf0278 -Author: Guillaume Desmottes -Date: Mon Jun 22 18:33:59 2009 +0200 - - handle_iq_reply: don't leak the handler_id if there is no handler - - wocky/wocky-xmpp-scheduler.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 4610c7de8fcd5db2f91fa9cd1e5e9eed9e2e8959 -Author: Guillaume Desmottes -Date: Mon Jun 22 17:45:06 2009 +0200 - - wocky_xmpp_scheduler_send_iq_async: use a GAsyncReadyCallback as reply callback - - tests/wocky-xmpp-scheduler-test.c | 48 ++++++---------------------------- - wocky/wocky-xmpp-scheduler.c | 51 ++++++++++++++++++++++++------------- - wocky/wocky-xmpp-scheduler.h | 12 +++----- - 3 files changed, 47 insertions(+), 64 deletions(-) - -commit 96b1a7ae77f5925d062f755368d6f236f66664b8 -Author: Guillaume Desmottes -Date: Mon Jun 22 15:04:04 2009 +0200 - - rename wocky_xmpp_scheduler_send_with_reply_async to wocky_xmpp_scheduler_send_iq_async - - tests/wocky-xmpp-scheduler-test.c | 22 +++++++++++----------- - wocky/wocky-xmpp-scheduler.c | 2 +- - wocky/wocky-xmpp-scheduler.h | 2 +- - 3 files changed, 13 insertions(+), 13 deletions(-) - -commit c1bd573248240028c76a80ba1bbe5a2566c992b2 -Author: Guillaume Desmottes -Date: Mon Jun 22 12:05:19 2009 +0200 - - test to cancel an IQ reply cb - - tests/wocky-xmpp-scheduler-test.c | 28 +++++++++++++++++++++++++++- - 1 files changed, 27 insertions(+), 1 deletions(-) - -commit 721b0b8ccbcff5e2c4a7e119a9a6ce6da30f5281 -Author: Guillaume Desmottes -Date: Mon Jun 22 12:03:25 2009 +0200 - - Don't call the IQ reply callback if it has been cancelled - - wocky/wocky-xmpp-scheduler.c | 14 +++++++++++--- - 1 files changed, 11 insertions(+), 3 deletions(-) - -commit f62c98d0a19a8adf497c5f8c8340f5dcbd284a60 -Author: Guillaume Desmottes -Date: Thu Jun 18 17:20:13 2009 +0100 - - add test_send_with_reply - - tests/wocky-xmpp-scheduler-test.c | 97 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 97 insertions(+), 0 deletions(-) - -commit 483aaf0df8f1ab497eb542252e254c9f94f2111c -Author: Guillaume Desmottes -Date: Thu Jun 18 17:29:14 2009 +0100 - - Implement wocky_xmpp_scheduler_send_with_reply_async - - wocky/wocky-xmpp-scheduler.c | 134 ++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-scheduler.h | 14 +++++ - 2 files changed, 148 insertions(+), 0 deletions(-) - -commit 484ce52850f6600d52074110ccebb2640564438a -Author: Guillaume Desmottes -Date: Thu Jun 25 14:23:36 2009 +0100 - - add test_set_attribute - - tests/wocky-xmpp-node-test.c | 32 ++++++++++++++++++++++++++++++++ - 1 files changed, 32 insertions(+), 0 deletions(-) - -commit f52003a111d3b82d8e63b0eef88e0507f5f39cba -Author: Guillaume Desmottes -Date: Thu Jun 25 14:23:30 2009 +0100 - - wocky_xmpp_node_set_attribute_n_ns: remove old attribute if needed - - wocky/wocky-xmpp-node.c | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) - -commit 110567f60b21ce9edb85d4e5897ddb3e9bb65374 -Author: Guillaume Desmottes -Date: Thu Jun 25 14:22:43 2009 +0100 - - wocky-xmpp-node: factor out attribute_free - - wocky/wocky-xmpp-node.c | 12 +++++++++--- - 1 files changed, 9 insertions(+), 3 deletions(-) - -commit 933bc0eae3bd039207dd33a1e6c4e8144f391aab -Author: Guillaume Desmottes -Date: Thu Jun 25 14:01:31 2009 +0100 - - test_node_equal: remove useless parenthesis - - tests/wocky-xmpp-node-test.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit a9f0ba9ddf5bebbe3603425ed73c002be6be0332 -Author: Guillaume Desmottes -Date: Thu Jun 25 13:56:42 2009 +0100 - - fix typo in test name - - tests/wocky-xmpp-node-test.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a786cdf413f3c8c850520d7fee4b2886bb7c3f0b -Author: Guillaume Desmottes -Date: Wed Jun 24 13:21:11 2009 +0100 - - test_cancel_sent_stanza_cancelled: don't leak the error - - tests/wocky-xmpp-scheduler-test.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 974ff9956518fabd858bb9d70b95491ef6139339 -Author: Guillaume Desmottes -Date: Wed Jun 24 13:18:05 2009 +0100 - - wocky-xmpp-scheduler-test: add test_writing_error - - tests/wocky-xmpp-scheduler-test.c | 43 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 43 insertions(+), 0 deletions(-) - -commit 482f36297ffbc2f513ded8ca56cbd59a6445f1ef -Author: Guillaume Desmottes -Date: Wed Jun 24 13:17:44 2009 +0100 - - add wocky_test_output_stream_set_write_error to emulate writing errors - - tests/wocky-test-stream.c | 21 ++++++++++++++++++++- - tests/wocky-test-stream.h | 2 ++ - 2 files changed, 22 insertions(+), 1 deletions(-) - -commit a19964c4403fdcc697f84105afc9be17e3967bab -Author: Guillaume Desmottes -Date: Tue Jun 23 15:10:44 2009 +0200 - - test wocky_xmpp_stanza_build_iq_error - - tests/wocky-xmpp-stanza-test.c | 59 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 59 insertions(+), 0 deletions(-) - -commit 3a22650fa8a8055f917667089d3589c90b74a13d -Author: Guillaume Desmottes -Date: Tue Jun 23 15:10:24 2009 +0200 - - add wocky_xmpp_stanza_build_iq_error - - wocky/wocky-xmpp-stanza.c | 15 +++++++++++++++ - wocky/wocky-xmpp-stanza.h | 3 +++ - 2 files changed, 18 insertions(+), 0 deletions(-) - -commit a3e685ea6c29d6724936835bfef48a5a54ef39bc -Author: Guillaume Desmottes -Date: Tue Jun 23 14:17:46 2009 +0200 - - test wocky_xmpp_stanza_build_iq_result - - tests/wocky-xmpp-stanza-test.c | 59 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 59 insertions(+), 0 deletions(-) - -commit 892c0350e3ab8aea585da29e10bb236d7cda5754 -Author: Guillaume Desmottes -Date: Tue Jun 23 15:39:47 2009 +0200 - - add wocky-xmpp-stanza-test to tests suite - - .gitignore | 1 + - tests/Makefile.am | 6 +++++- - tests/wocky-xmpp-stanza-test.c | 19 +++++++++++++++++++ - 3 files changed, 25 insertions(+), 1 deletions(-) - -commit c144f9005696014e325c316a8d9f3eb19d9e6126 -Author: Guillaume Desmottes -Date: Tue Jun 23 14:15:14 2009 +0200 - - add wocky_xmpp_stanza_build_iq_result - - wocky/wocky-xmpp-stanza.c | 47 +++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-stanza.h | 3 ++ - 2 files changed, 50 insertions(+), 0 deletions(-) - -commit 39f0cb5ed4afff87264210d3df7af85dccc278ea -Author: Guillaume Desmottes -Date: Tue Jun 23 14:48:21 2009 +0200 - - add a regression test for wocky_xmpp_node_equal - - tests/wocky-xmpp-node-test.c | 25 +++++++++++++++++++++++++ - 1 files changed, 25 insertions(+), 0 deletions(-) - -commit ac1e6e749cc1d7fd110b7a0506f4e31c31f344e4 -Author: Guillaume Desmottes -Date: Tue Jun 23 14:46:02 2009 +0200 - - wocky_xmpp_node_equal: check if nodes have the same number of attributes - - Checking if node1 has all the attributes of node0 is not enough. The - nodes are different if node1 contains more attributes than node0. - - wocky/wocky-xmpp-node.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 3a728b81379631f9627037e6e13a78d333361d00 -Author: Guillaume Desmottes -Date: Tue Jun 23 14:33:19 2009 +0200 - - add wocky-xmpp-node-test to tests suite - - .gitignore | 1 + - tests/Makefile.am | 6 +++++- - tests/wocky-xmpp-node-test.c | 19 +++++++++++++++++++ - 3 files changed, 25 insertions(+), 1 deletions(-) - -commit 750c8d1db07544dc9d16e6fa13e21de4fca2adec -Author: Guillaume Desmottes -Date: Tue Jun 23 10:19:13 2009 +0200 - - add a regression test: test_cancel_sent_stanza - - tests/wocky-xmpp-scheduler-test.c | 60 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 60 insertions(+), 0 deletions(-) - -commit e5feb9d157d9a4c9e2d25109b2098516da41dabf -Author: Guillaume Desmottes -Date: Tue Jun 23 10:16:44 2009 +0200 - - send_stanza_cb: elem can be NULL if the sending operation has been cancelled - - elem is removed from the queue when the cancellable is cancelled. - So, if the user cancels the sending operation when the stanza has been sent - but before send_stanza_cb is called, then elem won't be in the queue - anymore. - - wocky/wocky-xmpp-scheduler.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit f52286df5a3cfe0a9304ff948e20b7a512b539f8 -Author: Guillaume Desmottes -Date: Mon Jun 22 18:53:53 2009 +0200 - - wocky-xmpp-scheduler-test: use test->cancellable - - tests/wocky-xmpp-scheduler-test.c | 19 +++++-------------- - 1 files changed, 5 insertions(+), 14 deletions(-) - -commit 909c3e39a9153c228428aec5c495e7a9c54da3f2 -Author: Guillaume Desmottes -Date: Mon Jun 22 18:31:53 2009 +0200 - - add a cancellable to test_data_t - - tests/wocky-test-helper.c | 3 +++ - tests/wocky-test-helper.h | 1 + - 2 files changed, 4 insertions(+), 0 deletions(-) - -commit 54630fde66560b0f651e95f051adc941f7c1ae07 -Author: Guillaume Desmottes -Date: Tue Jun 23 10:25:07 2009 +0200 - - Increase the test timer - - 1 second was too short and timer was generally fired when running tests - with valgrind. - - tests/wocky-test-helper.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 861dbe33d1b09dd9577fc952d3cca0120702f6e5 -Author: Guillaume Desmottes -Date: Tue Jun 23 10:22:14 2009 +0200 - - add myself to AUTHORS - - AUTHORS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit d1ba44aa011221559143bdd54b72eaaac0dfcf0b -Author: Guillaume Desmottes -Date: Thu Jun 18 17:02:52 2009 +0100 - - close_sent_cb: check if close operation hasn't be completed yet - - If we receive the other side close before we finished to send yours, the - close operation would be already completed. - - wocky/wocky-xmpp-scheduler.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit 706f10f27c2c78b3998ca94a00ae712d95221a79 -Author: Guillaume Desmottes -Date: Thu Jun 18 16:58:11 2009 +0100 - - add test_close_both_schedulers test helper - - tests/wocky-test-helper.c | 12 ++++++++++++ - tests/wocky-test-helper.h | 2 ++ - 2 files changed, 14 insertions(+), 0 deletions(-) - -commit c802c013650643d3c8a9ce45906a70a6694dbdb4 -Author: Guillaume Desmottes -Date: Thu Jun 18 17:35:08 2009 +0100 - - unref the stanza in test_expected_stanza_received - - tests/wocky-test-helper.c | 1 + - tests/wocky-xmpp-scheduler-test.c | 7 ++++--- - 2 files changed, 5 insertions(+), 3 deletions(-) - -commit e8d0683759fc59c4d834797c68bbc5d1f0073689 -Author: Guillaume Desmottes -Date: Wed Jun 17 14:30:24 2009 +0100 - - add test_handler_stanza - - tests/wocky-xmpp-scheduler-test.c | 135 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 135 insertions(+), 0 deletions(-) - -commit 6e3d2a45d156e8a84cb850783fd48500fc49e432 -Author: Guillaume Desmottes -Date: Wed Jun 17 14:30:09 2009 +0100 - - check if stanzas match with the one passed when registering the handler - - wocky/wocky-xmpp-scheduler.c | 25 ++++++++++++++++++++----- - wocky/wocky-xmpp-scheduler.h | 2 +- - 2 files changed, 21 insertions(+), 6 deletions(-) - -commit 253d6a320965c178613bddb916aac86d63f88fbe -Author: Guillaume Desmottes -Date: Wed Jun 17 14:24:55 2009 +0100 - - add wocky_xmpp_node_is_superset - - wocky/wocky-xmpp-node.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-node.h | 3 ++ - 2 files changed, 65 insertions(+), 0 deletions(-) - -commit a14a3ab158be85b34a2aea39fadfbdb8079b2eeb -Author: Guillaume Desmottes -Date: Thu Jun 18 10:56:24 2009 +0100 - - add wocky_xmpp_stanza_build_va - - wocky/wocky-xmpp-stanza.c | 19 +++++++++++++++++-- - wocky/wocky-xmpp-stanza.h | 9 +++++++++ - 2 files changed, 26 insertions(+), 2 deletions(-) - -commit a46e6125d19b7f9d7e83cc4fab1ed199e5b0a43b -Author: Guillaume Desmottes -Date: Wed Jun 17 15:34:10 2009 +0100 - - rename wocky_decode_jid arguments according to RFC's names - - wocky/wocky-xmpp-scheduler.c | 38 +++++++++++++++++++------------------- - 1 files changed, 19 insertions(+), 19 deletions(-) - -commit fab1c3bc2ccab10d4cdc07b4ac3ade3b8b335a63 -Author: Guillaume Desmottes -Date: Tue Jun 16 17:47:50 2009 +0100 - - add test_handler_full_jid - - tests/wocky-xmpp-scheduler-test.c | 49 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 49 insertions(+), 0 deletions(-) - -commit 38ed0c782d3946dfc0b644119a50ee1297c32558 -Author: Guillaume Desmottes -Date: Tue Jun 16 17:44:08 2009 +0100 - - add test_handler_bare_jid - - tests/wocky-xmpp-scheduler-test.c | 48 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 48 insertions(+), 0 deletions(-) - -commit 28731a6d72e78550918634f36070e65cd38e1f92 -Author: Guillaume Desmottes -Date: Tue Jun 16 17:41:36 2009 +0100 - - handle_stanza: filter using the from attribute if needed - - wocky/wocky-xmpp-scheduler.c | 53 ++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 49 insertions(+), 4 deletions(-) - -commit 82e48db5f9cee80956e0e4a6248032f5c582e336 -Author: Guillaume Desmottes -Date: Tue Jun 16 17:48:13 2009 +0100 - - add expected arg to send_stanza - - tests/wocky-xmpp-scheduler-test.c | 16 ++++++++++------ - 1 files changed, 10 insertions(+), 6 deletions(-) - -commit 9633251d39656ccd0dcda7093362d10b629f73b5 -Merge: 1d3c7fe 0ecde94 -Author: Guillaume Desmottes -Date: Wed Jun 17 15:31:07 2009 +0100 - - Merge branch 'handlers+test-refactoring+remove' - -commit 1d3c7fe760dad7e5f45bcfe213b6bc96b62511f3 -Merge: e79b6eb 6463811 -Author: Guillaume Desmottes -Date: Wed Jun 17 15:28:43 2009 +0100 - - Merge branch 'decode-jid' - -commit 6463811f41a7f96602d43f2cbd195aa4524a0851 -Author: Guillaume Desmottes -Date: Wed Jun 17 15:13:10 2009 +0100 - - wocky_decode_jid: assert that at least one output arg is not NULL - - wocky/wocky-utils.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 790b68f5f611fb0eeb2ba0d41119d5e8d4ed9003 -Author: Guillaume Desmottes -Date: Wed Jun 17 15:12:22 2009 +0100 - - wocky_decode_jid: rename args according to RFC's names - - wocky/wocky-utils.c | 38 +++++++++++++++++++------------------- - wocky/wocky-utils.h | 6 +++--- - 2 files changed, 22 insertions(+), 22 deletions(-) - -commit 0ecde940fd71d366474c4f8a7033877149a0c037 -Author: Guillaume Desmottes -Date: Wed Jun 17 15:05:22 2009 +0100 - - wocky_xmpp_scheduler_unregister_handler: raise a warning if the handler is not registered - - tests/wocky-xmpp-scheduler-test.c | 4 +--- - wocky/wocky-xmpp-scheduler.c | 8 +++++--- - wocky/wocky-xmpp-scheduler.h | 2 +- - 3 files changed, 7 insertions(+), 7 deletions(-) - -commit e79b6ebd998d4ee3a5142db09fadf4219730c2cc -Merge: 72f1aaa 9228ca5 -Author: Guillaume Desmottes -Date: Wed Jun 17 14:44:46 2009 +0100 - - Merge branch 'handlers+test-refactoring' - -commit 72f1aaa92475e068851cb05363dad94a2b07bbaa -Merge: f811427 1ee88a7 -Author: Guillaume Desmottes -Date: Wed Jun 17 14:42:14 2009 +0100 - - Merge branch 'handlers' - -commit f8114271ed5c26f1837b787c0fba3823ff45ef04 -Author: Guillaume Desmottes -Date: Tue Jun 16 12:42:43 2009 +0100 - - wocky-xmpp-scheduler: remove unused priv->sending - - wocky/wocky-xmpp-scheduler.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 1ee88a7058f987ea4b26a6e54632c3f7989aa50e -Author: Guillaume Desmottes -Date: Tue Jun 16 17:53:12 2009 +0100 - - handle_stanza: move wocky_xmpp_stanza_get_type_info out of the for loop - - wocky/wocky-xmpp-scheduler.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 85ea3206514c56d3262bb74ec2e75b848cb65c81 -Author: Guillaume Desmottes -Date: Tue Jun 16 16:47:16 2009 +0100 - - import wocky_decode_jid from Gabble - - wocky/wocky-utils.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-utils.h | 5 +++ - 2 files changed, 93 insertions(+), 0 deletions(-) - -commit 04e0f71576b6f01906ebee414f3f1b009623be83 -Author: Guillaume Desmottes -Date: Tue Jun 16 16:30:39 2009 +0100 - - add test_unregister_handler - - tests/wocky-xmpp-scheduler-test.c | 58 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 58 insertions(+), 0 deletions(-) - -commit 36e3d4f7d6a1508e70dc0160dd4833d1fbc23d01 -Author: Guillaume Desmottes -Date: Tue Jun 16 16:30:03 2009 +0100 - - add wocky_xmpp_scheduler_unregister_handler - - wocky/wocky-xmpp-scheduler.c | 16 ++++++++++++++++ - wocky/wocky-xmpp-scheduler.h | 3 +++ - 2 files changed, 19 insertions(+), 0 deletions(-) - -commit 9228ca515a7f4379c5655c8d9aab923834d8e648 -Author: Guillaume Desmottes -Date: Tue Jun 16 16:08:22 2009 +0100 - - use test_expected_stanza_received - - tests/wocky-xmpp-scheduler-test.c | 38 +++--------------------------------- - 1 files changed, 4 insertions(+), 34 deletions(-) - -commit 9ff3329b355ff03e05f951f481c5f9e737dce776 -Author: Guillaume Desmottes -Date: Tue Jun 16 16:07:57 2009 +0100 - - add test_expected_stanza_received helper - - tests/wocky-test-helper.c | 14 ++++++++++++++ - tests/wocky-test-helper.h | 3 +++ - 2 files changed, 17 insertions(+), 0 deletions(-) - -commit 185494031ae6cf60687e652638ff00130a0be120 -Author: Guillaume Desmottes -Date: Tue Jun 16 16:01:29 2009 +0100 - - factor out send_stanza - - tests/wocky-xmpp-scheduler-test.c | 26 ++++++++++++++------------ - 1 files changed, 14 insertions(+), 12 deletions(-) - -commit ce3e2b3d4130d048ea3de65525c484ed868fe136 -Author: Guillaume Desmottes -Date: Tue Jun 16 15:43:17 2009 +0100 - - use test_close_scheduler - - tests/wocky-xmpp-scheduler-test.c | 41 +++--------------------------------- - 1 files changed, 4 insertions(+), 37 deletions(-) - -commit 3867344f20babf7920151b906eb736e7f05f23d4 -Author: Guillaume Desmottes -Date: Tue Jun 16 15:40:13 2009 +0100 - - add test_close_scheduler helper - - tests/wocky-test-helper.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ - tests/wocky-test-helper.h | 2 + - 2 files changed, 56 insertions(+), 0 deletions(-) - -commit 8ec9912ef59216ffcc871dc9f1f7e85250b067d2 -Author: Guillaume Desmottes -Date: Tue Jun 16 15:14:24 2009 +0100 - - add test_handler_priority - - tests/wocky-xmpp-scheduler-test.c | 113 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 113 insertions(+), 0 deletions(-) - -commit 191a714037406c7bfa5cce73089865ced4a15d97 -Author: Guillaume Desmottes -Date: Tue Jun 16 14:53:56 2009 +0100 - - test_filter: use new API and re-enable test - - tests/wocky-xmpp-scheduler-test.c | 36 +++++++----------------------------- - 1 files changed, 7 insertions(+), 29 deletions(-) - -commit 690e7579e63f8abaeef7736b48bef1852aaaf021 -Author: Guillaume Desmottes -Date: Tue Jun 16 14:49:36 2009 +0100 - - test_receive: use new API and re-enable test - - tests/wocky-xmpp-scheduler-test.c | 11 ++++------- - 1 files changed, 4 insertions(+), 7 deletions(-) - -commit a2d057bdbd77e02f297e1a5430fb7ddaf0f51a82 -Author: Guillaume Desmottes -Date: Tue Jun 16 14:54:24 2009 +0100 - - start to implement new handlers API - - wocky/wocky-xmpp-scheduler.c | 122 +++++++++++++++++++++++++++++++++++++++++- - wocky/wocky-xmpp-scheduler.h | 10 ++++ - 2 files changed, 131 insertions(+), 1 deletions(-) - -commit 1fd895c4b547ee3c55b881491052306fa437ae95 -Author: Guillaume Desmottes -Date: Tue Jun 16 12:54:31 2009 +0100 - - rename WockyXmppSchedulerStanzaCallbackFunc to WockyXmppSchedulerHandlerFunc - - wocky/wocky-xmpp-scheduler.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 88f4be67d489a370b81886df0bf44dc2ad9690b5 -Author: Guillaume Desmottes -Date: Tue Jun 16 12:42:43 2009 +0100 - - wocky-xmpp-scheduler: remove unused priv->sending - - wocky/wocky-xmpp-scheduler.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit ca9a5ee4fb36d2d06fb20848d298c714bdf09ab3 -Author: Guillaume Desmottes -Date: Tue Jun 16 12:42:05 2009 +0100 - - Remove old stanza filters code and disable its tests for now - - tests/wocky-xmpp-scheduler-test.c | 10 ++++- - wocky/wocky-xmpp-scheduler.c | 73 +------------------------------------ - wocky/wocky-xmpp-scheduler.h | 10 ----- - 3 files changed, 9 insertions(+), 84 deletions(-) - -commit dfd4ad4f6ee9434bd53294184f9085adbf070a55 -Author: Guillaume Desmottes -Date: Tue Jun 16 11:53:18 2009 +0100 - - rename wocky_xmpp_scheduler_send_full to wocky_xmpp_scheduler_send_async - - tests/wocky-xmpp-scheduler-test.c | 20 ++++++++++---------- - wocky/wocky-xmpp-scheduler.c | 4 ++-- - wocky/wocky-xmpp-scheduler.h | 2 +- - 3 files changed, 13 insertions(+), 13 deletions(-) - -commit 76de9c85a2245126be45dcbf3940c7cda987e4cb -Author: Guillaume Desmottes -Date: Tue Jun 16 11:51:03 2009 +0100 - - rename wocky_xmpp_scheduler_close to wocky_xmpp_scheduler_close_async - - tests/wocky-xmpp-scheduler-test.c | 28 ++++++++++++++-------------- - wocky/wocky-xmpp-scheduler.c | 2 +- - wocky/wocky-xmpp-scheduler.h | 2 +- - 3 files changed, 16 insertions(+), 16 deletions(-) - -commit 6578ce681d98c131c768917f446ef212d6e67dee -Author: Guillaume Desmottes -Date: Tue Jun 9 17:13:09 2009 +0100 - - test sending a stanza throught a closing scheduler - - tests/wocky-xmpp-scheduler-test.c | 28 +++++++++++++++++++++++++--- - 1 files changed, 25 insertions(+), 3 deletions(-) - -commit 9fbbbcd49e1a67603cb0e73fe8719e8b82d83536 -Author: Guillaume Desmottes -Date: Tue Jun 9 17:07:32 2009 +0100 - - wocky_xmpp_scheduler_send_full: raise an error if scheduler is closing - - wocky/wocky-xmpp-scheduler.c | 9 +++++++++ - wocky/wocky-xmpp-scheduler.h | 1 + - 2 files changed, 10 insertions(+), 0 deletions(-) - -commit 13eb2944d8880757b399a4699a19c96653723b03 -Author: Guillaume Desmottes -Date: Mon Jun 8 17:17:17 2009 +0100 - - Test if the right error is raised when trying to send a stanza through a closed scheduler - - tests/wocky-xmpp-scheduler-test.c | 52 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 52 insertions(+), 0 deletions(-) - -commit 18f277e55b4cce729e3a25b018560c9c20a60b9b -Author: Guillaume Desmottes -Date: Tue Jun 16 11:37:55 2009 +0100 - - replace wocky_test_stream_read_error by wocky_test_input_stream_set_read_error - - tests/wocky-test-stream.c | 8 +++++--- - tests/wocky-test-stream.h | 2 +- - tests/wocky-xmpp-scheduler-test.c | 2 +- - 3 files changed, 7 insertions(+), 5 deletions(-) - -commit b820dd0721ba4329f68cffea436df45a0d91db72 -Author: Guillaume Desmottes -Date: Mon Jun 8 17:06:41 2009 +0100 - - test if the remote-error signal is properly fired - - tests/wocky-xmpp-scheduler-test.c | 44 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 44 insertions(+), 0 deletions(-) - -commit ca3944ed0da521d610add494ceea597fcc276656 -Author: Guillaume Desmottes -Date: Tue Jun 16 11:30:18 2009 +0100 - - add wocky_test_stream_read_error to simulate a read error - - tests/wocky-test-stream.c | 18 ++++++++++++++++++ - tests/wocky-test-stream.h | 2 ++ - 2 files changed, 20 insertions(+), 0 deletions(-) - -commit 7c1db745323573c073f360258296f399bf86315d -Author: Guillaume Desmottes -Date: Wed Jun 10 10:40:53 2009 +0100 - - wocky-xmpp-reader-test: use g_assert_error - - tests/wocky-xmpp-reader-test.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 9ea7ecc262b401ee4e70816316a06c157daccad9 -Author: Guillaume Desmottes -Date: Wed Jun 10 10:39:52 2009 +0100 - - wocky-test-sasl-auth: use g_assert_error - - tests/wocky-test-sasl-auth.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 6afd22825552cb8c2a22a186041f011f0cb6dad6 -Author: Guillaume Desmottes -Date: Wed Jun 10 10:39:01 2009 +0100 - - wocky-test-sasl-auth-server: use g_assert_error - - tests/wocky-test-sasl-auth-server.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 4e59a279a10698e3bba38bb355d1d652db3a109c -Author: Guillaume Desmottes -Date: Wed Jun 10 10:38:10 2009 +0100 - - wocky-xmpp-connection-test: use g_assert_error - - tests/wocky-xmpp-connection-test.c | 54 ++++++++++++++++++------------------ - 1 files changed, 27 insertions(+), 27 deletions(-) - -commit 317733282354de459ccfa7180c979d47629a2bee -Author: Guillaume Desmottes -Date: Wed Jun 10 10:35:11 2009 +0100 - - use G_IO_ERROR_PENDING instead of WOCKY_XMPP_CONNECTION_ERROR_PENDING - - tests/wocky-xmpp-connection-test.c | 15 +++++---------- - wocky/wocky-xmpp-connection.c | 15 +++++---------- - wocky/wocky-xmpp-connection.h | 3 --- - 3 files changed, 10 insertions(+), 23 deletions(-) - -commit c628264ae27860a76b4382170c5270b613f25b9f -Author: Sjoerd Simons -Date: Fri Jun 12 16:00:28 2009 +0100 - - tweak the close_sent_cb function for better readability - - wocky/wocky-xmpp-scheduler.c | 31 +++++++++++++++++-------------- - 1 files changed, 17 insertions(+), 14 deletions(-) - -commit dc0d4c95a99cf1c0ba1b9654ad4a224c398f310c -Author: Guillaume Desmottes -Date: Thu Jun 11 10:48:17 2009 +0100 - - close_sent_cb: add some comments - - wocky/wocky-xmpp-scheduler.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 8081866e9583452f11695ba05467865e27ef74ab -Author: Guillaume Desmottes -Date: Thu Jun 11 10:45:15 2009 +0100 - - priv->close_result is never supposed to be NULL in close_sent_cb - - wocky/wocky-xmpp-scheduler.c | 9 +++------ - 1 files changed, 3 insertions(+), 6 deletions(-) - -commit 10a60da5e5b478bc4e79015ad76aa5292b504705 -Author: Guillaume Desmottes -Date: Thu Jun 11 10:43:02 2009 +0100 - - factor out complete_close - - wocky/wocky-xmpp-scheduler.c | 34 +++++++++++++++++----------------- - 1 files changed, 17 insertions(+), 17 deletions(-) - -commit 8b1062aa7b4254d5cebb2e2ec6a6ec53b74961b5 -Author: Guillaume Desmottes -Date: Wed Jun 10 10:27:41 2009 +0100 - - close_sent_cb: don't complete the result twice if it has been cancelled and there was an error during sending - - wocky/wocky-xmpp-scheduler.c | 11 +++++++---- - 1 files changed, 7 insertions(+), 4 deletions(-) - -commit d5a9b421174f769bafb8e05b917e8efb5769b07f -Author: Guillaume Desmottes -Date: Wed Jun 10 10:24:50 2009 +0100 - - close_sent_cb: no need to complete in idle - - wocky/wocky-xmpp-scheduler.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit dae06ab93eeb484238d50ed35d90702eec5d85d2 -Author: Guillaume Desmottes -Date: Tue Jun 9 17:46:45 2009 +0100 - - cancelling a wocky_xmpp_scheduler_close operation doesn't cancel the send_close_async - - We can't know if the close has been sent or not when cancelling. Don't - allow to cancel it to avoid to put the scheduler in an inconsistent - state. - - tests/wocky-xmpp-scheduler-test.c | 9 ++------- - wocky/wocky-xmpp-scheduler.c | 15 ++++++++++++--- - 2 files changed, 14 insertions(+), 10 deletions(-) - -commit 4360ebaa119cca75152f66c0a3fe7853f2e9f0f3 -Author: Guillaume Desmottes -Date: Tue Jun 9 16:49:37 2009 +0100 - - wocky_xmpp_scheduler_dispose: tweak g_warning message - - wocky/wocky-xmpp-scheduler.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit da3dae5f23ed9d547b18660d7141b4a3367c50c2 -Author: Guillaume Desmottes -Date: Tue Jun 9 16:44:45 2009 +0100 - - use G_IO_ERROR_PENDING instead of WOCKY_XMPP_SCHEDULER_ERROR_PENDING - - tests/wocky-xmpp-scheduler-test.c | 3 +-- - wocky/wocky-xmpp-scheduler.c | 4 ++-- - wocky/wocky-xmpp-scheduler.h | 1 - - 3 files changed, 3 insertions(+), 5 deletions(-) - -commit c061b7df5cfa41e1df25e2c0bc05e79532f53434 -Author: Guillaume Desmottes -Date: Tue Jun 9 15:39:01 2009 +0100 - - close_sent_cb: remove useless async result temp variables - - wocky/wocky-xmpp-scheduler.c | 13 +++++-------- - 1 files changed, 5 insertions(+), 8 deletions(-) - -commit 9d181c22ba4111142e7e169958176523f321f180 -Author: Guillaume Desmottes -Date: Mon Jun 8 15:02:28 2009 +0100 - - test cancelling wocky_xmpp_scheduler_close - - tests/wocky-xmpp-scheduler-test.c | 51 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 51 insertions(+), 0 deletions(-) - -commit d9346747d32c8b770f8893ac7a3965454862bee3 -Author: Guillaume Desmottes -Date: Mon Jun 8 17:02:17 2009 +0100 - - don't set local_closed if the cancel operation has been closed - - wocky/wocky-xmpp-scheduler.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit cf77235237b1533019a38f6a804c1da619c21f81 -Author: Guillaume Desmottes -Date: Mon Jun 8 15:01:35 2009 +0100 - - wocky_xmpp_scheduler_close: add cancellable support - - wocky/wocky-xmpp-scheduler.c | 10 +++++++--- - 1 files changed, 7 insertions(+), 3 deletions(-) - -commit 07f6bb04555518c8e5d96952677dad06f14eeaef -Author: Guillaume Desmottes -Date: Mon Jun 8 15:00:52 2009 +0100 - - close_sent_cb: don't leak the result if wocky_xmpp_connection_send_close_finish failed - - wocky/wocky-xmpp-scheduler.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 9559b315189e16c4a11300cc99db6f3b44cc2994 -Author: Guillaume Desmottes -Date: Mon Jun 8 14:26:40 2009 +0100 - - close_sent_cb: propagate error - - wocky/wocky-xmpp-scheduler.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit b4a1e557d0d778013a355763c0126bef73905b10 -Author: Guillaume Desmottes -Date: Mon Jun 8 14:22:15 2009 +0100 - - test_close_twice: try to call wocky_xmpp_scheduler_close once the scheduler has been closed - - tests/wocky-xmpp-scheduler-test.c | 24 ++++++++++++++++++++++++ - 1 files changed, 24 insertions(+), 0 deletions(-) - -commit e2f131deb2bd55b4e0964fd66ae521384281cd10 -Author: Guillaume Desmottes -Date: Mon Jun 8 14:21:50 2009 +0100 - - wocky_xmpp_scheduler_close: raise an error if already closed - - wocky/wocky-xmpp-scheduler.c | 14 ++++++++++++-- - wocky/wocky-xmpp-scheduler.h | 1 + - 2 files changed, 13 insertions(+), 2 deletions(-) - -commit 5ee041e5a80d9d9e1e417efdc05e46afe900ae7d -Author: Guillaume Desmottes -Date: Mon Jun 8 14:06:42 2009 +0100 - - test if wocky_xmpp_scheduler_close can be closed after the remote connection has been closed - - tests/wocky-xmpp-scheduler-test.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit a8366339ae38cc591713f15f16beca83d9b95c64 -Author: Guillaume Desmottes -Date: Mon Jun 8 14:11:06 2009 +0100 - - wocky_xmpp_scheduler_close: don't wait for other side's closing if it has already been closed - - wocky/wocky-xmpp-scheduler.c | 14 +++++++++++++- - 1 files changed, 13 insertions(+), 1 deletions(-) - -commit 16fe7d66d331c02fff883a4168543ffa75f72f85 -Author: Guillaume Desmottes -Date: Mon Jun 8 13:07:25 2009 +0100 - - add priv->remote_closed telling us if the remote connection has been closed - - wocky/wocky-xmpp-scheduler.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 8068686bbf5a093c5743c9eb07ff7b2e4b8cad78 -Author: Guillaume Desmottes -Date: Mon Jun 8 12:44:41 2009 +0100 - - test remote-closed signal - - tests/wocky-xmpp-scheduler-test.c | 48 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 48 insertions(+), 0 deletions(-) - -commit f9328d93da37d679e5f464369cf391abd3117306 -Author: Guillaume Desmottes -Date: Mon Jun 8 12:28:49 2009 +0100 - - Fire remote-error signal when something goes wrong when receiving stanza - - wocky/wocky-xmpp-scheduler.c | 16 ++++++++++++++-- - 1 files changed, 14 insertions(+), 2 deletions(-) - -commit 6419950e848c165a429ebe178fc336ae3f9f9db9 -Author: Guillaume Desmottes -Date: Mon Jun 8 12:13:17 2009 +0100 - - fire remote-closed signal when peer closed his XMPP connection - - wocky/wocky-xmpp-scheduler.c | 32 ++++++++++++++++++++++++++------ - 1 files changed, 26 insertions(+), 6 deletions(-) - -commit b45709b2fddefed7eb534247d445ca6c8120484c -Author: Guillaume Desmottes -Date: Mon Jun 8 12:04:08 2009 +0100 - - wocky_xmpp_scheduler_start: don't assert if sched has already been started - - wocky/wocky-xmpp-scheduler.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit b44a76804e7af23cdc11bf23ed58cf7351733bd1 -Author: Guillaume Desmottes -Date: Mon Jun 8 11:40:27 2009 +0100 - - send_stanza_cb: cancel all pending sending operations if sending failed - - wocky/wocky-xmpp-scheduler.c | 31 +++++++++++++++++++++++-------- - 1 files changed, 23 insertions(+), 8 deletions(-) - -commit 063a4d203093d14d95b0a3f2c56e22d0d0accc59 -Author: Guillaume Desmottes -Date: Mon Jun 8 11:28:27 2009 +0100 - - wocky_xmpp_scheduler_finalize: assert than the queue is empty - - Queue elements have a ref on the scheduler so it shouldn't be destroyed - while the queue is not empty. - - wocky/wocky-xmpp-scheduler.c | 13 ++++--------- - 1 files changed, 4 insertions(+), 9 deletions(-) - -commit b14c17a79d993e42ec1301c28f6c1e6e30e87282 -Author: Guillaume Desmottes -Date: Mon Jun 8 10:34:43 2009 +0100 - - display a warning when disposing a not closed scheduler - - wocky/wocky-xmpp-scheduler.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 866e4c2d586e1f439a1aa1ab57661103369704c5 -Author: Guillaume Desmottes -Date: Mon Jun 8 10:32:29 2009 +0100 - - unref and set to NULL receive_cancellable as soon we stop reading - - wocky/wocky-xmpp-scheduler.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit d77c713f7435de9465a34e261125c007848fa3cb -Author: Guillaume Desmottes -Date: Fri Jun 5 17:00:45 2009 +0100 - - test if the right error is raised when trying to close the scheduler twice - - tests/wocky-xmpp-scheduler-test.c | 44 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 44 insertions(+), 0 deletions(-) - -commit e1fadaf363890ea429665fe01ecd5449a40052ed -Author: Guillaume Desmottes -Date: Fri Jun 5 17:00:23 2009 +0100 - - raise an error if wocky_xmpp_scheduler_close is called twice - - wocky/wocky-xmpp-scheduler.c | 12 +++++++++--- - wocky/wocky-xmpp-scheduler.h | 1 + - 2 files changed, 10 insertions(+), 3 deletions(-) - -commit d5774f48d3636ac3203a650da681fc8727a7cfd6 -Author: Guillaume Desmottes -Date: Fri Jun 5 16:36:30 2009 +0100 - - test if the right error is raised when trying to close a not started scheduler - - tests/wocky-xmpp-scheduler-test.c | 48 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 48 insertions(+), 0 deletions(-) - -commit a344fbd5dc64b192b2993bfcb8f2e398fec05fa3 -Author: Guillaume Desmottes -Date: Fri Jun 5 16:33:03 2009 +0100 - - wocky_xmpp_scheduler_close: raise an error if scheduler has not been started - - wocky/wocky-xmpp-scheduler.c | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -commit 23dd4eae609c6d50a102086ab127a156b10e4ac1 -Author: Guillaume Desmottes -Date: Fri Jun 5 16:31:56 2009 +0100 - - add WOCKY_XMPP_SCHEDULER_ERROR - - wocky/wocky-xmpp-scheduler.c | 18 ++++++++++++++++++ - wocky/wocky-xmpp-scheduler.h | 14 ++++++++++++++ - 2 files changed, 32 insertions(+), 0 deletions(-) - -commit 06fccf9b94869a4df5651cf63b948526886c63e9 -Author: Guillaume Desmottes -Date: Fri Jun 5 16:17:54 2009 +0100 - - create receive_cancellable when scheduler is started - - Calling _start more than once doesn't make sense and that way we can use - the cancellable to check if the scheduler has been started or not. - - wocky/wocky-xmpp-scheduler.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit e9329271e5b7d95c7eaf9d083b9751d837c89d99 -Author: Guillaume Desmottes -Date: Fri Jun 5 15:57:19 2009 +0100 - - test if the send queue is flushed before closing the connection - - tests/wocky-xmpp-scheduler-test.c | 87 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 87 insertions(+), 0 deletions(-) - -commit 4fd21899a087a3b165ea7f19596f759adf861985 -Author: Guillaume Desmottes -Date: Fri Jun 5 15:56:56 2009 +0100 - - flush the sending queue before closing the connection - - wocky/wocky-xmpp-scheduler.c | 32 +++++++++++++++++++++++++++----- - 1 files changed, 27 insertions(+), 5 deletions(-) - -commit fc32475f8cbc9941762d70bfec77eb879b3dbb54 -Author: Guillaume Desmottes -Date: Fri Jun 5 15:53:55 2009 +0100 - - xmpp-scheduler: include wocky-debug.h - - wocky/wocky-xmpp-scheduler.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 189b3e115f656d3858b4970aa779e60f7690a8b9 -Author: Guillaume Desmottes -Date: Fri Jun 5 15:51:06 2009 +0100 - - add xmpp-scheduler debug domain - - wocky/wocky-debug.c | 1 + - wocky/wocky-debug.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit c3aa6ef4804fd7a074fa933b3891b2403b0ea471 -Author: Guillaume Desmottes -Date: Tue Jun 9 15:21:42 2009 +0100 - - stanza_received_cb: no need to store the async result in a temp variable - - wocky/wocky-xmpp-scheduler.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit 9f4ce3ea9fcdad4b0460b0210523f0a35c93496f -Author: Guillaume Desmottes -Date: Fri Jun 5 12:16:57 2009 +0100 - - test filters - - tests/wocky-xmpp-scheduler-test.c | 103 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 103 insertions(+), 0 deletions(-) - -commit cc92cf455aaf6f5f3ab9e9c4d1fc87bbf99d00c4 -Author: Guillaume Desmottes -Date: Fri Jun 5 12:01:05 2009 +0100 - - test_receive: close the connections - - tests/wocky-xmpp-scheduler-test.c | 67 +++++++++++++++++++++++++++++++++++- - 1 files changed, 65 insertions(+), 2 deletions(-) - -commit 17a75b1c0be207e69b37f4ba762e932a59e7d339 -Author: Guillaume Desmottes -Date: Fri Jun 5 12:00:33 2009 +0100 - - Implement simple and incomplete wocky_xmpp_scheduler_close - - wocky/wocky-xmpp-scheduler.c | 76 +++++++++++++++++++++++++++++++++++++++++- - wocky/wocky-xmpp-scheduler.h | 10 +++++ - 2 files changed, 85 insertions(+), 1 deletions(-) - -commit 6d74ea1811f57ce2cab7f2501998c489da8996c3 -Author: Guillaume Desmottes -Date: Fri Jun 5 11:57:34 2009 +0100 - - add test_open_both_connections() helper - - tests/wocky-test-helper.c | 33 ++++++++++++++++++++++++++++----- - tests/wocky-test-helper.h | 2 ++ - 2 files changed, 30 insertions(+), 5 deletions(-) - -commit cd841cc83f95d52b9516181ea4ee98191a079d41 -Author: Guillaume Desmottes -Date: Tue Jun 2 18:19:22 2009 +0100 - - test stanza receiving - - tests/wocky-xmpp-scheduler-test.c | 50 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 50 insertions(+), 0 deletions(-) - -commit 13ed721929cebc8bf2ce93ae0caf6953d831b18f -Author: Guillaume Desmottes -Date: Tue Jun 2 18:19:07 2009 +0100 - - xmpp-scheduler: implement receiving - - wocky/wocky-xmpp-scheduler.c | 137 ++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-scheduler.h | 17 +++++ - 2 files changed, 154 insertions(+), 0 deletions(-) - -commit 7f1b7c2605ebec8634685b73ec9673c39d5d92d5 -Author: Guillaume Desmottes -Date: Thu Jun 4 10:46:09 2009 +0100 - - wocky-xmpp-connection-test: test cancelling wocky_xmpp_connection_recv_stanza_async - - tests/wocky-xmpp-connection-test.c | 46 ++++++++++++++++++++++++++++++++++++ - 1 files changed, 46 insertions(+), 0 deletions(-) - -commit 0607cf05c67c16e7ff4d1017f6008d904767a864 -Author: Guillaume Desmottes -Date: Thu Jun 4 10:45:43 2009 +0100 - - implement cancellable support in wocky_test_input_stream_read_async - - tests/wocky-test-stream.c | 23 ++++++++++++++++++++--- - 1 files changed, 20 insertions(+), 3 deletions(-) - -commit 6da1de42742ad4ed326a9d9f92f73dd348bcc4da -Author: Guillaume Desmottes -Date: Thu Jun 4 17:28:29 2009 +0100 - - rename wocky_test_input_stream_data_available to _try_read and use it in _read_async - - tests/wocky-test-stream.c | 26 +++++++++++++++++--------- - 1 files changed, 17 insertions(+), 9 deletions(-) - -commit 279ce500d54bb707c0d195d83ef546081891c80b -Author: Guillaume Desmottes -Date: Thu Jun 4 17:14:02 2009 +0100 - - wocky_test_stream_init: pass associated input_stream to output_data_written_cb - - tests/wocky-test-stream.c | 24 +++++++----------------- - 1 files changed, 7 insertions(+), 17 deletions(-) - -commit 19eda286d9a31a7d97d8471558ffb2cd8ec007d8 -Author: Guillaume Desmottes -Date: Wed Jun 3 15:17:03 2009 +0100 - - TestStream: call wocky_test_input_stream_data_available when the OutputStream has written data - - tests/wocky-test-stream.c | 30 +++++++++++++++++++++++++++++- - 1 files changed, 29 insertions(+), 1 deletions(-) - -commit 36b6a164f22272b8e830d5da7c405fa63ace641a -Author: Guillaume Desmottes -Date: Wed Jun 3 15:16:29 2009 +0100 - - TestInputStream: implement async reading - - tests/wocky-test-stream.c | 96 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 96 insertions(+), 0 deletions(-) - -commit fcdf24ef1cdcb16fffef6c85e0f20dceade85153 -Author: Guillaume Desmottes -Date: Wed Jun 3 15:14:51 2009 +0100 - - wocky-test-stream: add data-written signal on the TestOutputStream object - - tests/wocky-test-stream.c | 18 +++++++++++++++++- - 1 files changed, 17 insertions(+), 1 deletions(-) - -commit ccf96d2734dc8a18ed9df3c4abc9b5e1ddb7c505 -Author: Guillaume Desmottes -Date: Wed Jun 3 15:53:47 2009 +0100 - - wait_close_cb: use g_assert_error - - tests/wocky-test-helper.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit f91e267758d7d2e8e0bc42a50033c16dfde8554f -Author: Guillaume Desmottes -Date: Wed Jun 3 14:55:09 2009 +0100 - - wocky-xmpp-scheduler-test: send one more stanza when testing sending - - This will ensure that all and the pending sending operations have been - completed before calling test_close_connection(). - - tests/wocky-xmpp-scheduler-test.c | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) - -commit e280d1387a3b1b1eddce038f01fbc0d4d1e5e86e -Author: Guillaume Desmottes -Date: Wed Jun 3 14:05:38 2009 +0100 - - test_send_simple_message: use test_{open,close}_connection - - tests/wocky-xmpp-connection-test.c | 85 ++++++------------------------------ - 1 files changed, 14 insertions(+), 71 deletions(-) - -commit b1d67eb9a573d2f960b93252967cc523992eb246 -Author: Guillaume Desmottes -Date: Wed Jun 3 13:55:29 2009 +0100 - - wocky-xmpp-scheduler-test: use test_{open,from}_connection from test helper - - tests/wocky-xmpp-scheduler-test.c | 92 +------------------------------------ - 1 files changed, 2 insertions(+), 90 deletions(-) - -commit 2757eb6990a14f335ad05b742057746ee5db489f -Author: Guillaume Desmottes -Date: Wed Jun 3 13:55:06 2009 +0100 - - add test_{open,close}_connection to test-helper - - tests/wocky-test-helper.c | 88 +++++++++++++++++++++++++++++++++++++++++++++ - tests/wocky-test-helper.h | 4 ++ - 2 files changed, 92 insertions(+), 0 deletions(-) - -commit 8bd7be587eab9fa3de0f8037a40db0a5bd41d5fe -Author: Guillaume Desmottes -Date: Wed Jun 3 13:49:46 2009 +0100 - - wocky-xmpp-connection-test: use test helper - - tests/wocky-xmpp-connection-test.c | 56 +---------------------------------- - 1 files changed, 2 insertions(+), 54 deletions(-) - -commit 57ba9e784df0a446a22899fb189b696b0fceea5f -Author: Guillaume Desmottes -Date: Wed Jun 3 13:49:27 2009 +0100 - - wocky-xmpp-scheduler-test: use test helper - - tests/wocky-xmpp-scheduler-test.c | 67 +------------------------------------ - 1 files changed, 1 insertions(+), 66 deletions(-) - -commit 93a6e922356bffa109a3972771f40e943ed1bf07 -Author: Guillaume Desmottes -Date: Wed Jun 3 13:49:00 2009 +0100 - - add wocky-test-helper.[ch] - - tests/Makefile.am | 2 + - tests/wocky-test-helper.c | 58 +++++++++++++++++++++++++++++++++++++++++++++ - tests/wocky-test-helper.h | 32 ++++++++++++++++++++++++ - 3 files changed, 92 insertions(+), 0 deletions(-) - -commit 881ba77b4d37fea577be5c5c26106d3438226d84 -Author: Guillaume Desmottes -Date: Tue Jun 2 18:34:55 2009 +0100 - - wocky-xmpp-scheduler-test: factor out close_connection() - - tests/wocky-xmpp-scheduler-test.c | 94 ++++++++++++++++++++++--------------- - 1 files changed, 56 insertions(+), 38 deletions(-) - -commit 9794e11ccb9db7e300ee5a816be0022b5d56beba -Author: Guillaume Desmottes -Date: Tue Jun 2 17:28:56 2009 +0100 - - wocky-xmpp-scheduler-test: factor out open_connection() - - tests/wocky-xmpp-scheduler-test.c | 105 +++++++++++++++++++++---------------- - 1 files changed, 59 insertions(+), 46 deletions(-) - -commit df77c35236f9131f1a51e048a939354f963058c9 -Author: Guillaume Desmottes -Date: Tue Jun 2 16:22:43 2009 +0100 - - store the self pointer in sending_queue_elem - - That way we don't have to use another struct as callback data when - connecting the cancelled signal. - - wocky/wocky-xmpp-scheduler.c | 45 ++++++++++------------------------------- - 1 files changed, 11 insertions(+), 34 deletions(-) - -commit 03eb19c97cdf48766bea07263f91ebb3561d38fc -Author: Guillaume Desmottes -Date: Tue Jun 2 16:20:15 2009 +0100 - - send_cancelled_cb: use remove instead of remove_all as the same elem isn't expected to be more than once in the queue - - wocky/wocky-xmpp-scheduler.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 16ca9b6e59e7a2ec770dc83fa42e1f3d915bd64c -Author: Guillaume Desmottes -Date: Tue Jun 2 16:07:42 2009 +0100 - - send_received_open_cb: use g_assert instead of g_assert_not_reached - - tests/wocky-xmpp-scheduler-test.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 189ffc2a988d4642a486e662606709d1aab0f2ab -Author: Guillaume Desmottes -Date: Tue Jun 2 16:06:38 2009 +0100 - - check that we receive the right error when waiting for the disconnection - - tests/wocky-xmpp-scheduler-test.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit e74d11f7d165fdea8accc4554afd61c49139c097 -Author: Guillaume Desmottes -Date: Tue Jun 2 16:04:21 2009 +0100 - - wocky-xmpp-scheduler-test.c: move misleading comment - - tests/wocky-xmpp-scheduler-test.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8f03cf617138cd1929fe0045c04e34fc0125a828 -Author: Guillaume Desmottes -Date: Tue Jun 2 16:00:10 2009 +0100 - - wocky_xmpp_scheduler_send_full_finish: check if result is valid - - wocky/wocky-xmpp-scheduler.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 251b9f66cd0408e7c74c2389b4b180385fd24630 -Author: Guillaume Desmottes -Date: Tue Jun 2 15:54:52 2009 +0100 - - rename sending_queue_elt to sending_queue_elem - - wocky/wocky-xmpp-scheduler.c | 87 +++++++++++++++++++++--------------------- - 1 files changed, 44 insertions(+), 43 deletions(-) - -commit 418af4933a5d9ca2e819188b399707f3eb4e4a82 -Author: Guillaume Desmottes -Date: Tue Jun 2 14:53:16 2009 +0100 - - send_stanza_cb: check wocky_xmpp_connection_send_stanza_finish return value - - wocky/wocky-xmpp-scheduler.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 637da6dcc942c231d5d2049c8906052d122998ac -Author: Guillaume Desmottes -Date: Tue Jun 2 14:13:09 2009 +0100 - - test cancelling a stanza before it has been sent - - tests/wocky-xmpp-scheduler-test.c | 46 +++++++++++++++++++++++++++++++++++- - 1 files changed, 44 insertions(+), 2 deletions(-) - -commit 477ad45c3d9f9d73c91949f5e03dce85b5137417 -Author: Guillaume Desmottes -Date: Tue Jun 2 14:12:40 2009 +0100 - - Remove stanza from the queue and cancel its sending if its cancellable is cancelled - - wocky/wocky-xmpp-scheduler.c | 54 ++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 52 insertions(+), 2 deletions(-) - -commit 9c4069b2210c00a1dffbcd4e75598d4f0ddd0505 -Author: Guillaume Desmottes -Date: Tue Jun 2 11:22:11 2009 +0100 - - assert that we received all the expected stanzas when disposing the test - - tests/wocky-xmpp-scheduler-test.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 7c7baecba968d6cc7754d135c48200dbd4daa265 -Author: Guillaume Desmottes -Date: Mon Jun 1 17:12:11 2009 +0100 - - test wocky_xmpp_scheduler_send - - tests/wocky-xmpp-scheduler-test.c | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) - -commit f7e7b6053cb6d464ccf42663d11d493027f4254a -Author: Guillaume Desmottes -Date: Mon Jun 1 17:12:00 2009 +0100 - - add wocky_xmpp_scheduler_send - - wocky/wocky-xmpp-scheduler.c | 7 +++++++ - wocky/wocky-xmpp-scheduler.h | 3 +++ - 2 files changed, 10 insertions(+), 0 deletions(-) - -commit 9ab57f9b94265c493c3af98cbb7fd3fc9a9823c8 -Author: Guillaume Desmottes -Date: Mon Jun 1 15:54:53 2009 +0100 - - test wocky_xmpp_scheduler_send_full - - tests/wocky-xmpp-scheduler-test.c | 206 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 206 insertions(+), 0 deletions(-) - -commit c490b404e407b8e1851ee847b4e41cfd200050ef -Author: Guillaume Desmottes -Date: Mon Jun 1 15:45:23 2009 +0100 - - Implement wocky_xmpp_scheduler_send_full - - wocky/wocky-xmpp-scheduler.c | 134 ++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-scheduler.h | 12 ++++ - 2 files changed, 146 insertions(+), 0 deletions(-) - -commit d8b252ece382d077e0aa98a2e49881e7251ccc76 -Author: Guillaume Desmottes -Date: Mon Jun 1 12:53:46 2009 +0100 - - add tests/wocky-xmpp-scheduler-test to .gitignore - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit b308b15a7aac4ef0152198cb31f8cd24ddbca5c3 -Author: Guillaume Desmottes -Date: Mon Jun 1 12:53:00 2009 +0100 - - add wocky-xmpp-scheduler-test.c and test instantion of the scheduler - - tests/Makefile.am | 7 +++++- - tests/wocky-xmpp-scheduler-test.c | 38 +++++++++++++++++++++++++++++++++++++ - 2 files changed, 44 insertions(+), 1 deletions(-) - -commit f0bc7751b1d5648ed16543f4511ef85f50e99adc -Author: Guillaume Desmottes -Date: Mon Jun 1 12:37:43 2009 +0100 - - add skeleton of wocky-xmpp-scheduler.[ch] - - wocky/Makefile.am | 4 +- - wocky/wocky-xmpp-scheduler.c | 187 ++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-scheduler.h | 64 ++++++++++++++ - 3 files changed, 254 insertions(+), 1 deletions(-) - -commit 511cfe3be6d61fc643807858a3619498e387cc4a -Author: Guillaume Desmottes -Date: Tue Jun 2 14:23:48 2009 +0100 - - Ignore lcov generated files - - .gitignore | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit 897aaa49cd6487a463ea99a6b04712130d44742b -Author: Sjoerd Simons -Date: Tue Jun 2 10:53:28 2009 +0100 - - Fix typo in comments - - tests/wocky-test-sasl-auth-server.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f5101174008ec502a2a053c832e6389fb3ca71dc -Author: Sjoerd Simons -Date: Tue Jun 2 10:51:28 2009 +0100 - - free the decoded response in all cases - - tests/wocky-test-sasl-auth-server.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit e6996af331116e2b595f52ce0ed2205c49faec1b -Author: Sjoerd Simons -Date: Mon Jun 1 19:22:47 2009 +0100 - - Propertify the sasl auth user, password, server and connection parameters - - The username-requested and password-requested were usually just annoying for - users of the API and didn't help much as the only authentication mechanisms - that are currently implemented always need a username/password anyway. - - Also moved server and connection up into the constructor as they should be - static anyway. - - examples/connect.c | 15 +---- - tests/wocky-test-sasl-auth.c | 22 ++---- - wocky/wocky-sasl-auth.c | 156 +++++++++++++++++++++++++++++------------- - wocky/wocky-sasl-auth.h | 7 +- - 4 files changed, 121 insertions(+), 79 deletions(-) - -commit 0f7cd832532ed56cf1d30c965ae371b05a56dbaa -Author: Sjoerd Simons -Date: Mon Jun 1 18:31:42 2009 +0100 - - Test Sasl authentication using the wrong username/password - - tests/wocky-test-sasl-auth-server.c | 65 +++++++++++++++++++++++++++++++++-- - tests/wocky-test-sasl-auth-server.h | 2 + - tests/wocky-test-sasl-auth.c | 27 ++++++++++++--- - 3 files changed, 86 insertions(+), 8 deletions(-) - -commit 80d03b583a10815518b8310f4be448e1c04c32c2 -Author: Sjoerd Simons -Date: Fri May 22 18:37:50 2009 +0100 - - Remove unused wocky_debug_stanza - - wocky/wocky-debug.c | 26 -------------------------- - 1 files changed, 0 insertions(+), 26 deletions(-) - -commit a3a7af80578032f008fead5f8af9fc63c1e91a60 -Author: Sjoerd Simons -Date: Fri May 22 18:36:59 2009 +0100 - - small coding style fix - - wocky/wocky-debug.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit df4225f312414e5c3033ac613f2577703eeeacd5 -Author: Sjoerd Simons -Date: Fri May 22 18:35:29 2009 +0100 - - Move SaslAuth to a more gio like API - - examples/connect.c | 37 +++++-------- - tests/wocky-test-sasl-auth.c | 54 ++++++++----------- - wocky/wocky-sasl-auth.c | 121 +++++++++++++++++++++++++----------------- - wocky/wocky-sasl-auth.h | 16 ++++-- - 4 files changed, 121 insertions(+), 107 deletions(-) - -commit 24ac60b3cc10c80135e9893445d14506c7f4f2dd -Author: Sjoerd Simons -Date: Mon May 18 17:20:58 2009 +0100 - - Make the example work with the latest glib/gio versions - - examples/connect.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit d00206a4b16948abfbd9f21a370963fedbd4e3bd -Author: Sjoerd Simons -Date: Mon May 18 17:20:31 2009 +0100 - - Make the example a bit more friendly to use - - examples/connect.c | 27 +++++++++++++++++++++++---- - 1 files changed, 23 insertions(+), 4 deletions(-) - -commit d920590317e61e13d326bf01f480c0fce8521378 -Author: Sjoerd Simons -Date: Fri May 15 17:35:37 2009 +0100 - - Add ability to generate code coverage statistics - - Makefile.am | 3 +++ - configure.ac | 13 +++++++++++++ - 2 files changed, 16 insertions(+), 0 deletions(-) - -commit 2790b407dca4bfa39a3a4ffe2819a2cf09311694 -Author: Sjoerd Simons -Date: Fri May 15 17:33:15 2009 +0100 - - Output all output of genhtml - - The output of genhtml doesn't follow a standard format, so don't try to grep - into it for details. As it is, the output is pretty small and reasonably - useful, so it doesn't win anything anyway - - rules/lcov.mak | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 25098ed1acc86e0ed962f3f1f9f03418ba46dd08 -Author: Emanuele Aina -Date: Fri Jul 6 07:31:48 2007 +0000 - - Removed a redundant rule in lcov.mak - - 20070706073148-f974e-45ecdef81918d4d9926bd6a5faba0e09de35c82e.gz - - rules/lcov.mak | 9 +++------ - 1 files changed, 3 insertions(+), 6 deletions(-) - -commit 44de7acc851cc1307d99f2423de5c85226fc7ecb -Author: Emanuele Aina -Date: Thu Jul 5 21:54:06 2007 +0000 - - rules/lcov.mak: remove the need for the LCOV_PATH variable - - 20070705215406-f974e-087116fe59a3b2f01f4e12ef470ecd5698eb638a.gz - - rules/lcov.mak | 19 ++++++++++--------- - 1 files changed, 10 insertions(+), 9 deletions(-) - -commit d0baefd87779c8a426fd21595257e0e238bd79d6 -Author: Emanuele Aina -Date: Tue Jul 3 19:30:08 2007 +0000 - - Do not use the internal copy of lcov if we cannot use the system one - - The history has been edited and the internal copy of lcov introduced - in the "Add coverage and valgrind support for tests" patch has been - deleted. Yay for using textual patches to store the history! - - 20070703193008-f974e-d2322b04e4566dd2b12e5b6d15a35197343ffb9c.gz - - rules/lcov.mak | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 6c4bb604de9f165b98cf8812774d913e33311cb9 -Author: Emanuele Aina -Date: Mon Jun 25 17:35:12 2007 +0000 - - Streamline the coverage output printed to screen to make it more useful - - 20070625173512-f974e-f1613c3b485bb04b984114493735cf40331a7382.gz - - rules/lcov.mak | 18 ++++++++++-------- - 1 files changed, 10 insertions(+), 8 deletions(-) - -commit 15b11ff887fae57729d1020de0cfd1010e8f7ee1 -Author: Emanuele Aina -Date: Mon Jun 25 09:39:16 2007 +0000 - - Use the variable instead of calling make directly - - 20070625093916-f974e-a951f658ae1ad2ae4198505fcc9a57e164d1924d.gz - - rules/lcov.mak | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 62678cb1604cd3617072cfe5718256695e901ed6 -Author: Emanuele Aina -Date: Sun Jun 24 22:57:53 2007 +0000 - - Put the lcov output in coverage/ instead of lcov/ - - 20070624225753-f974e-5f129404f14e68f686a38231fddd432678232421.gz - - rules/lcov.mak | 20 +++++++++++--------- - 1 files changed, 11 insertions(+), 9 deletions(-) - -commit 6b058337d0aa472495a62e1f95ed40cf47952912 -Author: Emanuele Aina -Date: Sun Jun 24 21:57:11 2007 +0000 - - Add coverage and valgrind support for tests - - 20070624215711-f974e-565c5019028294ac2c333e9e863af6699abfb83f.gz - - rules/lcov.mak | 25 +++++++++++++++++++++++++ - 1 files changed, 25 insertions(+), 0 deletions(-) - -commit dfcb0b2b8ca9704b6d6e571f18c4da7eeaaf38b2 -Author: Emanuele Aina -Date: Tue Jul 3 19:30:08 2007 +0000 - - Do not use the internal copy of lcov if we cannot use the system one - - The history has been edited and the internal copy of lcov introduced - in the "Add coverage and valgrind support for tests" patch has been - deleted. Yay for using textual patches to store the history! - - 20070703193008-f974e-d2322b04e4566dd2b12e5b6d15a35197343ffb9c.gz - - m4/wocky-lcov.m4 | 7 +------ - 1 files changed, 1 insertions(+), 6 deletions(-) - -commit 5f881517714b1a0b4b504174379d773749231a7e -Author: Emanuele Aina -Date: Tue Jun 26 13:21:54 2007 +0000 - - Fixed the valgrind and coverage compile options reorganizing the macro inclusion - - 20070626132154-f974e-1c612eaa640fd535b4ebb5b8bfc40695ff9819f5.gz - - m4/wocky-gcov.m4 | 57 +++++++++++++++++++++++++++++------------------------ - m4/wocky-lcov.m4 | 12 +++++++--- - 2 files changed, 39 insertions(+), 30 deletions(-) - -commit 88bc0fe9e1019025221ed0849417bfcb14999568 -Author: Emanuele Aina -Date: Mon Jun 25 09:13:47 2007 +0000 - - Print 'no' when checking for the lcov executable - - 20070625091347-f974e-685d07ee25031df4129e60f9df4eb6fdd5ba0e84.gz - - m4/wocky-lcov.m4 | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 0c314b851edc62ddff813580517b0b2dd6b4e3bf -Author: Emanuele Aina -Date: Mon Jun 25 09:13:06 2007 +0000 - - Corrected the HAVE_GCOV variable name - - 20070625091306-f974e-cf057c7c9978d567f3eb46a56e476f5cf4afcc75.gz - - m4/wocky-gcov.m4 | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 75643a4870f1d97423a5006aa6768b386b0d6c2e -Author: Emanuele Aina -Date: Mon Jun 25 07:57:42 2007 +0000 - - Split the command line settings from the detection of libraries and utilities - - 20070625075742-f974e-6695a3b35627caa5a09411094577c68d34a60d1e.gz - - m4/wocky-gcov.m4 | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ - m4/wocky-lcov.m4 | 22 ++++++++++++++++++++++ - 2 files changed, 70 insertions(+), 0 deletions(-) - -commit b84438c2c653c085a5acd6f5f8826e555d81a350 -Author: Sjoerd Simons -Date: Fri May 15 15:24:52 2009 +0100 - - free errors after usage - - tests/wocky-xmpp-connection-test.c | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -commit 3b9af1cc237749d5b375d696cd00b128a2648f89 -Author: Sjoerd Simons -Date: Fri May 15 15:19:08 2009 +0100 - - Mark the input stream as closed when the reader is in CLOSED or ERROR state - - wocky/wocky-xmpp-connection.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit fb292e99a3a70fba491bdfb7685de1f100663e7c -Author: Sjoerd Simons -Date: Fri May 15 15:10:28 2009 +0100 - - Remove useles empty line - - wocky/wocky-xmpp-connection.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit ded1c661557dae3b6da5c66cc00dc0804b043154 -Author: Sjoerd Simons -Date: Fri May 15 15:10:12 2009 +0100 - - Implement WOCKY_XMPP_CONNECTION_ERROR_{IS_CLOSED,IS_OPEN} error reporting - - wocky/wocky-xmpp-connection.c | 213 ++++++++++++++++++++++++++++------------- - 1 files changed, 148 insertions(+), 65 deletions(-) - -commit 4fc485ff6b62487fa4c6cbf777f6197356fa73a1 -Author: Sjoerd Simons -Date: Fri May 15 15:08:55 2009 +0100 - - Add WOCKY_XMPP_CONNECTION_ERROR_{IS_CLOSED,IS_OPEN} - - wocky/wocky-xmpp-connection.h | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 2d8b9ebc2de3dcc2fcbcb9d129f56ebde0132cb1 -Author: Sjoerd Simons -Date: Fri May 15 13:06:46 2009 +0100 - - Add test for _IS_CLOSED and _IS_OPEN errors from the XmppConnection - - tests/wocky-xmpp-connection-test.c | 247 ++++++++++++++++++++++++++++++++++++ - 1 files changed, 247 insertions(+), 0 deletions(-) - -commit 4dae728e05ed4e7f75872323879bfb5e3e58a780 -Author: Sjoerd Simons -Date: Fri May 15 12:25:41 2009 +0100 - - Implement reporting of WOCKY_XMPP_CONNECTION_ERROR_NOT_OPEN - - wocky/wocky-xmpp-connection.c | 31 +++++++++++++++++++++++++++++-- - 1 files changed, 29 insertions(+), 2 deletions(-) - -commit ac98e1b3a12500e7180f18ceba288941016619e7 -Author: Sjoerd Simons -Date: Mon Apr 27 22:39:43 2009 +0100 - - Add test for WOCKY_XMPP_CONNECTION_ERROR_NOT_OPEN - - tests/wocky-xmpp-connection-test.c | 84 +++++++++++++++++++++++++++++++++++- - 1 files changed, 82 insertions(+), 2 deletions(-) - -commit dbdadf768558077acae49bf7431105ac71ad1078 -Author: Sjoerd Simons -Date: Fri May 15 11:47:09 2009 +0100 - - Correctly count outstanding operation in the simple message test - - tests/wocky-xmpp-connection-test.c | 33 +++++++++++++++++++++++++++++---- - 1 files changed, 29 insertions(+), 4 deletions(-) - -commit ebfe07410fa3f4a832872d3518e02aab30e51f63 -Author: Sjoerd Simons -Date: Fri May 15 11:44:25 2009 +0100 - - On write errors use the correct AsyncResult - - wocky/wocky-xmpp-connection.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit e9295ce2d6a9c0e133c335e430153d10e7a312e5 -Author: Sjoerd Simons -Date: Fri May 15 11:43:31 2009 +0100 - - Chain up dispose to the right parent class - - tests/wocky-test-stream.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 1697164be513289ae8ade35f389ab3ab33f35601 -Author: Sjoerd Simons -Date: Fri May 15 11:43:00 2009 +0100 - - Remove useless finalize - - tests/wocky-test-stream.c | 9 --------- - 1 files changed, 0 insertions(+), 9 deletions(-) - -commit 80e8d2e23db228df1bd813fb56a686882688f924 -Author: Sjoerd Simons -Date: Fri May 15 11:42:07 2009 +0100 - - GIOStream is now a base-class instead of an interface - - GIOStream got merged into glib as a base-class instead of an interface. Make - WockyTestIOStream implement the basic functionality of this class and also move - the ownership of the input and output streams from WockyTestStream to - WockyTestIoStream for more correct refcounting - - tests/wocky-test-stream.c | 52 ++++++++++++++++++++------------------------ - 1 files changed, 24 insertions(+), 28 deletions(-) - -commit 4118cbe69438eaf43e61fccf9be4a7ec16a1c169 -Author: Sjoerd Simons -Date: Fri May 15 11:11:11 2009 +0100 - - get_{input,output}_stream no longer return refs - - wocky/wocky-xmpp-connection.c | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 993b66dca1bc78ea1c2d08ba49a53a51fc97b8b6 -Author: Sjoerd Simons -Date: Mon Apr 27 22:27:07 2009 +0100 - - Implementing WockyXmppConnection pending error reporting - - wocky/wocky-xmpp-connection.c | 45 +++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-connection.h | 8 +++--- - 2 files changed, 49 insertions(+), 4 deletions(-) - -commit f5e5186be62cdf5f48a42ac021a47f1340507413 -Author: Sjoerd Simons -Date: Mon Apr 27 20:57:09 2009 +0200 - - First propagate errors, then assert validity - - wocky/wocky-xmpp-connection.c | 32 ++++++++++++++++---------------- - 1 files changed, 16 insertions(+), 16 deletions(-) - -commit a85cd2dfb6c6165baaa3d164a8e6ce0db362526c -Author: Sjoerd Simons -Date: Mon Apr 27 20:49:23 2009 +0200 - - Add test for WOCKY_XMPP_CONNECTION_ERROR_PENDING - - tests/wocky-xmpp-connection-test.c | 275 +++++++++++++++++++++++++++++++++++- - 1 files changed, 274 insertions(+), 1 deletions(-) - -commit a720f4473a9af3159d106fa7f8d21567bfb5075a -Author: Sjoerd Simons -Date: Mon Apr 27 20:48:49 2009 +0200 - - Add new error messages - - wocky/wocky-xmpp-connection.h | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 66cd832b07843202288ad90380d8bb436332df28 -Author: Sjoerd Simons -Date: Mon Apr 27 19:19:23 2009 +0200 - - Factor out some common test setup - - tests/wocky-xmpp-connection-test.c | 90 ++++++++++++++++++++---------------- - 1 files changed, 50 insertions(+), 40 deletions(-) - -commit bbb959af3b34fafa7a1e37e2c16b459f7d3a6453 -Author: Sjoerd Simons -Date: Sat Apr 25 00:56:22 2009 +0200 - - Get rid of the WockyXmppConnectionFlags - - wocky/wocky-xmpp-connection.c | 50 +++++++++++++++++++++++++++-------------- - wocky/wocky-xmpp-connection.h | 13 ---------- - 2 files changed, 33 insertions(+), 30 deletions(-) - -commit be9bbfa3fdf7ccb9ce4902663f297b947babb3d9 -Author: Sjoerd Simons -Date: Sat Apr 25 00:52:36 2009 +0200 - - only send stanza after sending the opening has finished - - tests/wocky-xmpp-connection-test.c | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 6bcae39e85b1d512a0590b7dbc7675d98d381204 -Author: Sjoerd Simons -Date: Mon Apr 27 15:05:40 2009 +0200 - - Fixed documentation style issues - - wocky/wocky-xmpp-connection.c | 87 +++++++++++++++++++++-------------------- - 1 files changed, 44 insertions(+), 43 deletions(-) - -commit 0848c5e67c9ef3ba999517b9d6a07cfbc940aa8f -Author: Sjoerd Simons -Date: Fri Apr 24 18:54:11 2009 +0100 - - Initial documentation for WockyXmppConnection - - wocky/wocky-xmpp-connection.c | 165 ++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 164 insertions(+), 1 deletions(-) - -commit 0b84315d26880bf5bd38229c99903b20b2246469 -Author: Sjoerd Simons -Date: Fri Apr 24 10:56:00 2009 +0100 - - Tweak the WockyXmppConnectionError documentation - - wocky/wocky-xmpp-connection.h | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 7085d1caccfd7c9077e027701447fa8cf5edd100 -Author: Sjoerd Simons -Date: Mon Apr 27 14:21:10 2009 +0200 - - Fix coding style - - examples/connect.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit 97e52a67cb4b6332f09820e34e02132f4957ea60 -Author: Sjoerd Simons -Date: Mon Apr 27 14:20:54 2009 +0200 - - Run coding style checks on the example - - examples/Makefile.am | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit c83d762891efb99196acb92d9f56baeb7d9fb2ff -Author: Sjoerd Simons -Date: Mon Apr 27 14:20:19 2009 +0200 - - Remove the useless constructor override in WockyXmppConnection - - wocky/wocky-xmpp-connection.c | 22 +++------------------- - 1 files changed, 3 insertions(+), 19 deletions(-) - -commit ffe6fc959326b27d982143d84a1694ec6bf67856 -Author: Sjoerd Simons -Date: Fri Apr 24 19:27:11 2009 +0100 - - Fix some coding style issues - - wocky/wocky-xmpp-connection.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit d05e3a23d8f1e4da63b0ea137d003d4857b04895 -Author: Sjoerd Simons -Date: Thu Apr 23 18:22:30 2009 +0100 - - Port the connect exampe to the new XmppConnection API - - examples/connect.c | 336 ++++++++++++++++++++++++++++++++++------------------ - 1 files changed, 221 insertions(+), 115 deletions(-) - -commit f8b084781a77bed4dfab9f8ffa96dbb870a1821b -Author: Sjoerd Simons -Date: Thu Apr 23 18:06:17 2009 +0100 - - Correct wocky_xmpp_connection_recv_open_finish prototype - - wocky/wocky-xmpp-connection.c | 8 ++++---- - wocky/wocky-xmpp-connection.h | 8 ++++---- - 2 files changed, 8 insertions(+), 8 deletions(-) - -commit 34514ca4062838df213eca20ac7d3b3a1b889a40 -Author: Sjoerd Simons -Date: Thu Apr 23 15:54:31 2009 +0100 - - style tweak - - tests/wocky-test-stream.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 7beb1c240936d32b5116d9f1b078f7e9c58bf548 -Author: Sjoerd Simons -Date: Thu Apr 23 14:58:26 2009 +0100 - - Port test-sasl-auth to new WockyXmppConnection api - - tests/wocky-test-sasl-auth-server.c | 207 ++++++++++++++++++++++++++++++----- - 1 files changed, 178 insertions(+), 29 deletions(-) - -commit c8e54f29607ef3210f67e67c06094c2fcaf6a7df -Author: Sjoerd Simons -Date: Thu Apr 23 14:57:48 2009 +0100 - - Finish porting WockySaslAuth to new XmppConnection api - - wocky/wocky-sasl-auth.c | 52 +++++++++++++++++++++++++--------------------- - 1 files changed, 28 insertions(+), 24 deletions(-) - -commit 93067ea7fef23a1f5621136e40dc854413ba6734 -Author: Sjoerd Simons -Date: Thu Apr 23 13:31:08 2009 +0100 - - Finish porting wocky-test-sasl-auth to the new XmppConnection api - - tests/wocky-test-sasl-auth.c | 173 ++++++++++++++++++++++++++++++------------ - 1 files changed, 125 insertions(+), 48 deletions(-) - -commit b6ea317ecfea560b16202465703f24900227d4f7 -Author: Sjoerd Simons -Date: Thu Apr 23 16:18:50 2009 +0100 - - Add _reset function to WockyXmppConnection - - wocky/wocky-xmpp-connection.c | 14 ++++++++++++++ - wocky/wocky-xmpp-connection.h | 2 ++ - 2 files changed, 16 insertions(+), 0 deletions(-) - -commit b33584cb42de7d4a8f692d5b70a85189ec9446a8 -Author: Sjoerd Simons -Date: Thu Apr 23 16:18:35 2009 +0100 - - Rename wocky_xmpp_connection_send_stanza_async_finish to wocky_xmpp_connection_send_stanza_finish - - tests/wocky-xmpp-connection-test.c | 2 +- - wocky/wocky-xmpp-connection.c | 8 ++++---- - wocky/wocky-xmpp-connection.h | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -commit 9a8816e5cf4dee267f8c2135001749fca207fb7b -Author: Sjoerd Simons -Date: Wed Apr 22 13:33:32 2009 +0100 - - All async operation should have callbacks calling finish - - tests/wocky-xmpp-connection-test.c | 18 ++++++++++++++++-- - 1 files changed, 16 insertions(+), 2 deletions(-) - -commit 09feab449fef01e09d81cf6d2837a7bd8a399aa0 -Author: Sjoerd Simons -Date: Wed Apr 22 13:26:32 2009 +0100 - - Implement reading side of WockyXmppConnection - - wocky/wocky-xmpp-connection.c | 171 ++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 161 insertions(+), 10 deletions(-) - -commit f02177dd6e6e344fa2eb1afc0de7a1edac2803f7 -Author: Sjoerd Simons -Date: Wed Apr 22 13:25:24 2009 +0100 - - Send close from the input connection instead of output - - tests/wocky-xmpp-connection-test.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 9465c4813c86665627c6a37274cd0e9df7f46793 -Author: Sjoerd Simons -Date: Fri Apr 17 17:38:34 2009 +0100 - - Add a simple message sending test to the connection test - - tests/wocky-xmpp-connection-test.c | 105 +++++++++++++++++++++++++++++++++++- - 1 files changed, 104 insertions(+), 1 deletions(-) - -commit e3b1514009d78478bb050f1096db8c37b856524f -Author: Sjoerd Simons -Date: Fri Apr 17 17:01:11 2009 +0100 - - Implemented the reading side of WockyXmppConnection - - wocky/wocky-xmpp-connection.c | 390 ++++++++++++++++++----------------------- - wocky/wocky-xmpp-connection.h | 2 - - 2 files changed, 171 insertions(+), 221 deletions(-) - -commit 7dc6e67d8972463b8732c208a6ab5f90b4a6529b -Author: Sjoerd Simons -Date: Fri Apr 17 16:59:48 2009 +0100 - - More noddy ports to the new XmppConnection api - - tests/wocky-test-sasl-auth-server.c | 24 +++++++++++++++++------- - tests/wocky-test-sasl-auth.c | 20 +++++++++++++++----- - 2 files changed, 32 insertions(+), 12 deletions(-) - -commit 53abbaef35d5821b8a8284824c6681f041f62793 -Author: Sjoerd Simons -Date: Fri Apr 17 16:59:04 2009 +0100 - - Port the WockyXmppConnection tests to the new API - - tests/wocky-xmpp-connection-test.c | 79 ++++++++++++++++++++++-------------- - 1 files changed, 48 insertions(+), 31 deletions(-) - -commit c9c3e51b010523ad1081bb61e8f3d1d97c0e163b -Author: Sjoerd Simons -Date: Fri Apr 17 16:58:29 2009 +0100 - - Noddy port of WockySaslAuth to the new API - - wocky/wocky-sasl-auth.c | 33 ++++++++++----------------------- - 1 files changed, 10 insertions(+), 23 deletions(-) - -commit 25b94703af119d614d9e4622632de91c3fbff31e -Author: Sjoerd Simons -Date: Fri Apr 17 16:56:46 2009 +0100 - - Add a WockyXmppConnection error domain and various codes - - wocky/wocky-xmpp-connection.c | 18 ++++++++++++++++++ - wocky/wocky-xmpp-connection.h | 21 +++++++++++++++++++++ - 2 files changed, 39 insertions(+), 0 deletions(-) - -commit a55fb89ee72f9c18757ba776a27152bcfe4433d1 -Author: Sjoerd Simons -Date: Fri Apr 10 12:50:10 2009 +0100 - - Redo the XmppConnection API in a more push/pull manner - - Start of the refactored API for xmpp connection. The intention is that the - XmppConnection is a very thin layer over GIOStream and the XMPP reader/writers. - The actual scheduling of stanzas and a more advanced API for adding filters etc - will be part of a higher level object. - - This patch has stubs for all the new methods with the old ones commented out so - tests can compile and run but fail. - - wocky/wocky-xmpp-connection.c | 215 ++++++++++++++++++++++++++++++++--------- - wocky/wocky-xmpp-connection.h | 64 ++++++++++-- - 2 files changed, 221 insertions(+), 58 deletions(-) - -commit 98242d24c638f02758e7c7cbd022ccba54832f99 -Author: Guillaume Desmottes -Date: Fri Apr 17 15:20:54 2009 +0100 - - update .gitignore - - .gitignore | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 503b2ae6b7097232b81608c97ac640d6fb6862d5 -Author: Sjoerd Simons -Date: Fri Apr 17 15:47:14 2009 +0100 - - Fixed typo in documentation (availble -> available) - - wocky/wocky-xmpp-reader.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6ecdea5f71e7ba723896c580f08befda4526aa87 -Author: Sjoerd Simons -Date: Thu Apr 16 17:27:16 2009 +0100 - - Document that _pop_stanza transfer ownership of the stanza to the caller - - wocky/wocky-xmpp-reader.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit a117f2e59663d2592d9892627a3459ce5ee65df2 -Author: Sjoerd Simons -Date: Thu Apr 16 17:22:12 2009 +0100 - - test whether the reader handles a stream with no stanzas correctly - - Add a test to see whether the reader correctly handles a stream which doesn't - include any stanzas, just open and close. At the same time test that - _peek_stanza and _pop_stanza have no effect on the state changes - - tests/wocky-xmpp-reader-test.c | 35 +++++++++++++++++++++++++++++++++++ - 1 files changed, 35 insertions(+), 0 deletions(-) - -commit 02dd8e89a315b07dc7273c5057aa363c8c79415a -Author: Sjoerd Simons -Date: Thu Apr 16 17:21:55 2009 +0100 - - Also exercise wocky_xmpp_reader_peek_stanza in tests - - tests/wocky-xmpp-reader-test.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit a501050e971d32b24b8e01e572f9ce3a5be258b7 -Author: Sjoerd Simons -Date: Thu Apr 16 16:18:06 2009 +0100 - - add wocky_xmpp_reader_peek_stanza function - - Add a function to see if there are stanzas available from the xmpp reader. - - wocky/wocky-xmpp-reader.c | 19 +++++++++++++++++++ - wocky/wocky-xmpp-reader.h | 1 + - 2 files changed, 20 insertions(+), 0 deletions(-) - -commit 3455033f67d333207d33abf4a92521b7bd4f8755 -Author: Sjoerd Simons -Date: Mon Apr 13 16:54:28 2009 +0100 - - Fix style issues found by coding style checker - - tests/wocky-test-sasl-auth.c | 2 +- - tests/wocky-test-stream.h | 4 ++-- - tests/wocky-xmpp-reader-test.c | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -commit 083a0cb3edc72c853100a3efd0c3d39c5f08be61 -Author: Sjoerd Simons -Date: Mon Apr 13 16:52:08 2009 +0100 - - Add coding style checks fo the tests - - tests/Makefile.am | 27 ++++++++++++++++----------- - 1 files changed, 16 insertions(+), 11 deletions(-) - -commit 179db666c83486c1039e6d0f5e7b6797ec0617eb -Author: Sjoerd Simons -Date: Mon Apr 13 16:35:22 2009 +0100 - - Actuall let /xmpp-sasl/no-plain do what was intended - - tests/wocky-test-sasl-auth.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8296cf03e838adfbbf264f8bd23efb5df7bb2c8a -Author: Sjoerd Simons -Date: Mon Apr 13 16:34:58 2009 +0100 - - Add test to refuse plain auth when that's the only one available - - tests/wocky-test-sasl-auth.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit e50dc5ba5b0f457067695e510cf3511d69defc2c -Author: Sjoerd Simons -Date: Mon Apr 13 16:34:17 2009 +0100 - - Use one test case per test - - tests/wocky-test-sasl-auth.c | 37 ++++++++++++++++--------------------- - 1 files changed, 16 insertions(+), 21 deletions(-) - -commit 7a6eb9b3be535dcab90483ab77677495f8317790 -Author: Sjoerd Simons -Date: Mon Apr 13 16:03:17 2009 +0100 - - Port to gtester testing and GIO - - tests/wocky-test-sasl-auth.c | 74 +++++++++++++++++------------------------ - 1 files changed, 31 insertions(+), 43 deletions(-) - -commit 1bfe8ba0ff3652a61b2f942159d2e7d684eb13f9 -Author: Sjoerd Simons -Date: Mon Apr 13 16:01:46 2009 +0100 - - Link and build sasl tests against wocky-test-stream - - tests/Makefile.am | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 4566cd7dc6c77a85467e1f09009585cb5c245f27 -Author: Sjoerd Simons -Date: Mon Apr 13 16:01:14 2009 +0100 - - Port from GibberTransport to GIOStream - - tests/wocky-test-sasl-auth-server.c | 7 ++++--- - tests/wocky-test-sasl-auth-server.h | 4 ++-- - 2 files changed, 6 insertions(+), 5 deletions(-) - -commit 8776899c3ab71cd849b96d383d7706ee241e4497 -Author: Sjoerd Simons -Date: Mon Apr 13 15:58:49 2009 +0100 - - Write the close tag to the output stream as well - - wocky/wocky-xmpp-connection.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 5c6efc7e87382905d7e17631ba9403a83e0b16a6 -Author: Sjoerd Simons -Date: Mon Apr 13 15:34:16 2009 +0100 - - Correctly pass version point to get_object_get - - wocky/wocky-xmpp-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d53e4a2a9e3f535d67b3cf04125559313573ad77 -Author: Sjoerd Simons -Date: Mon Apr 13 15:32:36 2009 +0100 - - Correctly check connection status bitfield - - wocky/wocky-xmpp-connection.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 7e83807aa0a84dd83889c660619a64327fb5925d -Author: Sjoerd Simons -Date: Fri Apr 10 15:09:53 2009 +0100 - - build the sasl tests - - configure.ac | 14 ++++++++++++++ - tests/Makefile.am | 14 ++++++++++++++ - 2 files changed, 28 insertions(+), 0 deletions(-) - -commit 36b170b45e6f305fdf88d3c3ef9ed07038c64356 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:33:00 2008 +0000 - - wocky-test-sasl-auth-server: fix coding style - - tests/wocky-test-sasl-auth-server.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 00a47a2239891bc7fa3ab2ea5146a152a7f9efcf -Author: Guillaume Desmottes -Date: Sat Dec 13 17:25:58 2008 +0000 - - wocky-test-sasl-auth: fix static functions and multi declarations - - tests/wocky-test-sasl-auth.c | 25 +++++++++++++------------ - 1 files changed, 13 insertions(+), 12 deletions(-) - -commit a8411ef267c1c7b03a3a246e69dac6bf10f0e0e6 -Author: Guillaume Desmottes -Date: Mon Dec 8 14:20:01 2008 +0000 - - wocky-test-sasl-auth.c: workaround missing g_set_error_literal - - tests/wocky-test-sasl-auth.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit b7e252cd7cd7874d63e1e3a09b955d3ec474204e -Author: Sjoerd Simons -Date: Wed Jun 4 11:31:58 2008 +0000 - - Coding style updates - - 20080604113158-93b9a-6c2078534b174e0730dfb45389ee2fbca53827a8.gz - - tests/wocky-test-sasl-auth-server.c | 388 +++++++++++++++++++---------------- - tests/wocky-test-sasl-auth-server.h | 20 +- - tests/wocky-test-sasl-auth.c | 158 ++++++++------- - 3 files changed, 305 insertions(+), 261 deletions(-) - -commit ab2c23c715e876004869e370e098514a94a82651 -Author: Sjoerd Simons -Date: Wed Jun 4 10:19:29 2008 +0000 - - Convert tests to telepathy coding style - - 20080604101929-93b9a-7480a8b55e1a75d9a1797bf42412944f31513e20.gz - - tests/wocky-test-sasl-auth-server.c | 36 +++++++++++++++++----------------- - 1 files changed, 18 insertions(+), 18 deletions(-) - -commit 1d2ca3485c2facd14de350faa5fde2c43ee580bf -Author: Sjoerd Simons -Date: Mon Jul 2 07:57:48 2007 +0000 - - Correctly restart the xmpp connection after the auth was successfull - - 20070702075748-b58c9-213277df2d2cb5e38c824542ea6356c1b80f0c0a.gz - - tests/wocky-test-sasl-auth.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit e14d42ff4858dd16302e74c898cb6a41ec5e5873 -Author: Emanuele Aina -Date: Sun Jul 1 14:13:34 2007 +0000 - - Fix a memleak in the WockySaslAuth test - - 20070701141334-f974e-cf2e6f47799a9e6abb864d32ffa13a3ac9a8a52e.gz - - tests/wocky-test-sasl-auth.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 1971aee01ad9e27314ecf94caead0bd5b6486827 -Author: Emanuele Aina -Date: Sun Jul 1 14:08:36 2007 +0000 - - Fix two memleaks in TestSaslAuthServer - - 20070701140836-f974e-f6fc59db3a7309773cc92cf5699405169e342aaf.gz - - tests/wocky-test-sasl-auth-server.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 323871a91984219797f928e0e75e4eb8e6f849c3 -Author: Emanuele Aina -Date: Thu Jun 21 20:52:14 2007 +0000 - - Ported the SASL test to Check using its looping tests support - - 20070621205214-f974e-39f1ea943fea106ca043b43e82f42748e7031ede.gz - - tests/wocky-test-sasl-auth.c | 198 ++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 198 insertions(+), 0 deletions(-) - -commit aa65b1798f0b1b4bef0662b5f49ee76dc57c6213 -Author: Sjoerd Simons -Date: Sat Mar 17 21:20:49 2007 +0000 - - Use sasl-test.db as filename for the sasl test - - 20070317212049-93b9a-74efbb70d1aab22bb0d48f5a7c69eaf2ea35bb8f.gz - - tests/wocky-test-sasl-auth-server.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ca6d85ec64db6d370f581c53b5b14ebf4a658810 -Author: Sjoerd Simons -Date: Sat Feb 17 22:10:01 2007 +0000 - - TestSaslAuthServer: Handle PLAIN correctly and add the possibility to simulate problems - - 20070217221001-93b9a-517090543e2208cdc45dec534e3a99e0eaed1096.gz - - tests/wocky-test-sasl-auth-server.c | 122 ++++++++++++++++++++--------------- - tests/wocky-test-sasl-auth-server.h | 9 ++- - 2 files changed, 77 insertions(+), 54 deletions(-) - -commit e021c54b3504bb3332afc8a2b8d77c0500eed964 -Author: Sjoerd Simons -Date: Sat Feb 17 17:06:05 2007 +0000 - - Add start of a sasl auth test - - 20070217170605-93b9a-9af2313bab57fb9611f352d47bd5cd08af3eb92d.gz - - tests/wocky-test-sasl-auth-server.c | 411 +++++++++++++++++++++++++++++++++++ - tests/wocky-test-sasl-auth-server.h | 64 ++++++ - 2 files changed, 475 insertions(+), 0 deletions(-) - -commit 3f75f90a58986d75e894e0600339c9ec5b37d4b0 -Author: Sjoerd Simons -Date: Mon Apr 13 14:50:05 2009 +0100 - - Small style tweaks and typo fixed to the documentation - - wocky/wocky-xmpp-reader.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -commit 4db621ed08f20fabb8fcd20a341aa2dc8172a100 -Author: Sjoerd Simons -Date: Mon Apr 13 14:17:49 2009 +0100 - - fix typo - - tests/wocky-xmpp-readwrite-test.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 16bc40ed81aaf2534fac9fa87e71300ed8c271a7 -Author: Sjoerd Simons -Date: Mon Apr 13 14:12:45 2009 +0100 - - Fix some small style issues - - tests/wocky-xmpp-readwrite-test.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit d2f51cb31a340fd94225c24a0d17d97357d5676e -Author: Sjoerd Simons -Date: Mon Apr 13 12:55:18 2009 +0100 - - Add a comment to clarify wocky_xmpp_reader_check_eos - - wocky/wocky-xmpp-reader.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 621da979f7488e53e6ad03a9cae3bc80a8133943 -Author: Sjoerd Simons -Date: Fri Apr 10 12:28:43 2009 +0100 - - Don't hardcode the path to valgrind - - tests/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c530c1297b6decaf2f044251f4ac21e3561f8e76 -Author: Sjoerd Simons -Date: Fri Apr 10 11:16:35 2009 +0100 - - Add valgrind surpression for glib leaking tls - - tests/Makefile.am | 5 +++++ - tests/threadlocal.supp | 8 ++++++++ - 2 files changed, 13 insertions(+), 0 deletions(-) - -commit c357dc2c1c2ec3f8ee2efb93f4ec670f0666485c -Author: Sjoerd Simons -Date: Thu Apr 9 19:39:35 2009 +0100 - - unref the input, output and cancel objects on dispose - - wocky/wocky-xmpp-connection.c | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) - -commit 86766769cef5c956d44edea151bc65f6dc56c181 -Author: Sjoerd Simons -Date: Thu Apr 9 19:39:11 2009 +0100 - - Don't forget to free errors - - tests/wocky-xmpp-reader-test.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 9e3cbb657c7930330fcf1f6f3ceae5f9dcfcc017 -Author: Sjoerd Simons -Date: Thu Apr 9 19:38:55 2009 +0100 - - Set all the stream variables to NULL after unreffing - - tests/wocky-test-stream.c | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -commit fa1c63910c72c3a565da344fa90b1861f536e267 -Author: Sjoerd Simons -Date: Thu Apr 9 19:38:27 2009 +0100 - - Clear out the stanza that's in progress when disposing - - wocky/wocky-xmpp-reader.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit ca9bc4a1918815d0d1a7383685c8d256a7b99404 -Author: Sjoerd Simons -Date: Thu Apr 9 19:08:56 2009 +0100 - - Add valgrind test targets - - tests/Makefile.am | 32 +++++++++++++++++++++++++++++++- - 1 files changed, 31 insertions(+), 1 deletions(-) - -commit af573f72676bb2b79c5acfe460ba9abc6f15ae7b -Author: Sjoerd Simons -Date: Thu Apr 9 18:00:42 2009 +0100 - - Document various enums and quarks - - wocky/wocky-xmpp-reader.c | 7 +++++++ - wocky/wocky-xmpp-reader.h | 22 ++++++++++++++++++++++ - 2 files changed, 29 insertions(+), 0 deletions(-) - -commit d54d07bad698c63c2f4fa3e1ea8ab203484581ee -Author: Sjoerd Simons -Date: Thu Apr 9 18:00:05 2009 +0100 - - Generate GObject enums - - wocky/Makefile.am | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 990176ddd27647bc73fadefbf355a0829c6b7dc7 -Author: Sjoerd Simons -Date: Thu Apr 9 17:23:58 2009 +0100 - - Document the methods - - wocky/wocky-xmpp-reader.c | 61 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 61 insertions(+), 0 deletions(-) - -commit d00aa6ae721c0214db3705acb2cddea1fcb951a1 -Author: Sjoerd Simons -Date: Thu Apr 9 17:10:30 2009 +0100 - - Tweak comment so gtk-doc doesn't pick it up - - wocky/wocky-xmpp-stanza.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6b6f3164f2935cc7556484e7be36ac3bcddbb722 -Author: Sjoerd Simons -Date: Mon Apr 6 17:25:43 2009 +0100 - - Update copyright headers - - wocky/wocky-xmpp-reader.c | 4 ++-- - wocky/wocky-xmpp-reader.h | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit c62484cd570c8f0903ff33e19986f92fa26848d2 -Author: Sjoerd Simons -Date: Mon Apr 6 17:05:34 2009 +0100 - - Don't reset the reader state in non-streaming mode after parsing a chunk - - The API user should explicitely reset the xml parser after it got the chunks it - wanted out. Thus the parser shouldn't be reset after parsing a chunk of data in - non-streaming mode. Fixes a bug when parsing one message in seperate - chunks. - - wocky/wocky-xmpp-reader.c | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -commit 0eb0b3600d7c9a8377f4da24202af0616714daba -Author: Sjoerd Simons -Date: Mon Apr 6 17:05:02 2009 +0100 - - Add a test for reader states when parsing chunks - - tests/wocky-xmpp-reader-test.c | 43 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 43 insertions(+), 0 deletions(-) - -commit 09b9556d682c7abab64814af9419577d0b65532a -Author: Sjoerd Simons -Date: Mon Apr 6 16:57:38 2009 +0100 - - Assert that the reader state stays open after a full stanza is parsed - - For consistenty, even in non-streaming mode, the reader state should stay open - untill the stanza is popped. Assert this in the tests as well - - tests/wocky-xmpp-readwrite-test.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 33c81ba85a4376e89ce7a4aa706110e18dfbfa81 -Author: Sjoerd Simons -Date: Fri Apr 3 18:58:50 2009 +0100 - - Fix some object leaks - - tests/wocky-xmpp-readwrite-test.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 0a86a9b15a52ce5f2858a12631ff5bec64b17e55 -Author: Sjoerd Simons -Date: Fri Apr 3 18:52:48 2009 +0100 - - Check if the queue has ended after popping the next stanza - - wocky/wocky-xmpp-reader.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 76910891ff10c669770facac0b7040901f0bf12e -Author: Sjoerd Simons -Date: Fri Apr 3 18:51:58 2009 +0100 - - Add some more checks - - tests/wocky-xmpp-readwrite-test.c | 21 ++++++++++++++++++++- - 1 files changed, 20 insertions(+), 1 deletions(-) - -commit 67fba3d1c47b7fdd86b152e12484842b02ad7a81 -Author: Sjoerd Simons -Date: Fri Apr 3 18:21:44 2009 +0100 - - Correctly return GErrors - - wocky/wocky-xmpp-reader.c | 27 ++++++++++++++++++++++----- - 1 files changed, 22 insertions(+), 5 deletions(-) - -commit 67b87e93fb445aed88049d05480711627f8b1759 -Author: Sjoerd Simons -Date: Fri Apr 3 17:00:36 2009 +0100 - - Add a pure reader test - - tests/Makefile.am | 7 ++- - tests/wocky-xmpp-reader-test.c | 100 ++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 106 insertions(+), 1 deletions(-) - -commit ea73a3b3457d369e845a6521fc30308a5793140c -Author: Sjoerd Simons -Date: Fri Apr 3 18:16:44 2009 +0100 - - Define an error domain for WockyXmppReader - - wocky/wocky-xmpp-reader.c | 12 +++++++++++- - wocky/wocky-xmpp-reader.h | 8 ++++++++ - 2 files changed, 19 insertions(+), 1 deletions(-) - -commit 9f5b3abe87aa2eb601eeab823d9288103f6b6a01 -Author: Sjoerd Simons -Date: Fri Apr 3 16:39:25 2009 +0100 - - rename the reader state enum to WOCKY_XMPP_READER_STATE_* - - tests/wocky-xmpp-readwrite-test.c | 16 ++++++++++------ - wocky/wocky-xmpp-connection.c | 6 +++--- - wocky/wocky-xmpp-reader.c | 14 +++++++------- - wocky/wocky-xmpp-reader.h | 8 ++++---- - 4 files changed, 24 insertions(+), 20 deletions(-) - -commit 94ff0ea84b8ff022b0de84925b126e1632c5e0e3 -Author: Sjoerd Simons -Date: Fri Apr 3 14:35:35 2009 +0100 - - Remove double include - - tests/wocky-xmpp-readwrite-test.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 0dd3acfd18f33646deeab0fb32d638ae96d16303 -Author: Sjoerd Simons -Date: Fri Apr 3 14:28:01 2009 +0100 - - g_return_if_fail if pushing bytes when the reader has closed - - wocky/wocky-xmpp-reader.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 485238b4180fdbf3efd312b9cf43388118ef2542 -Author: Sjoerd Simons -Date: Fri Apr 3 14:27:34 2009 +0100 - - Let the read-write test send multiple messages - - tests/wocky-xmpp-readwrite-test.c | 47 ++++++++++++++++++++++++++----------- - 1 files changed, 33 insertions(+), 14 deletions(-) - -commit 2189612f80620c8dd9dca22216f876ba0fb9b387 -Author: Sjoerd Simons -Date: Fri Apr 3 13:29:09 2009 +0100 - - Add support for opening streams with a default language set - - tests/wocky-xmpp-readwrite-test.c | 5 ++--- - wocky/wocky-xmpp-connection.c | 4 ++-- - wocky/wocky-xmpp-reader.c | 19 +++++++++++++++++++ - wocky/wocky-xmpp-writer.c | 18 ++++++++++++++++-- - wocky/wocky-xmpp-writer.h | 8 ++++++-- - 5 files changed, 45 insertions(+), 9 deletions(-) - -commit 531a7092e1daab286bb4dd3e6d209dd93a610dae -Author: Sjoerd Simons -Date: Fri Apr 3 13:08:52 2009 +0100 - - Make the WockyXmppReader API more synchronous - - Parsing XML is a synchronous event, blobs of data get pushed in stanzas come - out. The async API that emits signals doesn't really reflect this nature and - made using the reader more tedious then needed. The API is now synchronous, - data gets pushed in by one function, stanzas get pulled out by another one and - state is checked afterwards by another function. - - tests/wocky-xmpp-readwrite-test.c | 103 ++++++---------- - wocky/wocky-xmpp-connection.c | 85 +++++-------- - wocky/wocky-xmpp-reader.c | 247 ++++++++++++++++++++++++++----------- - wocky/wocky-xmpp-reader.h | 22 +++- - 4 files changed, 264 insertions(+), 193 deletions(-) - -commit 49ec6757939543b86f65df9ee651986cdabeee85 -Author: Sjoerd Simons -Date: Thu Apr 2 17:08:19 2009 +0100 - - Fix wording - - wocky/wocky-xmpp-writer.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit 485f5b0131d9c00a065748a56acd85cb52387967 -Author: Sjoerd Simons -Date: Thu Apr 2 14:01:31 2009 +0100 - - Convert to new coding style - - wocky/wocky-xmpp-writer.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 6e1b39873e86498c052d5a3410fbf2dc134c631c -Author: Sjoerd Simons -Date: Thu Apr 2 12:48:46 2009 +0100 - - Document WockyXmppWriter - - wocky/wocky-xmpp-writer.c | 46 ++++++++++++++++++++++++++++++++++++++++---- - 1 files changed, 41 insertions(+), 5 deletions(-) - -commit e2d28e439a488a3364d6449a6ba0b193dbdbe6df -Author: Sjoerd Simons -Date: Thu Apr 2 12:38:16 2009 +0100 - - Don't return errors from wocky_xmpp_write_stanza - - In practise wocky_xmpp_write_stanza never returns an error. Change the function - signature to reflect this and not act like it could return errors - - wocky/wocky-xmpp-connection.c | 6 +----- - wocky/wocky-xmpp-writer.c | 5 ++--- - wocky/wocky-xmpp-writer.h | 7 ++++--- - 3 files changed, 7 insertions(+), 11 deletions(-) - -commit 7db9bf17fecd67651f5e0207f7a3601d2da77b8d -Author: Sjoerd Simons -Date: Wed Apr 1 19:49:45 2009 +0100 - - Start of documentation for xmpp-writer - - wocky/wocky-xmpp-writer.c | 26 ++++++++++++++++++++++++++ - 1 files changed, 26 insertions(+), 0 deletions(-) - -commit 72f69804e5341f983c7c1f81fb49318e0f1e5eed -Author: Sjoerd Simons -Date: Thu Apr 2 13:07:34 2009 +0100 - - Rename wocky_xmpp_node_compare to wocky_xmpp_node_equal - - tests/wocky-xmpp-readwrite-test.c | 4 ++-- - wocky/wocky-xmpp-node.c | 4 ++-- - wocky/wocky-xmpp-node.h | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -commit 177774e8edc054604ee214f10b72f318c399e5a0 -Author: Sjoerd Simons -Date: Thu Apr 2 13:02:22 2009 +0100 - - Unref all objects used in the test - - tests/wocky-xmpp-readwrite-test.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit bcdad3efc3dbf1313289fc816e4e89507e089686 -Author: Sjoerd Simons -Date: Thu Apr 2 13:00:16 2009 +0100 - - Remove left-over debugging code - - tests/wocky-xmpp-readwrite-test.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit ff9c11bb7c7de67c289dea8368e8f5becf6edf5e -Author: Sjoerd Simons -Date: Thu Apr 2 12:56:39 2009 +0100 - - Use g_strcmp0 to implement wocky_strdiff - - wocky/wocky-utils.c | 9 +-------- - 1 files changed, 1 insertions(+), 8 deletions(-) - -commit 2f859786fa03aaf8b78a4df546eeb670c6fc443b -Author: Sjoerd Simons -Date: Thu Apr 2 12:55:45 2009 +0100 - - Fix coding style - - wocky/wocky-utils.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 0b48e635e73f93d86250915002e3480239f82d31 -Author: Sjoerd Simons -Date: Wed Apr 1 19:17:37 2009 +0100 - - Assert that open and close aren't called when not in streaming mode - - wocky/wocky-xmpp-writer.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit c3157c668b7c39f799b69c2516ac700ef2a10ce1 -Author: Sjoerd Simons -Date: Wed Apr 1 19:17:08 2009 +0100 - - Add function to compare to node trees - - wocky/wocky-xmpp-node.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-node.h | 4 +++ - 2 files changed, 56 insertions(+), 0 deletions(-) - -commit 92e882f8c126fb0e53c9bdb244f5a0e4f8cabe2e -Author: Sjoerd Simons -Date: Wed Apr 1 19:16:14 2009 +0100 - - If a new child doesn't have a specified namespace, use the parent namespace - - wocky/wocky-xmpp-node.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 821d4248f8778e4dbe1f0286f4146eaa53110774 -Author: Sjoerd Simons -Date: Wed Apr 1 19:15:22 2009 +0100 - - Fix typo - - wocky/wocky-xmpp-writer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8a4e1fa27082fef9bfd9ef53cdf3a900b29f538e -Author: Sjoerd Simons -Date: Wed Apr 1 19:14:18 2009 +0100 - - Set namespaces for all stanza types - - wocky/wocky-xmpp-stanza.c | 36 ++++++++++++++++++++++++------------ - 1 files changed, 24 insertions(+), 12 deletions(-) - -commit 748d7a750638a9a94ad3eeaef6cc7fc5fa674df9 -Author: Sjoerd Simons -Date: Wed Apr 1 19:13:41 2009 +0100 - - Add jabber:client namespace - - wocky/wocky-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit e8480c3bb2150032594b5f4fce327f76e59b6548 -Author: Sjoerd Simons -Date: Wed Apr 1 19:12:45 2009 +0100 - - Add a small test just to test the reader and the writer - - tests/Makefile.am | 5 +- - tests/wocky-xmpp-readwrite-test.c | 159 +++++++++++++++++++++++++++++++++++++ - 2 files changed, 163 insertions(+), 1 deletions(-) - -commit 60aa14017e59c6d4a6a6a8b38084df7d4401e436 -Author: Sjoerd Simons -Date: Wed Apr 1 19:11:58 2009 +0100 - - Add some utilities - - wocky/Makefile.am | 2 ++ - wocky/wocky-utils.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-utils.h | 32 ++++++++++++++++++++++++++++++++ - 3 files changed, 81 insertions(+), 0 deletions(-) - -commit fe48d0aa1516fc2923c162073bfc6d2e195d1fed -Author: Sjoerd Simons -Date: Tue Mar 31 20:11:57 2009 +0100 - - Add streaming-mode construct time property - - wocky/wocky-xmpp-writer.c | 78 +++++++++++++++++++++++++++++++++++++++----- - 1 files changed, 69 insertions(+), 9 deletions(-) - -commit 83a2c296c787e2512834ed56b21f29639208e4c8 -Author: Sjoerd Simons -Date: Wed Apr 1 13:58:28 2009 +0100 - - Fallback to connecting to the server directly on port 5222 if srv resolving fails - - examples/connect.c | 68 +++++++++++++++++++++++++++++++++++++++++++++------- - 1 files changed, 59 insertions(+), 9 deletions(-) - -commit 635f92483e9ce1b965b759af2ee6c4b1f27bd5b2 -Author: Sjoerd Simons -Date: Tue Mar 31 18:49:53 2009 +0100 - - Add gtkdoc infrastructure - - Makefile.am | 2 +- - autogen.sh | 2 + - configure.ac | 4 ++ - docs/Makefile.am | 1 + - docs/reference/Makefile.am | 94 ++++++++++++++++++++++++++++++++++++++++++++ - docs/reference/wocky.types | 11 +++++ - 6 files changed, 113 insertions(+), 1 deletions(-) - -commit 19a946d9e9346b3ee751d9f4091f5525eed61b3c -Author: Sjoerd Simons -Date: Mon Mar 30 12:48:52 2009 +0100 - - Add LGPL 2.1 as COPYING file - - COPYING | 510 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 510 insertions(+), 0 deletions(-) - -commit 68b661d09d36e9e4a87523625f69c29cbefcb561 -Author: Sjoerd Simons -Date: Mon Mar 30 12:45:07 2009 +0100 - - Add a basic gitignore file - - .gitignore | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 69 insertions(+), 0 deletions(-) - -commit 906848ae00fe8be9871aac376c3b4be24c6424a2 -Author: Sjoerd Simons -Date: Fri Mar 27 15:36:29 2009 +0000 - - Ignore eof and cancelled callbacks - - wocky/wocky-xmpp-connection.c | 27 +++++++++++++++++++-------- - 1 files changed, 19 insertions(+), 8 deletions(-) - -commit e1ab4307a71d28a83c5762d335a7faaba8fbe98d -Author: Sjoerd Simons -Date: Fri Mar 27 14:40:28 2009 +0000 - - unref the connection the stream - - tests/wocky-xmpp-connection-test.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 66935908eb1fc342fdd24b8d8089ed8583059d2a -Author: Sjoerd Simons -Date: Fri Mar 27 14:38:16 2009 +0000 - - Ref the async queue in both input and output and end the stream when the writing end is disposed - - tests/wocky-test-stream.c | 20 ++++++++++++++------ - 1 files changed, 14 insertions(+), 6 deletions(-) - -commit c19b402c8320e60a0035d1c019eb94c18bbaef95 -Author: Sjoerd Simons -Date: Fri Mar 27 12:49:58 2009 +0000 - - Unref objects after usage - - tests/wocky-xmpp-connection-test.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 0eeadab870129450d8930f3522536c40f1eecba7 -Author: Sjoerd Simons -Date: Fri Mar 27 12:20:30 2009 +0000 - - Add missing space - - tests/wocky-test-stream.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e59f23eed6f8021e175abf5f78b8f3c9c19c596f -Author: Sjoerd Simons -Date: Thu Mar 26 18:59:12 2009 +0000 - - Use gtester and generate test resports - - tests/Makefile.am | 18 +++++++++++++++--- - 1 files changed, 15 insertions(+), 3 deletions(-) - -commit 1469bdcce4b6d788b7d1a1c116cc5106926b8e15 -Author: Sjoerd Simons -Date: Thu Mar 26 18:58:52 2009 +0000 - - put libwocky.la in LDADD instead of AM_LDFLAGS - - tests/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 65b84717f074344a57a6d7599fe64757428c22f3 -Author: Sjoerd Simons -Date: Thu Mar 26 18:57:23 2009 +0000 - - Use a hardcoded message and add a timeout - - tests/wocky-xmpp-connection-test.c | 102 ++++++++++++++---------------------- - 1 files changed, 40 insertions(+), 62 deletions(-) - -commit b0acae0cc7d82cf023b0c8a516ee9d63a70f4f90 -Author: Sjoerd Simons -Date: Thu Mar 26 16:52:00 2009 +0000 - - Port to WockTestStream - - tests/wocky-xmpp-connection-test.c | 52 ++++++++++++++++++++++------------- - 1 files changed, 33 insertions(+), 19 deletions(-) - -commit 537f300bc4ce02322b805689d108cd1b9d4ef883 -Author: Sjoerd Simons -Date: Thu Mar 26 16:50:48 2009 +0000 - - Implement a test stream - - tests/Makefile.am | 3 +- - tests/wocky-test-stream.c | 356 +++++++++++++++++++++++++++++++++++++++++++++ - tests/wocky-test-stream.h | 69 +++++++++ - 3 files changed, 427 insertions(+), 1 deletions(-) - -commit 7ac2ea742ac94923973854ef46b29aa8c0222700 -Author: Sjoerd Simons -Date: Thu Mar 26 16:50:00 2009 +0000 - - Compile against libwocky - - tests/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit a16675a5f38148f4d0cffe1da8d5217b3946dd6e -Author: Sjoerd Simons -Date: Thu Mar 26 16:49:16 2009 +0000 - - Define test programs - - tests/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 2da6b78091d5a947ee37523ce55aacbe3c061d34 -Author: Sjoerd Simons -Date: Thu Mar 26 11:11:30 2009 +0000 - - Remove usueless debugging - - wocky/wocky-xmpp-connection.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 1fac6a540b046c7f3e9292a758813682df05c8a3 -Author: Sjoerd Simons -Date: Tue Mar 24 17:02:01 2009 +0000 - - Move to GTest - - tests/wocky-xmpp-connection-test.c | 29 ++++++++++++++++------------- - 1 files changed, 16 insertions(+), 13 deletions(-) - -commit d7407e5cc8b2d3916904cf27a778fb4ebaf1f89b -Author: Sjoerd Simons -Date: Tue Mar 24 17:01:35 2009 +0000 - - Build the xmpp connection test - - Makefile.am | 2 +- - configure.ac | 1 + - tests/Makefile.am | 9 +++++++++ - 3 files changed, 11 insertions(+), 1 deletions(-) - -commit 449e09a23fda76464cc52d2c1077d8c0a15b3ca9 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:34:01 2008 +0000 - - wocky-xmpp-connection-test: fix coding style - - tests/wocky-xmpp-connection-test.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e1e3f1b4b64280d2df246b41666e8a1ece8e31b4 -Author: Guillaume Desmottes -Date: Sat Dec 13 15:22:36 2008 +0000 - - wocky-xmpp-connection-test: fix static functions - - tests/wocky-xmpp-connection-test.c | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) - -commit 0e69cdef0ef37d3818f7bdcd7373c33963f3b763 -Author: Sjoerd Simons -Date: Wed Jun 4 10:19:29 2008 +0000 - - Convert tests to telepathy coding style - - 20080604101929-93b9a-7480a8b55e1a75d9a1797bf42412944f31513e20.gz - - tests/wocky-xmpp-connection-test.c | 37 +++++++++++++++++++++-------------- - 1 files changed, 22 insertions(+), 15 deletions(-) - -commit d8879f17e446f72b2f34260575eb9959a05c3a8b -Author: Emanuele Aina -Date: Mon Jul 2 16:49:18 2007 +0000 - - Fix a memleak in the WockyXmppConnection test - - 20070702164918-f974e-d961a1edd7f9d983588abecbc339095b1ab43e67.gz - - tests/wocky-xmpp-connection-test.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 263548eb95b7ab382f6c99c8368131de1ef60f0b -Author: Emanuele Aina -Date: Wed Jun 27 13:03:05 2007 +0000 - - Use the $srcdir env var to obtain the input files to make 'make distcheck' happy - - 20070627130305-f974e-abafbea1da144e4822c77f4c5529a1e84b7c42fe.gz - - tests/wocky-xmpp-connection-test.c | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) - -commit a1a3cfb3c6028eca9a188509caa4aa3e349c6298 -Author: Sjoerd Simons -Date: Fri Jun 22 23:00:21 2007 +0000 - - The main test runs g_type_init, no need to do it again in indiviual tests - - 20070622230021-b58c9-b0670ceb4a1c2e27d4b7815421409a7410197d4a.gz - - tests/wocky-xmpp-connection-test.c | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit ab3a9206ca001b0e6bd414f04915f6a2d68ce682 -Author: Sjoerd Simons -Date: Fri Jun 22 22:59:37 2007 +0000 - - Add destructor for the file chunker - - 20070622225937-b58c9-b293278434eaacc2671e4bf79cf4abc5b7278033.gz - - tests/wocky-xmpp-connection-test.c | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) - -commit 0672214f17623d23b1e101bbe29eb11dfe35d1be -Author: Emanuele Aina -Date: Wed Jun 13 16:16:40 2007 +0000 - - Replaced two variables used as constants with thei values - - 20070613161640-f974e-df65a86b4479e120293d77316801459df704d0dc.gz - - tests/wocky-xmpp-connection-test.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 3dfc9142f411a14a363d31b42e2c9ecc9838e664 -Author: Emanuele Aina -Date: Wed Jun 13 16:13:24 2007 +0000 - - Factored the file chunking code out of the test - - 20070613161324-f974e-d62367f7adbd4db10479b8e9078b1be0cb45a2e9.gz - - tests/wocky-xmpp-connection-test.c | 51 +++++++++++++++++++++++++++++------ - 1 files changed, 42 insertions(+), 9 deletions(-) - -commit ea65e79738efeb5a35741345bc4b026879c2cb02 -Author: Emanuele Aina -Date: Wed Jun 13 15:36:14 2007 +0000 - - Check the parsing of a valid message - - 20070613153614-f974e-8c309a7855465643f05f322e1366640a9656f2c6.gz - - tests/wocky-xmpp-connection-test.c | 36 ++++++++++++++++++++++++++++++++++++ - 1 files changed, 36 insertions(+), 0 deletions(-) - -commit c9038d2b29279027889021bc952c34165e36e306 -Author: Emanuele Aina -Date: Wed Jun 13 14:02:35 2007 +0000 - - Add a testcase for WockyXmppConnection and check its istantiation - - 20070613140235-f974e-38a23919dc403a05ad6852760c6b13bd9ad2e6f5.gz - - tests/wocky-xmpp-connection-test.c | 35 +++++++++++++++++++++++++++++++++++ - 1 files changed, 35 insertions(+), 0 deletions(-) - -commit 0638057a6768d8120ef7e65c44fa7eb30d0c08a4 -Author: Sjoerd Simons -Date: Tue Mar 24 14:35:48 2009 +0000 - - Coding style fix - - wocky/wocky-sasl-auth.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4d074ec8e8c8b0bf24f5869cef0a55e5287c2e53 -Author: Sjoerd Simons -Date: Thu Mar 26 11:05:13 2009 +0000 - - Add fixmes to catch erros when writing things out - - wocky/wocky-xmpp-connection.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit d5cd67ff979bcb36c611699867701ad4964e5bcc -Author: Sjoerd Simons -Date: Thu Mar 26 11:03:38 2009 +0000 - - Don't locally define the xmpp namespace - - wocky/wocky-xmpp-connection.c | 1 - - wocky/wocky-xmpp-reader.c | 6 +++--- - 2 files changed, 3 insertions(+), 4 deletions(-) - -commit 383751f5111fc1d22c3ba7b2d585d7d04597b057 -Author: Sjoerd Simons -Date: Thu Mar 26 11:00:07 2009 +0000 - - Don't use C++ style comments - - wocky/wocky-xmpp-connection.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 438382f8318d6af57d95886b04e43375690476b1 -Author: Sjoerd Simons -Date: Tue Mar 24 11:55:12 2009 +0000 - - Update copyright headers - - wocky/wocky-sasl-auth.c | 4 ++-- - wocky/wocky-xmpp-connection.h | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 529fc7a6fa74e31b4979422e641f556c502c48e6 -Author: Sjoerd Simons -Date: Mon Mar 23 18:16:23 2009 +0000 - - Remove dead code - - examples/connect.c | 55 ---------------------------------------------------- - 1 files changed, 0 insertions(+), 55 deletions(-) - -commit 1ece255bbf5d98a66ffa0575f74910a525b172df -Author: Sjoerd Simons -Date: Mon Mar 23 18:11:18 2009 +0000 - - Hook in sasl helper - - examples/connect.c | 21 ++++++++------------- - 1 files changed, 8 insertions(+), 13 deletions(-) - -commit bb31d5438d401d51b703977c612475fcf8c77bc9 -Author: Sjoerd Simons -Date: Mon Mar 23 17:07:32 2009 +0000 - - Add sasl authenticator helper module - - wocky/Makefile.am | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 3c84c10fcea898a73e25a8b06f0b2f2625157fd7 -Author: Sjoerd Simons -Date: Mon Mar 23 17:07:11 2009 +0000 - - Port to GLibs md5 checksum functionality - - wocky/wocky-sasl-auth.c | 60 ++++++++++++++++++++++++++-------------------- - 1 files changed, 34 insertions(+), 26 deletions(-) - -commit 4b75598e43920219416dec5028f8c349a6441370 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:14:10 2008 +0000 - - wocky-sasl-auth: fix coding style - - wocky/wocky-sasl-auth.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit 26ab880096b9782311ff127a1331a3638bb00387 -Author: Guillaume Desmottes -Date: Fri Dec 12 17:54:08 2008 +0000 - - update includes to use wocky-signals-marshal.h instead of signals-marshal.h - - wocky/wocky-sasl-auth.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 7a542ab51b8aeab8187ac09af99f8954e0403180 -Author: Guillaume Desmottes -Date: Fri Dec 12 16:20:20 2008 +0000 - - wocky_sasl_auth_start_mechanism: fix a declaration - - wocky/wocky-sasl-auth.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8465322a802554fca237d5879737732f0669615b -Author: Guillaume Desmottes -Date: Fri Dec 12 16:18:29 2008 +0000 - - wocky_sasl_auth_has_mechanism has to be static - - wocky/wocky-sasl-auth.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6da185773de26ceee59b96fc0673ce0bd5f7295c -Author: Sjoerd Simons -Date: Wed Jun 4 09:28:40 2008 +0000 - - Make wocky conform to telepathy coding style - - 20080604092840-93b9a-aee2061241cb08f169ce5b8e9834aaf1ab65cf9a.gz - - wocky/wocky-sasl-auth.c | 837 +++++++++++++++++++++++++---------------------- - wocky/wocky-sasl-auth.h | 23 +- - 2 files changed, 456 insertions(+), 404 deletions(-) - -commit dccf0da6a9ff31acd71d47144989d1ec53f11716 -Author: Emanuele Aina -Date: Sun Jul 1 13:55:50 2007 +0000 - - Fix two small memleak in WockySaslAuth - - 20070701135550-f974e-01e921aff6b722104ea1262ac39980d2dbef55b5.gz - - wocky/wocky-sasl-auth.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 082b548788f9c72e790d176d7dafa756876ad013 -Author: Simon McVittie -Date: Mon Jul 2 10:48:55 2007 +0000 - - wocky/: generate all signal marshallers together. - - Generate them by grepping source code to see which marshallers are needed, - avoiding the need for .list files. - - 20070702104855-53eee-56259e92f01b710c85025a8f1bad923288f12ba5.gz - - wocky/wocky-sasl-auth.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 1829e57b45fe1e8ef8464316a3c20e55e0a707e7 -Author: Sjoerd Simons -Date: Sat Feb 17 17:03:28 2007 +0000 - - WockySaslAuth: Remove spurious arguments to a debug statement - - 20070217170328-93b9a-59bd06add72df19d2f3edd1a28886a22e9c9d10b.gz - - wocky/wocky-sasl-auth.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 6109871d6c280863d3ed226db6dc28bea69755e4 -Author: Sjoerd Simons -Date: Sat Feb 17 17:02:55 2007 +0000 - - WockySaslAuth: Cope with empty challenges (which are invalid) - - 20070217170255-93b9a-22ca1a043a082b8e1632749d468c8540e0b7958b.gz - - wocky/wocky-sasl-auth.c | 17 +++++++++++------ - 1 files changed, 11 insertions(+), 6 deletions(-) - -commit 0565c2c4b1d52cadc6d066dfccb76cead3a1a48e -Author: Sjoerd Simons -Date: Fri Feb 16 11:19:50 2007 +0000 - - WockySaslAuth: Generate a 256 bit random cnonce instead of using a hardcoded one - - 20070216111950-93b9a-6ec73801d3febe68b79942103981dc68edc5efc0.gz - - wocky/wocky-sasl-auth.c | 16 +++++++++++++++- - 1 files changed, 15 insertions(+), 1 deletions(-) - -commit ecea718f8c6b34d768e7cc4804c8b083cee9bb3c -Author: Sjoerd Simons -Date: Thu Feb 15 19:55:10 2007 +0000 - - WockySaslAuth: Add support for the PLAIN auth mechanism - - 20070215195510-93b9a-40b76ba500725cb5f704c9d8a305494e5adb5604.gz - - wocky/wocky-sasl-auth.c | 130 ++++++++++++++++++++++++++++++++++++++++------- - 1 files changed, 112 insertions(+), 18 deletions(-) - -commit 5459d59a5a62c8a08394e9cfd122abc0c5f863e3 -Author: Sjoerd Simons -Date: Thu Feb 15 16:06:10 2007 +0000 - - WockySaslAuth: Rename the error quak from salut_wocky_auth_failed to wocky_sasl_auth_error - - 20070215160610-93b9a-5677d3a6fca4f248e779c043fdb6e8c7199fda77.gz - - wocky/wocky-sasl-auth.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3f6b5451a209d3ddc4c28e3d3c9158e49de2a431 -Author: Sjoerd Simons -Date: Thu Feb 15 10:55:01 2007 +0000 - - Added SASL authentication helper for wocky (just digest-md5 for now) - - 20070215105501-93b9a-f19f851129b23241b015579541e73f827e5ff373.gz - - wocky/wocky-sasl-auth.c | 700 +++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-sasl-auth.h | 94 +++++++ - 2 files changed, 794 insertions(+), 0 deletions(-) - -commit d9c0e2f1cbf30d7607f796e5eb9105b572f2dfed -Author: Sjoerd Simons -Date: Mon Mar 23 12:20:49 2009 +0000 - - Add an connection example - - Makefile.am | 2 +- - configure.ac | 9 +- - examples/Makefile.am | 14 +++ - examples/connect.c | 280 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 300 insertions(+), 5 deletions(-) - -commit 38ea6f4656a637bc1d6e063a72ab14e8ef36c1f7 -Author: Sjoerd Simons -Date: Mon Mar 23 12:19:23 2009 +0000 - - Define ENABLE_DEBUG if it's not disabled - - configure.ac | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -commit a6eebde4700395e4f0916fc6d4bf8fd4ded25373 -Author: Sjoerd Simons -Date: Mon Mar 23 12:18:13 2009 +0000 - - First noddy port to GNIO - - wocky/wocky-xmpp-connection.c | 129 +++++++++++++++++++++++++++------------- - wocky/wocky-xmpp-connection.h | 11 +-- - 2 files changed, 91 insertions(+), 49 deletions(-) - -commit 9558d23edc3f2a6354987af77880ca58ed778724 -Author: Sjoerd Simons -Date: Mon Mar 23 12:16:30 2009 +0000 - - Add wocky-namespaces to the build - - wocky/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 131ee48f74d8e45dafd154bb2dd79d0f5aec06ee -Author: Alban Crequy -Date: Mon Nov 24 12:37:06 2008 +0000 - - lib/wocky/wocky-namespaces.h: Fix double #define from the merge - - wocky/wocky-namespaces.h | 8 +------- - 1 files changed, 1 insertions(+), 7 deletions(-) - -commit dbbbc6cbd707b008e37a32f353bfb754826852b4 -Author: Alban Crequy -Date: Wed Oct 8 15:48:33 2008 +0100 - - lib/wocky/wocky-namespaces.h: Remove all the uneeded casts - - wocky/wocky-namespaces.h | 38 +++++++++++++++++++------------------- - 1 files changed, 19 insertions(+), 19 deletions(-) - -commit 0a3a8450df6ffa7a659d2cadfd08dca06a538e99 -Author: Alban Crequy -Date: Thu Oct 2 18:44:45 2008 +0100 - - Caps: Add SalutPresenceCache and SalutDisco - - wocky/wocky-namespaces.h | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 766e1f7d619466203299a2a2c766a58e1b95cd09 -Author: Alban Crequy -Date: Wed Oct 1 15:35:01 2008 +0100 - - Caps: publish the right caps in txt records after the caps changed with SetSelfCapabilities - - wocky/wocky-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 64099c646a8bea927b66c9228d7825a6c25cd7f7 -Author: Sjoerd Simons -Date: Thu Oct 30 19:33:52 2008 +0000 - - Add jabber:x:event namespace - - wocky/wocky-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit a728d5057f38610fa87f270e84865ae095a35abe -Author: Jonny Lamb -Date: Tue Jul 15 18:56:36 2008 +0000 - - Added Marco's file transfer code. - - 20080715185636-8ed0e-06775a31a2c94b716db41375af32db8248b9e8d3.gz - - wocky/wocky-namespaces.h | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit e21e96c193e92eb2f507bea48e6c054415c4dea4 -Author: Simon McVittie -Date: Fri Nov 2 15:53:16 2007 +0000 - - Use new Clique namespace to represent the Clique protocol (XMPP-like messages over a reliable multicast protocol) - - 20071102155316-53eee-fa026748eb7cdb35c32fdc4e523d3cc2a2fc1866.gz - - wocky/wocky-namespaces.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 57319116ef5bfefa47a73290a2766709211149d7 -Author: Guillaume Desmottes -Date: Fri Oct 19 16:08:52 2007 +0000 - - add WOCKY_TELEPATHY_NS_RMULTICAST namespace and use it in bytestream-muc - - 20071019160852-7fe3f-a8289e1842f7371947c6aab5e2f0764297970f2f.gz - - wocky/wocky-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit f0f1ac83fd9a864adb6d3428332b5627ba476d98 -Author: Guillaume Desmottes -Date: Wed Oct 17 14:51:15 2007 +0000 - - add jingle errors NS - - 20071017145115-7fe3f-9045aaae3cf2efbd008ef6dd4b968e73cf609ad9.gz - - wocky/wocky-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 9a91b49d1d4f43b846b8f5aa61b94799e40dba3f -Author: Guillaume Desmottes -Date: Tue Oct 16 14:59:08 2007 +0000 - - add OOB NS - - 20071016145908-7fe3f-0bd6e603b25b2c9a6718107e4302764b63bbdd24.gz - - wocky/wocky-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 25cdbf39b7dcb7d76693a7b3c5fb85e5fec8d783 -Author: Guillaume Desmottes -Date: Tue Oct 16 11:52:09 2007 +0000 - - wocky-namespaces.h: add SI related NS - - 20071016115209-7fe3f-88728f8ee5e1723c5c876fe7eb77f0d837c8c99c.gz - - wocky/wocky-namespaces.h | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit fef054f9cd513e15106ccbadd702890321fdf850 -Author: Guillaume Desmottes -Date: Fri Aug 17 14:34:51 2007 +0000 - - wocky-namespaces.h: add WOCKY_TELEPATHY_NS_OLPC_ACTIVITY_PROPS - - 20070817143451-7fe3f-b9a78518ce007308ca2f1f3f5b8df4a44dda2563.gz - - wocky/wocky-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 38e80b8f903f8800e6c3f4b9f910cfdc900c71ef -Author: Guillaume Desmottes -Date: Wed Aug 1 14:08:53 2007 +0000 - - fix IBB NS - - 20070801140853-7fe3f-6e410e615a9619db3b6b62bd7f0aa763ab2a715e.gz - - wocky/wocky-namespaces.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 79388f1807076e7d7528102e11d11e0024ff9db1 -Author: Guillaume Desmottes -Date: Fri Jun 15 11:55:34 2007 +0000 - - wocky-namespaces.h: add tubes NS - - 20070615115534-7fe3f-bc808f4784fbc66fb160f25de84058a26800d4ea.gz - - wocky/wocky-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 9c760087f91329c7c88a6b51bc9a16eb6435e12b -Author: Guillaume Desmottes -Date: Wed Jun 13 17:10:56 2007 +0000 - - add IBB and AMP NS - - 20070613171056-7fe3f-42a9b52794f2a1ddab3aec7d9e65c68fc4f1c5f9.gz - - wocky/wocky-namespaces.h | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 89c3f9080a667721a0a051d6cdecadd1f8fa3c04 -Author: Guillaume Desmottes -Date: Tue Jun 12 14:24:34 2007 +0000 - - wocky-namespaces.h: add #define test to protect against multi inclusion - - 20070612142434-7fe3f-09ccbc7bd36ab724a53220376d1e7c46c842b4f8.gz - - wocky/wocky-namespaces.h | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit cfc80a8794b405ccc2127fe6fa52100fe5cfcdfd -Author: Sjoerd Simons -Date: Fri Mar 16 21:26:30 2007 +0000 - - Add xhtml-im and w3c xhtml namespace - - 20070316212630-93b9a-bcdbd042585561b0f20076b5e7f5f1c41c1e2867.gz - - wocky/wocky-namespaces.h | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 4a364f0b3f688edf5370d375f2f44b5e077e857a -Author: Sjoerd Simons -Date: Mon Feb 19 22:52:17 2007 +0000 - - wocky-namespaces.h: Add TLS namespace - - 20070219225217-93b9a-a939a12c3ca9cc6a087d08e9e3b045b0a2568f60.gz - - wocky/wocky-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 43811d80edd39543cce3e65e011fc93d10d94edb -Author: Sjoerd Simons -Date: Sat Feb 17 12:35:57 2007 +0000 - - wocky-namespaces: Add the jabber stream namespace - - 20070217123557-93b9a-2efee7ed7fe5077289e66078c13d9480f975e699.gz - - wocky/wocky-namespaces.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 08820023c0787959fd6c746d6e7a04784d5692e3 -Author: Sjoerd Simons -Date: Thu Feb 15 10:55:01 2007 +0000 - - Added SASL authentication helper for wocky (just digest-md5 for now) - - 20070215105501-93b9a-f19f851129b23241b015579541e73f827e5ff373.gz - - wocky/wocky-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 952f5bd31390e6d0e291e95e7035628e5e6f8ee9 -Author: Sjoerd Simons -Date: Tue Mar 17 19:41:23 2009 +0000 - - Add basic build infrastructure - - AUTHORS | 1 + - Makefile.am | 10 ++++ - NEWS | 1 + - autogen.sh | 31 ++++++++++++ - configure.ac | 108 +++++++++++++++++++++++++++++++++++++++++++ - m4/Makefile.am | 2 + - m4/as-compiler-flag.m4 | 33 +++++++++++++ - m4/tp-compiler-flag.m4 | 36 ++++++++++++++ - m4/tp-compiler-warnings.m4 | 40 ++++++++++++++++ - tools/Makefile.am | 5 ++ - tools/check-c-style.sh | 56 ++++++++++++++++++++++ - tools/check-coding-style.mk | 17 +++++++ - tools/check-misc.sh | 13 +++++ - tools/check-whitespace.sh | 17 +++++++ - wocky/Makefile.am | 78 +++++++++++++++++++++++++++++++ - 15 files changed, 448 insertions(+), 0 deletions(-) - -commit 467cc8de580acb2fd89a7e0f827c75408aadf526 -Author: Will Thompson -Date: Sun Jan 11 17:50:48 2009 +0000 - - Define stub DEBUG macros when !ENABLE_DEBUG - - Defining DEBUG(...) to expand to nothing trips warnings for code like - this: - - if (foo) - DEBUG(...); - - It could be worked around by using {}s, but better to fix the macros - - wocky/wocky-debug.h | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit c86b788131b5e4bb0090e6f2517cf8077bad5265 -Author: Will Thompson -Date: Sun Jan 11 17:04:07 2009 +0000 - - Compare strictly to WOCKY_STANZA_TYPE_NONE in several functions. - - In check_sub_type, sub_type can legitimately be NONE, but the compiler - spuriously warns if we check it's non-negative (see previous commit). - All other comparisons were equally correct if they didn't accept - WOCKY_STANZA_TYPE_NONE. - - wocky/wocky-xmpp-stanza.c | 11 +++++------ - 1 files changed, 5 insertions(+), 6 deletions(-) - -commit 7e41eb5e7042eeb9f01828f0e811cff27994a176 -Author: Will Thompson -Date: Sun Jan 11 15:42:23 2009 +0000 - - Remove an unused label. - - All references to it were removed in "use assertions instead of - wocky_goto_if_fail and wocky_goto_if_reached". - - wocky/wocky-xmpp-stanza.c | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit fb8e0aab248612fd02e702e4a6f9ba5931ce5148 -Author: Guillaume Desmottes -Date: Wed Jan 7 11:56:25 2009 +0000 - - wocky-debug.c: don't build code if debug is disabled - - wocky/wocky-debug.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 3b6d233e8e6cccc4f4186fc2690ff15b62aa71aa -Author: Guillaume Desmottes -Date: Wed Jan 7 11:55:48 2009 +0000 - - wocky-debug.h: G_BEGIN_DECLS has to be outside the #ifdef ENABLE_DEBUG - - wocky/wocky-debug.h | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 8862f970f5194430e8cff9902e774bcdff2e34e5 -Author: Guillaume Desmottes -Date: Wed Jan 7 11:53:42 2009 +0000 - - use assertions instead of wocky_goto_if_fail and wocky_goto_if_reached - - wocky/wocky-xmpp-stanza.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit 4bd74bfd5c424baa2b206a12e4790620e0c698c5 -Author: Guillaume Desmottes -Date: Wed Jan 7 11:53:14 2009 +0000 - - wocky-debug.h: remove wocky_goto_if_reached and wocky_goto_if_fail as they don't really make sense - - wocky/wocky-debug.h | 22 ---------------------- - 1 files changed, 0 insertions(+), 22 deletions(-) - -commit 15b3424d3c7e4f4f6bb968e9c7bc23aea9674e9a -Author: Guillaume Desmottes -Date: Mon Dec 15 12:13:11 2008 +0000 - - wocky-xmpp-node: fix coding style - - wocky/wocky-xmpp-node.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -commit 4c007a2f5caba03babd121d98beb6834b5d813e0 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:12:59 2008 +0000 - - wocky-xmpp-reader: fix coding style - - wocky/wocky-xmpp-reader.c | 34 +++++++++++++++++----------------- - 1 files changed, 17 insertions(+), 17 deletions(-) - -commit 8a76c2fc4f2761c7ae36aa30358ccf6bbb05b1a0 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:12:50 2008 +0000 - - wocky-xmpp-writer: fix coding style - - wocky/wocky-xmpp-writer.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 5ab277188ce4101b89473630a7e8952f1a647de2 -Author: Guillaume Desmottes -Date: Fri Dec 12 17:54:08 2008 +0000 - - update includes to use wocky-signals-marshal.h instead of signals-marshal.h - - wocky/wocky-xmpp-connection.c | 2 +- - wocky/wocky-xmpp-reader.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 7b4cd5daeb003f91876794f69e58493a6016da12 -Author: Guillaume Desmottes -Date: Fri Dec 12 16:00:41 2008 +0000 - - wocky-xmpp-writer: _write_attr and _write_child have to be static - - wocky/wocky-xmpp-writer.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 3ccd5c9e9edf633210211778b54feb4a59063a9d -Author: Guillaume Desmottes -Date: Fri Dec 12 15:58:36 2008 +0000 - - add wocky_xmpp_connection_new_no_stream prototype - - wocky/wocky-xmpp-connection.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 4f3e118fda6d886e91a0fe1eededbe0f57068ed8 -Author: Guillaume Desmottes -Date: Fri Dec 12 15:57:00 2008 +0000 - - wocky-debug.h: fix wocky_debug_set_flags_from_env prototype - - wocky/wocky-debug.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ff1ba290ce71cc2c49273c730865b032459e63d2 -Author: Sjoerd Simons -Date: Thu Oct 30 19:06:31 2008 +0000 - - Push new stanza at the tail of the queue, so they are popped in the right order later on - - wocky/wocky-xmpp-reader.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 77cad2cef33f3152fd47464b73f9e36bffb1ec74 -Author: Jonny Lamb -Date: Tue Jul 15 18:56:36 2008 +0000 - - Added Marco's file transfer code. - - 20080715185636-8ed0e-06775a31a2c94b716db41375af32db8248b9e8d3.gz - - wocky/wocky-debug.c | 1 + - wocky/wocky-debug.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit e2aebb5710e8fb6fb6f2b32e006dad2292ae1921 -Author: Sjoerd Simons -Date: Wed Jun 4 09:28:40 2008 +0000 - - Make wocky conform to telepathy coding style - - 20080604092840-93b9a-aee2061241cb08f169ce5b8e9834aaf1ab65cf9a.gz - - wocky/wocky-debug.c | 4 +- - wocky/wocky-debug.h | 4 +- - wocky/wocky-xmpp-connection.c | 314 +++++++++++++++++--------------- - wocky/wocky-xmpp-connection.h | 40 ++-- - wocky/wocky-xmpp-node.c | 318 +++++++++++++++++--------------- - wocky/wocky-xmpp-node.h | 116 ++++++------- - wocky/wocky-xmpp-reader.c | 403 ++++++++++++++++++++++------------------- - wocky/wocky-xmpp-reader.h | 24 ++- - wocky/wocky-xmpp-stanza.c | 6 +- - wocky/wocky-xmpp-stanza.h | 19 +- - wocky/wocky-xmpp-writer.c | 282 ++++++++++++++++------------- - wocky/wocky-xmpp-writer.h | 38 ++-- - 12 files changed, 828 insertions(+), 740 deletions(-) - -commit 51742d045364acce563136414a8bdd1465873f37 -Author: Simon McVittie -Date: Fri Oct 19 15:08:41 2007 +0000 - - Add WOCKY_NODE_ASSIGN_TO opcode to wocky_xmpp_stanza_build - - 20071019150841-53eee-c6180e5eccfd5d5819a0d12b881444be3bfc90d9.gz - - wocky/wocky-xmpp-stanza.c | 9 +++++++++ - wocky/wocky-xmpp-stanza.h | 1 + - 2 files changed, 10 insertions(+), 0 deletions(-) - -commit 0dd7b754a7991f9420b0ea84a2eeaa75a5e15bc8 -Author: Guillaume Desmottes -Date: Wed Jul 11 09:19:19 2007 +0000 - - fix WOCKY_XMPP_CONNECTION_CLOSE_FULLY_CLOSED flag - - 20070711091919-7fe3f-6ef819ed805180f8c37574ff13147a9955a711e2.gz - - wocky/wocky-xmpp-connection.h | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit e0e3927117928acc24bfa4209fe4b0f53888ed05 -Author: Guillaume Desmottes -Date: Tue Jul 10 08:46:59 2007 +0000 - - wocky-xmpp-connection.c: add CLOSE flags - - 20070710084659-7fe3f-4ae9b76c8176493817626c6725f61aa7ea3c90d3.gz - - wocky/wocky-xmpp-connection.c | 4 ++++ - wocky/wocky-xmpp-connection.h | 17 +++++++++++------ - 2 files changed, 15 insertions(+), 6 deletions(-) - -commit 24fd6b222d0eb8e755a288ae71e3a1760fb7bda5 -Author: Sjoerd Simons -Date: Mon Jul 2 07:56:29 2007 +0000 - - Add flags to indicate which way the stream opening has been sent - - 20070702075629-b58c9-caba73719213896652eca8671e7606bb09c7792f.gz - - wocky/wocky-xmpp-connection.c | 22 +++++++++++----------- - wocky/wocky-xmpp-connection.h | 9 ++++++++- - 2 files changed, 19 insertions(+), 12 deletions(-) - -commit a471b048c6269470b2b26499e031c9adadc8e1d1 -Author: Simon McVittie -Date: Mon Jul 2 10:48:55 2007 +0000 - - lib/wocky/: generate all signal marshallers together. - - Generate them by grepping source code to see which marshallers are needed, - avoiding the need for .list files. - - 20070702104855-53eee-56259e92f01b710c85025a8f1bad923288f12ba5.gz - - wocky/wocky-xmpp-connection.c | 4 ++-- - wocky/wocky-xmpp-reader.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 4bc73e5c0936180cfaab2e5267916f4eb702e4c7 -Author: Guillaume Desmottes -Date: Thu Jun 28 14:06:46 2007 +0000 - - xmpp-stanza: assert stanza->node != NULL - - 20070628140646-7fe3f-6e9a2388bc757c87c00addad2f36c7d9a917d420.gz - - wocky/wocky-xmpp-stanza.c | 8 +------- - 1 files changed, 1 insertions(+), 7 deletions(-) - -commit dfa38e4d0e9e3f2d82e79f16bc62fc94c8753878 -Author: Guillaume Desmottes -Date: Thu Jun 28 13:57:42 2007 +0000 - - xmpp-stanza: factor out (sub) type name -> WockyStanza(Sub)Type to simplify code - - 20070628135742-7fe3f-63c98e9add085256738a6d841354e8ac4a5d7366.gz - - wocky/wocky-xmpp-stanza.c | 90 +++++++++++++++++++++++---------------------- - 1 files changed, 46 insertions(+), 44 deletions(-) - -commit 316afe222f71d36bcae05b66f0878972bb966cc7 -Author: Guillaume Desmottes -Date: Thu Jun 28 13:39:32 2007 +0000 - - rename LAST_WOCKY_STANZA_(SUB_)TYPE to NUM_WOCKY_STANZA_(SUB_)TYPE - - 20070628133932-7fe3f-12f50c87a912fdcaf632cbd2496162fdb95d6019.gz - - wocky/wocky-xmpp-stanza.c | 26 +++++++++++++------------- - wocky/wocky-xmpp-stanza.h | 4 ++-- - 2 files changed, 15 insertions(+), 15 deletions(-) - -commit 0721a4a4a39f59f97a112dcfeebb307a1f0e24d2 -Author: Guillaume Desmottes -Date: Thu Jun 28 12:44:49 2007 +0000 - - add wocky_xmpp_stanza_get_type_info - - 20070628124449-7fe3f-7ce76716162f4ef37a00cfaf0135f998fe684df0.gz - - wocky/wocky-xmpp-stanza.c | 63 +++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-stanza.h | 4 +++ - 2 files changed, 67 insertions(+), 0 deletions(-) - -commit 0be3da65c21240e3c9b514b1468734af101603a2 -Author: Guillaume Desmottes -Date: Thu Jun 28 11:52:15 2007 +0000 - - add WOCKY_STANZA_TYPE_UNKNOWN and WOCKY_STANZA_SUB_TYPE_UNKNOWN - - 20070628115215-7fe3f-b1554b27ca4159ccabfb0440253f4511dd2cd9f6.gz - - wocky/wocky-xmpp-stanza.c | 3 +++ - wocky/wocky-xmpp-stanza.h | 2 ++ - 2 files changed, 5 insertions(+), 0 deletions(-) - -commit fba5b3d743d2ef44fce54ae7dae2eee1fe84c3ab -Author: Guillaume Desmottes -Date: Wed Jun 27 15:40:13 2007 +0000 - - xmpp writer: wocky_xmpp_writer_write_stanza: properly end the XML document if we opened it - - 20070627154013-7fe3f-4531ab5c3ffdc7098d6a7cb10cbf53b1fbd4ae9f.gz - - wocky/wocky-xmpp-writer.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 144379b5082f74b2f2683c9fdc2d5d2b8d72d261 -Author: Guillaume Desmottes -Date: Wed Jun 27 15:29:50 2007 +0000 - - xmpp-reader: fix parser leak - - 20070627152950-7fe3f-66c9308c55f88482fc97277bf40d24a9f382e6fc.gz - - wocky/wocky-xmpp-reader.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 5d185bb1b41e4b6b2682ef51d4c9c66832935aa1 -Author: Guillaume Desmottes -Date: Wed Jun 13 09:21:29 2007 +0000 - - resolve conflicts - - 20070613092129-7fe3f-2b6baa02dcd135f33a8f7b8a9c02d8453d962d23.gz - - wocky/wocky-debug.c | 2 ++ - wocky/wocky-debug.h | 3 +++ - 2 files changed, 5 insertions(+), 0 deletions(-) - -commit bf1eee65708b2e3be575896ab2be6efc0f1478ad -Author: Guillaume Desmottes -Date: Mon Jun 11 10:14:31 2007 +0000 - - add bytestream flag in wocky-debug - - 20070611101431-7fe3f-d1f9d74df54bc1e246ab75826b931d6bd9695999.gz - - wocky/wocky-debug.c | 1 - - wocky/wocky-debug.h | 1 - - 2 files changed, 0 insertions(+), 2 deletions(-) - -commit f73827190c938dfa875964636794db7e33e535d2 -Author: Guillaume Desmottes -Date: Fri Jun 22 09:50:36 2007 +0000 - - wocky-xmpp-reader: don't leak the nodes queue - - 20070622095036-7fe3f-38a0c4ea6789444c6b04a1f6df11e6ef84f99c0e.gz - - wocky/wocky-xmpp-reader.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit fa04537b90306f15562cd2312dffe695a803015b -Author: Guillaume Desmottes -Date: Thu Jun 21 13:45:17 2007 +0000 - - wocky-xmpp-connection.c: generate an id for stanza who doesn't have one before sending - - 20070621134517-7fe3f-74190255a1c13b53ffe1d07aac675e0e925c58e6.gz - - wocky/wocky-xmpp-connection.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit dc6c99e3e6d00e41832b4794c6c50262588c05d9 -Author: Guillaume Desmottes -Date: Thu Jun 21 13:39:08 2007 +0000 - - add wocky_xmpp_connection_new_id public method[3~ - - 20070621133908-7fe3f-086b66767bad06086b6f74f8dc19bc04d6fa01e6.gz - - wocky/wocky-xmpp-connection.c | 20 +++++++++++++++++++- - wocky/wocky-xmpp-connection.h | 3 +++ - 2 files changed, 22 insertions(+), 1 deletions(-) - -commit 2652b052605d50f9b5487c0d427dbddd85b508f8 -Author: Sjoerd Simons -Date: Tue Jun 19 03:27:15 2007 +0000 - - Initialize the debugging flags if that wasn't done yet - - 20070619032715-b58c9-173cdbd3f369494cf1a519097bc9fbab3ad39215.gz - - wocky/wocky-debug.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 51712116dd763988f32a75293f1ed88e169df039 -Author: Sjoerd Simons -Date: Tue Jun 19 12:01:26 2007 +0000 - - Format type fixes from misc@mandriva.org - - 20070619120126-b58c9-44b9271200324439d74cb1969dc22f6f661c4de8.gz - - wocky/wocky-xmpp-reader.c | 2 +- - wocky/wocky-xmpp-writer.c | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 50412b9c566bb63a06137c8f4977092f56481865 -Author: Guillaume Desmottes -Date: Fri Jun 15 12:30:45 2007 +0000 - - reimplement wocky_debug_stanza to use wocky_xmpp_node_to_string - - 20070615123045-7fe3f-bb91394e6454c0d035256c299c86aab08d365e06.gz - - wocky/wocky-debug.c | 77 ++++---------------------------------------------- - 1 files changed, 7 insertions(+), 70 deletions(-) - -commit 4055ba7ff34b23a10e4cd62af03cd633d03acd9a -Author: Guillaume Desmottes -Date: Fri Jun 15 12:23:06 2007 +0000 - - add wocky_xmpp_node_to_string - - 20070615122306-7fe3f-2f268e618ce79a7d8d06c310612a3a596f74a327.gz - - wocky/wocky-xmpp-node.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-node.h | 4 ++ - 2 files changed, 76 insertions(+), 0 deletions(-) - -commit d73925be92098f822a484ce132ffd3db50d82ba2 -Author: Guillaume Desmottes -Date: Wed Jun 13 16:19:06 2007 +0000 - - wocky-xmpp-stanza.c: fix an argument error in wocky_xmpp_stanza_build documentation - - 20070613161906-7fe3f-3c14588a9ea94511993588092993b6629aaf7e8a.gz - - wocky/wocky-xmpp-stanza.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit cdaecd0c999362ca02137967d6977064bb06f6b5 -Author: Sjoerd Simons -Date: Fri Jun 15 11:40:07 2007 +0000 - - remove some trailing spaces - - 20070615114007-93b9a-2338f688e7b0ce01c5070bac8708adb0aaff78d5.gz - - wocky/wocky-xmpp-node.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 6f6380896a97a822e02fab3b8aa5e74282859b41 -Author: Sjoerd Simons -Date: Fri Jun 15 11:39:49 2007 +0000 - - Use g_return_val_if_fail in wocky_xmpp_node_get_language when a NULL node is passed - - 20070615113949-93b9a-775a9a54736ba1c8f382daf936a060760e78b9df.gz - - wocky/wocky-xmpp-node.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 4918b36bcf360b27a8e50fa921f48821ca8ccdb4 -Author: Emanuele Aina -Date: Sat Jun 9 09:19:16 2007 +0000 - - Tested wocky_xmpp_node_set_language_n() and fixed wocky_xmpp_node_set_language() with a NULL lang - - 20070609091916-f974e-25d6e0593963b0bd7c33fce670639d08b476bf55.gz - - wocky/wocky-xmpp-node.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit 15e31a547272ad0f1f5093b4cd94f763b45df2f5 -Author: Emanuele Aina -Date: Sat Jun 9 08:52:06 2007 +0000 - - Test and fix wocky_xmpp_node_get_language() with a NULL node - - 20070609085206-f974e-1b61af2304ed7605d44148e95e77f6ebad7707aa.gz - - wocky/wocky-xmpp-node.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b360f8d3554c2ae6d65c5045a9068e8a3b13d06a -Author: Guillaume Desmottes -Date: Wed Jun 13 09:17:55 2007 +0000 - - don't create the stanza if there is an error during build argument parsing - - 20070613091755-7fe3f-802a0d76f1fb50a69a28468b181192d7841358ad.gz - - wocky/wocky-xmpp-stanza.c | 26 +++++++++++++++++--------- - 1 files changed, 17 insertions(+), 9 deletions(-) - -commit 72b18fc647a588cf1f3ac7159ae5602283863ffc -Author: Guillaume Desmottes -Date: Wed Jun 13 08:50:15 2007 +0000 - - wocky-xmpp-stanza.c: use wocky_goto_if_reached and wocky_goto_if_fail during stanza build parsing to fix a leak - - 20070613085015-7fe3f-6959e93f20bab7ce55761ba4a19d5cba606925ad.gz - - wocky/wocky-xmpp-stanza.c | 14 ++++++++------ - 1 files changed, 8 insertions(+), 6 deletions(-) - -commit da9aa5559cd85df763e99c67290793739c1473d9 -Author: Guillaume Desmottes -Date: Wed Jun 13 08:49:50 2007 +0000 - - wocky-debug: add wocky_goto_if_reached and wocky_goto_if_fail macros - - 20070613084950-7fe3f-279be93f5843f3e83cf19c8ea065266813e27e44.gz - - wocky/wocky-debug.h | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+), 0 deletions(-) - -commit 8508e9c7dc3520fb7c58a9d83770af0d3a69f76c -Author: Guillaume Desmottes -Date: Wed Jun 13 08:21:06 2007 +0000 - - wocky-xmpp-stanza.c: use g_return_if_reached instead of g_assert_not_reached during stanza_build args parsing - - 20070613082106-7fe3f-fea96904e7c8341ec782ef7adb4010051b54c1fd.gz - - wocky/wocky-xmpp-stanza.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3e06b80331181dbd51db8b558c05413055c273eb -Author: Guillaume Desmottes -Date: Wed Jun 13 08:18:50 2007 +0000 - - wocky-xmpp-stanza: typedef WockyBuildTag - - 20070613081850-7fe3f-de42e6fe3365b02f563fea147bcf931159d0b0fc.gz - - wocky/wocky-xmpp-stanza.c | 9 +++++---- - wocky/wocky-xmpp-stanza.h | 4 ++-- - 2 files changed, 7 insertions(+), 6 deletions(-) - -commit 17057f079cb009d328a6d15ff055d60dc6123365 -Author: Guillaume Desmottes -Date: Tue Jun 12 16:37:54 2007 +0000 - - wocky-xmpp-stanza.c: use type_names array to find the optionnal NS associated with a type - - 20070612163754-7fe3f-a3af4d83860cdfabecfcad53976adf601434aa4b.gz - - wocky/wocky-xmpp-stanza.c | 42 +++++++++++++++++++++++++----------------- - 1 files changed, 25 insertions(+), 17 deletions(-) - -commit b6d570618ea9607824a4b791e7016be9fee826a9 -Author: Guillaume Desmottes -Date: Tue Jun 12 16:26:37 2007 +0000 - - wocky-xmpp-stanza.c: use the sub_type_names array instead of a switch to check if sub types belong to the right type - - 20070612162637-7fe3f-955ab74a038aad6251a18cdcaff5de5851137ef9.gz - - wocky/wocky-xmpp-stanza.c | 122 ++++++++++++++++++++------------------------- - 1 files changed, 54 insertions(+), 68 deletions(-) - -commit f8a66555b6d9653604179cc64c09357bcdad7940 -Author: Guillaume Desmottes -Date: Tue Jun 12 13:23:50 2007 +0000 - - wocky-xmpp-stanza.c: properly handle STREAM types - - 20070612132350-7fe3f-7d209e6f707c34287d5bf777d569184ae06e8204.gz - - wocky/wocky-xmpp-stanza.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit ca2e030db5c297c8add2e35b0be9c5c149fae7a3 -Author: Guillaume Desmottes -Date: Tue Jun 12 13:03:45 2007 +0000 - - ibber-xmpp-stanza.c: use static array instead of big switch to find subtype's name - - 20070612130345-7fe3f-876077a1161eb2518338057adbe44bc465fd5591.gz - - wocky/wocky-xmpp-stanza.c | 92 +++++++++++++++++--------------------------- - wocky/wocky-xmpp-stanza.h | 2 +- - 2 files changed, 37 insertions(+), 57 deletions(-) - -commit 8f6dfc96eda50ab3c4dd38fd85e8dbae7930ca15 -Author: Guillaume Desmottes -Date: Tue Jun 12 12:42:10 2007 +0000 - - wocky-xmpp-stanza.c: use static array instead of big switch to find type's name - - 20070612124210-7fe3f-09e3c49ea8a4d1d3c76d1b7474082e771cf75bab.gz - - wocky/wocky-xmpp-stanza.c | 65 ++++++++++++++++++-------------------------- - wocky/wocky-xmpp-stanza.h | 2 +- - 2 files changed, 28 insertions(+), 39 deletions(-) - -commit 866769bc8214c2edc50bf3f9a0e2ab8408e5a8f5 -Author: Guillaume Desmottes -Date: Tue Jun 12 11:33:57 2007 +0000 - - wocky-xmpp-stanza.c: use g_slist_delete_link instead of 4 instructions doing exactly that - - 20070612113357-7fe3f-d5ec9f715c4648b185b34189b65e2fcf5981818b.gz - - wocky/wocky-xmpp-stanza.c | 8 ++------ - 1 files changed, 2 insertions(+), 6 deletions(-) - -commit 4ecc416de40fd54b4cca41aef2811200117fe606 -Author: Guillaume Desmottes -Date: Tue Jun 12 11:18:15 2007 +0000 - - wocky-xmpp-stanza.c: remove useless case WOCKY_STANZA_END in wocky_xmpp_stanza_build parsing - - 20070612111815-7fe3f-4cc369ea682244bda2023a2139e745de97de32dc.gz - - wocky/wocky-xmpp-stanza.c | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 67d33ef83577620b9f2032ac277a30efa8983e7a -Author: Guillaume Desmottes -Date: Tue Jun 12 11:02:56 2007 +0000 - - wocky-debug.c: fix a leak in wocky_debug_stanza - - 20070612110256-7fe3f-877bb91429285528b2850f12fa6de368b8abc29d.gz - - wocky/wocky-debug.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit fadd12766cf9429859d28fb98ded3c01a8c1bef7 -Author: Guillaume Desmottes -Date: Tue Jun 12 10:13:18 2007 +0000 - - wocky-xmpp-stanza: implement wocky_xmpp_stanza_build - - 20070612101318-7fe3f-b362200f7804bace88b1c37e219a7c2a6dfd6b5e.gz - - wocky/wocky-xmpp-stanza.c | 307 ++++++++++++++++++++++++++++++++++++++++++++- - wocky/wocky-xmpp-stanza.h | 54 ++++++++- - 2 files changed, 359 insertions(+), 2 deletions(-) - -commit 2cfc4be419d9c1945ffab0934f322f596bae0adb -Author: Guillaume Desmottes -Date: Mon Jun 11 18:17:48 2007 +0000 - - move DEBUG_STANZA to wocky-debug - - 20070611181748-7fe3f-e4fe05a3b32cde8da6bbafc991d35af099fd2f4f.gz - - wocky/wocky-debug.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-debug.h | 11 +++++++ - 2 files changed, 95 insertions(+), 0 deletions(-) - -commit 059efc894984d1b42a42bce38dddd12ca1b699c9 -Author: Sjoerd Simons -Date: Tue Jun 12 16:09:01 2007 +0000 - - Move SalutMucConnection to wocky as WockyMucConnection - - 20070612160901-93b9a-3c886d3735de02ed4b8193747040b2d2aff41ae0.gz - - wocky/wocky-debug.c | 1 + - wocky/wocky-debug.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit bac62f2a52fc7011fd8a4735d28ac519cdead593 -Author: Sjoerd Simons -Date: Mon Jun 11 13:01:12 2007 +0000 - - Fix some silly memleaks in wocky-xmpp-node, spotted by Marco Barisione and Mikael Hallendal - - 20070611130112-93b9a-24d1d091e1c29656fbb77310229ac46ab8a6a646.gz - - wocky/wocky-xmpp-node.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit cc004e9082a0b6cc0041eccd029269621d6a614d -Author: Sjoerd Simons -Date: Sat Jun 9 12:01:06 2007 +0000 - - Streaming property no long exists - - 20070609120106-b58c9-591196b73410755f9547fcba3db24a3ee42d6236.gz - - wocky/wocky-xmpp-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bb496013e58ed3c9fdd189be4c332cbe2ebc3d23 -Author: Sjoerd Simons -Date: Fri Jun 8 20:55:58 2007 +0000 - - Remove non-streaming mode - - 20070608205558-b58c9-1f43c402d842d1568296e44f0d45dc6028af7ffc.gz - - wocky/wocky-xmpp-connection.c | 83 +++------------------------------------- - wocky/wocky-xmpp-connection.h | 3 - - 2 files changed, 7 insertions(+), 79 deletions(-) - -commit 88842e2845cbfd917540158bb9a7d1f7ec42a430 -Author: Sjoerd Simons -Date: Mon Jun 4 06:53:29 2007 +0000 - - wocky-debug: Add a specific rmulticast debugging category - - 20070604065329-b58c9-068df8879b1a105a2989f236df4bb093276a8e9e.gz - - wocky/wocky-debug.c | 1 + - wocky/wocky-debug.h | 3 ++- - 2 files changed, 3 insertions(+), 1 deletions(-) - -commit 0add488b22c20aa4ab5a8cc818b378cf1d77fa80 -Author: Sjoerd Simons -Date: Mon May 21 11:51:57 2007 +0000 - - Add debug category for the multicast sender - - 20070521115157-93b9a-2300e537dcec6524cef474128ad490b38999bea5.gz - - wocky/wocky-debug.c | 17 +++++++++-------- - wocky/wocky-debug.h | 13 +++++++------ - 2 files changed, 16 insertions(+), 14 deletions(-) - -commit 10968df7be60c30b6f4f4690a71992380fdfbf31 -Author: Sjoerd Simons -Date: Tue Mar 13 18:43:38 2007 +0000 - - WockyXmppConnection: Compile fixes - - 20070313184338-93b9a-5922970bfa5ca6805d2a89777d47dd5d02dba8e5.gz - - wocky/wocky-xmpp-connection.c | 13 ++++++++----- - 1 files changed, 8 insertions(+), 5 deletions(-) - -commit 808e37792b31f6491d5536aaff325a665d709b8f -Author: Sjoerd Simons -Date: Tue Mar 13 12:59:15 2007 +0000 - - WockyXmppConnection: Add a non-streaming mode - - 20070313125915-93b9a-da87a011ed0cb9e681d3912fb1a7620ab3850548.gz - - wocky/wocky-xmpp-connection.c | 123 ++++++++++++++++++++++++++++++++++++----- - wocky/wocky-xmpp-connection.h | 4 + - 2 files changed, 113 insertions(+), 14 deletions(-) - -commit 790bba519b03494265255886c8c1b9b4695f3467 -Author: Sjoerd Simons -Date: Tue Mar 13 11:58:10 2007 +0000 - - WockyXmppConnection: Allow the connection to be created without an underlying transport - - 20070313115810-93b9a-3e0ad2e51ba1732a87de2d306e29d803871c35d4.gz - - wocky/wocky-xmpp-connection.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 4d27720ab917b387ae8fa39da9c43874eeec11a6 -Author: Sjoerd Simons -Date: Thu Mar 1 14:49:17 2007 +0000 - - wocky-debug.h: Fix typo in __DEBUG_H__ define - - 20070301144917-93b9a-28b4ed528b50e24b899889e30576e620069476aa.gz - - wocky/wocky-debug.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a0c600b9c07cb0681ca1bb2333e1065bfe3dd11f -Author: Sjoerd Simons -Date: Mon Feb 19 22:53:07 2007 +0000 - - WockyXmppConnection: Add functions to disengage the connection from the transport and re-engage it on top of a new transport - - 20070219225307-93b9a-dad771f4cc6e83f618d5e41d3ef3171df3148d71.gz - - wocky/wocky-xmpp-connection.c | 27 ++++++++++++++++++++++----- - wocky/wocky-xmpp-connection.h | 5 +++++ - 2 files changed, 27 insertions(+), 5 deletions(-) - -commit 7b44ac78160a88adf50edee43259669ce24474d8 -Author: Sjoerd Simons -Date: Sat Feb 17 22:07:03 2007 +0000 - - WockyXmppConnection: Mark stream as closed after calling connection_restart - - 20070217220703-93b9a-e72fce05b9ca351dc6500cb684edd735e26ad680.gz - - wocky/wocky-xmpp-connection.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 660cfd64118d30b5b7c846db3a2cde8e610e1b49 -Author: Sjoerd Simons -Date: Sat Feb 17 17:05:05 2007 +0000 - - WockyXmppConnection: Add function to restart the stream, which allows the other side to reopen the connection (After say a sasl authentication) - - 20070217170505-93b9a-15e939bb4095cee5e33b12455685e8349929a3c6.gz - - wocky/wocky-xmpp-connection.c | 9 +++++++++ - wocky/wocky-xmpp-connection.h | 6 ++++++ - 2 files changed, 15 insertions(+), 0 deletions(-) - -commit 5f6902411d555f942f906a6adc9948c64834860a -Author: Sjoerd Simons -Date: Sat Feb 17 12:34:45 2007 +0000 - - WockyXmppReader: Make wocky_xmpp_reader_push reentrant - - 20070217123445-93b9a-e4981edf60f86e15232a86156acb3ff36d8843b6.gz - - wocky/wocky-xmpp-reader.c | 74 +++++++++++++++++++++++++++++++-------------- - 1 files changed, 51 insertions(+), 23 deletions(-) - -commit f7a9270d556a5e7da4219574d3cfd1ed4a20b813 -Author: Sjoerd Simons -Date: Fri Feb 16 10:35:42 2007 +0000 - - WockyXmppConnection: Only reset after we reopen our own stream, not after the other side has opened their stream - - 20070216103542-93b9a-7b716672297079528284236d21f1d4549b4263b4.gz - - wocky/wocky-xmpp-connection.c | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit 474568cb7bd70ae27943eca403780f16ab8fa3e6 -Author: Sjoerd Simons -Date: Thu Feb 15 19:54:17 2007 +0000 - - WockyXmppConnection: If the stream is re-opened reset the xml reader - - 20070215195417-93b9a-36e408dd62df217b236f334913da992957612110.gz - - wocky/wocky-xmpp-connection.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit 28098b62916ff654251334f9200b738ffbeea57d -Author: Sjoerd Simons -Date: Thu Feb 15 19:53:41 2007 +0000 - - WockyXmppWriter: Turn of indenting of the output stream for now - - 20070215195341-93b9a-06a6024612b2c75cf254a05be028c776e605a2f9.gz - - wocky/wocky-xmpp-writer.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit e4328fefd92299a312323722b173a0e44189ae1b -Author: Sjoerd Simons -Date: Thu Feb 15 19:50:36 2007 +0000 - - WockyXmppReader: Add ability to reset the reader when needed - - 20070215195036-93b9a-101186da1a23a1456991feb9e5e9ac6312856eac.gz - - wocky/wocky-xmpp-reader.c | 26 +++++++++++++++++++++++--- - wocky/wocky-xmpp-reader.h | 1 + - 2 files changed, 24 insertions(+), 3 deletions(-) - -commit b8565f2e2f4dc54cf7edd79eacafb243a9dab3bc -Author: Sjoerd Simons -Date: Thu Feb 15 16:06:33 2007 +0000 - - Implement an SSL transport for wocky - - 20070215160633-93b9a-bbb1468c182c157f593dcf07ef21d5bed09e8f7f.gz - - wocky/wocky-debug.c | 1 + - wocky/wocky-debug.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit 825318c597fe94d083534de7c34b9b42eb6d1f50 -Author: Sjoerd Simons -Date: Thu Feb 15 10:55:01 2007 +0000 - - Added SASL authentication helper for wocky (just digest-md5 for now) - - 20070215105501-93b9a-f19f851129b23241b015579541e73f827e5ff373.gz - - wocky/wocky-debug.c | 1 + - wocky/wocky-debug.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit 9c1ca9bc99f8339ac39ec2f640660ac85f62658e -Author: Sjoerd Simons -Date: Tue Feb 13 15:51:44 2007 +0000 - - SalutXmppWriter: Add debugging to stream open and close - - 20070213155144-93b9a-8fa834e31dda7628e45ca7cfcce8dcf34fccbca3.gz - - wocky/wocky-xmpp-writer.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit de5327a61f7ffbd4b8bf0bd3800ca11851d30408 -Author: Sjoerd Simons -Date: Tue Feb 13 13:26:33 2007 +0000 - - Push received transport data through handler functions instead of signals - - 20070213132633-93b9a-25678d8680408e6e7ecb88289afd577cb1163734.gz - - wocky/wocky-debug.c | 1 + - wocky/wocky-debug.h | 7 ++++--- - wocky/wocky-xmpp-connection.c | 21 +++++++++++---------- - 3 files changed, 16 insertions(+), 13 deletions(-) - -commit eaa86572f2ee3c1f283577e4747749bef79265ac -Author: Sjoerd Simons -Date: Tue Feb 13 10:05:59 2007 +0000 - - WockyXmppNode: Assert that attribute values are !NULL - - 20070213100559-93b9a-407f99a9c26a5769c78345098b0bc53a6a44eb19.gz - - wocky/wocky-xmpp-node.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 9c139ce0b8eadf1b44ed5790cb0ebc1da409aaf9 -Author: Sjoerd Simons -Date: Tue Feb 13 10:05:08 2007 +0000 - - WockyXmppWriter: Add debugging - - 20070213100508-93b9a-82ec00ac21ed4b0b4094ab1b5dfbcc35784c8c67.gz - - wocky/wocky-xmpp-writer.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit ec14381d7e181456e515fef019d77b118a65ccb5 -Author: Sjoerd Simons -Date: Thu Feb 8 15:47:08 2007 +0000 - - Reinitialize the parser after each chunk when not in stream mode - - 20070208154708-93b9a-7f92d7d174ea5da1ba624838e3a94e6b54306391.gz - - wocky/wocky-xmpp-reader.c | 21 ++++++++++++++++----- - 1 files changed, 16 insertions(+), 5 deletions(-) - -commit c6f178501aaadebdd1ab6dcdd21725c739853239 -Author: Sjoerd Simons -Date: Thu Feb 8 15:46:31 2007 +0000 - - Add debugging - - 20070208154631-93b9a-fb77ac76d5b324196b2b84a8f57077cadc6ec14e.gz - - wocky/wocky-xmpp-reader.c | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit af18cf0a81cd75e41ef0cc311d0e195d5991d465 -Author: Sjoerd Simons -Date: Thu Feb 8 15:45:34 2007 +0000 - - Add xmpp debugging categories - - 20070208154534-93b9a-be8e1257a1ccf376fd7134229d62d5187219f7cb.gz - - wocky/wocky-debug.c | 6 +++++- - wocky/wocky-debug.h | 4 ++++ - 2 files changed, 9 insertions(+), 1 deletions(-) - -commit 456ea6b3c19601fdbacf438596aca68c46000adb -Author: Sjoerd Simons -Date: Fri Feb 2 13:48:00 2007 +0000 - - Fix conflicts in libwocky - - 20070202134800-93b9a-accfe9e4ec5f2ac7d7d4360889743b8e09d9ca4b.gz - - wocky/wocky-xmpp-reader.c | 8 ++++---- - wocky/wocky-xmpp-reader.h | 6 ++++-- - wocky/wocky-xmpp-writer.c | 8 ++++---- - wocky/wocky-xmpp-writer.h | 3 ++- - 4 files changed, 14 insertions(+), 11 deletions(-) - -commit 11e8272e8ad14c1eeac8ba162227c3626fedf11f -Author: Sjoerd Simons -Date: Wed Jan 24 23:10:56 2007 +0000 - - If not in stream mode, clear the parser for every new buffer - - 20070124231056-93b9a-a17e06fc79026e8dca6cf50db26c9f18eb112397.gz - - wocky/wocky-xmpp-reader.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 4cc6811422ef30741f9c61bf51fa335d93a515be -Author: Sjoerd Simons -Date: Wed Jan 24 22:54:24 2007 +0000 - - Xmpp stanza end on depth 1 in stream mode and depth 0 in non-streaming mode - - 20070124225424-93b9a-0169f09b6155c007c04c7dc66d453bd600291ee8.gz - - wocky/wocky-xmpp-reader.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 48a09308f5782730a8b77fef7f8f45fdc5da2336 -Author: Sjoerd Simons -Date: Wed Jan 24 22:09:34 2007 +0000 - - Let the xmpp reader provide a non-stream mode - - 20070124220934-93b9a-b436df2985b6622eb18b66a2116af4ed6375c65f.gz - - wocky/wocky-xmpp-reader.c | 18 +++++++++++++++--- - wocky/wocky-xmpp-reader.h | 4 ++-- - 2 files changed, 17 insertions(+), 5 deletions(-) - -commit 238939565225f060e327b4fcd100eccd85575806 -Author: Sjoerd Simons -Date: Wed Jan 24 22:09:05 2007 +0000 - - Provide a non-stream mode - - 20070124220905-93b9a-4d27e82d447907538d5b5e9215583bc4fb6fa0f9.gz - - wocky/wocky-xmpp-writer.c | 15 +++++++++++++++ - wocky/wocky-xmpp-writer.h | 2 +- - 2 files changed, 16 insertions(+), 1 deletions(-) - -commit 37f2ef26d25198ac6f39d5122d91f2da66995413 -Author: Sjoerd Simons -Date: Tue Jan 23 12:02:45 2007 +0000 - - Only recognize the standard stream namespaces after a stream open - - 20070123120245-93b9a-78aa5121c17e4668e8fdf11b6a0a66d5848751ce.gz - - wocky/wocky-xmpp-writer.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit ef14dec7c25700a1ada1436a41610154a6e2dc10 -Author: Sjoerd Simons -Date: Fri Feb 2 13:37:11 2007 +0000 - - Refactor xmpp magic into it's own seperate library - - 20070202133711-93b9a-4dec550fce51511f5f452fa5e1c2158049fdc2f6.gz - - wocky/wocky-debug.c | 55 +++++++ - wocky/wocky-debug.h | 49 +++++++ - wocky/wocky-xmpp-connection.c | 275 ++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-connection.h | 73 ++++++++++ - wocky/wocky-xmpp-node.c | 281 +++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-node.h | 131 +++++++++++++++++ - wocky/wocky-xmpp-reader.c | 310 +++++++++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-reader.h | 63 +++++++++ - wocky/wocky-xmpp-stanza.c | 99 +++++++++++++ - wocky/wocky-xmpp-stanza.h | 62 ++++++++ - wocky/wocky-xmpp-writer.c | 271 +++++++++++++++++++++++++++++++++++ - wocky/wocky-xmpp-writer.h | 76 ++++++++++ - 12 files changed, 1745 insertions(+), 0 deletions(-) - -commit d3816f063f3902037b69763d91e57738d7e781e5 -Author: Sjoerd Simons -Date: Tue Mar 17 18:52:43 2009 +0000 - - Initial commit - - README | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/config.guess telepathy-salut-0.8.0/lib/ext/wocky/config.guess --- telepathy-salut-0.7.2/lib/ext/wocky/config.guess 2012-03-15 18:43:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/config.guess 2012-04-04 16:37:44.000000000 +0000 @@ -2,9 +2,9 @@ # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-05-11' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -57,8 +55,8 @@ Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +143,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -792,13 +790,12 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -807,6 +804,9 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -861,6 +861,13 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -895,13 +902,16 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -943,7 +953,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -978,13 +988,13 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-tilera-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -1315,6 +1325,9 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/config.sub telepathy-salut-0.8.0/lib/ext/wocky/config.sub --- telepathy-salut-0.7.2/lib/ext/wocky/config.sub 2012-03-15 18:43:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/config.sub 2012-04-04 16:37:44.000000000 +0000 @@ -2,9 +2,9 @@ # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-03-23' +timestamp='2012-02-10' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -76,8 +74,8 @@ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -132,6 +130,10 @@ os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -247,17 +249,22 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -291,7 +298,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -300,7 +307,7 @@ | spu \ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -315,8 +322,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -329,7 +335,10 @@ strongarm | thumb | xscale) basic_machine=arm-unknown ;; - + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; xscaleeb) basic_machine=armeb-unknown ;; @@ -352,11 +361,13 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ @@ -365,8 +376,10 @@ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -400,7 +413,7 @@ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ @@ -408,10 +421,11 @@ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -711,7 +725,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -808,10 +821,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -1120,13 +1141,8 @@ basic_machine=t90-cray os=-unicos ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1336,7 +1352,7 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1548,9 +1564,6 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/configure telepathy-salut-0.8.0/lib/ext/wocky/configure --- telepathy-salut-0.7.2/lib/ext/wocky/configure 2012-03-15 18:43:37.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/configure 2012-04-04 16:37:43.000000000 +0000 @@ -681,6 +681,8 @@ CCAS AM_BACKSLASH AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V CPP OTOOL64 OTOOL @@ -705,6 +707,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -1489,7 +1492,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] 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 @@ -2821,9 +2824,9 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} +# 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}' { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 @@ -2920,8 +2923,8 @@ -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -3129,6 +3132,7 @@ 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= @@ -3942,6 +3946,7 @@ # 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. @@ -4001,7 +4006,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | 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. @@ -4745,6 +4750,11 @@ 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 @@ -4784,7 +4794,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"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -5213,7 +5223,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -5854,13 +5864,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -6007,6 +6017,7 @@ # 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};"\ @@ -6395,7 +6406,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*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 @@ -6406,7 +6417,20 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + 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 + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -7046,7 +7070,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # 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 lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7057,6 +7087,7 @@ 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 : @@ -7089,6 +7120,7 @@ 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 : @@ -7110,7 +7142,9 @@ 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 -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + 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 lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -7515,7 +7549,22 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + 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 else pic_mode=default fi @@ -7593,6 +7642,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -8052,7 +8105,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -8143,18 +8198,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # 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 @@ -8516,7 +8586,6 @@ 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 @@ -8769,8 +8838,7 @@ 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= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$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~ @@ -9150,6 +9218,7 @@ # 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' @@ -9195,6 +9264,7 @@ 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 @@ -9223,10 +9293,6 @@ 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 @@ -9239,7 +9305,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 @@ -9278,7 +9344,6 @@ 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 @@ -9902,11 +9967,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -9996,7 +10056,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -10005,7 +10065,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -10070,7 +10130,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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' @@ -10209,7 +10269,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -10217,10 +10277,6 @@ 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. @@ -10228,7 +10284,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -10246,7 +10302,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -10266,7 +10322,7 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' @@ -10277,7 +10333,7 @@ ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -10338,7 +10394,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -10354,7 +10410,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -10391,9 +10447,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10487,7 +10543,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -10556,7 +10612,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10581,7 +10637,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -10605,7 +10661,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -10636,7 +10692,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10646,7 +10702,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -11428,6 +11484,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -11449,6 +11507,33 @@ 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='\' @@ -12005,6 +12090,7 @@ # 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. @@ -12064,7 +12150,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | 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. @@ -12432,6 +12518,7 @@ # 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. @@ -12489,7 +12576,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | 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. @@ -15746,6 +15833,7 @@ 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"`' @@ -15828,7 +15916,6 @@ 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"`' @@ -15884,6 +15971,7 @@ # Quote evaled strings. for var in SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -15934,7 +16022,6 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -16738,8 +16825,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 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -16793,6 +16880,9 @@ # 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 @@ -17094,10 +17184,6 @@ # 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 diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/depcomp telepathy-salut-0.8.0/lib/ext/wocky/depcomp --- telepathy-salut-0.7.2/lib/ext/wocky/depcomp 2012-03-15 18:43:39.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/depcomp 2012-04-04 16:37:45.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-12-04.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011 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 outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -90,10 +90,18 @@ # 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 @@ -158,10 +166,12 @@ ' < "$tmpdepfile" | ## Some versions of gcc put a space before the `:'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -405,6 +415,52 @@ 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. @@ -503,7 +559,9 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$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" sed '1,2d' "$tmpdepfile" | tr ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/Makefile.in telepathy-salut-0.8.0/lib/ext/wocky/docs/Makefile.in --- telepathy-salut-0.7.2/lib/ext/wocky/docs/Makefile.in 2012-03-15 18:43:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/Makefile.in 2012-04-04 16:37:44.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -502,10 +502,15 @@ installcheck: installcheck-recursive install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/annotation-glossary.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/annotation-glossary.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/annotation-glossary.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/annotation-glossary.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ Annotation Glossary - + diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/api-index-full.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/api-index-full.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/api-index-full.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/api-index-full.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ API Index - + @@ -1977,6 +1977,10 @@
+wocky_send_ll_pep_event, function in wocky-pubsub-helpers +
+
+
WockySession, struct in wocky-types
@@ -2324,6 +2328,10 @@
+WockyXep0115CapabilitiesHasFeatureFunc, user_function in WockyXep0115Capabilities +
+
+
WockyXep0115CapabilitiesInterface, struct in WockyXep0115Capabilities
@@ -2336,6 +2344,10 @@
+wocky_xep_0115_capabilities_has_feature, function in WockyXep0115Capabilities +
+
+
WockyXmppConnectionClass, struct in WockyXmppConnection
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/ch01.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/ch01.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/ch01.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/ch01.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ API Reference - + @@ -21,7 +21,7 @@

-API Reference

+API Reference
WockyAuthHandler diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/index.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/index.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/index.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/index.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ Wocky Reference Manual - + diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/index.sgml telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/index.sgml --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/index.sgml 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/index.sgml 2012-04-04 16:39:37.000000000 +0000 @@ -602,6 +602,7 @@ + diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/object-tree.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/object-tree.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/object-tree.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/object-tree.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ Object Hierarchy - + @@ -23,14 +23,14 @@

Object Hierarchy

-    GObject
+    GObject
         WockyAuthRegistry
         WockyContact
             WockyBareContact
             WockyLLContact
             WockyResourceContact
         WockyCapsCache
-        GIOStream
+        GIOStream
             WockyTLSConnection
         WockyNodeTree
         WockyPubsubNode
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/WockyAuthRegistry.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/WockyAuthRegistry.html
--- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/WockyAuthRegistry.html	2012-03-26 17:22:38.000000000 +0000
+++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/WockyAuthRegistry.html	2012-04-04 16:39:37.000000000 +0000
@@ -3,7 +3,7 @@
 
 
 WockyAuthRegistry
-
+
 
 
 
@@ -49,88 +49,88 @@
 struct              WockyAuthRegistry;
 void                (*WockyAuthRegistryChallengeAsyncFunc)
                                                         (WockyAuthRegistry *self,
-                                                         const GString *challenge_data,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            (*WockyAuthRegistryChallengeFinishFunc)
-                                                        (WockyAuthRegistry *self,
-                                                         GAsyncResult *result,
-                                                         GString **response,
-                                                         GError **error);
+                                                         const GString *challenge_data,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            (*WockyAuthRegistryChallengeFinishFunc)
+                                                        (WockyAuthRegistry *self,
+                                                         GAsyncResult *result,
+                                                         GString **response,
+                                                         GError **error);
 struct              WockyAuthRegistryClass;
 void                (*WockyAuthRegistryFailureFunc)     (WockyAuthRegistry *self,
-                                                         GError *error);
+                                                         GError *error);
 void                (*WockyAuthRegistryStartAuthAsyncFunc)
                                                         (WockyAuthRegistry *self,
-                                                         const GSList *mechanisms,
-                                                         gboolean allow_plain,
-                                                         gboolean is_secure_channel,
-                                                         const gchar *username,
-                                                         const gchar *password,
-                                                         const gchar *server,
-                                                         const gchar *session_id,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            (*WockyAuthRegistryStartAuthFinishFunc)
+                                                         const GSList *mechanisms,
+                                                         gboolean allow_plain,
+                                                         gboolean is_secure_channel,
+                                                         const gchar *username,
+                                                         const gchar *password,
+                                                         const gchar *server,
+                                                         const gchar *session_id,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            (*WockyAuthRegistryStartAuthFinishFunc)
                                                         (WockyAuthRegistry *self,
-                                                         GAsyncResult *result,
+                                                         GAsyncResult *result,
                                                          WockyAuthRegistryStartData **start_data,
-                                                         GError **error);
+                                                         GError **error);
                     WockyAuthRegistryStartData;
 void                (*WockyAuthRegistrySuccessAsyncFunc)
                                                         (WockyAuthRegistry *self,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            (*WockyAuthRegistrySuccessFinishFunc)
-                                                        (WockyAuthRegistry *self,
-                                                         GAsyncResult *result,
-                                                         GError **error);
-GQuark              wocky_auth_error_quark              (void);
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            (*WockyAuthRegistrySuccessFinishFunc)
+                                                        (WockyAuthRegistry *self,
+                                                         GAsyncResult *result,
+                                                         GError **error);
+GQuark              wocky_auth_error_quark              (void);
 void                wocky_auth_registry_add_handler     (WockyAuthRegistry *self,
                                                          WockyAuthHandler *handler);
 void                wocky_auth_registry_challenge_async (WockyAuthRegistry *self,
-                                                         const GString *challenge_data,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            wocky_auth_registry_challenge_finish
-                                                        (WockyAuthRegistry *self,
-                                                         GAsyncResult *res,
-                                                         GString **response,
-                                                         GError **error);
+                                                         const GString *challenge_data,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            wocky_auth_registry_challenge_finish
+                                                        (WockyAuthRegistry *self,
+                                                         GAsyncResult *res,
+                                                         GString **response,
+                                                         GError **error);
 void                wocky_auth_registry_failure         (WockyAuthRegistry *self,
-                                                         GError *error);
+                                                         GError *error);
 WockyAuthRegistry * wocky_auth_registry_new             (void);
 void                wocky_auth_registry_start_auth_async
                                                         (WockyAuthRegistry *self,
-                                                         const GSList *mechanisms,
-                                                         gboolean allow_plain,
-                                                         gboolean is_secure_channel,
-                                                         const gchar *username,
-                                                         const gchar *password,
-                                                         const gchar *server,
-                                                         const gchar *session_id,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            wocky_auth_registry_start_auth_finish
+                                                         const GSList *mechanisms,
+                                                         gboolean allow_plain,
+                                                         gboolean is_secure_channel,
+                                                         const gchar *username,
+                                                         const gchar *password,
+                                                         const gchar *server,
+                                                         const gchar *session_id,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            wocky_auth_registry_start_auth_finish
                                                         (WockyAuthRegistry *self,
-                                                         GAsyncResult *result,
+                                                         GAsyncResult *result,
                                                          WockyAuthRegistryStartData **start_data,
-                                                         GError **error);
+                                                         GError **error);
 WockyAuthRegistryStartData * wocky_auth_registry_start_data_dup
                                                         (WockyAuthRegistryStartData *start_data);
 void                wocky_auth_registry_start_data_free (WockyAuthRegistryStartData *start_data);
 WockyAuthRegistryStartData * wocky_auth_registry_start_data_new
-                                                        (const gchar *mechanism,
-                                                         const GString *initial_response);
+                                                        (const gchar *mechanism,
+                                                         const GString *initial_response);
 void                wocky_auth_registry_success_async   (WockyAuthRegistry *self,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            wocky_auth_registry_success_finish  (WockyAuthRegistry *self,
-                                                         GAsyncResult *res,
-                                                         GError **error);
-gboolean            wocky_auth_registry_supports_one_of (WockyAuthRegistry *self,
-                                                         const GSList *mechanisms,
-                                                         gboolean allow_plain);
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            wocky_auth_registry_success_finish  (WockyAuthRegistry *self,
+                                                         GAsyncResult *res,
+                                                         GError **error);
+gboolean            wocky_auth_registry_supports_one_of (WockyAuthRegistry *self,
+                                                         const GSList *mechanisms,
+                                                         gboolean allow_plain);
 
@@ -140,7 +140,7 @@ +----WockyAuthError
-  GObject
+  GObject
    +----WockyAuthRegistry
 
@@ -280,9 +280,9 @@

WockyAuthRegistryChallengeAsyncFunc ()

void                (*WockyAuthRegistryChallengeAsyncFunc)
                                                         (WockyAuthRegistry *self,
-                                                         const GString *challenge_data,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ const GString *challenge_data, + GAsyncReadyCallback callback, + gpointer user_data);

Recieves a challenge and asynchronously provides a reply. By default the challenge is passed on to the chosen WockyAuthHandler. @@ -313,15 +313,15 @@


WockyAuthRegistryChallengeFinishFunc ()

-
gboolean            (*WockyAuthRegistryChallengeFinishFunc)
+
gboolean            (*WockyAuthRegistryChallengeFinishFunc)
                                                         (WockyAuthRegistry *self,
-                                                         GAsyncResult *result,
-                                                         GString **response,
-                                                         GError **error);
+ GAsyncResult *result, + GString **response, + GError **error);

-Finishes a GAsyncResult from +Finishes a GAsyncResult from WockyAuthRegistryChallengeAsyncFunc. By default it extracts a -GString response from the given GSimpleAsyncResult and copies it +GString response from the given GSimpleAsyncResult and copies it to the out param.

@@ -333,7 +333,7 @@ - + @@ -341,13 +341,13 @@ - @@ -423,7 +423,7 @@

WockyAuthRegistryFailureFunc ()

void                (*WockyAuthRegistryFailureFunc)     (WockyAuthRegistry *self,
-                                                         GError *error);
+ GError *error);

Notifies the client of a server-side error. By default this is not implemented. @@ -437,7 +437,7 @@

- +

result :

a GAsyncResult objecta GAsyncResult object

response :

error :

a location to fill with a GError if an error is hit, or NULL +a location to fill with a GError if an error is hit, or NULL

Returns :

-TRUE on success, otherwise FALSE +TRUE on success, otherwise FALSE

error :

a GError describing the failurea GError describing the failure
@@ -447,15 +447,15 @@

WockyAuthRegistryStartAuthAsyncFunc ()

void                (*WockyAuthRegistryStartAuthAsyncFunc)
                                                         (WockyAuthRegistry *self,
-                                                         const GSList *mechanisms,
-                                                         gboolean allow_plain,
-                                                         gboolean is_secure_channel,
-                                                         const gchar *username,
-                                                         const gchar *password,
-                                                         const gchar *server,
-                                                         const gchar *session_id,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ const GSList *mechanisms, + gboolean allow_plain, + gboolean is_secure_channel, + const gchar *username, + const gchar *password, + const gchar *server, + const gchar *session_id, + GAsyncReadyCallback callback, + gpointer user_data);

Starts a async authentication: chooses mechanism and gets initial data. The default function chooses a WockyAuthHandler by which mechanism it @@ -475,13 +475,13 @@

allow_plain :

-TRUE if PLAIN is allowed, otherwise FALSE +TRUE if PLAIN is allowed, otherwise FALSE

is_secure_channel :

-TRUE if channel is secure, otherwise FALSE +TRUE if channel is secure, otherwise FALSE @@ -515,15 +515,15 @@

WockyAuthRegistryStartAuthFinishFunc ()

-
gboolean            (*WockyAuthRegistryStartAuthFinishFunc)
+
gboolean            (*WockyAuthRegistryStartAuthFinishFunc)
                                                         (WockyAuthRegistry *self,
-                                                         GAsyncResult *result,
+                                                         GAsyncResult *result,
                                                          WockyAuthRegistryStartData **start_data,
-                                                         GError **error);
+ GError **error);

-Called to finish the GAsyncResult task for authentication +Called to finish the GAsyncResult task for authentication start. By default, it extracts a WockyAuthRegistryStartData -pointer from a given GSimpleAsyncResult and copies it to the out +pointer from a given GSimpleAsyncResult and copies it to the out param.

@@ -535,7 +535,7 @@ - + @@ -543,13 +543,13 @@ - @@ -570,11 +570,11 @@ - + - + @@ -585,8 +585,8 @@

WockyAuthRegistrySuccessAsyncFunc ()

void                (*WockyAuthRegistrySuccessAsyncFunc)
                                                         (WockyAuthRegistry *self,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GAsyncReadyCallback callback, + gpointer user_data);

Notifies the registry of authentication success, and allows a last ditch attempt at aborting the authentication at the client's discretion. @@ -613,15 +613,15 @@


WockyAuthRegistrySuccessFinishFunc ()

-
gboolean            (*WockyAuthRegistrySuccessFinishFunc)
+
gboolean            (*WockyAuthRegistrySuccessFinishFunc)
                                                         (WockyAuthRegistry *self,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+ GAsyncResult *result, + GError **error);

-Finishes a GAsyncResult from +Finishes a GAsyncResult from WockyAuthRegistrySuccessAsyncFunc. It checks for any errors set on -the given GSimpleAsyncResult, copies the GError to an out param -and returns FALSE if there was an error. +the given GSimpleAsyncResult, copies the GError to an out param +and returns FALSE if there was an error.

result :

a GAsyncResult objecta GAsyncResult object

start_data :

error :

a location to fill with a GError if an error is hit, or NULL +a location to fill with a GError if an error is hit, or NULL

Returns :

-TRUE on success, otherwise FALSE +TRUE on success, otherwise FALSE

gchar *mechanism;

gchar *mechanism;

the name of the mechanism

GString *initial_response;

GString *initial_response;

the data in the response
@@ -632,17 +632,17 @@ - + - @@ -651,7 +651,7 @@

wocky_auth_error_quark ()

-
GQuark              wocky_auth_error_quark              (void);
+
GQuark              wocky_auth_error_quark              (void);

@@ -663,24 +663,24 @@

wocky_auth_registry_challenge_async ()

void                wocky_auth_registry_challenge_async (WockyAuthRegistry *self,
-                                                         const GString *challenge_data,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ const GString *challenge_data, + GAsyncReadyCallback callback, + gpointer user_data);

wocky_auth_registry_challenge_finish ()

-
gboolean            wocky_auth_registry_challenge_finish
+
gboolean            wocky_auth_registry_challenge_finish
                                                         (WockyAuthRegistry *self,
-                                                         GAsyncResult *res,
-                                                         GString **response,
-                                                         GError **error);
+ GAsyncResult *res, + GString **response, + GError **error);

wocky_auth_registry_failure ()

void                wocky_auth_registry_failure         (WockyAuthRegistry *self,
-                                                         GError *error);
+ GError *error);

@@ -692,24 +692,24 @@

wocky_auth_registry_start_auth_async ()

void                wocky_auth_registry_start_auth_async
                                                         (WockyAuthRegistry *self,
-                                                         const GSList *mechanisms,
-                                                         gboolean allow_plain,
-                                                         gboolean is_secure_channel,
-                                                         const gchar *username,
-                                                         const gchar *password,
-                                                         const gchar *server,
-                                                         const gchar *session_id,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ const GSList *mechanisms, + gboolean allow_plain, + gboolean is_secure_channel, + const gchar *username, + const gchar *password, + const gchar *server, + const gchar *session_id, + GAsyncReadyCallback callback, + gpointer user_data);

wocky_auth_registry_start_auth_finish ()

-
gboolean            wocky_auth_registry_start_auth_finish
+
gboolean            wocky_auth_registry_start_auth_finish
                                                         (WockyAuthRegistry *self,
-                                                         GAsyncResult *result,
+                                                         GAsyncResult *result,
                                                          WockyAuthRegistryStartData **start_data,
-                                                         GError **error);
+ GError **error);

@@ -726,29 +726,29 @@

wocky_auth_registry_start_data_new ()

WockyAuthRegistryStartData * wocky_auth_registry_start_data_new
-                                                        (const gchar *mechanism,
-                                                         const GString *initial_response);
+ (const gchar *mechanism, + const GString *initial_response);

wocky_auth_registry_success_async ()

void                wocky_auth_registry_success_async   (WockyAuthRegistry *self,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GAsyncReadyCallback callback, + gpointer user_data);

wocky_auth_registry_success_finish ()

-
gboolean            wocky_auth_registry_success_finish  (WockyAuthRegistry *self,
-                                                         GAsyncResult *res,
-                                                         GError **error);
+
gboolean            wocky_auth_registry_success_finish  (WockyAuthRegistry *self,
+                                                         GAsyncResult *res,
+                                                         GError **error);

wocky_auth_registry_supports_one_of ()

-
gboolean            wocky_auth_registry_supports_one_of (WockyAuthRegistry *self,
-                                                         const GSList *mechanisms,
-                                                         gboolean allow_plain);
+
gboolean            wocky_auth_registry_supports_one_of (WockyAuthRegistry *self,
+                                                         const GSList *mechanisms,
+                                                         gboolean allow_plain);

Checks whether at least one of mechanisms is supported by Wocky. At present, Wocky itself only implements password-based authentication mechanisms. @@ -767,13 +767,13 @@

- + +TRUE if one of the mechanisms is supported by wocky, +FALSE otherwise.

result :

a GAsyncResult objecta GAsyncResult object

error :

a location to fill with a GError if an error is hit, or NULL +a location to fill with a GError if an error is hit, or NULL

Returns :

-TRUE on success, otherwise FALSE +TRUE on success, otherwise FALSE

mechanisms :

a GSList of gchar* of auth mechanismsa GSList of gchar* of auth mechanisms

Returns :

-TRUE if one of the mechanisms is supported by wocky, -FALSE otherwise.
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/WockyBareContact.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/WockyBareContact.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/WockyBareContact.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/WockyBareContact.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyBareContact - + @@ -42,28 +42,28 @@ struct WockyBareContactClass; void wocky_bare_contact_add_group (WockyBareContact *contact, - const gchar *group); + const gchar *group); void wocky_bare_contact_add_resource (WockyBareContact *contact, WockyResourceContact *resource); WockyBareContact * wocky_bare_contact_copy (WockyBareContact *contact); void wocky_bare_contact_debug_print (WockyBareContact *contact); -gboolean wocky_bare_contact_equal (WockyBareContact *a, +gboolean wocky_bare_contact_equal (WockyBareContact *a, WockyBareContact *b); -const gchar * const * wocky_bare_contact_get_groups (WockyBareContact *contact); -const gchar * wocky_bare_contact_get_jid (WockyBareContact *contact); -const gchar * wocky_bare_contact_get_name (WockyBareContact *contact); -GSList * wocky_bare_contact_get_resources (WockyBareContact *contact); +const gchar * const * wocky_bare_contact_get_groups (WockyBareContact *contact); +const gchar * wocky_bare_contact_get_jid (WockyBareContact *contact); +const gchar * wocky_bare_contact_get_name (WockyBareContact *contact); +GSList * wocky_bare_contact_get_resources (WockyBareContact *contact); WockyRosterSubscriptionFlags wocky_bare_contact_get_subscription (WockyBareContact *contact); -gboolean wocky_bare_contact_in_group (WockyBareContact *contact, - const gchar *group); -WockyBareContact * wocky_bare_contact_new (const gchar *jid); +gboolean wocky_bare_contact_in_group (WockyBareContact *contact, + const gchar *group); +WockyBareContact * wocky_bare_contact_new (const gchar *jid); void wocky_bare_contact_remove_group (WockyBareContact *contact, - const gchar *group); + const gchar *group); void wocky_bare_contact_set_groups (WockyBareContact *contact, - gchar **groups); + gchar **groups); void wocky_bare_contact_set_name (WockyBareContact *contact, - const gchar *name); + const gchar *name); void wocky_bare_contact_set_subscription (WockyBareContact *contact, WockyRosterSubscriptionFlags subscription); @@ -90,7 +90,7 @@

wocky_bare_contact_add_group ()

void                wocky_bare_contact_add_group        (WockyBareContact *contact,
-                                                         const gchar *group);
+ const gchar *group);

Adds group to contact's groups.

@@ -171,7 +171,7 @@

wocky_bare_contact_equal ()

-
gboolean            wocky_bare_contact_equal            (WockyBareContact *a,
+
gboolean            wocky_bare_contact_equal            (WockyBareContact *a,
                                                          WockyBareContact *b);

Compares whether two WockyBareContact instances refer to the same @@ -192,7 +192,7 @@

Returns :

-TRUE if the two contacts match. +TRUE if the two contacts match.
@@ -200,7 +200,7 @@

wocky_bare_contact_get_groups ()

-
const gchar * const * wocky_bare_contact_get_groups     (WockyBareContact *contact);
+
const gchar * const * wocky_bare_contact_get_groups     (WockyBareContact *contact);

Returns the list of the groups of contact.

@@ -221,7 +221,7 @@

wocky_bare_contact_get_jid ()

-
const gchar *       wocky_bare_contact_get_jid          (WockyBareContact *contact);
+
const gchar *       wocky_bare_contact_get_jid          (WockyBareContact *contact);

Returns the JID of the contact wrapped by contact.

@@ -243,7 +243,7 @@

wocky_bare_contact_get_name ()

-
const gchar *       wocky_bare_contact_get_name         (WockyBareContact *contact);
+
const gchar *       wocky_bare_contact_get_name         (WockyBareContact *contact);

Returns the name of the contact wrapped by contact.

@@ -266,10 +266,10 @@

wocky_bare_contact_get_resources ()

-
GSList *            wocky_bare_contact_get_resources    (WockyBareContact *contact);
+
GSList *            wocky_bare_contact_get_resources    (WockyBareContact *contact);

-Gets a GSList of all the contact's resources. -You should call g_slist_free on the list when done with it. +Gets a GSList of all the contact's resources. +You should call g_slist_free on the list when done with it.

@@ -280,7 +280,7 @@ - +

Returns :

a GSList of WockyResourceContact objects.a GSList of WockyResourceContact objects.
@@ -311,8 +311,8 @@

wocky_bare_contact_in_group ()

-
gboolean            wocky_bare_contact_in_group         (WockyBareContact *contact,
-                                                         const gchar *group);
+
gboolean            wocky_bare_contact_in_group         (WockyBareContact *contact,
+                                                         const gchar *group);

Determines whether the given contact is in group.

@@ -330,7 +330,7 @@

Returns :

-TRUE if the contact is in the given group. +TRUE if the contact is in the given group.
@@ -338,7 +338,7 @@

wocky_bare_contact_new ()

-
WockyBareContact *  wocky_bare_contact_new              (const gchar *jid);
+
WockyBareContact *  wocky_bare_contact_new              (const gchar *jid);

Creates a new WockyBareContact for a given JID.

@@ -361,7 +361,7 @@

wocky_bare_contact_remove_group ()

void                wocky_bare_contact_remove_group     (WockyBareContact *contact,
-                                                         const gchar *group);
+ const gchar *group);

Removes group from the contact's groups.

@@ -383,7 +383,7 @@

wocky_bare_contact_set_groups ()

void                wocky_bare_contact_set_groups       (WockyBareContact *contact,
-                                                         gchar **groups);
+ gchar **groups);

Sets contact's groups.

@@ -405,7 +405,7 @@

wocky_bare_contact_set_name ()

void                wocky_bare_contact_set_name         (WockyBareContact *contact,
-                                                         const gchar *name);
+ const gchar *name);

Sets contact's name to name.

diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/WockyCapsCache.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/WockyCapsCache.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/WockyCapsCache.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/WockyCapsCache.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyCapsCache - + @@ -46,24 +46,24 @@ WockyCapsCache * wocky_caps_cache_dup_shared (void); void wocky_caps_cache_free_shared (void); void wocky_caps_cache_insert (WockyCapsCache *self, - const gchar *node, + const gchar *node, WockyNodeTree *query_node); WockyNodeTree * wocky_caps_cache_lookup (WockyCapsCache *self, - const gchar *node); -WockyCapsCache * wocky_caps_cache_new (const gchar *path); + const gchar *node); +WockyCapsCache * wocky_caps_cache_new (const gchar *path);

Object Hierarchy

-  GObject
+  GObject
    +----WockyCapsCache
 

Properties

-  "path"                     gchar*                : Read / Write / Construct Only
+  "path"                     gchar*                : Read / Write / Construct Only
 
@@ -124,7 +124,7 @@

wocky_caps_cache_insert ()

void                wocky_caps_cache_insert             (WockyCapsCache *self,
-                                                         const gchar *node,
+                                                         const gchar *node,
                                                          WockyNodeTree *query_node);

Adds a new item to the caps cache. node is associated with @@ -155,7 +155,7 @@

wocky_caps_cache_lookup ()

WockyNodeTree *     wocky_caps_cache_lookup             (WockyCapsCache *self,
-                                                         const gchar *node);
+ const gchar *node);

Look up node in the caps cache self. The caller is responsible for unreffing the returned WockyNodeTree. @@ -174,7 +174,7 @@

Returns :

-a WockyNodeTree if node was found in the cache, or NULL +a WockyNodeTree if node was found in the cache, or NULL if a match was not found @@ -183,7 +183,7 @@

wocky_caps_cache_new ()

-
WockyCapsCache *    wocky_caps_cache_new                (const gchar *path);
+
WockyCapsCache *    wocky_caps_cache_new                (const gchar *path);

Convenience function to create a new WockyCapsCache.

@@ -206,7 +206,7 @@

Property Details

The "path" property

-
  "path"                     gchar*                : Read / Write / Construct Only
+
  "path"                     gchar*                : Read / Write / Construct Only

The path on disk to the SQLite database where this WockyCapsCache stores its information. diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/WockyContact.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/WockyContact.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/WockyContact.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/WockyContact.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyContact - + @@ -41,8 +41,8 @@ #include <wocky/wocky-contact.h> struct WockyContactClass; -gchar * (*WockyContactDupJidImpl) (WockyContact *self); -gchar * wocky_contact_dup_jid (WockyContact *self); +gchar * (*WockyContactDupJidImpl) (WockyContact *self); +gchar * wocky_contact_dup_jid (WockyContact *self);

@@ -62,12 +62,12 @@

WockyContactDupJidImpl ()

-
gchar *             (*WockyContactDupJidImpl)           (WockyContact *self);
+
gchar *             (*WockyContactDupJidImpl)           (WockyContact *self);

wocky_contact_dup_jid ()

-
gchar *             wocky_contact_dup_jid               (WockyContact *self);
+
gchar *             wocky_contact_dup_jid               (WockyContact *self);
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky.devhelp2 telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky.devhelp2 --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky.devhelp2 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky.devhelp2 2012-04-04 16:39:37.000000000 +0000 @@ -400,6 +400,7 @@ + diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/WockyDiscoIdentity.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/WockyDiscoIdentity.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/WockyDiscoIdentity.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/WockyDiscoIdentity.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyDiscoIdentity - + @@ -40,17 +40,17 @@

Synopsis

struct              WockyDiscoIdentity;
-GPtrArray *         wocky_disco_identity_array_copy     (const GPtrArray *source);
-void                wocky_disco_identity_array_free     (GPtrArray *arr);
-GPtrArray *         wocky_disco_identity_array_new      (void);
-gint                wocky_disco_identity_cmp            (WockyDiscoIdentity *left,
+GPtrArray *         wocky_disco_identity_array_copy     (const GPtrArray *source);
+void                wocky_disco_identity_array_free     (GPtrArray *arr);
+GPtrArray *         wocky_disco_identity_array_new      (void);
+gint                wocky_disco_identity_cmp            (WockyDiscoIdentity *left,
                                                          WockyDiscoIdentity *right);
 WockyDiscoIdentity * wocky_disco_identity_copy          (const WockyDiscoIdentity *source);
 void                wocky_disco_identity_free           (WockyDiscoIdentity *identity);
-WockyDiscoIdentity * wocky_disco_identity_new           (const gchar *category,
-                                                         const gchar *type,
-                                                         const gchar *lang,
-                                                         const gchar *name);
+WockyDiscoIdentity * wocky_disco_identity_new           (const gchar *category,
+                                                         const gchar *type,
+                                                         const gchar *lang,
+                                                         const gchar *name);
 
@@ -86,19 +86,19 @@ -

gchar *category;

+

gchar *category;

the identity category -

gchar *type;

+

gchar *type;

the identity type -

gchar *lang;

+

gchar *lang;

the identity language -

gchar *name;

+

gchar *name;

the identity name @@ -107,7 +107,7 @@

wocky_disco_identity_array_copy ()

-
GPtrArray *         wocky_disco_identity_array_copy     (const GPtrArray *source);
+
GPtrArray *         wocky_disco_identity_array_copy     (const GPtrArray *source);

Copies an array of WockyDiscoIdentity objects. The returned array contains new copies of the contents of the source array. @@ -132,7 +132,7 @@


wocky_disco_identity_array_free ()

-
void                wocky_disco_identity_array_free     (GPtrArray *arr);
+
void                wocky_disco_identity_array_free     (GPtrArray *arr);

Frees an array of WockyDiscoIdentity objects created with wocky_disco_identity_array_new() or returned by @@ -140,7 +140,7 @@

Note that if this method is called with an array created with -g_ptr_array_new(), the caller should also free the array contents. +g_ptr_array_new(), the caller should also free the array contents.

See: wocky_disco_identity_array_new(), wocky_disco_identity_array_copy() @@ -156,7 +156,7 @@


wocky_disco_identity_array_new ()

-
GPtrArray *         wocky_disco_identity_array_new      (void);
+
GPtrArray *         wocky_disco_identity_array_new      (void);

Creates a new array of WockyDiscoIdentity structures.

@@ -175,7 +175,7 @@

wocky_disco_identity_cmp ()

-
gint                wocky_disco_identity_cmp            (WockyDiscoIdentity *left,
+
gint                wocky_disco_identity_cmp            (WockyDiscoIdentity *left,
                                                          WockyDiscoIdentity *right);

Compares left and right. It returns an integer less than, equal @@ -183,7 +183,7 @@ less than, to match, or be greater than right.

-This function can be casted to a GCompareFunc to sort a list of +This function can be casted to a GCompareFunc to sort a list of WockyDiscoIdentity structures.

@@ -250,10 +250,10 @@

wocky_disco_identity_new ()

-
WockyDiscoIdentity * wocky_disco_identity_new           (const gchar *category,
-                                                         const gchar *type,
-                                                         const gchar *lang,
-                                                         const gchar *name);
+
WockyDiscoIdentity * wocky_disco_identity_new           (const gchar *category,
+                                                         const gchar *type,
+                                                         const gchar *lang,
+                                                         const gchar *name);

diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/WockyNodeTree.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/WockyNodeTree.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/WockyNodeTree.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/WockyNodeTree.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyNodeTree - + @@ -39,11 +39,11 @@

Synopsis

struct              WockyNodeTreeClass;
 WockyNode *         wocky_node_tree_get_top_node        (WockyNodeTree *self);
-WockyNodeTree *     wocky_node_tree_new                 (const gchar *name,
-                                                         const gchar *ns,
+WockyNodeTree *     wocky_node_tree_new                 (const gchar *name,
+                                                         const gchar *ns,
                                                          ...);
 WockyNodeTree *     wocky_node_tree_new_from_node       (WockyNode *node);
-WockyNodeTree *     wocky_node_tree_new_va              (const gchar *name,
+WockyNodeTree *     wocky_node_tree_new_va              (const gchar *name,
                                                          const char *ns,
                                                          va_list va);
 
@@ -70,8 +70,8 @@

wocky_node_tree_new ()

-
WockyNodeTree *     wocky_node_tree_new                 (const gchar *name,
-                                                         const gchar *ns,
+
WockyNodeTree *     wocky_node_tree_new                 (const gchar *name,
+                                                         const gchar *ns,
                                                          ...);

Build a node-tree from a list of arguments. @@ -80,7 +80,7 @@

-

Example 2. 

+

Example 2. 

@@ -117,7 +117,7 @@ @@ -151,7 +151,7 @@

wocky_node_tree_new_va ()

-
WockyNodeTree *     wocky_node_tree_new_va              (const gchar *name,
+
WockyNodeTree *     wocky_node_tree_new_va              (const gchar *name,
                                                          const char *ns,
                                                          va_list va);
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/WockyPubsubNode.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/WockyPubsubNode.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/WockyPubsubNode.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/WockyPubsubNode.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyPubsubNode - + @@ -44,48 +44,48 @@ struct WockyPubsubNodeClass; WockyPubsubAffiliation * wocky_pubsub_affiliation_copy (WockyPubsubAffiliation *aff); voidwocky_pubsub_affiliation_free (WockyPubsubAffiliation *aff); -GList * wocky_pubsub_affiliation_list_copy (GList *affs); -voidwocky_pubsub_affiliation_list_free (GList *affs); +GList * wocky_pubsub_affiliation_list_copy (GList *affs); +voidwocky_pubsub_affiliation_list_free (GList *affs); WockyPubsubAffiliation * wocky_pubsub_affiliation_new (WockyPubsubNode *node, - const gchar *jid, + const gchar *jid, WockyPubsubAffiliationState state); voidwocky_pubsub_node_delete_async (WockyPubsubNode *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -gbooleanwocky_pubsub_node_delete_finish (WockyPubsubNode *self, - GAsyncResult *result, - GError **error); + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gbooleanwocky_pubsub_node_delete_finish (WockyPubsubNode *self, + GAsyncResult *result, + GError **error); voidwocky_pubsub_node_get_configuration_async (WockyPubsubNode *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); WockyDataForm * wocky_pubsub_node_get_configuration_finish (WockyPubsubNode *self, - GAsyncResult *result, - GError **error); -const gchar * wocky_pubsub_node_get_name (WockyPubsubNode *self); + GAsyncResult *result, + GError **error); +const gchar * wocky_pubsub_node_get_name (WockyPubsubNode *self); voidwocky_pubsub_node_list_affiliates_async (WockyPubsubNode *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -gbooleanwocky_pubsub_node_list_affiliates_finish - (WockyPubsubNode *self, - GAsyncResult *result, - GList **affiliates, - GError **error); + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gbooleanwocky_pubsub_node_list_affiliates_finish + (WockyPubsubNode *self, + GAsyncResult *result, + GList **affiliates, + GError **error); voidwocky_pubsub_node_list_subscribers_async (WockyPubsubNode *self, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -gbooleanwocky_pubsub_node_list_subscribers_finish - (WockyPubsubNode *self, - GAsyncResult *result, - GList **subscribers, - GError **error); + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gbooleanwocky_pubsub_node_list_subscribers_finish + (WockyPubsubNode *self, + GAsyncResult *result, + GList **subscribers, + GError **error); WockyStanza * wocky_pubsub_node_make_publish_stanza (WockyPubsubNode *self, WockyNode **pubsub_out, @@ -93,33 +93,33 @@ WockyNode **item_out); voidwocky_pubsub_node_modify_affiliates_async (WockyPubsubNode *self, - const GList *affiliates, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -gbooleanwocky_pubsub_node_modify_affiliates_finish + const GList *affiliates, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gbooleanwocky_pubsub_node_modify_affiliates_finish (WockyPubsubNode *self, - GAsyncResult *result, - GError **error); + GAsyncResult *result, + GError **error); voidwocky_pubsub_node_subscribe_async (WockyPubsubNode *self, - const gchar *jid, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); + const gchar *jid, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); WockyPubsubSubscription * wocky_pubsub_node_subscribe_finish (WockyPubsubNode *self, - GAsyncResult *result, - GError **error); + GAsyncResult *result, + GError **error); voidwocky_pubsub_node_unsubscribe_async (WockyPubsubNode *self, - const gchar *jid, - const gchar *subid, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -gbooleanwocky_pubsub_node_unsubscribe_finish + const gchar *jid, + const gchar *subid, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gbooleanwocky_pubsub_node_unsubscribe_finish (WockyPubsubNode *self, - GAsyncResult *result, - GError **error); + GAsyncResult *result, + GError **error);
@@ -158,7 +158,7 @@
- + @@ -275,7 +275,7 @@

wocky_pubsub_affiliation_list_copy ()

-
GList *             wocky_pubsub_affiliation_list_copy  (GList *affs);
+
GList *             wocky_pubsub_affiliation_list_copy  (GList *affs);

Shorthand for manually copying affs, duplicating each element with wocky_pubsub_affiliation_copy(). @@ -299,10 +299,10 @@


wocky_pubsub_affiliation_list_free ()

-
void                wocky_pubsub_affiliation_list_free  (GList *affs);
+
void                wocky_pubsub_affiliation_list_free  (GList *affs);

Frees a list of WockyPubsubAffiliation structures, as shorthand for calling -wocky_pubsub_affiliation_free() for each element, followed by g_list_free(). +wocky_pubsub_affiliation_free() for each element, followed by g_list_free().

... :

the description of the node tree to build, -terminated with NULL +terminated with NULL
the node to which this affiliation relates

gchar *jid;

gchar *jid;

the bare JID affiliated to node
@@ -317,7 +317,7 @@

wocky_pubsub_affiliation_new ()

WockyPubsubAffiliation * wocky_pubsub_affiliation_new   (WockyPubsubNode *node,
-                                                         const gchar *jid,
+                                                         const gchar *jid,
                                                          WockyPubsubAffiliationState state);

@@ -352,25 +352,25 @@

wocky_pubsub_node_delete_async ()

void                wocky_pubsub_node_delete_async      (WockyPubsubNode *self,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

wocky_pubsub_node_delete_finish ()

-
gboolean            wocky_pubsub_node_delete_finish     (WockyPubsubNode *self,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+
gboolean            wocky_pubsub_node_delete_finish     (WockyPubsubNode *self,
+                                                         GAsyncResult *result,
+                                                         GError **error);

wocky_pubsub_node_get_configuration_async ()

void                wocky_pubsub_node_get_configuration_async
                                                         (WockyPubsubNode *self,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Retrieves the current configuration for a node owned by the user.

@@ -383,7 +383,7 @@
- + @@ -402,8 +402,8 @@

wocky_pubsub_node_get_configuration_finish ()

WockyDataForm *     wocky_pubsub_node_get_configuration_finish
                                                         (WockyPubsubNode *self,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+ GAsyncResult *result, + GError **error);

Complete a call to wocky_pubsub_node_get_configuration_async().

@@ -424,7 +424,7 @@ - @@ -433,16 +433,16 @@

wocky_pubsub_node_get_name ()

-
const gchar *       wocky_pubsub_node_get_name          (WockyPubsubNode *self);
+
const gchar *       wocky_pubsub_node_get_name          (WockyPubsubNode *self);

wocky_pubsub_node_list_affiliates_async ()

void                wocky_pubsub_node_list_affiliates_async
                                                         (WockyPubsubNode *self,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Retrieves the list of entities affilied to a node you own. callback may complete the call using wocky_pubsub_node_list_affiliates_finish(). @@ -461,7 +461,7 @@

- + @@ -478,11 +478,11 @@

wocky_pubsub_node_list_affiliates_finish ()

-
gboolean            wocky_pubsub_node_list_affiliates_finish
+
gboolean            wocky_pubsub_node_list_affiliates_finish
                                                         (WockyPubsubNode *self,
-                                                         GAsyncResult *result,
-                                                         GList **affiliates,
-                                                         GError **error);
+ GAsyncResult *result, + GList **affiliates, + GError **error);

Completes a call to wocky_pubsub_node_list_affiliates_async(). The list returned in affiliates should be freed with @@ -502,18 +502,18 @@

- @@ -524,9 +524,9 @@

wocky_pubsub_node_list_subscribers_async ()

void                wocky_pubsub_node_list_subscribers_async
                                                         (WockyPubsubNode *self,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Retrieves the list of subscriptions to a node you own. callback may complete the call using wocky_pubsub_node_list_subscribers_finish(). @@ -545,7 +545,7 @@

- + @@ -562,11 +562,11 @@

wocky_pubsub_node_list_subscribers_finish ()

-
gboolean            wocky_pubsub_node_list_subscribers_finish
+
gboolean            wocky_pubsub_node_list_subscribers_finish
                                                         (WockyPubsubNode *self,
-                                                         GAsyncResult *result,
-                                                         GList **subscribers,
-                                                         GError **error);
+ GAsyncResult *result, + GList **subscribers, + GError **error);

Completes a call to wocky_pubsub_node_list_subscribers_async(). The list returned in subscribers should be freed with @@ -586,18 +586,18 @@

- @@ -617,10 +617,10 @@

wocky_pubsub_node_modify_affiliates_async ()

void                wocky_pubsub_node_modify_affiliates_async
                                                         (WockyPubsubNode *self,
-                                                         const GList *affiliates,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ const GList *affiliates, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Modifies the entities affiliated to a node that you own.

@@ -638,7 +638,7 @@ - + @@ -655,10 +655,10 @@

wocky_pubsub_node_modify_affiliates_finish ()

-
gboolean            wocky_pubsub_node_modify_affiliates_finish
+
gboolean            wocky_pubsub_node_modify_affiliates_finish
                                                         (WockyPubsubNode *self,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+ GAsyncResult *result, + GError **error);

Complete a call to wocky_pubsub_node_modify_affiliates_async().

@@ -680,7 +680,7 @@
@@ -690,10 +690,10 @@

wocky_pubsub_node_subscribe_async ()

void                wocky_pubsub_node_subscribe_async   (WockyPubsubNode *self,
-                                                         const gchar *jid,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ const gchar *jid, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Attempts to subscribe to self.

@@ -707,12 +707,12 @@
- + @@ -731,18 +731,18 @@

wocky_pubsub_node_subscribe_finish ()

WockyPubsubSubscription * wocky_pubsub_node_subscribe_finish
                                                         (WockyPubsubNode *self,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+ GAsyncResult *result, + GError **error);

wocky_pubsub_node_unsubscribe_async ()

void                wocky_pubsub_node_unsubscribe_async (WockyPubsubNode *self,
-                                                         const gchar *jid,
-                                                         const gchar *subid,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ const gchar *jid, + const gchar *subid, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Attempts to unsubscribe from self.

@@ -756,7 +756,7 @@
@@ -765,7 +765,7 @@ - + @@ -782,10 +782,10 @@

wocky_pubsub_node_unsubscribe_finish ()

-
gboolean            wocky_pubsub_node_unsubscribe_finish
+
gboolean            wocky_pubsub_node_unsubscribe_finish
                                                         (WockyPubsubNode *self,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+ GAsyncResult *result, + GError **error);
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/WockyResourceContact.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/WockyResourceContact.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/WockyResourceContact.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/WockyResourceContact.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyResourceContact - + @@ -41,13 +41,13 @@ #include <wocky/wocky-resource-contact.h> struct WockyResourceContactClass; -gbooleanwocky_resource_contact_equal (WockyResourceContact *a, +gbooleanwocky_resource_contact_equal (WockyResourceContact *a, WockyResourceContact *b); WockyBareContact * wocky_resource_contact_get_bare_contact (WockyResourceContact *contact); -const gchar * wocky_resource_contact_get_resource (WockyResourceContact *contact); +const gchar * wocky_resource_contact_get_resource (WockyResourceContact *contact); WockyResourceContact * wocky_resource_contact_new (WockyBareContact *bare, - const gchar *resource); + const gchar *resource);
@@ -67,7 +67,7 @@

wocky_resource_contact_equal ()

-
gboolean            wocky_resource_contact_equal        (WockyResourceContact *a,
+
gboolean            wocky_resource_contact_equal        (WockyResourceContact *a,
                                                          WockyResourceContact *b);

@@ -79,13 +79,13 @@

wocky_resource_contact_get_resource ()

-
const gchar *       wocky_resource_contact_get_resource (WockyResourceContact *contact);
+
const gchar *       wocky_resource_contact_get_resource (WockyResourceContact *contact);

wocky_resource_contact_new ()

WockyResourceContact * wocky_resource_contact_new       (WockyBareContact *bare,
-                                                         const gchar *resource);
+ const gchar *resource);
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/WockySession.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/WockySession.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/WockySession.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/WockySession.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockySession - + @@ -42,13 +42,13 @@ struct WockySessionClass; WockyContactFactory * wocky_session_get_contact_factory (WockySession *session); -const gchar * wocky_session_get_jid (WockySession *session); +const gchar * wocky_session_get_jid (WockySession *session); WockyPorter * wocky_session_get_porter (WockySession *session); -WockySession * wocky_session_new_ll (const gchar *full_jid); +WockySession * wocky_session_new_ll (const gchar *full_jid); WockySession * wocky_session_new_with_connection (WockyXmppConnection *conn, - const gchar *full_jid); + const gchar *full_jid); voidwocky_session_set_jid (WockySession *session, - const gchar *jid); + const gchar *jid); voidwocky_session_start (WockySession *session); @@ -74,7 +74,7 @@

wocky_session_get_jid ()

-
const gchar *       wocky_session_get_jid               (WockySession *session);
+
const gchar *       wocky_session_get_jid               (WockySession *session);

@@ -84,19 +84,19 @@

wocky_session_new_ll ()

-
WockySession *      wocky_session_new_ll                (const gchar *full_jid);
+
WockySession *      wocky_session_new_ll                (const gchar *full_jid);

wocky_session_new_with_connection ()

WockySession *      wocky_session_new_with_connection   (WockyXmppConnection *conn,
-                                                         const gchar *full_jid);
+ const gchar *full_jid);

wocky_session_set_jid ()

void                wocky_session_set_jid               (WockySession *session,
-                                                         const gchar *jid);
+ const gchar *jid);

diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyAuthHandler.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyAuthHandler.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyAuthHandler.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyAuthHandler.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyAuthHandler - + @@ -37,28 +37,28 @@

cancellable :

optional GCancellable object, NULL to ignoreoptional GCancellable object, NULL to ignore

callback :

Returns :

a form representing the node configuration on success; NULL and +a form representing the node configuration on success; NULL and sets error otherwise

cancellable :

optional GCancellable objectoptional GCancellable object

callback :

affiliates :

location at which to store a list of WockyPubsubAffiliation -pointers, or NULL +pointers, or NULL

error :

location at which to store an error, or NULL +location at which to store an error, or NULL

Returns :

-TRUE if the list of subscribers was successfully retrieved; FALSE +TRUE if the list of subscribers was successfully retrieved; FALSE and sets error if an error occured.

cancellable :

optional GCancellable objectoptional GCancellable object

callback :

subscribers :

location at which to store a list of WockyPubsubSubscription -pointers, or NULL +pointers, or NULL

error :

location at which to store an error, or NULL +location at which to store an error, or NULL

Returns :

-TRUE if the list of subscribers was successfully retrieved; FALSE +TRUE if the list of subscribers was successfully retrieved; FALSE and sets error if an error occured.

cancellable :

optional GCancellable object, NULL to ignoreoptional GCancellable object, NULL to ignore

callback :

Returns :

-TRUE if the affiliates were successfully modified; FALSE and sets +TRUE if the affiliates were successfully modified; FALSE and sets error otherwise.

jid :

the JID to use as the subscribed JID (usually the connection's bare or -full JID); may not be NULL +full JID); may not be NULL

cancellable :

optional GCancellable object, NULL to ignoreoptional GCancellable object, NULL to ignore

callback :

jid :

the JID subscribed to self (usually the connection's bare or -full JID); may not be NULL +full JID); may not be NULL

cancellable :

optional GCancellable object, NULL to ignoreoptional GCancellable object, NULL to ignore

callback :

Synopsis

-
gboolean            (*WockyAuthAuthDataFunc)            (WockyAuthHandler *handler,
-                                                         const GString *data,
-                                                         GString **response,
-                                                         GError **error);
+
gboolean            (*WockyAuthAuthDataFunc)            (WockyAuthHandler *handler,
+                                                         const GString *data,
+                                                         GString **response,
+                                                         GError **error);
 struct              WockyAuthHandlerIface;
-gboolean            (*WockyAuthInitialResponseFunc)     (WockyAuthHandler *handler,
-                                                         GString **initial_data,
-                                                         GError **error);
-gboolean            (*WockyAuthSuccessFunc)             (WockyAuthHandler *handler,
-                                                         GError **error);
-gboolean            wocky_auth_handler_get_initial_response
+gboolean            (*WockyAuthInitialResponseFunc)     (WockyAuthHandler *handler,
+                                                         GString **initial_data,
+                                                         GError **error);
+gboolean            (*WockyAuthSuccessFunc)             (WockyAuthHandler *handler,
+                                                         GError **error);
+gboolean            wocky_auth_handler_get_initial_response
                                                         (WockyAuthHandler *handler,
-                                                         GString **initial_data,
-                                                         GError **error);
-const gchar *       wocky_auth_handler_get_mechanism    (WockyAuthHandler *handler);
-gboolean            wocky_auth_handler_handle_auth_data (WockyAuthHandler *handler,
-                                                         const GString *data,
-                                                         GString **response,
-                                                         GError **error);
-gboolean            wocky_auth_handler_handle_success   (WockyAuthHandler *handler,
-                                                         GError **error);
-gboolean            wocky_auth_handler_is_plain         (WockyAuthHandler *handler);
+                                                         GString **initial_data,
+                                                         GError **error);
+const gchar *       wocky_auth_handler_get_mechanism    (WockyAuthHandler *handler);
+gboolean            wocky_auth_handler_handle_auth_data (WockyAuthHandler *handler,
+                                                         const GString *data,
+                                                         GString **response,
+                                                         GError **error);
+gboolean            wocky_auth_handler_handle_success   (WockyAuthHandler *handler,
+                                                         GError **error);
+gboolean            wocky_auth_handler_is_plain         (WockyAuthHandler *handler);
 
@@ -68,10 +68,10 @@

Details

WockyAuthAuthDataFunc ()

-
gboolean            (*WockyAuthAuthDataFunc)            (WockyAuthHandler *handler,
-                                                         const GString *data,
-                                                         GString **response,
-                                                         GError **error);
+
gboolean            (*WockyAuthAuthDataFunc)            (WockyAuthHandler *handler,
+                                                         const GString *data,
+                                                         GString **response,
+                                                         GError **error);

@@ -89,16 +89,16 @@ -

GTypeInterface parent;

+

GTypeInterface parent;

The parent interface. -

gchar *mechanism;

+

gchar *mechanism;

The AUTH mechanism which this handler responds to challenges for. -

gboolean plain;

+

gboolean plain;

Whether the mechanism this handler handles sends secrets in plaintext. @@ -123,9 +123,9 @@

WockyAuthInitialResponseFunc ()

-
gboolean            (*WockyAuthInitialResponseFunc)     (WockyAuthHandler *handler,
-                                                         GString **initial_data,
-                                                         GError **error);
+
gboolean            (*WockyAuthInitialResponseFunc)     (WockyAuthHandler *handler,
+                                                         GString **initial_data,
+                                                         GError **error);

Called when authentication begins, if the mechanism allows a response to an implicit challenge during AUTH initiation (which, in @@ -133,9 +133,9 @@ to the server).

-The function should return TRUE on success, and optionally set the +The function should return TRUE on success, and optionally set the initial_data to a string if there is -initial data to send. On error, it should return FALSE and set +initial data to send. On error, it should return FALSE and set error.

@@ -147,18 +147,18 @@ - - @@ -167,8 +167,8 @@

WockyAuthSuccessFunc ()

-
gboolean            (*WockyAuthSuccessFunc)             (WockyAuthHandler *handler,
-                                                         GError **error);
+
gboolean            (*WockyAuthSuccessFunc)             (WockyAuthHandler *handler,
+                                                         GError **error);

Called when a <success/> stanza is received during authentication. If no error is returned, then authentication @@ -185,13 +185,13 @@

- @@ -200,17 +200,17 @@

wocky_auth_handler_get_initial_response ()

-
gboolean            wocky_auth_handler_get_initial_response
+
gboolean            wocky_auth_handler_get_initial_response
                                                         (WockyAuthHandler *handler,
-                                                         GString **initial_data,
-                                                         GError **error);
+ GString **initial_data, + GError **error);

Called when authentication begins to fetch the initial data to send to the server in the <auth/> stanza.

-If this function returns TRUE, initial_data will be non-NULL if handler -provides an initial response, and NULL otherwise. +If this function returns TRUE, initial_data will be non-NULL if handler +provides an initial response, and NULL otherwise.

initial_data :

a GString location to fill with the initial data. [out] +a GString location to fill with the initial data. [out]

error :

an optional location for a GError to fill, or NULL +an optional location for a GError to fill, or NULL

Returns :

-TRUE on success, otherwise FALSE +TRUE on success, otherwise FALSE

error :

an optional location for a GError to fill, or NULL +an optional location for a GError to fill, or NULL

Returns :

-TRUE on success, otherwise FALSE +TRUE on success, otherwise FALSE
@@ -227,13 +227,13 @@ - +TRUE on success; FALSE otherwise.

error :

an optional location for a GError to fill, or NULL +an optional location for a GError to fill, or NULL

Returns :

-TRUE on success; FALSE otherwise.
@@ -241,7 +241,7 @@

wocky_auth_handler_get_mechanism ()

-
const gchar *       wocky_auth_handler_get_mechanism    (WockyAuthHandler *handler);
+
const gchar *       wocky_auth_handler_get_mechanism    (WockyAuthHandler *handler);

Returns the name of the SASL mechanism handler implements.

@@ -262,10 +262,10 @@

wocky_auth_handler_handle_auth_data ()

-
gboolean            wocky_auth_handler_handle_auth_data (WockyAuthHandler *handler,
-                                                         const GString *data,
-                                                         GString **response,
-                                                         GError **error);
+
gboolean            wocky_auth_handler_handle_auth_data (WockyAuthHandler *handler,
+                                                         const GString *data,
+                                                         GString **response,
+                                                         GError **error);

Asks handler to respond to a <challenge/> stanza or a <success/> with data. On success, handler will put @@ -285,18 +285,18 @@

response :

a location to fill with a challenge -response in a GString. [out][transfer full] +response in a GString. [out][transfer full]

error :

-an optional location for a GError to fill, or NULL +an optional location for a GError to fill, or NULL

Returns :

-TRUE on success, otherwise FALSE +TRUE on success, otherwise FALSE @@ -305,8 +305,8 @@

wocky_auth_handler_handle_success ()

-
gboolean            wocky_auth_handler_handle_success   (WockyAuthHandler *handler,
-                                                         GError **error);
+
gboolean            wocky_auth_handler_handle_success   (WockyAuthHandler *handler,
+                                                         GError **error);

Called when a <success/> stanza is received during authentication. If no error is returned, then authentication @@ -323,13 +323,13 @@

error :

-an optional location for a GError to fill, or NULL +an optional location for a GError to fill, or NULL

Returns :

-TRUE on success, otherwise FALSE +TRUE on success, otherwise FALSE @@ -338,7 +338,7 @@

wocky_auth_handler_is_plain ()

-
gboolean            wocky_auth_handler_is_plain         (WockyAuthHandler *handler);
+
gboolean            wocky_auth_handler_is_plain         (WockyAuthHandler *handler);

Checks whether handler sends secrets in plaintext. This may be used to decide whether to use handler on an insecure XMPP connection. @@ -353,7 +353,7 @@

Returns :

-TRUE if handler sends secrets in plaintext. +TRUE if handler sends secrets in plaintext.
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-auth-registry-enumtypes.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-auth-registry-enumtypes.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-auth-registry-enumtypes.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-auth-registry-enumtypes.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky-auth-registry-enumtypes - + diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyC2SPorter.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyC2SPorter.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyC2SPorter.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyC2SPorter.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyC2SPorter - + @@ -41,42 +41,42 @@
struct              WockyC2SPorterClass;
 void                wocky_c2s_porter_enable_power_saving_mode
                                                         (WockyC2SPorter *porter,
-                                                         gboolean enable);
+                                                         gboolean enable);
 WockyPorter *       wocky_c2s_porter_new                (WockyXmppConnection *connection,
-                                                         const gchar *full_jid);
-guint               wocky_c2s_porter_register_handler_from_server
+                                                         const gchar *full_jid);
+guint               wocky_c2s_porter_register_handler_from_server
                                                         (WockyC2SPorter *self,
                                                          WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
-                                                         guint priority,
+                                                         guint priority,
                                                          WockyPorterHandlerFunc callback,
-                                                         gpointer user_data,
+                                                         gpointer user_data,
                                                          ...);
-guint               wocky_c2s_porter_register_handler_from_server_by_stanza
+guint               wocky_c2s_porter_register_handler_from_server_by_stanza
                                                         (WockyC2SPorter *self,
                                                          WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
-                                                         guint priority,
+                                                         guint priority,
                                                          WockyPorterHandlerFunc callback,
-                                                         gpointer user_data,
+                                                         gpointer user_data,
                                                          WockyStanza *stanza);
-guint               wocky_c2s_porter_register_handler_from_server_va
+guint               wocky_c2s_porter_register_handler_from_server_va
                                                         (WockyC2SPorter *self,
                                                          WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
-                                                         guint priority,
+                                                         guint priority,
                                                          WockyPorterHandlerFunc callback,
-                                                         gpointer user_data,
+                                                         gpointer user_data,
                                                          va_list ap);
 void                wocky_c2s_porter_send_whitespace_ping_async
                                                         (WockyC2SPorter *self,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            wocky_c2s_porter_send_whitespace_ping_finish
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            wocky_c2s_porter_send_whitespace_ping_finish
                                                         (WockyC2SPorter *self,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+                                                         GAsyncResult *result,
+                                                         GError **error);
 
@@ -102,7 +102,7 @@

wocky_c2s_porter_enable_power_saving_mode ()

void                wocky_c2s_porter_enable_power_saving_mode
                                                         (WockyC2SPorter *porter,
-                                                         gboolean enable);
+ gboolean enable);

Enable or disable power saving. In power saving mode, Wocky will attempt to queue "uninteresting" stanza until it is either manually @@ -150,7 +150,7 @@

wocky_c2s_porter_new ()

WockyPorter *       wocky_c2s_porter_new                (WockyXmppConnection *connection,
-                                                         const gchar *full_jid);
+ const gchar *full_jid);

Convenience function to create a new WockyC2SPorter.

@@ -178,13 +178,13 @@

wocky_c2s_porter_register_handler_from_server ()

-
guint               wocky_c2s_porter_register_handler_from_server
+
guint               wocky_c2s_porter_register_handler_from_server
                                                         (WockyC2SPorter *self,
                                                          WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
-                                                         guint priority,
+                                                         guint priority,
                                                          WockyPorterHandlerFunc callback,
-                                                         gpointer user_data,
+                                                         gpointer user_data,
                                                          ...);

Registers a handler for incoming stanzas from the local user's server; that @@ -245,8 +245,8 @@

callback :

-A WockyPorterHandlerFunc, which should return FALSE to decline -the stanza (Wocky will continue to the next handler, if any), or TRUE to +A WockyPorterHandlerFunc, which should return FALSE to decline +the stanza (Wocky will continue to the next handler, if any), or TRUE to stop further processing. @@ -269,13 +269,13 @@

wocky_c2s_porter_register_handler_from_server_by_stanza ()

-
guint               wocky_c2s_porter_register_handler_from_server_by_stanza
+
guint               wocky_c2s_porter_register_handler_from_server_by_stanza
                                                         (WockyC2SPorter *self,
                                                          WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
-                                                         guint priority,
+                                                         guint priority,
                                                          WockyPorterHandlerFunc callback,
-                                                         gpointer user_data,
+                                                         gpointer user_data,
                                                          WockyStanza *stanza);

A WockyStanza version of @@ -308,8 +308,8 @@

callback :

-A WockyPorterHandlerFunc, which should return FALSE to decline -the stanza (Wocky will continue to the next handler, if any), or TRUE to +A WockyPorterHandlerFunc, which should return FALSE to decline +the stanza (Wocky will continue to the next handler, if any), or TRUE to stop further processing. @@ -332,13 +332,13 @@

wocky_c2s_porter_register_handler_from_server_va ()

-
guint               wocky_c2s_porter_register_handler_from_server_va
+
guint               wocky_c2s_porter_register_handler_from_server_va
                                                         (WockyC2SPorter *self,
                                                          WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
-                                                         guint priority,
+                                                         guint priority,
                                                          WockyPorterHandlerFunc callback,
-                                                         gpointer user_data,
+                                                         gpointer user_data,
                                                          va_list ap);

A va_list version of @@ -371,8 +371,8 @@

callback :

-A WockyPorterHandlerFunc, which should return FALSE to decline -the stanza (Wocky will continue to the next handler, if any), or TRUE to +A WockyPorterHandlerFunc, which should return FALSE to decline +the stanza (Wocky will continue to the next handler, if any), or TRUE to stop further processing. @@ -397,9 +397,9 @@

wocky_c2s_porter_send_whitespace_ping_async ()

void                wocky_c2s_porter_send_whitespace_ping_async
                                                         (WockyC2SPorter *self,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Request asynchronous sending of a whitespace ping. When the operation is finished callback will be called. You can then call @@ -434,10 +434,10 @@


wocky_c2s_porter_send_whitespace_ping_finish ()

-
gboolean            wocky_c2s_porter_send_whitespace_ping_finish
+
gboolean            wocky_c2s_porter_send_whitespace_ping_finish
                                                         (WockyC2SPorter *self,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+ GAsyncResult *result, + GError **error);

Finishes sending a whitespace ping.

diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyCapsHash.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyCapsHash.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyCapsHash.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyCapsHash.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyCapsHash - + @@ -37,10 +37,10 @@

Synopsis

-
gchar *             wocky_caps_hash_compute_from_lists  (GPtrArray *features,
-                                                         GPtrArray *identities,
-                                                         GPtrArray *dataforms);
-gchar *             wocky_caps_hash_compute_from_node   (WockyNode *node);
+
gchar *             wocky_caps_hash_compute_from_lists  (GPtrArray *features,
+                                                         GPtrArray *identities,
+                                                         GPtrArray *dataforms);
+gchar *             wocky_caps_hash_compute_from_node   (WockyNode *node);
 
@@ -53,9 +53,9 @@

Details

wocky_caps_hash_compute_from_lists ()

-
gchar *             wocky_caps_hash_compute_from_lists  (GPtrArray *features,
-                                                         GPtrArray *identities,
-                                                         GPtrArray *dataforms);
+
gchar *             wocky_caps_hash_compute_from_lists  (GPtrArray *features,
+                                                         GPtrArray *identities,
+                                                         GPtrArray *dataforms);

Compute the hash as defined by the XEP-0115 from a list of features, identities and dataforms. @@ -65,21 +65,21 @@

features :

-a GPtrArray of strings of features +a GPtrArray of strings of features

identities :

-a GPtrArray of WockyDiscoIdentity structures +a GPtrArray of WockyDiscoIdentity structures

dataforms :

-a GPtrArray of WockyDataForm objects, or NULL +a GPtrArray of WockyDataForm objects, or NULL

Returns :

a newly allocated string of the caps hash which should be -freed using g_free() +freed using g_free() @@ -88,7 +88,7 @@

wocky_caps_hash_compute_from_node ()

-
gchar *             wocky_caps_hash_compute_from_node   (WockyNode *node);
+
gchar *             wocky_caps_hash_compute_from_node   (WockyNode *node);

Compute the hash as defined by the XEP-0115 from a received WockyNode. @@ -108,7 +108,7 @@

Returns :

the hash. The called must free the returned hash with -g_free(). +g_free().
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-connector-enumtypes.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-connector-enumtypes.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-connector-enumtypes.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-connector-enumtypes.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky-connector-enumtypes - + diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyConnector.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyConnector.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyConnector.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyConnector.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyConnector - + @@ -46,38 +46,38 @@ struct WockyConnectorClass; enum WockyConnectorError; void wocky_connector_connect_async (WockyConnector *self, - GCancellable *cancellable, - GAsyncReadyCallback cb, - gpointer user_data); + GCancellable *cancellable, + GAsyncReadyCallback cb, + gpointer user_data); WockyXmppConnection * wocky_connector_connect_finish (WockyConnector *self, - GAsyncResult *res, - gchar **jid, - gchar **sid, - GError **error); -GQuark wocky_connector_error_quark (void); -WockyConnector * wocky_connector_new (const gchar *jid, - const gchar *pass, - const gchar *resource, + GAsyncResult *res, + gchar **jid, + gchar **sid, + GError **error); +GQuark wocky_connector_error_quark (void); +WockyConnector * wocky_connector_new (const gchar *jid, + const gchar *pass, + const gchar *resource, WockyAuthRegistry *auth_registry, WockyTLSHandler *tls_handler); void wocky_connector_register_async (WockyConnector *self, - GCancellable *cancellable, - GAsyncReadyCallback cb, - gpointer user_data); + GCancellable *cancellable, + GAsyncReadyCallback cb, + gpointer user_data); WockyXmppConnection * wocky_connector_register_finish (WockyConnector *self, - GAsyncResult *res, - gchar **jid, - gchar **sid, - GError **error); + GAsyncResult *res, + gchar **jid, + gchar **sid, + GError **error); void wocky_connector_set_auth_registry (WockyConnector *self, WockyAuthRegistry *registry); void wocky_connector_unregister_async (WockyConnector *self, - GCancellable *cancellable, - GAsyncReadyCallback cb, - gpointer user_data); -gboolean wocky_connector_unregister_finish (WockyConnector *self, - GAsyncResult *res, - GError **error); + GCancellable *cancellable, + GAsyncReadyCallback cb, + gpointer user_data); +gboolean wocky_connector_unregister_finish (WockyConnector *self, + GAsyncResult *res, + GError **error);
@@ -93,14 +93,14 @@ See: RFC3920 XEP-0077

-Sends and receives WockyStanzas from an underlying GIOStream. +Sends and receives WockyStanzas from an underlying GIOStream. negotiating TLS if possible and completing authentication with the server by the "most suitable" method available. Returns a WockyXmppConnection object to the user on successful completion.

Can also be used to register or unregister an account: When unregistering -(cancelling) an account, a WockyXmppConnection is NOT returned - a gboolean +(cancelling) an account, a WockyXmppConnection is NOT returned - a gboolean value indicating success or failure is returned instead.

@@ -407,9 +407,9 @@

wocky_connector_connect_async ()

void                wocky_connector_connect_async       (WockyConnector *self,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback cb,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback cb, + gpointer user_data);

Connect to the account/server specified by the self. cb should invoke wocky_connector_connect_finish(). @@ -423,16 +423,16 @@

cancellable :

-an GCancellable, or NULL +an GCancellable, or NULL

cb :

-a GAsyncReadyCallback to call when the operation completes. +a GAsyncReadyCallback to call when the operation completes.

user_data :

-a gpointer to pass to the callback. +a gpointer to pass to the callback.
@@ -441,10 +441,10 @@

wocky_connector_connect_finish ()

WockyXmppConnection * wocky_connector_connect_finish    (WockyConnector *self,
-                                                         GAsyncResult *res,
-                                                         gchar **jid,
-                                                         gchar **sid,
-                                                         GError **error);
+ GAsyncResult *res, + gchar **jid, + gchar **sid, + GError **error);

Called by the callback passed to wocky_connector_connect_async().

@@ -457,23 +457,23 @@

res :

-a GAsyncResult (from your wocky_connector_connect_async() callback). +a GAsyncResult (from your wocky_connector_connect_async() callback).

jid :

-(NULL to ignore) the user JID from the server is stored here. +(NULL to ignore) the user JID from the server is stored here.

sid :

-(NULL to ignore) the Session ID is stored here. +(NULL to ignore) the Session ID is stored here.

error :

-(NULL to ignore) the GError (if any) is sored here. +(NULL to ignore) the GError (if any) is sored here.

Returns :

-a WockyXmppConnection instance (success), or NULL (failure). +a WockyXmppConnection instance (success), or NULL (failure).
@@ -481,19 +481,19 @@

wocky_connector_error_quark ()

-
GQuark              wocky_connector_error_quark         (void);
+
GQuark              wocky_connector_error_quark         (void);

wocky_connector_new ()

-
WockyConnector *    wocky_connector_new                 (const gchar *jid,
-                                                         const gchar *pass,
-                                                         const gchar *resource,
+
WockyConnector *    wocky_connector_new                 (const gchar *jid,
+                                                         const gchar *pass,
+                                                         const gchar *resource,
                                                          WockyAuthRegistry *auth_registry,
                                                          WockyTLSHandler *tls_handler);

Connect to the account/server specified by self. -To set other WockyConnector properties, use g_object_new() instead. +To set other WockyConnector properties, use g_object_new() instead.

@@ -512,12 +512,12 @@ - - @@ -532,9 +532,9 @@

wocky_connector_register_async ()

void                wocky_connector_register_async      (WockyConnector *self,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback cb,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback cb, + gpointer user_data);

Connect to the account/server specified by self, register (set up) the account there and then log in to it. @@ -549,16 +549,16 @@

- - + - +

auth_registry :

a WockyAuthRegistry, or NULL +a WockyAuthRegistry, or NULL

tls_handler :

a WockyTLSHandler, or NULL +a WockyTLSHandler, or NULL

cancellable :

an GCancellable, or NULL +an GCancellable, or NULL

cb :

a GAsyncReadyCallback to call when the operation completes.a GAsyncReadyCallback to call when the operation completes.

user_data :

a gpointer to pass to the callback cb.a gpointer to pass to the callback cb.
@@ -567,10 +567,10 @@

wocky_connector_register_finish ()

WockyXmppConnection * wocky_connector_register_finish   (WockyConnector *self,
-                                                         GAsyncResult *res,
-                                                         gchar **jid,
-                                                         gchar **sid,
-                                                         GError **error);
+ GAsyncResult *res, + gchar **jid, + gchar **sid, + GError **error);

Called by the callback passed to wocky_connector_register_async().

@@ -583,23 +583,23 @@

res :

-a GAsyncResult (from your wocky_connector_register_async() callback). +a GAsyncResult (from your wocky_connector_register_async() callback).

jid :

-(NULL to ignore) the JID in effect after connection is stored here. +(NULL to ignore) the JID in effect after connection is stored here.

sid :

-(NULL to ignore) the Session ID after connection is stored here. +(NULL to ignore) the Session ID after connection is stored here.

error :

-(NULL to ignore) the GError (if any) is stored here. +(NULL to ignore) the GError (if any) is stored here.

Returns :

-a WockyXmppConnection instance (success), or NULL (failure). +a WockyXmppConnection instance (success), or NULL (failure).
@@ -614,9 +614,9 @@

wocky_connector_unregister_async ()

void                wocky_connector_unregister_async    (WockyConnector *self,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback cb,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback cb, + gpointer user_data);

Connect to the account/server specified by self, and unregister (cancel) the account there. @@ -631,16 +631,16 @@

cancellable :

-an GCancellable, or NULL +an GCancellable, or NULL

cb :

-a GAsyncReadyCallback to call when the operation completes. +a GAsyncReadyCallback to call when the operation completes.

user_data :

-a gpointer to pass to the callback cb. +a gpointer to pass to the callback cb.
@@ -648,9 +648,9 @@

wocky_connector_unregister_finish ()

-
gboolean            wocky_connector_unregister_finish   (WockyConnector *self,
-                                                         GAsyncResult *res,
-                                                         GError **error);
+
gboolean            wocky_connector_unregister_finish   (WockyConnector *self,
+                                                         GAsyncResult *res,
+                                                         GError **error);

Called by the callback passed to wocky_connector_unregister_async().

@@ -663,15 +663,15 @@

res :

-a GAsyncResult (from the wocky_connector_unregister_async() callback). +a GAsyncResult (from the wocky_connector_unregister_async() callback).

error :

-(NULL to ignore) the GError (if any) is stored here. +(NULL to ignore) the GError (if any) is stored here.

Returns :

-a gboolean value TRUE (success), or FALSE (failure). +a gboolean value TRUE (success), or FALSE (failure).
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyContactFactory.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyContactFactory.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyContactFactory.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyContactFactory.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyContactFactory - + @@ -46,24 +46,24 @@ WockyLLContact *contact); WockyBareContact * wocky_contact_factory_ensure_bare_contact (WockyContactFactory *factory, - const gchar *bare_jid); + const gchar *bare_jid); WockyLLContact * wocky_contact_factory_ensure_ll_contact (WockyContactFactory *factory, - const gchar *jid); + const gchar *jid); WockyResourceContact * wocky_contact_factory_ensure_resource_contact (WockyContactFactory *factory, - const gchar *full_jid); -GList * wocky_contact_factory_get_ll_contacts + const gchar *full_jid); +GList * wocky_contact_factory_get_ll_contacts (WockyContactFactory *factory); WockyBareContact * wocky_contact_factory_lookup_bare_contact (WockyContactFactory *factory, - const gchar *bare_jid); + const gchar *bare_jid); WockyLLContact * wocky_contact_factory_lookup_ll_contact (WockyContactFactory *factory, - const gchar *jid); + const gchar *jid); WockyResourceContact * wocky_contact_factory_lookup_resource_contact (WockyContactFactory *factory, - const gchar *full_jid); + const gchar *full_jid); WockyContactFactory * wocky_contact_factory_new (void);
@@ -115,7 +115,7 @@

wocky_contact_factory_ensure_bare_contact ()

WockyBareContact *  wocky_contact_factory_ensure_bare_contact
                                                         (WockyContactFactory *factory,
-                                                         const gchar *bare_jid);
+ const gchar *bare_jid);

Returns an instance of WockyBareContact for bare_jid. The factory cache is used, but if the contact is not found in the cache, a new @@ -135,7 +135,7 @@

Returns :

a new reference to a WockyBareContact instance, which the caller -is expected to release with g_object_unref() after use. +is expected to release with g_object_unref() after use.
@@ -145,7 +145,7 @@

wocky_contact_factory_ensure_ll_contact ()

WockyLLContact *    wocky_contact_factory_ensure_ll_contact
                                                         (WockyContactFactory *factory,
-                                                         const gchar *jid);
+ const gchar *jid);

Returns an instance of WockyLLContact for jid. The factory cache is used, but if the contact is not found in the cache, @@ -165,7 +165,7 @@

Returns :

a new reference to a WockyLLContact instance, which the -caller is expected to release with g_object_unref() after use. +caller is expected to release with g_object_unref() after use.
@@ -175,7 +175,7 @@

wocky_contact_factory_ensure_resource_contact ()

WockyResourceContact * wocky_contact_factory_ensure_resource_contact
                                                         (WockyContactFactory *factory,
-                                                         const gchar *full_jid);
+ const gchar *full_jid);

Returns an instance of WockyResourceContact for full_jid. The factory cache is used, but if the resource is not found in the cache, @@ -195,7 +195,7 @@

Returns :

a new reference to a WockyResourceContact instance, which the -caller is expected to release with g_object_unref() after use. +caller is expected to release with g_object_unref() after use.
@@ -203,7 +203,7 @@

wocky_contact_factory_get_ll_contacts ()

-
GList *             wocky_contact_factory_get_ll_contacts
+
GList *             wocky_contact_factory_get_ll_contacts
                                                         (WockyContactFactory *factory);

@@ -217,8 +217,8 @@

Returns :

-a newly allocated GList of WockyLLContacts which -should be freed using g_list_free(). +a newly allocated GList of WockyLLContacts which +should be freed using g_list_free().
@@ -228,7 +228,7 @@

wocky_contact_factory_lookup_bare_contact ()

WockyBareContact *  wocky_contact_factory_lookup_bare_contact
                                                         (WockyContactFactory *factory,
-                                                         const gchar *bare_jid);
+ const gchar *bare_jid);

Looks up if there's a WockyBareContact for bare_jid in the cache, and returns it if it's found. @@ -247,7 +247,7 @@

Returns :

a borrowed WockyBareContact instance (which the caller should -reference with g_object_ref() if it will be kept), or NULL if the +reference with g_object_ref() if it will be kept), or NULL if the contact is not found. @@ -258,7 +258,7 @@

wocky_contact_factory_lookup_ll_contact ()

WockyLLContact *    wocky_contact_factory_lookup_ll_contact
                                                         (WockyContactFactory *factory,
-                                                         const gchar *jid);
+ const gchar *jid);

Looks up if there's a WockyLLContact for jid in the cache, and returns it if it's found. @@ -277,7 +277,7 @@

Returns :

a borrowed WockyLLContact instance (which the caller should -reference with g_object_ref() if it will be kept), or NULL if the +reference with g_object_ref() if it will be kept), or NULL if the contact is not found. @@ -288,7 +288,7 @@

wocky_contact_factory_lookup_resource_contact ()

WockyResourceContact * wocky_contact_factory_lookup_resource_contact
                                                         (WockyContactFactory *factory,
-                                                         const gchar *full_jid);
+ const gchar *full_jid);

Looks up if there's a WockyResourceContact for full_jid in the cache, and returns it if it's found. @@ -307,7 +307,7 @@

Returns :

a borrowed WockyResourceContact instance (which the caller should -reference with g_object_ref() if it will be kept), or NULL if the +reference with g_object_ref() if it will be kept), or NULL if the contact is not found. diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-data-form-enumtypes.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-data-form-enumtypes.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-data-form-enumtypes.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-data-form-enumtypes.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky-data-form-enumtypes - + diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyDataForm.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyDataForm.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyDataForm.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyDataForm.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyDataForm - + @@ -50,32 +50,32 @@ enum WockyDataFormFieldType; void wocky_data_form_add_to_node (WockyDataForm *self, WockyNode *node); -GQuark wocky_data_form_error_quark (void); -gint wocky_data_form_field_cmp (const WockyDataFormField *left, +GQuark wocky_data_form_error_quark (void); +gint wocky_data_form_field_cmp (const WockyDataFormField *left, const WockyDataFormField *right); -const gchar * wocky_data_form_get_instructions (WockyDataForm *self); -const gchar * wocky_data_form_get_title (WockyDataForm *self); +const gchar * wocky_data_form_get_instructions (WockyDataForm *self); +const gchar * wocky_data_form_get_title (WockyDataForm *self); WockyDataForm * wocky_data_form_new_from_form (WockyNode *node, - GError **error); + GError **error); WockyDataForm * wocky_data_form_new_from_node (WockyNode *x, - GError **error); -gboolean wocky_data_form_parse_result (WockyDataForm *self, + GError **error); +gboolean wocky_data_form_parse_result (WockyDataForm *self, WockyNode *node, - GError **error); -gboolean wocky_data_form_set_boolean (WockyDataForm *self, - const gchar *field_name, - gboolean field_value, - gboolean create_if_missing); -gboolean wocky_data_form_set_string (WockyDataForm *self, - const gchar *field_name, - const gchar *field_value, - gboolean create_if_missing); -gboolean wocky_data_form_set_strv (WockyDataForm *self, - const gchar *field_name, - const gchar * const *field_values, - gboolean create_if_missing); -gboolean wocky_data_form_set_type (WockyDataForm *self, - const gchar *form_type); + GError **error); +gboolean wocky_data_form_set_boolean (WockyDataForm *self, + const gchar *field_name, + gboolean field_value, + gboolean create_if_missing); +gboolean wocky_data_form_set_string (WockyDataForm *self, + const gchar *field_name, + const gchar *field_value, + gboolean create_if_missing); +gboolean wocky_data_form_set_strv (WockyDataForm *self, + const gchar *field_name, + const gchar * const *field_values, + gboolean create_if_missing); +gboolean wocky_data_form_set_type (WockyDataForm *self, + const gchar *form_type); void wocky_data_form_submit (WockyDataForm *self, WockyNode *node); @@ -172,38 +172,38 @@ the type of the field -

gchar *var;

+

gchar *var;

the field name -

gchar *label;

+

gchar *label;

the label of the field -

gchar *desc;

+

gchar *desc;

the description of the field -

gboolean required;

+

gboolean required;

-TRUE if the field is required, otherwise FALSE +TRUE if the field is required, otherwise FALSE -

GValue *default_value;

+

GValue *default_value;

the default of the field -

gchar **raw_value_contents;

+

gchar **raw_value_contents;

-

GValue *value;

+

GValue *value;

the field value -

GSList *options;

-a GSList of WockyDataFormFieldOptions if type +

GSList *options;

+a GSList of WockyDataFormFieldOptions if type if WOCKY_DATA_FORM_FIELD_TYPE_LIST_MULTI or WOCKY_DATA_FORM_FIELD_TYPE_LIST_SINGLE @@ -226,11 +226,11 @@ -

gchar *label;

+

gchar *label;

the option label -

gchar *value;

+

gchar *value;

the option value @@ -352,50 +352,50 @@

wocky_data_form_error_quark ()

-
GQuark              wocky_data_form_error_quark         (void);
+
GQuark              wocky_data_form_error_quark         (void);

wocky_data_form_field_cmp ()

-
gint                wocky_data_form_field_cmp           (const WockyDataFormField *left,
+
gint                wocky_data_form_field_cmp           (const WockyDataFormField *left,
                                                          const WockyDataFormField *right);

wocky_data_form_get_instructions ()

-
const gchar *       wocky_data_form_get_instructions    (WockyDataForm *self);
+
const gchar *       wocky_data_form_get_instructions    (WockyDataForm *self);

wocky_data_form_get_title ()

-
const gchar *       wocky_data_form_get_title           (WockyDataForm *self);
+
const gchar *       wocky_data_form_get_title           (WockyDataForm *self);

wocky_data_form_new_from_form ()

WockyDataForm *     wocky_data_form_new_from_form       (WockyNode *node,
-                                                         GError **error);
+ GError **error);

wocky_data_form_new_from_node ()

WockyDataForm *     wocky_data_form_new_from_node       (WockyNode *x,
-                                                         GError **error);
+ GError **error);

wocky_data_form_parse_result ()

-
gboolean            wocky_data_form_parse_result        (WockyDataForm *self,
+
gboolean            wocky_data_form_parse_result        (WockyDataForm *self,
                                                          WockyNode *node,
-                                                         GError **error);
+ GError **error);

wocky_data_form_set_boolean ()

-
gboolean            wocky_data_form_set_boolean         (WockyDataForm *self,
-                                                         const gchar *field_name,
-                                                         gboolean field_value,
-                                                         gboolean create_if_missing);
+
gboolean            wocky_data_form_set_boolean         (WockyDataForm *self,
+                                                         const gchar *field_name,
+                                                         gboolean field_value,
+                                                         gboolean create_if_missing);
@@ -420,7 +420,7 @@ @@ -429,10 +429,10 @@

wocky_data_form_set_string ()

-
gboolean            wocky_data_form_set_string          (WockyDataForm *self,
-                                                         const gchar *field_name,
-                                                         const gchar *field_value,
-                                                         gboolean create_if_missing);
+
gboolean            wocky_data_form_set_string          (WockyDataForm *self,
+                                                         const gchar *field_name,
+                                                         const gchar *field_value,
+                                                         gboolean create_if_missing);

Returns :

-TRUE if the field was successfully filled in; FALSE if the field +TRUE if the field was successfully filled in; FALSE if the field did not exist or does not accept a boolean
@@ -457,7 +457,7 @@ @@ -466,16 +466,16 @@

wocky_data_form_set_strv ()

-
gboolean            wocky_data_form_set_strv            (WockyDataForm *self,
-                                                         const gchar *field_name,
-                                                         const gchar * const *field_values,
-                                                         gboolean create_if_missing);
+
gboolean            wocky_data_form_set_strv            (WockyDataForm *self,
+                                                         const gchar *field_name,
+                                                         const gchar * const *field_values,
+                                                         gboolean create_if_missing);

wocky_data_form_set_type ()

-
gboolean            wocky_data_form_set_type            (WockyDataForm *self,
-                                                         const gchar *form_type);
+
gboolean            wocky_data_form_set_type            (WockyDataForm *self,
+                                                         const gchar *form_type);

Creates a hidden FORM_TYPE field in self and sets its value to form_type. This is intended only to be used on empty forms created for blind @@ -491,13 +491,13 @@

- diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-debug.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-debug.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-debug.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-debug.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky-debug - + diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-Wocky-GnuTLS-TLS.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-Wocky-GnuTLS-TLS.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-Wocky-GnuTLS-TLS.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-Wocky-GnuTLS-TLS.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ Wocky GnuTLS TLS - + @@ -48,34 +48,34 @@ WockyTLSConnection; WockyTLSSession; enum WockyTLSVerificationLevel; -GQuarkwocky_tls_cert_error_quark (void); -GQuarkwocky_tls_error_quark (void); +GQuarkwocky_tls_cert_error_quark (void); +GQuarkwocky_tls_error_quark (void); voidwocky_tls_session_add_ca (WockyTLSSession *session, - const gchar *path); + const gchar *path); voidwocky_tls_session_add_crl (WockyTLSSession *session, - const gchar *path); -GPtrArray * wocky_tls_session_get_peers_certificate + const gchar *path); +GPtrArray * wocky_tls_session_get_peers_certificate (WockyTLSSession *session, WockyTLSCertType *type); WockyTLSConnection * wocky_tls_session_handshake (WockyTLSSession *session, - GCancellable *cancellable, - GError **error); + GCancellable *cancellable, + GError **error); voidwocky_tls_session_handshake_async (WockyTLSSession *session, - gint io_priority, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); + gint io_priority, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); WockyTLSConnection * wocky_tls_session_handshake_finish (WockyTLSSession *session, - GAsyncResult *result, - GError **error); -WockyTLSSession * wocky_tls_session_new (GIOStream *stream); -WockyTLSSession * wocky_tls_session_server_new (GIOStream *stream, - guint dhbits, - const gchar *key, - const gchar *cert); + GAsyncResult *result, + GError **error); +WockyTLSSession * wocky_tls_session_new (GIOStream *stream); +WockyTLSSession * wocky_tls_session_server_new (GIOStream *stream, + guint dhbits, + const gchar *key, + const gchar *cert); intwocky_tls_session_verify_peer (WockyTLSSession *session, - const gchar *peername, - GStrv extra_identities, + const gchar *peername, + GStrv extra_identities, WockyTLSVerificationLevel level, WockyTLSCertStatus *status); @@ -91,12 +91,12 @@ +----WockyTLSCertType
-  GObject
-   +----GIOStream
+  GObject
+   +----GIOStream
          +----WockyTLSConnection
 
-  GObject
+  GObject
    +----WockyTLSSession
 
@@ -108,11 +108,11 @@
 

Properties

   "session"                  WockyTLSSession*      : Write / Construct Only
-  "base-stream"              GIOStream*            : Write / Construct Only
-  "dh-bits"                  guint                 : Write / Construct Only
-  "server"                   gboolean              : Write / Construct Only
-  "x509-cert"                gchar*                : Write / Construct Only
-  "x509-key"                 gchar*                : Write / Construct Only
+  "base-stream"              GIOStream*            : Write / Construct Only
+  "dh-bits"                  guint                 : Write / Construct Only
+  "server"                   gboolean              : Write / Construct Only
+  "x509-cert"                gchar*                : Write / Construct Only
+  "x509-key"                 gchar*                : Write / Construct Only
 
@@ -200,29 +200,29 @@

wocky_tls_cert_error_quark ()

-
GQuark              wocky_tls_cert_error_quark          (void);
+
GQuark              wocky_tls_cert_error_quark          (void);

wocky_tls_error_quark ()

-
GQuark              wocky_tls_error_quark               (void);
+
GQuark              wocky_tls_error_quark               (void);

wocky_tls_session_add_ca ()

void                wocky_tls_session_add_ca            (WockyTLSSession *session,
-                                                         const gchar *path);
+ const gchar *path);

wocky_tls_session_add_crl ()

void                wocky_tls_session_add_crl           (WockyTLSSession *session,
-                                                         const gchar *path);
+ const gchar *path);

wocky_tls_session_get_peers_certificate ()

-
GPtrArray *         wocky_tls_session_get_peers_certificate
+
GPtrArray *         wocky_tls_session_get_peers_certificate
                                                         (WockyTLSSession *session,
                                                          WockyTLSCertType *type);
@@ -230,37 +230,37 @@

wocky_tls_session_handshake ()

WockyTLSConnection * wocky_tls_session_handshake        (WockyTLSSession *session,
-                                                         GCancellable *cancellable,
-                                                         GError **error);
+ GCancellable *cancellable, + GError **error);

wocky_tls_session_handshake_async ()

void                wocky_tls_session_handshake_async   (WockyTLSSession *session,
-                                                         gint io_priority,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ gint io_priority, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

wocky_tls_session_handshake_finish ()

WockyTLSConnection * wocky_tls_session_handshake_finish (WockyTLSSession *session,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+ GAsyncResult *result, + GError **error);

wocky_tls_session_new ()

-
WockyTLSSession *   wocky_tls_session_new               (GIOStream *stream);
+
WockyTLSSession *   wocky_tls_session_new               (GIOStream *stream);

wocky_tls_session_server_new ()

-
WockyTLSSession *   wocky_tls_session_server_new        (GIOStream *stream,
-                                                         guint dhbits,
-                                                         const gchar *key,
-                                                         const gchar *cert);
+
WockyTLSSession *   wocky_tls_session_server_new        (GIOStream *stream,
+                                                         guint dhbits,
+                                                         const gchar *key,
+                                                         const gchar *cert);

Create a new TLS server session

@@ -294,8 +294,8 @@

wocky_tls_session_verify_peer ()

int                 wocky_tls_session_verify_peer       (WockyTLSSession *session,
-                                                         const gchar *peername,
-                                                         GStrv extra_identities,
+                                                         const gchar *peername,
+                                                         GStrv extra_identities,
                                                          WockyTLSVerificationLevel level,
                                                          WockyTLSCertStatus *status);
@@ -310,13 +310,13 @@

The "base-stream" property

-
  "base-stream"              GIOStream*            : Write / Construct Only
+
  "base-stream"              GIOStream*            : Write / Construct Only

the stream that TLS communicates over.


The "dh-bits" property

-
  "dh-bits"                  guint                 : Write / Construct Only
+
  "dh-bits"                  guint                 : Write / Construct Only

Diffie-Hellmann bits: 768, 1024, 2048, 3072 0r 4096.

Allowed values: [768,4096]

Default value: 1024

@@ -324,21 +324,21 @@

The "server" property

-
  "server"                   gboolean              : Write / Construct Only
+
  "server"                   gboolean              : Write / Construct Only

whether this is a server.

Default value: FALSE


The "x509-cert" property

-
  "x509-cert"                gchar*                : Write / Construct Only
+
  "x509-cert"                gchar*                : Write / Construct Only

x509 PEM certificate file.

Default value: NULL


The "x509-key" property

-
  "x509-key"                 gchar*                : Write / Construct Only
+
  "x509-key"                 gchar*                : Write / Construct Only

x509 PEM key file.

Default value: NULL

diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-heartbeat-source.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-heartbeat-source.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-heartbeat-source.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-heartbeat-source.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky-heartbeat-source - + @@ -37,11 +37,11 @@

Returns :

-TRUE if the field was successfully filled in; FALSE if the field +TRUE if the field was successfully filled in; FALSE if the field did not exist or does not accept a string

form_type :

the URI to use as the FORM_TYPE field; may not be NULL +the URI to use as the FORM_TYPE field; may not be NULL

Returns :

-TRUE if the form's type was set; FALSE if the form already had a +TRUE if the form's type was set; FALSE if the form already had a type.

Synopsis

-
void                (*WockyHeartbeatCallback)           (gpointer user_data);
-GSource *           wocky_heartbeat_source_new          (guint max_interval);
+
void                (*WockyHeartbeatCallback)           (gpointer user_data);
+GSource *           wocky_heartbeat_source_new          (guint max_interval);
 void                wocky_heartbeat_source_update_interval
-                                                        (GSource *source,
-                                                         guint max_interval);
+                                                        (GSource *source,
+                                                         guint max_interval);
 
@@ -51,21 +51,21 @@

Details

WockyHeartbeatCallback ()

-
void                (*WockyHeartbeatCallback)           (gpointer user_data);
+
void                (*WockyHeartbeatCallback)           (gpointer user_data);

wocky_heartbeat_source_new ()

-
GSource *           wocky_heartbeat_source_new          (guint max_interval);
+
GSource *           wocky_heartbeat_source_new          (guint max_interval);

Creates a source which calls its callback at least every max_interval -seconds. This is similar to g_timeout_source_new_seconds(), except that the +seconds. This is similar to g_timeout_source_new_seconds(), except that the callback may be called slightly earlier than requested, in sync with other periodic network activity (from other XMPP connections, or other applications entirely).

-When calling g_source_set_callback() on this source, the supplied callback's +When calling g_source_set_callback() on this source, the supplied callback's signature should match WockyHeartbeatCallback.

@@ -87,8 +87,8 @@

wocky_heartbeat_source_update_interval ()

void                wocky_heartbeat_source_update_interval
-                                                        (GSource *source,
-                                                         guint max_interval);
+ (GSource *source, + guint max_interval);

Updates the interval between calls to source's callback. The new interval may not take effect until after the next call to the callback. diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky - + diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-http-proxy.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-http-proxy.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-http-proxy.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-http-proxy.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky-http-proxy - + @@ -48,7 +48,7 @@

Object Hierarchy

-  GObject
+  GObject
    +----WockyHttpProxy
 
@@ -56,7 +56,7 @@

Implemented Interfaces

WockyHttpProxy implements - GProxy.

+ GProxy.

Description

diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-digest.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-digest.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-digest.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-digest.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky-jabber-auth-digest - + @@ -37,8 +37,8 @@

Synopsis

-
WockyJabberAuthDigest * wocky_jabber_auth_digest_new    (const gchar *server,
-                                                         const gchar *password);
+
WockyJabberAuthDigest * wocky_jabber_auth_digest_new    (const gchar *server,
+                                                         const gchar *password);
 
@@ -48,8 +48,8 @@

Details

wocky_jabber_auth_digest_new ()

-
WockyJabberAuthDigest * wocky_jabber_auth_digest_new    (const gchar *server,
-                                                         const gchar *password);
+
WockyJabberAuthDigest * wocky_jabber_auth_digest_new    (const gchar *server,
+                                                         const gchar *password);
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyJabberAuth.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyJabberAuth.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyJabberAuth.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyJabberAuth.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyJabberAuth - + @@ -42,19 +42,19 @@ WockyAuthHandler *handler); void wocky_jabber_auth_authenticate_async (WockyJabberAuth *self, - gboolean allow_plain, - gboolean is_secure, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -gboolean wocky_jabber_auth_authenticate_finish + gboolean allow_plain, + gboolean is_secure, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean wocky_jabber_auth_authenticate_finish (WockyJabberAuth *self, - GAsyncResult *result, - GError **error); -WockyJabberAuth * wocky_jabber_auth_new (const gchar *server, - const gchar *username, - const gchar *resource, - const gchar *password, + GAsyncResult *result, + GError **error); +WockyJabberAuth * wocky_jabber_auth_new (const gchar *server, + const gchar *username, + const gchar *resource, + const gchar *password, WockyXmppConnection *connection, WockyAuthRegistry *auth_registry); @@ -84,27 +84,27 @@

wocky_jabber_auth_authenticate_async ()

void                wocky_jabber_auth_authenticate_async
                                                         (WockyJabberAuth *self,
-                                                         gboolean allow_plain,
-                                                         gboolean is_secure,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ gboolean allow_plain, + gboolean is_secure, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

wocky_jabber_auth_authenticate_finish ()

-
gboolean            wocky_jabber_auth_authenticate_finish
+
gboolean            wocky_jabber_auth_authenticate_finish
                                                         (WockyJabberAuth *self,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+ GAsyncResult *result, + GError **error);

wocky_jabber_auth_new ()

-
WockyJabberAuth *   wocky_jabber_auth_new               (const gchar *server,
-                                                         const gchar *username,
-                                                         const gchar *resource,
-                                                         const gchar *password,
+
WockyJabberAuth *   wocky_jabber_auth_new               (const gchar *server,
+                                                         const gchar *username,
+                                                         const gchar *resource,
+                                                         const gchar *password,
                                                          WockyXmppConnection *connection,
                                                          WockyAuthRegistry *auth_registry);
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-password.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-password.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-password.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-password.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky-jabber-auth-password - + @@ -38,7 +38,7 @@

Synopsis

WockyJabberAuthPassword * wocky_jabber_auth_password_new
-                                                        (const gchar *password);
+                                                        (const gchar *password);
 
@@ -49,7 +49,7 @@

wocky_jabber_auth_password_new ()

WockyJabberAuthPassword * wocky_jabber_auth_password_new
-                                                        (const gchar *password);
+ (const gchar *password);
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyMetaPorter.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyMetaPorter.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyMetaPorter.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyMetaPorter.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyMetaPorter - + @@ -40,24 +40,24 @@
#define             WOCKY_META_PORTER_ERROR
 struct              WockyMetaPorterClass;
 enum                WockyMetaPorterError;
-GSocketConnection * wocky_meta_porter_borrow_connection (WockyMetaPorter *porter,
+GSocketConnection * wocky_meta_porter_borrow_connection (WockyMetaPorter *porter,
                                                          WockyLLContact *contact);
-GQuark              wocky_meta_porter_error_quark       (void);
+GQuark              wocky_meta_porter_error_quark       (void);
 guint16             wocky_meta_porter_get_port          (WockyMetaPorter *porter);
 void                wocky_meta_porter_hold              (WockyMetaPorter *porter,
                                                          WockyContact *contact);
-WockyPorter *       wocky_meta_porter_new               (const gchar *jid,
+WockyPorter *       wocky_meta_porter_new               (const gchar *jid,
                                                          WockyContactFactory *contact_factory);
 void                wocky_meta_porter_open_async        (WockyMetaPorter *porter,
                                                          WockyLLContact *contact,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            wocky_meta_porter_open_finish       (WockyMetaPorter *porter,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            wocky_meta_porter_open_finish       (WockyMetaPorter *porter,
+                                                         GAsyncResult *result,
+                                                         GError **error);
 void                wocky_meta_porter_set_jid           (WockyMetaPorter *porter,
-                                                         const gchar *jid);
+                                                         const gchar *jid);
 void                wocky_meta_porter_unhold            (WockyMetaPorter *porter,
                                                          WockyContact *contact);
 
@@ -92,15 +92,15 @@

wocky_meta_porter_borrow_connection ()

-
GSocketConnection * wocky_meta_porter_borrow_connection (WockyMetaPorter *porter,
+
GSocketConnection * wocky_meta_porter_borrow_connection (WockyMetaPorter *porter,
                                                          WockyLLContact *contact);

-Borrow the GSocketConnection of the porter to contact, if one -exists, otherwise NULL will be returned. +Borrow the GSocketConnection of the porter to contact, if one +exists, otherwise NULL will be returned.

Note that the connection returned should be reffed using -g_object_ref() if it needs to be kept. However, it will still be +g_object_ref() if it needs to be kept. However, it will still be operated on by the underlying WockyXmppConnection object so can close spontaneously unless wocky_meta_porter_hold() is called with contact. @@ -120,7 +120,7 @@

Returns :

-the GSocketConnection or NULL if no connection is open +the GSocketConnection or NULL if no connection is open
@@ -128,7 +128,7 @@

wocky_meta_porter_error_quark ()

-
GQuark              wocky_meta_porter_error_quark       (void);
+
GQuark              wocky_meta_porter_error_quark       (void);

@@ -190,7 +190,7 @@

wocky_meta_porter_new ()

-
WockyPorter *       wocky_meta_porter_new               (const gchar *jid,
+
WockyPorter *       wocky_meta_porter_new               (const gchar *jid,
                                                          WockyContactFactory *contact_factory);

Convenience function to create a new WockyMetaPorter object. The @@ -201,7 +201,7 @@

jid :

-the JID of the local user, or NULL +the JID of the local user, or NULL @@ -221,9 +221,9 @@

wocky_meta_porter_open_async ()

void                wocky_meta_porter_open_async        (WockyMetaPorter *porter,
                                                          WockyLLContact *contact,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Make an asynchronous request to open a connection to contact if one is not already open. The hold count of the porter to @@ -250,7 +250,7 @@

cancellable :

-an optional GCancellable, or NULL +an optional GCancellable, or NULL @@ -268,9 +268,9 @@

wocky_meta_porter_open_finish ()

-
gboolean            wocky_meta_porter_open_finish       (WockyMetaPorter *porter,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+
gboolean            wocky_meta_porter_open_finish       (WockyMetaPorter *porter,
+                                                         GAsyncResult *result,
+                                                         GError **error);

Finishes an asynchronous request to open a connection if one is not already open. See wocky_meta_porter_open_async() for more details. @@ -285,17 +285,17 @@

result :

-the GAsyncResult +the GAsyncResult

error :

-an optional GError location to store an error message +an optional GError location to store an error message

Returns :

-TRUE if the operation was a success, otherwise FALSE +TRUE if the operation was a success, otherwise FALSE @@ -305,10 +305,10 @@

wocky_meta_porter_set_jid ()

void                wocky_meta_porter_set_jid           (WockyMetaPorter *porter,
-                                                         const gchar *jid);
+ const gchar *jid);

Changes the local JID according to porter. Note that this function -can only be called once, and only if NULL was passed to +can only be called once, and only if NULL was passed to wocky_meta_porter_new() when creating porter. Calling it again will be a no-op.

diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-muc-enumtypes.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-muc-enumtypes.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-muc-enumtypes.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-muc-enumtypes.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky-muc-enumtypes - + diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyMuc.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyMuc.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyMuc.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyMuc.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyMuc - + @@ -51,28 +51,28 @@ WockyMucAffiliation wocky_muc_affiliation (WockyMuc *muc); WockyStanza * wocky_muc_create_presence (WockyMuc *muc, WockyStanzaSubType type, - const gchar *status); + const gchar *status); void wocky_muc_disco_info_async (WockyMuc *muc, - GAsyncReadyCallback callback, - GCancellable *cancel, - gpointer data); -gboolean wocky_muc_disco_info_finish (WockyMuc *muc, - GAsyncResult *res, - GError **error); + GAsyncReadyCallback callback, + GCancellable *cancel, + gpointer data); +gboolean wocky_muc_disco_info_finish (WockyMuc *muc, + GAsyncResult *res, + GError **error); WockyMucState wocky_muc_get_state (WockyMuc *muc); void wocky_muc_initiate_async (WockyMuc *muc, - GAsyncReadyCallback callback, - GCancellable *cancel, - gpointer data); -gboolean wocky_muc_initiate_finish (GObject *source, - GAsyncResult *res, - GError **error); -const gchar * wocky_muc_jid (WockyMuc *muc); + GAsyncReadyCallback callback, + GCancellable *cancel, + gpointer data); +gboolean wocky_muc_initiate_finish (GObject *source, + GAsyncResult *res, + GError **error); +const gchar * wocky_muc_jid (WockyMuc *muc); void wocky_muc_join (WockyMuc *muc, - GCancellable *cancel); -GHashTable * wocky_muc_members (WockyMuc *muc); + GCancellable *cancel); +GHashTable * wocky_muc_members (WockyMuc *muc); WockyMucRole wocky_muc_role (WockyMuc *muc); -const gchar * wocky_muc_user (WockyMuc *muc); +const gchar * wocky_muc_user (WockyMuc *muc);
@@ -308,15 +308,15 @@ -

gchar *from;

+

gchar *from;

the JID of the member (roomserver/nick) -

gchar *jid;

+

gchar *jid;

the JID of the owner (ownerdomain/resource) -

gchar *nick;

+

gchar *nick;

the nickname of the member @@ -328,7 +328,7 @@ the WockyMucAffiliation of the member -

gchar *status;

+

gchar *status;

the user set status string @@ -656,22 +656,22 @@

wocky_muc_create_presence ()

WockyStanza *       wocky_muc_create_presence           (WockyMuc *muc,
                                                          WockyStanzaSubType type,
-                                                         const gchar *status);
+ const gchar *status);

wocky_muc_disco_info_async ()

void                wocky_muc_disco_info_async          (WockyMuc *muc,
-                                                         GAsyncReadyCallback callback,
-                                                         GCancellable *cancel,
-                                                         gpointer data);
+ GAsyncReadyCallback callback, + GCancellable *cancel, + gpointer data);

wocky_muc_disco_info_finish ()

-
gboolean            wocky_muc_disco_info_finish         (WockyMuc *muc,
-                                                         GAsyncResult *res,
-                                                         GError **error);
+
gboolean            wocky_muc_disco_info_finish         (WockyMuc *muc,
+                                                         GAsyncResult *res,
+                                                         GError **error);

@@ -682,32 +682,32 @@

wocky_muc_initiate_async ()

void                wocky_muc_initiate_async            (WockyMuc *muc,
-                                                         GAsyncReadyCallback callback,
-                                                         GCancellable *cancel,
-                                                         gpointer data);
+ GAsyncReadyCallback callback, + GCancellable *cancel, + gpointer data);

wocky_muc_initiate_finish ()

-
gboolean            wocky_muc_initiate_finish           (GObject *source,
-                                                         GAsyncResult *res,
-                                                         GError **error);
+
gboolean            wocky_muc_initiate_finish           (GObject *source,
+                                                         GAsyncResult *res,
+                                                         GError **error);

wocky_muc_jid ()

-
const gchar *       wocky_muc_jid                       (WockyMuc *muc);
+
const gchar *       wocky_muc_jid                       (WockyMuc *muc);

wocky_muc_join ()

void                wocky_muc_join                      (WockyMuc *muc,
-                                                         GCancellable *cancel);
+ GCancellable *cancel);

wocky_muc_members ()

-
GHashTable *        wocky_muc_members                   (WockyMuc *muc);
+
GHashTable *        wocky_muc_members                   (WockyMuc *muc);

@@ -717,7 +717,7 @@

wocky_muc_user ()

-
const gchar *       wocky_muc_user                      (WockyMuc *muc);
+
const gchar *       wocky_muc_user                      (WockyMuc *muc);
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-namespaces.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-namespaces.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-namespaces.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-namespaces.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky-namespaces - + diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyNode.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyNode.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyNode.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyNode.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyNode - + @@ -48,127 +48,127 @@ void wocky_node_add_build_va (WockyNode *node, va_list va); WockyNode * wocky_node_add_child (WockyNode *node, - const gchar *name); + const gchar *name); WockyNode * wocky_node_add_child_ns (WockyNode *node, - const gchar *name, - const gchar *ns); + const gchar *name, + const gchar *ns); WockyNode * wocky_node_add_child_ns_q (WockyNode *node, - const gchar *name, - GQuark ns); + const gchar *name, + GQuark ns); WockyNode * wocky_node_add_child_with_content (WockyNode *node, - const gchar *name, + const gchar *name, const char *content); WockyNode * wocky_node_add_child_with_content_ns (WockyNode *node, - const gchar *name, - const gchar *content, - const gchar *ns); + const gchar *name, + const gchar *content, + const gchar *ns); WockyNode * wocky_node_add_child_with_content_ns_q (WockyNode *node, - const gchar *name, - const gchar *content, - GQuark ns); + const gchar *name, + const gchar *content, + GQuark ns); void wocky_node_add_node_tree (WockyNode *node, WockyNodeTree *tree); void wocky_node_append_content (WockyNode *node, - const gchar *content); + const gchar *content); void wocky_node_append_content_n (WockyNode *node, - const gchar *content, + const gchar *content, gsize size); -const gchar * wocky_node_attribute_ns_get_prefix_from_quark - (GQuark ns); -const gchar * wocky_node_attribute_ns_get_prefix_from_urn - (const gchar *urn); -void wocky_node_attribute_ns_set_prefix (GQuark ns, - const gchar *prefix); +const gchar * wocky_node_attribute_ns_get_prefix_from_quark + (GQuark ns); +const gchar * wocky_node_attribute_ns_get_prefix_from_urn + (const gchar *urn); +void wocky_node_attribute_ns_set_prefix (GQuark ns, + const gchar *prefix); void wocky_node_deinit (void); -gboolean (*wocky_node_each_attr_func) (const gchar *key, - const gchar *value, - const gchar *pref, - const gchar *ns, - gpointer user_data); +gboolean (*wocky_node_each_attr_func) (const gchar *key, + const gchar *value, + const gchar *pref, + const gchar *ns, + gpointer user_data); void wocky_node_each_attribute (WockyNode *node, wocky_node_each_attr_func func, - gpointer user_data); + gpointer user_data); void wocky_node_each_child (WockyNode *node, wocky_node_each_child_func func, - gpointer user_data); -gboolean (*wocky_node_each_child_func) (WockyNode *node, - gpointer user_data); -gboolean wocky_node_equal (WockyNode *node0, + gpointer user_data); +gboolean (*wocky_node_each_child_func) (WockyNode *node, + gpointer user_data); +gboolean wocky_node_equal (WockyNode *node0, WockyNode *node1); void wocky_node_free (WockyNode *node); -const gchar * wocky_node_get_attribute (WockyNode *node, - const gchar *key); -const gchar * wocky_node_get_attribute_ns (WockyNode *node, - const gchar *key, - const gchar *ns); +const gchar * wocky_node_get_attribute (WockyNode *node, + const gchar *key); +const gchar * wocky_node_get_attribute_ns (WockyNode *node, + const gchar *key, + const gchar *ns); WockyNode * wocky_node_get_child (WockyNode *node, - const gchar *name); + const gchar *name); WockyNode * wocky_node_get_child_ns (WockyNode *node, - const gchar *name, - const gchar *ns); -const gchar * wocky_node_get_content_from_child (WockyNode *node, - const gchar *name); -const gchar * wocky_node_get_content_from_child_ns + const gchar *name, + const gchar *ns); +const gchar * wocky_node_get_content_from_child (WockyNode *node, + const gchar *name); +const gchar * wocky_node_get_content_from_child_ns (WockyNode *node, - const gchar *name, - const gchar *ns); + const gchar *name, + const gchar *ns); WockyNode * wocky_node_get_first_child (WockyNode *node); WockyNode * wocky_node_get_first_child_ns (WockyNode *node, - const gchar *ns); -const gchar * wocky_node_get_language (WockyNode *node); -const gchar * wocky_node_get_ns (WockyNode *node); -gboolean wocky_node_has_ns (WockyNode *node, - const gchar *ns); -gboolean wocky_node_has_ns_q (WockyNode *node, - GQuark ns); + const gchar *ns); +const gchar * wocky_node_get_language (WockyNode *node); +const gchar * wocky_node_get_ns (WockyNode *node); +gboolean wocky_node_has_ns (WockyNode *node, + const gchar *ns); +gboolean wocky_node_has_ns_q (WockyNode *node, + GQuark ns); void wocky_node_init (void); -gboolean wocky_node_is_superset (WockyNode *node, +gboolean wocky_node_is_superset (WockyNode *node, WockyNode *subset); void wocky_node_iter_init (WockyNodeIter *iter, WockyNode *node, - const gchar *name, - const gchar *ns); -gboolean wocky_node_iter_next (WockyNodeIter *iter, + const gchar *name, + const gchar *ns); +gboolean wocky_node_iter_next (WockyNodeIter *iter, WockyNode **next); -gboolean wocky_node_matches (WockyNode *node, - const gchar *name, - const gchar *ns); -gboolean wocky_node_matches_q (WockyNode *node, - const gchar *name, - GQuark ns); +gboolean wocky_node_matches (WockyNode *node, + const gchar *name, + const gchar *ns); +gboolean wocky_node_matches_q (WockyNode *node, + const gchar *name, + GQuark ns); WockyNode * wocky_node_new (const char *name, - const gchar *ns); + const gchar *ns); void wocky_node_prepend_node_tree (WockyNode *node, WockyNodeTree *tree); void wocky_node_set_attribute (WockyNode *node, - const gchar *key, - const gchar *value); + const gchar *key, + const gchar *value); void wocky_node_set_attribute_n (WockyNode *node, - const gchar *key, - const gchar *value, + const gchar *key, + const gchar *value, gsize value_size); void wocky_node_set_attribute_n_ns (WockyNode *node, - const gchar *key, - const gchar *value, + const gchar *key, + const gchar *value, gsize value_size, - const gchar *ns); + const gchar *ns); void wocky_node_set_attribute_ns (WockyNode *node, - const gchar *key, - const gchar *value, - const gchar *ns); + const gchar *key, + const gchar *value, + const gchar *ns); void wocky_node_set_attributes (WockyNode *node, - const gchar *key, + const gchar *key, ...); void wocky_node_set_content (WockyNode *node, - const gchar *content); + const gchar *content); void wocky_node_set_language (WockyNode *node, - const gchar *lang); + const gchar *lang); void wocky_node_set_language_n (WockyNode *node, - const gchar *lang, + const gchar *lang, gsize lang_size); -gchar * wocky_node_to_string (WockyNode *node); +gchar * wocky_node_to_string (WockyNode *node);
@@ -196,11 +196,11 @@ -

gchar *name;

+

gchar *name;

name of the node -

gchar *content;

+

gchar *content;

content of the node @@ -283,7 +283,7 @@ Add a node subtree to an existing parent node.

-

Example 1. 

+

Example 1. 

@@ -326,7 +326,7 @@ @@ -342,7 +342,7 @@

wocky_node_add_child ()

WockyNode *         wocky_node_add_child                (WockyNode *node,
-                                                         const gchar *name);
+ const gchar *name);

Adds a WockyNode with the specified name to an already existing node.

@@ -369,11 +369,11 @@

wocky_node_add_child_ns ()

WockyNode *         wocky_node_add_child_ns             (WockyNode *node,
-                                                         const gchar *name,
-                                                         const gchar *ns);
+ const gchar *name, + const gchar *ns);

Adds a WockyNode with the specified name to an already existing node, -under the specified namespace. If the namespace is NULL, this is equivalent +under the specified namespace. If the namespace is NULL, this is equivalent to wocky_node_add_child().

... :

the description of the stanza to build, -terminated with NULL +terminated with NULL
@@ -403,8 +403,8 @@

wocky_node_add_child_ns_q ()

WockyNode *         wocky_node_add_child_ns_q           (WockyNode *node,
-                                                         const gchar *name,
-                                                         GQuark ns);
+ const gchar *name, + GQuark ns);

Adds a WockyNode with the specified name to an already existing node, under the specified namespace. If the namespace is 0, this is equivalent @@ -437,7 +437,7 @@

wocky_node_add_child_with_content ()

WockyNode *         wocky_node_add_child_with_content   (WockyNode *node,
-                                                         const gchar *name,
+                                                         const gchar *name,
                                                          const char *content);

Adds a WockyNode with the specified name and containing the @@ -471,13 +471,13 @@

wocky_node_add_child_with_content_ns ()

WockyNode *         wocky_node_add_child_with_content_ns
                                                         (WockyNode *node,
-                                                         const gchar *name,
-                                                         const gchar *content,
-                                                         const gchar *ns);
+ const gchar *name, + const gchar *content, + const gchar *ns);

Adds a WockyNode with the specified name and the specified content to an already existing node, under the specified namespace. -If the namespace is NULL, this is equivalent to +If the namespace is NULL, this is equivalent to wocky_node_add_child_with_content().

@@ -512,9 +512,9 @@

wocky_node_add_child_with_content_ns_q ()

WockyNode *         wocky_node_add_child_with_content_ns_q
                                                         (WockyNode *node,
-                                                         const gchar *name,
-                                                         const gchar *content,
-                                                         GQuark ns);
+ const gchar *name, + const gchar *content, + GQuark ns);

Adds a WockyNode with the specified name and the specified content to an already existing node, under the specified namespace. @@ -574,7 +574,7 @@

wocky_node_append_content ()

void                wocky_node_append_content           (WockyNode *node,
-                                                         const gchar *content);
+ const gchar *content);

Appends some content to the content of a WockyNode.

@@ -597,7 +597,7 @@

wocky_node_append_content_n ()

void                wocky_node_append_content_n         (WockyNode *node,
-                                                         const gchar *content,
+                                                         const gchar *content,
                                                          gsize size);

Appends a specified number of content bytes to the content of a @@ -625,8 +625,8 @@


wocky_node_attribute_ns_get_prefix_from_quark ()

-
const gchar *       wocky_node_attribute_ns_get_prefix_from_quark
-                                                        (GQuark ns);
+
const gchar *       wocky_node_attribute_ns_get_prefix_from_quark
+                                                        (GQuark ns);

Gets the prefix of the namespace identified by the quark.

@@ -647,8 +647,8 @@

wocky_node_attribute_ns_get_prefix_from_urn ()

-
const gchar *       wocky_node_attribute_ns_get_prefix_from_urn
-                                                        (const gchar *urn);
+
const gchar *       wocky_node_attribute_ns_get_prefix_from_urn
+                                                        (const gchar *urn);

Gets the prefix of the namespace identified by the URN.

@@ -669,8 +669,8 @@

wocky_node_attribute_ns_set_prefix ()

-
void                wocky_node_attribute_ns_set_prefix  (GQuark ns,
-                                                         const gchar *prefix);
+
void                wocky_node_attribute_ns_set_prefix  (GQuark ns,
+                                                         const gchar *prefix);

Sets a desired prefix for a namespace.

@@ -679,7 +679,7 @@
- @@ -700,11 +700,11 @@

wocky_node_each_attr_func ()

-
gboolean            (*wocky_node_each_attr_func)        (const gchar *key,
-                                                         const gchar *value,
-                                                         const gchar *pref,
-                                                         const gchar *ns,
-                                                         gpointer user_data);
+
gboolean            (*wocky_node_each_attr_func)        (const gchar *key,
+                                                         const gchar *value,
+                                                         const gchar *pref,
+                                                         const gchar *ns,
+                                                         gpointer user_data);

Specifies the type of functions passed to wocky_node_each_attribute().

@@ -735,7 +735,7 @@
+FALSE to stop further attributes from being examined.

ns :

a GQuark +a GQuark

Returns :

-FALSE to stop further attributes from being examined.
@@ -745,7 +745,7 @@

wocky_node_each_attribute ()

void                wocky_node_each_attribute           (WockyNode *node,
                                                          wocky_node_each_attr_func func,
-                                                         gpointer user_data);
+ gpointer user_data);

Calls a function for each attribute of a WockyNode.

@@ -773,7 +773,7 @@

wocky_node_each_child ()

void                wocky_node_each_child               (WockyNode *node,
                                                          wocky_node_each_child_func func,
-                                                         gpointer user_data);
+ gpointer user_data);

Calls a function for each child of a WockyNode.

@@ -799,8 +799,8 @@

wocky_node_each_child_func ()

-
gboolean            (*wocky_node_each_child_func)       (WockyNode *node,
-                                                         gpointer user_data);
+
gboolean            (*wocky_node_each_child_func)       (WockyNode *node,
+                                                         gpointer user_data);

Specifies the type of functions passed to wocky_node_each_child().

@@ -820,7 +820,7 @@

Returns :

-FALSE to stop further children from being examined. +FALSE to stop further children from being examined.
@@ -828,7 +828,7 @@

wocky_node_equal ()

-
gboolean            wocky_node_equal                    (WockyNode *node0,
+
gboolean            wocky_node_equal                    (WockyNode *node0,
                                                          WockyNode *node1);

Compares two WockyNodes for equality. @@ -849,7 +849,7 @@

Returns :

-TRUE if the two nodes are equal. +TRUE if the two nodes are equal.
@@ -873,8 +873,8 @@

wocky_node_get_attribute ()

-
const gchar *       wocky_node_get_attribute            (WockyNode *node,
-                                                         const gchar *key);
+
const gchar *       wocky_node_get_attribute            (WockyNode *node,
+                                                         const gchar *key);

Returns the value of an attribute in a WockyNode.

@@ -892,7 +892,7 @@

Returns :

-the value of the attribute key, or NULL if node doesn't +the value of the attribute key, or NULL if node doesn't have such attribute. @@ -901,12 +901,12 @@

wocky_node_get_attribute_ns ()

-
const gchar *       wocky_node_get_attribute_ns         (WockyNode *node,
-                                                         const gchar *key,
-                                                         const gchar *ns);
+
const gchar *       wocky_node_get_attribute_ns         (WockyNode *node,
+                                                         const gchar *key,
+                                                         const gchar *ns);

Returns the value of an attribute in a WockyNode, limiting the search -within a specific namespace. If the namespace is NULL, this is equivalent +within a specific namespace. If the namespace is NULL, this is equivalent to wocky_node_get_attribute().

@@ -923,12 +923,12 @@ - - @@ -938,7 +938,7 @@

wocky_node_get_child ()

WockyNode *         wocky_node_get_child                (WockyNode *node,
-                                                         const gchar *name);
+ const gchar *name);

Gets a child of a node, searching by name.

@@ -965,12 +965,12 @@

wocky_node_get_child_ns ()

WockyNode *         wocky_node_get_child_ns             (WockyNode *node,
-                                                         const gchar *name,
-                                                         const gchar *ns);
+ const gchar *name, + const gchar *ns);

Gets the child of a node, searching by name and limiting the search to the specified namespace. -If the namespace is NULL, this is equivalent to wocky_node_get_child() +If the namespace is NULL, this is equivalent to wocky_node_get_child()

ns :

the namespace to search within, or NULL +the namespace to search within, or NULL

Returns :

the value of the attribute key, or NULL if node doesn't +the value of the attribute key, or NULL if node doesn't have such attribute in ns.
@@ -986,7 +986,7 @@ - @@ -999,8 +999,8 @@

wocky_node_get_content_from_child ()

-
const gchar *       wocky_node_get_content_from_child   (WockyNode *node,
-                                                         const gchar *name);
+
const gchar *       wocky_node_get_content_from_child   (WockyNode *node,
+                                                         const gchar *name);

Retrieves the content from a child of a node, if it exists.

@@ -1018,7 +1018,7 @@
- @@ -1027,10 +1027,10 @@

wocky_node_get_content_from_child_ns ()

-
const gchar *       wocky_node_get_content_from_child_ns
+
const gchar *       wocky_node_get_content_from_child_ns
                                                         (WockyNode *node,
-                                                         const gchar *name,
-                                                         const gchar *ns);
+ const gchar *name, + const gchar *ns);

Retrieves the content from a child of a node, if it exists.

@@ -1052,7 +1052,7 @@
- @@ -1075,7 +1075,7 @@ - +

ns :

the namespace of the child to get, or NULL +the namespace of the child to get, or NULL

Returns :

the content of the child of node named name, or NULL if node +the content of the child of node named name, or NULL if node has no such child.

Returns :

the content of the child of node named name in ns, or NULL if +the content of the child of node named name in ns, or NULL if node has no such child.

Returns :

a WockyNode, or NULL if node has no children.a WockyNode, or NULL if node has no children.
@@ -1084,7 +1084,7 @@

wocky_node_get_first_child_ns ()

WockyNode *         wocky_node_get_first_child_ns       (WockyNode *node,
-                                                         const gchar *ns);
+ const gchar *ns);

Returns the first child of node whose namespace is ns, saving you the bother of faffing around with a WockyNodeIter. @@ -1103,7 +1103,7 @@

Returns :

-the first child of node whose namespace is ns, or NULL if none +the first child of node whose namespace is ns, or NULL if none is found. @@ -1112,7 +1112,7 @@

wocky_node_get_language ()

-
const gchar *       wocky_node_get_language             (WockyNode *node);
+
const gchar *       wocky_node_get_language             (WockyNode *node);

Gets the language of a WockyNode

@@ -1134,7 +1134,7 @@

wocky_node_get_ns ()

-
const gchar *       wocky_node_get_ns                   (WockyNode *node);
+
const gchar *       wocky_node_get_ns                   (WockyNode *node);

Gets the namespace of a WockyNode

@@ -1156,14 +1156,14 @@

wocky_node_has_ns ()

-
gboolean            wocky_node_has_ns                   (WockyNode *node,
-                                                         const gchar *ns);
+
gboolean            wocky_node_has_ns                   (WockyNode *node,
+                                                         const gchar *ns);

wocky_node_has_ns_q ()

-
gboolean            wocky_node_has_ns_q                 (WockyNode *node,
-                                                         GQuark ns);
+
gboolean            wocky_node_has_ns_q                 (WockyNode *node,
+                                                         GQuark ns);

@@ -1177,7 +1177,7 @@

wocky_node_is_superset ()

-
gboolean            wocky_node_is_superset              (WockyNode *node,
+
gboolean            wocky_node_is_superset              (WockyNode *node,
                                                          WockyNode *subset);
@@ -1193,7 +1193,7 @@ +TRUE if node is a superset of subset.

Returns :

-TRUE if node is a superset of subset.
@@ -1203,8 +1203,8 @@

wocky_node_iter_init ()

void                wocky_node_iter_init                (WockyNodeIter *iter,
                                                          WockyNode *node,
-                                                         const gchar *name,
-                                                         const gchar *ns);
+ const gchar *name, + const gchar *ns);

Initializes an iterator that can be used to iterate over the children of node, filtered by name and ns @@ -1253,12 +1253,12 @@

name :

-Name to filter on or NULL +Name to filter on or NULL

ns :

-namespace to filter on or NULL +namespace to filter on or NULL @@ -1267,10 +1267,10 @@

wocky_node_iter_next ()

-
gboolean            wocky_node_iter_next                (WockyNodeIter *iter,
+
gboolean            wocky_node_iter_next                (WockyNodeIter *iter,
                                                          WockyNode **next);

-Advances iter to the next child that matches its filter. if FALSE is +Advances iter to the next child that matches its filter. if FALSE is returned next is not set and the iterator becomes invalid

@@ -1287,7 +1287,7 @@ +FALSE if the last child has been reached

Returns :

-FALSE if the last child has been reached
@@ -1295,9 +1295,9 @@

wocky_node_matches ()

-
gboolean            wocky_node_matches                  (WockyNode *node,
-                                                         const gchar *name,
-                                                         const gchar *ns);
+
gboolean            wocky_node_matches                  (WockyNode *node,
+                                                         const gchar *name,
+                                                         const gchar *ns);

Checks whether a node has a particular name and namespace.

@@ -1311,18 +1311,18 @@

name :

-the expected element name, which may not be NULL +the expected element name, which may not be NULL

ns :

-the expected element namespace, which may not be NULL +the expected element namespace, which may not be NULL

Returns :

-TRUE if node is named name, in namespace ns. +TRUE if node is named name, in namespace ns.
@@ -1330,9 +1330,9 @@

wocky_node_matches_q ()

-
gboolean            wocky_node_matches_q                (WockyNode *node,
-                                                         const gchar *name,
-                                                         GQuark ns);
+
gboolean            wocky_node_matches_q                (WockyNode *node,
+                                                         const gchar *name,
+                                                         GQuark ns);

Checks whether a node has a particular name and namespace.

@@ -1346,7 +1346,7 @@

name :

-the expected element name, which may not be NULL +the expected element name, which may not be NULL @@ -1356,7 +1356,7 @@

Returns :

-TRUE if node is named name, in namespace ns. +TRUE if node is named name, in namespace ns.
@@ -1365,7 +1365,7 @@

wocky_node_new ()

WockyNode *         wocky_node_new                      (const char *name,
-                                                         const gchar *ns);
+ const gchar *ns);

Convenience function which creates a WockyNode and sets its name to name. @@ -1415,8 +1415,8 @@

wocky_node_set_attribute ()

void                wocky_node_set_attribute            (WockyNode *node,
-                                                         const gchar *key,
-                                                         const gchar *value);
+ const gchar *key, + const gchar *value);

Sets an attribute in a WockyNode to a specific value.

@@ -1443,8 +1443,8 @@

wocky_node_set_attribute_n ()

void                wocky_node_set_attribute_n          (WockyNode *node,
-                                                         const gchar *key,
-                                                         const gchar *value,
+                                                         const gchar *key,
+                                                         const gchar *value,
                                                          gsize value_size);

Sets a new attribute to a WockyNode, with the supplied values. @@ -1476,13 +1476,13 @@

wocky_node_set_attribute_n_ns ()

void                wocky_node_set_attribute_n_ns       (WockyNode *node,
-                                                         const gchar *key,
-                                                         const gchar *value,
+                                                         const gchar *key,
+                                                         const gchar *value,
                                                          gsize value_size,
-                                                         const gchar *ns);
+ const gchar *ns);

Sets a new attribute to a WockyNode, with the supplied values. -If the namespace is NULL, this is equivalent to +If the namespace is NULL, this is equivalent to wocky_node_set_attribute_n().

@@ -1507,7 +1507,7 @@ - @@ -1517,12 +1517,12 @@

wocky_node_set_attribute_ns ()

void                wocky_node_set_attribute_ns         (WockyNode *node,
-                                                         const gchar *key,
-                                                         const gchar *value,
-                                                         const gchar *ns);
+ const gchar *key, + const gchar *value, + const gchar *ns);

Sets an attribute in a WockyNode, within a specific namespace. -If the namespace is NULL, this is equivalent to +If the namespace is NULL, this is equivalent to wocky_node_set_attribute().

ns :

a namespace, or NULL +a namespace, or NULL
@@ -1543,7 +1543,7 @@ - @@ -1553,7 +1553,7 @@

wocky_node_set_attributes ()

void                wocky_node_set_attributes           (WockyNode *node,
-                                                         const gchar *key,
+                                                         const gchar *key,
                                                          ...);

Sets attributes in a WockyNode to specific values. @@ -1572,7 +1572,7 @@

- @@ -1582,7 +1582,7 @@

wocky_node_set_content ()

void                wocky_node_set_content              (WockyNode *node,
-                                                         const gchar *content);
+ const gchar *content);

Sets the content of a WockyNode.

@@ -1605,7 +1605,7 @@

wocky_node_set_language ()

void                wocky_node_set_language             (WockyNode *node,
-                                                         const gchar *lang);
+ const gchar *lang);

Sets the language of a WockyNode.

@@ -1619,7 +1619,7 @@
- +

ns :

a namespace, or NULL +a namespace, or NULL

... :

pairs of keys and values, terminated by NULL +pairs of keys and values, terminated by NULL

lang :

a NULL-terminated string containing the languagea NULL-terminated string containing the language
@@ -1628,7 +1628,7 @@

wocky_node_set_language_n ()

void                wocky_node_set_language_n           (WockyNode *node,
-                                                         const gchar *lang,
+                                                         const gchar *lang,
                                                          gsize lang_size);

Sets the language of a WockyNode. @@ -1655,7 +1655,7 @@


wocky_node_to_string ()

-
gchar *             wocky_node_to_string                (WockyNode *node);
+
gchar *             wocky_node_to_string                (WockyNode *node);

Obtains a string representation of a WockyNode.

diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyPepService.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyPepService.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyPepService.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyPepService.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyPepService - + @@ -43,18 +43,18 @@ struct WockyPepServiceClass; void wocky_pep_service_get_async (WockyPepService *self, WockyBareContact *contact, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); WockyStanza * wocky_pep_service_get_finish (WockyPepService *self, - GAsyncResult *result, + GAsyncResult *result, WockyNode **item, - GError **error); + GError **error); WockyStanza * wocky_pep_service_make_publish_stanza (WockyPepService *self, WockyNode **item); -WockyPepService * wocky_pep_service_new (const gchar *node, - gboolean subscribe); +WockyPepService * wocky_pep_service_new (const gchar *node, + gboolean subscribe); void wocky_pep_service_start (WockyPepService *self, WockySession *session); @@ -81,9 +81,9 @@

wocky_pep_service_get_async ()

void                wocky_pep_service_get_async         (WockyPepService *self,
                                                          WockyBareContact *contact,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Starts an asynchronous operation to get the PEP node, "node". @@ -105,7 +105,7 @@

cancellable :

-an optional GCancellable object, or NULL +an optional GCancellable object, or NULL @@ -124,9 +124,9 @@

wocky_pep_service_get_finish ()

WockyStanza *       wocky_pep_service_get_finish        (WockyPepService *self,
-                                                         GAsyncResult *result,
+                                                         GAsyncResult *result,
                                                          WockyNode **item,
-                                                         GError **error);
+ GError **error);

Finishes an asynchronous operation to get the PEP node, "node". For more details, see @@ -141,18 +141,18 @@

result :

-a GAsyncResult +a GAsyncResult

item :

on success, the first <item> element -in the result, or NULL if self has no published items. [out][allow-none] +in the result, or NULL if self has no published items. [out][allow-none]

error :

-a location to store a GError if an error occurs +a location to store a GError if an error occurs

Returns :

@@ -180,12 +180,12 @@

item :

-a location to store the item WockyNode, or NULL +a location to store the item WockyNode, or NULL

Returns :

-a new WockyStanza PEP publish stanza; free with g_object_unref() +a new WockyStanza PEP publish stanza; free with g_object_unref() @@ -194,8 +194,8 @@

wocky_pep_service_new ()

-
WockyPepService *   wocky_pep_service_new               (const gchar *node,
-                                                         gboolean subscribe);
+
WockyPepService *   wocky_pep_service_new               (const gchar *node,
+                                                         gboolean subscribe);

A convenience function to create a new WockyPepService object.

@@ -209,8 +209,8 @@

subscribe :

-TRUE if Wocky is to subscribe to the notifications of -the node, otherwise FALSE +TRUE if Wocky is to subscribe to the notifications of +the node, otherwise FALSE diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyPing.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyPing.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyPing.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyPing.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyPing - + @@ -38,9 +38,9 @@

Synopsis

struct              WockyPingClass;
-GQuark              wocky_ping_error_quark              (void);
+GQuark              wocky_ping_error_quark              (void);
 WockyPing *         wocky_ping_new                      (WockyC2SPorter *porter,
-                                                         guint interval);
+                                                         guint interval);
 
@@ -63,13 +63,13 @@

wocky_ping_error_quark ()

-
GQuark              wocky_ping_error_quark              (void);
+
GQuark              wocky_ping_error_quark              (void);

wocky_ping_new ()

WockyPing *         wocky_ping_new                      (WockyC2SPorter *porter,
-                                                         guint interval);
+ guint interval);
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyPorter.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyPorter.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyPorter.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyPorter.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyPorter - + @@ -42,109 +42,109 @@ #define WOCKY_PORTER_HANDLER_PRIORITY_MIN #define WOCKY_PORTER_HANDLER_PRIORITY_NORMAL enum WockyPorterError; -gboolean (*WockyPorterHandlerFunc) (WockyPorter *porter, +gboolean (*WockyPorterHandlerFunc) (WockyPorter *porter, WockyStanza *stanza, - gpointer user_data); + gpointer user_data); struct WockyPorterInterface; void wocky_porter_acknowledge_iq (WockyPorter *porter, WockyStanza *stanza, ...); void wocky_porter_close_async (WockyPorter *porter, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -gboolean wocky_porter_close_finish (WockyPorter *porter, - GAsyncResult *result, - GError **error); -GQuark wocky_porter_error_quark (void); + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean wocky_porter_close_finish (WockyPorter *porter, + GAsyncResult *result, + GError **error); +GQuark wocky_porter_error_quark (void); void wocky_porter_force_close_async (WockyPorter *porter, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -gboolean wocky_porter_force_close_finish (WockyPorter *porter, - GAsyncResult *result, - GError **error); -const gchar * wocky_porter_get_bare_jid (WockyPorter *self); -const gchar * wocky_porter_get_full_jid (WockyPorter *self); -const gchar * wocky_porter_get_resource (WockyPorter *self); -guint wocky_porter_register_handler_from (WockyPorter *self, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean wocky_porter_force_close_finish (WockyPorter *porter, + GAsyncResult *result, + GError **error); +const gchar * wocky_porter_get_bare_jid (WockyPorter *self); +const gchar * wocky_porter_get_full_jid (WockyPorter *self); +const gchar * wocky_porter_get_resource (WockyPorter *self); +guint wocky_porter_register_handler_from (WockyPorter *self, WockyStanzaType type, WockyStanzaSubType sub_type, - const gchar *from, - guint priority, + const gchar *from, + guint priority, WockyPorterHandlerFunc callback, - gpointer user_data, + gpointer user_data, ...); -guint wocky_porter_register_handler_from_anyone +guint wocky_porter_register_handler_from_anyone (WockyPorter *self, WockyStanzaType type, WockyStanzaSubType sub_type, - guint priority, + guint priority, WockyPorterHandlerFunc callback, - gpointer user_data, + gpointer user_data, ...); -guint wocky_porter_register_handler_from_anyone_by_stanza +guint wocky_porter_register_handler_from_anyone_by_stanza (WockyPorter *self, WockyStanzaType type, WockyStanzaSubType sub_type, - guint priority, + guint priority, WockyPorterHandlerFunc callback, - gpointer user_data, + gpointer user_data, WockyStanza *stanza); -guint wocky_porter_register_handler_from_anyone_va +guint wocky_porter_register_handler_from_anyone_va (WockyPorter *self, WockyStanzaType type, WockyStanzaSubType sub_type, - guint priority, + guint priority, WockyPorterHandlerFunc callback, - gpointer user_data, + gpointer user_data, va_list ap); -guint wocky_porter_register_handler_from_by_stanza +guint wocky_porter_register_handler_from_by_stanza (WockyPorter *self, WockyStanzaType type, WockyStanzaSubType sub_type, - const gchar *from, - guint priority, + const gchar *from, + guint priority, WockyPorterHandlerFunc callback, - gpointer user_data, + gpointer user_data, WockyStanza *stanza); -guint wocky_porter_register_handler_from_va +guint wocky_porter_register_handler_from_va (WockyPorter *self, WockyStanzaType type, WockyStanzaSubType sub_type, - const gchar *from, - guint priority, + const gchar *from, + guint priority, WockyPorterHandlerFunc callback, - gpointer user_data, + gpointer user_data, va_list ap); void wocky_porter_send (WockyPorter *porter, WockyStanza *stanza); void wocky_porter_send_async (WockyPorter *porter, WockyStanza *stanza, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -gboolean wocky_porter_send_finish (WockyPorter *porter, - GAsyncResult *result, - GError **error); + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean wocky_porter_send_finish (WockyPorter *porter, + GAsyncResult *result, + GError **error); void wocky_porter_send_iq_async (WockyPorter *porter, WockyStanza *stanza, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); void wocky_porter_send_iq_error (WockyPorter *porter, WockyStanza *stanza, WockyXmppError error_code, - const gchar *message); + const gchar *message); WockyStanza * wocky_porter_send_iq_finish (WockyPorter *porter, - GAsyncResult *result, - GError **error); + GAsyncResult *result, + GError **error); void wocky_porter_send_iq_gerror (WockyPorter *porter, WockyStanza *stanza, - const GError *error); + const GError *error); void wocky_porter_start (WockyPorter *porter); void wocky_porter_unregister_handler (WockyPorter *porter, - guint id); + guint id);
@@ -227,25 +227,25 @@

WockyPorterHandlerFunc ()

-
gboolean            (*WockyPorterHandlerFunc)           (WockyPorter *porter,
+
gboolean            (*WockyPorterHandlerFunc)           (WockyPorter *porter,
                                                          WockyStanza *stanza,
-                                                         gpointer user_data);
+ gpointer user_data);

Handler called when a matching stanza has been received by the WockyPorter.

-If a handler returns TRUE, this means that it has taken responsibility +If a handler returns TRUE, this means that it has taken responsibility for handling the stanza and (if applicable) sending a reply.

-If a handler returns FALSE, this indicates that it has declined to process +If a handler returns FALSE, this indicates that it has declined to process the stanza. The next handler (if any) is invoked.

A handler must not assume that stanza will continue to exist after the handler has returned, unless it has taken a reference to stanza using -g_object_ref(). +g_object_ref().

@@ -266,7 +266,7 @@ +TRUE if the stanza has been handled, FALSE if not

Returns :

-TRUE if the stanza has been handled, FALSE if not
@@ -351,8 +351,8 @@ -

GTypeInterface parent_iface;

-Fields shared with GTypeInterface. +

GTypeInterface parent_iface;

+Fields shared with GTypeInterface.

get_full_jid ()

@@ -461,7 +461,7 @@

... :

-a wocky_stanza_build() specification; pass NULL to include no +a wocky_stanza_build() specification; pass NULL to include no body in the reply. @@ -471,9 +471,9 @@

wocky_porter_close_async ()

void                wocky_porter_close_async            (WockyPorter *porter,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Request asynchronous closing of a WockyPorter. This fires the WockyPorter::closing signal, flushes the sending queue, closes the XMPP @@ -492,7 +492,7 @@

cancellable :

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

callback :

@@ -508,9 +508,9 @@

wocky_porter_close_finish ()

-
gboolean            wocky_porter_close_finish           (WockyPorter *porter,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+
gboolean            wocky_porter_close_finish           (WockyPorter *porter,
+                                                         GAsyncResult *result,
+                                                         GError **error);

Finishes a close operation.

@@ -524,17 +524,17 @@

result :

-a GAsyncResult +a GAsyncResult

error :

-a GError location to store the error occuring, or NULL to ignore. +a GError location to store the error occuring, or NULL to ignore.

Returns :

-TRUE on success or FALSE on error. +TRUE on success or FALSE on error.
@@ -542,7 +542,7 @@

wocky_porter_error_quark ()

-
GQuark              wocky_porter_error_quark            (void);
+
GQuark              wocky_porter_error_quark            (void);

Get the error quark used by the porter.

@@ -558,9 +558,9 @@

wocky_porter_force_close_async ()

void                wocky_porter_force_close_async      (WockyPorter *porter,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Force the WockyPorter to close the TCP connection of the underlying WockyXmppConnection. @@ -580,7 +580,7 @@

cancellable :

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

callback :

@@ -596,9 +596,9 @@

wocky_porter_force_close_finish ()

-
gboolean            wocky_porter_force_close_finish     (WockyPorter *porter,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+
gboolean            wocky_porter_force_close_finish     (WockyPorter *porter,
+                                                         GAsyncResult *result,
+                                                         GError **error);

Finishes a force close operation.

@@ -612,17 +612,17 @@

result :

-a GAsyncResult +a GAsyncResult

error :

-a GError location to store the error occuring, or NULL to ignore. +a GError location to store the error occuring, or NULL to ignore.

Returns :

-TRUE on success or FALSE on error. +TRUE on success or FALSE on error.
@@ -630,7 +630,7 @@

wocky_porter_get_bare_jid ()

-
const gchar *       wocky_porter_get_bare_jid           (WockyPorter *self);
+
const gchar *       wocky_porter_get_bare_jid           (WockyPorter *self);

@@ -652,7 +652,7 @@

wocky_porter_get_full_jid ()

-
const gchar *       wocky_porter_get_full_jid           (WockyPorter *self);
+
const gchar *       wocky_porter_get_full_jid           (WockyPorter *self);

@@ -674,7 +674,7 @@

wocky_porter_get_resource ()

-
const gchar *       wocky_porter_get_resource           (WockyPorter *self);
+
const gchar *       wocky_porter_get_resource           (WockyPorter *self);

@@ -696,19 +696,19 @@

wocky_porter_register_handler_from ()

-
guint               wocky_porter_register_handler_from  (WockyPorter *self,
+
guint               wocky_porter_register_handler_from  (WockyPorter *self,
                                                          WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
-                                                         const gchar *from,
-                                                         guint priority,
+                                                         const gchar *from,
+                                                         guint priority,
                                                          WockyPorterHandlerFunc callback,
-                                                         gpointer user_data,
+                                                         gpointer user_data,
                                                          ...);

Register a new stanza handler. Stanza handlers are called when the Porter receives a new stanza matching the rules of the handler. Matching handlers are sorted by priority and are -called until one claims to have handled the stanza (by returning TRUE). +called until one claims to have handled the stanza (by returning TRUE).

If from is a bare JID, then the resource of the JID in the from attribute @@ -776,7 +776,7 @@

from :

the JID whose messages this handler is intended for (may not be -NULL) +NULL)

priority :

@@ -787,8 +787,8 @@

callback :

-A WockyPorterHandlerFunc, which should return FALSE to decline -the stanza (Wocky will continue to the next handler, if any), or TRUE to +A WockyPorterHandlerFunc, which should return FALSE to decline +the stanza (Wocky will continue to the next handler, if any), or TRUE to stop further processing. @@ -811,13 +811,13 @@

wocky_porter_register_handler_from_anyone ()

-
guint               wocky_porter_register_handler_from_anyone
+
guint               wocky_porter_register_handler_from_anyone
                                                         (WockyPorter *self,
                                                          WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
-                                                         guint priority,
+                                                         guint priority,
                                                          WockyPorterHandlerFunc callback,
-                                                         gpointer user_data,
+                                                         gpointer user_data,
                                                          ...);

Registers a handler for incoming stanzas from anyone, including those where @@ -913,8 +913,8 @@

callback :

-A WockyPorterHandlerFunc, which should return FALSE to decline -the stanza (Wocky will continue to the next handler, if any), or TRUE to +A WockyPorterHandlerFunc, which should return FALSE to decline +the stanza (Wocky will continue to the next handler, if any), or TRUE to stop further processing. @@ -937,13 +937,13 @@

wocky_porter_register_handler_from_anyone_by_stanza ()

-
guint               wocky_porter_register_handler_from_anyone_by_stanza
+
guint               wocky_porter_register_handler_from_anyone_by_stanza
                                                         (WockyPorter *self,
                                                          WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
-                                                         guint priority,
+                                                         guint priority,
                                                          WockyPorterHandlerFunc callback,
-                                                         gpointer user_data,
+                                                         gpointer user_data,
                                                          WockyStanza *stanza);

A WockyStanza version of @@ -976,8 +976,8 @@

callback :

-A WockyPorterHandlerFunc, which should return FALSE to decline -the stanza (Wocky will continue to the next handler, if any), or TRUE to +A WockyPorterHandlerFunc, which should return FALSE to decline +the stanza (Wocky will continue to the next handler, if any), or TRUE to stop further processing. @@ -1000,13 +1000,13 @@

wocky_porter_register_handler_from_anyone_va ()

-
guint               wocky_porter_register_handler_from_anyone_va
+
guint               wocky_porter_register_handler_from_anyone_va
                                                         (WockyPorter *self,
                                                          WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
-                                                         guint priority,
+                                                         guint priority,
                                                          WockyPorterHandlerFunc callback,
-                                                         gpointer user_data,
+                                                         gpointer user_data,
                                                          va_list ap);

A va_list version of @@ -1039,8 +1039,8 @@

callback :

-A WockyPorterHandlerFunc, which should return FALSE to decline -the stanza (Wocky will continue to the next handler, if any), or TRUE to +A WockyPorterHandlerFunc, which should return FALSE to decline +the stanza (Wocky will continue to the next handler, if any), or TRUE to stop further processing. @@ -1063,14 +1063,14 @@

wocky_porter_register_handler_from_by_stanza ()

-
guint               wocky_porter_register_handler_from_by_stanza
+
guint               wocky_porter_register_handler_from_by_stanza
                                                         (WockyPorter *self,
                                                          WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
-                                                         const gchar *from,
-                                                         guint priority,
+                                                         const gchar *from,
+                                                         guint priority,
                                                          WockyPorterHandlerFunc callback,
-                                                         gpointer user_data,
+                                                         gpointer user_data,
                                                          WockyStanza *stanza);

A WockyStanza version of wocky_porter_register_handler_from(); see @@ -1096,7 +1096,7 @@

from :

the JID whose messages this handler is intended for (may not be -NULL) +NULL)

priority :

@@ -1107,8 +1107,8 @@

callback :

-A WockyPorterHandlerFunc, which should return FALSE to decline -the stanza (Wocky will continue to the next handler, if any), or TRUE to +A WockyPorterHandlerFunc, which should return FALSE to decline +the stanza (Wocky will continue to the next handler, if any), or TRUE to stop further processing. @@ -1131,14 +1131,14 @@

wocky_porter_register_handler_from_va ()

-
guint               wocky_porter_register_handler_from_va
+
guint               wocky_porter_register_handler_from_va
                                                         (WockyPorter *self,
                                                          WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
-                                                         const gchar *from,
-                                                         guint priority,
+                                                         const gchar *from,
+                                                         guint priority,
                                                          WockyPorterHandlerFunc callback,
-                                                         gpointer user_data,
+                                                         gpointer user_data,
                                                          va_list ap);

A va_list version of wocky_porter_register_handler_from(); see @@ -1164,7 +1164,7 @@

from :

the JID whose messages this handler is intended for (may not be -NULL) +NULL)

priority :

@@ -1175,8 +1175,8 @@

callback :

-A WockyPorterHandlerFunc, which should return FALSE to decline -the stanza (Wocky will continue to the next handler, if any), or TRUE to +A WockyPorterHandlerFunc, which should return FALSE to decline +the stanza (Wocky will continue to the next handler, if any), or TRUE to stop further processing. @@ -1203,7 +1203,7 @@ WockyStanza *stanza);

Send a WockyStanza. This is a convenient function to not have to -call wocky_porter_send_async() with lot of NULL arguments if you +call wocky_porter_send_async() with lot of NULL arguments if you don't care to know when the stanza has been actually sent.

@@ -1226,9 +1226,9 @@

wocky_porter_send_async ()

void                wocky_porter_send_async             (WockyPorter *porter,
                                                          WockyStanza *stanza,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Request asynchronous sending of a WockyStanza. When the stanza has been sent callback will be called. @@ -1249,7 +1249,7 @@

- + @@ -1265,9 +1265,9 @@

wocky_porter_send_finish ()

-
gboolean            wocky_porter_send_finish            (WockyPorter *porter,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+
gboolean            wocky_porter_send_finish            (WockyPorter *porter,
+                                                         GAsyncResult *result,
+                                                         GError **error);

Finishes sending a WockyStanza.

@@ -1281,18 +1281,18 @@
- - +TRUE on success or FALSE on error.

cancellable :

optional GCancellable object, NULL to ignoreoptional GCancellable object, NULL to ignore

callback :

result :

a GAsyncResult +a GAsyncResult

error :

a GError location to store the error occuring, or NULL to +a GError location to store the error occuring, or NULL to ignore.

Returns :

-TRUE on success or FALSE on error.
@@ -1302,9 +1302,9 @@

wocky_porter_send_iq_async ()

void                wocky_porter_send_iq_async          (WockyPorter *porter,
                                                          WockyStanza *stanza,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Request asynchronous sending of a WockyStanza of type WOCKY_STANZA_TYPE_IQ and sub-type WOCKY_STANZA_SUB_TYPE_GET or @@ -1326,7 +1326,7 @@

cancellable :

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

callback :

@@ -1345,7 +1345,7 @@
void                wocky_porter_send_iq_error          (WockyPorter *porter,
                                                          WockyStanza *stanza,
                                                          WockyXmppError error_code,
-                                                         const gchar *message);
+ const gchar *message);

Sends an error reply for stanza back to its sender, with the given error_code and message, and including the child element from the original @@ -1386,8 +1386,8 @@

wocky_porter_send_iq_finish ()

WockyStanza *       wocky_porter_send_iq_finish         (WockyPorter *porter,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+ GAsyncResult *result, + GError **error);

Get the reply of an IQ query.

@@ -1401,16 +1401,16 @@

result :

-a GAsyncResult +a GAsyncResult

error :

-a GError location to store the error occuring, or NULL to ignore. +a GError location to store the error occuring, or NULL to ignore.

Returns :

-a reffed WockyStanza on success, NULL on error +a reffed WockyStanza on success, NULL on error
@@ -1420,7 +1420,7 @@

wocky_porter_send_iq_gerror ()

void                wocky_porter_send_iq_gerror         (WockyPorter *porter,
                                                          WockyStanza *stanza,
-                                                         const GError *error);
+ const GError *error);

Sends an error reply for stanza back to its sender, building the <error/> element from the given error. To send error @@ -1471,7 +1471,7 @@

wocky_porter_unregister_handler ()

void                wocky_porter_unregister_handler     (WockyPorter *porter,
-                                                         guint id);
+ guint id);

Unregister a registered handler. This handler won't be called when receiving stanzas anymore. diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-helpers.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-helpers.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-helpers.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-helpers.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky-pubsub-helpers - + @@ -37,42 +37,44 @@

Synopsis

-
gboolean            wocky_pubsub_distill_ambivalent_iq_reply
-                                                        (GObject *source,
-                                                         GAsyncResult *res,
-                                                         const gchar *pubsub_ns,
-                                                         const gchar *child_name,
+
gboolean            wocky_pubsub_distill_ambivalent_iq_reply
+                                                        (GObject *source,
+                                                         GAsyncResult *res,
+                                                         const gchar *pubsub_ns,
+                                                         const gchar *child_name,
                                                          WockyNodeTree **child_out,
-                                                         GError **error);
-gboolean            wocky_pubsub_distill_iq_reply       (GObject *source,
-                                                         GAsyncResult *res,
-                                                         const gchar *pubsub_ns,
-                                                         const gchar *child_name,
+                                                         GError **error);
+gboolean            wocky_pubsub_distill_iq_reply       (GObject *source,
+                                                         GAsyncResult *res,
+                                                         const gchar *pubsub_ns,
+                                                         const gchar *child_name,
                                                          WockyNodeTree **child_out,
-                                                         GError **error);
-gboolean            wocky_pubsub_distill_stanza         (WockyStanza *result,
-                                                         const gchar *pubsub_ns,
-                                                         const gchar *child_name,
-                                                         gboolean body_optional,
+                                                         GError **error);
+gboolean            wocky_pubsub_distill_stanza         (WockyStanza *result,
+                                                         const gchar *pubsub_ns,
+                                                         const gchar *child_name,
+                                                         gboolean body_optional,
                                                          WockyNodeTree **child_out,
-                                                         GError **error);
-gboolean            wocky_pubsub_distill_void_iq_reply  (GObject *source,
-                                                         GAsyncResult *res,
-                                                         GError **error);
-WockyStanza *       wocky_pubsub_make_event_stanza      (const gchar *node,
-                                                         const gchar *from,
+                                                         GError **error);
+gboolean            wocky_pubsub_distill_void_iq_reply  (GObject *source,
+                                                         GAsyncResult *res,
+                                                         GError **error);
+WockyStanza *       wocky_pubsub_make_event_stanza      (const gchar *node,
+                                                         const gchar *from,
                                                          WockyNode **item_out);
-WockyStanza *       wocky_pubsub_make_publish_stanza    (const gchar *service,
-                                                         const gchar *node,
+WockyStanza *       wocky_pubsub_make_publish_stanza    (const gchar *service,
+                                                         const gchar *node,
                                                          WockyNode **pubsub_out,
                                                          WockyNode **publish_out,
                                                          WockyNode **item_out);
-WockyStanza *       wocky_pubsub_make_stanza            (const gchar *service,
+WockyStanza *       wocky_pubsub_make_stanza            (const gchar *service,
                                                          WockyStanzaSubType sub_type,
-                                                         const gchar *pubsub_ns,
-                                                         const gchar *action_name,
+                                                         const gchar *pubsub_ns,
+                                                         const gchar *action_name,
                                                          WockyNode **pubsub_node,
                                                          WockyNode **action_node);
+void                wocky_send_ll_pep_event             (WockySession *session,
+                                                         WockyStanza *stanza);
 
@@ -82,13 +84,13 @@

Details

wocky_pubsub_distill_ambivalent_iq_reply ()

-
gboolean            wocky_pubsub_distill_ambivalent_iq_reply
-                                                        (GObject *source,
-                                                         GAsyncResult *res,
-                                                         const gchar *pubsub_ns,
-                                                         const gchar *child_name,
+
gboolean            wocky_pubsub_distill_ambivalent_iq_reply
+                                                        (GObject *source,
+                                                         GAsyncResult *res,
+                                                         const gchar *pubsub_ns,
+                                                         const gchar *child_name,
                                                          WockyNodeTree **child_out,
-                                                         GError **error);
+ GError **error);

Helper function to finish a wocky_porter_send_iq_async() operation and extract a particular pubsub child from the resulting reply, if it is @@ -120,7 +122,7 @@

child_out :

location at which to store a reference to the node tree at -child_name, if it is found, or to be set to NULL if it is not +child_name, if it is found, or to be set to NULL if it is not found @@ -132,7 +134,7 @@

Returns :

-TRUE if the IQ was a success; FALSE if +TRUE if the IQ was a success; FALSE if sending the IQ failed or the reply had type='error', with error set appropriately. @@ -142,12 +144,12 @@

wocky_pubsub_distill_iq_reply ()

-
gboolean            wocky_pubsub_distill_iq_reply       (GObject *source,
-                                                         GAsyncResult *res,
-                                                         const gchar *pubsub_ns,
-                                                         const gchar *child_name,
+
gboolean            wocky_pubsub_distill_iq_reply       (GObject *source,
+                                                         GAsyncResult *res,
+                                                         const gchar *pubsub_ns,
+                                                         const gchar *child_name,
                                                          WockyNodeTree **child_out,
-                                                         GError **error);
+ GError **error);

Helper function to finish a wocky_porter_send_iq_async() operation and extract a particular pubsub child from the resulting reply, if needed. @@ -167,18 +169,18 @@

pubsub_ns :

the namespace of the <pubsub/> node expected in this reply -(such as WOCKY_XMPP_NS_PUBSUB), or NULL if one is not expected +(such as WOCKY_XMPP_NS_PUBSUB), or NULL if one is not expected

child_name :

the name of the child of <pubsub/> expected in this reply -(such as "subscriptions"); ignored if pubsub_ns is NULL +(such as "subscriptions"); ignored if pubsub_ns is NULL

child_out :

location at which to store a reference to the node tree at -child_name, or NULL if you don't need it. +child_name, or NULL if you don't need it.

error :

@@ -189,7 +191,7 @@

Returns :

-TRUE if the desired pubsub child was found; FALSE if +TRUE if the desired pubsub child was found; FALSE if sending the IQ failed, the reply had type='error', or the pubsub child was not found, with error set appropriately. @@ -199,18 +201,18 @@

wocky_pubsub_distill_stanza ()

-
gboolean            wocky_pubsub_distill_stanza         (WockyStanza *result,
-                                                         const gchar *pubsub_ns,
-                                                         const gchar *child_name,
-                                                         gboolean body_optional,
+
gboolean            wocky_pubsub_distill_stanza         (WockyStanza *result,
+                                                         const gchar *pubsub_ns,
+                                                         const gchar *child_name,
+                                                         gboolean body_optional,
                                                          WockyNodeTree **child_out,
-                                                         GError **error);
+ GError **error);

Helper function to extract a particular pubsub child node from a reply, if -it is present. If body_optional is FALSE, the +it is present. If body_optional is FALSE, the <pubsub><child_name/></pubsub> tree being absent is not -considered an error: child_out is set to NULL and the function returns -TRUE. +considered an error: child_out is set to NULL and the function returns +TRUE.

If you are happy to delegate calling wocky_porter_send_iq_finish() and @@ -237,23 +239,23 @@

body_optional :

-If TRUE, the child being absent is not considered an error +If TRUE, the child being absent is not considered an error

child_out :

location at which to store a reference to the node tree at -child_name, if it is found, or to be set to NULL if it is not. +child_name, if it is found, or to be set to NULL if it is not.

error :

location at which to store an error if the child node is not found -and body_optional is FALSE +and body_optional is FALSE

Returns :

-TRUE if the child was found or was optional; FALSE with error +TRUE if the child was found or was optional; FALSE with error set otherwise. @@ -262,9 +264,9 @@

wocky_pubsub_distill_void_iq_reply ()

-
gboolean            wocky_pubsub_distill_void_iq_reply  (GObject *source,
-                                                         GAsyncResult *res,
-                                                         GError **error);
+
gboolean            wocky_pubsub_distill_void_iq_reply  (GObject *source,
+                                                         GAsyncResult *res,
+                                                         GError **error);

Helper function to finish a wocky_porter_send_iq_async() operation where no pubsub child is expected in the resulting reply. @@ -290,7 +292,7 @@

Returns :

-TRUE if the IQ was a success; FALSE if +TRUE if the IQ was a success; FALSE if sending the IQ failed or the reply had type='error', with error set appropriately. @@ -300,8 +302,8 @@

wocky_pubsub_make_event_stanza ()

-
WockyStanza *       wocky_pubsub_make_event_stanza      (const gchar *node,
-                                                         const gchar *from,
+
WockyStanza *       wocky_pubsub_make_event_stanza      (const gchar *node,
+                                                         const gchar *from,
                                                          WockyNode **item_out);

Generates a new message stanza to send to other contacts about an @@ -319,22 +321,22 @@

node :

-the the name of the pubsub node; may not be NULL +the the name of the pubsub node; may not be NULL

from :

-a JID to use as the 'from' attribute, or NULL +a JID to use as the 'from' attribute, or NULL

item_out :

-a location to store the item WockyNode, or NULL +a location to store the item WockyNode, or NULL

Returns :

-a new WockyStanza pubsub event stanza; free with g_object_unref() +a new WockyStanza pubsub event stanza; free with g_object_unref() @@ -343,8 +345,8 @@

wocky_pubsub_make_publish_stanza ()

-
WockyStanza *       wocky_pubsub_make_publish_stanza    (const gchar *service,
-                                                         const gchar *node,
+
WockyStanza *       wocky_pubsub_make_publish_stanza    (const gchar *service,
+                                                         const gchar *node,
                                                          WockyNode **pubsub_out,
                                                          WockyNode **publish_out,
                                                          WockyNode **item_out);
@@ -356,12 +358,12 @@

service :

-the JID of a PubSub service, or NULL +the JID of a PubSub service, or NULL

node :

-the name of a node on service; may not be NULL +the name of a node on service; may not be NULL @@ -387,10 +389,10 @@

wocky_pubsub_make_stanza ()

-
WockyStanza *       wocky_pubsub_make_stanza            (const gchar *service,
+
WockyStanza *       wocky_pubsub_make_stanza            (const gchar *service,
                                                          WockyStanzaSubType sub_type,
-                                                         const gchar *pubsub_ns,
-                                                         const gchar *action_name,
+                                                         const gchar *pubsub_ns,
+                                                         const gchar *action_name,
                                                          WockyNode **pubsub_node,
                                                          WockyNode **action_node);

@@ -401,7 +403,7 @@

service :

-the JID of a PubSub service, or NULL +the JID of a PubSub service, or NULL @@ -428,6 +430,28 @@
+
+
+

wocky_send_ll_pep_event ()

+
void                wocky_send_ll_pep_event             (WockySession *session,
+                                                         WockyStanza *stanza);
+

+Send a PEP event to all link-local contacts interested in receiving it. +

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

session :

the WockySession to send on

stanza :

the PEP event stanza to send
+
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-plain.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-plain.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-plain.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-plain.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky-sasl-plain - + @@ -37,8 +37,8 @@

Synopsis

-
WockySaslPlain *    wocky_sasl_plain_new                (const gchar *username,
-                                                         const gchar *password);
+
WockySaslPlain *    wocky_sasl_plain_new                (const gchar *username,
+                                                         const gchar *password);
 
@@ -48,8 +48,8 @@

Details

wocky_sasl_plain_new ()

-
WockySaslPlain *    wocky_sasl_plain_new                (const gchar *username,
-                                                         const gchar *password);
+
WockySaslPlain *    wocky_sasl_plain_new                (const gchar *username,
+                                                         const gchar *password);
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-scram.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-scram.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-scram.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-scram.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky-sasl-scram - + @@ -37,9 +37,9 @@

Synopsis

-
WockySaslScram *    wocky_sasl_scram_new                (const gchar *server,
-                                                         const gchar *username,
-                                                         const gchar *password);
+
WockySaslScram *    wocky_sasl_scram_new                (const gchar *server,
+                                                         const gchar *username,
+                                                         const gchar *password);
 
@@ -49,9 +49,9 @@

Details

wocky_sasl_scram_new ()

-
WockySaslScram *    wocky_sasl_scram_new                (const gchar *server,
-                                                         const gchar *username,
-                                                         const gchar *password);
+
WockySaslScram *    wocky_sasl_scram_new                (const gchar *server,
+                                                         const gchar *username,
+                                                         const gchar *password);
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-utils.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-utils.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-utils.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-utils.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky-sasl-utils - + @@ -39,11 +39,11 @@

Synopsis

#define             WOCKY_SHA1_BLOCK_SIZE
 #define             WOCKY_SHA1_DIGEST_SIZE
-GByteArray *        sasl_calculate_hmac_sha1            (guint8 *key,
+GByteArray *        sasl_calculate_hmac_sha1            (guint8 *key,
                                                          gsize key_len,
                                                          guint8 *text,
                                                          gsize text_len);
-gchar *             sasl_generate_base64_nonce          (void);
+gchar *             sasl_generate_base64_nonce          (void);
 
@@ -65,7 +65,7 @@

sasl_calculate_hmac_sha1 ()

-
GByteArray *        sasl_calculate_hmac_sha1            (guint8 *key,
+
GByteArray *        sasl_calculate_hmac_sha1            (guint8 *key,
                                                          gsize key_len,
                                                          guint8 *text,
                                                          gsize text_len);
@@ -73,7 +73,7 @@

sasl_generate_base64_nonce ()

-
gchar *             sasl_generate_base64_nonce          (void);
+
gchar *             sasl_generate_base64_nonce          (void);
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyStanza.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyStanza.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyStanza.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyStanza.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyStanza - + @@ -42,8 +42,8 @@ enum WockyStanzaType; WockyStanza * wocky_stanza_build (WockyStanzaType type, WockyStanzaSubType sub_type, - const gchar *from, - const gchar *to, + const gchar *from, + const gchar *to, ...); WockyStanza * wocky_stanza_build_iq_error (WockyStanza *iq, ...); @@ -55,32 +55,32 @@ va_list ap); WockyStanza * wocky_stanza_build_to_contact (WockyStanzaType type, WockyStanzaSubType sub_type, - const gchar *from, + const gchar *from, WockyContact *to, ...); WockyStanza * wocky_stanza_build_va (WockyStanzaType type, WockyStanzaSubType sub_type, - const gchar *from, - const gchar *to, + const gchar *from, + const gchar *to, va_list ap); WockyStanza * wocky_stanza_copy (WockyStanza *old); -gboolean wocky_stanza_extract_errors (WockyStanza *stanza, +gboolean wocky_stanza_extract_errors (WockyStanza *stanza, WockyXmppErrorType *type, - GError **core, - GError **specialized, + GError **core, + GError **specialized, WockyNode **specialized_node); -gboolean wocky_stanza_extract_stream_error (WockyStanza *stanza, - GError **stream_error); -const gchar * wocky_stanza_get_from (WockyStanza *self); +gboolean wocky_stanza_extract_stream_error (WockyStanza *stanza, + GError **stream_error); +const gchar * wocky_stanza_get_from (WockyStanza *self); WockyContact * wocky_stanza_get_from_contact (WockyStanza *self); -const gchar * wocky_stanza_get_to (WockyStanza *self); +const gchar * wocky_stanza_get_to (WockyStanza *self); WockyContact * wocky_stanza_get_to_contact (WockyStanza *self); WockyNode * wocky_stanza_get_top_node (WockyStanza *self); void wocky_stanza_get_type_info (WockyStanza *stanza, WockyStanzaType *type, WockyStanzaSubType *sub_type); -WockyStanza * wocky_stanza_new (const gchar *name, - const gchar *ns); +WockyStanza * wocky_stanza_new (const gchar *name, + const gchar *ns); void wocky_stanza_set_from_contact (WockyStanza *self, WockyContact *contact); void wocky_stanza_set_to_contact (WockyStanza *self, @@ -327,8 +327,8 @@

wocky_stanza_build ()

WockyStanza *       wocky_stanza_build                  (WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
-                                                         const gchar *from,
-                                                         const gchar *to,
+                                                         const gchar *from,
+                                                         const gchar *to,
                                                          ...);

Build a XMPP stanza from a list of arguments. @@ -337,7 +337,7 @@

-

Example 3. 

+

Example 3. 

@@ -400,7 +400,7 @@

-

Example 4. 

+

Example 4. 

@@ -446,16 +446,16 @@ - + - + @@ -555,7 +555,7 @@

wocky_stanza_build_to_contact ()

WockyStanza *       wocky_stanza_build_to_contact       (WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
-                                                         const gchar *from,
+                                                         const gchar *from,
                                                          WockyContact *to,
                                                          ...);
@@ -564,8 +564,8 @@

wocky_stanza_build_va ()

WockyStanza *       wocky_stanza_build_va               (WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
-                                                         const gchar *from,
-                                                         const gchar *to,
+                                                         const gchar *from,
+                                                         const gchar *to,
                                                          va_list ap);

@@ -576,20 +576,20 @@

wocky_stanza_extract_errors ()

-
gboolean            wocky_stanza_extract_errors         (WockyStanza *stanza,
+
gboolean            wocky_stanza_extract_errors         (WockyStanza *stanza,
                                                          WockyXmppErrorType *type,
-                                                         GError **core,
-                                                         GError **specialized,
+                                                         GError **core,
+                                                         GError **specialized,
                                                          WockyNode **specialized_node);

Given a message, iq or presence stanza with type='error', breaks it down into values describing the error. type and core are guaranteed to be set; specialized and specialized_node will be set if a recognised -application-specific error is found, and the latter will be set to NULL if +application-specific error is found, and the latter will be set to NULL if no application-specific error is found.

-Any or all of the out parameters may be NULL to ignore the value. The +Any or all of the out parameters may be NULL to ignore the value. The value stored in specialized_node is borrowed from stanza, and is only valid as long as the latter is alive.

@@ -622,7 +622,7 @@
+TRUE if the stanza had type='error'; FALSE otherwise

from :

The sender's JID, or NULL to leave it unspecified.The sender's JID, or NULL to leave it unspecified.

to :

The target's JID, or NULL to leave it unspecified.The target's JID, or NULL to leave it unspecified.

... :

the description of the stanza to build, -terminated with NULL +terminated with NULL

Returns :

-TRUE if the stanza had type='error'; FALSE otherwise
@@ -630,8 +630,8 @@

wocky_stanza_extract_stream_error ()

-
gboolean            wocky_stanza_extract_stream_error   (WockyStanza *stanza,
-                                                         GError **stream_error);
+
gboolean            wocky_stanza_extract_stream_error   (WockyStanza *stanza,
+                                                         GError **stream_error);
@@ -647,7 +647,7 @@ @@ -656,7 +656,7 @@

wocky_stanza_get_from ()

-
const gchar *       wocky_stanza_get_from               (WockyStanza *self);
+
const gchar *       wocky_stanza_get_from               (WockyStanza *self);

@@ -669,7 +669,7 @@
- +

Returns :

-TRUE and sets stream_error if the stanza was indeed a stream +TRUE and sets stream_error if the stanza was indeed a stream error.

Returns :

The sender of self, or NULL if no sender was specified.The sender of self, or NULL if no sender was specified.
@@ -682,7 +682,7 @@

wocky_stanza_get_to ()

-
const gchar *       wocky_stanza_get_to                 (WockyStanza *self);
+
const gchar *       wocky_stanza_get_to                 (WockyStanza *self);

@@ -695,7 +695,7 @@

Returns :

-The recipient of self, or NULL if no recipient was specified. +The recipient of self, or NULL if no recipient was specified.
@@ -733,8 +733,8 @@

wocky_stanza_new ()

-
WockyStanza *       wocky_stanza_new                    (const gchar *name,
-                                                         const gchar *ns);
+
WockyStanza *       wocky_stanza_new                    (const gchar *name,
+                                                         const gchar *ns);

diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyTLSConnector.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyTLSConnector.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyTLSConnector.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyTLSConnector.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyTLSConnector - + @@ -41,15 +41,15 @@ WockyTLSConnector * wocky_tls_connector_new (WockyTLSHandler *handler); void wocky_tls_connector_secure_async (WockyTLSConnector *self, WockyXmppConnection *connection, - gboolean old_style_ssl, - const gchar *peername, - GStrv extra_identities, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); + gboolean old_style_ssl, + const gchar *peername, + GStrv extra_identities, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); WockyXmppConnection * wocky_tls_connector_secure_finish (WockyTLSConnector *self, - GAsyncResult *res, - GError **error); + GAsyncResult *res, + GError **error);
@@ -76,19 +76,19 @@

wocky_tls_connector_secure_async ()

void                wocky_tls_connector_secure_async    (WockyTLSConnector *self,
                                                          WockyXmppConnection *connection,
-                                                         gboolean old_style_ssl,
-                                                         const gchar *peername,
-                                                         GStrv extra_identities,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ gboolean old_style_ssl, + const gchar *peername, + GStrv extra_identities, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

wocky_tls_connector_secure_finish ()

WockyXmppConnection * wocky_tls_connector_secure_finish (WockyTLSConnector *self,
-                                                         GAsyncResult *res,
-                                                         GError **error);
+ GAsyncResult *res, + GError **error);
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-tls-enumtypes.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-tls-enumtypes.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-tls-enumtypes.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-tls-enumtypes.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky-tls-enumtypes - + diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyTLSHandler.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyTLSHandler.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyTLSHandler.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyTLSHandler.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyTLSHandler - + @@ -40,29 +40,29 @@
struct              WockyTLSHandlerClass;
 void                (*WockyTLSHandlerVerifyAsyncFunc)   (WockyTLSHandler *self,
                                                          WockyTLSSession *tls_session,
-                                                         const gchar *peername,
-                                                         GStrv extra_identities,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            (*WockyTLSHandlerVerifyFinishFunc)  (WockyTLSHandler *self,
-                                                         GAsyncResult *res,
-                                                         GError **error);
-gboolean            wocky_tls_handler_add_ca            (WockyTLSHandler *self,
-                                                         const gchar *path);
-gboolean            wocky_tls_handler_add_crl           (WockyTLSHandler *self,
-                                                         const gchar *path);
-GSList *            wocky_tls_handler_get_cas           (WockyTLSHandler *self);
-GSList *            wocky_tls_handler_get_crls          (WockyTLSHandler *self);
-WockyTLSHandler *   wocky_tls_handler_new               (gboolean ignore_ssl_errors);
+                                                         const gchar *peername,
+                                                         GStrv extra_identities,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            (*WockyTLSHandlerVerifyFinishFunc)  (WockyTLSHandler *self,
+                                                         GAsyncResult *res,
+                                                         GError **error);
+gboolean            wocky_tls_handler_add_ca            (WockyTLSHandler *self,
+                                                         const gchar *path);
+gboolean            wocky_tls_handler_add_crl           (WockyTLSHandler *self,
+                                                         const gchar *path);
+GSList *            wocky_tls_handler_get_cas           (WockyTLSHandler *self);
+GSList *            wocky_tls_handler_get_crls          (WockyTLSHandler *self);
+WockyTLSHandler *   wocky_tls_handler_new               (gboolean ignore_ssl_errors);
 void                wocky_tls_handler_verify_async      (WockyTLSHandler *self,
                                                          WockyTLSSession *tls_session,
-                                                         const gchar *peername,
-                                                         GStrv extra_identities,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            wocky_tls_handler_verify_finish     (WockyTLSHandler *self,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+                                                         const gchar *peername,
+                                                         GStrv extra_identities,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            wocky_tls_handler_verify_finish     (WockyTLSHandler *self,
+                                                         GAsyncResult *result,
+                                                         GError **error);
 
@@ -103,23 +103,23 @@

WockyTLSHandlerVerifyAsyncFunc ()

void                (*WockyTLSHandlerVerifyAsyncFunc)   (WockyTLSHandler *self,
                                                          WockyTLSSession *tls_session,
-                                                         const gchar *peername,
-                                                         GStrv extra_identities,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ const gchar *peername, + GStrv extra_identities, + GAsyncReadyCallback callback, + gpointer user_data);

WockyTLSHandlerVerifyFinishFunc ()

-
gboolean            (*WockyTLSHandlerVerifyFinishFunc)  (WockyTLSHandler *self,
-                                                         GAsyncResult *res,
-                                                         GError **error);
+
gboolean            (*WockyTLSHandlerVerifyFinishFunc)  (WockyTLSHandler *self,
+                                                         GAsyncResult *res,
+                                                         GError **error);

wocky_tls_handler_add_ca ()

-
gboolean            wocky_tls_handler_add_ca            (WockyTLSHandler *self,
-                                                         const gchar *path);
+
gboolean            wocky_tls_handler_add_ca            (WockyTLSHandler *self,
+                                                         const gchar *path);

Sensible default paths (under Debian derived distributions) are:

@@ -144,7 +144,7 @@

Returns :

-a gboolean indicating whether the path was resolved. +a gboolean indicating whether the path was resolved. Does not indicate that there was actually a file or directory there or that any CAs were actually found. The CAs won't actually be loaded until just before the TLS session setup is attempted. @@ -155,8 +155,8 @@

wocky_tls_handler_add_crl ()

-
gboolean            wocky_tls_handler_add_crl           (WockyTLSHandler *self,
-                                                         const gchar *path);
+
gboolean            wocky_tls_handler_add_crl           (WockyTLSHandler *self,
+                                                         const gchar *path);

This function does not descend subdirectories automatically.

@@ -173,7 +173,7 @@

Returns :

-a gboolean indicating whether the path was resolved. +a gboolean indicating whether the path was resolved. Does not indicate that there was actually a file or directory there or that any CRLs were actually found. The CRLs won't actually be loaded until just before the TLS session setup is attempted. @@ -184,34 +184,34 @@

wocky_tls_handler_get_cas ()

-
GSList *            wocky_tls_handler_get_cas           (WockyTLSHandler *self);
+
GSList *            wocky_tls_handler_get_cas           (WockyTLSHandler *self);

wocky_tls_handler_get_crls ()

-
GSList *            wocky_tls_handler_get_crls          (WockyTLSHandler *self);
+
GSList *            wocky_tls_handler_get_crls          (WockyTLSHandler *self);

wocky_tls_handler_new ()

-
WockyTLSHandler *   wocky_tls_handler_new               (gboolean ignore_ssl_errors);
+
WockyTLSHandler *   wocky_tls_handler_new               (gboolean ignore_ssl_errors);

wocky_tls_handler_verify_async ()

void                wocky_tls_handler_verify_async      (WockyTLSHandler *self,
                                                          WockyTLSSession *tls_session,
-                                                         const gchar *peername,
-                                                         GStrv extra_identities,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ const gchar *peername, + GStrv extra_identities, + GAsyncReadyCallback callback, + gpointer user_data);

wocky_tls_handler_verify_finish ()

-
gboolean            wocky_tls_handler_verify_finish     (WockyTLSHandler *self,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+
gboolean            wocky_tls_handler_verify_finish     (WockyTLSHandler *self,
+                                                         GAsyncResult *result,
+                                                         GError **error);
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-utils.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-utils.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-utils.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-utils.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky-utils - + @@ -37,41 +37,41 @@

Synopsis

-
gchar *             wocky_absolutize_path               (const gchar *path);
-gchar *             wocky_compose_jid                   (const gchar *node,
-                                                         const gchar *domain,
-                                                         const gchar *resource);
-gboolean            wocky_decode_jid                    (const gchar *jid,
-                                                         gchar **node,
-                                                         gchar **domain,
-                                                         gchar **resource);
-gboolean            wocky_enum_from_nick                (GType enum_type,
-                                                         const gchar *nick,
-                                                         gint *value);
-const gchar *       wocky_enum_to_nick                  (GType enum_type,
-                                                         gint value);
-GString *           wocky_g_string_dup                  (const GString *str);
-void                wocky_g_string_free                 (GString *str);
-GValue *            wocky_g_value_slice_dup             (const GValue *value);
-void                wocky_g_value_slice_free            (GValue *value);
-GValue *            wocky_g_value_slice_new             (GType type);
-GValue *            wocky_g_value_slice_new_boolean     (gboolean b);
-GValue *            wocky_g_value_slice_new_boxed       (GType type,
-                                                         gconstpointer p);
-GValue *            wocky_g_value_slice_new_double      (double d);
-GValue *            wocky_g_value_slice_new_int         (gint n);
-GValue *            wocky_g_value_slice_new_int64       (gint64 n);
-GValue *            wocky_g_value_slice_new_static_boxed
-                                                        (GType type,
-                                                         gconstpointer p);
-GValue *            wocky_g_value_slice_new_static_string
-                                                        (const gchar *string);
-GValue *            wocky_g_value_slice_new_string      (const gchar *string);
-GValue *            wocky_g_value_slice_new_take_boxed  (GType type,
-                                                         gpointer p);
-GValue *            wocky_g_value_slice_new_take_string (gchar *string);
-GValue *            wocky_g_value_slice_new_uint        (guint n);
-GValue *            wocky_g_value_slice_new_uint64      (guint64 n);
+
gchar *             wocky_absolutize_path               (const gchar *path);
+gchar *             wocky_compose_jid                   (const gchar *node,
+                                                         const gchar *domain,
+                                                         const gchar *resource);
+gboolean            wocky_decode_jid                    (const gchar *jid,
+                                                         gchar **node,
+                                                         gchar **domain,
+                                                         gchar **resource);
+gboolean            wocky_enum_from_nick                (GType enum_type,
+                                                         const gchar *nick,
+                                                         gint *value);
+const gchar *       wocky_enum_to_nick                  (GType enum_type,
+                                                         gint value);
+GString *           wocky_g_string_dup                  (const GString *str);
+void                wocky_g_string_free                 (GString *str);
+GValue *            wocky_g_value_slice_dup             (const GValue *value);
+void                wocky_g_value_slice_free            (GValue *value);
+GValue *            wocky_g_value_slice_new             (GType type);
+GValue *            wocky_g_value_slice_new_boolean     (gboolean b);
+GValue *            wocky_g_value_slice_new_boxed       (GType type,
+                                                         gconstpointer p);
+GValue *            wocky_g_value_slice_new_double      (double d);
+GValue *            wocky_g_value_slice_new_int         (gint n);
+GValue *            wocky_g_value_slice_new_int64       (gint64 n);
+GValue *            wocky_g_value_slice_new_static_boxed
+                                                        (GType type,
+                                                         gconstpointer p);
+GValue *            wocky_g_value_slice_new_static_string
+                                                        (const gchar *string);
+GValue *            wocky_g_value_slice_new_string      (const gchar *string);
+GValue *            wocky_g_value_slice_new_take_boxed  (GType type,
+                                                         gpointer p);
+GValue *            wocky_g_value_slice_new_take_string (gchar *string);
+GValue *            wocky_g_value_slice_new_uint        (guint n);
+GValue *            wocky_g_value_slice_new_uint64      (guint64 n);
 #define             wocky_implement_finish_copy_pointer (source,
                                                          tag,
                                                          copy_func,
@@ -83,11 +83,11 @@
                                                          tag)
 #define             wocky_implement_finish_void         (source,
                                                          tag)
-GList *             wocky_list_deep_copy                (GBoxedCopyFunc copy,
-                                                         const GList *items);
-gchar *             wocky_normalise_jid                 (const gchar *jid);
-gboolean            wocky_strdiff                       (const gchar *left,
-                                                         const gchar *right);
+GList *             wocky_list_deep_copy                (GBoxedCopyFunc copy,
+                                                         const GList *items);
+gchar *             wocky_normalise_jid                 (const gchar *jid);
+gboolean            wocky_strdiff                       (const gchar *left,
+                                                         const gchar *right);
 
@@ -97,10 +97,10 @@

Details

wocky_absolutize_path ()

-
gchar *             wocky_absolutize_path               (const gchar *path);
+
gchar *             wocky_absolutize_path               (const gchar *path);

Return an absolute form of path. This cleans up duplicate slashes, "." or -".." path segments, etc., and prepends g_get_current_dir() if necessary, but +".." path segments, etc., and prepends g_get_current_dir() if necessary, but does not necessarily resolve symlinks.

@@ -112,8 +112,8 @@ - +

Returns :

an absolute path which must be freed with g_free(), or possibly -NULL for invalid filenamesan absolute path which must be freed with g_free(), or possibly +NULL for invalid filenames
@@ -121,12 +121,12 @@

wocky_compose_jid ()

-
gchar *             wocky_compose_jid                   (const gchar *node,
-                                                         const gchar *domain,
-                                                         const gchar *resource);
+
gchar *             wocky_compose_jid                   (const gchar *node,
+                                                         const gchar *domain,
+                                                         const gchar *resource);

-Composes a JID from its parts. If node is empty or NULL, the '@' -separator is also omitted; if resource is empty or NULL, the '/' separator +Composes a JID from its parts. If node is empty or NULL, the '@' +separator is also omitted; if resource is empty or NULL, the '/' separator is also omitted.

@@ -134,16 +134,16 @@ - - + - @@ -157,10 +157,10 @@

wocky_decode_jid ()

-
gboolean            wocky_decode_jid                    (const gchar *jid,
-                                                         gchar **node,
-                                                         gchar **domain,
-                                                         gchar **resource);
+
gboolean            wocky_decode_jid                    (const gchar *jid,
+                                                         gchar **node,
+                                                         gchar **domain,
+                                                         gchar **resource);

If the JID is valid, returns TRUE and sets the caller's node/domain/resource pointers if they are not NULL. The node and resource @@ -196,7 +196,7 @@

+TRUE if the JID is valid

node :

the node part of a JID, possibly empty or NULL +the node part of a JID, possibly empty or NULL

domain :

the non-NULL domain part of a JIDthe non-NULL domain part of a JID

resource :

the resource part of a JID, possibly empty or NULL +the resource part of a JID, possibly empty or NULL

Returns :

-TRUE if the JID is valid
@@ -204,9 +204,9 @@

wocky_enum_from_nick ()

-
gboolean            wocky_enum_from_nick                (GType enum_type,
-                                                         const gchar *nick,
-                                                         gint *value);
+
gboolean            wocky_enum_from_nick                (GType enum_type,
+                                                         const gchar *nick,
+                                                         gint *value);

@@ -219,20 +219,20 @@

nick :

-a non-NULL string purporting to be the nickname of a value of +a non-NULL string purporting to be the nickname of a value of enum_type

value :

the address at which to store the value of enum_type corresponding -to nick if this functions returns TRUE; if this function returns -FALSE, this variable will be left untouched. +to nick if this functions returns TRUE; if this function returns +FALSE, this variable will be left untouched.

Returns :

-TRUE if nick is a member of enum_type, or FALSE otherwise +TRUE if nick is a member of enum_type, or FALSE otherwise
@@ -240,8 +240,8 @@

wocky_enum_to_nick ()

-
const gchar *       wocky_enum_to_nick                  (GType enum_type,
-                                                         gint value);
+
const gchar *       wocky_enum_to_nick                  (GType enum_type,
+                                                         gint value);

@@ -259,7 +259,7 @@

Returns :

-the nickname of value, or NULL if it is not, in fact, a value of +the nickname of value, or NULL if it is not, in fact, a value of enum_type @@ -269,17 +269,17 @@

wocky_g_string_dup ()

-
GString *           wocky_g_string_dup                  (const GString *str);
+
GString *           wocky_g_string_dup                  (const GString *str);

wocky_g_string_free ()

-
void                wocky_g_string_free                 (GString *str);
+
void                wocky_g_string_free                 (GString *str);

wocky_g_value_slice_dup ()

-
GValue *            wocky_g_value_slice_dup             (const GValue *value);
+
GValue *            wocky_g_value_slice_dup             (const GValue *value);

@@ -293,7 +293,7 @@

Returns :

a newly allocated copy of value, to be freed with -wocky_g_value_slice_free() or g_slice_free(). +wocky_g_value_slice_free() or g_slice_free().
@@ -302,13 +302,13 @@

wocky_g_value_slice_free ()

-
void                wocky_g_value_slice_free            (GValue *value);
+
void                wocky_g_value_slice_free            (GValue *value);

Unset and free a slice-allocated GValue.

(GDestroyNotify) wocky_g_value_slice_free can be used -as a destructor for values in a GHashTable, for example. +as a destructor for values in a GHashTable, for example.

@@ -321,9 +321,9 @@

wocky_g_value_slice_new ()

-
GValue *            wocky_g_value_slice_new             (GType type);
+
GValue *            wocky_g_value_slice_new             (GType type);

-Slice-allocate an empty GValue. wocky_g_value_slice_new_boolean() and similar +Slice-allocate an empty GValue. wocky_g_value_slice_new_boolean() and similar functions are likely to be more convenient to use for the types supported.

@@ -335,8 +335,8 @@ - +

Returns :

a newly allocated, newly initialized GValue, to be freed with -wocky_g_value_slice_free() or g_slice_free().a newly allocated, newly initialized GValue, to be freed with +wocky_g_value_slice_free() or g_slice_free().
@@ -345,10 +345,10 @@

wocky_g_value_slice_new_boolean ()

-
GValue *            wocky_g_value_slice_new_boolean     (gboolean b);
+
GValue *            wocky_g_value_slice_new_boolean     (gboolean b);

-Slice-allocate and initialize a GValue. This function is convenient to -use when constructing hash tables from string to GValue, for example. +Slice-allocate and initialize a GValue. This function is convenient to +use when constructing hash tables from string to GValue, for example.

@@ -359,8 +359,8 @@ - @@ -370,11 +370,11 @@

wocky_g_value_slice_new_boxed ()

-
GValue *            wocky_g_value_slice_new_boxed       (GType type,
-                                                         gconstpointer p);
+
GValue *            wocky_g_value_slice_new_boxed       (GType type,
+                                                         gconstpointer p);

-Slice-allocate and initialize a GValue. This function is convenient to -use when constructing hash tables from string to GValue, for example. +Slice-allocate and initialize a GValue. This function is convenient to +use when constructing hash tables from string to GValue, for example.

Returns :

a GValue of type G_TYPE_BOOLEAN with value b, to be freed with -wocky_g_value_slice_free() or g_slice_free() +a GValue of type G_TYPE_BOOLEAN with value b, to be freed with +wocky_g_value_slice_free() or g_slice_free()
@@ -389,8 +389,8 @@ - @@ -400,10 +400,10 @@

wocky_g_value_slice_new_double ()

-
GValue *            wocky_g_value_slice_new_double      (double d);
+
GValue *            wocky_g_value_slice_new_double      (double d);

-Slice-allocate and initialize a GValue. This function is convenient to -use when constructing hash tables from string to GValue, for example. +Slice-allocate and initialize a GValue. This function is convenient to +use when constructing hash tables from string to GValue, for example.

Returns :

a GValue of type type whose value is a copy of p, -to be freed with wocky_g_value_slice_free() or g_slice_free() +a GValue of type type whose value is a copy of p, +to be freed with wocky_g_value_slice_free() or g_slice_free()
@@ -414,8 +414,8 @@ - @@ -425,10 +425,10 @@

wocky_g_value_slice_new_int ()

-
GValue *            wocky_g_value_slice_new_int         (gint n);
+
GValue *            wocky_g_value_slice_new_int         (gint n);

-Slice-allocate and initialize a GValue. This function is convenient to -use when constructing hash tables from string to GValue, for example. +Slice-allocate and initialize a GValue. This function is convenient to +use when constructing hash tables from string to GValue, for example.

Returns :

a GValue of type G_TYPE_DOUBLE with value n, to be freed with -wocky_g_value_slice_free() or g_slice_free() +a GValue of type G_TYPE_DOUBLE with value n, to be freed with +wocky_g_value_slice_free() or g_slice_free()
@@ -439,8 +439,8 @@ - @@ -450,10 +450,10 @@

wocky_g_value_slice_new_int64 ()

-
GValue *            wocky_g_value_slice_new_int64       (gint64 n);
+
GValue *            wocky_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. +Slice-allocate and initialize a GValue. This function is convenient to +use when constructing hash tables from string to GValue, for example.

Returns :

a GValue of type G_TYPE_INT with value n, to be freed with -wocky_g_value_slice_free() or g_slice_free() +a GValue of type G_TYPE_INT with value n, to be freed with +wocky_g_value_slice_free() or g_slice_free()
@@ -464,8 +464,8 @@ - @@ -475,12 +475,12 @@

wocky_g_value_slice_new_static_boxed ()

-
GValue *            wocky_g_value_slice_new_static_boxed
-                                                        (GType type,
-                                                         gconstpointer p);
+
GValue *            wocky_g_value_slice_new_static_boxed
+                                                        (GType type,
+                                                         gconstpointer p);

-Slice-allocate and initialize a GValue. This function is convenient to -use when constructing hash tables from string to GValue, for example. +Slice-allocate and initialize a GValue. This function is convenient to +use when constructing hash tables from string to GValue, for example.

Returns :

a GValue of type G_TYPE_INT64 with value n, to be freed with -wocky_g_value_slice_free() or g_slice_free() +a GValue of type G_TYPE_INT64 with value n, to be freed with +wocky_g_value_slice_free() or g_slice_free()
@@ -495,8 +495,8 @@ - @@ -506,11 +506,11 @@

wocky_g_value_slice_new_static_string ()

-
GValue *            wocky_g_value_slice_new_static_string
-                                                        (const gchar *string);
+
GValue *            wocky_g_value_slice_new_static_string
+                                                        (const gchar *string);

-Slice-allocate and initialize a GValue. This function is convenient to -use when constructing hash tables from string to GValue, for example. +Slice-allocate and initialize a GValue. This function is convenient to +use when constructing hash tables from string to GValue, for example.

Returns :

a GValue of type type whose value is p, -to be freed with wocky_g_value_slice_free() or g_slice_free() +a GValue of type type whose value is p, +to be freed with wocky_g_value_slice_free() or g_slice_free()
@@ -522,8 +522,8 @@ - @@ -533,10 +533,10 @@

wocky_g_value_slice_new_string ()

-
GValue *            wocky_g_value_slice_new_string      (const gchar *string);
+
GValue *            wocky_g_value_slice_new_string      (const gchar *string);

-Slice-allocate and initialize a GValue. This function is convenient to -use when constructing hash tables from string to GValue, for example. +Slice-allocate and initialize a GValue. This function is convenient to +use when constructing hash tables from string to GValue, for example.

Returns :

a GValue of type G_TYPE_STRING whose value is string, -to be freed with wocky_g_value_slice_free() or g_slice_free() +a GValue of type G_TYPE_STRING whose value is string, +to be freed with wocky_g_value_slice_free() or g_slice_free()
@@ -547,8 +547,8 @@ - @@ -558,11 +558,11 @@

wocky_g_value_slice_new_take_boxed ()

-
GValue *            wocky_g_value_slice_new_take_boxed  (GType type,
-                                                         gpointer p);
+
GValue *            wocky_g_value_slice_new_take_boxed  (GType type,
+                                                         gpointer p);

-Slice-allocate and initialize a GValue. This function is convenient to -use when constructing hash tables from string to GValue, for example. +Slice-allocate and initialize a GValue. This function is convenient to +use when constructing hash tables from string to GValue, for example.

Returns :

a GValue of type G_TYPE_STRING whose value is a copy of string, -to be freed with wocky_g_value_slice_free() or g_slice_free() +a GValue of type G_TYPE_STRING whose value is a copy of string, +to be freed with wocky_g_value_slice_free() or g_slice_free()
@@ -573,14 +573,14 @@ - - @@ -590,24 +590,24 @@

wocky_g_value_slice_new_take_string ()

-
GValue *            wocky_g_value_slice_new_take_string (gchar *string);
+
GValue *            wocky_g_value_slice_new_take_string (gchar *string);

-Slice-allocate and initialize a GValue. This function is convenient to -use when constructing hash tables from string to GValue, for example. +Slice-allocate and initialize a GValue. This function is convenient to +use when constructing hash tables from string to GValue, for example.

p :

a pointer of type type which will be freed with g_boxed_free() by the -returned GValue (the caller must own it before calling this function, but +a pointer of type type which will be freed with g_boxed_free() by the +returned GValue (the caller must own it before calling this function, but no longer owns it after this function returns)

Returns :

a GValue of type type whose value is p, -to be freed with wocky_g_value_slice_free() or g_slice_free() +a GValue of type type whose value is p, +to be freed with wocky_g_value_slice_free() or g_slice_free()
- - @@ -617,10 +617,10 @@

wocky_g_value_slice_new_uint ()

-
GValue *            wocky_g_value_slice_new_uint        (guint n);
+
GValue *            wocky_g_value_slice_new_uint        (guint n);

-Slice-allocate and initialize a GValue. This function is convenient to -use when constructing hash tables from string to GValue, for example. +Slice-allocate and initialize a GValue. This function is convenient to +use when constructing hash tables from string to GValue, for example.

string :

a string which will be freed with g_free() by the returned GValue +a string which will be freed with g_free() by the returned GValue (the caller must own it before calling this function, but no longer owns it after this function returns)

Returns :

a GValue of type G_TYPE_STRING whose value is string, -to be freed with wocky_g_value_slice_free() or g_slice_free() +a GValue of type G_TYPE_STRING whose value is string, +to be freed with wocky_g_value_slice_free() or g_slice_free()
@@ -631,8 +631,8 @@ - @@ -642,10 +642,10 @@

wocky_g_value_slice_new_uint64 ()

-
GValue *            wocky_g_value_slice_new_uint64      (guint64 n);
+
GValue *            wocky_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. +Slice-allocate and initialize a GValue. This function is convenient to +use when constructing hash tables from string to GValue, for example.

Returns :

a GValue of type G_TYPE_UINT with value n, to be freed with -wocky_g_value_slice_free() or g_slice_free() +a GValue of type G_TYPE_UINT with value n, to be freed with +wocky_g_value_slice_free() or g_slice_free()
@@ -656,8 +656,8 @@ - @@ -689,13 +689,13 @@

wocky_list_deep_copy ()

-
GList *             wocky_list_deep_copy                (GBoxedCopyFunc copy,
-                                                         const GList *items);
+
GList *             wocky_list_deep_copy                (GBoxedCopyFunc copy,
+                                                         const GList *items);

wocky_normalise_jid ()

-
gchar *             wocky_normalise_jid                 (const gchar *jid);
+
gchar *             wocky_normalise_jid                 (const gchar *jid);

Returns :

a GValue of type G_TYPE_UINT64 with value n, to be freed with -wocky_g_value_slice_free() or g_slice_free() +a GValue of type G_TYPE_UINT64 with value n, to be freed with +wocky_g_value_slice_free() or g_slice_free()
@@ -706,7 +706,7 @@ @@ -715,10 +715,10 @@

wocky_strdiff ()

-
gboolean            wocky_strdiff                       (const gchar *left,
-                                                         const gchar *right);
+
gboolean            wocky_strdiff                       (const gchar *left,
+                                                         const gchar *right);

-Return TRUE if the given strings are different. Unlike strcmp this +Return TRUE if the given strings are different. Unlike strcmp this function will handle null pointers, treating them as distinct from any string.

@@ -736,8 +736,8 @@
+FALSE if left and right are both NULL, or if +neither is NULL and both have the same contents; TRUE otherwise

Returns :

a normalised JID, using the same rules as wocky_decode_jid(), -or NULL if the JID could not be sensibly decoded. +or NULL if the JID could not be sensibly decoded. This value should be freed when you are done with it.

Returns :

-FALSE if left and right are both NULL, or if -neither is NULL and both have the same contents; TRUE otherwise
diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyXmppConnection.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyXmppConnection.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyXmppConnection.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyXmppConnection.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyXmppConnection - + @@ -40,84 +40,84 @@
#define             WOCKY_XMPP_CONNECTION_ERROR
 struct              WockyXmppConnectionClass;
 enum                WockyXmppConnectionError;
-GQuark              wocky_xmpp_connection_error_quark   (void);
+GQuark              wocky_xmpp_connection_error_quark   (void);
 void                wocky_xmpp_connection_force_close_async
                                                         (WockyXmppConnection *connection,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            wocky_xmpp_connection_force_close_finish
-                                                        (WockyXmppConnection *connection,
-                                                         GAsyncResult *result,
-                                                         GError **error);
-WockyXmppConnection * wocky_xmpp_connection_new         (GIOStream *stream);
-gchar *             wocky_xmpp_connection_new_id        (WockyXmppConnection *self);
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            wocky_xmpp_connection_force_close_finish
+                                                        (WockyXmppConnection *connection,
+                                                         GAsyncResult *result,
+                                                         GError **error);
+WockyXmppConnection * wocky_xmpp_connection_new         (GIOStream *stream);
+gchar *             wocky_xmpp_connection_new_id        (WockyXmppConnection *self);
 void                wocky_xmpp_connection_recv_open_async
                                                         (WockyXmppConnection *connection,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            wocky_xmpp_connection_recv_open_finish
-                                                        (WockyXmppConnection *connection,
-                                                         GAsyncResult *result,
-                                                         gchar **to,
-                                                         gchar **from,
-                                                         gchar **version,
-                                                         gchar **lang,
-                                                         gchar **id,
-                                                         GError **error);
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            wocky_xmpp_connection_recv_open_finish
+                                                        (WockyXmppConnection *connection,
+                                                         GAsyncResult *result,
+                                                         gchar **to,
+                                                         gchar **from,
+                                                         gchar **version,
+                                                         gchar **lang,
+                                                         gchar **id,
+                                                         GError **error);
 void                wocky_xmpp_connection_recv_stanza_async
                                                         (WockyXmppConnection *connection,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
 WockyStanza *       wocky_xmpp_connection_recv_stanza_finish
                                                         (WockyXmppConnection *connection,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+                                                         GAsyncResult *result,
+                                                         GError **error);
 void                wocky_xmpp_connection_reset         (WockyXmppConnection *connection);
 void                wocky_xmpp_connection_send_close_async
                                                         (WockyXmppConnection *connection,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            wocky_xmpp_connection_send_close_finish
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            wocky_xmpp_connection_send_close_finish
                                                         (WockyXmppConnection *connection,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+                                                         GAsyncResult *result,
+                                                         GError **error);
 void                wocky_xmpp_connection_send_open_async
                                                         (WockyXmppConnection *connection,
-                                                         const gchar *to,
-                                                         const gchar *from,
-                                                         const gchar *version,
-                                                         const gchar *lang,
-                                                         const gchar *id,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            wocky_xmpp_connection_send_open_finish
+                                                         const gchar *to,
+                                                         const gchar *from,
+                                                         const gchar *version,
+                                                         const gchar *lang,
+                                                         const gchar *id,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            wocky_xmpp_connection_send_open_finish
                                                         (WockyXmppConnection *connection,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+                                                         GAsyncResult *result,
+                                                         GError **error);
 void                wocky_xmpp_connection_send_stanza_async
                                                         (WockyXmppConnection *connection,
                                                          WockyStanza *stanza,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            wocky_xmpp_connection_send_stanza_finish
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            wocky_xmpp_connection_send_stanza_finish
                                                         (WockyXmppConnection *connection,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+                                                         GAsyncResult *result,
+                                                         GError **error);
 void                wocky_xmpp_connection_send_whitespace_ping_async
                                                         (WockyXmppConnection *connection,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            wocky_xmpp_connection_send_whitespace_ping_finish
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            wocky_xmpp_connection_send_whitespace_ping_finish
                                                         (WockyXmppConnection *connection,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+                                                         GAsyncResult *result,
+                                                         GError **error);
 
@@ -199,7 +199,7 @@

wocky_xmpp_connection_error_quark ()

-
GQuark              wocky_xmpp_connection_error_quark   (void);
+
GQuark              wocky_xmpp_connection_error_quark   (void);

Get the error quark used by the connection.

@@ -216,22 +216,22 @@

wocky_xmpp_connection_force_close_async ()

void                wocky_xmpp_connection_force_close_async
                                                         (WockyXmppConnection *connection,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

wocky_xmpp_connection_force_close_finish ()

-
gboolean            wocky_xmpp_connection_force_close_finish
+
gboolean            wocky_xmpp_connection_force_close_finish
                                                         (WockyXmppConnection *connection,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+ GAsyncResult *result, + GError **error);

wocky_xmpp_connection_new ()

-
WockyXmppConnection * wocky_xmpp_connection_new         (GIOStream *stream);
+
WockyXmppConnection * wocky_xmpp_connection_new         (GIOStream *stream);

Convenience function to create a new WockyXmppConnection.

@@ -252,7 +252,7 @@

wocky_xmpp_connection_new_id ()

-
gchar *             wocky_xmpp_connection_new_id        (WockyXmppConnection *self);
+
gchar *             wocky_xmpp_connection_new_id        (WockyXmppConnection *self);
@@ -273,9 +273,9 @@

wocky_xmpp_connection_recv_open_async ()

void                wocky_xmpp_connection_recv_open_async
                                                         (WockyXmppConnection *connection,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Request asynchronous receiving of an XMPP stream opening over the stream. When the operation is finished callback will be called. You can then call @@ -306,15 +306,15 @@


wocky_xmpp_connection_recv_open_finish ()

-
gboolean            wocky_xmpp_connection_recv_open_finish
+
gboolean            wocky_xmpp_connection_recv_open_finish
                                                         (WockyXmppConnection *connection,
-                                                         GAsyncResult *result,
-                                                         gchar **to,
-                                                         gchar **from,
-                                                         gchar **version,
-                                                         gchar **lang,
-                                                         gchar **id,
-                                                         GError **error);
+ GAsyncResult *result, + gchar **to, + gchar **from, + gchar **version, + gchar **lang, + gchar **id, + GError **error);

Finishes receiving a stream opening.

@@ -370,9 +370,9 @@

wocky_xmpp_connection_recv_stanza_async ()

void                wocky_xmpp_connection_recv_stanza_async
                                                         (WockyXmppConnection *connection,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Asynchronous receive a WockyStanza. When the operation is finished callback will be called. You can then call @@ -411,8 +411,8 @@

wocky_xmpp_connection_recv_stanza_finish ()

WockyStanza *       wocky_xmpp_connection_recv_stanza_finish
                                                         (WockyXmppConnection *connection,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+ GAsyncResult *result, + GError **error);

Finishes receiving a stanza

@@ -460,9 +460,9 @@

wocky_xmpp_connection_send_close_async ()

void                wocky_xmpp_connection_send_close_async
                                                         (WockyXmppConnection *connection,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Request asynchronous sending of an XMPP stream close. When the operation is finished callback will be called. You can then call @@ -498,10 +498,10 @@


wocky_xmpp_connection_send_close_finish ()

-
gboolean            wocky_xmpp_connection_send_close_finish
+
gboolean            wocky_xmpp_connection_send_close_finish
                                                         (WockyXmppConnection *connection,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+ GAsyncResult *result, + GError **error);

Finishes send the xmpp stream close.

@@ -532,14 +532,14 @@

wocky_xmpp_connection_send_open_async ()

void                wocky_xmpp_connection_send_open_async
                                                         (WockyXmppConnection *connection,
-                                                         const gchar *to,
-                                                         const gchar *from,
-                                                         const gchar *version,
-                                                         const gchar *lang,
-                                                         const gchar *id,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ const gchar *to, + const gchar *from, + const gchar *version, + const gchar *lang, + const gchar *id, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Request asynchronous sending of an XMPP stream opening over the stream. When the operation is finished callback will be called. You can then call @@ -590,10 +590,10 @@


wocky_xmpp_connection_send_open_finish ()

-
gboolean            wocky_xmpp_connection_send_open_finish
+
gboolean            wocky_xmpp_connection_send_open_finish
                                                         (WockyXmppConnection *connection,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+ GAsyncResult *result, + GError **error);

Finishes sending a stream opening.

@@ -625,9 +625,9 @@
void                wocky_xmpp_connection_send_stanza_async
                                                         (WockyXmppConnection *connection,
                                                          WockyStanza *stanza,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Request asynchronous sending of a WockyStanza. When the operation is finished callback will be called. You can then call @@ -669,10 +669,10 @@


wocky_xmpp_connection_send_stanza_finish ()

-
gboolean            wocky_xmpp_connection_send_stanza_finish
+
gboolean            wocky_xmpp_connection_send_stanza_finish
                                                         (WockyXmppConnection *connection,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+ GAsyncResult *result, + GError **error);

Finishes sending a stanza.

@@ -703,9 +703,9 @@

wocky_xmpp_connection_send_whitespace_ping_async ()

void                wocky_xmpp_connection_send_whitespace_ping_async
                                                         (WockyXmppConnection *connection,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
+ GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data);

Request asynchronous sending of a whitespace ping. When the operation is finished callback will be called. You can then call @@ -742,10 +742,10 @@


wocky_xmpp_connection_send_whitespace_ping_finish ()

-
gboolean            wocky_xmpp_connection_send_whitespace_ping_finish
+
gboolean            wocky_xmpp_connection_send_whitespace_ping_finish
                                                         (WockyXmppConnection *connection,
-                                                         GAsyncResult *result,
-                                                         GError **error);
+ GAsyncResult *result, + GError **error);

Finishes sending a whitespace ping.

diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error-enumtypes.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error-enumtypes.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error-enumtypes.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error-enumtypes.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky-xmpp-error-enumtypes - + diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky-xmpp-error - + @@ -50,24 +50,24 @@ struct WockyXmppErrorSpecialization; enum WockyXmppErrorType; enum WockyXmppStreamError; -GQuark wocky_jingle_error_quark (void); -GQuark wocky_si_error_quark (void); -WockyNode * wocky_stanza_error_to_node (const GError *error, +GQuark wocky_jingle_error_quark (void); +GQuark wocky_si_error_quark (void); +WockyNode * wocky_stanza_error_to_node (const GError *error, WockyNode *parent_node); void wocky_xmpp_error_deinit (void); -const gchar * wocky_xmpp_error_description (WockyXmppError error); +const gchar * wocky_xmpp_error_description (WockyXmppError error); void wocky_xmpp_error_extract (WockyNode *error, WockyXmppErrorType *type, - GError **core, - GError **specialized, + GError **core, + GError **specialized, WockyNode **specialized_node); void wocky_xmpp_error_init (void); -GQuark wocky_xmpp_error_quark (void); +GQuark wocky_xmpp_error_quark (void); void wocky_xmpp_error_register_domain (WockyXmppErrorDomain *domain); -const gchar * wocky_xmpp_error_string (WockyXmppError error); -const gchar * wocky_xmpp_stanza_error_to_string (GError *error); -GError * wocky_xmpp_stream_error_from_node (WockyNode *error); -GQuark wocky_xmpp_stream_error_quark (void); +const gchar * wocky_xmpp_error_string (WockyXmppError error); +const gchar * wocky_xmpp_stanza_error_to_string (GError *error); +GError * wocky_xmpp_stream_error_from_node (WockyNode *error); +GQuark wocky_xmpp_stream_error_quark (void);
@@ -406,16 +406,16 @@
- - + + - - + + - +

GQuark domain;

a GQuark of the error domain

GQuark domain;

a GQuark of the error domain

GType enum_type;

the GType of the error enum

GType enum_type;

the GType of the error enum

WockyXmppErrorSpecialization *codes;

a NULL-terminated array of of WockyXmppErrorSpecializationsa NULL-terminated array of of WockyXmppErrorSpecializations
@@ -438,7 +438,7 @@ -

const gchar *description;

+

const gchar *description;

description of the error @@ -446,9 +446,9 @@ which WockyXmppError this error specializes -

gboolean override_type;

+

gboolean override_type;

-TRUE if type should be used, or FALSE if the +TRUE if type should be used, or FALSE if the default error type for specializes should be used @@ -718,17 +718,17 @@

wocky_jingle_error_quark ()

-
GQuark              wocky_jingle_error_quark            (void);
+
GQuark              wocky_jingle_error_quark            (void);

wocky_si_error_quark ()

-
GQuark              wocky_si_error_quark                (void);
+
GQuark              wocky_si_error_quark                (void);

wocky_stanza_error_to_node ()

-
WockyNode *         wocky_stanza_error_to_node          (const GError *error,
+
WockyNode *         wocky_stanza_error_to_node          (const GError *error,
                                                          WockyNode *parent_node);

@@ -739,7 +739,7 @@

wocky_xmpp_error_description ()

-
const gchar *       wocky_xmpp_error_description        (WockyXmppError error);
+
const gchar *       wocky_xmpp_error_description        (WockyXmppError error);

@@ -762,17 +762,17 @@

wocky_xmpp_error_extract ()

void                wocky_xmpp_error_extract            (WockyNode *error,
                                                          WockyXmppErrorType *type,
-                                                         GError **core,
-                                                         GError **specialized,
+                                                         GError **core,
+                                                         GError **specialized,
                                                          WockyNode **specialized_node);

Given an <error/> node, breaks it down into values describing the error. type and core are guaranteed to be set; specialized and specialized_node will be set if a recognised application-specific error is found, and the -latter will be set to NULL if no application-specific error is found. +latter will be set to NULL if no application-specific error is found.

-Any or all of the out parameters may be NULL to ignore the value. The +Any or all of the out parameters may be NULL to ignore the value. The value stored in specialized_node is borrowed from stanza, and is only valid as long as the latter is alive.

@@ -813,7 +813,7 @@

wocky_xmpp_error_quark ()

-
GQuark              wocky_xmpp_error_quark              (void);
+
GQuark              wocky_xmpp_error_quark              (void);

@@ -836,7 +836,7 @@

wocky_xmpp_error_string ()

-
const gchar *       wocky_xmpp_error_string             (WockyXmppError error);
+
const gchar *       wocky_xmpp_error_string             (WockyXmppError error);

@@ -858,10 +858,10 @@

wocky_xmpp_stanza_error_to_string ()

-
const gchar *       wocky_xmpp_stanza_error_to_string   (GError *error);
+
const gchar *       wocky_xmpp_stanza_error_to_string   (GError *error);

Returns the name of the XMPP stanza error element represented by error. -This is intended for use in debugging messages, with GErrors returned by +This is intended for use in debugging messages, with GErrors returned by wocky_stanza_extract_errors().

@@ -875,7 +875,7 @@ - @@ -884,7 +884,7 @@

wocky_xmpp_stream_error_from_node ()

-
GError *            wocky_xmpp_stream_error_from_node   (WockyNode *error);
+
GError *            wocky_xmpp_stream_error_from_node   (WockyNode *error);

Returns :

the error code as a string, or NULL if +the error code as a string, or NULL if error->domain is not known to Wocky.
@@ -902,7 +902,7 @@

wocky_xmpp_stream_error_quark ()

-
GQuark              wocky_xmpp_stream_error_quark       (void);
+
GQuark              wocky_xmpp_stream_error_quark       (void);

Get the error quark used for stream errors

diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-reader-enumtypes.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-reader-enumtypes.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-reader-enumtypes.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-reader-enumtypes.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ wocky-xmpp-reader-enumtypes - + diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyXmppReader.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyXmppReader.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyXmppReader.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyXmppReader.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyXmppReader - + @@ -43,8 +43,8 @@ struct WockyXmppReaderClass; enum WockyXmppReaderError; enum WockyXmppReaderState; -GQuark wocky_xmpp_reader_error_quark (void); -GError * wocky_xmpp_reader_get_error (WockyXmppReader *reader); +GQuark wocky_xmpp_reader_error_quark (void); +GError * wocky_xmpp_reader_get_error (WockyXmppReader *reader); WockyXmppReaderState wocky_xmpp_reader_get_state (WockyXmppReader *reader); WockyXmppReader * wocky_xmpp_reader_new (void); WockyXmppReader * wocky_xmpp_reader_new_no_stream (void); @@ -163,7 +163,7 @@

wocky_xmpp_reader_error_quark ()

-
GQuark              wocky_xmpp_reader_error_quark       (void);
+
GQuark              wocky_xmpp_reader_error_quark       (void);

Get the error quark used by the reader.

@@ -178,7 +178,7 @@

wocky_xmpp_reader_get_error ()

-
GError *            wocky_xmpp_reader_get_error         (WockyXmppReader *reader);
+
GError *            wocky_xmpp_reader_get_error         (WockyXmppReader *reader);

Get the error from the reader

diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyXmppWriter.html telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyXmppWriter.html --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/html/wocky-WockyXmppWriter.html 2012-03-26 17:22:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyXmppWriter.html 2012-04-04 16:39:37.000000000 +0000 @@ -3,7 +3,7 @@ WockyXmppWriter - + @@ -45,11 +45,11 @@ const guint8 **data, gsize *length); void wocky_xmpp_writer_stream_open (WockyXmppWriter *writer, - const gchar *to, - const gchar *from, - const gchar *version, - const gchar *lang, - const gchar *id, + const gchar *to, + const gchar *from, + const gchar *version, + const gchar *lang, + const gchar *id, const guint8 **data, gsize *length); void wocky_xmpp_writer_write_node_tree (WockyXmppWriter *writer, @@ -164,11 +164,11 @@

wocky_xmpp_writer_stream_open ()

void                wocky_xmpp_writer_stream_open       (WockyXmppWriter *writer,
-                                                         const gchar *to,
-                                                         const gchar *from,
-                                                         const gchar *version,
-                                                         const gchar *lang,
-                                                         const gchar *id,
+                                                         const gchar *to,
+                                                         const gchar *from,
+                                                         const gchar *version,
+                                                         const gchar *lang,
+                                                         const gchar *id,
                                                          const guint8 **data,
                                                          gsize *length);

diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/Makefile.in telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/Makefile.in --- telepathy-salut-0.7.2/lib/ext/wocky/docs/reference/Makefile.in 2012-03-15 18:43:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/Makefile.in 2012-04-04 16:37:44.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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 = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -381,6 +381,7 @@ 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 @@ -450,10 +451,15 @@ installcheck: installcheck-am install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/examples/Makefile.in telepathy-salut-0.8.0/lib/ext/wocky/examples/Makefile.in --- telepathy-salut-0.7.2/lib/ext/wocky/examples/Makefile.in 2012-03-15 18:43:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/examples/Makefile.in 2012-04-04 16:37:44.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -60,8 +60,8 @@ am_wocky_receive_messages_OBJECTS = receive-messages.$(OBJEXT) wocky_receive_messages_OBJECTS = $(am_wocky_receive_messages_OBJECTS) wocky_receive_messages_LDADD = $(LDADD) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am_wocky_register_OBJECTS = register.$(OBJEXT) wocky_register_OBJECTS = $(am_wocky_register_OBJECTS) @@ -82,21 +82,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) 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_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(wocky_receive_messages_SOURCES) $(wocky_register_SOURCES) \ $(wocky_send_message_SOURCES) $(wocky_unregister_SOURCES) @@ -310,6 +310,7 @@ 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 @@ -328,16 +329,16 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -wocky-receive-messages$(EXEEXT): $(wocky_receive_messages_OBJECTS) $(wocky_receive_messages_DEPENDENCIES) +wocky-receive-messages$(EXEEXT): $(wocky_receive_messages_OBJECTS) $(wocky_receive_messages_DEPENDENCIES) $(EXTRA_wocky_receive_messages_DEPENDENCIES) @rm -f wocky-receive-messages$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_receive_messages_OBJECTS) $(wocky_receive_messages_LDADD) $(LIBS) -wocky-register$(EXEEXT): $(wocky_register_OBJECTS) $(wocky_register_DEPENDENCIES) +wocky-register$(EXEEXT): $(wocky_register_OBJECTS) $(wocky_register_DEPENDENCIES) $(EXTRA_wocky_register_DEPENDENCIES) @rm -f wocky-register$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_register_OBJECTS) $(wocky_register_LDADD) $(LIBS) -wocky-send-message$(EXEEXT): $(wocky_send_message_OBJECTS) $(wocky_send_message_DEPENDENCIES) +wocky-send-message$(EXEEXT): $(wocky_send_message_OBJECTS) $(wocky_send_message_DEPENDENCIES) $(EXTRA_wocky_send_message_DEPENDENCIES) @rm -f wocky-send-message$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_send_message_OBJECTS) $(wocky_send_message_LDADD) $(LIBS) -wocky-unregister$(EXEEXT): $(wocky_unregister_OBJECTS) $(wocky_unregister_DEPENDENCIES) +wocky-unregister$(EXEEXT): $(wocky_unregister_OBJECTS) $(wocky_unregister_DEPENDENCIES) $(EXTRA_wocky_unregister_DEPENDENCIES) @rm -f wocky-unregister$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_unregister_OBJECTS) $(wocky_unregister_LDADD) $(LIBS) @@ -355,26 +356,23 @@ .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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -479,10 +477,15 @@ installcheck: installcheck-am install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/INSTALL telepathy-salut-0.8.0/lib/ext/wocky/INSTALL --- telepathy-salut-0.7.2/lib/ext/wocky/INSTALL 2012-03-15 18:43:39.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/INSTALL 2012-04-04 16:37:45.000000000 +0000 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 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,6 +226,11 @@ 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-salut-0.7.2/lib/ext/wocky/install-sh telepathy-salut-0.8.0/lib/ext/wocky/install-sh --- telepathy-salut-0.7.2/lib/ext/wocky/install-sh 2012-03-15 18:43:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/install-sh 2012-04-04 16:37:44.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-01-19.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -156,6 +156,10 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -200,7 +208,11 @@ fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for `test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -385,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/ltmain.sh telepathy-salut-0.8.0/lib/ext/wocky/ltmain.sh --- telepathy-salut-0.7.2/lib/ext/wocky/ltmain.sh 2012-03-15 18:43:34.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/ltmain.sh 2012-04-04 16:37:40.000000000 +0000 @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 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,6 +41,7 @@ # --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 @@ -69,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 Debian-2.4-4 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,9 +80,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4 Debian-2.4-4" +VERSION="2.4.2 Debian-2.4.2-1" TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -136,15 +137,10 @@ : ${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//"} @@ -387,7 +383,7 @@ ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -771,8 +767,8 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1052,6 +1048,7 @@ opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1120,6 +1117,10 @@ 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" @@ -2059,7 +2060,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3201,11 +3202,13 @@ # 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 $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3470,7 +3473,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" ;; @@ -3982,14 +3985,17 @@ # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -5057,9 +5063,15 @@ { EOF func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -5643,7 +5655,8 @@ continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6150,7 +6163,8 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6834,7 +6848,7 @@ test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7319,6 +7333,7 @@ # 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 @@ -7438,7 +7453,7 @@ versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8026,6 +8041,11 @@ # 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= @@ -8056,7 +8076,7 @@ elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -8064,11 +8084,7 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - 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 + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9158,6 +9174,8 @@ 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" @@ -9267,7 +9285,8 @@ *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/m4/libtool.m4 telepathy-salut-0.8.0/lib/ext/wocky/m4/libtool.m4 --- telepathy-salut-0.7.2/lib/ext/wocky/m4/libtool.m4 2012-03-15 18:43:34.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/m4/libtool.m4 2012-04-04 16:37:40.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 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 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 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -146,6 +146,8 @@ 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 @@ -637,7 +639,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -801,6 +803,7 @@ 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)], @@ -822,6 +825,31 @@ ])# _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], @@ -852,6 +880,10 @@ 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)])]) @@ -954,7 +986,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # 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 lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -962,6 +1000,7 @@ 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 @@ -973,6 +1012,7 @@ [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 @@ -990,7 +1030,9 @@ 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 -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + 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 lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1035,8 +1077,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1047,6 +1089,8 @@ _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 @@ -1330,14 +1374,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*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*) LD="${LD-ld} -m elf64_sparc" ;; + 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 + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1414,13 +1471,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -1600,6 +1657,11 @@ 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 @@ -1639,7 +1701,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"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2185,7 +2247,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2194,7 +2256,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2259,7 +2321,7 @@ ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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' @@ -2398,7 +2460,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2406,10 +2468,6 @@ 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. @@ -2417,7 +2475,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2435,7 +2493,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2455,7 +2513,7 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' @@ -2466,7 +2524,7 @@ ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -2527,7 +2585,7 @@ ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -2543,7 +2601,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -2580,9 +2638,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2657,7 +2715,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -2726,7 +2784,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2751,7 +2809,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -2775,7 +2833,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -2806,7 +2864,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2816,7 +2874,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -3238,7 +3296,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3658,6 +3716,7 @@ # 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};"\ @@ -4242,7 +4301,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + 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 ;; esac else @@ -4334,18 +4395,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # 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 @@ -4505,7 +4581,9 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + _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/;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'] @@ -4533,7 +4611,6 @@ _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 @@ -4787,8 +4864,7 @@ 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)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$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~ @@ -5084,6 +5160,7 @@ # 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' @@ -5130,10 +5207,6 @@ _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 @@ -5146,7 +5219,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 @@ -5185,7 +5258,6 @@ 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 @@ -5627,9 +5699,6 @@ _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], @@ -5787,7 +5856,6 @@ _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 @@ -6157,7 +6225,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6918,12 +6986,18 @@ } }; _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 @@ -7120,7 +7194,6 @@ _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 @@ -7253,7 +7326,6 @@ _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 @@ -7440,6 +7512,77 @@ ])# _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 @@ -7509,6 +7652,13 @@ 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-salut-0.7.2/lib/ext/wocky/m4/ltoptions.m4 telepathy-salut-0.8.0/lib/ext/wocky/m4/ltoptions.m4 --- telepathy-salut-0.7.2/lib/ext/wocky/m4/ltoptions.m4 2012-03-15 18:43:34.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/m4/ltoptions.m4 2012-04-04 16:37:40.000000000 +0000 @@ -326,9 +326,24 @@ # 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], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [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=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/m4/ltversion.m4 telepathy-salut-0.8.0/lib/ext/wocky/m4/ltversion.m4 --- telepathy-salut-0.7.2/lib/ext/wocky/m4/ltversion.m4 2012-03-15 18:43:35.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/m4/ltversion.m4 2012-04-04 16:37:40.000000000 +0000 @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3293 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/m4/Makefile.in telepathy-salut-0.8.0/lib/ext/wocky/m4/Makefile.in --- telepathy-salut-0.7.2/lib/ext/wocky/m4/Makefile.in 2012-03-15 18:43:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/m4/Makefile.in 2012-04-04 16:37:45.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -306,10 +306,15 @@ installcheck: installcheck-am install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/Makefile.in telepathy-salut-0.8.0/lib/ext/wocky/Makefile.in --- telepathy-salut-0.7.2/lib/ext/wocky/Makefile.in 2012-03-15 18:43:39.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/Makefile.in 2012-04-04 16:37:45.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -56,11 +56,11 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -83,9 +83,11 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(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 am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -114,6 +116,8 @@ 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@ @@ -279,7 +283,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/rules/lcov.mak $(am__configure_deps) @for dep in $?; do \ @@ -304,6 +308,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/rules/lcov.mak: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -315,10 +320,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -550,7 +553,11 @@ $(am__remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + 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 $(am__remove_distdir) dist-lzma: distdir @@ -558,7 +565,7 @@ $(am__remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) dist-tarZ: distdir @@ -589,6 +596,8 @@ 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*) \ @@ -608,6 +617,7 @@ && 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 \ @@ -636,8 +646,16 @@ 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: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @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 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -669,10 +687,15 @@ installcheck: installcheck-recursive install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) @@ -762,8 +785,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-lzma dist-shar \ - dist-tarZ dist-xz dist-zip distcheck distclean \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip 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-salut-0.7.2/lib/ext/wocky/missing telepathy-salut-0.8.0/lib/ext/wocky/missing --- telepathy-salut-0.7.2/lib/ext/wocky/missing 2012-03-15 18:43:38.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/missing 2012-04-04 16:37:44.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.13; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,6 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -122,15 +121,6 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -226,7 +216,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -256,7 +246,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -318,41 +308,6 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/tests/Makefile.in telepathy-salut-0.8.0/lib/ext/wocky/tests/Makefile.in --- telepathy-salut-0.7.2/lib/ext/wocky/tests/Makefile.in 2012-03-15 18:43:39.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/tests/Makefile.in 2012-04-04 16:37:45.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -81,8 +81,8 @@ wocky_bare_contact_test_OBJECTS = \ $(am_wocky_bare_contact_test_OBJECTS) wocky_bare_contact_test_LDADD = $(LDADD) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am_wocky_caps_hash_test_OBJECTS = wocky-caps-hash-test.$(OBJEXT) \ wocky-test-helper.$(OBJEXT) wocky-test-stream.$(OBJEXT) @@ -232,21 +232,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) 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_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(wocky_bare_contact_test_SOURCES) \ $(wocky_caps_hash_test_SOURCES) \ @@ -726,6 +726,7 @@ 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 @@ -753,85 +754,85 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -wocky-bare-contact-test$(EXEEXT): $(wocky_bare_contact_test_OBJECTS) $(wocky_bare_contact_test_DEPENDENCIES) +wocky-bare-contact-test$(EXEEXT): $(wocky_bare_contact_test_OBJECTS) $(wocky_bare_contact_test_DEPENDENCIES) $(EXTRA_wocky_bare_contact_test_DEPENDENCIES) @rm -f wocky-bare-contact-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_bare_contact_test_OBJECTS) $(wocky_bare_contact_test_LDADD) $(LIBS) -wocky-caps-hash-test$(EXEEXT): $(wocky_caps_hash_test_OBJECTS) $(wocky_caps_hash_test_DEPENDENCIES) +wocky-caps-hash-test$(EXEEXT): $(wocky_caps_hash_test_OBJECTS) $(wocky_caps_hash_test_DEPENDENCIES) $(EXTRA_wocky_caps_hash_test_DEPENDENCIES) @rm -f wocky-caps-hash-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_caps_hash_test_OBJECTS) $(wocky_caps_hash_test_LDADD) $(LIBS) -wocky-connector-test$(EXEEXT): $(wocky_connector_test_OBJECTS) $(wocky_connector_test_DEPENDENCIES) +wocky-connector-test$(EXEEXT): $(wocky_connector_test_OBJECTS) $(wocky_connector_test_DEPENDENCIES) $(EXTRA_wocky_connector_test_DEPENDENCIES) @rm -f wocky-connector-test$(EXEEXT) $(AM_V_CCLD)$(wocky_connector_test_LINK) $(wocky_connector_test_OBJECTS) $(wocky_connector_test_LDADD) $(LIBS) -wocky-contact-factory-test$(EXEEXT): $(wocky_contact_factory_test_OBJECTS) $(wocky_contact_factory_test_DEPENDENCIES) +wocky-contact-factory-test$(EXEEXT): $(wocky_contact_factory_test_OBJECTS) $(wocky_contact_factory_test_DEPENDENCIES) $(EXTRA_wocky_contact_factory_test_DEPENDENCIES) @rm -f wocky-contact-factory-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_contact_factory_test_OBJECTS) $(wocky_contact_factory_test_LDADD) $(LIBS) -wocky-data-form-test$(EXEEXT): $(wocky_data_form_test_OBJECTS) $(wocky_data_form_test_DEPENDENCIES) +wocky-data-form-test$(EXEEXT): $(wocky_data_form_test_OBJECTS) $(wocky_data_form_test_DEPENDENCIES) $(EXTRA_wocky_data_form_test_DEPENDENCIES) @rm -f wocky-data-form-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_data_form_test_OBJECTS) $(wocky_data_form_test_LDADD) $(LIBS) -wocky-http-proxy-test$(EXEEXT): $(wocky_http_proxy_test_OBJECTS) $(wocky_http_proxy_test_DEPENDENCIES) +wocky-http-proxy-test$(EXEEXT): $(wocky_http_proxy_test_OBJECTS) $(wocky_http_proxy_test_DEPENDENCIES) $(EXTRA_wocky_http_proxy_test_DEPENDENCIES) @rm -f wocky-http-proxy-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_http_proxy_test_OBJECTS) $(wocky_http_proxy_test_LDADD) $(LIBS) -wocky-jid-validation-test$(EXEEXT): $(wocky_jid_validation_test_OBJECTS) $(wocky_jid_validation_test_DEPENDENCIES) +wocky-jid-validation-test$(EXEEXT): $(wocky_jid_validation_test_OBJECTS) $(wocky_jid_validation_test_DEPENDENCIES) $(EXTRA_wocky_jid_validation_test_DEPENDENCIES) @rm -f wocky-jid-validation-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_jid_validation_test_OBJECTS) $(wocky_jid_validation_test_LDADD) $(LIBS) -wocky-loopback-test$(EXEEXT): $(wocky_loopback_test_OBJECTS) $(wocky_loopback_test_DEPENDENCIES) +wocky-loopback-test$(EXEEXT): $(wocky_loopback_test_OBJECTS) $(wocky_loopback_test_DEPENDENCIES) $(EXTRA_wocky_loopback_test_DEPENDENCIES) @rm -f wocky-loopback-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_loopback_test_OBJECTS) $(wocky_loopback_test_LDADD) $(LIBS) -wocky-node-tree-test$(EXEEXT): $(wocky_node_tree_test_OBJECTS) $(wocky_node_tree_test_DEPENDENCIES) +wocky-node-tree-test$(EXEEXT): $(wocky_node_tree_test_OBJECTS) $(wocky_node_tree_test_DEPENDENCIES) $(EXTRA_wocky_node_tree_test_DEPENDENCIES) @rm -f wocky-node-tree-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_node_tree_test_OBJECTS) $(wocky_node_tree_test_LDADD) $(LIBS) -wocky-pep-service-test$(EXEEXT): $(wocky_pep_service_test_OBJECTS) $(wocky_pep_service_test_DEPENDENCIES) +wocky-pep-service-test$(EXEEXT): $(wocky_pep_service_test_OBJECTS) $(wocky_pep_service_test_DEPENDENCIES) $(EXTRA_wocky_pep_service_test_DEPENDENCIES) @rm -f wocky-pep-service-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_pep_service_test_OBJECTS) $(wocky_pep_service_test_LDADD) $(LIBS) -wocky-ping-test$(EXEEXT): $(wocky_ping_test_OBJECTS) $(wocky_ping_test_DEPENDENCIES) +wocky-ping-test$(EXEEXT): $(wocky_ping_test_OBJECTS) $(wocky_ping_test_DEPENDENCIES) $(EXTRA_wocky_ping_test_DEPENDENCIES) @rm -f wocky-ping-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_ping_test_OBJECTS) $(wocky_ping_test_LDADD) $(LIBS) -wocky-porter-test$(EXEEXT): $(wocky_porter_test_OBJECTS) $(wocky_porter_test_DEPENDENCIES) +wocky-porter-test$(EXEEXT): $(wocky_porter_test_OBJECTS) $(wocky_porter_test_DEPENDENCIES) $(EXTRA_wocky_porter_test_DEPENDENCIES) @rm -f wocky-porter-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_porter_test_OBJECTS) $(wocky_porter_test_LDADD) $(LIBS) -wocky-pubsub-node-test$(EXEEXT): $(wocky_pubsub_node_test_OBJECTS) $(wocky_pubsub_node_test_DEPENDENCIES) +wocky-pubsub-node-test$(EXEEXT): $(wocky_pubsub_node_test_OBJECTS) $(wocky_pubsub_node_test_DEPENDENCIES) $(EXTRA_wocky_pubsub_node_test_DEPENDENCIES) @rm -f wocky-pubsub-node-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_pubsub_node_test_OBJECTS) $(wocky_pubsub_node_test_LDADD) $(LIBS) -wocky-pubsub-service-test$(EXEEXT): $(wocky_pubsub_service_test_OBJECTS) $(wocky_pubsub_service_test_DEPENDENCIES) +wocky-pubsub-service-test$(EXEEXT): $(wocky_pubsub_service_test_OBJECTS) $(wocky_pubsub_service_test_DEPENDENCIES) $(EXTRA_wocky_pubsub_service_test_DEPENDENCIES) @rm -f wocky-pubsub-service-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_pubsub_service_test_OBJECTS) $(wocky_pubsub_service_test_LDADD) $(LIBS) -wocky-resource-contact-test$(EXEEXT): $(wocky_resource_contact_test_OBJECTS) $(wocky_resource_contact_test_DEPENDENCIES) +wocky-resource-contact-test$(EXEEXT): $(wocky_resource_contact_test_OBJECTS) $(wocky_resource_contact_test_DEPENDENCIES) $(EXTRA_wocky_resource_contact_test_DEPENDENCIES) @rm -f wocky-resource-contact-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_resource_contact_test_OBJECTS) $(wocky_resource_contact_test_LDADD) $(LIBS) -wocky-roster-test$(EXEEXT): $(wocky_roster_test_OBJECTS) $(wocky_roster_test_DEPENDENCIES) +wocky-roster-test$(EXEEXT): $(wocky_roster_test_OBJECTS) $(wocky_roster_test_DEPENDENCIES) $(EXTRA_wocky_roster_test_DEPENDENCIES) @rm -f wocky-roster-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_roster_test_OBJECTS) $(wocky_roster_test_LDADD) $(LIBS) -wocky-sasl-utils-test$(EXEEXT): $(wocky_sasl_utils_test_OBJECTS) $(wocky_sasl_utils_test_DEPENDENCIES) +wocky-sasl-utils-test$(EXEEXT): $(wocky_sasl_utils_test_OBJECTS) $(wocky_sasl_utils_test_DEPENDENCIES) $(EXTRA_wocky_sasl_utils_test_DEPENDENCIES) @rm -f wocky-sasl-utils-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_sasl_utils_test_OBJECTS) $(wocky_sasl_utils_test_LDADD) $(LIBS) -wocky-scram-sha1-test$(EXEEXT): $(wocky_scram_sha1_test_OBJECTS) $(wocky_scram_sha1_test_DEPENDENCIES) +wocky-scram-sha1-test$(EXEEXT): $(wocky_scram_sha1_test_OBJECTS) $(wocky_scram_sha1_test_DEPENDENCIES) $(EXTRA_wocky_scram_sha1_test_DEPENDENCIES) @rm -f wocky-scram-sha1-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_scram_sha1_test_OBJECTS) $(wocky_scram_sha1_test_LDADD) $(LIBS) -wocky-session-test$(EXEEXT): $(wocky_session_test_OBJECTS) $(wocky_session_test_DEPENDENCIES) +wocky-session-test$(EXEEXT): $(wocky_session_test_OBJECTS) $(wocky_session_test_DEPENDENCIES) $(EXTRA_wocky_session_test_DEPENDENCIES) @rm -f wocky-session-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_session_test_OBJECTS) $(wocky_session_test_LDADD) $(LIBS) -wocky-stanza-test$(EXEEXT): $(wocky_stanza_test_OBJECTS) $(wocky_stanza_test_DEPENDENCIES) +wocky-stanza-test$(EXEEXT): $(wocky_stanza_test_OBJECTS) $(wocky_stanza_test_DEPENDENCIES) $(EXTRA_wocky_stanza_test_DEPENDENCIES) @rm -f wocky-stanza-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_stanza_test_OBJECTS) $(wocky_stanza_test_LDADD) $(LIBS) -wocky-test-sasl-auth$(EXEEXT): $(wocky_test_sasl_auth_OBJECTS) $(wocky_test_sasl_auth_DEPENDENCIES) +wocky-test-sasl-auth$(EXEEXT): $(wocky_test_sasl_auth_OBJECTS) $(wocky_test_sasl_auth_DEPENDENCIES) $(EXTRA_wocky_test_sasl_auth_DEPENDENCIES) @rm -f wocky-test-sasl-auth$(EXEEXT) $(AM_V_CCLD)$(wocky_test_sasl_auth_LINK) $(wocky_test_sasl_auth_OBJECTS) $(wocky_test_sasl_auth_LDADD) $(LIBS) -wocky-tls-test$(EXEEXT): $(wocky_tls_test_OBJECTS) $(wocky_tls_test_DEPENDENCIES) +wocky-tls-test$(EXEEXT): $(wocky_tls_test_OBJECTS) $(wocky_tls_test_DEPENDENCIES) $(EXTRA_wocky_tls_test_DEPENDENCIES) @rm -f wocky-tls-test$(EXEEXT) $(AM_V_CCLD)$(wocky_tls_test_LINK) $(wocky_tls_test_OBJECTS) $(wocky_tls_test_LDADD) $(LIBS) -wocky-utils-test$(EXEEXT): $(wocky_utils_test_OBJECTS) $(wocky_utils_test_DEPENDENCIES) +wocky-utils-test$(EXEEXT): $(wocky_utils_test_OBJECTS) $(wocky_utils_test_DEPENDENCIES) $(EXTRA_wocky_utils_test_DEPENDENCIES) @rm -f wocky-utils-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_utils_test_OBJECTS) $(wocky_utils_test_LDADD) $(LIBS) -wocky-xmpp-connection-test$(EXEEXT): $(wocky_xmpp_connection_test_OBJECTS) $(wocky_xmpp_connection_test_DEPENDENCIES) +wocky-xmpp-connection-test$(EXEEXT): $(wocky_xmpp_connection_test_OBJECTS) $(wocky_xmpp_connection_test_DEPENDENCIES) $(EXTRA_wocky_xmpp_connection_test_DEPENDENCIES) @rm -f wocky-xmpp-connection-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_xmpp_connection_test_OBJECTS) $(wocky_xmpp_connection_test_LDADD) $(LIBS) -wocky-xmpp-node-test$(EXEEXT): $(wocky_xmpp_node_test_OBJECTS) $(wocky_xmpp_node_test_DEPENDENCIES) +wocky-xmpp-node-test$(EXEEXT): $(wocky_xmpp_node_test_OBJECTS) $(wocky_xmpp_node_test_DEPENDENCIES) $(EXTRA_wocky_xmpp_node_test_DEPENDENCIES) @rm -f wocky-xmpp-node-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_xmpp_node_test_OBJECTS) $(wocky_xmpp_node_test_LDADD) $(LIBS) -wocky-xmpp-reader-test$(EXEEXT): $(wocky_xmpp_reader_test_OBJECTS) $(wocky_xmpp_reader_test_DEPENDENCIES) +wocky-xmpp-reader-test$(EXEEXT): $(wocky_xmpp_reader_test_OBJECTS) $(wocky_xmpp_reader_test_DEPENDENCIES) $(EXTRA_wocky_xmpp_reader_test_DEPENDENCIES) @rm -f wocky-xmpp-reader-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_xmpp_reader_test_OBJECTS) $(wocky_xmpp_reader_test_LDADD) $(LIBS) -wocky-xmpp-readwrite-test$(EXEEXT): $(wocky_xmpp_readwrite_test_OBJECTS) $(wocky_xmpp_readwrite_test_DEPENDENCIES) +wocky-xmpp-readwrite-test$(EXEEXT): $(wocky_xmpp_readwrite_test_OBJECTS) $(wocky_xmpp_readwrite_test_DEPENDENCIES) $(EXTRA_wocky_xmpp_readwrite_test_DEPENDENCIES) @rm -f wocky-xmpp-readwrite-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wocky_xmpp_readwrite_test_OBJECTS) $(wocky_xmpp_readwrite_test_LDADD) $(LIBS) @@ -886,250 +887,219 @@ .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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< wocky_connector_test-wocky-connector-test.o: wocky-connector-test.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -MT wocky_connector_test-wocky-connector-test.o -MD -MP -MF $(DEPDIR)/wocky_connector_test-wocky-connector-test.Tpo -c -o wocky_connector_test-wocky-connector-test.o `test -f 'wocky-connector-test.c' || echo '$(srcdir)/'`wocky-connector-test.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_connector_test-wocky-connector-test.Tpo $(DEPDIR)/wocky_connector_test-wocky-connector-test.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-connector-test.c' object='wocky_connector_test-wocky-connector-test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-connector-test.c' object='wocky_connector_test-wocky-connector-test.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-connector-test.o `test -f 'wocky-connector-test.c' || echo '$(srcdir)/'`wocky-connector-test.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-connector-test.o `test -f 'wocky-connector-test.c' || echo '$(srcdir)/'`wocky-connector-test.c wocky_connector_test-wocky-connector-test.obj: wocky-connector-test.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -MT wocky_connector_test-wocky-connector-test.obj -MD -MP -MF $(DEPDIR)/wocky_connector_test-wocky-connector-test.Tpo -c -o wocky_connector_test-wocky-connector-test.obj `if test -f 'wocky-connector-test.c'; then $(CYGPATH_W) 'wocky-connector-test.c'; else $(CYGPATH_W) '$(srcdir)/wocky-connector-test.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_connector_test-wocky-connector-test.Tpo $(DEPDIR)/wocky_connector_test-wocky-connector-test.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-connector-test.c' object='wocky_connector_test-wocky-connector-test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-connector-test.c' object='wocky_connector_test-wocky-connector-test.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-connector-test.obj `if test -f 'wocky-connector-test.c'; then $(CYGPATH_W) 'wocky-connector-test.c'; else $(CYGPATH_W) '$(srcdir)/wocky-connector-test.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-connector-test.obj `if test -f 'wocky-connector-test.c'; then $(CYGPATH_W) 'wocky-connector-test.c'; else $(CYGPATH_W) '$(srcdir)/wocky-connector-test.c'; fi` wocky_connector_test-wocky-test-sasl-auth-server.o: wocky-test-sasl-auth-server.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -MT wocky_connector_test-wocky-test-sasl-auth-server.o -MD -MP -MF $(DEPDIR)/wocky_connector_test-wocky-test-sasl-auth-server.Tpo -c -o wocky_connector_test-wocky-test-sasl-auth-server.o `test -f 'wocky-test-sasl-auth-server.c' || echo '$(srcdir)/'`wocky-test-sasl-auth-server.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_connector_test-wocky-test-sasl-auth-server.Tpo $(DEPDIR)/wocky_connector_test-wocky-test-sasl-auth-server.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-sasl-auth-server.c' object='wocky_connector_test-wocky-test-sasl-auth-server.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-sasl-auth-server.c' object='wocky_connector_test-wocky-test-sasl-auth-server.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-test-sasl-auth-server.o `test -f 'wocky-test-sasl-auth-server.c' || echo '$(srcdir)/'`wocky-test-sasl-auth-server.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-test-sasl-auth-server.o `test -f 'wocky-test-sasl-auth-server.c' || echo '$(srcdir)/'`wocky-test-sasl-auth-server.c wocky_connector_test-wocky-test-sasl-auth-server.obj: wocky-test-sasl-auth-server.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -MT wocky_connector_test-wocky-test-sasl-auth-server.obj -MD -MP -MF $(DEPDIR)/wocky_connector_test-wocky-test-sasl-auth-server.Tpo -c -o wocky_connector_test-wocky-test-sasl-auth-server.obj `if test -f 'wocky-test-sasl-auth-server.c'; then $(CYGPATH_W) 'wocky-test-sasl-auth-server.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-sasl-auth-server.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_connector_test-wocky-test-sasl-auth-server.Tpo $(DEPDIR)/wocky_connector_test-wocky-test-sasl-auth-server.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-sasl-auth-server.c' object='wocky_connector_test-wocky-test-sasl-auth-server.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-sasl-auth-server.c' object='wocky_connector_test-wocky-test-sasl-auth-server.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-test-sasl-auth-server.obj `if test -f 'wocky-test-sasl-auth-server.c'; then $(CYGPATH_W) 'wocky-test-sasl-auth-server.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-sasl-auth-server.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-test-sasl-auth-server.obj `if test -f 'wocky-test-sasl-auth-server.c'; then $(CYGPATH_W) 'wocky-test-sasl-auth-server.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-sasl-auth-server.c'; fi` wocky_connector_test-wocky-test-connector-server.o: wocky-test-connector-server.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -MT wocky_connector_test-wocky-test-connector-server.o -MD -MP -MF $(DEPDIR)/wocky_connector_test-wocky-test-connector-server.Tpo -c -o wocky_connector_test-wocky-test-connector-server.o `test -f 'wocky-test-connector-server.c' || echo '$(srcdir)/'`wocky-test-connector-server.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_connector_test-wocky-test-connector-server.Tpo $(DEPDIR)/wocky_connector_test-wocky-test-connector-server.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-connector-server.c' object='wocky_connector_test-wocky-test-connector-server.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-connector-server.c' object='wocky_connector_test-wocky-test-connector-server.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-test-connector-server.o `test -f 'wocky-test-connector-server.c' || echo '$(srcdir)/'`wocky-test-connector-server.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-test-connector-server.o `test -f 'wocky-test-connector-server.c' || echo '$(srcdir)/'`wocky-test-connector-server.c wocky_connector_test-wocky-test-connector-server.obj: wocky-test-connector-server.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -MT wocky_connector_test-wocky-test-connector-server.obj -MD -MP -MF $(DEPDIR)/wocky_connector_test-wocky-test-connector-server.Tpo -c -o wocky_connector_test-wocky-test-connector-server.obj `if test -f 'wocky-test-connector-server.c'; then $(CYGPATH_W) 'wocky-test-connector-server.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-connector-server.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_connector_test-wocky-test-connector-server.Tpo $(DEPDIR)/wocky_connector_test-wocky-test-connector-server.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-connector-server.c' object='wocky_connector_test-wocky-test-connector-server.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-connector-server.c' object='wocky_connector_test-wocky-test-connector-server.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-test-connector-server.obj `if test -f 'wocky-test-connector-server.c'; then $(CYGPATH_W) 'wocky-test-connector-server.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-connector-server.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-test-connector-server.obj `if test -f 'wocky-test-connector-server.c'; then $(CYGPATH_W) 'wocky-test-connector-server.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-connector-server.c'; fi` wocky_connector_test-wocky-test-helper.o: wocky-test-helper.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -MT wocky_connector_test-wocky-test-helper.o -MD -MP -MF $(DEPDIR)/wocky_connector_test-wocky-test-helper.Tpo -c -o wocky_connector_test-wocky-test-helper.o `test -f 'wocky-test-helper.c' || echo '$(srcdir)/'`wocky-test-helper.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_connector_test-wocky-test-helper.Tpo $(DEPDIR)/wocky_connector_test-wocky-test-helper.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-helper.c' object='wocky_connector_test-wocky-test-helper.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-helper.c' object='wocky_connector_test-wocky-test-helper.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-test-helper.o `test -f 'wocky-test-helper.c' || echo '$(srcdir)/'`wocky-test-helper.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-test-helper.o `test -f 'wocky-test-helper.c' || echo '$(srcdir)/'`wocky-test-helper.c wocky_connector_test-wocky-test-helper.obj: wocky-test-helper.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -MT wocky_connector_test-wocky-test-helper.obj -MD -MP -MF $(DEPDIR)/wocky_connector_test-wocky-test-helper.Tpo -c -o wocky_connector_test-wocky-test-helper.obj `if test -f 'wocky-test-helper.c'; then $(CYGPATH_W) 'wocky-test-helper.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-helper.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_connector_test-wocky-test-helper.Tpo $(DEPDIR)/wocky_connector_test-wocky-test-helper.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-helper.c' object='wocky_connector_test-wocky-test-helper.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-helper.c' object='wocky_connector_test-wocky-test-helper.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-test-helper.obj `if test -f 'wocky-test-helper.c'; then $(CYGPATH_W) 'wocky-test-helper.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-helper.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-test-helper.obj `if test -f 'wocky-test-helper.c'; then $(CYGPATH_W) 'wocky-test-helper.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-helper.c'; fi` wocky_connector_test-wocky-test-stream.o: wocky-test-stream.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -MT wocky_connector_test-wocky-test-stream.o -MD -MP -MF $(DEPDIR)/wocky_connector_test-wocky-test-stream.Tpo -c -o wocky_connector_test-wocky-test-stream.o `test -f 'wocky-test-stream.c' || echo '$(srcdir)/'`wocky-test-stream.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_connector_test-wocky-test-stream.Tpo $(DEPDIR)/wocky_connector_test-wocky-test-stream.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-stream.c' object='wocky_connector_test-wocky-test-stream.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-stream.c' object='wocky_connector_test-wocky-test-stream.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-test-stream.o `test -f 'wocky-test-stream.c' || echo '$(srcdir)/'`wocky-test-stream.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-test-stream.o `test -f 'wocky-test-stream.c' || echo '$(srcdir)/'`wocky-test-stream.c wocky_connector_test-wocky-test-stream.obj: wocky-test-stream.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -MT wocky_connector_test-wocky-test-stream.obj -MD -MP -MF $(DEPDIR)/wocky_connector_test-wocky-test-stream.Tpo -c -o wocky_connector_test-wocky-test-stream.obj `if test -f 'wocky-test-stream.c'; then $(CYGPATH_W) 'wocky-test-stream.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-stream.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_connector_test-wocky-test-stream.Tpo $(DEPDIR)/wocky_connector_test-wocky-test-stream.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-stream.c' object='wocky_connector_test-wocky-test-stream.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-stream.c' object='wocky_connector_test-wocky-test-stream.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-test-stream.obj `if test -f 'wocky-test-stream.c'; then $(CYGPATH_W) 'wocky-test-stream.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-stream.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-wocky-test-stream.obj `if test -f 'wocky-test-stream.c'; then $(CYGPATH_W) 'wocky-test-stream.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-stream.c'; fi` wocky_connector_test-test-resolver.o: test-resolver.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -MT wocky_connector_test-test-resolver.o -MD -MP -MF $(DEPDIR)/wocky_connector_test-test-resolver.Tpo -c -o wocky_connector_test-test-resolver.o `test -f 'test-resolver.c' || echo '$(srcdir)/'`test-resolver.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_connector_test-test-resolver.Tpo $(DEPDIR)/wocky_connector_test-test-resolver.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-resolver.c' object='wocky_connector_test-test-resolver.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-resolver.c' object='wocky_connector_test-test-resolver.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-test-resolver.o `test -f 'test-resolver.c' || echo '$(srcdir)/'`test-resolver.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-test-resolver.o `test -f 'test-resolver.c' || echo '$(srcdir)/'`test-resolver.c wocky_connector_test-test-resolver.obj: test-resolver.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -MT wocky_connector_test-test-resolver.obj -MD -MP -MF $(DEPDIR)/wocky_connector_test-test-resolver.Tpo -c -o wocky_connector_test-test-resolver.obj `if test -f 'test-resolver.c'; then $(CYGPATH_W) 'test-resolver.c'; else $(CYGPATH_W) '$(srcdir)/test-resolver.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_connector_test-test-resolver.Tpo $(DEPDIR)/wocky_connector_test-test-resolver.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-resolver.c' object='wocky_connector_test-test-resolver.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-resolver.c' object='wocky_connector_test-test-resolver.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-test-resolver.obj `if test -f 'test-resolver.c'; then $(CYGPATH_W) 'test-resolver.c'; else $(CYGPATH_W) '$(srcdir)/test-resolver.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_connector_test_CFLAGS) $(CFLAGS) -c -o wocky_connector_test-test-resolver.obj `if test -f 'test-resolver.c'; then $(CYGPATH_W) 'test-resolver.c'; else $(CYGPATH_W) '$(srcdir)/test-resolver.c'; fi` wocky_test_sasl_auth-wocky-test-helper.o: wocky-test-helper.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -MT wocky_test_sasl_auth-wocky-test-helper.o -MD -MP -MF $(DEPDIR)/wocky_test_sasl_auth-wocky-test-helper.Tpo -c -o wocky_test_sasl_auth-wocky-test-helper.o `test -f 'wocky-test-helper.c' || echo '$(srcdir)/'`wocky-test-helper.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_test_sasl_auth-wocky-test-helper.Tpo $(DEPDIR)/wocky_test_sasl_auth-wocky-test-helper.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-helper.c' object='wocky_test_sasl_auth-wocky-test-helper.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-helper.c' object='wocky_test_sasl_auth-wocky-test-helper.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-helper.o `test -f 'wocky-test-helper.c' || echo '$(srcdir)/'`wocky-test-helper.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-helper.o `test -f 'wocky-test-helper.c' || echo '$(srcdir)/'`wocky-test-helper.c wocky_test_sasl_auth-wocky-test-helper.obj: wocky-test-helper.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -MT wocky_test_sasl_auth-wocky-test-helper.obj -MD -MP -MF $(DEPDIR)/wocky_test_sasl_auth-wocky-test-helper.Tpo -c -o wocky_test_sasl_auth-wocky-test-helper.obj `if test -f 'wocky-test-helper.c'; then $(CYGPATH_W) 'wocky-test-helper.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-helper.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_test_sasl_auth-wocky-test-helper.Tpo $(DEPDIR)/wocky_test_sasl_auth-wocky-test-helper.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-helper.c' object='wocky_test_sasl_auth-wocky-test-helper.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-helper.c' object='wocky_test_sasl_auth-wocky-test-helper.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-helper.obj `if test -f 'wocky-test-helper.c'; then $(CYGPATH_W) 'wocky-test-helper.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-helper.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-helper.obj `if test -f 'wocky-test-helper.c'; then $(CYGPATH_W) 'wocky-test-helper.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-helper.c'; fi` wocky_test_sasl_auth-wocky-test-sasl-auth.o: wocky-test-sasl-auth.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -MT wocky_test_sasl_auth-wocky-test-sasl-auth.o -MD -MP -MF $(DEPDIR)/wocky_test_sasl_auth-wocky-test-sasl-auth.Tpo -c -o wocky_test_sasl_auth-wocky-test-sasl-auth.o `test -f 'wocky-test-sasl-auth.c' || echo '$(srcdir)/'`wocky-test-sasl-auth.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_test_sasl_auth-wocky-test-sasl-auth.Tpo $(DEPDIR)/wocky_test_sasl_auth-wocky-test-sasl-auth.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-sasl-auth.c' object='wocky_test_sasl_auth-wocky-test-sasl-auth.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-sasl-auth.c' object='wocky_test_sasl_auth-wocky-test-sasl-auth.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-sasl-auth.o `test -f 'wocky-test-sasl-auth.c' || echo '$(srcdir)/'`wocky-test-sasl-auth.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-sasl-auth.o `test -f 'wocky-test-sasl-auth.c' || echo '$(srcdir)/'`wocky-test-sasl-auth.c wocky_test_sasl_auth-wocky-test-sasl-auth.obj: wocky-test-sasl-auth.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -MT wocky_test_sasl_auth-wocky-test-sasl-auth.obj -MD -MP -MF $(DEPDIR)/wocky_test_sasl_auth-wocky-test-sasl-auth.Tpo -c -o wocky_test_sasl_auth-wocky-test-sasl-auth.obj `if test -f 'wocky-test-sasl-auth.c'; then $(CYGPATH_W) 'wocky-test-sasl-auth.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-sasl-auth.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_test_sasl_auth-wocky-test-sasl-auth.Tpo $(DEPDIR)/wocky_test_sasl_auth-wocky-test-sasl-auth.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-sasl-auth.c' object='wocky_test_sasl_auth-wocky-test-sasl-auth.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-sasl-auth.c' object='wocky_test_sasl_auth-wocky-test-sasl-auth.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-sasl-auth.obj `if test -f 'wocky-test-sasl-auth.c'; then $(CYGPATH_W) 'wocky-test-sasl-auth.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-sasl-auth.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-sasl-auth.obj `if test -f 'wocky-test-sasl-auth.c'; then $(CYGPATH_W) 'wocky-test-sasl-auth.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-sasl-auth.c'; fi` wocky_test_sasl_auth-wocky-test-sasl-handler.o: wocky-test-sasl-handler.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -MT wocky_test_sasl_auth-wocky-test-sasl-handler.o -MD -MP -MF $(DEPDIR)/wocky_test_sasl_auth-wocky-test-sasl-handler.Tpo -c -o wocky_test_sasl_auth-wocky-test-sasl-handler.o `test -f 'wocky-test-sasl-handler.c' || echo '$(srcdir)/'`wocky-test-sasl-handler.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_test_sasl_auth-wocky-test-sasl-handler.Tpo $(DEPDIR)/wocky_test_sasl_auth-wocky-test-sasl-handler.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-sasl-handler.c' object='wocky_test_sasl_auth-wocky-test-sasl-handler.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-sasl-handler.c' object='wocky_test_sasl_auth-wocky-test-sasl-handler.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-sasl-handler.o `test -f 'wocky-test-sasl-handler.c' || echo '$(srcdir)/'`wocky-test-sasl-handler.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-sasl-handler.o `test -f 'wocky-test-sasl-handler.c' || echo '$(srcdir)/'`wocky-test-sasl-handler.c wocky_test_sasl_auth-wocky-test-sasl-handler.obj: wocky-test-sasl-handler.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -MT wocky_test_sasl_auth-wocky-test-sasl-handler.obj -MD -MP -MF $(DEPDIR)/wocky_test_sasl_auth-wocky-test-sasl-handler.Tpo -c -o wocky_test_sasl_auth-wocky-test-sasl-handler.obj `if test -f 'wocky-test-sasl-handler.c'; then $(CYGPATH_W) 'wocky-test-sasl-handler.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-sasl-handler.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_test_sasl_auth-wocky-test-sasl-handler.Tpo $(DEPDIR)/wocky_test_sasl_auth-wocky-test-sasl-handler.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-sasl-handler.c' object='wocky_test_sasl_auth-wocky-test-sasl-handler.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-sasl-handler.c' object='wocky_test_sasl_auth-wocky-test-sasl-handler.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-sasl-handler.obj `if test -f 'wocky-test-sasl-handler.c'; then $(CYGPATH_W) 'wocky-test-sasl-handler.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-sasl-handler.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-sasl-handler.obj `if test -f 'wocky-test-sasl-handler.c'; then $(CYGPATH_W) 'wocky-test-sasl-handler.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-sasl-handler.c'; fi` wocky_test_sasl_auth-wocky-test-sasl-auth-server.o: wocky-test-sasl-auth-server.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -MT wocky_test_sasl_auth-wocky-test-sasl-auth-server.o -MD -MP -MF $(DEPDIR)/wocky_test_sasl_auth-wocky-test-sasl-auth-server.Tpo -c -o wocky_test_sasl_auth-wocky-test-sasl-auth-server.o `test -f 'wocky-test-sasl-auth-server.c' || echo '$(srcdir)/'`wocky-test-sasl-auth-server.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_test_sasl_auth-wocky-test-sasl-auth-server.Tpo $(DEPDIR)/wocky_test_sasl_auth-wocky-test-sasl-auth-server.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-sasl-auth-server.c' object='wocky_test_sasl_auth-wocky-test-sasl-auth-server.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-sasl-auth-server.c' object='wocky_test_sasl_auth-wocky-test-sasl-auth-server.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-sasl-auth-server.o `test -f 'wocky-test-sasl-auth-server.c' || echo '$(srcdir)/'`wocky-test-sasl-auth-server.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-sasl-auth-server.o `test -f 'wocky-test-sasl-auth-server.c' || echo '$(srcdir)/'`wocky-test-sasl-auth-server.c wocky_test_sasl_auth-wocky-test-sasl-auth-server.obj: wocky-test-sasl-auth-server.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -MT wocky_test_sasl_auth-wocky-test-sasl-auth-server.obj -MD -MP -MF $(DEPDIR)/wocky_test_sasl_auth-wocky-test-sasl-auth-server.Tpo -c -o wocky_test_sasl_auth-wocky-test-sasl-auth-server.obj `if test -f 'wocky-test-sasl-auth-server.c'; then $(CYGPATH_W) 'wocky-test-sasl-auth-server.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-sasl-auth-server.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_test_sasl_auth-wocky-test-sasl-auth-server.Tpo $(DEPDIR)/wocky_test_sasl_auth-wocky-test-sasl-auth-server.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-sasl-auth-server.c' object='wocky_test_sasl_auth-wocky-test-sasl-auth-server.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-sasl-auth-server.c' object='wocky_test_sasl_auth-wocky-test-sasl-auth-server.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-sasl-auth-server.obj `if test -f 'wocky-test-sasl-auth-server.c'; then $(CYGPATH_W) 'wocky-test-sasl-auth-server.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-sasl-auth-server.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-sasl-auth-server.obj `if test -f 'wocky-test-sasl-auth-server.c'; then $(CYGPATH_W) 'wocky-test-sasl-auth-server.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-sasl-auth-server.c'; fi` wocky_test_sasl_auth-wocky-test-stream.o: wocky-test-stream.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -MT wocky_test_sasl_auth-wocky-test-stream.o -MD -MP -MF $(DEPDIR)/wocky_test_sasl_auth-wocky-test-stream.Tpo -c -o wocky_test_sasl_auth-wocky-test-stream.o `test -f 'wocky-test-stream.c' || echo '$(srcdir)/'`wocky-test-stream.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_test_sasl_auth-wocky-test-stream.Tpo $(DEPDIR)/wocky_test_sasl_auth-wocky-test-stream.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-stream.c' object='wocky_test_sasl_auth-wocky-test-stream.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-stream.c' object='wocky_test_sasl_auth-wocky-test-stream.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-stream.o `test -f 'wocky-test-stream.c' || echo '$(srcdir)/'`wocky-test-stream.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-stream.o `test -f 'wocky-test-stream.c' || echo '$(srcdir)/'`wocky-test-stream.c wocky_test_sasl_auth-wocky-test-stream.obj: wocky-test-stream.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -MT wocky_test_sasl_auth-wocky-test-stream.obj -MD -MP -MF $(DEPDIR)/wocky_test_sasl_auth-wocky-test-stream.Tpo -c -o wocky_test_sasl_auth-wocky-test-stream.obj `if test -f 'wocky-test-stream.c'; then $(CYGPATH_W) 'wocky-test-stream.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-stream.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_test_sasl_auth-wocky-test-stream.Tpo $(DEPDIR)/wocky_test_sasl_auth-wocky-test-stream.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-stream.c' object='wocky_test_sasl_auth-wocky-test-stream.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-stream.c' object='wocky_test_sasl_auth-wocky-test-stream.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-stream.obj `if test -f 'wocky-test-stream.c'; then $(CYGPATH_W) 'wocky-test-stream.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-stream.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_test_sasl_auth_CFLAGS) $(CFLAGS) -c -o wocky_test_sasl_auth-wocky-test-stream.obj `if test -f 'wocky-test-stream.c'; then $(CYGPATH_W) 'wocky-test-stream.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-stream.c'; fi` wocky_tls_test-wocky-tls-test.o: wocky-tls-test.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_tls_test_CFLAGS) $(CFLAGS) -MT wocky_tls_test-wocky-tls-test.o -MD -MP -MF $(DEPDIR)/wocky_tls_test-wocky-tls-test.Tpo -c -o wocky_tls_test-wocky-tls-test.o `test -f 'wocky-tls-test.c' || echo '$(srcdir)/'`wocky-tls-test.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_tls_test-wocky-tls-test.Tpo $(DEPDIR)/wocky_tls_test-wocky-tls-test.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-tls-test.c' object='wocky_tls_test-wocky-tls-test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-tls-test.c' object='wocky_tls_test-wocky-tls-test.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_tls_test_CFLAGS) $(CFLAGS) -c -o wocky_tls_test-wocky-tls-test.o `test -f 'wocky-tls-test.c' || echo '$(srcdir)/'`wocky-tls-test.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_tls_test_CFLAGS) $(CFLAGS) -c -o wocky_tls_test-wocky-tls-test.o `test -f 'wocky-tls-test.c' || echo '$(srcdir)/'`wocky-tls-test.c wocky_tls_test-wocky-tls-test.obj: wocky-tls-test.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_tls_test_CFLAGS) $(CFLAGS) -MT wocky_tls_test-wocky-tls-test.obj -MD -MP -MF $(DEPDIR)/wocky_tls_test-wocky-tls-test.Tpo -c -o wocky_tls_test-wocky-tls-test.obj `if test -f 'wocky-tls-test.c'; then $(CYGPATH_W) 'wocky-tls-test.c'; else $(CYGPATH_W) '$(srcdir)/wocky-tls-test.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_tls_test-wocky-tls-test.Tpo $(DEPDIR)/wocky_tls_test-wocky-tls-test.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-tls-test.c' object='wocky_tls_test-wocky-tls-test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-tls-test.c' object='wocky_tls_test-wocky-tls-test.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_tls_test_CFLAGS) $(CFLAGS) -c -o wocky_tls_test-wocky-tls-test.obj `if test -f 'wocky-tls-test.c'; then $(CYGPATH_W) 'wocky-tls-test.c'; else $(CYGPATH_W) '$(srcdir)/wocky-tls-test.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_tls_test_CFLAGS) $(CFLAGS) -c -o wocky_tls_test-wocky-tls-test.obj `if test -f 'wocky-tls-test.c'; then $(CYGPATH_W) 'wocky-tls-test.c'; else $(CYGPATH_W) '$(srcdir)/wocky-tls-test.c'; fi` wocky_tls_test-wocky-test-helper.o: wocky-test-helper.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_tls_test_CFLAGS) $(CFLAGS) -MT wocky_tls_test-wocky-test-helper.o -MD -MP -MF $(DEPDIR)/wocky_tls_test-wocky-test-helper.Tpo -c -o wocky_tls_test-wocky-test-helper.o `test -f 'wocky-test-helper.c' || echo '$(srcdir)/'`wocky-test-helper.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_tls_test-wocky-test-helper.Tpo $(DEPDIR)/wocky_tls_test-wocky-test-helper.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-helper.c' object='wocky_tls_test-wocky-test-helper.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-helper.c' object='wocky_tls_test-wocky-test-helper.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_tls_test_CFLAGS) $(CFLAGS) -c -o wocky_tls_test-wocky-test-helper.o `test -f 'wocky-test-helper.c' || echo '$(srcdir)/'`wocky-test-helper.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_tls_test_CFLAGS) $(CFLAGS) -c -o wocky_tls_test-wocky-test-helper.o `test -f 'wocky-test-helper.c' || echo '$(srcdir)/'`wocky-test-helper.c wocky_tls_test-wocky-test-helper.obj: wocky-test-helper.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_tls_test_CFLAGS) $(CFLAGS) -MT wocky_tls_test-wocky-test-helper.obj -MD -MP -MF $(DEPDIR)/wocky_tls_test-wocky-test-helper.Tpo -c -o wocky_tls_test-wocky-test-helper.obj `if test -f 'wocky-test-helper.c'; then $(CYGPATH_W) 'wocky-test-helper.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-helper.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_tls_test-wocky-test-helper.Tpo $(DEPDIR)/wocky_tls_test-wocky-test-helper.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-helper.c' object='wocky_tls_test-wocky-test-helper.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-helper.c' object='wocky_tls_test-wocky-test-helper.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_tls_test_CFLAGS) $(CFLAGS) -c -o wocky_tls_test-wocky-test-helper.obj `if test -f 'wocky-test-helper.c'; then $(CYGPATH_W) 'wocky-test-helper.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-helper.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_tls_test_CFLAGS) $(CFLAGS) -c -o wocky_tls_test-wocky-test-helper.obj `if test -f 'wocky-test-helper.c'; then $(CYGPATH_W) 'wocky-test-helper.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-helper.c'; fi` wocky_tls_test-wocky-test-stream.o: wocky-test-stream.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_tls_test_CFLAGS) $(CFLAGS) -MT wocky_tls_test-wocky-test-stream.o -MD -MP -MF $(DEPDIR)/wocky_tls_test-wocky-test-stream.Tpo -c -o wocky_tls_test-wocky-test-stream.o `test -f 'wocky-test-stream.c' || echo '$(srcdir)/'`wocky-test-stream.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_tls_test-wocky-test-stream.Tpo $(DEPDIR)/wocky_tls_test-wocky-test-stream.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-stream.c' object='wocky_tls_test-wocky-test-stream.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-stream.c' object='wocky_tls_test-wocky-test-stream.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_tls_test_CFLAGS) $(CFLAGS) -c -o wocky_tls_test-wocky-test-stream.o `test -f 'wocky-test-stream.c' || echo '$(srcdir)/'`wocky-test-stream.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_tls_test_CFLAGS) $(CFLAGS) -c -o wocky_tls_test-wocky-test-stream.o `test -f 'wocky-test-stream.c' || echo '$(srcdir)/'`wocky-test-stream.c wocky_tls_test-wocky-test-stream.obj: wocky-test-stream.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_tls_test_CFLAGS) $(CFLAGS) -MT wocky_tls_test-wocky-test-stream.obj -MD -MP -MF $(DEPDIR)/wocky_tls_test-wocky-test-stream.Tpo -c -o wocky_tls_test-wocky-test-stream.obj `if test -f 'wocky-test-stream.c'; then $(CYGPATH_W) 'wocky-test-stream.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-stream.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/wocky_tls_test-wocky-test-stream.Tpo $(DEPDIR)/wocky_tls_test-wocky-test-stream.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wocky-test-stream.c' object='wocky_tls_test-wocky-test-stream.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='wocky-test-stream.c' object='wocky_tls_test-wocky-test-stream.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_tls_test_CFLAGS) $(CFLAGS) -c -o wocky_tls_test-wocky-test-stream.obj `if test -f 'wocky-test-stream.c'; then $(CYGPATH_W) 'wocky-test-stream.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-stream.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wocky_tls_test_CFLAGS) $(CFLAGS) -c -o wocky_tls_test-wocky-test-stream.obj `if test -f 'wocky-test-stream.c'; then $(CYGPATH_W) 'wocky-test-stream.c'; else $(CYGPATH_W) '$(srcdir)/wocky-test-stream.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -1235,10 +1205,15 @@ installcheck: installcheck-am install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/tools/Makefile.in telepathy-salut-0.8.0/lib/ext/wocky/tools/Makefile.in --- telepathy-salut-0.7.2/lib/ext/wocky/tools/Makefile.in 2012-03-15 18:43:39.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/tools/Makefile.in 2012-04-04 16:37:45.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -310,10 +310,15 @@ installcheck: installcheck-am install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/lib/ext/wocky/wocky/Makefile.in telepathy-salut-0.8.0/lib/ext/wocky/wocky/Makefile.in --- telepathy-salut-0.7.2/lib/ext/wocky/wocky/Makefile.in 2012-03-15 18:43:39.000000000 +0000 +++ telepathy-salut-0.8.0/lib/ext/wocky/wocky/Makefile.in 2012-04-04 16:37:45.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -82,6 +82,12 @@ 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)$(libwocky_ladir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = @@ -177,8 +183,8 @@ am_libwocky_la_OBJECTS = $(am__objects_7) $(am__objects_8) \ $(am__objects_9) $(am__objects_9) libwocky_la_OBJECTS = $(am_libwocky_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent libwocky_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -195,21 +201,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) 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_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libwocky_la_SOURCES) DIST_SOURCES = $(am__libwocky_la_SOURCES_DIST) @@ -574,6 +580,7 @@ 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: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -625,7 +632,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libwocky.la: $(libwocky_la_OBJECTS) $(libwocky_la_DEPENDENCIES) +libwocky.la: $(libwocky_la_OBJECTS) $(libwocky_la_DEPENDENCIES) $(EXTRA_libwocky_la_DEPENDENCIES) $(AM_V_CCLD)$(libwocky_la_LINK) $(am_libwocky_la_rpath) $(libwocky_la_OBJECTS) $(libwocky_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -704,26 +711,23 @@ .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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -747,9 +751,7 @@ @$(NORMAL_UNINSTALL) @list='$(libwocky_la_HEADERS)'; test -n "$(libwocky_ladir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libwocky_ladir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libwocky_ladir)" && rm -f $$files + dir='$(DESTDIR)$(libwocky_ladir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -856,10 +858,15 @@ installcheck: installcheck-am install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/lib/gibber/gibber-oob-file-transfer.c telepathy-salut-0.8.0/lib/gibber/gibber-oob-file-transfer.c --- telepathy-salut-0.7.2/lib/gibber/gibber-oob-file-transfer.c 2012-03-25 13:34:59.000000000 +0000 +++ telepathy-salut-0.8.0/lib/gibber/gibber-oob-file-transfer.c 2012-04-04 00:28:20.000000000 +0000 @@ -929,6 +929,8 @@ { GibberOobFileTransfer *self = GIBBER_OOB_FILE_TRANSFER (ft); + g_return_if_fail (self->priv->msg != NULL); + DEBUG("Starting HTTP chunked file transfer"); self->priv->channel = src; g_io_channel_ref (src); diff -Nru telepathy-salut-0.7.2/lib/gibber/Makefile.in telepathy-salut-0.8.0/lib/gibber/Makefile.in --- telepathy-salut-0.7.2/lib/gibber/Makefile.in 2012-03-26 17:19:21.000000000 +0000 +++ telepathy-salut-0.8.0/lib/gibber/Makefile.in 2012-04-04 16:37:35.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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 @@ gibber-signals-marshal.lo am_libgibber_la_OBJECTS = $(am__objects_1) $(am__objects_2) libgibber_la_OBJECTS = $(am_libgibber_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -87,21 +87,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) 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_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libgibber_la_SOURCES) DIST_SOURCES = $(libgibber_la_SOURCES) @@ -421,6 +421,7 @@ 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 @@ -439,7 +440,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libgibber.la: $(libgibber_la_OBJECTS) $(libgibber_la_DEPENDENCIES) +libgibber.la: $(libgibber_la_OBJECTS) $(libgibber_la_DEPENDENCIES) $(EXTRA_libgibber_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libgibber_la_OBJECTS) $(libgibber_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -475,26 +476,23 @@ .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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -716,10 +714,15 @@ installcheck: installcheck-recursive install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/lib/gibber/tests/Makefile.in telepathy-salut-0.8.0/lib/gibber/tests/Makefile.in --- telepathy-salut-0.7.2/lib/gibber/tests/Makefile.in 2012-03-26 17:19:21.000000000 +0000 +++ telepathy-salut-0.8.0/lib/gibber/tests/Makefile.in 2012-04-04 16:37:35.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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 @@ check_gibber_listener_SOURCES = check-gibber-listener.c check_gibber_listener_OBJECTS = check-gibber-listener.$(OBJEXT) check_gibber_listener_LDADD = $(LDADD) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent check_gibber_r_multicast_causal_transport_SOURCES = \ check-gibber-r-multicast-causal-transport.c @@ -109,21 +109,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) 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_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = check-gibber-listener.c \ check-gibber-r-multicast-causal-transport.c \ @@ -383,6 +383,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/rules/check.mak $(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 @@ -410,22 +411,22 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -check-gibber-listener$(EXEEXT): $(check_gibber_listener_OBJECTS) $(check_gibber_listener_DEPENDENCIES) +check-gibber-listener$(EXEEXT): $(check_gibber_listener_OBJECTS) $(check_gibber_listener_DEPENDENCIES) $(EXTRA_check_gibber_listener_DEPENDENCIES) @rm -f check-gibber-listener$(EXEEXT) $(AM_V_CCLD)$(LINK) $(check_gibber_listener_OBJECTS) $(check_gibber_listener_LDADD) $(LIBS) -check-gibber-r-multicast-causal-transport$(EXEEXT): $(check_gibber_r_multicast_causal_transport_OBJECTS) $(check_gibber_r_multicast_causal_transport_DEPENDENCIES) +check-gibber-r-multicast-causal-transport$(EXEEXT): $(check_gibber_r_multicast_causal_transport_OBJECTS) $(check_gibber_r_multicast_causal_transport_DEPENDENCIES) $(EXTRA_check_gibber_r_multicast_causal_transport_DEPENDENCIES) @rm -f check-gibber-r-multicast-causal-transport$(EXEEXT) $(AM_V_CCLD)$(LINK) $(check_gibber_r_multicast_causal_transport_OBJECTS) $(check_gibber_r_multicast_causal_transport_LDADD) $(LIBS) -check-gibber-r-multicast-packet$(EXEEXT): $(check_gibber_r_multicast_packet_OBJECTS) $(check_gibber_r_multicast_packet_DEPENDENCIES) +check-gibber-r-multicast-packet$(EXEEXT): $(check_gibber_r_multicast_packet_OBJECTS) $(check_gibber_r_multicast_packet_DEPENDENCIES) $(EXTRA_check_gibber_r_multicast_packet_DEPENDENCIES) @rm -f check-gibber-r-multicast-packet$(EXEEXT) $(AM_V_CCLD)$(LINK) $(check_gibber_r_multicast_packet_OBJECTS) $(check_gibber_r_multicast_packet_LDADD) $(LIBS) -check-gibber-r-multicast-sender$(EXEEXT): $(check_gibber_r_multicast_sender_OBJECTS) $(check_gibber_r_multicast_sender_DEPENDENCIES) +check-gibber-r-multicast-sender$(EXEEXT): $(check_gibber_r_multicast_sender_OBJECTS) $(check_gibber_r_multicast_sender_DEPENDENCIES) $(EXTRA_check_gibber_r_multicast_sender_DEPENDENCIES) @rm -f check-gibber-r-multicast-sender$(EXEEXT) $(AM_V_CCLD)$(LINK) $(check_gibber_r_multicast_sender_OBJECTS) $(check_gibber_r_multicast_sender_LDADD) $(LIBS) -check-gibber-unix-transport$(EXEEXT): $(check_gibber_unix_transport_OBJECTS) $(check_gibber_unix_transport_DEPENDENCIES) +check-gibber-unix-transport$(EXEEXT): $(check_gibber_unix_transport_OBJECTS) $(check_gibber_unix_transport_DEPENDENCIES) $(EXTRA_check_gibber_unix_transport_DEPENDENCIES) @rm -f check-gibber-unix-transport$(EXEEXT) $(AM_V_CCLD)$(LINK) $(check_gibber_unix_transport_OBJECTS) $(check_gibber_unix_transport_LDADD) $(LIBS) -test-r-multicast-transport-io$(EXEEXT): $(test_r_multicast_transport_io_OBJECTS) $(test_r_multicast_transport_io_DEPENDENCIES) +test-r-multicast-transport-io$(EXEEXT): $(test_r_multicast_transport_io_OBJECTS) $(test_r_multicast_transport_io_DEPENDENCIES) $(EXTRA_test_r_multicast_transport_io_DEPENDENCIES) @rm -f test-r-multicast-transport-io$(EXEEXT) $(AM_V_CCLD)$(test_r_multicast_transport_io_LINK) $(test_r_multicast_transport_io_OBJECTS) $(test_r_multicast_transport_io_LDADD) $(LIBS) @@ -446,58 +447,51 @@ .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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< test_r_multicast_transport_io-test-r-multicast-transport-io.o: test-r-multicast-transport-io.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_r_multicast_transport_io_CFLAGS) $(CFLAGS) -MT test_r_multicast_transport_io-test-r-multicast-transport-io.o -MD -MP -MF $(DEPDIR)/test_r_multicast_transport_io-test-r-multicast-transport-io.Tpo -c -o test_r_multicast_transport_io-test-r-multicast-transport-io.o `test -f 'test-r-multicast-transport-io.c' || echo '$(srcdir)/'`test-r-multicast-transport-io.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_r_multicast_transport_io-test-r-multicast-transport-io.Tpo $(DEPDIR)/test_r_multicast_transport_io-test-r-multicast-transport-io.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-r-multicast-transport-io.c' object='test_r_multicast_transport_io-test-r-multicast-transport-io.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-r-multicast-transport-io.c' object='test_r_multicast_transport_io-test-r-multicast-transport-io.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_r_multicast_transport_io_CFLAGS) $(CFLAGS) -c -o test_r_multicast_transport_io-test-r-multicast-transport-io.o `test -f 'test-r-multicast-transport-io.c' || echo '$(srcdir)/'`test-r-multicast-transport-io.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_r_multicast_transport_io_CFLAGS) $(CFLAGS) -c -o test_r_multicast_transport_io-test-r-multicast-transport-io.o `test -f 'test-r-multicast-transport-io.c' || echo '$(srcdir)/'`test-r-multicast-transport-io.c test_r_multicast_transport_io-test-r-multicast-transport-io.obj: test-r-multicast-transport-io.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_r_multicast_transport_io_CFLAGS) $(CFLAGS) -MT test_r_multicast_transport_io-test-r-multicast-transport-io.obj -MD -MP -MF $(DEPDIR)/test_r_multicast_transport_io-test-r-multicast-transport-io.Tpo -c -o test_r_multicast_transport_io-test-r-multicast-transport-io.obj `if test -f 'test-r-multicast-transport-io.c'; then $(CYGPATH_W) 'test-r-multicast-transport-io.c'; else $(CYGPATH_W) '$(srcdir)/test-r-multicast-transport-io.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_r_multicast_transport_io-test-r-multicast-transport-io.Tpo $(DEPDIR)/test_r_multicast_transport_io-test-r-multicast-transport-io.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-r-multicast-transport-io.c' object='test_r_multicast_transport_io-test-r-multicast-transport-io.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-r-multicast-transport-io.c' object='test_r_multicast_transport_io-test-r-multicast-transport-io.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_r_multicast_transport_io_CFLAGS) $(CFLAGS) -c -o test_r_multicast_transport_io-test-r-multicast-transport-io.obj `if test -f 'test-r-multicast-transport-io.c'; then $(CYGPATH_W) 'test-r-multicast-transport-io.c'; else $(CYGPATH_W) '$(srcdir)/test-r-multicast-transport-io.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_r_multicast_transport_io_CFLAGS) $(CFLAGS) -c -o test_r_multicast_transport_io-test-r-multicast-transport-io.obj `if test -f 'test-r-multicast-transport-io.c'; then $(CYGPATH_W) 'test-r-multicast-transport-io.c'; else $(CYGPATH_W) '$(srcdir)/test-r-multicast-transport-io.c'; fi` test_r_multicast_transport_io-test-transport.o: test-transport.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_r_multicast_transport_io_CFLAGS) $(CFLAGS) -MT test_r_multicast_transport_io-test-transport.o -MD -MP -MF $(DEPDIR)/test_r_multicast_transport_io-test-transport.Tpo -c -o test_r_multicast_transport_io-test-transport.o `test -f 'test-transport.c' || echo '$(srcdir)/'`test-transport.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_r_multicast_transport_io-test-transport.Tpo $(DEPDIR)/test_r_multicast_transport_io-test-transport.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-transport.c' object='test_r_multicast_transport_io-test-transport.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-transport.c' object='test_r_multicast_transport_io-test-transport.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_r_multicast_transport_io_CFLAGS) $(CFLAGS) -c -o test_r_multicast_transport_io-test-transport.o `test -f 'test-transport.c' || echo '$(srcdir)/'`test-transport.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_r_multicast_transport_io_CFLAGS) $(CFLAGS) -c -o test_r_multicast_transport_io-test-transport.o `test -f 'test-transport.c' || echo '$(srcdir)/'`test-transport.c test_r_multicast_transport_io-test-transport.obj: test-transport.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_r_multicast_transport_io_CFLAGS) $(CFLAGS) -MT test_r_multicast_transport_io-test-transport.obj -MD -MP -MF $(DEPDIR)/test_r_multicast_transport_io-test-transport.Tpo -c -o test_r_multicast_transport_io-test-transport.obj `if test -f 'test-transport.c'; then $(CYGPATH_W) 'test-transport.c'; else $(CYGPATH_W) '$(srcdir)/test-transport.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_r_multicast_transport_io-test-transport.Tpo $(DEPDIR)/test_r_multicast_transport_io-test-transport.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-transport.c' object='test_r_multicast_transport_io-test-transport.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-transport.c' object='test_r_multicast_transport_io-test-transport.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_r_multicast_transport_io_CFLAGS) $(CFLAGS) -c -o test_r_multicast_transport_io-test-transport.obj `if test -f 'test-transport.c'; then $(CYGPATH_W) 'test-transport.c'; else $(CYGPATH_W) '$(srcdir)/test-transport.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_r_multicast_transport_io_CFLAGS) $(CFLAGS) -c -o test_r_multicast_transport_io-test-transport.obj `if test -f 'test-transport.c'; then $(CYGPATH_W) 'test-transport.c'; else $(CYGPATH_W) '$(srcdir)/test-transport.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -638,14 +632,15 @@ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ + col="$$grn"; \ else \ - echo "$$red$$dashes"; \ + col="$$red"; \ fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ + 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}"; \ test "$$failed" -eq 0; \ else :; fi @@ -695,10 +690,15 @@ installcheck: installcheck-am install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/lib/Makefile.in telepathy-salut-0.8.0/lib/Makefile.in --- telepathy-salut-0.7.2/lib/Makefile.in 2012-03-26 17:19:21.000000000 +0000 +++ telepathy-salut-0.8.0/lib/Makefile.in 2012-04-04 16:37:35.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -532,10 +532,15 @@ installcheck: installcheck-recursive install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/ltmain.sh telepathy-salut-0.8.0/ltmain.sh --- telepathy-salut-0.7.2/ltmain.sh 2012-03-15 18:43:26.000000000 +0000 +++ telepathy-salut-0.8.0/ltmain.sh 2012-04-04 16:37:30.000000000 +0000 @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 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,6 +41,7 @@ # --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 @@ -69,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 Debian-2.4-4 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,9 +80,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4 Debian-2.4-4" +VERSION="2.4.2 Debian-2.4.2-1" TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -136,15 +137,10 @@ : ${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//"} @@ -387,7 +383,7 @@ ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -771,8 +767,8 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1052,6 +1048,7 @@ opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1120,6 +1117,10 @@ 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" @@ -2059,7 +2060,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3201,11 +3202,13 @@ # 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 $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3470,7 +3473,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" ;; @@ -3982,14 +3985,17 @@ # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -5057,9 +5063,15 @@ { EOF func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -5643,7 +5655,8 @@ continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6150,7 +6163,8 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6834,7 +6848,7 @@ test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7319,6 +7333,7 @@ # 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 @@ -7438,7 +7453,7 @@ versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8026,6 +8041,11 @@ # 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= @@ -8056,7 +8076,7 @@ elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -8064,11 +8084,7 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - 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 + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9158,6 +9174,8 @@ 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" @@ -9267,7 +9285,8 @@ *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" diff -Nru telepathy-salut-0.7.2/m4/libtool.m4 telepathy-salut-0.8.0/m4/libtool.m4 --- telepathy-salut-0.7.2/m4/libtool.m4 2012-03-15 18:43:26.000000000 +0000 +++ telepathy-salut-0.8.0/m4/libtool.m4 2012-04-04 16:37:30.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 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 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 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -146,6 +146,8 @@ 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 @@ -637,7 +639,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -801,6 +803,7 @@ 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)], @@ -822,6 +825,31 @@ ])# _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], @@ -852,6 +880,10 @@ 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)])]) @@ -954,7 +986,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # 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 lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -962,6 +1000,7 @@ 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 @@ -973,6 +1012,7 @@ [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 @@ -990,7 +1030,9 @@ 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 -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + 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 lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1035,8 +1077,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1047,6 +1089,8 @@ _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 @@ -1330,14 +1374,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*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*) LD="${LD-ld} -m elf64_sparc" ;; + 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 + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1414,13 +1471,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -1600,6 +1657,11 @@ 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 @@ -1639,7 +1701,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"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2185,7 +2247,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2194,7 +2256,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2259,7 +2321,7 @@ ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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' @@ -2398,7 +2460,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2406,10 +2468,6 @@ 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. @@ -2417,7 +2475,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2435,7 +2493,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2455,7 +2513,7 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' @@ -2466,7 +2524,7 @@ ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -2527,7 +2585,7 @@ ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -2543,7 +2601,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -2580,9 +2638,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2657,7 +2715,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -2726,7 +2784,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2751,7 +2809,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -2775,7 +2833,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -2806,7 +2864,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2816,7 +2874,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor 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 @@ -3238,7 +3296,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3658,6 +3716,7 @@ # 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};"\ @@ -4242,7 +4301,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + 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 ;; esac else @@ -4334,18 +4395,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # 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 @@ -4505,7 +4581,9 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + _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/;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'] @@ -4533,7 +4611,6 @@ _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 @@ -4787,8 +4864,7 @@ 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)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$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~ @@ -5084,6 +5160,7 @@ # 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' @@ -5130,10 +5207,6 @@ _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 @@ -5146,7 +5219,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 @@ -5185,7 +5258,6 @@ 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 @@ -5627,9 +5699,6 @@ _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], @@ -5787,7 +5856,6 @@ _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 @@ -6157,7 +6225,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6918,12 +6986,18 @@ } }; _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 @@ -7120,7 +7194,6 @@ _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 @@ -7253,7 +7326,6 @@ _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 @@ -7440,6 +7512,77 @@ ])# _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 @@ -7509,6 +7652,13 @@ 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-salut-0.7.2/m4/ltoptions.m4 telepathy-salut-0.8.0/m4/ltoptions.m4 --- telepathy-salut-0.7.2/m4/ltoptions.m4 2012-03-15 18:43:26.000000000 +0000 +++ telepathy-salut-0.8.0/m4/ltoptions.m4 2012-04-04 16:37:31.000000000 +0000 @@ -326,9 +326,24 @@ # 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], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [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=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) diff -Nru telepathy-salut-0.7.2/m4/ltversion.m4 telepathy-salut-0.8.0/m4/ltversion.m4 --- telepathy-salut-0.7.2/m4/ltversion.m4 2012-03-15 18:43:26.000000000 +0000 +++ telepathy-salut-0.8.0/m4/ltversion.m4 2012-04-04 16:37:31.000000000 +0000 @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3293 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru telepathy-salut-0.7.2/m4/Makefile.in telepathy-salut-0.8.0/m4/Makefile.in --- telepathy-salut-0.7.2/m4/Makefile.in 2012-03-26 17:19:21.000000000 +0000 +++ telepathy-salut-0.8.0/m4/Makefile.in 2012-04-04 16:37:36.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -336,10 +336,15 @@ installcheck: installcheck-am install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/Makefile.am telepathy-salut-0.8.0/Makefile.am --- telepathy-salut-0.7.2/Makefile.am 2012-03-25 13:34:59.000000000 +0000 +++ telepathy-salut-0.8.0/Makefile.am 2012-04-03 21:24:48.000000000 +0000 @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = tools extensions lib src data m4 tests docs plugins salut +SUBDIRS = tools extensions lib src data m4 salut plugins tests docs DISTCHECK_CONFIGURE_FLAGS = --disable-debug --enable-gtk-doc diff -Nru telepathy-salut-0.7.2/Makefile.in telepathy-salut-0.8.0/Makefile.in --- telepathy-salut-0.7.2/Makefile.in 2012-03-26 17:19:22.000000000 +0000 +++ telepathy-salut-0.8.0/Makefile.in 2012-04-04 16:37:36.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -59,11 +59,11 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -86,9 +86,11 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(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 am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -117,6 +119,8 @@ 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@ @@ -301,7 +305,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = tools extensions lib src data m4 tests docs plugins salut +SUBDIRS = tools extensions lib src data m4 salut plugins tests docs DISTCHECK_CONFIGURE_FLAGS = --disable-debug --enable-gtk-doc COVERAGE_DIR = coverage @@ -316,7 +320,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/rules/lcov.mak $(srcdir)/tools/telepathy.am $(am__configure_deps) @for dep in $?; do \ @@ -341,6 +345,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/rules/lcov.mak $(srcdir)/tools/telepathy.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -352,10 +357,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -587,7 +590,11 @@ $(am__remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + 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 $(am__remove_distdir) dist-lzma: distdir @@ -595,7 +602,7 @@ $(am__remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) dist-tarZ: distdir @@ -626,6 +633,8 @@ 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*) \ @@ -646,6 +655,7 @@ && 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 \ @@ -674,8 +684,16 @@ 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: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @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 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -706,10 +724,15 @@ installcheck: installcheck-recursive install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) @@ -798,18 +821,19 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist 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 install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + dist-gzip dist-hook dist-lzip 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 install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am valgrind: diff -Nru telepathy-salut-0.7.2/missing telepathy-salut-0.8.0/missing --- telepathy-salut-0.7.2/missing 2012-03-15 18:43:30.000000000 +0000 +++ telepathy-salut-0.8.0/missing 2012-04-04 16:37:35.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.13; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,6 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -122,15 +121,6 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -226,7 +216,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -256,7 +246,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -318,41 +308,6 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. diff -Nru telepathy-salut-0.7.2/NEWS telepathy-salut-0.8.0/NEWS --- telepathy-salut-0.7.2/NEWS 2012-03-26 17:19:11.000000000 +0000 +++ telepathy-salut-0.8.0/NEWS 2012-04-04 16:36:13.000000000 +0000 @@ -1,3 +1,26 @@ +telepathy-salut 0.8.0 (2012-04-04) +================================== + +This is the start of a new stable branch. + +Changes since 0.7.2: + +• Fix build with OLPC code enabled. (Jonny) + +• Fix MUC code to announce the user as a member of the MUC if it is + the creator. (Jonny) + +• Fix race in file transfer code which was giving the IO channel to + Gibber before it knew how to deal with it.. (Jonny) + +Summary of particularly noteworthy changes since 0.6.x: + +• The FileTransfer Metadata interface has been implemented. + +• Salut now builds on Android using 'androgenizer'. + +• Salut can now be built and used on Windows/MinGW32. + telepathy-salut 0.7.2 (2012-03-26) ================================== diff -Nru telepathy-salut-0.7.2/plugins/Makefile.in telepathy-salut-0.8.0/plugins/Makefile.in --- telepathy-salut-0.7.2/plugins/Makefile.in 2012-03-26 17:19:22.000000000 +0000 +++ telepathy-salut-0.8.0/plugins/Makefile.in 2012-04-04 16:37:36.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,13 +77,19 @@ 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)$(pluginexecdir)" LTLIBRARIES = $(noinst_LTLIBRARIES) $(pluginexec_LTLIBRARIES) test_la_LIBADD = am_test_la_OBJECTS = test.lo test_la_OBJECTS = $(am_test_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent test_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -98,21 +104,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) 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_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(test_la_SOURCES) DIST_SOURCES = $(test_la_SOURCES) @@ -395,7 +401,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -test.la: $(test_la_OBJECTS) $(test_la_DEPENDENCIES) +test.la: $(test_la_OBJECTS) $(test_la_DEPENDENCIES) $(EXTRA_test_la_DEPENDENCIES) $(AM_V_CCLD)$(test_la_LINK) $(test_la_OBJECTS) $(test_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -409,26 +415,23 @@ .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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -535,10 +538,15 @@ installcheck: installcheck-am install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/salut/Makefile.in telepathy-salut-0.8.0/salut/Makefile.in --- telepathy-salut-0.7.2/salut/Makefile.in 2012-03-26 17:19:22.000000000 +0000 +++ telepathy-salut-0.8.0/salut/Makefile.in 2012-04-04 16:37:36.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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 = telepathy-salut-uninstalled.pc telepathy-salut.pc CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -86,6 +86,12 @@ 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)$(pkgconfigdir)" \ "$(DESTDIR)$(salutincludedir)" DATA = $(pkgconfig_DATA) @@ -349,9 +355,7 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-salutincludeHEADERS: $(salutinclude_HEADERS) @$(NORMAL_INSTALL) test -z "$(salutincludedir)" || $(MKDIR_P) "$(DESTDIR)$(salutincludedir)" @@ -369,9 +373,7 @@ @$(NORMAL_UNINSTALL) @list='$(salutinclude_HEADERS)'; test -n "$(salutincludedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(salutincludedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(salutincludedir)" && rm -f $$files + dir='$(DESTDIR)$(salutincludedir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -472,10 +474,15 @@ installcheck: installcheck-am install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/src/avahi-muc-channel.c telepathy-salut-0.8.0/src/avahi-muc-channel.c --- telepathy-salut-0.7.2/src/avahi-muc-channel.c 2012-03-25 13:34:59.000000000 +0000 +++ telepathy-salut-0.8.0/src/avahi-muc-channel.c 2012-04-03 21:26:38.000000000 +0000 @@ -327,5 +327,6 @@ "discovery-client", discovery_client, "initiator-handle", initiator, "requested", requested, + "creator", creator, NULL); } diff -Nru telepathy-salut-0.7.2/src/file-transfer-channel.c telepathy-salut-0.8.0/src/file-transfer-channel.c --- telepathy-salut-0.7.2/src/file-transfer-channel.c 2012-03-26 15:45:18.000000000 +0000 +++ telepathy-salut-0.8.0/src/file-transfer-channel.c 2012-04-04 01:06:53.000000000 +0000 @@ -111,6 +111,7 @@ guint progress_timer; GSocket *socket; gboolean remote_accepted; + GIOChannel *channel; /* properties */ TpFileTransferState state; @@ -750,6 +751,12 @@ self->priv->ft = NULL; } + if (self->priv->channel != NULL) + { + g_io_channel_unref (self->priv->channel); + self->priv->channel = NULL; + } + /* release any references held by the object here */ if (G_OBJECT_CLASS (salut_file_transfer_channel_parent_class)->dispose) @@ -858,6 +865,18 @@ { self->priv->remote_accepted = TRUE; + /* if we've got the IO channel here then gibber_file_transfer_send + * hasn't been called so let's call it now before doing anything + * else. */ + if (self->priv->channel != NULL) + { + gibber_file_transfer_send (ft, self->priv->channel); + + /* we have no need for this anymore */ + g_io_channel_unref (self->priv->channel); + self->priv->channel = NULL; + } + if (self->priv->socket != NULL) { /* ProvideFile has already been called. Channel is Open */ @@ -1451,11 +1470,12 @@ GIOCondition condition, gpointer user_data) { + SalutFileTransferChannel *self = SALUT_FILE_TRANSFER_CHANNEL (user_data); GibberFileTransfer *ft; int new_fd; GIOChannel *channel; - ft = SALUT_FILE_TRANSFER_CHANNEL (user_data)->priv->ft; + ft = self->priv->ft; g_assert (ft != NULL); @@ -1478,10 +1498,25 @@ g_io_channel_set_close_on_unref (channel, TRUE); g_io_channel_set_encoding (channel, NULL, NULL); if (ft->direction == GIBBER_FILE_TRANSFER_DIRECTION_INCOMING) - gibber_file_transfer_receive (ft, channel); + { + gibber_file_transfer_receive (ft, channel); + g_io_channel_unref (channel); + } else - gibber_file_transfer_send (ft, channel); - g_io_channel_unref (channel); + { + /* gibber_file_transfer_send needs ::remote-accepted to have + * already been fired, so let's wait for that, keeping + * around the GIOChannel, if it hasn't already happened. */ + if (self->priv->remote_accepted) + { + gibber_file_transfer_send (ft, channel); + g_io_channel_unref (channel); + } + else + { + self->priv->channel = channel; + } + } } return FALSE; diff -Nru telepathy-salut-0.7.2/src/Makefile.in telepathy-salut-0.8.0/src/Makefile.in --- telepathy-salut-0.7.2/src/Makefile.in 2012-03-26 17:19:22.000000000 +0000 +++ telepathy-salut-0.8.0/src/Makefile.in 2012-04-04 16:37:36.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -104,6 +104,12 @@ 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)$(pluginexeclibdir)" \ "$(DESTDIR)$(libexecdir)" LTLIBRARIES = $(noinst_LTLIBRARIES) $(pluginexeclib_LTLIBRARIES) @@ -174,8 +180,8 @@ $(am__objects_10) libsalut_convenience_la_OBJECTS = \ $(am_libsalut_convenience_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent libsalut_plugins_la_DEPENDENCIES = am_libsalut_plugins_la_OBJECTS = caps-channel-manager.lo plugin.lo \ @@ -210,21 +216,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) 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_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libsalut_convenience_la_SOURCES) \ $(libsalut_plugins_la_SOURCES) $(telepathy_salut_SOURCES) \ @@ -584,6 +590,7 @@ 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 @@ -633,9 +640,9 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libsalut-convenience.la: $(libsalut_convenience_la_OBJECTS) $(libsalut_convenience_la_DEPENDENCIES) +libsalut-convenience.la: $(libsalut_convenience_la_OBJECTS) $(libsalut_convenience_la_DEPENDENCIES) $(EXTRA_libsalut_convenience_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libsalut_convenience_la_OBJECTS) $(libsalut_convenience_la_LIBADD) $(LIBS) -libsalut-plugins.la: $(libsalut_plugins_la_OBJECTS) $(libsalut_plugins_la_DEPENDENCIES) +libsalut-plugins.la: $(libsalut_plugins_la_OBJECTS) $(libsalut_plugins_la_DEPENDENCIES) $(EXTRA_libsalut_plugins_la_DEPENDENCIES) $(AM_V_CCLD)$(libsalut_plugins_la_LINK) -rpath $(pluginexeclibdir) $(libsalut_plugins_la_OBJECTS) $(libsalut_plugins_la_LIBADD) $(LIBS) install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) @@ -689,10 +696,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -telepathy-salut$(EXEEXT): $(telepathy_salut_OBJECTS) $(telepathy_salut_DEPENDENCIES) +telepathy-salut$(EXEEXT): $(telepathy_salut_OBJECTS) $(telepathy_salut_DEPENDENCIES) $(EXTRA_telepathy_salut_DEPENDENCIES) @rm -f telepathy-salut$(EXEEXT) $(AM_V_CCLD)$(telepathy_salut_LINK) $(telepathy_salut_OBJECTS) $(telepathy_salut_LDADD) $(LIBS) -write-mgr-file$(EXEEXT): $(write_mgr_file_OBJECTS) $(write_mgr_file_DEPENDENCIES) +write-mgr-file$(EXEEXT): $(write_mgr_file_OBJECTS) $(write_mgr_file_DEPENDENCIES) $(EXTRA_write_mgr_file_DEPENDENCIES) @rm -f write-mgr-file$(EXEEXT) $(AM_V_CCLD)$(LINK) $(write_mgr_file_OBJECTS) $(write_mgr_file_LDADD) $(LIBS) @@ -763,34 +770,30 @@ .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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< sha1-util.lo: sha1/sha1-util.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 sha1-util.lo -MD -MP -MF $(DEPDIR)/sha1-util.Tpo -c -o sha1-util.lo `test -f 'sha1/sha1-util.c' || echo '$(srcdir)/'`sha1/sha1-util.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/sha1-util.Tpo $(DEPDIR)/sha1-util.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sha1/sha1-util.c' object='sha1-util.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sha1/sha1-util.c' object='sha1-util.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@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 sha1-util.lo `test -f 'sha1/sha1-util.c' || echo '$(srcdir)/'`sha1/sha1-util.c +@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 sha1-util.lo `test -f 'sha1/sha1-util.c' || echo '$(srcdir)/'`sha1/sha1-util.c mostlyclean-libtool: -rm -f *.lo @@ -903,10 +906,15 @@ installcheck: installcheck-am install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/src/muc-channel.c telepathy-salut-0.8.0/src/muc-channel.c --- telepathy-salut-0.7.2/src/muc-channel.c 2012-03-25 13:34:59.000000000 +0000 +++ telepathy-salut-0.8.0/src/muc-channel.c 2012-04-03 21:29:05.000000000 +0000 @@ -84,6 +84,7 @@ { PROP_MUC_CONNECTION = 1, PROP_NAME, + PROP_CREATOR, LAST_PROPERTY }; @@ -94,6 +95,7 @@ GibberMucConnection *muc_connection; gchar *muc_name; gboolean connected; + gboolean creator; guint timeout; /* (gchar *) -> (SalutContact *) */ GHashTable *senders; @@ -137,6 +139,9 @@ case PROP_MUC_CONNECTION: g_value_set_object (value, priv->muc_connection); break; + case PROP_CREATOR: + g_value_set_boolean (value, priv->creator); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -160,6 +165,9 @@ case PROP_MUC_CONNECTION: priv->muc_connection = g_value_get_object (value); break; + case PROP_CREATOR: + priv->creator = g_value_get_boolean (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -217,7 +225,7 @@ { SalutMucChannelPrivate *priv = self->priv; - if (tp_base_channel_is_requested (TP_BASE_CHANNEL (self))) + if (priv->creator) { DEBUG ("I created this muc. Adding myself as member now"); salut_muc_channel_add_self_to_members (self); @@ -656,6 +664,17 @@ g_object_class_install_property (object_class, PROP_MUC_CONNECTION, param_spec); + param_spec = g_param_spec_boolean ( + "creator", + "creator", + "Whether or not we created this muc", + FALSE, + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_READWRITE | + G_PARAM_STATIC_STRINGS); + g_object_class_install_property (object_class, + PROP_CREATOR, param_spec); + signals[READY] = g_signal_new ( "ready", G_OBJECT_CLASS_TYPE (salut_muc_channel_class), @@ -933,7 +952,8 @@ } #ifdef ENABLE_OLPC - if (salut_connection_olpc_observe_muc_stanza (self->connection, + if (salut_connection_olpc_observe_muc_stanza ( + SALUT_CONNECTION (base_connection), tp_base_channel_get_target_handle (base_chan), from_handle, stanza)) return; diff -Nru telepathy-salut-0.7.2/tests/Makefile.in telepathy-salut-0.8.0/tests/Makefile.in --- telepathy-salut-0.7.2/tests/Makefile.in 2012-03-26 17:19:22.000000000 +0000 +++ telepathy-salut-0.8.0/tests/Makefile.in 2012-04-04 16:37:36.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -64,8 +64,8 @@ $(top_builddir)/src/libsalut-convenience.la \ $(top_builddir)/lib/gibber/libgibber.la \ $(top_builddir)/extensions/libsalut-extensions.la -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am_telepathy_salut_debug_OBJECTS = debug.$(OBJEXT) telepathy_salut_debug_OBJECTS = $(am_telepathy_salut_debug_OBJECTS) @@ -83,21 +83,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) 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_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = check-node-properties.c $(telepathy_salut_debug_SOURCES) DIST_SOURCES = check-node-properties.c \ @@ -388,6 +388,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/rules/check.mak $(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 @@ -415,10 +416,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -check-node-properties$(EXEEXT): $(check_node_properties_OBJECTS) $(check_node_properties_DEPENDENCIES) +check-node-properties$(EXEEXT): $(check_node_properties_OBJECTS) $(check_node_properties_DEPENDENCIES) $(EXTRA_check_node_properties_DEPENDENCIES) @rm -f check-node-properties$(EXEEXT) $(AM_V_CCLD)$(LINK) $(check_node_properties_OBJECTS) $(check_node_properties_LDADD) $(LIBS) -telepathy-salut-debug$(EXEEXT): $(telepathy_salut_debug_OBJECTS) $(telepathy_salut_debug_DEPENDENCIES) +telepathy-salut-debug$(EXEEXT): $(telepathy_salut_debug_OBJECTS) $(telepathy_salut_debug_DEPENDENCIES) $(EXTRA_telepathy_salut_debug_DEPENDENCIES) @rm -f telepathy-salut-debug$(EXEEXT) $(AM_V_CCLD)$(LINK) $(telepathy_salut_debug_OBJECTS) $(telepathy_salut_debug_LDADD) $(LIBS) @@ -434,26 +435,23 @@ .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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(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 -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -671,10 +669,15 @@ installcheck: installcheck-recursive install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/tests/twisted/avahi/file-transfer/send-file-and-cancel-immediately.py telepathy-salut-0.8.0/tests/twisted/avahi/file-transfer/send-file-and-cancel-immediately.py --- telepathy-salut-0.7.2/tests/twisted/avahi/file-transfer/send-file-and-cancel-immediately.py 2012-03-25 13:34:59.000000000 +0000 +++ telepathy-salut-0.8.0/tests/twisted/avahi/file-transfer/send-file-and-cancel-immediately.py 2012-04-04 01:21:58.000000000 +0000 @@ -29,7 +29,9 @@ http.request('GET', self.filename) except socket.error, e: code, msg = e.args - assert errno.errorcode[code] == 'ECONNREFUSED' + assert errno.errorcode[code] == 'ECONNREFUSED', '%r' % e + except Exception, e: + assert False, 'Should raise a socket error, not: %r' % e else: assert False, "Should raise a socket error" diff -Nru telepathy-salut-0.7.2/tests/twisted/config.py telepathy-salut-0.8.0/tests/twisted/config.py --- telepathy-salut-0.7.2/tests/twisted/config.py 2012-03-26 17:22:40.000000000 +0000 +++ telepathy-salut-0.8.0/tests/twisted/config.py 2012-04-04 16:39:25.000000000 +0000 @@ -1,2 +1,2 @@ -PACKAGE_STRING = "Telepathy Salut 0.7.2" +PACKAGE_STRING = "Telepathy Salut 0.8.0" PLUGINS_ENABLED = True diff -Nru telepathy-salut-0.7.2/tests/twisted/Makefile.in telepathy-salut-0.8.0/tests/twisted/Makefile.in --- telepathy-salut-0.7.2/tests/twisted/Makefile.in 2012-03-26 17:19:22.000000000 +0000 +++ telepathy-salut-0.8.0/tests/twisted/Makefile.in 2012-04-04 16:37:36.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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 = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -390,6 +390,7 @@ 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 @@ -622,14 +623,15 @@ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ + col="$$grn"; \ else \ - echo "$$red$$dashes"; \ + col="$$red"; \ fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ + 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}"; \ test "$$failed" -eq 0; \ else :; fi @@ -709,10 +711,15 @@ installcheck: installcheck-recursive install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/tests/twisted/tools/Makefile.in telepathy-salut-0.8.0/tests/twisted/tools/Makefile.in --- telepathy-salut-0.7.2/tests/twisted/tools/Makefile.in 2012-03-26 17:19:22.000000000 +0000 +++ telepathy-salut-0.8.0/tests/twisted/tools/Makefile.in 2012-04-04 16:37:36.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -356,10 +356,15 @@ installcheck: installcheck-am install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) diff -Nru telepathy-salut-0.7.2/tools/Makefile.in telepathy-salut-0.8.0/tools/Makefile.in --- telepathy-salut-0.7.2/tools/Makefile.in 2012-03-26 17:19:22.000000000 +0000 +++ telepathy-salut-0.8.0/tools/Makefile.in 2012-04-04 16:37:36.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -356,10 +356,15 @@ installcheck: installcheck-am install-strip: - $(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 + 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 mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)