diff -Nru telepathy-salut-0.5.0/aclocal.m4 telepathy-salut-0.7.0/aclocal.m4 --- telepathy-salut-0.5.0/aclocal.m4 2011-05-03 13:29:16.000000000 +0000 +++ telepathy-salut-0.7.0/aclocal.m4 2011-11-16 10:27:28.000000000 +0000 @@ -27,6 +27,7 @@ dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) AC_DEFUN([GTK_DOC_CHECK], [ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first @@ -54,6 +55,11 @@ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], [PKG_CHECK_EXISTS([gtk-doc >= $1],, AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,) + fi fi AC_MSG_CHECKING([whether to build gtk-doc documentation]) @@ -109,7 +115,8 @@ # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -155,7 +162,8 @@ pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -203,9 +211,9 @@ AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD diff -Nru telepathy-salut-0.5.0/ChangeLog telepathy-salut-0.7.0/ChangeLog --- telepathy-salut-0.5.0/ChangeLog 2011-05-03 13:29:57.000000000 +0000 +++ telepathy-salut-0.7.0/ChangeLog 2011-11-16 10:28:04.000000000 +0000 @@ -1,47392 +1,3823 @@ -commit 6c47bda9644d4e2b3ccb785a5d1f713be4495f55 +commit b76c7452300f5e81d2ffe96973fe568504ae3e3d Author: Jonny Lamb -Date: Tue May 3 14:28:58 2011 +0100 +Date: 2011-11-16 10:09:49 +0000 - version 0.5.0 + version 0.7.0 Signed-off-by: Jonny Lamb - NEWS | 2 +- - configure.ac | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit bc49af5ea64f124731837f402d00e12fb75b7c17 +commit c1b70a2413c41d8f94b44cf41484050695eb1d60 Author: Jonny Lamb -Date: Tue May 3 14:00:45 2011 +0100 +Date: 2011-11-16 10:20:46 +0000 - update wocky snapshot + tests: include xmppstream and ipv6 in EXTRA_DIST + + How on earth did this work before? Signed-off-by: Jonny Lamb - lib/ext/wocky | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9da53bf4cf7bc5da9752cc94789f07fea0e14b2a +commit 18a669f7e222aa86a4c8a165ba1dc20cb50c7c58 Author: Jonny Lamb -Date: Tue May 3 12:13:33 2011 +0100 +Date: 2011-11-16 10:02:12 +0000 - avahi-olpc-activity-manager: ignore browser-found callbacks if disconnected + NEWS: updated Signed-off-by: Jonny Lamb - src/avahi-olpc-activity-manager.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit ebc29012b9e85fab2c5786ae87c3f9eb21e309dd +commit 8365e7709268d8e6b738fe9e2477314a5a8ecdef Author: Jonny Lamb -Date: Tue May 3 12:13:23 2011 +0100 +Date: 2011-11-16 08:58:09 +0000 - contact: fix typo + ft helper: use crazier stock metadata Signed-off-by: Jonny Lamb - src/contact.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 4b134ed8009b9465c961db2f45fcf1f9a3b59d0d +commit c84e19dfd4d6714b6f3a88c8f04231aeba453183 +Merge: bc9ae56 fc23a86 Author: Jonny Lamb -Date: Tue May 3 12:12:23 2011 +0100 - - avahimock: use an actually unique index for new objects on the bus - - Signed-off-by: Jonny Lamb +Date: 2011-11-16 08:53:50 +0000 - tests/twisted/avahimock.py | 16 ++++++++++------ - 1 files changed, 10 insertions(+), 6 deletions(-) + Merge branch 'ft-metadata' -commit b636c3a48bbb1a47d67a812c6af5ffebf55c50ac +commit bc9ae568196b3621a19e208f59ebadb2c068ef27 Author: Jonny Lamb -Date: Tue May 3 10:17:01 2011 +0100 +Date: 2011-11-15 10:11:48 +0000 - remove all set but unused variables + wocky: update snapshot for sasl fix again Signed-off-by: Jonny Lamb - lib/gibber/gibber-oob-file-transfer.c | 8 +++----- - src/avahi-muc-channel.c | 23 ----------------------- - src/contact.c | 2 -- - src/disco.c | 11 ----------- - src/presence-cache.c | 5 ----- - src/roomlist-channel.c | 2 -- - src/si-bytestream-manager.c | 4 +--- - src/tube-stream.c | 3 +-- - src/tubes-channel.c | 7 +------ - src/tubes-manager.c | 3 --- - 10 files changed, 6 insertions(+), 62 deletions(-) - -commit c9bea14a3f70862173c32aba43d92d0e77835465 +commit 8b964be6eaf563e919d062b7ee6e5d5cad66b50e Author: Jonny Lamb -Date: Mon May 2 16:41:16 2011 +0100 +Date: 2011-11-15 09:14:19 +0000 - avahitest: catch a specific exception - - It can break the KeyboardException case. + wocky: update snapshot to fix sasl build failure Signed-off-by: Jonny Lamb - tests/twisted/avahitest.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4064258595701503a26f3b93eef01512263b3d68 +commit fc23a8623e7ec3ab9e7f39381367c7d46dc73c7f Author: Jonny Lamb -Date: Mon May 2 16:24:15 2011 +0100 +Date: 2011-11-15 09:01:01 +0000 - avahimock: don't emit Found on ipv6 addresses if ipv6 is not available + ft metadata: use tp-glib generated code rather than using the draft interface Signed-off-by: Jonny Lamb - tests/twisted/avahimock.py | 5 ++++- - tests/twisted/avahitest.py | 4 +--- - 2 files changed, 5 insertions(+), 4 deletions(-) - -commit 3fffd2d46ef898a8d5c0049d0fad5f82d56b7e87 +commit 20b6d3c332d5bf1acaa928aba0be06853cc19783 Author: Jonny Lamb -Date: Mon May 2 16:22:55 2011 +0100 +Date: 2011-11-15 08:59:58 +0000 - avahitest: replace ipv6 one which doesn't touch avahi - - Our mock avahi will let an ipv6 service be resolved even if ipv6 is - not available. This isn't such a big deal, but let's stop using it for - an ipv6 check. + configure: up dependency on tp-glib Signed-off-by: Jonny Lamb - .../avahi/file-transfer/receive-file-ipv6.py | 4 ++-- - tests/twisted/avahitest.py | 20 +++++++++----------- - 2 files changed, 11 insertions(+), 13 deletions(-) - -commit ee2533ead63db9d1f08347b7c82719a4921622e0 +commit 4c1f77918863361e2b44171f11cc82379b936354 Author: Jonny Lamb -Date: Thu Apr 28 16:52:19 2011 +0100 +Date: 2011-11-09 19:36:04 +0000 - file_transfer_helper: use a predicate to find the FT channel - - Picking up the first channel that pops up from NewChannels can be - wrong. There's something up with the tests on the buildbot but not - sure what -- this might fix something there though. The worst this can - do is change the test failure from an AssertionError to a - TimeoutError which is fine. + metadata: update to new draft Signed-off-by: Jonny Lamb - .../avahi/file-transfer/file_transfer_helper.py | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 5a2318c2a4ea6fe3c532ab2ca5f96ebcf85c3965 +commit cab22c8a694a21b48073f572baf49c907ce2bf9d Author: Jonny Lamb -Date: Thu Apr 28 16:29:47 2011 +0100 +Date: 2011-11-09 17:33:15 +0000 - twisted tests: get rid of annoying test- prefix + ft-client-caps test: clarify caps dict building Signed-off-by: Jonny Lamb - tests/README | 10 +- - tests/twisted/Makefile.am | 88 ++-- - tests/twisted/avahi/aliases.py | 45 ++ - tests/twisted/avahi/caps-file-transfer.py | 255 +++++++ - tests/twisted/avahi/caps-self.py | 73 ++ - tests/twisted/avahi/caps-tubes.py | 791 ++++++++++++++++++++ - tests/twisted/avahi/close-local-pending-room.py | 91 +++ - .../avahi/file-transfer/ichat-receive-directory.py | 43 ++ - .../avahi/file-transfer/ichat-receive-file.py | 41 + - .../file-transfer/ichat-send-file-declined.py | 50 ++ - .../twisted/avahi/file-transfer/ichat-send-file.py | 55 ++ - .../avahi/file-transfer/receive-and-send-file.py | 36 + - .../file-transfer/receive-file-and-disconnect.py | 18 + - ...ive-file-and-sender-disconnect-while-pending.py | 32 + - ...file-and-sender-disconnect-while-transfering.py | 29 + - .../receive-file-and-xmpp-disconnect.py | 28 + - .../receive-file-cancelled-immediately.py | 29 + - .../avahi/file-transfer/receive-file-decline.py | 44 ++ - .../avahi/file-transfer/receive-file-ipv6.py | 77 ++ - .../avahi/file-transfer/receive-file-not-found.py | 58 ++ - tests/twisted/avahi/file-transfer/receive-file.py | 6 + - .../send-file-and-cancel-immediately.py | 41 + - .../file-transfer/send-file-and-disconnect.py | 17 + - .../avahi/file-transfer/send-file-declined.py | 41 + - .../twisted/avahi/file-transfer/send-file-ipv6.py | 48 ++ - .../file-transfer/send-file-item-not-found.py | 40 + - .../file-transfer/send-file-provide-immediately.py | 30 + - .../file-transfer/send-file-to-unknown-contact.py | 29 + - .../file-transfer/send-file-wait-to-provide.py | 43 ++ - .../file-transfer/test-ichat-receive-directory.py | 43 -- - .../avahi/file-transfer/test-ichat-receive-file.py | 41 - - .../file-transfer/test-ichat-send-file-declined.py | 50 -- - .../avahi/file-transfer/test-ichat-send-file.py | 55 -- - .../file-transfer/test-receive-and-send-file.py | 36 - - .../test-receive-file-and-disconnect.py | 18 - - ...ive-file-and-sender-disconnect-while-pending.py | 32 - - ...file-and-sender-disconnect-while-transfering.py | 29 - - .../test-receive-file-and-xmpp-disconnect.py | 28 - - .../test-receive-file-cancelled-immediately.py | 29 - - .../file-transfer/test-receive-file-decline.py | 44 -- - .../avahi/file-transfer/test-receive-file-ipv6.py | 77 -- - .../file-transfer/test-receive-file-not-found.py | 58 -- - .../avahi/file-transfer/test-receive-file.py | 6 - - .../test-send-file-and-cancel-immediately.py | 41 - - .../file-transfer/test-send-file-and-disconnect.py | 17 - - .../avahi/file-transfer/test-send-file-declined.py | 41 - - .../avahi/file-transfer/test-send-file-ipv6.py | 48 -- - .../file-transfer/test-send-file-item-not-found.py | 40 - - .../test-send-file-provide-immediately.py | 30 - - .../test-send-file-to-unknown-contact.py | 29 - - .../test-send-file-wait-to-provide.py | 43 -- - tests/twisted/avahi/ichat-composing.py | 75 ++ - tests/twisted/avahi/ichat-incoming-msg.py | 66 ++ - tests/twisted/avahi/muc-invite.py | 120 +++ - tests/twisted/avahi/olpc-activity-announcements.py | 115 +++ - tests/twisted/avahi/register.py | 36 + - tests/twisted/avahi/request-im.py | 163 ++++ - tests/twisted/avahi/request-muc.py | 157 ++++ - tests/twisted/avahi/roomlist.py | 174 +++++ - tests/twisted/avahi/set-presence.py | 61 ++ - tests/twisted/avahi/test-aliases.py | 45 -- - tests/twisted/avahi/test-caps-file-transfer.py | 255 ------- - tests/twisted/avahi/test-caps-self.py | 73 -- - tests/twisted/avahi/test-caps-tubes.py | 791 -------------------- - .../twisted/avahi/test-close-local-pending-room.py | 91 --- - tests/twisted/avahi/test-ichat-composing.py | 75 -- - tests/twisted/avahi/test-ichat-incoming-msg.py | 66 -- - tests/twisted/avahi/test-muc-invite.py | 120 --- - .../avahi/test-olpc-activity-announcements.py | 115 --- - tests/twisted/avahi/test-register.py | 36 - - tests/twisted/avahi/test-request-im.py | 163 ---- - tests/twisted/avahi/test-request-muc.py | 157 ---- - tests/twisted/avahi/test-roomlist.py | 174 ----- - tests/twisted/avahi/test-set-presence.py | 61 -- - tests/twisted/avahi/test-text-channel.py | 87 --- - tests/twisted/avahi/text-channel.py | 87 +++ - tests/twisted/avahi/tubes/disabled-1-1-tubes.py | 62 ++ - .../avahi/tubes/offer-private-stream-tube.py | 360 +++++++++ - .../avahi/tubes/request-invalid-dbus-tube.py | 62 ++ - tests/twisted/avahi/tubes/request-muc-tubes.py | 155 ++++ - .../twisted/avahi/tubes/test-disabled-1-1-tubes.py | 62 -- - .../avahi/tubes/test-offer-private-stream-tube.py | 360 --------- - .../avahi/tubes/test-request-invalid-dbus-tube.py | 62 -- - .../twisted/avahi/tubes/test-request-muc-tubes.py | 155 ---- - tests/twisted/avahi/tubes/test-tube-close.py | 71 -- - .../avahi/tubes/test-two-muc-stream-tubes.py | 376 ---------- - .../avahi/tubes/test-two-private-stream-tubes.py | 329 -------- - tests/twisted/avahi/tubes/tube-close.py | 71 ++ - tests/twisted/avahi/tubes/two-muc-stream-tubes.py | 376 ++++++++++ - .../avahi/tubes/two-private-stream-tubes.py | 329 ++++++++ - 90 files changed, 4608 insertions(+), 4608 deletions(-) - -commit 46c042e05f7b7fce80a640e4cda59404ca642139 +commit e06f69ebeaded3ca058f0b8284c99fa877229bb7 Author: Jonny Lamb -Date: Thu Apr 28 16:07:32 2011 +0100 +Date: 2011-11-09 17:30:56 +0000 - update wocky snapshot + ft-manager: use nicer tp_g_value_slice_new_* functions Signed-off-by: Jonny Lamb - lib/ext/wocky | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4c8fe6b52797328d579a4410b60f667592735919 +commit 8301cfa529c78b18a3aa1c956174f7497f139b5a Author: Jonny Lamb -Date: Thu Apr 28 16:06:51 2011 +0100 +Date: 2011-11-09 17:29:33 +0000 - tests: fix linking problems - - I don't really understand why this was breaking and why this patch - fixes it... + ft-manager: clarify argument name Signed-off-by: Jonny Lamb - tests/Makefile.am | 10 ++++------ - 1 files changed, 4 insertions(+), 6 deletions(-) - -commit 75c17ef51654a0d23255e04ff508c1bece6c4cd5 +commit 57358a9583c236887ecad3eee7f95d92df992259 Author: Jonny Lamb -Date: Thu Apr 28 16:06:32 2011 +0100 +Date: 2011-11-09 17:28:45 +0000 - twisted tests: include avahitest and avahimock in EXTRA_DIST + twisted tests: use conn.Requests isntead of making a dbus.Interface Signed-off-by: Jonny Lamb - tests/twisted/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 4a87d73aa1941979c5d9843deba28ec383607f89 +commit 95c08235df1830bea849d525c7ada75c171f407f Author: Jonny Lamb -Date: Thu Apr 28 16:05:58 2011 +0100 +Date: 2011-11-09 17:27:15 +0000 - symbol-hacks: leave out wocky_debug - - It's not a function pointer with --disable-debug and we don't really - care about that file anyway. + ft-channel: simplify adding fields to dataform Signed-off-by: Jonny Lamb - src/symbol-hacks.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 87d71aa0f844276f1d0e717c9081dee4f90ce0dd +commit 9447abfcd7cc2db7bce778ba65b9b1f81586d5c9 Author: Jonny Lamb -Date: Thu Apr 28 14:06:39 2011 +0100 +Date: 2011-11-09 17:27:00 +0000 - capabilities: fix includes + namespaces: change FT metadata namespace + + "and… im: is not a URI scheme. http://telepathy.im/..." Signed-off-by: Jonny Lamb - salut/capabilities.h | 2 +- - src/capability-set.c | 3 ++- - src/presence-cache.c | 1 + - 3 files changed, 4 insertions(+), 2 deletions(-) - -commit 243c0b73d7ed3db43d13e37828bd28cb10c16cd6 +commit 1fa63b2d5417dbdc9a2e6fa35f76592375f4840a Author: Jonny Lamb -Date: Thu Apr 28 14:05:57 2011 +0100 +Date: 2011-11-09 17:22:52 +0000 - src: remove annoying salut- prefix + ft-channel: use a more appropriate GQueue than a GList Signed-off-by: Jonny Lamb - .gitignore | 10 +- - src/Makefile.am | 190 +- - src/avahi-contact-manager.c | 324 +++ - src/avahi-contact-manager.h | 67 + - src/avahi-contact.c | 904 +++++++ - src/avahi-contact.h | 75 + - src/avahi-discovery-client.c | 388 +++ - src/avahi-discovery-client.h | 72 + - src/avahi-muc-channel.c | 355 +++ - src/avahi-muc-channel.h | 72 + - src/avahi-muc-manager.c | 207 ++ - src/avahi-muc-manager.h | 69 + - src/avahi-olpc-activity-manager.c | 377 +++ - src/avahi-olpc-activity-manager.h | 68 + - src/avahi-olpc-activity.c | 546 ++++ - src/avahi-olpc-activity.h | 70 + - src/avahi-roomlist-manager.c | 442 ++++ - src/avahi-roomlist-manager.h | 69 + - src/avahi-self.c | 557 +++++ - src/avahi-self.h | 69 + - src/capabilities.c | 60 + - src/capabilities.h | 30 + - src/caps-hash.c | 80 + - src/caps-hash.h | 31 + - src/connection-manager.c | 202 ++ - src/connection-manager.h | 63 + - src/connection.c | 4111 +++++++++++++++++++++++++++++++ - src/connection.h | 97 + - src/contact-channel.c | 443 ++++ - src/contact-channel.h | 62 + - src/contact-manager.c | 700 ++++++ - src/contact-manager.h | 89 + - src/contact.c | 854 +++++++ - src/contact.h | 183 ++ - src/disco.c | 603 +++++ - src/disco.h | 103 + - src/discovery-client.c | 168 ++ - src/discovery-client.h | 112 + - src/dummy-discovery-client.c | 134 + - src/dummy-discovery-client.h | 63 + - src/file-transfer-channel.c | 1629 ++++++++++++ - src/file-transfer-channel.h | 91 + - src/ft-manager.c | 635 +++++ - src/ft-manager.h | 66 + - src/im-channel.c | 735 ++++++ - src/im-channel.h | 70 + - src/im-manager.c | 647 +++++ - src/im-manager.h | 64 + - src/muc-channel.c | 1423 +++++++++++ - src/muc-channel.h | 92 + - src/muc-manager.c | 1204 +++++++++ - src/muc-manager.h | 84 + - src/olpc-activity-manager.c | 350 +++ - src/olpc-activity-manager.h | 98 + - src/olpc-activity.c | 699 ++++++ - src/olpc-activity.h | 98 + - src/presence-cache.c | 696 ++++++ - src/presence-cache.h | 87 + - src/presence.h | 53 + - src/protocol.c | 16 +- - src/roomlist-channel.c | 692 ++++++ - src/roomlist-channel.h | 76 + - src/roomlist-manager.c | 549 +++++ - src/roomlist-manager.h | 86 + - src/salut-avahi-contact-manager.c | 324 --- - src/salut-avahi-contact-manager.h | 67 - - src/salut-avahi-contact.c | 904 ------- - src/salut-avahi-contact.h | 75 - - src/salut-avahi-discovery-client.c | 388 --- - src/salut-avahi-discovery-client.h | 72 - - src/salut-avahi-muc-channel.c | 355 --- - src/salut-avahi-muc-channel.h | 72 - - src/salut-avahi-muc-manager.c | 207 -- - src/salut-avahi-muc-manager.h | 69 - - src/salut-avahi-olpc-activity-manager.c | 377 --- - src/salut-avahi-olpc-activity-manager.h | 68 - - src/salut-avahi-olpc-activity.c | 546 ---- - src/salut-avahi-olpc-activity.h | 70 - - src/salut-avahi-roomlist-manager.c | 442 ---- - src/salut-avahi-roomlist-manager.h | 69 - - src/salut-avahi-self.c | 557 ----- - src/salut-avahi-self.h | 69 - - src/salut-capabilities.c | 60 - - src/salut-capabilities.h | 30 - - src/salut-caps-hash.c | 80 - - src/salut-caps-hash.h | 31 - - src/salut-connection-manager.c | 202 -- - src/salut-connection-manager.h | 63 - - src/salut-connection.c | 4111 ------------------------------- - src/salut-connection.h | 97 - - src/salut-contact-channel.c | 443 ---- - src/salut-contact-channel.h | 62 - - src/salut-contact-manager.c | 700 ------ - src/salut-contact-manager.h | 89 - - src/salut-contact.c | 854 ------- - src/salut-contact.h | 183 -- - src/salut-disco.c | 603 ----- - src/salut-disco.h | 103 - - src/salut-discovery-client.c | 168 -- - src/salut-discovery-client.h | 112 - - src/salut-dummy-discovery-client.c | 134 - - src/salut-dummy-discovery-client.h | 63 - - src/salut-file-transfer-channel.c | 1629 ------------ - src/salut-file-transfer-channel.h | 91 - - src/salut-ft-manager.c | 635 ----- - src/salut-ft-manager.h | 66 - - src/salut-im-channel.c | 735 ------ - src/salut-im-channel.h | 70 - - src/salut-im-manager.c | 647 ----- - src/salut-im-manager.h | 64 - - src/salut-muc-channel.c | 1423 ----------- - src/salut-muc-channel.h | 92 - - src/salut-muc-manager.c | 1204 --------- - src/salut-muc-manager.h | 84 - - src/salut-olpc-activity-manager.c | 350 --- - src/salut-olpc-activity-manager.h | 98 - - src/salut-olpc-activity.c | 699 ------ - src/salut-olpc-activity.h | 98 - - src/salut-presence-cache.c | 696 ------ - src/salut-presence-cache.h | 87 - - src/salut-presence.h | 53 - - src/salut-roomlist-channel.c | 692 ------ - src/salut-roomlist-channel.h | 76 - - src/salut-roomlist-manager.c | 549 ----- - src/salut-roomlist-manager.h | 86 - - src/salut-self.c | 1079 -------- - src/salut-self.h | 172 -- - src/salut-si-bytestream-manager.c | 924 ------- - src/salut-si-bytestream-manager.h | 81 - - src/salut-tubes-channel.c | 2610 -------------------- - src/salut-tubes-channel.h | 94 - - src/salut-tubes-manager.c | 1277 ---------- - src/salut-tubes-manager.h | 71 - - src/salut-util.c | 388 --- - src/salut-util.h | 35 - - src/salut.c | 4 +- - src/self.c | 1079 ++++++++ - src/self.h | 172 ++ - src/si-bytestream-manager.c | 924 +++++++ - src/si-bytestream-manager.h | 81 + - src/text-helper.c | 2 +- - src/text-helper.h | 2 +- - src/tube-dbus.c | 4 +- - src/tube-dbus.h | 4 +- - src/tube-iface.c | 4 +- - src/tube-stream.c | 12 +- - src/tube-stream.h | 4 +- - src/tubes-channel.c | 2610 ++++++++++++++++++++ - src/tubes-channel.h | 94 + - src/tubes-manager.c | 1277 ++++++++++ - src/tubes-manager.h | 71 + - src/util.c | 388 +++ - src/util.h | 35 + - tests/Makefile.am | 2 +- - tests/check-node-properties.c | 2 +- - tests/debug.c | 40 + - tests/salut-debug.c | 40 - - tests/twisted/saluttest.py | 2 +- - 158 files changed, 30043 insertions(+), 30043 deletions(-) - -commit c1790e71e42d774923b7c8273ea617a22b69acdb +commit 799d74657c2564e246ccba046899af9c8b5b1a81 Author: Jonny Lamb -Date: Thu Apr 28 13:50:47 2011 +0100 +Date: 2011-11-09 17:22:41 +0000 - capabilities-set: rename to capability-set + ft-channel: deal with bad ServiceName fields Signed-off-by: Jonny Lamb - salut/Makefile.am | 2 +- - salut/capabilities-set.h | 86 ------ - salut/capability-set.h | 86 ++++++ - src/Makefile.am | 4 +- - src/capabilities-set.c | 752 ---------------------------------------------- - src/capability-set.c | 752 ++++++++++++++++++++++++++++++++++++++++++++++ - src/salut-capabilities.h | 2 +- - src/salut-contact.h | 2 +- - src/salut-self.h | 2 +- - 9 files changed, 844 insertions(+), 844 deletions(-) - -commit a4e984f3452880335ded6cad6c5c4fb0f6739c60 +commit edd05599c1af88d6ebe236d943df700985cbf38f Author: Jonny Lamb -Date: Thu Apr 28 13:49:02 2011 +0100 +Date: 2011-10-28 18:44:12 +0100 - capabilities: rename to capabilites-set + ft tests: add tests for FT service name caps Signed-off-by: Jonny Lamb - src/Makefile.am | 2 +- - src/capabilities-set.c | 752 ++++++++++++++++++++++++++++++++++++++++++++++++ - src/capabilities.c | 752 ------------------------------------------------ - 3 files changed, 753 insertions(+), 753 deletions(-) - -commit 0cc6c406211450c7d97542b838023fa8e6f86f99 +commit 21ae0b44c562c7b10436badf370b45cb39c7c815 Author: Jonny Lamb -Date: Thu Apr 28 13:12:11 2011 +0100 +Date: 2011-10-28 18:11:47 +0100 - servicetest: update to newest version from gabble + ft-manager: remove forcibly adding FT channel class to self contact caps + + If we stop at this point, specific FT services won't be added to the + self handle's contact caps. It's also completely unnecessary to + special case this. Signed-off-by: Jonny Lamb - tests/twisted/saluttest.py | 19 +++++++++++++- - tests/twisted/servicetest.py | 59 ++++++++++++++++++++++++++--------------- - 2 files changed, 55 insertions(+), 23 deletions(-) - -commit 3c489579a8efecb4fc35b0ac57b971632c1f9113 +commit aa920049bbafadb7af1dc3cc652bfc5ce9b29b50 Author: Jonny Lamb -Date: Thu Apr 28 13:04:41 2011 +0100 +Date: 2011-10-28 18:11:07 +0100 - twisted tests: update caps_helper and ns from gabble + caps-helper: update disco helper method to work with Salut Signed-off-by: Jonny Lamb - tests/twisted/avahi/caps_helper.py | 343 ++++++++++++++++++++++-- - tests/twisted/avahi/test-caps-file-transfer.py | 6 +- - tests/twisted/avahi/test-caps-self.py | 12 +- - tests/twisted/avahi/test-caps-tubes.py | 18 +- - tests/twisted/ns.py | 66 ++++- - 5 files changed, 404 insertions(+), 41 deletions(-) - -commit 7066fd189689905a76a1f8ef2fd6f97b50f97826 +commit b1a002fbbcbd758261290e665940f82ea07ee57e Author: Jonny Lamb -Date: Thu Apr 28 12:49:34 2011 +0100 +Date: 2011-10-28 16:13:10 +0100 - saluttest: add elem* and related functions from gabbletest + ft-manager: advertise file transfer services with capabilities Signed-off-by: Jonny Lamb - tests/twisted/saluttest.py | 104 ++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 104 insertions(+), 0 deletions(-) - -commit 60190192661bb53d24c002ffa4d2ff5bbf773e74 +commit a93f43a6ff1dce06ca0367ad8d8e4fa60b080220 Author: Jonny Lamb -Date: Thu Apr 28 12:48:14 2011 +0100 +Date: 2011-10-28 14:16:04 +0100 - saluttest: remove the NOC signal handler when finished with + ft-manager: fail to create channel if the contact doesn't have the right caps Signed-off-by: Jonny Lamb - tests/twisted/saluttest.py | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit d60e070a47af84e0ee7d427c5d814ce27327ea17 +commit da7d8af161a632ab032aa37a29c71aa801016e17 Author: Jonny Lamb -Date: Thu Apr 28 12:47:32 2011 +0100 +Date: 2011-10-28 12:34:07 +0100 - saluttest: use reactor.crash instead of .stop + file-transfer-helper: let salut disco our announced caps - I'm not happy about this but this is what gabble does. + Note that a few tests implement their own announce_contact methods, + but if you don't advertise a caps hash salut will just assume FT + capabilities for legacy clients (iChat I guess). + + This will break once support for looking at contact capabilities and + only sending metadata to ones who support it is implemented. Signed-off-by: Jonny Lamb - tests/twisted/saluttest.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a3fb5a74a59ded97b36a952bfef56b65ac018593 +commit c786795145bbf692eed9a8372d499232b74fcfde Author: Jonny Lamb -Date: Thu Apr 28 12:45:30 2011 +0100 +Date: 2011-10-28 11:12:47 +0100 - NEWS: updated + caps-helper: fix typo in make_caps_disco_reply Signed-off-by: Jonny Lamb - NEWS | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 49 insertions(+), 0 deletions(-) - -commit 0fd17a82d334948bc133ae27b65e15d0b36e8fd7 +commit edce1ee89f449e31beeca18c47e6fde48add43d6 Author: Jonny Lamb -Date: Wed Apr 27 11:56:16 2011 +0100 +Date: 2011-10-27 17:41:31 +0100 - util: don't try and get caps out of something we can't read - - Most link-local contacts in the contact factory will be created by the - avahi contact manager in Salut, and so they will ultimately be - SalutAvahiContact objects, but not all of them. - - One example of one which isn't is the LL contact which wocky ensures - when creating the loopback porter in WockyMetaPorter, so let's not - cast that to a SalutContact blindly. + ft-manager: only advertise Metadata support for those who support it Signed-off-by: Jonny Lamb - src/salut-util.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit 87450c745491c7d671642cc473aa18b3560d2c2a +commit 430514bccb385ebfed07618d9e6dce3764aeddda Author: Jonny Lamb -Date: Tue Apr 26 16:45:25 2011 +0100 +Date: 2011-10-27 17:28:40 +0100 - connection: pass even empty clients through to channel managers + capabilities: advertise support for the TP FT metadata extension Signed-off-by: Jonny Lamb - src/salut-connection.c | 10 +++------- - 1 files changed, 3 insertions(+), 7 deletions(-) - -commit 2bf6e0678fbe891b1bf14f9c5c2d5872cfbb2cc8 +commit 6084cf0931068c84fa61d21e9d280a67597a54ce Author: Jonny Lamb -Date: Mon Apr 25 11:26:07 2011 +0100 +Date: 2011-10-27 17:19:30 +0100 - connection, presence-cache: add comments for the "data forms equal" functions - - They differ. This is why. + metadata test: ensure we get an error with a bad Metadata property Signed-off-by: Jonny Lamb - src/salut-connection.c | 5 +++++ - src/salut-presence-cache.c | 5 +++++ - 2 files changed, 10 insertions(+), 0 deletions(-) - -commit 34a662ecb815d9aec4578f333f7b0bff7e055ce7 +commit 9baa2ca53c901b7d33ab7bbf49232673c163328f Author: Jonny Lamb -Date: Mon Apr 25 11:25:43 2011 +0100 +Date: 2011-10-27 17:17:47 +0100 - contact: no need to keep an old pointer array around when it's being replaced + metadata test: test receiving an offer with no dataforms Signed-off-by: Jonny Lamb - src/salut-contact.c | 8 ++------ - 1 files changed, 2 insertions(+), 6 deletions(-) - -commit dc1f9e468f5121c4a5bdadaa115b4ada270f6153 +commit 34529237a47c3833aebd479050af7a62dedf69f6 Author: Jonny Lamb -Date: Mon Apr 25 11:14:20 2011 +0100 +Date: 2011-10-27 17:15:15 +0100 - contact, presence-cache: set a free func on unused pointer arrays - - These will never have any elements in them by design, but it's not - clear so be more explicit and set a free func on the new pointer array - anyway. + ft-helper: test parsing incoming offer metadata Signed-off-by: Jonny Lamb - src/salut-contact.c | 2 +- - src/salut-presence-cache.c | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -commit 7c05d71d522b09273c88753009d3ba2b7b5e200c +commit 4f71a9a8eb76ab7139172f57f8ef1e79364eebeb Author: Jonny Lamb -Date: Mon Apr 25 10:43:00 2011 +0100 +Date: 2011-10-27 17:14:43 +0100 - presence-cache: learn self caps if they've been announced + caps-helper: split out add_dataforms function Signed-off-by: Jonny Lamb - src/salut-connection.c | 7 +++++++ - src/salut-presence-cache.c | 22 ++++++++++++++++++++++ - src/salut-presence-cache.h | 4 ++++ - 3 files changed, 33 insertions(+), 0 deletions(-) - -commit c24ccc5af95ae5bd2d7a7b4f63a179c924e1b34a +commit 1f39d6e66d3a3c83cd756810fa11ac52681f60c5 Author: Jonny Lamb -Date: Mon Apr 25 10:42:39 2011 +0100 +Date: 2011-10-27 16:49:10 +0100 - connection: fix typo in update capabilities code + ft tests: add simple metadata test Signed-off-by: Jonny Lamb - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b1587d322b5e3c71230335b138405c27f3a2495b +commit c02da80c845f7852451c79a18c473f883900a4c0 Author: Jonny Lamb -Date: Mon Apr 25 10:42:17 2011 +0100 +Date: 2011-10-27 16:18:43 +0100 - caps-hash: calculate self hash using data forms too + ft-channel: include metadata in file transfer offer Signed-off-by: Jonny Lamb - src/salut-caps-hash.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 90214e17469e3e059781ba1649085932fbd632e2 +commit 7f3b4e7c145fad099b45ad5536b804498584a723 Author: Jonny Lamb -Date: Mon Apr 25 10:41:24 2011 +0100 +Date: 2011-10-27 16:17:40 +0100 - connection: let clients represent themselves with data forms + caps-helper: add extract_data_forms function + + Stolen right from gabble. Signed-off-by: Jonny Lamb - src/salut-connection.c | 108 +++++++++++++++++++++++++++++++++++++++-------- - 1 files changed, 89 insertions(+), 19 deletions(-) - -commit b7f4a89e383f5a35de82f0c34f2572cefe4855de +commit a6c40254424f16d54c6c69a8edd2168a8ff4a4cf Author: Jonny Lamb -Date: Mon Apr 25 10:39:26 2011 +0100 +Date: 2011-10-27 16:17:26 +0100 - disco: reply from disco requests with data forms + twisted tests: move caps_helper to root Signed-off-by: Jonny Lamb - src/salut-disco.c | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) - -commit db3d002508ed28bceb9621b33c48c0c609052dd8 +commit 3264d551611950164ccbf76b8a7ec00ccb7a679e Author: Jonny Lamb -Date: Mon Apr 25 10:31:00 2011 +0100 +Date: 2011-10-27 15:21:25 +0100 - presence-cache: remember data forms + ft-manager: disallow Metadata items with key='FORM_TYPE' Signed-off-by: Jonny Lamb - src/salut-contact.c | 21 +++++++++++++- - src/salut-contact.h | 3 +- - src/salut-presence-cache.c | 64 ++++++++++++++++++++++++++++++++++++++++--- - 3 files changed, 81 insertions(+), 7 deletions(-) - -commit ce0aa7668f5d258087baf3b46adb45a7d0c2938a +commit 530666920263084fea59b5291a3e155f2080e80b Author: Jonny Lamb -Date: Mon Apr 25 10:29:00 2011 +0100 +Date: 2011-10-27 15:19:32 +0100 - contact, self: implement WockyXep0115Capabilities iface + ft-channel: make Metadata props immutable and test them Signed-off-by: Jonny Lamb - src/salut-contact.c | 33 ++++++++++++++++++++++++++++++- - src/salut-contact.h | 1 + - src/salut-self.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++- - src/salut-self.h | 2 + - 4 files changed, 86 insertions(+), 3 deletions(-) - -commit 30bb4bda54e3a3da7e59e289f55c5c76bb0292b1 +commit 911b27cab33f073bb33e1b4f3b11d670a441a3fa Author: Jonny Lamb -Date: Fri Apr 22 12:24:51 2011 +0100 +Date: 2011-10-27 15:12:25 +0100 - caps-channel-manager: add data form argument to represent_client + ft-channel: get Metadata props from the file transfer offer Signed-off-by: Jonny Lamb - salut/caps-channel-manager.h | 6 ++++-- - src/caps-channel-manager.c | 5 +++-- - src/salut-connection.c | 3 ++- - src/salut-ft-manager.c | 3 ++- - src/salut-tubes-manager.c | 3 ++- - 5 files changed, 13 insertions(+), 7 deletions(-) - -commit fdb5c005d67481ff18b7f943b8959d1176087692 +commit ba724c8be698dc3828c05acdfeaca25c8c3078e6 Author: Jonny Lamb -Date: Fri Apr 22 12:21:14 2011 +0100 +Date: 2011-10-27 15:12:04 +0100 - update wocky snapshot + gibber-ft: parse data forms in query node of file transfer offer Signed-off-by: Jonny Lamb - lib/ext/wocky | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 263a21c3d21d9a56d30b0c9d17be8cf683011571 +commit f93e211013c7f89c58365af275c4e8aa078786d5 Author: Jonny Lamb -Date: Fri Apr 22 09:41:29 2011 +0100 +Date: 2011-10-27 14:41:58 +0100 - util: include salut-contact.h in the normal place - - This was a temporary fix until I worked out the uuid problem, now - fixed a couple of commits ago. + ft-manager: set Metadata props from channel request Signed-off-by: Jonny Lamb - src/salut-util.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 880ea0007c66d856853b5d6e34546781b8ea582d +commit b9601186e65665a03c76ba930ae17566c829ca94 Author: Jonny Lamb -Date: Fri Apr 22 09:40:34 2011 +0100 +Date: 2011-10-27 14:39:09 +0100 - contact: remove config.h include from header + ft-channel: set Metadata props on construction Signed-off-by: Jonny Lamb - src/salut-contact.h | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit d0e53bd470a2638835324575aa2a4bf0b67ad8e8 +commit 5718a543a8c040cc9624f6947ecb45a6250d8e0e Author: Jonny Lamb -Date: Fri Apr 22 09:39:45 2011 +0100 +Date: 2011-10-27 16:35:34 +0100 - src: include uuid directory and link to libuuid + caps-file-transfer: bring back to the present - No idea how this worked before... + Stop duplicating code and use pretty assertion functions and + misc. like that. Signed-off-by: Jonny Lamb - src/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit b779af034320e2402bce4c011cda1b0b10157625 +commit 816c32f7c72f9b808bf1b727f2f1906f68ba45e4 Author: Jonny Lamb -Date: Fri Apr 22 09:31:36 2011 +0100 +Date: 2011-10-27 14:36:10 +0100 - util: extract copying and sending a stanza from send_ll_pep_event() to another function + ft-manager: add Metadata props to Allowed_Properties Signed-off-by: Jonny Lamb - src/salut-util.c | 42 ++++++++++++++++++------------------------ - 1 files changed, 18 insertions(+), 24 deletions(-) - -commit 916945dcf7cbfd98a7a13de65864136019cf7532 +commit 9c8c3e7342dd417c50495d3c95fca576d3db558a Author: Jonny Lamb -Date: Thu Apr 7 12:53:21 2011 +0100 +Date: 2011-10-27 14:32:07 +0100 - pep: make salut_send_ll_pep_event part of public API + ft-channel: implement Metadata properties Signed-off-by: Jonny Lamb - salut/Makefile.am | 3 ++- - salut/util.h | 29 +++++++++++++++++++++++++++++ - src/Makefile.am | 1 + - src/salut-util.c | 1 + - src/salut-util.h | 4 ---- - 5 files changed, 33 insertions(+), 5 deletions(-) - -commit 431b8494eb86a456353fdf14c49d1695f7145980 +commit 5ece0fd90c64c8e26515d37c398c49475d9bd7de Author: Jonny Lamb -Date: Fri Mar 11 11:06:02 2011 +0000 +Date: 2011-10-27 14:20:14 +0100 - util: add salut_send_ll_event function + extensions: add Chan.I.FileTransfer.Metadata draft interface Signed-off-by: Jonny Lamb - src/salut-util.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/salut-util.h | 4 +++ - 2 files changed, 71 insertions(+), 0 deletions(-) - -commit 067627e64a19c64de4eb6549ff9a4ec11aef17ef +commit 50ff02ddcec6dafa6eb2d98eeeab8d3113ea4a39 Author: Jonny Lamb -Date: Fri Apr 22 09:13:10 2011 +0100 +Date: 2011-10-27 14:14:22 +0100 - update wocky snapshot + configure: enable avahi twisted tests by default Signed-off-by: Jonny Lamb - lib/ext/wocky | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 456667da199ede4d4000577d67b915e4e3437063 -Merge: 62ebf96 395324b +commit 90c913eb7879949d9f931bb1d2f4818f35bef749 Author: Jonny Lamb -Date: Fri Apr 22 09:12:49 2011 +0100 +Date: 2011-10-27 14:04:32 +0100 - Merge branch 'caps' - - Conflicts: - configure.ac - lib/ext/wocky - src/salut-caps-hash.c - src/salut-caps-hash.h + saluttest: stop ensuring the known list; it's not available or used Signed-off-by: Jonny Lamb -commit 62ebf96742349fe72411ef8cb03ddb511e80cd94 +commit 63a8ec4e6da877a7189d31b42a0cb605f0f51f84 Author: Jonny Lamb -Date: Mon Apr 18 10:50:52 2011 +0100 +Date: 2011-10-27 14:00:23 +0100 - src/Makefile: only build enumtypes files for salut files + avahimock: signal AllForNow on ServiceBrowsers immediately - Like in gabble. + The new ContactList stuff relies on avahi sending AllForNow now. - Signed-off-by: Jonny Lamb - - src/Makefile.am | 27 +++++++++++++++------------ - src/salut-contact-manager.c | 2 +- - src/salut-contact.c | 2 +- - 3 files changed, 17 insertions(+), 14 deletions(-) - -commit ae1b3ea0785850fd2e08b069a5d28ddaaa7ccad6 -Author: Jonny Lamb -Date: Mon Apr 18 10:29:08 2011 +0100 - - symbol-hacks: add some hacks to enable all wocky symbols be visible for plugins + In tests we don't actually need to do any discovery so we don't care + about this being so quick. Signed-off-by: Jonny Lamb - src/Makefile.am | 4 ++ - src/salut.c | 3 + - src/symbol-hacks.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/symbol-hacks.h | 8 ++++ - 4 files changed, 132 insertions(+), 0 deletions(-) +commit b849b67eb138764d2fddcd9aafaf22ec03e34fff +Author: Will Thompson +Date: 2011-10-18 10:33:13 +0100 -commit 8d54b22a1df8aedb8ccbe87df07ba114d207a759 -Author: Jonny Lamb -Date: Tue Apr 12 10:21:07 2011 +0100 + bump nano-version to 0.6.0.1 - connection: add get_name() function - - Signed-off-by: Jonny Lamb +commit b54f3a4d84316ec8559aff227ff106ccd8670f86 +Author: Will Thompson +Date: 2011-10-18 10:25:08 +0100 - salut/connection.h | 2 ++ - src/salut-connection.c | 8 ++++++++ - 2 files changed, 10 insertions(+), 0 deletions(-) + Version 0.6.0 -commit b034ef99f9afab5b2513cef6a7104f3f6ab3c8ef -Author: Jonny Lamb -Date: Tue Apr 12 09:50:02 2011 +0100 +commit b3cce5dc40fc744d01b9844cfe0b91b6e42112f7 +Author: Will Thompson +Date: 2011-10-18 10:24:46 +0100 - connection: add get_session() function - - Signed-off-by: Jonny Lamb + NEWS for 0.6.0 - salut/connection.h | 4 ++++ - src/salut-connection.c | 8 ++++++++ - 2 files changed, 12 insertions(+), 0 deletions(-) +commit 47acb3d179f8d4a36364daadae8b00bfadda2590 +Author: Xavier Claessens +Date: 2011-09-29 10:29:48 +0200 -commit 91b885466102af636f787fc524b386e2b2c16087 -Author: Jonny Lamb -Date: Fri Apr 8 10:47:46 2011 +0100 + Use TpBaseContactList to implement the immutable roster - exec-with-log.sh.in: set G_SLICE=debug-blocks - - Signed-off-by: Jonny Lamb +commit 9341fc8f346787caa3be2c5e5e20a03102162924 +Author: Xavier Claessens +Date: 2011-09-29 09:22:58 +0200 - tests/twisted/tools/exec-with-log.sh.in | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + Use GObjectClass::constructed instead of GObjectClass::constructor -commit e1ae931b405822f9887c743cfeb1e0c7af5c8d34 +commit 81eec12622706003f46e9be9e92e96e1b164a5de Author: Jonny Lamb -Date: Fri Apr 8 10:39:36 2011 +0100 +Date: 2011-10-05 12:06:42 +0100 - exec-with-log.sh.in: just append to salut-testing.log + start on version 0.5.3 - Don't clobber it completely. + Great things will happen. Signed-off-by: Jonny Lamb - tests/twisted/Makefile.am | 2 +- - tests/twisted/tools/exec-with-log.sh.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 9388ac55d3d7bccb9d042c2a3ecba11d0c4bfa71 +commit 0d025106a50a75904ae13b65e4c8f8220faa1104 Author: Jonny Lamb -Date: Fri Apr 8 10:30:37 2011 +0100 +Date: 2011-10-05 11:39:52 +0100 - exec-with-log.sh.in: copy SALUT_TEST_BACKTRACE from gabble + version 0.5.2 Signed-off-by: Jonny Lamb - .gitignore | 2 +- - tests/twisted/tools/Makefile.am | 3 ++- - tests/twisted/tools/exec-with-log.sh.in | 2 ++ - tests/twisted/tools/run_and_bt.gdb | 3 +++ - 4 files changed, 8 insertions(+), 2 deletions(-) +commit e7d04988d6cc2934a2e77b1a73e92bf29795177b +Author: Derek Foreman +Date: 2011-05-16 14:35:41 -0400 -commit c3032ebbd2079312d13be1fefb68376177a27934 -Author: Jonny Lamb -Date: Thu Apr 7 11:18:48 2011 +0100 - - update wocky snapshot + remove duplicates from source file list Signed-off-by: Jonny Lamb - lib/ext/wocky | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit eca1ade70e2a05e5f08ad21d6aafaba58a7aba65 -Merge: 194ca9b 6856d76 -Author: Jonny Lamb -Date: Thu Apr 7 10:20:37 2011 +0100 +commit 254284476b7f8d2a9f6c92963c9c752058288b03 +Author: Will Thompson +Date: 2011-09-15 16:05:35 +0100 - Merge branch 'mock-avahi' + with-session-bus: import echo fix from Gabble + + Reviewed-by: Jonny Lamb -commit 6856d768ec168a2e25b55fb4eec62731befc0dc2 +commit 166546dc5e4e920727f6e6146fe862d4cc935cac Author: Jonny Lamb -Date: Thu Apr 7 10:20:20 2011 +0100 +Date: 2011-09-07 15:06:17 +0100 - update wocky snapshot + util: fix send_ll_pep_event to get the node properly + + This is following a fix in Wocky to put the node name in the correct + attribute. Signed-off-by: Jonny Lamb - lib/ext/wocky | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 80118b801297e3d645cf2495cf9e9017bf8b325a +commit 7188bde6e6e1c81617c89db6a1fd7be727653e4a Author: Jonny Lamb -Date: Wed Apr 6 14:40:11 2011 +0100 +Date: 2011-09-07 15:06:07 +0100 - oob: hack around v6-in-v4 addresses being exposed + update wocky snapshot - This commit should be reverted when we depend on a GLib new enough to - fix bgo#646082. + Changes in this update: + + * Gnutls SSL backend fixes. + * Implement whitespace pings in the c2s porter. + * Fix the pubsub event node generator to put the node in the right + place. + * and a few more misc. fixes here and there. Signed-off-by: Jonny Lamb - lib/gibber/gibber-bytestream-oob.c | 4 ++++ - lib/gibber/gibber-oob-file-transfer.c | 1 + - lib/gibber/gibber-util.c | 20 ++++++++++++++++++++ - lib/gibber/gibber-util.h | 2 ++ - 4 files changed, 27 insertions(+), 0 deletions(-) - -commit 51fe8aa4bdd5730d5262389e00a3eeae2df03745 -Author: Jonny Lamb -Date: Wed Apr 6 13:08:33 2011 +0100 +commit b81086c2a76b2e5ca3ca421deebc51122fb26069 +Merge: e97a10a 79c310d +Author: Will Thompson +Date: 2011-08-24 15:21:32 +0100 - tests: only run the test suite on real avahi if SALUT_TEST_REAL_AVAHI=1 + Merge branch 'contact-info' - Signed-off-by: Jonny Lamb + https://bugs.freedesktop.org/show_bug.cgi?id=40035 + + Reviewed-by: Jonny Lamb + Branch-quality: impeccable - tests/README | 6 ++++++ - tests/twisted/Makefile.am | 6 +++++- - tests/twisted/avahitest.py | 4 ++++ - tests/twisted/saluttest.py | 3 ++- - tests/twisted/tools/exec-with-log.sh.in | 6 ++++-- - 5 files changed, 21 insertions(+), 4 deletions(-) +commit 79c310dfcae1ee9de84448b0c0ee0dbc48431f5e +Author: Will Thompson +Date: 2011-08-16 11:45:23 +0100 -commit b92a619720285dbd5720ff8257acf290f072f276 -Author: Jonny Lamb -Date: Wed Apr 6 13:07:16 2011 +0100 + ContactInfo: note why supporting self is complicated - avahimock: don't bother resolving hostnames; it's only going to be localhsot - - This also means we can use anything we bloody want for the testsuite's - hostname. +commit 4296af242825c610a57224c082922299001e15e8 +Author: Will Thompson +Date: 2011-08-16 11:01:00 +0100 + + ContactInfo: ignore empty name, jid and email fields. - Signed-off-by: Jonny Lamb + When I tested this branch out for real, I found that a few people on the + network were publishing empty JIDs and email addresses, rather than + omitting them. This is probably also a bug in Salut. But we should cope + anyway. - tests/twisted/avahimock.py | 11 ++--------- - 1 files changed, 2 insertions(+), 9 deletions(-) +commit a5d63dcf86593359ddfa739a0f02d519255c991c +Author: Will Thompson +Date: 2011-08-16 10:50:56 +0100 -commit 236cea2a171ef1402bc55f236f57b491068b4b34 -Author: Jonny Lamb -Date: Wed Apr 6 10:59:36 2011 +0100 + ContactInfo: test empty 1st, last and nick fields are ignored - avahimock: don't use magic numbers for AvahiServerState enum - - Signed-off-by: Jonny Lamb +commit 55a1ee445c98ca0f1c9b1bc52b210eb983df077e +Author: Will Thompson +Date: 2011-08-16 10:42:56 +0100 - tests/twisted/avahimock.py | 12 +++++++++--- - 1 files changed, 9 insertions(+), 3 deletions(-) + ContactInfo: expose fake FN field -commit 3909b2b81de06119e577a2d3caad43b047ac6f12 -Author: Jonny Lamb -Date: Wed Apr 6 10:56:25 2011 +0100 +commit 7b616f381e4c1ef705b03195215b3b230b455b07 +Author: Will Thompson +Date: 2011-08-16 10:42:39 +0100 - avahimock: hard-code GetHostName and GetHostNameFqdn return values + Contact: track shoddily-computed full name + +commit 41bb4ec0a5fdd056e47568729a3e8bdd589c59e0 +Author: Will Thompson +Date: 2011-08-16 10:40:38 +0100 + + ContactInfo: refactor out add_singleton_field - Signed-off-by: Jonny Lamb + Possibly squash into a7fe74f609f0f7a21716ef90dde7d67480a7df64 ? - tests/twisted/avahimock.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) +commit 3eb7f8fe5d80fb34b9b2ea29e729bf0b1b60479a +Author: Will Thompson +Date: 2011-08-15 17:38:23 +0100 -commit 7270ff8b1571ee6869799cfb82903286c41be4fb -Author: Jonny Lamb -Date: Wed Apr 6 10:56:11 2011 +0100 + ContactInfo: test invalid and invisible handles - avahimock: use a constant for the domain name +commit d05399590a69be5b856498c7bb3e0638bf48e614 +Author: Will Thompson +Date: 2011-08-15 17:28:26 +0100 + + ContactInfo: implement RequestContactInfo + +commit 930e744331bb058d009f150b54a791a52dd1f7d2 +Author: Will Thompson +Date: 2011-08-15 17:07:46 +0100 + + ContactInfo: implement GetContactInfo + +commit 4c46b78a768409dc56561d1556ff9cab13a2b572 +Author: Will Thompson +Date: 2011-08-15 16:50:09 +0100 + + ContactInfo: expose email and JID - Signed-off-by: Jonny Lamb + I don't like the duplication in this function very much, but I don't + think splitting it up into another function would make it much/any + easier to read. + +commit 1fe8255709572fe97a338d848d419965a7dc1338 +Author: Will Thompson +Date: 2011-08-15 16:40:01 +0100 - tests/twisted/avahimock.py | 10 ++++------ - 1 files changed, 4 insertions(+), 6 deletions(-) + ContactInfo: implement change notification -commit c26f3aa03e438c5cbb2d01e33798b528f043c177 -Author: Jonny Lamb -Date: Wed Apr 6 10:53:14 2011 +0100 +commit 246f3bc72ba494c640f3db1fd8dacd92fd24e42e +Author: Will Thompson +Date: 2011-08-15 16:00:58 +0100 - avahimock: use a little better error string + Debug: remove 'all' special-case - Only a little. + This is done in GLib these days + +commit d7bfc06d26fdd0f29e0de5de339dbea40c9dc60d +Author: Will Thompson +Date: 2011-08-15 15:57:26 +0100 + + ContactInfo: implement 'n' for contacts - Signed-off-by: Jonny Lamb + This is only implemented for GetContactAttributes, and there is no + change notification. - tests/twisted/avahimock.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) +commit e2077215e1be24c4f806a08670c7ef5231d6de94 +Author: Will Thompson +Date: 2011-08-15 15:14:03 +0100 -commit eb6bb90cdcc1fa1180431577794b856b36f3ae6e -Author: Jonny Lamb -Date: Wed Apr 6 10:53:03 2011 +0100 + ContactInfo: list plausible supported fields - avahimock: return a hard-coded domain name +commit 71e40e50edc95b74e57bb43456da96adcb1d1720 +Author: Will Thompson +Date: 2011-08-15 14:24:24 +0100 + + Add a stub implementation of ContactInfo - Signed-off-by: Jonny Lamb + This is all the stuff that's completely trivial to implement. - tests/twisted/avahimock.py | 6 +----- - 1 files changed, 1 insertions(+), 5 deletions(-) +commit 92e70e7c0bce0e7e3938812042b2f0a31a9fb049 +Author: Will Thompson +Date: 2011-08-15 14:20:11 +0100 -commit 45775a33e8cb70168c610d6f96b462c5f2b4b6e2 -Author: Jonny Lamb -Date: Wed Apr 6 10:52:51 2011 +0100 + avahi/aliases.py: modernize a little - tests: remove Avahi service file - - Signed-off-by: Jonny Lamb +commit a5601ee7c1de3683acbc6a0fe7e630e8d63ba4f7 +Author: Will Thompson +Date: 2011-08-12 16:49:55 +0200 - tests/twisted/tools/org.freedesktop.Avahi.service | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) + Connection: include capabilities.h once -commit 4addd90afa20fd9dd7fbbedb6280d36907b7b529 -Author: Jonny Lamb -Date: Wed Apr 6 10:45:52 2011 +0100 +commit c862984280c7096f4e1232b931846fbeb6157872 +Author: Will Thompson +Date: 2011-08-12 15:43:00 +0200 - saluttest: use the whole test path like in gabble - - Signed-off-by: Jonny Lamb + Connection: use TP_STRUCT_TYPE_ALIAS_PAIR - tests/twisted/saluttest.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) +commit 19bfc985571cfe4586b71cb7005863f8598b971b +Author: Will Thompson +Date: 2011-08-12 15:39:27 +0200 -commit 6e2eca6716c0d955df2dad02db83b42623cfbd7f -Author: Jonny Lamb -Date: Wed Apr 6 10:45:22 2011 +0100 + Contact: track real names - contact-manager: don't look up a contact in a NULL hash table - - Signed-off-by: Jonny Lamb +commit 9117c3da3f8341d48bfe790e5e5a9e00d52b1839 +Author: Will Thompson +Date: 2011-08-12 15:08:06 +0200 - src/salut-contact-manager.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + Contact: track email address -commit 194ca9bd5fc1ff70845937cd03f49bb74b91a1e1 -Author: Jonny Lamb -Date: Tue Apr 5 14:47:15 2011 +0100 +commit 67fe59719ea3fa6777b1446a8773de6b2b241941 +Author: Will Thompson +Date: 2011-08-12 15:04:23 +0200 - configure: re-word description of --enable-avahi-tests - - Signed-off-by: Jonny Lamb + Contact: signal JID changes - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) +commit a073bd17c10cda7a32c19c64d322c6491618ead6 +Author: Will Thompson +Date: 2011-08-12 14:19:28 +0200 -commit b8c26c0d6ac59c88fede90542e65e877fa6f68da -Author: Jonny Lamb -Date: Tue Apr 5 14:36:42 2011 +0100 + Track contacts' JIDs even without --enable-olpc - check-gibber-listener: fix test by not depending on what test was run before - - The main loop (and therefore the listener) was only started if the - signalled gboolean was FALSE. If this was the first test run then this - would be the case, but if the tcp-listen test was run beforehand then - it would be TRUE and so the main loop wouldn't run and the test would - fail. - - Seeing that the unix-listen test doesn't actually ever test the - signalled gboolean, let's just stop depending on it. - - Signed-off-by: Jonny Lamb +commit 253e93508d78b524b5c94e7ecf5893aaacfc8b58 +Author: Will Thompson +Date: 2011-08-12 14:13:24 +0200 - lib/gibber/tests/check-gibber-listener.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + Contact: Replace #defines with an enum -commit 89c9098ed080a9e3c83191ba6fb0d5a08e1b957b -Merge: 758dba3 c41a25e -Author: Jonny Lamb -Date: Tue Apr 5 13:57:09 2011 +0100 +commit 6f490c06af966758f3601ce36c23e342f356c6b9 +Author: Will Thompson +Date: 2011-08-12 11:51:45 +0200 - Merge branch 'ohhai' + AvahiContact: use tp_str_empty -commit c41a25ef7f8b9a221ba1e2b5e7f8d21c203c7e02 -Author: Jonny Lamb -Date: Tue Apr 5 13:52:49 2011 +0100 +commit e97a10ac5c84088967b3740c593372ccdbca4731 +Author: Will Thompson +Date: 2011-07-08 15:24:53 +0100 - oob-file-transfer: use the correct enum when comparing members - - We got a GSocketFamily enum member from g_socket_address_get_family, - but then compared it to a SoupAddressFamily, although members of the - latter enum are exactly the same as the members of the former. + Update Wocky for corresponding --disable-debug fixes + +commit 9ec80fc9a1961faa9befcc2097b9c12260fa7594 +Author: Will Thompson +Date: 2011-07-08 15:24:18 +0100 + + Define a static inline no-op DEBUG() with --disable-debug + +commit ae5cc6b9b5684ed33420535483c313b1f295f076 +Merge: 19f06ba 942d12c +Author: Stef Walter +Date: 2011-08-13 14:46:50 +0200 + + Merge branch 'test-cleanup' + +commit 942d12cf39fb8c134b795d4627d325a2ed5de44c +Author: Stef Walter +Date: 2011-08-11 12:31:52 +0200 + + gibber: Ignore files built during tests. + +commit cb82f2205683fe2a532f3ed9d91be3c24c1f2b4a +Author: Stef Walter +Date: 2011-08-11 12:23:23 +0200 + + gibber: Remove broken tests and dependency on xmldiff - gcc pointed this out as: + * These tests don't run successfully anyway. - gibber-oob-file-transfer.c:526:14: error: comparison between - ‘GSocketFamily’ and ‘enum ’ + https://bugs.freedesktop.org/show_bug.cgi?id=40001 + +commit 19f06ba9e81b1356506746242772c710c23b3b74 +Author: Jonny Lamb +Date: 2011-07-25 14:46:15 +0100 + + tests: ensure OLPC tests are included in releases Signed-off-by: Jonny Lamb - lib/gibber/gibber-oob-file-transfer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 94d9944e2d38a764d4edbce9cab57ccdece247fc +commit 8075e04490d656b3da9bc651497338cfb7adc94b Author: Jonny Lamb -Date: Tue Apr 5 11:59:35 2011 +0100 +Date: 2011-07-25 14:44:24 +0100 - connection: don't crash if we try and get self caps before connecting + namespaces: add …/activity-properties constant + + This lets the thing build with --enable-olpc. Signed-off-by: Jonny Lamb - src/salut-connection.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) +commit bfcb1a34dcd0c7b2b2e43e4610c6ddebf26a747a +Author: Will Thompson +Date: 2011-07-07 16:24:56 +0100 -commit 381972fb479a62e1ec994335b75bf7cf01b851be -Merge: 758dba3 ff4a897 -Author: Jonny Lamb -Date: Tue Apr 5 11:52:48 2011 +0100 + Update coding style and release mail scripts + + I grabbed the latter from an old branch by mistake when I added it. - Merge remote branch 'smcv/mock-avahi' +commit df52a7dc52147f70c2e180c09b58de052e3eed10 +Author: Will Thompson +Date: 2011-07-07 16:03:10 +0100 -commit 758dba3714c8c586c21478e8759800acaeb9dc34 -Author: Jonny Lamb -Date: Tue Apr 5 11:52:12 2011 +0100 + Bump the nyanoversion to 0.5.1.1 - update wocky snapshot - - Signed-off-by: Jonny Lamb +commit 34473911a31f7b7620dfe86fc5ae1ccdf7e170ca +Author: Will Thompson +Date: 2011-07-07 14:35:33 +0100 - lib/ext/wocky | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Version 0.5.1 -commit b9c31893d6c4508efc3e49b07cd82f07ae8f242c -Author: Jonny Lamb -Date: Tue Apr 5 11:21:54 2011 +0100 +commit 97c6fb746bf64591e88d50006fbb1edc26c70a2a +Author: Will Thompson +Date: 2011-07-07 14:35:14 +0100 - connection: give the WockySession to create_sidecar_async - - Signed-off-by: Jonny Lamb + News for 0.5.1 - src/salut-connection.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) +commit a0490633f7652cc89d1e9c4b67ea89868f98e7b8 +Author: Will Thompson +Date: 2011-07-07 15:32:04 +0100 -commit 197b891390ee4dd5a1f5b46bc20629e665e94275 -Merge: 871abd7 f7687c7 -Author: Jonny Lamb -Date: Tue Apr 5 11:17:23 2011 +0100 + Propagate -Werror and coding style checks to Wocky + + Previously, -Werror was always enabled in lib/ext/wocky, even for + releases. So it just failed to distcheck for me, and would make + packagers hate us. - Merge remote branch 'smcv/im-on-a-train' +commit 10287449e56eb7acb54572948b4ce9aaa0a0cd52 +Author: Will Thompson +Date: 2011-07-07 14:33:50 +0100 -commit 871abd7cb3f8d7c44f55542a4d757a34f7ca3a1f -Merge: 165dfad cfdad47 -Author: Jonny Lamb -Date: Tue Apr 5 09:50:44 2011 +0100 + Add and use telepathy.am and make-release-mail.py + + This will let me use maintainer-make-release, and adds checks for things + like UNRELEASED. - Merge branch 'meta-porter' +commit 2cb08f95c385adaf10b5a4a9cfe127cfbfdf1ddc +Author: Will Thompson +Date: 2011-07-07 13:25:54 +0100 + + tests: look for 'contact-ids' in MembersChangedDetailed - Conflicts: - .gitignore - src/salut-connection.c - src/salut-disco.c - src/salut-self.c + For at least a year, telepathy-glib used the wrong name for this field + in the details of a group changed: member-ids, rather than contact-ids + as defined in the spec and used by TelepathyQt4. - Signed-off-by: Jonny Lamb + Since Salut doesn't depend on tp-glib >= 0.14.6, let's look for both in + the test suite. + + Looked-over-my-shoulder-while-I-fixed-this: Jonny Lamb -commit cfdad47a9ef766fbcee6d47476110cd92c6a2dc2 +commit ee7c997300d26960e5cb662542815763cf3a03ca Author: Jonny Lamb -Date: Tue Apr 5 09:47:04 2011 +0100 +Date: 2011-07-07 13:30:37 +0100 update wocky snapshot Signed-off-by: Jonny Lamb - lib/ext/wocky | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) +commit d1e2397dc684b609ac5f9b78fd4d5b1e2b24c452 +Author: Sjoerd Simons +Date: 2011-06-25 00:24:10 +0200 + + Cope with the default value of handle-type being changed in new tp-glib + + In recent versions of tp-glib the handle-type property defaults to + TP_UNKNOWN_HANDLE_TYPE instead of 0. Update the various assertions which + verify a channel doesn't get constructed with an unexpected handle type + to accept both 0 and TP_UNKNOWN_HANDLE_TYPE so we're compatible with + both versions. -commit 95d10244be9f3f4c49fbf499714a9ee89f370d87 +commit 58a742936ea0a71da0df61043236c65ba485be8d Author: Jonny Lamb -Date: Tue Apr 5 09:45:04 2011 +0100 +Date: 2011-06-24 10:10:32 +0100 - disco: use _extract_errors instead of extracting sub types manually + contact-channel: treat TP_UNKNOWN_HANDLE_TYPE has unset handle type Signed-off-by: Jonny Lamb - src/salut-disco.c | 10 ++-------- - 1 files changed, 2 insertions(+), 8 deletions(-) - -commit 1a9adddd5ba9d12b53ccca45822f744850838083 +commit 90d82631b78341a86c040b82dc3438478dc12cdd Author: Jonny Lamb -Date: Tue Apr 5 09:35:57 2011 +0100 +Date: 2011-05-09 14:06:52 +0100 - disco: fix indentation + update wocky snapshot Signed-off-by: Jonny Lamb - src/salut-disco.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 06a7012fd69e2cc6884dd71d6b202e74822c1495 +commit 2782c58b5869babfcca9b699ff75360c4b7f57a4 Author: Jonny Lamb -Date: Tue Apr 5 09:34:25 2011 +0100 +Date: 2011-05-09 09:31:45 +0100 - muc-manager: don't pass on bad clique invites to other channel managers + gibber ibb bytestream: remove Signed-off-by: Jonny Lamb - src/salut-muc-manager.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit e7c0c381f9316d60dfec3d15f0eaba5f0456d4ee +commit b1de837ebae853467aff11fb5096a934dfb865a5 Author: Jonny Lamb -Date: Mon Apr 4 11:09:00 2011 +0100 +Date: 2011-05-04 14:27:04 +0100 - disco: always free request structs - - The problem is this: - - 1. disco request is made - 2. connection is disconnected - 3. SalutDisco is disposed - 4. SalutDisco dispose function g_cancellable_cancels each request - 5. the porter (actually sending the IQ) realises it's been cancelled - and completes in an idle - 6. the disco callback deletes the request, dereferencing its disco - pointer - 7. but it's already been disposed, so assertion galore. - - There was previously an attempt to detect this but it was a bit - shonky. Now the disco pointer is cleared when SalutDisco is disposed, - then when the disco callback tries to delete the request it doesn't - try to access any SalutDisco structures. Bingo. + gibber-xmpp-error: remove Signed-off-by: Jonny Lamb - src/salut-disco.c | 27 +++++++++++++-------------- - 1 files changed, 13 insertions(+), 14 deletions(-) - -commit 8248ff7760017918c7361c5fc07cd9532ad5c1cf +commit 01a4df8810bf41ecbb8c44eb3ce10d0a360dd379 Author: Jonny Lamb -Date: Mon Apr 4 09:07:00 2011 +0100 +Date: 2011-05-04 14:26:07 +0100 - Revert "muc-manager: don't assert on no invite node" + stop using GibberXmppError - This reverts commit c836c6a9c3c70dd3259e316dc5e9eb1a3e78b821. - - src/salut-muc-manager.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + Signed-off-by: Jonny Lamb -commit 7b1a6014d3b982a8c15e3204d77f3f872d473ef9 +commit 484325b8891af7d0ba92d796fa8804481b9e846a Author: Jonny Lamb -Date: Mon Apr 4 09:04:36 2011 +0100 +Date: 2011-05-04 09:11:59 +0100 - tests: stop using re.sub when messing with argv[0] + gibber: remove gibber-namespaces.h Signed-off-by: Jonny Lamb - .../avahi/file-transfer/file_transfer_helper.py | 3 +-- - tests/twisted/saluttest.py | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -commit 6fac150759b9c58cf44ffd29dfa9fec7f8e02e48 +commit 27e730bbd087abbc79452eb071fa51c5ed07c863 Author: Jonny Lamb -Date: Mon Apr 4 08:44:50 2011 +0100 +Date: 2011-05-04 09:11:29 +0100 - connection: fix "force_called" variable usage - - Previously it meant exactly the opposite. + stop using gibber-namespaces.h Signed-off-by: Jonny Lamb - src/salut-connection.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 3ea1ca10bb3524b6d15c8b689277ff558584701b +commit 3342b364c9678d063e9287a411f6b46336a9f988 Author: Jonny Lamb -Date: Mon Apr 4 08:41:35 2011 +0100 +Date: 2011-05-03 17:14:21 +0100 - connection: use g_clear_error as it's NULL-safe + gibber-xmpp-writer: removed Signed-off-by: Jonny Lamb - src/salut-connection.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit bc8d85dd7ab42234559c798d5467fa35ab734d28 +commit 026439608057f8c8ba8d1cc8bbcafb4acd172e58 Author: Jonny Lamb -Date: Mon Apr 4 08:40:01 2011 +0100 +Date: 2011-05-03 17:13:38 +0100 - muc-manager: register a higher priority handler than the IM manager + muc-connection: use WockyXmppWriter Signed-off-by: Jonny Lamb - src/salut-im-manager.c | 5 ----- - src/salut-muc-manager.c | 3 ++- - 2 files changed, 2 insertions(+), 6 deletions(-) - -commit 8ee26255a58818a4cf46238a178812445712565e +commit 48cab0984fee58b5f85f352da29d5094858f27c6 Author: Jonny Lamb -Date: Fri Apr 1 15:51:04 2011 +0100 +Date: 2011-05-03 17:08:14 +0100 - file-transfer-channel: delete ft sockets when finalizing the channel + gibber-xmpp-reader: removed Signed-off-by: Jonny Lamb - src/salut-file-transfer-channel.c | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) - -commit 62e9935711e9914933bf95ad1e6ebb58c5cc605d +commit 16d61ed42ff441cbcb37c595419537b0c77613ff Author: Jonny Lamb -Date: Fri Apr 1 15:39:06 2011 +0100 +Date: 2011-05-03 17:05:02 +0100 - muc-manager: don't try and index a NULL hash table - - This can happen if a browser-removed callback is called after the - manager has been asked to close all channels. + muc-connection: use WockyXmppReader Signed-off-by: Jonny Lamb - src/salut-muc-manager.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 201df796f0a887ceeed9d4c4a9dd937ce99a8f25 +commit 8c395bffcc0dc5774fbaf8563dc6956058e5a581 Author: Jonny Lamb -Date: Fri Apr 1 15:16:56 2011 +0100 +Date: 2011-05-03 16:38:43 +0100 - tests: fix tab/space problem + configure.ac: set AC_LANG Signed-off-by: Jonny Lamb - tests/twisted/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 240e4b1274ad7ffbe16db384dd76f8b72da5b9a2 +commit 948708e4a443e1af27eea7c5db45a0be88dec950 Author: Jonny Lamb -Date: Fri Apr 1 15:16:17 2011 +0100 +Date: 2011-05-03 15:28:32 +0100 - twisted tests: make disabled messages conform + tube-dbus: fix typo Signed-off-by: Jonny Lamb - .../avahi/file-transfer/test-send-file-ipv6.py | 2 +- - tests/twisted/avahi/test-caps-tubes.py | 2 +- - .../avahi/tubes/test-offer-private-stream-tube.py | 2 +- - .../avahi/tubes/test-request-invalid-dbus-tube.py | 3 +-- - tests/twisted/avahi/tubes/test-tube-close.py | 2 +- - .../avahi/tubes/test-two-private-stream-tubes.py | 2 +- - .../avahi/tubes/tubes-to-nonexistant-ids.py | 2 +- - 7 files changed, 7 insertions(+), 8 deletions(-) - -commit cbb040479b508ec7fb459d32da2bfe3543b8df6a +commit 11b952142ff9b1c39642240581ab8c483e8588c8 Author: Jonny Lamb -Date: Fri Apr 1 15:15:02 2011 +0100 +Date: 2011-05-03 14:57:00 +0100 - file_transfer_helper.py: add test name to contact JID - - This is to work around avahi being slow at updating contacts and so - running tests with the same JIDs listening on different TCP ports for - incoming connections can break things as salut doesn't get updated. + nano release Signed-off-by: Jonny Lamb - .../avahi/file-transfer/file_transfer_helper.py | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -commit 53c099075e201b8f85565f6d19c3c05cc9ab3e0b +commit 6c47bda9644d4e2b3ccb785a5d1f713be4495f55 Author: Jonny Lamb -Date: Fri Apr 1 15:14:21 2011 +0100 +Date: 2011-05-03 14:28:58 +0100 - file_transfer_helper.py: fix assertion message + version 0.5.0 Signed-off-by: Jonny Lamb - .../avahi/file-transfer/file_transfer_helper.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 9ce433140e03c710fdbf7e5a305f56ba42d10b1a +commit bc49af5ea64f124731837f402d00e12fb75b7c17 Author: Jonny Lamb -Date: Fri Apr 1 15:14:05 2011 +0100 +Date: 2011-05-03 14:00:45 +0100 - file-transfer tests: make HTTP server less verbose + update wocky snapshot Signed-off-by: Jonny Lamb - .../avahi/file-transfer/file_transfer_helper.py | 7 +++++++ - .../file-transfer/test-receive-file-not-found.py | 5 +++++ - 2 files changed, 12 insertions(+), 0 deletions(-) - -commit 74b4e5edf4e91be3c943d607e8ec3ec658d045ff +commit 9da53bf4cf7bc5da9752cc94789f07fea0e14b2a Author: Jonny Lamb -Date: Fri Apr 1 15:13:05 2011 +0100 +Date: 2011-05-03 12:13:33 +0100 - ipv6.py: stop using reactor.listenWith - - It's deprecated. This is a bit of a hack though. + avahi-olpc-activity-manager: ignore browser-found callbacks if disconnected Signed-off-by: Jonny Lamb - tests/twisted/ipv6.py | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -commit f837a11220b51efa62e44384b3196988e7d34d2d +commit ebc29012b9e85fab2c5786ae87c3f9eb21e309dd Author: Jonny Lamb -Date: Fri Apr 1 15:12:39 2011 +0100 +Date: 2011-05-03 12:13:23 +0100 - tube-stream: set the WockyContact on a stanza to send + contact: fix typo Signed-off-by: Jonny Lamb - src/tube-stream.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 189021e7203015023c9887cd68950797761c395a +commit 4b134ed8009b9465c961db2f45fcf1f9a3b59d0d Author: Jonny Lamb -Date: Fri Apr 1 15:12:20 2011 +0100 +Date: 2011-05-03 12:12:23 +0100 - si-bytestream-manager: set the :contact property on new bytestreams + avahimock: use an actually unique index for new objects on the bus Signed-off-by: Jonny Lamb - src/salut-si-bytestream-manager.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit c630cdf3ff2a3f8c5621b6dc7616e8de352cb66a +commit b636c3a48bbb1a47d67a812c6af5ffebf55c50ac Author: Jonny Lamb -Date: Fri Apr 1 14:52:29 2011 +0100 +Date: 2011-05-03 10:17:01 +0100 - si-bytestream-manager: free a newly allocated stanza + remove all set but unused variables Signed-off-by: Jonny Lamb - src/salut-si-bytestream-manager.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 6f43b3aa51fe97d1d0c475d5394362e685b3bdee +commit c9bea14a3f70862173c32aba43d92d0e77835465 Author: Jonny Lamb -Date: Fri Apr 1 14:51:45 2011 +0100 +Date: 2011-05-02 16:41:16 +0100 - si-bytestream-manager: fix s/get/set/ typo + avahitest: catch a specific exception - Introduced in 923da48ffc4735. + It can break the KeyboardException case. Signed-off-by: Jonny Lamb - src/salut-si-bytestream-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1f230673c5581384f89bf7ccedf091f9a39b0642 +commit 4064258595701503a26f3b93eef01512263b3d68 Author: Jonny Lamb -Date: Thu Mar 31 14:27:41 2011 +0100 +Date: 2011-05-02 16:24:15 +0100 - with-session-bus.sh: steal latest from gabble + avahimock: don't emit Found on ipv6 addresses if ipv6 is not available Signed-off-by: Jonny Lamb - tests/twisted/tools/with-session-bus.sh | 15 ++++++++++++--- - 1 files changed, 12 insertions(+), 3 deletions(-) - -commit 197e5ae81b2595a0a16f4cd4c19c549023095da1 +commit 3fffd2d46ef898a8d5c0049d0fad5f82d56b7e87 Author: Jonny Lamb -Date: Thu Mar 31 12:57:59 2011 +0100 +Date: 2011-05-02 16:22:55 +0100 - saluttest: set nickname to the test name for log prettiness + avahitest: replace ipv6 one which doesn't touch avahi - cf. gabble. + Our mock avahi will let an ipv6 service be resolved even if ipv6 is + not available. This isn't such a big deal, but let's stop using it for + an ipv6 check. Signed-off-by: Jonny Lamb - tests/twisted/saluttest.py | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 0ceb8919443b0af641ff42b705192134a8781a46 +commit ee2533ead63db9d1f08347b7c82719a4921622e0 Author: Jonny Lamb -Date: Thu Mar 31 10:58:00 2011 +0100 +Date: 2011-04-28 16:52:19 +0100 - xmppstream: set default namespace to jabber:client in stream open + file_transfer_helper: use a predicate to find the FT channel - Woo! + Picking up the first channel that pops up from NewChannels can be + wrong. There's something up with the tests on the buildbot but not + sure what -- this might fix something there though. The worst this can + do is change the test failure from an AssertionError to a + TimeoutError which is fine. Signed-off-by: Jonny Lamb - tests/twisted/xmppstream.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 7898353910dae2ab720fa9d7ec85e8c86a0a7d70 +commit 5a2318c2a4ea6fe3c532ab2ca5f96ebcf85c3965 Author: Jonny Lamb -Date: Thu Mar 31 09:48:28 2011 +0100 +Date: 2011-04-28 16:29:47 +0100 - all: chain up to parent constructed if there is one + twisted tests: get rid of annoying test- prefix Signed-off-by: Jonny Lamb - lib/gibber/gibber-bytestream-ibb.c | 3 +++ - lib/gibber/gibber-bytestream-oob.c | 3 +++ - src/salut-contact.c | 3 +++ - src/salut-disco.c | 3 +++ - 4 files changed, 12 insertions(+), 0 deletions(-) - -commit 3512aee218b2f157b0595ec82de0104602987eb8 +commit 46c042e05f7b7fce80a640e4cda59404ca642139 Author: Jonny Lamb -Date: Thu Mar 31 09:19:38 2011 +0100 +Date: 2011-04-28 16:07:32 +0100 - contact: listen to ::status-changed and remove connection pointer when disconnected - - The contact can outlive the connection and then can call methods ont - he connection which has already been disposed. An example of this is - when resolving a contact. + update wocky snapshot Signed-off-by: Jonny Lamb - src/salut-contact.c | 44 +++++++++++++++++++++++++++++++++++++------- - 1 files changed, 37 insertions(+), 7 deletions(-) - -commit c836c6a9c3c70dd3259e316dc5e9eb1a3e78b821 +commit 4c8fe6b52797328d579a4410b60f667592735919 Author: Jonny Lamb -Date: Thu Mar 31 09:07:15 2011 +0100 +Date: 2011-04-28 16:06:51 +0100 - muc-manager: don't assert on no invite node + tests: fix linking problems - These callbacks are different now -- they can be called to see what - the callback so we shouldn't assert if it's not actually a MUC invite. + I don't really understand why this was breaking and why this patch + fixes it... Signed-off-by: Jonny Lamb - src/salut-muc-manager.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 2afb63eb8aaeff4be8fa4bb8c812e0a95dc71f43 +commit 75c17ef51654a0d23255e04ff508c1bece6c4cd5 Author: Jonny Lamb -Date: Thu Mar 31 09:06:44 2011 +0100 +Date: 2011-04-28 16:06:32 +0100 - disco: only delete the request if it hasn't been already done for us + twisted tests: include avahitest and avahimock in EXTRA_DIST Signed-off-by: Jonny Lamb - src/salut-disco.c | 11 +++++++++-- - 1 files changed, 9 insertions(+), 2 deletions(-) - -commit d5b43d1beb459187ab918dcd0a02c7fbc5cd27e1 +commit 4a87d73aa1941979c5d9843deba28ec383607f89 Author: Jonny Lamb -Date: Thu Mar 31 09:06:24 2011 +0100 +Date: 2011-04-28 16:05:58 +0100 - disco: deal with the SalutSelf being NULL + symbol-hacks: leave out wocky_debug + + It's not a function pointer with --disable-debug and we don't really + care about that file anyway. Signed-off-by: Jonny Lamb - src/salut-disco.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit e16a55113fa64f01176be789f688467f2bb07c70 +commit 87d71aa0f844276f1d0e717c9081dee4f90ce0dd Author: Jonny Lamb -Date: Thu Mar 31 09:05:12 2011 +0100 +Date: 2011-04-28 14:06:39 +0100 - avahi-self: propogate error in announce + capabilities: fix includes Signed-off-by: Jonny Lamb - src/salut-avahi-self.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a546c1822cb7d5cc8288ebba139611553c1ecea9 +commit 243c0b73d7ed3db43d13e37828bd28cb10c16cd6 Author: Jonny Lamb -Date: Thu Mar 31 09:03:54 2011 +0100 +Date: 2011-04-28 14:05:57 +0100 - connection: keep a ref to the connection when calling close/force close - - Also, fix a case where tp_base_connection_finish_shutdown() is called - twice. D'oh! - - This will be fixed anyway when we remove force_close from the public - API. + src: remove annoying salut- prefix Signed-off-by: Jonny Lamb - src/salut-connection.c | 15 +++++++++++---- - 1 files changed, 11 insertions(+), 4 deletions(-) - -commit 3c833d1715c4210cc92e04f5ac569b2d76f78356 +commit c1790e71e42d774923b7c8273ea617a22b69acdb Author: Jonny Lamb -Date: Thu Mar 31 09:03:17 2011 +0100 +Date: 2011-04-28 13:50:47 +0100 - connection: add more debug messages when failing to connect + capabilities-set: rename to capability-set Signed-off-by: Jonny Lamb - src/salut-connection.c | 28 +++++++++++++++++++++++----- - 1 files changed, 23 insertions(+), 5 deletions(-) - -commit 329a283e5818be2178ef3ec0f67c5decb7cdcf40 +commit a4e984f3452880335ded6cad6c5c4fb0f6739c60 Author: Jonny Lamb -Date: Thu Mar 31 09:01:59 2011 +0100 +Date: 2011-04-28 13:49:02 +0100 - saluttest: update exec_test_deferred from gabbletest + capabilities: rename to capabilites-set Signed-off-by: Jonny Lamb - tests/twisted/saluttest.py | 42 +++++++++++++++++++++++++++++++----------- - 1 files changed, 31 insertions(+), 11 deletions(-) - -commit 6d612aabb03cfb848fc3734423cd194dfd493278 +commit 0cc6c406211450c7d97542b838023fa8e6f86f99 Author: Jonny Lamb -Date: Thu Mar 31 09:00:30 2011 +0100 +Date: 2011-04-28 13:12:11 +0100 - servicetest: update colourer from gabble's servicetest + servicetest: update to newest version from gabble Signed-off-by: Jonny Lamb - tests/twisted/servicetest.py | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 82f78a2d798ad284395fbb1dbb1416a78a53d6a2 +commit 3c489579a8efecb4fc35b0ac57b971632c1f9113 Author: Jonny Lamb -Date: Tue Mar 29 10:02:20 2011 +0100 +Date: 2011-04-28 13:04:41 +0100 - im-manager: ignore clique MUC invites and leave for the MUC manager + twisted tests: update caps_helper and ns from gabble Signed-off-by: Jonny Lamb - src/salut-im-manager.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit e1bd15b54853fd7143247208d3664463a0587d0c +commit 7066fd189689905a76a1f8ef2fd6f97b50f97826 Author: Jonny Lamb -Date: Tue Mar 29 10:01:44 2011 +0100 +Date: 2011-04-28 12:49:34 +0100 - disco: fix calling the callback if the cancellable was cancelled - - Oops! + saluttest: add elem* and related functions from gabbletest Signed-off-by: Jonny Lamb - src/salut-disco.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1247394a708123bcebf28aae91861a2e99314c70 +commit 60190192661bb53d24c002ffa4d2ff5bbf773e74 Author: Jonny Lamb -Date: Thu Mar 24 11:40:36 2011 +0000 +Date: 2011-04-28 12:48:14 +0100 - avahi-contact: use stack-allocated GQueue instead of expensive or annoying GLists + saluttest: remove the NOC signal handler when finished with Signed-off-by: Jonny Lamb - src/salut-avahi-contact.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 42edf30b88986a29cbbc811efea10084efe2f2f7 +commit d60e070a47af84e0ee7d427c5d814ce27327ea17 Author: Jonny Lamb -Date: Thu Mar 24 11:34:20 2011 +0000 +Date: 2011-04-28 12:47:32 +0100 - bytestream-oob: ensure we free the socket address in an error + saluttest: use reactor.crash instead of .stop + + I'm not happy about this but this is what gabble does. Signed-off-by: Jonny Lamb - lib/gibber/gibber-bytestream-oob.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit f12c6f1b6f07544f614bb1815aaf78d5a6f0c610 +commit a3fb5a74a59ded97b36a952bfef56b65ac018593 Author: Jonny Lamb -Date: Thu Mar 24 11:23:37 2011 +0000 +Date: 2011-04-28 12:45:30 +0100 - bytestream-oob: use the actual socket address when connecting to remote contact + NEWS: updated Signed-off-by: Jonny Lamb - lib/gibber/gibber-bytestream-oob.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 1098480d797fb261eef5e8b9ce6c206acb63fd73 +commit 0fd17a82d334948bc133ae27b65e15d0b36e8fd7 Author: Jonny Lamb -Date: Thu Mar 24 11:05:59 2011 +0000 +Date: 2011-04-27 11:56:16 +0100 - bytestream-[io]bb: fix so more than the first object can work + util: don't try and get caps out of something we can't read - Also, clean up by removing the if (blah blah blah) in the set_property - implementation. + Most link-local contacts in the contact factory will be created by the + avahi contact manager in Salut, and so they will ultimately be + SalutAvahiContact objects, but not all of them. + + One example of one which isn't is the LL contact which wocky ensures + when creating the loopback porter in WockyMetaPorter, so let's not + cast that to a SalutContact blindly. Signed-off-by: Jonny Lamb - lib/gibber/gibber-bytestream-ibb.c | 23 +++++++++++------------ - lib/gibber/gibber-bytestream-oob.c | 24 ++++++++++++------------ - 2 files changed, 23 insertions(+), 24 deletions(-) - -commit e3a81ac84abf6cedaea3aac4d638461e296346fd +commit 87450c745491c7d671642cc473aa18b3560d2c2a Author: Jonny Lamb -Date: Thu Mar 24 10:45:13 2011 +0000 +Date: 2011-04-26 16:45:25 +0100 - tube-stream: don't unref a NULL stanza + connection: pass even empty clients through to channel managers Signed-off-by: Jonny Lamb - src/tube-stream.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 165dfad6d746110a90693cc366fc58556bdff42e +commit 2bf6e0678fbe891b1bf14f9c5c2d5872cfbb2cc8 Author: Jonny Lamb -Date: Wed Mar 23 10:25:19 2011 +0000 +Date: 2011-04-25 11:26:07 +0100 - gitmodules: update wocky's URL + connection, presence-cache: add comments for the "data forms equal" functions + + They differ. This is why. Signed-off-by: Jonny Lamb - .gitmodules | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c492cf03519d25a69ef7291bba69c963478922ec +commit 34a662ecb815d9aec4578f333f7b0bff7e055ce7 Author: Jonny Lamb -Date: Wed Mar 23 10:23:23 2011 +0000 +Date: 2011-04-25 11:25:43 +0100 - gibber-file-transfer: porter property cannot be NULL + contact: no need to keep an old pointer array around when it's being replaced Signed-off-by: Jonny Lamb - lib/gibber/gibber-file-transfer.c | 13 +++++-------- - lib/gibber/gibber-oob-file-transfer.c | 2 ++ - 2 files changed, 7 insertions(+), 8 deletions(-) - -commit a6e01c196e3dd611635fdeddc69616a913dca2fc +commit dc1f9e468f5121c4a5bdadaa115b4ada270f6153 Author: Jonny Lamb -Date: Wed Mar 23 10:16:51 2011 +0000 +Date: 2011-04-25 11:14:20 +0100 - im-channel: clarify comment regarding stanza handler callback returning FALSE + contact, presence-cache: set a free func on unused pointer arrays + + These will never have any elements in them by design, but it's not + clear so be more explicit and set a free func on the new pointer array + anyway. Signed-off-by: Jonny Lamb - src/salut-im-channel.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 1a06f891b2ee5767a28c9539c200dc8eab70947e +commit 7c05d71d522b09273c88753009d3ba2b7b5e200c Author: Jonny Lamb -Date: Wed Mar 23 10:15:42 2011 +0000 +Date: 2011-04-25 10:43:00 +0100 - disco: don't call the callback if the object has been disposed + presence-cache: learn self caps if they've been announced Signed-off-by: Jonny Lamb - src/salut-disco.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit b900269fe36cd5852a62cfa1910dff51d55a05fe +commit c24ccc5af95ae5bd2d7a7b4f63a179c924e1b34a Author: Jonny Lamb -Date: Wed Mar 23 09:28:23 2011 +0000 +Date: 2011-04-25 10:42:39 +0100 - avahi-contact: use prepend then reverse, instead of append + connection: fix typo in update capabilities code Signed-off-by: Jonny Lamb - src/salut-avahi-contact.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit c95d4e863585a94c8d454cd60ace9b2b800b18a5 +commit b1587d322b5e3c71230335b138405c27f3a2495b Author: Jonny Lamb -Date: Wed Mar 23 09:19:52 2011 +0000 +Date: 2011-04-25 10:42:17 +0100 - avahi-contact: remove confusing comment + caps-hash: calculate self hash using data forms too Signed-off-by: Jonny Lamb - src/salut-avahi-contact.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 9e28b4fadafad3a8a4900a64329712e41876a48c +commit 90214e17469e3e059781ba1649085932fbd632e2 Author: Jonny Lamb -Date: Wed Mar 23 09:19:01 2011 +0000 +Date: 2011-04-25 10:41:24 +0100 - avahi-contact: don't get the AvahiIfIndex if it's not required + connection: let clients represent themselves with data forms Signed-off-by: Jonny Lamb - src/salut-avahi-contact.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit b76e690de7a13bcb91d9d02dc2685aa3dfade235 +commit b7f4a89e383f5a35de82f0c34f2572cefe4855de Author: Jonny Lamb -Date: Tue Mar 22 13:53:54 2011 +0000 +Date: 2011-04-25 10:39:26 +0100 - connection: don't critical when calling UpdateCapabilities pre-connection - - I assumed gabble_capability_set_equals would take a NULL argument - fine, but alas it does not. + disco: reply from disco requests with data forms Signed-off-by: Jonny Lamb - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bd725740a004bd38e55331494a7673f2766032ab +commit db3d002508ed28bceb9621b33c48c0c609052dd8 Author: Jonny Lamb -Date: Mon Mar 21 15:55:18 2011 +0000 +Date: 2011-04-25 10:31:00 +0100 - plugin-loader: don't critical if a plugin lazily implements no sidecars - - An empty strv is really { NULL }, but it's not so unreasonable to - use just NULL instead, so we shouldn't break if we get that. - - Creating a sidecar is safe as it checks whether the strv contains the - requested interface using tp_strv_contains() which treats NULL as an - empty strv. + presence-cache: remember data forms Signed-off-by: Jonny Lamb - src/plugin-loader.c | 13 +++++++++---- - 1 files changed, 9 insertions(+), 4 deletions(-) - -commit 54bb941c5faa92ce49f61e1af925c72345026537 +commit ce0aa7668f5d258087baf3b46adb45a7d0c2938a Author: Jonny Lamb -Date: Mon Mar 21 14:57:14 2011 +0000 +Date: 2011-04-25 10:29:00 +0100 - connection: save pre-connect UpdateCapabilities and set when creating the SalutSelf + contact, self: implement WockyXep0115Capabilities iface Signed-off-by: Jonny Lamb - src/salut-connection.c | 51 ++++++++++++++++++++++++++++++++++++++--------- - 1 files changed, 41 insertions(+), 10 deletions(-) - -commit 801723046b8ba801711273ba44929c79097c463f +commit 30bb4bda54e3a3da7e59e289f55c5c76bb0292b1 Author: Jonny Lamb -Date: Mon Mar 21 14:33:19 2011 +0000 +Date: 2011-04-22 12:24:51 +0100 - Revert "connection: create SalutSelf earlier" + caps-channel-manager: add data form argument to represent_client - This reverts commit 137833bf895865765abd0e719f5ca52a510bd253. - - src/salut-connection.c | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) + Signed-off-by: Jonny Lamb -commit 02dfe0e60dafbda103c760dc8476a42d81ffeb20 +commit fdb5c005d67481ff18b7f943b8959d1176087692 Author: Jonny Lamb -Date: Mon Mar 21 13:51:32 2011 +0000 +Date: 2011-04-22 12:21:14 +0100 - tests: stop referring to libsalut-backend-avahi - - This was removed in 3f2f6de25ce5a5d7d5. + update wocky snapshot Signed-off-by: Jonny Lamb - tests/Makefile.am | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit c83e98eccd192a7ef9f77cb317b6f0ec70d2bdb1 -Author: Will Thompson -Date: Fri Mar 18 18:45:11 2011 +0000 +commit 263a21c3d21d9a56d30b0c9d17be8cf683011571 +Author: Jonny Lamb +Date: 2011-04-22 09:41:29 +0100 - configure: check for Python Avahi module + util: include salut-contact.h in the normal place - Previously we'd try to run the tests even if the Avahi Python module - wasn't available. - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit f915df4a1f24eb032d16198c19770c47bcb7a40c -Author: Will Thompson -Date: Fri Mar 18 18:44:46 2011 +0000 - - Correctly use im-local-xmpp as the icon name. + This was a temporary fix until I worked out the uuid problem, now + fixed a couple of commits ago. - 6db2272 broke this. - - salut/protocol.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Signed-off-by: Jonny Lamb -commit d4a982ee82f105fa5e11d8ed3086482561af431c -Author: Will Thompson -Date: Fri Mar 18 18:41:25 2011 +0000 +commit 880ea0007c66d856853b5d6e34546781b8ea582d +Author: Jonny Lamb +Date: 2011-04-22 09:40:34 +0100 - Unconfuse TpTubeChannelState and TpTubeState a bit + contact: remove config.h include from header - My version of GCC didn't like building a bunch of the tube code because - it confuses TpTubeChannelState and TpTubeState. In practice this code - works because the former is a superset of the latter and none of the - confused code paths can encounter the extra value. This patch tidies up - just enough for the compiler not to whine. - - src/salut-tubes-channel.c | 12 ++++++------ - src/tube-dbus.c | 2 +- - src/tube-iface.c | 2 +- - src/tube-stream.c | 4 ++-- - 4 files changed, 10 insertions(+), 10 deletions(-) + Signed-off-by: Jonny Lamb -commit cde06ccf071f793a81e0f71627719d7753d9430d -Merge: 3c112f5 14e2d72 +commit d0e53bd470a2638835324575aa2a4bf0b67ad8e8 Author: Jonny Lamb -Date: Mon Mar 21 08:58:09 2011 +0000 +Date: 2011-04-22 09:39:45 +0100 - Merge branch 'sidetzars' + src: include uuid directory and link to libuuid - Conflicts: - extensions/all.xml - salut/Makefile.am - src/salut-connection.c + No idea how this worked before... Signed-off-by: Jonny Lamb -commit 3c112f53e732306b95f1c01050972ac5fd6ecae2 +commit b779af034320e2402bce4c011cda1b0b10157625 Author: Jonny Lamb -Date: Fri Mar 18 13:20:12 2011 +0000 +Date: 2011-04-22 09:31:36 +0100 - connection: only print "updated caps" if they've changed + util: extract copying and sending a stanza from send_ll_pep_event() to another function Signed-off-by: Jonny Lamb - src/salut-connection.c | 18 +++++++----------- - 1 files changed, 7 insertions(+), 11 deletions(-) - -commit 91211a7c2b02c0773e77d33a95850be9a6e1b9cc +commit 916945dcf7cbfd98a7a13de65864136019cf7532 Author: Jonny Lamb -Date: Fri Mar 18 13:19:48 2011 +0000 +Date: 2011-04-07 12:53:21 +0100 - capabilities: move to public API - - This lets plugins build again. :-) + pep: make salut_send_ll_pep_event part of public API Signed-off-by: Jonny Lamb - salut/Makefile.am | 3 +- - salut/capabilities.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ - src/Makefile.am | 2 +- - src/capabilities.h | 73 -------------------------------------------------- - 4 files changed, 76 insertions(+), 75 deletions(-) - -commit 06cee2b75b0ea04dc9b4b7a0af01847af05ae6d7 +commit 431b8494eb86a456353fdf14c49d1695f7145980 Author: Jonny Lamb -Date: Fri Mar 18 12:50:39 2011 +0000 +Date: 2011-03-11 11:06:02 +0000 - salut: remove duplicate pkg-config file + util: add salut_send_ll_event function Signed-off-by: Jonny Lamb - .gitignore | 3 --- - configure.ac | 2 -- - salut/telepathy-salut-uninstalled.pc.in | 3 ++- - salut/telepathy-salut.pc.in | 3 ++- - src/Makefile.am | 7 ------- - src/telepathy-salut-uninstalled.pc.in | 12 ------------ - src/telepathy-salut.pc.in | 12 ------------ - 7 files changed, 4 insertions(+), 38 deletions(-) - -commit 42f10a68a6075ad711c46ca375b85429cc5a0a4c +commit 067627e64a19c64de4eb6549ff9a4ec11aef17ef Author: Jonny Lamb -Date: Fri Mar 18 09:32:44 2011 +0000 +Date: 2011-04-22 09:13:10 +0100 - salut: make caps-channel-manager and capabilities-set public salut API + update wocky snapshot Signed-off-by: Jonny Lamb - salut/Makefile.am | 4 +- - salut/capabilities-set.h | 86 ++++++++++++++++++++++++++++++++++ - salut/caps-channel-manager.h | 106 ++++++++++++++++++++++++++++++++++++++++++ - src/Makefile.am | 4 +- - src/capabilities-set.h | 86 ---------------------------------- - src/capabilities.h | 2 +- - src/caps-channel-manager.c | 3 +- - src/caps-channel-manager.h | 106 ------------------------------------------ - src/salut-capabilities.h | 2 +- - src/salut-connection.c | 3 +- - src/salut-contact-manager.c | 3 +- - src/salut-contact.h | 2 +- - src/salut-ft-manager.c | 3 +- - src/salut-im-manager.c | 3 +- - src/salut-muc-manager.c | 3 +- - src/salut-roomlist-manager.c | 3 +- - src/salut-self.h | 3 +- - src/salut-tubes-manager.c | 3 +- - 18 files changed, 218 insertions(+), 207 deletions(-) - -commit 73a0c0372789fe13154fddb89eef2a9a010bdd4c +commit 456667da199ede4d4000577d67b915e4e3437063 +Merge: 62ebf96 395324b Author: Jonny Lamb -Date: Fri Mar 18 08:50:14 2011 +0000 +Date: 2011-04-22 09:12:49 +0100 - connection: only try and announce self caps if they've changed + Merge branch 'caps' + + Conflicts: + configure.ac + lib/ext/wocky + src/salut-caps-hash.c + src/salut-caps-hash.h Signed-off-by: Jonny Lamb - src/salut-connection.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -commit 84e53c868e09a632e6cbd2e7299d8c3da12e1630 +commit 62ebf96742349fe72411ef8cb03ddb511e80cd94 Author: Jonny Lamb -Date: Thu Mar 17 14:40:18 2011 +0000 +Date: 2011-04-18 10:50:52 +0100 - extensions: remove ContactCapabilities draft + src/Makefile: only build enumtypes files for salut files + + Like in gabble. Signed-off-by: Jonny Lamb - .../Connection_Interface_Contact_Capabilities.xml | 165 -------------------- - extensions/Makefile.am | 1 - - extensions/all.xml | 1 - - 3 files changed, 0 insertions(+), 167 deletions(-) - -commit 3eb861687d891bf851951e19d9c08836d48c9148 +commit ae1b3ea0785850fd2e08b069a5d28ddaaa7ccad6 Author: Jonny Lamb -Date: Thu Mar 17 14:40:05 2011 +0000 +Date: 2011-04-18 10:29:08 +0100 - connection: port to undrafted ContactCapabilities + symbol-hacks: add some hacks to enable all wocky symbols be visible for plugins Signed-off-by: Jonny Lamb - src/salut-connection.c | 104 ++++++++++++++++-------- - tests/twisted/avahi/test-caps-file-transfer.py | 2 +- - tests/twisted/avahi/test-caps-self.py | 7 +- - tests/twisted/avahi/test-caps-tubes.py | 18 ++-- - tests/twisted/constants.py | 2 +- - 5 files changed, 84 insertions(+), 49 deletions(-) - -commit 137833bf895865765abd0e719f5ca52a510bd253 +commit 8d54b22a1df8aedb8ccbe87df07ba114d207a759 Author: Jonny Lamb -Date: Thu Mar 17 14:36:36 2011 +0000 +Date: 2011-04-12 10:21:07 +0100 - connection: create SalutSelf earlier - - This is so we can reference it before we connect for, say, - UpdateCapabilities. + connection: add get_name() function Signed-off-by: Jonny Lamb - src/salut-connection.c | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) - -commit 0018ac8a41cb3b59bac226446ac233337bb04306 +commit b034ef99f9afab5b2513cef6a7104f3f6ab3c8ef Author: Jonny Lamb -Date: Thu Mar 17 12:58:43 2011 +0000 +Date: 2011-04-12 09:50:02 +0100 - disco: use WockyNode instead of GibberXmppNode + connection: add get_session() function Signed-off-by: Jonny Lamb - src/salut-disco.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 79e42ba994fad7271e9e5e9eca6c45f643e9cdfd +commit 91b885466102af636f787fc524b386e2b2c16087 Author: Jonny Lamb -Date: Thu Mar 17 12:58:21 2011 +0000 +Date: 2011-04-08 10:47:46 +0100 - presence-cache: fix leak and used uninitialized warning + exec-with-log.sh.in: set G_SLICE=debug-blocks Signed-off-by: Jonny Lamb - src/salut-presence-cache.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 318dfd3cdcc3549e3fca8d0ddba7e00fca3d3e2f -Merge: 1400816 0eba2ff +commit e1ae931b405822f9887c743cfeb1e0c7af5c8d34 Author: Jonny Lamb -Date: Thu Mar 17 12:51:40 2011 +0000 +Date: 2011-04-08 10:39:36 +0100 - Merge branch contact-caps + exec-with-log.sh.in: just append to salut-testing.log - Conflicts: - src/salut-caps-channel-manager.c - src/salut-caps-channel-manager.h - src/salut-disco.c - src/salut-ft-manager.c - src/salut-presence-cache.c - src/salut-tubes-manager.c + Don't clobber it completely. Signed-off-by: Jonny Lamb -commit 140081643caa1eda5763e52d616616408994b366 +commit 9388ac55d3d7bccb9d042c2a3ecba11d0c4bfa71 Author: Jonny Lamb -Date: Thu Mar 17 12:45:51 2011 +0000 +Date: 2011-04-08 10:30:37 +0100 - {ft,tubes} managers: don't use G_GNUC_UNUSED on used arguments + exec-with-log.sh.in: copy SALUT_TEST_BACKTRACE from gabble Signed-off-by: Jonny Lamb - src/salut-ft-manager.c | 2 +- - src/salut-tubes-manager.c | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 14e2d72bbeae565a53fe8bd32f375c0cec3715c0 +commit c3032ebbd2079312d13be1fefb68376177a27934 Author: Jonny Lamb -Date: Wed Mar 16 14:28:47 2011 +0000 +Date: 2011-04-07 11:18:48 +0100 - sidecar: update copyright years + update wocky snapshot Signed-off-by: Jonny Lamb - salut/sidecar.h | 2 +- - src/sidecar.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) +commit eca1ade70e2a05e5f08ad21d6aafaba58a7aba65 +Merge: 194ca9b 6856d76 +Author: Jonny Lamb +Date: 2011-04-07 10:20:37 +0100 -commit f89e2b1d8bb03138c11437148ef3c85a95aa4b2f + Merge branch 'mock-avahi' + +commit 6856d768ec168a2e25b55fb4eec62731befc0dc2 Author: Jonny Lamb -Date: Wed Mar 16 10:56:09 2011 +0000 +Date: 2011-04-07 10:20:20 +0100 - gibber: update to meta porter API changes + update wocky snapshot Signed-off-by: Jonny Lamb - lib/gibber/gibber-bytestream-oob.c | 4 ++-- - lib/gibber/gibber-oob-file-transfer.c | 8 +++++--- - 2 files changed, 7 insertions(+), 5 deletions(-) - -commit 67c4ee0d757d0165b9bc6f38202fe6bfee389b85 +commit 80118b801297e3d645cf2495cf9e9017bf8b325a Author: Jonny Lamb -Date: Tue Mar 15 15:19:59 2011 +0000 +Date: 2011-04-06 14:40:11 +0100 - sidecars test: added + oob: 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 - tests/twisted/Makefile.am | 12 ++++++- - tests/twisted/sidecars.py | 61 +++++++++++++++++++++++++++++++ - tests/twisted/tools/exec-with-log.sh.in | 1 + - 3 files changed, 73 insertions(+), 1 deletions(-) - -commit e7fe1cceac51e7e4e9f72f74523962af4905c974 +commit 51fe8aa4bdd5730d5262389e00a3eeae2df03745 Author: Jonny Lamb -Date: Tue Mar 15 15:19:36 2011 +0000 +Date: 2011-04-06 13:08:33 +0100 - connection: implement FUTURE interface + tests: only run the test suite on real avahi if SALUT_TEST_REAL_AVAHI=1 Signed-off-by: Jonny Lamb - src/salut-connection.c | 322 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 322 insertions(+), 0 deletions(-) - -commit 459624a34cb65c30ede5887166d038d900b2216e +commit b92a619720285dbd5720ff8257acf290f072f276 Author: Jonny Lamb -Date: Tue Mar 15 14:39:22 2011 +0000 +Date: 2011-04-06 13:07:16 +0100 - test plugin: add simple sidecar support + avahimock: don't bother resolving hostnames; it's only going to be localhsot + + This also means we can use anything we bloody want for the testsuite's + hostname. Signed-off-by: Jonny Lamb - extensions/Connection_Future.xml | 110 ++++++++++++++++++++++++++++++++++++++ - extensions/Makefile.am | 2 + - extensions/Salut_Plugin_Test.xml | 27 +++++++++ - extensions/all.xml | 2 + - plugins/test.c | 79 +++++++++++++++++++++++++++ - plugins/test.h | 33 +++++++++++ - 6 files changed, 253 insertions(+), 0 deletions(-) - -commit 04c5ef4799db15e400bb407396c161e930ab2389 +commit 236cea2a171ef1402bc55f236f57b491068b4b34 Author: Jonny Lamb -Date: Tue Mar 15 14:39:03 2011 +0000 +Date: 2011-04-06 10:59:36 +0100 - plugins: add sidecar support to plugins + avahimock: don't use magic numbers for AvahiServerState enum Signed-off-by: Jonny Lamb - plugins/Makefile.am | 2 +- - salut/Makefile.am | 3 +- - salut/plugin.h | 43 +++++++++++++++++++++++++ - salut/sidecar.h | 67 ++++++++++++++++++++++++++++++++++++++ - src/Makefile.am | 5 ++- - src/plugin-loader.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++- - src/plugin-loader.h | 17 ++++++++++ - src/plugin.c | 64 +++++++++++++++++++++++++++++++++++++ - src/sidecar.c | 47 +++++++++++++++++++++++++++ - 9 files changed, 331 insertions(+), 5 deletions(-) - -commit 5262d495ae17c65b654d22bcb9f1699d4d866143 +commit 3909b2b81de06119e577a2d3caad43b047ac6f12 Author: Jonny Lamb -Date: Tue Mar 15 14:11:34 2011 +0000 +Date: 2011-04-06 10:56:25 +0100 - salut: define SalutConnection so it can be referred to in plugins + avahimock: hard-code GetHostName and GetHostNameFqdn return values Signed-off-by: Jonny Lamb - salut/Makefile.am | 1 + - salut/connection.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ - src/salut-connection.h | 19 +------------------ - 3 files changed, 49 insertions(+), 18 deletions(-) - -commit 0eba2ffb56ed5f612e6d2a9657fe38522a3bd2b1 -Merge: c98fa2f 627a15e +commit 7270ff8b1571ee6869799cfb82903286c41be4fb Author: Jonny Lamb -Date: Tue Mar 15 13:44:34 2011 +0000 +Date: 2011-04-06 10:56:11 +0100 - Merge branch 'plugin' - - Conflicts: - .gitignore - configure.ac - tests/Makefile.am + avahimock: use a constant for the domain name Signed-off-by: Jonny Lamb -commit e623f4b62512508af7f9bd30965e1d8e17a6f74c +commit c26f3aa03e438c5cbb2d01e33798b528f043c177 Author: Jonny Lamb -Date: Mon Mar 14 12:02:32 2011 +0000 +Date: 2011-04-06 10:53:14 +0100 - all: use hold/unhold instead of ref/unref + avahimock: use a little better error string + + Only a little. Signed-off-by: Jonny Lamb - lib/gibber/gibber-bytestream-oob.c | 2 +- - lib/gibber/gibber-oob-file-transfer.c | 2 +- - src/salut-file-transfer-channel.c | 6 +++--- - src/salut-im-channel.c | 4 ++-- - src/salut-si-bytestream-manager.c | 6 +++--- - 5 files changed, 10 insertions(+), 10 deletions(-) - -commit 68771fd034b1b2df3d286352479d687c32c199e0 +commit eb6bb90cdcc1fa1180431577794b856b36f3ae6e Author: Jonny Lamb -Date: Mon Mar 14 09:44:36 2011 +0000 +Date: 2011-04-06 10:53:03 +0100 - all: use specific to/from when referring to contacts in stanzas now + avahimock: return a hard-coded domain name Signed-off-by: Jonny Lamb - lib/gibber/gibber-bytestream-oob.c | 4 ++-- - lib/gibber/gibber-file-transfer.c | 4 ++-- - src/salut-connection.c | 2 +- - src/salut-disco.c | 2 +- - src/salut-ft-manager.c | 2 +- - src/salut-im-manager.c | 2 +- - src/salut-muc-manager.c | 2 +- - src/salut-olpc-activity.c | 2 +- - src/salut-si-bytestream-manager.c | 2 +- - src/text-helper.c | 2 +- - 10 files changed, 12 insertions(+), 12 deletions(-) - -commit c98fa2f0585d1752db4c37af6ea9abcb13c31ff3 -Author: Stef Walter -Date: Sat Mar 12 10:14:13 2011 +0100 - - Distribute *.pc.in files, and different text for uninstalled version. - - src/Makefile.am | 4 ++++ - src/telepathy-salut-uninstalled.pc.in | 4 ++-- - 2 files changed, 6 insertions(+), 2 deletions(-) - -commit 84fab29e9bba4dc5b8f4e19e94a81dd4f262c49d -Author: Stef Walter -Date: Fri Mar 11 15:36:57 2011 +0100 +commit 45775a33e8cb70168c610d6f96b462c5f2b4b6e2 +Author: Jonny Lamb +Date: 2011-04-06 10:52:51 +0100 - Add a telepathy-salut.pc file which contains the executable path. - - For use in tests. + tests: remove Avahi service file - https://bugs.freedesktop.org/show_bug.cgi?id=35211 - - .gitignore | 3 +++ - configure.ac | 2 ++ - src/Makefile.am | 3 +++ - src/telepathy-salut-uninstalled.pc.in | 12 ++++++++++++ - src/telepathy-salut.pc.in | 12 ++++++++++++ - 5 files changed, 32 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit 627a15ea32138a4406dc2bd8c29e879b1a8f14e9 +commit 4addd90afa20fd9dd7fbbedb6280d36907b7b529 Author: Jonny Lamb -Date: Wed Mar 2 16:51:12 2011 +0000 +Date: 2011-04-06 10:45:52 +0100 - plugin: clarify the ownership of the returned array + saluttest: use the whole test path like in gabble Signed-off-by: Jonny Lamb - salut/plugin.h | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit d63fd99f448a10cf34b881c478861b603ffd2c6d +commit 6e2eca6716c0d955df2dad02db83b42623cfbd7f Author: Jonny Lamb -Date: Wed Mar 2 16:46:54 2011 +0000 +Date: 2011-04-06 10:45:22 +0100 - connection: fix typo when freeing the actual pointer array + contact-manager: don't look up a contact in a NULL hash table Signed-off-by: Jonny Lamb - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4fd95fb998e8bd4143504d8c99a564a34246cd49 +commit 194ca9bd5fc1ff70845937cd03f49bb74b91a1e1 Author: Jonny Lamb -Date: Wed Mar 2 16:43:39 2011 +0000 +Date: 2011-04-05 14:47:15 +0100 - avahi-{contact,self}: fix typo in making contact/self jid + configure: re-word description of --enable-avahi-tests Signed-off-by: Jonny Lamb - src/salut-avahi-contact.c | 2 +- - src/salut-avahi-self.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 9190abbe5e9041444424a49b6a6d6c45b453170f +commit b8c26c0d6ac59c88fede90542e65e877fa6f68da Author: Jonny Lamb -Date: Wed Mar 2 16:39:34 2011 +0000 +Date: 2011-04-05 14:36:42 +0100 - plugin: use G_DEFINE_INTERFACE + check-gibber-listener: fix test by not depending on what test was run before - We need GLib 2.24 for this. + The main loop (and therefore the listener) was only started if the + signalled gboolean was FALSE. If this was the first test run then this + would be the case, but if the tcp-listen test was run beforehand then + it would be TRUE and so the main loop wouldn't run and the test would + fail. + + Seeing that the unix-listen test doesn't actually ever test the + signalled gboolean, let's just stop depending on it. Signed-off-by: Jonny Lamb - configure.ac | 2 +- - src/plugin.c | 25 ++++--------------------- - 2 files changed, 5 insertions(+), 22 deletions(-) +commit 89c9098ed080a9e3c83191ba6fb0d5a08e1b957b +Merge: 758dba3 c41a25e +Author: Jonny Lamb +Date: 2011-04-05 13:57:09 +0100 -commit edcba4c589ff2b6954d46de3bdeda4ff91455eb5 + Merge branch 'ohhai' + +commit c41a25ef7f8b9a221ba1e2b5e7f8d21c203c7e02 Author: Jonny Lamb -Date: Wed Mar 2 16:31:15 2011 +0000 +Date: 2011-04-05 13:52:49 +0100 - connection: wocky_session_new now has a _ll suffix + oob-file-transfer: use the correct enum when comparing members + + We got a GSocketFamily enum member from g_socket_address_get_family, + but then compared it to a SoupAddressFamily, although members of the + latter enum are exactly the same as the members of the former. + + gcc pointed this out as: + + gibber-oob-file-transfer.c:526:14: error: comparison between + ‘GSocketFamily’ and ‘enum ’ Signed-off-by: Jonny Lamb - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a6bf9ee54e934988f59a3d3296e3cc476b1bb703 +commit 94d9944e2d38a764d4edbce9cab57ccdece247fc Author: Jonny Lamb -Date: Wed Mar 2 15:40:40 2011 +0000 +Date: 2011-04-05 11:59:35 +0100 - ft-manager: only get the contact with an actual ft offer + connection: don't crash if we try and get self caps before connecting Signed-off-by: Jonny Lamb - src/salut-ft-manager.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit e35953ceb721c30e7808edccf8a00ca9a185adc7 +commit 381972fb479a62e1ec994335b75bf7cf01b851be +Merge: 758dba3 ff4a897 Author: Jonny Lamb -Date: Wed Mar 2 15:37:42 2011 +0000 - - gibber-xmpp-connection: removed - - Signed-off-by: Jonny Lamb - - .gitignore | 1 - - lib/gibber/Makefile.am | 2 - - lib/gibber/gibber-bytestream-direct.c | 1 - - lib/gibber/gibber-bytestream-oob.c | 1 - - lib/gibber/gibber-file-transfer.h | 1 - - lib/gibber/gibber-xmpp-connection.c | 391 ----------------------- - lib/gibber/gibber-xmpp-connection.h | 102 ------ - lib/gibber/tests/Makefile.am | 19 +- - lib/gibber/tests/check-gibber-xmpp-connection.c | 135 -------- - lib/gibber/tests/test-xmpp-connection.c | 160 --------- - src/salut-im-manager.c | 1 - - src/salut-tubes-channel.h | 1 - - 12 files changed, 2 insertions(+), 813 deletions(-) +Date: 2011-04-05 11:52:48 +0100 -commit 51bd65fd96c762fea7990507db13b144cee50abc -Author: Guillaume Desmottes -Date: Wed Mar 2 16:34:55 2011 +0100 - - add Messages properties to immutable properties - - src/salut-im-channel.c | 4 ++++ - src/salut-muc-channel.c | 4 ++++ - 2 files changed, 8 insertions(+), 0 deletions(-) + Merge remote branch 'smcv/mock-avahi' -commit e4bd1f21c86cbd949f70a911f6dc8dfd795e1baa +commit 758dba3714c8c586c21478e8759800acaeb9dc34 Author: Jonny Lamb -Date: Wed Mar 2 15:34:16 2011 +0000 +Date: 2011-04-05 11:52:12 +0100 - gibber-iq-helper: removed + update wocky snapshot Signed-off-by: Jonny Lamb - .gitignore | 1 - - lib/gibber/Makefile.am | 2 - - lib/gibber/gibber-bytestream-oob.c | 1 - - lib/gibber/gibber-iq-helper.c | 403 -------------------------- - lib/gibber/gibber-iq-helper.h | 87 ------ - lib/gibber/tests/Makefile.am | 1 - - lib/gibber/tests/check-gibber-iq-helper.c | 439 ----------------------------- - 7 files changed, 0 insertions(+), 934 deletions(-) - -commit dbd43829b8370a7fb2b5120594b3e30752452a55 +commit b9c31893d6c4508efc3e49b07cd82f07ae8f242c Author: Jonny Lamb -Date: Wed Mar 2 15:32:16 2011 +0000 +Date: 2011-04-05 11:21:54 +0100 - si-bytestream-manager: remove stray include of Gibber iq helper + connection: give the WockySession to create_sidecar_async Signed-off-by: Jonny Lamb - src/salut-si-bytestream-manager.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) +commit 197b891390ee4dd5a1f5b46bc20629e665e94275 +Merge: 871abd7 f7687c7 +Author: Jonny Lamb +Date: 2011-04-05 11:17:23 +0100 + + Merge remote branch 'smcv/im-on-a-train' -commit f8bc814ca4f1343080f5e5b384143cc63ee81f08 +commit 871abd7cb3f8d7c44f55542a4d757a34f7ca3a1f +Merge: 165dfad cfdad47 Author: Jonny Lamb -Date: Wed Mar 2 15:30:06 2011 +0000 +Date: 2011-04-05 09:50:44 +0100 - gibber-xmpp-connection-listener: removed + Merge branch 'meta-porter' + + Conflicts: + .gitignore + src/salut-connection.c + src/salut-disco.c + src/salut-self.c Signed-off-by: Jonny Lamb - .gitignore | 1 - - lib/gibber/Makefile.am | 2 - - lib/gibber/gibber-xmpp-connection-listener.c | 194 -------------------- - lib/gibber/gibber-xmpp-connection-listener.h | 74 -------- - lib/gibber/tests/Makefile.am | 1 - - .../tests/check-gibber-xmpp-connection-listener.c | 123 ------------- - 6 files changed, 0 insertions(+), 395 deletions(-) - -commit 423253450d567702bd427448f52bb14992c4321e +commit cfdad47a9ef766fbcee6d47476110cd92c6a2dc2 Author: Jonny Lamb -Date: Wed Mar 2 15:20:55 2011 +0000 +Date: 2011-04-05 09:47:04 +0100 - xcm: remove files + update wocky snapshot Signed-off-by: Jonny Lamb - src/Makefile.am | 2 - - src/salut-connection.c | 1 - - src/salut-xmpp-connection-manager.c | 1646 ----------------------------------- - src/salut-xmpp-connection-manager.h | 129 --- - 4 files changed, 0 insertions(+), 1778 deletions(-) - -commit 75c4a6d047cb5833afb410fcb7fc38b00d2e4804 +commit 95d10244be9f3f4c49fbf499714a9ee89f370d87 Author: Jonny Lamb -Date: Wed Mar 2 15:20:37 2011 +0000 +Date: 2011-04-05 09:45:04 +0100 - connection: stop creating an XCM + disco: use _extract_errors instead of extracting sub types manually Signed-off-by: Jonny Lamb - src/salut-connection.c | 30 ------------------------------ - 1 files changed, 0 insertions(+), 30 deletions(-) - -commit bc601fcaf79be77d8b87e33c3685f68204aa44b3 +commit 1a9adddd5ba9d12b53ccca45822f744850838083 Author: Jonny Lamb -Date: Wed Mar 2 15:18:02 2011 +0000 +Date: 2011-04-05 09:35:57 +0100 - presence-cache: stop using the XCM + disco: fix indentation Signed-off-by: Jonny Lamb - src/salut-presence-cache.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 437ecdf19f385a28d3a9ac4a92a3dfaa732b2695 +commit 06a7012fd69e2cc6884dd71d6b202e74822c1495 Author: Jonny Lamb -Date: Wed Mar 2 15:17:20 2011 +0000 +Date: 2011-04-05 09:34:25 +0100 - bytestream-oob: stop using GibberXmppConnections + muc-manager: don't pass on bad clique invites to other channel managers Signed-off-by: Jonny Lamb - lib/gibber/gibber-bytestream-oob.c | 365 +++++++++++++++++++++--------------- - 1 files changed, 210 insertions(+), 155 deletions(-) - -commit e56b5d3319ce696568fd813361b7ec742c8704ee +commit e7c0c381f9316d60dfec3d15f0eaba5f0456d4ee Author: Jonny Lamb -Date: Wed Mar 2 14:00:48 2011 +0000 +Date: 2011-04-04 11:09:00 +0100 - bytestream-ibb: stop using GibberXmppConnections + disco: always free request structs + + The problem is this: + + 1. disco request is made + 2. connection is disconnected + 3. SalutDisco is disposed + 4. SalutDisco dispose function g_cancellable_cancels each request + 5. the porter (actually sending the IQ) realises it's been cancelled + and completes in an idle + 6. the disco callback deletes the request, dereferencing its disco + pointer + 7. but it's already been disposed, so assertion galore. + + There was previously an attempt to detect this but it was a bit + shonky. Now the disco pointer is cleared when SalutDisco is disposed, + then when the disco callback tries to delete the request it doesn't + try to access any SalutDisco structures. Bingo. Signed-off-by: Jonny Lamb - lib/gibber/gibber-bytestream-ibb.c | 241 ++++++++++++++++++++---------------- - 1 files changed, 137 insertions(+), 104 deletions(-) - -commit 923da48ffc4735a139c950bcd2f1e911cc68f15d +commit 8248ff7760017918c7361c5fc07cd9532ad5c1cf Author: Jonny Lamb -Date: Wed Mar 2 14:00:09 2011 +0000 +Date: 2011-04-04 09:07:00 +0100 - si-bytestream-manager: stop using the XCM + Revert "muc-manager: don't assert on no invite node" - Signed-off-by: Jonny Lamb - - src/salut-si-bytestream-manager.c | 359 +++++++++++-------------------------- - src/salut-si-bytestream-manager.h | 1 - - 2 files changed, 106 insertions(+), 254 deletions(-) + This reverts commit c836c6a9c3c70dd3259e316dc5e9eb1a3e78b821. -commit 0e37db997eecb5b8646a2f362da2fa53ec0c78a2 +commit 7b1a6014d3b982a8c15e3204d77f3f872d473ef9 Author: Jonny Lamb -Date: Wed Mar 2 13:59:43 2011 +0000 +Date: 2011-04-04 09:04:36 +0100 - tubes-channel: stop using the XCM + tests: stop using re.sub when messing with argv[0] Signed-off-by: Jonny Lamb - src/salut-tubes-channel.c | 249 +++++---------------------------------------- - src/salut-tubes-channel.h | 1 - - src/tube-stream.c | 248 +++++++-------------------------------------- - src/tube-stream.h | 2 +- - 4 files changed, 64 insertions(+), 436 deletions(-) - -commit 898b111ab4a296052fcc333b911d3626af990916 +commit 6fac150759b9c58cf44ffd29dfa9fec7f8e02e48 Author: Jonny Lamb -Date: Wed Mar 2 13:56:06 2011 +0000 +Date: 2011-04-04 08:44:50 +0100 - tubes-manager: stop using the XCM + connection: fix "force_called" variable usage + + Previously it meant exactly the opposite. Signed-off-by: Jonny Lamb - src/salut-connection.c | 3 +- - src/salut-tubes-manager.c | 99 ++++++++++----------------------------------- - src/salut-tubes-manager.h | 4 +- - 3 files changed, 24 insertions(+), 82 deletions(-) - -commit f6fa1694a73010ac0134a648cfcfea93cb9ccd76 +commit 3ea1ca10bb3524b6d15c8b689277ff558584701b Author: Jonny Lamb -Date: Wed Mar 2 13:54:14 2011 +0000 +Date: 2011-04-04 08:41:35 +0100 - muc-manager: stop using the XCM + connection: use g_clear_error as it's NULL-safe Signed-off-by: Jonny Lamb - src/salut-avahi-discovery-client.c | 5 +- - src/salut-avahi-muc-channel.c | 2 - - src/salut-avahi-muc-channel.h | 3 +- - src/salut-avahi-muc-manager.c | 9 +-- - src/salut-avahi-muc-manager.h | 2 - - src/salut-connection.c | 2 +- - src/salut-discovery-client.c | 14 +-- - src/salut-discovery-client.h | 5 +- - src/salut-muc-channel.c | 192 +++++++++--------------------------- - src/salut-muc-channel.h | 1 - - src/salut-muc-manager.c | 94 +++++------------ - src/salut-muc-manager.h | 3 +- - 12 files changed, 91 insertions(+), 241 deletions(-) - -commit 2857f6212a3e2e9136469f224f77b3e21472ac72 +commit bc8d85dd7ab42234559c798d5467fa35ab734d28 Author: Jonny Lamb -Date: Wed Mar 2 13:50:05 2011 +0000 +Date: 2011-04-04 08:40:01 +0100 - connection: stop using the XCM for OLPC uninvite stanzas + muc-manager: register a higher priority handler than the IM manager Signed-off-by: Jonny Lamb - src/salut-connection.c | 65 ++++++++++++++++++++++------------------------- - 1 files changed, 30 insertions(+), 35 deletions(-) - -commit 5dfe4eafe41678ea7291825f3fe8128a59a651a7 +commit 8ee26255a58818a4cf46238a178812445712565e Author: Jonny Lamb -Date: Wed Mar 2 13:48:49 2011 +0000 +Date: 2011-04-01 15:51:04 +0100 - olpc-activity: stop using the XCM + file-transfer-channel: delete ft sockets when finalizing the channel Signed-off-by: Jonny Lamb - src/salut-olpc-activity.c | 115 +------------------------------------------- - 1 files changed, 3 insertions(+), 112 deletions(-) - -commit aff3ae0fa99b1ecd7078505e1d8503e997ce0bd8 +commit 62e9935711e9914933bf95ad1e6ebb58c5cc605d Author: Jonny Lamb -Date: Wed Mar 2 13:48:04 2011 +0000 +Date: 2011-04-01 15:39:06 +0100 - roomlist-manager: stop using the XCM + muc-manager: don't try and index a NULL hash table + + This can happen if a browser-removed callback is called after the + manager has been asked to close all channels. Signed-off-by: Jonny Lamb - src/salut-avahi-discovery-client.c | 5 ++--- - src/salut-avahi-roomlist-manager.c | 4 ---- - src/salut-avahi-roomlist-manager.h | 2 -- - src/salut-connection.c | 2 +- - src/salut-discovery-client.h | 5 ++--- - src/salut-roomlist-manager.c | 26 -------------------------- - src/salut-roomlist-manager.h | 1 - - 7 files changed, 5 insertions(+), 40 deletions(-) - -commit 900449dfacf9518f3fcc52972f8ef0a4850f75af +commit 201df796f0a887ceeed9d4c4a9dd937ce99a8f25 Author: Jonny Lamb -Date: Wed Mar 2 13:47:28 2011 +0000 +Date: 2011-04-01 15:16:56 +0100 - file transfers: stop using the XCM + tests: fix tab/space problem Signed-off-by: Jonny Lamb - lib/gibber/gibber-file-transfer.c | 108 +++++++++++------ - lib/gibber/gibber-file-transfer.h | 5 +- - lib/gibber/gibber-oob-file-transfer.c | 206 +++++++++++++++++++++++---------- - lib/gibber/gibber-oob-file-transfer.h | 3 +- - src/salut-connection.c | 3 +- - src/salut-file-transfer-channel.c | 128 +++++---------------- - src/salut-file-transfer-channel.h | 8 +- - src/salut-ft-manager.c | 62 ++++------ - src/salut-ft-manager.h | 3 +- - 9 files changed, 276 insertions(+), 250 deletions(-) - -commit 5b1e6d98e994e33d234db050fba28c533d41ac65 +commit 240e4b1274ad7ffbe16db384dd76f8b72da5b9a2 Author: Jonny Lamb -Date: Wed Mar 2 13:45:45 2011 +0000 +Date: 2011-04-01 15:16:17 +0100 - presence-cache: handle errors when discoing contacts + twisted tests: make disabled messages conform Signed-off-by: Jonny Lamb - src/salut-presence-cache.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit b2c345adeb8f9df81b5eecd0d00583e8b90deefb +commit cbb040479b508ec7fb459d32da2bfe3543b8df6a Author: Jonny Lamb -Date: Wed Mar 2 13:45:09 2011 +0000 +Date: 2011-04-01 15:15:02 +0100 - im-channel: stop using the XCM + file_transfer_helper.py: add test name to contact JID + + This is to work around avahi being slow at updating contacts and so + running tests with the same JIDs listening on different TCP ports for + incoming connections can break things as salut doesn't get updated. Signed-off-by: Jonny Lamb - src/salut-im-channel.c | 532 ++++++++---------------------------------------- - src/salut-im-channel.h | 4 - - src/text-helper.c | 15 +- - src/text-helper.h | 4 +- - 4 files changed, 95 insertions(+), 460 deletions(-) - -commit 31e26a89bc3d052ef2d29a2afdb5bd297c8e15d5 +commit 53c099075e201b8f85565f6d19c3c05cc9ab3e0b Author: Jonny Lamb -Date: Wed Mar 2 13:44:05 2011 +0000 +Date: 2011-04-01 15:14:21 +0100 - im-manager: stop using the XCM + file_transfer_helper.py: fix assertion message Signed-off-by: Jonny Lamb - src/salut-connection.c | 3 +- - src/salut-im-manager.c | 90 ++++++++++++----------------------------------- - src/salut-im-manager.h | 4 +-- - 3 files changed, 25 insertions(+), 72 deletions(-) - -commit 408b0ccb7919cdaef808357c9d65355c261f5f4e +commit 9ce433140e03c710fdbf7e5a305f56ba42d10b1a Author: Jonny Lamb -Date: Wed Mar 2 13:42:23 2011 +0000 +Date: 2011-04-01 15:14:05 +0100 - disco: stop using the XCM + file-transfer tests: make HTTP server less verbose Signed-off-by: Jonny Lamb - src/salut-connection.c | 2 +- - src/salut-disco.c | 526 +++++++++++++++--------------------------------- - src/salut-disco.h | 7 +- - 3 files changed, 170 insertions(+), 365 deletions(-) - -commit 60fe494dd65dac6a46aa19fded9b2b9bef9f9822 +commit 74b4e5edf4e91be3c943d607e8ec3ec658d045ff Author: Jonny Lamb -Date: Wed Mar 2 13:35:53 2011 +0000 +Date: 2011-04-01 15:13:05 +0100 - avahi-contact-manager: add contacts to Wocky's contact factory too when created + ipv6.py: stop using reactor.listenWith + + It's deprecated. This is a bit of a hack though. Signed-off-by: Jonny Lamb - src/salut-avahi-contact-manager.c | 21 ++++++++++++++++----- - 1 files changed, 16 insertions(+), 5 deletions(-) - -commit e4c52c08713c044949fd825986d832b4687c24c7 +commit f837a11220b51efa62e44384b3196988e7d34d2d Author: Jonny Lamb -Date: Wed Mar 2 13:34:41 2011 +0000 +Date: 2011-04-01 15:12:39 +0100 - avahi-contact: make a subclass of WockyLLContact + tube-stream: set the WockyContact on a stanza to send Signed-off-by: Jonny Lamb - src/salut-avahi-contact.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ - src/salut-contact.c | 2 +- - src/salut-contact.h | 6 +++- - 3 files changed, 65 insertions(+), 3 deletions(-) - -commit 5cf592b7034bebfc0be623bc662b43897fd71b09 +commit 189021e7203015023c9887cd68950797761c395a Author: Jonny Lamb -Date: Wed Mar 2 13:28:17 2011 +0000 +Date: 2011-04-01 15:12:20 +0100 - connection: close all porters when disconnecting + si-bytestream-manager: set the :contact property on new bytestreams Signed-off-by: Jonny Lamb - src/salut-connection.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 104 insertions(+), 3 deletions(-) - -commit 97a6813723e5fa96109c82f3aa31e296ec8cfc2a +commit c630cdf3ff2a3f8c5621b6dc7616e8de352cb66a Author: Jonny Lamb -Date: Wed Mar 2 12:16:58 2011 +0000 +Date: 2011-04-01 14:52:29 +0100 - connection: create a WockySession + si-bytestream-manager: free a newly allocated stanza Signed-off-by: Jonny Lamb - src/salut-avahi-self.c | 6 +++--- - src/salut-connection.c | 27 ++++++++++++++++++++++----- - src/salut-connection.h | 4 ++++ - src/salut-self.c | 3 +-- - src/salut-self.h | 4 ++-- - 5 files changed, 32 insertions(+), 12 deletions(-) - -commit b79d0489bc6ef6b912af020d4014170a79827bb1 -Merge: 7e4e2b4 8843f79 +commit 6f43b3aa51fe97d1d0c475d5394362e685b3bdee Author: Jonny Lamb -Date: Wed Mar 2 08:04:06 2011 +0000 - - Merge remote branch 'stef/test-using-gtest' - -commit 7e4e2b44d35cc8e7321e4f62cc8dbb84a4f43f1e -Author: Danielle Madeley -Date: Wed Mar 2 09:52:26 2011 +1100 - - message-sent and message-received are int64, not uint64 or uint32 - - src/text-helper.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 8843f79f35f40e517154d0b231681c220ddebce0 -Author: Stef Walter -Date: Wed Feb 16 16:50:27 2011 +0100 +Date: 2011-04-01 14:51:45 +0100 - Migrate from 'check' to glib tests. + si-bytestream-manager: fix s/get/set/ typo - https://bugs.freedesktop.org/show_bug.cgi?id=34341 - - .gitignore | 12 ++ - README | 2 - - configure.ac | 6 - - lib/gibber/tests/Makefile.am | 103 ++++++------- - lib/gibber/tests/check-gibber-iq-helper.c | 160 ++++++++++---------- - lib/gibber/tests/check-gibber-listener.c | 68 +++++---- - .../check-gibber-r-multicast-causal-transport.c | 127 +++++++++------- - lib/gibber/tests/check-gibber-r-multicast-packet.c | 81 ++++++----- - lib/gibber/tests/check-gibber-r-multicast-sender.c | 121 ++++++++++----- - lib/gibber/tests/check-gibber-unix-transport.c | 55 ++++--- - .../tests/check-gibber-xmpp-connection-listener.c | 37 +++-- - lib/gibber/tests/check-gibber-xmpp-connection.c | 43 +++-- - lib/gibber/tests/check-gibber-xmpp-error.c | 69 +++++---- - lib/gibber/tests/check-gibber-xmpp-reader.c | 72 +++++----- - lib/gibber/tests/check-gibber.h | 17 -- - lib/gibber/tests/check-helpers.c | 63 -------- - lib/gibber/tests/check-helpers.h | 43 ------ - lib/gibber/tests/check-main.c | 53 ------- - tests/Makefile.am | 67 ++++----- - tests/check-helpers.c | 63 -------- - tests/check-helpers.h | 43 ------ - tests/check-main.c | 40 ----- - tests/check-node-properties.c | 98 ++++++------ - tests/check-salut.h | 6 - - 24 files changed, 607 insertions(+), 842 deletions(-) - -commit 1b1060dc25d6a027b02a2c3a928fef0bff239dbc -Author: Stef Walter -Date: Sun Feb 13 16:08:51 2011 +0100 - - Cleanup comments that no longer match source. - - src/salut-contact-channel.c | 18 ------------------ - src/salut-im-channel.c | 24 ------------------------ - 2 files changed, 0 insertions(+), 42 deletions(-) - -commit aec9acb11cc830b199571cc675577a40669cc3cf -Author: Stef Walter -Date: Sun Feb 13 16:00:57 2011 +0100 - - Remove unused member variable. + Introduced in 923da48ffc4735. - SalutImManagerPrivate::pending_connections - - src/salut-im-manager.c | 24 ------------------------ - 1 files changed, 0 insertions(+), 24 deletions(-) + Signed-off-by: Jonny Lamb -commit 8ff71251a3e5dd85645b85fe16e161eb126bfe1e +commit 1f230673c5581384f89bf7ccedf091f9a39b0642 Author: Jonny Lamb -Date: Wed Feb 9 12:41:43 2011 +0000 +Date: 2011-03-31 14:27:41 +0100 - gibber: remove node and stanza tests + with-session-bus.sh: steal latest from gabble Signed-off-by: Jonny Lamb - lib/gibber/tests/Makefile.am | 2 - - lib/gibber/tests/check-gibber-xmpp-node.c | 146 ----------------------- - lib/gibber/tests/check-gibber-xmpp-stanza.c | 168 --------------------------- - lib/gibber/tests/check-gibber.h | 2 - - lib/gibber/tests/check-main.c | 2 - - 5 files changed, 0 insertions(+), 320 deletions(-) - -commit e36cc7e902fec88a1fb979e10cf1f2b86611464d +commit 197e5ae81b2595a0a16f4cd4c19c549023095da1 Author: Jonny Lamb -Date: Wed Feb 9 12:37:59 2011 +0000 +Date: 2011-03-31 12:57:59 +0100 - gibber: remove GibberXmppNode wrapper + saluttest: set nickname to the test name for log prettiness + + cf. gabble. Signed-off-by: Jonny Lamb - lib/gibber/Makefile.am | 2 - - lib/gibber/gibber-bytestream-ibb.c | 8 +- - lib/gibber/gibber-bytestream-iface.h | 4 +- - lib/gibber/gibber-bytestream-oob.c | 22 +++--- - lib/gibber/gibber-debug.c | 2 +- - lib/gibber/gibber-debug.h | 1 - - lib/gibber/gibber-file-transfer.c | 2 +- - lib/gibber/gibber-iq-helper.c | 16 +++--- - lib/gibber/gibber-oob-file-transfer.c | 84 ++++++++++++------------ - lib/gibber/gibber-xmpp-error.c | 28 ++++---- - lib/gibber/gibber-xmpp-error.h | 7 +- - lib/gibber/gibber-xmpp-node.c | 24 ------- - lib/gibber/gibber-xmpp-node.h | 59 ----------------- - lib/gibber/tests/check-gibber-iq-helper.c | 18 +++--- - lib/gibber/tests/check-gibber-xmpp-error.c | 18 +++--- - lib/gibber/tests/check-gibber-xmpp-node.c | 90 +++++++++++++------------- - lib/gibber/tests/check-gibber-xmpp-reader.c | 14 ++-- - lib/gibber/tests/check-gibber-xmpp-stanza.c | 16 +++--- - lib/gibber/tests/check-gibber.h | 2 +- - lib/gibber/tests/check-main.c | 2 +- - lib/gibber/tests/test-xmpp-connection.c | 14 ++-- - src/salut-caps-channel-manager.c | 2 +- - src/salut-caps-channel-manager.h | 6 +- - src/salut-caps-hash.c | 36 +++++----- - src/salut-caps-hash.h | 4 +- - src/salut-connection.c | 20 +++--- - src/salut-connection.h | 2 +- - src/salut-disco.c | 20 +++--- - src/salut-disco.h | 3 +- - src/salut-ft-manager.c | 8 +- - src/salut-muc-channel.c | 14 ++-- - src/salut-muc-manager.c | 10 ++-- - src/salut-olpc-activity.c | 16 +++--- - src/salut-olpc-activity.h | 2 +- - src/salut-presence-cache.c | 4 +- - src/salut-self.c | 2 +- - src/salut-self.h | 2 +- - src/salut-si-bytestream-manager.c | 64 ++++++++++---------- - src/salut-tubes-channel.c | 80 ++++++++++++------------ - src/salut-tubes-manager.c | 40 ++++++------ - src/salut-util.c | 42 ++++++------ - src/salut-util.h | 5 +- - src/salut-xmpp-connection-manager.c | 2 +- - src/text-helper.c | 36 +++++----- - src/tube-stream.c | 14 ++-- - tests/check-main.c | 2 +- - tests/check-node-properties.c | 20 +++--- - tests/check-salut.h | 2 +- - 48 files changed, 398 insertions(+), 493 deletions(-) - -commit c06e646052ad30573ee2404b841eda6352e036e7 +commit 0ceb8919443b0af641ff42b705192134a8781a46 Author: Jonny Lamb -Date: Wed Feb 9 12:37:46 2011 +0000 +Date: 2011-03-31 10:58:00 +0100 - gibber: remove GibberXmppStanza wrapper + xmppstream: set default namespace to jabber:client in stream open + + Woo! Signed-off-by: Jonny Lamb - .gitignore | 1 + - lib/gibber/Makefile.am | 2 - - lib/gibber/gibber-bytestream-ibb.c | 132 +++++++++++++------------- - lib/gibber/gibber-bytestream-ibb.h | 2 +- - lib/gibber/gibber-bytestream-iface.h | 4 +- - lib/gibber/gibber-bytestream-oob.c | 114 ++++++++++++------------ - lib/gibber/gibber-debug.c | 2 +- - lib/gibber/gibber-debug.h | 5 +- - lib/gibber/gibber-file-transfer.c | 12 +- - lib/gibber/gibber-file-transfer.h | 12 +- - lib/gibber/gibber-iq-helper.c | 42 ++++---- - lib/gibber/gibber-iq-helper.h | 16 ++-- - lib/gibber/gibber-muc-connection.c | 8 +- - lib/gibber/gibber-muc-connection.h | 4 +- - lib/gibber/gibber-oob-file-transfer.c | 54 ++++++------ - lib/gibber/gibber-oob-file-transfer.h | 4 +- - lib/gibber/gibber-xmpp-connection.c | 10 +- - lib/gibber/gibber-xmpp-connection.h | 4 +- - lib/gibber/gibber-xmpp-error.c | 8 +- - lib/gibber/gibber-xmpp-error.h | 5 +- - lib/gibber/gibber-xmpp-reader.c | 4 +- - lib/gibber/gibber-xmpp-stanza.c | 26 ----- - lib/gibber/gibber-xmpp-stanza.h | 90 ------------------ - lib/gibber/gibber-xmpp-writer.h | 2 +- - lib/gibber/tests/Makefile.am | 2 +- - lib/gibber/tests/check-gibber-iq-helper.c | 104 +++++++++++----------- - lib/gibber/tests/check-gibber-xmpp-error.c | 24 +++--- - lib/gibber/tests/check-gibber-xmpp-reader.c | 6 +- - lib/gibber/tests/check-gibber-xmpp-stanza.c | 82 ++++++++-------- - lib/gibber/tests/test-xmpp-connection.c | 2 +- - src/debug.h | 2 +- - src/salut-caps-channel-manager.h | 4 +- - src/salut-caps-hash.c | 4 +- - src/salut-caps-hash.h | 4 +- - src/salut-connection.c | 10 +- - src/salut-connection.h | 4 +- - src/salut-disco.c | 90 +++++++++--------- - src/salut-disco.h | 2 +- - src/salut-file-transfer-channel.c | 6 +- - src/salut-file-transfer-channel.h | 2 +- - src/salut-ft-manager.c | 4 +- - src/salut-im-channel.c | 32 +++--- - src/salut-im-channel.h | 6 +- - src/salut-im-manager.c | 6 +- - src/salut-muc-channel.c | 44 +++++----- - src/salut-muc-manager.c | 16 ++-- - src/salut-muc-manager.h | 2 +- - src/salut-olpc-activity.c | 34 ++++---- - src/salut-self.h | 2 +- - src/salut-si-bytestream-manager.c | 114 ++++++++++++------------ - src/salut-si-bytestream-manager.h | 4 +- - src/salut-tubes-channel.c | 80 ++++++++-------- - src/salut-tubes-channel.h | 8 +- - src/salut-tubes-manager.c | 18 ++-- - src/salut-util.h | 3 +- - src/salut-xmpp-connection-manager.c | 10 +- - src/salut-xmpp-connection-manager.h | 6 +- - src/text-helper.c | 18 ++-- - src/text-helper.h | 8 +- - src/tube-stream.c | 32 +++--- - src/tube-stream.h | 2 +- - tests/check-node-properties.c | 72 +++++++------- - 62 files changed, 662 insertions(+), 770 deletions(-) - -commit ebdffdf082dc15538815517970c5af10184b1115 +commit 7898353910dae2ab720fa9d7ec85e8c86a0a7d70 Author: Jonny Lamb -Date: Tue Feb 8 14:42:20 2011 +0000 +Date: 2011-03-31 09:48:28 +0100 - salut: include wocky as part of the salut plugin API + all: chain up to parent constructed if there is one Signed-off-by: Jonny Lamb - configure.ac | 21 ++++++++++++++++++++- - salut/telepathy-salut-uninstalled.pc.in | 2 +- - 2 files changed, 21 insertions(+), 2 deletions(-) - -commit d09a602e12e25484dce07a22973fbbc111b7ae3d +commit 3512aee218b2f157b0595ec82de0104602987eb8 Author: Jonny Lamb -Date: Tue Feb 8 11:14:53 2011 +0000 +Date: 2011-03-31 09:19:38 +0100 - plugin: fix up pkg-config files + contact: listen to ::status-changed and remove connection pointer when disconnected + + The contact can outlive the connection and then can call methods ont + he connection which has already been disposed. An example of this is + when resolving a contact. Signed-off-by: Jonny Lamb - salut/telepathy-salut-uninstalled.pc.in | 13 ++++++------- - salut/telepathy-salut.pc.in | 3 +-- - 2 files changed, 7 insertions(+), 9 deletions(-) - -commit 95ed3ebfffdbbe6da7db659c06cb9aeb11d252db +commit c836c6a9c3c70dd3259e316dc5e9eb1a3e78b821 Author: Jonny Lamb -Date: Tue Feb 8 10:26:31 2011 +0000 +Date: 2011-03-31 09:07:15 +0100 - salut: move protocol.h to salut's public API + muc-manager: don't assert on no invite node + + These callbacks are different now -- they can be called to see what + the callback so we shouldn't assert if it's not actually a MUC invite. Signed-off-by: Jonny Lamb - salut/Makefile.am | 3 +- - salut/protocol.h | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/Makefile.am | 3 +- - src/protocol.h | 91 ----------------------------------------------------- - 4 files changed, 95 insertions(+), 93 deletions(-) - -commit baf67f53e38d8ac0d4e7355f832d4065bd9c6553 +commit 2afb63eb8aaeff4be8fa4bb8c812e0a95dc71f43 Author: Jonny Lamb -Date: Tue Feb 8 10:17:19 2011 +0000 +Date: 2011-03-31 09:06:44 +0100 - protocol: specify the DNSSD name and have a backend fallback + disco: only delete the request if it hasn't been already done for us Signed-off-by: Jonny Lamb - src/protocol.c | 31 ++++++++++++++++++++++++++++++- - src/protocol.h | 15 +++++++++++++++ - src/salut-connection-manager.c | 1 + - src/salut-connection.c | 17 +++++++++++++++++ - src/write-mgr-file.c | 1 + - 5 files changed, 64 insertions(+), 1 deletions(-) - -commit 3f2f6de25ce5a5d7d5d335682548c1a95b72feb1 +commit d5b43d1beb459187ab918dcd0a02c7fbc5cd27e1 Author: Jonny Lamb -Date: Tue Feb 8 09:51:26 2011 +0000 +Date: 2011-03-31 09:06:24 +0100 - src/: remove backend static libraries - - Just throw it all into the convenience library. + disco: deal with the SalutSelf being NULL Signed-off-by: Jonny Lamb - src/Makefile.am | 12 ++---------- - tests/Makefile.am | 2 -- - 2 files changed, 2 insertions(+), 12 deletions(-) - -commit 8d8cbbdd95e420c34916da95bd2ce2b34e4f57b4 +commit e16a55113fa64f01176be789f688467f2bb07c70 Author: Jonny Lamb -Date: Mon Feb 7 16:48:53 2011 +0000 +Date: 2011-03-31 09:05:12 +0100 - avahi-{contact-manager,self,contact}: don't assume dnssd name is _presence._tcp + avahi-self: propogate error in announce Signed-off-by: Jonny Lamb - src/salut-avahi-contact-manager.c | 14 +++++++++++++- - src/salut-avahi-contact.c | 5 ++++- - src/salut-avahi-self.c | 13 +++++++++++-- - 3 files changed, 28 insertions(+), 4 deletions(-) - -commit 96da3972933b51037593c92a395a96e26f2c0f4f +commit a546c1822cb7d5cc8288ebba139611553c1ecea9 Author: Jonny Lamb -Date: Mon Feb 7 16:48:03 2011 +0000 +Date: 2011-03-31 09:03:54 +0100 - avahi-discovery-client: add a get_dnssd_name function + connection: keep a ref to the connection when calling close/force close + + Also, fix a case where tp_base_connection_finish_shutdown() is called + twice. D'oh! + + This will be fixed anyway when we remove force_close from the public + API. Signed-off-by: Jonny Lamb - src/salut-avahi-discovery-client.c | 45 ++++++++++++++++++++++++++++++++++++ - src/salut-avahi-discovery-client.h | 3 ++ - src/salut-discovery-client.c | 10 ++++++++ - 3 files changed, 58 insertions(+), 0 deletions(-) - -commit 6db2272c47e4ba7cadf623940e2877d820359cf1 +commit 3c833d1715c4210cc92e04f5ac569b2d76f78356 Author: Jonny Lamb -Date: Mon Feb 7 16:15:41 2011 +0000 +Date: 2011-03-31 09:03:17 +0100 - protocol: allow the name, icon name and English to be set easier + connection: add more debug messages when failing to connect Signed-off-by: Jonny Lamb - src/protocol.c | 66 +++++++++++++++++++++++++++++++++++----- - src/protocol.h | 9 +++++- - src/salut-connection-manager.c | 5 ++- - src/write-mgr-file.c | 5 ++- - 4 files changed, 74 insertions(+), 11 deletions(-) - -commit 0a4e239e80474e990475c987546adc80c4af6008 +commit 329a283e5818be2178ef3ec0f67c5decb7cdcf40 Author: Jonny Lamb -Date: Mon Feb 7 14:06:08 2011 +0000 +Date: 2011-03-31 09:01:59 +0100 - test plugin: document how to add another protocol + saluttest: update exec_test_deferred from gabbletest Signed-off-by: Jonny Lamb - plugins/test.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit e343336ffb798eccfae8b3e5f0fdb5ab6b294e6d +commit 6d612aabb03cfb848fc3734423cd194dfd493278 Author: Jonny Lamb -Date: Mon Feb 7 13:48:42 2011 +0000 +Date: 2011-03-31 09:00:30 +0100 - plugin: add initialize method to give access to the CM + servicetest: update colourer from gabble's servicetest Signed-off-by: Jonny Lamb - plugins/test.c | 8 ++++++++ - salut/plugin.h | 14 ++++++++++++++ - src/plugin-loader.c | 14 ++++++++++++++ - src/plugin-loader.h | 5 +++++ - src/plugin.c | 11 +++++++++++ - src/salut-connection-manager.c | 8 ++++++++ - 6 files changed, 60 insertions(+), 0 deletions(-) - -commit 5700f08ca7b05df559a0829c04d7874e3c4d86b9 +commit 82f78a2d798ad284395fbb1dbb1416a78a53d6a2 Author: Jonny Lamb -Date: Mon Feb 7 13:28:30 2011 +0000 +Date: 2011-03-29 10:02:20 +0100 - plugin: add padding and API version + im-manager: ignore clique MUC invites and leave for the MUC manager Signed-off-by: Jonny Lamb - plugins/test.c | 4 ++++ - salut/plugin.h | 16 +++++++++++++--- - 2 files changed, 17 insertions(+), 3 deletions(-) - -commit 16b379a0df1128cdc22c64fc06b2fb55001129d1 +commit e1bd15b54853fd7143247208d3664463a0587d0c Author: Jonny Lamb -Date: Mon Feb 7 12:40:18 2011 +0000 +Date: 2011-03-29 10:01:44 +0100 - plugin: clarify the return type of CreateChannelManagersImpl + disco: fix calling the callback if the cancellable was cancelled + + Oops! Signed-off-by: Jonny Lamb - salut/plugin.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit c241268980bcbdc00e768343eb56d7ae27162020 +commit 1247394a708123bcebf28aae91861a2e99314c70 Author: Jonny Lamb -Date: Mon Feb 7 12:37:32 2011 +0000 +Date: 2011-03-24 11:40:36 +0000 - test plugin: implement create_channel_managers + avahi-contact: use stack-allocated GQueue instead of expensive or annoying GLists Signed-off-by: Jonny Lamb - plugins/Makefile.am | 2 +- - plugins/test.c | 11 +++++++++++ - 2 files changed, 12 insertions(+), 1 deletions(-) - -commit 9acaad58f52a2d337126968aa173b35a4fb14c2d +commit 42edf30b88986a29cbbc811efea10084efe2f2f7 Author: Jonny Lamb -Date: Mon Feb 7 12:37:11 2011 +0000 +Date: 2011-03-24 11:34:20 +0000 - connection: add channel managers from plugins + bytestream-oob: ensure we free the socket address in an error Signed-off-by: Jonny Lamb - src/salut-connection.c | 19 +++++++++++++++++++ - 1 files changed, 19 insertions(+), 0 deletions(-) - -commit 091287566f168fd2a26900d4d8980973b889f144 +commit f12c6f1b6f07544f614bb1815aaf78d5a6f0c610 Author: Jonny Lamb -Date: Mon Feb 7 12:36:45 2011 +0000 +Date: 2011-03-24 11:23:37 +0000 - plugin-loader: add create_channel_managers method to iterate the plugins + bytestream-oob: use the actual socket address when connecting to remote contact Signed-off-by: Jonny Lamb - src/plugin-loader.c | 32 ++++++++++++++++++++++++++++++++ - src/plugin-loader.h | 8 +++++++- - 2 files changed, 39 insertions(+), 1 deletions(-) - -commit 60f4cffc76886b2cc16a5672ef540e6aa346058d +commit 1098480d797fb261eef5e8b9ce6c206acb63fd73 Author: Jonny Lamb -Date: Mon Feb 7 12:35:16 2011 +0000 +Date: 2011-03-24 11:05:59 +0000 - plugin: add a create_channel_managers plugin member + bytestream-[io]bb: fix so more than the first object can work + + Also, clean up by removing the if (blah blah blah) in the set_property + implementation. Signed-off-by: Jonny Lamb - salut/plugin.h | 15 +++++++++++++++ - src/plugin.c | 14 ++++++++++++++ - 2 files changed, 29 insertions(+), 0 deletions(-) - -commit be34bffd864816dbd82a8097a955eec3ed4131fa +commit e3a81ac84abf6cedaea3aac4d638461e296346fd Author: Jonny Lamb -Date: Mon Feb 7 11:57:31 2011 +0000 +Date: 2011-03-24 10:45:13 +0000 - plugin-loader: add plugin loader from gabble + tube-stream: don't unref a NULL stanza Signed-off-by: Jonny Lamb - src/Makefile.am | 6 +- - src/plugin-loader.c | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++ - src/plugin-loader.h | 60 ++++++++++++++ - src/plugin.c | 67 +++++++++++++++ - src/salut.c | 11 ++- - 5 files changed, 369 insertions(+), 2 deletions(-) - -commit 6195e787e6fb2c92cebe85ebd815210f0952a2f0 +commit 165dfad6d746110a90693cc366fc58556bdff42e Author: Jonny Lamb -Date: Mon Feb 7 11:49:59 2011 +0000 +Date: 2011-03-23 10:25:19 +0000 - plugins: add a test plugin + gitmodules: update wocky's URL Signed-off-by: Jonny Lamb - Makefile.am | 2 +- - configure.ac | 1 + - plugins/Makefile.am | 32 ++++++++++++++++++++++++++++++++ - plugins/test.c | 41 +++++++++++++++++++++++++++++++++++++++++ - plugins/test.h | 32 ++++++++++++++++++++++++++++++++ - 5 files changed, 107 insertions(+), 1 deletions(-) - -commit aacd617f299de8836b41383634c452060f0dcf4f +commit c492cf03519d25a69ef7291bba69c963478922ec Author: Jonny Lamb -Date: Mon Feb 7 11:44:15 2011 +0000 +Date: 2011-03-23 10:23:23 +0000 - plugins: start defining SalutPlugin interface + gibber-file-transfer: porter property cannot be NULL Signed-off-by: Jonny Lamb - .gitignore | 3 + - Makefile.am | 2 +- - configure.ac | 3 + - salut/Makefile.am | 9 ++++ - salut/plugin.h | 76 +++++++++++++++++++++++++++++++ - salut/telepathy-salut-uninstalled.pc.in | 15 ++++++ - salut/telepathy-salut.pc.in | 15 ++++++ - 7 files changed, 122 insertions(+), 1 deletions(-) - -commit fc8261c9098be490635c7f6eea3fa47d0a134263 +commit a6e01c196e3dd611635fdeddc69616a913dca2fc Author: Jonny Lamb -Date: Mon Feb 7 11:37:46 2011 +0000 +Date: 2011-03-23 10:16:51 +0000 - configure: add --enable-plugins option and link to gmodule + im-channel: clarify comment regarding stanza handler callback returning FALSE Signed-off-by: Jonny Lamb - configure.ac | 25 +++++++++++++++++++++++++ - src/Makefile.am | 3 +++ - 2 files changed, 28 insertions(+), 0 deletions(-) - -commit af380d713a0fe6a74b84e30d0ebd576ed2904f2c +commit 1a06f891b2ee5767a28c9539c200dc8eab70947e Author: Jonny Lamb -Date: Mon Feb 7 11:34:08 2011 +0000 +Date: 2011-03-23 10:15:42 +0000 - debug: add plugin debug categories + disco: don't call the callback if the object has been disposed Signed-off-by: Jonny Lamb - src/debug.c | 1 + - src/debug.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit 395324b1dab0e8b03b0ae44704a1347fefb3776b -Author: Jonny Lamb -Date: Fri Feb 4 14:43:55 2011 +0000 +commit b900269fe36cd5852a62cfa1910dff51d55a05fe +Author: Jonny Lamb +Date: 2011-03-23 09:28:23 +0000 - caps-hash: use wocky_caps_hash_compute_from_lists + avahi-contact: use prepend then reverse, instead of append - Signed-off-by: Jonny Lamb - - src/salut-caps-hash.c | 84 ++++++------------------------------------------ - 1 files changed, 11 insertions(+), 73 deletions(-) - -commit 56d7666e1bf58b3bed1301e039338765f181239a -Author: Guillaume Desmottes -Date: Thu Feb 3 09:58:55 2011 +0100 - - add mising space + Signed-off-by: Jonny Lamb - src/salut-file-transfer-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) +commit c95d4e863585a94c8d454cd60ace9b2b800b18a5 +Author: Jonny Lamb +Date: 2011-03-23 09:19:52 +0000 -commit 7be0c14026bc0d6c2b48cf63ef8078ada04b3fb4 -Author: Guillaume Desmottes -Date: Thu Feb 3 09:58:26 2011 +0100 + avahi-contact: remove confusing comment + + Signed-off-by: Jonny Lamb - file_transfer_channel_allowed_properties: update comment regarding properties ordering +commit 9e28b4fadafad3a8a4900a64329712e41876a48c +Author: Jonny Lamb +Date: 2011-03-23 09:19:01 +0000 - src/salut-ft-manager.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + avahi-contact: don't get the AvahiIfIndex if it's not required + + Signed-off-by: Jonny Lamb -commit e5e96f1eb0f55daf657d696b7871e70ee22e9f4c +commit b76e690de7a13bcb91d9d02dc2685aa3dfade235 Author: Jonny Lamb -Date: Wed Feb 2 16:30:48 2011 +0000 +Date: 2011-03-22 13:53:54 +0000 - caps-hash: remove caps hashing code + connection: don't critical when calling UpdateCapabilities pre-connection - This has moved to Wocky. + I assumed gabble_capability_set_equals would take a NULL argument + fine, but alas it does not. Signed-off-by: Jonny Lamb - src/salut-caps-hash.c | 348 +------------------------------------------------ - src/salut-caps-hash.h | 1 - - 2 files changed, 4 insertions(+), 345 deletions(-) - -commit 2ae55c56418a3eca478503b345a11505280b4341 +commit bd725740a004bd38e55331494a7673f2766032ab Author: Jonny Lamb -Date: Wed Feb 2 16:30:26 2011 +0000 +Date: 2011-03-21 15:55:18 +0000 - presence-cache: use wocky's caps hashing code + plugin-loader: don't critical if a plugin lazily implements no sidecars + + An empty strv is really { NULL }, but it's not so unreasonable to + use just NULL instead, so we shouldn't break if we get that. + + Creating a sidecar is safe as it checks whether the strv contains the + requested interface using tp_strv_contains() which treats NULL as an + empty strv. Signed-off-by: Jonny Lamb - src/salut-presence-cache.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 5232222c686297476efa5d0480b59380cdbb23d4 +commit 54bb941c5faa92ce49f61e1af925c72345026537 Author: Jonny Lamb -Date: Wed Feb 2 16:29:59 2011 +0000 +Date: 2011-03-21 14:57:14 +0000 - configure: test for python-avahi + connection: save pre-connect UpdateCapabilities and set when creating the SalutSelf Signed-off-by: Jonny Lamb - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 015fd9530cbbe4b010e8314dc2e7bfa7eb55c985 +commit 801723046b8ba801711273ba44929c79097c463f Author: Jonny Lamb -Date: Wed Feb 2 16:12:24 2011 +0000 +Date: 2011-03-21 14:33:19 +0000 - configure: check for xmldiff + Revert "connection: create SalutSelf earlier" - Signed-off-by: Jonny Lamb - - NEWS | 6 ++++++ - configure.ac | 7 +++++++ - 2 files changed, 13 insertions(+), 0 deletions(-) + This reverts commit 137833bf895865765abd0e719f5ca52a510bd253. -commit 4b6c7eae9d1f338ce9f7bc5a08b47175f23937be +commit 02dfe0e60dafbda103c760dc8476a42d81ffeb20 Author: Jonny Lamb -Date: Wed Feb 2 15:50:13 2011 +0000 +Date: 2011-03-21 13:51:32 +0000 - update wocky snapshot + tests: stop referring to libsalut-backend-avahi + + This was removed in 3f2f6de25ce5a5d7d5. Signed-off-by: Jonny Lamb - lib/ext/wocky | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) +commit c83e98eccd192a7ef9f77cb317b6f0ec70d2bdb1 +Author: Will Thompson +Date: 2011-03-18 18:45:11 +0000 -commit a05c46e046b564c4a9f1a5a5f438ede6e33f0029 -Author: Guillaume Desmottes -Date: Wed Feb 2 16:45:31 2011 +0100 + configure: check for Python Avahi module + + Previously we'd try to run the tests even if the Avahi Python module + wasn't available. - test URI property +commit f915df4a1f24eb032d16198c19770c47bcb7a40c +Author: Will Thompson +Date: 2011-03-18 18:44:46 +0000 - .../avahi/file-transfer/file_transfer_helper.py | 49 ++++++++++++++++--- - .../file-transfer/test-receive-and-send-file.py | 4 +- - 2 files changed, 43 insertions(+), 10 deletions(-) + Correctly use im-local-xmpp as the icon name. + + 6db2272 broke this. -commit 1cb100517f2e430ef31b310acbbd7cf35463021e -Author: Guillaume Desmottes -Date: Wed Feb 2 16:31:36 2011 +0100 +commit d4a982ee82f105fa5e11d8ed3086482561af431c +Author: Will Thompson +Date: 2011-03-18 18:41:25 +0000 - Implement FileTransfer.FileURI (fdo #33833) + Unconfuse TpTubeChannelState and TpTubeState a bit + + My version of GCC didn't like building a bunch of the tube code because + it confuses TpTubeChannelState and TpTubeState. In practice this code + works because the former is a superset of the latter and none of the + confused code paths can encounter the extra value. This patch tidies up + just enough for the compiler not to whine. - src/salut-file-transfer-channel.c | 135 ++++++++++++++++---- - src/salut-file-transfer-channel.h | 2 +- - src/salut-ft-manager.c | 8 +- - .../avahi/file-transfer/file_transfer_helper.py | 3 +- - tests/twisted/avahi/test-caps-file-transfer.py | 8 +- - tests/twisted/avahi/test-caps-tubes.py | 2 +- - 6 files changed, 126 insertions(+), 32 deletions(-) +commit cde06ccf071f793a81e0f71627719d7753d9430d +Merge: 3c112f5 14e2d72 +Author: Jonny Lamb +Date: 2011-03-21 08:58:09 +0000 -commit 4a2f0b9d5c36dd085a93d3e8a0fc3d87e7829f69 -Author: Guillaume Desmottes -Date: Wed Feb 2 15:21:20 2011 +0100 + Merge branch 'sidetzars' + + Conflicts: + extensions/all.xml + salut/Makefile.am + src/salut-connection.c + + Signed-off-by: Jonny Lamb - file transfer tests: use constants.py +commit 3c112f53e732306b95f1c01050972ac5fd6ecae2 +Author: Jonny Lamb +Date: 2011-03-18 13:20:12 +0000 - .../avahi/file-transfer/file_transfer_helper.py | 198 ++++++++------------ - .../file-transfer/test-ichat-send-file-declined.py | 10 +- - ...ive-file-and-sender-disconnect-while-pending.py | 8 +- - ...file-and-sender-disconnect-while-transfering.py | 3 +- - .../test-receive-file-and-xmpp-disconnect.py | 3 +- - .../test-receive-file-cancelled-immediately.py | 9 +- - .../file-transfer/test-receive-file-decline.py | 13 +- - .../file-transfer/test-receive-file-not-found.py | 11 +- - .../test-send-file-and-cancel-immediately.py | 9 +- - .../avahi/file-transfer/test-send-file-declined.py | 10 +- - .../avahi/file-transfer/test-send-file-ipv6.py | 13 +- - .../file-transfer/test-send-file-item-not-found.py | 11 +- - .../test-send-file-provide-immediately.py | 13 +- - .../test-send-file-to-unknown-contact.py | 4 +- - .../test-send-file-wait-to-provide.py | 18 +- - 15 files changed, 152 insertions(+), 181 deletions(-) + connection: only print "updated caps" if they've changed + + Signed-off-by: Jonny Lamb -commit 317ad67e47170acf2cdc3fe0c6ab045b3093f628 -Author: Guillaume Desmottes -Date: Wed Feb 2 14:29:28 2011 +0100 +commit 91211a7c2b02c0773e77d33a95850be9a6e1b9cc +Author: Jonny Lamb +Date: 2011-03-18 13:19:48 +0000 - constants.py: sync with Gabble + capabilities: move to public API - Remaining change: ContactCapabilities is still a DRAFT in Salut. - - tests/twisted/constants.py | 66 +++++++++++++++++++++++++++++++++++-------- - 1 files changed, 53 insertions(+), 13 deletions(-) + This lets plugins build again. :-) + + Signed-off-by: Jonny Lamb -commit 8783513aa2c5fde5d408054d10d8c89f48e7ea92 -Author: Guillaume Desmottes -Date: Wed Feb 2 13:16:22 2011 +0100 +commit 06cee2b75b0ea04dc9b4b7a0af01847af05ae6d7 +Author: Jonny Lamb +Date: 2011-03-18 12:50:39 +0000 - file_transfer_channel_allowed_properties: use tp-glib constants + salut: remove duplicate pkg-config file - Also re-order it to match Gabble's ordering. - - src/salut-ft-manager.c | 23 ++++++++++--------- - .../avahi/file-transfer/file_transfer_helper.py | 4 +- - tests/twisted/avahi/test-caps-file-transfer.py | 16 +++++++------- - tests/twisted/avahi/test-caps-tubes.py | 4 +- - 4 files changed, 24 insertions(+), 23 deletions(-) + Signed-off-by: Jonny Lamb -commit 7dffc1e2c000a36d8cae2f69b43e8144e89d6b26 -Author: Guillaume Desmottes -Date: Wed Feb 2 13:10:52 2011 +0100 +commit 42f10a68a6075ad711c46ca375b85429cc5a0a4c +Author: Jonny Lamb +Date: 2011-03-18 09:32:44 +0000 - Depends on telepathy-glib 0.13.12 + salut: make caps-channel-manager and capabilities-set public salut API - We need it to implement FileTransfer.URI. - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Signed-off-by: Jonny Lamb -commit e8e06a9d1c688d7b56ccc1f8267ece7cb9a96d62 -Author: Guillaume Desmottes -Date: Wed Feb 2 13:25:19 2011 +0100 +commit 73a0c0372789fe13154fddb89eef2a9a010bdd4c +Author: Jonny Lamb +Date: 2011-03-18 08:50:14 +0000 - saluttest: silence the queue if we hit an error + connection: only try and announce self caps if they've changed - This a backport of the Gabble commit ee177cfb2a13a8374e2f1037e806b7bc58aa708b - - tests/twisted/saluttest.py | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit f7687c7da88feccd4a225d17397ee83118018052 -Author: Simon McVittie -Date: Fri Dec 3 15:59:35 2010 +0000 +commit 84e53c868e09a632e6cbd2e7299d8c3da12e1630 +Author: Jonny Lamb +Date: 2011-03-17 14:40:18 +0000 - test-close-local-pending-room.py: be more specific in our expectations + extensions: remove ContactCapabilities draft - When not on a LAN, the events don't come out in the order we'd assumed. + Signed-off-by: Jonny Lamb - .../twisted/avahi/test-close-local-pending-room.py | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) +commit 3eb861687d891bf851951e19d9c08836d48c9148 +Author: Jonny Lamb +Date: 2011-03-17 14:40:05 +0000 -commit a15d92f646d661207f947c65554bc2421a42fe57 -Author: Simon McVittie -Date: Fri Dec 3 15:58:34 2010 +0000 - - test-close-local-pending-room.py: use constants.py - - .../twisted/avahi/test-close-local-pending-room.py | 11 +++-------- - 1 files changed, 3 insertions(+), 8 deletions(-) - -commit 5527c3226d98a1afd3b0df3c63b36712d9149f09 -Author: Simon McVittie -Date: Fri Dec 3 12:30:29 2010 +0000 - - test-muc-invite.py: avoid implicit assertion that no non-Text channels appear - - This failed at least once for me while on an offline laptop. - - tests/twisted/avahi/test-muc-invite.py | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 8a26a635ad7249d650afede4201030e34c567cc5 -Author: Simon McVittie -Date: Fri Dec 3 12:29:55 2010 +0000 - - test-muc-invite.py: make better use of constants.py - - tests/twisted/avahi/test-muc-invite.py | 21 ++++++++------------- - 1 files changed, 8 insertions(+), 13 deletions(-) - -commit ff4a8979d408daaebd19ff041b2d908aa3a3bc76 -Merge: ee83ae0 cbe5cc6 -Author: Simon McVittie -Date: Fri Dec 3 12:18:21 2010 +0000 - - Merge branch 'master' into mock-avahi - -commit cbe5cc6fdeb62706f03bf212f2fd747dae8bde15 -Author: Simon McVittie -Date: Wed Nov 17 17:48:01 2010 +0000 - - fd.o #31665: use TpDBusDaemon, not tp_get_bus() - - Reviewed-by: Guillaume Desmottes - - src/salut-contact-channel.c | 9 ++++----- - src/salut-file-transfer-channel.c | 6 +++--- - src/salut-im-channel.c | 6 +++--- - src/salut-muc-channel.c | 6 +++--- - src/salut-roomlist-channel.c | 8 +++++--- - src/salut-tubes-channel.c | 11 ++++++----- - src/tube-dbus.c | 15 ++++++++------- - src/tube-stream.c | 13 +++++++------ - 8 files changed, 39 insertions(+), 35 deletions(-) - -commit ee83ae0811a5753316766ded2d85f8758f83ba43 -Merge: 2cb3acc 279099c -Author: Tomeu Vizoso -Date: Fri Nov 5 14:03:04 2010 +0100 - - Merge branch 'mock-avahi-3' into mock-avahi-4 - -commit d68cc47ccbc09a02f997eb2e09d8e6977099cdeb -Author: Simon McVittie -Date: Thu Oct 7 15:45:53 2010 +0100 - - Remove SalutCapsChannelManager - - src/Makefile.am | 2 - - src/salut-capabilities.c | 2 - - src/salut-caps-channel-manager.c | 120 --------------------------- - src/salut-caps-channel-manager.h | 98 ---------------------- - src/salut-connection.c | 1 - - src/salut-contact-manager.c | 2 - - src/salut-ft-manager.c | 69 --------------- - src/salut-im-manager.c | 2 - - src/salut-muc-manager.c | 3 - - src/salut-presence-cache.c | 1 - - src/salut-roomlist-manager.c | 3 - - src/salut-tubes-manager.c | 169 -------------------------------------- - 12 files changed, 0 insertions(+), 472 deletions(-) - -commit 4f5e6848885df1e4418a6ea525533399d2cf52bc -Author: Simon McVittie -Date: Mon Nov 1 12:23:03 2010 +0000 - - SalutPresenceCache: don't store per_channel_manager_caps - - src/salut-presence-cache.c | 141 +------------------------------------------- - src/salut-presence-cache.h | 16 ----- - 2 files changed, 3 insertions(+), 154 deletions(-) - -commit a66e59e57fb9d5a0db5e7a783d918552c9b853f7 -Author: Simon McVittie -Date: Thu Oct 7 15:40:34 2010 +0100 - - SalutContact: don't store per_channel_manager_caps - - src/salut-contact.c | 7 +------ - src/salut-contact.h | 4 +--- - src/salut-presence-cache.c | 8 +------- - 3 files changed, 3 insertions(+), 16 deletions(-) - -commit ff8a9257edd2347d65c49c7a1e70b1fa685f535d -Author: Simon McVittie -Date: Thu Oct 7 15:39:13 2010 +0100 - - SalutPresenceCache: don't emit the actual capabilities in capabilities-update - - src/salut-connection.c | 5 +---- - src/salut-presence-cache.c | 6 ++---- - 2 files changed, 3 insertions(+), 8 deletions(-) - -commit 2d79e55cae1bc970738bbea23f7f29bb609c2841 -Author: Simon McVittie -Date: Thu Oct 7 15:35:06 2010 +0100 - - Remove now-unused functionality from SalutCapsChannelManager - - src/salut-capabilities.c | 38 +++------ - src/salut-capabilities.h | 19 ---- - src/salut-caps-channel-manager.c | 54 ------------ - src/salut-caps-channel-manager.h | 35 -------- - src/salut-ft-manager.c | 10 -- - src/salut-tubes-manager.c | 170 +------------------------------------- - 6 files changed, 13 insertions(+), 313 deletions(-) - -commit 5ab4bfc3d804e3d7f13c02f74204c33c5fcab02b -Author: Simon McVittie -Date: Thu Oct 7 15:14:15 2010 +0100 - - SalutSelf: work entirely in terms of a GabbleCapabilitySet, with no "per-channel-manager caps" - - In the process, convert salut_connection_set_self_capabilities to use - gabble_caps_channel_manager_represent_client. - - src/salut-capabilities.c | 11 ++++++++++ - src/salut-capabilities.h | 3 ++ - src/salut-connection.c | 37 ++++++++++++++------------------- - src/salut-self.c | 51 +++++++-------------------------------------- - src/salut-self.h | 5 +--- - 5 files changed, 39 insertions(+), 68 deletions(-) - -commit 85c6d6055dac41fb9426c7fd80c921996d1d3e0c -Author: Simon McVittie -Date: Thu Oct 7 14:59:33 2010 +0100 - - salut_self_swap_per_channel_manager_caps: stop returning the old caps - - They're no longer needed. - - src/salut-connection.c | 5 ++--- - src/salut-self.c | 9 ++++----- - src/salut-self.h | 2 +- - 3 files changed, 7 insertions(+), 9 deletions(-) - -commit 185f79efa3815df1f0d808a329ea8092ed773f15 -Author: Simon McVittie -Date: Thu Oct 7 14:57:19 2010 +0100 - - _emit_contact_capabilities_changed: no longer needs the old/new caps - - src/salut-connection.c | 13 ++++--------- - 1 files changed, 4 insertions(+), 9 deletions(-) - -commit 6780d912b70569152df058fb3087d1d12e7f468e -Author: Simon McVittie -Date: Thu Oct 7 14:56:09 2010 +0100 - - _emit_contact_capabilities_changed: always emit the signal - - Both of its callers now check for a difference. - - src/salut-connection.c | 38 ++------------------------------------ - 1 files changed, 2 insertions(+), 36 deletions(-) - -commit 94cb205fc725d6522f6c8072565140f0e3206c65 -Author: Simon McVittie -Date: Thu Oct 7 14:55:09 2010 +0100 - - salut_connection_set_self_capabilities: only call _emit_contact_capabilities_changed if caps have changed - - src/salut-connection.c | 13 ++++++++++--- - 1 files changed, 10 insertions(+), 3 deletions(-) - -commit 107e5f62fe1e1d3e459ecc6f0d459a68c6886b44 -Author: Simon McVittie -Date: Thu Oct 7 14:51:51 2010 +0100 - - connection_capabilities_update_cb: always call _emit_contact_capabilities_changed - - src/salut-connection.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit af3395399d83d916035e2df1209f7fe959352568 -Author: Simon McVittie -Date: Thu Oct 7 14:51:15 2010 +0100 - - salut_presence_cache_change_caps: do nothing if contact's caps are unchanged - - src/salut-presence-cache.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit be3658ad0df3a4a81d66e255cecd559dcaa69ec3 -Author: Simon McVittie -Date: Thu Oct 7 14:47:36 2010 +0100 - - SalutCapsChannelManagerGetContactCapsFunc: remove, unused - - src/salut-caps-channel-manager.c | 17 -------- - src/salut-caps-channel-manager.h | 6 --- - src/salut-ft-manager.c | 40 ------------------- - src/salut-im-manager.c | 25 +------------ - src/salut-tubes-manager.c | 78 -------------------------------------- - 5 files changed, 1 insertions(+), 165 deletions(-) - -commit 9e348a4b7be07c544bcae015e08b1f0c157e5959 -Author: Simon McVittie -Date: Thu Oct 7 13:19:42 2010 +0100 - - SalutConnection: use GabbleCapsChannelManager to read contacts' caps - - src/salut-connection.c | 27 ++++++++++++++++++++++++--- - 1 files changed, 24 insertions(+), 3 deletions(-) - -commit 568c4516d414d3027ad1d707235a4e009a9beb42 -Author: Simon McVittie -Date: Thu Oct 7 13:17:50 2010 +0100 - - Implement a trivial GabbleCapsChannelManager on channel managers that have no caps - - src/salut-contact-manager.c | 4 +++- - src/salut-muc-manager.c | 4 +++- - src/salut-roomlist-manager.c | 5 ++++- - 3 files changed, 10 insertions(+), 3 deletions(-) - -commit 96b3489f713a0c2cdb31f304aad8e0ca9a82ba95 -Author: Simon McVittie -Date: Thu Oct 7 13:10:15 2010 +0100 - - SalutImManager: implement new-style get_contact_caps - - src/salut-im-manager.c | 47 +++++++++++++++++++++++++++++++++++++---------- - 1 files changed, 37 insertions(+), 10 deletions(-) - -commit 739c94ced26cabe12bb5bc87760983c4e24d845e -Author: Simon McVittie -Date: Thu Oct 7 12:59:46 2010 +0100 - - SalutSelf: limit per_channel_manager_caps editing to a "swap" operation - - src/salut-connection.c | 9 ++++----- - src/salut-self.c | 23 ++++++++--------------- - src/salut-self.h | 5 +++-- - 3 files changed, 15 insertions(+), 22 deletions(-) - -commit 824aa6b7b2143632186997facff1e6c545d2e9dd -Author: Simon McVittie -Date: Thu Oct 7 12:53:41 2010 +0100 - - Change signature of salut_caps_channel_manager_add_capability - - - it implicitly acts on the self-handle (nothing else makes sense) - - it takes the per_channel_manager_caps to modify as an argument - instead of editing the SalutSelf directly - - src/salut-caps-channel-manager.c | 6 ++-- - src/salut-caps-channel-manager.h | 8 +++--- - src/salut-connection.c | 8 ++++-- - src/salut-tubes-manager.c | 40 +++---------------------------------- - 4 files changed, 16 insertions(+), 46 deletions(-) - -commit bc579b149883f032c124aece99e8098db69ffdb9 -Author: Simon McVittie -Date: Thu Oct 7 12:39:04 2010 +0100 - - Add simple accessors for SalutSelf's per_channel_manager_caps - - src/salut-connection.c | 8 +++----- - src/salut-self.c | 27 ++++++++++++++++++++++++++- - src/salut-self.h | 5 ++++- - src/salut-tubes-manager.c | 33 +++++++++++++++++---------------- - 4 files changed, 50 insertions(+), 23 deletions(-) - -commit 2e526e88acb15a9a2c45d523ee772ab1b582e154 -Author: Simon McVittie -Date: Thu Oct 7 12:17:15 2010 +0100 - - salut_self_get_features: make static - - src/salut-self.c | 2 +- - src/salut-self.h | 1 - - 2 files changed, 1 insertions(+), 2 deletions(-) - -commit 492ff26eeea595bbf9bfcf36bee76ba87be59a6a -Author: Simon McVittie -Date: Thu Oct 7 12:06:27 2010 +0100 - - Use salut_self_get_caps instead of salut_self_get_features - - src/salut-caps-hash.c | 21 +++++++++++---------- - src/salut-disco.c | 28 ++++++++++++++-------------- - 2 files changed, 25 insertions(+), 24 deletions(-) - -commit 83e66a0af3117bc559b31eab52d8e4d62b2ee292 -Author: Simon McVittie -Date: Thu Oct 7 12:06:08 2010 +0100 - - SalutSelf: add an accessor for a capabilities set - - src/salut-self.c | 36 ++++++++++++++++++++++++++++++++++++ - src/salut-self.h | 2 ++ - 2 files changed, 38 insertions(+), 0 deletions(-) - -commit a13c8e58094b9524ada5c54edb7ca8c9c6a99518 -Author: Simon McVittie -Date: Wed Oct 6 19:08:22 2010 +0100 - - FT, Tubes channel managers: implement GabbleCapsChannelManager - - src/salut-ft-manager.c | 74 +++++++++++++++++++++++++- - src/salut-tubes-manager.c | 131 ++++++++++++++++++++++++++++++++++++++++++++- - 2 files changed, 202 insertions(+), 3 deletions(-) - -commit dbae0daf521292779949dd1a20650be09295f9c6 -Author: Simon McVittie -Date: Wed Oct 6 18:58:14 2010 +0100 - - Add a quirk (pseudo-capability) to anyone without XEP-0115 caps - - src/salut-presence-cache.c | 20 ++++++++++++-------- - src/salut-presence-cache.h | 4 ++++ - 2 files changed, 16 insertions(+), 8 deletions(-) - -commit 3412b586ac693e2d1b73ec276cd36b1e5d25bc28 -Author: Simon McVittie -Date: Wed Oct 6 18:53:53 2010 +0100 - - SalutContact: have guaranteed non-NULL new-style capabilities - - src/salut-contact.c | 8 +++++++- - src/salut-contact.h | 3 +++ - src/salut-presence-cache.c | 11 +++++++---- - 3 files changed, 17 insertions(+), 5 deletions(-) - -commit ec01a9a74666325d6cd3601aabb132b302bb3206 -Author: Simon McVittie -Date: Wed Oct 6 18:38:04 2010 +0100 - - SalutPresenceCache: remember a CapabilityInfo struct for those without caps - - src/salut-presence-cache.c | 87 ++++++++++++++++++++++++-------------------- - 1 files changed, 47 insertions(+), 40 deletions(-) - -commit 14136a6e2d57fd0a6b7d0581f308405f978a49ab -Author: Simon McVittie -Date: Mon Nov 1 12:22:20 2010 +0000 - - Give capability_info_get the semantics you'd expect - - In particular, this means the struct's members never need to be NULL. - - src/salut-presence-cache.c | 27 ++++++--------------------- - 1 files changed, 6 insertions(+), 21 deletions(-) - -commit 124e8bfca5dda0a74b55b36eb98656f3d1ebba88 -Author: Simon McVittie -Date: Wed Oct 6 17:54:24 2010 +0100 - - salut_presence_cache_change_caps: factor out - - src/salut-presence-cache.c | 67 +++++++++++++++++++++---------------------- - 1 files changed, 33 insertions(+), 34 deletions(-) - -commit 764398884d19debfbefd380e4bf7aa477c867b5b -Author: Simon McVittie -Date: Mon Nov 1 12:21:28 2010 +0000 - - SalutPresenceCache: store a GabbleCapabilitySet too - - src/salut-connection.c | 5 +++++ - src/salut-presence-cache.c | 12 ++++++++++++ - 2 files changed, 17 insertions(+), 0 deletions(-) - -commit 6d9edc433b2ee0d94eacd638a073a410242a44eb -Author: Simon McVittie -Date: Wed Oct 6 13:23:46 2010 +0100 - - SalutPresenceCache: imply caps_set by (per_channel_manager_caps != NULL) - - src/salut-presence-cache.c | 18 ++++++------------ - 1 files changed, 6 insertions(+), 12 deletions(-) - -commit ac7f670911cabd895f5af1240b2e3784d299b057 -Author: Simon McVittie -Date: Wed Oct 6 13:20:07 2010 +0100 - - SalutPresenceCache: don't create per_channel_manager_caps until needed - - This also fixes a theoretical leak if we get a redundant disco response - when caps_set is already TRUE. - - src/salut-presence-cache.c | 20 +++++++------------- - 1 files changed, 7 insertions(+), 13 deletions(-) - -commit 21b30751bcf16356363db168ec33a1582822b198 -Author: Simon McVittie -Date: Wed Oct 6 13:09:37 2010 +0100 - - SalutPresenceCache: inline capability_info_recvd into its one caller - - src/salut-presence-cache.c | 28 ++++++++++------------------ - 1 files changed, 10 insertions(+), 18 deletions(-) - -commit 4e7982bf4aed630addfd31d4d123d41e9da0620f -Author: Simon McVittie -Date: Wed Oct 6 13:37:41 2010 +0100 - - SalutTubesManager: add_service_to_array: remove unused argument - - src/salut-tubes-manager.c | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit ef65ffffd9b883dc5eae9fd0aac4cba5542a1ef5 -Author: Simon McVittie -Date: Wed Oct 6 12:57:33 2010 +0100 - - SalutFTManager: add_file_transfer_channel_class: remove unused argument - - src/salut-ft-manager.c | 9 +++------ - 1 files changed, 3 insertions(+), 6 deletions(-) - -commit c26759d1cda55c8212c9f3c4700f62c646fdd837 -Author: Simon McVittie -Date: Mon Nov 1 13:16:32 2010 +0000 - - Import GabbleCapsChannelManager and related classes - - From Gabble, with minimal modifications: - - - put gabble/namespaces.h in gabble_namespaces.h - - include capabilities-set.h instead of gabble/capabilities-set.h - - use DEBUG_PRESENCE instead of GABBLE_DEBUG_PRESENCE - - src/Makefile.am | 7 + - src/capabilities-set.h | 86 +++++ - src/capabilities.c | 752 ++++++++++++++++++++++++++++++++++++++++++++ - src/capabilities.h | 73 +++++ - src/caps-channel-manager.c | 126 ++++++++ - src/caps-channel-manager.h | 106 +++++++ - src/gabble_namespaces.h | 27 ++ - src/namespaces.h | 118 +++++++ - 8 files changed, 1295 insertions(+), 0 deletions(-) - -commit 2cb3acc20fcf252517a6b94f66f37f09756ba2b9 -Merge: 93e1ace 401d722 -Author: Simon McVittie -Date: Fri Nov 5 12:28:03 2010 +0000 - - Merge branch 'reliability' - - Reviewed-by: Guillaume Desmottes - -commit 279099cd64e7f337ce13f73bbb1f14b975a9c8ee -Author: Tomeu Vizoso -Date: Thu Nov 4 14:32:43 2010 +0100 - - Only emit ServiceResolver.Found signals that match the protocol - - tests/twisted/avahimock.py | 27 +++++++++++++++++---------- - 1 files changed, 17 insertions(+), 10 deletions(-) - -commit 0e0532968984ef1e49a61d463364202aeb9dc4a1 -Author: Tomeu Vizoso -Date: Thu Nov 4 12:57:44 2010 +0100 - - Get the event for the expected protocol - - .../avahi/file-transfer/test-receive-file-ipv6.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 401d722e8adcc275e8c77416e57a2fcfc302bc8f -Author: Simon McVittie -Date: Mon Nov 1 18:34:54 2010 +0000 - - Use wait_for_contact_in_publish more - - .../avahi/file-transfer/file_transfer_helper.py | 18 +++---------- - tests/twisted/avahi/test-aliases.py | 18 +----------- - .../twisted/avahi/test-close-local-pending-room.py | 16 +---------- - tests/twisted/avahi/test-ichat-composing.py | 16 +---------- - tests/twisted/avahi/test-ichat-incoming-msg.py | 16 +---------- - .../avahi/test-olpc-activity-announcements.py | 27 +------------------ - tests/twisted/avahi/test-text-channel.py | 16 +---------- - .../twisted/avahi/tubes/test-disabled-1-1-tubes.py | 16 +---------- - .../avahi/tubes/test-offer-private-stream-tube.py | 16 +---------- - tests/twisted/avahi/tubes/test-tube-close.py | 16 +---------- - 10 files changed, 22 insertions(+), 153 deletions(-) - -commit c4537936793e9980f3c79b52851150ad5a365fd7 -Author: Simon McVittie -Date: Mon Nov 1 17:42:44 2010 +0000 - - test-caps-file-transfer: expect ContactCapabilitiesChanged in a non-racy way - - tests/twisted/avahi/test-caps-file-transfer.py | 14 +++----------- - 1 files changed, 3 insertions(+), 11 deletions(-) - -commit 788dd4105660df6de1a7caee5cd8417f21488f79 -Author: Simon McVittie -Date: Mon Nov 1 17:31:22 2010 +0000 - - file-transfer/test-ichat-receive-file.py: re-enable if no other llXMPP is running - - .../avahi/file-transfer/test-ichat-receive-file.py | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit ad25a0c9081965c5ca1d8ff27bbcaf6f277eb9ed -Author: Simon McVittie -Date: Mon Nov 1 17:30:59 2010 +0000 - - salut_file_transfer_channel_new_from_stanza: force the 'from' address - - This is necessary to interop with iChat, which doesn't specify. This - appears to have regressed in November 2008, but the test was disabled, - so nobody noticed... - - src/salut-file-transfer-channel.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 7b2aa8033044ef7c49303a4af4429b6a19b5421a -Author: Simon McVittie -Date: Mon Nov 1 17:27:44 2010 +0000 - - gibber_file_transfer_new_from_stanza and friends: raise a GError - - lib/gibber/gibber-file-transfer.c | 10 +++-- - lib/gibber/gibber-file-transfer.h | 5 +- - lib/gibber/gibber-oob-file-transfer.c | 73 ++++++++++++++++++++++++++++----- - lib/gibber/gibber-oob-file-transfer.h | 2 +- - src/salut-file-transfer-channel.c | 5 ++- - 5 files changed, 76 insertions(+), 19 deletions(-) - -commit 1a44c03aa82541f38ca91e92f6f568c26a86fc56 -Author: Simon McVittie -Date: Mon Nov 1 16:04:40 2010 +0000 - - avahi/test-muc-invite.py: use wait_for_contact_in_publish() - - tests/twisted/avahi/test-muc-invite.py | 16 ++-------------- - 1 files changed, 2 insertions(+), 14 deletions(-) - -commit 033bb4edc3aa0e150b8e7bc2488c7a2491e00170 -Author: Simon McVittie -Date: Mon Nov 1 16:04:22 2010 +0000 - - Tests: factor out wait_for_contact_in_publish() - - tests/twisted/avahi/test-request-im.py | 20 +++----------------- - tests/twisted/saluttest.py | 17 +++++++++++++++++ - 2 files changed, 20 insertions(+), 17 deletions(-) - -commit 03688071f04208f2cf500512ac6c8247f7ffe6fd -Author: Simon McVittie -Date: Mon Nov 1 15:53:56 2010 +0000 - - Only skip file-transfer/test-ichat-receive-directory.py if needed - - .../file-transfer/test-ichat-receive-directory.py | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit ac6eef30becd54315ed8cd908f13e9eec112e4ef -Author: Simon McVittie -Date: Mon Nov 1 15:53:21 2010 +0000 - - SalutFtManager: allow salut_file_transfer_channel_new_from_stanza to fail - - src/salut-ft-manager.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 292c52e13cfef7aabe523cd145eede1bdede4133 -Author: Simon McVittie -Date: Mon Nov 1 15:53:07 2010 +0000 - - salut_file_transfer_channel_new_from_stanza: don't use FALSE as a null pointer - - src/salut-file-transfer-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 90313495b1546a5134ddc77235f5ae327218e551 -Author: Simon McVittie -Date: Mon Nov 1 15:29:46 2010 +0000 - - avahi/test-ichat-incoming-msg.py: enable if we're not running another Salut - - tests/twisted/avahi/test-ichat-incoming-msg.py | 7 ++----- - 1 files changed, 2 insertions(+), 5 deletions(-) - -commit 93c7575637ed3b3663a2d17deccb5f2e97e67e6c -Author: Simon McVittie -Date: Mon Nov 1 15:28:54 2010 +0000 - - avahitest: add a method to check whether another Salut is running - - Some of the tests can fail if there is one. - - tests/twisted/avahitest.py | 30 ++++++++++++++++++++++++++++++ - 1 files changed, 30 insertions(+), 0 deletions(-) - -commit 2d24d3b662714f379592e35ce0ba26ed30631c2f -Author: Simon McVittie -Date: Mon Oct 18 16:18:03 2010 +0100 - - receive_presence_and_ask_caps: only match the IQ result, not random other IQs - - When running these tests on a live network, we can see queries from - other contacts, which this overly-broad expectation would match. - - tests/twisted/avahi/test-caps-file-transfer.py | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit 243711910a0e2a1f2fb62c6f39a303704ed45cd6 -Author: Simon McVittie -Date: Mon Oct 18 15:59:41 2010 +0100 - - SalutDisco: echo @id in caps results - - src/salut-disco.c | 16 ++++++++++++---- - 1 files changed, 12 insertions(+), 4 deletions(-) - -commit 54c4095ae197d0c840a1d1938c4d255aa9feb318 -Author: Simon McVittie -Date: Mon Oct 18 12:56:32 2010 +0100 - - Put Wocky debug information in test logs, now we use it - - tests/twisted/tools/exec-with-log.sh.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a4d42fb98e4049eee0bee2e9469a4191f58df662 -Author: Simon McVittie -Date: Mon Oct 18 12:56:13 2010 +0100 - - Add more information to stream events, based on Gabble - - - to and from_ are the same as name and remote_name, which are also kept - - iq_id on IQs - - presence_status on presences - - tests/twisted/xmppstream.py | 22 ++++++++++++++++++++-- - 1 files changed, 20 insertions(+), 2 deletions(-) - -commit e81a81f343dc8488810710f6a58461fca42bc993 -Author: Tomeu Vizoso -Date: Mon Oct 25 16:20:14 2010 +0200 - - Announce for both ipv4 and ipv6 those entries created with AVAHI_PROTO_UNSPEC - - tests/twisted/avahimock.py | 64 ++++++++++++++++++++++++------------------- - 1 files changed, 36 insertions(+), 28 deletions(-) - -commit 47e13f5fdc1c342e925b400cdc823f97710513ad -Author: Tomeu Vizoso -Date: Mon Oct 25 14:10:00 2010 +0200 - - Resolve to ipv6 addresses - - tests/twisted/avahimock.py | 19 ++++++++++++++++--- - 1 files changed, 16 insertions(+), 3 deletions(-) - -commit 83df5595eba196eab1418074f3dec0773798aed5 -Author: Tomeu Vizoso -Date: Mon Oct 25 13:12:43 2010 +0200 - - Add a .service file for the mock avahi service - - as recent versions of avahi-client expects it to be there. - - tests/twisted/tools/org.freedesktop.Avahi.service | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 93594c0f17ccfa9d5e62aad11da4d488721c17bf -Author: Tomeu Vizoso -Date: Fri Oct 22 18:30:33 2010 +0200 - - Allow multiple removals of the same entry - - tests/twisted/avahimock.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 8f507a22a32a2141abbe00baa2f81d9f5638c4f5 -Author: Tomeu Vizoso -Date: Wed Oct 20 19:08:03 2010 +0200 - - Implement EntryGroup.AddRecord - - Use it to lookup multicast groups for clique - - tests/twisted/avahimock.py | 31 +++++++++++++++++++++++++++---- - 1 files changed, 27 insertions(+), 4 deletions(-) - -commit d5c3c7fccdc8db7a2453d4a9c6f9bed98ec365e0 -Author: Tomeu Vizoso -Date: Wed Oct 20 17:50:16 2010 +0200 - - Remove superfluous timeout_add to speed up tests - - tests/twisted/avahimock.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e393717c71fb98170baa89a4ec5a026d7bcd4d20 -Author: Tomeu Vizoso -Date: Wed Oct 20 17:31:28 2010 +0200 - - Remove ServiceBrowser and ServiceResolver when their client disappears - - tests/twisted/avahimock.py | 17 ++++++++++++++++- - 1 files changed, 16 insertions(+), 1 deletions(-) - -commit 84ac518af1149f11ed7f6b1fd1ae27bd4e7f71a5 -Author: Tomeu Vizoso -Date: Wed Oct 20 17:22:48 2010 +0200 - - Free entry groups when its client disappears - - tests/twisted/avahimock.py | 18 ++++++++++++++++-- - 1 files changed, 16 insertions(+), 2 deletions(-) - -commit e1890770b83d4c9538ade442d83adcfa14b79ea4 -Author: Tomeu Vizoso -Date: Wed Oct 20 15:25:33 2010 +0200 - - Preserve original exception in test - - .../test-send-file-to-unknown-contact.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit c3af031143062b7431c747994eedd0b56b57e083 -Author: Tomeu Vizoso -Date: Wed Oct 20 12:03:47 2010 +0200 - - Emit ServiceBrowser.ItemRemove when an EntryGroup is freed - - tests/twisted/avahimock.py | 22 +++++++++++++++++++++- - 1 files changed, 21 insertions(+), 1 deletions(-) - -commit 4cac324669d7744546741f6c78c6f2ce6e958b5d -Author: Tomeu Vizoso -Date: Wed Oct 20 11:54:58 2010 +0200 - - Remove unimplemented methods because of clutter - - tests/twisted/avahimock.py | 81 -------------------------------------------- - 1 files changed, 0 insertions(+), 81 deletions(-) - -commit a6ded5eb4d586453142599c6d8b5aa9f7bf9e244 -Author: Tomeu Vizoso -Date: Wed Oct 20 11:20:25 2010 +0200 - - Properly get the local hostname and domain - - and resolve it to a real address - - tests/twisted/avahimock.py | 43 +++++++++++++++++++++++++++++++------------ - 1 files changed, 31 insertions(+), 12 deletions(-) - -commit facd128d30492156e659271352b5c2ece36d6471 -Author: Tomeu Vizoso -Date: Wed Oct 20 11:00:17 2010 +0200 - - Don't overwrite host and port if they didn't change - - tests/twisted/avahimock.py | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit 899351b0dda94455997ee5cb523077b0b36f8f4b -Author: Tomeu Vizoso -Date: Wed Oct 20 10:31:14 2010 +0200 - - When a ServiceBrowser is created, emit ItemNew for every entry - - that matches. - - tests/twisted/avahimock.py | 18 ++++++++++++++++-- - 1 files changed, 16 insertions(+), 2 deletions(-) - -commit 06c7ae32288d16b282a3f6a10b502995db9c3f78 -Author: Tomeu Vizoso -Date: Tue Oct 19 17:58:47 2010 +0200 - - Refactor the state and logic into avahimock.Model - - which is called by the dbus methods and emits the appropriate signals - - tests/twisted/avahimock.py | 220 ++++++++++++++++++++++++++------------------ - 1 files changed, 129 insertions(+), 91 deletions(-) - -commit eb6255d392d59f099024e7552a68bb5e013b7fbe -Author: Tomeu Vizoso -Date: Tue Oct 19 11:38:12 2010 +0200 - - Implement some o.f.Avahi.*.Free methods - - tests/twisted/avahimock.py | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -commit 8b6cbd052584a52409351950b0374d82afb78105 -Author: Tomeu Vizoso -Date: Tue Oct 19 10:48:17 2010 +0200 - - Also emit ServiceResolver.Found when a record is updated - - tests/twisted/avahimock.py | 40 +++++++++++++++++++++++++++------------- - 1 files changed, 27 insertions(+), 13 deletions(-) - -commit 94733e1daa8874ab232c91d048e7f7215c8637bc -Author: Tomeu Vizoso -Date: Tue Oct 19 10:01:53 2010 +0200 - - Implement o.f.Avahi.Server.ServiceResolverNew and emit - - ServiceBrowser.ItemNew and ServiceResolver.Found. - - tests/twisted/avahimock.py | 97 +++++++++++++++++++++++++++++++++++++++---- - 1 files changed, 88 insertions(+), 9 deletions(-) - -commit 93e1acef5a3297a3f1d2609f7cb2bd4346fd0fb9 -Merge: e637925 ed363eb -Author: Simon McVittie -Date: Mon Oct 18 17:06:01 2010 +0100 - - Merge branch 'protocol' - - Reviewed-by: Tomeu Vizoso - -commit 44243b8c3b7bdf0f24367fa1c06df9f32d0b9aab -Author: Tomeu Vizoso -Date: Fri Oct 15 13:49:54 2010 +0200 - - Implement emitting StateChanged in terms of SignalMessage - - tests/twisted/avahimock.py | 16 ++++++++++------ - 1 files changed, 10 insertions(+), 6 deletions(-) - -commit e6379255daebc533d84f5e82fbc86dfbd412174c -Author: Tomeu Vizoso -Date: Fri Oct 15 10:28:06 2010 +0200 - - Preserve existing PYTHONPATH when running tests - - tests/twisted/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 91963b4df2ff519fafb38c5832065e601dbdc856 -Author: Tomeu Vizoso -Date: Fri Oct 15 12:06:05 2010 +0200 - - Implement o.f.Avahi.Server.ServiceBrowserNew - - tests/twisted/avahimock.py | 23 ++++++++++++++++++++--- - 1 files changed, 20 insertions(+), 3 deletions(-) - -commit 2edd4d741a42cebd86fa2b0d342118538c0929f3 -Author: Tomeu Vizoso -Date: Fri Oct 15 12:05:24 2010 +0200 - - Make entry group's object paths unique - - tests/twisted/avahimock.py | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit d3624f3edcc833c8bbf0582df1cffc0a738f9e20 -Author: Tomeu Vizoso -Date: Fri Oct 15 10:28:27 2010 +0200 - - Emit o.f.A.EntryGroup.StateChanged - - tests/twisted/avahimock.py | 23 ++++++++++++++++++----- - 1 files changed, 18 insertions(+), 5 deletions(-) - -commit 4b1779eb3b4a37cd428bc4463f9c00b3a5608e5d -Author: Tomeu Vizoso -Date: Fri Oct 15 10:28:06 2010 +0200 - - Preserve existing PYTHONPATH when running tests - - tests/twisted/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ed363ebe811bd6adbfe03c95c4909bccd607c489 -Author: Simon McVittie -Date: Fri Oct 1 14:13:57 2010 +0100 - - Add a test for Protocol objects - - tests/twisted/Makefile.am | 4 ++- - tests/twisted/cm/protocol.py | 66 ++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 69 insertions(+), 1 deletions(-) - -commit a1e965e5c36c0a2e66d266c04d993de50404741c -Author: Simon McVittie -Date: Fri Oct 1 11:42:50 2010 +0100 - - Add Protocol objects - - src/Makefile.am | 4 +- - src/protocol.c | 250 ++++++++++++++++++++++++++++ - src/protocol.h | 69 ++++++++ - src/salut-connection-manager.c | 157 +++++-------------- - src/write-mgr-file.c | 352 ++++++++++++++++++++++++++++++++++------ - 5 files changed, 661 insertions(+), 171 deletions(-) - -commit bf32c4eb6b1ad30d33a42dcda666fb2b53f268ed -Author: Simon McVittie -Date: Fri Oct 1 12:38:47 2010 +0100 - - All channel managers: implement type_foreach_channel_class - - src/salut-contact-manager.c | 9 +++++---- - src/salut-ft-manager.c | 14 ++++++++------ - src/salut-im-manager.c | 9 +++++---- - src/salut-muc-manager.c | 17 +++++++++-------- - src/salut-roomlist-manager.c | 10 +++++----- - src/salut-tubes-manager.c | 14 +++++++------- - 6 files changed, 39 insertions(+), 34 deletions(-) - -commit a6d8e7856005e86b829fb452e972c662360fadc3 -Author: Simon McVittie -Date: Thu Sep 23 16:52:04 2010 +0100 - - Depend on telepathy-glib 0.12 release candidate, for Protocol etc. - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9dbd9864fd9e0b3fb4badb638fb183d54047a45a -Author: Tomeu Vizoso -Date: Thu Oct 14 13:31:14 2010 +0200 - - Implement o.f.A.EntryGroup.GetState - - tests/twisted/avahimock.py | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit 075914a2cf7afceb32fba2462328209df9c78ca6 -Author: Tomeu Vizoso -Date: Thu Oct 14 12:47:23 2010 +0200 - - Return expected values in o.f.Avahi.Server.GetAPIVersion and GetState - - tests/twisted/avahimock.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit a69372ddb701967d0faadbb8bfdfa874d9c8c801 -Author: Tomeu Vizoso -Date: Thu Oct 14 12:46:30 2010 +0200 - - Set DBUS_SYSTEM_BUS_ADDRESS before launching the CM process - - tests/twisted/tools/exec-with-log.sh.in | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit fbe4a4782ee22b373a322412bfbc7ef19c33e62c -Author: Tomeu Vizoso -Date: Wed Oct 13 16:52:26 2010 +0200 - - Implement o.f.Avahi.EntryGroup.AddService and Commit - - tests/twisted/avahimock.py | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) - -commit 71a00c2cbf7a4a19ee19b57795e5d4e98c43210b -Merge: 54017f0 a9ef4a4 -Author: Simon McVittie -Date: Wed Oct 13 15:35:59 2010 +0100 - - Merge branch 'wocky' - - Reviewed-by: Guillaume Desmottes - -commit a9ef4a4cef43ecf469d06ef5792359c0688ad7f4 -Author: Simon McVittie -Date: Wed Oct 13 15:04:36 2010 +0100 - - Enable gtk-doc in distcheck so Wocky can also distcheck - - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 789c6be33c7db6b8e1b4e0319f19a4e280cfd8be -Author: Simon McVittie -Date: Wed Oct 13 14:52:13 2010 +0100 - - GibberXmppStanza: include wocky-stanza.h in a way that works out-of-tree - - lib/gibber/gibber-xmpp-stanza.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 74a80043531c0cca12a19d8e2d612f33fee7f8a2 -Author: Tomeu Vizoso -Date: Wed Oct 13 13:39:45 2010 +0200 - - Implement o.f.Avahi.Server.GetHostNameFqdn and GetDomainName - - tests/twisted/avahimock.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit ae31ed7c0ab1280285cfccbcae213a87163cf230 -Author: Tomeu Vizoso -Date: Wed Oct 13 13:07:01 2010 +0200 - - Implement o.f.Avahi.Server.EntryGroupNew - - tests/twisted/avahimock.py | 13 ++++++++++++- - 1 files changed, 12 insertions(+), 1 deletions(-) - -commit 4559c4691e3f68cac18dba3990e367d16ba38d0f -Author: Tomeu Vizoso -Date: Wed Oct 13 13:06:22 2010 +0200 - - Implement o.f.Avahi.Server.GetHostName - - tests/twisted/avahimock.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f476cd509c630408f6fbb08abdc373c98877284c -Author: Tomeu Vizoso -Date: Mon Oct 11 14:01:50 2010 +0200 - - Add mock service implementing org.freedesktop.Avahi* - - tests/twisted/avahimock.py | 148 ++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 148 insertions(+), 0 deletions(-) - -commit 087e05ca156bf1b133de1d21f738a8cee7ec2be4 -Author: Tomeu Vizoso -Date: Mon Oct 11 13:57:31 2010 +0200 - - Make sure that the mock Avahi service is running - - ...before executing every test. - - tests/twisted/saluttest.py | 30 ++++++++++++++++++++++++++++++ - 1 files changed, 30 insertions(+), 0 deletions(-) - -commit 0d500b026d044c615e4e3a8219ae5fd773deba2c -Author: Tomeu Vizoso -Date: Mon Oct 11 13:56:02 2010 +0200 - - Move call to Avahi from the class definition to the constructor - - so we don't depend on Avahi on module import - - tests/twisted/avahitest.py | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit e214e31e95f68c7088950daaa6acc39f2eaa1173 -Author: Simon McVittie -Date: Fri Oct 8 15:24:34 2010 +0100 - - Implement GibberXmppReader in terms of WockyXmppReader - - It has a different programming model (it emits signals rather than just - having a stanza queue) so instead of being the same, it's a subclass. - - lib/gibber/gibber-xmpp-reader.c | 376 ++++++--------------------------------- - lib/gibber/gibber-xmpp-reader.h | 6 +- - 2 files changed, 59 insertions(+), 323 deletions(-) - -commit 2dfe5319d5a3603a450717a271a59f8b575e0588 -Author: Simon McVittie -Date: Fri Oct 8 14:52:51 2010 +0100 - - saluttest.exec_test_deferred: if make_connection fails, die - - Adapted from Will's commit 9071c1af4 in Gabble, although that one needs - to cope with multiple connections. - - tests/twisted/saluttest.py | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit 0febecdd02df4f4b73f2825159a6f6aa36e7b506 -Author: Simon McVittie -Date: Fri Oct 8 14:46:20 2010 +0100 - - Replace GibberXmppWriter with WockyXmppWriter and some inlines - - lib/gibber/gibber-xmpp-writer.c | 326 +-------------------------------------- - lib/gibber/gibber-xmpp-writer.h | 69 ++++----- - 2 files changed, 30 insertions(+), 365 deletions(-) - -commit aa933d09fda320cdafa99e6a2816f5071078015c -Author: Tomeu Vizoso -Date: Fri Oct 8 15:26:40 2010 +0200 - - Use the temporary bus as the system bus in the avahi tests - - tests/twisted/Makefile.am | 2 +- - tests/twisted/tools/with-session-bus.sh | 9 +++++++++ - 2 files changed, 10 insertions(+), 1 deletions(-) - -commit 3aad39ef4ea2aaf37a210800ef72570dcc197fd4 -Author: Simon McVittie -Date: Fri Oct 8 14:25:57 2010 +0100 - - Fix a few remaining instances of stanza->node - - tests/check-node-properties.c | 11 +++++++---- - 1 files changed, 7 insertions(+), 4 deletions(-) - -commit 7cf0935a252015bb9fd08466e8cef8cca9a4cabd -Author: Simon McVittie -Date: Fri Oct 8 14:25:43 2010 +0100 - - GibberXmppReader: cope with stanzas with no namespace - - Backported from WockyXmppReader. - - lib/gibber/gibber-xmpp-reader.c | 14 ++++++++++++-- - 1 files changed, 12 insertions(+), 2 deletions(-) - -commit 8418b6f5cde587b444c45a308e8a8698e39b383f -Author: Simon McVittie -Date: Fri Oct 8 13:42:34 2010 +0100 - - Replace GibberXmppNode and GibberXmppStanza with WockyNode and WockyStanza - - Most of the API is similar enough to add a pile of #defines and not touch - application code. Exceptions: - - - wocky_node_each_attribute passes an extra argument to the callback, - so adjust GibberXmppWriter and test-xmpp-connection to cope - - WockyStanza->node doesn't exist, so use wocky_xmpp_stanza_get_top_node - a lot - - lib/gibber/gibber-bytestream-ibb.c | 19 +- - lib/gibber/gibber-bytestream-oob.c | 27 ++- - lib/gibber/gibber-debug.c | 4 +- - lib/gibber/gibber-file-transfer.c | 5 +- - lib/gibber/gibber-iq-helper.c | 29 ++- - lib/gibber/gibber-oob-file-transfer.c | 31 ++- - lib/gibber/gibber-xmpp-connection.c | 5 +- - lib/gibber/gibber-xmpp-error.c | 4 +- - lib/gibber/gibber-xmpp-node.c | 371 ------------------------ - lib/gibber/gibber-xmpp-node.h | 123 ++------ - lib/gibber/gibber-xmpp-reader.c | 2 +- - lib/gibber/gibber-xmpp-stanza.c | 416 --------------------------- - lib/gibber/gibber-xmpp-stanza.h | 147 ++++------ - lib/gibber/gibber-xmpp-writer.c | 8 +- - lib/gibber/tests/check-gibber-iq-helper.c | 17 +- - lib/gibber/tests/check-gibber-xmpp-error.c | 11 +- - lib/gibber/tests/check-gibber-xmpp-reader.c | 4 +- - lib/gibber/tests/check-gibber-xmpp-stanza.c | 5 +- - lib/gibber/tests/test-xmpp-connection.c | 8 +- - src/salut-connection.c | 10 +- - src/salut-disco.c | 10 +- - src/salut-im-channel.c | 2 +- - src/salut-muc-channel.c | 5 +- - src/salut-muc-manager.c | 8 +- - src/salut-olpc-activity.c | 8 +- - src/salut-si-bytestream-manager.c | 25 +- - src/salut-tubes-channel.c | 14 +- - src/salut-tubes-manager.c | 9 +- - src/salut-xmpp-connection-manager.c | 3 +- - src/text-helper.c | 34 ++- - src/tube-stream.c | 4 +- - 31 files changed, 278 insertions(+), 1090 deletions(-) - -commit e6efc9a197db675f84df2e84ebb38e283f90ed22 -Author: Simon McVittie -Date: Fri Oct 8 13:39:13 2010 +0100 - - Remove Gibber tests for things Wocky won't let us do anyway - - - nodes with a NULL name - - nodes with a NULL or omitted namespace - - lib/gibber/tests/check-gibber-xmpp-node.c | 29 ++++------------------------- - 1 files changed, 4 insertions(+), 25 deletions(-) - -commit 93e80f65abec276c7c2f3888665e23057b71152f -Author: Simon McVittie -Date: Fri Oct 8 13:38:20 2010 +0100 - - init and deinit wocky in the Gibber tests - - lib/gibber/tests/check-main.c | 4 ++++ - lib/gibber/tests/test-xmpp-connection.c | 3 +++ - 2 files changed, 7 insertions(+), 0 deletions(-) - -commit e73c51ad7414eb150dca9c7eb432a44edf469b2e -Author: Simon McVittie -Date: Fri Oct 8 13:37:57 2010 +0100 - - yet another set of WOCKY_CFLAGS - - tests/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 2f8d86cd0927d3f1f76bf62414357e117f4cb9bb -Author: Simon McVittie -Date: Fri Oct 8 12:23:41 2010 +0100 - - GibberXMPPNode test: don't change nodes' namespace - - lib/gibber/tests/check-gibber-xmpp-node.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 834d18332f3d585dcdba4abda430dcc2a59131ae -Author: Simon McVittie -Date: Fri Oct 8 12:23:20 2010 +0100 - - SalutTubeStream: don't change the namespace of a node after creation - - src/tube-stream.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit a880ca796c8fb9d3a761c6cd22f435617b3d6e68 -Author: Simon McVittie -Date: Fri Oct 8 11:48:27 2010 +0100 - - Remove gibber_xmpp_stanza_new - - lib/gibber/gibber-xmpp-stanza.c | 12 ------------ - lib/gibber/gibber-xmpp-stanza.h | 1 - - 2 files changed, 0 insertions(+), 13 deletions(-) - -commit e55f92ff9b68b102f4b39895004ab4c5112eafac -Author: Simon McVittie -Date: Fri Oct 8 11:38:48 2010 +0100 - - Always create stanzas with a specified namespace - - Also create nodes that already have an XMLNS where possible. - - The Wocky equivalents enforce having an XMLNS. - - lib/gibber/gibber-oob-file-transfer.c | 39 ++++++++++++-------------- - lib/gibber/gibber-xmpp-error.c | 8 +++--- - lib/gibber/gibber-xmpp-node.c | 3 +- - lib/gibber/gibber-xmpp-reader.c | 7 +++-- - lib/gibber/gibber-xmpp-stanza.c | 4 +- - lib/gibber/tests/check-gibber-xmpp-stanza.c | 6 +++- - src/salut-xmpp-connection-manager.c | 3 +- - src/text-helper.c | 3 +- - tests/check-node-properties.c | 3 +- - 9 files changed, 38 insertions(+), 38 deletions(-) - -commit ec55ac9cd25a418468de7db819cc5a44dfadcec3 -Author: Simon McVittie -Date: Fri Oct 8 11:34:50 2010 +0100 - - gibber_xmpp_stanza_new_ns: add - - lib/gibber/gibber-xmpp-stanza.c | 12 ++++++++++++ - lib/gibber/gibber-xmpp-stanza.h | 2 ++ - 2 files changed, 14 insertions(+), 0 deletions(-) - -commit d8f2be17257d44cd50b0590937fa3e5fd9dfc7b3 -Author: Simon McVittie -Date: Fri Oct 8 11:36:35 2010 +0100 - - gibber_xmpp_node_new_ns: add - - lib/gibber/gibber-xmpp-node.c | 11 +++++++++++ - lib/gibber/gibber-xmpp-node.h | 1 + - 2 files changed, 12 insertions(+), 0 deletions(-) - -commit b175d097d4e574ea2c4fe272bdc982dd83fbf4f3 -Author: Simon McVittie -Date: Fri Oct 8 12:01:47 2010 +0100 - - Add Wocky CFLAGS to Gibber tests so we can use Wocky's constants - - lib/gibber/tests/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 8b5cf4ba620eccfdc63146f7fb7cb9524ccf4620 -Author: Simon McVittie -Date: Fri Oct 8 11:18:28 2010 +0100 - - Glue Wocky into the build system - - configure.ac | 8 ++++ - lib/Makefile.am | 2 +- - lib/ext/Makefile.am | 16 +++++++ - lib/gibber/Makefile.am | 4 +- - m4/ax_config_dir.m4 | 109 ++++++++++++++++++++++++++++++++++++++++++++++++ - src/Makefile.am | 34 ++++++++++----- - 6 files changed, 159 insertions(+), 14 deletions(-) - -commit 64a0d8635871b9f85e335d05c65765774c99c497 -Author: Simon McVittie -Date: Fri Oct 8 11:04:23 2010 +0100 - - Set up Wocky in autogen.sh - - autogen.sh | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) - -commit 7cc3f4a29e1c106eafd1146ae5c630a939d1eeed -Author: Simon McVittie -Date: Fri Oct 8 11:03:52 2010 +0100 - - Add Wocky as a submodule - - .gitmodules | 3 +++ - lib/ext/wocky | 1 + - 2 files changed, 4 insertions(+), 0 deletions(-) - -commit 54017f0527fb4487e1ae386f7762af46272f83e7 -Author: Simon McVittie -Date: Thu Oct 7 15:58:07 2010 +0100 - - Nano version for development branch - - NEWS | 3 +++ - configure.ac | 2 +- - 2 files changed, 4 insertions(+), 1 deletions(-) - -commit 931c49c5eefede516a80d6721f49c134d2a652d9 -Author: Simon McVittie -Date: Thu Oct 7 15:57:24 2010 +0100 - - Revert "Adjust configure.ac for stable branch" - - This reverts commit 9bd0a0719e394c42f8f95e29ce811360437a8016. - - configure.ac | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 9bd0a0719e394c42f8f95e29ce811360437a8016 -Author: Simon McVittie -Date: Thu Oct 7 15:57:00 2010 +0100 - - Adjust configure.ac for stable branch - - configure.ac | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 5f2c842b817732d0a77759139ee562150e7863c0 -Author: Tomeu Vizoso -Date: Wed Oct 6 19:00:23 2010 +0200 - - Bump nano version to 0.4.0.1 - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 22651d24b5136d09282494f35fb85e6464c15845 -Author: Tomeu Vizoso -Date: Wed Oct 6 18:12:16 2010 +0200 - - Release 0.4.0 - - NEWS | 17 +++++++++++++++++ - configure.ac | 6 +++--- - 2 files changed, 20 insertions(+), 3 deletions(-) - -commit cb8a603aea2f05e376a165cae2219a213c7517a4 -Author: Simon McVittie -Date: Wed Oct 6 17:01:45 2010 +0100 - - fix compilation of recently changed code in SalutConnection - - src/salut-connection.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 748d74aa6eb4a52948ed7b37374e2b3a0a1f2f4f -Merge: 89cd8e0 7bea65c -Author: Simon McVittie -Date: Wed Oct 6 16:52:23 2010 +0100 - - Merge branches 'cleaning' and 'tests' - - Reviewed-by: Tomeu Vizoso - -commit 7bea65c65ef9bd86a5671c00772440feab4f3d1c -Author: Simon McVittie -Date: Wed Oct 6 15:53:26 2010 +0100 - - test-caps-file-transfer: specifically look for the contact we care about - - Otherwise, we could get capability changes for other contacts on the LAN. - - tests/twisted/avahi/test-caps-file-transfer.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 9e3c7be28649ecacde7580a1b1f3c0b40e5f9b7c -Author: Simon McVittie -Date: Wed Oct 6 15:49:00 2010 +0100 - - servicetest: update from Gabble to get parallel event queues - - tests/twisted/servicetest.py | 161 ++++++++++++++++++++++++++++-------------- - 1 files changed, 108 insertions(+), 53 deletions(-) - -commit 89cd8e077616ef9d0da1ea58093ee363bfc0495e -Author: Tomeu Vizoso -Date: Tue Oct 5 17:52:51 2010 +0200 - - Remove the activity when its channel has been closed, as Gabble does - - * src/salut-connection.c: Listen for muc channels closed and leave - the associated activity. - * src/salut-self.[hc]: Add salut_self_remove_olpc_activity() - - src/salut-connection.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ - src/salut-self.c | 16 +++++++++++ - src/salut-self.h | 3 ++ - 3 files changed, 89 insertions(+), 0 deletions(-) - -commit ee2c2dea450e484a6245f78f0b56bd7f07083902 -Author: Simon McVittie -Date: Tue Oct 5 18:39:03 2010 +0100 - - Apply some fairly crude filtering to the lcov output again - - rules/lcov.mak | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 50668ea83a111b3e795a3ba0e9cc73735bda4b2e -Author: Simon McVittie -Date: Tue Oct 5 18:34:59 2010 +0100 - - Remove lcov output cleaning, which no longer works in the current version - - rules/lcov.mak | 8 ++------ - 1 files changed, 2 insertions(+), 6 deletions(-) - -commit e7ca1633d073bed2a77c98dab731a6d1357ce14e -Author: Simon McVittie -Date: Tue Oct 5 16:37:53 2010 +0100 - - Ignore more generated files - - .gitignore | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 3253fc54e9e4c186ad918ed9c8204e6c238aea0a -Author: Simon McVittie -Date: Tue Oct 5 16:32:59 2010 +0100 - - Remove check for which is no longer used - - configure.ac | 9 --------- - 1 files changed, 0 insertions(+), 9 deletions(-) - -commit 6479b4316ce426cc1c7e4ef389c4e7760824f8af -Author: Simon McVittie -Date: Tue Oct 5 16:32:02 2010 +0100 - - remove obsolete check for signal.h - - configure.ac | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 6fd6e421c8628edfb3faf8c89b48704dca679b9d -Author: Simon McVittie -Date: Tue Oct 5 16:31:05 2010 +0100 - - remove obsolete check for backtrace/execinfo functions - - configure.ac | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 72f4d1f6f21586cddd1701a9544eb1e085d0a6bb -Author: Simon McVittie -Date: Tue Oct 5 16:29:52 2010 +0100 - - Remove obsolete check for endianness, now that we don't ship SHA1 code - - configure.ac | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit 75bf11161e99009dea17109ef43f3857141c1c9e -Author: Simon McVittie -Date: Tue Oct 5 16:28:43 2010 +0100 - - remove obsolete check for dbus-binding-tool - - configure.ac | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -commit 3c3529a3edd0be3a2e465f77243947ca3db41903 -Author: Simon McVittie -Date: Tue Oct 5 16:28:18 2010 +0100 - - adjust configure.ac so it doesn't mis-highlight - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d81daec166a107c709463f65162c6315f8014b19 -Author: Simon McVittie -Date: Tue Oct 5 13:56:47 2010 +0100 - - SalutDisco: simplify priv access - - src/salut-disco.c | 28 +++++++++++++--------------- - 1 files changed, 13 insertions(+), 15 deletions(-) - -commit b2ba7ca61ffa7365d1542069301d3a4c51aee231 -Author: Simon McVittie -Date: Tue Oct 5 13:54:42 2010 +0100 - - SalutConnection: use a safer idiom for private struct access - - src/salut-connection.c | 83 ++++++++++++++++++++++------------------------- - src/salut-connection.h | 3 +- - 2 files changed, 41 insertions(+), 45 deletions(-) - -commit abf567919afeb46ee3700055428449c29e3f013f -Author: Simon McVittie -Date: Tue Oct 5 13:55:00 2010 +0100 - - SalutAvahiContact: use a safer idiom for private struct access - - src/salut-avahi-contact.c | 31 ++++++++++++++----------------- - 1 files changed, 14 insertions(+), 17 deletions(-) - -commit 88a6126931dfbe5c9dede9959e9057ad1f892c7d -Author: Simon McVittie -Date: Tue Oct 5 13:54:04 2010 +0100 - - SalutContact: use a safer idiom for priv access - - src/salut-contact.c | 42 ++++++++++++++++++++---------------------- - src/salut-contact.h | 2 ++ - 2 files changed, 22 insertions(+), 22 deletions(-) - -commit 0393fb6f36637b7370347c37d1f6caf984be188d -Author: Simon McVittie -Date: Tue Oct 5 13:59:30 2010 +0100 - - SalutAvahiSelf: use type-safe idiom for priv access - - src/salut-avahi-self.c | 38 ++++++++++++++------------------------ - src/salut-avahi-self.h | 3 ++- - 2 files changed, 16 insertions(+), 25 deletions(-) - -commit be35d7da176b8c5457a2c3c3e7a0b7113894ffec -Author: Simon McVittie -Date: Tue Oct 5 13:53:24 2010 +0100 - - SalutSelf: use a safer idiom for private struct access - - src/salut-self.c | 53 ++++++++++++++++++++++++++++++----------------------- - src/salut-self.h | 3 +++ - 2 files changed, 33 insertions(+), 23 deletions(-) - -commit 422a2b4ecdf3062d1c565c820ddac20c3d267637 -Author: Simon McVittie -Date: Tue Oct 5 12:37:00 2010 +0100 - - gibber: remove now-unused MD5 implementation - - lib/gibber/Makefile.am | 6 +- - lib/gibber/libmd5-rfc/md5.c | 381 --------------------------------------- - lib/gibber/libmd5-rfc/md5.h | 91 ---------- - lib/gibber/libmd5-rfc/md5main.c | 139 -------------- - 4 files changed, 1 insertions(+), 616 deletions(-) - -commit c0949ae111fa6120143278af158e3d0c62d4f6ce -Author: Simon McVittie -Date: Tue Oct 5 12:35:30 2010 +0100 - - gibber: remove SASL support - - Wocky now has this, and Salut never used it. - - configure.ac | 14 - - lib/gibber/Makefile.am | 2 - - lib/gibber/gibber-sasl-auth.c | 869 -------------------- - lib/gibber/gibber-sasl-auth.h | 91 -- - lib/gibber/tests/Makefile.am | 11 - - lib/gibber/tests/check-gibber-sasl-auth.c | 213 ----- - lib/gibber/tests/check-gibber.h | 1 - - lib/gibber/tests/check-main.c | 3 - - lib/gibber/tests/test-sasl-auth-server.c | 460 ----------- - lib/gibber/tests/test-sasl-auth-server.h | 73 -- - 10 files changed, 0 insertions(+), 1737 deletions(-) - -commit 6e9cc8f19d0d5f80ce951304e6afe0cf64cd906b -Author: Simon McVittie -Date: Tue Oct 5 12:30:25 2010 +0100 - - Remove examples and OpenSSL support from libgibber - - Salut doesn't need SSL, and Gabble never used this functionality. New - projects should use GIO and/or Wocky. - - configure.ac | 18 - - lib/gibber/Makefile.am | 16 +- - lib/gibber/examples/Makefile.am | 33 -- - lib/gibber/examples/test-ssl.c | 269 ------------- - lib/gibber/examples/test-tcp.c | 147 -------- - lib/gibber/gibber-ssl-transport.c | 751 ------------------------------------- - lib/gibber/gibber-ssl-transport.h | 76 ---- - 7 files changed, 1 insertions(+), 1309 deletions(-) - -commit 60e50418facfdfc0b367b02bf88de7f615d9148c -Merge: 2bee924 8644ef8 -Author: Simon McVittie -Date: Fri Oct 1 14:52:52 2010 +0100 - - Merge branch 'tests' - - Reviewed-by: Tomeu Vizoso - -commit 8644ef895fd86084de5af8ab219d8aeb1b303c55 -Author: Simon McVittie -Date: Fri Oct 1 14:12:37 2010 +0100 - - saluttest: optionally don't make a Connection - - Tests for ConnectionManager and Protocol don't need to interact with Avahi - at all. - - tests/twisted/saluttest.py | 21 +++++++++++++++------ - 1 files changed, 15 insertions(+), 6 deletions(-) - -commit 6053b767827fb68d06ef32255e0cd985815dcb0d -Author: Simon McVittie -Date: Fri Oct 1 14:11:49 2010 +0100 - - saluttest: use install_colourer() from servicetest - - tests/twisted/saluttest.py | 29 ++--------------------------- - 1 files changed, 2 insertions(+), 27 deletions(-) - -commit 05296bdfb9eb3acd494aec39e978329daef0484a -Author: Simon McVittie -Date: Fri Oct 1 14:11:24 2010 +0100 - - servicetest: update from Gabble - - tests/twisted/servicetest.py | 224 ++++++++++++++++++++++++++++++++++-------- - 1 files changed, 183 insertions(+), 41 deletions(-) - -commit e23377959f56a10b89364908fc4638557c78e140 -Author: Simon McVittie -Date: Fri Oct 1 13:08:48 2010 +0100 - - test-request-im: pick up the desired handle in a non-racy way - - If we're really unlucky, someone else on the network could drop off - between getting the MembersChanged, and inspecting their handle. We - could work around this with try: except:, but now that - MembersChangedDetailed exists, we don't have to. - - tests/twisted/avahi/test-request-im.py | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit e01e0c53a0565d45c125d5e18b3a2fa52bd7fc03 -Author: Simon McVittie -Date: Fri Oct 1 13:07:31 2010 +0100 - - test-muc-invite: reject the invitation in a way that actually works - - tests/twisted/avahi/test-muc-invite.py | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 5984be4092c3f390c1d8afccb1aeb2c435f6f15a -Author: Simon McVittie -Date: Fri Oct 1 13:04:27 2010 +0100 - - test-muc-invite: make interface checking future-proof - - The check for Interfaces has failed ever since Messages support was added. - - We could make much, much more use of constants and servicetest in this - test, but making the tests pass is a higher priority for now. - - tests/twisted/avahi/test-muc-invite.py | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit eb51a18a4fb73e65536b37132d8725d962483fb7 -Author: Simon McVittie -Date: Fri Oct 1 14:12:50 2010 +0100 - - constants: add Aliasing and complex Presence - - tests/twisted/constants.py | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 05ef9f4215eb93fd31709436c4eb13d47d6233d2 -Author: Simon McVittie -Date: Fri Oct 1 12:57:52 2010 +0100 - - constants.py: update from telepathy-gabble, mostly - - However, revert the change to the final ContactCapabilties namespace: - Salut only implements draft 1. - - tests/twisted/constants.py | 185 +++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 183 insertions(+), 2 deletions(-) - -commit 2bee92445dee73db51690cce03d4c0f3b0d4c82d -Author: Simon McVittie -Date: Fri Oct 1 11:34:35 2010 +0100 - - salut_connection_manager_new_connection: access the right priv pointer - - src/salut-connection-manager.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 5edddb86c1120205a140c0dd2c2dfd4350116dac -Author: Simon McVittie -Date: Fri Oct 1 11:34:23 2010 +0100 - - Set nano version so we can have -Werror again - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 816b4e8169dba1d957ea9a882744d3766a44e8bf -Merge: 6aae570 e18e5bc -Author: Simon McVittie -Date: Fri Sep 24 10:52:01 2010 +0100 - - Merge branch 'misc' - - Reviewed-by: Guillaume Desmottes - -commit e18e5bcd4115f50fa0fc2fc88f0e15995db23606 -Author: Simon McVittie -Date: Thu Sep 23 16:36:37 2010 +0100 - - salut_normalize_non_empty: factor out connection-independent normalization - - We'll need this for the Protocol. - - src/salut-connection.c | 17 ++++++++++++----- - src/salut-connection.h | 2 ++ - 2 files changed, 14 insertions(+), 5 deletions(-) - -commit 286f1ba0d330dfc0513e1d45cf58884408f2e8c6 -Author: Simon McVittie -Date: Thu Sep 23 16:34:38 2010 +0100 - - salut_connection_get_implemented_interfaces: add - - We'll need this for Protocol objects. - - src/salut-connection.c | 31 +++++++++++++++++++------------ - src/salut-connection.h | 2 ++ - 2 files changed, 21 insertions(+), 12 deletions(-) - -commit 636c5237465f5d8f15638e8a38f28f0744737e25 -Author: Simon McVittie -Date: Thu Sep 23 16:34:00 2010 +0100 - - salut_connection_manager_finalize: chain up to superclass correctly - - src/salut-connection-manager.c | 12 +++++++++--- - 1 files changed, 9 insertions(+), 3 deletions(-) - -commit a3edc3da9df00ae0cc787f34481a01b63a9f3453 -Author: Simon McVittie -Date: Thu Sep 23 16:32:49 2010 +0100 - - SalutConnectionManager: use the normal telepathy-glib priv idioms - - This way is less verbose and more type-safe that what's there at the - moment. - - src/salut-connection-manager.c | 15 ++++++--------- - src/salut-connection-manager.h | 3 ++- - 2 files changed, 8 insertions(+), 10 deletions(-) - -commit cbde852e371dfdaadda1d62453ff6b815b7c25ae -Author: Simon McVittie -Date: Thu Sep 23 16:28:46 2010 +0100 - - SalutConnectionManager: include headers in the recommended order - - src/salut-connection-manager.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 0f85e9ae246b1e7a9b7872bca14dbb92fe0d1910 -Author: Simon McVittie -Date: Thu Sep 23 16:27:28 2010 +0100 - - Remove the GibberResolver and all its infrastructure - - Salut never used it, and Gabble no longer uses it either, so let's bin it. - Please use GResolver in new code. - - configure.ac | 34 -- - lib/gibber/Makefile.am | 18 +- - lib/gibber/examples/Makefile.am | 9 +- - lib/gibber/examples/test-resolv.c | 130 ----- - lib/gibber/gibber-resolver-asyncns.c | 415 -------------- - lib/gibber/gibber-resolver-asyncns.h | 59 -- - lib/gibber/gibber-resolver.c | 896 ------------------------------ - lib/gibber/gibber-resolver.h | 175 ------ - lib/gibber/tests/Makefile.am | 3 - - lib/gibber/tests/check-gibber-resolver.c | 91 --- - lib/gibber/tests/check-gibber.h | 1 - - lib/gibber/tests/check-main.c | 1 - - lib/gibber/tests/test-resolver.c | 113 ---- - lib/gibber/tests/test-resolver.h | 59 -- - 14 files changed, 2 insertions(+), 2002 deletions(-) - -commit 6aae5708e84425b101cf17f43baf9bb500dce943 -Merge: e5d9e6c 9d18668 -Author: Tomeu Vizoso -Date: Thu Sep 16 16:31:03 2010 +0200 - - Merge branch 'master' of git+ssh://git.collabora.co.uk/git/telepathy-salut - -commit 9d18668df1f73ee797fa29e304b02373e21c9f1f -Author: Guillaume Desmottes -Date: Thu Sep 16 16:00:19 2010 +0200 - - fix shadow warning errors - - src/salut-tubes-manager.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit e5d9e6c15a3b2a647387613c63398866510b0d35 -Author: Tomeu Vizoso -Date: Thu Aug 19 14:03:24 2010 +0200 - - version 0.3.13 - - NEWS | 19 +++++++++++++++++-- - configure.ac | 4 ++-- - 2 files changed, 19 insertions(+), 4 deletions(-) - -commit 44b3d6b3b74687c015e990515a0866a1cdf4bf2b -Author: Tomeu Vizoso -Date: Mon Aug 16 12:14:18 2010 +0200 - - Add rationales to AddActivity and GetActivity - - extensions/OLPC_Activity_Properties.xml | 4 ++++ - extensions/OLPC_Buddy_Info.xml | 5 +++++ - 2 files changed, 9 insertions(+), 0 deletions(-) - -commit c4942f37f1462f067eb7b65d87ba6d7510c3cf6d -Author: Tomeu Vizoso -Date: Wed Aug 11 15:15:46 2010 +0200 - - Add a BuddyInfo.AddActivity method so activities can advertise themselves without having to track all the other shared activities. - - Exposes salut_self_add_olpc_activity in salut-self.h - - extensions/OLPC_Buddy_Info.xml | 20 ++++++++++++++++++++ - src/salut-connection.c | 24 ++++++++++++++++++++++++ - src/salut-self.c | 17 +++++++---------- - src/salut-self.h | 3 +++ - 4 files changed, 54 insertions(+), 10 deletions(-) - -commit ac58539082c8fa438e2ef9148d51c5618fde64bd -Author: Tomeu Vizoso -Date: Wed Aug 11 15:10:49 2010 +0200 - - Add a ActivityProperties.GetActivity method for retrieving an activity's room handle from its id. - - extensions/OLPC_Activity_Properties.xml | 20 ++++++++++++++++++ - src/salut-connection.c | 33 +++++++++++++++++++++++++++++++ - src/salut-olpc-activity-manager.c | 20 ++++++++++++++++++ - src/salut-olpc-activity-manager.h | 3 ++ - 4 files changed, 76 insertions(+), 0 deletions(-) - -commit 726001d0d64457905c645bb9ade8aecbca756a0c -Merge: a242b11 0d374be -Author: Simon McVittie -Date: Wed May 26 11:37:53 2010 +0100 - - Merge branch 'trivia' - - Reviewed-by: Guillaume Desmottes - Bug: https://bugs.freedesktop.org/show_bug.cgi?id=28258 - -commit 0d374be6fe41427482faa43995dedfdee836842e -Author: Simon McVittie -Date: Wed May 26 10:53:17 2010 +0100 - - with-session-bus.sh: update from telepathy-glib, fixing a bashism - - tests/twisted/tools/with-session-bus.sh | 12 +++++++++++- - 1 files changed, 11 insertions(+), 1 deletions(-) - -commit 846767b6c0b232cd53f67bc23c73a9d9395e4f0f -Author: Simon McVittie -Date: Wed May 26 10:52:15 2010 +0100 - - configure.ac: fix non-POSIX use of test - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a242b118a7f4808342e522108da692e7264f7a40 -Author: Xavier Claessens -Date: Thu May 20 14:55:51 2010 +0200 - - Implement avatar requirements properties - - src/salut-connection.c | 63 ++++++++++++++++++++++++++++++++++++++++++----- - 1 files changed, 56 insertions(+), 7 deletions(-) - -commit dc1f76f249ea031ef50709b660db054e7daa1c17 -Author: Simon McVittie -Date: Thu May 20 12:22:47 2010 +0100 - - Nano version - - NEWS | 5 +++++ - configure.ac | 2 +- - 2 files changed, 6 insertions(+), 1 deletions(-) - -commit ed1f3a02205af96f5b0b63f9bf47e9dc1aebd7b5 -Author: Simon McVittie -Date: Thu May 20 12:04:15 2010 +0100 - - Prepare version 0.3.12 - - NEWS | 27 +++++++++++++++++++++++++-- - configure.ac | 4 ++-- - 2 files changed, 27 insertions(+), 4 deletions(-) - -commit 8220abbc6b079aeb9760b1d399ca029ea7751e95 -Author: Simon McVittie -Date: Thu May 20 12:01:45 2010 +0100 - - Quieten build further - - data/Makefile.am | 4 ++-- - docs/Makefile.am | 4 ++-- - extensions/Makefile.am | 22 +++++++++++----------- - lib/gibber/Makefile.am | 10 +++++----- - src/Makefile.am | 10 +++++----- - tests/twisted/Makefile.am | 2 +- - tests/twisted/tools/Makefile.am | 8 ++++---- - tools/Makefile.am | 12 ++++++------ - 8 files changed, 36 insertions(+), 36 deletions(-) - -commit 7e6b2d33b287c9b6d743f7a0d1f6463e4e582c44 -Author: Simon McVittie -Date: Thu May 20 11:54:52 2010 +0100 - - Revert "Shave salut's build." - - This reverts commit 99cc66bb81516ad87657e8d49e286502bba63f69. - - Conflicts: - - lib/gibber/Makefile.am - src/Makefile.am - - .gitignore | 3 - - configure.ac | 4 -- - data/Makefile.am | 6 +-- - docs/Makefile.am | 6 +-- - extensions/Makefile.am | 24 +++++------ - lib/gibber/Makefile.am | 12 ++--- - lib/gibber/examples/Makefile.am | 4 +- - m4/shave.m4 | 77 -------------------------------------- - shave-libtool.in | 69 ---------------------------------- - shave.in | 79 --------------------------------------- - src/Makefile.am | 14 +++---- - tests/twisted/Makefile.am | 4 +- - tests/twisted/tools/Makefile.am | 8 +-- - tools/Makefile.am | 14 +++---- - tools/shave.mk | 1 - - 15 files changed, 37 insertions(+), 288 deletions(-) - -commit 4cd65645628c1b3a16cc84225833b67e9876e8ed -Author: Simon McVittie -Date: Thu May 20 11:51:33 2010 +0100 - - Enable optional quiet build - - autogen.sh | 13 +++++++------ - configure.ac | 1 + - 2 files changed, 8 insertions(+), 6 deletions(-) - -commit 33f1636f3ea64375cb1db0a13ddfbbdbcfd64222 -Merge: 89f5517 c26c019 -Author: Simon McVittie -Date: Thu May 20 11:37:33 2010 +0100 - - Merge branch 'misc' - - Reviewed-by: Sjoerd Simons - -commit c26c0197cca74b9bc21abf88819464ac29213a86 -Author: Simon McVittie -Date: Thu May 20 11:34:52 2010 +0100 - - fd.o #26152: make critical warnings fatal by default - - src/salut.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit e9f335b11233ce3dd61286bfe49f21790adbab6a -Author: Simon McVittie -Date: Thu May 20 11:31:34 2010 +0100 - - fd.o #20732 (partial): allow the user to leave MUCs with RemoveMembers() - - At the moment, Clique does not define a way to send a parting message, - so the message and reason-code are ignored; however, this does fix the - telepathy-spec compliance issue. - - src/salut-muc-channel.c | 62 ++++++++++++++++++++++++++------ - tests/twisted/avahi/test-muc-invite.py | 2 +- - 2 files changed, 52 insertions(+), 12 deletions(-) - -commit 89f5517ba20124b8e4d494280a4acb3802981cef -Merge: ae192c1 b760492 -Author: Simon McVittie -Date: Thu May 20 11:15:02 2010 +0100 - - Merge remote branch 'cassidy/muc-properties-27289' - - Reviewed-by: Simon McVittie - -commit ae192c1f652fb79baf56a2daf15e76b18b0dbc67 -Merge: c826be4 68ee3cc -Author: Simon McVittie -Date: Thu May 20 11:10:39 2010 +0100 - - Merge branch 'gibbering-wreck' - -commit 68ee3ccf3cae7c3054b6f972632bc89beadfdcf1 -Author: Simon McVittie -Date: Fri May 7 15:49:00 2010 +0100 - - gibber_fd_transport_set_fd: take an is_socket parameter, and call Winsock-compatible functions if true - - For the moment I'm just skipping the "non-blocking I/O" fcntl for - non-sockets on Windows. In practice, this code path is never taken... - - (Taken from Gabble) - - lib/gibber/gibber-fd-transport.c | 19 ++++++++++++++++--- - lib/gibber/gibber-fd-transport.h | 3 ++- - lib/gibber/gibber-linklocal-transport.c | 4 ++-- - lib/gibber/gibber-listener.c | 2 +- - lib/gibber/gibber-tcp-transport.c | 2 +- - lib/gibber/gibber-unix-transport.c | 4 ++-- - 6 files changed, 24 insertions(+), 10 deletions(-) - -commit 50d6f3d9a86d6512ce6e1b558827b82888cdffad -Author: Simon McVittie -Date: Fri May 7 15:48:04 2010 +0100 - - Conditionalize uses of unistd.h in Gibber - - lib/gibber/gibber-fd-transport.c | 7 ++++++- - lib/gibber/gibber-linklocal-transport.c | 7 ++++++- - lib/gibber/gibber-listener.c | 9 ++++++++- - lib/gibber/gibber-tcp-transport.c | 6 +++++- - lib/gibber/gibber-util.c | 6 +++++- - 5 files changed, 30 insertions(+), 5 deletions(-) - -commit 7aa834a49404af2881b4b44c9817e80fd4e84c37 -Author: Simon McVittie -Date: Wed Oct 28 16:12:09 2009 +0000 - - GibberListener: use gibber_socket_set_error - - lib/gibber/gibber-listener.c | 45 ++++++++++++++++------------------------- - 1 files changed, 18 insertions(+), 27 deletions(-) - -commit b3062292012a2f26e5d17b61faa00451b6504ada -Author: Simon McVittie -Date: Wed Oct 28 16:17:07 2009 +0000 - - GibberTCPTransport: use gibber_socket_errno, gibber_socket_strerror - - errno and strerror won't work on Windows. *sigh* - - lib/gibber/gibber-sockets.c | 4 ++-- - lib/gibber/gibber-sockets.h | 2 ++ - lib/gibber/gibber-tcp-transport.c | 3 ++- - 3 files changed, 6 insertions(+), 3 deletions(-) - -commit faac37f9310d0d8ef5344e68a61825d9d2f48ea6 -Author: Simon McVittie -Date: Wed Oct 28 15:40:05 2009 +0000 - - gibber-tcp-transport: new_connect_attempt: use gibber-sockets.h wrappers - - lib/gibber/gibber-tcp-transport.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 6b0f0e6370f2ce0d2a2daab40b2a29274bc82473 -Author: Simon McVittie -Date: Wed Oct 28 15:38:42 2009 +0000 - - gibber_socket_set_nonblocking: wrapper for fcntl or ioctlsocket as appropriate - - lib/gibber/gibber-sockets.c | 12 ++++++++++++ - lib/gibber/gibber-sockets.h | 2 ++ - 2 files changed, 14 insertions(+), 0 deletions(-) - -commit 41910a006f859fd73cab9e904c6174d49484ea02 -Author: Simon McVittie -Date: Wed Oct 28 16:11:40 2009 +0000 - - gibber_socket_set_error etc.: add wrappers for Winsock not returning errors in errno - - lib/gibber/gibber-sockets.c | 54 +++++++++++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-sockets.h | 4 +++ - 2 files changed, 58 insertions(+), 0 deletions(-) - -commit 2c30cd332f1c88d4b53ce38e9b46d49d8aacb71f -Author: Simon McVittie -Date: Tue Oct 13 16:22:31 2009 +0100 - - GibberListener: stub out Unix sockets unless GIBBER_TYPE_UNIX_TRANSPORT was built - - lib/gibber/gibber-listener.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit 9965331b27831d812901f26c3cdf48446156a196 -Author: Simon McVittie -Date: Wed Oct 28 15:48:38 2009 +0000 - - gibber-listener: add_listener: use gibber_io_channel_new_from_socket - - We're listening on IPv4, IPv6 or Unix here, so we know it's a socket, not - some other sort of fd. - - lib/gibber/gibber-listener.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6ce8fe4a794971bc4cbf40f57f7cb053e6c44fd3 -Author: Simon McVittie -Date: Wed Oct 28 15:32:20 2009 +0000 - - gibber_io_channel_new_from_socket: new wrapper function - - This should only be used if sockfd is known to be a socket. - - lib/gibber/gibber-sockets.c | 10 ++++++++++ - lib/gibber/gibber-sockets.h | 2 ++ - 2 files changed, 12 insertions(+), 0 deletions(-) - -commit da2783bd5cd4d695ad364cbc80b212a2c90b3999 -Author: Simon McVittie -Date: Fri May 7 14:54:40 2010 +0100 - - gibber_connect_errno_requires_retry: wrap the difference between Winsock and Unix errno values - - From Gabble. - - lib/gibber/Makefile.am | 1 + - lib/gibber/gibber-sockets.c | 36 ++++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-sockets.h | 6 ++++++ - lib/gibber/gibber-tcp-transport.c | 2 +- - 4 files changed, 44 insertions(+), 1 deletions(-) - -commit 508cf75c238574f0ccbaaa26316d4ba5877ae97e -Author: Simon McVittie -Date: Fri May 7 15:16:35 2010 +0100 - - GibberUnixTransport: don't build if not running on Unix - - lib/gibber/gibber-unix-transport.c | 8 +++++++- - lib/gibber/gibber-unix-transport.h | 4 ++++ - 2 files changed, 11 insertions(+), 1 deletions(-) - -commit 23079bc4b84054734ccac5c1a2a84d662175319c -Author: Sjoerd Simons -Date: Fri Dec 18 14:06:53 2009 +0000 - - Initialize the buffer used in a cmsg to zero - - Initializing the buffer the zero prevents false positives from valgrind. Also - fixed a small code consistency issue - - lib/gibber/gibber-unix-transport.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 9dd84176101220b136eb4b72f9843350645f5263 -Author: Simon McVittie -Date: Fri May 7 15:10:28 2010 +0100 - - Use gibber-sockets.h within Gibber, instead of individual networking headers - - Similar changes have been made in Gabble already. - - lib/gibber/gibber-bytestream-direct.c | 4 +--- - lib/gibber/gibber-bytestream-direct.h | 2 +- - lib/gibber/gibber-bytestream-oob.c | 4 +--- - lib/gibber/gibber-bytestream-oob.h | 3 +-- - lib/gibber/gibber-fd-transport.c | 2 +- - lib/gibber/gibber-fd-transport.h | 5 +---- - lib/gibber/gibber-linklocal-transport.c | 2 +- - lib/gibber/gibber-listener.c | 4 ---- - lib/gibber/gibber-muc-connection.c | 3 +-- - lib/gibber/gibber-multicast-transport.c | 6 +----- - lib/gibber/gibber-r-multicast-packet.c | 2 +- - lib/gibber/gibber-resolver.c | 7 ++----- - lib/gibber/gibber-resolver.h | 3 +-- - lib/gibber/gibber-tcp-transport.c | 2 +- - lib/gibber/gibber-transport.h | 2 +- - lib/gibber/gibber-unix-transport.c | 2 ++ - lib/gibber/gibber-util.h | 4 +--- - lib/gibber/gibber-xmpp-connection-listener.c | 3 +-- - 18 files changed, 19 insertions(+), 41 deletions(-) - -commit c2b2d0fa47f10ed6fe84c744205dbf0f8deec798 -Author: Simon McVittie -Date: Fri May 7 14:48:29 2010 +0100 - - gibber-sockets.h: new meta-header for various system socket headers - - This wouldn't be a viable approach for a real library (it requires - including config.h in a header), but Gibber is just a convenience - library and will remain so until we've migrated out all its code, so - I think it's acceptable here. - - (Copied from Gabble.) - - lib/gibber/Makefile.am | 3 ++ - lib/gibber/gibber-sockets-unix.h | 61 +++++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-sockets-win32.h | 29 +++++++++++++++++ - lib/gibber/gibber-sockets.h | 33 ++++++++++++++++++++ - 4 files changed, 126 insertions(+), 0 deletions(-) - -commit 18c463bdf541c94454b191d2a69f81ecaf6c44b7 -Author: Simon McVittie -Date: Fri May 7 14:43:51 2010 +0100 - - configure.ac: check for numerous networking-related headers - - Originally from Gabble. - - configure.ac | 32 ++++++++++++++++++++++++++++++++ - 1 files changed, 32 insertions(+), 0 deletions(-) - -commit b9556285bf33827b876b0048e53b5a2be0816d3e -Author: Will Thompson -Date: Wed Nov 25 13:08:49 2009 +0000 - - Document a deliberate switch fall-through - - lib/gibber/gibber-fd-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 10e1d2758dbcdf9c04c2ca96a42a2bf357eba69c -Author: Simon McVittie -Date: Fri May 7 14:38:38 2010 +0100 - - fd.o#22970: GibberUnixTransport: make credential-passing support optional and detectable - - Our implementation only works for Linux so far, so we need to be able to - avoid advertising credential-passing on e.g. Darwin. - - Patches to the implementation were copied from Gabble, fd.o #22968; - patches to the tests are new. - - lib/gibber/gibber-unix-transport.c | 47 ++++++++++++++++++++++++ - lib/gibber/gibber-unix-transport.h | 2 + - lib/gibber/tests/check-gibber-unix-transport.c | 20 +++++++++-- - 3 files changed, 66 insertions(+), 3 deletions(-) - -commit c826be427182246f0645d42a73f4f38ee3d361c5 -Author: Simon McVittie -Date: Fri Apr 30 17:01:17 2010 +0100 - - Revert "debug: add more log level macros" - - This reverts commit 0dd711eb6834db4c165a4c75df78852bbe7d5b7d; its ERROR - etc. macros don't have the desired semantics (see fd.o #27899). - telepathy-glib/Gabble patches are pending, and a better implementation for - Salut can be based on one of those. - - src/debug.c | 16 +++++++--------- - src/debug.h | 32 +++----------------------------- - 2 files changed, 10 insertions(+), 38 deletions(-) - -commit 0dd711eb6834db4c165a4c75df78852bbe7d5b7d -Author: Jonny Lamb -Date: Thu Apr 29 18:09:46 2010 +0100 - - debug: add more log level macros - - Signed-off-by: Jonny Lamb - - src/debug.c | 16 +++++++++------- - src/debug.h | 32 +++++++++++++++++++++++++++++--- - 2 files changed, 38 insertions(+), 10 deletions(-) - -commit fbd18d70fd24f60bcb82f10ed32eeefd7269ab2c -Author: Jonny Lamb -Date: Thu Apr 29 18:07:49 2010 +0100 - - text-helper: pass the correct timestamp as the "message-sent" value - - time is a pointer to time(2) which is not what we want. - - Signed-off-by: Jonny Lamb - - src/text-helper.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c4a999ffd01db1c8e948ad633387ec9891879c16 -Author: Mike Ruprecht -Date: Tue Apr 6 05:29:45 2010 -0500 - - Fix building with the tr_TR.UTF-8 locale. - - The tr_TR.UTF-8 has a quirk regarding upper and lowercase letters. - Using the tr command to replace lowercase letters with uppercase - letters sometimes causes the lowercase letters to remain (namely - 'i'). This patch forces a 'C' locale for these tr commands. - - lib/gibber/Makefile.am | 6 +++--- - src/Makefile.am | 6 +++--- - 2 files changed, 6 insertions(+), 6 deletions(-) - -commit d09e25eff397c59623c2292373777bbf349a222b -Author: Mike Ruprecht -Date: Tue Apr 6 16:16:05 2010 -0500 - - Remove the Channel_Future.xml extension as it's no longer used. - - extensions/Channel_Future.xml | 66 ----------------------------------------- - extensions/Makefile.am | 2 - - extensions/all.xml | 1 - - extensions/channel.xml | 27 ----------------- - 4 files changed, 0 insertions(+), 96 deletions(-) - -commit 12d283bfa8eaa34cea4178c3378c9ca8ea221a91 -Author: Simon McVittie -Date: Tue Dec 23 20:06:56 2008 +0000 - - SalutContactManager: implement requestotron error correctly - - Even if returning an error, we have to return TRUE to say "this channel - manager is responsible for this request". - - Reviewed-by: Sjoerd Simons - - src/salut-contact-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ab4d036f717130d649dd3f9ad635044872c29a41 -Author: Tomeu Vizoso -Date: Tue Mar 30 14:03:05 2010 +0200 - - Remove trailing whitespace - - src/salut-im-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8ae6e3fef89b85ecb40185b965d66267b4823d6c -Author: Mike Ruprecht -Date: Thu Mar 25 17:59:26 2010 -0500 - - start dev of 0.3.12 - - NEWS | 10 ++++++++++ - configure.ac | 2 +- - 2 files changed, 11 insertions(+), 1 deletions(-) - -commit 245a28c75c7a98f9445e21e3e9c550d98e504213 -Author: Mike Ruprecht -Date: Thu Mar 25 15:38:26 2010 -0500 - - version 0.3.11 - - NEWS | 8 +++++--- - configure.ac | 4 ++-- - 2 files changed, 7 insertions(+), 5 deletions(-) - -commit 68b39d303b2e05fe26917906df25df06ef974dfb -Author: Mike Ruprecht -Date: Thu Mar 25 15:25:36 2010 -0500 - - Initialize GErrors to NULL. - - src/salut-im-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 688499b9a6d027ad71dbc4718f9c3b8a48dba776 -Author: Mike Ruprecht -Date: Thu Mar 25 00:57:22 2010 -0500 - - Remove use of g_set_prgname in main(). - - tp_run_connection_manager calls g_set_prgname internally. It's - supposed to only be called once. Calling it in addition to - tp_run_connection_manager causes an assertion. This patch removes - use of it in main(). - - src/salut.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit e0205b4e4ae678e6bb9535ae6ede30d7de654ee6 -Author: Sjoerd Simons -Date: Thu Mar 25 17:57:09 2010 +0000 - - fix silly typos - - src/salut-xmpp-connection-manager.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit d01ce69e1e0378c75ffa7179a84e70af5e9227e6 -Author: Sjoerd Simons -Date: Thu Mar 25 17:41:05 2010 +0000 - - Return an error from Send as soon as we can - - src/salut-im-channel.c | 60 ++++++++++++++++++++++------------------------- - 1 files changed, 28 insertions(+), 32 deletions(-) - -commit 212bd66ef7979a5a38efcb1b6085ee57ce495600 -Author: Mike Ruprecht -Date: Mon Mar 22 22:16:46 2010 -0500 - - Port MUC channels to use the message mixin. - - src/salut-muc-channel.c | 137 +++++++++++++++++++++++------------------------ - src/salut-muc-channel.h | 5 +- - 2 files changed, 70 insertions(+), 72 deletions(-) - -commit e18cdefc30e83a8d435356068ae72c987b613e43 -Author: Mike Ruprecht -Date: Thu Mar 25 01:07:56 2010 -0500 - - Port IM channels to use the message mixin. - - src/salut-im-channel.c | 151 +++++++++++++++++++++++------------------------ - src/salut-im-channel.h | 5 +- - 2 files changed, 76 insertions(+), 80 deletions(-) - -commit 2670fbf358c45a7a51bbe559b63f34a67b477db5 -Author: Mike Ruprecht -Date: Thu Mar 25 00:53:12 2010 -0500 - - Add helper functions for the message interface. - - Add some helper functions which contain code for the messaging - interface are common to both the IM and MUC text channels. - - src/text-helper.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++- - src/text-helper.h | 13 +++++ - 2 files changed, 142 insertions(+), 1 deletions(-) - -commit d5fa37b9722b1717abcdc58dbb9c47fbb9fa9805 -Author: Mike Ruprecht -Date: Tue Mar 23 20:50:43 2010 -0500 - - Copy the generate_id function from Gabble's util file. - - configure.ac | 10 ++++++++++ - src/salut-util.c | 30 +++++++++++++++++++++++++++++- - src/salut-util.h | 4 +++- - 3 files changed, 42 insertions(+), 2 deletions(-) - -commit cbc0bd6cc4f0c8a7d03125de9a5a7ab21906d243 -Author: Sjoerd Simons -Date: Thu Mar 25 15:50:24 2010 +0000 - - Fix strict aliasing warnings from gcc - - lib/gibber/gibber-bytestream-oob.c | 11 +++++++---- - src/salut-avahi-contact.c | 17 ++++++++++------- - 2 files changed, 17 insertions(+), 11 deletions(-) - -commit b760492c7ff2c9c2184df9770bc334afff327152 -Author: Guillaume Desmottes -Date: Wed Mar 24 16:28:09 2010 +0100 - - contact-channel: set set Properties flag on GroupFlags property - - src/salut-contact-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 96be641c7cc8fd6d28c6b2b4bb018ff7c9889762 -Author: Guillaume Desmottes -Date: Wed Mar 24 16:24:42 2010 +0100 - - muc-chat: set Properties flag on GroupFlags property - - All the properties are implemented as requested in the spec (fd.o #27289). - - src/salut-muc-channel.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 0047e3efc3bb117702873752fdc33095ac7b8bd5 -Author: Guillaume Desmottes -Date: Wed Mar 24 16:23:28 2010 +0100 - - Remove workaround for fd.o #15092 - - It has been fixed in tp-glib 0.7.19 and we depend on 0.7.36 - - src/salut-avahi-muc-channel.c | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -commit e53d4a71e250a972119bf6c4f7e763f24f82919e -Author: Jonny Lamb -Date: Thu Feb 18 15:56:19 2010 +0000 - - configure: be sure to link to avahi-client and avahi-common - - See http://bugs.debian.org/556489. - - Fixes: fd.o#25123 - - Signed-off-by: Jonny Lamb - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c0a0acfe0c36dbf529183409cfdab9b74d1fdac4 -Author: Guillaume Desmottes -Date: Thu Sep 10 10:40:47 2009 +0100 - - start dev of 0.3.11 - - NEWS | 10 ++++++++++ - configure.ac | 2 +- - 2 files changed, 11 insertions(+), 1 deletions(-) - -commit f096d1ff173e508e6e48103c88f7bb5884548853 -Author: Guillaume Desmottes -Date: Thu Sep 10 10:34:43 2009 +0100 - - version 0.3.10 - - NEWS | 4 +++- - configure.ac | 4 ++-- - 2 files changed, 5 insertions(+), 3 deletions(-) - -commit f46b7d4f0412fdfb66f83685f3e40181013ef4eb -Author: Guillaume Desmottes -Date: Wed Sep 9 16:12:29 2009 +0100 - - re-enable test-disabled-1-1-tubes.py - - This reverts commit f3bacb9a257a1f0094d881f9b831889d463a50d6. - - .../twisted/avahi/tubes/test-disabled-1-1-tubes.py | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 58394228cc5ac2f15708140f15d0cd9119202653 -Author: Guillaume Desmottes -Date: Wed Sep 9 16:11:53 2009 +0100 - - Disable 1-1 stream tube for now - - This reverts commit c0ffbbfc831e05f18fb45884842f254b4a5bf7ce. - - src/salut-connection.c | 4 ++++ - tests/twisted/avahi/test-caps-tubes.py | 4 ++++ - .../avahi/tubes/test-offer-private-stream-tube.py | 4 ++++ - tests/twisted/avahi/tubes/test-tube-close.py | 7 ++++--- - .../avahi/tubes/test-two-private-stream-tubes.py | 4 ++++ - .../avahi/tubes/tubes-to-nonexistant-ids.py | 4 ++++ - 6 files changed, 24 insertions(+), 3 deletions(-) - -commit ceb37db30efb3b266c1a202eca74efe13e6ef294 -Author: Guillaume Desmottes -Date: Wed Sep 9 16:29:11 2009 +0100 - - ile_transfer_helper.py: use hashlib instead of the deprecated md5 module - - .../avahi/file-transfer/file_transfer_helper.py | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit fc67de29978caf71f7698819e810c4d91a7c5399 -Author: Guillaume Desmottes -Date: Wed Sep 9 16:27:54 2009 +0100 - - Make Python 2.5 a hard dependency - - Gabble switched to Python 2.5 as even Maemo has it now. - - configure.ac | 32 ++++++++++---------------------- - 1 files changed, 10 insertions(+), 22 deletions(-) - -commit 9c455f0529d8642297836454f6490f0450fb0eb8 -Author: Guillaume Desmottes -Date: Wed Sep 9 16:01:24 2009 +0100 - - document Debug interface in NEWS - - NEWS | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit f9eca3c0f54500f0d877d9381d174406f17b0c1c -Author: Jonny Lamb -Date: Wed Sep 9 10:39:07 2009 +0100 - - update NEWS - - Signed-off-by: Jonny Lamb - - NEWS | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 2c7c9d0951f395a264002b4fdb3ba539b2ffebf7 -Author: Jonny Lamb -Date: Wed Sep 9 09:49:06 2009 +0100 - - connection: save presence/message and set once established if set after self is created - - Signed-off-by: Jonny Lamb - - src/salut-connection.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit 77d91a16cd55c87e3d2466ce580e64769e96e911 -Author: Jonny Lamb -Date: Tue Sep 8 19:22:08 2009 +0100 - - connection: if presence is set before connected, save and set after connecting - - Signed-off-by: Jonny Lamb - - src/salut-connection.c | 78 +++++++++++++++++++++++++++++++++++------------ - 1 files changed, 58 insertions(+), 20 deletions(-) - -commit 795f91319a6e81660fa3f8ea2cd23246617322a7 -Author: Jonny Lamb -Date: Tue Sep 8 19:20:45 2009 +0100 - - connection: set "dnd" to PRESENCE_TYPE_BUSY - - Signed-off-by: Jonny Lamb - - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6a68f130e45fc92da62d2e9d1e9ca123d4cd251e -Author: Jonny Lamb -Date: Mon Aug 24 12:37:26 2009 +0100 - - Add support for TpDebugSender. - - Signed-off-by: Jonny Lamb - - configure.ac | 2 +- - src/Makefile.am | 3 +- - src/debug.c | 72 ++++++++++++++++++++++++++++++++++++--- - src/debug.h | 3 ++ - src/salut-connection-manager.c | 22 ++++++++++++ - 5 files changed, 94 insertions(+), 8 deletions(-) - -commit a7a5cf31d8e8fd3a4991133c6755ad12890d32b6 -Author: Thomas Klausner -Date: Mon Aug 24 21:15:27 2009 +0100 - - Fix compilation on NetBSD by including more headers - - (Originally for telepathy-gabble's copy of libgibber) - - Signed-off-by: Simon McVittie - - lib/gibber/gibber-fd-transport.h | 1 + - lib/gibber/gibber-util.h | 2 ++ - 2 files changed, 3 insertions(+), 0 deletions(-) - -commit 463c7d126a2eed62f0f8cfb850298aee1121c523 -Author: Andres Salomon -Date: Mon Jul 20 12:18:11 2009 -0400 - - telepathy-salut: fix header guard in debug.h - - This would allow debug.h's contents to be included twice. - - Signed-off-by: Andres Salomon - Signed-off-by: Simon McVittie - - src/debug.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f979a181e0ff76e51446ff0593b5330b17af9d90 -Author: Guillaume Desmottes -Date: Fri Jun 26 16:00:58 2009 +0100 - - NEWS: tp-glib 0.7.31, stable tubes, contact caps - - NEWS | 17 +++++++++++++---- - 1 files changed, 13 insertions(+), 4 deletions(-) - -commit e06c2119893343905af2517c00841b8c731dc25d -Author: Guillaume Desmottes -Date: Wed Apr 15 16:55:03 2009 +0100 - - test-olpc-activity-announcements.py: port to new test API - - .../avahi/test-olpc-activity-announcements.py | 35 +++++++------------ - 1 files changed, 13 insertions(+), 22 deletions(-) - -commit 8d5ba982fa7f0c2662d2a051f4bf7ab65cb2e2c0 -Author: Guillaume Desmottes -Date: Wed Apr 15 16:27:19 2009 +0100 - - sync servicetest.py from Gabble - - The only change is the path argument of dbus-signal events which is the - full D-Bus path and not the truncated one as in Gabble. - - tests/twisted/servicetest.py | 257 +++++++++++++++--------------------------- - 1 files changed, 91 insertions(+), 166 deletions(-) - -commit d645fbdea5d49da5bbd747a95c669a10da3afc34 -Author: Guillaume Desmottes -Date: Wed Apr 15 16:58:59 2009 +0100 - - remove unused 'match' imports - - tests/twisted/avahi/test-request-muc.py | 2 +- - tests/twisted/avahi/test-roomlist.py | 2 +- - .../twisted/avahi/tubes/test-request-muc-tubes.py | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -commit 331c75faec21490b0ddc3dab2aa6a6cca5250c1d -Author: Guillaume Desmottes -Date: Wed Apr 15 16:29:44 2009 +0100 - - lazy is never used so there is no point to import it - - tests/twisted/avahi/test-request-muc.py | 2 +- - tests/twisted/avahi/test-roomlist.py | 2 +- - .../twisted/avahi/tubes/test-request-muc-tubes.py | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -commit 6b6d3c7cc7e1ebb7fb7ea9d7a1e83d9b12ccd72d -Author: Guillaume Desmottes -Date: Thu Feb 12 23:27:22 2009 +0000 - - test-caps-tubes.py: add generic tube capability - - tests/twisted/avahi/test-caps-tubes.py | 112 ++++++++++++++++++++----------- - 1 files changed, 72 insertions(+), 40 deletions(-) - -commit 6974fa8d457dfce8690adfec83965de6319b13ff -Author: Guillaume Desmottes -Date: Thu Feb 12 23:26:41 2009 +0000 - - Implement generic tube capability - - src/salut-tubes-manager.c | 92 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 92 insertions(+), 0 deletions(-) - -commit ebfa728fbceb5d84237ae0eb592e7ec97a7a09dd -Author: Guillaume Desmottes -Date: Thu Feb 12 23:26:06 2009 +0000 - - tubes-mgr: add TargetID as allowed property in ContactCapabilities - - src/salut-tubes-manager.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 0c87a3419ce4492bb717f0b3fb5fcad255f00700 -Author: Guillaume Desmottes -Date: Fri May 29 17:05:58 2009 +0100 - - tube-dbus: actually implement the LocalHost access control - - src/tube-dbus.c | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -commit 61de06a19a1ff3cacd52fc30b7930240a60abc05 -Author: Guillaume Desmottes -Date: Fri May 29 17:00:51 2009 +0100 - - add Localhost to SupportedAccessesControl - - src/tube-dbus.c | 2 ++ - tests/twisted/avahi/tubes/two-muc-dbus-tubes.py | 6 ++++-- - 2 files changed, 6 insertions(+), 2 deletions(-) - -commit 76d80775d38e5d9431eb228b6b0fa52e08cc9e72 -Author: Guillaume Desmottes -Date: Fri May 29 16:55:57 2009 +0100 - - two-muc-dbus-tubes.py: actually use the tube - - tests/twisted/avahi/tubes/two-muc-dbus-tubes.py | 62 +++++++++++++++++++++-- - 1 files changed, 58 insertions(+), 4 deletions(-) - -commit 15ec4ef188b29a3cab92c5cd9a5445b9da8223d8 -Author: Guillaume Desmottes -Date: Fri May 29 15:42:32 2009 +0100 - - two-muc-dbus-tubes.py: test DBusNames property - - tests/twisted/avahi/tubes/two-muc-dbus-tubes.py | 20 ++++++++++++++++++-- - 1 files changed, 18 insertions(+), 2 deletions(-) - -commit d2fd37bd780e48f4122839dc16a3f59abc254506 -Author: Guillaume Desmottes -Date: Fri May 29 15:42:00 2009 +0100 - - tube-dbus: use the rafined TP_HASH_TYPE_DBUS_TUBE_PARTICIPANTS for the dbus-names property - - src/tube-dbus.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3d36f363a99df75b20534392b1334f54e23ec561 -Author: Guillaume Desmottes -Date: Fri May 29 15:27:36 2009 +0100 - - two-muc-dbus-tubes.py: test if DBusNamesChanged is properly fired - - tests/twisted/avahi/tubes/two-muc-dbus-tubes.py | 33 +++++++++++++++++++--- - 1 files changed, 28 insertions(+), 5 deletions(-) - -commit 2a11a64bebaf319e52a261a79c43f45cc7e7ed66 -Author: Guillaume Desmottes -Date: Fri May 29 15:27:19 2009 +0100 - - fire DBusTube.DBusNamesChanged signal - - src/tube-dbus.c | 27 +++++++++++++++++++++++++++ - 1 files changed, 27 insertions(+), 0 deletions(-) - -commit 978b667252db9c824532431052727171155261c8 -Author: Guillaume Desmottes -Date: Fri May 29 15:20:47 2009 +0100 - - call update_tubes_info once the tube has been opened - - We just have to upgrade our tubes announcements when a tube has been - offered or when one has been opened. - - src/salut-tubes-channel.c | 12 ++---------- - 1 files changed, 2 insertions(+), 10 deletions(-) - -commit 112c8a655c0529999d63b932ea84c2510bd1043f -Author: Guillaume Desmottes -Date: Fri May 29 15:19:08 2009 +0100 - - tubes-channel: call add_yourself_in_dbus_names once the tube has been opened - - src/salut-tubes-channel.c | 17 ++++++++++------- - 1 files changed, 10 insertions(+), 7 deletions(-) - -commit 1a2e5bbb011e0ba2494b38271cb717a555073aa7 -Author: Guillaume Desmottes -Date: Fri May 29 14:30:32 2009 +0100 - - add two-muc-dbus-tubes.py - - tests/twisted/Makefile.am | 3 +- - tests/twisted/avahi/tubes/two-muc-dbus-tubes.py | 180 +++++++++++++++++++++++ - 2 files changed, 182 insertions(+), 1 deletions(-) - -commit 976e1ad9575012abf59a5f5377f5bffda8f50ea6 -Author: Guillaume Desmottes -Date: Fri May 29 14:27:20 2009 +0100 - - remove useless imports from stream tube tests - - .../avahi/tubes/test-two-muc-stream-tubes.py | 7 +------ - .../avahi/tubes/test-two-private-stream-tubes.py | 7 +------ - 2 files changed, 2 insertions(+), 12 deletions(-) - -commit 7edd566343f5ada18f95e5c49d0d1343af4f59ca -Author: Guillaume Desmottes -Date: Fri May 29 14:14:20 2009 +0100 - - factor out invite_to_muc to tubetestutil.py - - .../avahi/tubes/test-two-muc-stream-tubes.py | 52 +------------------- - tests/twisted/avahi/tubes/tubetestutil.py | 29 +++++++++++ - 2 files changed, 31 insertions(+), 50 deletions(-) - -commit 58835afd5eeb5bbd85ff445c806bbc022104f1c0 -Author: Guillaume Desmottes -Date: Fri May 29 14:07:10 2009 +0100 - - factor out join_muc() to tubetestutil.py - - .../avahi/tubes/test-two-muc-stream-tubes.py | 13 +++---------- - tests/twisted/avahi/tubes/tubetestutil.py | 15 +++++++++++++++ - 2 files changed, 18 insertions(+), 10 deletions(-) - -commit 6d2b0bf8934b727eb68c9d5a38a5e90e609b59c0 -Author: Guillaume Desmottes -Date: Fri May 29 13:51:00 2009 +0100 - - use connect_two_accounts() helper in stream tube tests - - .../avahi/tubes/test-two-muc-stream-tubes.py | 83 +------------------- - .../avahi/tubes/test-two-private-stream-tubes.py | 64 +-------------- - 2 files changed, 6 insertions(+), 141 deletions(-) - -commit c79707c891bb4f2eac5ab7270a28e332ca5aa50e -Author: Guillaume Desmottes -Date: Fri May 29 13:50:42 2009 +0100 - - add tubetestutil.py containing connect_two_accounts(), a tube tests helper function - - tests/twisted/Makefile.am | 3 +- - tests/twisted/avahi/tubes/tubetestutil.py | 78 +++++++++++++++++++++++++++++ - 2 files changed, 80 insertions(+), 1 deletions(-) - -commit 5e1b48a034e643d0638569caabd1051bb4ab31cc -Author: Guillaume Desmottes -Date: Fri May 29 13:00:03 2009 +0100 - - tubes-channel: always fire the Closed signal when a tube is closed - - src/salut-tubes-channel.c | 31 ++++++++++++------------------- - 1 files changed, 12 insertions(+), 19 deletions(-) - -commit e5c06308ae8df97ad22470853eada029db11a6f9 -Author: Guillaume Desmottes -Date: Fri May 29 12:53:23 2009 +0100 - - implement DBusTube.Accept method - - src/tube-dbus.c | 38 ++++++++++++++++++++++++++++++++++++-- - 1 files changed, 36 insertions(+), 2 deletions(-) - -commit b52f21413ec3933eacd120431d573841db8a03fd -Author: Guillaume Desmottes -Date: Fri May 29 12:39:02 2009 +0100 - - salut_muc_channel_received_stanza: remove D-Bus tube exception now they implement the new API - - src/salut-muc-channel.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit b3d2e08d077b38ffd178eab8abf5ea6af5ff0b6e -Author: Guillaume Desmottes -Date: Fri May 29 12:06:27 2009 +0100 - - tube-dbus: bytestream_state_changed_cb: fire TubeChannelStateChanged signal - - src/tube-dbus.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 467418a95c83f3ed906308b815051d1a4389c153 -Author: Guillaume Desmottes -Date: Fri May 29 12:05:54 2009 +0100 - - implement DBusTube.Offer method - - src/tube-dbus.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 61 insertions(+), 3 deletions(-) - -commit 8e80bbb0667077731276efe54aa8dc443387481e -Author: Guillaume Desmottes -Date: Fri May 29 12:05:25 2009 +0100 - - salut_tubes_channel_offer_d_bus_tube: call salut_tube_dbus_offer - - src/salut-tubes-channel.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit c64c9b8ff6c104fc5087277b18803eb04fd6376c -Author: Guillaume Desmottes -Date: Fri May 29 12:04:10 2009 +0100 - - add salut_tube_dbus_offer - - src/tube-dbus.c | 68 +++++++++++++++++++++++++++++++++++++++++++----------- - src/tube-dbus.h | 2 + - 2 files changed, 56 insertions(+), 14 deletions(-) - -commit 36a0860290d959ac9a1a52d304ea4520fa635e59 -Author: Guillaume Desmottes -Date: Fri May 29 10:26:00 2009 +0100 - - factor out create_dbus_server - - src/tube-dbus.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++-------- - 1 files changed, 49 insertions(+), 9 deletions(-) - -commit 2706d378ca1c221c1d7f2265fb2c9cc19b700978 -Author: Guillaume Desmottes -Date: Fri May 29 10:23:56 2009 +0100 - - tube-dbus: factor out do_close - - src/tube-dbus.c | 30 ++++++++++++++++++++---------- - 1 files changed, 20 insertions(+), 10 deletions(-) - -commit 5e86860ea01f997810d8453a23ff7ad97cd493ae -Author: Guillaume Desmottes -Date: Thu May 28 16:31:52 2009 +0100 - - salut-muc-manager: handle D-Bus tube channel request - - src/salut-muc-manager.c | 40 +++++++++++++++++++++++++++++++++++++++- - 1 files changed, 39 insertions(+), 1 deletions(-) - -commit de9f74cfe23302ee4019df27290cca3ddf8a52a7 -Author: Guillaume Desmottes -Date: Thu May 28 16:31:29 2009 +0100 - - salut_tubes_channel_tube_request: uncomment D-Bus tube new API code - - src/salut-tubes-channel.c | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit 951bf1029b0fc3f3440d4704685cad73fa798054 -Author: Guillaume Desmottes -Date: Thu May 28 16:31:07 2009 +0100 - - tube-dbus: implement DBusTube properties - - src/tube-dbus.c | 31 ++++++++++++++++++++++++++++--- - 1 files changed, 28 insertions(+), 3 deletions(-) - -commit 2c0e45ce4db80e1593fdd3c49b47ffe1e5d86f92 -Author: Guillaume Desmottes -Date: Thu May 28 16:23:57 2009 +0100 - - tube-dbus: implement Channel interface methods - - src/tube-dbus.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 73 insertions(+), 5 deletions(-) - -commit 9118a7d1c582e1a2a61ab8a433da2878a6e77a12 -Author: Guillaume Desmottes -Date: Thu May 28 16:20:50 2009 +0100 - - tube-dbus: start to implement Channel interface and DBusTube type - - src/tube-dbus.c | 267 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- - src/tube-dbus.h | 5 + - 2 files changed, 266 insertions(+), 6 deletions(-) - -commit 1efd67d7f2163e241272a23852ea10c9fab153a5 -Author: Guillaume Desmottes -Date: Thu May 28 15:38:10 2009 +0100 - - tube-dbus: add tube-offered signal - - src/tube-dbus.c | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -commit 822d0325633a4f42e8462a53ea1eff8fb43ca999 -Author: Guillaume Desmottes -Date: Thu May 28 15:19:33 2009 +0100 - - factor out handle_stream_tube_channel_request - - src/salut-muc-manager.c | 55 +++++++++++++++++++++++++++++------------------ - 1 files changed, 34 insertions(+), 21 deletions(-) - -commit 585e431972a3b2a350c3586232bca64df94883c5 -Author: Guillaume Desmottes -Date: Thu May 28 15:10:13 2009 +0100 - - factor out handle_tube_channel_request - - src/salut-muc-manager.c | 107 +++++++++++++++++++++++++++-------------------- - 1 files changed, 62 insertions(+), 45 deletions(-) - -commit bc07157de07316cbced61c0ee088adf210a980dc -Author: Guillaume Desmottes -Date: Thu May 28 15:04:06 2009 +0100 - - make salut_tubes_channel_tube_request more generic - - src/salut-muc-manager.c | 4 ++-- - src/salut-tubes-channel.c | 15 +++++++++++++-- - src/salut-tubes-channel.h | 3 ++- - src/salut-tubes-manager.c | 2 +- - 4 files changed, 18 insertions(+), 6 deletions(-) - -commit cd21e5214ee85732d4606b911a15af4d648e1fe4 -Author: Guillaume Desmottes -Date: Thu May 28 14:35:04 2009 +0100 - - salut_muc_manager_foreach_channel_class: add D-Bus tube - - src/salut-muc-manager.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 25342065f2efd13d6655e4c9c3452617ae1b3c0f -Author: Guillaume Desmottes -Date: Thu May 28 14:34:21 2009 +0100 - - add salut_tube_dbus_channel_get_allowed_properties () - - src/tube-dbus.c | 23 ++++++++++++++++++++++- - src/tube-dbus.h | 2 ++ - 2 files changed, 24 insertions(+), 1 deletions(-) - -commit e92c60f1414ccffe5162abd3869b46d07646ba8e -Author: Guillaume Desmottes -Date: Fri Jun 26 11:05:13 2009 +0100 - - test-caps-tubes.py: ensure to catch the right IQ - - tests/twisted/avahi/test-caps-tubes.py | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit bc8a0f4284cc61bb060a9272d2232826a8a846fa -Author: Guillaume Desmottes -Date: Thu May 28 14:07:52 2009 +0100 - - bump tp-glib dep to 0.7.31 as we need it for new tube API - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9e221bf025b26b97b44ddeff80063c6aa2d52304 -Author: Guillaume Desmottes -Date: Wed May 27 17:13:15 2009 +0100 - - tube-stream: use TP_ERROR_* from tp-glib - - src/tube-stream.c | 16 ++++------------ - 1 files changed, 4 insertions(+), 12 deletions(-) - -commit b2e0aecc89725e65a8755cae3155b1df6417f9e8 -Author: Guillaume Desmottes -Date: Wed May 27 17:10:31 2009 +0100 - - fix tests now that new tube API has been undrafted - - tests/twisted/avahi/test-caps-tubes.py | 36 ++++++++++---------- - .../avahi/tubes/test-offer-private-stream-tube.py | 22 ++++++------ - .../avahi/tubes/test-request-invalid-dbus-tube.py | 2 +- - .../avahi/tubes/test-two-muc-stream-tubes.py | 4 +- - .../avahi/tubes/test-two-private-stream-tubes.py | 4 +- - tests/twisted/constants.py | 6 ++-- - 6 files changed, 37 insertions(+), 37 deletions(-) - -commit 064070bc2b8c41c45cda66c9e8c0bab06d976093 -Author: Guillaume Desmottes -Date: Wed May 27 16:58:49 2009 +0100 - - undraft tube new API implementation - - src/salut-muc-manager.c | 10 +++--- - src/salut-tubes-channel.c | 28 +++++++------- - src/salut-tubes-manager.c | 44 ++++++++++++------------ - src/tube-stream.c | 84 ++++++++++++++++++++++---------------------- - 4 files changed, 83 insertions(+), 83 deletions(-) - -commit d2bf3a5312b91211d0a705eea8a9a60af5bd3715 -Author: Guillaume Desmottes -Date: Wed May 27 16:50:42 2009 +0100 - - remove new tube API from extensions/ - - extensions/Channel_Interface_Tube.xml | 256 --------------------------- - extensions/Channel_Type_DBus_Tube.xml | 190 -------------------- - extensions/Channel_Type_Stream_Tube.xml | 288 ------------------------------- - extensions/Makefile.am | 3 - - extensions/all.xml | 3 - - 5 files changed, 0 insertions(+), 740 deletions(-) - -commit 45f2b3cf09da50a0966fbf6d7776fd4202eb160b -Author: Guillaume Desmottes -Date: Wed May 27 16:31:12 2009 +0100 - - check if ConnectionClosed is properly fired - - .../avahi/tubes/test-two-muc-stream-tubes.py | 12 +++++++++++- - .../avahi/tubes/test-two-private-stream-tubes.py | 12 +++++++++++- - 2 files changed, 22 insertions(+), 2 deletions(-) - -commit 20497ca7fe92db648f08de3c978669b964b6473f -Author: Guillaume Desmottes -Date: Wed May 27 16:30:52 2009 +0100 - - tube-stream: fire ConnectionClosed - - src/tube-stream.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 44 insertions(+), 0 deletions(-) - -commit 4377d940f331650aea07e02716ebb94e3cd4011f -Author: Guillaume Desmottes -Date: Wed May 27 15:50:28 2009 +0100 - - break a race in stream tube tests - - .../avahi/tubes/test-two-muc-stream-tubes.py | 12 +++++------- - .../avahi/tubes/test-two-private-stream-tubes.py | 18 +++++++++--------- - 2 files changed, 14 insertions(+), 16 deletions(-) - -commit c2471b61837be7b223cd308104c24ac69e3b8aec -Author: Guillaume Desmottes -Date: Wed May 27 15:45:51 2009 +0100 - - check if NewLocalConnection is properly fired - - .../avahi/tubes/test-two-muc-stream-tubes.py | 11 ++++++++--- - .../avahi/tubes/test-two-private-stream-tubes.py | 10 +++++++--- - 2 files changed, 15 insertions(+), 6 deletions(-) - -commit 77946a9a9198635f331894202685443c280ecaff -Author: Guillaume Desmottes -Date: Wed May 27 15:45:37 2009 +0100 - - tube-stream: fire NewLocalConnection - - src/tube-stream.c | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -commit f54efd69c4633b136c230f3fbf8e59dd094e6046 -Author: Guillaume Desmottes -Date: Wed May 27 15:16:01 2009 +0100 - - tube-stream: factor out fire_new_remote_connection - - src/tube-stream.c | 37 +++++++++++++++++++++++++------------ - 1 files changed, 25 insertions(+), 12 deletions(-) - -commit 4954a0a45889753c04ea0214573defc475419614 -Author: Guillaume Desmottes -Date: Wed May 27 15:07:13 2009 +0100 - - check NewRemoteConnection's connection ID - - .../avahi/tubes/test-two-muc-stream-tubes.py | 3 ++- - .../avahi/tubes/test-two-private-stream-tubes.py | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -commit 8c8542eeab0a9df9db4f572a969207be50c636cf -Author: Guillaume Desmottes -Date: Wed May 27 15:06:50 2009 +0100 - - tube-stream: associate a connection ID with each tube connection - - src/tube-stream.c | 47 ++++++++++++++++++++++++++++++++++++++++++----- - 1 files changed, 42 insertions(+), 5 deletions(-) - -commit 281661c6d3277d3f50d75aad6110fdcc60cd0f48 -Author: Guillaume Desmottes -Date: Wed May 27 14:51:29 2009 +0100 - - fix tube tests to use latest API - - .../avahi/tubes/test-offer-private-stream-tube.py | 2 +- - .../avahi/tubes/test-two-muc-stream-tubes.py | 4 ++-- - .../avahi/tubes/test-two-private-stream-tubes.py | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -commit d0c589ef1523af5a875b49278f5126d0a3ef2393 -Author: Guillaume Desmottes -Date: Wed May 27 14:50:13 2009 +0100 - - tube-stream: fix implementation with latest DRAFT - - Offer() doesn't have a access_control_param argument any more. - The NewConnection signal has been renamed NewRemoteConnection and gained - 2 new args. - - src/tube-stream.c | 14 +++++++++----- - 1 files changed, 9 insertions(+), 5 deletions(-) - -commit f7fa63c667ab2aba39ebf757f16cf64379febb38 -Author: Guillaume Desmottes -Date: Wed May 27 14:26:16 2009 +0100 - - upgrade to latest tube DRAFT - - extensions/Channel_Interface_Tube.xml | 184 ++++++++++++++++++++++++------- - extensions/Channel_Type_DBus_Tube.xml | 43 ++++++-- - extensions/Channel_Type_Stream_Tube.xml | 114 ++++++++++++++++--- - 3 files changed, 279 insertions(+), 62 deletions(-) - -commit ba8010f3716dc215004f11335c5ceb2f55bd0457 -Author: Guillaume Desmottes -Date: Wed May 27 14:26:07 2009 +0100 - - extensions/all.xml: add DBus_Error_Name - - extensions/all.xml | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 5f069945c04d83fad7bebc3b958cba2e128b6922 -Author: Guillaume Desmottes -Date: Mon Jun 1 11:35:53 2009 +0100 - - gibber_fd_transport_block_receiving; don't crash when trying to unblock a not yet connected transport - - lib/gibber/gibber-fd-transport.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 7b8edcc7dc9c3dcb7c85358298861b17770927a4 -Author: Guillaume Desmottes -Date: Thu May 28 17:31:21 2009 +0100 - - Gibber: Don't touch signals-marshal.list if it's already up to date - - lib/gibber/Makefile.am | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 12907ebe47d79cd6712fb1fb3b111203e77ce8a5 -Author: Guillaume Desmottes -Date: Thu May 28 17:26:38 2009 +0100 - - Don't touch signals-marshal.list if it's already up to date - - By touching it, every source file using salut's marshallers is rebuilt whenever you - change any other source file, because Make always thinks the signals-marshal.h has changed. - - src/Makefile.am | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 878be3f442b5048ff65c18ae0bcd93735fc99677 -Author: Guillaume Desmottes -Date: Wed May 27 17:14:46 2009 +0100 - - tube_stream_open: chmod the newly created UNIX socket to allow everyone to access to it if access control is localhost - - src/tube-stream.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit e34c0eba26afe5054bd2d025b09bc0bff07532ef -Merge: 4b05f90 99cc66b -Author: Guillaume Desmottes -Date: Wed May 27 14:36:28 2009 +0100 - - Merge commit 'jonny/shave' - -commit 4b05f900a4eb43406508d828a3a93c940dc2d457 -Author: Guillaume Desmottes -Date: Wed May 27 14:22:27 2009 +0100 - - move tubes tests to their own subdirectory - - tests/twisted/Makefile.am | 16 +- - tests/twisted/avahi/test-disabled-1-1-tubes.py | 78 --- - .../avahi/test-offer-private-stream-tube.py | 368 --------------- - .../avahi/test-request-invalid-dbus-tube.py | 63 --- - tests/twisted/avahi/test-request-muc-tubes.py | 155 ------ - tests/twisted/avahi/test-tube-close.py | 82 ---- - tests/twisted/avahi/test-two-muc-stream-tubes.py | 499 -------------------- - .../twisted/avahi/test-two-private-stream-tubes.py | 373 --------------- - tests/twisted/avahi/tubes-to-nonexistant-ids.py | 50 -- - .../twisted/avahi/tubes/test-disabled-1-1-tubes.py | 78 +++ - .../avahi/tubes/test-offer-private-stream-tube.py | 368 +++++++++++++++ - .../avahi/tubes/test-request-invalid-dbus-tube.py | 63 +++ - .../twisted/avahi/tubes/test-request-muc-tubes.py | 155 ++++++ - tests/twisted/avahi/tubes/test-tube-close.py | 82 ++++ - .../avahi/tubes/test-two-muc-stream-tubes.py | 499 ++++++++++++++++++++ - .../avahi/tubes/test-two-private-stream-tubes.py | 373 +++++++++++++++ - .../avahi/tubes/tubes-to-nonexistant-ids.py | 50 ++ - 17 files changed, 1676 insertions(+), 1676 deletions(-) - -commit 9b2ddef2db27984102e68a7c8d606cd1332fad67 -Author: Guillaume Desmottes -Date: Wed May 27 14:19:54 2009 +0100 - - move file transfer tests to their own subdirectory - - tests/twisted/Makefile.am | 46 +- - .../avahi/file-transfer/file_transfer_helper.py | 426 ++++++++++++++++++++ - .../file-transfer/test-ichat-receive-directory.py | 45 ++ - .../avahi/file-transfer/test-ichat-receive-file.py | 43 ++ - .../file-transfer/test-ichat-send-file-declined.py | 50 +++ - .../avahi/file-transfer/test-ichat-send-file.py | 55 +++ - .../file-transfer/test-receive-and-send-file.py | 36 ++ - .../test-receive-file-and-disconnect.py | 18 + - ...ive-file-and-sender-disconnect-while-pending.py | 32 ++ - ...file-and-sender-disconnect-while-transfering.py | 30 ++ - .../test-receive-file-and-xmpp-disconnect.py | 29 ++ - .../test-receive-file-cancelled-immediately.py | 28 ++ - .../file-transfer/test-receive-file-decline.py | 43 ++ - .../avahi/file-transfer/test-receive-file-ipv6.py | 76 ++++ - .../file-transfer/test-receive-file-not-found.py | 52 +++ - .../avahi/file-transfer/test-receive-file.py | 6 + - .../test-send-file-and-cancel-immediately.py | 40 ++ - .../file-transfer/test-send-file-and-disconnect.py | 17 + - .../avahi/file-transfer/test-send-file-declined.py | 41 ++ - .../avahi/file-transfer/test-send-file-ipv6.py | 47 +++ - .../file-transfer/test-send-file-item-not-found.py | 39 ++ - .../test-send-file-provide-immediately.py | 29 ++ - .../test-send-file-to-unknown-contact.py | 28 ++ - .../test-send-file-wait-to-provide.py | 43 ++ - tests/twisted/avahi/file_transfer_helper.py | 426 -------------------- - .../twisted/avahi/test-ichat-receive-directory.py | 45 -- - tests/twisted/avahi/test-ichat-receive-file.py | 43 -- - .../twisted/avahi/test-ichat-send-file-declined.py | 50 --- - tests/twisted/avahi/test-ichat-send-file.py | 55 --- - tests/twisted/avahi/test-receive-and-send-file.py | 36 -- - .../avahi/test-receive-file-and-disconnect.py | 18 - - ...ive-file-and-sender-disconnect-while-pending.py | 32 -- - ...file-and-sender-disconnect-while-transfering.py | 30 -- - .../avahi/test-receive-file-and-xmpp-disconnect.py | 29 -- - .../test-receive-file-cancelled-immediately.py | 28 -- - tests/twisted/avahi/test-receive-file-decline.py | 43 -- - tests/twisted/avahi/test-receive-file-ipv6.py | 76 ---- - tests/twisted/avahi/test-receive-file-not-found.py | 52 --- - tests/twisted/avahi/test-receive-file.py | 6 - - .../avahi/test-send-file-and-cancel-immediately.py | 40 -- - .../twisted/avahi/test-send-file-and-disconnect.py | 17 - - tests/twisted/avahi/test-send-file-declined.py | 41 -- - tests/twisted/avahi/test-send-file-ipv6.py | 47 --- - .../twisted/avahi/test-send-file-item-not-found.py | 39 -- - .../avahi/test-send-file-provide-immediately.py | 29 -- - .../avahi/test-send-file-to-unknown-contact.py | 28 -- - .../avahi/test-send-file-wait-to-provide.py | 43 -- - 47 files changed, 1276 insertions(+), 1276 deletions(-) - -commit ad1e42fcaecd1e7900b71ebf8b209718fbfbb73e -Author: Guillaume Desmottes -Date: Wed May 27 14:08:22 2009 +0100 - - HT_CONTACT_LIST has been renamed to HT_LIST - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 8 ++++---- - .../twisted/avahi/test-two-private-stream-tubes.py | 8 ++++---- - tests/twisted/saluttest.py | 6 +++--- - 3 files changed, 11 insertions(+), 11 deletions(-) - -commit b2c37956714f3a5053edbbcf5207bed2f31545d7 -Author: Guillaume Desmottes -Date: Wed May 27 14:07:49 2009 +0100 - - sync constants.py from Gabble - - tests/twisted/constants.py | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit 3bd20ac4ace4710107bd6caf22ab47d86be97a62 -Author: Guillaume Desmottes -Date: Thu May 14 16:31:58 2009 +0100 - - pass a GError to GibberUnixTransportRecvCredentialsCb - - lib/gibber/gibber-unix-transport.c | 19 +++++++++++++++---- - lib/gibber/gibber-unix-transport.h | 2 ++ - lib/gibber/tests/check-gibber-unix-transport.c | 2 ++ - 3 files changed, 19 insertions(+), 4 deletions(-) - -commit 5156c80c42f9a8f9a98aa5c2ac375669239aef81 -Author: Guillaume Desmottes -Date: Tue May 12 18:11:54 2009 +0100 - - gibber_unix_transport_read: call credentials cb if recvmsg went wrong - - lib/gibber/gibber-unix-transport.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 38b28458516cf25a8de530d504f948346677abc2 -Author: Guillaume Desmottes -Date: Tue May 12 18:07:46 2009 +0100 - - rename gibber_unix_transport_wait_credentials to gibber_unix_transport_recv_credentials - - lib/gibber/gibber-unix-transport.c | 32 ++++++++++++------------ - lib/gibber/gibber-unix-transport.h | 6 ++-- - lib/gibber/tests/check-gibber-unix-transport.c | 2 +- - 3 files changed, 20 insertions(+), 20 deletions(-) - -commit 8e27bf595edbf964d21cdcb23d992e7c037b4746 -Author: Guillaume Desmottes -Date: Tue May 12 18:03:18 2009 +0100 - - gibber_unix_transport_dispose: set wait_creds_cb to NULL so callback won't be called when we are disposing - - lib/gibber/gibber-unix-transport.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 2acbcff6ab15ed07eb54af23440e638f2c1ac533 -Author: Guillaume Desmottes -Date: Mon May 11 17:58:19 2009 +0100 - - test gibber_unix_transport_wait_credentials - - lib/gibber/tests/check-gibber-unix-transport.c | 72 ++++++++++++++++++++++++ - 1 files changed, 72 insertions(+), 0 deletions(-) - -commit ee063a07af336663a5aa745aff8e52da968467f8 -Author: Guillaume Desmottes -Date: Mon May 11 17:52:13 2009 +0100 - - add gibber_unix_transport_wait_credentials - - lib/gibber/gibber-unix-transport.c | 101 +++++++++++++++++++++++++++++++++++- - lib/gibber/gibber-unix-transport.h | 26 +++++++++ - 2 files changed, 126 insertions(+), 1 deletions(-) - -commit 23c4c13e457636b747dc86c78bc3698943f32943 -Author: Guillaume Desmottes -Date: Mon May 11 16:38:15 2009 +0100 - - gibber-unix-transport: override GibberFdTransport's read - - lib/gibber/gibber-unix-transport.c | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) - -commit 23dddb10b955327c260bd392fa451db7265f76f7 -Author: Guillaume Desmottes -Date: Mon May 11 16:36:47 2009 +0100 - - export gibber_fd_transport_read - - lib/gibber/gibber-fd-transport.c | 4 +--- - lib/gibber/gibber-fd-transport.h | 5 +++++ - 2 files changed, 6 insertions(+), 3 deletions(-) - -commit da98e9b732f2cb473a9327acc8d9030a3903a074 -Author: Guillaume Desmottes -Date: Mon May 11 18:00:38 2009 +0100 - - add GibberUnixTransport tests to tests suite - - lib/gibber/tests/Makefile.am | 3 ++- - lib/gibber/tests/check-gibber-unix-transport.c | 8 +++++--- - lib/gibber/tests/check-gibber.h | 1 + - lib/gibber/tests/check-main.c | 1 + - 4 files changed, 9 insertions(+), 4 deletions(-) - -commit 4cb937c0323147b2b5f0efa4724685856ea5db70 -Author: Guillaume Desmottes -Date: Fri May 8 16:45:05 2009 +0100 - - add check-gibber-unix-transport.c - - lib/gibber/tests/check-gibber-unix-transport.c | 143 ++++++++++++++++++++++++ - 1 files changed, 143 insertions(+), 0 deletions(-) - -commit da21c2ab21423bf7830096c5970f2b55f4117e24 -Author: Guillaume Desmottes -Date: Fri May 8 15:55:38 2009 +0100 - - add gibber_unix_transport_send_credentials - - lib/gibber/gibber-unix-transport.c | 50 ++++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-unix-transport.h | 3 ++ - 2 files changed, 53 insertions(+), 0 deletions(-) - -commit ce0cec294a73ab2499b7d592c2468d5619784eec -Author: Guillaume Desmottes -Date: Mon May 11 17:28:31 2009 +0100 - - gibber-listener: create a GibberUnixTransport if the socket is a UNIX one - - lib/gibber/gibber-listener.c | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit a7c7ef5b8308a17679e63e3a646fe24fd65f6513 -Author: Guillaume Desmottes -Date: Tue May 12 14:29:35 2009 +0100 - - add gibber_unix_transport_new_from_fd - - lib/gibber/gibber-unix-transport.c | 9 +++++++++ - lib/gibber/gibber-unix-transport.h | 2 ++ - 2 files changed, 11 insertions(+), 0 deletions(-) - -commit 882943d2f884283b276c81ed1c3a608dbf81e262 -Author: Guillaume Desmottes -Date: Mon May 4 16:02:16 2009 +0100 - - coding style fix - - lib/gibber/gibber-listener.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit 1192750d6bf9c11130c52b4d217f3933d70ae658 -Author: Guillaume Desmottes -Date: Wed Apr 29 14:29:30 2009 +0100 - - NEWS: document tube API change - - NEWS | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 4f5154d3b43933af57d85005de2d90757e7145ef -Author: Guillaume Desmottes -Date: Wed Apr 29 14:26:19 2009 +0100 - - sync with latest tube spec DRAFT - - {Offer,Accept}StreamTube methods and the StreamTubeNewConnection - signal have been renamed. - - extensions/Channel_Interface_Tube.xml | 16 +++--- - extensions/Channel_Type_DBus_Tube.xml | 8 ++-- - extensions/Channel_Type_Stream_Tube.xml | 16 +++--- - src/tube-stream.c | 46 ++++++++++---------- - .../avahi/test-offer-private-stream-tube.py | 2 +- - tests/twisted/avahi/test-two-muc-stream-tubes.py | 8 ++-- - .../twisted/avahi/test-two-private-stream-tubes.py | 8 ++-- - 7 files changed, 52 insertions(+), 52 deletions(-) - -commit f3bacb9a257a1f0094d881f9b831889d463a50d6 -Author: Guillaume Desmottes -Date: Wed Apr 29 13:31:15 2009 +0100 - - Revert "re-enable test-disabled-1-1-tubes.py" - - This reverts commit b1a8441638280dbb4b0d56b7d17cfa16ac913356. - - tests/twisted/avahi/test-disabled-1-1-tubes.py | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit c0ffbbfc831e05f18fb45884842f254b4a5bf7ce -Author: Guillaume Desmottes -Date: Wed Apr 29 13:30:59 2009 +0100 - - Revert "disable 1-1 stream tubes" - - This reverts commit 2e03ee2ad64327a5427e3e299e9fc77fe45b4c40. - - src/salut-connection.c | 4 ---- - tests/twisted/avahi/test-caps-tubes.py | 4 ---- - .../avahi/test-offer-private-stream-tube.py | 4 ---- - tests/twisted/avahi/test-tube-close.py | 7 +++---- - .../twisted/avahi/test-two-private-stream-tubes.py | 4 ---- - tests/twisted/avahi/tubes-to-nonexistant-ids.py | 4 ---- - 6 files changed, 3 insertions(+), 24 deletions(-) - -commit 613fc6cc56ff7824378cead0371290515e4271ea -Author: Guillaume Desmottes -Date: Wed Apr 29 13:46:28 2009 +0100 - - test-caps-tubes.py: CONN_IFACE_CONTACT_CAPA has been renamed to CONN_IFACE_CONTACT_CAPS - - tests/twisted/avahi/test-caps-tubes.py | 56 ++++++++++++++++---------------- - 1 files changed, 28 insertions(+), 28 deletions(-) - -commit 99cc66bb81516ad87657e8d49e286502bba63f69 -Author: Jonny Lamb -Date: Sat Apr 25 12:41:56 2009 +0100 - - Shave salut's build. - - Signed-off-by: Jonny Lamb - - .gitignore | 3 + - configure.ac | 4 ++ - data/Makefile.am | 6 ++- - docs/Makefile.am | 6 ++- - extensions/Makefile.am | 24 ++++++----- - lib/gibber/Makefile.am | 12 +++-- - lib/gibber/examples/Makefile.am | 4 +- - m4/shave.m4 | 77 ++++++++++++++++++++++++++++++++++++++ - shave-libtool.in | 69 ++++++++++++++++++++++++++++++++++ - shave.in | 79 +++++++++++++++++++++++++++++++++++++++ - src/Makefile.am | 14 ++++--- - tests/twisted/Makefile.am | 4 +- - tests/twisted/tools/Makefile.am | 8 ++- - tools/Makefile.am | 14 ++++--- - tools/shave.mk | 1 + - 15 files changed, 288 insertions(+), 37 deletions(-) - -commit 5979dfce0cb08612e5c84c9c2b9aa1032989ff61 -Author: Guillaume Desmottes -Date: Fri Apr 17 15:07:52 2009 +0100 - - identation fix - - src/salut-muc-manager.c | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) - -commit 66872885f328aa0b8086aa4e0c03e69564b6d023 -Author: Guillaume Desmottes -Date: Wed Apr 15 15:35:56 2009 +0100 - - upgrade NEWS - - NEWS | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 8d7e5a32972cba1dfd27e60057c63d15af020a7f -Author: Guillaume Desmottes -Date: Wed Apr 15 15:34:41 2009 +0100 - - test-two-private-stream-tubes.py: check tube channels are in Requests's Channels property - - .../twisted/avahi/test-two-private-stream-tubes.py | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit a1d285b70b64c5826f68894070782e51eb67ffbd -Author: Guillaume Desmottes -Date: Wed Apr 15 15:34:07 2009 +0100 - - test-two-muc-stream-tubes.py: check tube channels are in Requests's Channels property - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit 593b469d8c71150d77f9a2492779c8aec6b46f2d -Author: Guillaume Desmottes -Date: Wed Apr 15 15:27:29 2009 +0100 - - salut_muc_manager_foreach_channel: include tube channels as well - - src/salut-muc-manager.c | 17 ++++++++++++++++- - 1 files changed, 16 insertions(+), 1 deletions(-) - -commit 845e54d0535b26ed25bba5527a24f9f0483a1365 -Author: Guillaume Desmottes -Date: Wed Apr 15 16:03:49 2009 +0100 - - use errors from constants - - tests/twisted/avahi/test-disabled-1-1-tubes.py | 4 +++- - ...ive-file-and-sender-disconnect-while-pending.py | 3 ++- - .../avahi/test-request-invalid-dbus-tube.py | 6 +++--- - .../avahi/test-send-file-to-unknown-contact.py | 3 ++- - 4 files changed, 10 insertions(+), 6 deletions(-) - -commit 351a4cb11066a069517301fe70f06e2b0975ad18 -Author: Guillaume Desmottes -Date: Wed Apr 15 15:46:16 2009 +0100 - - document tp-glib dep bump in NEWS - - NEWS | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 2074a2623e337ca7ca85d14271eb246f80e51397 -Author: Guillaume Desmottes -Date: Wed Apr 15 15:45:04 2009 +0100 - - Depend on tp-glib 0.7.29 for fixed errors - - tp-glib 0.7.29 fixed error names. By depending on it we can assert - that the right names are used in tests. - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 615a610d7414c091863f89dd16c4a92b5888bc6f -Author: Guillaume Desmottes -Date: Wed Apr 15 15:51:40 2009 +0100 - - CONN_IFACE_CONTACT_CAPA has been renamed to CONN_IFACE_CONTACT_CAPS - - tests/twisted/avahi/test-caps-file-transfer.py | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 711ed18e2d60ea47e0e6e261fa0f3223eccab751 -Author: Guillaume Desmottes -Date: Wed Apr 15 15:41:38 2009 +0100 - - sync constants.py from Gabble - - tests/twisted/constants.py | 165 ++++++++++++++++++++++++++++++++++++++------ - 1 files changed, 143 insertions(+), 22 deletions(-) - -commit 66d834661b77f1be352979c09b21b0782dfec108 -Author: Guillaume Desmottes -Date: Mon Apr 13 16:25:24 2009 +0100 - - test-set-presence.py: check initial presence - - tests/twisted/avahi/test-set-presence.py | 13 +++++++++---- - 1 files changed, 9 insertions(+), 4 deletions(-) - -commit 51c31c397d12a32d1565d89306031984c4f37ad2 -Author: Guillaume Desmottes -Date: Mon Apr 13 16:17:52 2009 +0100 - - add test-set-presence.py - - tests/twisted/Makefile.am | 1 + - tests/twisted/avahi/test-set-presence.py | 56 ++++++++++++++++++++++++++++++ - 2 files changed, 57 insertions(+), 0 deletions(-) - -commit 6c2832fc5aa50559625cbe4b0429c70ff64c76ff -Author: Guillaume Desmottes -Date: Mon Apr 13 16:14:16 2009 +0100 - - constants.py: add SimplePresence and connection status constants - - tests/twisted/constants.py | 20 ++++++++++++++++++++ - 1 files changed, 20 insertions(+), 0 deletions(-) - -commit d91b799724aebd0ea66a0cbfd3554c48bb41dee9 -Author: Guillaume Desmottes -Date: Mon Apr 13 15:21:59 2009 +0100 - - salut_self_set_presence: set status_message to NULL if the msg is an empty string - - src/salut-self.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 4e6f8cd1728408452b6d3336d3b8d9c199b2b4f5 -Author: Guillaume Desmottes -Date: Thu Apr 2 18:28:54 2009 +0100 - - start dev of 0.3.10 - - NEWS | 3 +++ - configure.ac | 2 +- - 2 files changed, 4 insertions(+), 1 deletions(-) - -commit 59648f659500602e96f8f08fec1466cadb05bcf0 -Author: Guillaume Desmottes -Date: Thu Apr 2 18:07:46 2009 +0100 - - version 0.3.9 - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit cfce0a87726168ff367afb78c06ef315e869eba9 -Author: Guillaume Desmottes -Date: Thu Apr 2 18:07:31 2009 +0100 - - upgrade NEWS for 0.3.9 - - NEWS | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit e436c6d08c42a613f105ed674cb4549cf78d359b -Author: Guillaume Desmottes -Date: Thu Apr 2 18:19:51 2009 +0100 - - add config.py to CLEANFILES - - tests/twisted/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0ef66ecb46d647cbfbe6106c6429eef509399561 -Author: Guillaume Desmottes -Date: Thu Apr 2 18:17:49 2009 +0100 - - fix Makefile.am - - tests/twisted/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9b9f7e203ca07fea64497b768ae7487364381f5a -Author: Guillaume Desmottes -Date: Thu Apr 2 14:28:32 2009 +0100 - - create_transfer_offer: we have to send our own address, not the peer one - - lib/gibber/gibber-oob-file-transfer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 58f802f1ad51dca4036297034412565b9757a3e1 -Author: Guillaume Desmottes -Date: Thu Apr 2 14:25:20 2009 +0100 - - add gibber_transport_get_sockaddr - - lib/gibber/gibber-fd-transport.c | 23 +++++++++++++++++++++++ - lib/gibber/gibber-transport.c | 12 ++++++++++++ - lib/gibber/gibber-transport.h | 6 ++++++ - 3 files changed, 41 insertions(+), 0 deletions(-) - -commit 58bf16a990e3399069c9d23eac524f46b267e06a -Author: Guillaume Desmottes -Date: Thu Apr 2 14:21:04 2009 +0100 - - rename gibber_transport_get_sockaddr to gibber_transport_get_peeraddr - - lib/gibber/gibber-bytestream-oob.c | 2 +- - lib/gibber/gibber-fd-transport.c | 8 ++++---- - lib/gibber/gibber-oob-file-transfer.c | 4 ++-- - lib/gibber/gibber-transport.c | 6 +++--- - lib/gibber/gibber-transport.h | 4 ++-- - src/salut-xmpp-connection-manager.c | 2 +- - 6 files changed, 13 insertions(+), 13 deletions(-) - -commit c71633bf51461a17e069e04dba28955ec7db77d8 -Author: Guillaume Desmottes -Date: Thu Apr 2 11:21:32 2009 +0100 - - http_server_cb: use G_GUINT64_FORMAT - - lib/gibber/gibber-oob-file-transfer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b1a8441638280dbb4b0d56b7d17cfa16ac913356 -Author: Guillaume Desmottes -Date: Wed Apr 1 18:54:52 2009 +0100 - - re-enable test-disabled-1-1-tubes.py - - tests/twisted/avahi/test-disabled-1-1-tubes.py | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 2e03ee2ad64327a5427e3e299e9fc77fe45b4c40 -Author: Guillaume Desmottes -Date: Wed Apr 1 17:59:55 2009 +0100 - - disable 1-1 stream tubes - - src/salut-connection.c | 4 ++++ - tests/twisted/avahi/test-caps-tubes.py | 4 ++++ - .../avahi/test-offer-private-stream-tube.py | 4 ++++ - tests/twisted/avahi/test-tube-close.py | 7 ++++--- - .../twisted/avahi/test-two-private-stream-tubes.py | 4 ++++ - tests/twisted/avahi/tubes-to-nonexistant-ids.py | 4 ++++ - 6 files changed, 24 insertions(+), 3 deletions(-) - -commit 3ea677c10ce94e3b01e8d4f558a9d6d4620afa4d -Author: Guillaume Desmottes -Date: Wed Apr 1 16:34:20 2009 +0100 - - upgrade news - - NEWS | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 61bf2d5c7d2993761392aa698df79e7a5ddc1c67 -Author: Guillaume Desmottes -Date: Wed Apr 1 18:19:31 2009 +0100 - - ft-manager: drop FT_CAPA_UNKNOWN and use FT_CAPA_SUPPORTED instead - - FT_CAPA_UNKNOWN had a value of 0 which appeared as 'NULL' in the - caps-channel-manager. This is misleading and the change in the contact - capabilities is not detected as NULL is supposed to be used when there - is no capability. - - src/salut-ft-manager.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 80e3f69459d14389150a708748b5307af12ba70b -Author: Guillaume Desmottes -Date: Wed Apr 1 16:23:53 2009 +0100 - - test-receive-file-ipv6: use check_ipv6_enabled - - tests/twisted/avahi/test-receive-file-ipv6.py | 15 ++------------- - 1 files changed, 2 insertions(+), 13 deletions(-) - -commit 96a99c02b32a35d0ca304a7f1793b06b8c94282c -Author: Guillaume Desmottes -Date: Wed Apr 1 16:23:40 2009 +0100 - - avahitest.py: add check_ipv6_enabled - - tests/twisted/avahitest.py | 17 ++++++++++++++++- - 1 files changed, 16 insertions(+), 1 deletions(-) - -commit d14f7979029b70d4b33a5ced51438f4316126d31 -Author: Guillaume Desmottes -Date: Wed Apr 1 16:09:47 2009 +0100 - - test-receive-file-ipv6.py: check if our IPv6 service has been actually announced and skip test if it doesn't - - tests/twisted/avahi/test-receive-file-ipv6.py | 34 ++++++++++-------------- - 1 files changed, 14 insertions(+), 20 deletions(-) - -commit fc6fe368cee054f22f567bcd1fb52aa5f5b02d19 -Author: Guillaume Desmottes -Date: Wed Apr 1 14:16:24 2009 +0100 - - test-receive-file-ipv6.py: skip test if Salut doesn't see service as we assume that's because IPv6 is disabled - - tests/twisted/avahi/test-receive-file-ipv6.py | 26 +++++++++++++++++++++--- - 1 files changed, 22 insertions(+), 4 deletions(-) - -commit 0ff62dfd49dbc4c6c121e8f9554ed1e0870b29b2 -Author: Guillaume Desmottes -Date: Wed Apr 1 13:12:59 2009 +0100 - - disable test-receive-file-ipv6.py - - tests/twisted/avahi/test-receive-file-ipv6.py | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 1bbb6f3eea3413871e1e8d8903f39584ce836560 -Merge: 2519b4e 9f2d203 -Author: Guillaume Desmottes -Date: Wed Apr 1 12:48:29 2009 +0100 - - Merge branch 'master' into ft-ipv6-REBASED - - Conflicts: - lib/gibber/gibber-oob-file-transfer.c - -commit 9f2d2036fe8329ddc0807f8ec7e3c20e20c6c3b9 -Merge: 3966f2d 511af65 -Author: Guillaume Desmottes -Date: Wed Apr 1 12:14:48 2009 +0100 - - Merge branch 'news' - - Conflicts: - NEWS - -commit 3966f2d6d03265e2196e53e93430e6c72adadff9 -Merge: 57b23ff 2ae5a4a -Author: Guillaume Desmottes -Date: Wed Apr 1 12:05:58 2009 +0100 - - Merge branch 'master' into ft-capa-REBASED - -commit 2ae5a4a6c572294a85b673f7245d28bb89eedbca -Author: Guillaume Desmottes -Date: Wed Apr 1 11:59:15 2009 +0100 - - fix typo - - NEWS | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 00197f1babd369e098b1269f514bd4cd434e5757 -Author: Guillaume Desmottes -Date: Tue Mar 31 12:33:04 2009 +0100 - - upgrade NEWS - - NEWS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 511af655fe31725a38eafe86179914329344c6a8 -Author: Guillaume Desmottes -Date: Tue Mar 31 13:02:50 2009 +0100 - - new stream tube API is implemented now - - NEWS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 28ea01260e704d3fa17aa78dd9f2b3f113943a81 -Author: Guillaume Desmottes -Date: Tue Mar 31 12:32:57 2009 +0100 - - fix typo in NEWS - - NEWS | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 57b23ffa93ca7412bc571fa3e76f00dfaa8fcd36 -Author: Guillaume Desmottes -Date: Tue Mar 31 10:15:22 2009 +0100 - - upgrade NEWS - - NEWS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 7a902343e90f5c867f590803c0a8d7c32029805a -Author: Guillaume Desmottes -Date: Mon Mar 30 17:55:55 2009 +0100 - - test-caps-tubes: use check_caps from caps_helper - - tests/twisted/avahi/test-caps-tubes.py | 17 +---------------- - 1 files changed, 1 insertions(+), 16 deletions(-) - -commit 0bacab68ea46e54ff3ea27ac026284ef2d1ec334 -Author: Guillaume Desmottes -Date: Mon Mar 30 17:55:36 2009 +0100 - - test-caps-self: use check_caps from caps_helper - - tests/twisted/avahi/test-caps-self.py | 17 +---------------- - 1 files changed, 1 insertions(+), 16 deletions(-) - -commit 086e98897a958c573eafec569ff56e95c8d54ec0 -Author: Guillaume Desmottes -Date: Mon Mar 30 17:55:15 2009 +0100 - - caps_helper: add check_caps - - tests/twisted/avahi/caps_helper.py | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit e2a2a58392bdaa235853c23739ab03832e365c43 -Author: Guillaume Desmottes -Date: Mon Mar 30 17:35:50 2009 +0100 - - set self caps before the first announce of the service - - src/salut-avahi-self.c | 61 ++++++++++++++++++++++++++--------------------- - src/salut-connection.c | 15 +++++------ - 2 files changed, 41 insertions(+), 35 deletions(-) - -commit 1e7e93c985e3b35064654805135f2b20bb682560 -Author: Guillaume Desmottes -Date: Mon Mar 30 17:20:08 2009 +0100 - - capabilities_get_features: prepend features as the order doesn't matter - - src/salut-capabilities.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1878875fdf6134b3f81c4f4950f1ad04a1cd58da -Merge: 0c910f5 129b5de -Author: Guillaume Desmottes -Date: Mon Mar 30 17:13:21 2009 +0100 - - Merge branch 'master' into ft-capa-REBASED - - Conflicts: - src/salut-disco.c - tests/twisted/constants.py - -commit 0c910f519fc9f3a44e0759f6acfe8cbb93e4dbbc -Author: Guillaume Desmottes -Date: Mon Mar 30 16:50:34 2009 +0100 - - announce_self_caps: no need of the if branch - - src/salut-connection.c | 11 ++++------- - 1 files changed, 4 insertions(+), 7 deletions(-) - -commit 2dd8f2f87a4b7f443f4dd0540c1916cf92cb5175 -Author: Guillaume Desmottes -Date: Mon Mar 30 16:48:43 2009 +0100 - - implement salut_ft_manager_caps_diff - - src/salut-ft-manager.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit 48009c5a0361c5bc0f11e642d67f2ad5f88b1407 -Author: Guillaume Desmottes -Date: Fri Mar 27 16:01:00 2009 +0000 - - don't keep a ref on priv->msg - - New version of libsoup unref unprocessed message when disposing the - session so there is no need to unref it ourself any more. - - lib/gibber/gibber-oob-file-transfer.c | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -commit 129b5deef9809366a595f0ed4a201b2629796b45 -Author: Guillaume Desmottes -Date: Fri Mar 27 14:24:46 2009 +0000 - - Raise NotImplemented on unknown address types/access-control mechs - - src/salut-file-transfer-channel.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 1e1ad2440b856a117e3e1b6a2836e06da04375df -Merge: 4d6b838 dd20d12 -Author: Guillaume Desmottes -Date: Fri Mar 27 15:02:10 2009 +0000 - - Merge branch 'fix-config' - -commit 4d6b838c81ecbb5315f536fd45af145a86b93d5b -Merge: 52e8ff6 aca0ff2 -Author: Guillaume Desmottes -Date: Fri Mar 27 14:51:34 2009 +0000 - - Merge branch 'trivia' - -commit dd20d120e8e104fc62fece5e044030d12c67b435 -Author: Guillaume Desmottes -Date: Fri Mar 27 14:48:48 2009 +0000 - - re-generate config.py when Makefile is changed - - so PACKAGE_STRING is properly updated - - tests/twisted/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 52e8ff6d0fe136b43f03b3a0ebdf59e5bbb91b74 -Author: Guillaume Desmottes -Date: Mon Mar 23 18:24:00 2009 +0000 - - gibber_fd_transport_send: returns an error if something went wrong - - lib/gibber/gibber-fd-transport.c | 21 ++++++++++++--------- - 1 files changed, 12 insertions(+), 9 deletions(-) - -commit aca0ff24f552d16dd2a496812d75446d67091ad7 -Author: Guillaume Desmottes -Date: Wed Mar 18 15:11:19 2009 +0000 - - gibber-listener: check getsockname return value - - lib/gibber/gibber-listener.c | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) - -commit 53553fadffa6c3d8a1ea37ac62fffedc76cd56cb -Author: Guillaume Desmottes -Date: Wed Mar 18 12:06:47 2009 +0000 - - saluttest.py: import constants as cs - - tests/twisted/saluttest.py | 22 +++++++++++----------- - 1 files changed, 11 insertions(+), 11 deletions(-) - -commit 28da6adeaff288ebc9a07aaaa4ff8ef7386a7b12 -Author: Guillaume Desmottes -Date: Wed Mar 18 12:01:05 2009 +0000 - - saluttest.py: remove useless imports - - tests/twisted/saluttest.py | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit 82e52313e102aa4f253958cd0c9bb3534be3f08f -Author: Guillaume Desmottes -Date: Tue Mar 17 14:24:07 2009 +0000 - - upgrade NEWS - - NEWS | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 994c8ef8961d257653a91f116ae69b4094bde3e5 -Author: Guillaume Desmottes -Date: Tue Mar 17 14:22:45 2009 +0000 - - {Accept,Provide}File have to store the unix socket address using an 'ay' - - src/salut-file-transfer-channel.c | 52 ++++++++----------- - tests/twisted/avahi/file_transfer_helper.py | 4 +- - ...ive-file-and-sender-disconnect-while-pending.py | 2 +- - 3 files changed, 25 insertions(+), 33 deletions(-) - -commit 55b2398e5dbcac602ab617df43dfeeb30538e98d -Author: Guillaume Desmottes -Date: Mon Mar 16 15:24:36 2009 +0000 - - salut_ft_manager_handle_request: display the id of the contact in the debug msg instead of his handle - - src/salut-ft-manager.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit d87fdc188f34d28500baf590041849b165c1c43f -Author: Guillaume Desmottes -Date: Mon Mar 16 15:21:55 2009 +0000 - - salut_file_transfer_channel_constructor: add a debug msg telling some info about the FT - - src/salut-file-transfer-channel.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 109dddd5548e38d32dbb5f24ca146bba51636ccc -Author: Guillaume Desmottes -Date: Mon Mar 16 14:55:27 2009 +0000 - - generate FT channel path in the channel constructor and using its address to ensure it's unique - - src/salut-file-transfer-channel.c | 7 +++---- - src/salut-file-transfer-channel.h | 4 ++-- - src/salut-ft-manager.c | 30 ++---------------------------- - 3 files changed, 7 insertions(+), 34 deletions(-) - -commit dd160092893270c699bf299f9c924d726db16823 -Author: Guillaume Desmottes -Date: Fri Nov 21 16:02:51 2008 +0000 - - file-transfer-channel: make most of the D-Bus properties construct only - - src/salut-file-transfer-channel.c | 16 +++++++--------- - 1 files changed, 7 insertions(+), 9 deletions(-) - -commit 4968bb1ca5bda27d0b3c74959ff349bdc153319e -Author: Guillaume Desmottes -Date: Fri Nov 21 15:57:37 2008 +0000 - - pass all the properties to salut_file_transfer_channel_new - - src/salut-file-transfer-channel.c | 18 +++++++++++++++++- - src/salut-file-transfer-channel.h | 5 ++++- - src/salut-ft-manager.c | 16 +++------------- - 3 files changed, 24 insertions(+), 15 deletions(-) - -commit 33b89cdaf4f69ce237afd5d500e52e9b4989eea3 -Author: Guillaume Desmottes -Date: Fri Nov 21 15:45:41 2008 +0000 - - replace salut_file_transfer_channel_received_file_offer by salut_file_transfer_channel_new_from_stanza - - src/salut-file-transfer-channel.c | 90 ++++++++++++++++++++---------------- - src/salut-file-transfer-channel.h | 10 +++-- - src/salut-ft-manager.c | 14 +----- - 3 files changed, 59 insertions(+), 55 deletions(-) - -commit 69b6be49f3328b610d60934a67aedec827a8098a -Author: Guillaume Desmottes -Date: Fri Nov 21 15:30:35 2008 +0000 - - remove salut_ft_manager_new_channel - - src/salut-file-transfer-channel.c | 2 +- - src/salut-file-transfer-channel.h | 2 +- - src/salut-ft-manager.c | 127 ++++++++++++++----------------------- - 3 files changed, 49 insertions(+), 82 deletions(-) - -commit 6012c312cc5dee4d821d260bebd20f1e7e2a438c -Author: Guillaume Desmottes -Date: Fri Nov 21 15:14:58 2008 +0000 - - factor out salut_ft_manager_channel_created and call it in message_stanza_callback - - src/salut-ft-manager.c | 39 ++++++++++++++++++++++++++------------- - 1 files changed, 26 insertions(+), 13 deletions(-) - -commit 460795ae5c101656517edb8dcc4ecc5e66ff2381 -Author: Guillaume Desmottes -Date: Fri Nov 21 14:52:46 2008 +0000 - - ft-manager: move debug output of the object path to generate_object_path - - src/salut-ft-manager.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit af44ed9db1c00993df842714d5078de364fd13f5 -Author: Guillaume Desmottes -Date: Fri Nov 21 14:51:00 2008 +0000 - - salut_ft_manager_handle_request: add debug output - - src/salut-ft-manager.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 488bb77e45ff518e7199220d3c61e363d14442ca -Author: Guillaume Desmottes -Date: Fri Nov 21 14:48:38 2008 +0000 - - salut_ft_manager_new_channel: factor out generate_object_path - - src/salut-ft-manager.c | 18 ++++++++++++++---- - 1 files changed, 14 insertions(+), 4 deletions(-) - -commit 6afff67765e457b65010079eaa712078f727ed20 -Author: Guillaume Desmottes -Date: Fri Nov 21 14:35:18 2008 +0000 - - salut_ft_manager_new_channel: use salut_file_transfer_channel_new - - src/salut-ft-manager.c | 11 ++--------- - 1 files changed, 2 insertions(+), 9 deletions(-) - -commit d9ef55092b1a54aaeb21f084f6ff0621fc56d3a6 -Author: Guillaume Desmottes -Date: Fri Nov 21 14:34:28 2008 +0000 - - add salut_file_transfer_channel_new - - src/salut-file-transfer-channel.c | 20 ++++++++++++++++++++ - src/salut-file-transfer-channel.h | 8 ++++++++ - 2 files changed, 28 insertions(+), 0 deletions(-) - -commit 002b7d9b0ee77772f5292b2c4a9b1d14420ffadc -Merge: 6e1cacb 0e7d3ff -Author: Guillaume Desmottes -Date: Wed Mar 11 16:10:14 2009 +0000 - - Merge branch 'master' into muc-stream-tube-new-api-REBASED - -commit 6e1cacb84906c06b1423f2da27914182d7918806 -Author: Guillaume Desmottes -Date: Wed Mar 11 14:23:54 2009 +0000 - - iq_tube_request_cb: destroy newly created tubes channel if the tube channel creation failed - - src/salut-tubes-manager.c | 20 +++++++++++++++----- - 1 files changed, 15 insertions(+), 5 deletions(-) - -commit 29e1e703a1217d86d637e0b47b9e1b17734dce33 -Author: Guillaume Desmottes -Date: Wed Mar 11 14:22:28 2009 +0000 - - iq_tube_request_cb: don't leak parameters if tubes channel creation failed - - src/salut-tubes-manager.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit c0caaad79fca2ba2ad25eccb2b865f860624f0e6 -Author: Guillaume Desmottes -Date: Wed Mar 11 14:06:38 2009 +0000 - - iq_tube_request_cb: announce the tubes channel only if it has just been created - - src/salut-tubes-manager.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -commit b2f8a6538b4d4f3dc59863d108dd40c0210fa50b -Author: Guillaume Desmottes -Date: Wed Mar 11 13:55:48 2009 +0000 - - test-two-private-stream-tubes.py: break potential races - - .../twisted/avahi/test-two-private-stream-tubes.py | 36 ++++++++++--------- - 1 files changed, 19 insertions(+), 17 deletions(-) - -commit e941c97b0dd1c9cd1d3ad7b4e2665fc7b25072f8 -Author: Guillaume Desmottes -Date: Wed Mar 11 13:44:59 2009 +0000 - - don't assume server-data-received and client-data-received events are ordered - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 18 ++++++++++-------- - 1 files changed, 10 insertions(+), 8 deletions(-) - -commit a661360a3da7c7cde0b7298d273ba111bd533c01 -Author: Guillaume Desmottes -Date: Wed Mar 11 13:39:31 2009 +0000 - - test-two-muc-stream-tubes: break potential races - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 20 ++++++++++++-------- - 1 files changed, 12 insertions(+), 8 deletions(-) - -commit 71f36f951a170d787f69f2948d3a0d3a1571b8e7 -Author: Guillaume Desmottes -Date: Wed Mar 11 13:34:20 2009 +0000 - - test-two-muc-stream-tubes.py: wrap long lines - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 79 ++++++++++++++-------- - 1 files changed, 51 insertions(+), 28 deletions(-) - -commit e086f961cbf832b3b59697d7c74dd72dcaa6f149 -Author: Guillaume Desmottes -Date: Tue Mar 10 17:29:48 2009 +0000 - - create_tubes_channel: rename text_created and txt_created variables to avoid confusion - - src/salut-muc-manager.c | 13 ++++++------- - 1 files changed, 6 insertions(+), 7 deletions(-) - -commit ea596f87fcc5d3c34d29353d2df7c769a3f803d6 -Author: Guillaume Desmottes -Date: Tue Mar 10 17:17:34 2009 +0000 - - identation fix - - src/tube-stream.c | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) - -commit 0e7d3ff6a8d1151d66ceb4f1197640f348ff3c11 -Author: Guillaume Desmottes -Date: Tue Mar 10 12:54:20 2009 +0000 - - gibber_fd_transport_set_fd: don't add watcher if transport was blocked - - lib/gibber/gibber-fd-transport.c | 11 +++++++++-- - 1 files changed, 9 insertions(+), 2 deletions(-) - -commit ad13ab6aef9ed00cf29429ca9b2167d256dcf5b4 -Author: Guillaume Desmottes -Date: Fri Mar 6 16:06:28 2009 +0000 - - gibber_tcp_transport_connect is now async - - lib/gibber/gibber-tcp-transport.c | 202 ++++++++++++++++++++++++++++--------- - 1 files changed, 153 insertions(+), 49 deletions(-) - -commit 0edb6bb5e8025ff5cef8319b00e9eb31ee34099e -Author: Guillaume Desmottes -Date: Tue Mar 3 15:00:27 2009 +0000 - - gibber-fd-transport: don't close transport when we get HUP as the buffers can be not empty - - lib/gibber/gibber-fd-transport.c | 8 +------- - 1 files changed, 1 insertions(+), 7 deletions(-) - -commit 0951c7c4f15c9faad1840dbff1dc17ba2812c997 -Merge: 19f26ce b62872c -Author: Guillaume Desmottes -Date: Thu Feb 26 19:19:47 2009 +0000 - - Merge branch 'requestotron-tubes-and-caps-with-complex-types-with-gibber-listener-REBASED' - -commit b62872c802e7e01407d20dbb39f85bbe48bc4a1e -Author: Guillaume Desmottes -Date: Thu Feb 26 19:17:31 2009 +0000 - - upgrade NEWS - - NEWS | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 19f26ce7441e04462ef4b734e32e3939355aa0cd -Author: Will Thompson -Date: Fri Feb 20 12:22:23 2009 +0000 - - Fix byte ordering of port in GibberListener - - Signed-off-by: Guillaume Desmottes - - lib/gibber/gibber-listener.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 269926cb231b176ef2c79dd8b923dd9da6bf1f57 -Author: Guillaume Desmottes -Date: Wed Feb 18 18:31:07 2009 +0000 - - caps_req_stanza_callback: no need to re-compute the hash, it's already stored in SalutSelf - - src/salut-disco.c | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -commit e1bc1d3e47ee87fa31ed0fb57321d338ef089f4f -Author: Guillaume Desmottes -Date: Wed Feb 18 18:27:49 2009 +0000 - - caps_req_stanza_callback: don't leak SalutSelf - - src/salut-disco.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 89f67c9d8ce80d4ae49aae1476bd7d96e28056b1 -Author: Guillaume Desmottes -Date: Wed Feb 18 18:21:02 2009 +0000 - - caps_req_stanza_filter: early return when sending not-found - - src/salut-disco.c | 169 +++++++++++++++++++++++++++------------------------- - 1 files changed, 88 insertions(+), 81 deletions(-) - -commit 7f256151f0eef65002e4cbdbd7fbe5427c290e0e -Merge: 3a2743e 51efded -Author: Guillaume Desmottes -Date: Wed Feb 18 18:15:44 2009 +0000 - - Merge branch 'master' into requestotron-tubes-and-caps-with-complex-types-with-gibber-listener-REBASED - -commit 3a2743ed8051482d85804f75eb11b26b91c3dc95 -Author: Guillaume Desmottes -Date: Tue Feb 17 18:06:33 2009 +0000 - - caps_req_stanza_callback: assert than node is not NULL as the filter already checked it was not - - src/salut-disco.c | 23 ++++++++--------------- - 1 files changed, 8 insertions(+), 15 deletions(-) - -commit 8556f673e3cf7ab44d6c1c4323764bd2f3d205a4 -Author: Guillaume Desmottes -Date: Tue Feb 17 18:01:19 2009 +0000 - - caps_req_stanza_callback: use g_str_has_prefix - - src/salut-disco.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 51efded5b03ed12cc9c24d94526af03178a82cb6 -Author: Guillaume Desmottes -Date: Tue Feb 17 17:34:11 2009 +0000 - - Revert "re-enable test-disabled-1-1-tubes.py" - - This reverts commit 61b3cdc8b3729b984d544824880b8cf1f58658cc. - - tests/twisted/avahi/test-disabled-1-1-tubes.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit d35d234df9f16d3401b9b8a71ec33b73c67c0fe1 -Author: Guillaume Desmottes -Date: Tue Feb 17 17:34:04 2009 +0000 - - Revert "tubes-to-nonexistant-ids.py: disable test for now as 1-1 stream tubes have been disabled" - - This reverts commit 7b89fa34120cf6e271f2495ea3ea5183ae09a31e. - - tests/twisted/avahi/tubes-to-nonexistant-ids.py | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit fe221417bf8d5c398560bea6acec84c22f28e82d -Author: Guillaume Desmottes -Date: Tue Feb 17 17:33:58 2009 +0000 - - Revert "test-two-tubes.py: disable test for now as 1-1 stream tubes have been disabled" - - This reverts commit abba1930b6a1b5f25448dccda911955655acd716. - - tests/twisted/avahi/test-two-tubes.py | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 9e70d9a583b33f0b686658339fe3331f201b0072 -Author: Guillaume Desmottes -Date: Tue Feb 17 17:33:51 2009 +0000 - - Revert "test-tube.py: disable test for now as 1-1 stream tubes have been disabled" - - This reverts commit e7a51d8bf5a6b895e205665887c638b0c50678fe. - - tests/twisted/avahi/test-tube.py | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit cdc2386a32c54e3957e8942634b7fcd816b5caf9 -Author: Guillaume Desmottes -Date: Tue Feb 17 17:33:43 2009 +0000 - - Revert "test-tube-close.py: disable test for now as 1-1 stream tubes have been disabled" - - This reverts commit 44646bdb61e5cef2ba11df02ef98cf0ce8a151c0. - - tests/twisted/avahi/test-tube-close.py | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit 80768e1333c13f12da875075affd8d1a4048eab0 -Author: Guillaume Desmottes -Date: Tue Feb 17 17:33:31 2009 +0000 - - Revert "Disable 1-1 stream tube for now as we're not happy with the protocol" - - This reverts commit a690db8c214f02e26d68a138751c8738d4ffa879. - - src/salut-connection.c | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit a77622c4e78fb67406d045260693f1d1c19dbc5f -Merge: 15c21b8 79a7acd -Author: Guillaume Desmottes -Date: Tue Feb 17 17:31:17 2009 +0000 - - Merge branch 'master' into requestotron-tubes-and-caps-with-complex-types-with-gibber-listener-REBASED - - Conflicts: - - extensions/Makefile.am - -commit 79a7acd7e4fb70404407c0c8df05a8b6778684e2 -Author: Guillaume Desmottes -Date: Tue Feb 17 16:26:52 2009 +0000 - - version 0.3.8.1 - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c0643834b9ee30204b049b716ae22c25ba86f49f -Author: Guillaume Desmottes -Date: Tue Feb 17 16:17:03 2009 +0000 - - mesh.py and simplemeshtest.py should be in lib/gibber/tests - - lib/gibber/tests/mesh.py | 235 ++++++++++++++++++++++++++++++++++++ - lib/gibber/tests/simplemeshtest.py | 101 +++++++++++++++ - tests/Makefile.am | 2 - - tests/mesh.py | 235 ------------------------------------ - tests/simplemeshtest.py | 101 --------------- - 5 files changed, 336 insertions(+), 338 deletions(-) - -commit a2b96a7a3409e480a62d18a4682936369b974dcd -Author: Guillaume Desmottes -Date: Tue Feb 17 16:01:00 2009 +0000 - - version 0.3.8 - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit eac547c448e12fdc6935f123833cf1676d8bb4dc -Author: Guillaume Desmottes -Date: Tue Feb 17 11:39:18 2009 +0000 - - Upgrade NEWS - - Don't mention StreamTube new API as it's currently implemented only in - 1-1 tubes which have been disabled for the release. - - NEWS | 11 +++++++++-- - 1 files changed, 9 insertions(+), 2 deletions(-) - -commit 61b3cdc8b3729b984d544824880b8cf1f58658cc -Author: Guillaume Desmottes -Date: Tue Feb 17 11:21:20 2009 +0000 - - re-enable test-disabled-1-1-tubes.py - - tests/twisted/avahi/test-disabled-1-1-tubes.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 7b89fa34120cf6e271f2495ea3ea5183ae09a31e -Author: Guillaume Desmottes -Date: Tue Feb 17 11:19:43 2009 +0000 - - tubes-to-nonexistant-ids.py: disable test for now as 1-1 stream tubes have been disabled - - tests/twisted/avahi/tubes-to-nonexistant-ids.py | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit abba1930b6a1b5f25448dccda911955655acd716 -Author: Guillaume Desmottes -Date: Tue Feb 17 11:19:26 2009 +0000 - - test-two-tubes.py: disable test for now as 1-1 stream tubes have been disabled - - tests/twisted/avahi/test-two-tubes.py | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit e7a51d8bf5a6b895e205665887c638b0c50678fe -Author: Guillaume Desmottes -Date: Tue Feb 17 11:19:02 2009 +0000 - - test-tube.py: disable test for now as 1-1 stream tubes have been disabled - - tests/twisted/avahi/test-tube.py | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 44646bdb61e5cef2ba11df02ef98cf0ce8a151c0 -Author: Guillaume Desmottes -Date: Tue Feb 17 11:18:48 2009 +0000 - - test-tube-close.py: disable test for now as 1-1 stream tubes have been disabled - - tests/twisted/avahi/test-tube-close.py | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit a690db8c214f02e26d68a138751c8738d4ffa879 -Author: Guillaume Desmottes -Date: Tue Feb 17 11:18:09 2009 +0000 - - Disable 1-1 stream tube for now as we're not happy with the protocol - - src/salut-connection.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 7da5f7ffa24b3ecdca3ef48abb6c8a4bd5be63b2 -Author: Guillaume Desmottes -Date: Thu Jan 22 10:40:49 2009 +0000 - - file_transfer_helper.py: FileTransfer is not a DRAFT anymore - - tests/twisted/avahi/file_transfer_helper.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 5f6a932bd5d8ab6846789d99a1d0afd36e67ac3e -Author: Guillaume Desmottes -Date: Thu Jan 22 10:40:33 2009 +0000 - - salut-ft-manager: use tp-glib instead of extension's generated code - - src/salut-ft-manager.c | 48 ++++++++++++++++++++++++------------------------ - 1 files changed, 24 insertions(+), 24 deletions(-) - -commit 1769eacb7b5bcafed55be78e02d781dbbb6ef9bb -Author: Guillaume Desmottes -Date: Thu Jan 22 10:40:20 2009 +0000 - - salut-file-transfer-channel: use tp-glib instead of extension's generated code - - src/salut-file-transfer-channel.c | 144 ++++++++++++++++++------------------ - 1 files changed, 72 insertions(+), 72 deletions(-) - -commit fc0b134f481f9d99e279578e44ea85dba0304708 -Author: Guillaume Desmottes -Date: Thu Jan 22 10:39:35 2009 +0000 - - bump telepathy-glib dependency to 0.7.23 as we need it for FT - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 48d3249342e77e0d6f4291d451157200cd75e5a8 -Author: Guillaume Desmottes -Date: Thu Jan 22 10:38:27 2009 +0000 - - remove Channel_Type_File_Transfer from extensions - - extensions/Channel_Type_File_Transfer.xml | 513 ----------------------------- - extensions/Makefile.am | 1 - - extensions/channel.xml | 1 - - 3 files changed, 0 insertions(+), 515 deletions(-) - -commit 9a88083a761c41d4150336b3cb646993c6d3976c -Author: Guillaume Desmottes -Date: Tue Feb 17 10:26:15 2009 +0000 - - trivial style fix - - src/salut-tubes-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8908e33b6cf637d29b2e3eb7d56725aba713c746 -Merge: 9bae8bf af7c215 -Author: Guillaume Desmottes -Date: Tue Feb 17 10:20:09 2009 +0000 - - Merge branch 'master' into muc-stream-tube-new-api-REBASED - -commit ce49aa303cd7ebfc45cf6723ff12ba673c44b527 -Merge: fb661cf 15c21b8 -Author: Guillaume Desmottes -Date: Thu Feb 12 15:55:41 2009 +0000 - - Merge branch 'requestotron-tubes-and-caps-with-complex-types-with-gibber-listener-REBASED' into ft-capa-REBASED - -commit 15c21b8180b8c782d90e3a1a58437c2b0ecacbe8 -Merge: 8695678 af7c215 -Author: Guillaume Desmottes -Date: Thu Feb 12 15:55:11 2009 +0000 - - Merge branch 'master' into requestotron-tubes-and-caps-with-complex-types-with-gibber-listener-REBASED - -commit af7c215cfc4ddd45f8abd67ba90a7ef2fdef000c -Author: Guillaume Desmottes -Date: Thu Feb 12 13:28:57 2009 +0000 - - gitignore: sasl-test.db has been moved to gibber tests - - .gitignore | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit fb661cfc7e882a9d1d9f0441789c0d20c86c1e8b -Merge: bb4b9b2 8695678 -Author: Guillaume Desmottes -Date: Thu Feb 12 13:15:47 2009 +0000 - - Merge branch 'requestotron-tubes-and-caps-with-complex-types-with-gibber-listener-REBASED' into ft-capa-REBASED - -commit 8695678c5c6792ac1b055dd121e3c68caec1ff48 -Merge: beba2ea df8e4cd -Author: Guillaume Desmottes -Date: Thu Feb 12 13:02:05 2009 +0000 - - Merge branch 'master' into requestotron-tubes-and-caps-with-complex-types-with-gibber-listener-REBASED - - Conflicts: - - .gitignore - -commit 9bae8bf3986cf75f932757786db7ca87d6398f5e -Author: Guillaume Desmottes -Date: Thu Feb 12 12:55:57 2009 +0000 - - add salut_tube_stream_channel_get_allowed_properties accessor instead of having the array in the header - - src/salut-muc-manager.c | 4 ++-- - src/salut-tubes-manager.c | 4 ++-- - src/tube-stream.c | 12 ++++++++++++ - src/tube-stream.h | 9 ++------- - 4 files changed, 18 insertions(+), 11 deletions(-) - -commit 4175899c2dfb1350061be3212a2b51577f8350b0 -Author: Guillaume Desmottes -Date: Thu Feb 12 12:46:02 2009 +0000 - - salut_tubes_channel_offer_stream_tube: no need to call salut_tubes_channel_send_iq_offer, it's done by salut_tube_stream_offer - - src/salut-tubes-channel.c | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) - -commit e7ac960d5cca8ba0698dd28b08ba7b42d3ae05f4 -Author: Guillaume Desmottes -Date: Thu Feb 12 12:45:42 2009 +0000 - - salut_tube_stream_offer_stream_tube: use salut_tube_stream_offer - - src/tube-stream.c | 28 +++++++++++----------------- - 1 files changed, 11 insertions(+), 17 deletions(-) - -commit a96aa703dcb7ab2ce49164b0a0bccec89a507f1d -Author: Guillaume Desmottes -Date: Thu Feb 12 12:26:06 2009 +0000 - - test-two-muc-stream-tubes: wait that we have joined the muc before offering the tube - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 814edf3b1d0fd61dceede86f2c14862f822bea05 -Author: Guillaume Desmottes -Date: Thu Feb 12 11:50:30 2009 +0000 - - test-two-private-stream-tubes: use new tube API - - .../twisted/avahi/test-two-private-stream-tubes.py | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit 7fdb2aa6a40c5ac6e566a59dc5a850d2667d7f53 -Author: Guillaume Desmottes -Date: Thu Feb 12 11:28:03 2009 +0000 - - test-two-muc-stream-tubes: check if Parameters are announced in incoming tube - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 46db9432b8569d5057c6e1c96b91ad21cb46635b -Author: Guillaume Desmottes -Date: Thu Feb 12 11:26:30 2009 +0000 - - test-two-muc-stream-tubes.py: use new tube API - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit ea73ebcdc7e3f427422e79f11d99fb3256c43063 -Author: Guillaume Desmottes -Date: Thu Feb 12 11:26:11 2009 +0000 - - send_channel_iq_tube: check if channel has been offered before adding it - - src/salut-tubes-channel.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 86d90dd357ee695f550c49671c650885ba9ebe41 -Author: Guillaume Desmottes -Date: Thu Feb 12 11:18:27 2009 +0000 - - tube-iface: parameters property is not read-only any more - - src/tube-iface.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 17db9736cedb07d5f631d13f1bc29b290c023992 -Author: Guillaume Desmottes -Date: Thu Feb 12 11:17:14 2009 +0000 - - remove Parameters from salut_stream_tube_channel_allowed_properties - - src/tube-stream.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 612e3ff761253f9e49ea9447afec05b0366af643 -Author: Guillaume Desmottes -Date: Thu Feb 12 11:16:49 2009 +0000 - - salut_muc_manager_request: don't pass parameters to salut_tubes_channel_tube_request any more - - src/salut-muc-manager.c | 7 +------ - 1 files changed, 1 insertions(+), 6 deletions(-) - -commit d31431636354c6faa48a872e6c59f937f2c3a559 -Merge: 23ad6e2 df8e4cd -Author: Guillaume Desmottes -Date: Thu Feb 12 11:14:53 2009 +0000 - - Merge branch 'master' into muc-stream-tube-new-api-REBASED - - Conflicts: - - src/salut-tubes-manager.c - tests/twisted/avahi/test-offer-private-stream-tube.py - -commit df8e4cdc8c8d2efe62a2410762424b4ac61ca077 -Author: Guillaume Desmottes -Date: Wed Feb 11 17:09:37 2009 +0000 - - tube-stream: Parameters property has to be in channel-properties only in incoming tubes - - src/tube-stream.c | 48 +++++++++++++++++++++++++++++++++++------------- - 1 files changed, 35 insertions(+), 13 deletions(-) - -commit 1ddcb3e8d6ef8884755f836e53ca96cf6f2244b6 -Author: Guillaume Desmottes -Date: Wed Feb 11 17:03:10 2009 +0000 - - test-tube: don't pass Parameters when creating the tube - - tests/twisted/avahi/test-tube.py | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -commit 48100b9ce60ffb39651a66f13c35034b9c76ad55 -Author: Guillaume Desmottes -Date: Wed Feb 11 17:02:48 2009 +0000 - - tubes-manager: Parameters is not an allowed property any more - - src/salut-tubes-manager.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit f5b41892b5d92d5e79fcf5cf3b339e9ed103f199 -Author: Guillaume Desmottes -Date: Wed Feb 11 17:01:40 2009 +0000 - - remove parameters argument from salut_tubes_channel_tube_request - - src/salut-tubes-channel.c | 17 +++++++---------- - src/salut-tubes-channel.h | 2 +- - src/salut-tubes-manager.c | 7 +------ - 3 files changed, 9 insertions(+), 17 deletions(-) - -commit 840807dc6313ef40114a76ac2a35321b67978e0e -Author: Guillaume Desmottes -Date: Wed Feb 11 16:58:21 2009 +0000 - - tube-stream: salut_tube_stream_offer_stream_tube now takes parameters - - src/tube-stream.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 0f1d05ccb1d861f0e8a9570dcbb483e6a7b4f9c9 -Author: Guillaume Desmottes -Date: Wed Feb 11 16:57:58 2009 +0000 - - tube-stream: Parameters is now ready only - - src/tube-stream.c | 39 ++------------------------------------- - 1 files changed, 2 insertions(+), 37 deletions(-) - -commit a89d4182df91ead00d374e8de946220a00b23a31 -Author: Guillaume Desmottes -Date: Wed Feb 11 17:01:56 2009 +0000 - - upgrade to latest tube draft - - extensions/Channel_Interface_Tube.xml | 33 +++++++++++++++++++++++++----- - extensions/Channel_Type_DBus_Tube.xml | 8 +++++++ - extensions/Channel_Type_Stream_Tube.xml | 8 +++++++ - 3 files changed, 43 insertions(+), 6 deletions(-) - -commit b4ee16c24028ea3f14392f970948edaee0b0cad0 -Merge: 74ae0df b795655 -Author: Guillaume Desmottes -Date: Wed Feb 11 16:24:23 2009 +0000 - - Merge branch 'upgrade-tube-spec-REBASED' - -commit bb4b9b202dc5e8de3fe8ed56204e7aab33db6066 -Author: Guillaume Desmottes -Date: Tue Feb 10 14:13:18 2009 +0000 - - Revert "SalutXmppConnectionManager: connect to TpSvcConnection::status-changed and close streams" - - This reverts commit 38b693ab35ccee5595f5c92b4537f7ac1e19e837. - - XCM is disposed when closing the connection so there is no need to do - that. - - src/salut-xmpp-connection-manager.c | 75 ++++++----------------------------- - 1 files changed, 13 insertions(+), 62 deletions(-) - -commit 837724ee73d3162221b7fd18a628b9baf2a8c432 -Author: Guillaume Desmottes -Date: Tue Feb 10 13:55:49 2009 +0000 - - test-caps-tubes: caps have been re-ordered - - tests/twisted/avahi/test-caps-tubes.py | 66 +++++++++++++------------------ - 1 files changed, 28 insertions(+), 38 deletions(-) - -commit 174b322c2d603702e5ce57bdf37b335f03d97b31 -Author: Guillaume Desmottes -Date: Tue Feb 10 13:54:50 2009 +0000 - - constants.py: add CHANNEL_TYPE_DBUS_TUBE and DBUS_TUBE_SERVICE_NAME - - tests/twisted/constants.py | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit ea9ec29f2b872b63e92a759a8260a2bff6dc9aff -Author: Guillaume Desmottes -Date: Tue Feb 10 13:09:10 2009 +0000 - - config.py depends on Makefile so is re-generated when version is changed - - tests/twisted/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit fa0c74c6d48d10b491ff6289a86efe3521a13508 -Author: Guillaume Desmottes -Date: Mon Jan 26 13:30:45 2009 +0000 - - test-caps-tubes.py: file transfer capa is announced now - - tests/twisted/avahi/test-caps-tubes.py | 35 ++++++++++++++++++++++--------- - 1 files changed, 25 insertions(+), 10 deletions(-) - -commit f3f9e0f8275c55660aead77159ac11f8b849ce4a -Author: Guillaume Desmottes -Date: Mon Jan 26 12:38:28 2009 +0000 - - test-caps-file-transfer: check self capa - - tests/twisted/avahi/test-caps-file-transfer.py | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) - -commit 34d58797c7ec5e9bf9a2bb4fd424f51fec85c6a5 -Author: Guillaume Desmottes -Date: Mon Jan 26 12:38:12 2009 +0000 - - salut_ft_manager_get_contact_caps: self-handle always support file transfer - - src/salut-ft-manager.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit f8e2ecc169540fefc6335dfe7bf188453886ca62 -Author: Guillaume Desmottes -Date: Mon Jan 26 12:30:21 2009 +0000 - - check if Salut advertise OOB features - - tests/twisted/avahi/test-caps-file-transfer.py | 31 ++++++++++++++---------- - 1 files changed, 18 insertions(+), 13 deletions(-) - -commit 88c8be519241945649931b3eb33269ff5e1e6c0d -Author: Guillaume Desmottes -Date: Mon Jan 26 11:54:52 2009 +0000 - - test-caps-file-transfer.py: check if FT capa is announced if contact doesn't announce any capa - - tests/twisted/avahi/test-caps-file-transfer.py | 31 +++++++++++++++++++++++- - 1 files changed, 30 insertions(+), 1 deletions(-) - -commit fd6e865d50f13a59f75c80541a2b8e2e18c43324 -Author: Guillaume Desmottes -Date: Mon Jan 26 11:54:16 2009 +0000 - - salut_tubes_manager_parse_caps: node can be NULL now - - src/salut-tubes-manager.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit ee6c642325eef63c40a69e22839ca8497383835a -Author: Guillaume Desmottes -Date: Mon Jan 26 11:53:54 2009 +0000 - - salut_ft_manager_parse_caps: say that FT capa is unknown if there is no capa announced - - src/salut-ft-manager.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 488ee4bd9794fc98fb1f4273e135a98f0d4fa57f -Author: Guillaume Desmottes -Date: Mon Jan 26 11:51:44 2009 +0000 - - salut_presence_cache_process_caps: get caps from managers if there is no - capa announced so we announce the default ones - - src/salut-presence-cache.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit 773266729e5c05fba4b3a5b00301d99cefa3679a -Author: Guillaume Desmottes -Date: Mon Jan 26 11:40:54 2009 +0000 - - presence-cache: factor out create_per_channel_manager_caps - - src/salut-presence-cache.c | 53 +++++++++++++++++++++++++++---------------- - 1 files changed, 33 insertions(+), 20 deletions(-) - -commit e372487162c77a0e84a793ecebd59777c4e5b706 -Author: Guillaume Desmottes -Date: Mon Jan 26 10:38:39 2009 +0000 - - test-caps-file-transfer: test contact without FT capa - - tests/twisted/avahi/test-caps-file-transfer.py | 45 +++++++++++++++++++++++- - 1 files changed, 44 insertions(+), 1 deletions(-) - -commit 5c2f9632c8f3d62c266abb7439349552d74ad41a -Author: Guillaume Desmottes -Date: Mon Jan 26 10:33:44 2009 +0000 - - test-caps-file-transfer.py: fix contact name - - tests/twisted/avahi/test-caps-file-transfer.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b79c6c0a63252e80ce15c86aef062849b641399d -Author: Guillaume Desmottes -Date: Fri Jan 23 17:25:11 2009 +0000 - - add test-caps-file-transfer.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit c3d03ec13c1bdbd286f7dcd7870202197118cf5e -Author: Guillaume Desmottes -Date: Fri Jan 23 17:24:57 2009 +0000 - - add test-caps-file-transfer.py - - tests/twisted/avahi/test-caps-file-transfer.py | 174 ++++++++++++++++++++++++ - 1 files changed, 174 insertions(+), 0 deletions(-) - -commit b4bed753fab4783f91dfaaaf1e3764e74bb0afe1 -Author: Guillaume Desmottes -Date: Fri Jan 23 17:24:06 2009 +0000 - - ft-manager: add FT's channel class if contact announces to support OOB - - src/salut-ft-manager.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 131 insertions(+), 1 deletions(-) - -commit b5c0e80bac6c87b37747323b1a0ce478769a36db -Author: Guillaume Desmottes -Date: Fri Jan 23 17:15:10 2009 +0000 - - constants.py: add FT constants - - tests/twisted/constants.py | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit dbe9fb87538d57837463efe715dc0567b6e95976 -Author: Guillaume Desmottes -Date: Fri Jan 23 15:19:51 2009 +0000 - - saluttest.py: OOB is now a fixed capa - - tests/twisted/saluttest.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 7ab7f90a19d385999cc6ac46a6f1da4f14cc949e -Author: Guillaume Desmottes -Date: Fri Jan 23 15:19:21 2009 +0000 - - advertiste OOB as a fixed capability - - src/salut-capabilities.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit bbea5f253dcaf1c7d6d1a3ca8a54f7861bcbb791 -Author: Guillaume Desmottes -Date: Fri Jan 23 15:15:26 2009 +0000 - - salut_disco_dispose: unref the XCM after canceling request as we could need it to release a connection - - src/salut-disco.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit e7fdafa70a4197ef2e0497aecc8ff6b362f8ee5f -Author: Guillaume Desmottes -Date: Fri Jan 23 15:10:08 2009 +0000 - - gibber_oob_file_transfer_is_file_offer: check if url is NULL before looking for its content - - lib/gibber/gibber-oob-file-transfer.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 10bac297338302397a559f27f067a825b00302e4 -Author: Guillaume Desmottes -Date: Fri Jan 23 15:03:28 2009 +0000 - - test-caps-tubes: use constants.py and ns.py - - tests/twisted/avahi/test-caps-tubes.py | 153 +++++++++++++++----------------- - 1 files changed, 72 insertions(+), 81 deletions(-) - -commit 61e09f3f1b5d07a8dbaceaccb483c7886dd1b228 -Author: Guillaume Desmottes -Date: Fri Jan 23 15:03:07 2009 +0000 - - constants.py: add CONN_IFACE_CONTACT_CAPA and CONN_IFACE_CONTACTS - - tests/twisted/constants.py | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit ab88bc874408a41f8e4f991b30db170a89d25f1f -Author: Guillaume Desmottes -Date: Fri Jan 23 14:56:48 2009 +0000 - - test-caps-tubes: fixed features are now announced - - tests/twisted/avahi/test-caps-tubes.py | 33 ++++++++++++++++++++----------- - 1 files changed, 21 insertions(+), 12 deletions(-) - -commit 1a8165e7e5d80bf3d865ec7602a59bcb99e145cc -Author: Guillaume Desmottes -Date: Fri Jan 23 14:56:03 2009 +0000 - - tubes-mgr: remove tube_feature as it's now announced as a fixed caps - - src/salut-tubes-manager.c | 8 -------- - 1 files changed, 0 insertions(+), 8 deletions(-) - -commit 8aa4a77a6a47ef127d4dd5a188001955eaf6dd9a -Author: Guillaume Desmottes -Date: Fri Jan 23 14:44:59 2009 +0000 - - test-caps-self: TELEPATHY_CAPS is now in ns - - tests/twisted/avahi/test-caps-self.py | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit bf96273a8c205215fb01c1cb8f252ade5d0f979f -Author: Guillaume Desmottes -Date: Fri Jan 23 14:44:32 2009 +0000 - - ns.py: add TELEPATHY_CAPS - - tests/twisted/ns.py | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 6ace4acd1288ec1469b99a9d84fee9e6f15cc2de -Author: Guillaume Desmottes -Date: Fri Jan 23 14:43:03 2009 +0000 - - test-caps-self: use fixed_features - - tests/twisted/avahi/test-caps-self.py | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 81fa9d8d928b343fc0d90415e00b5718b15a0cd6 -Author: Guillaume Desmottes -Date: Fri Jan 23 14:42:36 2009 +0000 - - saluttest.py: add fixed_features - - tests/twisted/saluttest.py | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 5594f8ec2e943a2372c3114f61501548dbc20077 -Author: Guillaume Desmottes -Date: Fri Jan 23 13:46:17 2009 +0000 - - test-caps-self.py: check if fixed caps are announced - - tests/twisted/avahi/test-caps-self.py | 42 ++++++++++++++++++++++---------- - 1 files changed, 29 insertions(+), 13 deletions(-) - -commit d268c543ca2764d406ef8f0ed90fd309fdd9c794 -Author: Guillaume Desmottes -Date: Fri Jan 23 13:41:44 2009 +0000 - - ns.py: add OOB, IBB, SI and tubes ns - - tests/twisted/ns.py | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 5622925bd58bf36e22df7ec63f009216fb1d4366 -Author: Guillaume Desmottes -Date: Fri Jan 23 13:35:42 2009 +0000 - - add ns.py to EXTRA_DIST - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit ca4ef2744610abed98b93283e203e6f89bb0a59b -Author: Guillaume Desmottes -Date: Fri Jan 23 13:34:55 2009 +0000 - - import ns.py from Gabble - - tests/twisted/ns.py | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) - -commit aca6fef89a59a271daf8189876be096ed0e3bcc3 -Author: Guillaume Desmottes -Date: Fri Jan 23 13:33:15 2009 +0000 - - salut-connection: announce our capabilites when connected - - src/salut-connection.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -commit ba6944ef2f75683d93ea4023f254844cb03d7490 -Author: Guillaume Desmottes -Date: Fri Jan 23 13:32:06 2009 +0000 - - capabilities_get_features: announce self_advertised_features too - - src/salut-capabilities.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit d7f635d857a342ca3f752acfd7436cd03fdf5d62 -Author: Guillaume Desmottes -Date: Fri Jan 23 12:35:03 2009 +0000 - - caps_req_stanza_callback: use salut_self_get_features - - src/salut-disco.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 4f92c94375ef6fff87e6565b1db7861572842cea -Author: Guillaume Desmottes -Date: Fri Jan 23 12:34:45 2009 +0000 - - caps_hash_compute_from_stanza: use salut_self_get_features - - src/salut-caps-hash.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit e96be440df07d451c65d7fa8a6c89c87bd6e38e7 -Author: Guillaume Desmottes -Date: Fri Jan 23 12:32:02 2009 +0000 - - add salut_self_get_features - - src/salut-self.c | 7 +++++++ - src/salut-self.h | 2 ++ - 2 files changed, 9 insertions(+), 0 deletions(-) - -commit a52b32d6ed3627acd5b51bb061da1c3f75810486 -Author: Guillaume Desmottes -Date: Fri Jan 23 12:24:38 2009 +0000 - - salut-connection: factor out announce_self_caps - - src/salut-connection.c | 29 ++++++++++++++++++++++------- - 1 files changed, 22 insertions(+), 7 deletions(-) - -commit 49d3937804fa7af6bbc8e940628577557ecc7c36 -Author: Guillaume Desmottes -Date: Thu Jan 22 18:04:48 2009 +0000 - - gibber-namespaces: add GIBBER_XMPP_NS_X_OOB - - lib/gibber/gibber-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 7bf66fdb71e2076fecef9da6be200bca701462bc -Author: Guillaume Desmottes -Date: Thu Jan 22 16:52:09 2009 +0000 - - rename GIBBER_XMPP_NS_OOB to GIBBER_XMPP_NS_IQ_OOB - - lib/gibber/gibber-bytestream-oob.c | 8 ++++---- - lib/gibber/gibber-namespaces.h | 2 +- - lib/gibber/gibber-oob-file-transfer.c | 4 ++-- - src/salut-si-bytestream-manager.c | 6 +++--- - 4 files changed, 10 insertions(+), 10 deletions(-) - -commit beba2ea4d45c64bb447d82b3b43342ea9de45f66 -Author: Guillaume Desmottes -Date: Tue Feb 10 10:45:36 2009 +0000 - - fix conflict resolution: tube state property has to be readonly - - src/tube-iface.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 58f5dde29e4ea359ac43d579fa775d2f6aad6e27 -Author: Guillaume Desmottes -Date: Mon Feb 9 22:35:56 2009 +0100 - - coding style fix - - src/salut-self.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 0e8c51caf2b43ac0e7f8e1a802efa55b8d2958e7 -Author: Guillaume Desmottes -Date: Mon Feb 9 22:32:19 2009 +0100 - - all.xml: fix Requestable_Channel_Class name - - extensions/all.xml | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3a9d04f58f3786c0accf10f4e5e5a569afc3dff0 -Author: Guillaume Desmottes -Date: Mon Feb 9 22:32:01 2009 +0100 - - tube-iface: fix wrong conflict resolution - - src/tube-iface.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 18cd4660d325f6e4c02be735db33006ec2a49e47 -Author: Guillaume Desmottes -Date: Mon Feb 2 16:00:07 2009 +0000 - - salut_tubes_manager_caps_diff: check pointer equality first - - src/salut-tubes-manager.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 4d6503914337b4955e4921fb14d8d854bddf9d43 -Author: Guillaume Desmottes -Date: Thu Jan 22 15:00:15 2009 +0000 - - hash_table_is_subset: no need to pass dummy key/value to g_hash_table_lookup_extended - - src/salut-tubes-manager.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 2bfc51d043f85c04e37f0e24b323a87e4ac0eebd -Author: Guillaume Desmottes -Date: Thu Jan 22 14:57:52 2009 +0000 - - salut_tubes_manager_caps_diff: check hash tables size first - - src/salut-tubes-manager.c | 17 +++++++++-------- - 1 files changed, 9 insertions(+), 8 deletions(-) - -commit bda59cffae234756fc836726538ed1f3ae42c633 -Author: Guillaume Desmottes -Date: Thu Jan 22 14:49:55 2009 +0000 - - salut_tubes_manager_caps_diff: return FALSE if both caps are NULL - - src/salut-tubes-manager.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit bd5ddb7506b4b6f59991f0f42b60a5354f4fdaa4 -Author: Guillaume Desmottes -Date: Thu Jan 22 14:33:55 2009 +0000 - - caps_hash_compute: use g_checksum_type_get_length instead of hardcoding the size - - src/salut-caps-hash.c | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) - -commit 47f78d1546ecba460596ff79302231724b91adc0 -Author: Guillaume Desmottes -Date: Thu Jan 22 14:24:21 2009 +0000 - - test-caps-tubes.py: check if the hash matches the announced capabilities - - tests/twisted/avahi/test-caps-tubes.py | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit cbb9facd703cb9e09a55535d88a292db90a369df -Author: Guillaume Desmottes -Date: Thu Jan 22 14:05:53 2009 +0000 - - caps_helper: wrap big line - - tests/twisted/avahi/caps_helper.py | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit 27aad294e32b783eefc615fbee9331d23a18ea82 -Author: Guillaume Desmottes -Date: Thu Jan 22 13:33:16 2009 +0000 - - test-send-file-and-cancel-immediately.py: add error message when asserting False - - .../avahi/test-send-file-and-cancel-immediately.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e1e1782638f46cb914b9f4735ee204c1e9365ef9 -Author: Guillaume Desmottes -Date: Thu Jan 22 13:32:56 2009 +0000 - - test-receive-file-and-sender-disconnect-while-pending.py: add error message when asserting False - - ...ive-file-and-sender-disconnect-while-pending.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 33bc8b39b1ce307536a63b98629fc2241b0fd29f -Author: Guillaume Desmottes -Date: Thu Jan 22 13:32:35 2009 +0000 - - test-disabled-1-1-tubes.py: add error message when asserting False - - tests/twisted/avahi/test-disabled-1-1-tubes.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ea5e8fda6bbf820896ca7106cc3daa8afbbf2edd -Author: Guillaume Desmottes -Date: Thu Jan 22 13:31:43 2009 +0000 - - test-request-invalid-dbus-tube.py: add error message when asserting False - - .../avahi/test-request-invalid-dbus-tube.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6f3595ac5417ea772807b790f4ab9b27d6c0aee2 -Author: Guillaume Desmottes -Date: Thu Jan 22 13:31:22 2009 +0000 - - test-send-file-to-unknown-contact.py: add error message when asserting False - - .../avahi/test-send-file-to-unknown-contact.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a55127dd217383ef58297b573350ef4627986787 -Author: Guillaume Desmottes -Date: Thu Jan 22 13:30:54 2009 +0000 - - tubes-to-nonexistant-ids.py: add error message when asserting False - - tests/twisted/avahi/tubes-to-nonexistant-ids.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit a19834519f53faab14650c16d592a971a67adb95 -Author: Guillaume Desmottes -Date: Thu Jan 22 13:23:17 2009 +0000 - - test-tube: add error message when asserting False - - tests/twisted/avahi/test-tube.py | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 20ddef6b55fae6df14e9695dbe4912cdfc821dcc -Author: Guillaume Desmottes -Date: Thu Jan 22 11:55:21 2009 +0000 - - move caps_req_stanza_callback from salut-connection to salut-disco - - src/salut-connection.c | 174 ----------------------------------------------- - src/salut-disco.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 177 insertions(+), 174 deletions(-) - -commit 682675ece27145864dade0ffcde8ffc7ff8e49fc -Author: Guillaume Desmottes -Date: Thu Jan 15 18:02:55 2009 +0000 - - test-caps-tubes: ContactCapabilitiesChanged now has a dict as argument - - tests/twisted/avahi/test-caps-tubes.py | 18 ++++++------------ - 1 files changed, 6 insertions(+), 12 deletions(-) - -commit 880c06710f3fc8424a3fbdc6f2d0c44ebb94b743 -Author: Guillaume Desmottes -Date: Thu Jan 15 18:02:34 2009 +0000 - - implement latest contact capabilities spec - - src/salut-connection.c | 12 +++++++++--- - src/salut-im-manager.c | 5 +++-- - src/salut-tubes-manager.c | 4 ++-- - 3 files changed, 14 insertions(+), 7 deletions(-) - -commit bb692e9161d5916c807dde25c6507157618d9b1b -Author: Guillaume Desmottes -Date: Thu Jan 15 18:01:47 2009 +0000 - - add Requestable_Channel_Class as an external type - - extensions/all.xml | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 9079d257ec8f7adddf819a2b954349a84b240b22 -Author: Guillaume Desmottes -Date: Thu Jan 15 18:01:22 2009 +0000 - - Connection_Interface_Contact_Capabilities.xml: update to latest spec - - .../Connection_Interface_Contact_Capabilities.xml | 87 +++++++++----------- - 1 files changed, 40 insertions(+), 47 deletions(-) - -commit a62b5bcad2cdbaefaeeab28a2777ee2051abcb3a -Author: Guillaume Desmottes -Date: Thu Jan 15 15:37:39 2009 +0000 - - tubes-manager: factor out tubes_capabilities_free - - src/salut-tubes-manager.c | 14 ++++++++++---- - 1 files changed, 10 insertions(+), 4 deletions(-) - -commit ae0e8ce0412415d4ec34fa32a1bb9492de0163d2 -Author: Guillaume Desmottes -Date: Thu Jan 15 15:34:50 2009 +0000 - - tubes-manager: factor out tubes_capabilities_new - - src/salut-tubes-manager.c | 51 ++++++++++++++++++++------------------------ - 1 files changed, 23 insertions(+), 28 deletions(-) - -commit c771725a8555a350830de8a043db3c327b875227 -Author: Guillaume Desmottes -Date: Thu Jan 15 15:15:51 2009 +0000 - - caps_req_stanza_callback: add FIXME about hardocded 'pc' attribute - - src/salut-connection.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit cd909fa4fc94b8269a7e350987d225a3f04fed08 -Author: Guillaume Desmottes -Date: Thu Jan 15 14:31:55 2009 +0000 - - remove generate_caps as it's not really useful - - tests/twisted/avahi/caps_helper.py | 4 ---- - tests/twisted/avahi/test-caps-self.py | 5 +++-- - 2 files changed, 3 insertions(+), 6 deletions(-) - -commit e4875aa4b2673bdfd63a98e6b9e9a63a5c7b1133 -Author: Guillaume Desmottes -Date: Thu Jan 15 14:29:34 2009 +0000 - - test-caps-tubes.py: generate caps hash instead of hardcoding them - - tests/twisted/avahi/test-caps-tubes.py | 17 +++++++++++------ - 1 files changed, 11 insertions(+), 6 deletions(-) - -commit de74b0c953510f3fe5cd47f222b22fe70a3207bf -Author: Guillaume Desmottes -Date: Thu Jan 15 13:26:17 2009 +0000 - - test-caps-self: use caps_helper - - tests/twisted/avahi/test-caps-self.py | 25 ++----------------------- - 1 files changed, 2 insertions(+), 23 deletions(-) - -commit 482eb01aed6add5ceb5d23755d2a9f59cf7e2e0c -Author: Guillaume Desmottes -Date: Thu Jan 15 13:25:53 2009 +0000 - - add caps_helper.py to test suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit f78241955ce047a4d6799b2601db079427c588ec -Author: Guillaume Desmottes -Date: Thu Jan 15 13:25:36 2009 +0000 - - add avahi/caps_helper.py - - tests/twisted/avahi/caps_helper.py | 27 +++++++++++++++++++++++++++ - 1 files changed, 27 insertions(+), 0 deletions(-) - -commit 15969d8c39e02092a9270e933b03e743f68135ed -Author: Guillaume Desmottes -Date: Wed Jan 14 16:26:42 2009 +0000 - - use slice allocator with Feature and TubesCapabilities - - src/salut-tubes-manager.c | 18 ++++++++++++------ - 1 files changed, 12 insertions(+), 6 deletions(-) - -commit ed7c69a0e96f6475c3b489c11c92a21190710745 -Author: Guillaume Desmottes -Date: Wed Jan 14 16:14:03 2009 +0000 - - coding style fix - - src/salut-tubes-manager.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 86e9db241fdfcff150c02968e4866c0cb37d8294 -Author: Guillaume Desmottes -Date: Wed Jan 14 16:11:28 2009 +0000 - - simplify salut_tubes_manager_caps_diff - - src/salut-tubes-manager.c | 98 +++++++++++++++++++------------------------- - 1 files changed, 42 insertions(+), 56 deletions(-) - -commit e33c5c238115adb618aaa6704d66bbef35e8c026 -Author: Guillaume Desmottes -Date: Wed Jan 14 16:11:09 2009 +0000 - - salut_tubes_manager_get_contact_caps: fix contact leak - - src/salut-tubes-manager.c | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit 060bbb34ef7fc6f40b8b8530d8c6184a843f4368 -Author: Guillaume Desmottes -Date: Wed Jan 14 15:15:06 2009 +0000 - - rename salut_private_tubes_factory_* to salut_tubes_manager_* - - src/salut-tubes-manager.c | 48 ++++++++++++++++++++++---------------------- - 1 files changed, 24 insertions(+), 24 deletions(-) - -commit b1a2366b0386711b20c7e8c9466f4f7496c664ac -Author: Guillaume Desmottes -Date: Wed Jan 14 15:02:49 2009 +0000 - - change salut_presence_cache_copy_cache_entry to return a GHashTable* - - src/salut-contact.c | 2 +- - src/salut-presence-cache.c | 18 +++++++++++------- - src/salut-presence-cache.h | 2 +- - 3 files changed, 13 insertions(+), 9 deletions(-) - -commit 8c09a36a3502dbfb062c4a52746ce967d2f39867 -Author: Guillaume Desmottes -Date: Wed Jan 14 14:49:39 2009 +0000 - - salut_connection_dispose: check that the objects are not NULL before unreffing them - - src/salut-connection.c | 14 ++++++++++---- - 1 files changed, 10 insertions(+), 4 deletions(-) - -commit f25a41fbe2a2669f1f3ddd4a897d1353b670d8d4 -Author: Guillaume Desmottes -Date: Wed Jan 14 14:47:33 2009 +0000 - - caps-hash: use tp_strdiff instead of g_str_equal - - src/salut-caps-hash.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit ca2c15c3e892a0cec72316e4890483c4e8977e97 -Author: Guillaume Desmottes -Date: Wed Jan 14 14:45:15 2009 +0000 - - caps_hash_compute: use GCheckSum instead of our own implementation of sha1 - - src/salut-caps-hash.c | 14 ++++++++++---- - 1 files changed, 10 insertions(+), 4 deletions(-) - -commit ba62c86d9e21754e5c4ebb09cba557364d2ae4af -Author: Guillaume Desmottes -Date: Wed Jan 14 14:20:57 2009 +0000 - - salut-caps-channel-manager.h: remove _future - - src/salut-caps-channel-manager.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 74a6ab687698bab161d64d90c7cb45b4a79d4bc7 -Author: Guillaume Desmottes -Date: Wed Jan 14 14:18:56 2009 +0000 - - salut_avahi_self_set_presence: rename _self to self - - src/salut-avahi-self.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit 11b6809fefc92a9e8f961f48f8df9926e99b8936 -Author: Guillaume Desmottes -Date: Wed Jan 14 14:16:05 2009 +0000 - - remove home-made base64 implementation - - src/Makefile.am | 2 - - src/base64.c | 196 ------------------------------------------------------- - src/base64.h | 28 -------- - 3 files changed, 0 insertions(+), 226 deletions(-) - -commit 2061f052c9dd48cda6da831dcb65bccbbfed8d3c -Author: Guillaume Desmottes -Date: Wed Jan 14 14:15:08 2009 +0000 - - salut-caps-hash: use glib's base64 implementation instead of our own - - src/salut-caps-hash.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit f38f8a7ee0f98468a9bb1c1730ffc123b3074c8f -Author: Guillaume Desmottes -Date: Wed Jan 14 13:47:10 2009 +0000 - - tubes-manager: fix SalutSelf leaks - - src/salut-tubes-manager.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 31cf0bb0550e5e4531a11d6fbc75614c1205d115 -Author: Guillaume Desmottes -Date: Wed Jan 14 12:52:34 2009 +0000 - - new_tubes_channel: we don't have to unref the contact twice - - src/salut-tubes-manager.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit c0f026c36d7c93c15679adb3043e9727e8b61bab -Author: Guillaume Desmottes -Date: Wed Jan 14 12:19:55 2009 +0000 - - test-caps-tubes.py: be sure that the caps announced in the service actually changes - - tests/twisted/avahi/test-caps-tubes.py | 14 +++++++++++++- - 1 files changed, 13 insertions(+), 1 deletions(-) - -commit fbf40bc695c1aeb392cb04433d9a06f0dcc4f4f0 -Author: Guillaume Desmottes -Date: Wed Jan 14 12:18:34 2009 +0000 - - add config.py to gitignore - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 575ef0ad7e0e419a02897978674bfe22c140a327 -Author: Guillaume Desmottes -Date: Wed Jan 14 10:47:45 2009 +0000 - - test-caps-self.py: generate caps instead of hardcoding them as they depend on the Salut version - - tests/twisted/avahi/test-caps-self.py | 25 ++++++++++++++++++++++++- - 1 files changed, 24 insertions(+), 1 deletions(-) - -commit 7f73a065f4106a811fa389e584a310eda565c201 -Author: Guillaume Desmottes -Date: Wed Jan 14 10:41:41 2009 +0000 - - generate tests/twisted/config.py containing PACKAGE_STRING - - configure.ac | 2 ++ - tests/twisted/Makefile.am | 6 ++++++ - 2 files changed, 8 insertions(+), 0 deletions(-) - -commit 20a481c7d1d6bbb0a9b68de85a812c87956080c8 -Author: Guillaume Desmottes -Date: Tue Jan 13 16:38:34 2009 +0000 - - add Channel_Class as external-type - - extensions/all.xml | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 5a18a46811350ca82a7970da27d1528b1be9c873 -Author: Alban Crequy -Date: Fri Dec 19 17:54:09 2008 +0000 - - Caps tests: update caps hash - - tests/twisted/avahi/test-caps-self.py | 2 +- - tests/twisted/avahi/test-caps-tubes.py | 10 +++++----- - 2 files changed, 6 insertions(+), 6 deletions(-) - -commit 3b942f12c73c17c313ad0ed5d2f9c6849e814bf7 -Author: Alban Crequy -Date: Fri Dec 19 17:40:56 2008 +0000 - - Use DEBUG() instead of g_warning() when receiving a bad capability from a contact - - src/salut-presence-cache.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit d79f947c5203dd981ed5aa7f971f30709bcb3f71 -Author: Alban Crequy -Date: Fri Dec 19 17:18:34 2008 +0000 - - test-caps-tubes.py: Update test to use # to concatenate service name to tubes caps URI - - tests/twisted/avahi/test-caps-tubes.py | 56 ++++++++++++++++---------------- - 1 files changed, 28 insertions(+), 28 deletions(-) - -commit 56560b7550fc7fdf2265ce528cc92164051fa15f -Author: Alban Crequy -Date: Fri Dec 19 17:11:02 2008 +0000 - - Use # to concatenate service name to tubes caps URI - - Tweak tubes features to be like: - http://telepathy.freedesktop.org/xmpp/tubes/stream#rfb - Rather than: - http://telepathy.freedesktop.org/xmpp/tubes/stream/rfb - - So we can put something at the http:// URI that talks about the - protocol. - - This commit is the same as in telepathy-gabble - 361575641a3132467e320a4484fea698ae3b935b - - src/salut-tubes-manager.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit dc78ee933cf6af24e1142816c96c9e80b732a25c -Author: Alban Crequy -Date: Fri Dec 19 17:06:20 2008 +0000 - - SalutMucManager and SalutRoomlistManager: implements SALUT_TYPE_CAPS_CHANNEL_MANAGER - - src/salut-muc-manager.c | 5 ++++- - src/salut-roomlist-manager.c | 5 ++++- - 2 files changed, 8 insertions(+), 2 deletions(-) - -commit 42af77d52985b7cd1b60ac52f60dc7e612f990fd -Author: Alban Crequy -Date: Fri Dec 19 16:49:36 2008 +0000 - - Fix after the merge: coding style - - src/salut-disco.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3aa512bf5947d2a1e51580228470fdf9eddef3be -Author: Alban Crequy -Date: Fri Dec 19 16:47:48 2008 +0000 - - Fix after the merge: includes - - src/salut-disco.c | 2 +- - src/salut-presence-cache.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit b1f294d884f6ccdf085283a21c516d48ff9e1683 -Author: Alban Crequy -Date: Fri Dec 19 16:47:24 2008 +0000 - - Fix after the merge: declaration order - - src/salut-connection.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 7f4b0478d8c91352358fdc75e5d235595b4ef7b9 -Author: Alban Crequy -Date: Tue Nov 25 17:05:42 2008 +0000 - - src/tube-iface.c: Set the "state" to contruct_only - - src/tube-iface.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 405dfea660efc932bca07fbf059cadef753ece14 -Author: Alban Crequy -Date: Mon Nov 24 12:57:23 2008 +0000 - - SalutFtManager implements SalutCapsChannelManager. Effectively returning FT capability still TBD. - - src/salut-ft-manager.c | 24 +++++++++++++++++++++++- - 1 files changed, 23 insertions(+), 1 deletions(-) - -commit d6e5191927b4e506ce89eb24758cc91b0167c9cf -Author: Alban Crequy -Date: Mon Nov 24 12:37:06 2008 +0000 - - lib/gibber/gibber-namespaces.h: Fix double #define from the merge - - lib/gibber/gibber-namespaces.h | 8 +------- - 1 files changed, 1 insertions(+), 7 deletions(-) - -commit 215c6dfdad4d80013a0c5245885ad7ffcf288ca0 -Author: Alban Crequy -Date: Fri Nov 7 18:26:51 2008 +0000 - - Remove include salut-direct-bytestream-manager.h - - src/salut-connection.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 3f95b0cc032b2cdef73df77f0bd6ed6bc321cb45 -Author: Alban Crequy -Date: Thu Oct 23 14:50:13 2008 -0400 - - SHA-1 code for capabilities hash: Use GChecksum for SHA-1 from src/sha1/sha1-util.[ch] - - src/salut-caps-hash.c | 14 +------------- - 1 files changed, 1 insertions(+), 13 deletions(-) - -commit 7693741b1bbd3f76924270b2956e1528bbcaa7b6 -Author: Alban Crequy -Date: Wed Oct 22 10:21:03 2008 -0400 - - SalutContactManager implements SALUT_TYPE_CAPS_CHANNEL_MANAGER - - src/salut-contact-manager.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 43a1300c823e5ed108866b88c8e3fa172febf0ec -Author: Alban Crequy -Date: Mon Oct 20 17:01:05 2008 -0400 - - Fix strict-aliasing warnings, and remove excessive usage of casts - - src/salut-capabilities.c | 7 ++++--- - src/salut-tubes-manager.c | 32 +++++++++++++++----------------- - 2 files changed, 19 insertions(+), 20 deletions(-) - -commit 272ee481fa740da2a1423fe05d8593b3965b53ff -Author: Alban Crequy -Date: Wed Oct 8 15:50:50 2008 +0100 - - Capabilities: Fix a leak - - src/salut-capabilities.h | 2 +- - src/salut-presence-cache.c | 2 ++ - src/salut-tubes-manager.c | 26 ++++++++++++++++++++------ - 3 files changed, 23 insertions(+), 7 deletions(-) - -commit 134bbc3a9cdc9b1a0a86c4d467a4c8acd4e0385a -Author: Alban Crequy -Date: Wed Oct 8 15:48:33 2008 +0100 - - lib/gibber/gibber-namespaces.h: Remove all the uneeded casts - - lib/gibber/gibber-namespaces.h | 38 +++++++++++++++++++------------------- - 1 files changed, 19 insertions(+), 19 deletions(-) - -commit 3e66c3c5651ba14f0efe274727c3d09de7eb0b1f -Author: Alban Crequy -Date: Wed Oct 8 15:15:19 2008 +0100 - - Stop using the workaround for bug #17329 - - - Update the spec in extensions/: - There was a bug in dbus-glib that prevent to use the right type: - Instead of a{ua(a{sv}as)}, we used a(ua{sv}as) as a workaround. - See http://bugs.freedesktop.org/show_bug.cgi?id=17329 - Now there is a fix, so we don't use the workaround anymore. - - - Update the implementation for the new spec - - - Update the unit test - - This commit is similar to the following commit in telepathy-gabble: - |commit 6971f458ad0816e40807549202d8a4ffe58b72aa - |Author: Alban Crequy - |Date: Wed Oct 8 11:30:59 2008 +0100 - - .../Connection_Interface_Contact_Capabilities.xml | 76 ++++++--- - src/salut-connection.c | 14 +- - src/salut-im-manager.c | 5 +- - src/salut-tubes-manager.c | 5 +- - tests/twisted/avahi/test-caps-tubes.py | 176 ++++++++++---------- - 5 files changed, 153 insertions(+), 123 deletions(-) - -commit 5790c345eabd1a434b43b33b8670f0491ab8f36d -Author: Alban Crequy -Date: Mon Oct 6 18:46:38 2008 +0100 - - SalutDisco: Remove commented code - - src/salut-disco.c | 39 --------------------------------------- - 1 files changed, 0 insertions(+), 39 deletions(-) - -commit a9c738cc2ca96bc1d27e064840ddefe0b3134c2f -Author: Alban Crequy -Date: Mon Oct 6 17:19:16 2008 +0100 - - Oops, I did not meant to commit theses debugs - - src/salut-tubes-manager.c | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) - -commit 62ded174d0206f01f0839d633ba4a62973b7bde8 -Author: Alban Crequy -Date: Mon Oct 6 17:11:55 2008 +0100 - - salut-presence-cache.c: Remove info->guys for now, it is not used and the reference count on SalutContact is wrong. However, the feature to not ask the same caps info from different contacts still need to be implemented. - - src/salut-presence-cache.c | 13 ------------- - 1 files changed, 0 insertions(+), 13 deletions(-) - -commit 6a09e7f829a6e1572c1a475aacda8b1959598952 -Author: Alban Crequy -Date: Mon Oct 6 16:55:24 2008 +0100 - - src/salut-tubes-manager.c: Fix reference counting on SalutContact - - src/salut-tubes-manager.c | 20 ++++++++++++++++++-- - 1 files changed, 18 insertions(+), 2 deletions(-) - -commit 19a076a56397996c449b870d2a7748267621c54c -Author: Alban Crequy -Date: Mon Oct 6 16:53:33 2008 +0100 - - src/salut-presence-cache.c: Fix reference counting on SalutContact - - src/salut-presence-cache.c | 9 +++------ - 1 files changed, 3 insertions(+), 6 deletions(-) - -commit 17b2a39dec4254afbe1ec8f322064b782ee55cfb -Author: Alban Crequy -Date: Mon Oct 6 15:11:06 2008 +0100 - - salut-disco.c: Take and release the GibberXmppConnection and the GibberIqHelper - - src/salut-disco.c | 17 +++++++++++++++-- - 1 files changed, 15 insertions(+), 2 deletions(-) - -commit a72287b3794d987afe795d0be1af8ad55f9bf5d4 -Author: Alban Crequy -Date: Mon Oct 6 15:01:29 2008 +0100 - - GibberIqHelper: Allow the user callback to unref the GibberIqHelper - - lib/gibber/gibber-iq-helper.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 7b4e317f517df154beac78b71cf64a827a816e9a -Author: Alban Crequy -Date: Mon Oct 6 10:59:56 2008 +0100 - - test-caps-tubes.py: Update test description - - tests/twisted/avahi/test-caps-tubes.py | 11 +++++------ - 1 files changed, 5 insertions(+), 6 deletions(-) - -commit c3f8bf2a134ed88fd3d045dc20cb22ae75e6b337 -Author: Alban Crequy -Date: Sun Oct 5 00:36:36 2008 +0100 - - Fix: remove_stanza_filter when SalutConnection is released. Register the filter without any XmppConnection criteria. - - src/salut-connection.c | 25 ++++++++----------------- - 1 files changed, 8 insertions(+), 17 deletions(-) - -commit 68d7850da817355507653fd6199f57821f140f7c -Author: Alban Crequy -Date: Sat Oct 4 23:16:42 2008 +0100 - - test-caps-tubes.py: Do not assume the contact handle is 2. - - tests/twisted/avahi/test-caps-tubes.py | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit ebb33652e7a6d6bc66e673a690404c76413de378 -Author: Alban Crequy -Date: Sat Oct 4 03:07:30 2008 +0100 - - Coding style - - src/salut-disco.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 5cdaaa18bd9163388f943f17be31a34f51f964e0 -Author: Alban Crequy -Date: Sat Oct 4 03:05:03 2008 +0100 - - Caps test: Remove uneeded variable - - tests/twisted/avahi/test-caps-tubes.py | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit cb7437f873d33fbc32153b4e241bbf9e442e07e9 -Author: Alban Crequy -Date: Sat Oct 4 03:04:34 2008 +0100 - - Salut always advertise generic tube capability - - src/salut-tubes-manager.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 3bdd157ccc943591b376e45ecb0ac2b0cd559335 -Author: Alban Crequy -Date: Sat Oct 4 02:31:27 2008 +0100 - - Do not ask contacts' caps when the contact does not advertise any caps - - src/salut-presence-cache.c | 42 ++++++++++++++++++++++++++++++------------ - 1 files changed, 30 insertions(+), 12 deletions(-) - -commit 0726d756a9d513067c3c3f47e2ef48d128886a47 -Author: Alban Crequy -Date: Sat Oct 4 02:24:17 2008 +0100 - - Workaround a race between the mdns publication with Avahi and opening a XmppConnection. It is a bug in Salut? - - tests/twisted/avahi/test-caps-tubes.py | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 8e3b395cdbe023eca0301299338254edb8134192 -Author: Alban Crequy -Date: Fri Oct 3 23:57:20 2008 +0100 - - Test caps: the fake contact does not send presence stanza but update its avahi txt records - - tests/twisted/avahi/test-caps-tubes.py | 131 ++++++++++++++++---------------- - 1 files changed, 67 insertions(+), 64 deletions(-) - -commit 5136ec8b620ece4d81b6290df6f381d6d81df125 -Author: Alban Crequy -Date: Fri Oct 3 23:55:53 2008 +0100 - - Also emit ContactCapabilitiesChanged when the new caps come from the cache (not only when the new caps come from a disco request) - - src/salut-presence-cache.c | 21 ++++++++++++++++----- - 1 files changed, 16 insertions(+), 5 deletions(-) - -commit 15997725f5478e45be74f1c52dc08b6b013dab98 -Author: Alban Crequy -Date: Fri Oct 3 23:54:34 2008 +0100 - - Add a contact attribute for the enhenced capabilities interface - - src/salut-connection.c | 91 +++++++++++++++++++++++++++++++++++------------- - 1 files changed, 67 insertions(+), 24 deletions(-) - -commit 178082b75e153211cc4e0561df8dbe95605400d0 -Author: Alban Crequy -Date: Fri Oct 3 23:53:15 2008 +0100 - - Fix salut_private_tubes_factory_add_cap - - src/salut-tubes-manager.c | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) - -commit 22ab97ab30c8b304b33c79f293dd86ddc4d7b036 -Author: Alban Crequy -Date: Fri Oct 3 19:34:01 2008 +0100 - - SalutTubesManager implements the enhenced capabilities interface - - src/salut-tubes-manager.c | 471 ++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 470 insertions(+), 1 deletions(-) - -commit da4d8ebbcd6da63c616df6a76ef222a2b8fee161 -Author: Alban Crequy -Date: Fri Oct 3 18:56:22 2008 +0100 - - SalutImManager implements salut_im_factory_get_contact_caps() - - src/salut-im-manager.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 62 insertions(+), 1 deletions(-) - -commit cbdc3c1ea60bf96c9617a292a928501e7b96c01e -Author: Alban Crequy -Date: Fri Oct 3 18:49:03 2008 +0100 - - test-caps-tubes.py: Check that Salut make disco requests - - tests/twisted/avahi/test-caps-tubes.py | 23 ++++++++++++----------- - 1 files changed, 12 insertions(+), 11 deletions(-) - -commit d68b4f3ac594daf8c5ac3f860627e6b2c52dfb5c -Author: Alban Crequy -Date: Fri Oct 3 18:48:19 2008 +0100 - - tests/twisted/saluttest.py: Fix sync_stream and make_result_iq - - tests/twisted/saluttest.py | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) - -commit d750632b9b1a1926930f5d941e93fa06c9c66342 -Author: Alban Crequy -Date: Fri Oct 3 18:47:12 2008 +0100 - - Caps: Reply to disco requests. Send disco requests. - - src/salut-caps-channel-manager.c | 2 +- - src/salut-caps-channel-manager.h | 4 +- - src/salut-caps-hash.c | 3 +- - src/salut-caps-hash.h | 2 +- - src/salut-connection.c | 192 ++++++++++++++++++- - src/salut-disco.c | 406 ++++++++++++++++++++++++-------------- - src/salut-disco.h | 7 +- - src/salut-presence-cache.c | 48 +++--- - src/salut-presence-cache.h | 3 +- - src/salut-tubes-channel.c | 1 + - 10 files changed, 486 insertions(+), 182 deletions(-) - -commit 75895a467ebf8003e44151353da7ec2f026d187b -Author: Alban Crequy -Date: Thu Oct 2 18:44:45 2008 +0100 - - Caps: Add SalutPresenceCache and SalutDisco - - lib/gibber/gibber-namespaces.h | 6 + - src/Makefile.am | 2 + - src/salut-avahi-contact.c | 11 + - src/salut-connection.c | 32 ++ - src/salut-connection.h | 7 + - src/salut-contact.c | 19 ++ - src/salut-contact.h | 12 + - src/salut-disco.c | 500 ++++++++++++++++++++++++++++++++ - src/salut-disco.h | 102 +++++++ - src/salut-presence-cache.c | 625 +++++++++++++++++++++++++++++++++++++++- - src/salut-presence-cache.h | 49 ++++ - 11 files changed, 1359 insertions(+), 6 deletions(-) - -commit 6c601c7c63566a1cd4eee42ec5c4a04fe7a587c9 -Author: Alban Crequy -Date: Thu Oct 2 17:57:16 2008 +0100 - - Implement caps_hash_compute_from_stanza() with Gibber - - src/salut-caps-hash.c | 246 +++++++++++++++++++++++++++++++++++++++++++++++++ - src/salut-caps-hash.h | 3 + - 2 files changed, 249 insertions(+), 0 deletions(-) - -commit 13e629a93d54a7e65e145ffaf926415fe917ef41 -Author: Alban Crequy -Date: Wed Oct 1 16:31:53 2008 +0100 - - test-caps-tubes.py: Import the tube caps test from Gabble. It does not pass atm because the implementation in Salut is missing and the test still need to be adapted. - - tests/twisted/Makefile.am | 1 + - tests/twisted/avahi/test-caps-tubes.py | 729 ++++++++++++++++++++++++++++++++ - tests/twisted/saluttest.py | 19 + - 3 files changed, 749 insertions(+), 0 deletions(-) - -commit 0175d22e4cfb7848f5b09a7d9e5fab03d7e74d5d -Author: Alban Crequy -Date: Wed Oct 1 16:30:57 2008 +0100 - - Caps: GetContactCapabilities calls every channel manager to get caps - - src/salut-connection.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 46 insertions(+), 1 deletions(-) - -commit 5dc7e644d11e0854b960c4cc2bdce06b57739229 -Author: Alban Crequy -Date: Wed Oct 1 15:36:24 2008 +0100 - - Tests: check txt records after SetSelfCapabilities - - tests/twisted/avahi/test-caps-self.py | 26 ++++++++++++++++++++++++++ - 1 files changed, 26 insertions(+), 0 deletions(-) - -commit 80c712d1516ed7e79c050ac62ee740f93d8353a4 -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 - - lib/gibber/gibber-namespaces.h | 3 +++ - src/salut-connection.c | 9 ++++++++- - 2 files changed, 11 insertions(+), 1 deletions(-) - -commit fef73cdedbeb61cab93367b1d74dbda34311c169 -Author: Alban Crequy -Date: Wed Oct 1 15:16:12 2008 +0100 - - src/salut-connection.c: Remove the hack to test caps txt record - - src/salut-connection.c | 10 ---------- - 1 files changed, 0 insertions(+), 10 deletions(-) - -commit 6c2699352744460d6cd7441de4431537e5caf3c1 -Author: Alban Crequy -Date: Wed Oct 1 15:14:56 2008 +0100 - - Avahi tests: Fix split when txt records contains '=' - - tests/twisted/avahitest.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a5b77d48c257da476fe9c4c8180f9e34ac5aff0f -Author: Alban Crequy -Date: Wed Oct 1 13:18:05 2008 +0100 - - Basic test for SetSelfCapabilities - - tests/twisted/Makefile.am | 1 + - tests/twisted/avahi/test-caps-self.py | 44 +++++++++++++++++++++++++++++++++ - 2 files changed, 45 insertions(+), 0 deletions(-) - -commit 3b40a24c21b1c3475ba7d5670939f9733e20cebb -Author: Alban Crequy -Date: Wed Oct 1 13:17:06 2008 +0100 - - Empty implementation of SALUT_CAPS_CHANNEL_MANAGER by channel managers - - src/salut-im-manager.c | 5 ++++- - src/salut-tubes-manager.c | 5 ++++- - 2 files changed, 8 insertions(+), 2 deletions(-) - -commit b5cf5c9f79b9cedcae9b2381a45899693e724dea -Author: Alban Crequy -Date: Wed Oct 1 12:12:23 2008 +0100 - - Start the implementation of D-Bus method call set_self_capabilities() - - src/Makefile.am | 2 + - src/salut-connection.c | 224 +++++++++++++++++++++++++++++++++++++++---- - src/salut-presence-cache.c | 105 +++++++++++++++++++++ - src/salut-presence-cache.h | 46 +++++++++ - 4 files changed, 356 insertions(+), 21 deletions(-) - -commit 321b94928472bfad35f80cdae8135b399f062ae5 -Author: Alban Crequy -Date: Tue Sep 30 18:26:13 2008 +0100 - - Import capability code from Gabble - - src/Makefile.am | 8 ++ - src/base64.c | 196 +++++++++++++++++++++++++++++++ - src/base64.h | 28 +++++ - src/debug.h | 36 +++--- - src/salut-capabilities.c | 60 ++++++++++ - src/salut-capabilities.h | 46 ++++++++ - src/salut-caps-channel-manager.c | 191 ++++++++++++++++++++++++++++++ - src/salut-caps-channel-manager.h | 140 ++++++++++++++++++++++ - src/salut-caps-hash.c | 236 ++++++++++++++++++++++++++++++++++++++ - src/salut-caps-hash.h | 29 +++++ - src/salut-self.h | 1 + - 11 files changed, 954 insertions(+), 17 deletions(-) - -commit a93f4d824d1328bd3ab09be744f316df622c3eb7 -Author: Alban Crequy -Date: Tue Sep 9 11:33:02 2008 +0100 - - Add the new capabilities interface in extensions/ - - .../Connection_Interface_Contact_Capabilities.xml | 150 ++++++++++++++++++++ - extensions/Makefile.am | 1 + - extensions/all.xml | 1 + - 3 files changed, 152 insertions(+), 0 deletions(-) - -commit 94cfc605aff7eeb4842386f6ac85190505d18259 -Author: Alban Crequy -Date: Mon Aug 25 10:41:15 2008 +0100 - - Ugly hack to test caps txt records - - src/salut-connection.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit d9310c7bd3f1300fcd15ecb596ab3adeacbf8c9f -Author: Alban Crequy -Date: Fri Aug 22 19:34:18 2008 +0100 - - Add salut_self_set_caps() that publish XEP-0115's {node, hash, ver} on Avahi - - src/salut-avahi-self.c | 28 ++++++++++++++++++++++++++++ - src/salut-self.c | 20 ++++++++++++++++++++ - src/salut-self.h | 7 +++++++ - 3 files changed, 55 insertions(+), 0 deletions(-) - -commit 74ae0dfeca85df93cda9ee9259f4359d1c535010 -Author: Dafydd Harries -Date: Sun Feb 8 13:15:46 2009 +0100 - - copy COPYING/AUTHORS files to lib/gibber - - lib/gibber/AUTHORS | 1 + - lib/gibber/COPYING | 542 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 543 insertions(+), 0 deletions(-) - -commit 2359ca653f36ca45e9486a184e0c16955deffc9e -Author: Dafydd Harries -Date: Sun Feb 8 13:15:12 2009 +0100 - - move Gibber tests into lib/gibber - - .gitignore | 9 +- - configure.ac | 3 +- - lib/gibber/Makefile.am | 2 +- - lib/gibber/tests/Makefile.am | 122 ++++ - lib/gibber/tests/check-gibber-iq-helper.c | 432 +++++++++++++ - lib/gibber/tests/check-gibber-listener.c | 211 +++++++ - .../check-gibber-r-multicast-causal-transport.c | 550 +++++++++++++++++ - lib/gibber/tests/check-gibber-r-multicast-packet.c | 228 +++++++ - lib/gibber/tests/check-gibber-r-multicast-sender.c | 652 ++++++++++++++++++++ - lib/gibber/tests/check-gibber-resolver.c | 91 +++ - lib/gibber/tests/check-gibber-sasl-auth.c | 213 +++++++ - .../tests/check-gibber-xmpp-connection-listener.c | 120 ++++ - lib/gibber/tests/check-gibber-xmpp-connection.c | 126 ++++ - lib/gibber/tests/check-gibber-xmpp-error.c | 139 +++++ - lib/gibber/tests/check-gibber-xmpp-node.c | 167 +++++ - lib/gibber/tests/check-gibber-xmpp-reader.c | 127 ++++ - lib/gibber/tests/check-gibber-xmpp-stanza.c | 165 +++++ - lib/gibber/tests/check-gibber.h | 20 + - lib/gibber/tests/check-helpers.c | 63 ++ - lib/gibber/tests/check-helpers.h | 43 ++ - lib/gibber/tests/check-main.c | 54 ++ - lib/gibber/tests/inputs/Makefile.am | 5 + - lib/gibber/tests/inputs/groupchat-invite.input | 32 + - .../inputs/simple-message-attrnamespace.input | 17 + - lib/gibber/tests/inputs/simple-message.input | 16 + - .../tests/inputs/strange-streamopening.input | 9 + - lib/gibber/tests/inputs/tls-stream-start.input | 18 + - lib/gibber/tests/run-xmpp-connection-test.sh | 29 + - lib/gibber/tests/test-r-multicast-transport-io.c | 226 +++++++ - lib/gibber/tests/test-resolver.c | 113 ++++ - lib/gibber/tests/test-resolver.h | 59 ++ - lib/gibber/tests/test-sasl-auth-server.c | 460 ++++++++++++++ - lib/gibber/tests/test-sasl-auth-server.h | 73 +++ - lib/gibber/tests/test-transport.c | 209 +++++++ - lib/gibber/tests/test-transport.h | 73 +++ - lib/gibber/tests/test-xmpp-connection.c | 157 +++++ - tests/Makefile.am | 73 +-- - tests/check-gibber-iq-helper.c | 432 ------------- - tests/check-gibber-listener.c | 211 ------- - tests/check-gibber-r-multicast-causal-transport.c | 550 ----------------- - tests/check-gibber-r-multicast-packet.c | 228 ------- - tests/check-gibber-r-multicast-sender.c | 652 -------------------- - tests/check-gibber-resolver.c | 91 --- - tests/check-gibber-sasl-auth.c | 213 ------- - tests/check-gibber-xmpp-connection-listener.c | 120 ---- - tests/check-gibber-xmpp-connection.c | 126 ---- - tests/check-gibber-xmpp-error.c | 139 ----- - tests/check-gibber-xmpp-node.c | 167 ----- - tests/check-gibber-xmpp-reader.c | 127 ---- - tests/check-gibber-xmpp-stanza.c | 165 ----- - tests/check-gibber.h | 20 - - tests/check-main.c | 31 - - tests/inputs/Makefile.am | 5 - - tests/inputs/groupchat-invite.input | 32 - - tests/inputs/simple-message-attrnamespace.input | 17 - - tests/inputs/simple-message.input | 16 - - tests/inputs/strange-streamopening.input | 9 - - tests/inputs/tls-stream-start.input | 18 - - tests/run-xmpp-connection-test.sh | 29 - - tests/test-r-multicast-transport-io.c | 226 ------- - tests/test-resolver.c | 113 ---- - tests/test-resolver.h | 59 -- - tests/test-sasl-auth-server.c | 460 -------------- - tests/test-sasl-auth-server.h | 73 --- - tests/test-transport.c | 209 ------- - tests/test-transport.h | 73 --- - tests/test-xmpp-connection.c | 157 ----- - 67 files changed, 5032 insertions(+), 4842 deletions(-) - -commit 2519b4e60a8a5aa31e5673824e7ff9d4dc0da054 -Author: Guillaume Desmottes -Date: Mon Feb 2 15:05:33 2009 +0000 - - coding style fix - - lib/gibber/gibber-oob-file-transfer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit eed82f0a0ece41c864a924cdd2e35213281c36bd -Author: Guillaume Desmottes -Date: Mon Feb 2 15:04:49 2009 +0000 - - add test-send-file-ipv6.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 7c750650961a6aac4e189b46e1353a3ec003dd56 -Author: Guillaume Desmottes -Date: Mon Feb 2 15:04:28 2009 +0000 - - add test-send-file-ipv6.py but disabled for now because of Python bug - - tests/twisted/avahi/test-send-file-ipv6.py | 47 ++++++++++++++++++++++++++++ - 1 files changed, 47 insertions(+), 0 deletions(-) - -commit 261bf8d951cf3973c9a5f23eb83710723de9aeae -Author: Guillaume Desmottes -Date: Mon Feb 2 15:02:03 2009 +0000 - - gibber_oob_file_transfer_offer: create a HTTP server listenning on IPv6 interfaces if the XMPP connection is a IP6 one - - lib/gibber/gibber-oob-file-transfer.c | 41 ++++++++++++++++++++++++++++++++- - 1 files changed, 40 insertions(+), 1 deletions(-) - -commit 71dd1bd38433e70a6683ca6bc99ef5ea71995f02 -Author: Guillaume Desmottes -Date: Mon Feb 2 14:05:27 2009 +0000 - - create_transfer_offer: add brackets around IPv6 address - - lib/gibber/gibber-oob-file-transfer.c | 16 ++++++++++++++-- - 1 files changed, 14 insertions(+), 2 deletions(-) - -commit c54cccc92db948ea718c6d177eb5134c9a12b9ae -Author: Guillaume Desmottes -Date: Mon Feb 2 14:01:48 2009 +0000 - - http_server_cb: add Content-Length header - - lib/gibber/gibber-oob-file-transfer.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit a7d42ea14b1a4878a44c55eccdd046a4f8e64cb8 -Author: Guillaume Desmottes -Date: Mon Feb 2 13:48:49 2009 +0000 - - create_transfer_offer: use gibber_transport_get_sockaddr and a struct sockaddr_storage so we can store an IPv6 address - - lib/gibber/gibber-oob-file-transfer.c | 13 ++++++------- - 1 files changed, 6 insertions(+), 7 deletions(-) - -commit 4978c1583565400d4b9883bbd212ffb73b57a411 -Author: Guillaume Desmottes -Date: Mon Feb 2 12:34:09 2009 +0000 - - test-receive-file-ipv6: announce the test presence using IPv6 - - tests/twisted/avahi/test-receive-file-ipv6.py | 15 +++++++++++++-- - 1 files changed, 13 insertions(+), 2 deletions(-) - -commit e77c6de6ae6cb62eb7fbf3559a4396cf4dcdc653 -Author: Guillaume Desmottes -Date: Mon Feb 2 09:57:25 2009 +0000 - - add test-receive-file-ipv6.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit c373bbb351de421881d9f0e2f8a16d541bb21347 -Author: Guillaume Desmottes -Date: Mon Feb 2 09:57:17 2009 +0000 - - add test-receive-file-ipv6.py - - tests/twisted/avahi/test-receive-file-ipv6.py | 60 +++++++++++++++++++++++++ - 1 files changed, 60 insertions(+), 0 deletions(-) - -commit 4473f19dcc714bca835e4aa3213b8ad279fd2b4e -Author: Guillaume Desmottes -Date: Mon Feb 2 09:56:18 2009 +0000 - - add _get_http_server_class - - tests/twisted/avahi/file_transfer_helper.py | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 9f4dbfce821d9b6307e64637f4815df8d4a90522 -Author: Guillaume Desmottes -Date: Fri Jan 30 18:20:47 2009 +0000 - - xmppstream: add connect_to_stream6 - - tests/twisted/xmppstream.py | 14 +++++++++++++- - 1 files changed, 13 insertions(+), 1 deletions(-) - -commit 302b692fdfe9e20c12ccb8ba2441def672c2a57d -Author: Guillaume Desmottes -Date: Fri Jan 30 18:20:27 2009 +0000 - - ipv6.py: add client side code - - tests/twisted/ipv6.py | 113 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 113 insertions(+), 0 deletions(-) - -commit 146375462dfd663c05d26a11c0bc36cd789d15ce -Author: Guillaume Desmottes -Date: Fri Jan 30 18:07:21 2009 +0000 - - listen_for_service: don't specify the proto so IPv6 service are announced too - - tests/twisted/avahitest.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b36d466bb783b95e6f0a318b2178bb9f74df37c9 -Author: Guillaume Desmottes -Date: Fri Jan 30 14:06:08 2009 +0000 - - xmppstream: add setup_stream_listener6 - - tests/twisted/xmppstream.py | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit 6357d7e4d233ef24a826ae524bfbcd2edf4738bb -Author: Guillaume Desmottes -Date: Fri Jan 30 14:05:44 2009 +0000 - - steal some code from proposed IPv6 patch support to make it actually work - - tests/twisted/ipv6.py | 85 +++++++++++++++++++++++++++--------------------- - 1 files changed, 48 insertions(+), 37 deletions(-) - -commit 761e13ade1a41871280670455bdff6e28e14fa22 -Author: Guillaume Desmottes -Date: Fri Jan 30 13:33:48 2009 +0000 - - import ipv6.py from Sjoerd - - tests/twisted/ipv6.py | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 56 insertions(+), 0 deletions(-) - -commit 7a6fd3bc526b0e95fb6fa76436fa62c977c27a38 -Author: Guillaume Desmottes -Date: Mon Dec 22 15:28:35 2008 +0100 - - add proto optionnal argument to AvahiAnnouncer - - tests/twisted/avahitest.py | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit 23ad6e21f0d86660741b6ef250aa1113e02eee50 -Author: Guillaume Desmottes -Date: Fri Feb 6 16:49:30 2009 +0100 - - muc-manager: salut_tubes_channel_tube_request now takes channel type, service and params as args - - src/salut-muc-manager.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit 5306989ae5add216aa1bccdcd8294125da080414 -Author: Guillaume Desmottes -Date: Fri Jan 30 12:09:59 2009 +0000 - - salut_tube_stream_accept_stream_tube: set address_type, access_control and access_control_param when accepting the tube - - src/tube-stream.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 632ce76a5113415403752ff5d516e0ccb53cc7a0 -Author: Guillaume Desmottes -Date: Thu Jan 29 17:19:26 2009 +0000 - - gibber_bytestream_direct_initiate: unref the bytestream as set_transport ref it - - lib/gibber/gibber-bytestream-direct.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit bd8ec2e88915bd1c9bdda7326ecf235762306b68 -Author: Guillaume Desmottes -Date: Thu Jan 29 17:15:15 2009 +0000 - - tube-stream: contact_new_connection_cb: unref the bytestream as add_bytestream keep its own ref - - src/tube-stream.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit e2b6b7a266cbe5424f4722d153fe687cadf23010 -Author: Guillaume Desmottes -Date: Thu Jan 29 17:14:39 2009 +0000 - - tube-stream: start_stream_direct: no need to ref the bytestream as we just create it - - src/tube-stream.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 378e449a90e906f16e56c71feed7ac6e3ce4b453 -Author: Guillaume Desmottes -Date: Thu Jan 29 16:36:36 2009 +0000 - - test-two-muc-stream-tubes: tube and tubes channels are now announced together - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 52 +++++++++++---------- - 1 files changed, 27 insertions(+), 25 deletions(-) - -commit aceba965292c9881d7b35cd4665c01ee9efcaecf -Author: Guillaume Desmottes -Date: Thu Jan 29 16:36:07 2009 +0000 - - salut_muc_channel_received_stanza: announce tubes and tube channels at the same time - - src/salut-muc-channel.c | 35 +++++++++++++++++++++++++++++++++-- - 1 files changed, 33 insertions(+), 2 deletions(-) - -commit fb6d84782017e3f6a036dd46a9a6bd80d6d7c7cf -Author: Guillaume Desmottes -Date: Thu Jan 29 16:34:06 2009 +0000 - - salut_muc_manager_ensure_tubes_channel: let the caller announce the channel - - src/salut-muc-manager.c | 9 +++++++-- - src/salut-muc-manager.h | 3 ++- - 2 files changed, 9 insertions(+), 3 deletions(-) - -commit 7000280e5edbc56c55f7e05802e0669f22b5226f -Author: Guillaume Desmottes -Date: Thu Jan 29 16:12:18 2009 +0000 - - salut_tubes_channel_muc_message_received: delegate NewChannel announcements to the caller - - src/salut-tubes-channel.c | 32 ++++++++++++-------------------- - src/salut-tubes-channel.h | 4 ++-- - 2 files changed, 14 insertions(+), 22 deletions(-) - -commit 23231a64361a3e73ffffba2672ebf369395aff30 -Author: Guillaume Desmottes -Date: Thu Jan 29 15:55:41 2009 +0000 - - test-offer-private-stream-tube.py: tube and tubes channels are now announced together - - .../avahi/test-offer-private-stream-tube.py | 10 ++++------ - 1 files changed, 4 insertions(+), 6 deletions(-) - -commit 8f65369605be3f14526c045c0378afaf8162e4e6 -Author: Guillaume Desmottes -Date: Thu Jan 29 15:27:49 2009 +0000 - - test-two-private-stream-tubes.py: test using the new API - - .../twisted/avahi/test-two-private-stream-tubes.py | 152 ++++++++++++++++++++ - 1 files changed, 152 insertions(+), 0 deletions(-) - -commit 5f1a9af8a46ce0cfe5b423d4648a2a70d19bf659 -Author: Guillaume Desmottes -Date: Thu Jan 29 15:27:26 2009 +0000 - - tubes-manager: announce the tubes channel with the newly created tube channel when receiving an incoming tube - - src/salut-tubes-manager.c | 21 +++++++++++++++++---- - 1 files changed, 17 insertions(+), 4 deletions(-) - -commit 064e9677616e7b1fe20465c1f720fdcd13d49f1d -Author: Guillaume Desmottes -Date: Thu Jan 29 15:24:39 2009 +0000 - - tubes-manager: when requesting a tube, announce the tubes channel with it - - src/salut-tubes-manager.c | 14 ++++++++++---- - 1 files changed, 10 insertions(+), 4 deletions(-) - -commit 220c0afc219d0220b8341cee9a6ce99a87e10212 -Author: Guillaume Desmottes -Date: Thu Jan 29 15:22:55 2009 +0000 - - salut_tubes_channel_message_received now returns the newly created channel so caller can announce it - - src/salut-tubes-channel.c | 10 ++++++++-- - src/salut-tubes-channel.h | 2 +- - 2 files changed, 9 insertions(+), 3 deletions(-) - -commit 689abbf2b202de240a04b93b6ab8f1bfc431b3d0 -Author: Guillaume Desmottes -Date: Thu Jan 29 15:20:59 2009 +0000 - - salut_tube_stream_accepted: fire TubeChannelStateChanged signal - - src/tube-stream.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit fcb5c22cda2647d52ff590f16d959ebb129d5ff4 -Author: Guillaume Desmottes -Date: Thu Jan 29 15:16:59 2009 +0000 - - test-two-private-stream-tubes: check if we receive welcome msg from the server - - .../twisted/avahi/test-two-private-stream-tubes.py | 28 +++++++++++++++++++- - 1 files changed, 27 insertions(+), 1 deletions(-) - -commit 3a6cfadd5d0c6d1c1272df75115ad6931b3ce99b -Author: Guillaume Desmottes -Date: Thu Jan 29 14:23:03 2009 +0000 - - test-two-private-stream-tubes: don't add signals twice in the event queue - - .../twisted/avahi/test-two-private-stream-tubes.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 71836f0f0970b568f2ae9599bbddc6047d263609 -Author: Guillaume Desmottes -Date: Thu Jan 29 14:09:25 2009 +0000 - - tubes-manager: don't fire NewChannel signal in new_tubes_channel - - src/salut-tubes-manager.c | 25 ++++++++++++++----------- - 1 files changed, 14 insertions(+), 11 deletions(-) - -commit 7f071f45e9f4f28b8fb76686d3d80c4cd72a2c0f -Author: Guillaume Desmottes -Date: Thu Jan 29 13:10:48 2009 +0000 - - test-two-private-stream-tubes: close the tubes channels and check connections are properly disconnected - - .../twisted/avahi/test-two-private-stream-tubes.py | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 9cc77f9d07f48e179dd04c821ee6cf4baf3ed855 -Author: Guillaume Desmottes -Date: Thu Jan 29 13:07:46 2009 +0000 - - test-two-private-stream-tubes.py: small code simplification - - .../twisted/avahi/test-two-private-stream-tubes.py | 8 +++----- - 1 files changed, 3 insertions(+), 5 deletions(-) - -commit 3e76a1a36c4dfa8bf8447c7b8282abff9a45d7b7 -Author: Guillaume Desmottes -Date: Thu Jan 29 12:58:05 2009 +0000 - - test-two-private-stream-tubes.py: check TubeClosed signals - - .../twisted/avahi/test-two-private-stream-tubes.py | 17 ++++++++++++----- - 1 files changed, 12 insertions(+), 5 deletions(-) - -commit 992cfb43c9fa06457857f30fb0e3099586933551 -Author: Guillaume Desmottes -Date: Thu Jan 29 12:49:37 2009 +0000 - - test-two-private-stream-tubes: use constants - - .../twisted/avahi/test-two-private-stream-tubes.py | 27 ++++++-------------- - 1 files changed, 8 insertions(+), 19 deletions(-) - -commit 6091ad55972af3dbebd8f8e9643a0cd64a229d7a -Author: Guillaume Desmottes -Date: Thu Jan 29 12:48:39 2009 +0000 - - constants.py: add CHANNEL_TYPE_CONTACT_LIST - - tests/twisted/constants.py | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 85eac7fd5634f4847653f0c0edaff90b07294a94 -Author: Guillaume Desmottes -Date: Thu Jan 29 11:49:05 2009 +0000 - - tube-stream: free the object_path when finalizing - - src/tube-stream.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit cdf22e157af3c108c30dc5a87a8e998a6cd25d8a -Author: Guillaume Desmottes -Date: Wed Jan 28 17:14:06 2009 +0000 - - tube_closed_cb: fire DBusNamesChanged only if the tube is a muc D-Bus one - - src/salut-tubes-channel.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit 999d88040972f1f7c3fccc4bad9d7d59b5cc96b4 -Author: Guillaume Desmottes -Date: Wed Jan 28 17:11:29 2009 +0000 - - test-two-muc-stream-tubes: check if TubeChannelStateChanged is fired when Offering the tube - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 24bca7a42a1d6e818f35015156c25d85ee5d6b28 -Author: Guillaume Desmottes -Date: Wed Jan 28 17:11:03 2009 +0000 - - salut_tube_stream_offer_stream_tube: fire TubeChannelStateChanged signal when accepting a muc tube - - src/tube-stream.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 0149c7bcd3bbb515cd6d89377733d9704011d873 -Author: Guillaume Desmottes -Date: Wed Jan 28 16:58:06 2009 +0000 - - test-two-muc-stream-tubes: test offering and accepting the tube (new API) - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 122 ++++++++++++++++++++++ - 1 files changed, 122 insertions(+), 0 deletions(-) - -commit a6dcb8168ac4d467490fb5a42cbec0cc1a1397b9 -Author: Guillaume Desmottes -Date: Wed Jan 28 16:57:02 2009 +0000 - - tube_closed_cb: fire Closed and ChannelClosed signals - - src/salut-tubes-channel.c | 24 ++++++++++++++++++++++++ - 1 files changed, 24 insertions(+), 0 deletions(-) - -commit efc047fd69d91e9da1c46d1d49c328b5f90df64f -Author: Guillaume Desmottes -Date: Wed Jan 28 16:56:37 2009 +0000 - - tubes-channel: emit NewChannel when we create a new incoming muc stream tube - - src/salut-tubes-channel.c | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit 6354840129b1ed39f239688b62c326d8cd37ab36 -Author: Guillaume Desmottes -Date: Wed Jan 28 16:55:21 2009 +0000 - - tube-stream: fire TubeChannelStateChanged signal when tube is open - - src/tube-stream.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 030c24a7009e8cb889558b6617fbfc912b19cb37 -Author: Guillaume Desmottes -Date: Wed Jan 28 16:39:04 2009 +0000 - - test-two-muc-stream-tubes: ordering of the server-connected and client-connected is not garantee - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 517c10d3dff3da179f6f7daee3ce244e9de2a706 -Author: Guillaume Desmottes -Date: Wed Jan 28 16:02:14 2009 +0000 - - test-two-muc-stream-tubes: fix Interfaces check - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 9e27a21746c00375eaad7995d28833ebcd66f19e -Author: Guillaume Desmottes -Date: Wed Jan 28 16:01:41 2009 +0000 - - test-two-muc-stream-tubes.py: no need to use an async call when requesting the tube - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1e6165759dd24c021eeb127c9630929cffcab865 -Author: Guillaume Desmottes -Date: Wed Jan 28 15:50:17 2009 +0000 - - constants: fix INTERFACES - - tests/twisted/constants.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b3c92ec373dc0e53307d594d3a2a5b49c86784aa -Author: Guillaume Desmottes -Date: Wed Jan 28 15:23:24 2009 +0000 - - test-request-muc-tubes.py: use constants - - tests/twisted/avahi/test-request-muc-tubes.py | 89 +++++++++---------------- - 1 files changed, 33 insertions(+), 56 deletions(-) - -commit ce05558120dbd4815e01dfacc077dddf4b75d0d4 -Author: Guillaume Desmottes -Date: Wed Jan 28 15:12:47 2009 +0000 - - test-two-muc-stream-tubes.py: start to test new tube API - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 54 +++++++++++++++++++++- - 1 files changed, 53 insertions(+), 1 deletions(-) - -commit d15d9f0c2fe5b0e954592dbf2f15c83cfcda4108 -Author: Guillaume Desmottes -Date: Wed Jan 28 15:11:38 2009 +0000 - - test-request-muc-tubes: text and tubes channels are announced together - - tests/twisted/avahi/test-request-muc-tubes.py | 126 +++++++++++-------------- - 1 files changed, 54 insertions(+), 72 deletions(-) - -commit 564fa6a1526c08d778911178fba86fd9d37d10cb -Author: Guillaume Desmottes -Date: Wed Jan 28 15:10:54 2009 +0000 - - muc-manager: handle StreamTube channel requests - - src/salut-muc-manager.c | 146 ++++++++++++++++++++++++++++++++++++++++------- - 1 files changed, 124 insertions(+), 22 deletions(-) - -commit 21575eb7675a5f000b29a898ab38faf0db14c4f5 -Author: Guillaume Desmottes -Date: Wed Jan 28 15:09:18 2009 +0000 - - salut_tubes_channel_offer_stream_tube: call salut_tube_stream_offer - - src/salut-tubes-channel.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit cdbcff9f329be2d22ef1f828fccb802a142fc869 -Author: Guillaume Desmottes -Date: Wed Jan 28 15:08:45 2009 +0000 - - add salut_tube_stream_offer - - src/tube-stream.c | 34 ++++++++++++++++++++++++++++++++++ - src/tube-stream.h | 2 ++ - 2 files changed, 36 insertions(+), 0 deletions(-) - -commit 5437ef121eba94c4671aee3daaf7203e5c739463 -Author: Guillaume Desmottes -Date: Wed Jan 28 15:07:55 2009 +0000 - - tube-stream: remove connection signal that doesn't make sense - - src/tube-stream.c | 12 ------------ - 1 files changed, 0 insertions(+), 12 deletions(-) - -commit 54f386de1016a5c880a98dac3ce9e137f102cd26 -Author: Guillaume Desmottes -Date: Wed Jan 28 15:06:55 2009 +0000 - - salut_tube_stream_add_bytestream: fire NewConnection signal (new API) - - src/tube-stream.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit bead5a78618560da0cbe5c9aa833f03e93438da2 -Author: Guillaume Desmottes -Date: Wed Jan 28 15:04:32 2009 +0000 - - tube-stream: not initiated tube are always in the not-offered state - - src/tube-stream.c | 34 +++++++++------------------------- - 1 files changed, 9 insertions(+), 25 deletions(-) - -commit 5f929f12419a3791a090a98029025c8dafe2dbbf -Author: Guillaume Desmottes -Date: Wed Jan 28 15:02:20 2009 +0000 - - tubes-channel: don't announce tube on the old API until it has been offered - - src/salut-tubes-channel.c | 63 +++++++++++++++++++++++++++++++++++++++----- - 1 files changed, 55 insertions(+), 8 deletions(-) - -commit bc7fb26f4558474451726d1c3c619554690336d6 -Author: Guillaume Desmottes -Date: Wed Jan 28 15:00:29 2009 +0000 - - muc-manager: announce stream tube channel class - - src/salut-muc-manager.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 8a65e72ac348596b91644cd1be6ecb8208f59661 -Author: Guillaume Desmottes -Date: Wed Jan 28 14:59:00 2009 +0000 - - test-offer-private-stream-tube: use new API to offer the tube - - .../avahi/test-offer-private-stream-tube.py | 11 +++-------- - 1 files changed, 3 insertions(+), 8 deletions(-) - -commit 748fe85efa8c130546e30dc326c4abd6707a610e -Author: Guillaume Desmottes -Date: Wed Jan 28 14:58:12 2009 +0000 - - tubes-manager: set requested property when creating a tubes channel - - src/salut-tubes-manager.c | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit de646b127371a204bbb7b816702d1e2edbcef52c -Author: Guillaume Desmottes -Date: Wed Jan 28 14:57:38 2009 +0000 - - tubes-channel: add priv->requested - - src/salut-tubes-channel.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 8fb32b04f8e0b978c77b6cb289756e8ee2012c36 -Author: Guillaume Desmottes -Date: Wed Jan 28 14:56:07 2009 +0000 - - constants: add INTERFACES - - tests/twisted/constants.py | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit d8b506f30718b715b64c6da9811d8fbe5ee62820 -Author: Guillaume Desmottes -Date: Wed Jan 28 11:30:44 2009 +0000 - - constants.py: add PROPERTIES_IFACE - - tests/twisted/constants.py | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 4432af58423a73f42b0dfa834fa5511a20d7e4f6 -Author: Guillaume Desmottes -Date: Wed Jan 28 11:30:13 2009 +0000 - - test-offer-private-stream-tube.py: TargetID is a tube channel allowed property - - .../avahi/test-offer-private-stream-tube.py | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit fb390c81842ae65c879c013b53bf6589615dfd6a -Author: Guillaume Desmottes -Date: Wed Jan 28 11:29:49 2009 +0000 - - tubes-mgr: use salut_stream_tube_channel_allowed_properties instead of our own copy of it - - src/salut-tubes-manager.c | 12 ++++-------- - 1 files changed, 4 insertions(+), 8 deletions(-) - -commit fb5e6abfbdb3c5fe9bdd0758ce92bcf1163c3b3a -Author: Guillaume Desmottes -Date: Wed Jan 28 11:27:55 2009 +0000 - - tube-stream: add salut_stream_tube_channel_allowed_properties - - src/tube-stream.h | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 3b926fad8f25f4a6785008cff5622533ce8ad0ce -Author: Guillaume Desmottes -Date: Wed Jan 28 11:06:26 2009 +0000 - - test-two-muc-stream-tubes: use constants.py and check if the tubes are properly closed - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 31 ++++++++------------- - 1 files changed, 12 insertions(+), 19 deletions(-) - -commit e820a6836428797fb2693415cbb6a3c3f07cce33 -Author: Guillaume Desmottes -Date: Wed Jan 28 10:59:44 2009 +0000 - - add few constants - - tests/twisted/constants.py | 15 ++++++++++++++- - 1 files changed, 14 insertions(+), 1 deletions(-) - -commit debf54e1ea1fd651ffbe80f040a254a26805bb12 -Author: Guillaume Desmottes -Date: Wed Jan 28 10:54:20 2009 +0000 - - rename test-tube.py to test-offer-private-stream-tube.py - - tests/twisted/Makefile.am | 2 +- - .../avahi/test-offer-private-stream-tube.py | 376 ++++++++++++++++++++ - tests/twisted/avahi/test-tube.py | 376 -------------------- - 3 files changed, 377 insertions(+), 377 deletions(-) - -commit 0f6b5ceb805a7f5f554b2ae7e9b2c6728fa76f33 -Author: Guillaume Desmottes -Date: Wed Jan 28 10:47:12 2009 +0000 - - rename test-two-tubes.py to test-two-private-stream-tubes.py - - tests/twisted/Makefile.am | 2 +- - .../twisted/avahi/test-two-private-stream-tubes.py | 180 ++++++++++++++++++++ - tests/twisted/avahi/test-two-tubes.py | 180 -------------------- - 3 files changed, 181 insertions(+), 181 deletions(-) - -commit b795655221b536bd849fe73dfbd2a735322f007f -Author: Guillaume Desmottes -Date: Tue Jan 27 17:14:35 2009 +0000 - - test-tube.py: Status has been renamed to State - - tests/twisted/avahi/test-tube.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 7cedc3b2cd908748a46c35f669e99de71cefa168 -Author: Guillaume Desmottes -Date: Tue Jan 27 17:14:15 2009 +0000 - - rename TUBE_STATUS to TUBE_STATE - - tests/twisted/constants.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 00f93f1e55a3cadc287417b5f2584a2efdf46963 -Author: Guillaume Desmottes -Date: Tue Jan 27 17:13:50 2009 +0000 - - salut_tube_stream_class_init: Status has been renamed to State - - src/tube-stream.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bff85ce67aa69744acc341f7bbb6fac1b9cf9c81 -Author: Guillaume Desmottes -Date: Tue Jan 27 17:13:32 2009 +0000 - - sync tube new API with latest draft - - extensions/Channel_Interface_Tube.xml | 10 ++-- - extensions/Channel_Type_DBus_Tube.xml | 102 +++++++++++-------------------- - extensions/Channel_Type_Stream_Tube.xml | 4 +- - 3 files changed, 44 insertions(+), 72 deletions(-) - -commit 151231d6f0a6afc13d691c201c60dd9d7934b7c4 -Author: Guillaume Desmottes -Date: Tue Jan 27 16:59:49 2009 +0000 - - all.xml: add DBus_Unique_Name - - extensions/all.xml | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 14056e1c24553ac0510c29810371827ffcc1e008 -Author: Guillaume Desmottes -Date: Thu Jan 22 13:14:21 2009 +0000 - - ft-manager: add file_channel_closed function - - src/salut-ft-manager.c | 14 +++++++++++--- - 1 files changed, 11 insertions(+), 3 deletions(-) - -commit 87b9764ca897a64020cd2a4ab3a5f87ad9b2bf69 -Author: Guillaume Desmottes -Date: Thu Jan 22 12:48:01 2009 +0000 - - wait_for_contact_list: add a FIXME about potential race - - tests/twisted/saluttest.py | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit c7fb05410c10982c72962387cc67eacd43e376ed -Author: Guillaume Desmottes -Date: Thu Jan 22 12:46:35 2009 +0000 - - wait_for_contact_list: use constants.py - - tests/twisted/saluttest.py | 25 +++++++++++-------------- - 1 files changed, 11 insertions(+), 14 deletions(-) - -commit 4ed188c1738b761eac0f31abb99a420dc8797596 -Author: Guillaume Desmottes -Date: Thu Jan 22 12:46:16 2009 +0000 - - constants.py: add HT_CONTACT_LIST and CHANNEL_TYPE_CONTACT_LIST - - tests/twisted/constants.py | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 0d058112841ab6692fd3dd36bad69ac30b0ec14b -Author: Guillaume Desmottes -Date: Fri Feb 6 12:54:48 2009 +0100 - - salut_tubes_manager_requestotron: initialise service - - src/salut-tubes-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 011d3296e540becc96243a4ce6c1a6302774b093 -Author: Guillaume Desmottes -Date: Fri Feb 6 12:48:47 2009 +0100 - - all.xml: add Unix_Timestamp64 - - extensions/all.xml | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit b599ea2099908d3be9eaacfaeae391b307f8499a -Author: Guillaume Desmottes -Date: Fri Feb 6 12:48:29 2009 +0100 - - extensions/channel.xml: remove Channel_Type_File.xml as it has been renamed to Channel_Type_File_Transfer.xml since ages - - extensions/channel.xml | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit dd70a293b53de568b880b208cc55fada6829ce67 -Author: Guillaume Desmottes -Date: Thu Feb 5 15:04:52 2009 +0000 - - pass request properties to salut_tubes_channel_tube_request so we don't have to fetch them twice - - src/salut-tubes-channel.c | 19 +++---------------- - src/salut-tubes-channel.h | 2 +- - src/salut-tubes-manager.c | 11 +++++++---- - 3 files changed, 11 insertions(+), 21 deletions(-) - -commit 5affa79a645a2748d276c5c838f018844f512388 -Author: Guillaume Desmottes -Date: Thu Feb 5 12:14:29 2009 +0000 - - salut_tube_stream_constructor: there is no point to fire a signal in the constructor - - src/tube-stream.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 03cb2c3d2b81abf49a1edb5218b95b4b9766fd80 -Author: Guillaume Desmottes -Date: Thu Feb 5 12:13:39 2009 +0000 - - salut_tubes_manager_foreach_channel: use GHashTableIter - - src/salut-tubes-manager.c | 41 ++++++++++++++--------------------------- - 1 files changed, 14 insertions(+), 27 deletions(-) - -commit 31a2596e32473dea7430bbe27715b3755f2dad1a -Author: Guillaume Desmottes -Date: Thu Feb 5 12:08:13 2009 +0000 - - salut_tubes_manager_close_all: define tmp variable in sub block - - src/salut-tubes-manager.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 2ff43ce0f6058e270a2ada0daaf0a33014e1ac40 -Author: Guillaume Desmottes -Date: Thu Feb 5 12:07:01 2009 +0000 - - salut_tubes_channel_foreach: use GHashTableIter - - src/salut-tubes-channel.c | 36 +++++++++++------------------------- - 1 files changed, 11 insertions(+), 25 deletions(-) - -commit 165dccf6c6dff87e25bc403adc1a4bd79123a907 -Author: Guillaume Desmottes -Date: Thu Feb 5 11:56:43 2009 +0000 - - salut_tubes_channel_offer_d_bus_tube: we don't have to use parameters_copied any more - - src/salut-tubes-channel.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit d2946f21770acee419de46e52e8a1da1006e8d64 -Author: Guillaume Desmottes -Date: Wed Jan 14 13:50:38 2009 +0000 - - tubes-to-nonexistant-ids: remove debug print - - tests/twisted/avahi/tubes-to-nonexistant-ids.py | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 4daac5ff78e1488e342300e8dde1d3b4adb9a08c -Author: Guillaume Desmottes -Date: Tue Jan 13 15:50:47 2009 +0000 - - upgrade constants.py from Gabble - - tests/twisted/constants.py | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) - -commit 01c31d6dde92b946d2b09b21cf4d7eabed631d40 -Author: Guillaume Desmottes -Date: Tue Jan 13 13:16:05 2009 +0000 - - tube-stream: GetStreamTubeSocketAddress method has been removed - - src/tube-stream.c | 19 ------------------- - 1 files changed, 0 insertions(+), 19 deletions(-) - -commit ead895d944e1bb9dc511ff9bb38e78cd602968f5 -Author: Guillaume Desmottes -Date: Tue Jan 13 13:15:42 2009 +0000 - - update to latest tube spec - - extensions/Channel_Interface_Tube.xml | 22 +++++-------- - extensions/Channel_Type_DBus_Tube.xml | 8 ++-- - extensions/Channel_Type_Stream_Tube.xml | 51 +++++++++---------------------- - 3 files changed, 27 insertions(+), 54 deletions(-) - -commit 567c779bacc1613caa292d2a086a6fd83ca13b39 -Author: Guillaume Desmottes -Date: Tue Jan 13 13:06:37 2009 +0000 - - coding style tweak - - src/tube-stream.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit a61f7289f0c2b972a3dc42a420815ab835c1949d -Author: Guillaume Desmottes -Date: Tue Jan 13 11:43:37 2009 +0000 - - salut_tubes_manager_requestotron: salut_tubes_channel_tube_request is not suppose to return NULL and, anyway, it doesn't make sense to call tp_channel_manager_emit_request_already_satisfied on the tubes channel - - src/salut-tubes-manager.c | 23 +++++++---------------- - 1 files changed, 7 insertions(+), 16 deletions(-) - -commit dde60dd84a389ef398e57829b6d74f40a3c11d38 -Author: Guillaume Desmottes -Date: Tue Jan 13 11:41:31 2009 +0000 - - remove require_new argument from salut_tubes_channel_tube_request as we can always create a new tube channel - - src/salut-tubes-channel.c | 3 +-- - src/salut-tubes-channel.h | 3 +-- - src/salut-tubes-manager.c | 2 +- - 3 files changed, 3 insertions(+), 5 deletions(-) - -commit 5d4807130dadd5f189a287ae169d44162a0b0d10 -Author: Guillaume Desmottes -Date: Tue Jan 13 11:37:36 2009 +0000 - - tubes-manager: renames channels to tubes_channels - - src/salut-tubes-manager.c | 50 ++++++++++++++++++++++---------------------- - 1 files changed, 25 insertions(+), 25 deletions(-) - -commit cf2e59117664047c3088d016bb18e7a7efedb839 -Author: Guillaume Desmottes -Date: Tue Jan 13 11:11:10 2009 +0000 - - tubes-to-nonexistant-jids.py has been renamed to tubes-to-nonexistant-ids.py - - tests/twisted/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0d1dfd6a06023a31dbb437aaae41a7fe4591641a -Author: Guillaume Desmottes -Date: Tue Jan 13 11:10:55 2009 +0000 - - rename tubes-to-nonexistant-jids.py to tubes-to-nonexistant-ids.py - - tests/twisted/avahi/tubes-to-nonexistant-ids.py | 51 ++++++++++++++++++++++ - tests/twisted/avahi/tubes-to-nonexistant-jids.py | 51 ---------------------- - 2 files changed, 51 insertions(+), 51 deletions(-) - -commit 3bd11513b91dd14d0795a404c25de946e24aa772 -Author: Will Thompson -Date: Tue Jan 13 11:02:24 2009 +0000 - - Add test constants to EXTRA_DIST - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit a0b892abc4b3bd1e47af9a97cfa4837d583dce96 -Author: Will Thompson -Date: Sun Jan 11 01:19:41 2009 +0000 - - Raise InvalidArgument from StreamTube requests without Service - - src/salut-tubes-manager.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 63f970891f14618f0a480cadf9a3723cacd0c572 -Author: Will Thompson -Date: Sun Jan 11 00:51:10 2009 +0000 - - Check errors returned by rejected StreamTube requests - - tests/twisted/avahi/test-tube.py | 21 ++++++++++++++++----- - tests/twisted/constants.py | 3 ++- - 2 files changed, 18 insertions(+), 6 deletions(-) - -commit e5a2d71b1b6ff7845939c11f1c2741466b157936 -Author: Will Thompson -Date: Sun Jan 11 00:47:39 2009 +0000 - - Behave on requests for Tubes to offline jids - - Previously, method calls requesting a Tubes channel to a jid that didn't - exist would never get a reply, and method calls requesting a StreamTube - to a jid that doesn't exist would trip an assertion. - - src/salut-tubes-manager.c | 43 ++++++++++++++++++++++++++++++++++--------- - 1 files changed, 34 insertions(+), 9 deletions(-) - -commit bc24857d8d6376ba54e3706113e4e41ba17b2ed2 -Author: Will Thompson -Date: Sun Jan 11 00:45:30 2009 +0000 - - Test requesting tubes to nonexistant jids - - tests/twisted/Makefile.am | 3 +- - tests/twisted/avahi/tubes-to-nonexistant-jids.py | 51 ++++++++++++++++++++++ - 2 files changed, 53 insertions(+), 1 deletions(-) - -commit 61cb83a59d525cac7fcd3dab115011e6c1eff42b -Author: Will Thompson -Date: Sun Jan 11 00:42:18 2009 +0000 - - Add a small set of test constants - - tests/twisted/constants.py | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) - -commit 0c7f1d40b591fa4319a3a73f8d1647fc3f54d575 -Author: Will Thompson -Date: Sat Jan 10 23:43:36 2009 +0000 - - Don't announce Tubes channel twice when requesting a StreamTube - - Previously, when a Channel.Type.Tubes was created as a side-effect of - requesting a Channel.Type.StreamTube, the implementation attempted to - emit a single NewChannels signal for both channels. But it was - incorrect: it emitted new-channels([Tubes], requests_satisfied=[]) - followed by new-channels([Tubes, StreamTube], requests_satisfied=[the - request you first thought of]) because passing request_token=NULL to - new_tubes_channel() does not stop it emitting NewChannels. - - On the assumption that no-one actually cares that the Tubes channel is a - side-effect of the StreamTube channel, let's just announce them - separately and be done with it. - - src/salut-tubes-manager.c | 30 +++++++++--------------------- - 1 files changed, 9 insertions(+), 21 deletions(-) - -commit b2aeafce4691cb92abfb194bd74689d621ecc1cc -Author: Will Thompson -Date: Sat Jan 10 23:09:25 2009 +0000 - - Disable requesting new-style DBus tubes. - - (They're not actually implemented.) - - src/salut-tubes-channel.c | 3 +++ - src/salut-tubes-manager.c | 14 ++++++++++++-- - .../avahi/test-request-invalid-dbus-tube.py | 5 +++++ - 3 files changed, 20 insertions(+), 2 deletions(-) - -commit d8f7efa12fa3862c98de8524e7e4102e020e18c5 -Author: Will Thompson -Date: Sat Jan 10 21:25:17 2009 +0000 - - Don't accept unique names as ServiceName for DTubes. - - src/salut-tubes-manager.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 50a8650046f76cb41c525b56cabf93c798f2ef05 -Author: Will Thompson -Date: Sat Jan 10 19:56:40 2009 +0000 - - Add more invalid services names to dtube request test - - .../avahi/test-request-invalid-dbus-tube.py | 41 ++++++++++++------- - 1 files changed, 26 insertions(+), 15 deletions(-) - -commit e282668dc4f805e1090158f1a17d2cf2fc041b4c -Author: Will Thompson -Date: Sat Jan 10 19:15:40 2009 +0000 - - Removed unused variables in test-request-invalid-dbus-tube - - .../avahi/test-request-invalid-dbus-tube.py | 16 ---------------- - 1 files changed, 0 insertions(+), 16 deletions(-) - -commit 1cd44bb086f6a43aafe445f55e4adaacb8806956 -Author: Guillaume Desmottes -Date: Thu Jan 8 17:06:19 2009 +0000 - - add test-request-invalid-dbus-tube.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit cc6ad3b71975fb0aca85449983300f94b260c264 -Author: Guillaume Desmottes -Date: Thu Jan 8 17:06:00 2009 +0000 - - add test-request-invalid-dbus-tube.py - - .../avahi/test-request-invalid-dbus-tube.py | 63 ++++++++++++++++++++ - 1 files changed, 63 insertions(+), 0 deletions(-) - -commit 345bce7f59e19259af260d97dfcfff7c7222022e -Author: Guillaume Desmottes -Date: Thu Jan 8 17:05:43 2009 +0000 - - salut_tubes_manager_requestotron: check if ServiceName is valid - - src/salut-tubes-manager.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 44d3f1b1ad609ffea629856c3f9897dd86fa6fc0 -Author: Guillaume Desmottes -Date: Thu Jan 8 16:09:30 2009 +0000 - - Inform NEWS that we now implement org.freedesktop.Telepathy.Channel.Type.StreamTube.DRAFT - - NEWS | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 4c807f3bd6a1189e31b416bab697a5a0876ab2b5 -Author: Guillaume Desmottes -Date: Thu Jan 8 15:54:14 2009 +0000 - - tube-dbus: initiator property has been renamed to initiator-handle - - src/tube-dbus.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit 018b3843e943e50b5075210c2a2d17c8bcaf78c4 -Author: Guillaume Desmottes -Date: Thu Jan 8 15:48:44 2009 +0000 - - test-tube: test Requested, InitiatorID, InitiatorHandle, Service and SupportedSocketTypes properties - - tests/twisted/avahi/test-tube.py | 39 +++++++++++++++++++++---------------- - 1 files changed, 22 insertions(+), 17 deletions(-) - -commit 6634beb188381caa70db1c6e2d75f39aeaa2fd0d -Author: Guillaume Desmottes -Date: Thu Jan 8 15:47:44 2009 +0000 - - tubes-channel: initiator property has been renamed to initiator-handle - - src/salut-tubes-channel.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 82901d8624c0e53d8265ef86b773ce307d88ce32 -Author: Guillaume Desmottes -Date: Thu Jan 8 15:47:13 2009 +0000 - - Implement and announce Requested, InitiatorHandle, InitiatorID and SupportedSocketTypes properties - - src/tube-stream.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 56 insertions(+), 2 deletions(-) - -commit d79bdbb8edbf77b2817377b53a97c29adc71b773 -Author: Guillaume Desmottes -Date: Thu Jan 8 15:46:06 2009 +0000 - - tubes-stream: initiator property has been renamed to initiator-handle - - src/tube-stream.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit 901a4dd67561870e870a0322cbfb231128ce37e8 -Author: Guillaume Desmottes -Date: Thu Jan 8 15:44:48 2009 +0000 - - tube-iface: rename initiator property to initiator-handle - - src/tube-iface.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit b6b711d496874314d662ece6bce1682c8d6d2360 -Author: Guillaume Desmottes -Date: Thu Jan 8 15:44:19 2009 +0000 - - salut_tubes_channel_get_available_stream_tube_types: use salut_tube_stream_get_supported_socket_types - - src/salut-tubes-channel.c | 33 ++------------------------------- - 1 files changed, 2 insertions(+), 31 deletions(-) - -commit 885a292e149c6e9e8a41f116c1700a79559230d3 -Author: Guillaume Desmottes -Date: Thu Jan 8 15:43:33 2009 +0000 - - add salut_tube_stream_get_supported_socket_types - - src/tube-stream.c | 43 +++++++++++++++++++++++++++++++++++++++++++ - src/tube-stream.h | 2 ++ - 2 files changed, 45 insertions(+), 0 deletions(-) - -commit d63abda5671c61f9befe9d833fa0cb96cb47280f -Author: Alban Crequy -Date: Fri Dec 19 15:47:09 2008 +0000 - - Revert "test-tube-close.py: disable test for now" - - This reverts commit a8ad09bb7576eaa6aceb7ac405ae3fe47e1f9733. - - tests/twisted/avahi/test-tube-close.py | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit 04d918aa4254bb02d75fe665ebe0f03d9a8c0846 -Author: Alban Crequy -Date: Fri Dec 19 15:44:24 2008 +0000 - - Revert "test-two-tubes.py: disable test for now" - - This reverts commit bedb3a47bf388873b3f417b1ce7ff1a9352b239c. - - tests/twisted/avahi/test-two-tubes.py | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 263472d346afb53899b2a8052b8d09c5e91734d3 -Author: Alban Crequy -Date: Mon Dec 15 15:16:57 2008 +0000 - - Disabled test test-disabled-1-1-tubes.py. FIXME: this should probably be removed completely - - tests/twisted/avahi/test-disabled-1-1-tubes.py | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 04b2f0c974be43861baf053c3790ef2ae104f727 -Author: Alban Crequy -Date: Wed Nov 26 14:25:24 2008 +0000 - - Tubes: the "state" property is not writeable anymore. Use an "offered" boolean instead to distinguish tubes which should be in the Not_Offered state - - src/salut-tubes-channel.c | 36 ++++++++++-------------------------- - src/tube-stream.c | 43 +++++++++++++++++++++++++++++++------------ - src/tube-stream.h | 8 ++++---- - 3 files changed, 45 insertions(+), 42 deletions(-) - -commit aca299841e7b75704d60eba5b1a1990dffe160d6 -Author: Alban Crequy -Date: Wed Nov 26 14:24:22 2008 +0000 - - test-tube.py: Better assert message - - tests/twisted/avahi/test-tube.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4275974abe8dc70d0f8ad8f9237d82a0d52088f7 -Author: Alban Crequy -Date: Tue Nov 25 14:23:11 2008 +0000 - - src/tube-stream.c: reorder checks in salut_tube_stream_accept_stream_tube - - src/tube-stream.c | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) - -commit 9ab0bcff32518fd442fd8aab8d4aa6a703b4d975 -Author: Alban Crequy -Date: Tue Nov 25 14:08:04 2008 +0000 - - src/tube-stream.c: change the state of the tube when offering it using the new tube API - - src/tube-stream.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 1a6836d69d79628fe85a42e681ddbd609f49047a -Author: Alban Crequy -Date: Tue Nov 25 13:53:46 2008 +0000 - - src/tube-stream.c: Fix a leak on priv->parameters (value might leak if both set during construction and by a dbus SetProperty) - - src/tube-stream.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit aea1862443e8fb32962dcd7ab944bfd03ff83ce3 -Author: Alban Crequy -Date: Tue Nov 25 13:49:03 2008 +0000 - - Coding style, indentation - - src/tube-stream.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 11359a26d493b52735a0898ab181405dd3d3a468 -Author: Alban Crequy -Date: Tue Nov 25 13:47:20 2008 +0000 - - src/salut-tubes-manager.c: wording: 'Already chatting' -> tube channel - - src/salut-tubes-manager.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 9f2b70ca071b377ffe583b47c6331eeb9d397181 -Author: Alban Crequy -Date: Tue Nov 25 13:45:02 2008 +0000 - - Coding style: remove the space after '!' - - src/salut-tubes-channel.c | 4 ++-- - src/salut-tubes-manager.c | 8 ++++---- - 2 files changed, 6 insertions(+), 6 deletions(-) - -commit 36a1e18a9dc271286c04f44e491b55f5b4dfc2b6 -Author: Alban Crequy -Date: Tue Nov 25 13:43:09 2008 +0000 - - DEBUGs: remove some DEBUG("Called") - - lib/gibber/gibber-bytestream-direct.c | 4 +--- - src/salut-tubes-manager.c | 1 - - src/tube-stream.c | 6 ------ - 3 files changed, 1 insertions(+), 10 deletions(-) - -commit 837617b15b96cb8714ddc0d9044df64993cb2017 -Author: Alban Crequy -Date: Tue Nov 25 13:39:59 2008 +0000 - - src/salut-tubes-manager.c: Fix a leak in salut_tubes_manager_foreach_channel_class() - - src/salut-tubes-manager.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 32cba0a4918d10ee1c8f4f264335c2fe065ed6bd -Author: Alban Crequy -Date: Tue Nov 25 13:27:14 2008 +0000 - - test-tube.py: don't test for implementation details (assert new_chan_path.find("StreamTube") - - tests/twisted/avahi/test-tube.py | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 319b17e42bdf6a270302192f4595d3270ab81f1e -Author: Alban Crequy -Date: Tue Nov 25 13:25:42 2008 +0000 - - test-tube.py: use the constant HT_CONTACT instead of hardcoding '1' - - tests/twisted/avahi/test-tube.py | 17 +++++++++-------- - 1 files changed, 9 insertions(+), 8 deletions(-) - -commit d572c7d8aa6f4d402001cdd2743bf98695d0037f -Author: Alban Crequy -Date: Tue Nov 25 13:20:32 2008 +0000 - - test-tube.py: use .has_key instead of ``is not None'' - - tests/twisted/avahi/test-tube.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit d6e6a7421cec4cdf24c25ec21af6f5506679abb2 -Author: Alban Crequy -Date: Mon Nov 24 12:19:15 2008 +0000 - - test-tube.py: Fix race in the test wrt NewChannels - - tests/twisted/avahi/test-tube.py | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -commit 144f7f0a3d1f94c569a13a7079ee6f0d94b702fd -Author: Alban Crequy -Date: Mon Nov 24 12:18:44 2008 +0000 - - extensions/all.xml: Fix previous conflict - - extensions/all.xml | 6 +----- - 1 files changed, 1 insertions(+), 5 deletions(-) - -commit ba414deebc7d20e6672acc220bbfcba5aa13b6a1 -Author: Alban Crequy -Date: Sun Nov 9 20:02:53 2008 +0000 - - src/salut-tubes-manager.c: Remove old factory iface code - - src/salut-tubes-manager.c | 12 ------------ - 1 files changed, 0 insertions(+), 12 deletions(-) - -commit 4d1d4399c1c572abb843d195c1d2e2e572c0caf6 -Author: Alban Crequy -Date: Fri Oct 31 15:56:56 2008 +0000 - - src/tube-stream.c: Fix salut_tube_stream_close on the Channel.Type.StreamTube interface: do not send the close message stanza twice - - src/tube-stream.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a32fbfee9d34b61f8d950ca333ba1b2525f3a5fb -Author: Alban Crequy -Date: Wed Oct 29 16:22:35 2008 +0000 - - src/salut-tubes-channel.c: Add missing "break". Why was it missing?! - - src/salut-tubes-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 9c36aba171c18b54558781b38f1ff9a90f16686d -Author: Alban Crequy -Date: Wed Oct 29 15:33:28 2008 +0000 - - src/tube-stream.c: Close the stream tube channel propertly when o.f.T.Channel.Close is called - - src/tube-stream.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 1a17755a8826d3eb519c78d599b1bcaa7d00add3 -Author: Alban Crequy -Date: Tue Sep 30 15:16:45 2008 +0100 - - Update extensions/Channel_Interface_Tube.xml - - extensions/Channel_Interface_Tube.xml | 30 +++++++++++++++++++----------- - 1 files changed, 19 insertions(+), 11 deletions(-) - -commit 5e92b748bb5fb879c0ef083d97964101ab3b3429 -Author: Alban Crequy -Date: Thu Sep 25 18:30:12 2008 +0100 - - SalutTubeStream implements the new tube API with the requestotron. Tube test updated. - - src/salut-connection.c | 2 - - src/salut-tubes-channel.c | 84 +++++-- - src/salut-tubes-channel.h | 3 + - src/salut-tubes-manager.c | 6 + - src/tube-iface.c | 4 +- - src/tube-stream.c | 494 +++++++++++++++++++++++++++++++++++++- - src/tube-stream.h | 10 +- - tests/twisted/avahi/test-tube.py | 224 ++++++++++++++++- - 8 files changed, 780 insertions(+), 47 deletions(-) - -commit 3ecc9c27a98ed6ade1d11827e6f2b1ee3a12a675 -Author: Alban Crequy -Date: Thu Sep 25 18:29:28 2008 +0100 - - test-tube-close.py: Fix contact name - - tests/twisted/avahi/test-tube-close.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 64567deff5f6d37603360ad1b52b82f664f8bbb5 -Author: Alban Crequy -Date: Thu Sep 25 12:30:22 2008 +0100 - - Add property "tubes-channel" to SalutStreamTube and SalutDBusTube object. They have a reference on the SalutTubesChannel object in order to call salut_tubes_channel_send_iq_offer() - - src/salut-tubes-channel.c | 4 ++-- - src/tube-dbus.c | 12 ++++++++++++ - src/tube-dbus.h | 5 +++-- - src/tube-iface.c | 13 +++++++++++++ - src/tube-stream.c | 32 ++++++++++++++++++++++---------- - src/tube-stream.h | 1 + - 6 files changed, 53 insertions(+), 14 deletions(-) - -commit 9c88376909ba48e250a59923eb02aeb1945d5e14 -Author: Alban Crequy -Date: Thu Sep 25 12:05:51 2008 +0100 - - Make salut_tubes_channel_send_iq_offer() public in order to use it in tube-stream.c and tube-dbus.c - - src/salut-tubes-channel.c | 23 +++++++++++++++++------ - src/salut-tubes-channel.h | 2 ++ - 2 files changed, 19 insertions(+), 6 deletions(-) - -commit 8cd3124c4f87c0057533116f985e9cec32e9711b -Author: Alban Crequy -Date: Thu Sep 25 12:03:45 2008 +0100 - - Rename signal names of StreamTubes and DBusTubes to avoid collisions when SalutTubeDBus and SalutTubeStream will implement TP_TYPE_SVC_CHANNEL - - src/salut-tubes-channel.c | 6 +++--- - src/tube-dbus.c | 4 ++-- - src/tube-stream.c | 6 +++--- - 3 files changed, 8 insertions(+), 8 deletions(-) - -commit f3e05031273711542c5ca5af47278f038d3cb332 -Author: Alban Crequy -Date: Wed Sep 24 16:37:27 2008 +0100 - - Reorder includes to observe the coding style, and add missing include - - src/salut-tubes-manager.c | 14 ++++++++------ - 1 files changed, 8 insertions(+), 6 deletions(-) - -commit 1d75426d4d5ffc510ae3de03dd216f7c10de650c -Author: Alban Crequy -Date: Wed Sep 24 16:32:24 2008 +0100 - - Create a SalutTubeStream (or DBus) object when the requestotron requests it. - - src/salut-tubes-channel.c | 68 +++++++++++++++++++++++++++++++++++++++------ - 1 files changed, 59 insertions(+), 9 deletions(-) - -commit dac3b5d76689a425cf08faaa67f9584307f09736 -Author: Alban Crequy -Date: Wed Sep 24 15:40:54 2008 +0100 - - SalutTubesManager implements TpChannelManager instead of the old channel factory. Implement the requestotron for Channel.Type.Tubes. New tube API not yet done. - - src/salut-connection.c | 13 +- - src/salut-tubes-channel.c | 11 ++ - src/salut-tubes-channel.h | 5 + - src/salut-tubes-manager.c | 432 +++++++++++++++++++++++++++++++++++---------- - 4 files changed, 362 insertions(+), 99 deletions(-) - -commit bb243baacc6aeb4aca92f406e5fdb8eebfd9d3f7 -Author: Alban Crequy -Date: Wed Sep 24 15:38:26 2008 +0100 - - SalutTubesChannel implements TpExportableChannel - - src/salut-tubes-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 6fe717a264c5270abe9bd37eec90a6024034c389 -Author: Alban Crequy -Date: Wed Sep 24 15:24:58 2008 +0100 - - Add the new tube D-Bus API in extensions. - - extensions/Channel_Interface_Tube.xml | 125 ++++++++++++++++++ - extensions/Channel_Type_DBus_Tube.xml | 183 ++++++++++++++++++++++++++ - extensions/Channel_Type_Stream_Tube.xml | 219 +++++++++++++++++++++++++++++++ - extensions/Makefile.am | 3 + - extensions/all.xml | 14 ++- - 5 files changed, 543 insertions(+), 1 deletions(-) - -commit 18cfbf89af680711c926c25c8039ef53f9d8f3b5 -Author: Alban Crequy -Date: Mon Sep 22 17:27:14 2008 +0100 - - Revert "test-text-channel.py: Wait Salut to release its well-known bus name at the end of the test" - - This reverts commit faf4140c5f1cdb9b5e26f8f248236c172d542b3e. - - tests/twisted/avahi/test-text-channel.py | 7 ------- - tests/twisted/servicetest.py | 16 ---------------- - 2 files changed, 0 insertions(+), 23 deletions(-) - -commit 2920b1ca186fe7a47ed69d28dd8353e1f34a01a6 -Author: Alban Crequy -Date: Mon Sep 22 11:23:39 2008 +0100 - - test-text-channel.py: Wait Salut to release its well-known bus name at the end of the test - - tests/twisted/avahi/test-text-channel.py | 7 +++++++ - tests/twisted/servicetest.py | 16 ++++++++++++++++ - 2 files changed, 23 insertions(+), 0 deletions(-) - -commit 38b693ab35ccee5595f5c92b4537f7ac1e19e837 -Author: Alban Crequy -Date: Mon Sep 22 17:01:29 2008 +0100 - - SalutXmppConnectionManager: connect to TpSvcConnection::status-changed and close streams - - src/salut-xmpp-connection-manager.c | 75 +++++++++++++++++++++++++++++------ - 1 files changed, 62 insertions(+), 13 deletions(-) - -commit 76b4de43886144e3be6174381c24453b9d1b20ba -Author: Guillaume Desmottes -Date: Mon Feb 2 11:53:47 2009 +0000 - - avahi-contact: _compare_address: addr_a have to be a sockaddr_storage to be able to store an IPv6 address - - src/salut-avahi-contact.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit 9f0ad111a603fc009e2ec684168c88a6b90faa90 -Author: Will Thompson -Date: Sun Jan 11 17:51:49 2009 +0000 - - Squash unused variables when !ENABLE_DEBUG - - src/salut-muc-channel.c | 6 +++++- - src/salut-xmpp-connection-manager.c | 2 ++ - 2 files changed, 7 insertions(+), 1 deletions(-) - -commit fe33209a3be978ae839133cacb2e7f6616e2d403 -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 - - lib/gibber/gibber-debug.h | 9 ++++++--- - src/debug.h | 6 ++++-- - 2 files changed, 10 insertions(+), 5 deletions(-) - -commit c55116d981d6c60ed936299ff4416975399839b0 -Author: Will Thompson -Date: Sun Jan 11 17:20:49 2009 +0000 - - Fix comparisons between signed and unsigned in tests - - tests/check-gibber-r-multicast-causal-transport.c | 2 +- - tests/check-gibber-r-multicast-packet.c | 4 ++-- - tests/check-gibber-r-multicast-sender.c | 2 +- - tests/check-gibber-xmpp-error.c | 2 +- - tests/test-r-multicast-transport-io.c | 4 ++-- - 5 files changed, 7 insertions(+), 7 deletions(-) - -commit bc31a3eb25808d2d47c6f32f99d4d38789be4875 -Author: Will Thompson -Date: Sun Jan 11 17:05:21 2009 +0000 - - Don't check if an unsigned int is negative. - - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b8a8b8209aa8f937ca9c3a0bd5a5c05ad9e48ab0 -Author: Will Thompson -Date: Sun Jan 11 17:04:07 2009 +0000 - - Compare strictly to GIBBER_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 - GIBBER_STANZA_TYPE_NONE. - - lib/gibber/gibber-xmpp-stanza.c | 11 +++++------ - 1 files changed, 5 insertions(+), 6 deletions(-) - -commit 1464e7e992943443cb45d0a9f30d8656a493e872 -Author: Will Thompson -Date: Sun Jan 11 16:47:31 2009 +0000 - - Remove check that a SalutPresenceId is >= 0. - - Even though C enums aren't guaranteed to be unsigned, if they happen to - be GCC helpfully warns about you checking they're non-negative. #gcc - don't seem to think this is a bad thing. I removed the positivity - check, because as the function's only caller (set_own_status) says, the - presence mixin has already validated the index, and it's being set from - an unsigned int anyway. - - src/salut-self.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 5713cf95c9bb4ba726be1724d0951a06f5f19233 -Author: Will Thompson -Date: Sun Jan 11 16:46:23 2009 +0000 - - Fix two if (foo); { ... } bugs. - - lib/gibber/gibber-r-multicast-sender.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit d46f7cd8c6855c3a7cf6d9d9ca177e30d703b7e1 -Author: Will Thompson -Date: Sun Jan 11 16:45:26 2009 +0000 - - Fix "comparing signed to unsigned" warnings. - - Mostly these are using signed ints when iterating GArray, whose len - member is a guint. - - lib/gibber/gibber-bytestream-direct.c | 2 +- - lib/gibber/gibber-r-multicast-causal-transport.c | 6 +++--- - lib/gibber/gibber-r-multicast-packet.c | 8 ++++---- - lib/gibber/gibber-r-multicast-sender.c | 8 ++++---- - lib/gibber/gibber-r-multicast-transport.c | 4 ++-- - src/salut-avahi-roomlist-manager.c | 4 ++-- - src/salut-connection.c | 8 ++++---- - src/salut-xmpp-connection-manager.c | 2 +- - 8 files changed, 21 insertions(+), 21 deletions(-) - -commit de3a44d6b0f98232e26e0c726c8d92d5fe8d955b -Author: Will Thompson -Date: Sun Jan 11 15:51:26 2009 +0000 - - Import magic compiler warning macros from tp-glib - - configure.ac | 42 ++++++++++++++++++------------------------ - m4/tp-compiler-flag.m4 | 36 ++++++++++++++++++++++++++++++++++++ - m4/tp-compiler-warnings.m4 | 40 ++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 94 insertions(+), 24 deletions(-) - -commit 5938d6c0e973876812198a7c3662e4c21a6f1e8d -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 - gibber_goto_if_fail and gibber_goto_if_reached". - - lib/gibber/gibber-xmpp-stanza.c | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit b663655583251de865a5a892e20a597e7275692f -Author: Guillaume Desmottes -Date: Wed Jan 7 12:03:29 2009 +0000 - - check-gibber-xmpp-stanza.c: don't call debug functions if debug is disabled - - tests/check-gibber-xmpp-stanza.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 32402728314ff1fad630610a80da1b7312e77835 -Author: Guillaume Desmottes -Date: Wed Jan 7 11:59:50 2009 +0000 - - salut-debug.c: don't call debug functions if debug is disabled - - tests/salut-debug.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit efc9edbd571089612fe91e9e60fda2fcec1d5e22 -Author: Guillaume Desmottes -Date: Wed Jan 7 11:59:31 2009 +0000 - - src/salut.c: don't call debug functions if debug is disabled - - src/salut.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 36921fef51562d8d9cd34aec58efe16480b9b83e -Author: Guillaume Desmottes -Date: Wed Jan 7 11:56:25 2009 +0000 - - gibber-debug.c: don't build code if debug is disabled - - lib/gibber/gibber-debug.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit fab81667a7061c13ac99a62a0f71dbfc6378cca7 -Author: Guillaume Desmottes -Date: Wed Jan 7 11:55:48 2009 +0000 - - gibber-debug.h: G_BEGIN_DECLS has to be outside the #ifdef ENABLE_DEBUG - - lib/gibber/gibber-debug.h | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 6be6014a3c8211a7fe2affa3aca6fe7307553fe4 -Author: Guillaume Desmottes -Date: Wed Jan 7 11:54:45 2009 +0000 - - build with --disable-debug when distchecking as in Gabble - - Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 43fdb5573a5213cb69610419e932e9c8aa6e2d7e -Author: Guillaume Desmottes -Date: Wed Jan 7 11:54:19 2009 +0000 - - add --disable-debug configure option as in Gabble - - configure.ac | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit df22fa3ea6544a5d52234a1f0cff5586c64e2657 -Author: Guillaume Desmottes -Date: Wed Jan 7 11:53:42 2009 +0000 - - use assertions instead of gibber_goto_if_fail and gibber_goto_if_reached - - lib/gibber/gibber-xmpp-stanza.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit c5b625b817476cf0923e4f34cd5ca29035b51c7b -Author: Guillaume Desmottes -Date: Wed Jan 7 11:53:14 2009 +0000 - - gibber-debug.h: remove gibber_goto_if_reached and gibber_goto_if_fail as they don't really make sense - - lib/gibber/gibber-debug.h | 22 ---------------------- - 1 files changed, 0 insertions(+), 22 deletions(-) - -commit d4514c252175194fb4f0950f55367baa6f4dfa02 -Author: Will Thompson -Date: Sun Jan 11 15:04:00 2009 +0000 - - Bump nano_version - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 7d3b07c75e5e3cc31e5f1b1539a760191ba26ebb -Author: Guillaume Desmottes -Date: Mon Jan 5 16:30:45 2009 +0000 - - add tar-ustar to AM_INIT_AUTOMAKE - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e3a6fa994b32f602a8b51b2fa5215dd1f0a553b8 -Author: Guillaume Desmottes -Date: Mon Jan 5 16:04:11 2009 +0000 - - version 0.3.7 - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit e97b78f39037a28d522960cba92165c57e933c0c -Author: Guillaume Desmottes -Date: Mon Jan 5 16:03:32 2009 +0000 - - Update NEWS for 0.3.7 - - NEWS | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 3efb0c374cfa596310e674150102b69847879628 -Author: Guillaume Desmottes -Date: Tue Dec 23 16:15:00 2008 +0100 - - update NEWS - - NEWS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 74a18ca4d1ee3c48d5b2232d130a6fb1c4484e41 -Author: Guillaume Desmottes -Date: Tue Dec 23 16:13:15 2008 +0100 - - new_connection_to_socket: fix transport leak - - src/tube-stream.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 4dc25a2b1be7980142b7be7e4cc24b1f32efae69 -Author: Guillaume Desmottes -Date: Tue Dec 23 16:08:54 2008 +0100 - - connect_to_url: fix transport leak - - lib/gibber/gibber-bytestream-oob.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 50c6d93db7228f371426062e2771425f6a95942b -Author: Guillaume Desmottes -Date: Tue Dec 23 13:19:46 2008 +0100 - - salut_tube_stream_dispose: free the xmpp connection mgr - - src/tube-stream.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 8f1bc49b757891dd11f8be03fd598900d84c3c31 -Author: Guillaume Desmottes -Date: Tue Dec 23 11:43:49 2008 +0100 - - ensure_iq_helper: unref contact and contact manager - - src/tube-stream.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 32a968428ca021f2819600c717f0b48906c56b56 -Author: Guillaume Desmottes -Date: Tue Dec 23 11:43:03 2008 +0100 - - xmpp_connection_manager_connection_closed_cb: unref contact and contact manager - - src/tube-stream.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit e05b9ef1820fb1b92088dd8ad567b1d25c381354 -Author: Guillaume Desmottes -Date: Tue Dec 23 11:41:42 2008 +0100 - - salut_muc_channel_send_invitation: don't leak the contact - - src/salut-muc-channel.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 799715de8cb90c09b2cda522754a6e8e4e5e3b26 -Author: Guillaume Desmottes -Date: Tue Dec 23 11:37:15 2008 +0100 - - salut_connection_olpc_observe_invitation: unref the inviter - - src/salut-connection.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 73b795d1496b13cdaae29026280f73ce6b537edd -Author: Guillaume Desmottes -Date: Mon Dec 22 18:03:44 2008 +0100 - - saluttest: use EnsureChannel instead of CreateChannel when requesting contact list channels as they could already exist - - tests/twisted/saluttest.py | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit f92699903eb9ff6e5e72b22796110814c3571e56 -Merge: 8ccf556 6e06efe -Author: Guillaume Desmottes -Date: Mon Dec 22 17:50:57 2008 +0100 - - Merge branch 'tests' - -commit 8ccf55692b9c4aef7bd92a89e8745b8a3f7bfd8a -Merge: a738491 49c0e54 -Author: Guillaume Desmottes -Date: Mon Dec 22 17:50:34 2008 +0100 - - Merge branch 'build' - -commit 49c0e54c5178e32ed7160f58d9e2549dc9908eec -Author: Guillaume Desmottes -Date: Mon Dec 22 16:37:50 2008 +0100 - - salut-olpc-activity: fix build errors - - src/salut-olpc-activity.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 30b08df89cd913450af3e015867448f5c8421c2f -Author: Guillaume Desmottes -Date: Mon Dec 22 16:37:39 2008 +0100 - - salut-self: fix build errors - - src/salut-self.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit a73849162767a7d28a1d3ac4cd8395480f35d9f5 -Author: Guillaume Desmottes -Date: Mon Dec 22 15:49:19 2008 +0100 - - salut_ft_manager_handle_request: call file_channel_closed_cb instead of unreffing the channel if salut_file_transfer_channel_offer_file failed so we don't unref the channel twice - - src/salut-ft-manager.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 6e06efe0526067018062eadec54b65857affb7ee -Author: Guillaume Desmottes -Date: Mon Dec 22 13:57:16 2008 +0100 - - test-two-muc-stream-tubes.py: use wait_for_contact_list - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 9 ++------- - 1 files changed, 2 insertions(+), 7 deletions(-) - -commit a3f4e3538635aaa8a6fc5281c7036e007e2d09be -Author: Guillaume Desmottes -Date: Mon Dec 22 13:53:54 2008 +0100 - - test-roomlist: use wait_for_contact_list - - tests/twisted/avahi/test-roomlist.py | 9 ++------- - 1 files changed, 2 insertions(+), 7 deletions(-) - -commit af03ed6d708ddac83ba29b97fc7971709fc184b4 -Author: Guillaume Desmottes -Date: Mon Dec 22 13:53:40 2008 +0100 - - test-request-muc-tubes: use wait_for_contact_list - - tests/twisted/avahi/test-request-muc-tubes.py | 9 ++------- - 1 files changed, 2 insertions(+), 7 deletions(-) - -commit f207a0c66331bcfa30966385aeb38b3a3d9d6a63 -Author: Guillaume Desmottes -Date: Mon Dec 22 13:53:28 2008 +0100 - - test-request-muc: use wait_for_contact_list - - tests/twisted/avahi/test-request-muc.py | 9 ++------- - 1 files changed, 2 insertions(+), 7 deletions(-) - -commit b0fe829522f9e407ccebe0fa4a82e270a878e991 -Author: Guillaume Desmottes -Date: Mon Dec 22 13:40:14 2008 +0100 - - test-request-im.py: use wait_for_contact_list - - tests/twisted/avahi/test-request-im.py | 24 ++---------------------- - 1 files changed, 2 insertions(+), 22 deletions(-) - -commit 02fcf6ca4b951d083bc5a6495d04217af3840b74 -Author: Guillaume Desmottes -Date: Mon Dec 22 13:39:52 2008 +0100 - - saluttest: add wait_for_contact_list - - tests/twisted/saluttest.py | 29 +++++++++++++++++++++++++++++ - 1 files changed, 29 insertions(+), 0 deletions(-) - -commit 75e7b3ac69e6fc8ea4f229f7c73d9542352f37b2 -Author: Guillaume Desmottes -Date: Mon Dec 22 13:33:15 2008 +0100 - - test-request-im.py: explicitely request contact list channels as Salut doesn't automatically create them if there is no one on the network - - tests/twisted/avahi/test-request-im.py | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -commit e7d0cf0712fdea83c8894579436f6bf7da5700b4 -Merge: f486e97 39c7452 -Author: Guillaume Desmottes -Date: Thu Dec 18 15:50:44 2008 +0000 - - Merge branch 'gibber-error' - -commit f486e972a40deb80a020119df9ac843e94ef0210 -Author: Guillaume Desmottes -Date: Thu Dec 18 14:33:40 2008 +0000 - - tube-stream: data_received_cb ref the transport to keep it artificially alive if needed - - src/tube-stream.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit 39c745237598a953ad0be1983b84aed165047258 -Author: Guillaume Desmottes -Date: Thu Dec 18 14:20:52 2008 +0000 - - gibber-fd-transport.h: removed unused error codes - - lib/gibber/gibber-fd-transport.h | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit bf1d8cdfc5fce9910c3048427ff9b26337039772 -Author: Guillaume Desmottes -Date: Thu Dec 18 13:52:26 2008 +0000 - - fd-transport: implement _channel_io_err - - lib/gibber/gibber-fd-transport.c | 43 ++++++++++++++++++++++++++++++++++++- - lib/gibber/gibber-fd-transport.h | 11 +++++++++ - 2 files changed, 52 insertions(+), 2 deletions(-) - -commit 324dbe23cb2925ee9247e2b1cb0c05e9ee7b7e9b -Author: Guillaume Desmottes -Date: Wed Dec 17 18:01:39 2008 +0000 - - d_bus_names_changed_removed: don't leak the arrays if handle_type == TP_HANDLE_TYPE_CONTACT - - src/salut-tubes-channel.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit 7932041d99ae4753584aa49ead3e17022571743b -Author: Guillaume Desmottes -Date: Wed Dec 17 17:58:49 2008 +0000 - - iq_tube_request_cb: destroy the parameters hash table - - src/salut-tubes-manager.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 276c5df257dc7e925afd934f7a4f627ec1642526 -Author: Guillaume Desmottes -Date: Wed Dec 17 17:57:06 2008 +0000 - - salut_tubes_channel_muc_message_received: destroy the parameters hash table - - src/salut-tubes-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 772feab9644dc85ce20953111842f84b99a2dbe2 -Author: Guillaume Desmottes -Date: Wed Dec 17 17:56:24 2008 +0000 - - salut_tubes_channel_offer_d_bus_tube and salut_tubes_channel_offer_stream_tube: no need to copy the parameters anymore - - src/salut-tubes-channel.c | 31 ++----------------------------- - 1 files changed, 2 insertions(+), 29 deletions(-) - -commit 0801a0713c007afe6b7ef6d5c235c90710d0cb3f -Author: Guillaume Desmottes -Date: Wed Dec 17 17:53:03 2008 +0000 - - salut_tube_stream_set_property: dup the boxed and destroy the old one if needed - - src/tube-stream.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit e82bccb0b2f30b1e88b6f1132674b395b4c211d9 -Author: Guillaume Desmottes -Date: Wed Dec 17 17:52:50 2008 +0000 - - salut_tube_dbus_set_property: dup the boxed and destroy the old one if needed - - src/tube-dbus.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 3ba33eb3bab8b5d2874b5de2c408ff511cba3b2f -Author: Guillaume Desmottes -Date: Wed Dec 17 16:00:42 2008 +0000 - - start_stream_initiation: add a FIXME - - src/tube-stream.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 40879456f0fb79380f2517cd78110109e882cac3 -Author: Guillaume Desmottes -Date: Wed Dec 17 15:53:22 2008 +0000 - - data_received_cb: assert that the transport is not NULL - - src/tube-stream.c | 6 +----- - 1 files changed, 1 insertions(+), 5 deletions(-) - -commit e1afeb4d9ee8398a8ba342965137ae80b7929502 -Author: Guillaume Desmottes -Date: Wed Dec 17 15:42:47 2008 +0000 - - remove old TODO - - src/tube-stream.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit aaf04a9613cac0c1a027d5286f86883cfc50dc27 -Author: Guillaume Desmottes -Date: Wed Dec 17 15:36:19 2008 +0000 - - start_stream_initiation: free data if salut_si_bytestream_manager_negotiate_stream failed - - src/tube-stream.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 36541e45b429a92e06ba54c81404b924e44a67bf -Author: Guillaume Desmottes -Date: Wed Dec 17 12:27:13 2008 +0000 - - tube-stream: gibber_bytestream_iface_block_read was renamed to gibber_bytestream_iface_block_reading - - src/tube-stream.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 99baa29ea87bdbcb18ec395f1064d915bdfda094 -Author: Guillaume Desmottes -Date: Wed Dec 17 12:26:56 2008 +0000 - - gibber-bytestream-oob: gibber_bytestream_iface_block_read was renamed to gibber_bytestream_iface_block_reading - - lib/gibber/gibber-bytestream-oob.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 64bd0976e8df6065665081f4d01078f3a600e71e -Author: Guillaume Desmottes -Date: Wed Dec 17 12:26:44 2008 +0000 - - gibber-bytestream-direct: gibber_bytestream_iface_block_read was renamed to gibber_bytestream_iface_block_reading - - lib/gibber/gibber-bytestream-direct.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit ca7a3e1c7a506e01e7af4f82d7713e1ff369bd58 -Author: Guillaume Desmottes -Date: Wed Dec 17 12:26:15 2008 +0000 - - gibber-bytestream-iface: rename gibber_bytestream_iface_block_read to gibber_bytestream_iface_block_reading - - lib/gibber/gibber-bytestream-iface.c | 6 +++--- - lib/gibber/gibber-bytestream-iface.h | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -commit 2a92c2f4f053de576363d9225bfa2f1d4b286630 -Author: Guillaume Desmottes -Date: Mon Dec 15 17:34:03 2008 +0000 - - start_stream_initiation: free data if salut_contact_manager_get_contact failed - - src/tube-stream.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit a4f008b51b707dd789c136b316ee233f7cbf9223 -Author: Guillaume Desmottes -Date: Mon Dec 15 17:28:36 2008 +0000 - - gibber-bytestream-oob: don't redefine signals - - lib/gibber/gibber-bytestream-oob.c | 44 ++--------------------------------- - 1 files changed, 3 insertions(+), 41 deletions(-) - -commit 86b8bba86508da7beedb2d4b45ad3ded439811e3 -Author: Guillaume Desmottes -Date: Mon Dec 15 17:28:17 2008 +0000 - - gibber-bytestream-muc: don't redefine signals - - lib/gibber/gibber-bytestream-muc.c | 32 ++------------------------------ - 1 files changed, 2 insertions(+), 30 deletions(-) - -commit 944c410324951d5c0fe21f3c8bf87eacf8d5a3fa -Author: Guillaume Desmottes -Date: Mon Dec 15 17:27:51 2008 +0000 - - gibber-bytestream-ibb: don't redefine signals - - lib/gibber/gibber-bytestream-ibb.c | 32 ++------------------------------ - 1 files changed, 2 insertions(+), 30 deletions(-) - -commit abd29bfc41121fd9649d81746676dbe0a6ec2080 -Author: Guillaume Desmottes -Date: Mon Dec 15 17:27:20 2008 +0000 - - gibber-bytestream-direct: don't redefine signals - - lib/gibber/gibber-bytestream-direct.c | 46 ++------------------------------ - 1 files changed, 3 insertions(+), 43 deletions(-) - -commit c8a7c6e0c8f5b1494bee097ab6eef688d12eab8d -Author: Guillaume Desmottes -Date: Mon Dec 15 17:26:40 2008 +0000 - - define bytestream signals in the interface - - lib/gibber/gibber-bytestream-iface.c | 25 +++++++++++++++++++++++++ - 1 files changed, 25 insertions(+), 0 deletions(-) - -commit 5bcdc96458d69ca7d2e67da7984d4c96d2275300 -Author: Guillaume Desmottes -Date: Mon Dec 15 15:25:11 2008 +0000 - - extra_bytestream_negotiate_cb: free the data structur if the bytestream was rejected - - src/tube-stream.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 447050105f9efcee9ca14bbb5c79541fd949a47c -Author: Alban Crequy -Date: Mon Dec 15 14:51:18 2008 +0000 - - SalutSelf: Remove another shadowed declaration - - src/salut-self.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 5bc42cdfc88b839dd622e1047b61acdc51542a63 -Author: Alban Crequy -Date: Mon Dec 15 14:45:07 2008 +0000 - - Remove shadowed declaration - - src/salut-avahi-contact.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit b92e137ca29997129ef796460ff7c04c402a3e69 -Merge: 666ab88 400d5d0 -Author: Guillaume Desmottes -Date: Mon Dec 15 14:48:50 2008 +0000 - - Merge branch 'coding-style' - -commit 666ab880eccbd46fc4221fd161667eed1c7ed920 -Author: Guillaume Desmottes -Date: Mon Dec 15 14:19:47 2008 +0000 - - use tp-glib socket address types - - src/tube-stream.c | 23 +++++++++-------------- - 1 files changed, 9 insertions(+), 14 deletions(-) - -commit 932bec4bbf45fc114907c8734dbe35b11ac5bd8c -Author: Guillaume Desmottes -Date: Mon Dec 15 13:02:29 2008 +0000 - - tube-stream: remove listen_io_channel and listen_io_channel_source_id as we now use a GibberListener - - src/tube-stream.c | 17 ----------------- - 1 files changed, 0 insertions(+), 17 deletions(-) - -commit 400d5d0bce26484cf36d5c93e1ec73be71f9e540 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:34:13 2008 +0000 - - check-node-properties: fix coding style - - tests/check-node-properties.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9e09f5497b461abb2c9cff326ed004dc4c130733 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:34:01 2008 +0000 - - check-gibber-xmpp-connection: fix coding style - - tests/check-gibber-xmpp-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4be148cad0a2268352eb22e91a6afffe3f1ae534 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:33:49 2008 +0000 - - check-gibber-r-multicast-sender: fix coding style - - tests/check-gibber-r-multicast-sender.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 48744ec861936540efac7f9691f9d17703636f15 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:33:35 2008 +0000 - - check-gibber-r-multicast-causal-transport: fix coding style - - tests/check-gibber-r-multicast-causal-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 7b4542204b95e48b30d1f28b0e4f249edae35293 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:33:23 2008 +0000 - - check-gibber-xmpp-reader: fix coding style - - tests/check-gibber-xmpp-reader.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 906d7a84682589fb07b5935a773c10ef00741816 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:33:11 2008 +0000 - - test-r-multicast-transport-io: fix coding style - - tests/test-r-multicast-transport-io.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 222a122945f2c88df61cde3066dfc99556a3534c -Author: Guillaume Desmottes -Date: Mon Dec 15 12:33:00 2008 +0000 - - test-sasl-auth-server: fix coding style - - tests/test-sasl-auth-server.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit dfbfe0d46f905af17ddceb038a24b891d0968542 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:32:50 2008 +0000 - - test-transport: fix coding style - - tests/test-transport.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 7a80b9bb6116e9d4ca1895955acd3811a2911277 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:29:17 2008 +0000 - - salut-avahi-contact-manager: fix coding style - - src/salut-avahi-contact-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 84ff77aad87474831e85f82eedffc88af381e81f -Author: Guillaume Desmottes -Date: Mon Dec 15 12:29:04 2008 +0000 - - salut-avahi-contact: fix coding style - - src/salut-avahi-contact.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 45f0b4c8b74478d86105142a203aaa327ac8db85 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:28:47 2008 +0000 - - salut-avahi-discovery-client: fix coding style - - src/salut-avahi-discovery-client.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 40f6ea0804325abe0e36e7a47bc114c2f9beeaae -Author: Guillaume Desmottes -Date: Mon Dec 15 12:28:33 2008 +0000 - - salut-avahi-muc-channel: fix coding style - - src/salut-avahi-muc-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit db8ccaea749444bb17c45edf548f9c81f6f5a992 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:28:21 2008 +0000 - - salut-avahi-muc-manager: fix coding style - - src/salut-avahi-muc-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 72058fdc51e2c57fc35b7852e46a36c1a0f0607e -Author: Guillaume Desmottes -Date: Mon Dec 15 12:28:07 2008 +0000 - - salut-avahi-roomlist-manager: fix coding style - - src/salut-avahi-roomlist-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f2304708d4e7660cba0269ccb36ac3068692d794 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:27:54 2008 +0000 - - alut-avahi-self: fix coding style - - src/salut-avahi-self.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4c9172febf423ebcc841a279a3241e08f0a55cc0 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:27:41 2008 +0000 - - salut-connection-manager: fix coding style - - src/salut-connection-manager.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit e2ef4a245aab33951ea52613d6c24a7b93ec5665 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:27:28 2008 +0000 - - salut-connection: fix coding style - - src/salut-connection.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit cf12ebf52d81c9da477a6e5982870dc241b758c5 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:27:16 2008 +0000 - - salut-contact-channel: fix coding style - - src/salut-contact-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9a2230e853fc3c6d857cd1346c1a13701989c013 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:27:02 2008 +0000 - - salut-contact-manager: fix coding style - - src/salut-contact-manager.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 32f0467d521c6b8359b1421792090b661c6301bd -Author: Guillaume Desmottes -Date: Mon Dec 15 12:26:43 2008 +0000 - - salut-contact: fix coding style - - src/salut-contact.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 783f717d99a2348897ef1c2d35325040b44106c1 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:26:32 2008 +0000 - - salut-dummy-discovery-client: fix coding style - - src/salut-dummy-discovery-client.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit af51b40c927d2a67be26032d1c532dcdcb21d03e -Author: Guillaume Desmottes -Date: Mon Dec 15 12:26:19 2008 +0000 - - salut-file-transfer-channel: fix coding style - - src/salut-file-transfer-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e5e7b651d77e381d0b0e9fcdb3832c0182f1073b -Author: Guillaume Desmottes -Date: Mon Dec 15 12:26:08 2008 +0000 - - salut-muc-channel: fix coding style - - src/salut-muc-channel.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 8c9669984c9fd7db7bb1b8bc641e7499e6f5a7ff -Author: Guillaume Desmottes -Date: Mon Dec 15 12:25:54 2008 +0000 - - salut-muc-manager: fix coding style - - src/salut-muc-manager.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit c4f95a267b85b45540b3b3a9d1e86decb6456622 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:25:42 2008 +0000 - - salut-roomlist-channel: fix coding style - - src/salut-roomlist-channel.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 04eb64e5ac2e78037ccfe039dede71303e040bc0 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:25:30 2008 +0000 - - salut-si-bytestream-manager: fix coding style - - src/salut-si-bytestream-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ba849365d29ef16741d1215fe3caded95249ab5d -Author: Guillaume Desmottes -Date: Mon Dec 15 12:25:16 2008 +0000 - - salut-tubes-channel: fix coding style - - src/salut-tubes-channel.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 87f4e4786aedd2f3add7e6fb629748f008324bdc -Author: Guillaume Desmottes -Date: Mon Dec 15 12:25:01 2008 +0000 - - salut-tubes-manager: fix coding style - - src/salut-tubes-manager.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 41bbe6dce6f35a235f4304d7c4a5a8402a62a762 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:24:49 2008 +0000 - - salut-xmpp-connection-manager: fix coding style - - src/salut-xmpp-connection-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit af28e2f4b0faaee34d7b228c46b634eda3e826f0 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:24:32 2008 +0000 - - tube-dbus: fix coding style - - src/tube-dbus.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d5bc655dd1b1bdad705e3904f7c3f6d60d6cd198 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:24:19 2008 +0000 - - tube-stream: fix coding style - - src/tube-stream.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 23a4bb7312eb31711b49be3ba334abf7de1f7d14 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:15:10 2008 +0000 - - gibber-resolver: fix coding style - - lib/gibber/gibber-resolver.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit 7fd1ac8865930ce4b33ab2881c050dbc9c08a55b -Author: Guillaume Desmottes -Date: Mon Dec 15 12:14:57 2008 +0000 - - gibber-r-multicast-transport: fix coding style - - lib/gibber/gibber-r-multicast-transport.c | 22 +++++++++++----------- - 1 files changed, 11 insertions(+), 11 deletions(-) - -commit ed0ee5049db14244dfdcbe263fd625deb3cd8c21 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:14:43 2008 +0000 - - gibber-r-multicast-sender: fix coding style - - lib/gibber/gibber-r-multicast-sender.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -commit 011accded0a3c01a3ab0a37c3f5921c7e7d6d1a1 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:14:28 2008 +0000 - - gibber-muc-connection: fix coding style - - lib/gibber/gibber-muc-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 667d72a0aae9b25464609d75314fb6b6564d61c4 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:14:10 2008 +0000 - - gibber-sasl-auth: fix coding style - - lib/gibber/gibber-sasl-auth.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit 2b472bee4a6b65a7ff5f6a35dad97648d695338e -Author: Guillaume Desmottes -Date: Mon Dec 15 12:13:57 2008 +0000 - - gibber-oob-file-transfer: fix coding style - - lib/gibber/gibber-oob-file-transfer.c | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) - -commit 03ca779fbd6a5f4970e58e413eb2f90844136e96 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:13:43 2008 +0000 - - ibber-iq-helper: fix coding style - - lib/gibber/gibber-iq-helper.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6834380cb2b2889ba36bd644fad4d854a3c1d37e -Author: Guillaume Desmottes -Date: Mon Dec 15 12:13:24 2008 +0000 - - gibber-r-multicast-packet: fix coding style - - lib/gibber/gibber-r-multicast-packet.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 655f5bba62a9ea790bc69b71cec2659889287f9d -Author: Guillaume Desmottes -Date: Mon Dec 15 12:13:11 2008 +0000 - - gibber-xmpp-node: fix coding style - - lib/gibber/gibber-xmpp-node.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -commit 45611747923eb61f625ec206bbee602371da26e8 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:12:59 2008 +0000 - - gibber-xmpp-reader: fix coding style - - lib/gibber/gibber-xmpp-reader.c | 34 +++++++++++++++++----------------- - 1 files changed, 17 insertions(+), 17 deletions(-) - -commit b90ac1fb0b71ba7a1aafad5b106480f51be5f1a1 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:12:50 2008 +0000 - - gibber-xmpp-writer: fix coding style - - lib/gibber/gibber-xmpp-writer.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit fe2163e848c36b0186335ed56b603db7b65bc060 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:12:34 2008 +0000 - - gibber-listener: fix coding style - - lib/gibber/gibber-listener.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4bf3de2fc21401944803b826b663a3bbd1637d18 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:12:15 2008 +0000 - - ibber-fd-transport: fix coding style - - lib/gibber/gibber-fd-transport.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 843c0c3d0fa7517f572e8a5a41d4fc3f36042e59 -Author: Guillaume Desmottes -Date: Mon Dec 15 12:11:25 2008 +0000 - - gibber-bytestream-oob.c: fix coding style - - lib/gibber/gibber-bytestream-oob.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 39dc3af8d02052f598745e51ba671d5f3f341f70 -Author: Guillaume Desmottes -Date: Mon Dec 15 11:55:37 2008 +0000 - - properly enable coding style checking so it's run as expected - - configure.ac | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 262bc5989f43357dc6411d60e1937054d04a8132 -Author: Guillaume Desmottes -Date: Mon Dec 15 11:48:32 2008 +0000 - - ugprade tools/check-c-style.sh using the one in Gabble master - - tools/check-c-style.sh | 20 ++++++++++++++++++++ - 1 files changed, 20 insertions(+), 0 deletions(-) - -commit 4d22af397553bbe2ea4210ff2cacc5c4df3e0d03 -Author: Guillaume Desmottes -Date: Mon Dec 15 10:30:52 2008 +0000 - - use G_GSIZE_FORMAT - - lib/gibber/gibber-fd-transport.c | 4 ++-- - lib/gibber/gibber-ssl-transport.c | 2 +- - src/salut-avahi-contact.c | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -commit eb7b47d7418f3089327668cde7b2ca874049de99 -Author: Guillaume Desmottes -Date: Sat Dec 13 17:25:58 2008 +0000 - - check-gibber-sasl-auth: fix static functions and multi declarations - - tests/check-gibber-sasl-auth.c | 25 +++++++++++++------------ - 1 files changed, 13 insertions(+), 12 deletions(-) - -commit 49bc9e1abf1299b479b6886b95824b142047b04f -Author: Guillaume Desmottes -Date: Sat Dec 13 17:22:39 2008 +0000 - - check-gibber-xmpp-error: include gibber-helper - - tests/check-gibber-xmpp-error.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 2b97dea1fd7f2c59a3ab1dcf71640d74cc84f662 -Author: Guillaume Desmottes -Date: Sat Dec 13 17:22:10 2008 +0000 - - check-gibber-xmpp-connection-listener: include gibber-helper - - tests/check-gibber-xmpp-connection-listener.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit eaf2ca1aec1618eae6ac6b10e311f50f761fe778 -Author: Guillaume Desmottes -Date: Sat Dec 13 17:21:29 2008 +0000 - - check-gibber-listener: include gibber-helper - - tests/check-gibber-listener.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit bfde93af09681353bff880c67a6e383e06c90d42 -Author: Guillaume Desmottes -Date: Sat Dec 13 17:21:15 2008 +0000 - - check-gibber-iq-helper.c: include gibber-helper - - tests/check-gibber-iq-helper.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 7331a74c3e574684c4be9ef1c0ccc0e43e10b04c -Author: Guillaume Desmottes -Date: Sat Dec 13 17:19:45 2008 +0000 - - check-gibber-xmpp-stanza: include gibber-helper - - tests/check-gibber-xmpp-stanza.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit f55029c8a64b4b8eb8966596da3aa7e939c48ff2 -Author: Guillaume Desmottes -Date: Sat Dec 13 17:18:29 2008 +0000 - - check-gibber-r-multicast-sender: fix static functions - - tests/check-gibber-r-multicast-sender.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit 85fb1084f9079c6c37e8a7428b50c7dc36eed045 -Author: Guillaume Desmottes -Date: Sat Dec 13 15:23:14 2008 +0000 - - check-gibber-r-multicast-packet: include check-gibber - - tests/check-gibber-r-multicast-packet.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 13343ec89858fdfcc65990e4e6b3a92a031f06ec -Author: Guillaume Desmottes -Date: Sat Dec 13 15:22:36 2008 +0000 - - check-gibber-xmpp-connection: fix static functions - - tests/check-gibber-xmpp-connection.c | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) - -commit 2511afe2f6469f1abee94cc3f955dd1b857a19e1 -Author: Guillaume Desmottes -Date: Sat Dec 13 15:20:46 2008 +0000 - - check-gibber-resolver: include check-gibber - - tests/check-gibber-resolver.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 55942ed27758e70bcce27300e68f7bc88bc4a651 -Author: Guillaume Desmottes -Date: Sat Dec 13 15:19:49 2008 +0000 - - check-gibber-r-multicast-causal-transport: fix static functions - - tests/check-gibber-r-multicast-causal-transport.c | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) - -commit 901f376c85e2884dfd13e125f8f3512ce2c38764 -Author: Guillaume Desmottes -Date: Sat Dec 13 15:19:34 2008 +0000 - - check-gibber: include check - - tests/check-gibber.h | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit ea2efdfacb1db6272ff377e85dfce9d2ea9f5c3c -Author: Guillaume Desmottes -Date: Sat Dec 13 15:18:13 2008 +0000 - - check-node-properties: include check-salut instead of check-gibber - - tests/check-node-properties.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bc7614fe87d1e9553e88ab98161dd8a8c9f8e288 -Author: Guillaume Desmottes -Date: Sat Dec 13 13:20:53 2008 +0000 - - check-node-properties: include check-gibber and fix code/declaration - - tests/check-node-properties.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit b79ede9fa9b43e867e83441eb95f56ca14d8cf90 -Author: Guillaume Desmottes -Date: Sat Dec 13 13:10:54 2008 +0000 - - check-gibber-xmpp-node: include check-gibber.h - - tests/check-gibber-xmpp-node.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit b1ef983d801fa58964274957b090134fdbf9b7ae -Author: Guillaume Desmottes -Date: Sat Dec 13 13:08:56 2008 +0000 - - check-gibber-xmpp-reader: include check-gibber.h - - tests/check-gibber-xmpp-reader.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 81b8a5e095565f1eecff6dd13c55760f75f3c8b0 -Author: Guillaume Desmottes -Date: Sat Dec 13 13:06:22 2008 +0000 - - check-gibber-xmpp-reader: don't mix code and declarations - - tests/check-gibber-xmpp-reader.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 23a75afeeab9118baf8e9a7334f36b707eea2dd6 -Author: Guillaume Desmottes -Date: Sat Dec 13 13:05:02 2008 +0000 - - check-helpers: fix static functions - - tests/check-helpers.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit cba4adfae11c2dfd423da9cd57d39c48d506b3cd -Author: Guillaume Desmottes -Date: Sat Dec 13 13:04:17 2008 +0000 - - test-r-multicast-transport-io: check static functions - - tests/test-r-multicast-transport-io.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 9f5a568a7c40fd677384c53c0edf8f3d9a9ffd20 -Author: Guillaume Desmottes -Date: Sat Dec 13 13:03:59 2008 +0000 - - check-main: fix static functions - - tests/check-main.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit f68ca16ae3487e507f0654947f4250209ef70c17 -Author: Guillaume Desmottes -Date: Sat Dec 13 12:55:58 2008 +0000 - - test-xmpp-connection.c: fix static functions - - tests/test-xmpp-connection.c | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) - -commit b1aeb7e40e720f6a1bc8f5d26a1fafeb2f9ecdb1 -Author: Guillaume Desmottes -Date: Sat Dec 13 12:55:39 2008 +0000 - - test-transport.c: rename send to send_ - - tests/test-transport.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 6f3d6480178908dcdb53c9361b14c8e42bc98862 -Author: Guillaume Desmottes -Date: Fri Dec 12 18:42:42 2008 +0000 - - update gitignore - - .gitignore | 10 +++------- - 1 files changed, 3 insertions(+), 7 deletions(-) - -commit 1d8819ef7087fba2954e390547167cdcba1500d9 -Author: Guillaume Desmottes -Date: Fri Dec 12 18:42:03 2008 +0000 - - update includes to use salut-signals-marshal.h instead of signals-marshal.h - - src/salut-avahi-discovery-client.c | 2 +- - src/salut-contact-manager.c | 2 +- - src/salut-contact.c | 2 +- - src/salut-file-transfer-channel.c | 2 +- - src/salut-ft-manager.c | 2 +- - src/salut-im-channel.c | 2 +- - src/salut-olpc-activity-manager.c | 2 +- - src/salut-olpc-activity.c | 2 +- - src/salut-xmpp-connection-manager.c | 2 +- - src/tube-stream.c | 2 +- - 10 files changed, 10 insertions(+), 10 deletions(-) - -commit 88bf0fe7e421aded0316aa81edcba29aa07fe90b -Author: Guillaume Desmottes -Date: Fri Dec 12 18:41:44 2008 +0000 - - update signals marhsalls code generator - - src/Makefile.am | 24 +++++++++++++----------- - 1 files changed, 13 insertions(+), 11 deletions(-) - -commit d819b19b65335dd8128c81bed8c8da6e45e12259 -Author: Guillaume Desmottes -Date: Fri Dec 12 18:34:09 2008 +0000 - - gibber_xmpp_error_to_node: no need to define node twice - - lib/gibber/gibber-xmpp-error.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 0afac2f5e1f6b015e9d47ba8411e0b9fb2936753 -Author: Guillaume Desmottes -Date: Fri Dec 12 18:30:41 2008 +0000 - - tube-stream: fix variables names - - src/tube-stream.c | 23 +++++++++++------------ - 1 files changed, 11 insertions(+), 12 deletions(-) - -commit 415a5b886eaf0316522e7851e69f448014b19862 -Author: Guillaume Desmottes -Date: Fri Dec 12 18:27:30 2008 +0000 - - salut-xmpp-connection-manager: fix static declarations - - src/salut-xmpp-connection-manager.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit aa6651630dc848906258147260cf4c2158812f98 -Author: Guillaume Desmottes -Date: Fri Dec 12 18:23:24 2008 +0000 - - salut-file-transfer-channel: rename some variables - - src/salut-file-transfer-channel.c | 22 +++++++++++----------- - 1 files changed, 11 insertions(+), 11 deletions(-) - -commit d04ae9c563b4897bc70e3a7fb2e69c4f37a836f1 -Author: Guillaume Desmottes -Date: Fri Dec 12 18:21:31 2008 +0000 - - salut_ft_manager_iface_foreach_one: fix code/declaration - - src/salut-ft-manager.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 4f0bcff9929b539d02d06c2009a6fa164ae62262 -Author: Guillaume Desmottes -Date: Fri Dec 12 18:20:21 2008 +0000 - - salut-avahi-contact: fix multi variables declarations - - src/Makefile.am | 3 +-- - src/salut-avahi-contact.c | 4 ++-- - 2 files changed, 3 insertions(+), 4 deletions(-) - -commit d7b55f8b360ab3b684beaa5fa37c92d34b81da55 -Author: Guillaume Desmottes -Date: Fri Dec 12 18:18:17 2008 +0000 - - salut-tubes-channel: fix multi variables declarations - - src/salut-tubes-channel.c | 45 ++++++++++++++++++++++----------------------- - 1 files changed, 22 insertions(+), 23 deletions(-) - -commit 9a6968b016ced50dd8098c7b9610dc1ae4fc9366 -Author: Guillaume Desmottes -Date: Fri Dec 12 18:13:58 2008 +0000 - - connection: fix declaration/code mixing - - src/salut-connection.c | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -commit 91fe55d6208fa889281a2e2c5892ddfa07af149e -Author: Guillaume Desmottes -Date: Fri Dec 12 18:11:49 2008 +0000 - - SALUT_CONNECTION_GET_PRIVATE: remove trailing ';' so compiler doesn't complain about mixed declarations and code - - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d031c63a786b152dd849a0f92a1453f20f50d298 -Author: Guillaume Desmottes -Date: Fri Dec 12 18:06:36 2008 +0000 - - salut_tube_dbus_dispose: no need to define twice contact_repo - - src/tube-dbus.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 36b8c0c6941501c9f1b679b75925988c56efb5b8 -Author: Guillaume Desmottes -Date: Fri Dec 12 18:04:13 2008 +0000 - - fix static functions - - src/salut-connection.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit 3780537b98e14944f0464334ef02e1d996ca6304 -Author: Guillaume Desmottes -Date: Fri Dec 12 18:00:52 2008 +0000 - - salut-connection: avoid double declaration - - src/salut-connection.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 782139f6f132dc86b28b551d84aa85de491cbb6e -Author: Guillaume Desmottes -Date: Fri Dec 12 17:59:12 2008 +0000 - - create_message_stanza has to be static - - src/text-helper.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f776dd58db389fa6763c396798464c4be9aeac78 -Author: Guillaume Desmottes -Date: Fri Dec 12 17:58:34 2008 +0000 - - salut-si-bytestream-manager.c: fix static functions - - src/salut-si-bytestream-manager.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 03339ddc5eb9d09da2d15a3303ec7b33bd0fb9c4 -Author: Guillaume Desmottes -Date: Fri Dec 12 17:57:40 2008 +0000 - - salut_muc_channel_add_member: avoid double declarations - - src/salut-muc-channel.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit c8165f4fe27b916559e9c26a58b22a9b9d2757ef -Author: Guillaume Desmottes -Date: Fri Dec 12 17:56:17 2008 +0000 - - salut_im_manager_foreach_channel has to be static - - src/salut-im-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit fe72b27e96ff548a90b60e00b8cb127c8639b4d6 -Author: Guillaume Desmottes -Date: Fri Dec 12 17:56:09 2008 +0000 - - fix debug_set_flags_from_env prototype - - src/debug.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9c17c7df4706ed798dfbb12900589e3968f4d96e -Author: Guillaume Desmottes -Date: Fri Dec 12 17:54:57 2008 +0000 - - update .gitignore - - .gitignore | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 2464b0a6c6bb6941a68a253f5e8e57f558742069 -Author: Guillaume Desmottes -Date: Fri Dec 12 17:54:08 2008 +0000 - - update includes to use gibber-signals-marshal.h instead of signals-marshal.h - - lib/gibber/gibber-bytestream-direct.c | 2 +- - lib/gibber/gibber-bytestream-ibb.c | 2 +- - lib/gibber/gibber-bytestream-muc.c | 2 +- - lib/gibber/gibber-bytestream-oob.c | 2 +- - lib/gibber/gibber-file-transfer.c | 2 +- - lib/gibber/gibber-listener.c | 2 +- - lib/gibber/gibber-muc-connection.c | 2 +- - lib/gibber/gibber-r-multicast-causal-transport.c | 2 +- - lib/gibber/gibber-r-multicast-sender.c | 2 +- - lib/gibber/gibber-sasl-auth.c | 2 +- - lib/gibber/gibber-transport.c | 2 +- - lib/gibber/gibber-xmpp-connection-listener.c | 2 +- - lib/gibber/gibber-xmpp-connection.c | 2 +- - lib/gibber/gibber-xmpp-reader.c | 2 +- - 14 files changed, 14 insertions(+), 14 deletions(-) - -commit f8d0ea71085c5ce84e7c515a3cbf7ca41ca8e828 -Author: Guillaume Desmottes -Date: Fri Dec 12 17:53:38 2008 +0000 - - lib/gibber/Makefile.am: update signals marshallers generator - - lib/gibber/Makefile.am | 32 ++++++++++++++++++++------------ - 1 files changed, 20 insertions(+), 12 deletions(-) - -commit 3cbaf51477817a7eb5df795c78f61034a293defb -Author: Guillaume Desmottes -Date: Fri Dec 12 17:34:47 2008 +0000 - - gibber/Makefile.am: update -enumtypes.[ch] generator code - - lib/gibber/Makefile.am | 22 +++++++++++----------- - 1 files changed, 11 insertions(+), 11 deletions(-) - -commit b1d6d6dfb972208b312b77a1c048ba4b1c4c2bcf -Author: Guillaume Desmottes -Date: Fri Dec 12 17:33:42 2008 +0000 - - rename read_ to bytes_read - - lib/gibber/gibber-fd-transport.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 3b43b5d642c3939d30f10f78ca4cab9f28a2f14d -Author: Guillaume Desmottes -Date: Fri Dec 12 16:37:33 2008 +0000 - - add declaration for gibber_xmpp_connection_listener_error_quark - - lib/gibber/gibber-xmpp-connection-listener.h | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 2008ab57bcdffeeceeb15744f29f0e616e04f8d7 -Author: Guillaume Desmottes -Date: Fri Dec 12 16:28:10 2008 +0000 - - listen_tcp_af: rename a variable to avoid double declaration - - lib/gibber/gibber-listener.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 150920cdba8e043a1384fd605ba14bce9e99043a -Author: Guillaume Desmottes -Date: Fri Dec 12 16:20:20 2008 +0000 - - gibber_sasl_auth_start_mechanism: fix a declaration - - lib/gibber/gibber-sasl-auth.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ce2526b876cd63f534302b61f7aa5cc045697774 -Author: Guillaume Desmottes -Date: Fri Dec 12 16:18:29 2008 +0000 - - gibber_sasl_auth_has_mechanism has to be static - - lib/gibber/gibber-sasl-auth.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 44cd093aac830672137d66d2e800721790301533 -Author: Guillaume Desmottes -Date: Fri Dec 12 16:14:03 2008 +0000 - - gibber_r_multicast_sender_class_init: fix declaration - - lib/gibber/gibber-r-multicast-sender.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3016cc02c8833be4fcbad536fedd4f5a5c2b81ed -Author: Guillaume Desmottes -Date: Fri Dec 12 16:07:49 2008 +0000 - - gibber-r-multicast-transport: rename some variables to avoid redeclaration of them - - lib/gibber/gibber-r-multicast-transport.c | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) - -commit efb82375ad499d6d96136fa5b9004db90e8580e5 -Author: Guillaume Desmottes -Date: Fri Dec 12 16:05:32 2008 +0000 - - gibber-r-multicast-sender: gibber_r_multicast_sender_group_gc and insert_packet have to be static - - lib/gibber/gibber-r-multicast-sender.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 529671d5a381c9dc04908df83ae97aad2bc8a9ba -Author: Guillaume Desmottes -Date: Fri Dec 12 16:04:00 2008 +0000 - - fix gibber_tcp_transport_new prototype - - lib/gibber/gibber-tcp-transport.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 992009feb074fb7502269b4de122357492e36009 -Author: Guillaume Desmottes -Date: Fri Dec 12 16:03:02 2008 +0000 - - gibber_fd_transport_read: rename read to read_ as this symbol is defined in libc - - lib/gibber/gibber-fd-transport.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 270a75b7595c37fb7c6a8b46205574a9a057a860 -Author: Guillaume Desmottes -Date: Fri Dec 12 16:00:41 2008 +0000 - - gibber-xmpp-writer: _write_attr and _write_child have to be static - - lib/gibber/gibber-xmpp-writer.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit ec9e197c5c105c34e5a930dc5de8b5945c42dcba -Author: Guillaume Desmottes -Date: Fri Dec 12 15:59:53 2008 +0000 - - gibber_bytestream_muc_initiate has to be static - - lib/gibber/gibber-bytestream-muc.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 86ca6fa4d2bf3b23d05088f8541375278db1c058 -Author: Guillaume Desmottes -Date: Fri Dec 12 15:59:16 2008 +0000 - - gibber_bytestream_oob_initiate has to be static - - lib/gibber/gibber-bytestream-oob.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b26be9e3254fa94e9c812bc3c0348e1ef774f008 -Author: Guillaume Desmottes -Date: Fri Dec 12 15:58:36 2008 +0000 - - add gibber_xmpp_connection_new_no_stream prototype - - lib/gibber/gibber-xmpp-connection.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 19314f09584bfc73ea9a6b07a7235aab5edf7a53 -Author: Guillaume Desmottes -Date: Fri Dec 12 15:57:19 2008 +0000 - - gibber-multicast-transport.h: fix gibber_multicast_transport_new prototype - - lib/gibber/gibber-multicast-transport.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e77506f47d4ea14bfe4ab5ebcca62c3de2b4ef2c -Author: Guillaume Desmottes -Date: Fri Dec 12 15:57:00 2008 +0000 - - gibber-debug.h: fix gibber_debug_set_flags_from_env prototype - - lib/gibber/gibber-debug.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 93cf831ce6a20cee18894c718c986bebb741319c -Author: Guillaume Desmottes -Date: Fri Dec 12 15:55:31 2008 +0000 - - be as anal as Gabble with compiler flags - - configure.ac | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) - -commit 946e96a5c5edebb6a5d8a331b61da1a3ed3eb2f2 -Author: Guillaume Desmottes -Date: Fri Dec 12 14:49:55 2008 +0000 - - upgrade NEWS - - NEWS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 0bd493eafcd25c053463fad392e38ffd6ea05d2b -Author: Guillaume Desmottes -Date: Fri Dec 12 14:41:59 2008 +0000 - - test-two-muc-stream-tubes.py: create an event when the server got a connection and send a welcome message to the client - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit 7452b2dc5d91b5e9823fae55f3442ae5090e336a -Author: Guillaume Desmottes -Date: Fri Dec 12 14:38:10 2008 +0000 - - new_connection_to_socket: block the transport while the bytesream is not open - - src/tube-stream.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 99fb721417eba51cfb19ca1ca8da9d63315376c7 -Author: Guillaume Desmottes -Date: Fri Dec 12 12:31:08 2008 +0000 - - transport_buffer_empty_cb: fix debug messsage - - src/tube-stream.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a9c261c10a514d75ae27d116a422787a2526bd64 -Author: Guillaume Desmottes -Date: Wed Dec 10 12:20:50 2008 +0000 - - salut_file_transfer_channel_offer_file: pass another GError to salut_xmpp_connection_manager_request_connection so we don't re-set it if something goes wrong - - src/salut-file-transfer-channel.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 4368667ca09fd9e4023917f4e9d9c60af457ac41 -Author: Guillaume Desmottes -Date: Tue Dec 9 17:23:01 2008 +0000 - - add test-receive-file-and-sender-disconnect-while-transfering.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 4d04fc0169e80716b1dfac3c8ab4f23fe7fb6f36 -Author: Guillaume Desmottes -Date: Tue Dec 9 17:22:54 2008 +0000 - - add test-receive-file-and-sender-disconnect-while-transfering.py - - ...file-and-sender-disconnect-while-transfering.py | 30 ++++++++++++++++++++ - 1 files changed, 30 insertions(+), 0 deletions(-) - -commit 916d28b85dbd18bb5b82dea5e6f5190e6515f551 -Author: Guillaume Desmottes -Date: Tue Dec 9 17:22:40 2008 +0000 - - contact_lost_cb: close the transfer only if it was pending - - src/salut-file-transfer-channel.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 22dd68d61836f03bb878f60e7a6d8d2910e4be75 -Author: Guillaume Desmottes -Date: Tue Dec 9 17:03:26 2008 +0000 - - rename test-receive-file-and-sender-disconnect.py to test-receive-file-and-sender-disconnect-while-pending.py - - tests/twisted/Makefile.am | 2 +- - ...ive-file-and-sender-disconnect-while-pending.py | 31 ++++++++++++++++++++ - .../test-receive-file-and-sender-disconnect.py | 31 -------------------- - 3 files changed, 32 insertions(+), 32 deletions(-) - -commit 20ced0fd2ba25e948f59907cc0c2e1f09821ee25 -Author: Guillaume Desmottes -Date: Tue Dec 9 16:36:43 2008 +0000 - - NEWS: summarize changes so far - - NEWS | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) - -commit b65235e9c921cd9603038ebb3b807fda03bbba81 -Author: Guillaume Desmottes -Date: Tue Dec 9 16:18:17 2008 +0000 - - add test-receive-file-and-xmpp-disconnect.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 3e1964761bcc2433305e01f1f46a1af221503089 -Author: Guillaume Desmottes -Date: Tue Dec 9 16:18:06 2008 +0000 - - add test-receive-file-and-xmpp-disconnect.py - - .../avahi/test-receive-file-and-xmpp-disconnect.py | 29 ++++++++++++++++++++ - 1 files changed, 29 insertions(+), 0 deletions(-) - -commit b0ab43975007de26e2eaf2ef4ef084b138868a5a -Author: Guillaume Desmottes -Date: Tue Dec 9 16:17:29 2008 +0000 - - file_transfer_helper: factor out _read_file_from_socket - - tests/twisted/avahi/file_transfer_helper.py | 23 +++++++++++++---------- - 1 files changed, 13 insertions(+), 10 deletions(-) - -commit 2918a09eaee02adbd4c896a2e3ad234d1e121a82 -Author: Guillaume Desmottes -Date: Tue Dec 9 16:17:02 2008 +0000 - - http_client_finished_chunks_cb: don't close the FT channel if the IQ result wasn't send - - lib/gibber/gibber-oob-file-transfer.c | 21 ++++++++++----------- - 1 files changed, 10 insertions(+), 11 deletions(-) - -commit 7315df9e649efed9c964c4d6ca64d4a539966495 -Author: Guillaume Desmottes -Date: Tue Dec 9 16:16:11 2008 +0000 - - gibber_file_transfer_send_stanza: raise an error if the XMPP connection is not connected - - lib/gibber/gibber-file-transfer.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 075402b4c35c19ace0ce776237adc5d983ad2673 -Author: Guillaume Desmottes -Date: Tue Dec 9 15:39:38 2008 +0000 - - test-receive-file-and-sender-disconnect.py: disconnect the XMPP connection too - - .../test-receive-file-and-sender-disconnect.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 527d3c6d0100bb0ddbec8360483159fafcf55ca6 -Author: Guillaume Desmottes -Date: Tue Dec 9 15:39:18 2008 +0000 - - salut_file_transfer_channel_close: don't cancel if the channel was already cancelled - - src/salut-file-transfer-channel.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 197bc32dd6ef46bea80c768fdd67e51f02780431 -Author: Guillaume Desmottes -Date: Tue Dec 9 15:32:24 2008 +0000 - - salut-file-transfer-channel: contact_lost_cb: add DEBUG - - src/salut-file-transfer-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 5584df5f0708c5e7bea0bf879c32f4e40e86b551 -Author: Guillaume Desmottes -Date: Tue Dec 9 15:07:33 2008 +0000 - - add test-receive-file-and-sender-disconnect.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit fde8951c76b3752c34b8e9c7217fbb9dd61b52e1 -Author: Guillaume Desmottes -Date: Tue Dec 9 15:07:26 2008 +0000 - - add test-receive-file-and-sender-disconnect.py - - .../test-receive-file-and-sender-disconnect.py | 31 ++++++++++++++++++++ - 1 files changed, 31 insertions(+), 0 deletions(-) - -commit d615ceb8a55c6d202e26d1b26ae453cbd55ec955 -Author: Guillaume Desmottes -Date: Tue Dec 9 15:07:11 2008 +0000 - - change state of FT to cancelled if the contact is disconnected - - src/salut-file-transfer-channel.c | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -commit 79d9d25aa9c92337d88172a28ea754cae1a33bd3 -Author: Guillaume Desmottes -Date: Tue Dec 9 15:05:36 2008 +0000 - - file_transfer_helper.py: store contact's service - - tests/twisted/avahi/file_transfer_helper.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 15db638631b05011561575ff354a3bd82c76e741 -Author: Guillaume Desmottes -Date: Tue Dec 9 15:05:02 2008 +0000 - - avahitest.py: add stop method to AvahiAnnouncer - - tests/twisted/avahitest.py | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 1bcd6677c4c42b7aeeae0f040d638d3617e07078 -Author: Guillaume Desmottes -Date: Tue Dec 9 14:05:53 2008 +0000 - - add test-receive-file-and-disconnect.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 8e6de42447c2c22628312e8266c7b0228973a999 -Author: Guillaume Desmottes -Date: Tue Dec 9 14:05:42 2008 +0000 - - add test-receive-file-and-disconnect.py - - .../avahi/test-receive-file-and-disconnect.py | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) - -commit 96eeebc5171a0bc09a137c6079754e37ca3fe4d8 -Merge: 947b1e5 d04b406 -Author: Guillaume Desmottes -Date: Tue Dec 9 13:56:27 2008 +0000 - - Merge branch 'master' into crasher - -commit d04b4067d4e65c9f4513a985dfa4be491cbd6b06 -Merge: ac41063 bc6a2fd -Author: Guillaume Desmottes -Date: Tue Dec 9 13:52:53 2008 +0000 - - Merge branch 'master' into ft-tests - -commit 947b1e505fd2143f8f8763971bd74b1a7143b922 -Merge: ac41063 bc6a2fd -Author: Guillaume Desmottes -Date: Tue Dec 9 12:02:57 2008 +0000 - - Merge branch 'soup2.4' into crasher - -commit bc6a2fdf9a58491bcea3cfd3409295d7bd01bd8c -Author: Guillaume Desmottes -Date: Tue Dec 9 11:40:17 2008 +0000 - - input_channel_readable_cb: soup_message_body_complete has to be called on the *response* body - - lib/gibber/gibber-oob-file-transfer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 31948f5649b53dc142625f32703ebc591bacdb9a -Merge: c57aaf8 8a8d0ce -Author: Guillaume Desmottes -Date: Mon Dec 8 14:40:30 2008 +0000 - - Merge branch 'master' into soup2.4 - -commit 8a8d0cecdabbdb7c944d96b96fc9d5461cbc9e39 -Author: Guillaume Desmottes -Date: Mon Dec 8 14:38:55 2008 +0000 - - test-xmpp-connection.c: check written value - - tests/test-xmpp-connection.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit c57aaf8626982beba42edda5956482cd44e16b8d -Merge: 3de400b 30c9f66 -Author: Guillaume Desmottes -Date: Mon Dec 8 14:28:24 2008 +0000 - - Merge branch 'test' into soup2.4 - -commit 30c9f66e1a63289dc87efdd648132a194ab1d82d -Author: Guillaume Desmottes -Date: Mon Dec 8 14:23:12 2008 +0000 - - add generated m4 files to gitignore - - .gitignore | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 378b63c0da8b36f5731ee93eadc5079704740b29 -Author: Guillaume Desmottes -Date: Mon Dec 8 14:20:01 2008 +0000 - - check-gibber-sasl-auth.c: workaround missing g_set_error_literal - - tests/check-gibber-sasl-auth.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 84b198c1e667289db84d12a8eee4448d4b35f33c -Author: Guillaume Desmottes -Date: Mon Dec 8 14:12:34 2008 +0000 - - test-xmpp-connection.c: don't ignore fwrite return value so compiler is happy - - tests/test-xmpp-connection.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 3de400b80f879b5d34d83187c9a9bec455a4766b -Author: Guillaume Desmottes -Date: Mon Dec 8 13:01:54 2008 +0000 - - http_client_chunk_cb: use the SoupBuffer - - lib/gibber/gibber-oob-file-transfer.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 1d46d32fcf50fbf1371f4b9512ac0fc5f0baae76 -Author: Guillaume Desmottes -Date: Mon Dec 8 13:00:09 2008 +0000 - - the SOUP_MESSAGE_OVERWRITE_CHUNKS flag has been deprecated - - lib/gibber/gibber-oob-file-transfer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ada747f1f1f31c40b65cc2a50b303dc14c948657 -Author: Guillaume Desmottes -Date: Mon Dec 8 12:59:27 2008 +0000 - - SoupMessage got_chunk signal has been renamed to got-chunk and takes an extra argument - - lib/gibber/gibber-oob-file-transfer.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 5be51de71d3a295e7eb4309f3df6e64ff450cde6 -Author: Guillaume Desmottes -Date: Mon Dec 8 12:33:00 2008 +0000 - - wrap a big line - - lib/gibber/gibber-oob-file-transfer.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 02e5ac40c262b2c87753a9bd6d3228ccb5b9eba3 -Author: Guillaume Desmottes -Date: Mon Dec 8 12:05:31 2008 +0000 - - gibber-oob-file-transfer.c: input_channel_readable_cb: chunk has to be added to the response, not the request - - lib/gibber/gibber-oob-file-transfer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2a8c4736186919880562c388593eca1a6929d5b1 -Author: Guillaume Desmottes -Date: Sat Dec 6 13:55:18 2008 +0000 - - remove FIXME about libsoup 2.4 - - lib/gibber/gibber-oob-file-transfer.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 2494b1467d20e2a95f0621e509d2fb84fe679c7f -Author: Guillaume Desmottes -Date: Fri Dec 5 16:22:37 2008 +0000 - - http_server_cb: use soup_server_unpause_message instead of soup_session_unpause_message - - lib/gibber/gibber-oob-file-transfer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8ae42c4f269a0b6db6dff15598c96ae80e72ce49 -Author: Guillaume Desmottes -Date: Fri Dec 5 16:14:18 2008 +0000 - - wrap a big line - - lib/gibber/gibber-oob-file-transfer.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 9dbc7d616af3416b5f21fbe7aeccac06fad42480 -Author: Guillaume Desmottes -Date: Fri Dec 5 16:14:03 2008 +0000 - - input_channel_readable_cb: we have to use soup_server_unpause_message and not soup_session_unpause_message as this function is called on the server side - - lib/gibber/gibber-oob-file-transfer.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 3174d5641a8ef55b81738dee854ac8c6f378bca6 -Author: Sjoerd Simons -Date: Fri Dec 5 15:33:16 2008 +0000 - - Change a missing soup_message_io_unpause to soup_session_unpause_message - - lib/gibber/gibber-oob-file-transfer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a48f668bf7620702e7a241234e72756acec11551 -Author: Sjoerd Simons -Date: Thu Dec 4 21:23:12 2008 +0000 - - Break lines at 80 chars - - lib/gibber/gibber-oob-file-transfer.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 15a0a7346d46d04802480b709af22e887ecf0c16 -Author: Hubert Figuiere -Date: Thu Dec 4 21:13:33 2008 +0000 - - Port to libsoup 2.4 - - configure.ac | 2 +- - lib/gibber/gibber-oob-file-transfer.c | 45 +++++++++++++++++--------------- - 2 files changed, 25 insertions(+), 22 deletions(-) - -commit ac410637de5f03633995f55a7cbdb7872581a41a -Author: Guillaume Desmottes -Date: Fri Dec 5 13:52:10 2008 +0000 - - test-ichat-send-file.py: port to new FT test design - - tests/twisted/avahi/test-ichat-send-file.py | 264 ++++----------------------- - 1 files changed, 38 insertions(+), 226 deletions(-) - -commit 9bd2f8a779d268bb363a1f2d3728100ca46d3f58 -Author: Guillaume Desmottes -Date: Fri Dec 5 13:51:54 2008 +0000 - - file_transfer_helper.py: factor out _get_http_response - - tests/twisted/avahi/file_transfer_helper.py | 13 ++++++++----- - 1 files changed, 8 insertions(+), 5 deletions(-) - -commit 79e7562e07421c243966c4889422f407eaf31acd -Author: Guillaume Desmottes -Date: Fri Dec 5 13:05:18 2008 +0000 - - test-ichat-send-file-declined.py: port to new FT test design - - .../twisted/avahi/test-ichat-send-file-declined.py | 217 ++++---------------- - 1 files changed, 36 insertions(+), 181 deletions(-) - -commit bbafe71d8f0398e491c38e95e4097e1690aed013 -Author: Guillaume Desmottes -Date: Fri Dec 5 13:05:02 2008 +0000 - - merge 2 import lines - - tests/twisted/avahi/file_transfer_helper.py | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 25f85109246907aea15401b1ec7b4cf686b06aa3 -Author: Guillaume Desmottes -Date: Fri Dec 5 12:54:06 2008 +0000 - - test-ichat-receive-file.py: port to new FT test design - - tests/twisted/avahi/test-ichat-receive-file.py | 244 +++-------------------- - 1 files changed, 32 insertions(+), 212 deletions(-) - -commit 20b904fbcbf9ac011b157a3f18b165452692e268 -Author: Guillaume Desmottes -Date: Fri Dec 5 12:46:53 2008 +0000 - - test-ichat-receive-directory.py: port to new FT test design - - .../twisted/avahi/test-ichat-receive-directory.py | 165 ++++--------------- - 1 files changed, 35 insertions(+), 130 deletions(-) - -commit 1d1af5f1cfc75d884e4436a414b8075e2e5f4ff4 -Author: Guillaume Desmottes -Date: Fri Dec 5 12:46:26 2008 +0000 - - file_transfer_helper.py: factor out _resolve_salut_presence - - tests/twisted/avahi/file_transfer_helper.py | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 494d1f8cfa955a60f8f22855d1ff6b4d791c7c11 -Author: Guillaume Desmottes -Date: Mon Nov 24 17:37:15 2008 +0000 - - return True when we want to exit the test earlier - - tests/twisted/avahi/test-receive-file-decline.py | 7 ++----- - .../avahi/test-send-file-and-cancel-immediately.py | 7 ++----- - .../twisted/avahi/test-send-file-and-disconnect.py | 10 ++-------- - tests/twisted/avahi/test-send-file-declined.py | 10 ++-------- - .../twisted/avahi/test-send-file-item-not-found.py | 4 ++-- - 5 files changed, 10 insertions(+), 28 deletions(-) - -commit 0a558b2988eb30a6dc0dce7b79fa7386c8f503f7 -Author: Guillaume Desmottes -Date: Mon Nov 24 17:32:39 2008 +0000 - - use a _actions list instead of a calling each function in run() - - tests/twisted/avahi/file_transfer_helper.py | 51 ++++++++----------- - tests/twisted/avahi/test-receive-and-send-file.py | 40 ++++++--------- - .../avahi/test-send-file-to-unknown-contact.py | 8 ++- - .../avahi/test-send-file-wait-to-provide.py | 21 +++----- - 4 files changed, 50 insertions(+), 70 deletions(-) - -commit 6058a5e2c9bef9f565193a179f2dcd3efc3d97e5 -Author: Guillaume Desmottes -Date: Mon Nov 24 17:04:38 2008 +0000 - - test-receive-and-send-file.py: use ReceiveFileTest and SendFileTest - - tests/twisted/avahi/test-receive-and-send-file.py | 346 +++------------------ - 1 files changed, 38 insertions(+), 308 deletions(-) - -commit 8943cca3f97db38fc1be48f2f64d0b0ba5993e80 -Author: Guillaume Desmottes -Date: Mon Nov 24 17:04:04 2008 +0000 - - file_transfer_helper.py: factor out _check_oob_iq - - tests/twisted/avahi/file_transfer_helper.py | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 58ac537c76413ce813d3967bc39a2ab1d547f0df -Author: Guillaume Desmottes -Date: Mon Nov 24 16:46:26 2008 +0000 - - remove debug output - - tests/twisted/avahi/test-receive-file-not-found.py | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 05c2e69c22b404e6f11f7b1b87c1f3a5c7a3ddfa -Author: Guillaume Desmottes -Date: Mon Nov 24 16:46:18 2008 +0000 - - rename ReceiveFileTransferTest to ReceiveFileTest - - tests/twisted/avahi/file_transfer_helper.py | 2 +- - .../test-receive-file-cancelled-immediately.py | 6 +++--- - tests/twisted/avahi/test-receive-file-decline.py | 4 ++-- - tests/twisted/avahi/test-receive-file-not-found.py | 4 ++-- - tests/twisted/avahi/test-receive-file.py | 4 ++-- - 5 files changed, 10 insertions(+), 10 deletions(-) - -commit 9db207710ff89ad91ea7a74dd5208e7b813ac7f7 -Author: Guillaume Desmottes -Date: Mon Nov 24 16:40:57 2008 +0000 - - test-send-file-to-unknown-contact.py: use SendFileTest - - .../avahi/test-send-file-to-unknown-contact.py | 108 +++----------------- - 1 files changed, 16 insertions(+), 92 deletions(-) - -commit 60eee18cc4c5f0a17d88c33725de3419681cd010 -Author: Guillaume Desmottes -Date: Mon Nov 24 16:40:45 2008 +0000 - - test-send-file-wait-to-provide.py: use SendFileTest - - .../avahi/test-send-file-wait-to-provide.py | 279 ++++---------------- - 1 files changed, 47 insertions(+), 232 deletions(-) - -commit b298ee7be81e9c8f8f46f5fe20711ff894d5a890 -Author: Guillaume Desmottes -Date: Mon Nov 24 16:40:33 2008 +0000 - - test-send-file-provide-immediately.py: use SendFileTest - - .../avahi/test-send-file-provide-immediately.py | 241 ++------------------ - 1 files changed, 21 insertions(+), 220 deletions(-) - -commit cd9d6fa95a16fafc3dea147213bc161f448bee94 -Author: Guillaume Desmottes -Date: Mon Nov 24 16:40:20 2008 +0000 - - test-send-file-item-not-found.py: use SendFileTest - - .../twisted/avahi/test-send-file-item-not-found.py | 235 +++----------------- - 1 files changed, 36 insertions(+), 199 deletions(-) - -commit 88384fde815ead559b66b9f7b22b101c04b17304 -Author: Guillaume Desmottes -Date: Mon Nov 24 16:40:07 2008 +0000 - - test-send-file-declined.py: use SendFileTest - - tests/twisted/avahi/test-send-file-declined.py | 243 +++++------------------- - 1 files changed, 44 insertions(+), 199 deletions(-) - -commit 902d6046e4b5faa64c08de39fa9d2a10240a8932 -Author: Guillaume Desmottes -Date: Mon Nov 24 16:39:24 2008 +0000 - - test-send-file-and-disconnect.py: use SendFileTest - - .../twisted/avahi/test-send-file-and-disconnect.py | 190 ++------------------ - 1 files changed, 15 insertions(+), 175 deletions(-) - -commit 31d5943f41b8c42b1b13f3010c2a3f11bfce3ed1 -Author: Guillaume Desmottes -Date: Mon Nov 24 16:39:07 2008 +0000 - - test-send-file-and-cancel-immediately.py: use SendFileTest - - .../avahi/test-send-file-and-cancel-immediately.py | 219 +++----------------- - 1 files changed, 30 insertions(+), 189 deletions(-) - -commit 941393e1db0703565b58a99fbe5ce069663f8ec4 -Author: Guillaume Desmottes -Date: Mon Nov 24 16:38:49 2008 +0000 - - file_transfer_helper.py: add SendFileTest - - tests/twisted/avahi/file_transfer_helper.py | 182 ++++++++++++++++++++++++--- - 1 files changed, 163 insertions(+), 19 deletions(-) - -commit cc711b421bd14b5ce1063449e69300c9a1ceef8e -Author: Guillaume Desmottes -Date: Mon Nov 24 13:51:10 2008 +0000 - - test-receive-file-not-found.py: use ReceiveFileTransferTest - - tests/twisted/avahi/test-receive-file-not-found.py | 256 ++++---------------- - 1 files changed, 47 insertions(+), 209 deletions(-) - -commit c464ef4ae0f25b802a3183057fa2a440d4d43798 -Author: Guillaume Desmottes -Date: Mon Nov 24 13:50:54 2008 +0000 - - test-receive-file-decline.py: use ReceiveFileTransferTest - - tests/twisted/avahi/test-receive-file-decline.py | 229 +++------------------ - 1 files changed, 33 insertions(+), 196 deletions(-) - -commit 2fa6e81e4e81d8a4e72db5647403defc4ec1dcd3 -Author: Guillaume Desmottes -Date: Mon Nov 24 13:50:41 2008 +0000 - - test-receive-file-cancelled-immediately.py: use ReceiveFileTransferTest - - .../test-receive-file-cancelled-immediately.py | 208 ++------------------ - 1 files changed, 19 insertions(+), 189 deletions(-) - -commit 4972ea63ffd2367ad498ac4908b0efb5fe6cc1c4 -Author: Guillaume Desmottes -Date: Mon Nov 24 13:50:21 2008 +0000 - - test-receive-file: use ReceiveFileTransferTest - - tests/twisted/avahi/test-receive-file.py | 218 +----------------------------- - 1 files changed, 3 insertions(+), 215 deletions(-) - -commit ab350a34ef53f20a64157732dfb461306246a1f3 -Author: Guillaume Desmottes -Date: Mon Nov 24 13:49:55 2008 +0000 - - add avahi/file_transfer_helper.py to EXTRA_DIST - - tests/twisted/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 80baeb65c4abe0391301859e1c71f60b2963e89f -Author: Guillaume Desmottes -Date: Mon Nov 24 13:48:01 2008 +0000 - - add file_transfer_helper.py - - tests/twisted/avahi/file_transfer_helper.py | 273 +++++++++++++++++++++++++++ - 1 files changed, 273 insertions(+), 0 deletions(-) - -commit cb3469a56e1b2b1ca6145aa5ccb2c916d04745db -Author: Guillaume Desmottes -Date: Wed Dec 3 15:05:31 2008 +0000 - - gibber-oob-file-transfer: unref the msg when disposing in the receiver case too if needed so we are sure to free all the soup objects - - lib/gibber/gibber-oob-file-transfer.c | 17 ++++++++++------- - 1 files changed, 10 insertions(+), 7 deletions(-) - -commit 34805396ad54bef91f7b9be3b9d5ff572367f002 -Author: Guillaume Desmottes -Date: Tue Dec 2 17:14:18 2008 +0000 - - version 0.3.6 - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8f6108694b4997da73a12c8210f683010e63a765 -Author: Guillaume Desmottes -Date: Tue Dec 2 17:12:15 2008 +0000 - - extensions/Makefile.am: remove Channel_Type_File.xml - - extensions/Makefile.am | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit cde10ae4c891e15133b27b5a895d35fea0cd2b3b -Merge: b073b35 d2fb066 -Author: Guillaume Desmottes -Date: Tue Dec 2 17:03:40 2008 +0000 - - Merge branch 'release' - -commit d2fb066bccc046c493dd2baa7f6cc204f8e12bfc -Author: Guillaume Desmottes -Date: Tue Dec 2 17:03:32 2008 +0000 - - version 0.3.6 - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit b464810d354ddeea9bac8a7ec8dfa2e92460e7b3 -Author: Guillaume Desmottes -Date: Tue Dec 2 17:02:58 2008 +0000 - - update NEWS for 0.3.6 - - NEWS | 25 +++++++++++++++++++++++++ - 1 files changed, 25 insertions(+), 0 deletions(-) - -commit b073b35181791c97888cf74f5d106ab7a74a5f77 -Author: Guillaume Desmottes -Date: Tue Dec 2 16:14:58 2008 +0000 - - gibber_oob_file_transfer_is_file_offer: skip leading '\n' in url - - lib/gibber/gibber-oob-file-transfer.c | 10 ++++++++-- - tests/twisted/avahi/test-ichat-receive-file.py | 2 +- - 2 files changed, 9 insertions(+), 3 deletions(-) - -commit 820608ed4d0891d806980ba0a91938f028d4f5ec -Author: Guillaume Desmottes -Date: Tue Dec 2 15:11:30 2008 +0000 - - tube-stream: block the transport while we don't have a bytestream to transfer its data - - src/tube-stream.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 8846da046ecfec61bbd21ad21f31c0b81f31dcff -Author: Guillaume Desmottes -Date: Tue Dec 2 15:08:19 2008 +0000 - - test-two-muc-stream-tubes: increase timer to one minute - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 4aa09a3ca2647008ddf70ab1a6ee6f59c7778088 -Author: Guillaume Desmottes -Date: Tue Dec 2 11:13:14 2008 +0000 - - test-two-muc-stream-tubes.py: increase timer - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d1a918d86d017406ca90feb497b4d3c220d27f12 -Author: Guillaume Desmottes -Date: Tue Dec 2 11:00:28 2008 +0000 - - test-two-muc-stream-tubes.py: wait for the TubeStateChanged and StreamTubeNewConnection signals - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 38 ++++++++++++++++++---- - 1 files changed, 31 insertions(+), 7 deletions(-) - -commit 8bce36782662029e5982a52d2d8d9342275bd8ed -Author: Guillaume Desmottes -Date: Mon Dec 1 11:24:59 2008 +0000 - - add test-two-muc-stream-tubes.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 723562f65923a30cc98c48c7ef522c958edeb3e9 -Author: Guillaume Desmottes -Date: Mon Dec 1 17:49:28 2008 +0000 - - add test-two-muc-stream-tubes.py - - tests/twisted/avahi/test-two-muc-stream-tubes.py | 243 ++++++++++++++++++++++ - 1 files changed, 243 insertions(+), 0 deletions(-) - -commit c1243ef3c2055548803d87a5d6382b0829763af3 -Author: Guillaume Desmottes -Date: Mon Dec 1 17:43:12 2008 +0000 - - salut_tube_stream_close: iterate on the bytestream_to_transport hash table as that's the one which always has all the bytestreams - - src/tube-stream.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit b41e7dda5da5f8c5f1a1fc7b8972b38190ff6f7c -Author: Alban Crequy -Date: Mon Dec 1 17:17:20 2008 +0000 - - SalutTubeStream: let the client know the right port with GetStreamTubeSocketAddress() - - src/tube-stream.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -commit 5365a02c4726c3507366dc052a27602f77999b3c -Merge: 9c8dc5e e4be88d -Author: Alban Crequy -Date: Mon Dec 1 16:57:18 2008 +0000 - - Merge branch 'master' into tubes-bugs - -commit 9c8dc5e085eb4856b8b4775d01aea5fb2a231912 -Author: Alban Crequy -Date: Mon Dec 1 16:52:03 2008 +0000 - - GibberBytestream{Direct,OOB}: add a comment on set_transport - - lib/gibber/gibber-bytestream-direct.c | 11 +++++++---- - lib/gibber/gibber-bytestream-oob.c | 3 +++ - 2 files changed, 10 insertions(+), 4 deletions(-) - -commit 3c2c3be64be6e2755552634bb013887c68758042 -Author: Alban Crequy -Date: Mon Dec 1 16:44:44 2008 +0000 - - GibberBytestream{Direct,OOB}: check the status of the transport in set_transport - - lib/gibber/gibber-bytestream-direct.c | 11 ++++++----- - lib/gibber/gibber-bytestream-oob.c | 11 ++++++----- - 2 files changed, 12 insertions(+), 10 deletions(-) - -commit e4be88ded3c5b3a761353640506dc7f59e5e2dc9 -Author: Guillaume Desmottes -Date: Mon Dec 1 16:20:23 2008 +0000 - - salut_roomlist_manager_dispose: don't leak the XCM - - src/salut-roomlist-manager.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 528c020512361e993070cf57184322af07aa7b68 -Author: Alban Crequy -Date: Mon Dec 1 16:32:29 2008 +0000 - - GibberBytestreamOOB: Check the status of the transport because with GibberListener, the transport can already be connected - - lib/gibber/gibber-bytestream-oob.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit a5125cae6c0c4ec1480b4dbfe26be193fda35aaa -Author: Guillaume Desmottes -Date: Mon Dec 1 15:47:59 2008 +0000 - - Revert "SalutXmppConnectionManager: connect to TpSvcConnection::status-changed and close streams" - - This reverts commit 4e1802e8e381df684793b22b9e6b7180a6b815eb. - - src/salut-xmpp-connection-manager.c | 77 ++++++---------------------------- - 1 files changed, 14 insertions(+), 63 deletions(-) - -commit 7419298e2624550fbd1294399e519e565567956f -Merge: 05e9eb4 30d6d50 -Author: Alban Crequy -Date: Mon Dec 1 14:47:15 2008 +0000 - - Merge commit 'cassidy/fix-transport' into tubes-bugs - -commit 30d6d50c9e154b23ee6aa95bdc81ff22dd108adf -Author: Guillaume Desmottes -Date: Mon Dec 1 14:42:49 2008 +0000 - - gibber-bytestream-oob: actually keep a ref on the transport - - lib/gibber/gibber-bytestream-oob.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 63d5473f097d4f2e4cde18c4b61654fed4547f02 -Author: Guillaume Desmottes -Date: Mon Dec 1 14:33:23 2008 +0000 - - gibber-bytestream-oob: set_transport: harmonize g_signal_connect syntax - - lib/gibber/gibber-bytestream-oob.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 12e5a84220c0ccb8509a8707ef1bcff4e375d164 -Author: Guillaume Desmottes -Date: Mon Dec 1 14:17:32 2008 +0000 - - gibber-listener.c: don't display port if it was not set - - lib/gibber/gibber-listener.c | 11 +++++++++-- - 1 files changed, 9 insertions(+), 2 deletions(-) - -commit 6fdb59f96cc88dbbdffea40f6642f1d488a62dbc -Author: Guillaume Desmottes -Date: Mon Dec 1 13:23:58 2008 +0000 - - listener_io_in_cb: don't query for the port if we are using a UNIX socket - - lib/gibber/gibber-listener.c | 18 +++++++++++++++--- - 1 files changed, 15 insertions(+), 3 deletions(-) - -commit 05e9eb4d7ea5d9c8f2716cab58c5fee8d0c103a8 -Merge: bd1c843 65e9508 -Author: Alban Crequy -Date: Mon Dec 1 12:30:10 2008 +0000 - - Merge branch 'master' into tubes-bugs - -commit bd1c843448e733e1bf2f9fb96b7dc8640e431f80 -Author: Alban Crequy -Date: Mon Dec 1 11:45:53 2008 +0000 - - SalutStreamTube: fix a crash on initiator side when the bytestream is closed while not fully open - - src/tube-stream.c | 35 ++++++++++++++++++++++------------- - 1 files changed, 22 insertions(+), 13 deletions(-) - -commit 65e9508671ca6dfd7d0d25cc160620256809435e -Author: Guillaume Desmottes -Date: Mon Dec 1 11:24:30 2008 +0000 - - gibber_oob_file_transfer_is_file_offer: check if the protocol is http so we don't identify stream tube bytestream as file transfer - - lib/gibber/gibber-oob-file-transfer.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 4a3e481234232873cb86bb684d6376b0840f0abb -Author: Guillaume Desmottes -Date: Mon Dec 1 11:12:44 2008 +0000 - - salut_ft_manager_new_channel: improve debug msg - - src/salut-ft-manager.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 6e9ff32ae32c2cd5d2eebd5767928941da12bc13 -Author: Guillaume Desmottes -Date: Fri Nov 28 16:37:31 2008 +0000 - - salut_muc_manager_request_new_muc_channel: fix roomlist_manager leak - - src/salut-muc-manager.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 0d3f6cae5145e43a54fc36f79702de06c4f3eae2 -Author: Guillaume Desmottes -Date: Fri Nov 28 16:26:18 2008 +0000 - - salut-roomlist-manager.h: remove old method declarations - - src/salut-roomlist-manager.h | 12 ------------ - 1 files changed, 0 insertions(+), 12 deletions(-) - -commit 9bdd6343d64dd2f485a17e4fb04b97ff0e600289 -Author: Guillaume Desmottes -Date: Fri Nov 28 15:58:36 2008 +0000 - - gibber_bytestream_oob_initiate: wtf? We are suppose to connect signals on objects, not functions - - lib/gibber/gibber-bytestream-oob.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 553cce6054f9a30b49ea8f44a8b48e6aa82041ea -Merge: 397404b bf45c90 -Author: Guillaume Desmottes -Date: Fri Nov 28 12:36:48 2008 +0000 - - Merge branch 'master' into ft-requestotron-ichat-directory - -commit bf45c909c6097081d6739aa1bbb7d4341a0b0a24 -Merge: a0f2083 151df5f -Author: Guillaume Desmottes -Date: Fri Nov 28 12:36:21 2008 +0000 - - Merge branch 'style' - -commit 151df5f58c833f1cedac788045b9b0b414a8c82c -Author: Guillaume Desmottes -Date: Fri Nov 28 12:26:18 2008 +0000 - - remove trailing space - - lib/gibber/gibber-bytestream-direct.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a0f20836f52b2e00da107a31402df3ff7344f249 -Author: Guillaume Desmottes -Date: Fri Nov 28 12:01:27 2008 +0000 - - http_server_cb: copy buffer to a tmp variable - - lib/gibber/gibber-oob-file-transfer.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit 15d45d0a250ddb6215b6b5fd3f3e6ddc68d6bbf0 -Author: Guillaume Desmottes -Date: Fri Nov 28 11:43:39 2008 +0000 - - gibber_oob_file_transfer_received_stanza: don't hardcode error code - - lib/gibber/gibber-oob-file-transfer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 7b4a219c6e3915faac5e3e1b3816a4a6aecb48c7 -Author: Guillaume Desmottes -Date: Fri Nov 28 11:42:36 2008 +0000 - - http_server_cb: no need to copy the byte array data if we don't free them - - lib/gibber/gibber-oob-file-transfer.c | 12 +++--------- - 1 files changed, 3 insertions(+), 9 deletions(-) - -commit 9790c581f2b29f159df569278a347497458461f2 -Merge: bbb1426 72c3ba8 -Author: Guillaume Desmottes -Date: Fri Nov 28 11:28:32 2008 +0000 - - Merge branch 'master' into ft-requestotron-ichat - - Conflicts: - - tests/twisted/Makefile.am - -commit 72c3ba82b25a8a539ae22811ce7877d9b1bb84f7 -Merge: c530823 1b139ff -Author: Guillaume Desmottes -Date: Fri Nov 28 11:23:02 2008 +0000 - - Merge branch 'master' into im-requests - - Conflicts: - - tests/twisted/Makefile.am - -commit c5308231c8203c2bdbfbff5026cd125001a0e0f0 -Author: Guillaume Desmottes -Date: Fri Nov 28 10:58:50 2008 +0000 - - test-request-im.py: no need to use call_async for EnsureChannel - - tests/twisted/avahi/test-request-im.py | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -commit 1b139ff40e1862b5bce03eb1a1e10b4ee886083e -Author: Guillaume Desmottes -Date: Fri Nov 28 10:51:42 2008 +0000 - - test-disabled-1-1-tubes.py: error raised in now NotImplemented. Probably because of the requestotronification - - tests/twisted/avahi/test-disabled-1-1-tubes.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f3e4c6d4bb7e8a767d1084ea605f626d40f28e03 -Merge: 88eb6d9 11bfb33 -Author: Guillaume Desmottes -Date: Fri Nov 28 10:51:05 2008 +0000 - - Merge branch 'master' into disable-1-1-tubes - - Conflicts: - - src/salut-connection.c - -commit 11bfb33832d0393a5fb244d7a59f72d6bd471aa4 -Author: Guillaume Desmottes -Date: Thu Nov 27 17:53:25 2008 +0000 - - test-roomlist.py: no need to use call_async for EnsureChannel - - tests/twisted/avahi/test-roomlist.py | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -commit e0323be4295d565ed0db47ce9261a26045af11a2 -Author: Guillaume Desmottes -Date: Thu Nov 27 17:51:45 2008 +0000 - - test-request-muc.py: no need to use call_async for EnsureChannel - - tests/twisted/avahi/test-request-muc.py | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -commit d3254cc6627f9f8e430a411aec82a0163937ff0a -Author: Guillaume Desmottes -Date: Thu Nov 27 17:40:43 2008 +0000 - - test-request-muc-tubes.py: no need to use call_async for EnsureChannel - - tests/twisted/avahi/test-request-muc-tubes.py | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -commit 7f595a4802fc864cd6a709463a0d2537c2d6d070 -Author: Guillaume Desmottes -Date: Thu Nov 27 17:20:01 2008 +0000 - - make_roomlist_channel: add FIXME explaining we should improve the id allocation at some point - - src/salut-roomlist-manager.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit d85a3d3698c8441cfdf3fd892c1383b96d2403e9 -Author: Guillaume Desmottes -Date: Thu Nov 27 15:59:59 2008 +0000 - - salut_roomlist_manager_request: don't check the Server property as user can't pass it when requesting anymore - - src/salut-roomlist-manager.c | 11 ----------- - 1 files changed, 0 insertions(+), 11 deletions(-) - -commit 9aefa07f9486b0c63c179e25c8cb284b04aaca0e -Author: Guillaume Desmottes -Date: Thu Nov 27 15:55:19 2008 +0000 - - salut_roomlist_manager_foreach_channel_class: no need to set twice channel_type_value - - src/salut-roomlist-manager.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 88eb6d9607f8be448da23c8a7a383fdfed082fc4 -Author: Guillaume Desmottes -Date: Thu Nov 27 11:25:25 2008 +0000 - - add /test-disabled-1-1-tubes.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit c9dd57692edf269b6f2b923b665c71ba569b56aa -Author: Guillaume Desmottes -Date: Thu Nov 27 11:25:09 2008 +0000 - - add /test-disabled-1-1-tubes.py - - tests/twisted/avahi/test-disabled-1-1-tubes.py | 72 ++++++++++++++++++++++++ - 1 files changed, 72 insertions(+), 0 deletions(-) - -commit 2f1b3edbd6862e23ee0223a377d7f0de0fa923ab -Author: Guillaume Desmottes -Date: Thu Nov 27 11:24:50 2008 +0000 - - Disable 1-1 tubes for now so don't instantiate the tubes-manager - - src/salut-connection.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit a8ad09bb7576eaa6aceb7ac405ae3fe47e1f9733 -Author: Guillaume Desmottes -Date: Thu Nov 27 11:24:03 2008 +0000 - - test-tube-close.py: disable test for now - - tests/twisted/avahi/test-tube-close.py | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit a6e815a404b19a6645f308dec6ac95d6c5be10a2 -Author: Guillaume Desmottes -Date: Thu Nov 27 11:23:43 2008 +0000 - - test-tube.py: disable test for now - - tests/twisted/avahi/test-tube.py | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit bedb3a47bf388873b3f417b1ce7ff1a9352b239c -Author: Guillaume Desmottes -Date: Thu Nov 27 11:23:28 2008 +0000 - - test-two-tubes.py: disable test for now - - tests/twisted/avahi/test-two-tubes.py | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit dd05316866e125a5e5d36f81afb61a75ce0c7f47 -Author: Guillaume Desmottes -Date: Thu Nov 27 11:01:54 2008 +0000 - - remove salut_muc_channel_emit_closed - - src/salut-muc-channel.c | 6 ------ - src/salut-muc-channel.h | 2 -- - 2 files changed, 0 insertions(+), 8 deletions(-) - -commit ee99bd3bf9d43b0199a54b44f8f2747826494b52 -Author: Guillaume Desmottes -Date: Thu Nov 27 11:00:58 2008 +0000 - - muc-manager: salut_muc_manager_close_all: no need to emit the channel Closed signal anymore as it's now done in muc-channel's dispose function - - src/salut-muc-manager.c | 9 --------- - 1 files changed, 0 insertions(+), 9 deletions(-) - -commit 5f0d4cfd392c5b8ee1216fd8966ec8880dd20ea5 -Author: Guillaume Desmottes -Date: Thu Nov 27 11:00:00 2008 +0000 - - salut_muc_channel_dispose: fire the Closed signal if the channel is not closed yet - - src/salut-muc-channel.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 5e76a409e27ca961cde3e74b0562425e0a7596af -Author: Guillaume Desmottes -Date: Thu Nov 27 10:59:35 2008 +0000 - - salut_muc_channel_close: raise an error if the channel is already closed - - src/salut-muc-channel.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit dd64ab79d4bc4aa3f1f564992bd91813ee0a87c5 -Author: Guillaume Desmottes -Date: Thu Nov 27 10:59:12 2008 +0000 - - muc-channel: add closed attribute to avoid to fire the Closed signal more than once - - src/salut-muc-channel.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 7d44f360e95cdd72f11eeb36b88375e259fc6741 -Author: Guillaume Desmottes -Date: Wed Nov 26 17:39:33 2008 +0000 - - test-muc-invite.py: explicitely say that the IP is a multicast address - - tests/twisted/avahi/test-muc-invite.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0aa4af73e6f2fad1bfb62ac43e83f65ad4df4ca8 -Author: Guillaume Desmottes -Date: Wed Nov 26 17:37:12 2008 +0000 - - test-muc-invite.py: enable the test as the crasher has been fixed in master - - tests/twisted/avahi/test-muc-invite.py | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit 71c2f6460062df0e86b3fecb7721c26cdd4e5ad8 -Merge: 1aca16d 8ac32b7 -Author: Guillaume Desmottes -Date: Wed Nov 26 17:33:00 2008 +0000 - - Merge branch 'master' into TpChannelManager - - Conflicts: - - tests/twisted/Makefile.am - -commit 1aca16d1e5eb1333656c9421318553cfaa9d297e -Author: Guillaume Desmottes -Date: Wed Nov 26 17:10:21 2008 +0000 - - salut_muc_channel_class_init: requested param is CONSTRUCT_ONLY - - src/salut-muc-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8ac32b7fed37a3f32826b561e4a6f33077eeae9e -Author: Guillaume Desmottes -Date: Wed Nov 26 17:08:15 2008 +0000 - - salut_muc_channel_close: emit the closed signal directly if the muc wasn't connected (#18552) - - src/salut-muc-channel.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit d11dd8d0893097ab4ce60b999b6fe70437c578a6 -Author: Guillaume Desmottes -Date: Wed Nov 26 17:04:07 2008 +0000 - - salut_muc_channel_close: check if we are actually connected before calling gibber_muc_connection_disconnect - - src/salut-muc-channel.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit f7f59f190fc65a263471d07686b9993ad7e97454 -Author: Guillaume Desmottes -Date: Wed Nov 26 16:48:57 2008 +0000 - - gibber_multicast_transport_disconnect: priv->fd assertion should be >= 0 - - lib/gibber/gibber-multicast-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4ff131707342763d35e3d66a2a6b81ddbb47e097 -Merge: afa043c 4acc915 -Author: Guillaume Desmottes -Date: Wed Nov 26 16:44:00 2008 +0000 - - Merge branch 'master' into gibber-crash - - Conflicts: - - tests/twisted/Makefile.am - -commit 40afbd48f45034f2430629bc5e6dc41060740cd7 -Author: Guillaume Desmottes -Date: Wed Nov 26 16:31:43 2008 +0000 - - test-roomlist.py: fix header - - tests/twisted/avahi/test-roomlist.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 07dd90cf59906bbced48fbcc7e97943668ea3555 -Author: Guillaume Desmottes -Date: Wed Nov 26 16:30:51 2008 +0000 - - add a requested attribute to muc-channel so muc that are created because of a tube channel request won't have requested set to TRUE - - src/salut-avahi-muc-channel.c | 4 +++- - src/salut-avahi-muc-channel.h | 3 ++- - src/salut-avahi-muc-manager.c | 5 +++-- - src/salut-muc-channel.c | 9 ++++++--- - src/salut-muc-manager.c | 14 +++++++++----- - src/salut-muc-manager.h | 2 +- - tests/twisted/avahi/test-request-muc-tubes.py | 4 ++-- - 7 files changed, 26 insertions(+), 15 deletions(-) - -commit fe7aa546134bbcc98a975ec481773bd0d627d7b4 -Author: Guillaume Desmottes -Date: Wed Nov 26 16:15:27 2008 +0000 - - add a comment about hardcoded address - - tests/twisted/avahi/test-muc-invite.py | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 3026878542d62daf146ef11ff0060cd28277278a -Author: Guillaume Desmottes -Date: Wed Nov 26 16:10:54 2008 +0000 - - coding style fixes - - src/salut-muc-manager.c | 17 +++++++++++------ - 1 files changed, 11 insertions(+), 6 deletions(-) - -commit 127e0a41b61ac73f11468ff594afefd39b80576c -Author: Guillaume Desmottes -Date: Wed Nov 26 16:00:53 2008 +0000 - - salut_roomlist_manager_init: no need to set connection to NULL - - src/salut-roomlist-manager.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit f0e836064730368b819a47397cd65132fd5fd968 -Author: Guillaume Desmottes -Date: Wed Nov 26 15:57:20 2008 +0000 - - fix comment - - src/salut-muc-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 743754b9cc38c379a97f7a506d51a33b2a971729 -Author: Guillaume Desmottes -Date: Wed Nov 26 15:57:00 2008 +0000 - - remove salut_muc_manager_finalize as it's useless - - src/salut-muc-manager.c | 13 ------------- - 1 files changed, 0 insertions(+), 13 deletions(-) - -commit 8055d3f5293f8b8e6755b2c7b1c4fac1d67c78d3 -Author: Guillaume Desmottes -Date: Wed Nov 26 15:55:48 2008 +0000 - - alut-muc-manager: remove roomlist_channels - - src/salut-muc-manager.c | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit 5bf5b00f113d32152dace637e7b43335eed33e15 -Author: Guillaume Desmottes -Date: Wed Nov 26 15:51:16 2008 +0000 - - coding style fix - - src/salut-avahi-roomlist-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit fedb4011d0207fe301f4f62e2f410ec5243bac1e -Author: Guillaume Desmottes -Date: Wed Nov 26 15:49:55 2008 +0000 - - fix room_resolvers description - - src/salut-avahi-roomlist-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1f4062675a84422ebadddb32bec005880a8ec2c2 -Author: Guillaume Desmottes -Date: Wed Nov 26 15:01:31 2008 +0000 - - add test-request-im.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit e5f174023616dacd2e3fd0f23b84f53c8d734b8b -Author: Guillaume Desmottes -Date: Wed Nov 26 15:01:25 2008 +0000 - - add test-request-im.py - - tests/twisted/avahi/test-request-im.py | 183 ++++++++++++++++++++++++++++++++ - 1 files changed, 183 insertions(+), 0 deletions(-) - -commit 75dc454aebf12ecca266795d54d36dadadfafe8f -Author: Guillaume Desmottes -Date: Wed Nov 26 14:57:31 2008 +0000 - - im-channel: add a closed attribute so we can fire the Closed signal even if the channel wasn't connected - - src/salut-im-channel.c | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 7d7a48d5777031ee3af80e3288ee61b3447ef4b5 -Author: Guillaume Desmottes -Date: Wed Nov 26 14:12:48 2008 +0000 - - roomlist-channel: the PROP_CONFERENCE_SERVER doesn't have to be writtable - - src/salut-roomlist-channel.c | 6 +----- - 1 files changed, 1 insertions(+), 5 deletions(-) - -commit 0d624af8e3dce1e188cece609a401c351366497f -Merge: 75fd862 4acc915 -Author: Guillaume Desmottes -Date: Wed Nov 26 14:01:47 2008 +0000 - - Merge branch 'master' into TpChannelManager - - Conflicts: - - src/salut-muc-manager.c - -commit 4acc915be8b49609ae9a0339c04d6b2fa8c389cd -Author: Guillaume Desmottes -Date: Wed Nov 26 13:14:01 2008 +0000 - - muc-manager: always include tubes code - - src/salut-muc-manager.c | 22 ---------------------- - 1 files changed, 0 insertions(+), 22 deletions(-) - -commit 36e01d545a37f1eefbbc251135e9d5944b34197a -Author: Guillaume Desmottes -Date: Wed Nov 26 13:13:37 2008 +0000 - - always build tubes files - - src/Makefile.am | 17 ++++++----------- - 1 files changed, 6 insertions(+), 11 deletions(-) - -commit 0f2168ba800373616c3ab33a3a408cae6865f065 -Author: Guillaume Desmottes -Date: Wed Nov 26 13:13:13 2008 +0000 - - bump dbus dependency to 1.1.0 so we can remove the dbus_message_marshal specific test - - configure.ac | 20 +------------------- - 1 files changed, 1 insertions(+), 19 deletions(-) - -commit 75fd86200493cdb8698227ad4262e9b1d76cdf91 -Merge: 67496fd 71e042a -Author: Guillaume Desmottes -Date: Wed Nov 26 12:39:41 2008 +0000 - - Merge branch 'master' into TpChannelManager - -commit 71e042a6e9ba1db532a7029dc3e9d67c5b1e4d25 -Author: Guillaume Desmottes -Date: Wed Nov 26 12:35:37 2008 +0000 - - change connection status to disconnected if salut_olpc_activity_manager_start failed - - src/salut-connection.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 18fed86ab5aa36d7df074060751db6ebb2a42ae7 -Author: Guillaume Desmottes -Date: Wed Nov 26 12:35:17 2008 +0000 - - change connection status to disconnected if salut_muc_manager_start failed - - src/salut-connection.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 082bbf8155ff9f0df1987254fbe4524a0fbe39f8 -Author: Guillaume Desmottes -Date: Wed Nov 26 12:34:45 2008 +0000 - - change connection status to disconnected and not connecting if salut_contact_manager_start failed - - src/salut-connection.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 67496fd2c1d7d8aca75a70edfa22572560457765 -Author: Guillaume Desmottes -Date: Wed Nov 26 12:11:30 2008 +0000 - - add avahi/test-muc-invite.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 9d2c696cc888d124a6f0938c03731fb45b51b018 -Author: Guillaume Desmottes -Date: Wed Nov 26 12:10:54 2008 +0000 - - add test-muc-invite.py (disabled for now) - - tests/twisted/avahi/test-muc-invite.py | 131 ++++++++++++++++++++++++++++++++ - 1 files changed, 131 insertions(+), 0 deletions(-) - -commit add63dbbb05e853d1ef094160ef1a121c462c580 -Author: Guillaume Desmottes -Date: Wed Nov 26 12:08:02 2008 +0000 - - invite_stanza_callback: emit the new channel signal - - src/salut-muc-manager.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 5372571a9d115a1c6572ff206b1b3ae46fc1224e -Author: Guillaume Desmottes -Date: Wed Nov 26 10:49:47 2008 +0000 - - remove double \n - - src/salut-tubes-channel.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit a3156b52b5197778c4bb235e06447d04573141de -Author: Guillaume Desmottes -Date: Wed Nov 26 10:49:07 2008 +0000 - - use G_PARAM_STATIC_STRINGS - - src/salut-connection.c | 8 ++------ - 1 files changed, 2 insertions(+), 6 deletions(-) - -commit 05a565477c18913f9631641cc17d00444b484ab8 -Author: Guillaume Desmottes -Date: Wed Nov 26 10:24:59 2008 +0000 - - fix comment - - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit abd5b36e872a25adfa3d593d75d774fa242379ac -Author: Guillaume Desmottes -Date: Tue Nov 25 18:19:47 2008 +0000 - - improve test description - - tests/twisted/avahi/test-request-muc-tubes.py | 2 +- - tests/twisted/avahi/test-request-muc.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 312ee000c476a587f6ce0ef66f7a59d1e9801220 -Author: Guillaume Desmottes -Date: Tue Nov 25 18:16:18 2008 +0000 - - bad rebase conflict resolution fix: the muc manager is not a factory anymore - - src/salut-connection.c | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit b1fb47ea4dcfc7fbf197f029db94ce4375a2327c -Author: Guillaume Desmottes -Date: Tue Nov 25 17:58:33 2008 +0000 - - muc-manager: remove all the queued_requests machinery as we emit the new-channel signal directly anyway - - src/salut-muc-manager.c | 105 ++++++++++------------------------------------ - 1 files changed, 23 insertions(+), 82 deletions(-) - -commit 8838034c615d46699887f58c894fca3b36142139 -Author: Guillaume Desmottes -Date: Tue Nov 25 17:32:34 2008 +0000 - - coding style fixes - - src/salut-muc-manager.c | 13 ++++++------- - 1 files changed, 6 insertions(+), 7 deletions(-) - -commit 770b14623839b42dc9a959b6f9d80b7ac91636a9 -Author: Guillaume Desmottes -Date: Tue Nov 25 17:11:56 2008 +0000 - - remove FIXME as the roomlist channels are now managed in their own manager - - src/salut-muc-manager.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 41039a73ee6e90b773563b47316ce3db5756907d -Author: Guillaume Desmottes -Date: Tue Nov 25 17:11:04 2008 +0000 - - use new style GET_PRIV - - src/salut-muc-manager.c | 10 +++++++--- - src/salut-muc-manager.h | 2 ++ - 2 files changed, 9 insertions(+), 3 deletions(-) - -commit 5d9d207b6d5d870db6797237e74584dbaef6c46c -Author: Guillaume Desmottes -Date: Tue Nov 25 17:01:00 2008 +0000 - - coding style tweaks - - src/salut-avahi-roomlist-manager.c | 40 +++++++++++++++++++++++------------ - 1 files changed, 26 insertions(+), 14 deletions(-) - -commit 183badc1cfe136f3b8aa3baad247e540f77a0778 -Author: Guillaume Desmottes -Date: Tue Nov 25 16:51:41 2008 +0000 - - fix copyrights - - src/salut-avahi-roomlist-manager.c | 2 +- - src/salut-avahi-roomlist-manager.h | 2 +- - src/salut-roomlist-manager.c | 2 +- - src/salut-roomlist-manager.h | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -commit 90f4bab2464b70430c8ec6fd2880fa503f523c36 -Author: Guillaume Desmottes -Date: Tue Nov 25 15:14:34 2008 +0000 - - test-request-muc-tubes: check text channel properties - - tests/twisted/avahi/test-request-muc-tubes.py | 25 +++++++++++++++++++++++-- - 1 files changed, 23 insertions(+), 2 deletions(-) - -commit 5f240b8e04595b3c91e3952f80bc5b08a04f4bab -Author: Guillaume Desmottes -Date: Tue Nov 25 15:10:00 2008 +0000 - - add test-request-muc-tubes.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit a994e6fb6d2ecdb240af8e3c25659fa2be595d41 -Author: Guillaume Desmottes -Date: Tue Nov 25 15:09:45 2008 +0000 - - add test-request-muc-tubes.py - - tests/twisted/avahi/test-request-muc-tubes.py | 183 +++++++++++++++++++++++++ - 1 files changed, 183 insertions(+), 0 deletions(-) - -commit 3b8a84c2c4b2fc1e2a6801bfad87f61f19252df6 -Author: Guillaume Desmottes -Date: Tue Nov 25 15:09:33 2008 +0000 - - salut_muc_manager_request: use create_tubes_channel so the text channel is created if needed - - src/salut-muc-manager.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit 55aaa326b9ac39a8ad247bcff85b428fb7276120 -Author: Guillaume Desmottes -Date: Tue Nov 25 15:08:55 2008 +0000 - - create_tubes_channel: announce the newly created text channel - - src/salut-muc-manager.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 1eb5cf45b5a156499e148b5b17c586cda1c15868 -Author: Guillaume Desmottes -Date: Tue Nov 25 14:45:39 2008 +0000 - - tubes-channel.c: fix PROP_INITIATOR_ID - - src/salut-tubes-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 5acd294263389253f442a21e0e5c215e9aedddbd -Author: Guillaume Desmottes -Date: Tue Nov 25 14:44:21 2008 +0000 - - tubes-channel: fix PROP_REQUESTED definition - - src/salut-tubes-channel.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 29ea0a469c04ed99e37a8d2dd2dc0c9853078224 -Author: Guillaume Desmottes -Date: Tue Nov 25 14:14:35 2008 +0000 - - add test-request-muc.py - - tests/twisted/avahi/test-request-muc.py | 165 +++++++++++++++++++++++++++++++ - 1 files changed, 165 insertions(+), 0 deletions(-) - -commit 9bd89f6cde342f83366b10e04f0700e26f3eba28 -Author: Guillaume Desmottes -Date: Tue Nov 25 14:12:15 2008 +0000 - - muc-manager: don't call salut_muc_manager_emit_new_channel in new_{muc,tubes}_channel as the caller will call it himself too - - src/salut-muc-manager.c | 2 -- - tests/twisted/Makefile.am | 3 ++- - 2 files changed, 2 insertions(+), 3 deletions(-) - -commit 6ac33204c61c35ff741bee8ac1b4215d5135fb63 -Author: Guillaume Desmottes -Date: Tue Nov 25 11:54:04 2008 +0000 - - remove second FIXME about rooms listing - - tests/twisted/avahi/test-roomlist.py | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 0942cbba39b4fd585245255b39a5eb4986093e8e -Author: Guillaume Desmottes -Date: Tue Nov 25 11:51:12 2008 +0000 - - remove double \n - - tests/twisted/avahi/test-roomlist.py | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 9c4aa87c458fbf8322c7be3c0a8596393b92159c -Author: Guillaume Desmottes -Date: Tue Nov 25 11:50:45 2008 +0000 - - comment ListRooms assertion as it will fail if rooms are announced on the network - - tests/twisted/avahi/test-roomlist.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 35f3c22080dc9565e7156da28509775028cb1ffa -Author: Guillaume Desmottes -Date: Tue Nov 25 11:46:14 2008 +0000 - - test-roomlist.py: hack to wait for the contact list channels - - tests/twisted/avahi/test-roomlist.py | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit cce1bb4aa8c4e6377765c2cc015866d475de1aed -Author: Guillaume Desmottes -Date: Tue Nov 25 11:44:50 2008 +0000 - - test-roomlist.py: don't check the Channels property as room list channels could have already been created - - tests/twisted/avahi/test-roomlist.py | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 89bdeb0da81a1da7f0484f0677d674ada20c8f56 -Author: Guillaume Desmottes -Date: Tue Nov 25 11:30:31 2008 +0000 - - remove test-room-list.py from tests suite - - tests/twisted/Makefile.am | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 782cb229fb14d7482cf1c2661dc7b2b660d50fdf -Author: Guillaume Desmottes -Date: Tue Nov 25 11:29:52 2008 +0000 - - remove test-room-list.py as it has been merged to test-roomlist.py - - tests/twisted/avahi/test-room-list.py | 41 --------------------------------- - 1 files changed, 0 insertions(+), 41 deletions(-) - -commit 49e9fb51bff8dd3ea475e5ee2082f284da1dde66 -Author: Guillaume Desmottes -Date: Tue Nov 25 11:29:23 2008 +0000 - - test-roomlist.py: call ListRooms - - tests/twisted/avahi/test-roomlist.py | 13 ++++++++++++- - 1 files changed, 12 insertions(+), 1 deletions(-) - -commit 302b08a89b9822a59aa447f1336106847445f04f -Author: Guillaume Desmottes -Date: Tue Nov 25 11:25:50 2008 +0000 - - use make_channel_proxy - - tests/twisted/avahi/test-roomlist.py | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit fc5d1fac5537b25c42187fb5d42932854fe20380 -Author: Guillaume Desmottes -Date: Tue Nov 25 11:20:38 2008 +0000 - - test-roomlist: define and use CHANNEL_TYPE_ROOMLIST - - tests/twisted/avahi/test-roomlist.py | 27 ++++++++++++++------------- - 1 files changed, 14 insertions(+), 13 deletions(-) - -commit 80e4c41042f65e1294c295c06f72c0844ebcb371 -Author: Guillaume Desmottes -Date: Tue Nov 25 11:17:17 2008 +0000 - - test-roomlist.py: add few comments - - tests/twisted/avahi/test-roomlist.py | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit f25506d2e2685c856a372b004c1ed1e4249400f6 -Author: Guillaume Desmottes -Date: Tue Nov 25 10:51:41 2008 +0000 - - test-roomlist: the Server property can't be set in channel requests - - tests/twisted/avahi/test-roomlist.py | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit f24372ff7f734dc2ab929d958a1dbc66a5bff6e3 -Author: Guillaume Desmottes -Date: Tue Nov 25 10:48:28 2008 +0000 - - roomlist-channel: re-add the Server property now we actually implement it - - src/salut-roomlist-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 0a0849884406f1a64cd5756c4bf59a5f9d8ba808 -Author: Guillaume Desmottes -Date: Tue Nov 25 10:48:00 2008 +0000 - - Server is not an allowed property - - src/salut-roomlist-manager.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 0e6d80c8c92f5735a3f3fb81d02a14bee933e78e -Author: Alban Crequy -Date: Wed Nov 12 19:44:54 2008 +0000 - - Start to requestotronify muc text and tubes channels - - src/salut-roomlist-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 12739f1f6e8e4d003d73430cc9de794d5dc9020c -Author: Alban Crequy -Date: Wed Nov 12 19:44:38 2008 +0000 - - src/salut-roomlist-manager.c: Close roomlist channel correctly - - src/salut-roomlist-manager.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit 4e9e9d7bdda37c382d202d0327fd9e1978fedafd -Author: Alban Crequy -Date: Wed Nov 12 19:42:59 2008 +0000 - - test-roomlist.py: Fix: use the correct channel path - - tests/twisted/avahi/test-roomlist.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 57b1d2309f3a2c4f80e47eb686d3c81467c5f318 -Author: Alban Crequy -Date: Wed Nov 12 19:42:39 2008 +0000 - - test-roomlist.py: Fix: do not use conference server on Salut - - tests/twisted/avahi/test-roomlist.py | 12 ++++-------- - 1 files changed, 4 insertions(+), 8 deletions(-) - -commit 51476a744c972f267765bca78c2cda8ef1104a8a -Author: Alban Crequy -Date: Wed Nov 12 18:58:17 2008 +0000 - - tests/twisted/avahi/test-roomlist.py: Use the correct contact name - - tests/twisted/avahi/test-roomlist.py | 15 ++++++++------- - 1 files changed, 8 insertions(+), 7 deletions(-) - -commit fffa516eb47360b2671faaee0483fce191b28c51 -Author: Alban Crequy -Date: Wed Nov 12 18:46:03 2008 +0000 - - SalutRoomlistManager: implement requests - - src/salut-roomlist-manager.c | 137 ++++++++++++++++++++++++++++++++++++++---- - 1 files changed, 126 insertions(+), 11 deletions(-) - -commit 66d2683f1d0419f7cb6952a3c24cfa01d70a8c95 -Author: Alban Crequy -Date: Wed Nov 12 18:45:23 2008 +0000 - - SalutRoomlistChannel: Add the conference-server property - - src/salut-roomlist-channel.c | 26 ++++++++++++++++++++++++++ - 1 files changed, 26 insertions(+), 0 deletions(-) - -commit d7b79d484bccbaa7eb0cbad26456f3cc89f5bcc8 -Author: Alban Crequy -Date: Wed Nov 12 17:27:55 2008 +0000 - - SalutRoomlistManager: Fix RequestableChannelClasses - - src/salut-roomlist-manager.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 522a59d364e1ee654266d2e4e6f5c442c225e518 -Author: Alban Crequy -Date: Wed Nov 12 16:45:36 2008 +0000 - - Add a test for Roomlist channels - - tests/twisted/Makefile.am | 1 + - tests/twisted/avahi/test-roomlist.py | 167 ++++++++++++++++++++++++++++++++++ - 2 files changed, 168 insertions(+), 0 deletions(-) - -commit bc3af65873e8baf815445542067748097a8b238e -Author: Alban Crequy -Date: Wed Nov 12 16:26:06 2008 +0000 - - src/salut-roomlist-manager.c: Coding style: 80 columns - - src/salut-roomlist-manager.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit 48dc4ccf8a644d57866a060e8dacb05fa86bdfa2 -Author: Alban Crequy -Date: Wed Nov 12 15:59:25 2008 +0000 - - SalutMucManager: emit new-channel when a chatrom is requested - - src/salut-muc-manager.c | 37 ++++++++++--------------------------- - 1 files changed, 10 insertions(+), 27 deletions(-) - -commit 3a0d8555487d8f9cdf5a008227174b2903912dc5 -Author: Alban Crequy -Date: Mon Nov 10 15:30:11 2008 +0000 - - SalutMucManager: initialise and release priv->queued_requests - - src/salut-muc-manager.c | 34 ++++++++++++++++++++++++++++++++++ - 1 files changed, 34 insertions(+), 0 deletions(-) - -commit 9c3b4cf05af9498acab6a8ec3932847b5c975336 -Author: Alban Crequy -Date: Mon Nov 10 15:24:56 2008 +0000 - - SalutAvahiRoomlistManager: add _find_muc_address - - src/salut-avahi-roomlist-manager.c | 51 ++++++++++++++++++++++++++++++++++++ - 1 files changed, 51 insertions(+), 0 deletions(-) - -commit f791606826b465655bd8841c8ed163207a3442eb -Author: Alban Crequy -Date: Mon Nov 10 15:16:02 2008 +0000 - - SalutRoomlistManager: add a property for SalutXmppConnectionManager - - src/salut-roomlist-manager.c | 19 +++++++++++++++++++ - 1 files changed, 19 insertions(+), 0 deletions(-) - -commit 434e5b145d5ef07bcce2933d92e48aab2dbaa438 -Author: Alban Crequy -Date: Mon Nov 10 14:35:28 2008 +0000 - - SalutConnection: create the new roomlist manager, in addition to the muc manager - - src/salut-avahi-discovery-client.c | 21 +++++++++++++++++++++ - src/salut-connection.c | 4 ++++ - src/salut-discovery-client.c | 12 ++++++++++++ - src/salut-discovery-client.h | 7 +++++++ - 4 files changed, 44 insertions(+), 0 deletions(-) - -commit 825227330cac217b05ba18edb57c6dad75230d68 -Author: Alban Crequy -Date: Thu Oct 30 11:45:05 2008 +0000 - - Split SalutMucManager to SalutMucManager and SalutRoomlistManager - - src/Makefile.am | 4 + - src/salut-avahi-muc-manager.c | 245 --------------- - src/salut-avahi-roomlist-manager.c | 383 +++++++++++++++++++++++ - src/salut-avahi-roomlist-manager.h | 71 +++++ - src/salut-connection.c | 25 ++- - src/salut-muc-manager.c | 592 +++++++++++++++++++---------------- - src/salut-muc-manager.h | 19 -- - src/salut-roomlist-manager.c | 440 ++++++++++++++++++++++++++ - src/salut-roomlist-manager.h | 99 ++++++ - 9 files changed, 1342 insertions(+), 536 deletions(-) - -commit 94db624a402b85deb22f3457b67f7eaa3202b2c0 -Author: Alban Crequy -Date: Tue Nov 25 10:34:22 2008 +0000 - - Debug: s/setuping/setting up/ - - src/salut-tubes-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9fd88dc8b99a9702ad29a1e04b7c610a043339eb -Author: Alban Crequy -Date: Tue Nov 25 10:06:04 2008 +0000 - - DEBUGs: wording, don't command the person reading the debug output - - lib/gibber/gibber-bytestream-direct.c | 2 +- - lib/gibber/gibber-bytestream-oob.c | 2 +- - src/salut-tubes-channel.c | 6 +++--- - 3 files changed, 5 insertions(+), 5 deletions(-) - -commit 81a1b005275d300e1c8ae124b5298616d59723ad -Author: Alban Crequy -Date: Mon Nov 24 18:51:18 2008 +0000 - - SalutTubeIface: don't make the "state" property writeable, add a proper function salut_tube_iface_accepted() instead - - src/salut-tubes-channel.c | 4 +--- - src/tube-iface.c | 12 +++++++++++- - src/tube-iface.h | 5 +++++ - src/tube-stream.c | 24 +++++++++++++++++++----- - 4 files changed, 36 insertions(+), 9 deletions(-) - -commit 4aea6ac8559caa362948d4fa93ee0caf0cbd96dc -Author: Alban Crequy -Date: Mon Nov 24 18:23:45 2008 +0000 - - GibberBytestreamDirect: Do not tinker with the states of the transport - - lib/gibber/gibber-bytestream-direct.c | 7 +++++-- - lib/gibber/gibber-transport.h | 4 ++-- - 2 files changed, 7 insertions(+), 4 deletions(-) - -commit 48cd1a1fb362905d8d400831b2a8c7ddf3414213 -Author: Alban Crequy -Date: Mon Nov 24 17:26:49 2008 +0000 - - src/salut-tubes-channel.c: better debugs when the contact accept/decline the tube offer - - src/salut-tubes-channel.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit d1941207ac27eb1156c15b3498d4848ff2587ba0 -Author: Alban Crequy -Date: Mon Nov 24 17:24:20 2008 +0000 - - src/salut-tubes-channel.c: Replace DEBUG("Called") by better debugs messages or remove them - - src/salut-tubes-channel.c | 11 +++-------- - 1 files changed, 3 insertions(+), 8 deletions(-) - -commit 3ea149a03d7908102d447bdc5ccf500638f2b86b -Author: Alban Crequy -Date: Mon Nov 24 17:12:38 2008 +0000 - - gibber_bytestream_direct_initiate: try all priv->addresses if the first one does not work (implement the "FIXME") - - lib/gibber/gibber-bytestream-direct.c | 24 ++++++++++++++---------- - 1 files changed, 14 insertions(+), 10 deletions(-) - -commit 417967dd852391aab6df8a7136be8db44e0d1936 -Author: Alban Crequy -Date: Mon Nov 24 16:19:41 2008 +0000 - - GibberBytestreams: Don't fail if the write is blocked, log a debug message, but send anyway, lower levels will buffer - - lib/gibber/gibber-bytestream-direct.c | 3 +-- - lib/gibber/gibber-bytestream-oob.c | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -commit 87b983291a15dd13c2bc2fc6307dfae4d35de61a -Author: Alban Crequy -Date: Mon Nov 24 16:06:05 2008 +0000 - - GibberBytestream: Coding Style: remove empty lines - - lib/gibber/gibber-bytestream-direct.c | 1 - - lib/gibber/gibber-bytestream-oob.c | 1 - - 2 files changed, 0 insertions(+), 2 deletions(-) - -commit 9ed8054d8ee41475f981d7e614537a3d87a39ad8 -Merge: c5828ca 8b1c087 -Author: Alban Crequy -Date: Mon Nov 24 11:45:44 2008 +0000 - - Merge branch 'master' into tubes-requestotron-without-new-specs-with-gibber-listener-2 - - Conflicts: - - tests/twisted/Makefile.am - -commit 397404b0cc506d10143da5d9bb60474a5bf47a09 -Author: Guillaume Desmottes -Date: Mon Nov 24 11:04:56 2008 +0000 - - add test-ichat-receive-directory.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit bd8a87a91bb26032e420bb2652198978b8724b6a -Author: Guillaume Desmottes -Date: Mon Nov 24 11:04:21 2008 +0000 - - add test-ichat-receive-directory.py - - .../twisted/avahi/test-ichat-receive-directory.py | 140 ++++++++++++++++++++ - 1 files changed, 140 insertions(+), 0 deletions(-) - -commit 38631112670ee3260d172c1350e24a42ce2a136d -Author: Guillaume Desmottes -Date: Mon Nov 24 11:03:20 2008 +0000 - - gibber_oob_file_transfer_new_from_stanza_with_from: check if the FT is actually a file transfer and not a directory transfer as we don't support them yet - - lib/gibber/gibber-oob-file-transfer.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 8b1c08778854a36c292a1c0cb4f9ae059a02651b -Merge: 95cb28e a2cd2c8 -Author: Guillaume Desmottes -Date: Mon Nov 24 10:41:08 2008 +0000 - - Merge branch 'ft-requestotron-cancelled' - -commit bbb142616e35da004a307d96100dba78f8ca49da -Merge: 0b5fa87 c0c5307 -Author: Guillaume Desmottes -Date: Sun Nov 23 21:29:57 2008 +0000 - - Merge branch 'master' into ft-requestotron-ichat - - Conflicts: - - tests/twisted/Makefile.am - -commit 95cb28eee6c731f207ce811ad6edfc86c143f0b8 -Author: Guillaume Desmottes -Date: Fri Nov 21 14:14:08 2008 +0000 - - gibber_oob_file_transfer_receive: don't hardcode HTTP status code - - lib/gibber/gibber-oob-file-transfer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a2cd2c86d87a290019705b0b3866a85223b87a15 -Author: Guillaume Desmottes -Date: Fri Nov 21 12:50:30 2008 +0000 - - add test-send-file-and-cancel-immediately.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 08fd6bc2a48de6a4f20ed219f7f2977328ef6ea8 -Author: Guillaume Desmottes -Date: Fri Nov 21 12:50:15 2008 +0000 - - add test-send-file-and-cancel-immediately.py - - .../avahi/test-send-file-and-cancel-immediately.py | 202 ++++++++++++++++++++ - 1 files changed, 202 insertions(+), 0 deletions(-) - -commit 2dbbb75e861eef6c9cd3e1db0f80821030c135ef -Author: Guillaume Desmottes -Date: Fri Nov 21 12:50:04 2008 +0000 - - gibber_oob_file_transfer_cancel: only send the 'error' stanza is we are the receiver. It doesn't make sense to send a reply to our own IQ. - - lib/gibber/gibber-oob-file-transfer.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit 2a938b1e6c146d3b275545ba5f3b8bfee42b1495 -Author: Guillaume Desmottes -Date: Fri Nov 21 12:22:18 2008 +0000 - - add test-receive-file-cancelled-immediately.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 2412a0857d34a5fe113820db45da17688c08618c -Author: Guillaume Desmottes -Date: Fri Nov 21 12:22:07 2008 +0000 - - add test-receive-file-cancelled-immediately.py - - .../test-receive-file-cancelled-immediately.py | 198 ++++++++++++++++++++ - 1 files changed, 198 insertions(+), 0 deletions(-) - -commit c0c530793efb8a39030e929cfa1fd56a7d99991f -Merge: 63046a4 d2ab6c3 -Author: Guillaume Desmottes -Date: Fri Nov 21 11:42:39 2008 +0000 - - Merge branch 'ft-requestotron' - -commit d2ab6c384e1446f1fc4bbb99c9aaae3459302da3 -Author: Guillaume Desmottes -Date: Wed Nov 19 15:22:39 2008 -0500 - - file-transfer-channel: error_cb: always change the channel status to error - - src/salut-file-transfer-channel.c | 23 +++++++++-------------- - 1 files changed, 9 insertions(+), 14 deletions(-) - -commit 4a57363c4f1cdc973e3a6d4dff4e8c70103cf7a4 -Merge: 08eeaaa 1461a21 -Author: Guillaume Desmottes -Date: Wed Nov 19 15:02:00 2008 -0500 - - Merge commit 'sjoerd/cassidy-ft-requestotron-fixes' into ft-requestotron - -commit 08eeaaab43e1b4687d89bd19298e8f0433973816 -Author: Guillaume Desmottes -Date: Wed Nov 19 11:46:08 2008 -0500 - - check if error is not NULL before calling g_error_new_literal - - src/salut-connection.c | 5 +++-- - src/salut-muc-manager.c | 10 ++++++---- - src/salut-self.c | 10 ++++++---- - 3 files changed, 15 insertions(+), 10 deletions(-) - -commit 1461a218dccc2612eb2931caf5886488f245c076 -Author: Sjoerd Simons -Date: Wed Nov 19 16:42:41 2008 +0000 - - Ensure the progress signals are not out of date for more then a second - - src/salut-file-transfer-channel.c | 88 ++++++++++++++++++++++++++++++++----- - 1 files changed, 76 insertions(+), 12 deletions(-) - -commit ed52e4c4ae2a39b23f30780ba4377d1d02f3d4c8 -Author: Guillaume Desmottes -Date: Wed Nov 19 11:38:12 2008 -0500 - - http_client_finished_chunks_cb: no need to define two GError - - lib/gibber/gibber-oob-file-transfer.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit e1d40f6b9c3e2347dc7864dda99d430d7e28545d -Author: Sjoerd Simons -Date: Wed Nov 19 15:18:43 2008 +0000 - - Only inspect the remote handle if needed - - src/salut-ft-manager.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 5c3c2f8c0f2232197124baa259bbd3974e499d1c -Author: Sjoerd Simons -Date: Wed Nov 19 15:07:24 2008 +0000 - - Remove bogus entry from the properties list - - src/salut-file-transfer-channel.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 60c3c99f2505f5ea00765ab0ebcc9b1edeebc070 -Author: Sjoerd Simons -Date: Wed Nov 19 15:06:39 2008 +0000 - - Don't rely on the order in the file_transfer_channel_fixed_properties list - - src/salut-ft-manager.c | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit afa043cca638ef9d55185750ca02f3010f0e21c0 -Author: Guillaume Desmottes -Date: Tue Nov 18 17:06:22 2008 -0500 - - add test-close-local-pending-room.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 31f46fbeeb133a06b0f64f1585f619b5516743c1 -Author: Guillaume Desmottes -Date: Tue Nov 18 17:06:13 2008 -0500 - - add test-close-local-pending-room.py - - .../twisted/avahi/test-close-local-pending-room.py | 105 ++++++++++++++++++++ - 1 files changed, 105 insertions(+), 0 deletions(-) - -commit 63046a45a3b8cbfebf4fd2f2fe64369566854946 -Author: Guillaume Desmottes -Date: Fri Nov 14 17:54:03 2008 +0000 - - add test-room-list.py to tests suite - - tests/twisted/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit a8efd5e94c206a9bbaf4a523fda7513acc2afa7f -Author: Guillaume Desmottes -Date: Fri Nov 14 17:53:51 2008 +0000 - - add test-room-list.py - - tests/twisted/avahi/test-room-list.py | 41 +++++++++++++++++++++++++++++++++ - 1 files changed, 41 insertions(+), 0 deletions(-) - -commit 27fbada437b7a7a9cf00b45a483382579ce9ddec -Author: Guillaume Desmottes -Date: Fri Nov 14 17:53:39 2008 +0000 - - salut-roomlist-channel: don't pretend to implement the Server property - - src/salut-roomlist-channel.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 0b5fa87955daf9356234bb7ac08432d4145380b8 -Merge: 76d76c3 5e74f05 -Author: Guillaume Desmottes -Date: Fri Nov 14 11:45:53 2008 +0000 - - Merge branch 'ft-requestotron' into ft-requestotron-ichat - -commit 5e74f05efeaeb0a71ee282890c8dd564cf75183b -Author: Guillaume Desmottes -Date: Fri Nov 14 11:42:29 2008 +0000 - - gibber_oob_file_transfer_received_stanza: fix a GError leak - - lib/gibber/gibber-oob-file-transfer.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 88332e470f8525a844246302551097f76a26c373 -Author: Guillaume Desmottes -Date: Fri Nov 14 11:36:29 2008 +0000 - - http_client_finished_chunks_cb: fix a GError leak - - lib/gibber/gibber-oob-file-transfer.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 7deaa218e52ad660cb09db92620c37e82daabefb -Author: Guillaume Desmottes -Date: Fri Nov 14 11:28:10 2008 +0000 - - gibber_oob_file_transfer_finalize: unref the GIOchannel if needed - - lib/gibber/gibber-oob-file-transfer.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 753ebad943c987b0d0ae16fff48455ded2ee8da0 -Author: Guillaume Desmottes -Date: Fri Nov 14 11:21:17 2008 +0000 - - file-transfer-channel: g_value_unset out_address - - src/salut-file-transfer-channel.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit f094ee9f63bbb38583862468346ef924eff7f5f4 -Author: Guillaume Desmottes -Date: Fri Nov 14 11:18:01 2008 +0000 - - salut_file_transfer_channel_get_property: use g_value_take_boxed for PROP_CHANNEL_PROPERTIES - - src/salut-file-transfer-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ae8dc60226e5918051a315bcfd75321c205f8515 -Author: Guillaume Desmottes -Date: Fri Nov 14 11:17:35 2008 +0000 - - salut_file_transfer_channel_received_file_offer: use GObject setter so memory is freed if needed - - src/salut-file-transfer-channel.c | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit d99db227cc815dfd595e3e665f62efee6362492d -Author: Guillaume Desmottes -Date: Fri Nov 14 11:16:46 2008 +0000 - - salut_file_transfer_channel_finalize: free missing properties - - src/salut-file-transfer-channel.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 5ca48157639fdc9020f15c2c610b302971368dd4 -Author: Guillaume Desmottes -Date: Fri Nov 14 11:16:13 2008 +0000 - - salut_file_transfer_channel_set_property: g_free strigns before setting them - - src/salut-file-transfer-channel.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit ee2d2da027b2d0a9d045ae91f4f341a5b0c16363 -Author: Guillaume Desmottes -Date: Fri Nov 14 10:51:08 2008 +0000 - - sync with latest FT spec DRAFT - - extensions/Channel_Type_File_Transfer.xml | 18 +++++++----------- - 1 files changed, 7 insertions(+), 11 deletions(-) - -commit fd858ddb08155362e3529c9e8fd9236a3f56ceb5 -Author: Guillaume Desmottes -Date: Thu Nov 13 17:45:52 2008 +0000 - - salut_file_transfer_channel_finalize: free the socket_path - - src/salut-file-transfer-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 0edb12ba9c73383507c5889512e7a8b818cab7c5 -Merge: 42dbff3 e688b37 -Author: Guillaume Desmottes -Date: Thu Nov 13 17:37:03 2008 +0000 - - Merge branch 'master' into ft-requestotron - -commit e688b3726fbb062175599287a45989ea97e7d49d -Author: Guillaume Desmottes -Date: Thu Nov 13 17:32:12 2008 +0000 - - exec-with-log.sh.in: use libtool --mode=execute to make valgrind happy - - tests/twisted/tools/exec-with-log.sh.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 42dbff3eac28fd9160f497938d2c3c67fdc47349 -Author: Guillaume Desmottes -Date: Thu Nov 13 17:20:13 2008 +0000 - - add est-receive-and-send-file.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 07537d18cf9eb8b5d17685468c348736d539c773 -Author: Guillaume Desmottes -Date: Thu Nov 13 17:20:05 2008 +0000 - - add est-receive-and-send-file.py - - tests/twisted/avahi/test-receive-and-send-file.py | 314 +++++++++++++++++++++ - 1 files changed, 314 insertions(+), 0 deletions(-) - -commit a3704412c57e65754d6d017debf8fce811ce4f33 -Author: Guillaume Desmottes -Date: Thu Nov 13 17:18:06 2008 +0000 - - salut_file_transfer_channel_offer_file: ref the connection object if we re-use an existing one - - src/salut-file-transfer-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 80a08f6b37009d56c2879136c3f19fd6cbf7490c -Merge: 6c68bcc 2bd0680 -Author: Guillaume Desmottes -Date: Thu Nov 13 17:10:27 2008 +0000 - - Merge branch 'master' into ft-requestotron - -commit 76d76c33580ed1079a45b1efe4ffed64a238bcbd -Merge: 3060916 6c68bcc -Author: Guillaume Desmottes -Date: Thu Nov 13 13:06:42 2008 +0000 - - Merge branch 'ft-requestotron' into ft-requestotron-ichat - -commit 6c68bcca6b65a3ed78dec6850a4d703874dad78d -Author: Guillaume Desmottes -Date: Thu Nov 13 13:05:36 2008 +0000 - - add test-send-file-and-disconnect.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit d9a81347647ddff84955e8a0bb8452703f0bb527 -Author: Guillaume Desmottes -Date: Thu Nov 13 13:05:28 2008 +0000 - - add test-send-file-and-disconnect.py - - .../twisted/avahi/test-send-file-and-disconnect.py | 183 ++++++++++++++++++++ - 1 files changed, 183 insertions(+), 0 deletions(-) - -commit f058a5692248aa0c2693ef0639c33582d75ff851 -Author: Guillaume Desmottes -Date: Thu Nov 13 13:05:11 2008 +0000 - - disconnect channel signal when disposing the ft manager - - src/salut-ft-manager.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit 8822a1a8acb083fa89d0ee392a2f9bc740bed61b -Author: Guillaume Desmottes -Date: Thu Nov 13 12:44:48 2008 +0000 - - add test-receive-file-decline.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 208757c30d35c0f956609b14847a4a4332fd683a -Author: Guillaume Desmottes -Date: Thu Nov 13 12:44:38 2008 +0000 - - add test-receive-file-decline.py - - tests/twisted/avahi/test-receive-file-decline.py | 209 ++++++++++++++++++++++ - 1 files changed, 209 insertions(+), 0 deletions(-) - -commit 4eeb8cd8aac5c2a1195bd11841d64db924edc1ce -Author: Guillaume Desmottes -Date: Thu Nov 13 12:38:34 2008 +0000 - - gibber_file_transfer_dispose: disconnect the connection signals so cb are not called after object was destroyed - - lib/gibber/gibber-file-transfer.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 3060916887a7f7f5b2a6396c603ec7d89d2422e8 -Merge: 4a1043c 862b3ae -Author: Guillaume Desmottes -Date: Wed Nov 12 17:52:50 2008 +0000 - - Merge branch 'ft-requestotron' into ft-requestotron-ichat - -commit 862b3ae189b47b468a90aa54e626e096fe1c4f8f -Author: Guillaume Desmottes -Date: Wed Nov 12 17:50:54 2008 +0000 - - http_client_finished_chunks_cb: unref the stanza - - lib/gibber/gibber-oob-file-transfer.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 797b492c8efdf81cafa2bf9dbe6e347107ff2652 -Author: Guillaume Desmottes -Date: Wed Nov 12 17:49:05 2008 +0000 - - gibber-oob-file-transfer: properly unref the SoupSession - - lib/gibber/gibber-oob-file-transfer.c | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -commit 6f2e053cfe2d953634e0ee4c7d26e7e2c7ba81d7 -Author: Guillaume Desmottes -Date: Wed Nov 12 17:28:29 2008 +0000 - - gibber_oob_file_transfer_cancel: don't leak the stanza - - lib/gibber/gibber-oob-file-transfer.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 9900ef7932193dae4715a860e27917bbb961587f -Author: Guillaume Desmottes -Date: Wed Nov 12 17:01:11 2008 +0000 - - gibber-oob-file-transfer: disconnect the channel watcher when disposing so input_channel_readable_cb isn't called after object disposing - - lib/gibber/gibber-oob-file-transfer.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -commit 346bf4fc982c2421f206a5747afcc792983cc4ab -Author: Guillaume Desmottes -Date: Wed Nov 12 16:43:12 2008 +0000 - - gibber_oob_file_transfer_finalize: call soup_server_quit so libsoup release its ref on the server - - lib/gibber/gibber-oob-file-transfer.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 82c439da9c4800af38e4c925538ac5183b949086 -Author: Guillaume Desmottes -Date: Wed Nov 12 16:38:34 2008 +0000 - - gibber_oob_file_transfer_offer: fix stanza leak - - lib/gibber/gibber-oob-file-transfer.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 180004f0b9c625b7f1166e3b430c46f3c27e9357 -Author: Guillaume Desmottes -Date: Wed Nov 12 16:35:34 2008 +0000 - - file-transfer-channel: unref the GibberFileTransfer when disposing - - src/salut-file-transfer-channel.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 9b9edd35bde2c10e14605adfb722e8e915e5cae3 -Author: Guillaume Desmottes -Date: Wed Nov 12 16:32:02 2008 +0000 - - salut-ft-manager: unref the channel when we remove it from the GList - - src/salut-ft-manager.c | 8 ++------ - 1 files changed, 2 insertions(+), 6 deletions(-) - -commit 4a1043c674ab0c7b7d795b3265cdc49fa06ca736 -Author: Guillaume Desmottes -Date: Wed Nov 12 15:24:52 2008 +0000 - - test-ichat-send-file-declined.py: use IncomingXmppiChatStream - - .../twisted/avahi/test-ichat-send-file-declined.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit f39692821426f5a86f8771e4c9636e770de474c7 -Author: Guillaume Desmottes -Date: Wed Nov 12 15:24:21 2008 +0000 - - test-ichat-send-file.py: use IncomingXmppiChatStream - - tests/twisted/avahi/test-ichat-send-file.py | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit fe249fbf0f26b737000dad44431bad803f493031 -Author: Guillaume Desmottes -Date: Wed Nov 12 15:22:45 2008 +0000 - - xmppstream.py: add IncomingXmppiChatStream class - - tests/twisted/xmppstream.py | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit 2bd0680960576ef5a6dd162a4e35b03b603906dd -Author: Alban Crequy -Date: Wed Nov 12 00:27:02 2008 +0000 - - Twisted tests: fix 'eavesdrop' parameter on the D-Bus test session - - tests/twisted/tools/tmp-session-bus.conf.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c1328222262ea50b8c0a5dcd46d61cc8f614e21e -Author: Guillaume Desmottes -Date: Tue Nov 11 18:41:36 2008 +0000 - - Simplify OutgoingXmppiChatStream implementation - - tests/twisted/xmppstream.py | 17 ++++------------- - 1 files changed, 4 insertions(+), 13 deletions(-) - -commit 02064002ad317add38c6cc2e4fbff1bffc61f599 -Author: Guillaume Desmottes -Date: Tue Nov 11 18:31:35 2008 +0000 - - :IncomingXmppStream: no need to explicitely set name/remote_name - - tests/twisted/xmppstream.py | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 4b628f925ddfedc5ac3d3b29ed0f8a3b227f6655 -Author: Guillaume Desmottes -Date: Tue Nov 11 18:29:00 2008 +0000 - - BaseXmlStream:send_header: don't set from/to attributes if the name/remote_name is None - - tests/twisted/xmppstream.py | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 7840b3766c897e25d2c8c67443852e91bb9234f4 -Merge: 39c3927 1639ea3 -Author: Guillaume Desmottes -Date: Tue Nov 11 18:20:05 2008 +0000 - - Merge branch 'ft-requestotron' into ft-requestotron-ichat - -commit 1639ea32a7d773138f8f59f26acd9fbef65a0f63 -Author: Guillaume Desmottes -Date: Tue Nov 11 17:48:54 2008 +0000 - - ft_transferred_chunk_cb: use x > y instead of x >= y+1 - - src/salut-file-transfer-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 84358e948c2f07643f7ec55988a6b6c7aaa52aad -Author: Guillaume Desmottes -Date: Tue Nov 11 17:18:36 2008 +0000 - - gibber-oob-file-transfer: add a FIXME about IPv6 support - - lib/gibber/gibber-oob-file-transfer.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit a12080ee18359f7e832f7aef7b1cd9aac5d817ef -Author: Guillaume Desmottes -Date: Tue Nov 11 17:13:49 2008 +0000 - - gibber-oob-file-transfer: prefix HTTP status code enum with HTTP_STATUS_CODE_. Add the OK code - - lib/gibber/gibber-oob-file-transfer.c | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) - -commit 57434b604a879099b3d6b81d7064ab84c22a9d82 -Author: Guillaume Desmottes -Date: Tue Nov 11 16:58:52 2008 +0000 - - salut-file-transfer-channel.h: add myself as author - - src/salut-file-transfer-channel.h | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 2eaba61207958fbc940f74e503b21856802968ff -Author: Guillaume Desmottes -Date: Tue Nov 11 16:58:43 2008 +0000 - - coding style tweaks - - src/salut-file-transfer-channel.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 23c32c86accd0308bebd0aa1f006d1cae67f9032 -Author: Guillaume Desmottes -Date: Tue Nov 11 16:46:35 2008 +0000 - - fix typo - - src/salut-file-transfer-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c696634fcdd22fc96776c37de85adc7560943ba0 -Author: Guillaume Desmottes -Date: Tue Nov 11 16:35:45 2008 +0000 - - It is valid to have a date of 0. Remove FIXME - - src/salut-ft-manager.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit f06aae6988898fd64a44b453b68fd7c2123cd450 -Author: Guillaume Desmottes -Date: Tue Nov 11 16:33:16 2008 +0000 - - salut_ft_manager_handle_request: check if ContentHashType is valid - - src/salut-ft-manager.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit b69cbe476dc6ad622f49bb7524eed2b92de28521 -Author: Guillaume Desmottes -Date: Tue Nov 11 12:14:08 2008 +0000 - - add a TODO saying we should use libsoup 2.4 - - lib/gibber/gibber-oob-file-transfer.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 39c392730a5c2627baafbf05b740c71dc88b8ec1 -Author: Guillaume Desmottes -Date: Tue Nov 11 12:08:12 2008 +0000 - - gibber-oob-file-transfer: copy the AppleSingle header using g_malloc so libsoup will properly free the memory once it's written - - lib/gibber/gibber-oob-file-transfer.c | 11 +++++++++-- - 1 files changed, 9 insertions(+), 2 deletions(-) - -commit 5b0eadf67a7cf03206c4d605ac1385663328a958 -Author: Guillaume Desmottes -Date: Tue Nov 11 11:33:12 2008 +0000 - - gibber-oob-file-transfer: don't leak byte array - - lib/gibber/gibber-oob-file-transfer.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 6488e114b2c6819eb54230fdff6b28ebef48c3e1 -Author: Guillaume Desmottes -Date: Mon Nov 10 17:51:50 2008 +0000 - - remove debug print - - tests/twisted/avahi/test-ichat-send-file.py | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 604458215b4f74097fef9dfc370ac4991fab9166 -Author: Guillaume Desmottes -Date: Mon Nov 10 17:51:38 2008 +0000 - - quote/unquote filename - - tests/twisted/avahi/test-ichat-receive-file.py | 5 +++-- - tests/twisted/avahi/test-ichat-send-file.py | 5 +++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - -commit 9465a82ce6fcc5a05f975aead8931b34e116d6ce -Merge: 1326e65 dd45916 -Author: Guillaume Desmottes -Date: Mon Nov 10 17:46:02 2008 +0000 - - Merge branch 'ft-requestotron' into ft-requestotron-ichat - -commit dd45916deed06409025770f51c94eddfd9d34ba0 -Author: Guillaume Desmottes -Date: Mon Nov 10 17:45:40 2008 +0000 - - test-receive-file: test receiving a file with a space in its filename - - tests/twisted/avahi/test-receive-file.py | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 342f5db36f4d6616a097310d2a22e5f51ae6d4b1 -Author: Guillaume Desmottes -Date: Mon Nov 10 17:43:29 2008 +0000 - - test-send-file-wait-to-provide.py: unescape the url filename - - .../avahi/test-send-file-wait-to-provide.py | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit dd8a094594d549f37d4b260026f9f6d4ddd2f59d -Author: Guillaume Desmottes -Date: Mon Nov 10 17:43:00 2008 +0000 - - test-send-file-provide-immediately.py: test sending file with a space in the filename - - .../avahi/test-send-file-provide-immediately.py | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 69342bc1c33d5d5626d98301ec7ef52e33f2ed2c -Author: Guillaume Desmottes -Date: Mon Nov 10 17:39:30 2008 +0000 - - gibber-oob-file-transfer.c: use g_uri_(un)escape_string instead of our own version of them - - lib/gibber/gibber-oob-file-transfer.c | 148 +-------------------------------- - 1 files changed, 3 insertions(+), 145 deletions(-) - -commit 1326e6544389805b32b5526de7fabd218ec39651 -Author: Guillaume Desmottes -Date: Mon Nov 10 17:07:48 2008 +0000 - - gibber-oob-file-transfer: set the Content-Type HTTP header - - lib/gibber/gibber-oob-file-transfer.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit fa0fa94bf104c685b84307b9da7c6c54e1847570 -Author: Guillaume Desmottes -Date: Mon Nov 10 17:03:10 2008 +0000 - - add test-ichat-send-file-declined.py to tests suite - - tests/twisted/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 5487e3db0c6775f729958a903806f271fa924a34 -Author: Guillaume Desmottes -Date: Mon Nov 10 17:02:55 2008 +0000 - - add test-ichat-send-file-declined.py - - .../twisted/avahi/test-ichat-send-file-declined.py | 195 ++++++++++++++++++++ - 1 files changed, 195 insertions(+), 0 deletions(-) - -commit e6a2e6d7ad2bdc95f044c7572b8e1ae934752bcc -Author: Guillaume Desmottes -Date: Mon Nov 10 17:01:17 2008 +0000 - - gibber-oob-file-transfer: if the error code is not in the 'code' attribute, try the 'type' one as iChat uses it - - lib/gibber/gibber-oob-file-transfer.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit fa6699ed838409b63528b141db26181fc9f074fc -Author: Guillaume Desmottes -Date: Mon Nov 10 16:59:39 2008 +0000 - - gibber-oob-file-transfer: don't crash if the IQ error stanza doesn't contain a 'code' attribute - - lib/gibber/gibber-oob-file-transfer.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit b6765ffce6cececc5bf4d30ea77612f20a40321f -Author: Guillaume Desmottes -Date: Mon Nov 10 16:45:35 2008 +0000 - - add test-ichat-send-file.py to tests suite - - tests/twisted/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit db99ae7e5bb1a771ad5480ff6dec1c78681656cd -Author: Guillaume Desmottes -Date: Mon Nov 10 16:45:26 2008 +0000 - - add test-ichat-send-file.py - - tests/twisted/avahi/test-ichat-send-file.py | 244 +++++++++++++++++++++++++++ - 1 files changed, 244 insertions(+), 0 deletions(-) - -commit c5828ca39ce9a0a21d1914d4272507c4741c3986 -Merge: 6dd30be 40f64af -Author: Alban Crequy -Date: Mon Nov 10 16:45:17 2008 +0000 - - Merge branch 'BytestreamManager-rename' into tubes-requestotron-without-new-specs-with-gibber-listener-2 - - Conflicts: - - src/debug.h - src/salut-connection.c - src/salut-si-bytestream-manager.h - src/tube-stream.c - -commit c72e121a62a5c15e96e1b51ab2792975ed887ecb -Author: Guillaume Desmottes -Date: Mon Nov 10 16:44:36 2008 +0000 - - Send the right AppleSimple data so we can send files to iChat - - lib/gibber/gibber-oob-file-transfer.c | 48 +++++++++++++++++++++++--------- - 1 files changed, 34 insertions(+), 14 deletions(-) - -commit 6dd30be7febcc54ee962c284643e03a4cd1ba4dd -Author: Alban Crequy -Date: Mon Nov 10 16:38:08 2008 +0000 - - Remove direct-bytestream-manager in debugs - - src/debug.c | 1 - - src/debug.h | 13 ++++++------- - 2 files changed, 6 insertions(+), 8 deletions(-) - -commit 40f64affca2561c9f7bab566a075bdeb82fc9c1d -Author: Alban Crequy -Date: Mon Nov 10 16:25:27 2008 +0000 - - Rename SalutBytestreamManager to SalutSiBytestreamManager - - 20080724115347-a41c0-1505e20ff53bf34c1514c76f44ec20a01b743aee.gz - - Conflicts: - - src/debug.c - src/salut-connection.c - src/salut-si-bytestream-manager.c - src/salut-si-bytestream-manager.h - - src/debug.c | 2 +- - src/debug.h | 2 +- - src/salut-connection.c | 22 +++--- - src/salut-si-bytestream-manager.c | 171 +++++++++++++++++++------------------ - src/salut-si-bytestream-manager.h | 62 +++++++------- - src/tube-stream.c | 6 +- - 6 files changed, 134 insertions(+), 131 deletions(-) - -commit dceb439924d7ad8ecce93bd43a63255a90a8a445 -Author: Alban Crequy -Date: Mon Nov 10 16:22:08 2008 +0000 - - Move salut-bytestream-manager to salut-si-bytestream-manager - - 20080724112847-a41c0-8f5044e92c92aeb123e546c1c38d6710b4661460.gz - - Conflicts: - - src/salut-connection.c - - src/Makefile.am | 4 +- - src/salut-bytestream-manager.c | 1063 ------------------------------------- - src/salut-bytestream-manager.h | 83 --- - src/salut-connection.c | 2 +- - src/salut-si-bytestream-manager.c | 1063 +++++++++++++++++++++++++++++++++++++ - src/salut-si-bytestream-manager.h | 83 +++ - src/tube-stream.c | 2 +- - 7 files changed, 1150 insertions(+), 1150 deletions(-) - -commit 9eddd203ada7e761ff7f4e312c9a862a0320776a -Author: Alban Crequy -Date: Mon Nov 10 16:09:51 2008 +0000 - - Remove GibberIqHelperRequestStanza: directly use GibberXmppStanza - - The GibberXmppStanza can be g_object_ref()ed and _unref()ed - This revert changes 5cedaf35 and a1bc2756. - - lib/gibber/gibber-iq-helper.c | 52 ++++++++++-------------------------- - lib/gibber/gibber-iq-helper.h | 10 +----- - src/salut-si-bytestream-manager.c | 6 +--- - src/salut-tubes-channel.c | 6 ++-- - src/salut-tubes-channel.h | 2 +- - src/salut-tubes-manager.c | 6 +--- - src/tube-stream.c | 12 +++++--- - src/tube-stream.h | 2 +- - tests/check-gibber-iq-helper.c | 14 +++------ - 9 files changed, 39 insertions(+), 71 deletions(-) - -commit 4fa6d5bf903d2fe26c315a71bb1374babf79e6a1 -Merge: d66c8d9 4d8a423 -Author: Guillaume Desmottes -Date: Mon Nov 10 12:20:33 2008 +0000 - - Merge branch 'ft-requestotron' into ft-requestotron-ichat - -commit f6f52aed0f61f249d628654cc1628bcbd453c3b9 -Merge: dadffcc 0208699 -Author: Alban Crequy -Date: Mon Nov 10 11:37:11 2008 +0000 - - Merge branch 'tubes-requestotron-without-new-specs' into tubes-requestotron-without-new-specs-with-gibber-listener-2 - - Conflicts: - - src/salut-connection.c - -commit 02086999c31dab06fccaea225c5052316e10bbef -Merge: 9a1c1bc ea36c3a -Author: Alban Crequy -Date: Mon Nov 10 11:32:25 2008 +0000 - - Merge branch 'master' into tubes-requestotron-without-new-specs - - Conflicts: - - src/salut-connection.c - src/tube-iface.c - -commit ea36c3a2815cce459940c2bc672cf94fa5dd2f2b -Merge: 96bbfa7 49bd5fb -Author: Alban Crequy -Date: Mon Nov 10 11:27:20 2008 +0000 - - Merge branch 'static-strings' - -commit 4d8a423991ba761d54c69abddc787078c35a5a92 -Author: Guillaume Desmottes -Date: Mon Nov 10 11:13:07 2008 +0000 - - add a TODO saying FT tests should share more code - - .../avahi/test-send-file-provide-immediately.py | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 90afca16cd6867741c2698d6d84e32cebc6cbfce -Author: Guillaume Desmottes -Date: Mon Nov 10 11:10:30 2008 +0000 - - s/canceled/cancelled - - lib/gibber/gibber-file-transfer.c | 4 ++-- - lib/gibber/gibber-oob-file-transfer.c | 4 ++-- - src/salut-file-transfer-channel.c | 8 ++++---- - 3 files changed, 8 insertions(+), 8 deletions(-) - -commit 49bd5fb1ddf502ea0ed0ea71006d6b51d1f1a445 -Author: Alban Crequy -Date: Sun Nov 9 21:51:18 2008 +0000 - - Gibber: use G_PARAM_STATIC_STRINGS - - lib/gibber/gibber-bytestream-ibb.c | 10 +------- - lib/gibber/gibber-bytestream-iface.c | 25 ++++----------------- - lib/gibber/gibber-bytestream-muc.c | 6 +---- - lib/gibber/gibber-bytestream-oob.c | 15 ++---------- - lib/gibber/gibber-iq-helper.c | 5 +--- - lib/gibber/gibber-r-multicast-causal-transport.c | 6 +--- - lib/gibber/gibber-r-multicast-sender.c | 4 +-- - lib/gibber/gibber-r-multicast-transport.c | 4 +-- - 8 files changed, 16 insertions(+), 59 deletions(-) - -commit c224564da4e90f6ac2858da1b013db6af5d805cb -Author: Alban Crequy -Date: Sun Nov 9 21:47:42 2008 +0000 - - Salut: use G_PARAM_STATIC_STRINGS - - src/salut-avahi-contact-manager.c | 5 +-- - src/salut-avahi-contact.c | 5 +-- - src/salut-avahi-muc-channel.c | 5 +-- - src/salut-avahi-muc-manager.c | 5 +-- - src/salut-avahi-olpc-activity-manager.c | 5 +-- - src/salut-avahi-olpc-activity.c | 5 +-- - src/salut-avahi-self.c | 5 +-- - src/salut-bytestream-manager.c | 10 +----- - src/salut-connection-manager.c | 5 +-- - src/salut-connection.c | 45 ++++++++------------------- - src/salut-contact-channel.c | 7 +--- - src/salut-contact-manager.c | 5 +-- - src/salut-contact.c | 10 +----- - src/salut-discovery-client.c | 5 +-- - src/salut-im-manager.c | 15 ++------- - src/salut-muc-channel.c | 18 ++++------- - src/salut-muc-manager.c | 10 +----- - src/salut-olpc-activity-manager.c | 5 +-- - src/salut-olpc-activity.c | 5 +-- - src/salut-roomlist-channel.c | 3 +- - src/salut-self.c | 45 +++++---------------------- - src/salut-tubes-channel.c | 14 ++------- - src/salut-xmpp-connection-manager.c | 8 +---- - src/tube-dbus.c | 30 ++++--------------- - src/tube-iface.c | 50 ++++++------------------------ - src/tube-stream.c | 20 ++---------- - 26 files changed, 78 insertions(+), 267 deletions(-) - -commit e3190c6a61149248b91948b24826908cf70c6aaf -Author: Alban Crequy -Date: Sun Nov 9 21:29:06 2008 +0000 - - Channels: use G_PARAM_STATIC_STRINGS - - src/salut-contact-channel.c | 12 ++++-------- - src/salut-im-channel.c | 9 +++------ - src/salut-muc-channel.c | 12 ++++-------- - src/salut-tubes-channel.c | 12 ++++-------- - 4 files changed, 15 insertions(+), 30 deletions(-) - -commit 96bbfa7834a3a98fc1da6253d0834b9b6255be69 -Author: Alban Crequy -Date: Sun Nov 9 21:21:52 2008 +0000 - - Channels: add immutable Interfaces property to channel details - - src/salut-contact-channel.c | 1 + - src/salut-im-channel.c | 1 + - src/salut-muc-channel.c | 1 + - src/salut-roomlist-channel.c | 1 + - src/salut-tubes-channel.c | 1 + - 5 files changed, 5 insertions(+), 0 deletions(-) - -commit dadffcc97eba8c64737f9db7f329914a3fd504f8 -Author: Alban Crequy -Date: Sun Nov 9 19:45:01 2008 +0000 - - test-two-tubes.py: remove races in the test suite - - tests/twisted/avahi/test-two-tubes.py | 60 +++++++++++++++++++++++++++------ - 1 files changed, 49 insertions(+), 11 deletions(-) - -commit bfa36df065fbd561e06282faeeee9f132a2ea9f6 -Author: Alban Crequy -Date: Sun Nov 9 18:50:04 2008 +0000 - - test-two-tubes.py: Coding style - - tests/twisted/avahi/test-two-tubes.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 59f3555691a08898347b8e083c7850fa22950a54 -Author: Alban Crequy -Date: Sun Nov 9 18:49:35 2008 +0000 - - src/tube-stream.c: Add the transport in the hashtable when a local application connects - - src/tube-stream.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit d00b9247806c13d5c60ca4e5ae78081a2cf311fe -Author: Alban Crequy -Date: Sun Nov 9 18:48:56 2008 +0000 - - src/tube-stream.c: Do not unref the transport in the "new-connection" callback - - src/tube-stream.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 600964a84a67ded83a7d271cde81183b7650ca0a -Author: Alban Crequy -Date: Sun Nov 9 18:47:11 2008 +0000 - - tube_stream_open: Fix: free the path after using it - - src/tube-stream.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit f6f846775d1db9317905a5a836f3dcfaac8d2930 -Merge: 8141be2 9a1c1bc -Author: Alban Crequy -Date: Fri Nov 7 19:39:20 2008 +0000 - - Merge branch 'tubes-requestotron-without-new-specs' into tubes-requestotron-without-new-specs-with-gibber-listener-2 - -commit 9a1c1bc686ecff5413dfe85d53f1ebe40a972809 -Author: Alban Crequy -Date: Fri Nov 7 19:34:28 2008 +0000 - - 1-1 stream tubes: new test: create a tube between 2 salut accounts and send some data through it in both directions - - tests/twisted/Makefile.am | 1 + - tests/twisted/avahi/test-two-tubes.py | 142 +++++++++++++++++++++++++++++++++ - 2 files changed, 143 insertions(+), 0 deletions(-) - -commit 8141be2555a214dcb9cbc6140bc9d2a19af3d96b -Merge: 0df9a40 38c6fca -Author: Alban Crequy -Date: Fri Nov 7 18:15:18 2008 +0000 - - Merge branch 'tubes-requestotron-without-new-specs' into tubes-requestotron-without-new-specs-with-gibber-listener-2 - - Conflicts: - - lib/gibber/gibber-bytestream-direct.c - src/salut-direct-bytestream-manager.c - -commit 38c6fca67c9d8e0dd4057ffd301a6e0c75c93a5a -Author: Alban Crequy -Date: Fri Nov 7 13:59:43 2008 +0000 - - GibberBytestreamDirect and SalutDirectBytestreamManager: Use struct sockaddr_storage for storage but always pass struct sockaddr* + size as parameters - - lib/gibber/gibber-bytestream-direct.c | 4 ++-- - lib/gibber/gibber-bytestream-direct.h | 2 +- - src/salut-direct-bytestream-manager.c | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -commit 203c7e4bdc55552a77dc94b09feaeb37c0a6f297 -Merge: 33a3f4b e351642 -Author: Alban Crequy -Date: Fri Nov 7 17:55:26 2008 +0000 - - Merge branch 'master' into tubes-requestotron-without-new-specs - -commit 0df9a408861821d4808c83a5e0efc0a7820ae2be -Author: Alban Crequy -Date: Fri Nov 7 17:54:12 2008 +0000 - - SalutStreamTube: Use Gibber{Unix,Tcp}Transport instead of reimplementing it - - src/tube-stream.c | 94 ++++++++++------------------------------------------ - 1 files changed, 18 insertions(+), 76 deletions(-) - -commit 9cb779af686f5844293a9a31f834b04799e9282b -Merge: dfe592e e351642 -Author: Alban Crequy -Date: Fri Nov 7 17:13:04 2008 +0000 - - Merge branch 'master' into tubes-requestotron-without-new-specs-with-gibber-listener-2 - -commit e351642ebe55f1376d2cf2da7669ee71a64cd21a -Author: Alban Crequy -Date: Fri Nov 7 17:08:45 2008 +0000 - - lib/gibber/gibber-xmpp-connection-listener.c: remove priv->port, call get_port only when needed - - lib/gibber/gibber-xmpp-connection-listener.c | 9 +++------ - 1 files changed, 3 insertions(+), 6 deletions(-) - -commit 818cedcd01801fffc383e44a4385811931d0a98b -Author: Alban Crequy -Date: Fri Nov 7 17:08:20 2008 +0000 - - src/salut-xmpp-connection-manager.c: coding style: remove if (x == TRUE) - - src/salut-xmpp-connection-manager.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 04d97706394e4a17db2d9edb0176ae30ec9dade8 -Author: Alban Crequy -Date: Fri Nov 7 16:59:19 2008 +0000 - - GibberListener: coding style - - lib/gibber/gibber-listener.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit dfe592e6d24312107c20a6a9e650aab2f147a08a -Merge: d9149b5 ab5e045 -Author: Alban Crequy -Date: Fri Nov 7 16:56:23 2008 +0000 - - Merge branch 'gibber-listener' into tubes-requestotron-without-new-specs-with-gibber-listener-2 - -commit ab5e045252bdc823f04011974ff21d8a0db268e6 -Author: Alban Crequy -Date: Fri Nov 7 16:53:26 2008 +0000 - - gibber_xmpp_connection_listener_listen() returns a boolean and add get_port() method - - lib/gibber/gibber-xmpp-connection-listener.c | 23 +++++++++++++++++------ - lib/gibber/gibber-xmpp-connection-listener.h | 7 +++++-- - src/salut-xmpp-connection-manager.c | 11 +++++++++-- - 3 files changed, 31 insertions(+), 10 deletions(-) - -commit d9149b569e6c32b7138e7644427360953a7e4ff9 -Author: Alban Crequy -Date: Fri Nov 7 16:36:56 2008 +0000 - - SalutDirectBytestreamManager: deleted. Use GibberListener instead. - - src/Makefile.am | 2 - - src/salut-connection.c | 26 -- - src/salut-direct-bytestream-manager.c | 516 --------------------------------- - src/salut-direct-bytestream-manager.h | 84 ------ - 4 files changed, 0 insertions(+), 628 deletions(-) - -commit 3b0f69598994737c574527cdc283bdbb457becf4 -Author: Alban Crequy -Date: Fri Nov 7 16:33:11 2008 +0000 - - SalutTubeStream: use GibberListener instead of SalutDirectBytestreamManager on the initiator side to receive connections from the remote CM - - - GibberBytestreamDirect: accept a transport instead of a fd. - - lib/gibber/gibber-bytestream-direct.c | 47 +++++++++----------------------- - lib/gibber/gibber-bytestream-direct.h | 3 +- - src/salut-direct-bytestream-manager.c | 2 +- - src/salut-tubes-channel.c | 9 ------ - src/tube-stream.c | 37 +++++++++++++++++++++---- - 5 files changed, 47 insertions(+), 51 deletions(-) - -commit 0005b70c642de7ff1ede8b6ff19e0ceaa4b3ed1d -Merge: 50c355f 33a3f4b -Author: Alban Crequy -Date: Fri Nov 7 15:02:21 2008 +0000 - - Merge branch 'tubes-requestotron-without-new-specs' into tubes-requestotron-without-new-specs-with-gibber-listener-2 - -commit 33a3f4b8b59d36e69a91fa9127a657ff0287fd69 -Author: Alban Crequy -Date: Fri Nov 7 15:01:18 2008 +0000 - - SalutTubeStream: remove dead code, again - - src/tube-stream.c | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) - -commit 50c355fabc6b86ad74aa718fe5a4bcf7b1530319 -Merge: b2b1d92 83c2e7d -Author: Alban Crequy -Date: Fri Nov 7 14:57:15 2008 +0000 - - Merge branch 'tubes-requestotron-without-new-specs' into tubes-requestotron-without-new-specs-with-gibber-listener-2 - - Conflicts: - - src/tube-stream.c - -commit 83c2e7d2690248029f8161b202ac46d8e4178aee -Author: Alban Crequy -Date: Fri Nov 7 14:48:57 2008 +0000 - - SalutTubeStream: remove dead code - - src/tube-stream.c | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -commit b2b1d92fa246871eded6c9a3c5d6a97655f1d831 -Author: Alban Crequy -Date: Fri Nov 7 14:44:21 2008 +0000 - - WiP - - src/salut-tubes-channel.c | 13 +----- - src/tube-iface.c | 9 ++++ - src/tube-iface.h | 3 + - src/tube-stream.c | 102 ++++++++++++++++++++++++++++++++++----------- - 4 files changed, 91 insertions(+), 36 deletions(-) - -commit f6ae2eb811cd93310383e8e81005e71648b43a78 -Author: Alban Crequy -Date: Fri Nov 7 13:59:43 2008 +0000 - - GibberBytestreamDirect and SalutDirectBytestreamManager: Use struct sockaddr_storage for storage but always pass struct sockaddr* + size as parameters - - lib/gibber/gibber-bytestream-direct.c | 4 ++-- - lib/gibber/gibber-bytestream-direct.h | 2 +- - src/salut-direct-bytestream-manager.c | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -commit e0bccbac0fd47f8e33f677cf2e63ae2be1d6df2e -Author: Alban Crequy -Date: Thu Nov 6 16:31:34 2008 +0000 - - SalutTubeStream: use GibberListener to listen connections from the local application - - src/tube-stream.c | 297 ++++++++++++++-------------------------------------- - 1 files changed, 80 insertions(+), 217 deletions(-) - -commit 24e9e6b63c32e94e36491b1716260e355aaebc5d -Merge: 44a2f4f 4ffbb68 -Author: Alban Crequy -Date: Fri Nov 7 13:50:12 2008 +0000 - - Merge branch 'gibber-listener' into tubes-requestotron-without-new-specs-with-gibber-listener-2 - -commit 44a2f4fb6f8bfcb3216abb4dd1e9a17cab048d29 -Merge: 640ef9d 2d4b46f -Author: Alban Crequy -Date: Fri Nov 7 13:17:39 2008 +0000 - - Merge branch 'master' into tubes-requestotron-without-new-specs - - Conflicts: - - tests/twisted/Makefile.am - -commit 4ffbb686f3d29c7ce7bd0db7c3dca6b9ebef054f -Merge: ce5e548 2d4b46f -Author: Alban Crequy -Date: Fri Nov 7 13:12:02 2008 +0000 - - Merge branch 'master' into gibber-listener - -commit ce5e5480fae8f625d1b7179755c7ae6a3546a421 -Author: Alban Crequy -Date: Fri Nov 7 13:10:26 2008 +0000 - - SalutXmppConnectionManager: The port 5298 is preferred to remain compatible with old versions of iChat. Try a few close to it, and if those fail, use a random port. - - lib/gibber/gibber-xmpp-connection-listener.c | 14 ++++++++++++-- - lib/gibber/gibber-xmpp-connection-listener.h | 2 +- - src/salut-xmpp-connection-manager.c | 16 +++++++++++----- - 3 files changed, 24 insertions(+), 8 deletions(-) - -commit cc77125afd87411a4253f45ed6dcc51650dce887 -Author: Alban Crequy -Date: Fri Nov 7 13:00:02 2008 +0000 - - Revert "XmppConnectionListener: let the GibberListener choose the port" - - This reverts commit 0ba6f445a71169b343874afcf4464d3691dd0f49. - - lib/gibber/gibber-xmpp-connection-listener.c | 10 +++------- - lib/gibber/gibber-xmpp-connection-listener.h | 4 ++-- - src/salut-xmpp-connection-manager.c | 24 +++++++++++++++++++++++- - tests/check-gibber-xmpp-connection-listener.c | 15 ++++++++++++--- - 4 files changed, 40 insertions(+), 13 deletions(-) - -commit d66c8d96c332565ecf48ddd7b68a161aa3163c29 -Author: Guillaume Desmottes -Date: Fri Nov 7 12:52:40 2008 +0000 - - add test-ichat-receive-file.py to tests suite (but disabled for now) - - tests/twisted/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 7a8d12e8d1e637e5d7c4fc2a16fcfb5b132aaac2 -Author: Guillaume Desmottes -Date: Fri Nov 7 12:52:24 2008 +0000 - - add test-ichat-receive-file.py - - tests/twisted/avahi/test-ichat-receive-file.py | 222 ++++++++++++++++++++++++ - 1 files changed, 222 insertions(+), 0 deletions(-) - -commit d961e36a33e0a0121863d8087ef2fb94c21b5771 -Author: Guillaume Desmottes -Date: Fri Nov 7 12:48:50 2008 +0000 - - Pass the SalutContact to salut_file_transfer_channel_received_file_offer so it can use gibber_file_transfer_new_from_stanza_with_from - - src/salut-file-transfer-channel.c | 6 ++++-- - src/salut-file-transfer-channel.h | 4 +++- - src/salut-ft-manager.c | 3 ++- - 3 files changed, 9 insertions(+), 4 deletions(-) - -commit 033b182328dbaffea01b07f63df00d2e0991212f -Author: Guillaume Desmottes -Date: Fri Nov 7 12:47:12 2008 +0000 - - add gibber_file_transfer_new_from_stanza_with_from - - lib/gibber/gibber-file-transfer.c | 21 ++++++++++++++++++--- - lib/gibber/gibber-file-transfer.h | 4 ++++ - 2 files changed, 22 insertions(+), 3 deletions(-) - -commit 9f3acfa9e1412413521f7fea9ed98deedf45b3e4 -Author: Guillaume Desmottes -Date: Fri Nov 7 12:45:53 2008 +0000 - - gibber-oob-file-transfer: remove gibber_oob_file_transfer_new_from_stanza and add gibber_oob_file_transfer_new_from_stanza_with_from instead - - lib/gibber/gibber-oob-file-transfer.c | 8 ++++---- - lib/gibber/gibber-oob-file-transfer.h | 5 +++-- - 2 files changed, 7 insertions(+), 6 deletions(-) - -commit cd5e4da73361314e90006cfbdc953b24e36e1229 -Author: Guillaume Desmottes -Date: Fri Nov 7 12:03:41 2008 +0000 - - re add tests that were accidentally removed during merge - - tests/twisted/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit ac61c826aeb1bcdd183f22d6111cf3f72fd45e87 -Merge: 5f076f7 2d4b46f -Author: Guillaume Desmottes -Date: Fri Nov 7 11:59:24 2008 +0000 - - Merge branch 'master' into ft-requestotron - -commit 2d4b46f3fbc9583cd4375717bf7042ff63ef36b3 -Author: Guillaume Desmottes -Date: Fri Nov 7 11:56:57 2008 +0000 - - incoming_pending_connection_stream_opened_cb: early return if we got a from attribute as we don't have to do the iChat special crack - - src/salut-xmpp-connection-manager.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit df8e254ea7c49d90f7b84015c60a5b0ab59f842d -Merge: 3bd83d7 229f952 -Author: Guillaume Desmottes -Date: Fri Nov 7 11:52:11 2008 +0000 - - Merge branch 'ichat-crash' - -commit 229f9526b841548f9e0b7cd51031cb46d7f6e4a3 -Author: Guillaume Desmottes -Date: Fri Nov 7 11:51:55 2008 +0000 - - Rephrase a debug output. Add a SALUT_CONTACT cast - - src/salut-xmpp-connection-manager.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 5f076f78e4fc8d8aa09a300b07ab89d7f8ccf037 -Merge: 23f876c 3bd83d7 -Author: Guillaume Desmottes -Date: Fri Nov 7 11:44:25 2008 +0000 - - Merge branch 'master' into ft-requestotron - - Conflicts: - - lib/gibber/Makefile.am - tests/twisted/Makefile.am - -commit af37a9a26a408b216934a232ebf9e766ba0fd5ad -Author: Guillaume Desmottes -Date: Fri Nov 7 11:38:37 2008 +0000 - - Improve debug info when a incoming connection is rejected because we can't identify it - - src/salut-xmpp-connection-manager.c | 19 ++++++++++++++++++- - 1 files changed, 18 insertions(+), 1 deletions(-) - -commit bc5b90402abaa793315db740f8721cfa76c5a159 -Author: Guillaume Desmottes -Date: Fri Nov 7 11:36:20 2008 +0000 - - disable test-ichat-incoming-msg.py as the test is not reliable - - tests/twisted/avahi/test-ichat-incoming-msg.py | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 73e2cd3fdb953bc18143af318eac0e6ae19fabca -Author: Guillaume Desmottes -Date: Fri Nov 7 11:26:48 2008 +0000 - - xmppstream.py: override OutgoingXmppiChatStream send method as iChat doesn't send from attribute in stanza - - tests/twisted/xmppstream.py | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 0ba6f445a71169b343874afcf4464d3691dd0f49 -Author: Alban Crequy -Date: Thu Nov 6 19:09:05 2008 +0000 - - XmppConnectionListener: let the GibberListener choose the port - - lib/gibber/gibber-xmpp-connection-listener.c | 10 +++++++--- - lib/gibber/gibber-xmpp-connection-listener.h | 4 ++-- - src/salut-xmpp-connection-manager.c | 24 +----------------------- - tests/check-gibber-xmpp-connection-listener.c | 15 +++------------ - 4 files changed, 13 insertions(+), 40 deletions(-) - -commit d20ec413e6b72ae2273a69351d83ef2c8f60c767 -Author: Alban Crequy -Date: Thu Nov 6 18:53:51 2008 +0000 - - GibberListener: listen functions return a boolean and add a get_port function - - lib/gibber/gibber-bytestream-oob.c | 5 +- - lib/gibber/gibber-listener.c | 74 ++++++++++++++++------------------- - lib/gibber/gibber-listener.h | 9 ++-- - tests/check-gibber-listener.c | 8 ++- - 4 files changed, 46 insertions(+), 50 deletions(-) - -commit 4d08404ccf87caf978e16c53afe377e0251826ee -Author: Alban Crequy -Date: Thu Nov 6 18:35:33 2008 +0000 - - GibberListener: abstract sockets are not implemented yet; do not test them - - lib/gibber/gibber-listener.c | 12 ++++++++++++ - tests/check-gibber-listener.c | 2 +- - 2 files changed, 13 insertions(+), 1 deletions(-) - -commit 610ee222ce14360239764da2824c3d1ace771ba3 -Author: Alban Crequy -Date: Thu Nov 6 18:29:03 2008 +0000 - - GibberListening: do not allow to listen several times - - lib/gibber/gibber-listener.c | 36 ++++++++++++++++++++++++++++++++++-- - 1 files changed, 34 insertions(+), 2 deletions(-) - -commit 3bd83d7ad830df0ccae37a0811f00ddae4922ee8 -Merge: fef6055 ba86274 -Author: Guillaume Desmottes -Date: Thu Nov 6 18:15:49 2008 +0000 - - Merge branch 'ichat-crash' - -commit 98dae4d21a3ec5772eccdc92feccd47fc4382976 -Author: Alban Crequy -Date: Thu Nov 6 18:12:17 2008 +0000 - - GibberListener: clean listeners in error case of listen_tcp_af() - - lib/gibber/gibber-listener.c | 17 ++++++++++++----- - 1 files changed, 12 insertions(+), 5 deletions(-) - -commit 6119a04aad3eae1480fdd2134bec51bc9f0f710d -Author: Alban Crequy -Date: Thu Nov 6 18:01:59 2008 +0000 - - Test GibberListener: separate test case for unix sockets - - tests/check-gibber-listener.c | 23 ++++++++++++++++------- - 1 files changed, 16 insertions(+), 7 deletions(-) - -commit 70ae190d576dbbf2a791791bbe19c8d40f416ad2 -Author: Alban Crequy -Date: Thu Nov 6 17:50:40 2008 +0000 - - Use g_strlcpy instead of strncpy + []='\0' - - lib/gibber/gibber-unix-transport.c | 3 +-- - src/tube-stream.c | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -commit ba862748c93ecab59c9c4aafff30157c8c3abeb5 -Author: Guillaume Desmottes -Date: Thu Nov 6 17:50:51 2008 +0000 - - add test-ichat-incoming-msg.py to tests suite - - tests/twisted/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit be2e4b3a54fd5bac4524369203df893faa2117af -Author: Guillaume Desmottes -Date: Thu Nov 6 17:50:39 2008 +0000 - - add test-ichat-incoming-msg.py - - tests/twisted/avahi/test-ichat-incoming-msg.py | 77 ++++++++++++++++++++++++ - 1 files changed, 77 insertions(+), 0 deletions(-) - -commit 8df03f5802da4ded7f9792bef54c31655e276a36 -Author: Guillaume Desmottes -Date: Thu Nov 6 17:50:26 2008 +0000 - - incoming_pending_connection_stanza_received_cb: fix self cast - - src/salut-xmpp-connection-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 25c18aff24b94c9d8977101decd181609b0a0cf7 -Author: Guillaume Desmottes -Date: Thu Nov 6 17:49:02 2008 +0000 - - xmppstream.py: OutgoingXmppiChatStream - - tests/twisted/xmppstream.py | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 23bb87b1797976846b56867cb6e126d1736f5d45 -Author: Alban Crequy -Date: Thu Nov 6 17:48:01 2008 +0000 - - Use struct sockaddr_storage for storage but always pass struct sockaddr* + size as parameters - - lib/gibber/gibber-bytestream-oob.c | 2 +- - lib/gibber/gibber-bytestream-oob.h | 2 +- - src/salut-avahi-contact.c | 16 ++++++++-------- - src/salut-bytestream-manager.c | 4 ++-- - src/salut-contact-manager.c | 15 +++++++++------ - src/salut-contact-manager.h | 2 +- - src/salut-contact.c | 5 +++-- - src/salut-contact.h | 5 +++-- - src/salut-xmpp-connection-manager.c | 8 ++++---- - tests/check-gibber-listener.c | 2 +- - tests/check-gibber-xmpp-connection-listener.c | 2 +- - 11 files changed, 34 insertions(+), 29 deletions(-) - -commit ef01690db6c8d9e5ec345f9aad4c50452024777e -Author: Alban Crequy -Date: Thu Nov 6 17:30:14 2008 +0000 - - GibberBytestreamOOB: the size of the struct sockaddr is given - - lib/gibber/gibber-bytestream-oob.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 43902a4b9153c469bb766110e0d15fc9a56e01a8 -Author: Alban Crequy -Date: Thu Nov 6 16:55:56 2008 +0000 - - GibberBytestreamOOB: set priv->listener to NULL after freeing it - - lib/gibber/gibber-bytestream-oob.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit fef605587dd586db90ad72bdb42d82d284deb853 -Author: Guillaume Desmottes -Date: Thu Nov 6 16:55:11 2008 +0000 - - make warning crashers when running tests - - tests/twisted/tools/exec-with-log.sh.in | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 77d73380f0c11fe620e81aacd2bc5e88703763be -Author: Guillaume Desmottes -Date: Thu Nov 6 16:09:41 2008 +0000 - - remove gibber_ll_transport_get_address - - lib/gibber/gibber-linklocal-transport.c | 18 ------------------ - lib/gibber/gibber-linklocal-transport.h | 3 --- - 2 files changed, 0 insertions(+), 21 deletions(-) - -commit b84ad63a556b1861a2d8aa70ed60e39c411fa3b1 -Author: Guillaume Desmottes -Date: Thu Nov 6 16:07:18 2008 +0000 - - xmpp-connection-manager: conn->transport is not a LL transport anymore so use gibber_transport_get_sockaddr instead of gibber_ll_transport_get_address - - src/salut-xmpp-connection-manager.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 23f876cdeb8e3ac14446d9a0acd181f2e0e4960f -Author: Guillaume Desmottes -Date: Thu Nov 6 15:08:32 2008 +0000 - - check that TransferredBytes is 0 if a file sending failed - - tests/twisted/avahi/test-send-file-declined.py | 4 ++++ - .../twisted/avahi/test-send-file-item-not-found.py | 4 ++++ - 2 files changed, 8 insertions(+), 0 deletions(-) - -commit 9106e231e9e8350d8dc4405980ab95eecb40f362 -Author: Guillaume Desmottes -Date: Thu Nov 6 15:05:41 2008 +0000 - - add test-receive-file-not-found.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit c5b7485cbd879d59bb753294d6ed358839d86c13 -Author: Guillaume Desmottes -Date: Thu Nov 6 15:05:29 2008 +0000 - - add test-receive-file-not-found.py - - tests/twisted/avahi/test-receive-file-not-found.py | 215 ++++++++++++++++++++ - 1 files changed, 215 insertions(+), 0 deletions(-) - -commit 205d22db4a9c1d9999a6c8fafefd86ea558771c4 -Author: Guillaume Desmottes -Date: Thu Nov 6 15:04:39 2008 +0000 - - Don't fire the TransferredBytesChanged signal if we got a HTTP error - - lib/gibber/gibber-oob-file-transfer.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 9d74499ad16e84f1cd03b9102c42d914dee81989 -Author: Guillaume Desmottes -Date: Thu Nov 6 14:43:22 2008 +0000 - - Send the 'item-not-found' error if we can't retrieve the file from peer - - src/salut-file-transfer-channel.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit ff78f3fd808f151fc56e0db219ac2b3d9f4029b4 -Author: Guillaume Desmottes -Date: Thu Nov 6 14:41:53 2008 +0000 - - salut_file_transfer_channel_set_state: prevent to fire the signal if the state didn't actually change - - src/salut-file-transfer-channel.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 820e0448f982a15b99f7e38a00c20dd5fe22b961 -Author: Guillaume Desmottes -Date: Thu Nov 6 14:40:39 2008 +0000 - - gibber-oob-file-transfer: the 'canceled' signal is fired when the transfer was cancelled for an external reason, we don't have to fire it when user explicitely ask to cancel - - lib/gibber/gibber-oob-file-transfer.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 6eadacb9671da98775b99936b22eb8b88d17ffb1 -Author: Guillaume Desmottes -Date: Thu Nov 6 14:33:05 2008 +0000 - - OOB 404 stanza is 'item-not-found' not 'not-found' - - lib/gibber/gibber-oob-file-transfer.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 0d60d1a9bfa92b8312c2a52e536fb6277e66d26f -Author: Guillaume Desmottes -Date: Thu Nov 6 14:31:46 2008 +0000 - - Display HTTP error - - lib/gibber/gibber-oob-file-transfer.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 25093665b61186ac2393ae09ae22a65d17fb4376 -Author: Alban Crequy -Date: Thu Nov 6 13:47:40 2008 +0000 - - GibberBytestreanOOB: use GibberListener instead of its own implementation of listen(2) - - lib/gibber/gibber-bytestream-oob.c | 156 +++++------------------------------- - 1 files changed, 22 insertions(+), 134 deletions(-) - -commit b2dd1a8b3e32167f4690beb04330da2869c37829 -Author: Alban Crequy -Date: Thu Nov 6 13:03:19 2008 +0000 - - GibberListener: when the port is 0, let a random port be chosen, returns this port. Add a unit test. - - lib/gibber/gibber-listener.c | 67 ++++++++++++++++++++++++++++------------- - lib/gibber/gibber-listener.h | 8 ++-- - tests/check-gibber-listener.c | 23 +++++++++++++- - 3 files changed, 72 insertions(+), 26 deletions(-) - -commit ffa24fce6fa4d56e7a3fd16c2639d41a26e96680 -Author: Guillaume Desmottes -Date: Thu Nov 6 12:54:25 2008 +0000 - - add test-send-file-item-not-found.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit e3e70b5c4ab1b689dce7a344136b8fb685510235 -Author: Guillaume Desmottes -Date: Thu Nov 6 12:54:15 2008 +0000 - - add test-send-file-item-not-found.py - - .../twisted/avahi/test-send-file-item-not-found.py | 198 ++++++++++++++++++++ - 1 files changed, 198 insertions(+), 0 deletions(-) - -commit 8dc655496d2e003b9c1f78a25e8d09dc08ca3930 -Author: Guillaume Desmottes -Date: Thu Nov 6 12:54:04 2008 +0000 - - file-transfer-channel: handle NOT_FOUND FT error - - src/salut-file-transfer-channel.c | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit ea59247583a584879fdae99e17e13a47a8c63038 -Author: Guillaume Desmottes -Date: Thu Nov 6 12:04:25 2008 +0000 - - add test-send-file-declined.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 2cb815a1477907c80c4cb9301fdeaba4b8341cb7 -Author: Guillaume Desmottes -Date: Thu Nov 6 12:04:13 2008 +0000 - - add test-send-file-declined.py - - tests/twisted/avahi/test-send-file-declined.py | 198 ++++++++++++++++++++++++ - 1 files changed, 198 insertions(+), 0 deletions(-) - -commit 38595a9b99fd7772590ae826162469cb81c187f0 -Author: Guillaume Desmottes -Date: Thu Nov 6 12:03:55 2008 +0000 - - gibber-oob-file-transfer: set cancelled to TRUE when we receive a decline stanza from the remote peer - - lib/gibber/gibber-oob-file-transfer.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit a32770b036d7ee4a57db1f60c679b3de85134be4 -Author: Guillaume Desmottes -Date: Thu Nov 6 12:01:48 2008 +0000 - - file-transfer-channel: connect the cancel signal when we send the file offer and not when it has been accepted so we are notified if the remote user declined the file - - src/salut-file-transfer-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 213d8eb79bacffe1ac5ec3cacf3b486e2b9c55d4 -Author: Guillaume Desmottes -Date: Thu Nov 6 11:54:53 2008 +0000 - - Channel_Type_File_Transfer.xml: sync with latest spec - - extensions/Channel_Type_File_Transfer.xml | 30 +++++++++++++++------------- - 1 files changed, 16 insertions(+), 14 deletions(-) - -commit 6609a42399d83c42a1960eeed3865d872202e0d3 -Author: Guillaume Desmottes -Date: Wed Nov 5 16:54:41 2008 +0000 - - add test-send-file-to-unknown-contact.py - - tests/twisted/Makefile.am | 1 + - .../avahi/test-send-file-to-unknown-contact.py | 101 ++++++++++++++++++++ - 2 files changed, 102 insertions(+), 0 deletions(-) - -commit 0ca1c7eaacaaf7a83c24b5b2059f4ff22533a9df -Author: Guillaume Desmottes -Date: Wed Nov 5 16:53:47 2008 +0000 - - don't crash if the TargetHandle is not connected - - src/salut-ft-manager.c | 23 ++++++++++++++++------- - 1 files changed, 16 insertions(+), 7 deletions(-) - -commit 1dca69eb89e26d9cbe4ff885ce2c71125ecda1dd -Author: Guillaume Desmottes -Date: Wed Nov 5 16:19:34 2008 +0000 - - gibber-file-transfer: keep a ref on the connection - - lib/gibber/gibber-file-transfer.c | 18 +++++++++++++++++- - 1 files changed, 17 insertions(+), 1 deletions(-) - -commit e03eecc986a3323b3614fd09afafc0edfca82fd1 -Author: Alban Crequy -Date: Wed Nov 5 15:23:32 2008 +0000 - - GibberListener: if the port is 0, let a random port be chosen and use the same port on all address family - - lib/gibber/gibber-listener.c | 36 +++++++++++++++++++++++++++++++++--- - 1 files changed, 33 insertions(+), 3 deletions(-) - -commit d1abba2d7c021b31a0f1d6b7a9d758fcb9ddd45d -Author: Guillaume Desmottes -Date: Wed Nov 5 14:38:50 2008 +0000 - - CreateChannel fails if the sending of the ft offer failed - - src/salut-ft-manager.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit d870e04400d0a105dd95fad8ccec7df27163b45d -Author: Guillaume Desmottes -Date: Wed Nov 5 14:31:52 2008 +0000 - - coding style tweaks - - src/salut-file-transfer-channel.c | 100 +++++++++++++++++++++---------------- - src/salut-ft-manager.c | 26 +++------- - 2 files changed, 65 insertions(+), 61 deletions(-) - -commit 5999c5c9734033c0040b1aae884db453eedbb954 -Author: Guillaume Desmottes -Date: Wed Nov 5 14:25:46 2008 +0000 - - emit the InitialOffsetDefined signal before the channel becomes Open - - src/salut-file-transfer-channel.c | 10 ++++++++++ - tests/twisted/avahi/test-receive-file.py | 9 +++++---- - .../avahi/test-send-file-provide-immediately.py | 9 +++++---- - .../avahi/test-send-file-wait-to-provide.py | 5 +++++ - 4 files changed, 25 insertions(+), 8 deletions(-) - -commit aa56b3d23609bb6f6a2b4aeac92bb9a5b6aed73d -Author: Guillaume Desmottes -Date: Wed Nov 5 14:13:09 2008 +0000 - - add test-send-file-provide-immediately.py - - tests/twisted/Makefile.am | 1 + - .../avahi/test-send-file-provide-immediately.py | 223 ++++++++++++++++++++ - 2 files changed, 224 insertions(+), 0 deletions(-) - -commit c468a1d5f4ac6f8760e8dbb5d226ef250c3f0171 -Author: Guillaume Desmottes -Date: Wed Nov 5 14:10:02 2008 +0000 - - rename test-send-file.py to test-send-file-wait-to-provide.p - - tests/twisted/Makefile.am | 2 +- - .../avahi/test-send-file-wait-to-provide.py | 229 ++++++++++++++++++++ - tests/twisted/avahi/test-send-file.py | 229 -------------------- - 3 files changed, 230 insertions(+), 230 deletions(-) - -commit 1bb51a407cc55e36f65af565f9fca928d61c4f64 -Author: Guillaume Desmottes -Date: Wed Nov 5 14:07:02 2008 +0000 - - test-receive-file.py: check if we receive the OOB IQ result - - tests/twisted/avahi/test-receive-file.py | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit a02620880cac2ad1835fae5026c3dbd232ad680b -Author: Alban Crequy -Date: Wed Nov 5 13:52:58 2008 +0000 - - Remove dead code - - lib/gibber/gibber-unix-transport.c | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit 4c8525aea7fbec24b9b8ac385a8cf671af5a055a -Author: Alban Crequy -Date: Wed Nov 5 13:52:33 2008 +0000 - - Update copyright - - lib/gibber/gibber-unix-transport.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit f7f325154d8a913a24fbee0e9428585d9e819cd0 -Author: Guillaume Desmottes -Date: Wed Nov 5 13:43:30 2008 +0000 - - test-send-file.py: test new states transition. OOB iq reply have to be send at the *end* of the transfer - - tests/twisted/avahi/test-send-file.py | 42 ++++++++++++++++++++------------ - 1 files changed, 26 insertions(+), 16 deletions(-) - -commit ac37fa768b48dae536ab02a4e96f114e4a930baa -Author: Guillaume Desmottes -Date: Wed Nov 5 13:41:23 2008 +0000 - - implement news states transitions - - src/salut-file-transfer-channel.c | 31 +++++++++++++++++++++++++------ - 1 files changed, 25 insertions(+), 6 deletions(-) - -commit da5a01d7ba30a20f4f70e667798860b56f3a6503 -Author: Guillaume Desmottes -Date: Wed Nov 5 12:43:25 2008 +0000 - - Implement new draft of the spec - - src/salut-file-transfer-channel.c | 102 +++++++++++++++++------------ - src/salut-file-transfer-channel.h | 3 + - src/salut-ft-manager.c | 8 ++- - tests/twisted/avahi/test-receive-file.py | 12 ++-- - tests/twisted/avahi/test-send-file.py | 24 +++----- - 5 files changed, 83 insertions(+), 66 deletions(-) - -commit 84190ffca8c5c58ad6f42dba53436ef10cf54cbc -Author: Guillaume Desmottes -Date: Wed Nov 5 11:22:13 2008 +0000 - - Channel_Type_File_Transfer.xm: sync with latest draft - - extensions/Channel_Type_File_Transfer.xml | 127 ++++++++++++++++++----------- - 1 files changed, 81 insertions(+), 46 deletions(-) - -commit 640ef9dc484d0f5a7c882f6a2f91d65fb4a48b06 -Merge: 5ba7bf1 13c3639 -Author: Alban Crequy -Date: Tue Nov 4 19:32:19 2008 +0000 - - Merge branch 'master' into tubes-requestotron-without-new-specs - -commit 7a0783aa5ff4275b8ac79e3d8bfb9de009b57504 -Author: Alban Crequy -Date: Tue Nov 4 19:13:44 2008 +0000 - - Implement gibber_listener_listen_socket() in GibberListener and test it in check-gibber-listener - - lib/gibber/gibber-listener.c | 25 +++++++++++++------------ - tests/check-gibber-listener.c | 33 +++++++++++++++++++++++++++++++++ - 2 files changed, 46 insertions(+), 12 deletions(-) - -commit 1e6f8ac61cd7f0233925789bd5a553231808f074 -Author: Alban Crequy -Date: Tue Nov 4 17:23:45 2008 +0000 - - GibberUnixTransport: Call gibber_transport_emit_error when gibber_unix_transport_connect() fails. - - lib/gibber/gibber-unix-transport.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 67b5884176d34d6ff358c902e93f83f46f3c1414 -Author: Alban Crequy -Date: Tue Nov 4 14:57:46 2008 +0000 - - GibberUnixTransport: Implement gibber_unix_transport_connect. - - lib/gibber/gibber-unix-transport.c | 54 ++++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-unix-transport.h | 3 ++ - 2 files changed, 57 insertions(+), 0 deletions(-) - -commit 0b387a908add93c0064b55d03bb2adac7bc45acf -Author: Alban Crequy -Date: Tue Nov 4 12:51:07 2008 +0000 - - Add GibberUnixTransport, child of GibberFdTransport - - lib/gibber/Makefile.am | 2 + - lib/gibber/gibber-unix-transport.c | 112 ++++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-unix-transport.h | 75 ++++++++++++++++++++++++ - 3 files changed, 189 insertions(+), 0 deletions(-) - -commit 25b58b304ceeb6f181553ff5778799ebe6734695 -Author: Guillaume Desmottes -Date: Tue Nov 4 11:47:08 2008 +0000 - - ft-manager: disconnect channel signals when disposing - - src/salut-ft-manager.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit ebe3eb979494f3bef10c24154d328ba8a59e0898 -Author: Guillaume Desmottes -Date: Tue Nov 4 11:46:30 2008 +0000 - - ft-manager: initialize the channels list to NULL as we start with an empty list - - src/salut-ft-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 13c36391727da9ec61d8ce68b126a80c48425f6e -Merge: 214090d d376eb5 -Author: Alban Crequy -Date: Mon Nov 3 16:49:58 2008 +0000 - - Merge branch 'gibber-listener' - -commit d376eb51a0438f5a5c6ed5fa116cc7a34f66d30d -Author: Alban Crequy -Date: Mon Nov 3 16:44:53 2008 +0000 - - tests/check-gibber-listener.c: Use g_error_matches instead of error->code - - tests/check-gibber-listener.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 0a8da4530a14fb96f16a3c43a5429cb08fced6b9 -Author: Guillaume Desmottes -Date: Mon Nov 3 14:43:23 2008 +0000 - - change from local-pending to accepted and from not-offererd to to remote pending should have reason requested - - src/salut-file-transfer-channel.c | 7 ++++--- - tests/twisted/avahi/test-receive-file.py | 4 ++-- - tests/twisted/avahi/test-send-file.py | 4 ++-- - 3 files changed, 8 insertions(+), 7 deletions(-) - -commit a9e5d3f96e7459858fb4937b91f11b239fb68bbd -Author: Guillaume Desmottes -Date: Mon Nov 3 14:34:04 2008 +0000 - - use the same interface name in tests than the ones of tp-python - - tests/twisted/avahi/test-receive-file.py | 46 ++++++++-------- - tests/twisted/avahi/test-send-file.py | 92 +++++++++++++++--------------- - 2 files changed, 69 insertions(+), 69 deletions(-) - -commit fc397dbc0734420638a33069ce456194160ab48c -Author: Guillaume Desmottes -Date: Mon Nov 3 14:19:58 2008 +0000 - - check if offset is always 0 when the ft is open - - tests/twisted/avahi/test-receive-file.py | 9 ++++++++- - tests/twisted/avahi/test-send-file.py | 8 ++++++++ - 2 files changed, 16 insertions(+), 1 deletions(-) - -commit 43d3e2b14fc8e5f43a32c8ff4f618f0381fdd5f6 -Author: Alban Crequy -Date: Mon Nov 3 14:19:48 2008 +0000 - - lib/gibber/gibber-listener.c: sizeof (guint) == sizeof (socklen_t) is not guaranteed, so cast to guint before emitting the signal - - lib/gibber/gibber-listener.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit cd40de50d8c5e23114d23b491ab907907ae2b3b6 -Author: Guillaume Desmottes -Date: Mon Nov 3 14:16:28 2008 +0000 - - content hash and dates are always non on the receiver side as the protocol doesn't support them - - src/salut-file-transfer-channel.c | 6 ------ - tests/twisted/avahi/test-receive-file.py | 11 ++++++----- - 2 files changed, 6 insertions(+), 11 deletions(-) - -commit 8207ba1d1897ee5ea1fd1aecdeac4e1c9179b7c3 -Author: Alban Crequy -Date: Mon Nov 3 14:11:28 2008 +0000 - - tests/check-gibber-listener.c: Check that GIBBER_LISTENER_ERROR_ADDRESS_IN_USE is returned correctly - - tests/check-gibber-listener.c | 12 +++++++++++- - 1 files changed, 11 insertions(+), 1 deletions(-) - -commit 1448d7e4403d40c55d3a73a17d16d8a78d4db49e -Author: Alban Crequy -Date: Mon Nov 3 14:00:52 2008 +0000 - - lib/gibber/gibber-listener.c: Remove blank line - - lib/gibber/gibber-listener.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 98af5376ce03d85daee5d68669d3415aecc0f473 -Author: Sjoerd Simons -Date: Mon Nov 3 13:55:00 2008 +0000 - - Remove redundant error clearing - - lib/gibber/gibber-listener.c | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) - -commit dc6add1bfa2e58de4fc3324b646957fbfdf7a9da -Author: Guillaume Desmottes -Date: Mon Nov 3 13:36:55 2008 +0000 - - file-transfer-channel: use priv->closed as channel destroyed property - - src/salut-file-transfer-channel.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 4b29c59035f40a411e27465cd62fbe1d01b35187 -Author: Guillaume Desmottes -Date: Mon Nov 3 13:31:32 2008 +0000 - - coding style fixes - - lib/gibber/gibber-file-transfer.c | 4 ++-- - lib/gibber/gibber-file-transfer.h | 2 +- - lib/gibber/gibber-oob-file-transfer.h | 2 +- - src/salut-file-transfer-channel.c | 4 ++-- - 4 files changed, 6 insertions(+), 6 deletions(-) - -commit b21a6e2f4c2d1a5df76f97aed4df78a32b37ae4d -Author: Sjoerd Simons -Date: Mon Nov 3 12:36:14 2008 +0000 - - Also include netinet/in.h as per man 7 ipv6 - - lib/gibber/gibber-listener.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 0cdf59558a6376de97a52dac8490069bc6ba4ec4 -Author: Sjoerd Simons -Date: Mon Nov 3 12:35:31 2008 +0000 - - Fix error handling to not leak Gerrors - - lib/gibber/gibber-listener.c | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit 720607b2e8116a53bcf2803d9b6452cdd02d4dc1 -Author: Sjoerd Simons -Date: Mon Nov 3 12:23:44 2008 +0000 - - Port the GibberXmppConnectionListener to GibberListener - - lib/gibber/gibber-xmpp-connection-listener.c | 152 +++---------------------- - lib/gibber/gibber-xmpp-connection-listener.h | 11 -- - src/salut-xmpp-connection-manager.c | 4 +- - tests/check-gibber-xmpp-connection-listener.c | 5 +- - 4 files changed, 21 insertions(+), 151 deletions(-) - -commit 0d9066b424b082ff34591bd44ed0fb5266cc64d5 -Author: Guillaume Desmottes -Date: Mon Nov 3 12:23:20 2008 +0000 - - send/receive the content-type and description to/from the OOB stanza - - lib/gibber/gibber-file-transfer.c | 30 ++++++++++++++++++++++++++++++ - lib/gibber/gibber-file-transfer.h | 2 ++ - lib/gibber/gibber-oob-file-transfer.c | 26 +++++++++++++++++++++++--- - src/salut-file-transfer-channel.c | 5 ++++- - tests/twisted/avahi/test-receive-file.py | 8 +++----- - tests/twisted/avahi/test-send-file.py | 5 ++++- - 6 files changed, 66 insertions(+), 10 deletions(-) - -commit 6099bb58e6bf57b792bc049d05aff5103e2b388d -Author: Sjoerd Simons -Date: Mon Nov 3 11:57:21 2008 +0000 - - Initial implementation of GibberListener - - lib/gibber/gibber-listener.c | 255 +++++++++++++++++++++++++++++++++++++++-- - lib/gibber/gibber-listener.h | 15 ++- - 2 files changed, 255 insertions(+), 15 deletions(-) - -commit f2ce41af7f0cf23b506017165b850b096321e29d -Author: Guillaume Desmottes -Date: Mon Nov 3 11:54:45 2008 +0000 - - send an IQ error reply instead of asserting if we failed to parse a file transfer offer - - src/salut-file-transfer-channel.c | 18 +++++++++++++++--- - src/salut-file-transfer-channel.h | 6 +++--- - src/salut-ft-manager.c | 9 +++++---- - 3 files changed, 23 insertions(+), 10 deletions(-) - -commit 4e832fa7db70e3f2e5cfd9559c391d35d15d4881 -Author: Sjoerd Simons -Date: Mon Nov 3 11:39:02 2008 +0000 - - Connect over tcp after connecting signals - - tests/check-gibber-listener.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 841f4537ebcf20b7dafcc8d971498e731a6b1bb6 -Author: Guillaume Desmottes -Date: Mon Nov 3 11:38:06 2008 +0000 - - remove some TODO comments and add one explaining the rational of the current design - - src/salut-file-transfer-channel.c | 31 +++---------------------------- - 1 files changed, 3 insertions(+), 28 deletions(-) - -commit 59aedf72b1935bb9e351c30085d13d8603b77948 -Author: Guillaume Desmottes -Date: Mon Nov 3 09:29:35 2008 +0000 - - replace some check by assertions - - src/salut-file-transfer-channel.c | 29 ++--------------------------- - 1 files changed, 2 insertions(+), 27 deletions(-) - -commit fd9d1faec784a409207c4a83014f5fca2089ddbc -Author: Guillaume Desmottes -Date: Mon Nov 3 09:26:01 2008 +0000 - - properly check if the address type and access control passed by the user is implemented - - src/salut-file-transfer-channel.c | 49 ++++++++++++++++++++++++++++++++---- - 1 files changed, 43 insertions(+), 6 deletions(-) - -commit fc0833389b998974764a35d5f17c04f063c6d9c9 -Author: Guillaume Desmottes -Date: Mon Nov 3 09:12:36 2008 +0000 - - fill the AvailableSocketTypes hash table - - src/salut-file-transfer-channel.c | 21 ++++++++++++++++++--- - tests/twisted/avahi/test-receive-file.py | 4 ++-- - tests/twisted/avahi/test-send-file.py | 4 ++-- - 3 files changed, 22 insertions(+), 7 deletions(-) - -commit 38035314fbac2fb5d7b8b2805f0e1403370a6049 -Merge: b8ca4af 214090d -Author: Guillaume Desmottes -Date: Mon Nov 3 09:07:35 2008 +0000 - - Merge commit 'origin/master' into ft-requestotron - - Conflicts: - - tests/twisted/Makefile.am - -commit b8ca4af281b525fb4f11fb90cfffac28244be636 -Author: Guillaume Desmottes -Date: Mon Nov 3 08:48:16 2008 +0000 - - add core to gitignore - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 1bab84e93dd6901cb958eea7bb0d95c44cf586c2 -Author: Guillaume Desmottes -Date: Mon Nov 3 08:47:06 2008 +0000 - - add 2 FIXME's - - lib/gibber/gibber-oob-file-transfer.c | 1 + - src/salut-file-transfer-channel.c | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit c798f3ecf2b4dd6edf8ec882debd1c114e71257a -Author: Sjoerd Simons -Date: Sat Nov 1 15:17:38 2008 +0000 - - Add test for gibber listener base on the xmpp-connection-listener one - - tests/Makefile.am | 3 +- - tests/check-gibber-listener.c | 133 +++++++++++++++++++++++++++++++++++++++++ - tests/check-gibber.h | 1 + - tests/check-main.c | 1 + - 4 files changed, 137 insertions(+), 1 deletions(-) - -commit 8dd55ea162490e1478b55094d5d46ba847eb2f14 -Author: Sjoerd Simons -Date: Sat Nov 1 15:16:18 2008 +0000 - - Add dummy listener implementation - - lib/gibber/Makefile.am | 2 + - lib/gibber/gibber-listener.c | 179 ++++++++++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-listener.h | 87 ++++++++++++++++++++ - 3 files changed, 268 insertions(+), 0 deletions(-) - -commit 5ba7bf12e9e0ae5f195f20f5f0d8796c308dd00e -Author: Alban Crequy -Date: Fri Oct 31 19:20:09 2008 +0000 - - SalutTubesManager: Fix _dispose: unref XmppConnectionManager after using it - - src/salut-tubes-manager.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit ff3e1690db37b69299d0f4bf6ef7628d4af4bf94 -Author: Alban Crequy -Date: Sun Oct 5 00:34:14 2008 +0100 - - Fix: remove_stanza_filter() when SalutTubesManager is destroyed. - - src/salut-tubes-manager.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 4f9c54782c2626ab418a6ca4f5db24725f10f16a -Author: Alban Crequy -Date: Fri Oct 31 19:01:45 2008 +0000 - - Fix previous commit: Fix leaks of ContactManager and XmppConnectionManager - - src/salut-tubes-manager.c | 16 ++++++++++++++-- - 1 files changed, 14 insertions(+), 2 deletions(-) - -commit abb226cbdffe39b79ae4b1d4a6ab676668da197f -Author: Alban Crequy -Date: Fri Oct 31 18:38:12 2008 +0000 - - Fix leaks of ContactManager and XmppConnectionManager - - src/salut-tubes-manager.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit da85754289c2f323d86d44eff2a5681d9dbb523f -Merge: 23f6f0f 214090d -Author: Alban Crequy -Date: Fri Oct 31 17:49:17 2008 +0000 - - Merge branch 'master' into tubes-requestotron-without-new-specs - -commit 214090d40580178e28f15ee1d52e2b24b9095c83 -Author: Alban Crequy -Date: Fri Oct 31 17:43:33 2008 +0000 - - src/salut-im-channel.c: Remove a ref on stanza: salut_im_channel_message_new() already ref it. - - src/salut-im-channel.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 36cfe8510a706e4d3758504b06c52edca688e042 -Author: Alban Crequy -Date: Fri Oct 31 17:13:47 2008 +0000 - - Channels: fix leaks when setting PROP_CHANNEL_PROPERTIES - - src/salut-im-channel.c | 2 +- - src/salut-muc-channel.c | 2 +- - src/salut-roomlist-channel.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -commit 23f6f0f02ccb3eae24dccb1c0321217e106d2a5b -Author: Alban Crequy -Date: Fri Oct 31 16:13:48 2008 +0000 - - SalutDirectBytestreamManager: Fix a leak - - src/salut-direct-bytestream-manager.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit c1527fc242b3f7cdbf9619e50aeeed0eff7c687e -Author: Alban Crequy -Date: Fri Oct 31 15:44:15 2008 +0000 - - src/salut-tubes-manager.c: Add a GError in extract_tube_information to send a precise error - - src/salut-tubes-manager.c | 41 +++++++++++++++++++++++++++-------------- - 1 files changed, 27 insertions(+), 14 deletions(-) - -commit fd6b6b96bde06ec97c4075b58e0b7643aca2cab9 -Author: Alban Crequy -Date: Fri Oct 31 13:15:19 2008 +0000 - - Avoid to send the close message stanza from both ends in 1-1 stream tubes. - - This commit is similar to what was done for telepathy-gabble for its bug #16797. - - docs/tubes.txt | 4 ---- - src/salut-tubes-channel.c | 6 +++--- - src/tube-dbus.c | 6 +++--- - src/tube-iface.c | 6 +++--- - src/tube-iface.h | 4 ++-- - src/tube-stream.c | 14 +++++++++----- - 6 files changed, 20 insertions(+), 20 deletions(-) - -commit 177bb367a5ebb22b474b720ad54f459335c31368 -Author: Alban Crequy -Date: Thu Oct 30 20:56:37 2008 +0000 - - docs/tubes.txt: the code does not ignore the acknowledgment of the tube offer anymore - - docs/tubes.txt | 8 +------- - 1 files changed, 1 insertions(+), 7 deletions(-) - -commit 3a8f8268e6f5c3a5cce92a180fbdbb9a6aece410 -Merge: fc40669 b200ab5 -Author: Alban Crequy -Date: Thu Oct 30 20:40:22 2008 +0000 - - Merge branch 'master' into tubes-requestotron-without-new-specs - - Conflicts: - - tests/twisted/Makefile.am - -commit b200ab5db03be32df6282f9e8d7b2da5cd97c802 -Author: Sjoerd Simons -Date: Thu Oct 30 20:09:05 2008 +0000 - - Remove debug messages - - tests/twisted/avahi/test-ichat-composing.py | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit fa4782da3035115f285c263dd2784462658d1445 -Author: Sjoerd Simons -Date: Thu Oct 30 19:35:57 2008 +0000 - - Ignore ichats type notification message - - src/text-helper.c | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) - -commit fb6091f3f3805a0f3bbeb73871b2de6772056ced -Author: Sjoerd Simons -Date: Thu Oct 30 19:35:00 2008 +0000 - - on the real message, put a jabber:x:event with composing but without id - - tests/twisted/avahi/test-ichat-composing.py | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit ad4063de81a247dc2499477d98f40612bb56d936 -Author: Sjoerd Simons -Date: Thu Oct 30 19:33:52 2008 +0000 - - Add jabber:x:event namespace - - lib/gibber/gibber-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 6b704cebb64bee0e6f827d7e5c0070bd234f4ea9 -Author: Sjoerd Simons -Date: Thu Oct 30 19:20:47 2008 +0000 - - We should only receive the message once - - tests/twisted/avahi/test-ichat-composing.py | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 59bc18c7889b7719ec9836e8dffa449030b88b54 -Author: Sjoerd Simons -Date: Thu Oct 30 19:18:34 2008 +0000 - - Add a test for iChat type chat notifications - - tests/twisted/Makefile.am | 3 +- - tests/twisted/avahi/test-ichat-composing.py | 88 +++++++++++++++++++++++++++ - 2 files changed, 90 insertions(+), 1 deletions(-) - -commit 2e9dd00050f622d9cac07adf914c986f47aae6ae -Author: Sjoerd Simons -Date: Thu Oct 30 19:16:20 2008 +0000 - - Fix checking of message type - - Actually assert when checks fail and set the message type - attribute to chat - - tests/twisted/avahi/test-text-channel.py | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit b89528c711196179f6a335f44864d5418b49afc5 -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 - - lib/gibber/gibber-xmpp-reader.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 49229aaecbb97d2380dc5cbde9da1e886c945349 -Author: Sjoerd Simons -Date: Thu Oct 30 19:05:54 2008 +0000 - - Check that the stanzas are read in the right order - - tests/check-gibber-xmpp-reader.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit b485f3768bc37c5d48932b013e5958c073d4ea47 -Author: Sjoerd Simons -Date: Wed Oct 8 16:01:54 2008 +0100 - - Use SSLv23_client_method instead of TLSv1_client_method to be compatible with gtalk - - lib/gibber/gibber-ssl-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit fc40669b80ead3f469235afb6713871c095f02a8 -Author: Alban Crequy -Date: Thu Oct 30 19:24:56 2008 +0000 - - GibberBytestreams: implement block_read as a virtual function on the bytestream iface. - - lib/gibber/gibber-bytestream-direct.c | 6 ++++-- - lib/gibber/gibber-bytestream-direct.h | 3 --- - lib/gibber/gibber-bytestream-iface.c | 11 +++++++++++ - lib/gibber/gibber-bytestream-iface.h | 4 ++++ - lib/gibber/gibber-bytestream-oob.c | 6 ++++-- - lib/gibber/gibber-bytestream-oob.h | 3 --- - src/tube-stream.c | 30 ++++-------------------------- - 7 files changed, 27 insertions(+), 36 deletions(-) - -commit e733dfde3bbb42c7fd7b80c123eebc8db97b43be -Author: Alban Crequy -Date: Thu Oct 30 19:23:34 2008 +0000 - - src/tube-iface.h: Coding style: return type on the same line as function definition - - src/tube-iface.h | 12 ++++-------- - 1 files changed, 4 insertions(+), 8 deletions(-) - -commit 5419a61c2a19cbd4a9635b59cc3b306145a5999a -Author: Alban Crequy -Date: Thu Oct 30 18:28:20 2008 +0000 - - src/salut-tubes-manager.c: coding style: alignment - - src/salut-tubes-manager.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit b29818b8c90136855a8940972d0bfe5d1fd63062 -Author: Alban Crequy -Date: Thu Oct 30 18:21:15 2008 +0000 - - src/salut-direct-bytestream-manager.c: Move initialisation from _constructor to _init - - src/salut-direct-bytestream-manager.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 2678b288366cc971465a35cf4652aca1b1399d18 -Author: Alban Crequy -Date: Thu Oct 30 17:59:56 2008 +0000 - - src/salut-direct-bytestream-manager.c: Better wording on GHashTable *listeners; - - src/salut-direct-bytestream-manager.c | 24 +++++++++++++----------- - src/salut-direct-bytestream-manager.h | 4 ++-- - 2 files changed, 15 insertions(+), 13 deletions(-) - -commit c9778bfe835ff594027fb848374280c7b374ca38 -Author: Alban Crequy -Date: Thu Oct 30 17:30:00 2008 +0000 - - Fix copyright date: only 2008 because this file is new - - src/salut-direct-bytestream-manager.c | 2 +- - src/salut-direct-bytestream-manager.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 2c1939fee2feefed0ff816084354a4d2c8300d55 -Author: Alban Crequy -Date: Thu Oct 30 17:27:27 2008 +0000 - - lib/gibber/gibber-bytestream-direct.c: Add a FIXME to try every address to connect - - lib/gibber/gibber-bytestream-direct.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 03afe9d1e164a05f3219ddc041987eeab5e11ae4 -Author: Alban Crequy -Date: Thu Oct 30 17:25:23 2008 +0000 - - lib/gibber/gibber-bytestream-direct.c: Coding style: fix alignment - - lib/gibber/gibber-bytestream-direct.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit dba1cbbfb8bef9eb2bee5162339751e35142ff12 -Author: Alban Crequy -Date: Thu Oct 30 17:24:02 2008 +0000 - - lib/gibber/gibber-bytestream-direct.c: add comment on gibber_bytestream_direct_accept - - lib/gibber/gibber-bytestream-direct.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 328394250756ff1321d53fa14b24b2377f158a93 -Author: Alban Crequy -Date: Thu Oct 30 17:20:44 2008 +0000 - - lib/gibber/gibber-bytestream-direct.c: Coding style: alignment - - lib/gibber/gibber-bytestream-direct.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 543064ea8a24a5439c99afba8891f16b534ca905 -Author: Alban Crequy -Date: Thu Oct 30 17:20:15 2008 +0000 - - lib/gibber/gibber-bytestream-direct.c: Add comment on PROP_PROTOCOL property - - lib/gibber/gibber-bytestream-direct.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2c56a6e4061bb43f953977d395fd08fbd36e0427 -Author: Alban Crequy -Date: Thu Oct 30 17:18:56 2008 +0000 - - lib/gibber/gibber-bytestream-direct.c: add comment on GibberBytestreamDirectPrivate->addresses - - lib/gibber/gibber-bytestream-direct.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 5d641613443fff62014c118063bd34ef067df11e -Author: Guillaume Desmottes -Date: Thu Oct 30 16:25:44 2008 +0000 - - fix value of FT_STATE_NONE in tests - - tests/twisted/avahi/test-receive-file.py | 3 +-- - tests/twisted/avahi/test-send-file.py | 2 +- - 2 files changed, 2 insertions(+), 3 deletions(-) - -commit c1193192816db45e343cab01ce63712e2a9ee4df -Author: Alban Crequy -Date: Thu Oct 30 15:01:21 2008 +0000 - - src/tube-stream.c: Do not use xmpp_connection_manager in MUC tubes. - - src/tube-stream.c | 38 +++++++++++++++++++++++++++----------- - 1 files changed, 27 insertions(+), 11 deletions(-) - -commit 019d38794d35a45ddef1b287d5d574334755811e -Author: Alban Crequy -Date: Thu Oct 30 15:00:41 2008 +0000 - - src/salut-tubes-channel.c: Fix previous "if" in previous commit - - src/salut-tubes-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6729329a06ab82bdf04f14f9effc5531f23b2e98 -Author: Guillaume Desmottes -Date: Thu Oct 30 14:21:21 2008 +0000 - - add test-receive-file.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 1de6f284aa8945d946d39c65392de5dce52efef1 -Author: Guillaume Desmottes -Date: Thu Oct 30 14:21:08 2008 +0000 - - add test-receive-file.py - - tests/twisted/avahi/test-receive-file.py | 210 ++++++++++++++++++++++++++++++ - 1 files changed, 210 insertions(+), 0 deletions(-) - -commit 53b639b01786d49b47be701773c2972fefa168ac -Author: Guillaume Desmottes -Date: Thu Oct 30 14:17:17 2008 +0000 - - set application/octet-stream as default content-type - - src/salut-file-transfer-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 5dec1a4721129e9a1df7f8c06dcf7337c3595289 -Author: Guillaume Desmottes -Date: Thu Oct 30 14:16:58 2008 +0000 - - set content-type to text/plain - - tests/twisted/avahi/test-send-file.py | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit dd06ac1181fffa92242c4d6a0d334d759ded4b80 -Author: Alban Crequy -Date: Thu Oct 30 14:09:49 2008 +0000 - - src/salut-tubes-channel.c: do not reference SalutContact or XmppConnectionManager in MUC tubes channel because theses objects are not used and they are NULL - - src/salut-tubes-channel.c | 15 ++++++++++----- - 1 files changed, 10 insertions(+), 5 deletions(-) - -commit 49aac6fd1a807d437deccb80e72a5c997866a61a -Author: Alban Crequy -Date: Thu Oct 30 14:09:11 2008 +0000 - - src/salut-tubes-channel.c: Remove double G_IMPLEMENT_INTERFACE TP_TYPE_EXPORTABLE_CHANNEL - - src/salut-tubes-channel.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit aa70d7a99170a7c874e2451930e88cbb31ffaf1e -Author: Guillaume Desmottes -Date: Thu Oct 30 14:02:40 2008 +0000 - - gibber-oob-file-transfer: add a FIXME about - - lib/gibber/gibber-oob-file-transfer.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 477afac688cf97b7d929a45ed585d73ded40a512 -Author: Guillaume Desmottes -Date: Thu Oct 30 13:59:24 2008 +0000 - - test-send-file.py: factor out FILE_DESCRIPTION and use xpath to find the url node - - tests/twisted/avahi/test-send-file.py | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -commit b31fcf1696fb5760a04e8b700a0a8de4ff350e49 -Author: Guillaume Desmottes -Date: Thu Oct 30 13:40:10 2008 +0000 - - file-transfer-channel: add comment listing properties not used - - src/salut-file-transfer-channel.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 0029c4e49616898222a3f4aa5f71e81119d68844 -Author: Alban Crequy -Date: Thu Oct 30 13:38:36 2008 +0000 - - test-tube-close.py: explain why this test is disabled - - tests/twisted/avahi/test-tube-close.py | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit d246efdf81cd329a84fc6df005064bca6dfaa0c2 -Author: Alban Crequy -Date: Thu Oct 30 12:27:44 2008 +0000 - - src/salut-tubes-manager.c: remove useless return - - src/salut-tubes-manager.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit e72bb5fed8e5822018f8c92fddafd1419b8ba9d1 -Author: Alban Crequy -Date: Thu Oct 30 12:26:12 2008 +0000 - - salut-direct-bytestream-manager.h: Coding style: the return type of the functions doesn't have to be on his own line - - src/salut-direct-bytestream-manager.h | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit a84f9557c6601e78817893b2211968385270708d -Author: Alban Crequy -Date: Thu Oct 30 12:20:06 2008 +0000 - - salut-direct-bytestream-manager.c: Coding style: alignement and remove trailing \n - - src/salut-direct-bytestream-manager.c | 17 ++++++++--------- - 1 files changed, 8 insertions(+), 9 deletions(-) - -commit a1bc2756d6c5a3812cf695110ddcedf39469f86a -Author: Alban Crequy -Date: Thu Oct 30 12:14:27 2008 +0000 - - GibberIqHelperRequestStanza: use g_slice instead of g_new - - lib/gibber/gibber-iq-helper.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit b8df101f79e4cd36329230cf5768a94c01f285a7 -Author: Alban Crequy -Date: Thu Oct 30 11:51:53 2008 +0000 - - gibber-bytestream-direct.h: Coding style: the return type of the functions doesn't have to be on his own line - - lib/gibber/gibber-bytestream-direct.h | 8 +++----- - 1 files changed, 3 insertions(+), 5 deletions(-) - -commit 8392c5c347016408cd53dedd22712ffd7eeaa282 -Author: Guillaume Desmottes -Date: Thu Oct 30 11:47:14 2008 +0000 - - file-transfer-channel: don't pass all the ft channle properties to salut_ft_manager_new_channel and don't fire the new-channel signal in it so the caller can set the extra properties before firing the signal - - src/salut-ft-manager.c | 72 ++++++++++++++++++++--------------------------- - 1 files changed, 31 insertions(+), 41 deletions(-) - -commit 6427f2825d4eb5c69a11ece8d9ae657377e958f3 -Author: Guillaume Desmottes -Date: Wed Oct 29 17:22:41 2008 +0000 - - test-send-file.py: catch the FileTransferStateChanged and TransferredBytesChanged signal together - - tests/twisted/avahi/test-send-file.py | 21 +++++++++++---------- - 1 files changed, 11 insertions(+), 10 deletions(-) - -commit fc87ab5ee02e22dbc708f707477d2e9dcf35dc97 -Author: Alban Crequy -Date: Wed Oct 29 17:13:55 2008 +0000 - - SalutDirectBytestreamManager: free listeners automatically by registering a function in g_hash_table_new_full and using g_hash_table_remove - - src/salut-direct-bytestream-manager.c | 38 +++++++++++++++++++------------- - 1 files changed, 22 insertions(+), 16 deletions(-) - -commit a3793f7a2df1ae06f3826047ee2db4559223718b -Author: Alban Crequy -Date: Wed Oct 29 17:02:43 2008 +0000 - - Coding style: do not prefix static function with "_". - - src/salut-tubes-channel.c | 38 +++++++++++++++++++------------------- - 1 files changed, 19 insertions(+), 19 deletions(-) - -commit f5df5b7c95c608b0159abef55ff34c92e2510b6f -Author: Alban Crequy -Date: Mon Oct 27 20:30:17 2008 +0000 - - Fix printf format for 64bits. - - lib/gibber/gibber-oob-file-transfer.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit a8f12042684d334a2ca019f8661042f7f6599966 -Author: Alban Crequy -Date: Wed Oct 29 16:59:54 2008 +0000 - - Coding style: tubes_muc_message_received, tubes_message_received and tubes_message_close_received prefixed with salut_tubes_channel - - src/salut-muc-channel.c | 2 +- - src/salut-tubes-channel.c | 28 ++++++++++++++-------------- - src/salut-tubes-channel.h | 6 +++--- - src/salut-tubes-manager.c | 7 ++++--- - 4 files changed, 22 insertions(+), 21 deletions(-) - -commit 46559cd8496866978944b5cf8312c2e86dddb154 -Author: Guillaume Desmottes -Date: Wed Oct 29 16:56:48 2008 +0000 - - ft-channel: remove the incoming property - - src/salut-file-transfer-channel.c | 20 -------------------- - 1 files changed, 0 insertions(+), 20 deletions(-) - -commit ce40f316f4d54a51d8db95b85313c36105788745 -Author: Alban Crequy -Date: Wed Oct 29 16:53:31 2008 +0000 - - docs/tubes.txt: Examples for tube closing - - docs/tubes.txt | 12 +++++++++++- - 1 files changed, 11 insertions(+), 1 deletions(-) - -commit 8e652260b0688340357b91bfc5e7738e3841aacc -Author: Guillaume Desmottes -Date: Wed Oct 29 16:51:57 2008 +0000 - - add test-send-file.py to tests suite - - tests/twisted/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit ccbd639e41f1d1beccb4c1001319a71b0b0e2885 -Author: Guillaume Desmottes -Date: Wed Oct 29 16:51:49 2008 +0000 - - add test-send-file.py - - tests/twisted/avahi/test-send-file.py | 211 +++++++++++++++++++++++++++++++++ - 1 files changed, 211 insertions(+), 0 deletions(-) - -commit 7dde074b7b8a90a4c7146c389665f3466f5590a1 -Author: Guillaume Desmottes -Date: Wed Oct 29 16:51:36 2008 +0000 - - file-transfer-channel: implement the exportable channel interface - - src/salut-file-transfer-channel.c | 159 ++++++++++++++++++++++++++++++++++--- - 1 files changed, 148 insertions(+), 11 deletions(-) - -commit 55e157af02ccd5f84180da100602232dd4250a02 -Author: Guillaume Desmottes -Date: Wed Oct 29 16:50:23 2008 +0000 - - connection: the ft manager is a channel manager now - - src/salut-connection.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 2702f94c64828145ee967a4d0eec01d9e5b82812 -Author: Alban Crequy -Date: Wed Oct 29 16:48:26 2008 +0000 - - docs/tubes.txt: IP policy when a new tube stream is established - - docs/tubes.txt | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit d66827952bc6d9683f42535da79e6c5d6b0aedbd -Author: Guillaume Desmottes -Date: Wed Oct 29 16:44:34 2008 +0000 - - Start the convert from a channel factory to a channel manager - - src/salut-ft-manager.c | 301 +++++++++++++++++++++++++++++++++++------------- - 1 files changed, 221 insertions(+), 80 deletions(-) - -commit 4550587a18f83a480e70793a930e66249b1daa4a -Author: Alban Crequy -Date: Wed Oct 29 16:36:08 2008 +0000 - - Reference count on XmppConnection: Revert last chunk of 1f0aca2d6a86a814230a9e6d8a9700d85956ac13 - - src/salut-xmpp-connection-manager.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit fe7fc3ff8fff957ad32a4de8661d7f18b4c5ef7d -Merge: cd00b40 57edd8e -Author: Alban Crequy -Date: Wed Oct 29 14:24:09 2008 +0000 - - Merge branch 'master' into tubes-requestotron-without-new-specs - -commit 57edd8ed94aa206b9903695f5a92c22e4599bb35 -Author: Alban Crequy -Date: Wed Oct 29 12:33:38 2008 +0000 - - Tests: refdbg: fix README and let the user use a different refdbg - - tests/README | 9 ++++++--- - tests/twisted/tools/exec-with-log.sh.in | 7 +++++++ - 2 files changed, 13 insertions(+), 3 deletions(-) - -commit c031c4de77c4f1bf77f4d6558becbc0804f9e27e -Author: Alban Crequy -Date: Wed Oct 29 12:07:53 2008 +0000 - - tests/README: add an example how to use refdbg - - tests/README | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit db6afd9955fcc219f5aeb81f390936be96c138bf -Author: Alban Crequy -Date: Wed Oct 29 11:55:46 2008 +0000 - - tests/README: explain how to use the different debugging tools with twisted tests - - tests/README | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) - -commit 2c50e1f904d50a5395e1f2fb2a359c6be60ffab5 -Author: Alban Crequy -Date: Wed Oct 29 11:48:33 2008 +0000 - - saluttest.py: wait before killing the bus if SALUT_TEST_REFDBG set as refdbg needs the process to be clearly exited - - tests/twisted/saluttest.py | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 8c00751d922b37a2a5afcd4da610b93c79285b11 -Author: Alban Crequy -Date: Wed Oct 29 11:47:05 2008 +0000 - - add refdbg.log to gitignore - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit cd00b40ce8bf3d863de110bb46276cb3444c9e26 -Author: Alban Crequy -Date: Tue Oct 28 19:41:05 2008 +0000 - - Revert a change on counting reference: SalutContact does not ref SalutConnection anymore - - src/salut-contact.c | 8 +------- - 1 files changed, 1 insertions(+), 7 deletions(-) - -commit 0135cfdc2176238e32def30e3badfed73fd0bd90 -Author: Alban Crequy -Date: Tue Oct 28 19:40:05 2008 +0000 - - src/salut-tubes-manager.c: Fix a reference count on SalutContact - - src/salut-tubes-manager.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit ac91f66205246148a64f6b4cbac6505b624a449c -Merge: 6167176 1bddf17 -Author: Alban Crequy -Date: Tue Oct 28 16:34:05 2008 +0000 - - Merge branch 'master' into tubes-requestotron-without-new-specs - -commit 7389661e35182dc2be84a6a2b80542c0fe7f0601 -Author: Guillaume Desmottes -Date: Tue Oct 28 15:40:26 2008 +0000 - - rename SalutFileChannel to SalutFileTransferChannel - - src/salut-file-transfer-channel.c | 168 ++++++++++++++++++------------------ - src/salut-file-transfer-channel.h | 52 ++++++------ - src/salut-ft-manager.c | 18 ++-- - 3 files changed, 119 insertions(+), 119 deletions(-) - -commit 70bb1c0266b2d32eb30381d7b6ef772bff158793 -Author: Guillaume Desmottes -Date: Tue Oct 28 15:36:23 2008 +0000 - - move salut-file-channel.[ch] to salut-file-transfer-channel.[ch] - - src/Makefile.am | 4 +- - src/salut-file-channel.c | 1225 ------------------------------------- - src/salut-file-channel.h | 74 --- - src/salut-file-transfer-channel.c | 1225 +++++++++++++++++++++++++++++++++++++ - src/salut-file-transfer-channel.h | 74 +++ - src/salut-ft-manager.c | 2 +- - 6 files changed, 1302 insertions(+), 1302 deletions(-) - -commit 862ff578a94208694455d5c202fa9155cd8b25c3 -Author: Guillaume Desmottes -Date: Tue Oct 28 15:32:38 2008 +0000 - - fix build with new spec - - src/salut-file-channel.c | 54 ++++++++++++++++++++++++--------------------- - src/salut-ft-manager.c | 2 +- - 2 files changed, 30 insertions(+), 26 deletions(-) - -commit fca108888c8c7f3d004090f7208dc99483ecda2c -Author: Guillaume Desmottes -Date: Tue Oct 28 15:30:02 2008 +0000 - - add Unix_Timestamp64 type to all.xml - - extensions/all.xml | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 5ee3d011eb4fe32dd7929f0b91faacfa60ea67a5 -Author: Guillaume Desmottes -Date: Tue Oct 28 15:29:30 2008 +0000 - - sync with latest FT spec draft - - extensions/Channel_Type_File.xml | 416 ------------------------- - extensions/Channel_Type_File_Transfer.xml | 480 +++++++++++++++++++++++++++++ - 2 files changed, 480 insertions(+), 416 deletions(-) - -commit 7acc3d9ebefacea15b0c3891ccbc6f303deefe60 -Author: Jonny Lamb -Date: Mon Sep 22 13:21:15 2008 +0100 - - Added my name as author in some headers. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 1 + - src/salut-file-channel.h | 2 ++ - src/salut-ft-manager.c | 1 + - src/salut-ft-manager.h | 1 + - 4 files changed, 5 insertions(+), 0 deletions(-) - -commit 48b261f13d1cc83d4f1b35235aab05f802b2b2a7 -Author: Jonny Lamb -Date: Mon Sep 22 13:05:07 2008 +0100 - - Handle error messages with printf format strings in. - - Signed-off-by: Jonny Lamb - - lib/gibber/gibber-oob-file-transfer.c | 4 ++-- - lib/gibber/gibber-resolver.c | 5 +++-- - lib/gibber/gibber-xmpp-error.c | 5 ++--- - src/salut-connection.c | 3 ++- - src/salut-muc-manager.c | 4 ++-- - src/salut-self.c | 6 ++++-- - src/write-mgr-file.c | 2 +- - 7 files changed, 16 insertions(+), 13 deletions(-) - -commit fd91bc41150a0a4892b2d0029a782184875eae2a -Author: Jonny Lamb -Date: Mon Sep 22 12:48:04 2008 +0100 - - escape_filename: if the number of unacceptable characters is zero then simply duplicate the filename. - - Signed-off-by: Jonny Lamb - - lib/gibber/gibber-oob-file-transfer.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit e08939d2509d65c6011f2b250eb552b7e4af1925 -Author: Jonny Lamb -Date: Fri Sep 19 18:31:29 2008 +0100 - - Moved size property from GibberFileTransfer public struct to private struct and added accessors. - - Signed-off-by: Jonny Lamb - - lib/gibber/gibber-file-transfer.c | 15 +++++++++++++++ - lib/gibber/gibber-file-transfer.h | 5 ++--- - lib/gibber/gibber-oob-file-transfer.c | 19 ++++++++++++++----- - src/salut-file-channel.c | 4 ++-- - 4 files changed, 33 insertions(+), 10 deletions(-) - -commit 1618936fac876aea38627b0dc0f527de5b4ca0da -Author: Jonny Lamb -Date: Fri Sep 19 17:42:24 2008 +0100 - - Fixed get_local_unix_socket_path function to create the random file name itself. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 31 ++++++++++++++++--------------- - 1 files changed, 16 insertions(+), 15 deletions(-) - -commit 2144d88f1fd660d8652f84c232351544e7359ff2 -Author: Jonny Lamb -Date: Fri Sep 19 12:23:37 2008 +0100 - - Use an error enum instead of hardcoding error values. - - Signed-off-by: Jonny Lamb - - lib/gibber/gibber-oob-file-transfer.c | 17 +++++++++++++---- - 1 files changed, 13 insertions(+), 4 deletions(-) - -commit 06a7d82024d9e42ea7c4bb47407eb222eda9f928 -Author: Jonny Lamb -Date: Fri Sep 19 12:14:49 2008 +0100 - - Fixed typo in dbus_g_method_return_error arguments. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 6e2985063c86fa73d2e26393914307b07d581dcf -Author: Jonny Lamb -Date: Thu Sep 18 19:00:46 2008 +0100 - - Added a comment explaining why wrote_chunk_cb is called in in _send. - - Signed-off-by: Jonny Lamb - - lib/gibber/gibber-oob-file-transfer.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 758cda5ce556f1271618ced1520fd32c589f4bd5 -Author: Jonny Lamb -Date: Thu Sep 18 18:58:33 2008 +0100 - - Use "& 0xff" instead of "& 15" for better readability. - - Signed-off-by: Jonny Lamb - - lib/gibber/gibber-oob-file-transfer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1f5c93f62e716f762e3d88fe0e735175fa8bac77 -Author: Jonny Lamb -Date: Thu Sep 18 18:51:44 2008 +0100 - - Wrap more lines at 80 characters. - - Signed-off-by: Jonny Lamb - - lib/gibber/gibber-oob-file-transfer.c | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 6e5afd98a0980f79ad320deb72620e83e75ad887 -Author: Jonny Lamb -Date: Thu Sep 18 18:34:08 2008 +0100 - - Removed irrelevant FIXME. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit ce03a47b3216bad1f1f40d6ce9b2fd5bf16f519d -Author: Jonny Lamb -Date: Thu Sep 18 18:18:29 2008 +0100 - - Cast and assign the file channel user_data in the same block. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 5d8e6b8ca5084f7e6863fe7335058f108362a45b -Author: Jonny Lamb -Date: Thu Sep 18 18:14:23 2008 +0100 - - Changed listen call to have a sensible backlog. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 946e202794796a5c477b15631753897d24fd7659 -Author: Jonny Lamb -Date: Thu Sep 18 18:01:08 2008 +0100 - - Cope with setting up local socket failing in {Accept,Offer}File methods. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 16 ++++++++++++++-- - 1 files changed, 14 insertions(+), 2 deletions(-) - -commit 7dc21d5d479c08e73e3294a14ca203fb83106e8e -Author: Jonny Lamb -Date: Thu Sep 18 16:04:45 2008 +0100 - - Duplicate the filename from the stanza and free it on finalize. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 0458ad2a358f20a6a8854e015772829e95557fe2 -Author: Jonny Lamb -Date: Thu Sep 18 16:02:58 2008 +0100 - - Cope with gibber_file_transfer_new_from_stanza failing. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 4fdbac34a3827660ef2dad6b615c621815d65d6d -Author: Jonny Lamb -Date: Thu Sep 18 16:01:10 2008 +0100 - - Wrapped lines to 80 characters maximum. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 56 +++++++++++++++++++++++++++++---------------- - 1 files changed, 36 insertions(+), 20 deletions(-) - -commit 57acdaab94f65c3b42ab476cd4dd2a6ae328df40 -Author: Jonny Lamb -Date: Thu Sep 18 15:52:31 2008 +0100 - - Fixed transferred-bytes write access. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b68faa9564e4d9453723f171f7e9c3720e94fc6c -Author: Jonny Lamb -Date: Thu Sep 18 15:51:40 2008 +0100 - - Fixed available-socket-type's writable access. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 6 +----- - 1 files changed, 1 insertions(+), 5 deletions(-) - -commit 1575f4fccfbd35270d02bbfaac396aa427548e7e -Author: Jonny Lamb -Date: Thu Sep 18 15:50:25 2008 +0100 - - Fixed state property's write-access. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 7bef36113c573dacaccd052b47533d47c909f96a -Author: Jonny Lamb -Date: Thu Sep 18 15:26:24 2008 +0100 - - Use g_value_dup_object instead of get_object and then refing. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit d2c6d8a2d1a8c47e7309c26b725e326ca172149e -Author: Jonny Lamb -Date: Thu Sep 18 15:25:27 2008 +0100 - - Removed unused commented-out code. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 11 ----------- - 1 files changed, 0 insertions(+), 11 deletions(-) - -commit d8ca5bb205369a3ea6cd36c6eb7ce67cc27a0f31 -Author: Jonny Lamb -Date: Thu Sep 18 15:24:35 2008 +0100 - - Renamed G_STR_EMPTY to CHECK_STR_EMPTY. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 2205704ee2e4ebb1573df81db636ca394a466b22 -Author: Jonny Lamb -Date: Thu Sep 18 15:22:04 2008 +0100 - - Removed useless include of text mixin. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.h | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 229626bddf1270f237ffc3610b61b2593042054f -Author: Jonny Lamb -Date: Thu Sep 18 15:21:50 2008 +0100 - - Updated .gitignore. - - Signed-off-by: Jonny Lamb - - .gitignore | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 58 insertions(+), 0 deletions(-) - -commit f205c020a70f3664ce33ba3847fadca7abc92181 -Author: Jonny Lamb -Date: Thu Sep 18 15:13:45 2008 +0100 - - Use NI_MAXHOST instead of 50 for the max hostname length. - - Signed-off-by: Jonny Lamb - - lib/gibber/gibber-oob-file-transfer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8a0c187a2243abfcf0aa85e369f518aab34d80ee -Author: Jonny Lamb -Date: Tue Aug 26 14:43:52 2008 +0100 - - Misc. style and comment fixes. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 36 +++++++++++++++++------------------- - src/salut-ft-manager.c | 4 +--- - 2 files changed, 18 insertions(+), 22 deletions(-) - -commit 6133111e4076c8c3b35001cb6750fbeb1459fa63 -Author: Jonny Lamb -Date: Tue Aug 26 14:41:51 2008 +0100 - - Use the Socket_Address_Type enum from the already-merged spec. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 19b94881cf9d642a1e7e7e6c177c71594268a173 -Author: Jonny Lamb -Date: Tue Aug 26 14:33:11 2008 +0100 - - Pass the channel instance into accept_local_socket_connection in case the GibberFileTransfer object hasn't been made yet. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit c9dbe56d636d6f69e711955a6a27425bcf33cd0d -Author: Jonny Lamb -Date: Tue Aug 26 14:32:21 2008 +0100 - - Removed salut_file_channel_check_and_send and implemented OfferFile. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 175 ++++++++++++++++++++++++++++++---------------- - 1 files changed, 114 insertions(+), 61 deletions(-) - -commit cf5ade9a0de8a049af082c60b20afb0e6abf2b2d -Author: Jonny Lamb -Date: Tue Aug 26 14:30:38 2008 +0100 - - Removed SocketPath property and added InitialOffset property. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 32 +++++++++++++++----------------- - 1 files changed, 15 insertions(+), 17 deletions(-) - -commit 3c235d3fd703c2f9114988a4d0e8ebdb2dc0acd0 -Author: Jonny Lamb -Date: Tue Aug 26 14:23:39 2008 +0100 - - Removed ContentMD5 property and replaced with ContentHashType and ContentHash. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 48 +++++++++++++++++++++++++++++++++++---------- - 1 files changed, 37 insertions(+), 11 deletions(-) - -commit 8ec7054264a4a6113df59e2372675f932d52efb4 -Author: Jonny Lamb -Date: Tue Aug 26 14:15:16 2008 +0100 - - Replaced Direction channel property with a incoming GObject property. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 31 ++++++++++++------------------- - src/salut-ft-manager.c | 11 +++++++---- - 2 files changed, 19 insertions(+), 23 deletions(-) - -commit e31c2cf7eff7a693b68e8a41eb62f3f17b467184 -Author: Jonny Lamb -Date: Wed Aug 20 17:45:48 2008 +0100 - - Updated Channel.Type.File spec. - - Signed-off-by: Jonny Lamb - - extensions/Channel_Type_File.xml | 218 +++++++++++++++++++++++++++++--------- - 1 files changed, 166 insertions(+), 52 deletions(-) - -commit aa51099d85773e1ecf200b41ca4ab6dc8983d51c -Author: Jonny Lamb -Date: Tue Aug 19 16:54:41 2008 +0100 - - Removed EstimatedFilesize property from the file channel. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 33 ++------------------------------- - 1 files changed, 2 insertions(+), 31 deletions(-) - -commit 7c0b9f650e5d43de11d4b5875092895e88f27448 -Author: Jonny Lamb -Date: Tue Aug 19 16:30:47 2008 +0100 - - Changed state GObject property to default to 0, which is the new "undefined" state. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0eb238e0b52d879a12e575bd35450f729479e4a9 -Author: Jonny Lamb -Date: Tue Aug 19 16:26:04 2008 +0100 - - Coding style changes to SalutFileChannel to make it conform with Collabora coding style. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 44 ++++++++++++++++++++++---------------------- - 1 files changed, 22 insertions(+), 22 deletions(-) - -commit f5782ddf4832a79105cf1343a923a41bca5d015c -Author: Jonny Lamb -Date: Tue Aug 19 16:25:34 2008 +0100 - - Make sure salut_file_channel_interfaces is static. - - Signed-off-by: Jonny Lamb - - src/salut-file-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 191acbe5c5fb2aa03299911b6fb977557aa71f70 -Author: Jonny Lamb -Date: Wed Aug 13 12:53:16 2008 +0100 - - Removed duplicate types from Channel.Type.File spec and used tp:external-type instead. - - Signed-off-by: Jonny Lamb - - extensions/Channel_Type_File.xml | 96 -------------------------------------- - extensions/all.xml | 6 ++ - 2 files changed, 6 insertions(+), 96 deletions(-) - -commit 1f6a8c39a6eb68f88305367f52c92d05538eeea1 -Author: Jonny Lamb -Date: Tue Aug 5 17:26:35 2008 +0000 - - Handle the canceled signal in both incoming and outgoing transfers. - - 20080805172635-8ed0e-8fd404bbb76af1e9dd2edf68e5c474e169a63ec3.gz - - src/salut-file-channel.c | 26 ++++++++++++++------------ - 1 files changed, 14 insertions(+), 12 deletions(-) - -commit 5c939c04488fced2d1455560cb3856536a617da8 -Author: Jonny Lamb -Date: Tue Aug 5 17:25:34 2008 +0000 - - Cancel the gibber file transfer when the recipient cancels the transfer, so that the sender receives a "canceled" signal. - - 20080805172534-8ed0e-b1f499d0b786bafc0f528ecbd6839d727eecb286.gz - - src/salut-file-channel.c | 10 +++++++--- - 1 files changed, 7 insertions(+), 3 deletions(-) - -commit 0d67ad9cf3edf184e9b56fefbe8c24d339d4edc7 -Author: Jonny Lamb -Date: Tue Aug 5 17:17:56 2008 +0000 - - Emit "canceled" on the GibberOobFileTransfer object if cancelled. - - 20080805171756-8ed0e-a7aa2731ebe1db77744ee37982df303add28c003.gz - - lib/gibber/gibber-oob-file-transfer.c | 16 +++++----------- - 1 files changed, 5 insertions(+), 11 deletions(-) - -commit bd449d5274ea17fccc38624694cffeef48306d41 -Author: Jonny Lamb -Date: Tue Aug 5 17:03:23 2008 +0000 - - Added a "cancelled" boolean to the GibberOobFileTransfer object to keep track of whether the transfer has been cancelled. - - 20080805170323-8ed0e-3452caec9c48299f64fda05a10f4ec7d27c661ac.gz - - lib/gibber/gibber-oob-file-transfer.c | 16 ++++++++++++++-- - 1 files changed, 14 insertions(+), 2 deletions(-) - -commit a99bb71e60479a78bf1afa77711e10ce8968fa8e -Author: Jonny Lamb -Date: Tue Aug 5 16:59:36 2008 +0000 - - Added more verbose debug message when an incomplete transfer occurs. - - 20080805165936-8ed0e-900709f518c8027a3a5815b7b0519ae6a62a593f.gz - - lib/gibber/gibber-oob-file-transfer.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 1a8c05b72c964c230372fc55b5c9b59ed1585068 -Author: Jonny Lamb -Date: Tue Aug 5 11:11:38 2008 +0000 - - Connect to the canceled signal in the file channel and change the transfer state appropriately. - - 20080805111138-8ed0e-54a4c870b5666c65c00f40902484380bc06ace61.gz - - src/salut-file-channel.c | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) - -commit d412383b99018cb2549d459866850183462e55d0 -Author: Jonny Lamb -Date: Tue Aug 5 11:10:35 2008 +0000 - - Emit the canceled signal in the GibberOobFileTransfer when appropriate. - - 20080805111035-8ed0e-f91960cb96d9d029aa4e1aafcd61696896dd1db7.gz - - lib/gibber/gibber-oob-file-transfer.c | 16 +++++++++++++++- - 1 files changed, 15 insertions(+), 1 deletions(-) - -commit 8c1f1dfd8892021daa214dcbc3e324d053d88997 -Author: Jonny Lamb -Date: Tue Aug 5 11:09:52 2008 +0000 - - Added canceled signal to GibberFileTransfer. - - 20080805110952-8ed0e-bd0b537a6f81b3bef8a7515396b41cdb6739608d.gz - - lib/gibber/gibber-file-transfer.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit d3efa93221ed4ded06d07f7de381421d5a0b362c -Author: Jonny Lamb -Date: Tue Aug 5 11:07:22 2008 +0000 - - Added a proper state change reason to a remote cancellation. - - 20080805110722-8ed0e-1f7f605bfaca0259a06284e6c4743aa2fc09157a.gz - - src/salut-file-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3842c8d684c30de8b62b09d9b210584db7a73770 -Author: Jonny Lamb -Date: Mon Aug 4 18:54:18 2008 +0000 - - Emit the canceled state on the file channel before closing it. - - 20080804185418-8ed0e-cbf1a34ae62b9f2b12a6b5151668fe351d9e2363.gz - - src/salut-file-channel.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit f6f6346d38397ba19d7dfd8a56be5397ec00025f -Author: Jonny Lamb -Date: Mon Aug 4 17:22:53 2008 +0000 - - Enabled sending one last TransferredBytes signal when the transfer finishes. - - 20080804172253-8ed0e-94862977e2c8af6a22d91fd86e4c83fa8d2b8f6d.gz - - lib/gibber/gibber-oob-file-transfer.c | 5 +++++ - src/salut-file-channel.c | 6 +++++- - 2 files changed, 10 insertions(+), 1 deletions(-) - -commit 7f58ccd66107b3e0182ad50bbc81a59b9347d256 -Author: Jonny Lamb -Date: Mon Aug 4 17:11:42 2008 +0000 - - Made sure TransferredBytes is only emitted once every second. - - 20080804171142-8ed0e-c7d3161ed7624ebc9bc613c6a783edf9e0e25fc9.gz - - src/salut-file-channel.c | 14 ++++++++++++-- - 1 files changed, 12 insertions(+), 2 deletions(-) - -commit 1cf782a29dca4c99b54260d50cbee46428add125 -Author: Jonny Lamb -Date: Mon Aug 4 16:04:58 2008 +0000 - - Added transferred-chunk signal to enable TransferredBytes to work. - - 20080804160458-8ed0e-ace6aeefc687528a03cecc1bbdae4dc1254209d3.gz - - lib/gibber/gibber-file-transfer.c | 8 ++++++++ - lib/gibber/gibber-oob-file-transfer.c | 9 +++++++++ - src/salut-file-channel.c | 18 ++++++++++++++++-- - 3 files changed, 33 insertions(+), 2 deletions(-) - -commit 06b4d917d1ce8d368aabb32f2182eea6e65f3bea -Author: Jonny Lamb -Date: Wed Jul 30 19:26:01 2008 +0000 - - Release the connection when the transfer is complete. - - 20080730192601-8ed0e-070f38ce9de748391d7fe1723d87f3572d5bfc72.gz - - src/salut-file-channel.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit b1424a02650814c320b8f8db5a207a2798d2c1cb -Author: Jonny Lamb -Date: Wed Jul 30 19:13:59 2008 +0000 - - Make sure the connection is taken by the connection manager when in use. - - 20080730191359-8ed0e-0ca82e9e3d95ffa8abfad14782da801e2a807324.gz - - src/salut-file-channel.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit e62d38ff6696fe5fcc11206fbf2e76ffcb127904 -Author: Jonny Lamb -Date: Wed Jul 30 14:25:30 2008 +0000 - - Made sure the object path of new file channels are unique. - - 20080730142530-8ed0e-d214e036fb5d5fbc54d6fd3998f6beaf02d5e2bd.gz - - src/salut-ft-manager.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit d8a4b78583e0276804850d267f251864bd72e203 -Author: Jonny Lamb -Date: Tue Jul 29 14:21:07 2008 +0000 - - Use a definition for an undefined file size instead of repeating G_MAXUINT64. - - 20080729142107-8ed0e-aa293bb8ae199ee4e5c1f478021c09064ff6ee4a.gz - - src/salut-file-channel.c | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit c1c02f08a2157b6fad848d5acde6647b4f54d42d -Author: Jonny Lamb -Date: Tue Jul 29 13:16:05 2008 +0000 - - Corrected unspecified file size from zero to G_MAXUINT64. - - 20080729131605-8ed0e-f517146225f0afb4f4c1050ada000a9021c982b6.gz - - src/salut-file-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 20404e475688744449f094661972ed533fdca7c0 -Author: Jonny Lamb -Date: Tue Jul 29 13:14:22 2008 +0000 - - Added more debugging output. - - 20080729131422-8ed0e-2742080b894c490b220c93b406e518d7a249ef0d.gz - - src/salut-file-channel.c | 20 ++++++++++++++++---- - src/salut-ft-manager.c | 2 ++ - 2 files changed, 18 insertions(+), 4 deletions(-) - -commit 2ee7942f6b5e17e42c5b025d43c7e275024a4478 -Author: Jonny Lamb -Date: Tue Jul 29 13:11:26 2008 +0000 - - Added TransferredBytes D-BUS properties to DBusPropertiesMixin config. - - 20080729131126-8ed0e-df691ff0b079c979316410c336c0b3e6cfafb848.gz - - src/salut-file-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 5304efbf4ad568d838816e2e6c6ba1acdf6ea811 -Author: Jonny Lamb -Date: Thu Jul 24 16:13:20 2008 +0000 - - Fixed salut_ft_manager_iface_foreach_one to work with a GList instead of a GHashTable. - - 20080724161320-8ed0e-58c22daf5464b1c3fcf644e25d391eee65d553bd.gz - - src/salut-ft-manager.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit 9f593a7ad733e571043f9bf7ab98e8ecfb96db7d -Author: Jonny Lamb -Date: Wed Jul 23 11:10:38 2008 +0000 - - Changed direction and state default values to values not actually in use. - - 20080723111038-8ed0e-e62de42176e20a9747191274f75518e74d5be627.gz - - src/salut-file-channel.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit dc355e89c22f7f708ecd6da51e111f578abbac81 -Author: Jonny Lamb -Date: Tue Jul 22 15:14:06 2008 +0000 - - Fixed libsoup's AC_SUBST in configure.ac. - - 20080722151406-8ed0e-aee3815a3c979716256bcef203924aa1568ebf24.gz - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 1f4c0c6b20ada75fcef65e16cb4b7f78ab83efda -Author: Jonny Lamb -Date: Tue Jul 22 14:58:19 2008 +0000 - - Added more error checks and calls to AcceptFile. - - 20080722145819-8ed0e-af2271f4af9426cba4d3203b16c812d047144bea.gz - - src/salut-file-channel.c | 13 +++++++++++-- - 1 files changed, 11 insertions(+), 2 deletions(-) - -commit 04799a468bb7ac47b30783e455b1785659ac5e5c -Author: Jonny Lamb -Date: Tue Jul 22 14:57:58 2008 +0000 - - Added NotAvailable error to AcceptFile. - - 20080722145758-8ed0e-3c84b9c13f7b485c98f62b09a7e6974364bc3304.gz - - extensions/Channel_Type_File.xml | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 619b0f547fbae886a47464e087db70a0bf4e6068 -Author: Jonny Lamb -Date: Tue Jul 22 14:57:45 2008 +0000 - - Fixed a rogue tab. - - 20080722145745-8ed0e-2545f073965212f90691d950d41670bfd6de3b71.gz - - extensions/Channel_Type_File.xml | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1cd521aa01f5511ee154607b650ddd48bbdf1575 -Author: Jonny Lamb -Date: Tue Jul 22 14:02:01 2008 +0000 - - Changed ft manager from using a hash table to a list, for managing channels. - - 20080722140201-8ed0e-62403ca3472bc08b53eddd30c36bf024786fe120.gz - - src/salut-ft-manager.c | 42 +++++++++--------------------------------- - 1 files changed, 9 insertions(+), 33 deletions(-) - -commit 921a8388a864a3b6d37dc8a328d19cdd03e7ff93 -Author: Jonny Lamb -Date: Tue Jul 22 13:42:55 2008 +0000 - - Added back code to execute when setting "direction" GObject property, which needs to be set by the constructor. - - 20080722134255-8ed0e-37f58dfad9943dfcc6bf614e0caa3ebab5dcf64c.gz - - src/salut-file-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit e742847c232c56dc26c8f02f2cd7fedcdaf552b5 -Author: Jonny Lamb -Date: Tue Jul 22 10:47:49 2008 +0000 - - Added TODO notes to AcceptFile implementation. - - 20080722104749-8ed0e-5efb0cd6357887c7a9aac8a4dec6c22529ab86a2.gz - - src/salut-file-channel.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit c0454011f65833942ffd013a295614b85d8646c7 -Author: Jonny Lamb -Date: Mon Jul 21 23:27:40 2008 +0000 - - Corrected output to AcceptFile. - - 20080721232740-8ed0e-59d43b7b3b3962ef27163d623d42fe5f31dee553.gz - - src/salut-file-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 354304cfc9e7b423116d8f3b30e449e0d9070784 -Author: Jonny Lamb -Date: Mon Jul 21 23:24:59 2008 +0000 - - Cleaned up socket path functions. - - 20080721232459-8ed0e-4f5b85d2c14ac91505505f25b05ea608f2a9974e.gz - - src/salut-file-channel.c | 29 +++++++++-------------------- - 1 files changed, 9 insertions(+), 20 deletions(-) - -commit d121860b556d8582574017e248b8591261056677 -Author: Jonny Lamb -Date: Mon Jul 21 23:13:29 2008 +0000 - - Removed unused hash table. - - 20080721231329-8ed0e-0cf986f070be768c3b72a0d47a4ac51915755316.gz - - src/salut-file-channel.c | 9 --------- - 1 files changed, 0 insertions(+), 9 deletions(-) - -commit db9237edcf8bf84d4168580eff43a7f5100ee0d7 -Author: Jonny Lamb -Date: Mon Jul 21 21:52:33 2008 +0000 - - Updated copyright dates. - - 20080721215233-8ed0e-6ff5ae3184206140e167cedd4049be7ade3bec73.gz - - src/salut-file-channel.c | 2 +- - src/salut-file-channel.h | 2 +- - src/salut-ft-manager.c | 2 +- - src/salut-ft-manager.h | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -commit 47f4b78c235a9422421cd0f8de87772f296cc239 -Author: Jonny Lamb -Date: Mon Jul 21 21:46:53 2008 +0000 - - Made direction property not writeable, and changed its default value to one without meaning in the code. - - 20080721214653-8ed0e-facbfb49285a2ed5e60cd0447058d7d65d677a8a.gz - - src/salut-file-channel.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit cf6333b6ac96cdd205ad76198bb364725195ad47 -Author: Jonny Lamb -Date: Mon Jul 21 20:13:08 2008 +0000 - - Added call to check_and_send method to property setter. - - 20080721201308-8ed0e-b52b6790ca7f24edec2c2b73868bd141698a5f63.gz - - src/salut-file-channel.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit a7f9481857f23927d8350f3e251983e2eb0b20a0 -Author: Jonny Lamb -Date: Mon Jul 21 20:12:16 2008 +0000 - - Added salut_file_channel_check_and_send function to initiate the file transfer if there are sufficient details. - - 20080721201216-8ed0e-b252308fb42dc646948b8c54ce949e5c8c599bbd.gz - - src/salut-file-channel.c | 41 +++++++++++++++++++++++++++++++++++++---- - 1 files changed, 37 insertions(+), 4 deletions(-) - -commit d343d643f8a042fe67a7e9be629bfe3363fde541 -Author: Jonny Lamb -Date: Mon Jul 21 20:11:43 2008 +0000 - - Recorded the socket path for SocketPath property to actually work. - - 20080721201143-8ed0e-587f59f039d4e45ee00d7d1c261e25c33418376c.gz - - src/salut-file-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 0e340fbe3d1859a8a16b965e54af6f810df31887 -Author: Jonny Lamb -Date: Mon Jul 21 20:10:27 2008 +0000 - - Simplified salut_file_channel_set_state to access the state variable directly. - - 20080721201027-8ed0e-1717b573965d81b6b19a2e16de155e9586b26ed7.gz - - src/salut-file-channel.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit b72754e98b0bdc02c79f0021d7756034538d419d -Author: Jonny Lamb -Date: Mon Jul 21 20:08:26 2008 +0000 - - Fixed pointer to GValue. - - 20080721200826-8ed0e-6cb9cffecf19a5eda4c48599caa7a02dae11e6d6.gz - - src/salut-file-channel.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 8ef1cc6eed6db87d4cd2eb4598def1ef921b00dd -Author: Jonny Lamb -Date: Mon Jul 21 20:07:20 2008 +0000 - - Replaced more of the old code with the new design. - - 20080721200720-8ed0e-fb711f91c0b7d92a1193ff9a7fcd06e9dc9b8359.gz - - src/salut-file-channel.c | 20 +++----------------- - 1 files changed, 3 insertions(+), 17 deletions(-) - -commit 56fdcb8af03d959261ab67006aeca9ca178e6efe -Author: Jonny Lamb -Date: Mon Jul 21 20:06:43 2008 +0000 - - Fixed typo in xmpp_connection_manager_new_connection_cb. - - 20080721200643-8ed0e-06a38e13b2708b3d52bcce61abbd88e077adf44e.gz - - src/salut-file-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e609c6711d511ac29b31f4a2bb931bebbf51425e -Author: Jonny Lamb -Date: Mon Jul 21 20:04:05 2008 +0000 - - Removed NewConnectionData struct and its references. - - 20080721200405-8ed0e-2b6aa74fa8111819f309dcaacc87a15924dcde89.gz - - src/salut-file-channel.c | 9 +-------- - 1 files changed, 1 insertions(+), 8 deletions(-) - -commit a494187268d7ecc561222501b6fe89283ca6e401 -Author: Jonny Lamb -Date: Mon Jul 21 20:01:13 2008 +0000 - - Cleaned up send_file_offer method. - - 20080721200113-8ed0e-de09992c4bf8990bdfd46d3226be9be6a2ae5cb3.gz - - src/salut-file-channel.c | 29 ++++++++--------------------- - 1 files changed, 8 insertions(+), 21 deletions(-) - -commit 62af24529fa3c6d2a263ffb6cb0564ad6ddecee4 -Author: Jonny Lamb -Date: Mon Jul 21 19:59:30 2008 +0000 - - Added salut_file_channel_set_state prototype. - - 20080721195930-8ed0e-a0214bec934650bb65d813033815c957492b7771.gz - - src/salut-file-channel.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit d63ce26077b53137820e3795909d5f7387a2565d -Author: Jonny Lamb -Date: Mon Jul 21 19:56:13 2008 +0000 - - Allow creating file channels with the correct direction. - - 20080721195613-8ed0e-a5fcd51e8d6706135565b6b6a42ec6c3c961519f.gz - - src/salut-ft-manager.c | 16 +++++++++++----- - 1 files changed, 11 insertions(+), 5 deletions(-) - -commit d3f5080c5a506f9a349be083f45230b5fc8027a2 -Author: Jonny Lamb -Date: Mon Jul 21 19:31:41 2008 +0000 - - Fixed typo in property setter. - - 20080721193141-8ed0e-910724afe396cb09945ec8c2278b69f30056f78b.gz - - src/salut-file-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 32c0d928d127ae128059b064ca92558a1044aaee -Author: Jonny Lamb -Date: Mon Jul 21 19:30:50 2008 +0000 - - Fixed GObject property setting in GibberOobFileTransfer creation. - - 20080721193050-8ed0e-fd0fd373bcd72b8d320112801423d2f9e451551e.gz - - src/salut-file-channel.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit ef32eca954cad41ac9f8f775d2e1e117706a9cc6 -Author: Jonny Lamb -Date: Mon Jul 21 19:29:23 2008 +0000 - - Use salut_file_channel_set_state where possible. - - 20080721192923-8ed0e-1c459c38302264367b6d1b7d3017a50b1c38b879.gz - - src/salut-file-channel.c | 15 +++++++++------ - 1 files changed, 9 insertions(+), 6 deletions(-) - -commit 3fdf8b0fbc862265684fea193159e85c83db051f -Author: Jonny Lamb -Date: Mon Jul 21 19:28:10 2008 +0000 - - More changes from uint to uint64. - - 20080721192810-8ed0e-f09a3630d725d44492cce0331c9178bef502a248.gz - - src/salut-file-channel.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit c85045a42f74ae8dc569a7daca3dd48fccbd67bf -Author: Jonny Lamb -Date: Mon Jul 21 19:25:24 2008 +0000 - - Added SocketPath D-BUS property. - - 20080721192524-8ed0e-a7f160a0a688e1c1ab670fb7b275224a7c22eec2.gz - - extensions/Channel_Type_File.xml | 8 ++++++++ - src/salut-file-channel.c | 22 +++++++++++++++++++++- - 2 files changed, 29 insertions(+), 1 deletions(-) - -commit 9bf4b36bfcea7ae8d2cdfdc1619a2d04b243e2ac -Author: Jonny Lamb -Date: Mon Jul 21 13:22:21 2008 +0000 - - Added G_STR_EMPTY helper method. - - 20080721132221-8ed0e-74cc6dc26682ef1b430ea482918c9cd16892c4c2.gz - - src/salut-file-channel.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 0a8ba7c60459e55c4d54b31528cc27eefa9b1afd -Author: Jonny Lamb -Date: Mon Jul 21 13:20:39 2008 +0000 - - Changed Size, EstimatedSize and TransferredBytes to uint64s. - - 20080721132039-8ed0e-eeb5a10173ed704c9e804e13000217d063b819a7.gz - - src/salut-file-channel.c | 32 ++++++++++++++++---------------- - 1 files changed, 16 insertions(+), 16 deletions(-) - -commit d4a6f4aa39da4f10209487b16ce056000decea90 -Author: Jonny Lamb -Date: Mon Jul 21 10:41:49 2008 +0000 - - Implemented the Interfaces D-Bus property nicely, but held onto the deprecated GetInterfaces method too. - - 20080721104149-8ed0e-56ef0d3711f86c8382be4d26db82289d610635ba.gz - - src/salut-file-channel.c | 19 +++++++++++++++---- - 1 files changed, 15 insertions(+), 4 deletions(-) - -commit aced2af9ee10e2a233a3b2ef98ebec5a8312bcd9 -Author: Jonny Lamb -Date: Fri Jul 18 17:10:43 2008 +0000 - - Made properties readwrite for use with the old requests API, for now. - - 20080718171043-8ed0e-a28c70a5c35af951998b38ae1f2738f3ff723b68.gz - - extensions/Channel_Type_File.xml | 12 ++++++------ - src/salut-file-channel.c | 12 ++++++------ - 2 files changed, 12 insertions(+), 12 deletions(-) - -commit 0c0a502747ebcdb22ebdad994da91730189c023f -Author: Jonny Lamb -Date: Fri Jul 18 12:18:32 2008 +0000 - - Added Direction property to file channel. - - 20080718121832-8ed0e-649e33e87af52de9064631b7fe73952d7955e8fd.gz - - src/salut-file-channel.c | 17 +++++++++++++++++ - src/salut-ft-manager.c | 1 + - 2 files changed, 18 insertions(+), 0 deletions(-) - -commit fd9dcfb9b66c395fbeb4b2ac4c3b83b7281fbbef -Author: Jonny Lamb -Date: Fri Jul 18 12:16:56 2008 +0000 - - Fixed property usage in file channel. - - 20080718121656-8ed0e-c2a8e962f568aa10f7649e5df68511dadd29201c.gz - - src/salut-file-channel.c | 65 ++++++++++++++++++++++++++++++++++++++------- - 1 files changed, 55 insertions(+), 10 deletions(-) - -commit b841945f7383bf2fc3055ee7ae89289958f256fc -Author: Jonny Lamb -Date: Thu Jul 17 18:26:33 2008 +0000 - - Started setting properties on the channel when required. - - 20080717182633-8ed0e-be204cfaf33b754fe022aba7cae793b20063a3c9.gz - - src/salut-file-channel.c | 20 +++++++++++++++++--- - 1 files changed, 17 insertions(+), 3 deletions(-) - -commit 5dde42da43ade275474619e17bc69c614f1ae027 -Author: Jonny Lamb -Date: Thu Jul 17 18:12:58 2008 +0000 - - Implemented using GObject properties correctly. - - 20080717181258-8ed0e-569c6c0e3945b9761719c28e18735a4a19b68c37.gz - - src/salut-file-channel.c | 117 +++++++++++++++++++++++++++++++++++++++------- - 1 files changed, 99 insertions(+), 18 deletions(-) - -commit c88f987fc9eaada0211f77cf805ab839c90151e2 -Author: Jonny Lamb -Date: Thu Jul 17 16:16:03 2008 +0000 - - Implemented TpDBusPropertiesMixin in File channel type. - - 20080717161603-8ed0e-b7c2f59c61c5d36a95d9d47357ab91a060867a2d.gz - - src/salut-file-channel.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++ - src/salut-file-channel.h | 1 + - 2 files changed, 133 insertions(+), 0 deletions(-) - -commit 95bcd0ed01acfe4dcab65ae1ab21324b6f8140cf -Author: Jonny Lamb -Date: Thu Jul 17 13:48:26 2008 +0000 - - Added temporary Direction property. - - 20080717134826-8ed0e-1d94261e3f87a79903997bf36d4788e15d815c5d.gz - - extensions/Channel_Type_File.xml | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+), 0 deletions(-) - -commit 1596ab3a079345a2d39da52067ce062c324c647a -Author: Jonny Lamb -Date: Wed Jul 16 17:06:19 2008 +0000 - - Removed file transfer mixin. - - 20080716170619-8ed0e-425f8f9d88adee496252fec278397b21a9c3830c.gz - - src/Makefile.am | 4 +- - src/file-transfer-mixin.c | 560 --------------------------------------------- - src/file-transfer-mixin.h | 127 ---------- - src/salut-file-channel.c | 33 +-- - src/salut-file-channel.h | 6 +- - src/salut-ft-manager.c | 2 +- - src/salut-ft-manager.h | 2 + - 7 files changed, 16 insertions(+), 718 deletions(-) - -commit e84f0255fe44b5de05e7834566f6fab27f0e7a97 -Author: Jonny Lamb -Date: Wed Jul 16 15:54:17 2008 +0000 - - Updated spec to include State property. - - 20080716155417-8ed0e-07748cd371c4e090f8ef5284fec5f57224baea38.gz - - extensions/Channel_Type_File.xml | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit bd2fab7e92e316fe150f285ba142f2d18ab6ee2b -Author: Jonny Lamb -Date: Wed Jul 16 15:38:30 2008 +0000 - - Fixed up AcceptFile and its dependant functions to not use the File Transfer ID. - - 20080716153830-8ed0e-44e776f0d8330d89044351f6368f272744c944ea.gz - - src/salut-file-channel.c | 115 +++++++++++++++++++++------------------------ - 1 files changed, 54 insertions(+), 61 deletions(-) - -commit deb9adf232b55c78d3ed81e2335e0e4ab076334a -Author: Jonny Lamb -Date: Wed Jul 16 13:32:59 2008 +0000 - - Renamed SalutFtChannel to SalutFileChannel. - - 20080716133259-8ed0e-03c15d1117bb7e08ffb098acd17f36ec3d18142a.gz - - src/salut-file-channel.c | 154 +++++++++++++++++++++++----------------------- - src/salut-file-channel.h | 52 ++++++++-------- - src/salut-ft-manager.c | 20 +++--- - 3 files changed, 113 insertions(+), 113 deletions(-) - -commit f0607286fba67637bcb6c3820e51f1651e97c625 -Author: Jonny Lamb -Date: Wed Jul 16 13:11:22 2008 +0000 - - Renamed salut-ft-channel.[ch] to salut-file-channel.[ch] - - 20080716131122-8ed0e-f8759bde23a78ab0553815342be045af82ff45b9.gz - - src/Makefile.am | 4 +- - src/salut-file-channel.c | 789 ++++++++++++++++++++++++++++++++++++++++++++++ - src/salut-file-channel.h | 75 +++++ - src/salut-ft-channel.c | 789 ---------------------------------------------- - src/salut-ft-channel.h | 75 ----- - src/salut-ft-manager.c | 2 +- - 6 files changed, 867 insertions(+), 867 deletions(-) - -commit e38dddd90ba8932bf587a8625e6215edd6f7428d -Author: Jonny Lamb -Date: Wed Jul 16 12:44:38 2008 +0000 - - Added new File channel type spec and got current code to compile. - - 20080716124438-8ed0e-719526712fb057566d999a8a06f0e209a6a65eb6.gz - - extensions/Channel_Type_File.xml | 354 +++++++++++++++++++++++++++++ - extensions/Channel_Type_File_Transfer.xml | 269 ---------------------- - extensions/Makefile.am | 1 + - extensions/channel.xml | 1 + - src/file-transfer-mixin.c | 142 +----------- - src/file-transfer-mixin.h | 5 +- - src/salut-ft-channel.c | 190 +-------------- - 7 files changed, 373 insertions(+), 589 deletions(-) - -commit f839964711ba39e7a4c71215a15795c428858f2b -Author: Jonny Lamb -Date: Tue Jul 15 18:56:36 2008 +0000 - - Added Marco's file transfer code. - - 20080715185636-8ed0e-06775a31a2c94b716db41375af32db8248b9e8d3.gz - - configure.ac | 7 +- - extensions/Channel_Type_File_Transfer.xml | 52 ++- - lib/gibber/Makefile.am | 28 +- - lib/gibber/gibber-debug.c | 1 + - lib/gibber/gibber-debug.h | 1 + - lib/gibber/gibber-file-transfer.c | 365 +++++++++++ - lib/gibber/gibber-file-transfer.h | 127 ++++ - lib/gibber/gibber-namespaces.h | 6 + - lib/gibber/gibber-oob-file-transfer.c | 781 +++++++++++++++++++++++ - lib/gibber/gibber-oob-file-transfer.h | 70 +++ - src/Makefile.am | 8 +- - src/debug.c | 1 + - src/debug.h | 1 + - src/file-transfer-mixin.c | 696 +++++++++++++++++++++ - src/file-transfer-mixin.h | 130 ++++ - src/salut-connection.c | 8 + - src/salut-ft-channel.c | 953 +++++++++++++++++++++++++++++ - src/salut-ft-channel.h | 75 +++ - src/salut-ft-manager.c | 407 ++++++++++++ - src/salut-ft-manager.h | 64 ++ - src/salut.c | 1 + - 21 files changed, 3772 insertions(+), 10 deletions(-) - -commit 61671764dcb781d8e7a6782bc2cae7db24492d1a -Merge: 77660a7 9bd3085 -Author: Alban Crequy -Date: Thu Oct 23 14:36:16 2008 -0400 - - Merge branch 'master' into tubes-requestotron-without-new-specs - -commit 1bddf174b9b4123bafcfab711007109afa37bfe0 -Author: Alban Crequy -Date: Thu Oct 23 14:25:03 2008 -0400 - - Twisted tests only uses IPv4 (not IPv6). Use PROTO_INET instead of PROTO_UNSPEC in Avahi calls. - - tests/twisted/avahitest.py | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 9bd3085e21273564033735eca808dccec0ddea40 -Author: Simon McVittie -Date: Wed Oct 15 16:21:32 2008 +0100 - - Use GChecksum for SHA-1 (with the same code as Gabble 0.7.12) - - COPYING | 36 --- - src/Makefile.am | 4 +- - src/sha1/sha1-util.c | 40 ++-- - src/sha1/sha1-util.h | 6 +- - src/sha1/sha1.c | 626 -------------------------------------------------- - src/sha1/sha1.h | 72 ------ - 6 files changed, 25 insertions(+), 759 deletions(-) - -commit cebe844419f6bd4b922de36b056e701740128ce4 -Author: Simon McVittie -Date: Wed Oct 15 16:37:45 2008 +0100 - - SalutRoomlistChannel: use TP_STRUCT_TYPE_ROOM_INFO rather than reinventing it - - src/salut-roomlist-channel.c | 19 +++++++------------ - 1 files changed, 7 insertions(+), 12 deletions(-) - -commit 5590625795b5e68c40f41a41e5f618005756ffd5 -Author: Simon McVittie -Date: Wed Oct 15 16:24:21 2008 +0100 - - SalutImChannel: use G_PARAM_STATIC_STRINGS - - src/salut-im-channel.c | 24 +++++------------------- - 1 files changed, 5 insertions(+), 19 deletions(-) - -commit aa8cab85dc9990d3f0d87cb1fada08348c26708a -Author: Simon McVittie -Date: Wed Oct 15 16:22:07 2008 +0100 - - .gitignore: ignore 'compile' (from automake 1.9) - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 48c9470e2bf5b0128eafab4dff3080984fcc823a -Author: Simon McVittie -Date: Wed Oct 15 16:18:27 2008 +0100 - - Bump telepathy-glib and GLib dependency versions - - configure.ac | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 01db0fe5ce6874560f1d5cee0b2d54f5321cfa08 -Author: Simon McVittie -Date: Wed Oct 15 16:18:03 2008 +0100 - - Require automake 1.9 (same rationale as telepathy-glib, Gabble) - - autogen.sh | 12 ++++++------ - configure.ac | 2 +- - 2 files changed, 7 insertions(+), 7 deletions(-) - -commit 77660a7bcec64328492af434843a63e8885495ce -Merge: e70cd6d 8bb3431 -Author: Alban Crequy -Date: Thu Oct 23 10:36:57 2008 -0400 - - Merge branch 'master' into tubes-requestotron-without-new-specs - -commit 8bb34311e60598cfea2489cc0aafffb4ac95263b -Author: Alban Crequy -Date: Thu Oct 23 10:20:58 2008 -0400 - - SalutImManager: implement EnsureChannel - - src/salut-im-manager.c | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) - -commit 731fba43cf5669bf8b841d14b789e835a891cc81 -Author: Alban Crequy -Date: Thu Oct 23 10:15:45 2008 -0400 - - Coding style: add a space in casts - - src/salut-im-manager.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 6b0bc1a0d7a28c81d7e15ebd07b597fa3feed412 -Author: Alban Crequy -Date: Thu Oct 23 10:14:35 2008 -0400 - - Channels do not implement .FUTURE anymore. Remove include extensions/extensions.h. - - src/salut-contact-channel.c | 4 ---- - src/salut-im-channel.c | 4 ---- - src/salut-muc-channel.c | 4 ---- - src/salut-tubes-channel.c | 4 ---- - src/tube-stream.c | 1 - - 5 files changed, 0 insertions(+), 17 deletions(-) - -commit b3f1b9e512dc95239d0f280058eae3631fe100b7 -Author: Alban Crequy -Date: Wed Oct 22 14:45:43 2008 -0400 - - extensions/Channel_Future.xml: Remove Requested, InitiatorHandle, InitiatorID because they are integrated in the main Channel interface now (Update from tp-spec) - - extensions/Channel_Future.xml | 122 +---------------------------------------- - 1 files changed, 2 insertions(+), 120 deletions(-) - -commit ed0c94cbddd3b4b01861cbd446d8776cffd3ab01 -Author: Alban Crequy -Date: Wed Oct 22 14:42:07 2008 -0400 - - SalutMucChannel: Requested, InitiatorID, InitiatorHandle are no more future properties - - src/salut-muc-channel.c | 14 +++----------- - 1 files changed, 3 insertions(+), 11 deletions(-) - -commit 2782d5b59c6dae898cab0e675108d3672682a927 -Author: Alban Crequy -Date: Wed Oct 22 14:41:19 2008 -0400 - - SalutContactChannel: Requested, InitiatorID, InitiatorHandle are no more future properties - - src/salut-contact-channel.c | 14 +++----------- - 1 files changed, 3 insertions(+), 11 deletions(-) - -commit e70cd6dc895e469ad19f6dbb1b2bbbc7731f2d67 -Author: Alban Crequy -Date: Wed Oct 22 14:31:55 2008 -0400 - - SalutTubesChannel: Fix bad conflict resolution - - src/salut-tubes-channel.c | 11 ----------- - 1 files changed, 0 insertions(+), 11 deletions(-) - -commit 49a966687ea8e1cfbdcbf64ab3bd33514818d17b -Merge: fcb0eb6 ba19207 -Author: Alban Crequy -Date: Wed Oct 22 14:31:32 2008 -0400 - - Merge branch 'wjt-requestotron' into tubes-requestotron-without-new-specs - - Conflicts: - - src/salut-tubes-channel.c - -commit ba192075fdd28c8f5da9788aafe2bd5b1ed0b668 -Author: Alban Crequy -Date: Wed Oct 22 14:20:28 2008 -0400 - - SalutImChannel: Requested, InitiatorID, InitiatorHandle are no more future properties - - src/salut-im-channel.c | 14 +++----------- - 1 files changed, 3 insertions(+), 11 deletions(-) - -commit d0cfa2b5844bcd87e53c0885fc391239f6a2833c -Author: Alban Crequy -Date: Wed Oct 22 14:16:19 2008 -0400 - - SalutTubesChannel: expose requested, initiator-handle and initiator-id as D-Bus properties - - src/salut-tubes-channel.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit b11806162e2a059b4daeb1845a320a3761bea383 -Author: Alban Crequy -Date: Wed Oct 22 13:38:47 2008 -0400 - - SalutRoomlistChannel: Implement initiator-id and initiator-handle - - src/salut-roomlist-channel.c | 32 ++++++++++++++++++++++++++++++++ - 1 files changed, 32 insertions(+), 0 deletions(-) - -commit cf6b9bd8a29488b73f5b895fcc387cdf886fa744 -Author: Alban Crequy -Date: Wed Oct 22 12:01:51 2008 -0400 - - SalutTubesChannel implements TpExportableChannel - - Conflicts: - - src/salut-tubes-channel.c - - src/salut-tubes-channel.c | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) - -commit e5046ab54fcc66f46b38ceb3817c9cda9738caf3 -Author: Alban Crequy -Date: Wed Oct 22 11:49:37 2008 -0400 - - SalutRoomlistChannel: use G_PARAM_STATIC_STRINGS - - src/salut-roomlist-channel.c | 9 +++------ - 1 files changed, 3 insertions(+), 6 deletions(-) - -commit 2f4d76ece60d320f6246e57c0fbba164b8c28617 -Author: Alban Crequy -Date: Wed Oct 22 11:45:16 2008 -0400 - - SalutRoomlistChannel: set priv->closed before emitting closed, so we don't indicate that we're about to respawn - - src/salut-roomlist-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 64e76c435993186881dc558b02780afb52f3eb54 -Author: Alban Crequy -Date: Wed Oct 22 11:42:41 2008 -0400 - - SalutRoomlistChannel: implement TpExportableChannel - - src/salut-roomlist-channel.c | 23 +++++++++++++++++++++++ - 1 files changed, 23 insertions(+), 0 deletions(-) - -commit a457a8ae5bc5b3d3af1d42efeec5d58eb5c97700 -Author: Alban Crequy -Date: Wed Oct 22 11:34:01 2008 -0400 - - SalutRoomlistChannel: add the Requested property - - src/salut-roomlist-channel.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit fcb0eb636ef1fee7e2445f6ee775a9c532eb3b6e -Author: Alban Crequy -Date: Tue Oct 21 16:58:53 2008 -0400 - - Give the initiator handle to SalutTubeChannel as a property - - src/salut-tubes-manager.c | 11 +++++++---- - 1 files changed, 7 insertions(+), 4 deletions(-) - -commit edf5d4c35861a7b102a9be9071452845ca14d783 -Author: Alban Crequy -Date: Tue Oct 21 16:58:11 2008 -0400 - - Add missing break; statement. - - It must have disappear in some merge.. - - src/salut-tubes-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit c8c02858db0aea762d7c9e8c97027ec7a93fb96e -Author: Alban Crequy -Date: Tue Oct 21 15:58:15 2008 -0400 - - Remove twice G_IMPLEMENT_INTERFACE (TP_TYPE_EXPORTABLE_CHANNEL, NULL); - - src/salut-tubes-channel.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit f17ac112bf4e441f97fad42c9140df36ab43a433 -Author: Alban Crequy -Date: Wed Sep 24 15:38:26 2008 +0100 - - SalutTubesChannel implements TpExportableChannel - - src/salut-tubes-channel.c | 20 ++++++++++++++++++++ - 1 files changed, 20 insertions(+), 0 deletions(-) - -commit 583f53ae011a85e5ede3b0e73422e096bfac6067 -Merge: d7f6ac2 e37e302 -Author: Alban Crequy -Date: Tue Oct 21 14:45:59 2008 -0400 - - Merge branch 'wjt-requestotron' into tubes-requestotron-without-new-specs - -commit e37e3023fa952ae5ae100aabe0cccb1fe926d4f4 -Author: Alban Crequy -Date: Tue Oct 21 14:43:41 2008 -0400 - - SalutMucChannel: implement ExportableChannel - - src/salut-muc-channel.c | 25 +++++++++++++++++++++++++ - 1 files changed, 25 insertions(+), 0 deletions(-) - -commit 467ca4db8014b50e8c14619354526594720cd099 -Merge: 30b35dd 948482e -Author: Alban Crequy -Date: Tue Oct 21 14:35:15 2008 -0400 - - Merge branch 'master' into wjt-requestotron - - Conflicts: - - src/salut-tubes-channel.c - -commit d7f6ac2875bc8e394ed181ded60da5f8955981ec -Merge: cc6b492 30b35dd -Author: Alban Crequy -Date: Tue Oct 21 12:14:13 2008 -0400 - - Merge branch 'wjt-requestotron' into tubes-requestotron-without-new-specs - - Conflicts: - - src/salut-tubes-channel.c - -commit 30b35dd3d7b51ebfca4ecc0f03946436b343eebc -Author: Will Thompson -Date: Tue Sep 30 11:26:56 2008 +0100 - - TubesChannel: implement ExportableChannel and Channel.FUTURE - - src/salut-muc-channel.c | 2 +- - src/salut-muc-manager.c | 16 +++++++++---- - src/salut-muc-manager.h | 2 +- - src/salut-tubes-channel.c | 52 +++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 65 insertions(+), 7 deletions(-) - -commit c4bdcc010df78c83199f2a6fef38b9e1de70a7f3 -Author: Will Thompson -Date: Mon Sep 29 17:41:50 2008 +0100 - - TubesChannelPrivate.self_handle should be TpHandle not TpHandleType - - src/salut-tubes-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 948482e7ebe99a3eefbe1a78d456cbf922476ee8 -Author: Will Thompson -Date: Mon Sep 29 17:41:50 2008 +0100 - - TubesChannelPrivate.self_handle should be TpHandle not TpHandleType - - src/salut-tubes-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4010c7a22005e55df2bac0cdd9728bb6d59cdd8a -Author: Will Thompson -Date: Mon Sep 29 17:26:05 2008 +0100 - - Include Channel.FUTURE in interfaces list for contact list and muc channels - - src/salut-contact-channel.c | 1 + - src/salut-muc-channel.c | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit de075710ef44e52c1aebcfeba6ee4d9f18e1dbf6 -Author: Will Thompson -Date: Mon Sep 29 16:16:25 2008 +0100 - - SalutMucChannel: implement Channel.FUTURE and ExportableChannel - - src/salut-avahi-muc-channel.c | 2 + - src/salut-avahi-muc-channel.h | 2 +- - src/salut-avahi-muc-manager.c | 5 ++- - src/salut-muc-channel.c | 70 ++++++++++++++++++++++++++++++++++++++-- - src/salut-muc-manager.c | 13 ++++--- - src/salut-muc-manager.h | 3 +- - 6 files changed, 81 insertions(+), 14 deletions(-) - -commit 1224c427f319576a52da69c5153e9dc43240984a -Author: Will Thompson -Date: Sun Sep 28 11:22:17 2008 +0100 - - ContactManager: don't accept requests with unknown properties - - src/salut-contact-manager.c | 25 +++++++++++++++++++------ - 1 files changed, 19 insertions(+), 6 deletions(-) - -commit 0a28b1b8750be5e1e523d500fa9b600c41cb31e1 -Author: Will Thompson -Date: Sun Sep 28 11:19:39 2008 +0100 - - SalutContactManager: don't implement TpChannelFactoryIface - - src/salut-contact-manager.c | 101 +------------------------------------------ - 1 files changed, 2 insertions(+), 99 deletions(-) - -commit d196dcea0327f2e52df8d95e59fe59fad50efc5f -Author: Will Thompson -Date: Sun Sep 28 11:05:28 2008 +0100 - - ContactManager: close all channels when disconnecting - - src/salut-contact-manager.c | 52 +++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 48 insertions(+), 4 deletions(-) - -commit ba64396864acccac5eda923e82252d91e7d46eab -Author: Will Thompson -Date: Sun Sep 28 10:49:19 2008 +0100 - - Use SalutContactManager as a TpChannelManager (not a ChannelFactory) - - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d82df0010f37395ff73286e4feeac3d8eaecc324 -Author: Will Thompson -Date: Sun Sep 28 01:12:14 2008 +0100 - - ContactManager: implement TpChannelManager - - src/salut-contact-manager.c | 196 +++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 191 insertions(+), 5 deletions(-) - -commit 83eaa07492f29fae23eb63990d24e1c5a0a983b8 -Author: Will Thompson -Date: Fri Sep 26 17:39:59 2008 +0100 - - SalutContactChannel: implement TpExportableChannel - - src/salut-contact-channel.c | 76 +++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 76 insertions(+), 0 deletions(-) - -commit 8f44c9bdb357d250f8e1f78f51b798febb4400fe -Author: Will Thompson -Date: Sun Sep 28 01:16:47 2008 +0100 - - ImManager: don't leak a GSList when emitting new-channel - - src/salut-im-manager.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit cc6b492fd4a65f1885aa7783cec1457d483cf44f -Author: Alban Crequy -Date: Tue Sep 23 14:32:49 2008 +0100 - - Tubes: check that the incoming connection on a tube comes from an IP advertised by the SalutContact. Update the test suite - - src/salut-direct-bytestream-manager.c | 44 +++++++++++++++++++++++++++++++++ - tests/twisted/avahi/test-tube.py | 13 +++++++++- - 2 files changed, 56 insertions(+), 1 deletions(-) - -commit 4e1802e8e381df684793b22b9e6b7180a6b815eb -Author: Alban Crequy -Date: Mon Sep 22 17:01:29 2008 +0100 - - SalutXmppConnectionManager: connect to TpSvcConnection::status-changed and close streams - - src/salut-xmpp-connection-manager.c | 77 ++++++++++++++++++++++++++++------ - 1 files changed, 63 insertions(+), 14 deletions(-) - -commit b5a813b78cb82f7f528aa8c3951c85036148a8ba -Author: Alban Crequy -Date: Mon Sep 22 16:08:28 2008 +0100 - - src/salut-im-manager.c: connect to TpSvcConnection::status-changed and close all channels in response to Disconnected - - src/salut-im-manager.c | 46 +++++++++++++++++++++++++++++++++++++++------- - 1 files changed, 39 insertions(+), 7 deletions(-) - -commit 8557a1f305ca9a436f80fb3c81351a25ffa0ade5 -Author: Alban Crequy -Date: Fri Sep 19 16:36:48 2008 +0100 - - Update requestotron branch to use interface from telepathy-glib 0.7.15 - - src/salut-connection.c | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 51e1912afda1b7e02a11b68bcac776f19405c10d -Merge: 3ccbda5 db1469f -Author: Alban Crequy -Date: Fri Sep 19 15:51:01 2008 +0100 - - Merge branch 'master' into wjt-requestotron - - Conflicts: - - .gitignore - src/salut-im-manager.c - -commit 7c24a337a914c4fcead5c5b3f7d9769a6caab1cd -Merge: 3e044f6 db1469f -Author: Alban Crequy -Date: Fri Sep 19 13:43:54 2008 +0100 - - Merge branch 'master' into tubes - - Conflicts: - - tests/twisted/Makefile.am - -commit db1469f65903092aeb5e29ffb19acf6f2376beb8 -Merge: 45b5a78 644a276 -Author: Alban Crequy -Date: Fri Sep 19 13:41:21 2008 +0100 - - Merge branch 'alban-trivial' - -commit 644a276dce72b5bb008055d6ca4412043d35b177 -Author: Alban Crequy -Date: Fri Sep 19 13:29:04 2008 +0100 - - SalutConnection: Fix a leak: call tp_contacts_mixin_finalize() - - src/salut-connection.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 3e044f60cd3c43cd99b01ac407a4fe9f90df59ad -Merge: c351314 c9db133 -Author: Alban Crequy -Date: Fri Sep 19 12:50:13 2008 +0100 - - Merge branch 'alban-ref' into tubes - -commit c351314cf87caed361b23c813b368e2d8a3c111c -Author: Alban Crequy -Date: Fri Sep 19 12:49:49 2008 +0100 - - Use g_value_dup_object instead of g_value_get_object+g_object_ref - - src/salut-tubes-manager.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit c9db1332f4e2bdf9d9e39817197750674a17a878 -Author: Alban Crequy -Date: Fri Sep 19 12:47:58 2008 +0100 - - Use g_value_dup_object instead of g_value_get_object+g_object_ref - - src/salut-contact.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 1aa1298159aa0a2db399c3cf251f65878bb9c4c6 -Author: Alban Crequy -Date: Fri Sep 19 12:41:28 2008 +0100 - - Revert "SalutTubesManager: Do not reference objects twice in set_property" - - This reverts commit bacc24df0a662a31c9b62bf0da194ec16a8caaa2. - - g_value_get_object() does not increment any ref count, so the commit bacc24df - is wrong. - - src/salut-tubes-manager.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 54c1f9b74c113e0c7d91042d105a4597a02496d0 -Merge: c60ca99 ff661fb -Author: Alban Crequy -Date: Fri Sep 19 12:36:10 2008 +0100 - - Merge branch 'alban-trivial' into tubes - -commit ff661fb8fd03cd2c003228a5c532a41acb733570 -Author: Alban Crequy -Date: Fri Sep 19 12:35:30 2008 +0100 - - Use g_value_dup_object instead of g_value_get_object+g_object_ref - - src/salut-im-manager.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit 1f0aca2d6a86a814230a9e6d8a9700d85956ac13 -Author: Alban Crequy -Date: Fri Sep 19 11:52:50 2008 +0100 - - Fix reference counts in SalutContact->SalutConnection and in SalutXmppConnectionManager - - src/salut-contact.c | 7 +++++++ - src/salut-xmpp-connection-manager.c | 14 +++++++++++++- - 2 files changed, 20 insertions(+), 1 deletions(-) - -commit c60ca99ceff665bb827ba2a1e665d253a72a9cdc -Merge: 4b82f19 0d8d1b6 -Author: Alban Crequy -Date: Thu Sep 18 17:21:41 2008 +0100 - - Merge branch 'alban-trivial' into tubes - -commit 0d8d1b6c88478779ec93912e1d12441bf9e4b6fb -Author: Alban Crequy -Date: Thu Sep 18 17:21:07 2008 +0100 - - SalutImManager: fix previous commit 12e59f4feb4d4268be1b5fcedabacb3d6e4d775e - - src/salut-im-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4b82f199ca47978ae42355dad1f86915b9ae3621 -Author: Alban Crequy -Date: Thu Sep 18 17:16:59 2008 +0100 - - SalutTubesManager: put "private" code in the constructor instead of salut_tubes_manager_new() - - src/salut-tubes-manager.c | 19 +++++-------------- - 1 files changed, 5 insertions(+), 14 deletions(-) - -commit 26eb80412efea23fbf0ff68aef109a98d223f53e -Merge: 024bae0 12e59f4 -Author: Alban Crequy -Date: Thu Sep 18 17:12:19 2008 +0100 - - Merge branch 'alban-trivial' into tubes - -commit 12e59f4feb4d4268be1b5fcedabacb3d6e4d775e -Author: Alban Crequy -Date: Thu Sep 18 17:11:13 2008 +0100 - - SalutImManager: Coding style: avoid unneeded variable - - src/salut-im-manager.c | 6 +----- - 1 files changed, 1 insertions(+), 5 deletions(-) - -commit 76b844f3d5cec77c387c626e217058a72dc8ed0c -Author: Alban Crequy -Date: Thu Sep 18 17:10:14 2008 +0100 - - SalutImManager: Coding style: name the variable "self" - - src/salut-im-manager.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 024bae0e027564c68a12eba52b95753a07b39f01 -Merge: b2437b4 c776935 -Author: Alban Crequy -Date: Thu Sep 18 17:01:01 2008 +0100 - - Merge branch 'alban-trivial' into tubes - -commit c776935e13d397642c4bb1de909df7a3ac07a964 -Author: Alban Crequy -Date: Thu Sep 18 16:58:28 2008 +0100 - - SalutImManager: Do not access to the private structure in salut_im_manager_new() but use property. - - src/salut-im-manager.c | 150 +++++++++++++++++++++++++++++++++++++++++++----- - 1 files changed, 135 insertions(+), 15 deletions(-) - -commit b2437b4cb32fb1c3fce54dc6ad09a6d0c9f2c72a -Author: Alban Crequy -Date: Thu Sep 18 15:40:48 2008 +0100 - - src/salut-direct-bytestream-manager.c: coding style: remove trailing spaces - - src/salut-direct-bytestream-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bacc24df0a662a31c9b62bf0da194ec16a8caaa2 -Author: Alban Crequy -Date: Thu Sep 18 15:35:56 2008 +0100 - - SalutTubesManager: Do not reference objects twice in set_property - - src/salut-tubes-manager.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 45b5a7803edb6fda66c93d532dea5c231cb14466 -Merge: 4bfc66d f091e8d -Author: Guillaume Desmottes -Date: Thu Sep 18 13:37:40 2008 +0100 - - Merge branch 'master' of git+ssh://git.collabora.co.uk/git/telepathy-salut - -commit 4bfc66d430788421bf0f43d9948090c929289932 -Author: Guillaume Desmottes -Date: Thu Sep 18 12:48:50 2008 +0100 - - Only run OLPC avahi tests if Salut was build with --enable-olpc - - tests/twisted/Makefile.am | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit 3cf9219796ba0bf6465711f70eb7e27231050b96 -Merge: e857440 f091e8d -Author: Alban Crequy -Date: Thu Sep 18 12:03:42 2008 +0100 - - Merge branch 'master' into tubes - - Conflicts: - - tests/twisted/Makefile.am - -commit f091e8dd318416ba9cd6e38cba2186152df69d62 -Merge: a659ba9 dbd5ecb -Author: Alban Crequy -Date: Wed Sep 17 18:09:44 2008 +0100 - - Merge commit 'origin/master' into salut-testsuite-sjoerd - -commit dbd5ecb1406b8f97e2961661ff3d8bc72a8d8551 -Author: Guillaume Desmottes -Date: Wed Sep 17 17:34:43 2008 +0100 - - version 0.3.5 - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8e2f251a9989f24e8894a7963a0ddfd8840c9bd6 -Author: Guillaume Desmottes -Date: Wed Sep 17 17:12:54 2008 +0100 - - version 0.3.5 - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 3afb71768f8ba1dca86c10f21d355acc5217c29f -Author: Guillaume Desmottes -Date: Wed Sep 17 17:11:55 2008 +0100 - - upgrade NEWS for the 0.3.5 release - - NEWS | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -commit 63cfc4275bd9810fa775cc260bb501b7b230d101 -Author: Guillaume Desmottes -Date: Tue Sep 16 18:34:13 2008 +0100 - - remove double spaces - - .../avahi/test-olpc-activity-announcements.py | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 9a294538988675f3caf4c78f7ac1031bf32aa37d -Author: Guillaume Desmottes -Date: Tue Sep 16 18:31:32 2008 +0100 - - make check set a+x to tests/run-xmpp-connection-test.sh so I guess that's what we should have in the repo - - 0 files changed, 0 insertions(+), 0 deletions(-) - -commit a738b55d1517cbfa3ddfa24096ee60afdd1810ea -Author: Guillaume Desmottes -Date: Tue Sep 16 18:28:07 2008 +0100 - - salut_olpc_activity_joined: check if activity is not private before announcing it - - src/salut-olpc-activity.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit f92f6f252fff92738b437bfbe234c03924838711 -Author: Guillaume Desmottes -Date: Tue Sep 16 18:11:10 2008 +0100 - - remove debug print - - tests/twisted/avahitest.py | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit c4b18dab49e38e086c0247bc0c94dbe94dbeefe8 -Author: Guillaume Desmottes -Date: Tue Sep 16 16:19:50 2008 +0100 - - update gitignore - - .gitignore | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit a659ba9e96a371d8d52fd034f4bb3f91bc1ed048 -Author: Alban Crequy -Date: Tue Sep 16 11:22:20 2008 +0100 - - tests/README: Fix command typo - - tests/README | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit fd5f9e33e691cb2d0adcda2907c7411f82923172 -Author: Sjoerd Simons -Date: Mon Sep 15 19:57:34 2008 +0100 - - Complete test to include joining and leaving the activity - - .../avahi/test-olpc-activity-announcements.py | 95 ++++++++++++++++--- - 1 files changed, 80 insertions(+), 15 deletions(-) - -commit 238fbd94f0158d91cfe40e90ee547cdf49259b6b -Author: Sjoerd Simons -Date: Mon Sep 15 19:56:56 2008 +0100 - - Optionally allow a records hostname to be specified - - tests/twisted/avahitest.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 31eba3b01844d99e37c5879ababd1b82b5217b8d -Author: Sjoerd Simons -Date: Mon Sep 15 19:56:09 2008 +0100 - - Add a class to announce raw records - - tests/twisted/avahitest.py | 25 +++++++++++++++++++++++++ - 1 files changed, 25 insertions(+), 0 deletions(-) - -commit 67ff10982e306a55139ca727248eebd93f49e3f7 -Author: Sjoerd Simons -Date: Mon Sep 15 19:55:36 2008 +0100 - - Fix typo in signal name - - tests/twisted/avahitest.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3d18b038be8ef1fb03d7b7afb121afe5a32e3f8b -Author: Sjoerd Simons -Date: Mon Sep 15 19:54:24 2008 +0100 - - Remove trailing spaces - - tests/twisted/avahitest.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 520aedb78453e35b63e23c623fe0005a51308a56 -Author: Sjoerd Simons -Date: Mon Sep 15 19:53:25 2008 +0100 - - Add ActivityProperties and BuddyInfo to interfaces - - tests/twisted/servicetest.py | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 9b53bfb37a525bfec240b853982be448d0ce0869 -Author: Sjoerd Simons -Date: Mon Sep 15 15:49:58 2008 +0100 - - Only announce activites that the contact has joined - - src/salut-olpc-activity.c | 35 +++++++++++++++++++++++------------ - 1 files changed, 23 insertions(+), 12 deletions(-) - -commit 6af80d874bc9bb6eadd7615cb37e4ff7c76fab05 -Author: Sjoerd Simons -Date: Mon Sep 15 15:47:30 2008 +0100 - - Allow update and stop_announce to be called on activities that aren't actually announced. So the higher level code doesn't have to remember whether announcing it actually succeeded - - src/salut-avahi-olpc-activity.c | 12 ++++++++++-- - 1 files changed, 10 insertions(+), 2 deletions(-) - -commit bbc4644ad6067ddb81adf6b0c073e545f9506aa8 -Merge: a1b50af d35233c -Author: Sjoerd Simons -Date: Mon Sep 15 12:40:41 2008 +0100 - - Merge branch 'master' into salut-muc-announcements-sjoerd - -commit d35233c05965d0e79383c73c91725ef26cbbc9d9 -Merge: 3d39775 19e80c3 -Author: Sjoerd Simons -Date: Mon Sep 15 12:37:23 2008 +0100 - - Merge branch 'salut-testsuite-sjoerd' - -commit a1b50af7089767e74a9b93f4d6d862f36dc3d3e9 -Author: Sjoerd Simons -Date: Mon Sep 15 12:08:52 2008 +0100 - - Start of the olpc activity announcements - - tests/twisted/Makefile.am | 3 +- - .../avahi/test-olpc-activity-announcements.py | 82 ++++++++++++++++++++ - 2 files changed, 84 insertions(+), 1 deletions(-) - -commit 92cd72ec9fbd289217b6204a53f76623afea6f3e -Author: Sjoerd Simons -Date: Mon Sep 15 12:07:42 2008 +0100 - - Add hook functions to the iterating queue to inspect events - - tests/twisted/servicetest.py | 12 +++++++++++- - 1 files changed, 11 insertions(+), 1 deletions(-) - -commit 27957c7cb4895164c51cddd57a3e7a6e3a4d2624 -Author: Sjoerd Simons -Date: Mon Sep 15 11:58:30 2008 +0100 - - Return self from listen_for_service to make it more convinient to use - - tests/twisted/avahitest.py | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 41aafbb207672bd47f0aae40cee013bde767a8ab -Author: Alban Crequy -Date: Wed Sep 10 12:29:02 2008 +0100 - - Update with-session-bus.sh from telepathy-glib - - This new version of with-session-bus.sh comes from the telepathy-glib git - repository: - - |commit 9c6a27f7b1796abfd0e30ec0e38a7bdbf3aa3863 - |Author: Alban Crequy - |Date: Wed Sep 10 11:42:17 2008 +0100 - | - | tools/with-session-bus.sh: Better explanation for usage - | - |commit 241d6e35c946bee2c8112f3f444fe9e2bfdaa9de - |Author: Alban Crequy - |Date: Tue Sep 9 18:13:39 2008 +0100 - | - | with-session-bus.sh: Fork dbus-monitor if requested - | - | If $WITH_SESSION_BUS_FORK_DBUS_MONITOR is set, fork dbus-monitor: - | dbus-monitor $WITH_SESSION_BUS_FORK_DBUS_MONITOR_OPT - - tests/twisted/tools/with-session-bus.sh | 13 ++++++++++++- - 1 files changed, 12 insertions(+), 1 deletions(-) - -commit dec81ea5627bedfb5bd8411b8f346ec4b06646f9 -Author: Alban Crequy -Date: Thu Sep 11 12:22:48 2008 +0100 - - saluttest.py: Fix twisted problem with reactor.stop - - tests/twisted/saluttest.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e857440fdae894fed0b750e87bcfc72bebe002f8 -Author: Alban Crequy -Date: Thu Sep 11 12:22:48 2008 +0100 - - saluttest.py: Fix twisted problem with reactor.stop - - tests/twisted/saluttest.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit eed81ad0c24e279b5ecaa3340239a0e791f90248 -Author: Alban Crequy -Date: Thu Sep 11 12:20:47 2008 +0100 - - test-tube.py: Test to send and receive data on the stream tube - - tests/twisted/avahi/test-tube.py | 79 ++++++++++++++++++++++++++++++-------- - 1 files changed, 63 insertions(+), 16 deletions(-) - -commit a3d7ef4aebfeaae60f412c26fd30f09030c11086 -Author: Alban Crequy -Date: Wed Sep 10 14:19:44 2008 +0100 - - test-tube-close.py: new test: close the connection and check salut send a stanza to close the tube. - - tests/twisted/Makefile.am | 3 +- - tests/twisted/avahi/test-tube-close.py | 80 ++++++++++++++++++++++++++++++++ - 2 files changed, 82 insertions(+), 1 deletions(-) - -commit 6a310a92c17d4737f887534b09ffd944b1178ec7 -Author: Alban Crequy -Date: Wed Sep 10 12:29:02 2008 +0100 - - Update with-session-bus.sh from telepathy-glib - - This new version of with-session-bus.sh comes from the telepathy-glib git - repository: - - |commit 9c6a27f7b1796abfd0e30ec0e38a7bdbf3aa3863 - |Author: Alban Crequy - |Date: Wed Sep 10 11:42:17 2008 +0100 - | - | tools/with-session-bus.sh: Better explanation for usage - | - |commit 241d6e35c946bee2c8112f3f444fe9e2bfdaa9de - |Author: Alban Crequy - |Date: Tue Sep 9 18:13:39 2008 +0100 - | - | with-session-bus.sh: Fork dbus-monitor if requested - | - | If $WITH_SESSION_BUS_FORK_DBUS_MONITOR is set, fork dbus-monitor: - | dbus-monitor $WITH_SESSION_BUS_FORK_DBUS_MONITOR_OPT - - tests/twisted/tools/with-session-bus.sh | 13 ++++++++++++- - 1 files changed, 12 insertions(+), 1 deletions(-) - -commit cb4043b8a21bae1977c07974ed65d9962cd32c87 -Author: Alban Crequy -Date: Wed Sep 10 12:27:34 2008 +0100 - - src/salut-tubes-channel.c: Fix: when offering the tube, put the XML node at the right place - - src/salut-tubes-channel.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 8e4f26ad3a0da3596b8f9989d5ec79214a4231fa -Author: Alban Crequy -Date: Wed Sep 10 12:19:31 2008 +0100 - - Add new test test-tube.py - - tests/twisted/Makefile.am | 6 ++- - tests/twisted/avahi/test-tube.py | 92 ++++++++++++++++++++++++++++++++++++++ - tests/twisted/trivialstream.py | 70 +++++++++++++++++++++++++++++ - 3 files changed, 166 insertions(+), 2 deletions(-) - -commit 98d21ab2103d5e76480c7b0db1e8d8f8a2bf2cf3 -Merge: dc9c963 19e80c3 -Author: Alban Crequy -Date: Wed Sep 10 11:19:02 2008 +0100 - - Merge commit 'sjoerd/salut-testsuite-sjoerd' into tubes - -commit 19e80c34bfa124c35ed6aa83028a51f3fc4f85d5 -Author: Sjoerd Simons -Date: Tue Sep 9 17:45:40 2008 +0100 - - Fixup the tests readme - - tests/README | 20 +++++++------------- - 1 files changed, 7 insertions(+), 13 deletions(-) - -commit 7caeec05eff992753016ad4aac7325fe88e81d2d -Author: Sjoerd Simons -Date: Tue Sep 9 17:22:30 2008 +0100 - - Add a README about how to run the tests - - tests/README | 44 ++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 44 insertions(+), 0 deletions(-) - -commit 1224b2cf9439b0ffcc186b3b3bbe1711f9988166 -Author: Sjoerd Simons -Date: Tue Sep 9 17:11:55 2008 +0100 - - Remove confusing PUBLISHED_NAME constant - - tests/twisted/avahi/test-text-channel.py | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 55f5a33e044641c4fc959c8ef9ec5ab74800d159 -Author: Sjoerd Simons -Date: Tue Sep 9 17:10:09 2008 +0100 - - Improve description - - tests/twisted/xmppstream.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 85fe1af88064b545400dcaee97cb543319e2c549 -Author: Sjoerd Simons -Date: Tue Sep 9 17:08:32 2008 +0100 - - better description - - tests/twisted/saluttest.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bf71971a0b00a26e1f82a2ab9f7e5c22263f9355 -Author: Sjoerd Simons -Date: Tue Sep 9 16:42:28 2008 +0100 - - Remove unused constants - - tests/twisted/avahi/test-aliases.py | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 7bce40d8908038b7cccead460a3607c99261e2c8 -Author: Sjoerd Simons -Date: Tue Sep 9 16:33:32 2008 +0100 - - Wrap twisted test in <80 chars - - configure.ac | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit dc9c963f1960ec99b76406d7434b08cffe093108 -Merge: 1b6895a 4158267 -Author: Alban Crequy -Date: Tue Sep 9 12:18:34 2008 +0100 - - Merge commit 'sjoerd/salut-testsuite-sjoerd' into tubes - -commit 1b6895a0c982f61a7474ba1871a52f96048bfac2 -Author: Alban Crequy -Date: Mon Sep 8 17:46:13 2008 +0100 - - docs/tubes.txt: implementation status - - docs/tubes.txt | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 278eadbef03d26a5a34f8ce9569616e35cf334a8 -Author: Alban Crequy -Date: Mon Sep 8 17:12:59 2008 +0100 - - 1-1 tubes: do no reply to the iq offering the tube before the user accepts it. - - src/salut-tubes-channel.c | 19 +++-- - src/salut-tubes-channel.h | 4 +- - src/salut-tubes-manager.c | 11 +--- - src/tube-stream.c | 174 ++++++++++++++++++++++++++++++++++++++------ - src/tube-stream.h | 3 +- - 5 files changed, 168 insertions(+), 43 deletions(-) - -commit 5cedaf354538e9530da6ad601e899e3f3a07cdbc -Author: Alban Crequy -Date: Mon Sep 8 15:26:18 2008 +0100 - - GibberIqHelper: Change the API to be able to reply to a iq request after the request stanza has been freed - - lib/gibber/gibber-iq-helper.c | 52 ++++++++++++++++++++++++++---------- - lib/gibber/gibber-iq-helper.h | 10 +++++- - src/salut-si-bytestream-manager.c | 6 +++- - src/salut-tubes-manager.c | 6 +++- - tests/check-gibber-iq-helper.c | 14 ++++++--- - 5 files changed, 62 insertions(+), 26 deletions(-) - -commit 70c242dfdfa6efced6b615d688233ed4db5cf17a -Author: Alban Crequy -Date: Mon Sep 8 14:45:22 2008 +0100 - - Set the tube to open when we receive the ack of the SI offer - - src/salut-tubes-channel.c | 4 ++++ - src/tube-iface.c | 2 +- - src/tube-stream.c | 5 +++++ - 3 files changed, 10 insertions(+), 1 deletions(-) - -commit 3ccbda54192796128d4a05cd1821fb6e5379c02a -Author: Will Thompson -Date: Sun Sep 7 22:29:28 2008 +0100 - - Don't build Requests binding as an extension - - extensions/Connection_Interface_Requests.xml | 400 -------------------------- - extensions/connection.xml | 1 - - 2 files changed, 0 insertions(+), 401 deletions(-) - -commit fe455444d101c93fe5658aa3a4e87df573ebcc33 -Author: Will Thompson -Date: Sun Sep 7 22:29:04 2008 +0100 - - Use tp-glib's Requests API; delete local copy. - - src/Makefile.am | 6 - - src/channel-manager.c | 446 --------------- - src/channel-manager.h | 135 ----- - src/conn-requests.c | 1358 ---------------------------------------------- - src/conn-requests.h | 41 -- - src/exportable-channel.c | 150 ----- - src/exportable-channel.h | 61 -- - src/salut-connection.c | 65 ++-- - src/salut-connection.h | 6 - - src/salut-im-channel.c | 6 +- - src/salut-im-manager.c | 39 +- - 11 files changed, 55 insertions(+), 2258 deletions(-) - -commit 5e308a482f6462c743c6847f4bf27efaa824f3b8 -Merge: 5a0aea6 3d39775 -Author: Alban Crequy -Date: Fri Sep 5 15:59:21 2008 +0100 - - Merge branch 'master' into tubes - -commit 4158267d754e8cb0d8658218ca4d5f1ecae40946 -Author: Sjoerd Simons -Date: Thu Sep 4 18:35:23 2008 +0100 - - Add text channel test - - tests/twisted/avahi/test-text-channel.py | 100 ++++++++++++++++++++++++++++++ - 1 files changed, 100 insertions(+), 0 deletions(-) - -commit 72bad72cfcc1966f1c12720c11e5e88fd696cc16 -Author: Sjoerd Simons -Date: Thu Sep 4 18:34:50 2008 +0100 - - Add events for connection results of outgoing connections - - tests/twisted/xmppstream.py | 16 ++++++++++++++-- - 1 files changed, 14 insertions(+), 2 deletions(-) - -commit 31adc7ff45d86fa20ffca79372bbde5461079b18 -Author: Sjoerd Simons -Date: Thu Sep 4 12:34:59 2008 +0100 - - Rename variables so it's more in line with how gabble work - - tests/twisted/Makefile.am | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) - -commit 18d85aab3bb13ef0867138954f7816e67d5fb4f4 -Author: Sjoerd Simons -Date: Thu Sep 4 11:51:32 2008 +0100 - - Only run tests that poke avahi when configure with --enable-avahi-tests - - configure.ac | 14 ++++++++++++++ - tests/Makefile.am | 6 +----- - tests/twisted/Makefile.am | 16 ++++++++++++++-- - 3 files changed, 29 insertions(+), 7 deletions(-) - -commit 52aca437bd01ad703047c2f8bf78280efd04f275 -Author: Will Thompson -Date: Thu Sep 4 00:49:29 2008 +0100 - - Requestotron: don't steal channel class' allowed_properties - - src/conn-requests.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4768e1d0df2387470cce201110b0c6db922238e3 -Author: Sjoerd Simons -Date: Wed Sep 3 19:41:58 2008 +0100 - - Add a incoming and outgoing xmmp stream for testing - - tests/twisted/xmppstream.py | 325 +++++++++++++++++++------------------------ - 1 files changed, 145 insertions(+), 180 deletions(-) - -commit d52856ab967d433177601933df26f28111605ed3 -Author: Will Thompson -Date: Wed Sep 3 19:36:25 2008 +0100 - - ImManager: fail text channel requests with unknown params - - src/salut-im-manager.c | 20 ++++++++++++++++---- - 1 files changed, 16 insertions(+), 4 deletions(-) - -commit 428016816370525b4e622100e6c6ceaf74656182 -Author: Will Thompson -Date: Wed Sep 3 19:32:13 2008 +0100 - - ChannelManager: add a helper to check for unknown properties in requests - - src/channel-manager.c | 28 ++++++++++++++++++++++++++++ - src/channel-manager.h | 6 ++++++ - 2 files changed, 34 insertions(+), 0 deletions(-) - -commit d38576adafcb1ed2a785553cd512f4a365eb43d0 -Author: Will Thompson -Date: Wed Sep 3 19:13:39 2008 +0100 - - ImManager: report request failure for nonexistant users - - src/salut-im-manager.c | 13 ++++++++++--- - 1 files changed, 10 insertions(+), 3 deletions(-) - -commit 826bfe394c4d8995b45a3a7e31570001bb01b54c -Author: Will Thompson -Date: Wed Sep 3 19:10:52 2008 +0100 - - Requestotron: more Target* validation, convert TargetID to TargetHandle - - src/conn-requests.c | 104 +++++++++++++++++++++++++++++++++++++++++---------- - 1 files changed, 84 insertions(+), 20 deletions(-) - -commit b724bc35e2961b2b42129649a4b5457b4fdfbc94 -Author: Will Thompson -Date: Wed Sep 3 12:48:01 2008 +0100 - - ImManager: don't satisfy requests with extra properties - - src/salut-im-manager.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 81c8a86ae14615e8a9255f07e90b2bd07e280c52 -Author: Will Thompson -Date: Wed Sep 3 12:40:01 2008 +0100 - - ImManager: don't implement ChannelFactory any more - - src/salut-im-manager.c | 135 +++--------------------------------------------- - 1 files changed, 8 insertions(+), 127 deletions(-) - -commit 0d8e67bae7a0578247173f372140c45bcc441905 -Author: Will Thompson -Date: Wed Sep 3 12:29:13 2008 +0100 - - ImManager: don't support opening channel to self_handle - - src/salut-im-manager.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit f887fc224ee2d34bca5905f144b63813e39e5826 -Author: Will Thompson -Date: Wed Sep 3 12:24:37 2008 +0100 - - Connection: dispose of requests machinery - - src/salut-connection.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 86fce92cf114c07a38c181b029857842270fa450 -Author: Will Thompson -Date: Wed Sep 3 11:52:25 2008 +0100 - - Connection: use ImManager as a ChannelManager not a ChannelFactory - - src/salut-connection.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit add6b367fd301df87dfae795b48673fb8b954c54 -Author: Will Thompson -Date: Wed Sep 3 11:50:27 2008 +0100 - - Requests: set failed requests' context to NULL before freeing - - src/conn-requests.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 6a6ce74d9073531cb7bbb447ab95e79b28c182c6 -Author: Will Thompson -Date: Tue Sep 2 16:58:35 2008 +0100 - - ImManager: implement _channel_manager_{create,request}_channel - - src/salut-im-manager.c | 108 +++++++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 102 insertions(+), 6 deletions(-) - -commit 253e14d4681e4dc9de45f89113a48147c0994c6e -Author: Will Thompson -Date: Tue Sep 2 15:47:38 2008 +0100 - - ImManager: implement _channel_manager_foreach_channel_class - - src/salut-im-manager.c | 31 ++++++++++++++++++++++++++++++- - 1 files changed, 30 insertions(+), 1 deletions(-) - -commit d188107da516801b95cec8a8adec548c27f496bd -Author: Will Thompson -Date: Tue Sep 2 15:31:48 2008 +0100 - - ImManager: implement _channel_manager_foreach_channel - - src/salut-im-manager.c | 15 ++++++++++++++- - 1 files changed, 14 insertions(+), 1 deletions(-) - -commit 5a626886f28ad3f2d427a76bc5fa69c3845f5a0a -Author: Will Thompson -Date: Tue Sep 2 15:18:53 2008 +0100 - - ImManager: trivial implementation of ChannelManager - - src/salut-im-manager.c | 22 +++++++++++++++++++++- - 1 files changed, 21 insertions(+), 1 deletions(-) - -commit ff34106eac551c0ed65174e3adf104374327f75c -Author: Will Thompson -Date: Tue Sep 2 14:14:38 2008 +0100 - - Add *.loT to .gitignore - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit eb236242e95b1a9a8fc3c6ee55193d1d8d31c56d -Author: Will Thompson -Date: Tue Sep 2 14:12:51 2008 +0100 - - ImChannel: implement ExportableChannel - - src/salut-im-channel.c | 26 ++++++++++++++++++++++++++ - 1 files changed, 26 insertions(+), 0 deletions(-) - -commit d01deaefb924c36b9a982eca9ed3163b8e4fc567 -Author: Will Thompson -Date: Tue Sep 2 12:19:00 2008 +0100 - - ImChannel: implement Channel.FUTURE - - src/salut-im-channel.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++-- - src/salut-im-manager.c | 12 +++++-- - 2 files changed, 80 insertions(+), 7 deletions(-) - -commit 706e508d84669c5fff2cd8ae1c614b14ec43f978 -Author: Will Thompson -Date: Tue Sep 2 11:50:24 2008 +0100 - - Remove salut_im_manager_get_channel_for_handle, which was unused - - src/salut-im-manager.c | 16 ---------------- - src/salut-im-manager.h | 4 ---- - 2 files changed, 0 insertions(+), 20 deletions(-) - -commit 9b01a01958389866ce11167e93b982fc04c6d3f5 -Author: Will Thompson -Date: Mon Sep 1 20:25:08 2008 +0100 - - Add Channel.FUTURE interface from 0.17.9 - - extensions/Channel_Future.xml | 184 +++++++++++++++++++++++++++++++++++++++++ - extensions/channel.xml | 1 + - 2 files changed, 185 insertions(+), 0 deletions(-) - -commit f0484eec7b4d07912f9778342ba141e5800643e3 -Author: Will Thompson -Date: Mon Sep 1 18:52:24 2008 +0100 - - Correct type signatures of channel factories' iface_init functions - - src/salut-contact-manager.c | 8 ++++---- - src/salut-im-manager.c | 8 ++++---- - src/salut-muc-manager.c | 8 ++++---- - 3 files changed, 12 insertions(+), 12 deletions(-) - -commit 256dad24c792373eaba9ddf0ffb85aec74d88bd2 -Author: Will Thompson -Date: Mon Sep 1 18:33:33 2008 +0100 - - Implement C.I.Requests' D-Bus properties - - src/salut-connection.c | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) - -commit b83249e8631a148a29345fc4826acc5084540c43 -Author: Will Thompson -Date: Mon Sep 1 18:11:35 2008 +0100 - - Make the ChannelManager API talk about 'allowed' directly - - src/channel-manager.h | 3 +-- - src/conn-requests.c | 23 +++-------------------- - 2 files changed, 4 insertions(+), 22 deletions(-) - -commit f92f0afd80f69a4263c2f5aea7c5f4d89162c329 -Author: Will Thompson -Date: Mon Sep 1 17:38:28 2008 +0100 - - Implement 'allowed' in terms of 'required' and 'optional' - - src/conn-requests.c | 23 +++++++++++++++++------ - 1 files changed, 17 insertions(+), 6 deletions(-) - -commit 12bbca3deada7a2c2378d5df96fa15f3390ea770 -Author: Sjoerd Simons -Date: Tue Sep 2 15:37:36 2008 +0100 - - Add a test for the various alias sources - - tests/twisted/Makefile.am | 3 +- - tests/twisted/avahi/test-aliases.py | 63 +++++++++++++++++++++++++++++++++++ - 2 files changed, 65 insertions(+), 1 deletions(-) - -commit a586523be72452e1042a15f84da10719b0da8e9e -Author: Sjoerd Simons -Date: Tue Sep 2 15:36:50 2008 +0100 - - Add an option to reset the whole text record instead of updating it - - tests/twisted/avahitest.py | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 5e5b4be2d0a0ec55e070677833cb0076fdf7ab52 -Author: Sjoerd Simons -Date: Tue Sep 2 15:36:18 2008 +0100 - - Remove the modding of the dbus signal paths - - tests/twisted/servicetest.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 563a3e8ab3ee54634d4e3a0850983a066b1675a3 -Author: Sjoerd Simons -Date: Tue Sep 2 14:14:53 2008 +0100 - - Always create AvahiService objects when a service is added, which can be requested to do resolving - - tests/twisted/avahi/test-register.py | 6 ++-- - tests/twisted/avahitest.py | 38 +++++++++++++++++++++++---------- - 2 files changed, 29 insertions(+), 15 deletions(-) - -commit 3d397752e8743b88c531727fab91d0b5cf3fbc6b -Author: Will Thompson -Date: Tue Sep 2 14:14:38 2008 +0100 - - Add *.loT to .gitignore - - .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 70646d5962d634d0bb43c84862d009e133375aea -Author: Sjoerd Simons -Date: Tue Sep 2 11:32:57 2008 +0100 - - Add a service announcer and a test for it - - tests/twisted/avahitest.py | 68 ++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 68 insertions(+), 0 deletions(-) - -commit 2521a1cec1acfe5b17ca0b0ff0a4d1a5eb4b1c99 -Author: Sjoerd Simons -Date: Tue Sep 2 11:31:43 2008 +0100 - - Add utility functions to get domain name and fqdn hostname form avahi - - tests/twisted/avahitest.py | 13 +++++++++++-- - 1 files changed, 11 insertions(+), 2 deletions(-) - -commit 75f01ff3be060e033b24d141b0ca824cb7f81c22 -Author: Sjoerd Simons -Date: Mon Sep 1 20:34:35 2008 +0100 - - Test that the service is register with the correct txt record - - tests/twisted/avahi/test-register.py | 25 ++++++++++++++++++++++--- - 1 files changed, 22 insertions(+), 3 deletions(-) - -commit f570f0f3530a23d9287f612147f16b8e07f74b85 -Author: Sjoerd Simons -Date: Mon Sep 1 20:32:45 2008 +0100 - - Add service resolving - - tests/twisted/avahitest.py | 45 +++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 44 insertions(+), 1 deletions(-) - -commit a35ea455a6f042aa007028af950a16dbe8908b0e -Author: Will Thompson -Date: Mon Sep 1 18:52:24 2008 +0100 - - Correct type signatures of channel factories' iface_init functions - - src/salut-contact-manager.c | 8 ++++---- - src/salut-im-manager.c | 8 ++++---- - src/salut-muc-manager.c | 8 ++++---- - 3 files changed, 12 insertions(+), 12 deletions(-) - -commit 4b90ac1708fcec38f55e594cd344e115c907714f -Author: Sjoerd Simons -Date: Mon Sep 1 18:40:15 2008 +0100 - - Very basic first test: test that calling an avahi connection causes a service to appear - - tests/twisted/avahi/test-register.py | 14 ++++++++++++-- - 1 files changed, 12 insertions(+), 2 deletions(-) - -commit 2f9d6dd3fa112844fd605348605673dc0c2a8b5f -Author: Sjoerd Simons -Date: Mon Sep 1 18:39:31 2008 +0100 - - Add some avahi testing utilities - - tests/twisted/avahitest.py | 53 ++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 53 insertions(+), 0 deletions(-) - -commit 8601536a08c783eb3167fdc4c4394fa552b4ea5c -Author: Sjoerd Simons -Date: Mon Sep 1 18:39:03 2008 +0100 - - Add a default published name that doesn't easily class with usernames - - tests/twisted/saluttest.py | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 5d562a2005d9633e0900c865d7cc6c407dd9b3bd -Author: Will Thompson -Date: Mon Sep 1 17:21:33 2008 +0100 - - Update Requests spec draft to that from 0.17.9 - - extensions/Connection_Interface_Requests.xml | 90 +++++++++++++------------ - 1 files changed, 47 insertions(+), 43 deletions(-) - -commit 1877be74f25bfa719a33330b3be7e6aa51d2f842 -Author: Sjoerd Simons -Date: Mon Sep 1 14:48:26 2008 +0100 - - Make default arguments right for a salut connection - - tests/twisted/saluttest.py | 7 ++----- - 1 files changed, 2 insertions(+), 5 deletions(-) - -commit d48e335f0a3c41a169fcc3baa5a079f534c630a8 -Author: Sjoerd Simons -Date: Mon Sep 1 14:35:46 2008 +0100 - - Instantiate at least a test - - tests/twisted/avahi/test-register.py | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 003335aa9e081a6205e16adedcc4e2a471c11273 -Author: Sjoerd Simons -Date: Mon Sep 1 14:35:26 2008 +0100 - - Don't make an initial stream - - tests/twisted/saluttest.py | 14 +++++--------- - 1 files changed, 5 insertions(+), 9 deletions(-) - -commit 08994c84fc2ea75a553fda83e7c4866849930515 -Author: Sjoerd Simons -Date: Mon Sep 1 14:33:42 2008 +0100 - - Move the xmpp bits into xmppstream.py - - tests/twisted/saluttest.py | 291 +------------------------------------------ - tests/twisted/xmppstream.py | 224 +++++++++++++++++++++++++++++++++ - 2 files changed, 226 insertions(+), 289 deletions(-) - -commit 6db6db65362d28afcb6ea4698be34201ba72c8a8 -Author: Sjoerd Simons -Date: Mon Sep 1 13:57:53 2008 +0100 - - Copy basic test infrastructure from gabble with s/gabble/salut where applicable - - configure.ac | 22 ++- - tests/Makefile.am | 6 +- - tests/twisted/Makefile.am | 33 ++ - tests/twisted/avahi/test-register.py | 3 + - tests/twisted/saluttest.py | 386 +++++++++++++++++++++ - tests/twisted/servicetest.py | 478 +++++++++++++++++++++++++++ - tests/twisted/tools/Makefile.am | 32 ++ - tests/twisted/tools/exec-with-log.sh.in | 15 + - tests/twisted/tools/salut.service.in | 3 + - tests/twisted/tools/tmp-session-bus.conf.in | 30 ++ - tests/twisted/tools/with-session-bus.sh | 73 ++++ - 11 files changed, 1078 insertions(+), 3 deletions(-) - -commit 346912e0fc8efdd5d620ef8f0ac48fb5b0f6f3a5 -Author: Will Thompson -Date: Tue Aug 26 17:20:00 2008 +0100 - - SalutConnection: make conn-requests implement RequestChannel - - src/salut-connection.c | 12 +++++++++++- - 1 files changed, 11 insertions(+), 1 deletions(-) - -commit 961999222c78a845b3801247c02cbb3c32685856 -Author: Will Thompson -Date: Tue Aug 26 17:12:14 2008 +0100 - - SalutConnection: unconditionally include extensions.h - - src/salut-connection.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit c500c3441205577aa355f5230c2a775553f8f2a8 -Author: Will Thompson -Date: Tue Aug 26 17:11:16 2008 +0100 - - Build extensions.c into libsalut-extensions - - extensions/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 6579220d340dea27e0450494a25dc0cae7a4e716 -Author: Will Thompson -Date: Tue Aug 26 12:00:43 2008 +0100 - - Copy Requests implementation from Gabble. - - src/Makefile.am | 2 + - src/conn-requests.c | 1299 ++++++++++++++++++++++++++++++++++++++++++++++++ - src/conn-requests.h | 41 ++ - src/salut-connection.h | 6 + - 4 files changed, 1348 insertions(+), 0 deletions(-) - -commit 7a7795c199926be933a3e5ffa153d460f6024f6e -Author: Will Thompson -Date: Tue Aug 26 12:00:18 2008 +0100 - - Generate GTypes for spec extensions - - extensions/Makefile.am | 7 +++++++ - extensions/extensions.h | 1 + - 2 files changed, 8 insertions(+), 0 deletions(-) - -commit 0a09ef89a736ccbfe07598b8975d5f9d6cd300c6 -Author: Will Thompson -Date: Mon Aug 25 18:42:17 2008 +0100 - - Build Requests interface. - - extensions/Connection_Interface_Requests.xml | 396 ++++++++++++++++++++++++++ - extensions/all.xml | 11 + - extensions/connection.xml | 1 + - 3 files changed, 408 insertions(+), 0 deletions(-) - -commit 457ce2f34ca84098dc99e6199063eda3fdaeea63 -Author: Will Thompson -Date: Mon Aug 25 17:02:19 2008 +0100 - - Copy SalutChannelManager and SalutExportableChannel from Gabble. - - src/Makefile.am | 4 + - src/channel-manager.c | 418 ++++++++++++++++++++++++++++++++++++++++++++++ - src/channel-manager.h | 130 ++++++++++++++ - src/exportable-channel.c | 150 +++++++++++++++++ - src/exportable-channel.h | 61 +++++++ - 5 files changed, 763 insertions(+), 0 deletions(-) - -commit 9db85f991df22f642c221d9180c525a40a026d67 -Author: Will Thompson -Date: Tue Aug 26 13:01:15 2008 +0100 - - Change a stray _boring regex to a glob - - .gitignore | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c241de5a18d00521ce2d5940622a4e360317a98f -Author: Will Thompson -Date: Tue Aug 26 12:12:12 2008 +0100 - - Move remaining exclusions from _boring to .gitignore. - - .gitignore | 21 ++++++++++++++++- - _boring | 71 ------------------------------------------------------------ - 2 files changed, 19 insertions(+), 73 deletions(-) - -commit 8edc08fda13962af8f4e2990ff0ebd6ae1e8071a -Author: Will Thompson -Date: Mon Aug 25 16:38:27 2008 +0100 - - Replace "Gabble" with "Salut" in property description. - - src/salut-contact-channel.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit f39ef898dc6d4829a3caba30dc7633076074c75d -Author: Will Thompson -Date: Mon Aug 25 16:22:14 2008 +0100 - - Fill in .gitignore - - .gitignore | 46 ++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 46 insertions(+), 0 deletions(-) - -commit edfbefc517bb81f214897d2ca5db28e807076cd1 -Author: Will Thompson -Date: Mon Aug 25 16:00:26 2008 +0100 - - Downgrade missing asyncns warning to a notice. - - configure.ac | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 5a0aea6c2f3f61121dbe8ed19eb3b4e345ffc318 -Author: Alban Crequy -Date: Fri Aug 22 17:12:47 2008 +0100 - - Remove the channel property in stream tube - - src/tube-stream.c | 15 --------------- - 1 files changed, 0 insertions(+), 15 deletions(-) - -commit bed5c393636a1cd6f6e4e876e29f17176d03ec10 -Author: Alban Crequy -Date: Fri Aug 22 17:11:12 2008 +0100 - - src/tube-stream.c: More useful debug - - src/tube-stream.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit e8071d9130b67aaa19ac423d0197a2e98964c0ba -Author: Alban Crequy -Date: Fri Aug 22 17:08:02 2008 +0100 - - src/tube-stream.c: start_stream_direct(): Early return in case of error - - src/tube-stream.c | 68 +++++++++++++++++++++++++++------------------------- - 1 files changed, 35 insertions(+), 33 deletions(-) - -commit 03ea6d78bdeb8de38fd4280c976682e9336a230f -Author: Alban Crequy -Date: Fri Aug 22 17:02:11 2008 +0100 - - Remove code after g_assert_not_reached(), it is pointless - - src/tube-stream.c | 22 ++++++++-------------- - 1 files changed, 8 insertions(+), 14 deletions(-) - -commit 201cd2d0910c4bf4344da7c2cea0601161e2d720 -Author: Alban Crequy -Date: Fri Aug 22 16:47:19 2008 +0100 - - Remove deprecated functions: salut_tubes_manager_handle_si_stream_request - - We don't use SI for 1-1 tubes anymore - - src/salut-si-bytestream-manager.c | 20 ++------------------ - src/salut-tubes-channel.c | 3 +-- - src/salut-tubes-manager.c | 28 ---------------------------- - src/salut-tubes-manager.h | 4 ---- - 4 files changed, 3 insertions(+), 52 deletions(-) - -commit 8b254f1a91278b4ab3d7f1567ea7e43d9aee2c68 -Author: Alban Crequy -Date: Fri Aug 22 16:40:47 2008 +0100 - - Remove never used function salut_tubes_manager_handle_tube_request - - src/salut-tubes-manager.c | 31 ------------------------------- - 1 files changed, 0 insertions(+), 31 deletions(-) - -commit b8ef6f6be6f36dd59d36385f3894f58a3e7a48f5 -Author: Alban Crequy -Date: Fri Aug 22 16:37:45 2008 +0100 - - Fix typo - - src/salut-tubes-manager.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit a33c71aadaf20298932b55fa7e9811d4abcf86c4 -Author: Alban Crequy -Date: Fri Aug 22 16:34:16 2008 +0100 - - Remove uneeded initialization - - src/salut-tubes-manager.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit ecd06befe8a245e3d155d84765d9bf168728da98 -Author: Alban Crequy -Date: Fri Aug 22 16:30:56 2008 +0100 - - extract_tube_information: Use tp_strdiff - - src/salut-tubes-manager.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit e28d0d73234e6b8d478186256bbb24e48333212e -Author: Alban Crequy -Date: Fri Aug 22 16:24:21 2008 +0100 - - Clean up extract_tube_information: do not use 2 variables with the same name in the same function, and return early when possible to avoid complex code - - src/salut-tubes-manager.c | 71 ++++++++++++++++++++++++--------------------- - 1 files changed, 38 insertions(+), 33 deletions(-) - -commit 6455f1161c80aebf23c320797a2ffd30438e0f6e -Author: Alban Crequy -Date: Fri Aug 22 16:00:45 2008 +0100 - - group declarations at the beginning of the block - - src/salut-tubes-channel.c | 9 ++++----- - 1 files changed, 4 insertions(+), 5 deletions(-) - -commit 05fa249f44963c9bebd65987db166592d296b9cd -Author: Alban Crequy -Date: Fri Aug 22 15:54:30 2008 +0100 - - Fix typo - - src/salut-tubes-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 68cefe9e2df2b45a343c33df994ecde9c6db7e4b -Author: Alban Crequy -Date: Fri Aug 22 15:53:31 2008 +0100 - - Coding style: function prototype - - src/salut-tubes-channel.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 74040da0315d3b5c83439fb857026388b7664275 -Author: Alban Crequy -Date: Fri Aug 22 15:50:02 2008 +0100 - - Factorise g_object_ref (priv->xmpp_connection) in _initialise_connection - - src/salut-tubes-channel.c | 15 ++++++--------- - 1 files changed, 6 insertions(+), 9 deletions(-) - -commit 98599956bfc3123aea96af1dcbfce796aff10083 -Author: Alban Crequy -Date: Fri Aug 22 15:45:07 2008 +0100 - - remove useless double blank lines - - src/salut-tubes-channel.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit dc075c6ba3fcb3f07df8e9b7bae570a58f171586 -Author: Alban Crequy -Date: Fri Aug 22 15:43:59 2008 +0100 - - struct _SalutTubesChannelPrivate: distinguish fields used by muc tubes and 1-1 tubes - - src/salut-tubes-channel.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit eefb51a63d3a1bcdd31796d22cb54c5ff7f64543 -Author: Alban Crequy -Date: Fri Aug 22 15:38:52 2008 +0100 - - Coding style: function declarations at the begin of the .c file should have the "static void" on their own line - - src/salut-tubes-channel.c | 39 +++++++++++++++------------------------ - src/tube-stream.c | 3 +-- - 2 files changed, 16 insertions(+), 26 deletions(-) - -commit 4a2dc3a96db3977ccf312a82521d090663637842 -Author: Alban Crequy -Date: Fri Aug 22 15:32:16 2008 +0100 - - src/salut-direct-bytestream-manager.c: listener_io_in_cb must return TRUE to continue listening - - src/salut-direct-bytestream-manager.c | 10 +++------- - 1 files changed, 3 insertions(+), 7 deletions(-) - -commit 0f6d91e0dde8f668acc99aaa446e0eac8ad3217b -Author: Alban Crequy -Date: Fri Aug 22 15:25:33 2008 +0100 - - Remove host_name_fqdn on salut-direct-bytestream-manager - - src/salut-connection.c | 3 +- - src/salut-direct-bytestream-manager.c | 35 +------------------------------- - src/salut-direct-bytestream-manager.h | 3 +- - 3 files changed, 4 insertions(+), 37 deletions(-) - -commit c83f3694af07e6a5f3e63d5edfe146c7fcb66571 -Author: Alban Crequy -Date: Fri Aug 22 15:15:07 2008 +0100 - - Remove src/salut-bytestream-manager.h - - src/salut-bytestream-manager.h | 83 ---------------------------------------- - 1 files changed, 0 insertions(+), 83 deletions(-) - -commit 2ef678b81456415719fc8a61098a9f5c10025d2d -Author: Alban Crequy -Date: Fri Aug 22 15:04:34 2008 +0100 - - Fix: Do not assert when the XmppConnection is gone - - src/salut-direct-bytestream-manager.c | 2 -- - src/salut-direct-bytestream-manager.h | 2 +- - src/tube-stream.c | 11 +---------- - 3 files changed, 2 insertions(+), 13 deletions(-) - -commit 5d543e68a1a0ac8ea6096404fdade10bcb646821 -Author: Alban Crequy -Date: Fri Aug 22 14:50:19 2008 +0100 - - Replace XmppConnection by a GArray of address in GibberBytestreamDirect - - lib/gibber/gibber-bytestream-direct.c | 50 ++++++++++++++------------------- - src/salut-direct-bytestream-manager.c | 2 +- - 2 files changed, 22 insertions(+), 30 deletions(-) - -commit 3d8e778203d2783d9d1873e873a37a03bb3c6265 -Author: Alban Crequy -Date: Fri Aug 22 12:17:56 2008 +0100 - - Identation/add a space - - lib/gibber/gibber-bytestream-direct.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 78742c07cd138850532b3beebd5e0b51126a6d83 -Author: Alban Crequy -Date: Fri Aug 22 12:08:49 2008 +0100 - - args of g_signal_new should be 4 spaces aligned - - lib/gibber/gibber-bytestream-direct.c | 36 ++++++++++++++++---------------- - 1 files changed, 18 insertions(+), 18 deletions(-) - -commit c87733695939a01290a72955196a552218b1465b -Merge: a1f29c0 ac3cb0a -Author: Alban Crequy -Date: Fri Aug 22 12:05:32 2008 +0100 - - Merge commit 'origin/master' into tubes - - Conflicts: - - src/salut-tubes-channel.c - -commit a1f29c082515ce22bd56dc859bb22a4f673f0cfe -Author: Alban Crequy -Date: Fri Aug 22 11:47:34 2008 +0100 - - Wrap > 80 chars lines - - lib/gibber/gibber-bytestream-direct.c | 18 ++++++++++++------ - 1 files changed, 12 insertions(+), 6 deletions(-) - -commit 3d4ed9ecdc5fb6ff386e7fa195c9f248362535c8 -Author: Alban Crequy -Date: Fri Aug 22 11:44:27 2008 +0100 - - Remove stream_init_id, not used anymore - - lib/gibber/gibber-bytestream-direct.c | 24 ------------------------ - 1 files changed, 0 insertions(+), 24 deletions(-) - -commit 9e8fabeac8972f22043548ffc81c16919a4c401f -Author: Alban Crequy -Date: Fri Aug 22 11:37:08 2008 +0100 - - gibber-bytestream-direct: Add a comment on PROP_PROTOCOL - - lib/gibber/gibber-bytestream-direct.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 57891774db0414a635da9d5498651f567f794a99 -Author: Alban Crequy -Date: Fri Aug 22 11:31:04 2008 +0100 - - Fix identation in lib/gibber/gibber-bytestream-direct.h - - lib/gibber/gibber-bytestream-direct.h | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit ac3cb0a0ac24e9931e710f3e1e28f34282f8377f -Author: Sjoerd Simons -Date: Wed Aug 20 19:08:29 2008 +0100 - - version telepathy-salut 0.3.4.1 - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 28c0ac5b51aa3694b0df8b0441771831f2ee52e2 -Author: Sjoerd Simons -Date: Wed Aug 20 17:41:04 2008 +0100 - - Properly add avahi olpc support to the avahi backend when compiling with olpc support - - src/Makefile.am | 25 ++++++++++++++----------- - 1 files changed, 14 insertions(+), 11 deletions(-) - -commit 2b2998bf6a7844e05f04e78b2ef462d44f3c0c60 -Author: Sjoerd Simons -Date: Wed Aug 20 17:35:56 2008 +0100 - - Make autogen.sh executable - - 0 files changed, 0 insertions(+), 0 deletions(-) - -commit 2da3f3be6a74b5690ca23e419152a3f7f30865d3 -Author: Sjoerd Simons -Date: Wed Aug 20 15:30:21 2008 +0100 - - version 0.3.4 - - NEWS | 14 ++++++++++++++ - configure.ac | 4 ++-- - 2 files changed, 16 insertions(+), 2 deletions(-) - -commit 3c891781e8947e12ed197834fbb566e73ddda6b7 -Author: Sjoerd Simons -Date: Wed Aug 20 15:53:42 2008 +0100 - - Refer to gitweb instead of darcs - - README | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4abc76f17949e855ac2551cc35467b0d972bdffb -Author: Sjoerd Simons -Date: Wed Aug 20 15:49:36 2008 +0100 - - Copy git dist-hook from gabble - - Makefile.am | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 0c4885f02c635f6beea1b77568a0724a3243a954 -Merge: 170fb38 857a484 -Author: Sjoerd Simons -Date: Wed Aug 20 13:06:50 2008 +0100 - - Merge branch 'master' into inspectotron-sjoerd - -commit 170fb3881e8a25a04e7e81c65d209d90c35d31ab -Author: Sjoerd Simons -Date: Wed Aug 20 13:03:59 2008 +0100 - - SalutConnection: Small coding style polish - - src/salut-connection.c | 15 ++++++++------- - 1 files changed, 8 insertions(+), 7 deletions(-) - -commit aa26613ed2feaca77c191142852977b8e12de9d6 -Author: Sjoerd Simons -Date: Wed Aug 20 12:59:16 2008 +0100 - - SalutConnection: fix up indentation in get_alias - - src/salut-connection.c | 24 ++++++++++++------------ - 1 files changed, 12 insertions(+), 12 deletions(-) - -commit b197d5a396b52f568b0353da1f86e386df0d738c -Author: Sjoerd Simons -Date: Wed Aug 20 12:58:10 2008 +0100 - - SalutConnection: rename handle_repo to contact_repo where dealing purely with contact handles - - src/salut-connection.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 857a484795b17e51998c5903d3d3670b2acfc727 -Author: Sjoerd Simons -Date: Tue Aug 19 22:28:04 2008 +0100 - - SalutMucChannel: Remove unused SalutConnection in the private struct - - src/salut-muc-channel.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 8eeaab9511c499eb597d6cf9ffc462ee1a5228b7 -Author: Sjoerd Simons -Date: Tue Aug 19 22:24:55 2008 +0100 - - SalutRoomlistChannel: Define the interfaces property - - src/salut-roomlist-channel.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 5fda4c8f71c1cc96e56e23227814e0d52f82b77e -Author: Sjoerd Simons -Date: Tue Aug 19 18:56:36 2008 +0100 - - SalutTubesChannel: Add TargetID property - - src/salut-tubes-channel.c | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit ee83838e749b1707e9fc057bf4448c1c5d8647ce -Author: Sjoerd Simons -Date: Tue Aug 19 18:56:26 2008 +0100 - - SalutRoomlistChannel: Add TargetID property - - src/salut-roomlist-channel.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit ceb8c6da02ffd92693f1c6ad8c4cd4162f3c78dd -Author: Sjoerd Simons -Date: Tue Aug 19 18:56:14 2008 +0100 - - SalutMucChannel: Add TargetID property - - src/salut-muc-channel.c | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit 97db7be2b5256d2c4f8791995ee2292d223e6943 -Author: Sjoerd Simons -Date: Tue Aug 19 18:56:07 2008 +0100 - - SalutImChannel: Add TargetID property - - src/salut-im-channel.c | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit 42606022c7c037724bfb9834481381354cc3f367 -Author: Sjoerd Simons -Date: Tue Aug 19 18:55:58 2008 +0100 - - SalutContactChannel: Add TargetID property - - src/salut-contact-channel.c | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit 93534ea96d8712edacaa7d30eb379ec98d4dee92 -Author: Sjoerd Simons -Date: Tue Aug 19 17:30:53 2008 +0100 - - SalutConnection: Implement GetAliases and refactor the alias getting - - src/salut-connection.c | 120 +++++++++++++++++++++++++++++------------------- - 1 files changed, 72 insertions(+), 48 deletions(-) - -commit a262aef23aa4f303cd80667e7dd3eacc42dbd83a -Author: Sjoerd Simons -Date: Tue Aug 19 17:01:49 2008 +0100 - - SalutConnection: In RequestAliases if we don't have information about a contact, let the alias fall back to the handle name - - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 362a0b4aaee0282cad9ab97454c4f9a48abb870a -Author: Sjoerd Simons -Date: Tue Aug 19 16:58:42 2008 +0100 - - SalutConnection: Add Aliasing to the Contacts interface - - src/salut-connection.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 52 insertions(+), 1 deletions(-) - -commit f21305455e8a75b19bd70abfb612f202a435304b -Author: Sjoerd Simons -Date: Tue Aug 19 16:39:23 2008 +0100 - - Add avatars to the Contacts interface - - src/salut-connection.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 54 insertions(+), 0 deletions(-) - -commit 745a8a7ea4bca8e77cba8a6d8072d19c49b306f8 -Author: Sjoerd Simons -Date: Tue Aug 19 17:33:19 2008 +0100 - - SalutConnection: Add the Contacts interface to the connection and reorder the interface in alphabetical order - - src/salut-connection.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit bc5bb561b4c2f975301cb0bfa9b476859c53eb43 -Author: Sjoerd Simons -Date: Tue Aug 19 16:23:26 2008 +0100 - - Add basic inspectotron support - - src/salut-connection.c | 11 +++++++++++ - src/salut-connection.h | 3 +++ - 2 files changed, 14 insertions(+), 0 deletions(-) - -commit f3de654193a5218026cb295618f51407fd4c4b5e -Author: Sjoerd Simons -Date: Tue Aug 19 16:03:58 2008 +0100 - - Depend on telepathy-glib >= 0.7.14 for the contacts mixin - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b7407782bb6711955a2d3c6de402b85cd44c8382 -Author: Alban Crequy -Date: Mon Aug 18 14:07:38 2008 +0100 - - Fix request tube channel: do not crash when requesting a tubes channel with a non existent contact - - src/salut-tubes-manager.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 3f84b5232cb85aef0fe5929790306534954e893b -Author: Sjoerd Simons -Date: Wed Aug 13 12:17:23 2008 +0100 - - SalutTubesChannel: Initialize external group properties - - src/salut-tubes-channel.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 299f069c615e17e5314e4275f79f4afc9d6e0a7f -Author: Sjoerd Simons -Date: Wed Aug 13 12:13:02 2008 +0100 - - SalutTubesChannel: Add a comment about telelepathy interface ordering - - src/salut-tubes-channel.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 5ed2353c903f2caf16d92976d4d057e9a536b02f -Author: Alban Crequy -Date: Tue Aug 12 15:50:00 2008 +0100 - - Fix merging problem with the darcs-git transition - - src/salut-connection.c | 8 -------- - 1 files changed, 0 insertions(+), 8 deletions(-) - -commit c39e758314c8bdda8b71eb7aad3870274d640ec8 -Merge: 4b0a253 3903a10 -Author: Jonny Lamb -Date: Tue Aug 12 14:14:25 2008 +0100 - - Merge branch 'master' into tubes - - Conflicts: - - src/debug.c - src/debug.h - src/salut-bytestream-manager.h - src/salut-connection.c - src/salut-si-bytestream-manager.c - src/salut-tubes-channel.c - src/tube-stream.c - - Signed-off-by: Jonny Lamb - -commit 4b0a253036d44d22e344d4e8b070035e521e5e45 -Author: Alban Crequy -Date: Mon Aug 11 10:36:06 2008 +0000 - - Update doc/tubes.txt - - 20080811103606-a41c0-4fc57c7790d33bfaec0a9754f29391794c5fc1a6.gz - - docs/tubes.txt | 114 +++++++------------------------------------------------- - 1 files changed, 14 insertions(+), 100 deletions(-) - -commit 648211fe137f4b7719a514c7fceb49b3af2a6419 -Author: Alban Crequy -Date: Tue Aug 5 10:44:31 2008 +0000 - - GibberBytestreamDirect connects to the right host instead of localhost - - 20080805104431-a41c0-705405af062328714141da27198fc4c7c8b9afa4.gz - - lib/gibber/gibber-bytestream-direct.c | 76 +++++++++++++++++++++------------ - src/salut-direct-bytestream-manager.c | 3 +- - src/salut-direct-bytestream-manager.h | 2 +- - src/salut-tubes-channel.c | 1 - - src/tube-stream.c | 23 +++++++--- - 5 files changed, 68 insertions(+), 37 deletions(-) - -commit f13bb9e2a318f8acde91c806fb2ec4838bc9df9d -Author: Alban Crequy -Date: Tue Aug 5 10:43:43 2008 +0000 - - tube-stream.c: Block reading on the application's socket when the tube's buffer is not empty - - 20080805104343-a41c0-e542e054a89212ec86e2eb37ae54765437b807ff.gz - - src/tube-stream.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 74 insertions(+), 3 deletions(-) - -commit 9400767ed352d122e619f18e3435e447e9765367 -Author: Alban Crequy -Date: Fri Aug 1 14:20:26 2008 +0000 - - SalutDirectBytestreamManager: clean up API, stop listening on the socket when the tube is closed - - 20080801142026-a41c0-a27a76056b40ddaeb1e50284fd5bb2cc36263869.gz - - src/salut-direct-bytestream-manager.c | 122 +++++++++++++++++++++++---------- - src/salut-direct-bytestream-manager.h | 19 +++--- - src/salut-tubes-channel.c | 12 +++- - src/tube-stream.c | 14 ++++ - 4 files changed, 119 insertions(+), 48 deletions(-) - -commit e2f8d5d876a2fd5477e8174ab9e72b2699f46739 -Author: Alban Crequy -Date: Thu Jul 31 14:21:37 2008 +0000 - - 1-1 tubes: use direct tcp connections, and connect to the right port - - 20080731142137-a41c0-efce423d1593431bd156242fa9216afd72c860f2.gz - - lib/gibber/gibber-bytestream-direct.c | 23 +++++++- - src/salut-direct-bytestream-manager.c | 100 +++++++++++++------------------- - src/salut-direct-bytestream-manager.h | 13 +++- - src/salut-tubes-channel.c | 33 ++++++++--- - src/salut-tubes-channel.h | 2 +- - src/salut-tubes-manager.c | 38 +++++++++++- - src/tube-stream.c | 75 +++++++++++++++++++++++- - src/tube-stream.h | 2 +- - 8 files changed, 203 insertions(+), 83 deletions(-) - -commit 103078c69e4d01fffb71b5fbebd5397269f975b8 -Author: Alban Crequy -Date: Wed Jul 30 16:31:19 2008 +0000 - - GibberBystreamDirect: implement _block_read, _initiate and _accept_socket - - 20080730163119-a41c0-772067c8e1391f208621de50222c1517b697db91.gz - - lib/gibber/gibber-bytestream-direct.c | 84 +++++++++++++++++++++++++++++++-- - lib/gibber/gibber-bytestream-direct.h | 7 +++ - 2 files changed, 86 insertions(+), 5 deletions(-) - -commit 1f20374bc06e5a9e4ae69ca61cce6bef84322f69 -Author: Alban Crequy -Date: Wed Jul 30 16:27:38 2008 +0000 - - GibberBystreamDirect: remove uneeded fields - - 20080730162738-a41c0-531fd78a64bc9c47525a56883bf5c51e62cd8d00.gz - - lib/gibber/gibber-bytestream-direct.c | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit 8f9260a0cc6fca20f943f5e01d6b81f3d7a3f58d -Author: Alban Crequy -Date: Wed Jul 30 16:26:43 2008 +0000 - - GibberBystreamDirect: Add host/port properties to GibberBystreamDirect object - - 20080730162643-a41c0-224f1bd47548f3df07378740f112b9bc154f7db3.gz - - lib/gibber/gibber-bytestream-direct.c | 47 +++++++++++++++++++++++++++++++++ - 1 files changed, 47 insertions(+), 0 deletions(-) - -commit 8402aba24a9c6b3dec8d322d3657a129605b65fd -Author: Alban Crequy -Date: Tue Jul 29 19:42:22 2008 +0000 - - src/salut-direct-bytestream-manager.c: Remove uneeded variables - - 20080729194222-a41c0-8181fe9bf45206f2bb70a4baf59076654b2b225b.gz - - src/salut-direct-bytestream-manager.c | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) - -commit 391b97eb483ec1f359dcedd351445bc2b7ec4ea0 -Author: Alban Crequy -Date: Tue Jul 29 10:45:08 2008 +0000 - - DirectBytestreamManager listens for connections (initiator side). Prototype to make new streams (recipient side) - - 20080729104508-a41c0-b69e618eb934e92af6a03c988d9f8f589e5f0842.gz - - src/salut-direct-bytestream-manager.c | 220 ++++++++++++++++++++++++++++++++- - src/salut-direct-bytestream-manager.h | 6 + - src/salut-tubes-channel.c | 16 +++- - src/tube-stream.c | 92 +++++++++++++- - 4 files changed, 325 insertions(+), 9 deletions(-) - -commit 7b8dea5ea4eec6d75ef20f9a95d98fe86fae0da2 -Author: Alban Crequy -Date: Tue Jul 29 10:40:04 2008 +0000 - - direct-bytestream-manager: make DEBUG() works - - 20080729104004-a41c0-d3512181bbfcf891c2e8208f229e63005a79b47e.gz - - src/debug.c | 1 + - src/debug.h | 13 ++++++++----- - 2 files changed, 9 insertions(+), 5 deletions(-) - -commit d31d1f69b8f69ca020c588d8574b18188c3be3c0 -Author: Alban Crequy -Date: Tue Jul 29 10:38:50 2008 +0000 - - gibber-bytestream-direct: Implement gibber_bytestream_direct_accept_socket() - - 20080729103850-a41c0-2b8d67c07d54a6e918812daa7ff07fbae5509aa3.gz - - lib/gibber/gibber-bytestream-direct.c | 209 ++++++++++++++++++++++++++++++++- - lib/gibber/gibber-bytestream-direct.h | 9 ++ - 2 files changed, 217 insertions(+), 1 deletions(-) - -commit f7c80cb7494def70ea2d95c5cdaa676c3566c7c4 -Author: Alban Crequy -Date: Mon Jul 28 16:31:07 2008 +0000 - - src/salut-direct-bytestrefix typo in gobject macros - - 20080728163107-a41c0-f72c57047ecb40025320b4bf2644e2fea91e8ef8.gz - - src/salut-direct-bytestream-manager.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6d4eeded78ae4461dcaea64931f90c4d6b916944 -Author: Alban Crequy -Date: Mon Jul 28 16:27:20 2008 +0000 - - salut-connection.c: Fix type when creating the DirectBytestreamManager - - 20080728162720-a41c0-ede8b62f55782093f78b471078deee570befadbc.gz - - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b978d24a10cdfa9c10f8ab7494a2a174f5eb7159 -Author: Alban Crequy -Date: Mon Jul 28 16:24:21 2008 +0000 - - gibber-bytestream-direct.c: Add debugs for not yet implemented functions - - 20080728162421-a41c0-7149bef7eb2acf1501e1afa713e4e1905daf05f9.gz - - lib/gibber/gibber-bytestream-direct.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 2005be2e17f7c16198e0ef491949e1174731a065 -Author: Alban Crequy -Date: Mon Jul 28 16:16:49 2008 +0000 - - gibber-bytestream-direct.c: add protocol property, remove xmpp_connection property - - 20080728161649-a41c0-5a740b12baba4f5a89a63c952c6d28c11bd8709a.gz - - lib/gibber/gibber-bytestream-direct.c | 35 ++++++-------------------------- - 1 files changed, 7 insertions(+), 28 deletions(-) - -commit 1ce672b68024a43f351db0410f83c9c830ac68ec -Author: Alban Crequy -Date: Mon Jul 28 14:09:01 2008 +0000 - - Stream tubes: Simplify extra_bytestream_negotiate_cb: remove uneeded parameters - - 20080728140901-a41c0-c6b2fc5d92753a09842391562e17c448ea958c74.gz - - src/salut-si-bytestream-manager.c | 6 ++---- - src/salut-si-bytestream-manager.h | 3 +-- - src/tube-stream.c | 2 -- - 3 files changed, 3 insertions(+), 8 deletions(-) - -commit b1f2b9fb48738a4b363c052db9afde850085c9fa -Author: Alban Crequy -Date: Fri Jul 25 10:45:15 2008 +0000 - - Add GibberBytestreamDirect, and SalutDirectBytestreamManager uses GibberBytestreamDirect - - 20080725104515-a41c0-626750f65c15e993f642ce3f12dd78151bf697b9.gz - - lib/gibber/Makefile.am | 2 + - lib/gibber/gibber-bytestream-direct.c | 359 +++++++++++++++++++++++++++++++++ - lib/gibber/gibber-bytestream-direct.h | 62 ++++++ - src/salut-direct-bytestream-manager.c | 17 ++ - src/salut-direct-bytestream-manager.h | 5 + - 5 files changed, 445 insertions(+), 0 deletions(-) - -commit eb459e9ccd32ff33a7f290b3900ba456e278970f -Author: Alban Crequy -Date: Thu Jul 24 14:42:26 2008 +0000 - - Add direct-bytestream-manager, still empty - - 20080724144226-a41c0-de09b2f960ed9b35ff161f0f5688ae49a7827cda.gz - - src/Makefile.am | 2 + - src/salut-connection.c | 68 +++++++++- - src/salut-direct-bytestream-manager.c | 242 +++++++++++++++++++++++++++++++++ - src/salut-direct-bytestream-manager.h | 69 ++++++++++ - src/tube-stream.c | 30 +++- - 5 files changed, 401 insertions(+), 10 deletions(-) - -commit 8b798e83f37f298c386f536a9eba00288bba15e2 -Author: Alban Crequy -Date: Thu Jul 24 11:53:47 2008 +0000 - - Rename SalutBytestreamManager to SalutSiBytestreamManager - - 20080724115347-a41c0-1505e20ff53bf34c1514c76f44ec20a01b743aee.gz - - src/debug.c | 4 +- - src/debug.h | 2 +- - src/salut-connection.c | 35 +++++--- - src/salut-si-bytestream-manager.c | 171 +++++++++++++++++++------------------ - src/salut-si-bytestream-manager.h | 62 +++++++------- - src/tube-stream.c | 6 +- - 6 files changed, 148 insertions(+), 132 deletions(-) - -commit 7fbac8a1a938cb7f018cdc14af586451cda1ffd8 -Author: Alban Crequy -Date: Thu Jul 24 11:28:47 2008 +0000 - - Move salut-bytestream-manager to salut-si-bytestream-manager - - 20080724112847-a41c0-8f5044e92c92aeb123e546c1c38d6710b4661460.gz - - src/Makefile.am | 4 +- - src/salut-bytestream-manager.c | 1081 ------------------------------------- - src/salut-bytestream-manager.h | 83 --- - src/salut-connection.c | 7 +- - src/salut-si-bytestream-manager.c | 1081 +++++++++++++++++++++++++++++++++++++ - src/salut-si-bytestream-manager.h | 83 +++ - src/tube-stream.c | 2 +- - 7 files changed, 1173 insertions(+), 1168 deletions(-) - -commit d12a3daa358fa656827e6d2f9728435eded07067 -Author: Alban Crequy -Date: Wed Jul 23 14:13:02 2008 +0000 - - Remove never used parameter bytestream when creating a tube - - 20080723141302-a41c0-6d2d521937531b71826c018e596a5ae1c7f902c9.gz - - src/salut-tubes-channel.c | 15 +++++++-------- - src/tube-dbus.c | 6 +----- - src/tube-dbus.h | 3 +-- - 3 files changed, 9 insertions(+), 15 deletions(-) - -commit 161a38d05b31f7ff71208aa61b9eeb68e76049df -Author: Alban Crequy -Date: Wed Jul 23 13:58:16 2008 +0000 - - Coding style - - 20080723135816-a41c0-bca9cb1f42f84598190da8f9d82cba63c26b568c.gz - - src/salut-tubes-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 24ebfc990c8947c37a24277b483aafd054899ae8 -Author: Alban Crequy -Date: Wed Jul 23 13:57:38 2008 +0000 - - src/salut-tubes-channel.c: Comment on GHashTable *tubes - - 20080723135738-a41c0-5955048a1758161495e32e4000c14880354857ca.gz - - src/salut-tubes-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit f2af9c51020aa40840aafa560727f12219237827 -Author: Alban Crequy -Date: Mon Jul 21 17:18:49 2008 +0000 - - Remove obsolete code: the code receiving tube requests is in SalutTubesManager - - 20080721171849-a41c0-f2b5de37b3170893009536f3ef7026ca0dbe252f.gz - - src/salut-tubes-channel.c | 68 +-------------------------------------------- - 1 files changed, 1 insertions(+), 67 deletions(-) - -commit e78334e87d516664e312d3c870247f2d23cb3b12 -Author: Alban Crequy -Date: Mon Jul 21 17:09:14 2008 +0000 - - doc: 1-1 stream tube session - - 20080721170914-a41c0-bca4ff43826d96d08910ae98e525e020ea085ba8.gz - - docs/tubes.txt | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 127 insertions(+), 2 deletions(-) - -commit 273f9b0595976a57000ca32d418983658cec6508 -Author: Alban Crequy -Date: Mon Jul 21 16:16:10 2008 +0000 - - Use application/octet-stream instead of binary/octect-stream - - 20080721161610-a41c0-c04afe9cf33a79557aab2ac036d381e858deec2f.gz - - src/salut-bytestream-manager.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 0f3d25b84fa867c1bea84c88f90a155608ae490b -Author: Alban Crequy -Date: Mon Jul 21 16:15:38 2008 +0000 - - Remove from the tube offer - - 20080721161538-a41c0-ede472c1643583d5aa9da0259a511d1734daf214.gz - - src/salut-tubes-channel.c | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -commit 710d91f9c8fb409343cc26b47355851e69e775a5 -Author: Alban Crequy -Date: Mon Jul 21 14:06:48 2008 +0000 - - doc: tube implementation status - - 20080721140648-a41c0-615acd233571a66b7d97ab32b5532e35619ce304.gz - - docs/tubes.txt | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit e2d7821cf67c3af5e13687861d24595f2cd999f6 -Author: Alban Crequy -Date: Mon Jul 21 11:58:37 2008 +0000 - - lib/gibber/gibber-iq-helper.c: Check that priv->xmpp_connection is not NULL - - 20080721115837-a41c0-4ebbb4e973d22dba06c3ce9c8922db6cee91f24e.gz - - lib/gibber/gibber-iq-helper.c | 9 +++------ - 1 files changed, 3 insertions(+), 6 deletions(-) - -commit d6de3941c7bef7e99e2bf59865b36dca1ce4a7f4 -Author: Alban Crequy -Date: Mon Jul 21 11:46:15 2008 +0000 - - Stream tube object sends a close tube message when the tube is close. It has a reference on the XmppConnectionManager to request a connection. When a close tube message is received, close the tube. - - 20080721114615-a41c0-e516a921271f991b7a7ab359e070a5f5ba8ff190.gz - - src/salut-tubes-channel.c | 26 +++++++- - src/salut-tubes-channel.h | 3 + - src/salut-tubes-manager.c | 90 ++++++++++++++++++---------- - src/tube-stream.c | 147 ++++++++++++++++++++++++++++++++++----------- - src/tube-stream.h | 7 +- - 5 files changed, 201 insertions(+), 72 deletions(-) - -commit 6e5ab52491254ff160a2b89739e4104e61ce2289 -Author: Alban Crequy -Date: Mon Jul 21 11:35:09 2008 +0000 - - lib/gibber/gibber-iq-helper.c: Remove handler when the IqHelper is freed - - 20080721113509-a41c0-e2e2122adbbfc5d8c1cd6b473d1f58f4644a3077.gz - - lib/gibber/gibber-iq-helper.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 70d905af43ea73851aa964a97132240240a6664f -Author: Alban Crequy -Date: Wed Jul 16 15:53:15 2008 +0000 - - src/salut-tubes-channel.c: Close the tube when we receive a iq type=error after offering a tube - - 20080716155315-a41c0-7169cc50aaa3845643abc7c592214315e0fc76cb.gz - - src/salut-tubes-channel.c | 8 ++------ - 1 files changed, 2 insertions(+), 6 deletions(-) - -commit fbf988972cab78ef42ffb8587fd55422ca488b75 -Author: Alban Crequy -Date: Mon May 19 17:21:43 2008 +0000 - - Implement 1-1 tubes - - 20080519172143-a41c0-dc1b60332b846aba2555f416fc0fb8999a8a173d.gz - - src/salut-bytestream-manager.c | 22 +++++++++++++++++----- - src/salut-tubes-manager.c | 28 ++++++++++++++++++++++++++++ - src/salut-tubes-manager.h | 4 ++++ - 3 files changed, 49 insertions(+), 5 deletions(-) - -commit 165227324ca091270f4c505970c5ec1d6a58ab0f -Author: Alban Crequy -Date: Mon May 19 17:20:50 2008 +0000 - - Export the Tubes Manager object for users of the Salut Connection object - - 20080519172050-a41c0-b6a2c7746cc1bb9849497d695c1f1a0d5231c94b.gz - - src/salut-connection.c | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) - -commit 45aa8513c79add04412e54a456e41be26778788a -Author: Alban Crequy -Date: Mon May 19 11:14:40 2008 +0000 - - Send stanza with the right parameters - - 20080519111440-a41c0-c8c7c60ea2262688d2f6524b3b76bb511147a4b5.gz - - src/salut-tubes-channel.c | 28 ++++++++++++++++++++-------- - 1 files changed, 20 insertions(+), 8 deletions(-) - -commit 9ca44edcdbff4c1e2a5dbce378ce83faecd78adf -Author: Alban Crequy -Date: Fri May 16 16:47:50 2008 +0000 - - Open a tube on the remote side when the initiator request it - - 20080516164750-a41c0-f2f3ad2cf579a1fa146dbdfe2b6db892f48ff603.gz - - src/salut-tubes-channel.c | 31 +++++++++++- - src/salut-tubes-channel.h | 4 ++ - src/salut-tubes-manager.c | 126 +++++++++++++++++++++++++++++++++++++------- - 3 files changed, 140 insertions(+), 21 deletions(-) - -commit 970d94a813faa4a70ce91a21c189d4802e88fe50 -Author: Alban Crequy -Date: Fri May 16 16:47:10 2008 +0000 - - Rename tubes_message_received to tubes_muc_message_received - - 20080516164710-a41c0-00db3e00b9af58f48e5eec6fbb3898a5d75f2992.gz - - src/salut-muc-channel.c | 2 +- - src/salut-tubes-channel.c | 8 +++++--- - src/salut-tubes-channel.h | 4 ++-- - 3 files changed, 8 insertions(+), 6 deletions(-) - -commit 72d4a5140eaf930cd9c11605305074e8ba429cf4 -Author: Alban Crequy -Date: Thu Apr 24 16:07:47 2008 +0000 - - Start to parse iq query and replies - - 20080424160747-a41c0-89117deaf72726dafa3fe5b9baec9bbe138ecb8f.gz - - src/salut-tubes-channel.c | 21 ++++++++++++--- - src/salut-tubes-manager.c | 62 ++++++++++++++++++++++++++++++++++++++++---- - 2 files changed, 73 insertions(+), 10 deletions(-) - -commit 99a065e6bfc17c64688f443bb7e2119921574337 -Author: Alban Crequy -Date: Thu Apr 24 15:02:18 2008 +0000 - - Send iq offer only 1 time - - 20080424150218-a41c0-c88977311240702d9fa54b8bdb9f0db99e6fe47a.gz - - src/salut-tubes-channel.c | 2 +- - src/tube-dbus.c | 1 + - src/tube-iface.c | 9 +++++++++ - src/tube-iface.h | 5 +++++ - src/tube-stream.c | 19 +++++++++++++++++++ - 5 files changed, 35 insertions(+), 1 deletions(-) - -commit 1ce76bee413cd18bfb0ee9518b2cf6c99ab763c7 -Author: Alban Crequy -Date: Thu Apr 24 11:47:11 2008 +0000 - - SalutTubesChannel's dispose: unref, disconnect signals and remove stanza filters - - 20080424114711-a41c0-d1721b40ccc4cb962345587d2620aec91c87a8ba.gz - - src/salut-tubes-channel.c | 31 +++++++++++++++++++++++++++++++ - 1 files changed, 31 insertions(+), 0 deletions(-) - -commit 6c02b478bba152f975b08f2be5c112084ff785a5 -Author: Alban Crequy -Date: Thu Apr 24 10:45:59 2008 +0000 - - Coding style, reported by cassidy - - 20080424104559-a41c0-084e4b42fb07101cf38a212ef1ea98e20a2d616c.gz - - src/salut-connection.c | 2 +- - src/salut-tubes-manager.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit 66867ce9148e12b69b26df7c71f89fd6584fe88f -Author: Alban Crequy -Date: Thu Apr 24 10:41:23 2008 +0000 - - Coding style - - 20080424104123-a41c0-30b5dacebf254a3225fb280e8f826cf5c1b16f6f.gz - - src/salut-tubes-channel.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit ee5071600089c38bf38928d7ead90159ba073cf1 -Author: Alban Crequy -Date: Thu Apr 24 10:39:36 2008 +0000 - - Effectively send iq and receive the reply - - 20080424103936-a41c0-32f79b26a9b200e77ca4b91f851c227f6dd35adf.gz - - src/salut-tubes-channel.c | 37 ++++++++++++++++++++++++++++++------- - 1 files changed, 30 insertions(+), 7 deletions(-) - -commit 94598b243a809f06dc3abea009b82ff54940a0f0 -Author: Alban Crequy -Date: Wed Apr 23 18:52:23 2008 +0000 - - Connect to the contact to offer a tube - - 20080423185223-a41c0-bf516c544aabf4d264021d51bf7541c700a760ad.gz - - src/salut-connection.c | 3 +- - src/salut-tubes-channel.c | 398 +++++++++++++++++++++++++++++++++++++++++++++ - src/salut-tubes-manager.c | 133 +++++++++++++++- - src/salut-tubes-manager.h | 8 +- - 4 files changed, 534 insertions(+), 8 deletions(-) - -commit 907613fee419094261d143c1b65abf2f8f943aa3 -Author: Alban Crequy -Date: Tue Apr 22 11:56:34 2008 +0000 - - Salut Tubes Manager - - 20080422115634-a41c0-5076aef578391df8aa0052f3712b867344283399.gz - - src/Makefile.am | 2 + - src/salut-connection.c | 17 +-- - src/salut-tubes-manager.c | 447 +++++++++++++++++++++++++++++++++++++++++++++ - src/salut-tubes-manager.h | 75 ++++++++ - 4 files changed, 529 insertions(+), 12 deletions(-) - -commit 3a46d723de424e67613535b162f41d659ab49129 -Author: Sjoerd Simons -Date: Mon Aug 11 13:47:16 2008 +0100 - - SalutTubesChannel: implement channel DBus properties - - src/salut-tubes-channel.c | 22 ++++++++++++++++++++++ - src/salut-tubes-channel.h | 1 + - 2 files changed, 23 insertions(+), 0 deletions(-) - -commit 19de00fe8e12582fc7c4c633ac619af63d0066e0 -Author: Sjoerd Simons -Date: Mon Aug 11 13:38:39 2008 +0100 - - SalutTubesChannel: expose interfaces as a GObject property - - src/salut-tubes-channel.c | 28 +++++++++++++++++++++++----- - 1 files changed, 23 insertions(+), 5 deletions(-) - -commit b067acc43b1227e5c8a49aac13e5cd79fd053e74 -Author: Sjoerd Simons -Date: Mon Aug 11 13:04:10 2008 +0100 - - SalutRoomlistChannel: implement channel DBus properties - - src/salut-roomlist-channel.c | 23 +++++++++++++++++++++++ - src/salut-roomlist-channel.h | 1 + - 2 files changed, 24 insertions(+), 0 deletions(-) - -commit df7ea7ba06f5c7ee8d23ab3263391bf873acfb31 -Author: Sjoerd Simons -Date: Mon Aug 11 12:59:25 2008 +0100 - - SalutRoomlistChannel: expose interfaces ad a GObject property - - src/salut-roomlist-channel.c | 11 ++++++++--- - 1 files changed, 8 insertions(+), 3 deletions(-) - -commit 78671f882bb2b7becb136dc7f383baa73ddd7aea -Author: Sjoerd Simons -Date: Mon Aug 11 12:19:17 2008 +0100 - - SalutMucChannel: Implement group interface DBus properties - - src/salut-muc-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 54831711541e5496a6f02dd6aae1bcfdc38c0e19 -Author: Sjoerd Simons -Date: Mon Aug 11 12:18:05 2008 +0100 - - SalutMucChannel: Implement channel DBus properties - - src/salut-muc-channel.c | 27 +++++++++++++++++++++++++-- - src/salut-muc-channel.h | 1 + - 2 files changed, 26 insertions(+), 2 deletions(-) - -commit 0406459323274637e29e6b21eb295ae99303b844 -Author: Sjoerd Simons -Date: Mon Aug 11 12:10:27 2008 +0100 - - SalutMucChannel: expose interface as a GObject property - - src/salut-muc-channel.c | 22 +++++++++++++++++++--- - 1 files changed, 19 insertions(+), 3 deletions(-) - -commit fc30e83b41cb3a560df2eb8fab81ea7b9905dfc7 -Author: Simon McVittie -Date: Mon Jun 9 09:43:40 2008 +0000 - - SalutContactChannel: Export Group properties from spec 0.17.6 - - 20080609094340-53eee-5de0031f176ddcd578043bddb24f58def7ae022f.gz - - Signed-off-by: Sjoerd Simons - - src/salut-contact-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit e7c691e2e28aa641b1d0a1633f12f961649930b9 -Author: Simon McVittie -Date: Mon Jun 9 09:42:52 2008 +0000 - - SalutContactChannel: implement D-Bus properties from spec 0.17.7 - - 20080609094252-53eee-7027ec63e9de6e2281b2435ccdc7bc9e19a64307.gz - - Signed-off-by: Sjoerd Simons - - src/salut-contact-channel.c | 22 ++++++++++++++++++++++ - src/salut-contact-channel.h | 2 ++ - 2 files changed, 24 insertions(+), 0 deletions(-) - -commit 93e65da5d1555aecab5eb1e204be545ded11e287 -Author: Simon McVittie -Date: Mon Jun 9 09:40:33 2008 +0000 - - SalutContactChannel: give property G_PARAM_STATIC_NAME - - 20080609094033-53eee-0366ab1d26862a543464a68e8e875966253378e4.gz - - Signed-off-by: Sjoerd Simons - - src/salut-contact-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 38654118b440cc84a00f84d82a76b76ba16398e8 -Author: Simon McVittie -Date: Mon Jun 9 09:39:08 2008 +0000 - - SalutContactChannel: export interfaces as a GObject property - - 20080609093908-53eee-a51b7d2aec7088f52f2e0a9dbfb326aeb7545f68.gz - - Signed-off-by: Sjoerd Simons - - src/salut-contact-channel.c | 24 ++++++++++++++++++++---- - 1 files changed, 20 insertions(+), 4 deletions(-) - -commit 3094ab8a65373680a4283c4a42a27f2707c45a12 -Author: Simon McVittie -Date: Mon Jun 9 09:38:16 2008 +0000 - - SalutContactChannel: update copyright year, re-order headers according to coding style - - 20080609093816-53eee-c472be1c967f5e501e72229a9948a2a660f9ab21.gz - - Signed-off-by: Sjoerd Simons - - src/salut-contact-channel.c | 15 ++++++++------- - 1 files changed, 8 insertions(+), 7 deletions(-) - -commit f72ef23c7a6f083a4720ad4fa36f5cb361b4993f -Author: Simon McVittie -Date: Mon Jun 9 09:36:23 2008 +0000 - - SalutImChannel: update copyright year - - 20080609093623-53eee-23e790b64a52d372710973002c7df6aec9d4de15.gz - - Signed-off-by: Sjoerd Simons - - src/salut-im-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ea4de3f2d7c2f2a560592660469d346d022ac458 -Author: Simon McVittie -Date: Mon Jun 9 09:33:40 2008 +0000 - - SalutImChannel: order #includes according to Telepathy coding style - - 20080609093340-53eee-5376fcf23bb198085100fb3b18cf999574016c91.gz - - Signed-off-by: Sjoerd Simons - - src/salut-im-channel.c | 39 +++++++++++++++++++-------------------- - 1 files changed, 19 insertions(+), 20 deletions(-) - -commit 0f35546dee32a21a97b01bc3a23ff3cde42405df -Author: Simon McVittie -Date: Mon Jun 9 09:24:39 2008 +0000 - - SalutImChannel: export D-Bus properties for spec 0.17.7 - - 20080609092439-53eee-e58947b32a94778178fc2b6c30289727701fc9e3.gz - - Signed-off-by: Sjoerd Simons - - src/salut-im-channel.c | 22 ++++++++++++++++++++++ - src/salut-im-channel.h | 2 ++ - 2 files changed, 24 insertions(+), 0 deletions(-) - -commit 989376ff46fc237a239167e038527ee3726532cd -Author: Simon McVittie -Date: Mon Jun 9 09:21:04 2008 +0000 - - SalutImChannel: expose interfaces as a GObject property - - 20080609092104-53eee-15adfda609537549e88d23262cfc792bdf714cae.gz - - Signed-off-by: Sjoerd Simons - - src/salut-im-channel.c | 20 +++++++++++++++++--- - 1 files changed, 17 insertions(+), 3 deletions(-) - -commit a35cd59125a2fe011c92a12da2bee3ba5af9f796 -Author: Simon McVittie -Date: Mon Jun 9 09:18:47 2008 +0000 - - SalutImChannel: set G_PARAM_STATIC_NAME on properties - - 20080609091847-53eee-5503e9b9889acabb6dc82a5dde055d63d765f014.gz - - Signed-off-by: Sjoerd Simons - - src/salut-im-channel.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit cbff71a7e9bded854b7180df298fb935dbd8eca2 -Author: Simon McVittie -Date: Mon Jun 9 09:18:17 2008 +0000 - - SalutImChannel: [coding style] no newline after return type for forward declarations - - 20080609091817-53eee-4db2cf526624415ac16b40cc4f1a9a7481994484.gz - - Signed-off-by: Sjoerd Simons - - src/salut-im-channel.c | 23 ++++++++--------------- - 1 files changed, 8 insertions(+), 15 deletions(-) - -commit 2996bc45abb653f3c46720e616ec9eb2af224791 -Author: Sjoerd Simons -Date: Sun Aug 10 13:42:15 2008 +0100 - - Remove .git-darcs-dir that got introduced as part of the git conversions - process - - 0 files changed, 0 insertions(+), 0 deletions(-) - -commit 3903a103107c43249619adcfae996b8c27e4e4d4 -Author: Guillaume Desmottes -Date: Thu Aug 7 09:17:44 2008 +0000 - - use tp_debug_divert_messages instead of our own copy of it - - - 20080807091744-7fe3f-1d323493d91e25deca165c6ab9b5a580467b48d7.gz - - src/debug.c | 33 --------------------------------- - src/debug.h | 4 ---- - src/salut.c | 2 +- - tests/salut-debug.c | 2 +- - 4 files changed, 2 insertions(+), 39 deletions(-) - -commit 0b09c2ebdc05bc0e58bd2d9821a2d853b9f499a7 -Author: Sjoerd Simons -Date: Tue Jul 29 17:26:19 2008 +0000 - - Use the function names as present in the final release of SimplePresence - - - 20080729172619-93b9a-838e8fbdb02adca2e830f47f75568007b3cc5ae6.gz - - src/salut-connection.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 5db6316f96bba9f87fd550552f9ae0544dce5c06 -Author: Sjoerd Simons -Date: Tue Jul 29 17:06:51 2008 +0000 - - Depend on telepathy-glib >= 0.7.13 for SimplePresence - - - 20080729170651-93b9a-403deef9c3c77d8c59b3190eba32c087702d68ba.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 960a9d86cf7537e38fda083bd1b243392f099c75 -Author: Sjoerd Simons -Date: Mon Jun 16 11:33:14 2008 +0000 - - Implement SimplePresence interface - - - 20080616113314-93b9a-03108278ae1ca77b8abc3c5cc1a66a44858b47ea.gz - - src/salut-connection.c | 13 ++++++++++++- - src/salut-connection.h | 2 ++ - 2 files changed, 14 insertions(+), 1 deletions(-) - -commit cd533f0810b50de9a00f91dc8a6efed550489fd1 -Author: Guillaume Desmottes -Date: Tue Jul 8 11:21:31 2008 +0000 - - salut-roomlist-channel.c: use g_value_take_string when setting the handle-name - - - 20080708112131-7fe3f-25b73404775edaf466e7de333d39261d33083109.gz - - src/salut-roomlist-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c8f8bb54081154c854835a99f923e0239908df80 -Author: Guillaume Desmottes -Date: Mon Jul 7 12:16:57 2008 +0000 - - salut-roomlist-channel.c: set the handle-name in the hashtable returned by the GotRooms signal - - - 20080707121657-7fe3f-171a67be53af6a48206a7b2c0673c1eebaf359ea.gz - - src/salut-roomlist-channel.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit d3b412245b5b4435b10eec2ccb37e68356262c34 -Author: Alban Crequy -Date: Fri Jun 6 10:08:48 2008 +0000 - - Remove unneeded include - - - 20080606100848-a41c0-e31ecb8a39807201b1bfaad73f14da85ca5a771d.gz - - src/salut-dummy-discovery-client.c | 14 -------------- - src/salut-dummy-discovery-client.h | 2 -- - 2 files changed, 0 insertions(+), 16 deletions(-) - -commit 8dc4a7c93717d93c4a1c33c1471c26adee53d865 -Author: Alban Crequy -Date: Thu Jun 5 18:25:05 2008 +0000 - - Create the backend object in the set_property instead of _create_factories - - - 20080605182505-a41c0-f6a7cbbe823101859f31661570c141a3625c33b7.gz - - src/salut-connection.c | 9 ++++----- - 1 files changed, 4 insertions(+), 5 deletions(-) - -commit 851c6dcd1b35bd3ebe07a26870c37773f4358dab -Author: Alban Crequy -Date: Thu Jun 5 18:20:24 2008 +0000 - - check coding style of telepathy-salut-debug - - - 20080605182024-a41c0-6e52855d6da914d7719a05c2679b0423ffd9b7c5.gz - - tests/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 927328ccb962dc3c657f018705fcdcfec08e0188 -Author: Alban Crequy -Date: Thu Jun 5 16:40:14 2008 +0000 - - Backend property is a construct only property - - - 20080605164014-a41c0-50f49e102a32e8ec1380aab8a0b3d31a1b1f9a83.gz - - src/salut-connection.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 16bde94b02ac08f1575aef77850c67d4c8df04d9 -Author: Alban Crequy -Date: Thu Jun 5 16:39:31 2008 +0000 - - Create the backend object in create_channel_factories, after the backend property has been set - - - 20080605163931-a41c0-f137e1f784d47e3b0eebe24ecb94217691c7ec63.gz - - src/salut-connection.c | 11 +++++------ - 1 files changed, 5 insertions(+), 6 deletions(-) - -commit b313f51f13a2050d8e3bab86dfcd05ff59614b07 -Author: Alban Crequy -Date: Thu Jun 5 16:38:23 2008 +0000 - - Abstract get_host_name_fqdn in backends - - - 20080605163823-a41c0-300e93f06f4bbe6098221d7658f6e8440b95e9c4.gz - - src/salut-avahi-discovery-client.c | 8 ++++++++ - src/salut-connection.c | 7 +------ - src/salut-discovery-client.c | 11 +++++++++++ - src/salut-discovery-client.h | 5 +++++ - 4 files changed, 25 insertions(+), 6 deletions(-) - -commit 0ac09c290fb19109c4c360a4eeb2178ef8572201 -Author: Alban Crequy -Date: Thu Jun 5 11:42:17 2008 +0000 - - Remove the two salut_discovery_client_new() functions, choose the avahi or dummy backend from the main() function and pass the GType backend to SalutConnectionManager and SalutConnection via a property when the object is created - - - 20080605114217-a41c0-0473007078d1fc15270971e3d8c8034690662e07.gz - - src/salut-avahi-discovery-client.c | 11 ---- - src/salut-avahi-discovery-client.h | 2 - - src/salut-connection-manager.c | 92 +++++++++++++++++++++++++++++++++++- - src/salut-connection-manager.h | 2 + - src/salut-connection.c | 44 +++++++++++++++++- - src/salut-dummy-discovery-client.c | 11 ---- - src/salut-dummy-discovery-client.h | 3 - - src/salut.c | 5 ++- - tests/salut-debug.c | 5 ++- - 9 files changed, 143 insertions(+), 32 deletions(-) - -commit 249b8eb2e94e8a224f74df468a95b492249ff8a1 -Author: Alban Crequy -Date: Wed Jun 4 14:47:23 2008 +0000 - - Add src/salut-dummy-discovery-client.c|h - - - 20080604144723-a41c0-779c0d6035d401e44b964ac30a828355ef630266.gz - - src/salut-dummy-discovery-client.c | 159 ++++++++++++++++++++++++++++++++++++ - src/salut-dummy-discovery-client.h | 68 +++++++++++++++ - 2 files changed, 227 insertions(+), 0 deletions(-) - -commit 186120be4e86f106b17f9f767cf5f7b090c71150 -Author: Alban Crequy -Date: Wed Jun 4 14:35:24 2008 +0000 - - Add a dummy backend - - - 20080604143524-a41c0-0a97764b62b6c9523b09b8a39447ec8fa07f602e.gz - - src/Makefile.am | 46 ++++++++++++++++++++++++----------- - src/salut-avahi-discovery-client.c | 6 ++-- - src/salut-avahi-discovery-client.h | 2 +- - src/salut-connection.c | 9 ++++--- - tests/Makefile.am | 2 + - 5 files changed, 42 insertions(+), 23 deletions(-) - -commit 6e030bdd0f5dd6545b7d7a5c0eb6a4973562c9c6 -Author: Alban Crequy -Date: Wed Jun 4 13:30:50 2008 +0000 - - Generating tests/telepathy-salut-debug - - - 20080604133050-a41c0-7a79c8e18cfc7eed9adc8e35aeec37a147992c8e.gz - - tests/Makefile.am | 15 ++++++++++++++- - tests/salut-debug.c | 35 +++++++++++++++++++++++++++++++++++ - 2 files changed, 49 insertions(+), 1 deletions(-) - -commit 01aaf7bddb92d4cb9b2a158c59feeb3222ea4a6c -Author: Sjoerd Simons -Date: Thu Jun 5 11:35:26 2008 +0000 - - version 0.3.3.1 - - - 20080605113526-93b9a-97e653a96440eaaf08d151e7d5879648384c2ac3.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0cff3a3ab40469523beba4cf05edd818ac2569b8 -Author: Sjoerd Simons -Date: Thu Jun 5 11:27:44 2008 +0000 - - version 0.3.3 - - - 20080605112744-93b9a-29be9903d10e8528f28855fa243857239eed8a2f.gz - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 952611b1d3b5116ae62032f866b7fb7b3c476aa4 -Author: Sjoerd Simons -Date: Thu Jun 5 11:16:41 2008 +0000 - - Update NEWS - - - 20080605111641-93b9a-73af5c40c7be2e07bd7d61da01ae862b2f4b262d.gz - - NEWS | 13 ++++++++++--- - 1 files changed, 10 insertions(+), 3 deletions(-) - -commit d0d291fc5f88aceaf107d6402638f4876c249f93 -Author: Sjoerd Simons -Date: Wed Jun 4 12:45:30 2008 +0000 - - Rename salut_avahi_contact_get_keyval* to _avahi_txt_get_keyval* - - - 20080604124530-93b9a-0ae31652ac4b679bf8ed7a791b4ae0aacc04d48a.gz - - src/salut-avahi-contact.c | 30 +++++++++++++++--------------- - 1 files changed, 15 insertions(+), 15 deletions(-) - -commit 2e1eb7d8dc72948f911c61eb90118a3053ff3f8c -Author: Sjoerd Simons -Date: Wed Jun 4 12:04:00 2008 +0000 - - SalutAvahiContact: If retrieve_avatar is called but the avatar_token == NULL then cancel the retrieval - - - 20080604120400-93b9a-1d7b1bfa9a12c885e2ec43a546820eea9ee0f157.gz - - src/salut-avahi-contact.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit e1fb1440e567a7d57d48a230c0979982c02ad803 -Author: Sjoerd Simons -Date: Wed Jun 4 11:54:05 2008 +0000 - - SalutAvahiContact: Fix STREMPTY macro and its usage - - - 20080604115405-93b9a-cd297609c3be4e33545aa3b712689039fc132552.gz - - src/salut-avahi-contact.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 2789088d3479b995fe0a3600fadc0669e7c4265f -Author: Sjoerd Simons -Date: Wed Jun 4 11:51:04 2008 +0000 - - More coding style fixes - - - 20080604115104-93b9a-98a5e1ae9bab4c13ffaaf90480e75c626f3da050.gz - - src/salut-avahi-olpc-activity-manager.h | 4 ++-- - src/salut-olpc-activity-manager.h | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 96b4a27efa6ce0fa3ace78dec6195d0525727a45 -Author: Sjoerd Simons -Date: Wed Jun 4 11:47:26 2008 +0000 - - SalutAvahiContact: Use a utility function to get the key/value from an avahi txt list - - - 20080604114726-93b9a-d4e3a9c171825d1a443630bd989adf6c5544fcb0.gz - - src/salut-avahi-contact.c | 188 +++++++++++++++++++-------------------------- - 1 files changed, 78 insertions(+), 110 deletions(-) - -commit ac9267dfe2bc50dbf4ad51d6477c079dc3d63f04 -Author: Sjoerd Simons -Date: Wed Jun 4 11:36:22 2008 +0000 - - Coding style updates - - - 20080604113622-93b9a-8ca5877780cdf67ac0aab6e3d7ae998be0a7d53f.gz - - src/salut-avahi-olpc-activity-manager.h | 6 ++++-- - src/salut-avahi-olpc-activity.c | 2 +- - src/salut-avahi-olpc-activity.h | 4 ++-- - src/salut-olpc-activity.h | 4 ++-- - 4 files changed, 9 insertions(+), 7 deletions(-) - -commit 64015f617a0b836579e74152b8bcbfe8f7e6ff99 -Author: Sjoerd Simons -Date: Wed Jun 4 11:31:58 2008 +0000 - - Coding style updates - - - 20080604113158-93b9a-6c2078534b174e0730dfb45389ee2fbca53827a8.gz - - tests/check-gibber-sasl-auth.c | 168 +++++++++-------- - tests/test-sasl-auth-server.c | 392 +++++++++++++++++++++------------------ - tests/test-sasl-auth-server.h | 20 +- - 3 files changed, 312 insertions(+), 268 deletions(-) - -commit ab0b393544724e1ea9c12852e9f9ab16d9a7cc4a -Author: Sjoerd Simons -Date: Wed Jun 4 10:25:10 2008 +0000 - - SalutAvahiContact: Define a macro to test for empty strings - - - 20080604102510-93b9a-c876590e5a47f8e5cfbfc79bda860110a4c1723e.gz - - src/salut-avahi-contact.c | 15 ++++++++++----- - 1 files changed, 10 insertions(+), 5 deletions(-) - -commit 1a554f3fa4446c3b59546b9a8143b22b62742057 -Author: Sjoerd Simons -Date: Wed Jun 4 10:19:29 2008 +0000 - - Convert tests to telepathy coding style - - - 20080604101929-93b9a-7480a8b55e1a75d9a1797bf42412944f31513e20.gz - - tests/Makefile.am | 12 ++ - tests/causalorderingtest.py | 2 +- - tests/check-gibber-r-multicast-causal-transport.c | 6 +- - tests/check-gibber-r-multicast-packet.c | 6 +- - tests/check-gibber-r-multicast-sender.c | 187 +++++++++++--------- - tests/check-gibber-xmpp-connection.c | 37 +++-- - tests/check-gibber-xmpp-error.c | 2 +- - tests/check-gibber-xmpp-node.c | 24 ++-- - tests/check-gibber-xmpp-reader.c | 25 ++-- - tests/check-gibber-xmpp-stanza.c | 2 +- - tests/check-helpers.c | 2 +- - tests/check-main.c | 16 +- - tests/test-r-multicast-transport-io.c | 194 +++++++++++--------- - tests/test-resolver.h | 4 +- - tests/test-sasl-auth-server.c | 36 ++-- - tests/test-transport.c | 93 ++++++----- - tests/test-transport.h | 8 +- - tests/test-xmpp-connection.c | 186 +++++++++++--------- - 18 files changed, 462 insertions(+), 380 deletions(-) - -commit ebde871b168784840bfd1fae56a99484e6aa32e8 -Author: Sjoerd Simons -Date: Wed Jun 4 09:28:40 2008 +0000 - - Make gibber conform to telepathy coding style - - - 20080604092840-93b9a-aee2061241cb08f169ce5b8e9834aaf1ab65cf9a.gz - - lib/gibber/Makefile.am | 13 +- - lib/gibber/gibber-bytestream-oob.c | 6 +- - lib/gibber/gibber-debug.c | 4 +- - lib/gibber/gibber-debug.h | 4 +- - lib/gibber/gibber-fd-transport.c | 388 +++++---- - lib/gibber/gibber-fd-transport.h | 17 +- - lib/gibber/gibber-iq-helper.c | 2 +- - lib/gibber/gibber-iq-helper.h | 2 +- - lib/gibber/gibber-linklocal-transport.c | 112 ++-- - lib/gibber/gibber-linklocal-transport.h | 39 +- - lib/gibber/gibber-muc-connection.c | 599 ++++++++------- - lib/gibber/gibber-muc-connection.h | 54 +- - lib/gibber/gibber-multicast-transport.c | 509 +++++++------ - lib/gibber/gibber-multicast-transport.h | 30 +- - lib/gibber/gibber-r-multicast-causal-transport.c | 87 +-- - lib/gibber/gibber-r-multicast-packet.c | 392 +++++----- - lib/gibber/gibber-r-multicast-packet.h | 10 +- - lib/gibber/gibber-r-multicast-sender.c | 937 ++++++++++++---------- - lib/gibber/gibber-r-multicast-sender.h | 31 +- - lib/gibber/gibber-r-multicast-transport.c | 204 +++--- - lib/gibber/gibber-r-multicast-transport.h | 31 +- - lib/gibber/gibber-resolver-asyncns.c | 4 +- - lib/gibber/gibber-resolver.c | 6 +- - lib/gibber/gibber-resolver.h | 6 +- - lib/gibber/gibber-sasl-auth.c | 865 +++++++++++---------- - lib/gibber/gibber-sasl-auth.h | 23 +- - lib/gibber/gibber-ssl-transport.c | 40 +- - lib/gibber/gibber-ssl-transport.h | 4 +- - lib/gibber/gibber-tcp-transport.c | 110 ++-- - lib/gibber/gibber-tcp-transport.h | 21 +- - lib/gibber/gibber-transport.c | 114 ++-- - lib/gibber/gibber-transport.h | 46 +- - lib/gibber/gibber-xmpp-connection-listener.c | 4 +- - lib/gibber/gibber-xmpp-connection-listener.h | 5 +- - lib/gibber/gibber-xmpp-connection.c | 314 ++++---- - lib/gibber/gibber-xmpp-connection.h | 40 +- - lib/gibber/gibber-xmpp-node.c | 320 ++++---- - lib/gibber/gibber-xmpp-node.h | 128 ++-- - lib/gibber/gibber-xmpp-reader.c | 405 +++++----- - lib/gibber/gibber-xmpp-reader.h | 24 +- - lib/gibber/gibber-xmpp-stanza.c | 6 +- - lib/gibber/gibber-xmpp-stanza.h | 19 +- - lib/gibber/gibber-xmpp-writer.c | 306 ++++---- - lib/gibber/gibber-xmpp-writer.h | 38 +- - 44 files changed, 3335 insertions(+), 2984 deletions(-) - -commit e9f08f6a1591a2e35a17a430f5aa5cae7f62f816 -Author: Sjoerd Simons -Date: Tue Jun 3 13:51:54 2008 +0000 - - Add coding style checking tools - - - 20080603135154-93b9a-b631438708091d087e3ba0eb58f04399819d1aba.gz - - tools/check-c-style.sh | 36 ++++++++++++++++++++++++++++++++++++ - tools/check-coding-style.mk | 17 +++++++++++++++++ - tools/check-misc.sh | 13 +++++++++++++ - tools/check-whitespace.sh | 17 +++++++++++++++++ - 4 files changed, 83 insertions(+), 0 deletions(-) - -commit 0399b890f6e105720e342badbf14ccf9fb9eee4e -Author: Sjoerd Simons -Date: Tue Jun 3 13:31:18 2008 +0000 - - Add coding style checker tools from gabble and make the main salut src tree valid coding style - - - 20080603133118-93b9a-1171eedccfe23199c466c9062c56c3a88227f090.gz - - configure.ac | 14 + - src/Makefile.am | 24 ++- - src/debug.h | 2 +- - src/salut-avahi-contact-manager.c | 6 +- - src/salut-avahi-contact-manager.h | 4 +- - src/salut-avahi-contact.c | 26 +- - src/salut-avahi-contact.h | 4 +- - src/salut-avahi-discovery-client.c | 4 +- - src/salut-avahi-muc-channel.c | 2 +- - src/salut-avahi-muc-channel.h | 4 +- - src/salut-avahi-muc-manager.c | 2 +- - src/salut-avahi-muc-manager.h | 13 +- - src/salut-avahi-self.c | 2 +- - src/salut-avahi-self.h | 4 +- - src/salut-bytestream-manager.h | 4 +- - src/salut-connection-manager.c | 69 +++-- - src/salut-connection-manager.h | 4 +- - src/salut-connection.c | 568 ++++++++++++++++++----------------- - src/salut-connection.h | 4 +- - src/salut-contact-channel.c | 64 ++-- - src/salut-contact-channel.h | 4 +- - src/salut-contact-manager.c | 233 ++++++++------- - src/salut-contact-manager.h | 10 +- - src/salut-contact.c | 110 ++++---- - src/salut-contact.h | 22 +- - src/salut-im-channel.c | 7 +- - src/salut-im-channel.h | 2 +- - src/salut-im-manager.h | 4 +- - src/salut-muc-channel.c | 337 +++++++++++---------- - src/salut-muc-channel.h | 9 +- - src/salut-muc-manager.c | 55 ++-- - src/salut-muc-manager.h | 4 +- - src/salut-self.c | 75 +++--- - src/salut-self.h | 4 +- - src/salut-tubes-channel.c | 4 +- - src/salut-tubes-channel.h | 2 +- - src/salut-xmpp-connection-manager.h | 37 +-- - src/salut.c | 18 +- - src/text-helper.c | 19 +- - src/write-mgr-file.c | 61 ++-- - tools/Makefile.am | 4 + - 41 files changed, 960 insertions(+), 885 deletions(-) - -commit c94efe7dcf6489dcf329d0cfb19b4a648644dc45 -Author: Sjoerd Simons -Date: Tue Jun 3 09:11:42 2008 +0000 - - Coding style fixes - - - 20080603091142-93b9a-7ee97024b1c0cb7a050689fafff4fa0a5d585b3f.gz - - src/salut-avahi-contact.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit 68659d1e99f177d0c183e1d4979568a02620f796 -Author: Sjoerd Simons -Date: Mon Jun 2 16:45:34 2008 +0000 - - SalutContact: Restart retrieving the avatar if the token was changed while retrieving it and only start retrieving an avatar when a new request came in while there were no outstanding requests - - - 20080602164534-93b9a-6f356814c429737f6c922143062bcb302d7a88cf.gz - - src/salut-contact.c | 14 ++++++++++---- - 1 files changed, 10 insertions(+), 4 deletions(-) - -commit 2866e65da6ba4ca0abd2ecbfb4b9ef451b7b121d -Author: Sjoerd Simons -Date: Mon Jun 2 16:42:36 2008 +0000 - - SalutAvahiContact: If _retrieve_avatar is called again, restart retrieving the avatar - - - 20080602164236-93b9a-465d3cbb97731030642f959a7723b5b399ef2392.gz - - src/salut-avahi-contact.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 335ddf4fd701232cb35c8d176c2a7637ba39b90d -Author: Sjoerd Simons -Date: Mon Jun 2 16:40:59 2008 +0000 - - SalutAvahiContact: don't call _avatar_request_flush twice if getting the avatar failed - - - 20080602164059-93b9a-441cff076af8d41d8926b326926477cacbb3fc10.gz - - src/salut-avahi-contact.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit d5b4295c9e04f8fc6277ba673ba6fa2ce4ee4e63 -Author: Sjoerd Simons -Date: Mon Jun 2 16:10:54 2008 +0000 - - Do proper error handling if adding a resolver for a contact fails - - - 20080602161054-93b9a-38d63d46921a153a2cbb04414dce1ced01bd4a44.gz - - src/salut-avahi-contact-manager.c | 8 ++++++-- - src/salut-avahi-contact.c | 9 ++++++--- - src/salut-avahi-contact.h | 2 +- - 3 files changed, 13 insertions(+), 6 deletions(-) - -commit 37b3bb265bd46c985942cb10e678a711d61478ac -Author: Sjoerd Simons -Date: Mon Jun 2 16:08:04 2008 +0000 - - SalutAvahiOlpcActivityManager: fix typo so it compiles again - - - 20080602160804-93b9a-82c892edd9133afa5a25744418af421239a29932.gz - - src/salut-avahi-olpc-activity-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 413cb1f4264f43ebe273a74d7adcf8fc88ab7c94 -Author: Sjoerd Simons -Date: Mon Jun 2 14:48:40 2008 +0000 - - Remove useless constructor functions from various classes - - - 20080602144840-93b9a-7286f74c3d61cc00e9345ef470a34f59e0b0e1a2.gz - - src/salut-avahi-contact-manager.c | 22 +--------------------- - src/salut-avahi-discovery-client.c | 18 ------------------ - src/salut-avahi-olpc-activity-manager.c | 23 ++++------------------- - src/salut-avahi-olpc-activity.c | 14 -------------- - src/salut-avahi-self.c | 19 ------------------- - src/salut-contact-manager.c | 14 -------------- - src/salut-olpc-activity-manager.c | 17 ----------------- - 7 files changed, 5 insertions(+), 122 deletions(-) - -commit d07bfe55bd78d3e1e2c8286d4743062a57384339 -Author: Sjoerd Simons -Date: Mon Jun 2 14:31:12 2008 +0000 - - Fix the casting in the various _GET_PRIV macros - - - 20080602143112-93b9a-2607d6734e2bab1aea9792fa3a05861c7c11df89.gz - - src/salut-avahi-contact-manager.c | 3 ++- - src/salut-avahi-contact.c | 2 +- - src/salut-avahi-discovery-client.c | 3 ++- - src/salut-avahi-muc-channel.c | 2 +- - src/salut-avahi-muc-manager.c | 2 +- - src/salut-avahi-self.c | 2 +- - src/salut-bytestream-manager.c | 2 +- - src/salut-roomlist-channel.c | 2 +- - src/salut-tubes-channel.c | 2 +- - src/tube-dbus.c | 2 +- - src/tube-stream.c | 2 +- - 11 files changed, 13 insertions(+), 11 deletions(-) - -commit f0d8e855ceb743412d354faa284496b03ef2243c -Author: Sjoerd Simons -Date: Mon Jun 2 14:14:43 2008 +0000 - - SalutAvahiSelf: Fix setting of the nickname parameter on the self object - - - 20080602141443-93b9a-696512167e4b091298f0b5c568bd8faaa12b6a2e.gz - - src/salut-avahi-self.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 4e3172fa25ddde218423cccfadb26c34f7ac6e2b -Author: Sjoerd Simons -Date: Mon Jun 2 14:05:21 2008 +0000 - - Salut doesn't support messages of type autoreply, but does support type notice - - - 20080602140521-93b9a-86207025c37274ba8f2e4a7b1315a7210ec54685.gz - - src/salut-im-channel.c | 6 ++++-- - src/salut-muc-channel.c | 3 ++- - src/text-helper.c | 2 -- - 3 files changed, 6 insertions(+), 5 deletions(-) - -commit b13d5789fd89f561b6cee45d16613f4f4cfe219f -Author: Sjoerd Simons -Date: Mon Jun 2 13:51:59 2008 +0000 - - Only send message types salut knows about - - - 20080602135159-93b9a-a748b0fce7559aa15b25e4fa677930234e95e10d.gz - - src/salut-im-channel.c | 15 +++++++++++++-- - src/salut-muc-channel.c | 14 ++++++++++++-- - src/text-helper.c | 6 ++++++ - 3 files changed, 31 insertions(+), 4 deletions(-) - -commit caceac26acef85f9ba5b5ae7c366a5d1fa240ff7 -Author: Sjoerd Simons -Date: Mon Jun 2 13:31:10 2008 +0000 - - Split up contact changes in multiple functions - - - 20080602133110-93b9a-571b7caad7dfb93efb4c7c628e83fe20c97d7a23.gz - - src/salut-avahi-contact.c | 174 +++++++++++++----------- - src/salut-contact.c | 337 +++++++++++++++++++++++--------------------- - src/salut-contact.h | 36 ++++-- - 3 files changed, 297 insertions(+), 250 deletions(-) - -commit 25202cdf936f1331e510ceb0df38d81ac0e7dc05 -Author: Sjoerd Simons -Date: Fri May 30 10:51:30 2008 +0000 - - Drop the ref to a AvahiContact when it has no more services - - - 20080530105130-93b9a-76c97b5dc0338d21023f585a14346066dbe5c97f.gz - - src/salut-avahi-contact-manager.c | 3 +++ - src/salut-contact-manager.c | 2 -- - 2 files changed, 3 insertions(+), 2 deletions(-) - -commit 3d76dda83501692859c8cf687a428a2898356426 -Author: Sjoerd Simons -Date: Fri May 30 10:40:12 2008 +0000 - - SalutContact: Whitespace fixes - - - 20080530104012-93b9a-793e81db547582a4b4ab7e27b86cd50684f19e42.gz - - src/salut-contact.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit 4a9a3bdd876046e800a9bacc369edd6b318e4d3e -Author: Guillaume Desmottes -Date: Wed Apr 9 09:43:03 2008 +0000 - - NEWS: fix typo - - - 20080409094303-7fe3f-a5565be11a0328d5bed9cdfbc2fe6c6e21de9ef5.gz - - NEWS | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ea93e9ba8a40a31ae9202bb05e8b25248f9a9fa2 -Author: Guillaume Desmottes -Date: Wed Apr 9 09:32:23 2008 +0000 - - version 0.3.2 - - - 20080409093223-7fe3f-7c1fc21c2577c6049e031fad678a0f61bff26346.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 818ea7415549ea88d096e3cf155f4208d8081146 -Author: Guillaume Desmottes -Date: Wed Apr 9 09:26:19 2008 +0000 - - version 0.3.2 - - - 20080409092619-7fe3f-4435a714cac2b09872712994227c352c0f0807f8.gz - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 26e5667777bedf76aea557d8bba6e973603fa4ee -Author: Guillaume Desmottes -Date: Wed Apr 9 09:25:13 2008 +0000 - - add a NEWS entry for 0.3.1 release - - - 20080409092513-7fe3f-5690a7e2a250187dfb0ba4a3c3fafa321492e4de.gz - - NEWS | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 234b2c6660c10716bb00b252513ce8e39269b167 -Author: Guillaume Desmottes -Date: Tue Apr 8 12:32:05 2008 +0000 - - avahi-olpc-activity: fix handle leaks - - - 20080408123205-7fe3f-f51690fc82c9b82ba9bf66af83606c95d237fb8d.gz - - src/salut-avahi-olpc-activity-manager.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit 257912a12dd01aac8449a1aaea366a9d775753c6 -Author: Guillaume Desmottes -Date: Tue Apr 8 11:27:03 2008 +0000 - - olpc-activity: unref the muc when it's closed - - - 20080408112703-7fe3f-a9c33db043a12c18aad62214780c9b05bedb5c2b.gz - - src/salut-olpc-activity.c | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit f9f35dce38a1beb597fccdb798aa639ab044b352 -Author: Guillaume Desmottes -Date: Tue Apr 8 11:23:57 2008 +0000 - - muc-mgr: emit the closed signal when closing all channels - - - 20080408112357-7fe3f-ca8c74222bbce5a1432f89ed30403807fef5b7fc.gz - - src/salut-muc-channel.c | 6 ++++++ - src/salut-muc-channel.h | 2 ++ - src/salut-muc-manager.c | 9 +++++++++ - 3 files changed, 17 insertions(+), 0 deletions(-) - -commit a5b1728758ef4d2e7f639544c680c8f257636b8c -Author: Guillaume Desmottes -Date: Tue Apr 8 09:33:09 2008 +0000 - - olpc-activity: contact have to be unrefed after salut_contact_manager_get_contact call - - - 20080408093309-7fe3f-90db9b99a5cae683a77c7aca42be4b1126beb7f0.gz - - src/salut-olpc-activity.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 068d15d0582df79a2467e29c1532b94c6b4db993 -Author: Guillaume Desmottes -Date: Mon Apr 7 14:11:32 2008 +0000 - - salut-avahi-olpc-activity-manager: fix a free and an unref issue - - - 20080407141132-7fe3f-92cd702d4b45f16f04f90ae677058a01f2bc5f5d.gz - - src/salut-avahi-olpc-activity-manager.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit cfd124481baf5490d2155c8ba60926073b004d0e -Author: Guillaume Desmottes -Date: Mon Apr 7 14:09:39 2008 +0000 - - muc-channel: don't keep a ref on the XCM, the muc mgr keep one for us - - - 20080407140939-7fe3f-d5877f4898a94fb6198e649e39d391d511e9f563.gz - - src/salut-muc-channel.c | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) - -commit 747137d76976d451afc2dda3b98c3b884dd57049 -Author: Guillaume Desmottes -Date: Mon Apr 7 14:06:36 2008 +0000 - - salut-olpc-activity-manager: always unref the activity when we call salut_contact_joined_activity - - - 20080407140636-7fe3f-16664d8a1d8d8a304bd908aa3026cc52c87cd64a.gz - - src/salut-olpc-activity-manager.c | 8 +++----- - 1 files changed, 3 insertions(+), 5 deletions(-) - -commit 0cd1fba461e9bfc97784ba11aa77d1ec5d51ddbc -Author: Guillaume Desmottes -Date: Mon Apr 7 08:57:26 2008 +0000 - - salut-connection: no need to get the DBus proxy when disposing - - - 20080407085726-7fe3f-6c814cb60e3034fb967a4c3f0b39f74a5e5e38e0.gz - - src/salut-connection.c | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit 42ec2a169ec92b569219ea15cdb65035a5cef1df -Author: Guillaume Desmottes -Date: Fri Apr 4 15:34:25 2008 +0000 - - muc-channel: don't keep a ref on the muc mgr - - - 20080404153425-7fe3f-8157d3221c52e78e4ba973e4128a5c32375a3cc1.gz - - src/salut-muc-channel.c | 9 +++------ - 1 files changed, 3 insertions(+), 6 deletions(-) - -commit e0c23b16700764d4366aef5891a6b7fc5e59bc57 -Author: Guillaume Desmottes -Date: Fri Apr 4 10:35:39 2008 +0000 - - unref the muc channel when we left an activity - - - 20080404103539-7fe3f-6bee851eeff9f438bb0f225fd269f0ec4d6b38d2.gz - - src/salut-olpc-activity.c | 12 ++++++++++++ - src/salut-olpc-activity.h | 2 ++ - src/salut-self.c | 1 + - 3 files changed, 15 insertions(+), 0 deletions(-) - -commit ce8aa967c9fc3e0bb8f96be892b9f51f327ad2f6 -Author: Guillaume Desmottes -Date: Fri Apr 4 09:13:55 2008 +0000 - - remove some old comments - - - 20080404091355-7fe3f-d44264eb7e09b6c3e274b3c3223e76e580652da1.gz - - src/salut-avahi-olpc-activity-manager.c | 2 -- - src/salut-avahi-olpc-activity.c | 1 - - src/salut-olpc-activity.c | 1 - - src/salut-olpc-activity.h | 3 +-- - 4 files changed, 1 insertions(+), 6 deletions(-) - -commit cb36432fb2a988b0bf6e83ebfab4fd9db378d2a9 -Author: Guillaume Desmottes -Date: Fri Apr 4 08:52:44 2008 +0000 - - olpc-activity-manager: move the activities_by_room hash table to private - - - 20080404085244-7fe3f-01363da441782237b2e88c57032e3067a5b86eaf.gz - - src/salut-avahi-olpc-activity-manager.c | 3 +- - src/salut-olpc-activity-manager.c | 36 ++++++++++++++++++++---------- - src/salut-olpc-activity-manager.h | 2 - - 3 files changed, 25 insertions(+), 16 deletions(-) - -commit a296e9303db9b7b7c67df09dc548842d85414f28 -Author: Guillaume Desmottes -Date: Thu Apr 3 14:54:28 2008 +0000 - - build new files - - - 20080403145428-7fe3f-06dd14b57d40559b527d1b6b405150a785964afc.gz - - src/Makefile.am | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) - -commit 8179f62df44338fd0b006af96ab2c71b46327981 -Author: Guillaume Desmottes -Date: Thu Apr 3 14:54:06 2008 +0000 - - connection: use the OLPC activity manager - - - 20080403145406-7fe3f-2cbb96ef57114add694a217a1eda32e3ca497da0.gz - - src/salut-connection.c | 244 ++++++++++++++++++++---------------------------- - 1 files changed, 102 insertions(+), 142 deletions(-) - -commit 34b886a45a5c226e7c73c569b1593d1469b89e4f -Author: Guillaume Desmottes -Date: Thu Apr 3 14:53:39 2008 +0000 - - add salut-avahi-olpc-activity-manager.[ch] - - - 20080403145339-7fe3f-33a13ae0bb5856b094c8f3bddf6843a44b9a65d0.gz - - src/salut-avahi-olpc-activity-manager.c | 393 +++++++++++++++++++++++++++++++ - src/salut-avahi-olpc-activity-manager.h | 66 +++++ - 2 files changed, 459 insertions(+), 0 deletions(-) - -commit 5fbf35c3cf33e3962a325d2aa14e13d6b82434f6 -Author: Guillaume Desmottes -Date: Thu Apr 3 14:53:15 2008 +0000 - - add salut-avahi-olpc-activity.[ch] - - - 20080403145315-7fe3f-4ecb8d7471cc84f78c39b8e7713bc64071fd3622.gz - - src/salut-avahi-olpc-activity.c | 556 +++++++++++++++++++++++++++++++++++++++ - src/salut-avahi-olpc-activity.h | 70 +++++ - 2 files changed, 626 insertions(+), 0 deletions(-) - -commit 77f0d2a51aa111e08235436014f0aeffee9beabd -Author: Guillaume Desmottes -Date: Thu Apr 3 14:52:53 2008 +0000 - - add salut-olpc-activity-manager.[ch] - - - 20080403145253-7fe3f-a316b5ad2dab597038c825aea83b3162e3efea0d.gz - - src/salut-olpc-activity-manager.c | 340 +++++++++++++++++++++++++++++++++++++ - src/salut-olpc-activity-manager.h | 97 +++++++++++ - 2 files changed, 437 insertions(+), 0 deletions(-) - -commit aff8edd7fa0cb8414e4a29195869192c57bc16de -Author: Guillaume Desmottes -Date: Thu Apr 3 14:51:49 2008 +0000 - - contact: remove OLPC activity tracking. That's the olpc-activity-mgr's job now - - - 20080403145149-7fe3f-18f889e25c9baa6df00a4961b4d4551e555208b8.gz - - src/salut-contact.c | 224 ++++++++++++++++++++------------------------------- - src/salut-contact.h | 14 ++-- - 2 files changed, 94 insertions(+), 144 deletions(-) - -commit b8f76bd1da91d056b9fe5d6fc09b80db2772fe86 -Author: Guillaume Desmottes -Date: Thu Apr 3 14:50:54 2008 +0000 - - contact-manager: move disposing code to close_all method - - - 20080403145054-7fe3f-02b1d4cee68f8f958ebe967172db356a30a282cb.gz - - src/salut-avahi-contact-manager.c | 51 ++++++++++++++---------------------- - src/salut-contact-manager.c | 2 + - src/salut-contact-manager.h | 2 +- - 3 files changed, 23 insertions(+), 32 deletions(-) - -commit 52079d5b9f651be2c6cfc81ff2091bc17d06baa6 -Author: Guillaume Desmottes -Date: Thu Apr 3 14:49:16 2008 +0000 - - self: fix build when OLPC support is disabled - - - 20080403144916-7fe3f-3ef1d0a9fe3b4f4cd653316fe7ada92365fa73bc.gz - - src/salut-avahi-self.c | 6 +- - src/salut-self.c | 816 ++++-------------------------------------------- - src/salut-self.h | 16 +- - 3 files changed, 68 insertions(+), 770 deletions(-) - -commit 9a3cd01a92f86dd63877e52a8cdaa2ce0bb745a1 -Author: Guillaume Desmottes -Date: Thu Apr 3 14:48:02 2008 +0000 - - discovery-client: fix build when OLPC support is disabled - - - 20080403144802-7fe3f-9f6898f602951a6f7b20ff668a7b80c3c2d5e893.gz - - src/salut-avahi-discovery-client.c | 8 +++++++- - src/salut-discovery-client.c | 2 ++ - src/salut-discovery-client.h | 8 +++++++- - 3 files changed, 16 insertions(+), 2 deletions(-) - -commit de3a26bfd143df58a6a5e558e9b0a75d4ad20f99 -Author: Guillaume Desmottes -Date: Thu Apr 3 14:46:56 2008 +0000 - - avahi-contact: pass NULL to salut_contact_change if OLPC support is disabled - - - 20080403144656-7fe3f-f8b3a630610886394b1bec96feb6fbe8b4e611ab.gz - - src/salut-avahi-contact.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -commit 64959ea67b017cf151dd819eeb818e04e675e875 -Author: Guillaume Desmottes -Date: Thu Apr 3 14:45:50 2008 +0000 - - add salut-olpc-activity.[ch] - - - 20080403144550-7fe3f-38fa52724c10bc99ab9caa4016aa4bebea0722eb.gz - - src/salut-olpc-activity.c | 760 +++++++++++++++++++++++++++++++++++++++++++++ - src/salut-olpc-activity.h | 97 ++++++ - 2 files changed, 857 insertions(+), 0 deletions(-) - -commit 5fd1abf843c6b029dae73158416afaa7fdefcd7b -Author: Guillaume Desmottes -Date: Mon Mar 31 10:34:38 2008 +0000 - - avahi-muc-manager: add missing include - - - 20080331103438-7fe3f-198496e1efb0d6bc21c375c273820dd715e84b87.gz - - src/salut-avahi-muc-manager.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit e559d1b1ff4588d56e3243074252e38616248e61 -Author: Guillaume Desmottes -Date: Mon Mar 31 10:33:35 2008 +0000 - - salut-contact: abstract avahi bits for presence and avatar - - - 20080331103335-7fe3f-163a61e0803b8430afb067d13ad72acd2e034ea4.gz - - src/salut-contact.c | 1294 ++++++++++++++------------------------------------- - src/salut-contact.h | 47 +- - 2 files changed, 377 insertions(+), 964 deletions(-) - -commit 127f09ce31eb97dc45729615d5741ca049ec9eed -Author: Guillaume Desmottes -Date: Mon Mar 31 10:32:38 2008 +0000 - - add /salut-avahi-contact.[ch] - - - 20080331103238-7fe3f-3ace65dedb883a3fe4bb005d8a9cdd707fe40c24.gz - - src/salut-avahi-contact.c | 826 +++++++++++++++++++++++++++++++++++++++++++++ - src/salut-avahi-contact.h | 75 ++++ - 2 files changed, 901 insertions(+), 0 deletions(-) - -commit fb9d16fb3c716e4d36f7ea2ffe5d3add1daf2735 -Author: Guillaume Desmottes -Date: Mon Mar 31 10:22:23 2008 +0000 - - salut-connection: use the discovery client to instantiate the self object - - - 20080331102223-7fe3f-c42a98cdab850741925eb8a1277b64d8fa06a6b5.gz - - src/salut-connection.c | 23 ++++++----------------- - 1 files changed, 6 insertions(+), 17 deletions(-) - -commit be49f64e461bdd0c6a2e172951a305c026706f8a -Author: Guillaume Desmottes -Date: Mon Mar 31 10:17:33 2008 +0000 - - salut-self: abstract presence and avatar announcement - - - 20080331101733-7fe3f-e5dab1af34b5f0652d188ccc2df14da697071294.gz - - src/salut-self.c | 731 ++++++++++++++++++++++++++---------------------------- - src/salut-self.h | 35 ++- - 2 files changed, 383 insertions(+), 383 deletions(-) - -commit 47ad9bb2c997c6c2d480daecf736974dab906f27 -Author: Guillaume Desmottes -Date: Mon Mar 31 10:16:53 2008 +0000 - - add salut-avahi-self.[ch] - - - 20080331101653-7fe3f-51cfccc7e70a5b4a58d29b69de8b018c92274d0e.gz - - src/salut-avahi-self.c | 540 ++++++++++++++++++++++++++++++++++++++++++++++++ - src/salut-avahi-self.h | 68 ++++++ - 2 files changed, 608 insertions(+), 0 deletions(-) - -commit 332a136518093d15c241cd071bc5dc324f861a17 -Author: Guillaume Desmottes -Date: Mon Mar 31 10:02:53 2008 +0000 - - discovery-client: add salut_discovery_client_create_self method - - - 20080331100253-7fe3f-f3dd5a7404db3e3aef677c481a38f0d297e1215f.gz - - src/salut-avahi-discovery-client.c | 25 +++++++++++++++++++++++++ - src/salut-discovery-client.c | 21 +++++++++++++++++++++ - src/salut-discovery-client.h | 11 +++++++++++ - 3 files changed, 57 insertions(+), 0 deletions(-) - -commit 9481dc60386e34ca7590102c93e6368822d34bcc -Author: Guillaume Desmottes -Date: Fri Mar 28 09:02:42 2008 +0000 - - muc-channel: add debug info about membership management - - - 20080328090242-7fe3f-e950996e2f9015831cff8deedbe969890ddbee00.gz - - src/salut-muc-channel.c | 20 ++++++++++++++++---- - 1 files changed, 16 insertions(+), 4 deletions(-) - -commit fd7b92dfc1cf1ba447eeb28e4153d57493a45af7 -Author: Guillaume Desmottes -Date: Thu Mar 27 10:22:40 2008 +0000 - - avahi-contact-manager: destroy the client after the resolver - - - 20080327102240-7fe3f-11749244d70e9e6cfe01447b342a9a0a098efb66.gz - - src/salut-avahi-contact-manager.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit 048a4c9eae3cecc4e6e36b44a57f83878e7df4b7 -Author: Guillaume Desmottes -Date: Thu Mar 27 10:01:40 2008 +0000 - - salut-contact-manager: abstract avahi bits - - - 20080327100140-7fe3f-08b0e8596a36a07408a0960cbd17cef27e331741.gz - - src/salut-contact-manager.c | 366 +++---------------------------------------- - src/salut-contact-manager.h | 24 +-- - 2 files changed, 28 insertions(+), 362 deletions(-) - -commit 0f214ee0a47db1bcffe0c8df0b0e0ee9e60969bf -Author: Guillaume Desmottes -Date: Thu Mar 27 09:57:32 2008 +0000 - - salut-avahi-muc-manager: destroy the discovery client after the browser - - - 20080327095732-7fe3f-5884698fec6921d79f1dd5c3fd171a477464ee82.gz - - src/salut-avahi-muc-manager.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit 2ca0454f1537e8de9f77c707526b739529b85930 -Author: Guillaume Desmottes -Date: Thu Mar 27 09:56:59 2008 +0000 - - salut-avahi-muc-channel.c: dispose function have to be static - - - 20080327095659-7fe3f-e9d7df677dc64b3173aaa72acd0fe5d5bfff38ca.gz - - src/salut-avahi-muc-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 498957df82c4825f6698c46f10c774b2cd81292a -Author: Guillaume Desmottes -Date: Thu Mar 27 09:55:13 2008 +0000 - - salut-avahi-contact-manager: remove OLPC activity code. Create salut-avahi-contact objects - - - 20080327095513-7fe3f-e4822f0d7e85cfdd74558d2c0270c4e6eb6c623f.gz - - src/salut-avahi-contact-manager.c | 116 ++++++++++++------------------------- - 1 files changed, 38 insertions(+), 78 deletions(-) - -commit 93fb663c7f1873e50b505711ec7395bdf4deceb1 -Author: Guillaume Desmottes -Date: Fri Mar 21 15:53:38 2008 +0000 - - salut-connection: disconnect signals when disposing the discovery client - - - 20080321155338-7fe3f-cbb3f2ee1e0fa329be662292132042d0734d066a.gz - - src/salut-connection.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 10d840ac705e416a986c0e236b8c1fea62a6e527 -Author: Guillaume Desmottes -Date: Fri Mar 21 10:47:17 2008 +0000 - - avahi-discovery-client: implement salut_discovery_client_create_olpc_activity_manager - - - 20080321104717-7fe3f-b4669f9bf8b01673452ea1223a24955e4af08d5f.gz - - src/salut-avahi-discovery-client.c | 20 ++++++++++++++++++++ - 1 files changed, 20 insertions(+), 0 deletions(-) - -commit 6bdd4486ebe8969efc374703d52e653698d33dff -Author: Guillaume Desmottes -Date: Fri Mar 21 10:43:27 2008 +0000 - - discovery-client: add salut_discovery_client_create_olpc_activity_manager - - - 20080321104327-7fe3f-db4648f11b6b029d7013c7d6d73ffb652c14cb06.gz - - src/salut-discovery-client.c | 11 +++++++++++ - src/salut-discovery-client.h | 6 ++++++ - 2 files changed, 17 insertions(+), 0 deletions(-) - -commit e6878327f0850724377792e308ad39a2e978c94b -Author: Sjoerd Simons -Date: Thu Mar 20 11:35:53 2008 +0000 - - GibberRMulticastCausalTransport: When reconnecting after a reset, reset the resetting flag - - - 20080320113553-b58c9-d3074a3e1160a03331fbdce5f91f380d0f3ed5d4.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 3086e9264a860253ff8eabaee6af4093ac1e5f1c -Author: Sjoerd Simons -Date: Thu Mar 20 11:34:52 2008 +0000 - - continous-failure.py: Update test to send messages on a regular basis to see check if data is still send after a reset - - - 20080320113452-b58c9-08851cf6347ebf8cc7dd2e01a5c72fed36125220.gz - - tests/continous-failure.py | 22 +++++++++++++++++++--- - 1 files changed, 19 insertions(+), 3 deletions(-) - -commit 602c6f6bc635042fe6fbea2abc5c2de953ad7ae1 -Author: Sjoerd Simons -Date: Thu Mar 20 11:30:05 2008 +0000 - - While resetting just drop messages, don't send it through to a lower transport - - - 20080320113005-b58c9-d73e2c636279bd00059324fd4887dcf0e3659697.gz - - lib/gibber/gibber-r-multicast-transport.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 23a60749273e1190f99d998562ae6879c1568c3b -Author: Guillaume Desmottes -Date: Wed Mar 19 12:55:32 2008 +0000 - - debug: add olpc-activity flag - - - 20080319125532-7fe3f-055e6d4797aca930049e5cae15a62e4f035fc849.gz - - src/debug.c | 1 + - src/debug.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit d9d8ef5a2c7e774c5d937bc633ff08a2be965b4c -Author: Guillaume Desmottes -Date: Wed Mar 19 10:27:29 2008 +0000 - - remove salut_contact_manager_new - - - 20080319102729-7fe3f-4f0c1433c118b957335b900aea2f66d25e7cad11.gz - - src/salut-contact-manager.c | 8 -------- - src/salut-contact-manager.h | 5 ----- - 2 files changed, 0 insertions(+), 13 deletions(-) - -commit 79df5bcc095465d3a8e665cbb16abb58f713678a -Author: Guillaume Desmottes -Date: Tue Mar 18 16:35:44 2008 +0000 - - avahi-muc-manager.c: coding style tweaks - - - 20080318163544-7fe3f-a60f37a9ffa487379835927235ffb41adca67e39.gz - - src/salut-avahi-muc-manager.c | 11 +++++------ - 1 files changed, 5 insertions(+), 6 deletions(-) - -commit b36d6b30d6a0cb22b70cb7c1de770b72c6233805 -Author: Guillaume Desmottes -Date: Tue Mar 18 15:47:22 2008 +0000 - - muc-manager: remove useless old code - - - 20080318154722-7fe3f-5731f6d75840b5e75acf9f67478d304bf78b47aa.gz - - src/salut-muc-manager.c | 8 -------- - 1 files changed, 0 insertions(+), 8 deletions(-) - -commit cb3903fa53d891acac96d5bec80594c988ab804e -Author: Guillaume Desmottes -Date: Tue Mar 18 15:23:39 2008 +0000 - - salut-connection: use new contact mgr API - - - 20080318152339-7fe3f-86071c68ee5c3f1155db72264b65dc8cd4e433d5.gz - - src/salut-connection.c | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) - -commit 4ebf23fb1edd5846d3dbeaac38d9402c97d7691d -Author: Guillaume Desmottes -Date: Tue Mar 18 15:22:50 2008 +0000 - - build salut-avahi-contact-manager - - - 20080318152250-7fe3f-4af252905dc8876c50486b8fa9b5c9d45a26b0af.gz - - src/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit fe27cb90ac40d5f01ad97d91f26d82f5252f8cf2 -Author: Guillaume Desmottes -Date: Tue Mar 18 15:22:14 2008 +0000 - - add salut-avahi-contact-manager.[ch] - - - 20080318152214-7fe3f-fd7bbb7b5683df57128067c23e50ec75cca4d393.gz - - src/salut-avahi-contact-manager.c | 367 +++++++++++++++++++++++++++++++++++++ - src/salut-avahi-contact-manager.h | 67 +++++++ - 2 files changed, 434 insertions(+), 0 deletions(-) - -commit 15d0cbe5da141d1574641575c19bae91fff899f0 -Author: Guillaume Desmottes -Date: Tue Mar 18 15:21:46 2008 +0000 - - salut-contact-manager: start to abstract avahi bits - - - 20080318152146-7fe3f-a6b449bdebfe41378d0ec20edf0b11dfc6a5f15d.gz - - src/salut-contact-manager.c | 189 +++++-------------------------------------- - src/salut-contact-manager.h | 15 +++- - 2 files changed, 31 insertions(+), 173 deletions(-) - -commit a8703dfe2d2d6c187028bde69eba9000df32bd59 -Author: Guillaume Desmottes -Date: Tue Mar 18 15:19:48 2008 +0000 - - avahi-discovery-client: implement _create_contact_manager - - - 20080318151948-7fe3f-a43f06c6417962e08a095a232b2ce007347f7b22.gz - - src/salut-avahi-discovery-client.c | 20 ++++++++++++++++++++ - 1 files changed, 20 insertions(+), 0 deletions(-) - -commit 88393a1d426e6254b5b6ae0e20d7477fea4cbbeb -Author: Guillaume Desmottes -Date: Tue Mar 18 15:19:06 2008 +0000 - - discovery-client: add salut_discovery_client_create_contact_manager - - - 20080318151906-7fe3f-981dd6cb69b48cfa77e1e397025da0f779658423.gz - - src/salut-discovery-client.c | 11 +++++++++++ - src/salut-discovery-client.h | 6 ++++++ - 2 files changed, 17 insertions(+), 0 deletions(-) - -commit 7c1b6001a909da31ac103751e6bd08925f9623f1 -Author: Guillaume Desmottes -Date: Tue Mar 18 12:54:19 2008 +0000 - - contact-manager: use the service name and not the activity name when removing an activity - - - 20080318125419-7fe3f-2b6337e920050070038738a49c87de057b8af8b6.gz - - src/salut-contact-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3c4bb38dd180bf3f97709c1c92296cdd64f1a51c -Author: Guillaume Desmottes -Date: Mon Mar 17 15:44:29 2008 +0000 - - salut-contact-manager: create a constructor to properly create the object - - - 20080317154429-7fe3f-f20137920dbb21f656396e5da08d67863cb620d8.gz - - src/salut-contact-manager.c | 111 ++++++++++++++++++++++++++++++++++++------- - 1 files changed, 94 insertions(+), 17 deletions(-) - -commit 714865396ee3483d7ee61ad344f19e7b8a038808 -Author: Guillaume Desmottes -Date: Mon Mar 17 14:39:52 2008 +0000 - - salut-avahi-discovery-client.c: change state when disposing the client - - - 20080317143952-7fe3f-73429a826f5478eb70e85ee828a7020abcdb5b46.gz - - src/salut-avahi-discovery-client.c | 39 +++++++++++++++++++++-------------- - 1 files changed, 23 insertions(+), 16 deletions(-) - -commit a44a5910b37e280f5abac1b639b0ac2c1488a70b -Author: Guillaume Desmottes -Date: Mon Mar 17 14:37:47 2008 +0000 - - salut-discovery-client: add disconnecting state - - - 20080317143747-7fe3f-3162180c4c51a4d3e003435a069ff7edfc473104.gz - - src/salut-avahi-discovery-client.c | 1 + - src/salut-discovery-client.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit d5b601c6f766e8bdf83c002502b4d18edd0fe48f -Author: Guillaume Desmottes -Date: Mon Mar 17 14:18:16 2008 +0000 - - muc-channel: rely on abstract methods to announce muc service - - - 20080317141816-7fe3f-f1f633e02d41e00ea40eecf198b191e562adc532.gz - - src/salut-muc-channel.c | 237 +++++++---------------------------------------- - src/salut-muc-channel.h | 15 ++- - 2 files changed, 43 insertions(+), 209 deletions(-) - -commit 921cb7b9413def5c8cc20b0b4bf4b91fa03bb77a -Author: Guillaume Desmottes -Date: Mon Mar 17 14:16:21 2008 +0000 - - salut-muc-manager: abstract muc channel creation in the muc manager - - - 20080317141621-7fe3f-c4d0ec3168ae673daff944d86f5da480dbe69d07.gz - - src/salut-avahi-muc-manager.c | 22 ++++++++++++++++++++++ - src/salut-muc-manager.c | 7 ++++--- - src/salut-muc-manager.h | 7 +++++++ - 3 files changed, 33 insertions(+), 3 deletions(-) - -commit d62508fa13a6c404670251be4e554a8a6c213b2c -Author: Guillaume Desmottes -Date: Mon Mar 17 14:15:14 2008 +0000 - - build salut-avahi-muc-channel - - - 20080317141514-7fe3f-910247ed1d5b704567837622eb37877a2f84f9f3.gz - - src/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 6a27e50ad8a3f2f4e19e9de93f0e00b43a0a29e0 -Author: Guillaume Desmottes -Date: Mon Mar 17 14:00:27 2008 +0000 - - add salut-avahi-muc-channel.[ch] - - - 20080317140027-7fe3f-7801255ac46bca9955736f135e8f9f41ee583a83.gz - - src/salut-avahi-muc-channel.c | 362 +++++++++++++++++++++++++++++++++++++++++ - src/salut-avahi-muc-channel.h | 72 ++++++++ - 2 files changed, 434 insertions(+), 0 deletions(-) - -commit 8c79c8c5f52575ea4d94e706b28bacd9b956824e -Author: Guillaume Desmottes -Date: Mon Mar 17 09:13:58 2008 +0000 - - add salut_muc_channel_new - - - 20080317091358-7fe3f-19f5fb49e07a068f74abe16564e8c66f68059228.gz - - src/salut-muc-channel.c | 23 +++++++++++++++++++++++ - src/salut-muc-channel.h | 9 +++++++++ - src/salut-muc-manager.c | 14 +++----------- - 3 files changed, 35 insertions(+), 11 deletions(-) - -commit e527185b1a87b4029268fba83aa2231edc563484 -Author: Guillaume Desmottes -Date: Fri Mar 14 15:19:49 2008 +0000 - - salut-connection: start to abstract Avahi - - - 20080314151949-7fe3f-ead36f3d2e99680c7b41a6dd77c8e91459336507.gz - - src/salut-connection.c | 115 ++++++++++++++++++++++++++--------------------- - 1 files changed, 64 insertions(+), 51 deletions(-) - -commit a11d8cea1ef8c30e0526299ef93b24a6697461d2 -Author: Guillaume Desmottes -Date: Fri Mar 14 15:18:15 2008 +0000 - - salut-muc-manager: remove all Avahi code and rely on abstract methods for discovery - - - 20080314151815-7fe3f-05835e68061351dcd3d100ef7b34870b18128baf.gz - - src/salut-muc-manager.c | 378 +++++++++++------------------------------------ - src/salut-muc-manager.h | 24 ++- - 2 files changed, 101 insertions(+), 301 deletions(-) - -commit 8e25249ed638ed175b078428fc3d7f1e3a31f200 -Author: Guillaume Desmottes -Date: Fri Mar 14 15:18:05 2008 +0000 - - build new files - - - 20080314151805-7fe3f-0caa7726bfd9b1ff5067152d7b054bb820a7883c.gz - - src/Makefile.am | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 060a9e35a5b1bf7b193cb6bc4558628c15aa9f26 -Author: Guillaume Desmottes -Date: Fri Mar 14 15:13:30 2008 +0000 - - add salut-avahi-muc-manager.[ch] - - - 20080314151330-7fe3f-4d49aafa79ac8e2d5de86d7651c06a4d845bef97.gz - - src/salut-avahi-muc-manager.c | 436 +++++++++++++++++++++++++++++++++++++++++ - src/salut-avahi-muc-manager.h | 68 +++++++ - 2 files changed, 504 insertions(+), 0 deletions(-) - -commit 9eaf7c8cb1568e13aaa3304596b7ee6650ec9546 -Author: Guillaume Desmottes -Date: Fri Mar 14 15:05:00 2008 +0000 - - add salut-avahi-discovery-client.[ch] - - - 20080314150500-7fe3f-955bbd7456e00d839e6844c01dc37258e97d13a7.gz - - src/salut-avahi-discovery-client.c | 265 ++++++++++++++++++++++++++++++++++++ - src/salut-avahi-discovery-client.h | 71 ++++++++++ - 2 files changed, 336 insertions(+), 0 deletions(-) - -commit aa69d2385d5975619a52dd19c2d4aa6ecabfaaab -Author: Guillaume Desmottes -Date: Fri Mar 14 15:03:25 2008 +0000 - - add salut-discovery-client.[ch] - - - 20080314150325-7fe3f-e94b563ea1f2ce64a471caa378cafb809a642b4e.gz - - src/salut-discovery-client.c | 95 ++++++++++++++++++++++++++++++++++++++++++ - src/salut-discovery-client.h | 72 +++++++++++++++++++++++++++++++ - 2 files changed, 167 insertions(+), 0 deletions(-) - -commit d6fcf8b576d6a33fd488ae334fc11b15fcee7a15 -Author: Guillaume Desmottes -Date: Fri Mar 14 12:37:31 2008 +0000 - - salut-muc-manager: move code from _new function to properties and constructor - - - 20080314123731-7fe3f-b28e4e3b3c1c4d11f1c59b5fceb8dd1aec3ed944.gz - - src/salut-muc-manager.c | 135 ++++++++++++++++++++++++++++++++++++++--------- - 1 files changed, 110 insertions(+), 25 deletions(-) - -commit bcea93334c91fcc368fd7199e16019ef79c1e77b -Author: Guillaume Desmottes -Date: Tue Mar 11 15:33:23 2008 +0000 - - salut-debug: add discovery flag - - - 20080311153323-7fe3f-e6c8c0ce2ffcb7bbbc29561a276e1ccec7bed1fd.gz - - src/debug.c | 1 + - src/debug.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit afab4ea0a6846ac8f4bc90eec91f6841cb5b7256 -Author: Alban Crequy -Date: Fri May 23 15:10:25 2008 +0000 - - Make tests work even when '.' is not in the $PATH - - - 20080523151025-a41c0-d2952b763c2ee3b40a2e43b7e8416402a4f0f2a8.gz - - rules/check.mak | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 3cc9ede38bbe8c387259585b8d8a82226ec36049 -Author: Sjoerd Simons -Date: Fri May 30 11:19:43 2008 +0000 - - tube-stream: Fix off by one error in unix socket path initialization - - - 20080530111943-93b9a-6d0f9dbacadfa0c3f4c52779be03e87fc3245d45.gz - - src/tube-stream.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f79090a53928fb0dbbafd43c0e4cfe77fc7dd221 -Author: Guillaume Desmottes -Date: Tue Apr 29 13:38:27 2008 +0000 - - don't use EAI_ADDRFAMILY and EAI_NODATA. Should fix build on Fedora 9 - - - 20080429133827-7fe3f-479a47eecfdd825cc8b38a88309be9d8cb1b711f.gz - - lib/gibber/gibber-resolver.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 54b93297f110a75446299c07c6ac655b5bc02ff7 -Author: Simon McVittie -Date: Wed Apr 23 11:31:13 2008 +0000 - - docs/: build HTML by default, now we have a properly licensed xep.xsl - - - 20080423113113-53eee-b88afcd4c99f1b209c9ef2d06840437ee3aafd2b.gz - - docs/Makefile.am | 38 ++++++++++++++------------------------ - docs/README | 6 ------ - 2 files changed, 14 insertions(+), 30 deletions(-) - -commit 1564754cf17a3b142351a09441aadf8712ef8c00 -Author: Simon McVittie -Date: Wed Apr 23 11:30:55 2008 +0000 - - tools/: ship xep.xsl now it's DFSG-free (thanks stpeter!) - - - 20080423113055-53eee-831b6ceaa3e7ffa200eb701e7d1230cb4ac3d604.gz - - tools/Makefile.am | 10 +- - tools/xep.xsl | 909 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 918 insertions(+), 1 deletions(-) - -commit 6ded0e455db5c1abce389da9c96133e42748e756 -Author: Simon McVittie -Date: Wed Apr 23 11:07:50 2008 +0000 - - COPYING: indicate the status of src/sha1/sha1.[ch] and tools/xep.xsl - - - 20080423110750-53eee-da5ecd8b1432500239b14fb3973a2214d450fe12.gz - - COPYING | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 69 insertions(+), 1 deletions(-) - -commit 03a1fa63b591fef7483832401c21cc988c63b26e -Author: Simon McVittie -Date: Tue Apr 22 11:06:27 2008 +0000 - - Fix bashism "&>" - - - 20080422110627-53eee-036b7cb6f278804e8c925529da6a7994fc14671f.gz - - autogen.sh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 70d4c73e78eb53e9f38ab55a08b0291c1b229bef -Author: Simon McVittie -Date: Mon Apr 21 17:13:58 2008 +0000 - - Remove cruft from tools/ - - - 20080421171358-53eee-b7e2675e510303d1b1ca398dcc8816491a10b64f.gz - - tools/Makefile.am | 7 +- - tools/genginterface.py | 712 ------------------------------------------ - tools/ls-interfaces.xsl | 35 -- - tools/make-all-async.xsl | 43 --- - tools/spec-to-introspect.xsl | 51 --- - tools/update-spec-gen-am.sh | 75 ----- - 6 files changed, 1 insertions(+), 922 deletions(-) - -commit e665d31614ef5aeb90a6aec96a656796808c46dc -Author: Simon McVittie -Date: Mon Apr 21 16:54:49 2008 +0000 - - Add tools/ to SUBDIRS - - - 20080421165449-53eee-7e365c98ef890bc77d8c84e65c736d1e17b5ecc4.gz - - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 82fd790681fff991ac0a151e71288550c1cd8a94 -Author: Simon McVittie -Date: Mon Apr 21 16:48:35 2008 +0000 - - Move extensions/tools to tools (consistent with Gabble, telepathy-glib, etc.) - - - 20080421164835-53eee-424948eb2510e98e743a9c2ba68b8985ed9f84de.gz - - configure.ac | 2 +- - extensions/Makefile.am | 4 +- - extensions/tools/Makefile.am | 42 -- - extensions/tools/c-constants-generator.xsl | 299 -------- - extensions/tools/c-interfaces-generator.xsl | 84 --- - extensions/tools/doc-generator.xsl | 758 -------------------- - extensions/tools/genginterface.py | 712 ------------------ - extensions/tools/glib-client-marshaller-gen.py | 59 -- - extensions/tools/glib-errors-enum-body.xsl | 72 -- - extensions/tools/glib-errors-enum-header.xsl | 73 -- - extensions/tools/glib-ginterface-gen.py | 711 ------------------ - extensions/tools/glib-gtypes-generator.py | 230 ------ - .../tools/glib-interfaces-body-generator.xsl | 47 -- - extensions/tools/glib-interfaces-generator.xsl | 55 -- - extensions/tools/glib-signals-marshal-gen.py | 55 -- - extensions/tools/identity.xsl | 7 - - extensions/tools/libglibcodegen.py | 320 --------- - extensions/tools/ls-interfaces.xsl | 35 - - extensions/tools/make-all-async.xsl | 43 -- - extensions/tools/spec-to-introspect.xsl | 51 -- - extensions/tools/update-spec-gen-am.sh | 75 -- - tools/Makefile.am | 42 ++ - tools/c-constants-generator.xsl | 299 ++++++++ - tools/c-interfaces-generator.xsl | 84 +++ - tools/doc-generator.xsl | 758 ++++++++++++++++++++ - tools/genginterface.py | 712 ++++++++++++++++++ - tools/glib-client-marshaller-gen.py | 59 ++ - tools/glib-errors-enum-body.xsl | 72 ++ - tools/glib-errors-enum-header.xsl | 73 ++ - tools/glib-ginterface-gen.py | 711 ++++++++++++++++++ - tools/glib-gtypes-generator.py | 230 ++++++ - tools/glib-interfaces-body-generator.xsl | 47 ++ - tools/glib-interfaces-generator.xsl | 55 ++ - tools/glib-signals-marshal-gen.py | 55 ++ - tools/identity.xsl | 7 + - tools/libglibcodegen.py | 320 +++++++++ - tools/ls-interfaces.xsl | 35 + - tools/make-all-async.xsl | 43 ++ - tools/spec-to-introspect.xsl | 51 ++ - tools/update-spec-gen-am.sh | 75 ++ - 40 files changed, 3730 insertions(+), 3732 deletions(-) - -commit 840dc089b307ec92829ec1168d4e49358910c6be -Author: Simon McVittie -Date: Mon Apr 21 16:45:08 2008 +0000 - - Add comment explaining why the .service.in file has a shorter name than you might expect - - - 20080421164508-53eee-50ee2a5f882df2251e132c2ea6326653d5b5c252.gz - - data/Makefile.am | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 4bf291a850d3c6b2dd25dbc63b5f85413202cace -Author: Simon McVittie -Date: Mon Apr 21 16:35:52 2008 +0000 - - Fix data/Makefile.am - - - 20080421163552-53eee-1138a03236e8322713771495399df05d6916cb5a.gz - - data/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit e2691a793900c2e8145c09502eb14a65d65492ae -Author: Simon McVittie -Date: Mon Apr 21 16:21:13 2008 +0000 - - Don't use tar-ustar now that we've removed the long filename that caused problems (it turns out to be an automake 1.9 feature anyway) - - - 20080421162113-53eee-7543bb61bc072f0015efc27cf296fe926d74c8d3.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 092e2331408f89ba92096cf81711061d35f2dae4 -Author: Simon McVittie -Date: Mon Apr 21 16:19:10 2008 +0000 - - Pass -f to autoreconf to update config.guess and friends - - - 20080421161910-53eee-b73334e37fbba9448c78d44a2ff85167c456d0bf.gz - - autogen.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit fb208c34a09e60f88ffa5e3dbb311567a442bbe1 -Author: Simon McVittie -Date: Mon Apr 21 16:18:40 2008 +0000 - - Prefer to run under automake-1.8 if available, to avoid automake 1.9 dependencies creeping in while we claim to support 1.8 - - - 20080421161840-53eee-2efdc56698a24c917bfcafc8e27d333039df2168.gz - - autogen.sh | 13 ++++++++++--- - 1 files changed, 10 insertions(+), 3 deletions(-) - -commit 5e2f2217b52af21e7166f40e27781a610242267f -Author: Simon McVittie -Date: Mon Apr 21 16:17:39 2008 +0000 - - Remove the fragile spec-gen.am stuff (no longer used) - - - 20080421161739-53eee-57bc93785fef1e8c7ac3a3cc5d0e26a0344118e4.gz - - autogen.sh | 3 --- - extensions/Makefile.am | 2 -- - 2 files changed, 0 insertions(+), 5 deletions(-) - -commit 184f752e22d9b8e84c013568777cf12290641b7a -Author: Simon McVittie -Date: Mon Apr 21 16:16:38 2008 +0000 - - Update code generation machinery - - - 20080421161638-53eee-78f691d4d0d0c0963127d77bae015e548efe831f.gz - - extensions/Makefile.am | 123 +++++++++++++++++++++++++-------------------- - extensions/all.xml | 5 +- - extensions/channel.xml | 27 ++++++++++ - extensions/connection.xml | 28 ++++++++++ - extensions/extensions.c | 6 ++ - 5 files changed, 131 insertions(+), 58 deletions(-) - -commit bc89908e2c110cd3c72bbf3797f80788f668814c -Author: Simon McVittie -Date: Mon Apr 21 16:16:19 2008 +0000 - - Require telepathy-glib 0.7.3 (path of least resistance for updating code-gen) - - - 20080421161619-53eee-f665e1867a06078fa60351dd293a863d6c4f0ae3.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b25e0d557c06a05042251a2f19e6be38141f0152 -Author: Simon McVittie -Date: Mon Apr 21 16:14:50 2008 +0000 - - configure.ac: check for mkdir -p (needed for updated code-gen) - - - 20080421161450-53eee-fb71431d2ef8588ab0149b61ab5a13fa1fc5170d.gz - - configure.ac | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 03df27f95ef4926dc0f15739d73b0c7a7f5758da -Author: Simon McVittie -Date: Mon Apr 21 16:14:25 2008 +0000 - - Add more codegen tools from telepathy-glib - - - 20080421161425-53eee-57f3aa4bdca004be44ba9ac5c24389e94bd1b55c.gz - - extensions/tools/Makefile.am | 35 +- - extensions/tools/glib-client-marshaller-gen.py | 59 ++ - extensions/tools/glib-ginterface-gen.py | 711 ++++++++++++++++++++ - extensions/tools/glib-gtypes-generator.py | 230 +++++++ - .../tools/glib-interfaces-body-generator.xsl | 47 ++ - extensions/tools/glib-interfaces-generator.xsl | 55 ++ - extensions/tools/glib-signals-marshal-gen.py | 55 ++ - extensions/tools/identity.xsl | 7 + - extensions/tools/libglibcodegen.py | 320 +++++++++ - 9 files changed, 1517 insertions(+), 2 deletions(-) - -commit dcf357c704df13cce5310c00b64ed5e14d4127ab -Author: Simon McVittie -Date: Mon Apr 21 16:12:21 2008 +0000 - - Update existing codegen tools from telepathy-glib - - - 20080421161221-53eee-04dacea1ac4f1d291f79f3c3b08d581458e08925.gz - - extensions/tools/c-constants-generator.xsl | 184 ++++++++----- - extensions/tools/c-interfaces-generator.xsl | 4 +- - extensions/tools/doc-generator.xsl | 385 ++++++++++++++++++++++++-- - extensions/tools/glib-errors-enum-body.xsl | 27 ++- - extensions/tools/glib-errors-enum-header.xsl | 27 ++- - extensions/tools/ls-interfaces.xsl | 2 + - extensions/tools/make-all-async.xsl | 21 ++ - extensions/tools/spec-to-introspect.xsl | 25 ++ - 8 files changed, 571 insertions(+), 104 deletions(-) - -commit 5bcaaea2ea021a4ea6041b74e4f273ea90f63298 -Author: Simon McVittie -Date: Mon Apr 21 13:23:30 2008 +0000 - - Remove as-ac-expand.m4 - - - 20080421132330-53eee-a75b470d6b20679042002bc0e537eda878146451.gz - - m4/Makefile.am | 3 +-- - m4/as-ac-expand.m4 | 49 ------------------------------------------------- - 2 files changed, 1 insertions(+), 51 deletions(-) - -commit bea029f709c6ddc673efddbb2132b3e7bdce81af -Author: Simon McVittie -Date: Mon Apr 21 13:22:54 2008 +0000 - - Remove now-useless AC_DEFINE/AC_SUBST/AS_AC_EXPAND of DBUS_SERVICES_DIR - - - 20080421132254-53eee-0d8b677b837a93d334ee5ae9bff9a44a22deca3b.gz - - configure.ac | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -commit 95bf83c298e779d4edd4b712443297eb072a58a1 -Author: Simon McVittie -Date: Mon Apr 21 13:19:32 2008 +0000 - - Don't distribute .service.in file with insanely long name (patch from my Gabble branch) - - - 20080421131932-53eee-568b21973e005135bffa5098629be745ed4ea9b5.gz - - data/Makefile.am | 21 +++++++------------ - ...op.Telepathy.ConnectionManager.salut.service.in | 3 -- - data/salut.service.in | 3 ++ - 3 files changed, 11 insertions(+), 16 deletions(-) - -commit 7aea6b5ce4246b70983e93cff3454a3a627a32c1 -Author: Simon McVittie -Date: Mon Apr 21 13:03:33 2008 +0000 - - Add a hard dependency on telepathy-glib 0.6.1 and avoid using #ifdef for tp_debug_set_flags - - - 20080421130333-53eee-01c0cf70c09ca45cf4721d0b258ac39e026e29e1.gz - - configure.ac | 7 +------ - src/debug.c | 6 +----- - src/salut.c | 10 +--------- - 3 files changed, 3 insertions(+), 20 deletions(-) - -commit bdafc09c8d55a67e445158779b99d98699864bf5 -Author: Alban Crequy -Date: Tue Apr 15 15:31:56 2008 +0000 - - Add a D-Bus message queue when the application is not yet connected to the tube (similar to Bug #14343 in Gabble) - - - 20080415153156-a41c0-24c44c55063246bb5ef35d4c0f250c8ce5bc6068.gz - - src/tube-dbus.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++---- - 1 files changed, 72 insertions(+), 6 deletions(-) - -commit 67badba2f8d18c51eab027dca48d7273288c8726 -Author: Alban Crequy -Date: Tue Apr 15 14:40:03 2008 +0000 - - Fix copyright - - - 20080415144003-a41c0-28af9e509291e1acda3cf78e7f15bb3246559ec8.gz - - lib/gibber/gibber-bytestream-ibb.c | 2 +- - src/tube-dbus.c | 2 +- - src/tube-iface.c | 2 +- - src/tube-stream.c | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -commit 15adc0cb109f4a1c3ee154d968b117eb5cc72281 -Author: Guillaume Desmottes -Date: Tue Apr 15 14:22:19 2008 +0000 - - rename gibber_transport_block to gibber_transport_block_receiving - - - 20080415142219-7fe3f-da9d8e1cce94bb1e4b69012cd0f6fae743962c80.gz - - lib/gibber/gibber-bytestream-oob.c | 2 +- - lib/gibber/gibber-fd-transport.c | 12 ++++++------ - lib/gibber/gibber-transport.c | 8 ++++---- - lib/gibber/gibber-transport.h | 7 +++---- - src/tube-stream.c | 2 +- - 5 files changed, 15 insertions(+), 16 deletions(-) - -commit 97f66166caf66b9b116adee81ccb1df4928c31be -Author: Guillaume Desmottes -Date: Wed Mar 5 18:02:57 2008 +0000 - - tube-stream: block the data stream when the bytestream is blocked and when transport buffer isn't empty - - - 20080305180257-7fe3f-fafcd411c3d2394983a9964e2a618750b0ef9d2f.gz - - src/tube-stream.c | 99 +++++++++++++++++++++++++++++++++++++++++------------ - 1 files changed, 77 insertions(+), 22 deletions(-) - -commit e48eec3dec961b9d0cfefea9c78cf7a44b6672ac -Author: Guillaume Desmottes -Date: Wed Mar 5 17:55:43 2008 +0000 - - bytestream-oob: block writing if the transport buffer isn't empty - - - 20080305175543-7fe3f-41abf277588792b510162fd467810363da4a7679.gz - - lib/gibber/gibber-bytestream-oob.c | 68 ++++++++++++++++++++++++++++++----- - 1 files changed, 58 insertions(+), 10 deletions(-) - -commit 0e46c6118b1cdb9783315ee2f0c27042223854b3 -Author: Guillaume Desmottes -Date: Wed Mar 5 17:53:36 2008 +0000 - - add gibber_bytestream_oob_block_read - - - 20080305175336-7fe3f-f69727027697ba9977c2499ea5363c746729a494.gz - - lib/gibber/gibber-bytestream-oob.c | 16 ++++++++++++++++ - lib/gibber/gibber-bytestream-oob.h | 3 +++ - 2 files changed, 19 insertions(+), 0 deletions(-) - -commit b251bd8f5dcc4ca2ae8ed6f044c73fa38094e1c5 -Author: Guillaume Desmottes -Date: Wed Mar 5 17:48:08 2008 +0000 - - gibber-fd-transport.c: implement gibber_transport_block - - - 20080305174808-7fe3f-f02e8973276cfcb0e09d7eaec57ad66ead0da158.gz - - lib/gibber/gibber-fd-transport.c | 28 +++++++++++++++++++++++++++- - 1 files changed, 27 insertions(+), 1 deletions(-) - -commit 0e80f8098d1a758149474b3ac3d540322a8b6e23 -Author: Guillaume Desmottes -Date: Wed Mar 5 17:33:24 2008 +0000 - - add gibber_transport_block method - - - 20080305173324-7fe3f-aefe91baadbb145291b0df9b79820785c736d958.gz - - lib/gibber/gibber-transport.c | 11 +++++++++++ - lib/gibber/gibber-transport.h | 5 +++++ - 2 files changed, 16 insertions(+), 0 deletions(-) - -commit 373294cf95440d889e33fa08834bdee6ce9a4d9e -Author: Sjoerd Simons -Date: Fri Feb 29 18:54:30 2008 +0000 - - Fix some small coding style issues - - - 20080229185430-b58c9-2e8a9fd2e3272303a046d480e03c1aec547a82cd.gz - - lib/gibber/gibber-r-multicast-sender.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit d6a58f308a9895d3a9c031a7057b95efb67d93f0 -Author: Sjoerd Simons -Date: Fri Feb 29 18:48:48 2008 +0000 - - GibberRMulticastSender: Don't assume that all packets between ->first_packet, and ->next_output_paxket exist - - - 20080229184848-b58c9-9d5a66aa30b9b5c7dc71858ec0c3d548f2c96027.gz - - lib/gibber/gibber-r-multicast-sender.c | 20 ++++++++------------ - 1 files changed, 8 insertions(+), 12 deletions(-) - -commit 79f17b1a0ca1f6af570c6807b0b02017afdaf367 -Author: Sjoerd Simons -Date: Fri Feb 29 17:57:44 2008 +0000 - - GibberRMulticastSender: Fix repairing when the node has moved to pending_removal - - - 20080229175744-b58c9-badc83e553cb58214d8869138cf0cb3b46e7313f.gz - - lib/gibber/gibber-r-multicast-sender.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 76058b9330713ce96e84d2a27743f5834efb23cd -Author: Sjoerd Simons -Date: Fri Feb 29 16:57:07 2008 +0000 - - GibberRMulticastSenderGroup: WHOIS_REQUEST senders should be looked up by whois_request.sender_id in the packet - - - 20080229165707-b58c9-73933d5855900e271c22c38a3dd468af8a4ee010.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d6e5594dab49ccf0ba5a2a3c0f80814cdc4d81f8 -Author: Sjoerd Simons -Date: Fri Feb 29 16:28:11 2008 +0000 - - GibberRMulticastSenderGroup: Fixed a silly bug where the condition in the forloop woud still true forever - - - 20080229162811-b58c9-1d62bba768c92463f9bc6d0171edcc4c5034cadc.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2850949ccc50f0487284acf65b69fe7c999c38e8 -Author: Sjoerd Simons -Date: Fri Feb 29 11:46:20 2008 +0000 - - GibberRMulticast: Don't keep pending removals in the main hash, but put them in a seperate array. So we can start a new gathering session including them, while still being able to react on repair requests - - - 20080229114620-b58c9-c2afc379ff4938c18beee24e7d03121670b815dc.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 109 +++----- - lib/gibber/gibber-r-multicast-sender.c | 312 +++++++++++++++++----- - lib/gibber/gibber-r-multicast-sender.h | 8 +- - 3 files changed, 290 insertions(+), 139 deletions(-) - -commit 4ebb8f7d45b2bdcfe51f545ad5f6d0d3d65b385b -Author: Sjoerd Simons -Date: Thu Feb 28 16:40:05 2008 +0000 - - GibberRMulticastTransport: Ensure we wait for nodes to finish their failure process before completeling the JOIN - - - 20080228164005-b58c9-91e322e6df3277ac03363586159626c1e4fd3d10.gz - - lib/gibber/gibber-r-multicast-transport.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit b3144e0081462993a01017931ee86fc969f0dc5a -Author: Sjoerd Simons -Date: Thu Feb 28 16:39:26 2008 +0000 - - GibberRMulticastTransport: reset the timeout to zero when the gathering phase has stopped, not strictly necessary, but nice anyway - - - 20080228163926-b58c9-427ec7caa197665ffaf2714fcbb549985fbefc02.gz - - lib/gibber/gibber-r-multicast-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit a7fde038d8e85345900587d31866e74f4ddd8895 -Author: Sjoerd Simons -Date: Thu Feb 28 15:47:31 2008 +0000 - - GibberRMulticastSender: Set the pending removal state before checking the queue length as the lenght partially depends on the state - - - 20080228154731-b58c9-2310ba695cac0635d663f79ecf3570bee82069a5.gz - - lib/gibber/gibber-r-multicast-sender.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit d38a061aae61d1ff4184c6f3ac35f3a556a35bf3 -Author: Sjoerd Simons -Date: Thu Feb 28 11:16:35 2008 +0000 - - If we're resetting because the join failed, return JOIN_FAILED immediately - - - 20080228111635-b58c9-be2d6d6e3d8b31472ca7a4dc4c3720764d7deba4.gz - - lib/gibber/gibber-r-multicast-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 6ca82af019bed472e693fd02c1eb5e5fd25d6621 -Author: Sjoerd Simons -Date: Thu Feb 28 11:16:08 2008 +0000 - - Better debugging of sender garbage collection - - - 20080228111608-b58c9-f407c4561a64c815eb1645d749755ab15d058093.gz - - lib/gibber/gibber-r-multicast-sender.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit 4b0d9e0136c26d3887cbc44292bddae343031103 -Author: Sjoerd Simons -Date: Thu Feb 28 09:55:32 2008 +0000 - - GibberRMulticast: Add more clear debugging information - - - 20080228095532-b58c9-4d7e3a4de70c95b7511eccb8b152c6c2c3ebc2a5.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 +- - lib/gibber/gibber-r-multicast-transport.c | 4 +++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -commit d6846b71b911caeb176fb467e7fb7be2a5f44161 -Author: Guillaume Desmottes -Date: Thu Feb 21 10:10:38 2008 +0000 - - bytestream-muc: set state to closing before closed - - - 20080221101038-7fe3f-bc6a9ae25604b2e906294bd65a8a3b26141904fe.gz - - lib/gibber/gibber-bytestream-muc.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 58beddaf9079aea3cc1fe363ed80bdaeb785246a -Author: Guillaume Desmottes -Date: Thu Feb 21 10:09:04 2008 +0000 - - bytestream-ibb: set status to closing before closed - - - 20080221100904-7fe3f-d774fc518f296f4c59735deedf6a75f0e7201137.gz - - lib/gibber/gibber-bytestream-ibb.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 1ac01f37e4e704ae0527d2034d734b9084079cfa -Author: Guillaume Desmottes -Date: Thu Feb 21 10:03:27 2008 +0000 - - bytestream-ibb: add a explanation about the current status of this bytestream - - - 20080221100327-7fe3f-70b9a8bf9ed9f214be8b9d74d95c412f09b01c0f.gz - - lib/gibber/gibber-bytestream-ibb.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit ad611c9862068d49e0a53ed48b64a788a6fc2317 -Author: Guillaume Desmottes -Date: Thu Feb 21 09:35:58 2008 +0000 - - bytestream-obb: remove redundant disconnect signals - - - 20080221093558-7fe3f-809061765448b5b7f9ba38358e7322d2d591cc17.gz - - lib/gibber/gibber-bytestream-oob.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 505474ee6f0470698211d14c89777c7568d4b185 -Author: Guillaume Desmottes -Date: Thu Feb 21 09:15:46 2008 +0000 - - bystream-oob: always go trought the closing state before the closed one - - - 20080221091546-7fe3f-50d041136c8170d666b749516b0a0779809a7362.gz - - lib/gibber/gibber-bytestream-oob.c | 11 +++++++---- - 1 files changed, 7 insertions(+), 4 deletions(-) - -commit e51f4a5d3a47504f335de2bae30b25f63535a596 -Author: Guillaume Desmottes -Date: Wed Feb 20 16:43:11 2008 +0000 - - bytestream-obb: add a closing state and disconnect the transport when closing the bytestream - - - 20080220164311-7fe3f-1607e7cd44065f8b009a18c58cb75da4e65ff2f1.gz - - lib/gibber/gibber-bytestream-iface.h | 1 + - lib/gibber/gibber-bytestream-oob.c | 151 +++++++++++++++++++++------------- - 2 files changed, 93 insertions(+), 59 deletions(-) - -commit 7530f84eb582195761b40743c574ec520bb96cba -Author: Guillaume Desmottes -Date: Wed Feb 20 15:13:58 2008 +0000 - - bytestream-oob: be sure the buffer is flushed before disconnect the transport - - - 20080220151358-7fe3f-b110c0e52710a52a6e20b77458ed67fda0ef9969.gz - - lib/gibber/gibber-bytestream-oob.c | 23 +++++++++++++++++++++-- - 1 files changed, 21 insertions(+), 2 deletions(-) - -commit 52d93588ef9ce1d525dd0b2a663dc17fd8174ae0 -Author: Guillaume Desmottes -Date: Wed Feb 20 13:07:31 2008 +0000 - - gibber-fd-transport: emit the buffer-empthy signal when all the data are directly send - - - 20080220130731-7fe3f-89479d58b69bdb4f589128959eb298dca9ff7890.gz - - lib/gibber/gibber-fd-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 538355b88670e3af185453e325fcdae715b14e2b -Author: Guillaume Desmottes -Date: Wed Feb 20 13:02:22 2008 +0000 - - add gibber_transport_emit_buffer_empty and use it instead of g_signal_emit_by_name - - - 20080220130222-7fe3f-6dda7dbd3f91fc6267ced2140be54e819795d977.gz - - lib/gibber/gibber-fd-transport.c | 2 +- - lib/gibber/gibber-transport.c | 5 +++++ - lib/gibber/gibber-transport.h | 3 +++ - 3 files changed, 9 insertions(+), 1 deletions(-) - -commit 0b541bf829fadb6d032202225ef64af23779cf7f -Author: Guillaume Desmottes -Date: Wed Feb 20 12:53:52 2008 +0000 - - gibber-transport: assert buffer_is_empty is implemented - - - 20080220125352-7fe3f-8e09cfb31edccb90388aee786f67cea18f708768.gz - - lib/gibber/gibber-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 7fb3bd086ba3854d62586ce489fd79c9fe0feaf4 -Author: Guillaume Desmottes -Date: Wed Feb 20 12:35:22 2008 +0000 - - tube-stream: wait the buffer is empty before remove the transport - - - 20080220123522-7fe3f-afeb9636be83cf04ef69ed305dcb89e8f606d675.gz - - src/tube-stream.c | 48 ++++++++++++++++++++++++++++++++++++++++-------- - 1 files changed, 40 insertions(+), 8 deletions(-) - -commit bfb37e73a45382867736d801b8c9cb348bcea431 -Author: Guillaume Desmottes -Date: Wed Feb 20 12:17:26 2008 +0000 - - gibber-fd-transport: implement the buffer_is_empty method - - - 20080220121726-7fe3f-a778b637f890c297c30062f620d8c511f680b293.gz - - lib/gibber/gibber-fd-transport.c | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) - -commit ecb0af1fbb627c973ba88887e920d65b69c3c831 -Author: Guillaume Desmottes -Date: Wed Feb 20 12:15:55 2008 +0000 - - gibber-fd-transport: emit the "buffer-empty" signal when needed - - - 20080220121555-7fe3f-a4496f080ccfa38d9b014a344b5e98bd2739017f.gz - - lib/gibber/gibber-fd-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 025d957ccd802565d10813e0a17ba0ff4c1e128f -Author: Guillaume Desmottes -Date: Wed Feb 20 12:14:49 2008 +0000 - - gibber-transport: add gibber_transport_buffer_is_empty abstract method - - - 20080220121449-7fe3f-f71a67795f683190eb1cdb8bdd187858472be20e.gz - - lib/gibber/gibber-transport.c | 9 +++++++++ - lib/gibber/gibber-transport.h | 4 ++++ - 2 files changed, 13 insertions(+), 0 deletions(-) - -commit 9800b361da430e7d6023ec4c21946bada41a6240 -Author: Guillaume Desmottes -Date: Wed Feb 20 12:02:30 2008 +0000 - - gibber-transport: add a "empty-buffer" signal - - - 20080220120230-7fe3f-bc4ddd7398392a295371f79ea5b8b393c2d56dcb.gz - - lib/gibber/gibber-transport.c | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -commit 41d45b8a7c8295e036d3090398b1e248c39c0ce5 -Author: Simon McVittie -Date: Mon Feb 18 16:53:30 2008 +0000 - - Reference the wiki page about Clique - - - 20080218165330-53eee-9367f3c939ad6e6550e2ee8cbced4bfefb9ed378.gz - - README | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit af6d26986ab59c3f732d76badedd3a481058a4ca -Author: Simon McVittie -Date: Mon Feb 18 15:52:58 2008 +0000 - - Fix up README for current Salut. Also s/Gabble/Salut/ and mention XEP-0174 instead of "Bonjour" - - - 20080218155258-53eee-6ec390e2983c8fdba3a1ecaa76d5e519c553ecd7.gz - - README | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit 3c12496df530bd34f12671ef80a4d0272d910383 -Author: Simon McVittie -Date: Mon Feb 18 15:36:53 2008 +0000 - - Use -Wno-portability now we explicitly require GNU Make (fd.o #14020) - - - 20080218153653-53eee-540983842761c77aff3c25e27d7464e2f9d48ad8.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e34ae4d0a6d2f30303f71be90a5b2faf100eab29 -Author: Simon McVittie -Date: Mon Feb 18 15:36:48 2008 +0000 - - Add README - - - 20080218153648-53eee-e4a9566921b4a9fbe34215d6bd768b8e3983d564.gz - - README | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 76 insertions(+), 0 deletions(-) - -commit 57d7db564d7add1e3a4bebd212b362855b775a05 -Author: Guillaume Desmottes -Date: Fri Feb 15 11:42:21 2008 +0000 - - version 0.3.1 - - - 20080215114221-7fe3f-3efe1be4226b11935799828fd35b7554d560d5d9.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit be87f224a582fd9744a582ab8dda53b9adcaa1f8 -Author: Guillaume Desmottes -Date: Fri Feb 15 11:36:45 2008 +0000 - - version 0.3.1 - - - 20080215113645-7fe3f-c2abcedba80e3c7ef3238e93211faf615e96757e.gz - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit d53d681f706d3f68d97772535a729847b4d5003b -Author: Laurent Bigonville -Date: Tue Feb 5 18:41:24 2008 +0000 - - configure.ac: readd lost enable_ssl variable - - - 20080205184124-34271-e12bdde8c722b2febc05a7821e5d497cf15567e5.gz - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 5c240f76ab40fed44e5c3dbcb7ee22c07d9f9061 -Author: Laurent Bigonville -Date: Sat Feb 2 16:21:49 2008 +0000 - - configure.ac: add a flag to control openssl support - - - 20080202162149-34271-7929944141455b52154b228f4060568fa13ded43.gz - - configure.ac | 14 +++++++++++--- - 1 files changed, 11 insertions(+), 3 deletions(-) - -commit f09f5999d37b7796e8cb893f41d6c00fae4e4403 -Author: Guillaume Desmottes -Date: Fri Feb 15 11:20:08 2008 +0000 - - add Salut 0.3.1 release notes - - - 20080215112008-7fe3f-7b9edb91bfea256dcad706e842dfd19a8fad3631.gz - - NEWS | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 6e5c96a214e44b574ad26d714cb31ffa0720781f -Author: Marco Barisione -Date: Tue Feb 12 12:50:34 2008 +0000 - - src/Makefile.am: use POSIX character classes instead of ranges - - - 20080212125034-f1355-2a8faf4a271bb325930bd8927296b26c6bad6f9c.gz - - src/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bcc6d82bc02ac5c94b030936575839eb7f826489 -Author: Marco Barisione -Date: Tue Feb 12 12:50:21 2008 +0000 - - lib/gibber/Makefile.am: use POSIX character classes instead of ranges - - - 20080212125021-f1355-0ceefa323ec0cda849ca43d4c98bf327d0255e7d.gz - - lib/gibber/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2c1336ad2871a09022395221ae5101d39674fc76 -Author: Marco Barisione -Date: Tue Feb 12 12:27:38 2008 +0000 - - src/Makefile.am: allow digits in type names while generating marshallers - - - 20080212122738-f1355-11824aaf039c3c07e4f8fa2346fa6c56f80ff76d.gz - - src/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 213e18355c8e495e30fe5223e099aa6f1ca4064f -Author: Marco Barisione -Date: Tue Feb 12 12:27:21 2008 +0000 - - lib/gibber/Makefile.am: allow digits in type names while generating marshallers - - - 20080212122721-f1355-1f151e370fda9f71bed0092657db14a241ace47a.gz - - lib/gibber/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit db2f680870119c5953195d079d75eb9724667171 -Author: Sjoerd Simons -Date: Thu Feb 7 13:06:30 2008 +0000 - - SalutMucManager: If setting up a resolver fails then we can get into a situation where a browser entry doesn't have a resolver. Handle this gracefully - - - 20080207130630-b58c9-dc509589bd21f6e3b3728f31ce0d658b92821f0c.gz - - src/salut-muc-manager.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit 655ac9abef97494c91c6ab6465716781f9b44d1b -Author: Guillaume Desmottes -Date: Fri Feb 1 14:24:54 2008 +0000 - - gibber-bytestream-muc: actually close the muc before announce it as closed - - - 20080201142454-7fe3f-9a8ab540ac89d53c84b86798263b4b74892c9e8b.gz - - lib/gibber/gibber-bytestream-muc.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 2b32cc9205a8bf0a8c5ade1060f6183ceedaaf64 -Author: Sjoerd Simons -Date: Fri Feb 1 11:38:20 2008 +0000 - - Ignore request for removal of unknown senders - - - 20080201113820-b58c9-87c69bbc773c679cb69faed69004e17d06fe8183.gz - - lib/gibber/gibber-r-multicast-sender.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 40a4c17f02c721bb0d7bd5e460710ae15c9f03da -Author: Sjoerd Simons -Date: Fri Feb 1 11:27:14 2008 +0000 - - Always fully stop whois recovery process if a WHOIS_REPLY was received - - - 20080201112714-b58c9-863339e58eefca776a940199499e135791dcc91c.gz - - lib/gibber/gibber-r-multicast-sender.c | 18 ++++++++++-------- - 1 files changed, 10 insertions(+), 8 deletions(-) - -commit 1d159cc9380bcbcec563a9c113b7a1f3e490b2ae -Author: Sjoerd Simons -Date: Fri Feb 1 11:26:22 2008 +0000 - - Reschedule whois request before sending out the request sigan, to prevent race conditions if the signal handler reenters the main loop - - - 20080201112622-b58c9-e06b56b79569ba286bdbbf00b2a5ab66ce957d60.gz - - lib/gibber/gibber-r-multicast-sender.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 855af32f9cbe4568f151404028219d711ed00528 -Author: Guillaume Desmottes -Date: Fri Feb 1 09:43:51 2008 +0000 - - salut-contact: GError have to be freed using g_error_free, not g_free - - - 20080201094351-7fe3f-ee103b8c4a24aaba0b27da496f3ad8214a8ad8df.gz - - src/salut-contact.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a8039257a0293d8a08ea4556bc9df0ba5b3dba7f -Author: Guillaume Desmottes -Date: Thu Jan 31 16:43:21 2008 +0000 - - tube-dbus: fix a reference leak when creating the muc bytestream - - - 20080131164321-7fe3f-7cc97c80562d2f0e80870f4f847957c4a76bb384.gz - - src/tube-dbus.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 4eb77c90214062dfb66cf9972487066a6c4aeeb8 -Author: Guillaume Desmottes -Date: Thu Jan 31 16:37:11 2008 +0000 - - salut_tube_dbus_constructor: when handle_type is room, the bytestream have to be of type GibberBytestreamMuc - - - 20080131163711-7fe3f-8a198df36a839f33f0389c1c9e180b600cddf94d.gz - - src/tube-dbus.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 254821f14e1ee929218525c594674677842a3ad6 -Author: Guillaume Desmottes -Date: Thu Jan 31 15:24:19 2008 +0000 - - salut-self: convert error code to TP_ERROR_NETWORK_ERROR when announce_activity() failed - - - 20080131152419-7fe3f-a5344bcd08499796f6d4b6a30fcfcc2ee2cc32f4.gz - - src/salut-self.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -commit 7e59ac8f853ba07f21acfc52b996d950d92bb08c -Author: Guillaume Desmottes -Date: Wed Jan 30 13:56:46 2008 +0000 - - NEWS: copy 0.3.0 release notes - - - 20080130135646-7fe3f-20a3928b87c6d54a6dc4d1860d750309571b4f7d.gz - - NEWS | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) - -commit 66d41c641937a003c6dda54dd38df026683e66ad -Author: Guillaume Desmottes -Date: Tue Jan 29 14:09:45 2008 +0000 - - salut-contact: display error message when ga_service_resolver_attach failed - - - 20080129140945-7fe3f-4f0b4ff6b11199a4e1b7fe4b16db641cd30551fb.gz - - src/salut-contact.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 6c8e484b65a3a0a30165f7c851a4574fd48ae03d -Author: Guillaume Desmottes -Date: Tue Jan 29 13:19:56 2008 +0000 - - salut-contact-manager.c: use DEBUG macro instead of g_message - - - 20080129131956-7fe3f-6bb6300f19dfe3f3cc2f3fcbda61b8d4fdfc7ddf.gz - - src/salut-contact-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 363714111a19b772c62b8eb9a75739ee0dd13c3c -Author: Sjoerd Simons -Date: Tue Jan 29 12:02:48 2008 +0000 - - GibberResolver: Fix function definition style - - - 20080129120248-b58c9-61a80236308b5e07308103db4a8dcbd3db5d8a91.gz - - lib/gibber/gibber-resolver.c | 107 +++++++++++++++++++++++++++++------------- - 1 files changed, 74 insertions(+), 33 deletions(-) - -commit fa7c9f63e5e1657cc0d9c263b1f6cad346ff0187 -Author: Sjoerd Simons -Date: Tue Jan 29 11:51:58 2008 +0000 - - GibberRMulticastTransport: Flush the state when asked to disconnect - - - 20080129115158-b58c9-0c161791fb02f52ce3811d24c9c610e7737f98a1.gz - - lib/gibber/gibber-r-multicast-transport.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit e523fec9d7e869b2ee1ca2d9829207fe21eb95f2 -Author: Sjoerd Simons -Date: Tue Jan 29 09:28:29 2008 +0000 - - check-gibber-resolver: Fix copyright header - - - 20080129092829-b58c9-5da63100665fddc6fa637b626b4d84aff595ed01.gz - - tests/check-gibber-resolver.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 44cc6fb2ec4fad286eb84db7b65b557aab42110c -Author: Sjoerd Simons -Date: Mon Jan 28 16:45:50 2008 +0000 - - GibberResolver: Use NS_GET16 instead of GETSHORT - - - 20080128164550-b58c9-664b1041eaab8e63bab262ea1c10618a06f72adc.gz - - lib/gibber/gibber-resolver.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit ad05f27dbdf9f3ecb048ccbe27fbeba2561f80a3 -Author: Sjoerd Simons -Date: Mon Jan 28 16:01:37 2008 +0000 - - GibberResolver: Various small coding style fixes - - - 20080128160137-b58c9-5eb1f11e77f2376ea57b305ae3e6af8920aa9a03.gz - - lib/gibber/gibber-resolver.c | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) - -commit 0775044cb6c4727c7b4d10dcd43ac0767ecfa80f -Author: Sjoerd Simons -Date: Mon Jan 28 15:51:36 2008 +0000 - - GibberResolver: Use g_list_next instead of ->next - - - 20080128155136-b58c9-c7ae7b40e49736d1bf2d242d22a98bd6ea5db23f.gz - - lib/gibber/gibber-resolver.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 3effd3c88dfe9fa7b778a7e00ca3c463d00d0f65 -Author: Sjoerd Simons -Date: Mon Jan 28 15:48:28 2008 +0000 - - GibberResolver: Small coding style fix - - - 20080128154828-b58c9-797494fda61cbd5fc91121748343d04d40385fb1.gz - - lib/gibber/gibber-resolver.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b02a203bf553d59b2eae0a82fc5871d9b04c9194 -Author: Sjoerd Simons -Date: Mon Jan 28 15:31:41 2008 +0000 - - test-resolv.c: Assert the return code after calling gibber_resolver_sockaddr_to_str, so it's always executed - - - 20080128153141-b58c9-e0c2d3fed6c35dfa74ca19bf4e03d3c2e3ba9968.gz - - lib/gibber/examples/test-resolv.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit b1e604d0d15b34e9265493ae1a22adcde3203945 -Author: Sjoerd Simons -Date: Mon Jan 28 15:30:03 2008 +0000 - - GibberResolver: Small coding style fix - - - 20080128153003-b58c9-dd36bf1ad7e4d69af4e76027df791d502ab9149a.gz - - lib/gibber/gibber-resolver.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c062e22ae65adc67da6c1a23ae36b1f605a67f1e -Author: Sjoerd Simons -Date: Mon Jan 28 15:28:38 2008 +0000 - - check-gibber-resolver.c: Use g_list_next instead of ->next - - - 20080128152838-b58c9-e5f60434cd5ce808c617792826426e1e5a09eee4.gz - - tests/check-gibber-resolver.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 7b2bb7fdb8db344ceceb2fe042b77483c2489a68 -Author: Sjoerd Simons -Date: Mon Jan 28 15:28:08 2008 +0000 - - GibberResolver: unset the resolver singleton when changing the type - - - 20080128152808-b58c9-f583f1a24cb007b18f9f4bc41c5252598e159391.gz - - lib/gibber/gibber-resolver.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit f821a6d45ddbcbb895734663d03e506ce24a6e1c -Author: Sjoerd Simons -Date: Mon Jan 28 15:26:59 2008 +0000 - - test-resolv.c: Little coding style fix - - - 20080128152659-b58c9-09fee42446ba99a776873bca9d1c412f476040c8.gz - - lib/gibber/examples/test-resolv.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 468cf0821ea18a06c041876f3f9f21898bd571d2 -Author: Sjoerd Simons -Date: Tue Jan 15 11:26:34 2008 +0000 - - Kill trailing spaces - - - 20080115112634-b58c9-1449521db0d9f3a582f51a4daebeea38c5e1fd8a.gz - - configure.ac | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit 3534441abe459b6baac08fd7ca0478c98718170b -Author: Sjoerd Simons -Date: Tue Jan 15 11:26:13 2008 +0000 - - Only use the async resolver when compiled with libasyncns support - - - 20080115112613-b58c9-7adfe48352fdcddfbbf20007d4de0f8581cb79c7.gz - - configure.ac | 5 ++++- - lib/gibber/gibber-resolver.c | 11 +++++++++-- - 2 files changed, 13 insertions(+), 3 deletions(-) - -commit a32a66544e63a7f59623e74c989966440759e0e2 -Author: Sjoerd Simons -Date: Tue Jan 15 11:02:34 2008 +0000 - - Add a resolver based on libasyncns - - - 20080115110234-b58c9-e589c3b495a46d96d7ebb2986dad48149886696e.gz - - configure.ac | 8 + - lib/gibber/Makefile.am | 13 + - lib/gibber/gibber-resolver-asyncns.c | 415 ++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-resolver-asyncns.h | 59 +++++ - lib/gibber/gibber-resolver.c | 4 +- - 5 files changed, 497 insertions(+), 2 deletions(-) - -commit 35312c1a91907015443b0c6ff35b8a983774df4a -Author: Sjoerd Simons -Date: Mon Jan 14 22:13:57 2008 +0000 - - GibberResolver: Implement getting the singleton resolver - - - 20080114221357-b58c9-560bc8842e8456b9557b667fe4c6bd0e9587dba3.gz - - lib/gibber/examples/test-resolv.c | 2 +- - lib/gibber/gibber-resolver.c | 27 +++++++++++++++++++++++++++ - lib/gibber/gibber-resolver.h | 3 +++ - 3 files changed, 31 insertions(+), 1 deletions(-) - -commit 02f73d258fb5d63fea60d40aee24a3894046a9ce -Author: Sjoerd Simons -Date: Mon Jan 14 22:13:35 2008 +0000 - - GibberResolver: Actually pass the error to gibber_resolver_srv_result - - - 20080114221335-b58c9-9d328ca9d26af122e8f4fbaecd302150437be9cc.gz - - lib/gibber/gibber-resolver.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8cfccc62f400b3fcb5a4a1c26b2cd07e9fef475b -Author: Sjoerd Simons -Date: Mon Jan 14 21:50:24 2008 +0000 - - Automatically configure the right resolv linking flags - - - 20080114215024-b58c9-0576be51e81b2e661bb19b1d32b88a3e1e9e0c0f.gz - - configure.ac | 21 +++++++++++++++++++++ - lib/gibber/Makefile.am | 2 +- - 2 files changed, 22 insertions(+), 1 deletions(-) - -commit 14943ff3b025352c5613fbd50228ad52a6700ec7 -Author: Sjoerd Simons -Date: Mon Jan 14 21:10:49 2008 +0000 - - GibberResolver: Add various utility functions and error codes - - - 20080114211049-b58c9-eee3371e048e92f9a45ac683fd59e0450c505222.gz - - lib/gibber/gibber-resolver.c | 107 +++++++++++++++++++++++++++++++++++------ - lib/gibber/gibber-resolver.h | 16 ++++++ - 2 files changed, 107 insertions(+), 16 deletions(-) - -commit 444e2dab549fcd454100b5a4d54dfc24804645e4 -Author: Sjoerd Simons -Date: Mon Jan 14 20:17:44 2008 +0000 - - Add a simple check for the srv list ordering - - - 20080114201744-b58c9-88384e91e79ee779a78c90f6f52e2d458671f076.gz - - tests/Makefile.am | 5 ++- - tests/check-gibber-resolver.c | 90 ++++++++++++++++++++++++++++++++ - tests/check-gibber.h | 1 + - tests/check-main.c | 1 + - tests/test-resolver.c | 113 +++++++++++++++++++++++++++++++++++++++++ - tests/test-resolver.h | 59 +++++++++++++++++++++ - 6 files changed, 268 insertions(+), 1 deletions(-) - -commit 0f77df525c86c8e327f5db737f024653f3e77177 -Author: Sjoerd Simons -Date: Mon Jan 14 20:15:06 2008 +0000 - - Implement GibberResolver and a simple usage example - - - 20080114201506-b58c9-26494b8c9df8fb0b00d4c35803753bc41112c4a2.gz - - lib/gibber/Makefile.am | 4 +- - lib/gibber/examples/Makefile.am | 9 +- - lib/gibber/examples/test-resolv.c | 127 +++++++ - lib/gibber/gibber-resolver.c | 746 +++++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-resolver.h | 157 ++++++++ - 5 files changed, 1041 insertions(+), 2 deletions(-) - -commit 5987a50830b594a4c0a954ce06bde19d337bd21e -Author: Sjoerd Simons -Date: Tue Jan 8 16:36:52 2008 +0000 - - Remove various obsolete includes - - - 20080108163652-b58c9-a26ff9675e10011921389ffc83aa2a17e0f73e7b.gz - - src/salut-connection.c | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -commit 7cec7d2cfcb2d5d81bf50333d64c407f9ae97fcb -Author: Guillaume Desmottes -Date: Tue Jan 29 10:22:49 2008 +0000 - - check-gibber-r-multicast-sender.c: fix a GibberRMulticastPacket leak - - - 20080129102249-7fe3f-e505eadf78dff8ebf2ae5a97e50e7d27db462d9e.gz - - tests/check-gibber-r-multicast-sender.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 3a9652b60e217510b3da9c9632e326aa27e51ce7 -Author: Guillaume Desmottes -Date: Tue Jan 29 10:17:10 2008 +0000 - - check-gibber-iq-helper.c: remove debug g_print - - - 20080129101710-7fe3f-e16f785a2b3cf4f9b0ab76a2a338a079a1ed61bb.gz - - tests/check-gibber-iq-helper.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 076d7f4515b40c182a6f5663712265380d5eecc7 -Author: Guillaume Desmottes -Date: Mon Jan 28 14:32:43 2008 +0000 - - bytestream-muc: Don't set "stream-id" properties in the setter function as user isn't suppose to set one - - - 20080128143243-7fe3f-d0ad63fe82de6a1c98a8e6f432fc1e6a94d62777.gz - - lib/gibber/gibber-bytestream-muc.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit be81723c018a95ad9cfddbe8117737084e75a6f4 -Author: Guillaume Desmottes -Date: Mon Jan 28 13:55:46 2008 +0000 - - salut_params_free: don't leak the published-name - - - 20080128135546-7fe3f-9a49eec81924c616b274cb74601b4fe353abd47d.gz - - src/salut-connection-manager.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit c3da2ccc8a5dc1a34b4967232284cb7ed9867075 -Author: Guillaume Desmottes -Date: Mon Dec 17 13:57:50 2007 +0000 - - salut-bytestream-manager: don't leak our streaminit_reply_cb_data structure if the XMPP connection failed - - - 20071217135750-7fe3f-67aa6c03551e10bba29f72b7e7764338d31bc367.gz - - src/salut-bytestream-manager.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit d7af9786af4cde0d8389bc01b0e4e57c64a4cf0d -Author: Guillaume Desmottes -Date: Fri Jan 25 13:17:13 2008 +0000 - - salut-contact: fix leaks when setting olpc_ip4 and olpc_ip6 value - - - 20080125131713-7fe3f-b40a4bb591828b60d6abcf58a039cb5436ca0164.gz - - src/salut-contact.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 7bd4f5f60c456cf7000b4a82a15c5d2d1b98686b -Author: Guillaume Desmottes -Date: Fri Jan 25 12:38:50 2008 +0000 - - bytestream-manager: fix a muc-manager refcount leak leading to a vicious crash when disposing connection - - - 20080125123850-7fe3f-2be310b724965cc0ea0e1fc70bc0e607394199ea.gz - - src/salut-bytestream-manager.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 8e0792afc023af0488b6eb801543a193ac25194d -Author: Guillaume Desmottes -Date: Mon Jan 21 12:30:32 2008 +0000 - - tubes-channel: tubes_message_received: change some test as assertion - - - 20080121123032-7fe3f-ed8eb022178d1706001a445b43393f49f7de741b.gz - - src/salut-tubes-channel.c | 9 ++------- - 1 files changed, 2 insertions(+), 7 deletions(-) - -commit a08ee2afb4d5089488418f92f299e127f5feec54 -Author: Guillaume Desmottes -Date: Mon Jan 21 12:10:23 2008 +0000 - - don't listen for the received-stanza in tubes-channel but received stanza from the text channel. Should fix #14145 on fd.o - - - 20080121121023-7fe3f-5155e302b5f0d2aa6faa4174ea99a8783c26b2ef.gz - - src/salut-muc-channel.c | 29 +++++++++++++++++++++++++++++ - src/salut-tubes-channel.c | 14 ++++---------- - src/salut-tubes-channel.h | 3 +++ - 3 files changed, 36 insertions(+), 10 deletions(-) - -commit 3b31372fb502645f4df7fa835a3c1d64fbdac5ba -Author: Guillaume Desmottes -Date: Mon Jan 21 12:09:39 2008 +0000 - - muc-manager: add salut_muc_manager_ensure_tubes_channel - - - 20080121120939-7fe3f-425e055ce91d59fec79b56c3b19bdd82c8eb8809.gz - - src/salut-muc-manager.c | 22 ++++++++++++++++++++++ - src/salut-muc-manager.h | 4 ++++ - 2 files changed, 26 insertions(+), 0 deletions(-) - -commit bbfe8bb29ffbfd2601de555fc8972e3e650cb8ae -Author: Guillaume Desmottes -Date: Mon Jan 21 11:09:10 2008 +0000 - - muc-manager: factor out tubes channel creation - - - 20080121110910-7fe3f-681ac1c970f3da310d984888934caae3dd067cd5.gz - - src/salut-muc-manager.c | 49 ++++++++++++++++++++++++++++++---------------- - 1 files changed, 32 insertions(+), 17 deletions(-) - -commit 89a1909547adf91e237a8b0f1b809bd6e7d5db47 -Author: Guillaume Desmottes -Date: Mon Jan 21 10:35:48 2008 +0000 - - tubes-channel: muc_connection_received_stanza_cb: check if the stanza has the right type/subtype - - - 20080121103548-7fe3f-bbc47331de1d784d07dcf8f7d31f42b5cb755e01.gz - - src/salut-tubes-channel.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 02211ffe92ca54dc40b5a216ab0cae746665542f -Author: Guillaume Desmottes -Date: Mon Jan 21 09:45:04 2008 +0000 - - tubes-channel: fix a typo in comment. We don't use presence to announce tubes in Salut - - - 20080121094504-7fe3f-803cef81e7d3880a73297a467b339d8b67be3107.gz - - src/salut-tubes-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d49d5fad708618c6d2c5abb971c623791d9c1e8e -Author: Guillaume Desmottes -Date: Fri Jan 18 10:50:09 2008 +0000 - - salut-self: send_olpc_activity_properties_changes_msg: convert GError to a TP_ERROR - - - 20080118105009-7fe3f-931bd6e8af5bf7a311005386e2d2042b491432d5.gz - - src/salut-self.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit a7b2b2c8f293b47ba845a97073cbb238b112dc06 -Author: Guillaume Desmottes -Date: Fri Jan 18 10:42:44 2008 +0000 - - salut-self: update_activity_privacy: convert GError to a TP_ERROR - - - 20080118104244-7fe3f-db482e1b3226575d65a9fdfc5e39b09437bea7de.gz - - src/salut-self.c | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -commit d6b1db1ee8c443c1e7fd32241e60420a867f6241 -Author: Guillaume Desmottes -Date: Fri Jan 18 10:34:38 2008 +0000 - - salut-self: update_activity_privacy have to be static - - - 20080118103438-7fe3f-6d90b35e5268a23f239703e5a08186627f4b822d.gz - - src/salut-self.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ca571d538dd46de85e147eb1a372b88f7c7b37d6 -Author: Guillaume Desmottes -Date: Thu Jan 17 14:51:45 2008 +0000 - - gibber-r-multicast-causal-transport.c: fix a crasher when a transport is disconnected before the self sender was created - - - 20080117145145-7fe3f-e2f74cc5eecff9b3b1501f1767edaf8703651609.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit 30809839d7c837816f6591ffde919ced7fb5c6d6 -Author: Guillaume Desmottes -Date: Thu Jan 10 13:53:38 2008 +0000 - - salut-connection: don't create the bytestream mgr if something got wrong and we disconnected the connection - - - 20080110135338-7fe3f-5af8aa6be5d7772015f18521c830499cdb52e9f0.gz - - src/salut-connection.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 786b735ef441207d9761f4abb0bc9c45d4c946f1 -Author: Sjoerd Simons -Date: Tue Jan 8 15:42:26 2008 +0000 - - version 0.3.0.1 - - - 20080108154226-93b9a-05fb81db17933ef9b0c1198fe78991a7d8072b37.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ee787676438037975306ee3df9b38025c0889728 -Author: Sjoerd Simons -Date: Tue Jan 8 15:34:52 2008 +0000 - - version 0.3.0 - - - 20080108153452-93b9a-afbe5b2b9086d520ef761aa3a56b3c793cc0e91f.gz - - configure.ac | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 5bfa4b4e656c0e1e530ec3483117bab3543b0e7e -Author: Sjoerd Simons -Date: Tue Jan 8 12:28:03 2008 +0000 - - Small coding style fixes - - - 20080108122803-b58c9-2557c5da785ad1454d34b1e21a9c1f51a5cd58e0.gz - - src/salut-contact.c | 2 +- - src/salut-self.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 11a864f5232c3e384de180fdd43c6d4f196dd24c -Author: Sjoerd Simons -Date: Mon Jan 7 21:34:22 2008 +0000 - - SalutContact: If the avatar tokens change while we retrieven an avatar. Restart it - - - 20080107213422-b58c9-722889f2377bbeae8335c02278ec9f9464d9a195.gz - - src/salut-contact.c | 18 ++++++++++++++++-- - 1 files changed, 16 insertions(+), 2 deletions(-) - -commit cf89271bf1f2bc62ae5aef98264245c2cfed872b -Author: Sjoerd Simons -Date: Mon Jan 7 17:17:29 2008 +0000 - - Implement the Avatar interface as intended - - - 20080107171729-b58c9-ba4d3caccc242f10d6743438f5781f8e477ddbab.gz - - src/salut-connection.c | 41 ++++++++++++++++++++++++----------------- - 1 files changed, 24 insertions(+), 17 deletions(-) - -commit 53976f5ec9224dff42cc37e6e8c23b68cd813a3f -Author: Sjoerd Simons -Date: Mon Jan 7 17:15:33 2008 +0000 - - When purely removing the avatar set the token to "" - - - 20080107171533-b58c9-2d7b7b78f9e3d59277fa550ab5a154cb2d59934a.gz - - src/salut-self.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit b12cc379ec43fa13967d79900ca8be84033676e6 -Author: Sjoerd Simons -Date: Mon Jan 7 16:54:13 2008 +0000 - - SalutSelf: Properly remove old avatar data if not setting a fresh one - - - 20080107165413-b58c9-44273a51901baeb445c8431642bb3e981fb83d9f.gz - - src/salut-self.c | 14 ++++++++------ - 1 files changed, 8 insertions(+), 6 deletions(-) - -commit 482d0c8703be0486f5f7ae44c5e3d47e3d2ed46b -Author: Guillaume Desmottes -Date: Mon Jan 7 11:19:43 2008 +0000 - - salut_connection_request_avatars: unref the contact after the salut_contact_get_avatar call - - - 20080107111943-7fe3f-e0f9aec50eaf63857c228659c67c6d85e1b1ad74.gz - - src/salut-connection.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 98cc1cbfc107a2bccb89f6e17b64ec978dd39011 -Author: Guillaume Desmottes -Date: Mon Jan 7 11:14:12 2008 +0000 - - salut-connection: coding style fix - - - 20080107111412-7fe3f-e5305b908680546c18bf92acc3aca20a64a55de8.gz - - src/salut-connection.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit cb4b737673912777c9f25d03f98f0f18162cf47a -Author: Sjoerd Simons -Date: Sat Jan 5 19:54:21 2008 +0000 - - SalutConnection, emit AvatarUpdated when our own avatar is set - - - 20080105195421-b58c9-e9136f2168cae356253032a16e103f1b33988106.gz - - src/salut-connection.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 89d9b4eccc68ee28efe82d3f5bb77e7bc6e181fa -Author: Sjoerd Simons -Date: Sat Jan 5 14:46:27 2008 +0000 - - Port to avahi-gobject - - - 20080105144627-b58c9-59315b12ad699a1c09f1e04dffffa89f616b1cad.gz - - configure.ac | 2 +- - src/Makefile.am | 22 +-- - src/salut-avahi-client.c | 270 -------------- - src/salut-avahi-client.h | 81 ----- - src/salut-avahi-entry-group.c | 677 ------------------------------------ - src/salut-avahi-entry-group.h | 186 ---------- - src/salut-avahi-enums.h | 70 ---- - src/salut-avahi-errors.c | 29 -- - src/salut-avahi-errors.h | 34 -- - src/salut-avahi-record-browser.c | 409 ---------------------- - src/salut-avahi-record-browser.h | 77 ---- - src/salut-avahi-service-browser.c | 400 --------------------- - src/salut-avahi-service-browser.h | 74 ---- - src/salut-avahi-service-resolver.c | 426 ----------------------- - src/salut-avahi-service-resolver.h | 77 ---- - src/salut-connection.c | 22 +- - src/salut-contact-manager.c | 30 +- - src/salut-contact-manager.h | 4 +- - src/salut-contact.c | 50 ++-- - src/salut-contact.h | 6 +- - src/salut-muc-channel.c | 22 +- - src/salut-muc-manager.c | 41 ++- - src/salut-muc-manager.h | 4 +- - src/salut-self.c | 98 +++--- - src/salut-self.h | 4 +- - 25 files changed, 142 insertions(+), 2973 deletions(-) - -commit caacf0e2dad67a45d1d906b9f9d8f5ef5dd2ca33 -Author: Sjoerd Simons -Date: Fri Jan 4 20:38:37 2008 +0000 - - SalutConnection: Implement RequestAvatars - - - 20080104203837-b58c9-5984cb92b46176ed168d4d470f217c0dd40f64b8.gz - - src/salut-connection.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 74 insertions(+), 0 deletions(-) - -commit f91670a95d9006a5903e09cd131dab69a9ef7913 -Author: Sjoerd Simons -Date: Fri Jan 4 20:03:19 2008 +0000 - - SalutConnection: Implement GetKnownAvatarTokens - - - 20080104200319-b58c9-58b59f2989d85486a36ed90989133e5c388b8329.gz - - src/salut-connection.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 63 insertions(+), 0 deletions(-) - -commit dd82dd17b4294379853521326d2fe17f6991d316 -Author: Simon McVittie -Date: Thu Jan 3 16:15:56 2008 +0000 - - When ignoring an attempt to set a tubes channel's type, assert that the desired value is either NULL or TP_IFACE_CHANNEL_TYPE_TUBES - - - 20080103161556-53eee-b2471ede72eaf32e1cce4385517cf325c2b7c7d9.gz - - src/salut-tubes-channel.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 03d09f9719b9ac3a573c5dbdb05ad8bb6f37546c -Author: Simon McVittie -Date: Thu Jan 3 16:13:27 2008 +0000 - - Assert that room lists have type ROOM_LIST, not TEXT - - - 20080103161327-53eee-70f61474e7844fabb613fdb0e401755966fa8696.gz - - src/salut-roomlist-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3c5e63852b0e85d5f7c958f1cc26a49ed6e1d914 -Author: Simon McVittie -Date: Thu Jan 3 13:09:56 2008 +0000 - - Cope with TpChannelIface channel-type property becoming writeable in telepathy-glib > 0.7.0, avoiding warnings when channels are constructed (fd.o #13896). - - If telepathy-glib is <= 0.7.0, the added code will never execute, but is - harmless. - - 20080103130956-53eee-332abad0cbbda9b38dc88650dd587d3a4bdff8f9.gz - - src/salut-roomlist-channel.c | 9 +++++++++ - src/salut-tubes-channel.c | 5 +++++ - 2 files changed, 14 insertions(+), 0 deletions(-) - -commit f43402954df3d2df74dc61522ee185400d9b6e3b -Author: Guillaume Desmottes -Date: Thu Jan 3 13:34:54 2008 +0000 - - gibber-tcp-transport.c: getaddrinfo uses gai_strerror and not errno for error reporting - - - 20080103133454-7fe3f-a75b7fd058d69baa5b2c606ef46d4c67a6d7d67e.gz - - lib/gibber/gibber-tcp-transport.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 842a38c3e3ef195366df011324785a110d9d877d -Author: Emanuele Aina -Date: Mon Dec 17 10:24:38 2007 +0000 - - gibber-ssl-transport.c: reissue the disconnecting/disconnected signals from the underlying transport - - - 20071217102438-f974e-a176126026743735ab872e751e41d80d6853a4e8.gz - - lib/gibber/gibber-ssl-transport.c | 23 +++++++++++++++++++++++ - 1 files changed, 23 insertions(+), 0 deletions(-) - -commit 74412e33a7adb2375e0184627e03a69bec38738a -Author: Sjoerd Simons -Date: Fri Dec 7 11:27:52 2007 +0000 - - version 0.2.99.1 - - - 20071207112752-93b9a-99ed1a150eb2000861c42422e645e5df7148b85f.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 550d99e0692187ef625d78efe8ded6d033be8659 -Author: Sjoerd Simons -Date: Fri Dec 7 11:13:01 2007 +0000 - - version 0.2.0.1 - - - 20071207111301-93b9a-014d45f57198ff2d784e4730fc7ae013a88e230f.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a7e5ed63d4b251bc1876fb7508dac03273bcaba7 -Author: Sjoerd Simons -Date: Fri Dec 7 11:03:48 2007 +0000 - - version 0.2.0 - - - 20071207110348-93b9a-e378f9d89061250dde29c43ae11d49c9bfa4b368.gz - - configure.ac | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 950363fe36ebd0d1f6c46103115a110aa13a6d14 -Author: Sjoerd Simons -Date: Thu Dec 6 16:55:47 2007 +0000 - - GibberRMulticastSender: An up to date session packet should have all senders in it's depends.. Fixes session packets not being properly rescheduled - - - 20071206165547-b58c9-a7253f023d1a038c2a4a3577f0e2cfd88ee371e7.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0060d6b8eee8d2d6571748298425803ff391d0bb -Author: Sjoerd Simons -Date: Thu Dec 6 11:51:40 2007 +0000 - - GibberBytestreamOOB: Little coding style fix - - - 20071206115140-b58c9-49b4acf6be10d6b8b4ca7c5de24e22c6e18367af.gz - - lib/gibber/gibber-bytestream-oob.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ccf2feb99a5ec4a752cd353c70a00fb7a15fed44 -Author: Sjoerd Simons -Date: Wed Dec 5 17:33:04 2007 +0000 - - GibberBytestreamOOB: Connect back to the address our sockaddress came from, ignoring the hostname we got from SI - - - 20071205173304-b58c9-e61b33ad1b0f87b3dc44aa0dd7e03842ca505cc9.gz - - lib/gibber/gibber-bytestream-oob.c | 45 ++++++++++++++++++++++++++++++++---- - 1 files changed, 40 insertions(+), 5 deletions(-) - -commit 33cbd8c0461182222e47673e677a2557e9cc79cb -Author: Sjoerd Simons -Date: Wed Dec 5 17:30:00 2007 +0000 - - GibberBytestreamOOB: Listen on wildcard instead of a specific address - - - 20071205173000-b58c9-1ef4e115be32e3d459ec078a8e01f49b37d74c0a.gz - - lib/gibber/gibber-bytestream-oob.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 94328859bc7681c398aebe40727e1e2050c058c6 -Author: Sjoerd Simons -Date: Wed Dec 5 14:30:07 2007 +0000 - - GibberFdTransport: Update copyright - - - 20071205143007-b58c9-d06fbdaa37a9018f402633a3167be6c21f228693.gz - - lib/gibber/gibber-fd-transport.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 141aeb291e900f534724b2516fa4424b0cb64e89 -Author: Sjoerd Simons -Date: Wed Dec 5 14:29:24 2007 +0000 - - GibberFdTransport: Implement get_sockaddr virtual method - - - 20071205142924-b58c9-915d7bd8d0d29e547e6cf7c225d5f2c5d342b612.gz - - lib/gibber/gibber-fd-transport.c | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) - -commit c4ccebf3ff0e2431c7fbe0ddedb1c90e00e8224c -Author: Sjoerd Simons -Date: Wed Dec 5 14:28:45 2007 +0000 - - Add a get_sockaddr virtual method to GibberTransport - - - 20071205142845-b58c9-a1dc3ac383004244f2a1cd778a781d850d648ed2.gz - - lib/gibber/gibber-transport.c | 10 ++++++++++ - lib/gibber/gibber-transport.h | 7 +++++++ - 2 files changed, 17 insertions(+), 0 deletions(-) - -commit ee8d9326f5971d34caad01d6e723e09a3678134b -Author: Marco Barisione -Date: Mon Dec 3 11:35:48 2007 +0000 - - genginterface.py: use gint64 and guint64 for x and t types instead of gint and guint - - - 20071203113548-f1355-0421f1a5156174a748c860ce7adb26f9a3deafbf.gz - - extensions/tools/genginterface.py | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 2184d859d8a3a795969318611f00d5cfb0c5e20f -Author: Marco Barisione -Date: Mon Dec 3 11:33:13 2007 +0000 - - genginterface.py: handle array of arrays in type_to_gtype() - - - 20071203113313-f1355-241bbd009108021ef7420f7aa3fe09dc85fb4ecf.gz - - extensions/tools/genginterface.py | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 25c77e8326dd090c4c31b3b580e553c8cb8e7688 -Author: Sjoerd Simons -Date: Mon Dec 3 11:37:37 2007 +0000 - - SalutAvahiEntryGroup: Comment on the contents of a the entries hashtable - - - 20071203113737-b58c9-9fc6204ad37231c3174c8116619ddc1dfb4c8d07.gz - - src/salut-avahi-entry-group.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit baa878ad6957b4069b03cf84c37d7ae978ae6770 -Author: Sjoerd Simons -Date: Mon Dec 3 11:21:17 2007 +0000 - - SalutAvahiEntryGroup: The entries hashtable exists of entries as keys, not strings.. Thus use an entry and not a string for removal - - - 20071203112117-b58c9-bebdf6f69f54d581158de8ba100449d00caade4f.gz - - src/salut-avahi-entry-group.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit 33555e4ad1d6359f819816f24fa8bbe5a0ed6bd8 -Author: Marco Barisione -Date: Sun Dec 2 17:42:53 2007 +0000 - - configure.ac: use $TELEPATHY_GLIB_LIBS instead of the non-existent $TP_GLIB_LIBS - - - 20071202174253-f1355-b9afa980fc709561b635fbea31b9a28b340deaa7.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c04dbc63aa6552a1cfb5da0c4d1641426672e890 -Author: Sjoerd Simons -Date: Thu Nov 29 21:32:48 2007 +0000 - - version 0.1.11.1 - - - 20071129213248-93b9a-2f55d65fc790f3cf37ce8f53439a4c843518ea18.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c836661706b7ad4e08dff6fdfce7026860c59126 -Author: Sjoerd Simons -Date: Thu Nov 29 21:16:21 2007 +0000 - - version 0.1.11 - - - 20071129211621-93b9a-ef63cccf25f9c964a2f6806335ac554149393913.gz - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 2ffd186f367b5dd0f7cfced26112fd32cceba265 -Author: Sjoerd Simons -Date: Thu Nov 29 20:49:03 2007 +0000 - - Announce muc rooms if and only if they are connected - - - 20071129204903-93b9a-22c18ec559a08418f9c7dc6ca996b7f4dfc08409.gz - - src/salut-muc-channel.c | 10 +++++++++- - src/salut-muc-manager.c | 2 +- - 2 files changed, 10 insertions(+), 2 deletions(-) - -commit 7a686229153bce298e01bc7e4b3fbf40699a2dc2 -Author: Sjoerd Simons -Date: Thu Nov 29 17:07:49 2007 +0000 - - Tube channels become ready as soon as their created, so return them right away - - - 20071129170749-93b9a-591c6a1382136f66e31512ff74bff0461977b5d8.gz - - src/salut-muc-manager.c | 38 +++-------------------------- - src/salut-tubes-channel.c | 58 --------------------------------------------- - src/salut-tubes-channel.h | 1 - - 3 files changed, 4 insertions(+), 93 deletions(-) - -commit e2b0b5845a1e1f4cba942a7d4abf61a2bc92804a -Author: Sjoerd Simons -Date: Thu Nov 29 16:26:57 2007 +0000 - - SalutTubesChannel: Throw an error when a tube is offered while the channel is not connected - - - 20071129162657-93b9a-2d658c15786014a0f16ed3204e314f263315e841.gz - - src/salut-tubes-channel.c | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+), 0 deletions(-) - -commit 4f7ec33a5edc87335040a4265db2f657bacbdeb2 -Author: Sjoerd Simons -Date: Thu Nov 29 12:16:35 2007 +0000 - - Don't stop already stopped senders - - - 20071129121635-93b9a-b44fb7a0beca7390d8c3c4dd7b080b1d2b2edf3c.gz - - lib/gibber/gibber-r-multicast-sender.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 6d38e9826489bb6e64bbd1c26660e322f0c3a608 -Author: Sjoerd Simons -Date: Thu Nov 29 11:18:49 2007 +0000 - - GibberRMulticastSender: Only send the initial repair request out quickly. And have bigger timeouts afterwards - - - 20071129111849-93b9a-38ce19ec8599d1afe1d19056bb3956eac9f940c5.gz - - lib/gibber/gibber-r-multicast-sender.c | 23 +++++++++++++++++------ - 1 files changed, 17 insertions(+), 6 deletions(-) - -commit d68efd0460071a3cdcef15f92907c6458c6bf854 -Author: Sjoerd Simons -Date: Wed Nov 28 18:29:44 2007 +0000 - - GibberRMulticastSender: Don't repair after and including stopped state instead of just after - - - 20071128182944-93b9a-56795deb7605c2e2fa0265fc0f5164cecf8e5fbb.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b3fa4a34adcbe79df92dd959c39e5a4f40083aca -Author: Sjoerd Simons -Date: Tue Nov 27 22:02:54 2007 +0000 - - Add a test with one node dying - - - 20071127220254-93b9a-ad502389173ee01f9413ee8884a82e602e5aa046.gz - - tests/died-node.py | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - tests/mesh.py | 9 ++++++++ - 2 files changed, 62 insertions(+), 0 deletions(-) - -commit 6de925920c8984ee20ddada6ceba4730f7ea1be2 -Author: Sjoerd Simons -Date: Tue Nov 27 22:02:34 2007 +0000 - - Add some debug info - - - 20071127220234-93b9a-0a2a9212dc721a1572212e816446318f0552676a.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 ++ - lib/gibber/gibber-r-multicast-transport.c | 2 ++ - 2 files changed, 4 insertions(+), 0 deletions(-) - -commit eab57f7c8edcaaa17eab4574f0f25f3f5152c66a -Author: Sjoerd Simons -Date: Tue Nov 27 22:02:10 2007 +0000 - - GibberRMulticastTransport: When tagging a failure as INSTANT_FAILURE, remove the failed timer. Also don't recheck INSTANT_FAILURE members - - - 20071127220210-93b9a-129889dcb3e5ec30bfdf8bd7913422a73ff87b99.gz - - lib/gibber/gibber-r-multicast-transport.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit 49117575d2eddab96143401cebe7301b6d074625 -Author: Sjoerd Simons -Date: Tue Nov 27 21:56:11 2007 +0000 - - GibberRMulticastTransport: Removing failed members from the members table afer the join has finished, even if they were in depends and not in failures - - - 20071127215611-93b9a-d3070c40b742678f0992ceaeeea77432336b2e9e.gz - - lib/gibber/gibber-r-multicast-transport.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit db1062f66eafdc94d0b916e20ffd5b6eeabfcb37 -Author: Sjoerd Simons -Date: Tue Nov 27 17:28:28 2007 +0000 - - GibberRMulticastSender: Only get the sender when it didn't fail. Prevents assertion failure when a sender was failed during the join process - - - 20071127172828-93b9a-e424a0e8ae2173707c15db6450c3a8756391036e.gz - - lib/gibber/gibber-r-multicast-transport.c | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit 8928f2072958724145dddc3d271cfb6a4135ffb1 -Author: Sjoerd Simons -Date: Tue Nov 27 17:08:09 2007 +0000 - - GibberRMulticastSender: Don't try to repair packets after the stopped state - - - 20071127170809-93b9a-d8f08a4bb3215cb237e99061be3b0a8193ddfe0f.gz - - lib/gibber/gibber-r-multicast-sender.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit c716be3da163918d2b880bb48f409ec142c20d0b -Author: Robert McQueen -Date: Wed Nov 28 02:24:38 2007 +0000 - - correct the LGPL 2.1 boilerplate (s/Library/Lesser/ and update FSF address) - - - 20071128022438-418b8-3052971bb1f2342e61c64251b52459c9e60488b3.gz - - extensions/Channel_Type_File_Transfer.xml | 2 +- - extensions/OLPC_Activity_Properties.xml | 4 ++-- - extensions/OLPC_Buddy_Info.xml | 4 ++-- - extensions/all.xml | 4 ++-- - extensions/tools/c-constants-generator.xsl | 2 +- - extensions/tools/c-interfaces-generator.xsl | 2 +- - extensions/tools/ls-interfaces.xsl | 4 ++-- - 7 files changed, 11 insertions(+), 11 deletions(-) - -commit 2358c96047308af79d1d2f9f204f36307fb65d8e -Author: Sjoerd Simons -Date: Mon Nov 26 19:45:37 2007 +0000 - - version 0.1.10.1 - - - 20071126194537-93b9a-40f275bfc2bea036f3ab72e4363eec98ebb7f323.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3c4711cb03a89be42046371ba79607c322d54698 -Author: Sjoerd Simons -Date: Mon Nov 26 19:43:57 2007 +0000 - - version 0.1.10 - - - 20071126194357-93b9a-bf8b0fa573779143a69128410595d240c08ae95f.gz - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit a897aa924cd5e88cf5dff6bb6cdcacb80e747a0a -Author: Sjoerd Simons -Date: Mon Nov 26 19:33:32 2007 +0000 - - Whitespace fixes - - - 20071126193332-93b9a-1d993cf0e5d09cc2cfc1c1c6345d2cd9e0b31d82.gz - - lib/gibber/gibber-r-multicast-sender.c | 4 ++-- - lib/gibber/gibber-r-multicast-transport.c | 9 +++++---- - 2 files changed, 7 insertions(+), 6 deletions(-) - -commit 830c15f898a10cea0523e4d10249621b5ebcc2ba -Author: Sjoerd Simons -Date: Mon Nov 26 19:11:36 2007 +0000 - - GibberRMulticastSender: Don't let lookup_by_name care about nodes pending for removal - - - 20071126191136-93b9a-8c4ec8e5b2f5085126ace5a6449ff427455fbcf6.gz - - lib/gibber/gibber-r-multicast-sender.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 647c0c5acc257d2589da4640bd63755e2e84e7bf -Author: Sjoerd Simons -Date: Mon Nov 26 19:10:05 2007 +0000 - - GibberRMulticastSender: While popping packets keep checking the senders state - - - 20071126191005-93b9a-9bacdb919e86302cd8da664ce7f6d37460783506.gz - - lib/gibber/gibber-r-multicast-sender.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -commit 34fd44acf66fbf2b0674c370050ba1473091b596 -Author: Sjoerd Simons -Date: Mon Nov 26 19:07:05 2007 +0000 - - GibberRMulticastSender: Let _cache_size only return the size of the relavant cached items - - - 20071126190705-93b9a-b3fd3c1feb9a2c1bcfa0accf2c7771ee60fc2dcf.gz - - lib/gibber/gibber-r-multicast-sender.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit b77fc2b55457beb362fb600b56efe5afc80591c8 -Author: Sjoerd Simons -Date: Mon Nov 26 19:06:31 2007 +0000 - - GibberRMulticastSender: When signalling failure only cancel the needed timers don't set the state to failure - - - 20071126190631-93b9a-b5e09dd32ec58e1dd0cc1a41fbf1a8884fa5d347.gz - - lib/gibber/gibber-r-multicast-sender.c | 36 +++++++++++++++++++------------ - 1 files changed, 22 insertions(+), 14 deletions(-) - -commit 92e26bae78275d5dede3eed63455fed51e9a5b93 -Author: Sjoerd Simons -Date: Mon Nov 26 19:04:25 2007 +0000 - - GibberRMulticastSender: When marking nodes as instant failure remove their respective senders from the causal transport - - - 20071126190425-93b9a-c51cdb7cb0990bee5d7821503b06c086470304b2.gz - - lib/gibber/gibber-r-multicast-transport.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 4ab8223cb72f2b2a9e8ec03177378b5400a674a9 -Author: Sjoerd Simons -Date: Mon Nov 26 19:03:51 2007 +0000 - - GibberRMulticastSender: Only do the failure process on the wire for nodes of which we known the start, otherwise mark them as instant failures - - - 20071126190351-93b9a-fb941ab8851d7a585dca63a0fad5cb26606d466a.gz - - lib/gibber/gibber-r-multicast-transport.c | 13 ++++++++++++- - 1 files changed, 12 insertions(+), 1 deletions(-) - -commit 6c479cb382ec76be3910b1f8c1c71b0a8a4e26c7 -Author: Sjoerd Simons -Date: Mon Nov 26 19:01:26 2007 +0000 - - Add a test continously failing one node, causing group split and reconnects - - - 20071126190126-93b9a-a75d8096a67cfd837b21cb9c6b20eec234993a90.gz - - tests/continous-failure.py | 35 +++++++++++++++++++++++++++++++++++ - 1 files changed, 35 insertions(+), 0 deletions(-) - -commit 0016ff11347fb51965ac30e020feaac7f9834ea0 -Author: Sjoerd Simons -Date: Mon Nov 26 15:28:48 2007 +0000 - - GibberRMulticastTransport: Don't flag members as ATTEMPT_JOIN_DONE when the AJ packets had the current sender in the senders field - - - 20071126152848-93b9a-b4e5f2a78faaa3f68f59d4c5d82f96904e2a5cec.gz - - lib/gibber/gibber-r-multicast-transport.c | 18 +++++++++++------- - 1 files changed, 11 insertions(+), 7 deletions(-) - -commit 7e99ccbedc978c8b29210be936334b49bfa535ca -Author: Sjoerd Simons -Date: Mon Nov 26 15:27:54 2007 +0000 - - Cleanup join failure timer when the join has succeeded - - - 20071126152754-93b9a-a84dd5431cf3d35bf1bc599062f90f37b52fb538.gz - - lib/gibber/gibber-r-multicast-transport.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 39ddd6cdaecb7ce6c380155507b120d90db9457b -Author: Sjoerd Simons -Date: Mon Nov 26 15:27:12 2007 +0000 - - GibberRMulticastTransport: When a node fails during a join let the join process take care of the removal from members - - - 20071126152712-93b9a-af54721efd8bae40771af31eae1436c7dbb611be.gz - - lib/gibber/gibber-r-multicast-transport.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit 973f70b6bed2c5d369f65865825551b4cd9f3164 -Author: Sjoerd Simons -Date: Mon Nov 26 15:26:00 2007 +0000 - - GibberRMulticastTransport: Updated members can start the packet after the one we just processed - - - 20071126152600-93b9a-d35d0de99a58b93f12c8b71585de57300a46e8f4.gz - - lib/gibber/gibber-r-multicast-transport.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 4457aefb3fc6031e7ef0bd403469444d970d38f0 -Author: Sjoerd Simons -Date: Mon Nov 26 15:25:23 2007 +0000 - - GibberRMulticastTransport: Check join state directly after starting it, in case we're the only one left - - - 20071126152523-93b9a-1ca684418ed65dd29b5d12fd5787d9ab8267e802.gz - - lib/gibber/gibber-r-multicast-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit d6917dd1396d8e7300dd58fac56e8d467ccc29c9 -Author: Sjoerd Simons -Date: Mon Nov 26 14:42:35 2007 +0000 - - causalorderingtest.py: Update the test to work the final protocol - - - 20071126144235-93b9a-6a42a62a2fb2d1d02aff64992ab091106ec050f4.gz - - tests/causalorderingtest.py | 26 +++++++++++++++----------- - 1 files changed, 15 insertions(+), 11 deletions(-) - -commit 1ba987ad3146d09c11bad509da6e09cc46c5ad41 -Author: Sjoerd Simons -Date: Mon Nov 26 11:32:42 2007 +0000 - - GibberRMulticastSender: Do a stricter check of a senders state before signalling failure - - - 20071126113242-93b9a-ef03b4a7dcdf05b57f3593982ae84c73c91aa9a2.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 28bdfff3cb53c0d798d1654dec1bb5a18ee38198 -Author: Sjoerd Simons -Date: Mon Nov 26 11:31:50 2007 +0000 - - After connecting the GibberRMTransport, no longer listen to GibberRMCTransport signals. Those belong to GibberRMTransport now - - - 20071126113150-93b9a-508b7cc97033f4ac2450ccdf165fad7439012519.gz - - lib/gibber/gibber-muc-connection.c | 7 +++++-- - tests/test-r-multicast-transport-io.c | 4 +++- - 2 files changed, 8 insertions(+), 3 deletions(-) - -commit 5db64b5be1698e1273f86e5f8567b3805cd273fa -Author: Sjoerd Simons -Date: Mon Nov 26 11:28:10 2007 +0000 - - GibberRMulticastTransport: Assert that we are not asked to connected in the connected state - - - 20071126112810-93b9a-a536b4c019058d1ccfbb44857ca0eb2d26a26115.gz - - lib/gibber/gibber-r-multicast-transport.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 65800856928cce38b549ff4e598d85d80b519348 -Author: Sjoerd Simons -Date: Mon Nov 26 09:57:37 2007 +0000 - - GibberRMulticastSender: Some whitespace fixes - - - 20071126095737-93b9a-ede8e3299810a74905ce26496519a7c0afca93e7.gz - - lib/gibber/gibber-r-multicast-sender.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 72c79dabd89f606643eb5718b9d3b8500fd1105a -Author: Sjoerd Simons -Date: Mon Nov 26 09:56:01 2007 +0000 - - Explain gibber_r_multicast_packet_diff a bit more - - - 20071126095601-93b9a-e0f64b1b4bdbd21732fd9622a4f57c94d1e91d1e.gz - - lib/gibber/gibber-r-multicast-packet.h | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit d1ef16266fb60084e5fa9b38fc651368c09a8234 -Author: Sjoerd Simons -Date: Mon Nov 26 09:47:51 2007 +0000 - - GibberRMulticastSender: Ensure sender dispose methods don't iterate the groups hash array while it's being freed - - - 20071126094751-93b9a-ccb4f5fda396012b66f061429676bb9de8fe6720.gz - - lib/gibber/gibber-r-multicast-sender.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 7e7dce848ac66d463c74b5eaa1d4d5f5f0260a1d -Author: Sjoerd Simons -Date: Sat Nov 24 23:29:40 2007 +0000 - - repair-after-node-disconnected-test.py: After successfull finishing, send a packet from the retriever and wait 30 seconds after success so everyone can dispose node0 - - - 20071124232940-93b9a-67537b2c5ba49008cf658e952318eeca8b30c969.gz - - tests/repair-after-node-disconnected-test.py | 16 ++++++++++++++-- - 1 files changed, 14 insertions(+), 2 deletions(-) - -commit 60aa6f72079293086a7b8ba3658d714b0171b592 -Author: Sjoerd Simons -Date: Sat Nov 24 23:27:57 2007 +0000 - - GibberRMulticastSender: Keep a sender in a pending removal state as long as not all it's depends are acked - - - 20071124232757-93b9a-2abb0a6dab8e060bd632623517a6278cb053815b.gz - - lib/gibber/gibber-r-multicast-sender.c | 183 ++++++++++++++++++++++++++++---- - lib/gibber/gibber-r-multicast-sender.h | 8 +- - 2 files changed, 169 insertions(+), 22 deletions(-) - -commit d55c2ce1ce4d4db4e53cc07041cdd67e54ad7552 -Author: Sjoerd Simons -Date: Sat Nov 24 23:22:26 2007 +0000 - - GibberRMulticastSender: Only stop repeating if requested - - - 20071124232226-93b9a-99f4fabd1a0b800f205bc1b20fa239c48e274910.gz - - lib/gibber/gibber-r-multicast-sender.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit f1a9941910ff6da970e9fd15f2a0eaa5750500d3 -Author: Sjoerd Simons -Date: Sat Nov 24 23:21:23 2007 +0000 - - mesh.py: Add some utility functions to dump depends and get the packets sender - - - 20071124232123-93b9a-7a3a6a8961f59f5348ee308467f7f2107d6708f8.gz - - tests/mesh.py | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit aeb0cbcaac8aa60e7d22dd1a72fbe0c6bff2726f -Author: Sjoerd Simons -Date: Sat Nov 24 10:59:49 2007 +0000 - - GibberRMulticastSender: After popping a data packat, exit the pop_packet function the normal way, to ensure the progress timer is properly reset - - - 20071124105949-93b9a-8db4291ac68265aadaf683d0f71185154f8ea272.gz - - lib/gibber/gibber-r-multicast-sender.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit e3907b3acecd80ebece04eecce0d286cd8573e13 -Author: Sjoerd Simons -Date: Thu Nov 22 14:42:26 2007 +0000 - - test-ssl.c: Call gibber_xmpp_connection_restart before reopening a connection - - - 20071122144226-93b9a-7dade3d53a11728ffa1d3307f0efdef09174f943.gz - - lib/gibber/examples/test-ssl.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit b26256eb868b56e669304752416616a50032eedc -Author: Guillaume Desmottes -Date: Mon Nov 19 16:29:12 2007 +0000 - - salut-connection: salut_connection_act_set_properties: use check_room() - - - 20071119162912-7fe3f-80da2601779897187dc4de5bbedd91d3fcf1dfef.gz - - src/salut-connection.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit 8f08b6bda63a228b40981f133d2b8a9eebe26a6f -Author: Guillaume Desmottes -Date: Mon Nov 19 16:27:15 2007 +0000 - - salut-connectio: factorize room_handle checking to check_room - - - 20071119162715-7fe3f-b12d74904345a834e0e223a5f073a8095730135b.gz - - src/salut-connection.c | 21 +++++++++++++-------- - 1 files changed, 13 insertions(+), 8 deletions(-) - -commit b9db953a4014c200dd6880eac9482a29cd72d1ec -Author: Guillaume Desmottes -Date: Mon Nov 19 16:22:25 2007 +0000 - - salut-connection: salut_connection_olpc_get_activities: check if contact handle is valid - - - 20071119162225-7fe3f-9b938299909d7a202c3f46cdb8989edc5b03d305.gz - - src/salut-connection.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 192cef5b117fd06278133a623f9f44864c42da2e -Author: Guillaume Desmottes -Date: Mon Nov 19 16:21:40 2007 +0000 - - salut-connection: salut_connection_olpc_get_current_activity: check if handle is valid - - - 20071119162140-7fe3f-1fbf34ac1513b000fefaa34ee68ce12e9f6d358d.gz - - src/salut-connection.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 037b2d488413a6dc39ccdc3307b8bd6de1b33fe2 -Author: Guillaume Desmottes -Date: Mon Nov 19 16:20:23 2007 +0000 - - salut_connection_olpc_get_properties: check if handle is valid - - - 20071119162023-7fe3f-70a8ba48e01567dfa626380ff0c97301d2e8a1ba.gz - - src/salut-connection.c | 31 +++++++++++++++++++++++++++++++ - 1 files changed, 31 insertions(+), 0 deletions(-) - -commit 0e7c332ca5a71cc64f715b2f62705e1c102abf9e -Author: Guillaume Desmottes -Date: Wed Nov 14 14:57:02 2007 +0000 - - Development version 0.1.9.1 - - - 20071114145702-7fe3f-944969e0442f6fdb9652ac28480d1c61b3af63b9.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 722093704e1fa1461d63b417a2bce683964bc4c0 -Author: Guillaume Desmottes -Date: Wed Nov 14 14:37:54 2007 +0000 - - version 0.1.9 - - - 20071114143754-7fe3f-db5adcedd05bd882519e3053340b1df976e8e840.gz - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 285f5eb4a5d6a08c4c9c328261e3523da8d7ce4c -Author: Guillaume Desmottes -Date: Wed Nov 14 14:34:51 2007 +0000 - - configure.ac: fix release comment: we use salut_nano_version and not salut_release - - - 20071114143451-7fe3f-05bb50d600b1d401d5b45134f4fba9beb6d52b38.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e5938606e694e7940cc9d71e553f185d142cd4bd -Author: Guillaume Desmottes -Date: Wed Nov 14 09:13:19 2007 +0000 - - salut-contact: remove the presence resolver failed timer when disposing (fix a crasher) - - - 20071114091319-7fe3f-fc9901a35c70a9147cdf27181fc7148df4f9c80f.gz - - src/salut-contact.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit c51c0ee2fb33bb3b09ab7b21222ace7ff43ccf2e -Author: Sjoerd Simons -Date: Tue Nov 13 20:08:55 2007 +0000 - - version 0.1.8.1 - - - 20071113200855-93b9a-b493e0daf0f9a7602394c16aebdb658a4cfa2616.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit eebb0511c7a37af34f764a4802160026c8ee1392 -Author: Sjoerd Simons -Date: Tue Nov 13 20:04:24 2007 +0000 - - version 0.1.8 - - - 20071113200424-93b9a-37aa8f55d7d68cccb49a7dfac531f08096447d6b.gz - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 1f1f955602fedc481b2be742e45e0949836e87a9 -Author: Sjoerd Simons -Date: Tue Nov 13 18:57:47 2007 +0000 - - SalutMucChannel: Return the correct type if we're already announcing a clique group - - - 20071113185747-b58c9-7ba85b0f9794df5a2c76d99be60667a18d1f11bc.gz - - src/salut-muc-channel.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit bb98d6ac5995bea2a58c539a9673d0cd2f03408f -Author: Guillaume Desmottes -Date: Tue Nov 13 18:24:41 2007 +0000 - - muc-channel: salut_muc_channel_publish_service: return if muc_group is NULL instead of asserting - - - 20071113182441-7fe3f-ac995fa24a49a2010cfcd266357fdf7282a9f19e.gz - - src/salut-muc-channel.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 3f4807060b65d78321430659481b58aa38c52c07 -Author: Sjoerd Simons -Date: Tue Nov 13 18:42:04 2007 +0000 - - SalutMucManager: If we're not compiled with tubes support, then a si request for a tube is always an error case - - - 20071113184204-b58c9-bd78e559df12eb87db8b982f2adddc7a380e692c.gz - - src/salut-muc-manager.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit a57dc988117b63c3dd790861ea647dc50eb6daf2 -Author: Guillaume Desmottes -Date: Tue Nov 13 17:37:04 2007 +0000 - - Use tp_debug_set_flags() if available, to separate 'persist' from the rest of the debug flags (backport from Gabble) - - - 20071113173704-7fe3f-476b868d3327e1529e2657d98dfa97cea6e57e25.gz - - configure.ac | 5 +++++ - src/debug.c | 8 ++++++-- - src/debug.h | 3 +-- - src/salut.c | 12 ++++++++++++ - 4 files changed, 24 insertions(+), 4 deletions(-) - -commit db4835864642062ad5db2a5f0eae6f5b035111f7 -Author: Sjoerd Simons -Date: Mon Nov 12 10:43:48 2007 +0000 - - version 0.1.7.1 - - - 20071112104348-93b9a-623d825e9ca9508ffc1cdc042a3dafebadd1bfba.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 35748709d8625f9ab126749826b5321bfe42c7fd -Author: Sjoerd Simons -Date: Mon Nov 12 10:34:30 2007 +0000 - - version 0.1.7 - - - 20071112103430-93b9a-c53ee70187f3f968d2af800ec340bb420bbe1ba7.gz - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 4cf459d64b9c4856467c2194036fb49e7c64bb98 -Author: Sjoerd Simons -Date: Mon Nov 12 10:18:11 2007 +0000 - - GibberRMulticastSender: rename gibber_r_multicast_sender_fail to _gibber_r_multicast_TEST_sender_fail, so it's extra clear that it's purely for testing - - - 20071112101811-93b9a-5d0fed27edffb924788b92710cc74e366f0a4cf4.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 +- - lib/gibber/gibber-r-multicast-sender.h | 2 +- - tests/test-r-multicast-transport-io.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -commit d60f79ce19b57ba61b2a2e9ec55c22423e58aa2d -Author: Sjoerd Simons -Date: Fri Nov 9 20:57:13 2007 +0000 - - GibberRMulticastSender: Mark a sender as failed if the data message didn't have the claimed amount of data in it - - - 20071109205713-93b9a-cc4c07e69c20690593d961e9e6dd4d2e7c740b57.gz - - lib/gibber/gibber-r-multicast-sender.c | 26 +++++++++++++++++++++----- - 1 files changed, 21 insertions(+), 5 deletions(-) - -commit 3bae1d7bc5da795e85d4ea52a16ceb56582fb532 -Author: Sjoerd Simons -Date: Fri Nov 9 20:17:47 2007 +0000 - - check-gibber-r-multicast-causal-transport.c: Be much more anal about the flags when doing fragmentation tests - - - 20071109201747-93b9a-d5f4c1ab49f4b674fb9cdc383b7d3e70fafdec38.gz - - tests/check-gibber-r-multicast-causal-transport.c | 13 +++++++++++-- - 1 files changed, 11 insertions(+), 2 deletions(-) - -commit 6d68f88c67e0a613af72c198e013fa78b5ca29dd -Author: Sjoerd Simons -Date: Fri Nov 9 20:17:08 2007 +0000 - - GibberRMulticastCausalTransport: Correctly set the flags when fragmenting into multiple packets - - - 20071109201708-93b9a-e6735f8ed580bcd146a1f18316506a8af9bbd52a.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit c5b83ea4a95cbbc6e68abd994ab9279014ef5dec -Author: Sjoerd Simons -Date: Fri Nov 9 14:41:31 2007 +0000 - - repair-after-node-disconnected-test: Add a simulation to test if a node can sucessfully retrieve unacked packets from a failed node from other nodes - - - 20071109144131-93b9a-c4276aa3f82606c54ff6f64d5f964c2e61bb51d8.gz - - tests/repair-after-node-disconnected-test.py | 177 ++++++++++++++++++++++++++ - 1 files changed, 177 insertions(+), 0 deletions(-) - -commit cc2dcda8aaf6c890a391ceb570cc4f752e5f0ddc -Author: Sjoerd Simons -Date: Fri Nov 9 13:38:40 2007 +0000 - - GibberRMulticastTransport: Data can come either from members or failing members - - - 20071109133840-93b9a-fc2c300ad044f87f5081645f796156a52de35971.gz - - lib/gibber/gibber-r-multicast-transport.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit 7f6514591148ba70495507a562558c4c316c96d1 -Author: Sjoerd Simons -Date: Fri Nov 9 12:54:50 2007 +0000 - - mesh.py: Add failure trigger function - - - 20071109125450-93b9a-1401b705bd225b0ab4916fff117ab92b61ea2401.gz - - tests/mesh.py | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit f8460a1dcf7da3e6a03a3251a2607ec7efc393d8 -Author: Sjoerd Simons -Date: Fri Nov 9 12:54:22 2007 +0000 - - test-r-multicast-transport-io: Add signalling to trigger failures on selected nodes - - - 20071109125422-93b9a-4e2e4c2ea73ac739358909e42eb9a72595345ae7.gz - - tests/test-r-multicast-transport-io.c | 19 ++++++++++++++++++- - 1 files changed, 18 insertions(+), 1 deletions(-) - -commit c60aa08e1555a9f35dce0b7d0c139560438fd636 -Author: Sjoerd Simons -Date: Fri Nov 9 12:52:33 2007 +0000 - - GibberRMulticastSender: Add functionality to trigger failure for testing purposes - - - 20071109125233-93b9a-260e86f64e5dad51bb435eee546bccc800d3c6b1.gz - - lib/gibber/gibber-r-multicast-sender.c | 7 +++++++ - lib/gibber/gibber-r-multicast-sender.h | 3 +++ - 2 files changed, 10 insertions(+), 0 deletions(-) - -commit 0662ae9cb297d037b994be029e123ee625357d26 -Author: Sjoerd Simons -Date: Fri Nov 9 12:51:03 2007 +0000 - - GibberRMulticastCausalTransport: Add a method to lookup a sender by name - - - 20071109125103-93b9a-0dce1b17363b8a49754359750b37ec4e8b63aa9f.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 12 ++++++++++++ - lib/gibber/gibber-r-multicast-causal-transport.h | 3 +++ - 2 files changed, 15 insertions(+), 0 deletions(-) - -commit 32213085ba9e96dbe055b6f91f5ad3b7d4a69d1a -Author: Sjoerd Simons -Date: Fri Nov 9 12:49:34 2007 +0000 - - GibberRMulticastSenderGroup: Add a method to lookup a sender by name - - - 20071109124934-93b9a-473d7c0a3261e5ae146496ca453c5296e7d85538.gz - - lib/gibber/gibber-r-multicast-sender.c | 17 +++++++++++++++++ - lib/gibber/gibber-r-multicast-sender.h | 3 +++ - 2 files changed, 20 insertions(+), 0 deletions(-) - -commit 4a2f1e4be2d936bb8f4f7e77da2e6981e060d38c -Author: Sjoerd Simons -Date: Fri Nov 9 12:49:25 2007 +0000 - - gibber-util: Add gibber_strdiff, copied from tp_strdiff - - - 20071109124925-93b9a-6ea0869bd602cbf1cf62e1e2d3948af2707fafef.gz - - lib/gibber/gibber-util.c | 25 +++++++++++++++++++++++++ - lib/gibber/gibber-util.h | 1 + - 2 files changed, 26 insertions(+), 0 deletions(-) - -commit e253e8c5728f1bf91c113e1eb91df40bcb9739f0 -Author: Guillaume Desmottes -Date: Fri Nov 9 13:09:10 2007 +0000 - - fix build with OLPC features enabled - - - 20071109130910-7fe3f-aa8af5d6fd95171c88404dcaa309c480939e49a4.gz - - src/salut-contact.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 45d2eaea322f573e48a4af52e12d23b198f6920e -Author: Guillaume Desmottes -Date: Fri Nov 9 12:01:45 2007 +0000 - - make contact's handle a public variable - - - 20071109120145-7fe3f-5bd92dbeb474e6968aebfbce91ad1cf76ecfa2ae.gz - - src/salut-contact-manager.c | 17 ++--------------- - src/salut-contact.c | 7 +++---- - src/salut-contact.h | 1 + - src/salut-muc-channel.c | 8 +------- - 4 files changed, 7 insertions(+), 26 deletions(-) - -commit 455e639d4a824b8061fec1664e167453f877f0c4 -Author: Guillaume Desmottes -Date: Fri Nov 9 11:49:39 2007 +0000 - - fix typo in debug message - - - 20071109114939-7fe3f-fddcd3a566d84c5516a28ba51673d3147832ce92.gz - - src/salut-contact-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 831fa03a8920e4b1bbe65792dbfe7c8633fbb236 -Author: Guillaume Desmottes -Date: Fri Nov 9 11:40:41 2007 +0000 - - muc-channel: no need to dup the string stored in priv->senders as it's owned by the Contact object and we have a ref on it - - - 20071109114041-7fe3f-a14ccff1e0e7f6b8447da5ee77b9947aaed84324.gz - - src/salut-muc-channel.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit d7756b9701e1c1947ef6f3811e08e2134f824037 -Author: Guillaume Desmottes -Date: Fri Nov 9 11:39:01 2007 +0000 - - replace salut_contact_manager_create_contact by salut_contact_manager_ensure_contact - - - 20071109113901-7fe3f-5d2d359ce28c5edfc6328072d800180b097f64cf.gz - - src/salut-contact-manager.c | 23 ++++++++++++++++++++++- - src/salut-contact-manager.h | 2 +- - src/salut-muc-channel.c | 15 +-------------- - 3 files changed, 24 insertions(+), 16 deletions(-) - -commit 677a7e1afe0c2e07302446246b77dd9c09444749 -Author: Guillaume Desmottes -Date: Fri Nov 9 11:23:44 2007 +0000 - - salut_contact_manager_create_contact: assert contact doesn't exist yet - - - 20071109112344-7fe3f-496bf4a4884f4254014e0cef091eb419bce2fe8a.gz - - src/salut-contact-manager.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 46f6c2f8a095430b1f08ea58f1325219bff03a2a -Author: Guillaume Desmottes -Date: Thu Nov 8 10:07:26 2007 +0000 - - give the SalutConnection to SalutContact instead of the room and contact repo - - - 20071108100726-7fe3f-b9a11ce8aedff27fcc7671b090027b413c7ddbe2.gz - - src/salut-contact-manager.c | 6 +---- - src/salut-contact.c | 50 +++++++++++++++++++++++++------------------ - src/salut-contact.h | 6 ++-- - 3 files changed, 33 insertions(+), 29 deletions(-) - -commit 1322f36cfa10d85603ea585598f92394b6b1aa94 -Author: Guillaume Desmottes -Date: Thu Nov 8 09:44:47 2007 +0000 - - contact-manager: don't ensure the contact handle anymore as it's done by the Contact object now - - - 20071108094447-7fe3f-67d85cbd2fbc86a2a5df3926c69a0109fc272a33.gz - - src/salut-contact-manager.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 4478d35fbd72baadcf38e034f10bf4d3dc87000c -Author: Guillaume Desmottes -Date: Wed Nov 7 16:44:37 2007 +0000 - - contact-manager: adapte to use new SalutContact API - - - 20071107164437-7fe3f-71e3632bb2664749cd19d5f0969be581a312df3d.gz - - src/salut-contact-manager.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit c2f6e0852ecdcdf15cbd040d8603cbee423142bd -Author: Guillaume Desmottes -Date: Wed Nov 7 16:43:40 2007 +0000 - - muc-channel: salut_muc_channel_add_members: don't ensure the handle as it's owned by the newly created contact now - - - 20071107164340-7fe3f-d1856fb19a065968c13897922bad1c760c6f759b.gz - - src/salut-muc-channel.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 345825790a5775a0070bfdce3862d0a73937cd7f -Author: Guillaume Desmottes -Date: Wed Nov 7 16:41:27 2007 +0000 - - make SalutContact owns the ref on his handle - - - 20071107164127-7fe3f-ee6be35176aef80d6eb9253008c8817b7c231523.gz - - src/salut-contact.c | 11 ++++++++++- - src/salut-contact.h | 3 ++- - 2 files changed, 12 insertions(+), 2 deletions(-) - -commit 9311a18715365f3a2a3bb8e4bb0e6db06a4eafc7 -Author: Guillaume Desmottes -Date: Wed Nov 7 16:21:15 2007 +0000 - - muc-channel: store senders in a hash table so we can unref contacts when closing the channel - - - 20071107162115-7fe3f-da2d387ea7ae83bc0f87492af63298d7dfdd6b8b.gz - - src/salut-muc-channel.c | 27 +++++++++++++-------------- - 1 files changed, 13 insertions(+), 14 deletions(-) - -commit 5987931e2f231e52f4fd26d580d1664a34998371 -Author: Guillaume Desmottes -Date: Wed Nov 7 16:01:03 2007 +0000 - - muc-channel: create/ref contact when we got new senders - - - 20071107160103-7fe3f-262d54df60a4bfe3b656d65a5f29ad13d83a4748.gz - - src/salut-muc-channel.c | 35 +++++++++++++++++++++++++++++++++-- - 1 files changed, 33 insertions(+), 2 deletions(-) - -commit 87aaf5123c8ce93109aa7a5d352b20f63835c7a5 -Author: Guillaume Desmottes -Date: Wed Nov 7 15:59:01 2007 +0000 - - contact-manager: add salut_contact_manager_create_contact public function - - - 20071107155901-7fe3f-0d917ef865b7f61fe7c64d7fa0d023aa1ca4ec65.gz - - src/salut-contact-manager.c | 47 ++++++++++++++++++++++++++++-------------- - src/salut-contact-manager.h | 3 ++ - 2 files changed, 34 insertions(+), 16 deletions(-) - -commit 5196f3d7c5c50ee2227a592a6dab583d38ddff41 -Author: Guillaume Desmottes -Date: Wed Nov 7 15:03:45 2007 +0000 - - muc-channel: split salut_muc_channel_change_members to salut_muc_channel_add_members and salut_muc_channel_remove_members - - - 20071107150345-7fe3f-85323678b3130adf4f7cd41c7bc5f85919aa034b.gz - - src/salut-muc-channel.c | 59 +++++++++++++++++++++++++++++++++++++--------- - 1 files changed, 47 insertions(+), 12 deletions(-) - -commit 3da9687a5dd824b077a23d26bf7433525a25377d -Author: Guillaume Desmottes -Date: Wed Nov 7 13:15:02 2007 +0000 - - muc-channel: fix debug message in salut_muc_channel_change_members - - - 20071107131502-7fe3f-1b719ac8bd8cf36ceecca6c459f36d943b5ade49.gz - - src/salut-muc-channel.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 19b8c14d64fd83d7017347ddd3f01316b0753a39 -Author: Sjoerd Simons -Date: Wed Nov 7 15:01:13 2007 +0000 - - GibberRMulticastCausalTransport: While disconnecting, still accept reliable and repair request packets - - - 20071107150113-93b9a-83f220d2ec8bd1974f7e8d5829395a5685530dbb.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 38 ++++++++++++++++++++++ - 1 files changed, 38 insertions(+), 0 deletions(-) - -commit 1866d738188a504309135ee68f03f3ef29d5a54a -Author: Sjoerd Simons -Date: Wed Nov 7 14:37:46 2007 +0000 - - GibberRMulticastSender: Add a stopped state in which a sender will only react to repair requests - - - 20071107143746-93b9a-aa287cb453b277922bb645cfa06addc1bb291537.gz - - lib/gibber/gibber-r-multicast-sender.c | 20 ++++++++++++++++---- - lib/gibber/gibber-r-multicast-sender.h | 5 +++-- - 2 files changed, 19 insertions(+), 6 deletions(-) - -commit e567e3d93b3276fc259212e815945fe188b69cb1 -Author: Sjoerd Simons -Date: Wed Nov 7 13:10:59 2007 +0000 - - Add a simulation to see if leaving nodes do still correctly react to repaire requests - - - 20071107131059-93b9a-84ff907176cfee79cb6e1eb2e02f377bcdeea0d7.gz - - tests/repair-after-fail-test.py | 154 +++++++++++++++++++++++++++++++++++++++ - 1 files changed, 154 insertions(+), 0 deletions(-) - -commit 36e20cb22046494cb05064e9c8f40fdf946a7356 -Author: Sjoerd Simons -Date: Wed Nov 7 14:39:27 2007 +0000 - - GibberRMulticastSender: Kill trailing whitespace - - - 20071107143927-93b9a-50059aa9bb1d57885a11045396a1a53a061d1e5d.gz - - lib/gibber/gibber-r-multicast-sender.c | 24 ++++++++++++------------ - 1 files changed, 12 insertions(+), 12 deletions(-) - -commit fe5e303874e292c8459dc9c8e6c8cbeca2fd0283 -Author: Sjoerd Simons -Date: Wed Nov 7 13:08:54 2007 +0000 - - Don't unnecessarily rstrip data - - - 20071107130854-93b9a-3fb3cea0a38696b9b9e3581c25f2fdc6b0e073a5.gz - - tests/mesh.py | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 4857316c0a9e48e91ce4c05e3d3ebcf451311b8f -Author: Simon McVittie -Date: Wed Nov 7 15:07:10 2007 +0000 - - Development version 0.1.6.1 - - - 20071107150710-53eee-589d8d89125b7e5ac9c57893e9a2bcf08c76a3c2.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b65d57c9516407557c85e7fbd846e8a09d3e6411 -Author: Simon McVittie -Date: Wed Nov 7 13:54:24 2007 +0000 - - Version 0.1.6 - - - 20071107135424-53eee-ebcbd849183c45d09d721844c02051ceb184d615.gz - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 0747812fbf6a06d68c8649a9c4042b5abfcde31d -Author: Simon McVittie -Date: Tue Nov 6 13:05:11 2007 +0000 - - Correct misleading comment: there are >3 known properties now - - - 20071106130511-53eee-cde8ed5ba9b7ef846764904869ce5fa1b2eb1cf6.gz - - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4e6ba7601adc449d8930e32a595aa6ba728c2ac4 -Author: Simon McVittie -Date: Tue Nov 6 13:04:25 2007 +0000 - - Remove SALUT_CONTACT_OLPC_IP4, SALUT_CONTACT_OLPC_IP6 bitfield flags (both are equivalent to SALUT_CONTACT_OLPC_PROPERTIES) - - - 20071106130425-53eee-c329107cf5a8bc8e4a3cfbf0b0c035c9842f370e.gz - - src/salut-connection.c | 4 +--- - src/salut-contact.c | 4 ++-- - src/salut-contact.h | 2 -- - 3 files changed, 3 insertions(+), 7 deletions(-) - -commit 78a39c1c84a2c050111835517357545f9dba0d5b -Author: Guillaume Desmottes -Date: Tue Aug 28 12:46:20 2007 +0000 - - add ip4-address and ip6-address as known buddy properties - - - 20070828124620-7fe3f-384265f6183c4ae1fe1dba02ae686a5481652212.gz - - src/salut-connection.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 0300aad9d75b55f1c2c2ad0fe4fc8d540b6b8d85 -Author: Guillaume Desmottes -Date: Mon Aug 27 14:44:47 2007 +0000 - - fix conflict with the IP buddy property patch - - - 20070827144447-7fe3f-848cd59eda7b52e48e15fd38842c9b38299e6164.gz - - src/salut-contact.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 96f27d2e176ea225bdca01503541cbcfb6bbc299 -Author: Dan Williams -Date: Sun Jul 15 09:30:38 2007 +0000 - - Put IPv4 and IPv6 addresses into buddy properties - - - 20070715093038-0fd4a-816387c1ea0b666f9ff1249657e79edf4b33b253.gz - - src/salut-connection.c | 34 +++++++++++++++++++++++++++------- - src/salut-contact.c | 38 +++++++++++++++++++++++++++++++++----- - src/salut-contact.h | 4 ++++ - 3 files changed, 64 insertions(+), 12 deletions(-) - -commit 708766251341e277ac5017340923118f76120441 -Author: Guillaume Desmottes -Date: Tue Nov 6 12:09:02 2007 +0000 - - salut-contact: set presence timeout to 20 minutes - - - 20071106120902-7fe3f-e27cf90a129a023d1a95d54a00f5a672ec581d7c.gz - - src/salut-contact.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit db87e23fe9e3336c7b3652f6c2e456a6c3aa60ee -Author: Guillaume Desmottes -Date: Mon Oct 29 15:20:59 2007 +0000 - - salut-contact: contact_failed_cb: fix test checking if there is already a timer - - - 20071029152059-7fe3f-baaaf866fb0976596ac92b892919f345c647d517.gz - - src/salut-contact.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 81b76c2f586dd31e956f61959403105751a5892c -Author: Guillaume Desmottes -Date: Mon Oct 29 13:46:23 2007 +0000 - - salut-contact: the timeout is in the millisecond, not second - - - 20071029134623-7fe3f-96fcc3def17ede3a289d102ab93251f08aa6f758.gz - - src/salut-contact.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e8974ea55969f6bf8069d99daf393b8c8050a010 -Author: Guillaume Desmottes -Date: Mon Oct 29 13:25:45 2007 +0000 - - salut-contact: when presence resolver fails, remove the contact after a timer if we wasn't able to resolve it again - - - 20071029132545-7fe3f-8984df3a2237c181cb2a1570cbd4d66ae55bfa3e.gz - - src/salut-contact.c | 35 +++++++++++++++++++++++++++++++++-- - 1 files changed, 33 insertions(+), 2 deletions(-) - -commit f89c91584af2cd40abc75c17ad82c614190dde8d -Author: Simon McVittie -Date: Mon Nov 5 19:12:45 2007 +0000 - - Fix conflicts - - - 20071105191245-53eee-e11f94b3103827682e0d46ff6303c32d3299eff5.gz - - lib/gibber/gibber-muc-connection.c | 25 ++++++++++++++----------- - 1 files changed, 14 insertions(+), 11 deletions(-) - -commit 8079eeb4b03d934cf5b37c4de60fe257d0dfea65 -Author: Simon McVittie -Date: Mon Nov 5 11:09:45 2007 +0000 - - Add telepathy-salut.8 man page - - - 20071105110945-53eee-e9610597c97ca0d7586afd2a1588d932d7e2a314.gz - - _boring | 2 ++ - docs/Makefile.am | 12 +++++++++++- - docs/telepathy-salut.8.in | 39 +++++++++++++++++++++++++++++++++++++++ - 3 files changed, 52 insertions(+), 1 deletions(-) - -commit 3721e0ccc9c68776e93f9fe73c13d6d4099d89af -Author: Simon McVittie -Date: Fri Nov 2 18:33:38 2007 +0000 - - Don't check for protocol attribute, we no longer send it - - - 20071102183338-53eee-41671923990bd6b2336f6adc291816863a996f83.gz - - src/salut-muc-manager.c | 11 ++--------- - 1 files changed, 2 insertions(+), 9 deletions(-) - -commit 5ee82be6b33499e790e16115503bf945d9a5b30b -Author: Simon McVittie -Date: Fri Nov 2 17:31:13 2007 +0000 - - docs/: fix XML - - - 20071102173113-53eee-9f8c3999090021409ad5c46559a5ebfe84e53a82.gz - - docs/clique.xml | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 3e8b92dfe3a898764f269e7035f51528e8430ce4 -Author: Simon McVittie -Date: Fri Nov 2 16:58:34 2007 +0000 - - Change OLPC activity DNS-SD records to _olpc-activity1._udp - - - 20071102165834-53eee-2f99007651add54d033c4963fe8d3a65152de4dc.gz - - src/salut-presence.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 929f9bd7fd9e2a5801d88169ff3e174a6642f6dd -Author: Simon McVittie -Date: Fri Nov 2 16:46:37 2007 +0000 - - Use #defines for DNS-SD service types. Rename _salut-room._udp to _clique._udp - - - 20071102164637-53eee-c1fb0a1b0da0057730ea94628b89f37e40bad255.gz - - src/salut-contact-manager.c | 7 ++++--- - src/salut-contact.c | 8 ++++---- - src/salut-muc-channel.c | 4 ++-- - src/salut-muc-manager.c | 2 +- - src/salut-presence.h | 3 +++ - src/salut-self.c | 6 +++--- - 6 files changed, 17 insertions(+), 13 deletions(-) - -commit 46fef6c6c9a411af75d23d7c82ee46624943b678 -Author: Simon McVittie -Date: Fri Nov 2 16:37:43 2007 +0000 - - Remove unused ansi.h - - - 20071102163743-53eee-d535a5c0b0396ab0e77f3fc2a38b4aa04bddc0ae.gz - - src/Makefile.am | 3 +-- - src/ansi.h | 24 ------------------------ - 2 files changed, 1 insertions(+), 26 deletions(-) - -commit ca0ba244863061e3d4adb9001d7d7439bf07f4f6 -Author: Simon McVittie -Date: Fri Nov 2 16:37:02 2007 +0000 - - Remove now-useless namespaces.h - - - 20071102163702-53eee-a50265c77d4380cdd176efd351a731a12e7e1e6c.gz - - src/Makefile.am | 3 +-- - src/namespaces.h | 23 ----------------------- - 2 files changed, 1 insertions(+), 25 deletions(-) - -commit b366e0ebd12e8bce904179a4225187648165778b -Author: Simon McVittie -Date: Fri Nov 2 16:36:13 2007 +0000 - - Fix up inclusions of namespace headers - - - 20071102163613-53eee-b0629123d4b9e682fa76f8bb26bbd3b843b70052.gz - - lib/gibber/gibber-muc-connection.c | 1 + - src/salut-im-channel.c | 1 - - src/salut-im-manager.c | 2 -- - src/salut-muc-channel.c | 2 +- - src/salut-muc-manager.c | 3 +-- - src/tube-dbus.c | 1 - - src/tube-stream.c | 1 - - 7 files changed, 3 insertions(+), 8 deletions(-) - -commit c3a4ac5d46c95d61da0e7695f59fd63fe7342d4e -Author: Simon McVittie -Date: Fri Nov 2 16:34:50 2007 +0000 - - Recommend 239.255.71.x in documentation - - - 20071102163450-53eee-21d38ab89719c73667233fd86869a5aa644d7b61.gz - - docs/clique.xml | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit df0de7b4fac98163b3b86c37d86e3f8ef1cd4172 -Author: Simon McVittie -Date: Fri Nov 2 16:16:16 2007 +0000 - - Replace some references to rMulticast with Clique - - - 20071102161616-53eee-560ebccd0539eb6aa7bf33d2296a12697c45a826.gz - - lib/gibber/gibber-bytestream-muc.c | 4 +++- - lib/gibber/gibber-muc-connection.c | 4 ++-- - 2 files changed, 5 insertions(+), 3 deletions(-) - -commit 229777322e57c4d9ea2cadaa739d5f08bd500fda -Author: Simon McVittie -Date: Fri Nov 2 16:15:42 2007 +0000 - - Document mDNS use for Clique - - - 20071102161542-53eee-04b8dc960267284d00fd5b7a6e3024c22b755ba9.gz - - docs/clique.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 55 insertions(+), 3 deletions(-) - -commit 1767c1f9dcebab22e3f939046ceaee603c672c1f -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 - - docs/clique.xml | 54 +++++++++-------------------------- - lib/gibber/gibber-muc-connection.c | 8 ++-- - lib/gibber/gibber-namespaces.h | 4 +- - src/namespaces.h | 3 -- - src/salut-im-channel.c | 6 ++-- - src/salut-muc-channel.c | 16 ++++------ - src/salut-muc-manager.c | 28 +++++------------- - 7 files changed, 37 insertions(+), 82 deletions(-) - -commit fc257866bc0e0c7e66ef0475b6bfdc0303cf9319 -Author: Simon McVittie -Date: Fri Nov 2 15:52:56 2007 +0000 - - clique.xml: call it Clique in the intro - - - 20071102155256-53eee-6e2e7c13bccb38bad7e357ff925cba279c83c4dd.gz - - docs/clique.xml | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit 24f988bb0d283c7abfb99d13855da3b462e77a40 -Author: Simon McVittie -Date: Fri Nov 2 15:27:01 2007 +0000 - - Rename docs/room-invitation.xml to docs/clique.xml - - - 20071102152701-53eee-1b7b671ace82e9f36fc67e84b5bd5f40309e17ed.gz - - docs/Makefile.am | 2 +- - docs/clique.xml | 137 ++++++++++++++++++++++++++++++++++++++++++++++ - docs/room-invitation.xml | 137 ---------------------------------------------- - 3 files changed, 138 insertions(+), 138 deletions(-) - -commit a29577c7a6f6360b135340d991b5869460b51eae -Author: Simon McVittie -Date: Thu Nov 1 13:20:17 2007 +0000 - - Change namespace in documentation to match code - - - 20071101132017-53eee-3993fc88411a1c18f5766acac39182fd80a3c89a.gz - - docs/room-invitation.xml | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit fd5d8c34727a9c29bed9321c693c8a1c672d2f07 -Author: Simon McVittie -Date: Thu Nov 1 13:14:47 2007 +0000 - - Add room-invitation protocol description - - - 20071101131447-53eee-de336ae13774f312cd4286b588fc3a19e499cfb7.gz - - Makefile.am | 2 +- - configure.ac | 1 + - docs/Makefile.am | 22 +++++++ - docs/README | 6 ++ - docs/room-invitation.xml | 137 ++++++++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 167 insertions(+), 1 deletions(-) - -commit 8819986d533652d510fac50ea0a409636c3c60eb -Author: Simon McVittie -Date: Mon Oct 22 12:34:36 2007 +0000 - - Echo broadcast messages that are from us (rMulticast aux bytestreams don't echo) - - - 20071022123436-53eee-fd91c3c54857af0aac5d2f7d8024d7c2101fca97.gz - - src/tube-dbus.c | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) - -commit 134bed157858610c2df67618dbc32890a76e865c -Author: Simon McVittie -Date: Mon Oct 22 12:33:55 2007 +0000 - - Rename NS_LLMUC to NS_TP_LL_ROOM_INVITATION and put it in the telepathy.fd.o/xmpp namespace - - - 20071022123355-53eee-d0f75e4438de341e9f7db0053deb48c6a826d419.gz - - src/namespaces.h | 3 ++- - src/salut-im-channel.c | 3 ++- - src/salut-muc-channel.c | 2 +- - src/salut-muc-manager.c | 6 ++++-- - 4 files changed, 9 insertions(+), 5 deletions(-) - -commit 972225c9c7bbd42c89395a019dfec111173cf548 -Author: Guillaume Desmottes -Date: Fri Nov 2 12:47:29 2007 +0000 - - bytestream-manager: unref the bystream when it's closed. It's the responsibilty of the object using it to ref it - - - 20071102124729-7fe3f-7007455e9c9e7abcce5b38527a566634c97ed132.gz - - src/salut-bytestream-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 01ac3bd7d7da0cea8832e12bb8670ffa93f5cb9c -Author: Simon McVittie -Date: Thu Nov 1 15:59:26 2007 +0000 - - Ignore OOB close stanza - it doesn't make sense for OOB TCP streams that we implement internally, and that's all we currently support - - - 20071101155926-53eee-8e8c13bb2a533a6dfb0fb88d9e2a50a94fd65bae.gz - - lib/gibber/gibber-bytestream-oob.c | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -commit f8ce035c3e7dc1391acada3bddb2c2e678a3d217 -Author: Guillaume Desmottes -Date: Thu Nov 1 14:30:57 2007 +0000 - - tube-stream: remove useless blank line - - - 20071101143057-7fe3f-01091e2e9172f3405972dcad83a015a1ad171a0f.gz - - src/tube-stream.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 0e928f56bdd63dc8e9b49f1a8e31272aefbbcf64 -Author: Guillaume Desmottes -Date: Thu Nov 1 14:16:53 2007 +0000 - - tube-stream: create the transport when the bystream is open as we are not able to handle data before - - - 20071101141653-7fe3f-3017e7119586d614860c0359914fb7db0ea98432.gz - - src/tube-stream.c | 110 ++++++++++++++++++++++++++++++++--------------------- - 1 files changed, 66 insertions(+), 44 deletions(-) - -commit 086c96a89992b4473701fc7ff4328650bb2146eb -Author: Guillaume Desmottes -Date: Thu Nov 1 13:39:15 2007 +0000 - - tube-stream: use GibberTransport instead of reinventing our own - - - 20071101133915-7fe3f-597fa2ba5389085542a03569398efa8eb52cd159.gz - - src/tube-stream.c | 258 ++++++++++++++++++++--------------------------------- - 1 files changed, 98 insertions(+), 160 deletions(-) - -commit a068c3f7937c37a5cdab73b7f51631c22051ec01 -Author: Guillaume Desmottes -Date: Mon Oct 29 09:33:55 2007 +0000 - - bytestream-manager: remove unnecessary casts from (gchar *) to (const gchar *) - - - 20071029093355-7fe3f-d169d25829c30dad8b5930ab2fff0ce292d73be9.gz - - src/salut-bytestream-manager.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 735a311ad2eb162abe36048dfd190dce6d61c9ac -Author: Guillaume Desmottes -Date: Fri Oct 26 16:05:00 2007 +0000 - - salut_tubes_channel_get_stream_tube_socket_address: don't hardcode unix type - - - 20071026160500-7fe3f-e2c5b67eeb4a195c9c691fab7c8941e01025a353.gz - - src/salut-tubes-channel.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 6bd6dada33edaeb92ed871f395fae89d850ffa5f -Author: Guillaume Desmottes -Date: Fri Oct 26 14:32:43 2007 +0000 - - tubes-channel: salut_tubes_channel_bytestream_offered: close the bytestream if there is an error - - - 20071026143243-7fe3f-30f59ab365cec8394aa7cb76f42c147230ad653f.gz - - src/salut-tubes-channel.c | 21 ++++++++------------- - 1 files changed, 8 insertions(+), 13 deletions(-) - -commit ba223e30a1d451afdb44735f69069fb7a88e787e -Author: Guillaume Desmottes -Date: Fri Oct 26 14:26:23 2007 +0000 - - tubes-channe: remove 1-1 tubes commented code - - - 20071026142623-7fe3f-88653624e7085ba53a6498004da3e4457e5e39b4.gz - - src/salut-tubes-channel.c | 76 --------------------------------------------- - 1 files changed, 0 insertions(+), 76 deletions(-) - -commit 49399bb02458cba64d8f51ba9e21e93637cdf133 -Author: Guillaume Desmottes -Date: Fri Oct 26 14:19:00 2007 +0000 - - salut-muc-manager.c: salut_muc_manager_handle_si_stream_request: close the bytestream if the tubes channel doesn't exist - - - 20071026141900-7fe3f-3fd994923f5c37ea8288adaf56545662daf7ff6f.gz - - src/salut-muc-manager.c | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit f1aa305650c4f1bb9b6ee72e072503f9774a7e87 -Author: Guillaume Desmottes -Date: Fri Oct 26 13:26:32 2007 +0000 - - salut-bytestream-manager.c: use gibber_bytestream_oob_set_check_addr_func to check if the addr is owned by the right contact - - - 20071026132632-7fe3f-4eb4c6847008e40769f8966fe51f81f9a08a02ed.gz - - src/salut-bytestream-manager.c | 41 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 41 insertions(+), 0 deletions(-) - -commit 10abfe1a4fd1c970d64aa9ee74deea9ea30ab047 -Author: Guillaume Desmottes -Date: Fri Oct 26 13:24:09 2007 +0000 - - add gibber_bytestream_oob_set_check_addr_func to let bytestream user define a function to check if he want to accept a incoming connection or not - - - 20071026132409-7fe3f-466822761c8c257ce8792bc24e40acd35b11304c.gz - - lib/gibber/gibber-bytestream-oob.c | 26 ++++++++++++++++++++++++-- - lib/gibber/gibber-bytestream-oob.h | 11 +++++++++++ - 2 files changed, 35 insertions(+), 2 deletions(-) - -commit 879b6ddd03d1cde5c4b0c79f8f2f1de595767921 -Author: Guillaume Desmottes -Date: Thu Oct 25 14:24:55 2007 +0000 - - bytestream-manager: the free of host_name_fqdn have to be done in the finalize, not dispose - - - 20071025142455-7fe3f-bf6c12de9d17b9e142dae1f298f70d90d2238095.gz - - src/salut-bytestream-manager.c | 15 ++++++++++++++- - 1 files changed, 14 insertions(+), 1 deletions(-) - -commit 4c8aace69054b1c86d916f0f3959554af95c4fe3 -Author: Guillaume Desmottes -Date: Thu Oct 25 14:16:50 2007 +0000 - - bytestream-manager: assert host_name_fqdn is not NULL in constructor - - - 20071025141650-7fe3f-d3365ba55c88fd802b4c96c2514df38bedc4f898.gz - - src/salut-bytestream-manager.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 9a62be1d5659d6fd6518799ef2cfc9150f20eaf9 -Author: Guillaume Desmottes -Date: Thu Oct 25 14:08:38 2007 +0000 - - add a "host-name-fqdn" property to the bytestream-mananager so we use the host name from avahi_client_get_host_name_fqdn in OOB bytestreams - - - 20071025140838-7fe3f-911611086e2f2f9f5fae169dd69dc8c4404c5697.gz - - src/salut-bytestream-manager.c | 37 +++++++++++++++++++++++++++---------- - src/salut-bytestream-manager.h | 3 ++- - src/salut-connection.c | 7 ++++--- - 3 files changed, 33 insertions(+), 14 deletions(-) - -commit 3ae0d26551317feefbb48643f55c5d60fb370486 -Author: Guillaume Desmottes -Date: Thu Oct 25 12:44:13 2007 +0000 - - fix confict with -protocol and make it build - - - 20071025124413-7fe3f-7c929b2b6a39ca5bc95c2129e7803a22362f4c90.gz - - lib/gibber/gibber-bytestream-muc.c | 26 +++++++++++++++++--------- - src/salut-tubes-channel.c | 6 +----- - 2 files changed, 18 insertions(+), 14 deletions(-) - -commit d064b0334cf92d975a69411af8bdcc561841b98a -Author: Guillaume Desmottes -Date: Thu Oct 25 11:23:16 2007 +0000 - - bytestream-oob: send the IQ response only if we are the recipient of the bytestream - - - 20071025112316-7fe3f-b968fbb1082e19ae3f0e73b52d28228e8f7a0fe6.gz - - lib/gibber/gibber-bytestream-oob.c | 47 +++++++++++++++++++++++++---------- - 1 files changed, 33 insertions(+), 14 deletions(-) - -commit eb1b62cc7d24fe9eb6c78150eea09b0559771bd6 -Author: Guillaume Desmottes -Date: Thu Oct 25 11:17:24 2007 +0000 - - bytestream-manager.c: unref the bytestream *after* the call to gibber_bytestream_iface_close - - - 20071025111724-7fe3f-6eb8dddd2adf2c07d9154fb3d7485cd92b6d2e45.gz - - src/salut-bytestream-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8d41615f2c3fbbb8811f74e2b8812a0398db0c96 -Author: Guillaume Desmottes -Date: Thu Oct 25 11:14:53 2007 +0000 - - bytestream-oob: ref the xmpp-connection and disconnect its signal when disposing - - - 20071025111453-7fe3f-0f1bdc167e4aed4385044ec01a96b6dd2048601a.gz - - lib/gibber/gibber-bytestream-oob.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit fefd78cd4c6eae956f4f1385ee5ac75511fcd4d6 -Author: Guillaume Desmottes -Date: Wed Oct 24 10:52:40 2007 +0000 - - bytestream-oob: add a TODO about IPv6 literals in URL - - - 20071024105240-7fe3f-f2528d399deea15cf395f1b9513fa279eb8e2af7.gz - - lib/gibber/gibber-bytestream-oob.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 659944b79a5f62cf6d2fb5653084ffbca002c28d -Author: Guillaume Desmottes -Date: Wed Oct 24 10:47:55 2007 +0000 - - bytestream-oob: add a FIXME in parse_oob_iq_result - - - 20071024104755-7fe3f-965ff0b6ff5c27cfafe4233480bbf118bf0c8394.gz - - lib/gibber/gibber-bytestream-oob.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 0610ab3a9bc2f9d9c425e70e3403c97e95258959 -Author: Guillaume Desmottes -Date: Tue Oct 23 15:38:45 2007 +0000 - - bytestream-oob: explicitely say in the host parameter description than it have to be a hostname, not a literal - - - 20071023153845-7fe3f-8d30bf993cc3172273b1bee8ec0525a77a0b4c59.gz - - lib/gibber/gibber-bytestream-oob.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 842de024827f4fcfa17a209cbb7ac2a2cf2db370 -Author: Guillaume Desmottes -Date: Tue Oct 23 16:01:25 2007 +0000 - - tubes-channel: when creating a new stream tube, set its initiator according to the contact who sent us the tubes messages - - - 20071023160125-7fe3f-d59bf30ca43166c44d0fbe73c4f0edda806d8e19.gz - - src/salut-tubes-channel.c | 28 ++++++++++++++++++++++++++++ - 1 files changed, 28 insertions(+), 0 deletions(-) - -commit be972733e0ced89685dbba9ab919c387cadf417b -Author: Guillaume Desmottes -Date: Tue Oct 23 15:55:45 2007 +0000 - - tubes-channel: extract_tube_information: allow initiator to be NULL - - - 20071023155545-7fe3f-49263e8c518def38893baa9daf5b4838ea37ba1e.gz - - src/salut-tubes-channel.c | 18 +++++++++++++----- - 1 files changed, 13 insertions(+), 5 deletions(-) - -commit 780feb6143f7977716ecf3dfedeff0d34f1fe8e5 -Author: Guillaume Desmottes -Date: Tue Oct 23 12:26:32 2007 +0000 - - bytestream-oob: call set_transport before connect and open_fd so we don't have to check for the state - - - 20071023122632-7fe3f-73857976aecf1dc73511a56510685017bf721dea.gz - - lib/gibber/gibber-bytestream-oob.c | 17 ++--------------- - 1 files changed, 2 insertions(+), 15 deletions(-) - -commit cbdc5b9d790b22fe34de04f72f038245162be955 -Author: Guillaume Desmottes -Date: Tue Oct 23 11:33:17 2007 +0000 - - bytestream-oob: don't expect transport's connect is synchronous - - - 20071023113317-7fe3f-946e7c5d90aa938c1387cd11f4891ae9d6f226e6.gz - - lib/gibber/gibber-bytestream-oob.c | 81 ++++++++++++++++++++---------------- - 1 files changed, 45 insertions(+), 36 deletions(-) - -commit c3629198011441fc16cacca7cd8c0c42f644507c -Author: Guillaume Desmottes -Date: Tue Oct 23 10:34:26 2007 +0000 - - fix stanza leak in gibber_bytestream_oob_accept - - - 20071023103426-7fe3f-03aa97d1d76a81a26ffacda567624c4260a8629f.gz - - lib/gibber/gibber-bytestream-oob.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 7cc0c61b0ce1b216239d36e3cfca13dfd266dca4 -Author: Guillaume Desmottes -Date: Tue Oct 23 10:31:00 2007 +0000 - - bytestream-oob: close the transport when disposing the bytestream - - - 20071023103100-7fe3f-d1664a967a1677b9e3a7407b731e07f243efe96b.gz - - lib/gibber/gibber-bytestream-oob.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit c05687cce13e8237cbdf1e3b52d6a9dc608ec288 -Author: Guillaume Desmottes -Date: Tue Oct 23 10:27:30 2007 +0000 - - bytestream-oob: close the bytestream if the transport is disconnected - - - 20071023102730-7fe3f-87d08cb05b7439f14876f911437e61ecaeb0b20f.gz - - lib/gibber/gibber-bytestream-oob.c | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) - -commit dddb4e0d40914a87ee2eb65c7dfd714e3d871f08 -Author: Guillaume Desmottes -Date: Tue Oct 23 10:14:42 2007 +0000 - - bytestream-oob: use GibberTransport instead of reimplementing our own - - - 20071023101442-7fe3f-96abf424f3f1309e847acdba80153d807a206348.gz - - lib/gibber/gibber-bytestream-oob.c | 253 ++++++------------------------------ - 1 files changed, 40 insertions(+), 213 deletions(-) - -commit 16e4d61bf51a4265dd80624552ae74ccb31f2975 -Author: Guillaume Desmottes -Date: Tue Oct 23 08:46:18 2007 +0000 - - bytestream-oob: coding style fix - - - 20071023084618-7fe3f-080ef680108c87094ae2071d6da125238143718c.gz - - lib/gibber/gibber-bytestream-oob.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 862b147e4c18c1e6827b7a9c25674652a2d9db9e -Author: Guillaume Desmottes -Date: Mon Oct 22 15:42:26 2007 +0000 - - bytestream-oob: normalize_address was renamed to gibber_normalize_address - - - 20071022154226-7fe3f-1a0f0a28170bbe8676d9e98c30a8fc034a1c3e89.gz - - lib/gibber/gibber-bytestream-oob.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ba34a400634153ff0d8c9856a77279aac59280e0 -Author: Guillaume Desmottes -Date: Mon Oct 22 15:36:04 2007 +0000 - - bytestream-oob: remove temporary buffer in data_io_in_cb - - - 20071022153604-7fe3f-414cf01c9cb23cdac3945d1dd2ac85b75926f336.gz - - lib/gibber/gibber-bytestream-oob.c | 17 +++++++---------- - 1 files changed, 7 insertions(+), 10 deletions(-) - -commit c2018735fc6a2bb35c1fdd085279fc98e0c01fd9 -Author: Guillaume Desmottes -Date: Mon Oct 22 15:05:16 2007 +0000 - - bytestream-obb: add a write buffer - - - 20071022150516-7fe3f-7e0b2dd46ac4d6258ee594330eb8b77a89816f3c.gz - - lib/gibber/gibber-bytestream-oob.c | 148 ++++++++++++++++++++++++++++------- - 1 files changed, 118 insertions(+), 30 deletions(-) - -commit c9cc74bd34ab5fee331a0af54136ce19ffdc2a05 -Author: Guillaume Desmottes -Date: Mon Oct 22 14:00:36 2007 +0000 - - bytestream-obb: close the bytestream if an error occurs when writing to the socket - - - 20071022140036-7fe3f-c9548979b33e435fca19de71615440774f10fe58.gz - - lib/gibber/gibber-bytestream-oob.c | 28 ++++++++++++++++++++++------ - 1 files changed, 22 insertions(+), 6 deletions(-) - -commit c355b530c22efe31cc7a9ccd82fcbc1e3418eeec -Author: Guillaume Desmottes -Date: Mon Oct 22 13:42:53 2007 +0000 - - allow func argument of gibber_bytestream_{oob,ibb}_accept to be NULL - - - 20071022134253-7fe3f-ce2f69b92e5cbff90ee3f886e8accc5e4b1d1f33.gz - - lib/gibber/gibber-bytestream-ibb.c | 7 +++++-- - lib/gibber/gibber-bytestream-oob.c | 7 +++++-- - 2 files changed, 10 insertions(+), 4 deletions(-) - -commit 782b5889a4e4aa21958caeac239a8855e512fcba -Author: Guillaume Desmottes -Date: Mon Oct 22 13:38:54 2007 +0000 - - rename parse_oob_close_iq to parse_oob_iq_result - - - 20071022133854-7fe3f-f06d22ccfbc1d3ca0c17ba8800d58bcdf502f5bc.gz - - lib/gibber/gibber-bytestream-oob.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 2625700ab53c64201a143234be6a88150b4b8707 -Author: Guillaume Desmottes -Date: Mon Oct 22 13:38:19 2007 +0000 - - bytestream-oob: use gibber-util's normalize_address instead of our own copy - - - 20071022133819-7fe3f-4cbeccfd97d0c65588629e5215801400d6313e38.gz - - lib/gibber/gibber-bytestream-oob.c | 22 +--------------------- - 1 files changed, 1 insertions(+), 21 deletions(-) - -commit 254efd1467a16ac6e047c646f31aed2c94af108f -Author: Guillaume Desmottes -Date: Mon Oct 22 13:13:02 2007 +0000 - - tubes-channel: remove the request attribute in the call of update_tubes_info in salut_tubes_channel_accept_stream_tube - - - 20071022131302-7fe3f-9afa74cbf4e0813c29c27f675d1d72387b3aed93.gz - - src/salut-tubes-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d9c50504917e31394ec41d10e690e907799deb89 -Author: Guillaume Desmottes -Date: Mon Oct 22 12:00:51 2007 +0000 - - bytestream-oob: make normalize_address more portable - - - 20071022120051-7fe3f-687e4605d1a552c6f8932ac2a698febe0f825143.gz - - lib/gibber/gibber-bytestream-oob.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -commit 619c622e7f9caa53d3e2a59e3e85a6bee8b93b7d -Author: Guillaume Desmottes -Date: Mon Oct 22 10:45:06 2007 +0000 - - bytestream-oob: don't bufferize data. Let the higher layer do that - - - 20071022104506-7fe3f-5c060f058666b5f1ab02b75eb262e31cf387e39f.gz - - lib/gibber/gibber-bytestream-oob.c | 52 +++++++++++++---------------------- - 1 files changed, 19 insertions(+), 33 deletions(-) - -commit 4ac081a11252f82a004167f7d01d2920eea923c2 -Author: Guillaume Desmottes -Date: Mon Oct 22 10:14:14 2007 +0000 - - bytestream-ibb: remove usless return in xmpp_connection_received_stanza_cb - - - 20071022101414-7fe3f-e146fe74f003385321995a112a13e39f092df16a.gz - - lib/gibber/gibber-bytestream-ibb.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit e24f72b282f65500efb984ef1563ab3a8040fb43 -Author: Guillaume Desmottes -Date: Mon Oct 22 10:13:19 2007 +0000 - - bytestream-ibb.c: inline send_stanza - - - 20071022101319-7fe3f-a31c7939ed0fe0e94468ec9ae5efb5fc46ae9c50.gz - - lib/gibber/gibber-bytestream-ibb.c | 18 ++++-------------- - 1 files changed, 4 insertions(+), 14 deletions(-) - -commit 7fae764519bf48c294511a5d445f49663ac59ccf -Author: Guillaume Desmottes -Date: Fri Oct 19 16:08:52 2007 +0000 - - add GIBBER_TELEPATHY_NS_RMULTICAST namespace and use it in bytestream-muc - - - 20071019160852-7fe3f-a8289e1842f7371947c6aab5e2f0764297970f2f.gz - - lib/gibber/gibber-bytestream-muc.c | 3 ++- - lib/gibber/gibber-namespaces.h | 3 +++ - 2 files changed, 5 insertions(+), 1 deletions(-) - -commit c48a5d9e9500e844e86c3419bc8fbf37f7676c30 -Author: Guillaume Desmottes -Date: Fri Oct 19 14:38:11 2007 +0000 - - bytestream-oob: send item-not-found error if connect to peer failed - - - 20071019143811-7fe3f-492dcb0dc0ffbf08dbcdb6c9232b63ee82aa45ca.gz - - lib/gibber/gibber-bytestream-oob.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -commit ca4911682b565ddc1d68a8fdfa03bc85a5bc9b7d -Author: Guillaume Desmottes -Date: Fri Oct 19 14:22:05 2007 +0000 - - bytestream-manager.c: improve parsing in si_request_reply_cb - - - 20071019142205-7fe3f-94b03be70cc2af73899ab5ad4af32f18c2db1095.gz - - src/salut-bytestream-manager.c | 120 ++++++++++++++++++++++------------------ - 1 files changed, 66 insertions(+), 54 deletions(-) - -commit f3ef420dbc5aa46d94ebbbe6071d88da61c56a1f -Author: Guillaume Desmottes -Date: Fri Oct 19 14:09:00 2007 +0000 - - bytestream-manager: remove double break - - - 20071019140900-7fe3f-fa1307d0fa268b38f3c1e7a83e939dbb20d06cef.gz - - src/salut-bytestream-manager.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 830b9769776104510cba86b2b1db76dbc86b48ac -Author: Guillaume Desmottes -Date: Fri Oct 19 14:08:07 2007 +0000 - - bytestream-manager.c: properly send IQ error in si_request_cb - - - 20071019140807-7fe3f-6ea152a3d9af406cc72811c4c39ba34684679300.gz - - src/salut-bytestream-manager.c | 91 +++++++++++++--------------------------- - 1 files changed, 29 insertions(+), 62 deletions(-) - -commit f0474b2e662c102ccb1e76cf1037815c87f6dbc4 -Author: Guillaume Desmottes -Date: Fri Oct 19 13:57:33 2007 +0000 - - gibber-iq-helper.c: add a TODO in gibber_iq_helper_new_error_reply - - - 20071019135733-7fe3f-4afcf06cab597e26bf51cf1972e01062054f0dea.gz - - lib/gibber/gibber-iq-helper.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit f09d870ba6fad9f464bb08a406a261ce40d5cbb3 -Author: Guillaume Desmottes -Date: Fri Oct 19 13:56:10 2007 +0000 - - check-gibber-iq-helper.c: update to use new gibber_iq_helper_new_error_reply API - - - 20071019135610-7fe3f-fb47984c76d941a3033d0d30a83cb139ec78bbd2.gz - - tests/check-gibber-iq-helper.c | 23 ++++++++++++++++++++++- - 1 files changed, 22 insertions(+), 1 deletions(-) - -commit 64060d641fc972513a8871831ade137ac8f34d7d -Author: Guillaume Desmottes -Date: Fri Oct 19 13:53:31 2007 +0000 - - modify gibber_iq_helper_new_error_reply to take a XmppError and a error msg as arguments - - - 20071019135331-7fe3f-ec3aa9b11713db676a05b12ce4c19a5e17ebfa34.gz - - lib/gibber/gibber-iq-helper.c | 11 +++++++++-- - lib/gibber/gibber-iq-helper.h | 4 +++- - 2 files changed, 12 insertions(+), 3 deletions(-) - -commit f717216d520e3d78e73a8c924d955cc8caf34381 -Author: Guillaume Desmottes -Date: Fri Oct 19 12:24:35 2007 +0000 - - bytestream-manager.c: backport streaminit_parse_request improvements from Gabble - - - 20071019122435-7fe3f-9ee8eda88201ac5987a08dfb4fe86b6dcc282d10.gz - - src/salut-bytestream-manager.c | 89 ++++++++++++++++++++------------------- - 1 files changed, 46 insertions(+), 43 deletions(-) - -commit 67e921b93cc00fc9d0e7339600fc0ef51626f33a -Author: Guillaume Desmottes -Date: Fri Oct 19 11:36:57 2007 +0000 - - build salut-bytestream-manager - - - 20071019113657-7fe3f-985b467092246c53910d6b0b091759633679d4b1.gz - - src/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 3336dda350e113d17b19db4047fc79c117fef1a0 -Author: Guillaume Desmottes -Date: Fri Oct 19 11:36:42 2007 +0000 - - add salut-bytestream-manager.[ch] - - - 20071019113642-7fe3f-c8866689793cf09636fb7ebba6b21c41d98b7f1d.gz - - src/salut-bytestream-manager.c | 1014 ++++++++++++++++++++++++++++++++++++++++ - src/salut-bytestream-manager.h | 82 ++++ - 2 files changed, 1096 insertions(+), 0 deletions(-) - -commit 5ba00fe40f0eb143cfdc4a45133bd0e0a3b13bcf -Author: Guillaume Desmottes -Date: Fri Oct 19 11:30:37 2007 +0000 - - build gibber-bytestream-oob - - - 20071019113037-7fe3f-80728e4ee6a1c2b23be7613e7f45fbccfb7de17e.gz - - lib/gibber/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit f499f1e7621dc03bc652151ef204cccaca20ecba -Author: Guillaume Desmottes -Date: Fri Oct 19 11:30:19 2007 +0000 - - add gibber-bytestream-oob.[ch] - - - 20071019113019-7fe3f-0a661f2c743da28a5aa97dfcbd495d7938b92b57.gz - - lib/gibber/gibber-bytestream-oob.c | 1070 ++++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-bytestream-oob.h | 63 +++ - 2 files changed, 1133 insertions(+), 0 deletions(-) - -commit 5f58d1537cd96cbfbed341fa85cd7b7787587c31 -Author: Guillaume Desmottes -Date: Fri Oct 19 10:40:49 2007 +0000 - - remove a test g_print - - - 20071019104049-7fe3f-7bef26a061c8576a64f386899e333c2670ccee1c.gz - - src/tube-stream.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 05bbe484030359f0da11a7d20bb714a0ab28c806 -Author: Guillaume Desmottes -Date: Fri Oct 19 09:58:39 2007 +0000 - - bytestream-ibb: add dispose_has_run - - - 20071019095839-7fe3f-3e5b7f02eb1c16d5a5db0e8b79c22192bc5102c4.gz - - lib/gibber/gibber-bytestream-ibb.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 9e23353cd450275d76485f2b0364fc83cb6ffdab -Author: Guillaume Desmottes -Date: Fri Oct 19 09:40:04 2007 +0000 - - build tube-stream - - - 20071019094004-7fe3f-1243004419464e3bf6b095e9f5bb713f1f832ea8.gz - - src/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 0bb4eaa6c3ec6d0d90335117282a453c38b7d6df -Author: Guillaume Desmottes -Date: Fri Oct 19 09:39:42 2007 +0000 - - add tube-stream.[ch] - - - 20071019093942-7fe3f-c0e4ec1162cc1e45a1dab4bd08d2d5204880e1f0.gz - - src/tube-stream.c | 1628 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/tube-stream.h | 73 +++ - 2 files changed, 1701 insertions(+), 0 deletions(-) - -commit 34f1a767f62a16c7b40c5e1ac7d38f447e7261e2 -Author: Guillaume Desmottes -Date: Fri Oct 19 09:21:50 2007 +0000 - - drop gibber_bytestream_iface_get_protocol. Use a property instead - - - 20071019092150-7fe3f-85006ae582b10866b3af5a7c7287ffb313f3152f.gz - - lib/gibber/gibber-bytestream-ibb.c | 18 ++++++------------ - lib/gibber/gibber-bytestream-iface.c | 20 +++++++++++--------- - lib/gibber/gibber-bytestream-iface.h | 4 ---- - lib/gibber/gibber-bytestream-muc.c | 26 ++++++-------------------- - 4 files changed, 23 insertions(+), 45 deletions(-) - -commit a9b8693b19cf44df554819305409295e24544b1c -Author: Guillaume Desmottes -Date: Fri Oct 19 09:05:38 2007 +0000 - - change bytestream_iface_accept API. The bytestream is now responsible of creating and sending the SI accept stanza - - - 20071019090538-7fe3f-163d1d18a4ec7fc548220af4a68a23db7765c57f.gz - - lib/gibber/gibber-bytestream-ibb.c | 46 ++++++++++++++++++++++++++------- - lib/gibber/gibber-bytestream-iface.c | 9 ++++-- - lib/gibber/gibber-bytestream-iface.h | 9 +++++- - lib/gibber/gibber-bytestream-muc.c | 4 ++- - 4 files changed, 52 insertions(+), 16 deletions(-) - -commit 55b9d2de0501f46fed0e1eed321a640595e3843c -Author: Guillaume Desmottes -Date: Wed Oct 17 15:00:21 2007 +0000 - - bytestream-ibb: properly decline bytestream if a GError is passed - - - 20071017150021-7fe3f-a30db1203825440fc212bf471c2bfa314d4deeea.gz - - lib/gibber/gibber-bytestream-ibb.c | 40 +++++++++++++---------------------- - 1 files changed, 15 insertions(+), 25 deletions(-) - -commit 52fd2f96c15a43704c6ed3c67c52c3e6ea08b7f9 -Author: Guillaume Desmottes -Date: Wed Oct 17 09:25:01 2007 +0000 - - bytestream-ibb: drop muc support - - - 20071017092501-7fe3f-553b85c6e50b47db1c729b051df61c05d7aa9b07.gz - - lib/gibber/gibber-bytestream-ibb.c | 188 +++++++++--------------------------- - 1 files changed, 46 insertions(+), 142 deletions(-) - -commit 69d6447f05648e8b75e707e0871f770878371a12 -Author: Guillaume Desmottes -Date: Wed Oct 17 08:52:46 2007 +0000 - - add a GError argument to gibber_bytestream_iface_close as in Gabble (not used yet) - - - 20071017085246-7fe3f-43bfb3bcea6dba70a39b42d74066141489663817.gz - - lib/gibber/gibber-bytestream-ibb.c | 49 +++++++++++++++++++-------------- - lib/gibber/gibber-bytestream-iface.c | 7 +++-- - lib/gibber/gibber-bytestream-iface.h | 22 ++++++--------- - lib/gibber/gibber-bytestream-muc.c | 5 ++- - src/tube-dbus.c | 6 ++-- - 5 files changed, 47 insertions(+), 42 deletions(-) - -commit ee111d80b4957be26cfbcbba4f9b2e5a68757d2f -Author: Guillaume Desmottes -Date: Tue Oct 16 15:55:36 2007 +0000 - - add salut_tubes_channel_bytestream_offered - - - 20071016155536-7fe3f-dc05f9bbb22b979499392e1d49eb47c254d37877.gz - - src/salut-tubes-channel.c | 86 +++++++++++++++++++++++++++++++++++++++++++++ - src/salut-tubes-channel.h | 4 ++ - 2 files changed, 90 insertions(+), 0 deletions(-) - -commit 2b28151d5afc17f475d05d977f7994900766b3cd -Author: Guillaume Desmottes -Date: Tue Oct 16 15:54:47 2007 +0000 - - add salut_muc_manager_handle_si_stream_request - - - 20071016155447-7fe3f-f9af504165d62bb1293afbd8a2fe19def7e969e7.gz - - src/salut-muc-manager.c | 31 +++++++++++++++++++++++++++++++ - src/salut-muc-manager.h | 6 ++++++ - 2 files changed, 37 insertions(+), 0 deletions(-) - -commit 5a1b6191026d9804673a1ea84cd1648c4283b00a -Author: Guillaume Desmottes -Date: Tue Oct 16 12:44:26 2007 +0000 - - tubes-channel: check if we have to publish the tube *before* adding the markup - - - 20071016124426-7fe3f-8fbe4532570fc6a938b55c318d7e21c52fedfcc8.gz - - src/salut-tubes-channel.c | 21 ++++++++++++--------- - 1 files changed, 12 insertions(+), 9 deletions(-) - -commit c2bba0f7bb856275d3dfc84e98cd2aca67961b2f -Author: Guillaume Desmottes -Date: Tue Oct 16 11:52:56 2007 +0000 - - salut-connection: instantiate the bytestream mgr - - - 20071016115256-7fe3f-c9d7ab25f90681f330735958f64fe6bb2595c53b.gz - - src/salut-connection.c | 28 ++++++++++++++++++++++++++++ - 1 files changed, 28 insertions(+), 0 deletions(-) - -commit 3c1dabc840c0246ba585afda98d399e605f4aa3d -Author: Guillaume Desmottes -Date: Tue Oct 16 11:52:30 2007 +0000 - - add bytestream-manager debug flag - - - 20071016115230-7fe3f-b7bce34bb06d1c53d39d3f14a4a4b7b518f84cba.gz - - src/debug.c | 1 + - src/debug.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit 03755c53b6dd4ac954515f600f84a0864bbfd12c -Author: Guillaume Desmottes -Date: Tue Oct 16 10:48:40 2007 +0000 - - tubes-channel: don't announce stream tubes we didn't initiate - - - 20071016104840-7fe3f-5d448cb9d247316489906d16d7b9950fffb1efcb.gz - - src/salut-tubes-channel.c | 11 +++++++++-- - 1 files changed, 9 insertions(+), 2 deletions(-) - -commit 02cb2ad8ade0bed8ae892daed7a46aed8b781022 -Author: Guillaume Desmottes -Date: Mon Oct 15 15:18:36 2007 +0000 - - implement AcceptStreamTube and GetStreamTubeSocketAddress - - - 20071015151836-7fe3f-cece3d11b3769666713d25c5bbbf4433d50f978b.gz - - src/salut-tubes-channel.c | 166 ++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 164 insertions(+), 2 deletions(-) - -commit 6404a27e9686954698c8ee4311323b58499d2467 -Author: Guillaume Desmottes -Date: Mon Oct 15 14:56:07 2007 +0000 - - tubes-channel: add unix and inet sockets in GetAvailableStreamTubeTypes result - - - 20071015145607-7fe3f-d33cf4317484f20557d1c7f61f811b0a77922223.gz - - src/salut-tubes-channel.c | 29 +++++++++++++++++++++++++++++ - 1 files changed, 29 insertions(+), 0 deletions(-) - -commit 48c2cc4c9d53174875a72279b42ff57c9e2604b4 -Author: Guillaume Desmottes -Date: Mon Oct 15 14:52:50 2007 +0000 - - tubes-channel: don't force the stream-id attribute in muc presence - - - 20071015145250-7fe3f-d655c7983b25475c3cfbf5f0ac90812449f3d1fd.gz - - src/salut-tubes-channel.c | 7 +------ - 1 files changed, 1 insertions(+), 6 deletions(-) - -commit c270503a095646e3cd837a24593beb0a134940b6 -Author: Guillaume Desmottes -Date: Mon Oct 15 14:42:24 2007 +0000 - - remove the offering parameter from extract_tube_information - - - 20071015144224-7fe3f-258f44e79311392101d96d519591a9f8c2034376.gz - - src/salut-tubes-channel.c | 19 +++---------------- - 1 files changed, 3 insertions(+), 16 deletions(-) - -commit ea33bcba076a4449eb4d1e59b45a3a78dae40bc9 -Author: Guillaume Desmottes -Date: Mon Oct 15 14:35:15 2007 +0000 - - start to implement OfferStreamTube (muc only for now) - - - 20071015143515-7fe3f-18b4db4afde8f38a8c8d7e548a15fa57f76d9c01.gz - - src/salut-tubes-channel.c | 173 ++++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 163 insertions(+), 10 deletions(-) - -commit 62b5a80bbcc0283f7ec3aa7215696a39d97fc2aa -Author: Guillaume Desmottes -Date: Mon Oct 15 12:14:11 2007 +0000 - - tubes-channel: add stream tubes in GetAvailableStreamTubeTypes result - - - 20071015121411-7fe3f-70ca6dc6507d00230c7edcb6a5411c81b26ed03d.gz - - src/salut-tubes-channel.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 50520b85ccc2a526cb3d2ec791bd897e116c7caf -Author: Guillaume Desmottes -Date: Thu Oct 25 11:46:47 2007 +0000 - - gibber-muc-connection.c: gibber_muc_connection_new_stream: make code easier to read and add a comment - - - 20071025114647-7fe3f-874bd63d843643779f5665c0c6490a114455686b.gz - - lib/gibber/gibber-muc-connection.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -commit e007edfa531bbebd96215327ac82467a6684ecfc -Author: Guillaume Desmottes -Date: Thu Oct 25 11:40:22 2007 +0000 - - gibber-muc-connection: fix a typo in comment - - - 20071025114022-7fe3f-4a2fc96db529da5a8e4ee6a0d8a8359c756afa88.gz - - lib/gibber/gibber-muc-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b100b7da800660849a507400c08cfb3fa0191988 -Author: Guillaume Desmottes -Date: Thu Oct 25 10:03:59 2007 +0000 - - call gibber_muc_connection_new_stream the first time get_property("stream-id") or gibber_bytestream_muc_send is called - - - 20071025100359-7fe3f-8c7461d6a6bb35aefeb71473cef76234c0ebc308.gz - - lib/gibber/gibber-bytestream-muc.c | 40 ++++++++++++++++++++++++++++++----- - 1 files changed, 34 insertions(+), 6 deletions(-) - -commit f09dd35597171a21b76e940dc5fafa68e99293b1 -Author: Guillaume Desmottes -Date: Thu Oct 25 09:17:54 2007 +0000 - - tubes-channel: remove generate_stream_id - - - 20071025091754-7fe3f-60a5c390e9fa7caad8ec51db5e4e51135abaa077.gz - - src/salut-tubes-channel.c | 21 --------------------- - 1 files changed, 0 insertions(+), 21 deletions(-) - -commit 3fb25110d3f7dd3950d423fcc5041fd2964758dc -Author: Guillaume Desmottes -Date: Thu Oct 25 09:15:57 2007 +0000 - - tubes-channel: remove the stream-id arg from create_new_tube - - - 20071025091557-7fe3f-be9f710aea987c5700028bef5024e9b3c6650b4f.gz - - src/salut-tubes-channel.c | 13 +++---------- - 1 files changed, 3 insertions(+), 10 deletions(-) - -commit f41aa253fd224853340169cd63c55103f0c2a7c3 -Author: Guillaume Desmottes -Date: Thu Oct 25 09:10:34 2007 +0000 - - use gibber_muc_connection_new_stream to allocate the stream used with D-Bus tubes - - - 20071025091034-7fe3f-61dd210e04e0131b7f6a7606e301e78b2d4ff966.gz - - lib/gibber/gibber-bytestream-muc.c | 8 ++++++-- - src/salut-tubes-channel.c | 3 ++- - src/tube-dbus.c | 13 +++---------- - src/tube-dbus.h | 4 ++-- - 4 files changed, 13 insertions(+), 15 deletions(-) - -commit ace98cb4e13fb5ae6fbecd91f700704214d9bc10 -Author: Guillaume Desmottes -Date: Thu Oct 25 09:05:56 2007 +0000 - - add gibber_muc_connection_new_stream and gibber_muc_connection_free_stream - - - 20071025090556-7fe3f-3abb0982a77abfd8124abde2c4110406521a8fba.gz - - lib/gibber/gibber-muc-connection.c | 73 ++++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-muc-connection.h | 5 ++ - 2 files changed, 78 insertions(+), 0 deletions(-) - -commit fafbe7e66232bd2347c888a3a66239e87816e954 -Author: Guillaume Desmottes -Date: Wed Oct 24 14:18:23 2007 +0000 - - muc stream-id are now guint16 - - - 20071024141823-7fe3f-660fda7ce7652149e0e371f564b4f9b9ac4a10d3.gz - - lib/gibber/gibber-bytestream-muc.c | 8 ++++---- - lib/gibber/gibber-bytestream-muc.h | 2 +- - src/salut-tubes-channel.c | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -commit e651c1ab92bb67974d2a361a1bca91c2b7eaaa36 -Author: Guillaume Desmottes -Date: Wed Oct 24 14:09:00 2007 +0000 - - tubes-channel: use new-senders and lost-senders instead of new-sender and lost-sender - - - 20071024140900-7fe3f-8fe05b87f57120950d9b4b824ccbeb4764c55fa4.gz - - src/salut-tubes-channel.c | 74 +++++++++++++++++++++++++-------------------- - 1 files changed, 41 insertions(+), 33 deletions(-) - -commit fee21591fb8f61acbe36afd9b40505787629edbe -Author: Guillaume Desmottes -Date: Wed Oct 24 13:49:10 2007 +0000 - - fix conflict with sjoerd-new-protocol - - - 20071024134910-7fe3f-024bc354359894d206ecdd10a0593cb27be72e4b.gz - - lib/gibber/gibber-bytestream-muc.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit d90a418c1235387cc74870279f4730119307924e -Author: Guillaume Desmottes -Date: Wed Oct 24 13:19:04 2007 +0000 - - tubes-channel: update muc-bytestream's sender <-> stream-id mapping - - - 20071024131904-7fe3f-1a594eb82ce94ecb6f7e21d4ecaec233e1154c2e.gz - - src/salut-tubes-channel.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 45 insertions(+), 0 deletions(-) - -commit 5bd58e6073275a3d0d2f700a156f09ab07014796 -Author: Guillaume Desmottes -Date: Wed Oct 24 13:15:26 2007 +0000 - - bytestream-muc: allow each sender to use his own stream id - - - 20071024131526-7fe3f-4187f8aabb8534ae5b4c1755cf80e68baec6be8f.gz - - lib/gibber/gibber-bytestream-muc.c | 34 +++++++++++++++++++++++++++++----- - lib/gibber/gibber-bytestream-muc.h | 6 ++++++ - 2 files changed, 35 insertions(+), 5 deletions(-) - -commit 67baf01677049eab9dddeb8785356a9281246d52 -Author: Sjoerd Simons -Date: Mon Nov 5 17:39:54 2007 +0000 - - SalutMucChannel: Let the debug info output which sender is unknown - - - 20071105173954-93b9a-4cc06f504a5084175b6a3c5a8b4ad6e195629b28.gz - - src/salut-muc-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6dc3ca9fc9f8aff14606bdd5a9f4b5f8fcd5db65 -Author: Sjoerd Simons -Date: Mon Nov 5 17:34:59 2007 +0000 - - GibberRMulticastSender: Use guint's to iterate through GArray's - - - 20071105173459-93b9a-521440eac5105fcad06bc271ab8d479a787cdc2e.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 628e8323cfe5728fe8001da0f8c7d39a2b051772 -Author: Sjoerd Simons -Date: Mon Nov 5 17:34:32 2007 +0000 - - GibberRMulticastSender: Document the contents of hash tables and queue's - - - 20071105173432-93b9a-c01583b7f4ef68f2f96a909bfca4ff72848c82eb.gz - - lib/gibber/gibber-r-multicast-sender.c | 3 ++- - lib/gibber/gibber-r-multicast-sender.h | 6 ++++-- - 2 files changed, 6 insertions(+), 3 deletions(-) - -commit 35d7c414bb08a51f7d0da218bcf9d20b0ac38135 -Author: Sjoerd Simons -Date: Mon Nov 5 17:33:45 2007 +0000 - - GibberRMulticastTransport: Use guint's to iterate through GArray's - - - 20071105173345-93b9a-63a1fa64f7e2c55a62bedd33621a4ed0d7e36ff7.gz - - lib/gibber/gibber-r-multicast-transport.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit 0900b8bbb92d061861073db8f7e87467237a60e5 -Author: Sjoerd Simons -Date: Mon Nov 5 17:11:41 2007 +0000 - - GibberRMulticastPacket: Little style tweak - - - 20071105171141-93b9a-e3ed2a3bccd23060b84d4092293efa3132fb49c7.gz - - lib/gibber/gibber-r-multicast-packet.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 8f3de31fa1757c717516ccbaf3acdf0c8bf214f1 -Author: Sjoerd Simons -Date: Mon Nov 5 17:11:29 2007 +0000 - - GibberRMulticastPacket: Use guint instead of int for iterating - - - 20071105171129-93b9a-9b5fd062c1bf7935af9491ec3e50ed61524d938b.gz - - lib/gibber/gibber-r-multicast-packet.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f0d3b9aa13ffffa10788a4c1e8e567e198e315c5 -Author: Sjoerd Simons -Date: Mon Nov 5 17:09:29 2007 +0000 - - GibberMucConnection: Remove trailing spaces - - - 20071105170929-93b9a-0484210e19e1a54c4fcbc7e4b98082377efb56ff.gz - - lib/gibber/gibber-muc-connection.c | 66 ++++++++++++++++++------------------ - 1 files changed, 33 insertions(+), 33 deletions(-) - -commit 96fa4aaa4485ed45aff15f8a57e3bc1b2d65d849 -Author: Sjoerd Simons -Date: Mon Nov 5 17:07:30 2007 +0000 - - GibberMucConnection: Document the signal parameters that don't have specific types - - - 20071105170730-93b9a-bc9fe2c7777b50438048e0abba67d88611e7d72d.gz - - lib/gibber/gibber-muc-connection.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit 75f2b0a922fc975054710066d1036d514644f2c5 -Author: Sjoerd Simons -Date: Mon Nov 5 17:01:05 2007 +0000 - - GibberRMulticastCausalTransport: Remove some vestigial cose - - - 20071105170105-93b9a-832b1fb4c27e3f891b0d79f8ed680c093e8b3c39.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 20 +++----------------- - 1 files changed, 3 insertions(+), 17 deletions(-) - -commit 875702a4553497517b6236bd7236daa5147d56fa -Author: Sjoerd Simons -Date: Mon Nov 5 16:55:22 2007 +0000 - - GibberMucConnection: Add an explenation why 239.255.71.0/24 is used for clique multicast groups - - - 20071105165522-93b9a-6f44858c0626d2f2d5d4b474cb019e19ca3f1266.gz - - lib/gibber/gibber-muc-connection.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 25113c110365d268314b5b5647b740f2ddf66c23 -Author: Sjoerd Simons -Date: Fri Nov 2 20:41:19 2007 +0000 - - Assign a default stream id to shut up gcc - - - 20071102204119-93b9a-c0c74d7bde066b34622ba61d3bb2e88db29382c1.gz - - tests/check-gibber-r-multicast-sender.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 464d362a3c13c68ee1ff213286609c210bcf7eb1 -Author: Sjoerd Simons -Date: Fri Nov 2 17:05:38 2007 +0000 - - GibberRMulticastSender: Don't use g_queue_clear, it's not defined in glib 2.12 - - - 20071102170538-b58c9-b0fa29184a457a068720f7428fadaa55ac10bd02.gz - - lib/gibber/gibber-r-multicast-sender.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 4ff21a280446ff8bba4abce1d88b60ad2b8c4284 -Author: Sjoerd Simons -Date: Fri Nov 2 16:57:43 2007 +0000 - - Cast values gotten from g_value_dup_object - - - 20071102165743-b58c9-1974d7308f434713fcccee09a87dba9de54ec317.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 2 +- - lib/gibber/gibber-r-multicast-transport.c | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -commit 0a809fe6aad7abd32b8c15e9d39ebe491de7a39f -Author: Guillaume Desmottes -Date: Fri Nov 2 16:22:10 2007 +0000 - - gibber-r-multicast-transport.c: fix GArray leak in recheck_failures - - - 20071102162210-7fe3f-41e19aa5d362973cdb1c340806f51880411b54fc.gz - - lib/gibber/gibber-r-multicast-transport.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit bb661ba7635d3b140a2951ed826017d9f96aaab8 -Author: Sjoerd Simons -Date: Fri Nov 2 16:35:42 2007 +0000 - - GibberMucConnection: Use a block from the ipv4 local scope multicast addresses range - - - 20071102163542-b58c9-ec086ec656adef85dd5751c1e2f4d23011b4e48c.gz - - lib/gibber/gibber-muc-connection.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit 08a8e318ee956851b09e1c3dec0dcc3cdfa63aa1 -Author: Sjoerd Simons -Date: Fri Nov 2 16:34:20 2007 +0000 - - GibberRMulticastPacket: Fix a little style issue - - - 20071102163420-b58c9-07bfd26f89446b8d6445bf2c75946d442b6e24dd.gz - - lib/gibber/gibber-r-multicast-packet.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e7e169151749b2c18da94cf3215db41819ad609e -Author: Guillaume Desmottes -Date: Fri Nov 2 15:59:49 2007 +0000 - - gibber-r-multicast-causal-transport.c: fix packet leak in gibber_r_multicast_causal_transport_send_failure - - - 20071102155949-7fe3f-7639d7b374eab5ddd9150b498a6eb480b149464e.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit b558c29f0ac5bc8e057da6c921dfc6c9aa81e10c -Author: Guillaume Desmottes -Date: Fri Nov 2 15:57:07 2007 +0000 - - gibber-r-multicast-causal-transport.c: fix packet leak in send_keepalive_cb - - - 20071102155707-7fe3f-8dfe5bf5a6babac42085e3a05b2364cbf412fdb2.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 1b5cebe20377c67a0b0b4b77edee5dc345eba7d0 -Author: Sjoerd Simons -Date: Fri Nov 2 16:05:35 2007 +0000 - - GibberRMulticastPacket: Bump the version to 1! - - - 20071102160535-b58c9-6b4587eee7c502a1ab2697fcc96db6d6758e3f69.gz - - lib/gibber/gibber-r-multicast-packet.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 2e257cdd8a26126321bc6cb9626fcbe54b7a2d1b -Author: Sjoerd Simons -Date: Fri Nov 2 16:05:05 2007 +0000 - - GibberRMulticastPacket: Reorder some fields to have a nicer alignment in some cases - - - 20071102160505-b58c9-0406bf03425632557f55c84fffef294b58f52c3d.gz - - lib/gibber/gibber-r-multicast-packet.c | 11 +++++++---- - 1 files changed, 7 insertions(+), 4 deletions(-) - -commit f171c3a7a107ce38e0c7b99e6cd386630b5b318f -Author: Sjoerd Simons -Date: Fri Nov 2 16:03:55 2007 +0000 - - GibberRMulticastPacket: Add Clique prefix to each packet - - - 20071102160355-b58c9-bf26b8e24774564a2717b6f9a8dbd47ae14bb659.gz - - lib/gibber/gibber-r-multicast-packet.c | 59 +++++++++++++++++++++++++++----- - tests/mesh.py | 2 +- - 2 files changed, 51 insertions(+), 10 deletions(-) - -commit 5c0b295ddcbfd52f170c841484f435ec3f8ea024 -Author: Sjoerd Simons -Date: Fri Nov 2 14:59:46 2007 +0000 - - Rename IS_RELIABLE_PACKET to GIBBER_R_MULTICAST_PACKET_IS_RELIABLE_PACKET - - - 20071102145946-b58c9-4593e35f0e2cbd44ac5cd6e7c4c10632725f570e.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 6 +++--- - lib/gibber/gibber-r-multicast-packet.c | 11 ++++++----- - lib/gibber/gibber-r-multicast-packet.h | 3 ++- - lib/gibber/gibber-r-multicast-sender.c | 4 ++-- - lib/gibber/gibber-r-multicast-transport.c | 3 ++- - 5 files changed, 15 insertions(+), 12 deletions(-) - -commit 1c2ba0c2acf1746ed061f878567c76f98450ee5e -Author: Sjoerd Simons -Date: Fri Nov 2 14:07:45 2007 +0000 - - check-gibber-r-multicast-packet: Assert that packet parsing succeeds and check some extra fields - - - 20071102140745-b58c9-03b4c1de940d013bd728f3965bb3fd1fbcd60c1f.gz - - tests/check-gibber-r-multicast-packet.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit fb9588ee4a53fd86640bc3bc83be4d22a81bfc09 -Author: Sjoerd Simons -Date: Fri Nov 2 14:06:59 2007 +0000 - - check-gibber-r-multicast-causal-transport.c: Assert that the packet parsing succeeds - - - 20071102140659-b58c9-cc10ed9252f6e0af47edd2cf69887442215f1a51.gz - - tests/check-gibber-r-multicast-causal-transport.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit c00ad8e3921cccd8e7c254520d631aefcdec2a22 -Author: Guillaume Desmottes -Date: Fri Nov 2 13:31:14 2007 +0000 - - salut-muc-manager.c: fix string leaks in browser_removed - - - 20071102133114-7fe3f-5405a7ee37f5eaa9c6bd62a92574f5af9160ea64.gz - - src/salut-muc-manager.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 50d98d65bdeb70f2488529013a9b6b316023dc4d -Author: Guillaume Desmottes -Date: Fri Nov 2 13:14:06 2007 +0000 - - gibber-r-multicast-causal-transport.c: fix packet leak in gibber_r_multicast_causal_transport_send_join - - - 20071102131406-7fe3f-551a1a98fff08fe2f28804598f94b33514263d33.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 3a07373c7ca91171702833ec99d5f9a25aae671d -Author: Guillaume Desmottes -Date: Fri Nov 2 13:13:06 2007 +0000 - - gibber-r-multicast-causal-transport.c: fix packet leak in gibber_r_multicast_causal_transport_send_attempt_join - - - 20071102131306-7fe3f-8d180fc7c845ca9e3f3ef2d8e8fce5ca4b508aa1.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit e32110d0f2da2a73e8fe86bf9b144edc7ba22715 -Author: Guillaume Desmottes -Date: Fri Nov 2 13:10:41 2007 +0000 - - gibber-r-multicast-sender.c: fix a GArray leak in gibber_r_multicast_sender_group_gc - - - 20071102131041-7fe3f-c9e70195eb36ae6d4dbde1cb60045b1f23db5161.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 59fc6993985814621bc6ff4663b6fba545fdce22 -Author: Sjoerd Simons -Date: Fri Nov 2 14:04:36 2007 +0000 - - GibberRMulticastPacket: When packet parsing fails, dont assert but return an error - - - 20071102140436-b58c9-ef83c853c9f795d0142dd880d35e580b3a7d2fd0.gz - - lib/gibber/gibber-r-multicast-packet.c | 131 +++++++++++++++++++++++-------- - lib/gibber/gibber-r-multicast-packet.h | 8 ++ - 2 files changed, 105 insertions(+), 34 deletions(-) - -commit 59be5ec6fd4fcd7c921706228331a5c5f576507e -Author: Sjoerd Simons -Date: Fri Nov 2 12:10:35 2007 +0000 - - GibberRMulticastTransport: Actually store the keepalive timer in the keepalive_timer variable - - - 20071102121035-b58c9-4d6549ef5e4d226496ebe7eb92408f1acc6f7dbe.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 473d7f3fb2600732ed2e812c36f982c5dfd16a8d -Author: Sjoerd Simons -Date: Fri Nov 2 11:53:16 2007 +0000 - - GibberRMulticastTransport: Fail nodes if they didn't take part in the join or failure process in time - - - 20071102115316-b58c9-5d742fa46e2c2eb379a7e9255588cf7286ffdc56.gz - - lib/gibber/gibber-r-multicast-transport.c | 218 ++++++++++++++++++++++++----- - 1 files changed, 184 insertions(+), 34 deletions(-) - -commit e30a12a938fda334a4828fdef902376eb8bdcda6 -Author: Sjoerd Simons -Date: Fri Nov 2 11:51:39 2007 +0000 - - GibberRMulticastCausalTransport: Stop the complete sender group instead of just the senders - - - 20071102115139-b58c9-97dd2c7f1eb9ac49c81d2abbfc52f184ef75e35f.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 11 +---------- - 1 files changed, 1 insertions(+), 10 deletions(-) - -commit 7b64675b75f5ae5525abea8cfeef9e323f7d9674 -Author: Sjoerd Simons -Date: Fri Nov 2 11:50:50 2007 +0000 - - GibberRMulticastSender: Add api to stuff the full sender group from popping - - - 20071102115050-b58c9-9906d095f3b1d28eb4cd346ff11c94c075be12e1.gz - - lib/gibber/gibber-r-multicast-sender.c | 21 +++++++++++++++++++++ - lib/gibber/gibber-r-multicast-sender.h | 2 ++ - 2 files changed, 23 insertions(+), 0 deletions(-) - -commit 2444210cd3cdcbdffee37da4fe095f3b8ea99b6a -Author: Sjoerd Simons -Date: Thu Nov 1 15:02:47 2007 +0000 - - GibberRMulticastSender: Handle a sparse stream - - - 20071101150247-b58c9-34769de4296e1859a1a5d6d1f28d34156c4769b5.gz - - lib/gibber/gibber-r-multicast-sender.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit eef3ef8f54cc08a4ca9d2b0a085fca30196f88b0 -Author: Sjoerd Simons -Date: Thu Nov 1 14:59:40 2007 +0000 - - GibberRMulticastSender: Initialize stream_id as soonas we can - - - 20071101145940-b58c9-4033b3e00da5771ba977666985fbbed7dcdd9cf8.gz - - lib/gibber/gibber-r-multicast-sender.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 4998606edc5294611d07874777f52ba0785b64bf -Author: Sjoerd Simons -Date: Thu Nov 1 14:57:33 2007 +0000 - - GibberRMulticastSender: typo in variable naming - - - 20071101145733-b58c9-b154ba14476a97e47085bfdbf92e1822434a0f3a.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9bb58c017cb52ca4f7f20d77976e242bf7f9685a -Author: Sjoerd Simons -Date: Thu Nov 1 14:54:56 2007 +0000 - - GibberRMulticastSender: Don't restart progress timer if the sender already failed - - - 20071101145456-b58c9-23a84ace47ec08af32e90b79fa4a86fda3767bb7.gz - - lib/gibber/gibber-r-multicast-sender.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 7c918971b733d568937af650eb1f4366f0467106 -Author: Sjoerd Simons -Date: Thu Nov 1 14:11:04 2007 +0000 - - GibberRMulticastSender: Fail a node if we haven't seen any reliable packets from them for 5 minutes - - - 20071101141104-b58c9-853638ec4b91fd05a1aa4209e29954d306db873e.gz - - lib/gibber/gibber-r-multicast-sender.c | 58 +++++++++++++++++++++++++++++--- - 1 files changed, 53 insertions(+), 5 deletions(-) - -commit 50aee55fcc21e7132d37bacf83b6168c5c636302 -Author: Sjoerd Simons -Date: Thu Nov 1 14:10:06 2007 +0000 - - GibberRMulticastCausalTransport: Ensure that at least every three minutes a reliable packet with depends is send - - - 20071101141006-b58c9-c9b2e1b10d32cec7263b21fe8f6eee70c7d9fd5f.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 64 +++++++++++++++++++++- - 1 files changed, 63 insertions(+), 1 deletions(-) - -commit 817b18d06615d73d332ca4186b7ba6b168d7c9c8 -Author: Sjoerd Simons -Date: Thu Nov 1 14:09:07 2007 +0000 - - GibberRMulticastPacket: Suppor NO_DATA packages - - - 20071101140907-b58c9-8a542079090164350c888157d0470a43b25a4f27.gz - - lib/gibber/gibber-r-multicast-packet.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit f052aee85b106736c8804f4ea9ea51f3f2c14df5 -Author: Sjoerd Simons -Date: Thu Nov 1 10:30:42 2007 +0000 - - GibberRMulticastSender: Free packets that both been acked by everyone and have been popped - - - 20071101103042-b58c9-8f1af37d0697aeb92594837bd9320f891c8767ae.gz - - lib/gibber/gibber-r-multicast-sender.c | 233 +++++++++++++++++++++++++++++++- - lib/gibber/gibber-r-multicast-sender.h | 6 + - 2 files changed, 234 insertions(+), 5 deletions(-) - -commit 7eba792d7d52efa1f708f692d67ae368d0906e6b -Author: Sjoerd Simons -Date: Wed Oct 31 14:50:04 2007 +0000 - - Use the new flags and size field of data packets - - - 20071031145004-b58c9-38ec6262fed3e3454b57d7f1636213e82d54bc2c.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 51 ++++-------- - lib/gibber/gibber-r-multicast-sender.c | 58 ++++++-------- - lib/gibber/gibber-r-multicast-transport.c | 2 +- - tests/check-gibber-r-multicast-packet.c | 8 +- - tests/check-gibber-r-multicast-sender.c | 97 +++++++++++++--------- - 5 files changed, 104 insertions(+), 112 deletions(-) - -commit 34a55380da49b791cf9035f6e8d601f4ad100f79 -Author: Sjoerd Simons -Date: Wed Oct 31 14:49:18 2007 +0000 - - GibberRMulticastPacket: Use flags and a size field instead of part/total for fragmentation - - - 20071031144918-b58c9-111ce1059b7130b91dd8dc174145317d45ef5d39.gz - - lib/gibber/gibber-r-multicast-packet.c | 52 ++++++++------------------------ - lib/gibber/gibber-r-multicast-packet.h | 9 ++++-- - 2 files changed, 19 insertions(+), 42 deletions(-) - -commit cf9ac9fd22b801f37cc691aba17ea3b0323ac62a -Author: Sjoerd Simons -Date: Tue Oct 30 15:40:39 2007 +0000 - - SalutMucChannel: Remove the self add timer when adding self to be sure we don't add ourselves twice - - - 20071030154039-b58c9-d2750e84d7245471424c05c4be39588645c18741.gz - - src/salut-muc-channel.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 9798692c19cc4be7e2eefd4c164a0e24aab010d0 -Author: Sjoerd Simons -Date: Tue Oct 30 15:40:01 2007 +0000 - - GibberRMulticastTransport: Fix some style issues and usage of the wrong variable - - - 20071030154001-b58c9-228c7d3abe20a157927820e4495357de89616f05.gz - - lib/gibber/gibber-r-multicast-transport.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit 49978801bac38025ce57906ed81b1263811e7a61 -Author: Sjoerd Simons -Date: Tue Oct 30 15:39:22 2007 +0000 - - GibberRMulticastPacket: Fix some style issues - - - 20071030153922-b58c9-7c033826d2ea1656e852af1f03569dc2d6543bfb.gz - - lib/gibber/gibber-r-multicast-packet.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 6224ab9037f3b394139199681a856dfd61f850ee -Author: Sjoerd Simons -Date: Tue Oct 30 15:38:55 2007 +0000 - - GibberRMulticastCausalTransort: Fix some style issues - - - 20071030153855-b58c9-0ba1893ab42648cd48a152f1ed5f3db819d37b72.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit dbe74fbc850cce291c8c762acbb0fba50aae9926 -Author: Sjoerd Simons -Date: Tue Oct 30 12:46:40 2007 +0000 - - GibberRMulticastCausalTransport: When short-circuiting the disconnect procedure.. Ensure that we don't have any stale timers - - - 20071030124640-b58c9-82a89d5304920192a17314f1a77aed6417e96560.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit fa41188d0d88d5c3a076c4c349ad6e969c7ad743 -Author: Sjoerd Simons -Date: Tue Oct 30 12:38:40 2007 +0000 - - GibberRMulticastTransport: When someone marks us as failed reset our connection to the group - - - 20071030123840-b58c9-3785b4dce39c9d1198fc31de9f2f19aae23a8ab9.gz - - lib/gibber/gibber-r-multicast-transport.c | 100 +++++++++++++++++++++++----- - 1 files changed, 82 insertions(+), 18 deletions(-) - -commit d41597cf733b4c164f6acba13b7f4c15aa91d793 -Author: Sjoerd Simons -Date: Tue Oct 30 12:37:23 2007 +0000 - - GibberRMulticastCausalTransport: Add support for resetting us (send byes, rejoin with a new id) - - - 20071030123723-b58c9-683080d4fbb39e7ef8854cca4ef54cbeb5c2130b.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 85 +++++++++++++++++++--- - lib/gibber/gibber-r-multicast-causal-transport.h | 5 +- - 2 files changed, 80 insertions(+), 10 deletions(-) - -commit d2b43f492b00fb8b7d983088cbd25d5d2bed5844 -Author: Sjoerd Simons -Date: Tue Oct 30 12:03:50 2007 +0000 - - GibberRMulticastSender: Whitespace fix - - - 20071030120350-b58c9-3b5495e35e18cf4bd5438a96a1ed39607698067f.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a8f3a56d653a3ef1d3ad5e3893d8b58e69b45b14 -Author: Sjoerd Simons -Date: Mon Oct 29 20:26:41 2007 +0000 - - GibberRMulticastTransport: Make sure that we don't allow to nodes in our group with the same name - - - 20071029202641-b58c9-b86272c94cebb51c8559464da348c844d3975ce4.gz - - lib/gibber/gibber-r-multicast-transport.c | 40 +++++++++++++++++++++++++++++ - 1 files changed, 40 insertions(+), 0 deletions(-) - -commit 600d641011623d3230eb9344620f4d2bcb79c250 -Author: Sjoerd Simons -Date: Mon Oct 29 19:30:07 2007 +0000 - - GibberRMulticastTransport: When a senders name isn't discovered when we start the join process, mark him as failed.. Also redo the join agreement checking to make it detect some cases better - - - 20071029193007-b58c9-e0ea69003c43e3fe740606fc08eca8a2a0bd2866.gz - - lib/gibber/gibber-r-multicast-transport.c | 59 +++++++++++++++++++++-------- - 1 files changed, 43 insertions(+), 16 deletions(-) - -commit 0d8305cb59771e97e97275b8382300200ef0e037 -Author: Sjoerd Simons -Date: Mon Oct 29 19:26:10 2007 +0000 - - GibberRMulticastTransport: When a sender signals failed, fail it. Also unify the failure handling more - - - 20071029192610-b58c9-2c223e8caadcbd1adf706c42b99802f602ea7aa8.gz - - lib/gibber/gibber-r-multicast-transport.c | 80 ++++++++++++++++++---------- - 1 files changed, 51 insertions(+), 29 deletions(-) - -commit 1959c79f42450dc89ad4294d47a649e628e824e3 -Author: Sjoerd Simons -Date: Mon Oct 29 19:22:00 2007 +0000 - - GibberRMulticastCausalTransport: Set are own data start right at the beginning - - - 20071029192200-b58c9-994d8a6c79805162cebf5ae3be080a3996ab9ec3.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 8d6b9a06744890864f4cec82315e855d3151df73 -Author: Sjoerd Simons -Date: Mon Oct 29 19:21:29 2007 +0000 - - GibberRMulticastCausalTransport: Proxy failed signals from senders - - - 20071029192129-b58c9-c24a91c24f218a445e198c787b00b689faa52c42.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 19 ++++++++++++++++--- - 1 files changed, 16 insertions(+), 3 deletions(-) - -commit f7bf666b8419fb73b86a974a748ad8ac3a887ee4 -Author: Sjoerd Simons -Date: Mon Oct 29 19:21:06 2007 +0000 - - GibberRMulticastCausalTransport: Don't add information about failed packages to depends or session packets - - - 20071029192106-b58c9-eee8f6e0ab630a075b33c1f35c0915153df1d96a.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 0c635d09ec2a46980b6152dbe8d3d93d8ff4b327 -Author: Sjoerd Simons -Date: Mon Oct 29 19:18:44 2007 +0000 - - GibberRMulticastCausalTransport: Ignore all our own packets. Letting WHOIS_REQUEST though isn't necessary anymore since the requested id has moved to it's own field - - - 20071029191844-b58c9-f82d2483bebd32423e0eb6bf2cffb4acc982cddc.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 75c64905520ab78afcf7db75e0df355744e5fa4a -Author: Sjoerd Simons -Date: Mon Oct 29 19:17:48 2007 +0000 - - GibberRMulticastSender: If we're adding everyone to the pop queue, first clear it - - - 20071029191748-b58c9-9d0fe35f84165f2fe805bc3256f475cb4b24414b.gz - - lib/gibber/gibber-r-multicast-sender.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit b0ffe09c8ff3bae4d52324ed1319021e2295cd98 -Author: Sjoerd Simons -Date: Mon Oct 29 19:14:02 2007 +0000 - - GibberRMulticastSender: Add some extra debugging information - - - 20071029191402-b58c9-14fb8e80b4820563680a1b6cb860d71a917ed8cb.gz - - lib/gibber/gibber-r-multicast-sender.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit a04f03cee79aa4fd99d410872fa450caaefe7542 -Author: Sjoerd Simons -Date: Mon Oct 29 19:12:29 2007 +0000 - - GibberRMulticastSender: When a sender requests it's packets being popped, while we're already popping. Add it to the pop_queue if it's not in yet - - - 20071029191229-b58c9-38c22de7f682962f04309a271f68159a3565cc69.gz - - lib/gibber/gibber-r-multicast-sender.c | 27 +++++++++++++++++++-------- - 1 files changed, 19 insertions(+), 8 deletions(-) - -commit f7b149dc404470dd130a3b43677cb102c0930c5d -Author: Sjoerd Simons -Date: Mon Oct 29 19:11:00 2007 +0000 - - GibberRMulticastSender: Let state changing be done by a function asserting state never goes backwards - - - 20071029191100-b58c9-cb69720c2373647ed9c392f8dddeab07857e4c91.gz - - lib/gibber/gibber-r-multicast-sender.c | 19 +++++++++++++++---- - 1 files changed, 15 insertions(+), 4 deletions(-) - -commit cb7287fc29d37e889b89b1858491e4ff43b5e07c -Author: Sjoerd Simons -Date: Mon Oct 29 19:09:43 2007 +0000 - - GibberRMulticastSender: Add a seperate failure mode for failed node of which we have no info at all - - - 20071029190943-b58c9-844767308bcf52c959084930b2c5afba8c1f7630.gz - - lib/gibber/gibber-r-multicast-sender.c | 43 ++++++++++++++++++++++++++------ - lib/gibber/gibber-r-multicast-sender.h | 1 + - 2 files changed, 36 insertions(+), 8 deletions(-) - -commit af733e926ea867cb9803ed662e6b425ba5ca33e7 -Author: Sjoerd Simons -Date: Mon Oct 29 19:07:20 2007 +0000 - - GibberRMulticastSender: Do a short timeout for the first whois request and longer ones for repeating requests. Also start a failure timer when doing a whois request for the first time and signal sender failure if the name isn't discovered in time - - - 20071029190720-b58c9-895116114ad02d8d31e58779d269c8049093655f.gz - - lib/gibber/gibber-r-multicast-sender.c | 124 +++++++++++++++++++++++++++----- - 1 files changed, 107 insertions(+), 17 deletions(-) - -commit 050a0a92f2bae354960f586acbbce29ba11f9950 -Author: Sjoerd Simons -Date: Mon Oct 29 19:05:15 2007 +0000 - - GibberRMulticastSender: Add fail signal - - - 20071029190515-b58c9-9477ddc1328a861702d51eabb5284ad141ffc261.gz - - lib/gibber/gibber-r-multicast-sender.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 8d653e66c655ff281a0311cbce91779650d921e4 -Author: Sjoerd Simons -Date: Mon Oct 29 18:51:40 2007 +0000 - - failnamemeshtest: Add a simulation for the case that the name of certain node can't be discovered by others - - - 20071029185140-b58c9-a66c767aecddc84dae8b9083cdcdb07d8ff3a919.gz - - tests/failnamemeshtest.py | 118 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 118 insertions(+), 0 deletions(-) - -commit 23f8ca7e639d9533d3905ae61dac1d624bd56dff -Author: Sjoerd Simons -Date: Fri Oct 26 13:43:46 2007 +0000 - - When the causal multicast transport is disconnecting stop all sender timers - - - 20071026134346-b58c9-e942a2dff43e75138a9c6ec7b6e1bc3519e026f4.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 12 +++++++++ - lib/gibber/gibber-r-multicast-sender.c | 27 ++++++++++++++++++++++ - lib/gibber/gibber-r-multicast-sender.h | 3 ++ - 3 files changed, 42 insertions(+), 0 deletions(-) - -commit 3394d73c6bedd0c4f4bdac069a7d164489f44c3c -Author: Sjoerd Simons -Date: Fri Oct 26 13:42:37 2007 +0000 - - GibberRMulticastTransport: Now really mark the right member as failed - - - 20071026134237-b58c9-e57c41af25c5ccab62226ad88bd85a9477580b97.gz - - lib/gibber/gibber-r-multicast-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 879d137a5a360f65c774a974aee03950eb0bbe7b -Author: Sjoerd Simons -Date: Fri Oct 26 13:13:16 2007 +0000 - - Print which node actually cause the error - - - 20071026131316-b58c9-a29c6910855b011ba031b461a70f5e40e2ac2cfe.gz - - tests/mesh.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3a8ef7ebe0cc84cb6a251fe2ee4d85e42d9e40b6 -Author: Sjoerd Simons -Date: Fri Oct 26 13:12:47 2007 +0000 - - check-gibber-r-multicast-sender: Port to the sender group concept and add some test for marking senders as failures - - - 20071026131247-b58c9-2f7f046150837357cd0539e20ea4653be45cf81c.gz - - tests/check-gibber-r-multicast-sender.c | 93 ++++++++++++++++++++++-------- - 1 files changed, 68 insertions(+), 25 deletions(-) - -commit b96646999baa9f5e1eb953c398d6278a8f9421a8 -Author: Sjoerd Simons -Date: Fri Oct 26 13:12:07 2007 +0000 - - GibberRMulticastTransport: Whitespace fixes - - - 20071026131207-b58c9-851cc22757846b634dff32a5244db300c25c02e8.gz - - lib/gibber/gibber-r-multicast-transport.c | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -commit a68388ec74a928eae118e5239ba242f3ff8df2f0 -Author: Sjoerd Simons -Date: Fri Oct 26 13:11:40 2007 +0000 - - GibberRMulticastTransport: Add failures failed by a join message to pending failures. And clean up pending failures when sending them as failures in a join. Also set nodes as failed as soon as we announce them as being a failure - - - 20071026131140-b58c9-bd091267da9e32b9e899809b6cc9a4ec325f8689.gz - - lib/gibber/gibber-r-multicast-transport.c | 32 +++++++++++++++++++++++++--- - 1 files changed, 28 insertions(+), 4 deletions(-) - -commit d87b8fbd99891e1f4270e949695c691a472966bf -Author: Sjoerd Simons -Date: Fri Oct 26 13:09:46 2007 +0000 - - GibberRMulticastTransport: Set the right member to failed - - - 20071026130946-b58c9-0101eb10e3756a4f2fc84ab6d8ab7ac0910a6974.gz - - lib/gibber/gibber-r-multicast-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 7797e1f7e8fb6a4e19a14a7ea34ad590d49cc357 -Author: Sjoerd Simons -Date: Fri Oct 26 13:06:50 2007 +0000 - - GibberRMulticastCausalTransport: Ignore repair requst for unknown senders - - - 20071026130650-b58c9-fc68b9f67c93ef68c1129ab7fcd9293e7c9bfcb2.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 12 +++++++++--- - 1 files changed, 9 insertions(+), 3 deletions(-) - -commit f8533614ed295380c09e9745ec84e04cf3e4d626 -Author: Sjoerd Simons -Date: Fri Oct 26 13:05:42 2007 +0000 - - GibberRMulticastSender: Add a failure and endpoint. Packets after the failure point will only be popped if their explicitely requisted (by depends from others) - - - 20071026130542-b58c9-a43c87ccf6a24532f775bf764915c17beaac09e8.gz - - lib/gibber/gibber-r-multicast-sender.c | 60 ++++++++++++++++++++++++++++---- - lib/gibber/gibber-r-multicast-sender.h | 5 +++ - 2 files changed, 58 insertions(+), 7 deletions(-) - -commit 5e1b7b3b5adfe112e5b4d8ef31dd0995a21627fe -Author: Sjoerd Simons -Date: Fri Oct 26 12:50:30 2007 +0000 - - GibberRMulticastCausalTransport: Port to using sender groups - - - 20071026125030-b58c9-33e5f2c09b8a683fefe543670296129d11081f1b.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 63 +++++++++++----------- - 1 files changed, 31 insertions(+), 32 deletions(-) - -commit 02de0281012b67232f0ef15b8a42db0b5c17a8cf -Author: Sjoerd Simons -Date: Fri Oct 26 12:47:01 2007 +0000 - - GibberRMulticastSender: Introduce the concept of a sender group and use that to ensure that no packets are popped while a pop callback is running - - - 20071026124701-b58c9-60973e566831daddac97a1f35192ba4413114e11.gz - - lib/gibber/gibber-r-multicast-sender.c | 158 ++++++++++++++++++++++---------- - lib/gibber/gibber-r-multicast-sender.h | 25 +++++- - 2 files changed, 135 insertions(+), 48 deletions(-) - -commit c036df28fcab0939f850ac2d703bd14f532eaa11 -Author: Sjoerd Simons -Date: Wed Oct 24 11:52:40 2007 +0000 - - check-gibber-r-multicast-sender: Add some extra tests and adapt to the senders set_data_start functionality - - - 20071024115240-b58c9-45b5c778c2ac660bb5287eff3977b8df8027002f.gz - - tests/check-gibber-r-multicast-sender.c | 37 ++++++++++++++++++++++++++++++- - 1 files changed, 36 insertions(+), 1 deletions(-) - -commit a31e1b5a2dec7bb6a8f57951987b33983c4abaa0 -Author: Sjoerd Simons -Date: Wed Oct 24 11:51:46 2007 +0000 - - GibberRMulticastTransport: Simplefy some code by calling GibberRMultiCastSender functions directly if we have the sender anyway - - - 20071024115146-b58c9-812f2aa0ab6331cbf8e015aa9a3d7e6b551cea9a.gz - - lib/gibber/gibber-r-multicast-transport.c | 10 ++++------ - 1 files changed, 4 insertions(+), 6 deletions(-) - -commit ce6df5aedd3511712e6bffaee8c37ab40bc9ca68 -Author: Sjoerd Simons -Date: Wed Oct 24 11:51:06 2007 +0000 - - GibberRMulticastTransport: data_received can now assert that it will only ever get data from members - - - 20071024115106-b58c9-0c2f87c31f23a5eda3eb5606f61c4e3341d17935.gz - - lib/gibber/gibber-r-multicast-transport.c | 9 ++++----- - 1 files changed, 4 insertions(+), 5 deletions(-) - -commit b8b0ed0f11c0252d256ba799daeaf2349b914107 -Author: Sjoerd Simons -Date: Wed Oct 24 11:49:39 2007 +0000 - - GibberRMulticastTransport: Record the packet_id of the last join packet of each node and set the data start to that if they become new members - - - 20071024114939-b58c9-2ebb237920c4ba81b07d14accc0f115543afbd4f.gz - - lib/gibber/gibber-r-multicast-transport.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit 16601caa60720ebccb49eed48aa7d84368c90371 -Author: Sjoerd Simons -Date: Wed Oct 24 11:46:01 2007 +0000 - - GibberRMulticastSender: Let gibber_r_multicast_causal_transport_add_sender return the sender that was added - - - 20071024114601-b58c9-e78c2a68ed36b5b8d38375232e4a211392e9a2a7.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 6 ++++-- - lib/gibber/gibber-r-multicast-causal-transport.h | 2 +- - 2 files changed, 5 insertions(+), 3 deletions(-) - -commit 440126fed1e7130e00308aeec53c20c02a6d17a7 -Author: Sjoerd Simons -Date: Wed Oct 24 11:45:19 2007 +0000 - - GibberRMulticastSEnder: Add debug state showing which data packets are actaully popped - - - 20071024114519-b58c9-d1cee8d924b07d9b1152eb0d8475d447baacf0d2.gz - - lib/gibber/gibber-r-multicast-sender.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit d566e04b038ad7f2f5bcd32be51e18e2b8fd6cdd -Author: Sjoerd Simons -Date: Wed Oct 24 11:44:25 2007 +0000 - - GibberRMulticastSender: Add a function to set the data start. All data starting before this point will be ignored. Also data not hold back before setting a starting point will be ignored - - - 20071024114425-b58c9-6987907cc502bcb2907d420713b3bf8cdc54593d.gz - - lib/gibber/gibber-r-multicast-sender.c | 47 +++++++++++++++++++++++++++++-- - lib/gibber/gibber-r-multicast-sender.h | 7 ++++- - 2 files changed, 50 insertions(+), 4 deletions(-) - -commit 106b75754df582eabf10bfc7a2c50952b49a8227 -Author: Sjoerd Simons -Date: Tue Oct 23 17:16:38 2007 +0000 - - GibberRMulticastSender: Cope with multiple interleaved data and control streams - - - 20071023171638-b58c9-763f71d7cf11d23d70182b56a23e5217bac36814.gz - - lib/gibber/gibber-r-multicast-sender.c | 258 ++++++++++++++++++++------------ - lib/gibber/gibber-r-multicast-sender.h | 3 +- - 2 files changed, 164 insertions(+), 97 deletions(-) - -commit 8ecc6353fc59258f4e2861470a13abb1a09d8328 -Author: Sjoerd Simons -Date: Tue Oct 23 17:15:19 2007 +0000 - - CheckGibberRMulticastSender: Add testcases for interleaving multiple fragmented streams - - - 20071023171519-b58c9-6dda14327e306b8bd8b28f89be8fa935396752ab.gz - - tests/check-gibber-r-multicast-sender.c | 94 ++++++++++++++++++++++++++----- - 1 files changed, 79 insertions(+), 15 deletions(-) - -commit 4d113bc141e5f76cd0d324bb0a2fb5eaaaef5cca -Author: Sjoerd Simons -Date: Tue Oct 23 16:23:01 2007 +0000 - - GibberRMulticastCausalTransport: Don't leak a refence to GibberRMulticastPacket's when sending out an unfragmented data packet - - - 20071023162301-b58c9-fd5e82670ab1385d49d2a8985bab8319d81616d7.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit 6166bcf080fd1efcba046086d719b15a6b3a6c54 -Author: Sjoerd Simons -Date: Tue Oct 23 16:20:22 2007 +0000 - - Schedule one idle next step at a time at most. Also ensure that the mainloop is always run - - - 20071023162022-b58c9-50348cd72c181bf50376e44e8ea35da7ac592e92.gz - - tests/check-gibber-r-multicast-sender.c | 20 +++++++++++++++----- - 1 files changed, 15 insertions(+), 5 deletions(-) - -commit 702a08464d98cb5ffed03889aae291b1b6b16ec6 -Author: Sjoerd Simons -Date: Mon Oct 22 14:08:28 2007 +0000 - - Fix missing 8 to 16 bit stream id conversions - - - 20071022140828-b58c9-f45627bb4a6da2f3a80c11f84ba168355e0e36e8.gz - - lib/gibber/gibber-r-multicast-sender.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 1c15c5f361653cf1638f7563826acf5bb534f2b9 -Author: Simon McVittie -Date: Mon Oct 22 12:20:40 2007 +0000 - - Merge with Sjoerd - - - 20071022122040-53eee-e6ca47181a6d1c631290dad2c6d4b49f86e88f33.gz - - src/salut-muc-channel.c | 15 +++++++++++---- - 1 files changed, 11 insertions(+), 4 deletions(-) - -commit 4f1a031c68a590f51f19f7faa30c962564a67724 -Author: Simon McVittie -Date: Fri Oct 19 15:10:43 2007 +0000 - - tests/: stylistic changes to files touched by new protocol - - - 20071019151043-53eee-82f5154a26b5acd125d701e85d26f33eb9689822.gz - - tests/check-gibber-r-multicast-causal-transport.c | 197 +++++++++++--------- - tests/check-gibber-r-multicast-packet.c | 149 +++++++++------- - 2 files changed, 190 insertions(+), 156 deletions(-) - -commit e012f7d426084e68d2c81e0550ec99182dfee057 -Author: Simon McVittie -Date: Fri Oct 19 15:10:30 2007 +0000 - - salut-muc-channel: use guint to iterate over GArray - - - 20071019151030-53eee-4398c236f7449d56d1cbee979da63389c367250c.gz - - src/salut-muc-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 17cd8f2db6deb8528209a13c577fe294e9d10050 -Author: Simon McVittie -Date: Fri Oct 19 15:09:52 2007 +0000 - - src/salut-muc-channel.c: stylistic changes - - - 20071019150952-53eee-c4ca3cfe2b139c77c49cd5d56448c9ee81de51ca.gz - - src/salut-muc-channel.c | 90 +++++++++++++++++++++++----------------------- - 1 files changed, 45 insertions(+), 45 deletions(-) - -commit 2ffa4e814ae09ab646fe187c2ae98b6e25381d7a -Author: Sjoerd Simons -Date: Mon Oct 22 12:00:25 2007 +0000 - - Move everything to 16 bit stream ids - - - 20071022120025-b58c9-eb830adc6446d4349add16b2c4b21807573c616a.gz - - lib/gibber/gibber-bytestream-muc.c | 6 +++--- - lib/gibber/gibber-muc-connection.c | 11 ++++++----- - lib/gibber/gibber-muc-connection.h | 4 ++-- - lib/gibber/gibber-r-multicast-causal-transport.c | 4 ++-- - lib/gibber/gibber-r-multicast-causal-transport.h | 4 ++-- - lib/gibber/gibber-r-multicast-transport.c | 2 +- - lib/gibber/gibber-r-multicast-transport.h | 4 ++-- - src/salut-tubes-channel.c | 4 ++-- - 8 files changed, 20 insertions(+), 19 deletions(-) - -commit de5487d509600b52918963737d874f827d872ec0 -Author: Sjoerd Simons -Date: Sun Oct 21 19:23:58 2007 +0000 - - SalutMucChannel: Wait a maximum of 60 seconds after connecting for other members - - - 20071021192358-b58c9-2d632cf2ed7d5d4149a793ad75a6f1f45254e600.gz - - src/salut-muc-channel.c | 32 ++++++++++++++++++++++++++++++++ - 1 files changed, 32 insertions(+), 0 deletions(-) - -commit 94ee121a782733a2ddf1e598af83b33b33e66bc0 -Author: Sjoerd Simons -Date: Sun Oct 21 19:21:44 2007 +0000 - - SalutMucManager: Fix crash when listing channels when RoomList channels are around - - - 20071021192144-b58c9-534b4f516da711d24dcee77201454066364d1bdf.gz - - src/salut-muc-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4c9ceb188559729ebc13d1b580005934c7173bde -Author: Sjoerd Simons -Date: Sun Oct 21 16:43:22 2007 +0000 - - Add the self handle to muc members after the first members have joined if we weren't the creator - - - 20071021164322-b58c9-cef522a251aac3480cd7ccbe8fccaf7f61e31c37.gz - - src/salut-muc-channel.c | 38 ++++++++++++++++++++++++++++++++++++-- - src/salut-muc-manager.c | 9 ++++++--- - 2 files changed, 42 insertions(+), 5 deletions(-) - -commit 276c2216559b0e2128cdff834e56cdc05828acd2 -Author: Sjoerd Simons -Date: Fri Oct 19 21:31:22 2007 +0000 - - GibberRMulticastCausalTransport: g_string_overwrite doesn't exist in glib < 2.14.. Use truncate and appand instead - - - 20071019213122-b58c9-8f58f2d109a3cc71de7405b5b0faa6a50e226a68.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 268cacaa6daec09cca474946fd639e8f9117d1e5 -Author: Sjoerd Simons -Date: Fri Oct 19 21:29:59 2007 +0000 - - GibberRMulticastTransport: Ignore all foreign bye packets - - - 20071019212959-b58c9-073c8e8378d80ac022e3546a9bdd1329f24befb7.gz - - lib/gibber/gibber-r-multicast-transport.c | 12 +++++++++--- - 1 files changed, 9 insertions(+), 3 deletions(-) - -commit 6f2b3d132dbc4249bc18ae61a83c6c7b806adce2 -Author: Sjoerd Simons -Date: Fri Oct 19 21:26:34 2007 +0000 - - GibberRMulticastSender: Ensure the sender isn't disposed while popping. Also make a list of all senders in the hashtable instead of iterating over a changing hashtable - - - 20071019212634-b58c9-413770e0c6b99ac510914378e5b06ced3f5fe6bd.gz - - lib/gibber/gibber-r-multicast-sender.c | 21 ++++++++++++++++++--- - 1 files changed, 18 insertions(+), 3 deletions(-) - -commit 55c6f13b1967539565a1da08b8b9bd0f9b3eea3e -Author: Sjoerd Simons -Date: Fri Oct 19 21:23:49 2007 +0000 - - GibberRMulticastCausalTransport: Unref senders when their removed from the hashtable - - - 20071019212349-b58c9-49f538763d20c9b693ba745106e728d7b3b7c26f.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 2f2ebaa44e8a0cfcf8b75eb9d50f4f5ca2223a1c -Author: Sjoerd Simons -Date: Thu Oct 18 21:42:33 2007 +0000 - - GibberMucConnection: Add a disconnecting state - - - 20071018214233-b58c9-48f75288481db6f92158968f8bd1c898185b1b2e.gz - - lib/gibber/gibber-muc-connection.c | 14 ++++++++++++-- - lib/gibber/gibber-muc-connection.h | 5 +++-- - 2 files changed, 15 insertions(+), 4 deletions(-) - -commit f49bf3c76014ac0ad67f874a3bf6e8d4225e6bfd -Author: Sjoerd Simons -Date: Thu Oct 18 21:41:12 2007 +0000 - - GibberRMulticastCausalTransport: After sending bye's do finalisations before sending disconnected - - - 20071018214112-b58c9-d291ca45bfa46fbad075d9fe998e63819f02cd5f.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 02ef49302d6e5b797dd23e214a3b98d7147dc8e7 -Author: Sjoerd Simons -Date: Thu Oct 18 20:56:28 2007 +0000 - - GibberRMulticastTransport: Also release the data of the sender itself when a join succeeded - - - 20071018205628-b58c9-3428dc870d6ef9491819b548b3ac6935b35bc40c.gz - - lib/gibber/gibber-r-multicast-transport.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit f457f1e79bc73b1ecec74f58207cab21752f8622 -Author: Sjoerd Simons -Date: Thu Oct 18 20:55:49 2007 +0000 - - GibberRMulticastTransport: Only allocate new and lost arrays when needed - - - 20071018205549-b58c9-80f72783eb04fabbc327a54f92e94153319e9c41.gz - - lib/gibber/gibber-r-multicast-transport.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit b1e5c04202ff44a3e3491d4508fac122d64f859e -Author: Sjoerd Simons -Date: Thu Oct 18 20:26:44 2007 +0000 - - GibberRMulticastTransport: Don't send new-senders or lost-senders with an empty array - - - 20071018202644-b58c9-e48ac8f7d49559e781e1b607271610afb0eab0b6.gz - - lib/gibber/gibber-r-multicast-transport.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 6d140f7dee5e996068a8920c77129914d7a8a5e7 -Author: Sjoerd Simons -Date: Thu Oct 18 20:26:16 2007 +0000 - - GibberMucConnection: Correct the signal type for lost-senders - - - 20071018202616-b58c9-abe2cd2bccba4cae117b845da0b76f4c1985f837.gz - - lib/gibber/gibber-muc-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 48b482b1d306c4228fd2c26afd0253ac80e41aed -Author: Sjoerd Simons -Date: Thu Oct 18 19:21:31 2007 +0000 - - Simulations: Adapt to the new new-senders and lost-senders signals - - - 20071018192131-b58c9-ae452829282cd6003b02f5ef51daf315d9732868.gz - - tests/mesh.py | 12 +++++++++- - tests/test-r-multicast-transport-io.c | 36 +++++++++++++++++++++++--------- - 2 files changed, 36 insertions(+), 12 deletions(-) - -commit 18236c219f961823a4ad2e3235a0161b78df6937 -Author: Sjoerd Simons -Date: Thu Oct 18 19:21:03 2007 +0000 - - SalutMucChannel: Adapt to the new new-senders and lost-senders signals - - - 20071018192103-b58c9-767d0eedf4b10aa4e20e90cd87925a0c37ca0415.gz - - src/salut-muc-channel.c | 68 ++++++++++++++++++++++------------------------- - 1 files changed, 32 insertions(+), 36 deletions(-) - -commit 5f7faaaf1d99424ff9bfde14fab1ce05041bdb07 -Author: Sjoerd Simons -Date: Thu Oct 18 19:20:45 2007 +0000 - - GibberMucConnection: Adapt to the new new-senders and lost-senders signals - - - 20071018192045-b58c9-8b482c1b3005aba0cf63e616a0e4d69cbc22c0d3.gz - - lib/gibber/gibber-muc-connection.c | 42 ++++++++++++++++++------------------ - 1 files changed, 21 insertions(+), 21 deletions(-) - -commit 89f48501363cb73dabfb4532e52083c50125f690 -Author: Sjoerd Simons -Date: Thu Oct 18 19:19:36 2007 +0000 - - GibberRMulticastTransport: Signal new-senders and lost-senders with a GArray instead of one sender at a time - - - 20071018191936-b58c9-ddfb290e5a783a828713adcee659d89640b08cd5.gz - - lib/gibber/gibber-r-multicast-transport.c | 46 ++++++++++++++++++++--------- - 1 files changed, 32 insertions(+), 14 deletions(-) - -commit 4b9d10b29b345be6754c414b6a3809b6cdf4d674 -Author: Sjoerd Simons -Date: Wed Oct 17 21:07:40 2007 +0000 - - mesh.py: Add utility function to get packet types - - - 20071017210740-b58c9-b8e0342e7ccc80011732b068b6e4de0bf1867a6c.gz - - tests/mesh.py | 18 +++++++++++++++++- - 1 files changed, 17 insertions(+), 1 deletions(-) - -commit 52e71001b7e775daaaaf42280ebe06c31291b595 -Author: Sjoerd Simons -Date: Wed Oct 17 21:07:19 2007 +0000 - - Add a simplemeshtest variant where all AJ packets of one node are always dropped - - - 20071017210719-b58c9-992e55c314b4ba0585696fa661549c8115cf91a5.gz - - tests/failmeshtest.py | 118 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 118 insertions(+), 0 deletions(-) - -commit 4a651a0f0df572f03b89e2bb98fea9c1541e9d2a -Author: Sjoerd Simons -Date: Wed Oct 17 21:06:37 2007 +0000 - - check-gibber-r-multicast-packet: Change part/total/stream_id types for the data packet to it's new types - - - 20071017210637-b58c9-6af11460a5d9d4ce1f486d826a31a84140a2a8c4.gz - - tests/check-gibber-r-multicast-packet.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 7795a81cde5dfcc54b14cd3114c7388d85885a7c -Author: Sjoerd Simons -Date: Wed Oct 17 21:05:44 2007 +0000 - - GibberRMulticastTransport: Recognize all failure types, add some nice assertions - - - 20071017210544-b58c9-9b17a6807a983a55057d303d2a34aecb291b143d.gz - - lib/gibber/gibber-r-multicast-transport.c | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit a66375d09cc0016a9b158b70ce147050b294db7d -Author: Sjoerd Simons -Date: Wed Oct 17 21:05:02 2007 +0000 - - RibberRMulticastSender: Do the assert after printing debug output - - - 20071017210502-b58c9-003c459912da1f108c5d70968303381a290153e5.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 64ae5500926428b3c07d07bbf79c250f9dfee8cc -Author: Sjoerd Simons -Date: Wed Oct 17 21:02:46 2007 +0000 - - GibberRMulticastPacket: Use bigger fields for fragmentation and stream ids - - - 20071017210246-b58c9-97108c8202aad0331d3edaa71915191670d5b093.gz - - lib/gibber/gibber-r-multicast-packet.c | 64 +++++++++++++++++++++++++++---- - lib/gibber/gibber-r-multicast-packet.h | 9 ++-- - 2 files changed, 60 insertions(+), 13 deletions(-) - -commit cd8a822358d2fffc91a39f1fa1c89615e19ac745 -Author: Sjoerd Simons -Date: Wed Oct 17 19:46:36 2007 +0000 - - First signal all lost members, then the new members - - - 20071017194636-b58c9-898a7be2da21bcbc6258b23d3f0ec77ed2f3c9b1.gz - - lib/gibber/gibber-r-multicast-transport.c | 41 ++++++++++++++++------------ - 1 files changed, 23 insertions(+), 18 deletions(-) - -commit 354a94cf1a820e9fd4dff7aa684d71fd4e2dc5a7 -Author: Sjoerd Simons -Date: Wed Oct 17 19:46:14 2007 +0000 - - Don't remove things from empty GArray's - - - 20071017194614-b58c9-6fd6f582fb1379ee406661fd2da1cf04b7d36e02.gz - - lib/gibber/gibber-r-multicast-transport.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 63c7cf1603b80bc468acc0224a205697ceafc882 -Author: Sjoerd Simons -Date: Wed Oct 17 15:22:38 2007 +0000 - - Implement joining with failures - - - 20071017152238-b58c9-c259b5ccdbd4ee398e744b91516fb864be76e30f.gz - - lib/gibber/gibber-r-multicast-transport.c | 377 ++++++++++++++++++++--------- - 1 files changed, 266 insertions(+), 111 deletions(-) - -commit 1c6592779c1a33ffc5ec5776ae8ef04300f27fd8 -Author: Sjoerd Simons -Date: Wed Oct 17 15:21:24 2007 +0000 - - GibberRMulticastCausalTransport: Add failures to the join messages - - - 20071017152124-b58c9-b789dfc9228630b17567bb58dc15fc84fe095682.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 3 ++- - lib/gibber/gibber-r-multicast-causal-transport.h | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -commit 356a7628cf064df850477ea7a0371374987d8527 -Author: Sjoerd Simons -Date: Wed Oct 17 15:18:31 2007 +0000 - - GibberRMulticastSender: Packet insertion should change the first_packet info - - - 20071017151831-b58c9-30139dee7770774e95246a2fd500f8b88b7635aa.gz - - lib/gibber/gibber-r-multicast-sender.c | 9 +++------ - 1 files changed, 3 insertions(+), 6 deletions(-) - -commit a184fef380b5cfef7fe022278dd938d266a1a760 -Author: Sjoerd Simons -Date: Wed Oct 17 15:17:35 2007 +0000 - - GibberRMulticastPacket: Add failures field to join packets - - - 20071017151735-b58c9-d660326e80a922b8300edab43efc63d190d2b518.gz - - lib/gibber/gibber-r-multicast-packet.c | 68 +++++++++++++++++++++++++++++-- - lib/gibber/gibber-r-multicast-packet.h | 19 +++++++++ - 2 files changed, 82 insertions(+), 5 deletions(-) - -commit 51562af4d72e7fc2ca4cea5ba351988e0252dfc1 -Author: Sjoerd Simons -Date: Wed Oct 17 13:55:50 2007 +0000 - - check-gibber-r-multicast-causal-transport.c: Unref the packet in the common function finalisation - - - 20071017135550-b58c9-dd105647ed52b83a75d355560e48725f404311f0.gz - - tests/check-gibber-r-multicast-causal-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 13ec6b7cd72d28cc9fff3b695634c61289c707d3 -Author: Sjoerd Simons -Date: Mon Oct 15 19:31:48 2007 +0000 - - GibberRMulticastTransport: Go back to normal state when joining has finished - - - 20071015193148-b58c9-51f2c4fdd789ecca90721f0e038c69952093732a.gz - - lib/gibber/gibber-r-multicast-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit b4aecb6196cd2d007f1f04ccae1dcb257adb4c8a -Author: Sjoerd Simons -Date: Mon Oct 15 18:18:54 2007 +0000 - - GibberRMulticastSender: reschedule whois requests packets if we receive a whois request - - - 20071015181854-b58c9-46d0ac963656218a8d6aed0814bf888d98b20a9e.gz - - lib/gibber/gibber-r-multicast-sender.c | 25 ++++++++++++++++++------- - 1 files changed, 18 insertions(+), 7 deletions(-) - -commit eb18869af5c1da8b574d9157cd2ef6af69c6ff27 -Author: Sjoerd Simons -Date: Mon Oct 15 15:42:17 2007 +0000 - - GibberRMulticastTransport: Move debug output above the actual handling - - - 20071015154217-b58c9-979d6149daec3fc51916040e136e1993f34fbfa0.gz - - lib/gibber/gibber-r-multicast-transport.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit ce99f6634702b46320ded43c962ad41ba5196ae0 -Author: Sjoerd Simons -Date: Mon Oct 15 15:41:38 2007 +0000 - - GibberRMulticastSender: Make the pop_packets code flow somewhat nicer - - - 20071015154138-b58c9-d4cfa8a5f0e0f0c7d0a05ce1f0b2dd9e2069ae21.gz - - lib/gibber/gibber-r-multicast-sender.c | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit 74750d2703eac98021d29a7b8719a12e96ad00cc -Author: Sjoerd Simons -Date: Mon Oct 15 15:34:56 2007 +0000 - - GibberRMulticastSender: Always try to pop packets instead of looking at the state, the pop_packets function will do the right thing - - - 20071015153456-b58c9-3761be18684a540511a75e62219d7977a8aa9689.gz - - lib/gibber/gibber-r-multicast-sender.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit f620d6ca7bbbdb4d0e1c855c3a006a3f678ec78d -Author: Sjoerd Simons -Date: Mon Oct 15 15:34:20 2007 +0000 - - check-gibber-r-multicast-sender.c: Let the holding test support multiple scenarios, add a test for out of order control packets - - - 20071015153420-b58c9-2a3cfc4a9493407c82e6dc75882ed6aeb3f4813b.gz - - tests/check-gibber-r-multicast-sender.c | 163 +++++++++++++++++++----------- - 1 files changed, 103 insertions(+), 60 deletions(-) - -commit 7fb1440e2f874663c69d09fde53113d94a785f8c -Author: Sjoerd Simons -Date: Mon Oct 15 10:32:41 2007 +0000 - - simplemeshtest.py: Print packet stats when all data has been send/received - - - 20071015103241-b58c9-df19805c885a0a0ab0cc72ac05b3809bd45696c6.gz - - tests/simplemeshtest.py | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit cb2e820a3905d1ac93615bd454016ab28100d8d6 -Author: Sjoerd Simons -Date: Mon Oct 15 10:31:02 2007 +0000 - - mesh.py: Add basic packet parsing (get the type) and stats - - - 20071015103102-b58c9-63a989f461943da241761eb04ea88f61bb1bc281.gz - - tests/mesh.py | 24 +++++++++++++++++++++++- - 1 files changed, 23 insertions(+), 1 deletions(-) - -commit a0aab35395c260701451579d8b11ca5e5e3bbd48 -Author: Sjoerd Simons -Date: Sun Oct 7 21:19:33 2007 +0000 - - GibberRMulticastCausalTransport: Add remove sender api - - - 20071007211933-b58c9-231cd77939ffc44268eaab210b9b9abf6b79db42.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 16 ++++++++++++++-- - lib/gibber/gibber-r-multicast-causal-transport.h | 2 ++ - 2 files changed, 16 insertions(+), 2 deletions(-) - -commit 13aec2dbb3a8e34680ecc3fe9cfe142c8c448af0 -Author: Sjoerd Simons -Date: Sun Oct 7 21:19:04 2007 +0000 - - GibberRMulticastTransport: Remove senders from our knowledge after the failure protocol has completed - - - 20071007211904-b58c9-749da5e3bcdb088cc49703835120b17e2e968273.gz - - lib/gibber/gibber-r-multicast-transport.c | 30 ++++++++++++++++++++++++++++- - 1 files changed, 29 insertions(+), 1 deletions(-) - -commit d3dd98a41b4022b0758e93937fc4665fda3eab54 -Author: Sjoerd Simons -Date: Sun Oct 7 21:17:04 2007 +0000 - - GibberRMulticastSender: Assert that the sender is not NULL - - - 20071007211704-b58c9-40bc318d9d4541b7a3ff610b32f7dc087b1fec6d.gz - - lib/gibber/gibber-r-multicast-sender.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 39556003a6abc1ae9376060cc972d6634a456311 -Author: Sjoerd Simons -Date: Sun Oct 7 21:09:57 2007 +0000 - - Send data after everyone connected. Connect the last node after receiving all the data - - - 20071007210957-b58c9-374f0081b8b75ae88a18d88c7ac79affb89e7754.gz - - tests/simplemeshtest.py | 47 +++++++++++++++++++++++++++++++++++------------ - 1 files changed, 35 insertions(+), 12 deletions(-) - -commit d031c105ee6b8f8959c0d55bb4fb65580be72dad -Author: Sjoerd Simons -Date: Sun Oct 7 19:57:53 2007 +0000 - - mesh.py: Add support for removing nodes - - - 20071007195753-b58c9-e0021ee135bd8e07e65f5b7e625049e3182a2d6f.gz - - tests/mesh.py | 14 ++++++-------- - 1 files changed, 6 insertions(+), 8 deletions(-) - -commit 2ea51ee96cb6836974a68b9c7b36c434708d6eeb -Author: Sjoerd Simons -Date: Sun Oct 7 19:51:19 2007 +0000 - - GibberRMulticastTransport: Add support for failing node and remove having a member for ourselves - - - 20071007195119-b58c9-01f2b387e2b15efbbef775c1c498911c7f3ed0e8.gz - - lib/gibber/gibber-r-multicast-transport.c | 182 ++++++++++++++++++++++++----- - 1 files changed, 153 insertions(+), 29 deletions(-) - -commit a3f3fa518ea95433cfe7b61db3d23fcf6e8db314 -Author: Sjoerd Simons -Date: Sun Oct 7 19:45:35 2007 +0000 - - GibberRMulticastTransport: some reindentation - - - 20071007194535-b58c9-733f3eb9cb1dd919f13c6c3071b8c20e03ab134e.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 7250b20c2c08aa8f2243f14c2d4f70f90b3bc4c3 -Author: Sjoerd Simons -Date: Sun Oct 7 19:44:15 2007 +0000 - - GibberRMulticastTransport: Add support for failures - - - 20071007194415-b58c9-c951152711ca524e9fcf7d6f22fe9c9b12f51b7d.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 29 +++++++++++++++++++++- - lib/gibber/gibber-r-multicast-causal-transport.h | 3 ++ - 2 files changed, 31 insertions(+), 1 deletions(-) - -commit 3cdf984a346b25f06c8b87ed25bdaa2effbcc6db -Author: Sjoerd Simons -Date: Sun Oct 7 19:43:31 2007 +0000 - - GibberRMulticastTransport: Actually send out repair messages for other nodes - - - 20071007194331-b58c9-8ddc81df29cd7ada10d65f11ed88ce4562a735bb.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit fbc4d12a7be975856bf1b3b0b4aa3385762b4854 -Author: Sjoerd Simons -Date: Sun Oct 7 19:40:25 2007 +0000 - - GibberRMulticastSender: Add failing state - - - 20071007194025-b58c9-33708d5002b479ed0426fdd559586fef2871298b.gz - - lib/gibber/gibber-r-multicast-sender.c | 1 + - lib/gibber/gibber-r-multicast-sender.h | 2 ++ - 2 files changed, 3 insertions(+), 0 deletions(-) - -commit 22e0b7b0b63b7a7e458280f44441f59c1a53e2cb -Author: Sjoerd Simons -Date: Sun Oct 7 17:08:10 2007 +0000 - - GibberRMulticastPacket: Add support for failure packets - - - 20071007170810-b58c9-d45b8be0eff2c3f015b3669529b284162f437ef0.gz - - lib/gibber/gibber-r-multicast-packet.c | 64 ++++++++++++++++++++++++++++++++ - lib/gibber/gibber-r-multicast-packet.h | 19 +++++++++ - 2 files changed, 83 insertions(+), 0 deletions(-) - -commit a3cdc5c74fc89d102b584378c32de4961afe42e1 -Author: Sjoerd Simons -Date: Sun Oct 7 16:20:32 2007 +0000 - - GibberRMulticastPacket: When parsing add the data payload size to packet size and assert that the complete packet is actually parse - - - 20071007162032-b58c9-2724a482677b9853e168f2d32001928fd4c0c96d.gz - - lib/gibber/gibber-r-multicast-packet.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 01e8ab4df5d7567aa85e1b46f82893380d607655 -Author: Sjoerd Simons -Date: Fri Oct 5 17:39:54 2007 +0000 - - Add support for disconnecting the node - - - 20071005173954-b58c9-5eed6075804691e415dc44f8776da4cd4adf462a.gz - - tests/test-r-multicast-transport-io.c | 24 ++++++++++++++++++++++++ - 1 files changed, 24 insertions(+), 0 deletions(-) - -commit 8ecc41e3c2ee39d59faa5b5f982e0d57eec5963f -Author: Sjoerd Simons -Date: Fri Oct 5 17:39:22 2007 +0000 - - Add support for disconnecting nodes - - - 20071005173922-b58c9-4d42da0408cc879e841d351100118077b3c2e37c.gz - - tests/mesh.py | 31 ++++++++++++++++++++++++++----- - 1 files changed, 26 insertions(+), 5 deletions(-) - -commit 97a2f39e420707a264abc6720f644aef40452664 -Author: Sjoerd Simons -Date: Fri Oct 5 15:47:12 2007 +0000 - - GibberRMulticastTransport: Treat foreign session packets the same as reliable packets. They have the same information - - - 20071005154712-b58c9-058b62b107a3b7ac7b1da21e5ee7bff211396334.gz - - lib/gibber/gibber-r-multicast-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4c662bceec525a0281c4fafb7a6db27a3dcc9fce -Author: Sjoerd Simons -Date: Fri Oct 5 15:44:03 2007 +0000 - - GibberRMulticastTransport: Add a disconnecting phase to wait for the underlying transport to be disconnected - - - 20071005154403-b58c9-ac3e6783caac45870c2580c191e02a66b74a1a31.gz - - lib/gibber/gibber-r-multicast-transport.c | 17 +++++++++++++++-- - 1 files changed, 15 insertions(+), 2 deletions(-) - -commit 6422016bc8c51ca24aa3f2eebf53b0fa8b3d7f4f -Author: Sjoerd Simons -Date: Fri Oct 5 15:40:00 2007 +0000 - - GibberRMulticastCausalTransport: Add disconnecting stage and send bye packets - - - 20071005154000-b58c9-331db727b8b197482956447fd8946e3ec56fb6e4.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 80 ++++++++++++++++++--- - 1 files changed, 68 insertions(+), 12 deletions(-) - -commit 383e0fa14c430fb243f03836794d189248e8f52e -Author: Sjoerd Simons -Date: Fri Oct 5 15:33:19 2007 +0000 - - GibberRMulticastSender: Unknown nodes in depends can only happen in AJ packets and then we can ignore those - - - 20071005153319-b58c9-204bfed54ef767d3f8761d49d77d630e89be3bda.gz - - lib/gibber/gibber-r-multicast-sender.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit 51ff9e66682f95e09507c351800bc52b815268c7 -Author: Sjoerd Simons -Date: Fri Oct 5 15:28:33 2007 +0000 - - GibberRMulticastSender: Don't print sender pointer in the debugging output - - - 20071005152833-b58c9-35cd930c417b4d95a252c198c05ab42f36ce2afc.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 47885a7bebf80cc61f2bfa6d732846e24d62425d -Author: Sjoerd Simons -Date: Fri Oct 5 15:26:41 2007 +0000 - - GibberRMulticastPacket: Parse and build BYE packets - - - 20071005152641-b58c9-c8e6efffcc96355b0fea8657803652237d2a8267.gz - - lib/gibber/gibber-r-multicast-packet.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 5e0e33d24d8d6d7a89f91f2ac8556599b86953bc -Author: Sjoerd Simons -Date: Thu Oct 4 15:43:34 2007 +0000 - - GibberRMulticastTransport: Implement joining protocol - - - 20071004154334-b58c9-d9da64510e737b4969632827d292dba8e6b3eb5a.gz - - lib/gibber/gibber-r-multicast-transport.c | 207 ++++++++++++++++++++++++++--- - 1 files changed, 189 insertions(+), 18 deletions(-) - -commit 2b4901d08e51c2413c6335a32b72fbf87572e14d -Author: Sjoerd Simons -Date: Thu Oct 4 15:42:00 2007 +0000 - - GibberRMulticastCausalTransport: Add api to get the sender object corresponding to an ID - - - 20071004154200-b58c9-843f41790d8640001a4148f300babee990e6516a.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 16 ++++++++++++++++ - lib/gibber/gibber-r-multicast-causal-transport.h | 10 ++++++++-- - 2 files changed, 24 insertions(+), 2 deletions(-) - -commit 8b169d9fda226ca2995e8c6d24723001a6d45d5a -Author: Sjoerd Simons -Date: Thu Oct 4 15:41:02 2007 +0000 - - GibberRMulticastCausalTransport: Up the session timeout to between 1.5 and 3 seconds - - - 20071004154102-b58c9-b701848f656256b0a08b454be28ad0a212119a21.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit afd58ddd465339b1adb55983f85dbba22251476b -Author: Sjoerd Simons -Date: Thu Oct 4 15:40:27 2007 +0000 - - GibberRMulticastCausalTransport: Only reindex the hash table iff we signaled a foreign packet (thus when it could actually have changed) - - - 20071004154027-b58c9-684420448c19f9f54b7291b33daa1ba343b07f83.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 92ec011485b459f1586c5e73b405c3a2aaa3749f -Author: Sjoerd Simons -Date: Thu Oct 4 15:39:49 2007 +0000 - - GibberRMulticastCausalTransport: Make the debug output somewhat nicer - - - 20071004153949-b58c9-742cdacd21a2ad774e3e0a1db21294b4ae79feb5.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f655dc425f6b445ae3ce5d6d33fff424a7fb2fe4 -Author: Sjoerd Simons -Date: Thu Oct 4 15:36:50 2007 +0000 - - GibberRMulticastSender: Add debugging output when releasing or holding back data - - - 20071004153650-b58c9-858cb1ebf8bda1f4114056d6e5aea21d9aea3429.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 7a90b89c525656f0657de54a78713ea746d7eee9 -Author: Simon McVittie -Date: Tue Oct 2 16:37:16 2007 +0000 - - Use Telepathy coding style for new files gibber-r-multicast-causal-transport.[ch] - - - 20071002163716-53eee-30a95590b94529135123adfbb269a4ba47a58d02.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 605 ++++++++++++---------- - lib/gibber/gibber-r-multicast-causal-transport.h | 52 +- - 2 files changed, 344 insertions(+), 313 deletions(-) - -commit c9f1e6ecae6450ca68edd7de178ec1fd632638e8 -Author: Sjoerd Simons -Date: Tue Oct 2 16:02:02 2007 +0000 - - GibberRMulticastCausalTransport: Add support for sending out JOIN packets - - - 20071002160202-b58c9-3c36a169b9bdb8a2006ec4c53e1ebf0676271f80.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 18 ++++++++++++++++++ - lib/gibber/gibber-r-multicast-causal-transport.h | 2 ++ - 2 files changed, 20 insertions(+), 0 deletions(-) - -commit 3add1dc8404394fe2a6ce533ca74e3fb7129e4c2 -Author: Sjoerd Simons -Date: Tue Oct 2 15:59:52 2007 +0000 - - GibberRMulticastPacket: Add preliminary support for JOIN packets - - - 20071002155952-b58c9-b5b926b096915b0d8f1dab787ecf5c8c5d28e090.gz - - lib/gibber/gibber-r-multicast-packet.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit f90b9419b4d86ef9e92d869c95ddce368fdcc55f -Author: Sjoerd Simons -Date: Tue Oct 2 14:01:41 2007 +0000 - - GibberRMulticastSender: seperate global and data dependency checking. And no longer prevent recursive popping - - - 20071002140141-b58c9-77594bf8de27ed80095881ce4fd7db3be083f736.gz - - lib/gibber/gibber-r-multicast-sender.c | 31 ++++++++++++++----------------- - 1 files changed, 14 insertions(+), 17 deletions(-) - -commit 26edf3333dab2c11e071f011247530fc61eb5e44 -Author: Sjoerd Simons -Date: Tue Oct 2 14:00:14 2007 +0000 - - Call update-senders from a senders popping process instead of from the causal multicast transport - - - 20071002140014-b58c9-1d21dd4e9a3cc4704fa21c96dacee6df4bf19c09.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 14 -------------- - lib/gibber/gibber-r-multicast-sender.c | 18 +++++++++++++++++- - 2 files changed, 17 insertions(+), 15 deletions(-) - -commit d926173dd82c0c6e5d30758d18708e22b8642a3c -Author: Sjoerd Simons -Date: Tue Oct 2 13:58:44 2007 +0000 - - Add a test to test the holding back/releasing of data with dependencies - - - 20071002135844-b58c9-b66d0eb7841f8f786f7e26089ac1f4d270ff176b.gz - - tests/check-gibber-r-multicast-sender.c | 211 +++++++++++++++++++++++++++++++ - 1 files changed, 211 insertions(+), 0 deletions(-) - -commit 0c7f8ee52aaf65f1d6a30ef2b8ecfa32032be847 -Author: Sjoerd Simons -Date: Mon Oct 1 17:20:43 2007 +0000 - - simplemeshtest.py: Tweak the setting a bit for testing the new protocol - - - 20071001172043-b58c9-0569c12abdd3e6fbd6565a90e3991071352dbfe5.gz - - tests/simplemeshtest.py | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 9d729fc799331d173c6fa20da7e7245d95c932d8 -Author: Sjoerd Simons -Date: Mon Oct 1 17:18:11 2007 +0000 - - Purely test the gibber-r-multicast-causal-transport and not the gibber-r-multicast-transport on top of it as that would need a totally different approach to testing - - - 20071001171811-b58c9-e418971f332b4acccf2336ae4bdd3bb46641d396.gz - - tests/Makefile.am | 34 +- - tests/check-gibber-r-multicast-causal-transport.c | 519 ++++++++++++++++++++ - tests/check-gibber-r-multicast-transport.c | 529 --------------------- - tests/check-gibber.h | 2 +- - tests/check-main.c | 2 +- - 5 files changed, 538 insertions(+), 548 deletions(-) - -commit 4b6dd377f3a045e40dc8e93c8411b06d63a76dc1 -Author: Sjoerd Simons -Date: Mon Oct 1 17:10:31 2007 +0000 - - check-gibber-r-multicast-sender: Set sender start points - - - 20071001171031-b58c9-3ac9d550c0f9dcbe1b36ca09772498670c1e857b.gz - - tests/check-gibber-r-multicast-sender.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 2b098bc34136bb40a68f4e808406cb3843cbeb35 -Author: Sjoerd Simons -Date: Mon Oct 1 16:07:27 2007 +0000 - - GibberRMulticastTransport: Implement switching from normal to gathering to joining phase, the joining phase itself isn't implemented yet - - - 20071001160727-b58c9-b1479bf17ca9e7b6a27747be00a6a1a83fe7667b.gz - - lib/gibber/gibber-r-multicast-transport.c | 81 ++++++++++++++++++++++++++++- - 1 files changed, 80 insertions(+), 1 deletions(-) - -commit 2a97d6d4ef5f1eafce198bac55c379cdb33d9883 -Author: Sjoerd Simons -Date: Mon Oct 1 16:05:53 2007 +0000 - - GibberRMulticastSender: Implement holding back data packets - - - 20071001160553-b58c9-cd15a7484d40cef4f30d2d6e8b3cd39e536c7614.gz - - lib/gibber/gibber-r-multicast-sender.c | 171 +++++++++++++++++++++++++------ - lib/gibber/gibber-r-multicast-sender.h | 15 +++- - 2 files changed, 150 insertions(+), 36 deletions(-) - -commit e42415339e8bc2f5e22c6c1642674faaafcd677e -Author: Sjoerd Simons -Date: Sun Sep 30 13:12:14 2007 +0000 - - GibberRMulticastTransport: Don't always send attemp joins after receive attempt join control packets - - - 20070930131214-b58c9-16a94327eaadf9f63937ce30651fb9860accb662.gz - - lib/gibber/gibber-r-multicast-transport.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit d3ce1e81da28acca025d45598f8985efd3231b76 -Author: Sjoerd Simons -Date: Sun Sep 30 13:10:02 2007 +0000 - - GibberRMulticastPacket: don't use g_array_set_size, it really expands the array instead of extending the preallocated size - - - 20070930131002-b58c9-4663c42d1c8d57f79cdfa602b7f4fcc794f54e63.gz - - lib/gibber/gibber-r-multicast-packet.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit df6596a771028beae12fca7c1835a6552a894a07 -Author: Sjoerd Simons -Date: Sun Sep 30 12:30:57 2007 +0000 - - Replace the depends GList in GibberRMulticastPacket with a GArray - - - 20070930123057-b58c9-025a443b7f264cf93d2f0ff1038da5a4af9c5de2.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 19 ++++---- - lib/gibber/gibber-r-multicast-packet.c | 52 ++++++++++++---------- - lib/gibber/gibber-r-multicast-packet.h | 2 +- - lib/gibber/gibber-r-multicast-sender.c | 9 ++-- - lib/gibber/gibber-r-multicast-transport.c | 17 +++---- - tests/check-gibber-r-multicast-packet.c | 16 +++--- - tests/check-gibber-r-multicast-transport.c | 10 ++-- - 7 files changed, 65 insertions(+), 60 deletions(-) - -commit 77fa614b4cd84ea58c5280998608bcd307133ff9 -Author: Sjoerd Simons -Date: Sun Sep 30 11:48:34 2007 +0000 - - GibberRMulticastTransport: Implement AJ sending - - - 20070930114834-b58c9-5fcb033d87e2cc890158821889a118f9b9a04d53.gz - - lib/gibber/gibber-r-multicast-transport.c | 466 +++++++++++++++++++++++++++-- - 1 files changed, 442 insertions(+), 24 deletions(-) - -commit e1ccdba43f8c830e28768e1e5dab78c8d4d26e79 -Author: Sjoerd Simons -Date: Sun Sep 30 11:39:45 2007 +0000 - - GibberRMulticastCausalTransport: Better debugging output - - - 20070930113945-b58c9-c2ce7f062af8d85514115e518797e08fa1365f5f.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 23 ++++++++++++--------- - 1 files changed, 13 insertions(+), 10 deletions(-) - -commit d8defb05c8ffac29e1ed17c75e074f7eb037b958 -Author: Sjoerd Simons -Date: Sun Sep 30 11:38:52 2007 +0000 - - mesh.py: Make the unknown output output a bit more compact - - - 20070930113852-b58c9-d2c9134253ab2a48de8da45e511e180bd0445f4c.gz - - tests/mesh.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b2c8a773177a8121399bfb6f20ae46bad84b8ef6 -Author: Sjoerd Simons -Date: Sun Sep 30 11:37:56 2007 +0000 - - GibberRMulticastSender: When checking depends a node is either new/unknown or we know it's next output packet - - - 20070930113756-b58c9-95aa53e34c3f70465650bf36b9f9984fb2f7fa52.gz - - lib/gibber/gibber-r-multicast-sender.c | 28 ++++++++++------------------ - 1 files changed, 10 insertions(+), 18 deletions(-) - -commit 719b5186475e68332c3bd094af975ee29b643bd7 -Author: Sjoerd Simons -Date: Tue Sep 18 10:46:36 2007 +0000 - - GibberCausalMulticastTransport: Fix prototype of control-packet-receive callback - - - 20070918104636-b58c9-9d1039cb2320525484e7eb3c9ed7eb5546fe0abe.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 94d6b8ca0862cca36174cb7f5e97e51a609d5f15 -Author: Sjoerd Simons -Date: Tue Sep 18 10:45:46 2007 +0000 - - GibberCausalMulticastTransport: Handle depends for all reliable packets, not just data packets - - - 20070918104546-b58c9-3f457aed4b77aa3d7f464f04e9734097073f729e.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit bbdee04debef28cce683238fce11309ee2155162 -Author: Sjoerd Simons -Date: Tue Sep 18 10:45:12 2007 +0000 - - GibberCausalMulticastTransport: Improve debugging information - - - 20070918104512-b58c9-d77b8de8bc64c44dbde00f1be780de2194eb0aba.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 72 +++++++++++++++------- - 1 files changed, 50 insertions(+), 22 deletions(-) - -commit bf14cee67e3eba5b1699a59be72826bb1847e40f -Author: Sjoerd Simons -Date: Tue Sep 18 10:43:00 2007 +0000 - - GibberCausalMulticastTransport: Rename _start_sender function to update_sender - - - 20070918104300-b58c9-aaa2c070fae8bf2d9988a6ed2da97324b32b409a.gz - - lib/gibber/gibber-r-multicast-causal-transport.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit cd23ddd6c1dad6111e18e6a0090cd3ecaefe8ad4 -Author: Sjoerd Simons -Date: Tue Sep 18 10:41:36 2007 +0000 - - GibberRMulticastCausalTransport: Add sender id to the Custom message buffers - - - 20070918104136-b58c9-c06e1eda7acbd6115a5d56f784093437b8a20f95.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 1 + - lib/gibber/gibber-r-multicast-causal-transport.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit ad153e9a05b8371979155a8bb19cb7f32a5d6b31 -Author: Sjoerd Simons -Date: Tue Sep 18 10:40:17 2007 +0000 - - GibberRMulticastCausalTransport: Use _update_sender instead of _start_sender methods - - - 20070918104017-b58c9-a5129eb30002d12d04b9bebdb78140d19ffa792f.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 53d6040e6518fb70e7a44267608717f1b6e9206b -Author: Sjoerd Simons -Date: Tue Sep 18 10:08:07 2007 +0000 - - GibberRMulticastSender: Add API to update the position in the stream of a sender - - - 20070918100807-b58c9-52838946512dd11d0bb551ff7eaee9429a36a142.gz - - lib/gibber/gibber-r-multicast-sender.c | 17 ++++++++++++++++- - lib/gibber/gibber-r-multicast-sender.h | 2 +- - 2 files changed, 17 insertions(+), 2 deletions(-) - -commit 91e8f076d3ae2a38566ebda3c9a6bf46c94bcefb -Author: Sjoerd Simons -Date: Tue Sep 18 10:07:40 2007 +0000 - - GibberRMulticastSender: Update {next,last}_output_packet variables before signalling control pacets - - - 20070918100740-b58c9-ff2012b52b1fe95e7f5f35e707b1445aba5082a7.gz - - lib/gibber/gibber-r-multicast-sender.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 4db1bf62e6f7baef7088af4be4680f8335cd7825 -Author: Sjoerd Simons -Date: Tue Sep 18 10:06:47 2007 +0000 - - Detect resents of the first packet too - - - 20070918100647-b58c9-6a59542e37cc4383fcd9d1e52e79fc01a55ee4a8.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 03443e58ae71bad1c944c492e1ed20bc9e858b05 -Author: Sjoerd Simons -Date: Tue Sep 18 10:06:17 2007 +0000 - - GibberRMulticastPacket: Assure that the senders array in an attempt_join packet is always allocated (even for an empty array). Makes the code using it a lot simpler - - - 20070918100617-b58c9-34bace5e87389afd244452bc551e754cb1f349b2.gz - - lib/gibber/gibber-r-multicast-packet.c | 28 +++++++++++++++------------- - 1 files changed, 15 insertions(+), 13 deletions(-) - -commit ba42b77080cbb2eb7c5b4baa2bfd8a2aa5e98388 -Author: Sjoerd Simons -Date: Mon Sep 17 09:45:54 2007 +0000 - - GibberRMulticastSender: Fix the definition of the received-control-message packet - - - 20070917094554-b58c9-1985f22629682a13b3e0d25cbfa2473ef6d62a48.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 869682af511f2f4b6b1862137b525f4f8dcabbf0 -Author: Sjoerd Simons -Date: Mon Sep 17 09:40:19 2007 +0000 - - GibberRMulticastSender: Don't forget to update the output packets administration when handling control packets - - - 20070917094019-b58c9-95ad9ad2bbe6f0d9bc03ac52c1e5926aecb90a84.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 02624b03b8493b82faafd9dbc3d7d7dd96e5a07b -Author: Sjoerd Simons -Date: Mon Sep 17 09:12:45 2007 +0000 - - Only free the attempt join g_array if it is set - - - 20070917091245-b58c9-107d368ca7ab7c7d7e134dcbd97a4a4a950f1045.gz - - lib/gibber/gibber-r-multicast-packet.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 5fead5feb1a563298d59f9d84cc3dfaff2561c91 -Author: Sjoerd Simons -Date: Fri Sep 14 14:17:05 2007 +0000 - - GibberRMulticastSender: Dependency checking can be done for all reliable packets, not use data packets - - - 20070914141705-b58c9-ac38184cef526edab7fe34510f93ad805425928b.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8bf3d40e92a555ef51c8bd6936bf10cde8d2b859 -Author: Sjoerd Simons -Date: Fri Sep 14 14:15:08 2007 +0000 - - GibberRMulticastSender: Fix some stupid typo's that broke compilation - - - 20070914141508-b58c9-52bb0a2bd368e118ba54b764e2af1e13dfa6809b.gz - - lib/gibber/gibber-r-multicast-sender.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 3da07f4fe85136711f247e66bba1a312b99f4c5c -Author: Sjoerd Simons -Date: Fri Sep 14 14:14:20 2007 +0000 - - GibberRMulticastCausalTransport: Improve packet type debug message a bit - - - 20070914141420-b58c9-ea2356fe424091ce79fa5cf11b41165e55f3f748.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0d7f20ebe042771bad92566fc30dd131a4f28e8d -Author: Sjoerd Simons -Date: Fri Sep 14 14:14:01 2007 +0000 - - GibberRMulticastCausalTransport: Also set packet_id on attempt join packets - - - 20070914141401-b58c9-dc265c06e23d7a8b98c3f4ba3615836e9bfd9655.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 355f20ec19eaae05283cb8cd844ce3dc151fcacc -Author: Sjoerd Simons -Date: Fri Sep 14 13:31:03 2007 +0000 - - GibberRMulticastCausalTransport: Add API to send attempt join messages - - - 20070914133103-b58c9-427ad678c56694d06b07f66beed72a5a8c880748.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 65 ++++++++++++++++++--- - lib/gibber/gibber-r-multicast-causal-transport.h | 8 +++ - 2 files changed, 63 insertions(+), 10 deletions(-) - -commit 18d15360d51fb273fc61c845facca1e1cad41120 -Author: Sjoerd Simons -Date: Fri Sep 14 13:09:33 2007 +0000 - - GibberRMulticastSender: whitespace and comments fixing - - - 20070914130933-b58c9-a51d592e2c11515d58eb86b854f6ea761d94ab24.gz - - lib/gibber/gibber-r-multicast-sender.c | 10 ++++------ - 1 files changed, 4 insertions(+), 6 deletions(-) - -commit 388b9ad69bd39e5d14fcd2345d825165c9b10bf8 -Author: Sjoerd Simons -Date: Fri Sep 14 13:08:23 2007 +0000 - - GibberRMulticastSender: Handle control packets almost but not entirely the same way as data packets - - - 20070914130823-b58c9-78aa9947ebea88b47849a824c359f4e29735e71f.gz - - lib/gibber/gibber-r-multicast-sender.c | 25 ++++++++++++++++++++----- - 1 files changed, 20 insertions(+), 5 deletions(-) - -commit 9283d8c0ed8a290b02120b4a27370f86eef559ed -Author: Sjoerd Simons -Date: Fri Sep 14 13:05:26 2007 +0000 - - GibberRMulticastSender: Add the posibility to keep repeating a specific packet, needed for certain attempt join packets - - - 20070914130526-b58c9-227947dce11f7b330193374714f71d2d6c5ad100.gz - - lib/gibber/gibber-r-multicast-sender.c | 32 +++++++++++++++++++++++++++++++- - lib/gibber/gibber-r-multicast-sender.h | 4 ++++ - 2 files changed, 35 insertions(+), 1 deletions(-) - -commit abe40c230ac7fabb366ebf2d3420eecc3da257e8 -Author: Sjoerd Simons -Date: Fri Sep 14 11:24:59 2007 +0000 - - GibberRMulticastPacket: Add API to add an array of new senders to an attempt join packet - - - 20070914112459-b58c9-b8cae1f8f5a68604b24ea28b95de996711bce464.gz - - lib/gibber/gibber-r-multicast-packet.c | 24 +++++++++++++++++++++++- - lib/gibber/gibber-r-multicast-packet.h | 5 +++++ - 2 files changed, 28 insertions(+), 1 deletions(-) - -commit fd82bece70bf4cebb9b02faa076d4beb4900fd14 -Author: Sjoerd Simons -Date: Fri Sep 14 11:00:58 2007 +0000 - - GibberRMulticastCausalTransport: Add depends to all senders of which we have a known starting sequence number - - - 20070914110058-b58c9-c12fb4b922ddcda2f9a40572ba6290cd0418901c.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit aa6547250f06ff7024fbadd1ba8d208e647b4f53 -Author: Sjoerd Simons -Date: Fri Sep 14 10:59:13 2007 +0000 - - GibberRMulticastSender: Clarify the new semantics of GIBBER_R_MULTICAST_SENDER_STATE_PREPARING a bit more - - - 20070914105913-b58c9-d80643ec767eb472117c8255e7743ee46ec710d0.gz - - lib/gibber/gibber-r-multicast-sender.h | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 2df4caf8bd3501712b81d81b4c68caa86220559f -Author: Sjoerd Simons -Date: Fri Sep 14 10:58:11 2007 +0000 - - GibberRMulticastSender: If the sender isn't preparing yet (thus no sane startpoint is known), ignore all evidence of it's packets - - - 20070914105811-b58c9-74a89216b329f1088360e45e6b9210c4f8caea78.gz - - lib/gibber/gibber-r-multicast-sender.c | 7 +------ - 1 files changed, 1 insertions(+), 6 deletions(-) - -commit 7d4860f880e4008ef379ca4319506876dcc17f6d -Author: Sjoerd Simons -Date: Fri Sep 14 09:43:16 2007 +0000 - - GibberRMulticastCausalTransport: Whitespace fixes - - - 20070914094316-b58c9-1cff555ea41df4b104a269fffe9e452094a69dce.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 215 +++++++++++++--------- - 1 files changed, 130 insertions(+), 85 deletions(-) - -commit 11a9aef3142dc8864f671c6a43662ca27dead565 -Author: Sjoerd Simons -Date: Fri Sep 14 09:14:36 2007 +0000 - - test-r-multicast-transport-io.c: Unref the causal and test transport as soon as another transport owns it - - - 20070914091436-b58c9-7e384df0086d33c6b47decd3a7de6349e052dd16.gz - - tests/test-r-multicast-transport-io.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 2a612f759eb7511283a4ce04c9929bc5292a4faa -Author: Sjoerd Simons -Date: Fri Sep 14 09:11:20 2007 +0000 - - check-gibber-r-multicast-transport.c: Unref the causal transport as soon as the reliable transport owns it - - - 20070914091120-b58c9-05337b78617284591a6ba577172b792114b2a877.gz - - tests/check-gibber-r-multicast-transport.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit dbdafb12b8839a892126c26c74343e1fee2c592d -Author: Sjoerd Simons -Date: Fri Sep 14 09:08:57 2007 +0000 - - GibberMucConnection: Also unref the causal transport when disposing - - - 20070914090857-b58c9-882f7f53ca1f4cc0b279f4e386eb9163ffe64d31.gz - - lib/gibber/gibber-muc-connection.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit c5f9e3d37a37e3c286706d500cd718580cc5d2c0 -Author: Sjoerd Simons -Date: Fri Sep 14 09:06:02 2007 +0000 - - GibberRMulticastTransport: Remove unused property from properties enum - - - 20070914090602-b58c9-c0d4d24b72304a9d885741886f40869d3caea8e5.gz - - lib/gibber/gibber-r-multicast-transport.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit afb9c63769e85c146e735c605dd758fcc8e0be6c -Author: Sjoerd Simons -Date: Wed Sep 12 18:59:40 2007 +0000 - - check-gibber-r-multicast-packet.c: Add test for Attempt Join packet - - - 20070912185940-b58c9-af2560f5bedabe2686e23165c2fa3a88074f68e3.gz - - tests/check-gibber-r-multicast-packet.c | 85 +++++++++++++++++++++++++++++-- - 1 files changed, 81 insertions(+), 4 deletions(-) - -commit cb492385270c519bef46e4be0859b8dbcfca4823 -Author: Sjoerd Simons -Date: Wed Sep 12 18:59:06 2007 +0000 - - check-gibber-r-multicast-sender.c: Cope with seperated packet_id setter - - - 20070912185906-b58c9-e20ff27afefbbc1dbe43070479424166faee9ba4.gz - - tests/check-gibber-r-multicast-sender.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit f2324e72f7e28d814ff7f2b940e0f17f8eeb7113 -Author: Sjoerd Simons -Date: Wed Sep 12 18:58:35 2007 +0000 - - check-gibber-r-multicast-transport.c: Cope with seperated packet_id setter - - - 20070912185835-b58c9-d7dd1efa87e04cd05257d27f75586515a014b726.gz - - tests/check-gibber-r-multicast-transport.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit acad03444b487f05e515a8a9d766a247610e738b -Author: Sjoerd Simons -Date: Wed Sep 12 18:57:48 2007 +0000 - - GibberRMulticastPacket: Add builder/parser for Attempt Join packets - - - 20070912185748-b58c9-da00a7ad189deb6dc11591d54406da3eeb1b5faa.gz - - lib/gibber/gibber-r-multicast-packet.c | 47 ++++++++++++++++++++++++++++++- - lib/gibber/gibber-r-multicast-packet.h | 15 ++++++++++ - 2 files changed, 60 insertions(+), 2 deletions(-) - -commit 52a807f42bda7a2f709b2ba5ab37bfc97c744b45 -Author: Sjoerd Simons -Date: Wed Sep 12 14:39:02 2007 +0000 - - GibberRMulticastCausalTransport: Use the new generic packet id setter - - - 20070912143902-b58c9-391b5763b72b317e29fa5eb96578f7b2149df139.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit 319e030a5f04a1ffb9745936ce5fe848ea579976 -Author: Sjoerd Simons -Date: Wed Sep 12 14:38:20 2007 +0000 - - GibberRMulticastPacket: Provide a single function for all reliable packets to set the packet id - - - 20070912143820-b58c9-2023e415031fe5f7834a31f40e7b13da107ebf1d.gz - - lib/gibber/gibber-r-multicast-packet.c | 12 ++++++++++-- - lib/gibber/gibber-r-multicast-packet.h | 5 ++++- - 2 files changed, 14 insertions(+), 3 deletions(-) - -commit cbb2f2929305c8acbf131716949260f29e455452 -Author: Sjoerd Simons -Date: Wed Sep 12 14:05:10 2007 +0000 - - GibberRMulticastTransport: When receiving a foreign packet, immediately add it to the known senders with all needed information if necessary - - - 20070912140510-b58c9-303cc0cc9957a8e3bc9b09577069b66d5dab85aa.gz - - lib/gibber/gibber-r-multicast-transport.c | 34 +++++++++++++++++++++++++++++ - 1 files changed, 34 insertions(+), 0 deletions(-) - -commit 0b5673073fbd0a90085e8087edce70707d9d7c3b -Author: Sjoerd Simons -Date: Wed Sep 12 14:04:04 2007 +0000 - - GibberRMulticastCausalTransport: Let high layer decide on which senders to add. And assume they do so in a consistent way - - - 20070912140404-b58c9-a162558cc709d6306f11621092cd57b55517ef5d.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 79 ++++++++++++++-------- - lib/gibber/gibber-r-multicast-causal-transport.h | 9 +++ - 2 files changed, 61 insertions(+), 27 deletions(-) - -commit cfde7941b9cbfed69707ce8c893092e9572b1bcb -Author: Sjoerd Simons -Date: Wed Sep 12 13:58:13 2007 +0000 - - GibberRMulticastSender: Add api to let users decide what the first packet of a senders sequence is - - - 20070912135813-b58c9-5dea3a5382e0c3f91f98375dfafc740422ba3b78.gz - - lib/gibber/gibber-r-multicast-sender.c | 33 ++++++++++++++++++++++++------- - lib/gibber/gibber-r-multicast-sender.h | 4 +++ - 2 files changed, 29 insertions(+), 8 deletions(-) - -commit b299c4d462e8790dcf11c09a772601c967be5c18 -Author: Sjoerd Simons -Date: Wed Sep 12 13:57:36 2007 +0000 - - GibberRMulticastSender: We should have a node's first packet and thus be able to repair it - - - 20070912135736-b58c9-68eb21cece99774151147d84c5e78cf8d178d23e.gz - - lib/gibber/gibber-r-multicast-sender.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 1544376841f0c4e6b122298c371d6fa4e87ffacb -Author: Sjoerd Simons -Date: Wed Sep 12 11:28:29 2007 +0000 - - GibberRMulticstCausalTransport: Move sender_id to public struct so it can be used for policy decisions - - - 20070912112829-b58c9-4b27f303d1d3fee71c5a7eb1e763892c6ae54c18.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 15 +++++++-------- - lib/gibber/gibber-r-multicast-causal-transport.h | 1 + - 2 files changed, 8 insertions(+), 8 deletions(-) - -commit 14c5c165bb01518c09f185317f66f88e114dcae3 -Author: Sjoerd Simons -Date: Wed Sep 12 10:54:50 2007 +0000 - - Move the common reliable packet information into the common packet structure. As this is now needed for a lot more then just DATA - - - 20070912105450-b58c9-9b2eea3e1e7c9736a4f67e620df155221169b817.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 4 +- - lib/gibber/gibber-r-multicast-packet.c | 70 +++++++++++----------- - lib/gibber/gibber-r-multicast-packet.h | 35 +++++++---- - lib/gibber/gibber-r-multicast-sender.c | 54 ++++++++++------- - tests/check-gibber-r-multicast-packet.c | 4 +- - tests/check-gibber-r-multicast-sender.c | 2 +- - tests/check-gibber-r-multicast-transport.c | 4 +- - 7 files changed, 96 insertions(+), 77 deletions(-) - -commit 5583e49ae9b837471293b477c6a9a1c46d577d1f -Author: Sjoerd Simons -Date: Wed Sep 12 08:55:50 2007 +0000 - - GibberRMulticastTransport: Add a temporaty hack to make new-sender work - - - 20070912085550-b58c9-14ee363102e64b409a388fbc2085bb30f86be3bb.gz - - lib/gibber/gibber-r-multicast-transport.c | 26 ++++++++++++++++++++++---- - 1 files changed, 22 insertions(+), 4 deletions(-) - -commit 002cec866541bf6a71e2d2c5c18ae1891c2f7b29 -Author: Sjoerd Simons -Date: Wed Sep 12 08:54:32 2007 +0000 - - Always put a causal multicast transport under the r-multicast transport - - - 20070912085432-b58c9-eee8641d82a8b93153288372c97452e89d581f2c.gz - - lib/gibber/gibber-muc-connection.c | 44 +++++++++++++++++++-------- - tests/check-gibber-r-multicast-transport.c | 45 +++++++++++++++++++++------ - tests/test-r-multicast-transport-io.c | 29 ++++++++++++----- - 3 files changed, 86 insertions(+), 32 deletions(-) - -commit ba956ea5ba285edefb09c59414979c9ac0db6847 -Author: Sjoerd Simons -Date: Wed Sep 12 08:54:13 2007 +0000 - - GibberRMulticastTransport: Rework to work on top of a causal transport - - - 20070912085413-b58c9-c6ec8f7976730f8ca0cc05d4708118eb4527b04a.gz - - lib/gibber/gibber-r-multicast-transport.c | 679 +--------------------------- - lib/gibber/gibber-r-multicast-transport.h | 10 +- - 2 files changed, 28 insertions(+), 661 deletions(-) - -commit a7a46f7a20972cda900074bf1912fc4e604774fe -Author: Sjoerd Simons -Date: Wed Sep 12 08:53:32 2007 +0000 - - GibberRMulticastCausalTransport: Rename everything to the proper namespace - - - 20070912085332-b58c9-059935668a28be506a2c1e6e891d4959bcfc31f6.gz - - lib/gibber/gibber-r-multicast-causal-transport.c | 295 ++++++++++++---------- - lib/gibber/gibber-r-multicast-causal-transport.h | 74 +++--- - 2 files changed, 201 insertions(+), 168 deletions(-) - -commit 6a61401aa3bbef0e0a3fb33dbc2b2a407f45acbc -Author: Sjoerd Simons -Date: Wed Sep 12 08:37:37 2007 +0000 - - Re-add gibber-r-multicast-transport - - - 20070912083737-b58c9-c1ef7affb2fd3c32ac218f74e37e4a832617d8e8.gz - - lib/gibber/gibber-r-multicast-transport.c | 907 +++++++++++++++++++++++++++++ - lib/gibber/gibber-r-multicast-transport.h | 83 +++ - 2 files changed, 990 insertions(+), 0 deletions(-) - -commit d2d661dfa91d45d139e4dee90c683980881cb876 -Author: Sjoerd Simons -Date: Wed Sep 12 08:28:35 2007 +0000 - - Split a lower causal layer out of gibber-r-multicast-causal-transport.c - - - 20070912082835-b58c9-3ccd30c7060d89e6881196c719e77e99587c0fdf.gz - - lib/gibber/Makefile.am | 3 + - lib/gibber/gibber-r-multicast-causal-transport.c | 907 ++++++++++++++++++++++ - lib/gibber/gibber-r-multicast-causal-transport.h | 83 ++ - lib/gibber/gibber-r-multicast-transport.c | 907 ---------------------- - lib/gibber/gibber-r-multicast-transport.h | 83 -- - 5 files changed, 993 insertions(+), 990 deletions(-) - -commit 43ae286219b30d71ada9125ef2a8c4b05a09ab3d -Author: Sjoerd Simons -Date: Tue Sep 11 09:07:00 2007 +0000 - - GibberMulticastTransport: Throw out silly whitespace - - - 20070911090700-b58c9-7199efc8cc08aef09f215ae1d33a3fb893ddefeb.gz - - lib/gibber/gibber-multicast-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 86745918b96b467906daef1f0e02818347c705e6 -Author: Simon McVittie -Date: Wed Oct 31 16:23:21 2007 +0000 - - SalutMucManager: return the existing tubes channel when signalling EXISTING (dev.laptop.org #4565) - - - 20071031162321-53eee-5196f8ed74071a4c283c9bfb42f628c1114c752e.gz - - src/salut-muc-manager.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 42573392fff5344ffd5b6f61ba25710befee0f81 -Author: Simon McVittie -Date: Fri Oct 26 10:59:25 2007 +0000 - - Install telepathy-salut in libexecdir, adjust .service accordingly - - - 20071026105925-53eee-2a53c7862a63ef32bd4f06b69703fb1d559c69e4.gz - - data/Makefile.am | 4 ++-- - ...op.Telepathy.ConnectionManager.salut.service.in | 2 +- - src/Makefile.am | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -commit b5ad93835e5b5e3181d332821d354781a114d091 -Author: Guillaume Desmottes -Date: Tue Oct 23 14:39:40 2007 +0000 - - tube-dbus: salut_tube_dbus_add_name: check D-Bus name if it starts with ":2." - - - 20071023143940-7fe3f-82fda4900ef26b78d8366352ee84242c08d1f8ba.gz - - src/tube-dbus.c | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) - -commit 1e2c2fe3f30c15bc72f9b67c6615f67b1bd71430 -Author: Guillaume Desmottes -Date: Tue Oct 23 14:29:34 2007 +0000 - - tubes-channel: use tube-dbus's functions to add/remove name to d-bus names - - - 20071023142934-7fe3f-59021d181df9cf465ade709c562538dcaef195fb.gz - - src/salut-tubes-channel.c | 59 ++++++++++---------------------------------- - 1 files changed, 14 insertions(+), 45 deletions(-) - -commit 62b69ab4b8537529ca2f6b315bc9eb491d473390 -Author: Guillaume Desmottes -Date: Tue Oct 23 14:28:58 2007 +0000 - - tube-dbus: add public functions to add/remove name to/from dbus names - - - 20071023142858-7fe3f-01f7f7725e5b86d0439b2cd9efa1a402ba17d576.gz - - src/tube-dbus.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/tube-dbus.h | 8 +++++++ - 2 files changed, 66 insertions(+), 0 deletions(-) - -commit 9780bf88442fecf74048e2260f1033efff58aa9a -Author: Guillaume Desmottes -Date: Tue Oct 23 14:06:11 2007 +0000 - - tube-dbus: use new algorithm to generate D-Bus local name - - - 20071023140611-7fe3f-44e7bb8f1a9275eea15a91bc14aa645613d9bee6.gz - - src/tube-dbus.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 53 insertions(+), 3 deletions(-) - -commit 7af283f37322cd01bc44b52a619a2e2725138341 -Author: Guillaume Desmottes -Date: Tue Oct 23 14:03:34 2007 +0000 - - sha1/sha1-util: add sha1_bin function - - - 20071023140334-7fe3f-76bd51b249b43745d84f27f749fc5bdef4183400.gz - - src/sha1/sha1-util.c | 12 ++++++++++++ - src/sha1/sha1-util.h | 6 ++++-- - 2 files changed, 16 insertions(+), 2 deletions(-) - -commit db5e17805a0f5a5cfefaef77930d28cf27ceab71 -Author: Guillaume Desmottes -Date: Tue Oct 23 14:02:14 2007 +0000 - - tubes-channel: be sure dbus-names related functions do anything in 1-1 D-Bus tubes - - - 20071023140214-7fe3f-42df2311498f20ef7db974c2bcc62db4ae6dbe90.gz - - src/salut-tubes-channel.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit 5cc83b49180da0f94219f9e65472a6976b83f8e9 -Author: Guillaume Desmottes -Date: Tue Oct 23 13:32:55 2007 +0000 - - tubes-channel: publish_tube_in_node: set dbus-name only if not NULL and set initiator only for D-Bus tubes - - - 20071023133255-7fe3f-4851cb1468e91eb148eb55d07042a924acfa2104.gz - - src/salut-tubes-channel.c | 40 ++++++++++++++++++++-------------------- - 1 files changed, 20 insertions(+), 20 deletions(-) - -commit 15c3c17a628eb409d0a28b7a4d958ec8075f047b -Author: Guillaume Desmottes -Date: Mon Oct 22 15:17:35 2007 +0000 - - use gibber_normalize_address in gibber_ll_transport_get_address - - - 20071022151735-7fe3f-a109c71a59bdc36a8a1a4bba6c436fe236775c5b.gz - - lib/gibber/gibber-linklocal-transport.c | 11 +++-------- - 1 files changed, 3 insertions(+), 8 deletions(-) - -commit c71a5e65f8a93b15df03323d9c6be035ceb78391 -Author: Guillaume Desmottes -Date: Mon Oct 22 15:12:37 2007 +0000 - - rename normalize_address to gibber_normalize_address - - - 20071022151237-7fe3f-11eb505386fba70cec7de7da2aa5381fdc6ce70e.gz - - lib/gibber/gibber-util.c | 2 +- - lib/gibber/gibber-util.h | 2 +- - lib/gibber/gibber-xmpp-connection-listener.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -commit c331029f85f590e1d4201facc96fc8ff182cda6e -Author: Simon McVittie -Date: Mon Oct 22 13:58:08 2007 +0000 - - Use tar-ustar for distcheck so long version numbers (with a datestamp) and long filenames (the .service) don't lead to failure - - - 20071022135808-53eee-e3b1b07886be12dadb085f8c02fd45c8b842b5cb.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8721f71ca6fdf2a04b190fa824e5564c134fde24 -Author: Simon McVittie -Date: Mon Oct 22 13:04:37 2007 +0000 - - Remove duplicate copy of muc_connection_new_sender_cb caused by diff|patch merging - - - 20071022130437-53eee-bacd2354095dd532e704865a0b2f98ce87f0b9e8.gz - - src/salut-tubes-channel.c | 10 ---------- - 1 files changed, 0 insertions(+), 10 deletions(-) - -commit 0eae970036199e9e70c044c422e147408ceea54e -Author: Simon McVittie -Date: Mon Oct 22 12:52:53 2007 +0000 - - tubes-channel: remove the "request" attribute in tubes announces (re-recorded) - - Originally by Guillaume, re-recorded to avoid depending on his stream tubes work. - - 20071022125253-53eee-5a3bdb09f96832aaa99cd01d8dad3c1bc232d356.gz - - src/salut-tubes-channel.c | 34 ++++++++++++++-------------------- - 1 files changed, 14 insertions(+), 20 deletions(-) - -commit ed957f2de6b22bac72b85eef29dd03ceb2411d4a -Author: Guillaume Desmottes -Date: Mon Oct 22 09:53:05 2007 +0000 - - tubes-channel: send tubes info when get a "new-sender" event - - - 20071022095305-7fe3f-acfcf154a7c9f6bbe5d0a97417433cc6c3c720f2.gz - - src/salut-tubes-channel.c | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) - -commit 9f1e23713c463d6f850f20b656571c21183ac6b9 -Author: Simon McVittie -Date: Fri Oct 19 15:09:28 2007 +0000 - - Use gibber_xmpp_stanza_build to build invitation messages - - - 20071019150928-53eee-353ef7dd9fbb58b81f983d237175cb4eea070456.gz - - src/salut-muc-channel.c | 42 +++++++++++++++++++++++++----------------- - 1 files changed, 25 insertions(+), 17 deletions(-) - -commit a2f9f337404697f0e922605a8573c95fc80374d8 -Author: Simon McVittie -Date: Fri Oct 19 15:08:41 2007 +0000 - - Add GIBBER_NODE_ASSIGN_TO opcode to gibber_xmpp_stanza_build - - - 20071019150841-53eee-c6180e5eccfd5d5819a0d12b881444be3bfc90d9.gz - - lib/gibber/gibber-transport.h | 2 +- - lib/gibber/gibber-xmpp-stanza.c | 9 +++++++++ - lib/gibber/gibber-xmpp-stanza.h | 1 + - 3 files changed, 11 insertions(+), 1 deletions(-) - -commit d6ce1334a69b536399233a701ca3911575360a10 -Author: Sjoerd Simons -Date: Fri Oct 5 15:36:37 2007 +0000 - - GibberTransport: Add disconnecting state - - - 20071005153637-b58c9-a8f3b244f2ff80cbb6898397c99a32c614e5ae2b.gz - - lib/gibber/gibber-transport.c | 24 +++++++++++++++++++----- - lib/gibber/gibber-transport.h | 8 ++++---- - 2 files changed, 23 insertions(+), 9 deletions(-) - -commit bfd2175431bd9b0e7e1ffdbaa25634058a1e5361 -Author: Guillaume Desmottes -Date: Mon Oct 22 12:39:43 2007 +0000 - - gibber-util.h: add G_BEGIN_DECLS/G_END_DECLS - - - 20071022123943-7fe3f-95aaa009e6e764b9ebf8dd4710523c16b54097e9.gz - - lib/gibber/gibber-util.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 8a170d7e9a2b46845a368533f4ab3a863830d4f5 -Author: Guillaume Desmottes -Date: Mon Oct 22 12:39:27 2007 +0000 - - gibber-util.c: fix normalize_address - - - 20071022123927-7fe3f-ce231bade927568fb31054bd52c8afd418a7cddf.gz - - lib/gibber/gibber-util.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 67b36d668299a3030a50c0df4245b94655a0cea4 -Author: Guillaume Desmottes -Date: Mon Oct 22 12:17:54 2007 +0000 - - move normalize_address from gibber-xmpp-connection-listener.c to gibber-util.c - - - 20071022121754-7fe3f-483fedae6edac3d83cd2896fbc69efc661b96905.gz - - lib/gibber/gibber-util.c | 21 +++++++++++++++++++++ - lib/gibber/gibber-util.h | 5 ++++- - lib/gibber/gibber-xmpp-connection-listener.c | 22 +--------------------- - 3 files changed, 26 insertions(+), 22 deletions(-) - -commit ff7cb122b8f87daba0dd181551f9edc58272d57e -Author: Guillaume Desmottes -Date: Mon Oct 22 12:12:47 2007 +0000 - - add and build gibber-util.[ch] - - - 20071022121247-7fe3f-7cea05172b26e7a88ac79838f6346fa7a17052d8.gz - - lib/gibber/Makefile.am | 2 ++ - lib/gibber/gibber-util.c | 26 ++++++++++++++++++++++++++ - lib/gibber/gibber-util.h | 26 ++++++++++++++++++++++++++ - 3 files changed, 54 insertions(+), 0 deletions(-) - -commit 91234dd98f52dba9e8329db6407cec0c24f8948d -Author: Guillaume Desmottes -Date: Mon Oct 22 12:04:52 2007 +0000 - - gibber-xmpp-connection-listener.c: make normalize_address more portable - - - 20071022120452-7fe3f-384bcd26fe8f1c2584a3cc4d169a769f4af80b64.gz - - lib/gibber/gibber-xmpp-connection-listener.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -commit b0b6f0f2c56fcd7ef979a5ac4ae82d406befc0cd -Author: Sjoerd Simons -Date: Mon Oct 22 08:54:20 2007 +0000 - - Fix some more style issues - - - 20071022085420-93b9a-a15f67979eeb3ff6d28121510bc78f5707893b55.gz - - src/salut-muc-manager.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 9c413bf668a23a3c659cc6b83ea95da7c173db74 -Author: Sjoerd Simons -Date: Mon Oct 22 07:58:48 2007 +0000 - - SalutMucManager: break if we found good parameters for the room to join - - - 20071022075848-b58c9-7ca9d0563ca21a53f8c63ec7c23f5e6e55cf25a5.gz - - src/salut-muc-manager.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 829195d7e1ab43e0a7252a41e938adcb806bd407 -Author: Sjoerd Simons -Date: Mon Oct 22 07:55:56 2007 +0000 - - Whitespace fixes - - - 20071022075556-b58c9-6df0da4693ea4d1589c6e0320f03d7806c33872c.gz - - src/salut-muc-channel.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit 444b15954aea7f5cf7e750c60a540f6f4dc17310 -Author: Sjoerd Simons -Date: Mon Oct 22 07:55:52 2007 +0000 - - Whitespace fixes - - - 20071022075552-b58c9-3b3237bf4ddd1e22d63012362971ce398b20f1e4.gz - - src/salut-muc-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f800ec45c5d85473ca0347195f52b66d9af82fe9 -Author: Sjoerd Simons -Date: Thu Oct 18 20:03:47 2007 +0000 - - SalutMucChannel: If we're connecting and the self handle is added.. Don't readd/restart connection - - - 20071018200347-b58c9-08df8b739cb82c5845693691ebbc536cfc5846fc.gz - - src/salut-muc-channel.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit ec4108a875a6c519224cd6c15a3dd04f63e8b7e3 -Author: Sjoerd Simons -Date: Sun Oct 21 20:27:19 2007 +0000 - - SalutMucManager: Keep an array of resolvers, so we can reflect finding multiple records for one room correctly - - - 20071021202719-b58c9-87740c5557e85d450dadb305b4cf73cfd4002c42.gz - - src/salut-muc-manager.c | 131 ++++++++++++++++++++++++++++++++++------------- - 1 files changed, 96 insertions(+), 35 deletions(-) - -commit 7a86296d79ee0e4570096cd75b98ba23a262d64f -Author: Guillaume Desmottes -Date: Wed Sep 19 08:10:35 2007 +0000 - - fix OLPC disabled build - - - 20070919081035-7fe3f-c0cf000510a1d718f2ff6f97c2474f8ba159741f.gz - - src/salut-connection.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit d68b7afdd91463871a58afd96fd22afeb7bd7a0e -Author: Guillaume Desmottes -Date: Tue Sep 18 16:06:00 2007 +0000 - - add debug in muc_ready_cb - - - 20070918160600-7fe3f-797f9304f8a7756b1fc7f67366704266beb329ad.gz - - src/salut-connection.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 96c89de6f87ad8523678926a6c0f8c1cae2878c1 -Author: Guillaume Desmottes -Date: Tue Sep 18 16:02:31 2007 +0000 - - forget about invites when we join the room - - - 20070918160231-7fe3f-094f066a2b50fbb9a21b2c4ee36dff6ccf05eb78.gz - - src/salut-connection.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 65 insertions(+), 0 deletions(-) - -commit a3ab2659d3f8524e2d9bcc8358a8a3fef7f345ee -Author: Guillaume Desmottes -Date: Tue Sep 18 15:39:30 2007 +0000 - - check room handle in salut_contact_left_private_activity - - - 20070918153930-7fe3f-0fb6ba89834235ee9e07e7153864c6f8ce6deacb.gz - - src/salut-contact.c | 16 +++++++++++++--- - 1 files changed, 13 insertions(+), 3 deletions(-) - -commit bdbc5adf82a31733f35cb3988ce35bdd5e6fcb78 -Author: Guillaume Desmottes -Date: Tue Sep 18 15:07:22 2007 +0000 - - add a FIXME about salut_contact_takes_part_in_olpc_activity - - - 20070918150722-7fe3f-0f915f5eaa5bf1704406b5fe655f982dbfe86aef.gz - - src/salut-connection.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit ef51e1c28639384a6fd0e4083e2373350e1ff234 -Author: Guillaume Desmottes -Date: Tue Sep 18 14:21:51 2007 +0000 - - revoke invites when we remove an activity due to a SetActivity call instead of using the muc closed signal - - - 20070918142151-7fe3f-58937dc85a1ae4d77dc4386093e1ae7ad873ea6d.gz - - src/salut-self.c | 35 ++++++++++------------------------- - 1 files changed, 10 insertions(+), 25 deletions(-) - -commit 1bc4fa86f9fcf87fa83003e198a3842b3ec5edff -Author: Guillaume Desmottes -Date: Tue Sep 18 13:45:45 2007 +0000 - - add 2 debug output + coding style tweaks - - - 20070918134545-7fe3f-43ea1b944a8abf4e9c51008887ce1ee7c7588555.gz - - src/salut-connection.c | 15 ++++++++------- - src/salut-self.c | 1 + - 2 files changed, 9 insertions(+), 7 deletions(-) - -commit 8115350a43ce00c72838a61c11e40d29b68aaf35 -Author: Guillaume Desmottes -Date: Tue Sep 18 13:21:30 2007 +0000 - - salut-connection: catch uninvite stanza and remove the contact from the activity - - - 20070918132130-7fe3f-e62d28eec96eac94101c17b610b56bf29063c464.gz - - src/salut-connection.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 74 insertions(+), 0 deletions(-) - -commit dd94d72fe0acc7928ed5e9eddff821c4e380af6b -Author: Guillaume Desmottes -Date: Tue Sep 18 13:21:06 2007 +0000 - - salut-contact: add salut_contact_left_private_activity public method - - - 20070918132106-7fe3f-03740544e77ad97ee7f7d854901544922951fa1f.gz - - src/salut-contact.c | 14 ++++++++++++++ - src/salut-contact.h | 4 ++++ - 2 files changed, 18 insertions(+), 0 deletions(-) - -commit 222247d90be46c1d14ebda601dd10c5de1b9fb31 -Author: Guillaume Desmottes -Date: Tue Sep 18 11:17:07 2007 +0000 - - salut-self: send uninvite stanza when we leave a muc associated with an activity - - - 20070918111707-7fe3f-748897d45dcf4468f039178c87e0e45aa14354cf.gz - - src/salut-self.c | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 163 insertions(+), 0 deletions(-) - -commit ac3430a69bd195708b1ae5478193d3bdde153142 -Author: Guillaume Desmottes -Date: Thu Oct 18 12:59:08 2007 +0000 - - salut-muc-manager.c: disconnect browser signals when closing to not be notified of disappearance of muc's service that will be close by us - - - 20071018125908-7fe3f-d048e1a4acff463b93d2312bd34237d2942b4ec3.gz - - src/salut-muc-manager.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 0179ce8cb9fe1beea3d93522c5b41549f4549258 -Author: Guillaume Desmottes -Date: Thu Oct 18 11:47:54 2007 +0000 - - gibber-xmpp-error: revert gint -> int useless change in gibber_xmpp_error_from_node - - - 20071018114754-7fe3f-712c8dddee606296aa47553a425b7aee0b17658e.gz - - lib/gibber/gibber-xmpp-error.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 511c872a74c93dfc15ac8a4aa0a6b704ab2d839e -Author: Guillaume Desmottes -Date: Thu Oct 18 10:50:10 2007 +0000 - - add parentheses around the expansion of GIBBER_XMPP_ERROR - - - 20071018105010-7fe3f-eb52fa49392032fc832ba8d2de5dc0b30b3f6971.gz - - lib/gibber/gibber-xmpp-error.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3c6914a0c2ade851ff0135604e18b424f552527a -Author: Guillaume Desmottes -Date: Thu Oct 18 10:49:29 2007 +0000 - - drop INVALID_XMPP_ERROR. Use XMPP_ERROR_UNDEFINED_CONDITION instead - - - 20071018104929-7fe3f-8ad350490986bf9525b03e53d8f1b819fcddcb1e.gz - - lib/gibber/gibber-xmpp-error.c | 4 ++-- - lib/gibber/gibber-xmpp-error.h | 2 -- - 2 files changed, 2 insertions(+), 4 deletions(-) - -commit 7aadb9101af02e704aeeec1fbfb88cf6b87bf3e8 -Author: Guillaume Desmottes -Date: Thu Oct 18 10:47:37 2007 +0000 - - use a g_return_val_if_fail in gibber_xmpp_error_to_node - - - 20071018104737-7fe3f-3cedd77f450d7b841eebc83744aa50a24a347853.gz - - lib/gibber/gibber-xmpp-error.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 7f5ce3b502f28ea6d8cfcd82bb0f7b8c58a404aa -Author: Guillaume Desmottes -Date: Thu Oct 18 10:45:09 2007 +0000 - - don't skip UNDEFINED_CONDITION in gibber_xmpp_error_from_node first loop - - - 20071018104509-7fe3f-e89879cc312d8f8e58a25433cb6642ad04f6a68b.gz - - lib/gibber/gibber-xmpp-error.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit f65e975fed2e780236ae2270bca0da4f7578e012 -Author: Guillaume Desmottes -Date: Thu Oct 18 10:37:38 2007 +0000 - - gibber-xmpp-error: update copyright and drop @author - - - 20071018103738-7fe3f-4c19e847007dd39ecf505fb13bca679c2851b5ae.gz - - lib/gibber/gibber-xmpp-error.c | 3 +-- - lib/gibber/gibber-xmpp-error.h | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -commit cd0d1fe5c7fef8b5aeb59d8b1f09bba71d20e43b -Author: Guillaume Desmottes -Date: Thu Oct 18 10:28:31 2007 +0000 - - gibber-xmpp-error: gibber_xmpp_error_to_node shouldn't accept XMPP_ERROR_UNDEFINED_CONDITION - - - 20071018102831-7fe3f-b25bbcdcf76f3c026f77c1a99dfd3192ca67e41c.gz - - lib/gibber/gibber-xmpp-error.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b63015a1601853da5efba411f8b9443eb1ae2b0a -Author: Guillaume Desmottes -Date: Thu Oct 18 10:22:48 2007 +0000 - - gibber-xmpp-error.c: use the NS when looking for the error child - - - 20071018102248-7fe3f-d46e72a849ca84fb8666b0ea15cb9b976ef7759f.gz - - lib/gibber/gibber-xmpp-error.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 2ef1addb4fdeb2fd9d63382a5e495b643bb0dcc5 -Author: Guillaume Desmottes -Date: Thu Oct 18 10:15:21 2007 +0000 - - move XMPP_ERROR_UNDEFINED_CONDITION to index 0 of xmpp_errors - - - 20071018101521-7fe3f-f35e84f84367d913f555b7a3630858127c496031.gz - - lib/gibber/gibber-xmpp-error.c | 24 +++++++++++++----------- - lib/gibber/gibber-xmpp-error.h | 5 +++-- - tests/check-gibber-xmpp-error.c | 2 +- - 3 files changed, 17 insertions(+), 14 deletions(-) - -commit 683869457f73e7ce6917c099796ac54e9e6ec747 -Author: Guillaume Desmottes -Date: Thu Oct 18 10:02:01 2007 +0000 - - use XMPP_ERROR_UNDEFINED_CONDITION instead of XMPP_ERROR_UNKNOWN - - - 20071018100201-7fe3f-d14a97983133c6d18cd8d4107dbcf2129838d27b.gz - - lib/gibber/gibber-xmpp-error.c | 6 +++--- - lib/gibber/gibber-xmpp-error.h | 1 - - 2 files changed, 3 insertions(+), 4 deletions(-) - -commit 4650703b96856e870fcebd4afa90ff64e07429ec -Author: Guillaume Desmottes -Date: Thu Oct 18 09:57:23 2007 +0000 - - rename XMPP_ERROR_JINGLE_UNKOWN_SESSION to XMPP_ERROR_JINGLE_UNKNOWN_SESSION - - - 20071018095723-7fe3f-3023ed433af308626ceaa159a9e7c82d79e9ec1a.gz - - lib/gibber/gibber-xmpp-error.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 5d2c823f925e4d27e4d08755b34eccf4d2bcba55 -Author: Guillaume Desmottes -Date: Thu Oct 18 09:26:53 2007 +0000 - - gibber-xmpp-error: set NS to GIBBER_XMPP_NS_STANZAS instead of NULL - - - 20071018092653-7fe3f-5c363a898e3eb20fae4fbd8bdc4c4e00c571c53c.gz - - lib/gibber/gibber-xmpp-error.c | 44 ++++++++++++++++++++-------------------- - 1 files changed, 22 insertions(+), 22 deletions(-) - -commit 581dbdfc63d904578444601130638c6f94014abc -Author: Guillaume Desmottes -Date: Thu Oct 18 09:12:07 2007 +0000 - - gibber-xmpp-error: rename "action cancel" type to "cancel" - - - 20071018091207-7fe3f-88165579960167533e213d66e5085d6ffb04f046.gz - - lib/gibber/gibber-xmpp-error.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b029f1518bc4ea32028bdbf4ea67aa3527a3e089 -Author: Guillaume Desmottes -Date: Wed Oct 17 14:51:15 2007 +0000 - - add jingle errors NS - - - 20071017145115-7fe3f-9045aaae3cf2efbd008ef6dd4b968e73cf609ad9.gz - - lib/gibber/gibber-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 81ae25ba18f58abab6b173638dc1e61ae8cb9e99 -Author: Guillaume Desmottes -Date: Tue Oct 16 14:59:08 2007 +0000 - - add OOB NS - - - 20071016145908-7fe3f-0bd6e603b25b2c9a6718107e4302764b63bbdd24.gz - - lib/gibber/gibber-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 2b171d1678c6350e6c73379e093b650cfa5b4445 -Author: Guillaume Desmottes -Date: Tue Oct 16 11:52:09 2007 +0000 - - gibber-namespaces.h: add SI related NS - - - 20071016115209-7fe3f-88728f8ee5e1723c5c876fe7eb77f0d837c8c99c.gz - - lib/gibber/gibber-namespaces.h | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit 00d14469daf520ef026cbcab4ce3bce2e468c024 -Author: Guillaume Desmottes -Date: Wed Oct 17 14:52:15 2007 +0000 - - add gibber-xmpp-error checks in test process - - - 20071017145215-7fe3f-6ad77b5ed5129418b12dc1356a40fe336caeed16.gz - - tests/Makefile.am | 3 ++- - tests/check-gibber.h | 1 + - tests/check-main.c | 1 + - 3 files changed, 4 insertions(+), 1 deletions(-) - -commit 3adb16f76564d1bce9fe380d2f66172c2344bb7b -Author: Guillaume Desmottes -Date: Wed Oct 17 14:51:47 2007 +0000 - - add check-gibber-xmpp-error.c - - - 20071017145147-7fe3f-b2f507e111b553fd4c6cb85cf646f26d2daa7336.gz - - tests/check-gibber-xmpp-error.c | 138 +++++++++++++++++++++++++++++++++++++++ - 1 files changed, 138 insertions(+), 0 deletions(-) - -commit 9ef0f80a1476a8b1df50c3f4bde7ba313c24821b -Author: Guillaume Desmottes -Date: Wed Oct 17 14:50:59 2007 +0000 - - build gibber-xmpp-error - - - 20071017145059-7fe3f-16d70f3ac5f0032c5d900d4cc5782cb9395a760d.gz - - lib/gibber/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 53b278f561fa814fba9229ac3b8182f2d3dcce51 -Author: Guillaume Desmottes -Date: Wed Oct 17 14:50:35 2007 +0000 - - add gibber-xmpp-error.[ch] - - - 20071017145035-7fe3f-8488fca172a08e5b1b5008ef941236854aead617.gz - - lib/gibber/gibber-xmpp-error.c | 481 ++++++++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-xmpp-error.h | 89 ++++++++ - 2 files changed, 570 insertions(+), 0 deletions(-) - -commit 1890937b2fb176ddf96a112eded06264c0761a97 -Author: Guillaume Desmottes -Date: Mon Oct 15 13:25:13 2007 +0000 - - add a bytestream argument to tube_dbus_new and create_new_tube as in Gabble - - - 20071015132513-7fe3f-a5b30376012c95a88a0caf5e60c0279bc47e36f1.gz - - src/salut-tubes-channel.c | 28 ++++++++++++++-------------- - src/tube-dbus.c | 10 ++++++++-- - src/tube-dbus.h | 3 ++- - 3 files changed, 24 insertions(+), 17 deletions(-) - -commit 462b8bb8160e87eff802cb9a0fe08af83b0b1062 -Author: Guillaume Desmottes -Date: Mon Oct 15 13:01:25 2007 +0000 - - add a GError argument to salut_tube_iface_accept as in Gabble - - - 20071015130125-7fe3f-82fa5996d5e6a3c95ee4126888086737189793c8.gz - - src/salut-tubes-channel.c | 2 +- - src/tube-dbus.c | 11 +++++++---- - src/tube-iface.c | 9 +++++---- - src/tube-iface.h | 6 +++--- - 4 files changed, 16 insertions(+), 12 deletions(-) - -commit f09a22bf1cbf6ea87fc46d85539a387b10b7b6e1 -Author: Guillaume Desmottes -Date: Mon Oct 15 12:22:36 2007 +0000 - - tubes-channel: coding style tweaks and remove old commented code - - - 20071015122236-7fe3f-7ebfc737d4d989a1d5cdf654cf147154a0ddf1e8.gz - - src/salut-tubes-channel.c | 184 ++------------------------------------------- - 1 files changed, 7 insertions(+), 177 deletions(-) - -commit a87f97238d86e02511ae5f560e156bc1658e1198 -Author: Guillaume Desmottes -Date: Mon Oct 15 12:01:37 2007 +0000 - - tube-dbus: implement message reassembly (code from Gabble) - - - 20071015120137-7fe3f-ce4939a71beb7df3368a0eda47bb627695cd4ba0.gz - - src/tube-dbus.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++-------- - 1 files changed, 162 insertions(+), 26 deletions(-) - -commit 238b4d98b5aac030a14aeffafab4c187e7f4f8a4 -Author: Guillaume Desmottes -Date: Mon Oct 15 11:07:03 2007 +0000 - - tube-dbus: use a switch in get_tube_state - - - 20071015110703-7fe3f-03136c656bb22404c8e143fc563d14f31d688f93.gz - - src/tube-dbus.c | 28 +++++++++++++++------------- - 1 files changed, 15 insertions(+), 13 deletions(-) - -commit d9e2e10678d7f7e4071c47692e85e22bab24d621 -Author: Guillaume Desmottes -Date: Mon Oct 15 10:59:20 2007 +0000 - - simplify salut_tube_dbus_init - - - 20071015105920-7fe3f-32103d7ec5f8f8956f9de77c49942fad309cccb5.gz - - src/tube-dbus.c | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -commit e07ca71a40a2dbda89405d692fdfa9cfebef8c29 -Author: Guillaume Desmottes -Date: Mon Oct 15 10:46:30 2007 +0000 - - tube-dbus: dbus_local_name and dbus_names are now muc specific - - - 20071015104630-7fe3f-9752c64a0a42510085f9b3c3b1d6293e8d0f818e.gz - - src/tube-dbus.c | 91 +++++++++++++++++++++++++++++++------------------------ - 1 files changed, 51 insertions(+), 40 deletions(-) - -commit 064aa39a688091970687afe3cab8eeda4fa801b0 -Author: Guillaume Desmottes -Date: Mon Oct 15 10:26:50 2007 +0000 - - tube-dbus: unlink socket when disposing, retry if dbus_server_listen failed (code from Gabble) - - - 20071015102650-7fe3f-eb45fc82f0397f951c5432c50bf24a2cc0c77fea.gz - - src/tube-dbus.c | 70 ++++++++++++++++++++++++++++++++++++++++-------------- - 1 files changed, 52 insertions(+), 18 deletions(-) - -commit 43c82119c84a24b5ef631bf1db82e4714ef361c9 -Author: Guillaume Desmottes -Date: Mon Oct 15 09:52:17 2007 +0000 - - use tp-glib tubes enum/functions - - - 20071015095217-7fe3f-cb4065d7faa5817eede0157830d7ae58591e4d0e.gz - - src/salut-muc-manager.c | 3 +- - src/salut-tubes-channel.c | 142 ++++++++++++++++++++++---------------------- - src/tube-dbus.c | 15 ++--- - src/tube-iface.c | 3 +- - 4 files changed, 80 insertions(+), 83 deletions(-) - -commit 5e35aeb6281051457687b3d8c8fda5dd74581f27 -Author: Guillaume Desmottes -Date: Mon Oct 15 09:27:43 2007 +0000 - - remove extensions/Channel_Type_Tubes.xml - - - 20071015092743-7fe3f-a12fc7737eea591e40555e2a4602658cc8b85e83.gz - - extensions/Channel_Type_Tubes.xml | 711 ------------------------------------- - extensions/all.xml | 1 - - 2 files changed, 0 insertions(+), 712 deletions(-) - -commit 2ecf9bf069b2e06b2f9dc28f9ec9dce7ed0feccc -Author: Guillaume Desmottes -Date: Mon Oct 15 09:21:51 2007 +0000 - - tubes-channel: remove backward compatibility with old tubes API - - - 20071015092151-7fe3f-d65b098ac4fcb0e9a244bfb24ee38bebc9b9e67b.gz - - src/salut-tubes-channel.c | 63 --------------------------------------------- - 1 files changed, 0 insertions(+), 63 deletions(-) - -commit 89551dc5f39dcd17145beebb412921829621ea63 -Author: Guillaume Desmottes -Date: Mon Oct 15 09:19:55 2007 +0000 - - move common tubes properties definitions to tube-iface.c - - - 20071015091955-7fe3f-7e72794fee7607e2744db76bb7ca426675c19bae.gz - - src/tube-dbus.c | 141 ++++++++---------------------------------------------- - src/tube-iface.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++- - 2 files changed, 158 insertions(+), 122 deletions(-) - -commit 242003a4c7125bfe2612eb35c5e80e979953c845 -Author: Guillaume Desmottes -Date: Mon Oct 15 08:39:58 2007 +0000 - - gibber-bytestream-ibb.c: add a FIXME about fragmentation - - - 20071015083958-7fe3f-18c1e28ecb87983aa743b316285896543af006e4.gz - - lib/gibber/gibber-bytestream-ibb.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 7d70bd11e61a3cbf36526f68fc78fc8167028bce -Author: Guillaume Desmottes -Date: Mon Oct 15 14:01:29 2007 +0000 - - gibber-bytestream-muc.c: add FIXME about futur Gibber API improvement - - - 20071015140129-7fe3f-ac20aad98c9f5813d35a2e2bf55201823448954b.gz - - lib/gibber/gibber-bytestream-muc.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit e474340b4a442306abe60009825a83e0e3d59a85 -Author: Guillaume Desmottes -Date: Mon Oct 15 13:53:49 2007 +0000 - - gibber-bytestream-muc.c: coding style fix - - - 20071015135349-7fe3f-18bec7eb3a5653a10b3067a0ee5b72cf18e53cf3.gz - - lib/gibber/gibber-bytestream-muc.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 0b925e761a2958a14e690dc9a1a5f0416bce5a8d -Author: Guillaume Desmottes -Date: Mon Oct 15 13:53:35 2007 +0000 - - gibber-bytestream-iface.c: fix copyright - - - 20071015135335-7fe3f-fd76a573192375e908744926ace12549f4ce03d9.gz - - lib/gibber/gibber-bytestream-iface.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 313b2de79179f0b5f7ed40d3fad3cdd1de65e54d -Author: Guillaume Desmottes -Date: Mon Oct 15 07:55:57 2007 +0000 - - gibber-bytestream-muc.[ch]: fix file name in header - - - 20071015075557-7fe3f-38808d8ca090691b30ed6eca12d33a6b290fb071.gz - - lib/gibber/gibber-bytestream-muc.c | 2 +- - lib/gibber/gibber-bytestream-muc.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit ab46711e81ee165a5cbf604c1b6501670d9dae25 -Author: Guillaume Desmottes -Date: Thu Sep 27 12:48:41 2007 +0000 - - bytestream-muc: remove useless comment - - - 20070927124841-7fe3f-75880b06aa4bbb07622f38a49077c381823683b1.gz - - lib/gibber/gibber-bytestream-muc.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit b30201a1f431d8e563d29f0b635ca1e492f2a742 -Author: Guillaume Desmottes -Date: Thu Sep 27 12:43:19 2007 +0000 - - bytestream-muc: remove stream_init_id as it's 1-1 bytestream specific - - - 20070927124319-7fe3f-35c63369367d35aa0fd35fc687fddc12883aa6c9.gz - - lib/gibber/gibber-bytestream-muc.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 0a19f9615c6e05211a33e947a191c34f57b0354c -Author: Guillaume Desmottes -Date: Thu Sep 27 12:40:46 2007 +0000 - - bytestream-ibb: implement get_protocol - - - 20070927124046-7fe3f-5a6967a1fae2eec5303bd5e758b3bd2ac0257998.gz - - lib/gibber/gibber-bytestream-ibb.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit 7eab5693de4f3e80593b40a07b84baea1a0a101b -Author: Guillaume Desmottes -Date: Thu Sep 27 12:23:42 2007 +0000 - - use GibberBytestreamMuc for Muc D-Bus tubes (re-written and re-recorded) - - - 20070927122342-7fe3f-50baf5dcaa22e4cf4e332a73e755716d54fe1e8b.gz - - src/tube-dbus.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 8b42e3b578014a4da82d4a835a36f61c400ec5fb -Author: Guillaume Desmottes -Date: Thu Sep 27 12:22:25 2007 +0000 - - tube-dbus: use the handle-type to determine if we need SI reply or not. Remove deprecated commented code - - - 20070927122225-7fe3f-ba6cfec7ddadb5baafc63a666b8568aacfce5adb.gz - - src/tube-dbus.c | 39 ++------------------------------------- - 1 files changed, 2 insertions(+), 37 deletions(-) - -commit 85f35c2558f0b3127aff71b22ac15ae5bcc45fd4 -Author: Guillaume Desmottes -Date: Thu Sep 27 12:15:05 2007 +0000 - - bytestream-muc: wrap a too long line - - - 20070927121505-7fe3f-eaa3e84d70352a445daa1d4a3f31d680821ab3ac.gz - - lib/gibber/gibber-bytestream-muc.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 027a1e3fc9adb3eb79acacf24153ea0e1f153168 -Author: Guillaume Desmottes -Date: Thu Sep 27 12:09:04 2007 +0000 - - build gibber-bytestream-muc.[ch] (re-recorded) - - - 20070927120904-7fe3f-bda180ced6ddec3dc306a803ae111ce21f406c1a.gz - - lib/gibber/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 352c4d2b113ed91313921f18cdfe3eed51a2eef0 -Author: Guillaume Desmottes -Date: Thu Sep 27 12:08:13 2007 +0000 - - gibber_bytestream_iface_send's "data" arg has to be a const - - - 20070927120813-7fe3f-1aba521fc62e1be68f2c01c5163b679a7d6d728f.gz - - lib/gibber/gibber-bytestream-ibb.c | 4 ++-- - lib/gibber/gibber-bytestream-iface.c | 4 ++-- - lib/gibber/gibber-bytestream-iface.h | 5 +++-- - 3 files changed, 7 insertions(+), 6 deletions(-) - -commit 9116af1fc6e59460eb18b767df00c410de75c4af -Author: Guillaume Desmottes -Date: Thu Sep 27 12:05:58 2007 +0000 - - rename gibber_bytestream_ibb_initiation to gibber_bytestream_ibb_initiate (re-recorded) - - - 20070927120558-7fe3f-e7e578bfd5ee6106cd3d42d8b1072841eb66094a.gz - - lib/gibber/gibber-bytestream-ibb.c | 8 ++++---- - lib/gibber/gibber-bytestream-iface.c | 4 ++-- - lib/gibber/gibber-bytestream-iface.h | 4 ++-- - 3 files changed, 8 insertions(+), 8 deletions(-) - -commit 7e6f6fa0526f236fcff2f03bd8216c62e7e67d04 -Author: Guillaume Desmottes -Date: Thu Sep 27 11:17:12 2007 +0000 - - bytestream-ibb: use bytestream-iface properties definitions (re-written and re-recorded) - - - 20070927111712-7fe3f-288fe33213907c2b1ac41bc4b798c7d4581df5ac.gz - - lib/gibber/gibber-bytestream-ibb.c | 58 +++++------------------------------ - 1 files changed, 9 insertions(+), 49 deletions(-) - -commit 8316ed73df4f158eb66067fddcc31984f5290b63 -Author: Guillaume Desmottes -Date: Thu Sep 27 11:13:32 2007 +0000 - - gibber-bytestream-iface: remove the stream-init-id property as its 1-1 bytestream specific (re-recorded) - - - 20070927111332-7fe3f-4d12ce8bb52c2badcda92d87c307ee685cff62a5.gz - - lib/gibber/gibber-bytestream-iface.c | 12 ------------ - 1 files changed, 0 insertions(+), 12 deletions(-) - -commit 0aec84a20f84402fa75efa0ea2c58110b7d9a623 -Author: Guillaume Desmottes -Date: Thu Sep 27 11:13:07 2007 +0000 - - rename LAST_GIBBER_BYTESTREAM_STATE to NUM_GIBBER_BYTESTREAM_STATES - - - 20070927111307-7fe3f-6bbf16751e4044fe9c354d35bffa363fa51a8a9f.gz - - lib/gibber/gibber-bytestream-ibb.c | 2 +- - lib/gibber/gibber-bytestream-iface.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 475707c45714eee18c427380c8be747c5c708a87 -Author: Guillaume Desmottes -Date: Tue Sep 4 11:35:57 2007 +0000 - - add gibber-bytestream-muc.[ch] - - - 20070904113557-7fe3f-3cbf2c73702d23bcd3d1b27b9ff225d4dd23f3da.gz - - lib/gibber/gibber-bytestream-muc.c | 399 ++++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-bytestream-muc.h | 63 ++++++ - 2 files changed, 462 insertions(+), 0 deletions(-) - -commit 606046d82fb443ecc025f61551a625eb4339ded5 -Author: Guillaume Desmottes -Date: Tue Sep 4 10:50:38 2007 +0000 - - tubes-channel: generate uint8 stream-id for muc tubes - - - 20070904105038-7fe3f-3c5c0c537590b2ae6276ccd2f2a8eca7224cfb03.gz - - src/salut-tubes-channel.c | 17 +++++++++++++---- - 1 files changed, 13 insertions(+), 4 deletions(-) - -commit 3163ca418df52e3b8e813c4012d9fb7549d4c2aa -Author: Guillaume Desmottes -Date: Mon Sep 3 14:39:15 2007 +0000 - - bytestream-iface: define common bytestream properties - - - 20070903143915-7fe3f-8e8b7b90c2b61fa0c2509cd91e3aa9d0d291826f.gz - - lib/gibber/gibber-bytestream-iface.c | 77 +++++++++++++++++++++++++++++++++- - 1 files changed, 76 insertions(+), 1 deletions(-) - -commit 5f671fc5111d5d0e5da425fb6844165fd24637cb -Author: Guillaume Desmottes -Date: Thu Sep 27 11:01:13 2007 +0000 - - bytestream-ibb: s/xmpp_connnection/xmpp_connection - - - 20070927110113-7fe3f-56d8c3c9eb74ef73297a2ac1ba142730e848cdd7.gz - - lib/gibber/gibber-bytestream-ibb.c | 24 ++++++++++++------------ - 1 files changed, 12 insertions(+), 12 deletions(-) - -commit 80d0bd959c1d87c0f3acda0121a882a07a0bad8d -Author: Guillaume Desmottes -Date: Thu Sep 27 10:59:22 2007 +0000 - - tube-dbus tube-iface: use GibberBytestreamIface instead of GibberBytestreamIBB - - - 20070927105922-7fe3f-11f91ecb497c13dcafa7d4b2d22916720e08faa0.gz - - src/tube-dbus.c | 27 +++++++++++++-------------- - src/tube-iface.c | 4 ++-- - src/tube-iface.h | 6 +++--- - 3 files changed, 18 insertions(+), 19 deletions(-) - -commit eaae3bc411152cde1c8f1d8527f79ba02b3c09cb -Author: Guillaume Desmottes -Date: Thu Sep 27 10:58:44 2007 +0000 - - gibber-bystream-ibb: abstract using GibberBystreamIface (re-written and re-recorded) - - - 20070927105844-7fe3f-f06f5833e2b30566c93669e613280657d21bf5fe.gz - - lib/gibber/gibber-bytestream-ibb.c | 83 ++++++++++++++++++++++++----------- - lib/gibber/gibber-bytestream-ibb.h | 18 -------- - 2 files changed, 57 insertions(+), 44 deletions(-) - -commit 7ae006625f7f80005d04f1f0f36da3353261b6ca -Author: Guillaume Desmottes -Date: Thu Sep 27 10:34:18 2007 +0000 - - use GibberBytestreamState enum instead of GibberBytestreamIBBState - - - 20070927103418-7fe3f-d0133403c06e9655f23f51b5ee36bde33d554e00.gz - - lib/gibber/gibber-bytestream-ibb.c | 32 ++++++++++++++++---------------- - lib/gibber/gibber-bytestream-ibb.h | 19 +------------------ - src/tube-dbus.c | 32 ++++++++++++++++---------------- - 3 files changed, 33 insertions(+), 50 deletions(-) - -commit dffa84db05cbc71049bee9ac9e3f9fd3d0af57c3 -Author: Guillaume Desmottes -Date: Wed Aug 1 09:54:43 2007 +0000 - - build gibber-bytestream-iface - - - 20070801095443-7fe3f-625fc60c4d94b20c597fd360e9ab428d04dc4dd0.gz - - lib/gibber/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit fc1061b37f2d64e6b03730f9801ac2d1ea70fbdb -Author: Guillaume Desmottes -Date: Wed Aug 1 09:54:21 2007 +0000 - - add gibber-bytestream-iface.[ch] - - - 20070801095421-7fe3f-7d8ba7dfed7aab122e349d8291d2b07abcd2c849.gz - - lib/gibber/gibber-bytestream-iface.c | 94 ++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-bytestream-iface.h | 91 ++++++++++++++++++++++++++++++++ - 2 files changed, 185 insertions(+), 0 deletions(-) - -commit eb177e11ab63c44b375aec3fdb218185350e3b6d -Author: Sjoerd Simons -Date: Wed Sep 26 15:52:28 2007 +0000 - - version 0.1.5.1 - - - 20070926155228-93b9a-936d1cebecd4c9b81f12b9498b6e39bf650b062f.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b6f5c9e9a78f60afc38aeaf57767f70bad002201 -Author: Sjoerd Simons -Date: Wed Sep 26 15:37:15 2007 +0000 - - version 0.1.5 - - - 20070926153715-93b9a-6a4ed5c17a36635a7d71fd1df9eb4545744e4083.gz - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 177497df0e2afc365dc0afec2c9b638d1cfd05bb -Author: Sjoerd Simons -Date: Wed Sep 26 15:12:14 2007 +0000 - - configure.ac: Check for the existance of dbus_message_marshal instead of checking the version - - - 20070926151214-93b9a-3e4ee367cc31855858edf28c5eeddead9e7fd7b3.gz - - configure.ac | 30 ++++++++++++++++-------------- - 1 files changed, 16 insertions(+), 14 deletions(-) - -commit 94a58f8423ff302109ecd0e8cfd1cf71b6704a18 -Author: Sjoerd Simons -Date: Wed Sep 26 14:36:48 2007 +0000 - - Don't build D-Bus tubes support when the D-Bus version is too old - - - 20070926143648-93b9a-9b445f529a2b2539a8add3c64e4ab258df2478d6.gz - - configure.ac | 18 +++++++++++++++++- - src/Makefile.am | 12 ++++++++---- - src/salut-muc-manager.c | 22 +++++++++++++++++++++- - 3 files changed, 46 insertions(+), 6 deletions(-) - -commit 7b99b967bb255a2eb8d9c2a6bcde608901ad6ee2 -Author: Guillaume Desmottes -Date: Wed Sep 19 10:17:38 2007 +0000 - - try to re-announce muc service when it disappears. Woraround for the "muc is not joinable after its creator left" bug - - - 20070919101738-7fe3f-684d8e3827478ce66381b6de75a9293fb821b660.gz - - src/salut-muc-manager.c | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit 0eab5c1ad867634c37ea515914f29c9120e16d75 -Author: Guillaume Desmottes -Date: Wed Sep 19 10:10:56 2007 +0000 - - make salut_muc_channel_publish_service a public method - - - 20070919101056-7fe3f-75c5127dbaad1f061f2559a8dfa6168b625c066d.gz - - src/salut-muc-channel.c | 6 +++--- - src/salut-muc-channel.h | 3 +++ - 2 files changed, 6 insertions(+), 3 deletions(-) - -commit 8a85d249a36eadb6ccf657d0a333e1d0a86997f4 -Author: Guillaume Desmottes -Date: Wed Sep 12 10:17:30 2007 +0000 - - salut-contact: use the activity pointer and not the activity id to check if the activity was previously announced by the contact - - - 20070912101730-7fe3f-2b68dbbbd6684947c411054321f2d4046b13840d.gz - - src/salut-contact.c | 12 ++++++++++-- - 1 files changed, 10 insertions(+), 2 deletions(-) - -commit fc864dae297a9a45f5af68148f5cf407581c4cbf -Author: Guillaume Desmottes -Date: Mon Sep 10 08:23:54 2007 +0000 - - send_olpc_activity_properties_changes_msg: ignore if the muc connection is not connected yet - - - 20070910082354-7fe3f-05d9c227b51c47f455a7cf7f09c7b2b4a96fb191.gz - - src/salut-self.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 748471243a327240121823304eb21850111b9c1b -Author: Guillaume Desmottes -Date: Thu Sep 6 22:26:04 2007 +0000 - - roomlist-channel: coding style tweaks - - - 20070906222604-7fe3f-72636b0b1bd97370ea8435faf796ff4b70eddb63.gz - - src/salut-roomlist-channel.c | 41 ++++++++++++++++++++++------------------- - 1 files changed, 22 insertions(+), 19 deletions(-) - -commit 09fa8c651f80298b5596fb14e70431bd747a9ec4 -Author: Guillaume Desmottes -Date: Thu Sep 6 22:23:58 2007 +0000 - - salut_roomlist_channel_close: emit the closed signal so we don't have to explicitely call g_object_run_dispose - - - 20070906222358-7fe3f-eb344ae7dd4c80cdd1ee4e331e5480bcfc50a0d6.gz - - src/salut-roomlist-channel.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 6305466f4d09439256ceef0632fe54a2e443bc8f -Author: Guillaume Desmottes -Date: Thu Sep 6 22:10:56 2007 +0000 - - roomlist-channel: salut_roomlist_channel_set_property: assert handle and handle-type value - - - 20070906221056-7fe3f-8a7eb9be96b8b969bcf283df1544046728dba80d.gz - - src/salut-roomlist-channel.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 920f41f0e227d5115c263f566c646fa1e26181c7 -Author: Guillaume Desmottes -Date: Thu Sep 6 15:14:43 2007 +0000 - - muc-manager: directly use g_object_unref instead of unref_foreach - - - 20070906151443-7fe3f-098c759a7ff2c745e30f2359eba9b3685976a1ff.gz - - src/salut-muc-manager.c | 9 +-------- - 1 files changed, 1 insertions(+), 8 deletions(-) - -commit 19725eaf1f456273491c31476fcea9344233170b -Author: Guillaume Desmottes -Date: Thu Sep 6 15:02:07 2007 +0000 - - roomlist don't have to be a singleton - - - 20070906150207-7fe3f-783ec676ff4ffc6d9ffbc4cf77c4fb9ff25c7f49.gz - - src/salut-muc-manager.c | 100 ++++++++++++++++++++++++++++++++-------------- - 1 files changed, 69 insertions(+), 31 deletions(-) - -commit a63b3264637c1b10e606af19b1f05e9b1e560ba3 -Author: Guillaume Desmottes -Date: Thu Sep 6 14:09:25 2007 +0000 - - fix conflict with HEAD - - - 20070906140925-7fe3f-866d4b166eb82351d824c02cf920fcb388c95b3f.gz - - src/salut-muc-manager.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 0966005bc1648ffdc802fd096ac9839cd4508c74 -Author: Guillaume Desmottes -Date: Fri Jul 20 15:04:06 2007 +0000 - - implement org.freedesktop.Telepathy.Channel.Type.RoomList - - - 20070720150406-7fe3f-51c0bbda8692a818b8493bae75ed1d251c3e9f86.gz - - src/Makefile.am | 2 + - src/salut-muc-manager.c | 80 ++++++- - src/salut-roomlist-channel.c | 539 ++++++++++++++++++++++++++++++++++++++++++ - src/salut-roomlist-channel.h | 75 ++++++ - 4 files changed, 694 insertions(+), 2 deletions(-) - -commit 40263dd324eda7ca3bb737125410564dc544d446 -Author: Guillaume Desmottes -Date: Thu Sep 6 13:45:34 2007 +0000 - - delay tubes channel announcement until it becomes ready - - - 20070906134534-7fe3f-d2d81fde381101f058784e0545743b550da399ec.gz - - src/salut-muc-manager.c | 60 ++++++++++++++++++++++++++++------------------ - 1 files changed, 36 insertions(+), 24 deletions(-) - -commit 19c0ca9c3029e0132595df33cd4a56ba439ed6eb -Author: Guillaume Desmottes -Date: Thu Sep 6 13:40:21 2007 +0000 - - tubes-channel: add a ready public variable. Avoid to send data if the text channel is not ready yet - - - 20070906134021-7fe3f-e86286b8da9b31c3be8c912978d90c59bcddea89.gz - - src/salut-tubes-channel.c | 64 +++++++++++++++++++++++++++++++++++++++++++- - src/salut-tubes-channel.h | 1 + - 2 files changed, 63 insertions(+), 2 deletions(-) - -commit fbb3a21dbb72e773e5c43552b5665b44a5fa0022 -Author: Guillaume Desmottes -Date: Thu Sep 6 08:09:22 2007 +0000 - - don't use TP_CHANNEL_GROUP_CHANGE_REASON_INVITED when user joins a muc - - - 20070906080922-7fe3f-95ff0fcff991d1c36527a7786e666e4056684bba.gz - - src/salut-muc-channel.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 48ad87f78635e315b1c49764313c79deb00be030 -Author: Guillaume Desmottes -Date: Thu Sep 6 08:01:48 2007 +0000 - - destroy TpIntSet in muc_connection_connected_cb - - - 20070906080148-7fe3f-231e427386df074a2aa62f89022572143680af7a.gz - - src/salut-muc-channel.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit ea44abf947d1359d6c56a20dfd4a16bc9ff50831 -Author: Guillaume Desmottes -Date: Thu Sep 6 07:49:34 2007 +0000 - - when joining a muc, set yourself as remote-pending while the muc connection isn't connected - - - 20070906074934-7fe3f-833f7018bad2a9787ad9cf90b5ebfeee42a0270f.gz - - src/salut-muc-channel.c | 16 +++++++++++++++- - 1 files changed, 15 insertions(+), 1 deletions(-) - -commit 6752a81fc96a7d3f104686c78f963246101b7668 -Author: Guillaume Desmottes -Date: Thu Sep 6 07:40:58 2007 +0000 - - revert delayed muc channel creation - - - 20070906074058-7fe3f-d61f8527b0f8d31607e6e435ee2d44577e3967c8.gz - - src/salut-muc-manager.c | 49 ++++------------------------------------------ - 1 files changed, 5 insertions(+), 44 deletions(-) - -commit bfa91be0ed918b851546f16a62176ea033faebb4 -Author: Guillaume Desmottes -Date: Wed Sep 5 13:07:16 2007 +0000 - - salut-contact: add a TODO item - - - 20070905130716-7fe3f-b833ba64a26d5f0310ccfc7dcdc8e65dbe55f3c3.gz - - src/salut-contact.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit e1682b1d8d3c5c57ef15e1154f6e9c445e0c0595 -Author: Guillaume Desmottes -Date: Wed Sep 5 13:00:58 2007 +0000 - - rename salut_contact_takes_part_olpc_activity to salut_contact_takes_part_olpc_activity and activity_have_id to activity_has_id - - - 20070905130058-7fe3f-201d1073cf63ec8fe785658f582c529e411020d6.gz - - src/salut-connection.c | 2 +- - src/salut-contact.c | 14 +++++++------- - src/salut-contact.h | 2 +- - 3 files changed, 9 insertions(+), 9 deletions(-) - -commit 659baf9c5f68fc30f72bfae1d11ae7ec21a6d9c5 -Author: Guillaume Desmottes -Date: Wed Sep 5 12:52:19 2007 +0000 - - salut-contact.c: add a comment about olpc_announced_activities contents - - - 20070905125219-7fe3f-dc8cbe102a33c60dd40e500654650295e49b79a9.gz - - src/salut-contact.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 560a40b2cc61bf4d5b986098cb618b4ec80b41b9 -Author: Guillaume Desmottes -Date: Wed Sep 5 12:44:29 2007 +0000 - - use tp_g_value_slice_new - - - 20070905124429-7fe3f-3d673f4cea230f26c41b1a1bc0ab00ab6d1889d2.gz - - src/salut-connection.c | 15 +++++---------- - src/salut-self.c | 15 +++++---------- - src/salut-util.c | 15 +++++---------- - 3 files changed, 15 insertions(+), 30 deletions(-) - -commit 59e6f287e58207417ab2e6a1d44b10a8e52b61bc -Author: Guillaume Desmottes -Date: Wed Sep 5 12:36:29 2007 +0000 - - bump telepathy-glib dependency to 0.5.14 - - - 20070905123629-7fe3f-6ff7819c787c4e7683a7bb2e917a511ef65a042a.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3ed165c87b6df8f796fa249b25fc46fecbd0c430 -Author: Guillaume Desmottes -Date: Wed Sep 5 12:33:45 2007 +0000 - - add comment about extract_properties_from_hash - - - 20070905123345-7fe3f-60263d7757dfe991e6f8fc974b30b1ae81b6d44a.gz - - src/salut-connection.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit afd10cd98e87fd5b37bf96dbed98f13a99d835ad -Author: Guillaume Desmottes -Date: Wed Sep 5 12:28:44 2007 +0000 - - salut-self.h: trivial style fix - - - 20070905122844-7fe3f-a44af6dc9149478d60c5ace9d0a1474c34d5e6fc.gz - - src/salut-self.h | 8 +++----- - 1 files changed, 3 insertions(+), 5 deletions(-) - -commit d1116d6936b797a072bb96f12c8ffa8b13589b5b -Author: Guillaume Desmottes -Date: Wed Sep 5 12:18:16 2007 +0000 - - salut-util.c: use "%u" for uint - - - 20070905121816-7fe3f-cd03e0e259ce4a645d35c78181c8bb3cfb8759a0.gz - - src/salut-util.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 81cf50ad3fa27e80954158d0b2ceddccdfedc3c9 -Author: Guillaume Desmottes -Date: Wed Sep 5 12:15:30 2007 +0000 - - salut-utilc: use strtol and strtoul instead of atoi - - - 20070905121530-7fe3f-d1de13a0757f34c39e01b90699fabc8a2f847d5d.gz - - src/salut-util.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 353451372a955d7fe9151f79a7c298573b680de7 -Author: Guillaume Desmottes -Date: Wed Sep 5 12:11:14 2007 +0000 - - use "bool" instead of "b" in salut_gibber_xmpp_node_extract_properties and gibber_xmpp_node_set_children_from_properties - - - 20070905121114-7fe3f-7b85843938cefb7fd96da51262df9068d8d0a9eb.gz - - src/salut-util.c | 4 ++-- - tests/check-node-properties.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit e110e65f13b4d91b5d1a5d01ac4be9dcbe11f0ab -Author: Guillaume Desmottes -Date: Wed Aug 29 08:59:46 2007 +0000 - - salut-self.c: update_activity_privacy: allow updated to be NULL - - - 20070829085946-7fe3f-c0b605d82eee99c3de650e3ec2e69fc197f4a4a6.gz - - src/salut-self.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 7df2779fc26b32b131855ee65ae6bfb22f5204e9 -Author: Guillaume Desmottes -Date: Tue Aug 28 13:26:55 2007 +0000 - - salut-self.c: when retrieving activity properties from the contact mgr, init their values to NULL to avoid to let them unset if contact manager doesn't know about these properties - - - 20070828132655-7fe3f-706a54a9fc294f26b550d24cc22add7f414c7eb4.gz - - src/salut-self.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2a75f7c69034cfe9dca08dba6a67c32ca7d9a8bc -Author: Guillaume Desmottes -Date: Tue Aug 28 11:59:41 2007 +0000 - - emit channel error if the connection to the muc failed - - - 20070828115941-7fe3f-73e990ca47ef45b056d87f1055dc31a5fc2b0cfd.gz - - src/salut-muc-channel.c | 25 +++++++++++++++++++++++++ - src/salut-muc-manager.c | 24 +++++++++++++++++++++++- - 2 files changed, 48 insertions(+), 1 deletions(-) - -commit bd664806ca07c9953afad9a301eb0e9070f6ca46 -Author: Guillaume Desmottes -Date: Tue Aug 28 10:46:51 2007 +0000 - - delay the creation of the tubes channel if we have to wait for the muc channel - - - 20070828104651-7fe3f-9ca9ff6af968be3048251b3eb82e318f18159fe7.gz - - src/salut-muc-manager.c | 35 +++++++++++++++++++++++++++++++++-- - 1 files changed, 33 insertions(+), 2 deletions(-) - -commit a4286ac1bc623b5125dfa2da61148fd170471df3 -Author: Guillaume Desmottes -Date: Tue Aug 28 10:19:21 2007 +0000 - - salut-muc-manager.c: wait the muc channel is ready before fire the new channel signal - - - 20070828101921-7fe3f-8e527fa6ff7d012df77e281bf41cdf579d57cada.gz - - src/salut-muc-manager.c | 13 ++++++++++--- - 1 files changed, 10 insertions(+), 3 deletions(-) - -commit 19c141a44b7507257df3b102e5228bc0b78b556c -Author: Guillaume Desmottes -Date: Tue Aug 28 10:18:58 2007 +0000 - - salut-muc-channel.c: add a "ready" signal emitted when the muc connection is connected - - - 20070828101858-7fe3f-f297f3c56e9f1d918a29757e81f39f99a4fee044.gz - - src/salut-muc-channel.c | 30 +++++++++++++++++++++++++++++- - 1 files changed, 29 insertions(+), 1 deletions(-) - -commit acabd056a156b7efdfef681b30f11eaab15fe73a -Author: Guillaume Desmottes -Date: Tue Aug 28 09:56:39 2007 +0000 - - gibber-r-multicast-transport.c: assert priv->self != NULL when sending - - - 20070828095639-7fe3f-fdee840faa16132c2c6de7f339b1c8f005dae535.gz - - lib/gibber/gibber-r-multicast-transport.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit cdedd4ec92e77f0dba4fe6ba80e1ff2e32746632 -Author: Guillaume Desmottes -Date: Fri Aug 24 11:09:20 2007 +0000 - - fix conflict with HEAD - - - 20070824110920-7fe3f-fc0ecea6627525eef6b82650c2b540cc0a791a12.gz - - src/salut-contact-manager.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit 80af7e7277b38ceef23cc1cbf615e052927cfc46 -Author: Guillaume Desmottes -Date: Fri Aug 24 10:24:15 2007 +0000 - - update_activity_privacy: move the activity privacy check from the caller into the function - - - 20070824102415-7fe3f-0e62644efde0e4789673a8d2055155d5714cbb62.gz - - src/salut-self.c | 21 +++++++++------------ - 1 files changed, 9 insertions(+), 12 deletions(-) - -commit 341f605a62f4433d7e681466930f77edee383bd7 -Author: Guillaume Desmottes -Date: Fri Aug 24 10:14:49 2007 +0000 - - create_properties_table: recycle the GValue* - - - 20070824101449-7fe3f-2ee0ce3c06276575734f8b456d2b710dc7db410b.gz - - src/salut-connection.c | 42 +++++++++++++++++++++--------------------- - src/salut-self.c | 42 +++++++++++++++++++++--------------------- - 2 files changed, 42 insertions(+), 42 deletions(-) - -commit 4a5955fe1169a2e6661d25ef3607619c4466031f -Author: Guillaume Desmottes -Date: Fri Aug 24 10:09:03 2007 +0000 - - salut-util: use tp_strdiff instead of strcmp - - - 20070824100903-7fe3f-6b7c31337a41bf5f4504945e3d9b027f97b0c335.gz - - src/salut-util.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -commit 74fbf5b472e24fc2d881bb8adf577b991a1ee241 -Author: Guillaume Desmottes -Date: Fri Aug 24 10:03:10 2007 +0000 - - fix some typos - - - 20070824100310-7fe3f-73b51bfe821890de4d229026ee4e642c131a8c68.gz - - src/salut-connection.c | 14 +++++++------- - src/salut-contact-manager.c | 4 ++-- - src/salut-muc-channel.c | 8 ++++---- - src/salut-muc-manager.c | 10 +++++----- - src/salut-self.c | 8 ++++---- - src/salut-self.h | 1 - - 6 files changed, 22 insertions(+), 23 deletions(-) - -commit 9c6ebc00cf475df989e84c1c1ed80c8bacb2a2a6 -Author: Guillaume Desmottes -Date: Fri Aug 24 09:58:26 2007 +0000 - - rename update_activity_privacy_policy to update_activity_privacy - - - 20070824095826-7fe3f-55cfcdf0134c7de2399b69483c08ce4033b91c4a.gz - - src/salut-self.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit a4070e56315027a623efc7ba922298ffa0240049 -Author: Guillaume Desmottes -Date: Fri Aug 24 09:53:12 2007 +0000 - - fix --disable-olpc-build - - - 20070824095312-7fe3f-5803dccaf1eb17902a1ddbfbe7a4f34c8525ecc8.gz - - src/salut-connection.h | 4 ++++ - src/salut-contact-manager.c | 8 +------- - src/salut-muc-channel.c | 4 ++++ - src/salut-muc-manager.c | 2 ++ - src/salut-self.c | 4 ++++ - 5 files changed, 15 insertions(+), 7 deletions(-) - -commit 4eab0920e7ce5da282ed332369e19aff8b233fdb -Author: Guillaume Desmottes -Date: Fri Aug 24 09:38:49 2007 +0000 - - olpc_activity_properties_changed: if we use SalutSelf's properties, be sure something was actually updated before fire the signal - - - 20070824093849-7fe3f-f4d62c3629ba78b626b4bd9cecb69534b0cb5142.gz - - src/salut-connection.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -commit c4160f7b8ba5965f33f0005fbf427f25e2885a9c -Author: Guillaume Desmottes -Date: Fri Aug 24 09:22:26 2007 +0000 - - salut-contact: avoid to have the same activity in the 2 hash tables at the same time - - - 20070824092226-7fe3f-e7521bfc8c29ff2befe563d51b382dccaa278b05.gz - - src/salut-contact.c | 23 +++++++++++++++++++++-- - 1 files changed, 21 insertions(+), 2 deletions(-) - -commit 85a1ae06d2e4712ab2a08d8347a36cc31c85e5fc -Author: Guillaume Desmottes -Date: Thu Aug 23 13:23:38 2007 +0000 - - salut-connection: factor out common code used in salut_connection_act_set_properties and check_properties - - - 20070823132338-7fe3f-5419d7fc7268ba69919e9fdefd26abb5323ea189.gz - - src/salut-connection.c | 298 +++++++++++++++++++----------------------------- - 1 files changed, 120 insertions(+), 178 deletions(-) - -commit 4142e978dbfbf540d4cda2bd905f9e5ad32e7e8b -Author: Guillaume Desmottes -Date: Thu Aug 23 12:38:36 2007 +0000 - - add "tags" olpc activity properties - - - 20070823123836-7fe3f-aa38dd7c1ea83ae5751e405fac71781ff85e2147.gz - - src/salut-connection.c | 85 ++++++++++++++++++++++++++++++++----------- - src/salut-contact-manager.c | 38 ++++++++++++++------ - src/salut-contact-manager.h | 5 ++- - src/salut-contact.c | 17 ++++++--- - src/salut-self.c | 40 +++++++++++++++++---- - src/salut-self.h | 6 ++-- - 6 files changed, 141 insertions(+), 50 deletions(-) - -commit 1f25dc915654ceb69e204d0d7a1530747f140957 -Author: Guillaume Desmottes -Date: Thu Aug 23 09:49:54 2007 +0000 - - remove FIXME about activity properties from invites. It's not a problem as SalutSelf's properties overwrite the one from the contact mgr - - - 20070823094954-7fe3f-e830caad81b483d71f3798d494c273775fef56a5.gz - - src/salut-contact-manager.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit d58a3f70369d260a36a6dd4beb32a9e625f9a602 -Author: Guillaume Desmottes -Date: Thu Aug 23 09:36:15 2007 +0000 - - fix refcount problem when we are invited to a private activity and then this activity becomes public - - - 20070823093615-7fe3f-0cf1793bffa0324266735c75b5eb839cbf43015c.gz - - src/salut-contact-manager.c | 16 ++++++++++++---- - 1 files changed, 12 insertions(+), 4 deletions(-) - -commit eaaea94e1141b536342c63e8c7f27e39db1ba949 -Author: Guillaume Desmottes -Date: Thu Aug 23 08:59:43 2007 +0000 - - salut-self: remove deprecated FIXME as now private activities have to be announced using SetActivities - - - 20070823085943-7fe3f-f3f9b626269acfdd3779ddd9d0b09281635456b1.gz - - src/salut-self.c | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit 777c94b1dd8a5c732246ea27808687ee28c962b4 -Author: Guillaume Desmottes -Date: Thu Aug 23 08:53:24 2007 +0000 - - salut-self: remove contact from the invited set when he joined activities - - - 20070823085324-7fe3f-d22d0414c354fc49e781be177530580ae2ccc690.gz - - src/salut-self.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 57 insertions(+), 1 deletions(-) - -commit 1dd139229e9643a955c87c517cb66efc4748f20d -Author: Guillaume Desmottes -Date: Wed Aug 22 15:54:08 2007 +0000 - - implement public -> private activity changes - - - 20070822155408-7fe3f-f5a68f59e68b8bc825382d7b213b31313df8aa26.gz - - src/salut-self.c | 32 +++++++++++++++++++++++++++----- - 1 files changed, 27 insertions(+), 5 deletions(-) - -commit 0242b5852a2d472ba65f7702196c1a6ff7d668e1 -Author: Guillaume Desmottes -Date: Wed Aug 22 15:37:47 2007 +0000 - - salut-connection: emit the ActivityPropertiesChanged signal even for activities we didn't join (fix regression) - - - 20070822153747-7fe3f-bdcc5a9567caa4ca712a7cddfb79ec5e7117320b.gz - - src/salut-connection.c | 21 +++++++++++++-------- - 1 files changed, 13 insertions(+), 8 deletions(-) - -commit 9f3c40bca3afdd7c73291b8971d8370d650740a9 -Author: Guillaume Desmottes -Date: Wed Aug 22 14:59:47 2007 +0000 - - catch when a buddy change the activity privacy policy from private to public - - - 20070822145947-7fe3f-f28504ea882c38babc379b96cf33d72a6c546933.gz - - src/salut-connection.c | 27 ++++++++++++++++++++++----- - src/salut-self.c | 15 +++++++++++---- - 2 files changed, 33 insertions(+), 9 deletions(-) - -commit a31753c96f6db5278e7a48ac0f4e621e6658de4e -Author: Guillaume Desmottes -Date: Wed Aug 22 14:25:55 2007 +0000 - - salut-self: get properties from the contact-manager when we create an activity so we'll use its initial properties if any - - - 20070822142555-7fe3f-dc03d0763958bcb8ce7022964f7ccf8e061a2a2a.gz - - src/salut-self.c | 150 +++++++++++++++++++++++++++-------------------------- - 1 files changed, 76 insertions(+), 74 deletions(-) - -commit 0cc448829b3e295241e54239618e1e8cbfaafb63 -Author: Guillaume Desmottes -Date: Wed Aug 22 13:24:43 2007 +0000 - - for private olpc activities: use muc message to notify properties changes - - - 20070822132443-7fe3f-9ed6f27f550c7a8f8fee2cc72dad95b9f8548e47.gz - - src/salut-connection.c | 170 +++++++++++++++++++++++++++++++++------------- - src/salut-connection.h | 4 + - src/salut-muc-channel.c | 20 +++-- - src/salut-self.c | 160 ++++++++++++++++++++++++++++++-------------- - 4 files changed, 247 insertions(+), 107 deletions(-) - -commit b7d132234f6241056e9f08b3c2b8b4555df17a2e -Author: Guillaume Desmottes -Date: Wed Aug 22 10:43:55 2007 +0000 - - update salut-self's OLPC activities properties when they are changed from an external source - - - 20070822104355-7fe3f-28c810131b319eaeaf0cf0647b5233b6a82d616a.gz - - src/salut-connection.c | 22 ++++++++++-- - src/salut-self.c | 88 +++++++++++++++++++++++++++++++++++------------- - src/salut-self.h | 5 +++ - 3 files changed, 87 insertions(+), 28 deletions(-) - -commit 658aa89d6d41b3437966bbfba30f1318503f082f -Author: Guillaume Desmottes -Date: Tue Aug 21 16:58:21 2007 +0000 - - resend pending invitations when changing activity properties to notify invited contact of the change - - - 20070821165821-7fe3f-c60b8001d828462b216233827e7e5b41c9f35b2c.gz - - src/salut-contact-manager.c | 18 +++++++- - src/salut-self.c | 88 ++++++++++++++++++++++++++++++++++++++++++- - src/salut-self.h | 2 +- - 3 files changed, 102 insertions(+), 6 deletions(-) - -commit c92f4b17143d872a4156cc2763c84dac74fd5888 -Author: Guillaume Desmottes -Date: Tue Aug 21 16:57:14 2007 +0000 - - salut-muc-channel: factor out salut_muc_channel_send_invitation and make it a public function - - - 20070821165714-7fe3f-30f413b16f4be6706414be49dca5d89166e7d97a.gz - - src/salut-muc-channel.c | 121 ++++++++++++++++++++++++++-------------------- - src/salut-muc-channel.h | 5 ++ - 2 files changed, 73 insertions(+), 53 deletions(-) - -commit 9e90f824951d09238fd614adfd0b47d0d2c56e48 -Author: Guillaume Desmottes -Date: Tue Aug 21 16:20:59 2007 +0000 - - salut-muc-manager.c: salut_muc_manager_get_text_channel ref the channel - - - 20070821162059-7fe3f-cb000e10e7f4e57c792b4b824cb134431b72763a.gz - - src/salut-muc-manager.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit 674e74585069a971693e4feb78294ff8c70487d8 -Author: Guillaume Desmottes -Date: Tue Aug 21 16:10:46 2007 +0000 - - salut-muc-channel.c: don't keep a ref on SalutSelf to avoid cyclic references - - - 20070821161046-7fe3f-bfb756380a82f81d422162858b9d810eede4dd90.gz - - src/salut-muc-channel.c | 7 +------ - 1 files changed, 1 insertions(+), 6 deletions(-) - -commit f49d707e3e14a7c2bf2a141f3cf8ecc9b7711392 -Author: Guillaume Desmottes -Date: Tue Aug 21 16:09:45 2007 +0000 - - add salut_muc_manager_get_text_channel public function - - - 20070821160945-7fe3f-126880ea5cedd0fec3d2263021bfaeba571e88ad.gz - - src/salut-muc-manager.c | 9 +++++++++ - src/salut-muc-manager.h | 5 +++++ - 2 files changed, 14 insertions(+), 0 deletions(-) - -commit 9123f75ecdda575ec0e46af7de647388c48892c3 -Author: Guillaume Desmottes -Date: Tue Aug 21 16:08:27 2007 +0000 - - fix conflicts with the "register the IM, muc and XMPP connection managers as read only properties" patch - - - 20070821160827-7fe3f-9cc84d6053404f344549d390e07bed8ac3c813dc.gz - - src/salut-connection.c | 31 +++++++++++++++++++++++++++++++ - 1 files changed, 31 insertions(+), 0 deletions(-) - -commit fbc61e41832f5a7be2c9c6d4a605d76a037f1f2a -Author: Guillaume Desmottes -Date: Wed Jul 25 15:52:37 2007 +0000 - - salut-connection.c: register the IM, muc and XMPP connection managers as read only properties - - - 20070725155237-7fe3f-ae2579b672f41cdf01e156f8107698fa5b68c118.gz - - src/salut-connection.c | 43 +++++++++++++++++++++++++++++-------------- - 1 files changed, 29 insertions(+), 14 deletions(-) - -commit 74c55a519e8aea6083d4ce8d64e49697c638d0f2 -Author: Guillaume Desmottes -Date: Tue Aug 21 15:23:07 2007 +0000 - - salut-self.c: factor out update_activity - - - 20070821152307-7fe3f-4297bfa683438d5be49664694150d45c8dd7ad73.gz - - src/salut-self.c | 51 ++++++++++++++++++++++++++++++++++++--------------- - 1 files changed, 36 insertions(+), 15 deletions(-) - -commit 6d39989d319a4bb3d82a0b58b99bd31f4add7a7f -Author: Guillaume Desmottes -Date: Tue Aug 21 14:19:43 2007 +0000 - - Implement the ActivityPropertiesChanged signal with public activities - - - 20070821141943-7fe3f-22a86eced11f1dfac18c66113ebe0435f9f8be09.gz - - src/salut-connection.c | 25 +++++++++++++++++++++++++ - src/salut-contact-manager.c | 26 +++++++++++++++++++++++++- - 2 files changed, 50 insertions(+), 1 deletions(-) - -commit 2eaaaf4fc3ae2657ad6224baff7fb157886ca2b2 -Author: Guillaume Desmottes -Date: Tue Aug 21 13:56:33 2007 +0000 - - salut-self: fix a regression. Activity properties are now announced when we announce the activity the first time - - - 20070821135633-7fe3f-ebff27d64c0b6e02ddd07ea9fcb1183467fd576b.gz - - src/salut-self.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit c7a4c68a2d9472cb97bca1184b74039f7c4f4887 -Author: Guillaume Desmottes -Date: Tue Aug 21 10:02:52 2007 +0000 - - salut-self: when setting activities, ask to the contact-manager if he already know this activity and if it's a public one. If yes, we can announce the activity too - - - 20070821100252-7fe3f-5ee6b7b5022d3bb88461cd0254c176dba72cdea1.gz - - src/salut-self.c | 17 +++++++++++------ - 1 files changed, 11 insertions(+), 6 deletions(-) - -commit 0d3f06076f73a015d9a6e8029da944e6b93a5555 -Author: Guillaume Desmottes -Date: Tue Aug 21 09:58:01 2007 +0000 - - SalutSelf: add SalutConnection and SalutContactManager private variable - - - 20070821095801-7fe3f-ae20e9830ebfde2f47507a565d82586f23b95783.gz - - src/salut-connection.c | 3 ++- - src/salut-self.c | 16 +++++++++++++++- - src/salut-self.h | 3 ++- - 3 files changed, 19 insertions(+), 3 deletions(-) - -commit 43d2df26c7ad60d32dd1966f6f7a56b4bb3df846 -Author: Guillaume Desmottes -Date: Tue Aug 21 08:53:46 2007 +0000 - - make salut-contact-manager is_private aware - - - 20070821085346-7fe3f-a075daf6551cab6ce36e6e162c33d62a5cedcbf9.gz - - src/salut-connection.c | 6 +++--- - src/salut-contact-manager.c | 11 ++++++++++- - src/salut-contact-manager.h | 2 +- - 3 files changed, 14 insertions(+), 5 deletions(-) - -commit e0fec77928af994d60e230f831d6ae11dca01141 -Author: Guillaume Desmottes -Date: Tue Aug 21 08:01:37 2007 +0000 - - salut-self.c: _set_olpc_activities_add: check if activity is private before announcing it / update its service - - - 20070821080137-7fe3f-58769e5adfc878dda83b601d1a51d75c536eb3c7.gz - - src/salut-self.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 05eb24185be270f42f7f16b27c1d024ab7123fb9 -Author: Guillaume Desmottes -Date: Mon Aug 20 14:55:25 2007 +0000 - - salut_contact_manager_add_invited_olpc_activity: insert the newly created activity to the hash table - - - 20070820145525-7fe3f-f1ade027ec7181e7d435137686153cac4ce1d1dc.gz - - src/salut-contact-manager.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 6e56fc713aaea4e1431b78730f9348878171f006 -Author: Guillaume Desmottes -Date: Mon Aug 20 14:21:35 2007 +0000 - - rename salut_contact_manager_add_invited_activity to salut_contact_manager_add_invited_olpc_activity - - - 20070820142135-7fe3f-b0632433db6c08adcd62d0a580ea7bc813f6e613.gz - - src/salut-connection.c | 2 +- - src/salut-contact-manager.c | 14 +++++++------- - src/salut-contact-manager.h | 2 +- - 3 files changed, 9 insertions(+), 9 deletions(-) - -commit ec4ff0d05ca031876157f094108879902cca8a04 -Author: Guillaume Desmottes -Date: Mon Aug 20 13:57:41 2007 +0000 - - rename salut_contact_join_private_olpc_activity to salut_contact_takes_part_olpc_activity as we can be invited to join a public activity - - - 20070820135741-7fe3f-82fe47ec2ac433b20ab792cc6747507385e7aa8e.gz - - src/salut-connection.c | 2 +- - src/salut-contact.c | 2 +- - src/salut-contact.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -commit eacaea5493af0c0ba9c7552e831cc2c4a01c5160 -Author: Guillaume Desmottes -Date: Mon Aug 20 13:49:57 2007 +0000 - - observe incoming invitations to update buddy activities and activities properties - - - 20070820134957-7fe3f-044f24c49cd66513a2a2e348d542620277bd2d61.gz - - src/salut-connection.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++ - src/salut-connection.h | 4 ++ - src/salut-muc-manager.c | 4 ++ - 3 files changed, 90 insertions(+), 0 deletions(-) - -commit 00c9f4e3470f98df84c85e2ba85a6a035331fee3 -Author: Guillaume Desmottes -Date: Mon Aug 20 13:47:25 2007 +0000 - - salut-contact-manager: add salut_contact_manager_add_invited_activity to create activity due to incoming invitations - - - 20070820134725-7fe3f-4b4c8966318b44621e8629c20d1a7ad169691823.gz - - src/salut-contact-manager.c | 28 ++++++++++++++++++++++++++++ - src/salut-contact-manager.h | 6 ++++++ - 2 files changed, 34 insertions(+), 0 deletions(-) - -commit 1e23f04980931c95619d828752536ad869cb4a73 -Author: Guillaume Desmottes -Date: Mon Aug 20 13:05:40 2007 +0000 - - salut-contact: rename olpc_activities hash table to olpc_announced_activities and add salut_contact_join_private_olpc_activity public method to manage invitations - - - 20070820130540-7fe3f-6fbdd2288d8e31b9d127a3d06b99f753f08401a9.gz - - src/salut-contact.c | 54 ++++++++++++++++++++++++++++++++++++++++++-------- - src/salut-contact.h | 3 ++ - 2 files changed, 48 insertions(+), 9 deletions(-) - -commit f37effe234218d35ef4b1ed47ed221f374927d36 -Author: Guillaume Desmottes -Date: Mon Aug 20 12:49:59 2007 +0000 - - salut-contact-manager: factor out activity update code - - - 20070820124959-7fe3f-408a7521c8aecd9a6bcdb592d97d228704dc6ce9.gz - - src/salut-contact-manager.c | 53 ++++++++++++++++++++++++++---------------- - 1 files changed, 33 insertions(+), 20 deletions(-) - -commit 4e4dea00e671930470436beab18ad529b75ec417 -Author: Guillaume Desmottes -Date: Mon Aug 20 09:59:31 2007 +0000 - - salut_self_olpc_augment_invitation: add the activity ID in the invite - - - 20070820095931-7fe3f-9c6995ea495217c5bb4092237bf238cfa6559164.gz - - src/salut-self.c | 21 +++++++++++++++------ - 1 files changed, 15 insertions(+), 6 deletions(-) - -commit 57677748d9ff676b78a50a24676964c373cc10ae -Author: Guillaume Desmottes -Date: Mon Aug 20 09:47:20 2007 +0000 - - move augment_invitation from salut_connection to salut_self - - - 20070820094720-7fe3f-953a055d3505b6273004aede00fdb46b8f1b8ddb.gz - - src/salut-connection.c | 26 ----------------- - src/salut-connection.h | 4 --- - src/salut-muc-channel.c | 13 ++++++++- - src/salut-self.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++ - src/salut-self.h | 7 +++++ - 5 files changed, 89 insertions(+), 31 deletions(-) - -commit 4f2e63d7b285bf6d81fb9eeed5726bd40e8f4260 -Author: Guillaume Desmottes -Date: Mon Aug 20 09:41:56 2007 +0000 - - salut-connection: register the Self object as a read-only property - - - 20070820094156-7fe3f-e3b0e569494df2fa6bad7927aa5e5cac032ae483.gz - - src/salut-connection.c | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) - -commit 374e045e50a8e4fd0e06430fad4e8dbf3b71c43f -Author: Guillaume Desmottes -Date: Fri Aug 17 14:54:31 2007 +0000 - - set activity's properties in MUC invitations - - - 20070817145431-7fe3f-72e189f160bfae739cd79974da5e93498b9822da.gz - - src/salut-connection.c | 29 +++++++++++++++++++++++++++++ - src/salut-connection.h | 6 ++++++ - src/salut-muc-channel.c | 3 +++ - 3 files changed, 38 insertions(+), 0 deletions(-) - -commit 37a91fc41114c5c53fcb368a1b4ab1883426d4d6 -Author: Guillaume Desmottes -Date: Fri Aug 17 14:51:27 2007 +0000 - - salut-connection.c: factor out create_properties_table - - - 20070817145127-7fe3f-d064d194e918fe572fad5feb7bfe8cc938ea29f7.gz - - src/salut-connection.c | 71 +++++++++++++++++++++++++++++------------------- - 1 files changed, 43 insertions(+), 28 deletions(-) - -commit da6ed6dd96b3456e4cb79e405be911171b9e064b -Author: Guillaume Desmottes -Date: Fri Aug 17 14:36:40 2007 +0000 - - check-node-properties.c: test the boolean type - - - 20070817143640-7fe3f-d5896ee64da0b91a6804f6bb2b1eae74fea4ca7e.gz - - tests/check-node-properties.c | 29 ++++++++++++++++++++++++++--- - 1 files changed, 26 insertions(+), 3 deletions(-) - -commit 588570cb884957331b115ee5cb5f69b379ad6603 -Author: Guillaume Desmottes -Date: Fri Aug 17 14:35:11 2007 +0000 - - salut-util.c: add support for boolean in gibber_xmpp_node_set_children_from_properties and salut_gibber_xmpp_node_extract_properties - - - 20070817143511-7fe3f-08a6ce3bcdfc334b6c9e7556a25488b74302b90c.gz - - src/salut-util.c | 39 ++++++++++++++++++++++++++++++++++++++- - 1 files changed, 38 insertions(+), 1 deletions(-) - -commit 564c840840c94b87ba1df17db3948662130fc7f3 -Author: Guillaume Desmottes -Date: Fri Aug 17 14:34:51 2007 +0000 - - gibber-namespaces.h: add GIBBER_TELEPATHY_NS_OLPC_ACTIVITY_PROPS - - - 20070817143451-7fe3f-b9a78518ce007308ca2f1f3f5b8df4a44dda2563.gz - - lib/gibber/gibber-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit b7d82fe39e9d2e9b9796a6f358b2cb25cf321b32 -Author: Guillaume Desmottes -Date: Fri Aug 17 13:37:10 2007 +0000 - - start to announce an activity when its private property is switched to FALSE - - - 20070817133710-7fe3f-4cc2e9e37d8bc3547fd359cedf1d5478e3902e8c.gz - - src/salut-self.c | 20 ++++++++++++++++++-- - 1 files changed, 18 insertions(+), 2 deletions(-) - -commit 7d6f40f723c48690111fb7db798a4f1bd0f39c79 -Author: Guillaume Desmottes -Date: Fri Aug 17 13:26:38 2007 +0000 - - add "private" activity property - - - 20070817132638-7fe3f-6d6a510829130e0801a4c8f47b41f120fa0b9eea.gz - - src/salut-connection.c | 27 ++++++++++++++++++++++++--- - src/salut-self.c | 24 +++++++++++------------- - src/salut-self.h | 5 +++-- - 3 files changed, 38 insertions(+), 18 deletions(-) - -commit ab0810f10a0bb2c9594360e428e23a9695fd8cd5 -Author: Guillaume Desmottes -Date: Fri Aug 17 10:26:28 2007 +0000 - - salut-self.c: salut_self_set_olpc_activity_properties return an error if it don't know the activity as SetActivities is supposed to be called before - - - 20070817102628-7fe3f-f543b133ff40cef1a5a06e8f526dfeb8f8b82f34.gz - - src/salut-self.c | 11 +++++------ - 1 files changed, 5 insertions(+), 6 deletions(-) - -commit 20878bd2e268db086effe559f9ac0c70c9ec913f -Author: Guillaume Desmottes -Date: Fri Aug 17 08:17:14 2007 +0000 - - salut-self.c: if we create the activity in set_properties, we don't share it. Announce not previously shared activity in _set_olpc_activities_add - - - 20070817081714-7fe3f-23ca56003cda067b33f2531b8ad990feb2659a83.gz - - src/salut-self.c | 87 ++++++++++++++++++++++++++++++++++++++++++----------- - 1 files changed, 69 insertions(+), 18 deletions(-) - -commit 590085e2530cd1eef94cc11dc8aca786ad7f1cd5 -Author: Guillaume Desmottes -Date: Thu Aug 16 16:06:46 2007 +0000 - - salut-self.c: factor out announcing activity code so we can create not public activities - - - 20070816160646-7fe3f-1fa6a0af28016d270d2fb4c1503930159a1df684.gz - - src/salut-self.c | 100 +++++++++++++++++++++++++++++------------------------ - 1 files changed, 55 insertions(+), 45 deletions(-) - -commit 8bfa8a647bcc0cc8787fd9b726cb257b823fe777 -Author: Guillaume Desmottes -Date: Tue Aug 28 17:59:40 2007 +0000 - - salut-tubes-channel.c: updated to fit spec 0.15.5 + implement old tubes API for backwards compatibilty - - - 20070828175940-7fe3f-0640c16b136949ff6794f30c283158bcf2700c33.gz - - src/salut-tubes-channel.c | 94 ++++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 88 insertions(+), 6 deletions(-) - -commit a8be6b84db0ef65594095cf9ad267f06461d91d3 -Author: Guillaume Desmottes -Date: Tue Aug 28 17:58:58 2007 +0000 - - update tubes spec to 0.15.5 - - - 20070828175858-7fe3f-7e50a91512e6a8a53d589a15a21d11d8d0d40ea9.gz - - extensions/Channel_Type_Tubes.xml | 215 +++++++++++++++++++++++++++++++++++-- - 1 files changed, 204 insertions(+), 11 deletions(-) - -commit 61f3078990ef49f10a2b02440018c7d712f8555c -Author: Sjoerd Simons -Date: Tue Jul 24 13:52:38 2007 +0000 - - Make the muc connection asynchronous - - - 20070724135238-b58c9-630bf99e8f05be57f6fc32a2eaff6161d9a6ffdb.gz - - lib/gibber/gibber-muc-connection.c | 37 ++++++++++++++++++++++++++++++----- - 1 files changed, 31 insertions(+), 6 deletions(-) - -commit 084c04e2b3fd75fcec0ea1624d4d81f48918fb06 -Author: Guillaume Desmottes -Date: Mon Aug 27 14:07:52 2007 +0000 - - update tubes API comments - - - 20070827140752-7fe3f-48298fc568437db5035127925e2e16515e158c51.gz - - src/salut-tubes-channel.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 17cea3700505efabb30992c055b2aac813e28ad0 -Author: Guillaume Desmottes -Date: Mon Aug 27 08:30:47 2007 +0000 - - salut-tubes-channel.c: remove HAVE_DBUS_TUBE tests as now we always build D-Bus tubes - - - 20070827083047-7fe3f-d33979086efcbd23fb31acc8af988672b40f68d6.gz - - src/salut-tubes-channel.c | 62 --------------------------------------------- - 1 files changed, 0 insertions(+), 62 deletions(-) - -commit 7b794b1f15d153597b2f0c067323d513d0efcb8b -Author: Guillaume Desmottes -Date: Mon Aug 27 08:22:39 2007 +0000 - - salut-tubes-channel.c: updated to fit latest spec - - - 20070827082239-7fe3f-0430ae8372490d92b5fd2c142fa1e86af0ad09d2.gz - - src/salut-tubes-channel.c | 79 +++++++++++++++++++++++--------------------- - 1 files changed, 41 insertions(+), 38 deletions(-) - -commit 4cafb3564b09e0c1bd71cb3d360c2c687a06bd9f -Author: Guillaume Desmottes -Date: Mon Aug 27 08:17:39 2007 +0000 - - update extensions/Channel_Type_Tubes.xml - - - 20070827081739-7fe3f-e39bbf2525b9df69fb32c0183f5883910b9b3d11.gz - - extensions/Channel_Type_Tubes.xml | 308 ++++++++++++++++++++++++++++++++----- - 1 files changed, 267 insertions(+), 41 deletions(-) - -commit e2bc8cb14142781576ff32a3a333db50a7f4ee4b -Author: Sjoerd Simons -Date: Fri Aug 24 14:31:59 2007 +0000 - - version 0.1.4.1 - - - 20070824143159-b58c9-0d5f9f06e7b335b647ff14aac3a9f37275107c01.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4a99b67f7ade8be3877784a28caad65eb7117c1f -Author: Sjoerd Simons -Date: Fri Aug 24 14:20:25 2007 +0000 - - version 0.1.4 - - - 20070824142025-b58c9-2e0470a66e451622ef7d56e721a3fb225dfb1816.gz - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 1a904b2d3bfb9782b1ce779b7890a96a967bad8a -Author: Sjoerd Simons -Date: Thu Aug 23 15:32:14 2007 +0000 - - SalutContactManager: Only dispose olpc specific hashtables when --enable-olpc is given - - - 20070823153214-b58c9-bca681f699ef315fc6dbe2b3bfe76e776a344014.gz - - src/salut-contact-manager.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit 74088545f6d0d6f7595a1290bc9f9060599b3237 -Author: Sjoerd Simons -Date: Thu Aug 23 15:08:21 2007 +0000 - - SalutConnectionManager: Rename the protocol to local-xmpp instead of ll-xmpp, like the new spec says - - - 20070823150821-b58c9-08283fd8ad4361f9b80cdf0b39e398751a21670f.gz - - src/salut-connection-manager.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit b06bb8f4ef88ea9516a839f2ae3a3c0c4489f3a0 -Author: Sjoerd Simons -Date: Thu Aug 23 13:00:33 2007 +0000 - - Change the protocol name to ll-xmpp - - - 20070823130033-b58c9-f87be7dc7e5ce20cf2800c1631f4135bbc7de3d9.gz - - src/salut-connection-manager.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 60e9d39f5401ec56237bb96ea2ea4efb36fe239f -Author: Sjoerd Simons -Date: Thu Aug 23 13:00:18 2007 +0000 - - Add debug output when setting the alias - - - 20070823130018-b58c9-9873617710e4f522c1dc54181fe1d47d5d580078.gz - - src/salut-connection.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit dd117b9e2559936b1a1ea7a9e45d90f712067597 -Author: Guillaume Desmottes -Date: Mon Aug 20 14:45:17 2007 +0000 - - gibber-r-multicast-transport.c: g_free doesn't need an "if not NULL" guard - - - 20070820144517-7fe3f-09ffde3f2bb7fa242e938d19015dd81005086205.gz - - lib/gibber/gibber-r-multicast-transport.c | 6 +----- - 1 files changed, 1 insertions(+), 5 deletions(-) - -commit ea68a959df87d8a232790c112abb2abf12af2886 -Author: Guillaume Desmottes -Date: Mon Aug 20 13:03:01 2007 +0000 - - salut-contact-manager: destroy olpc_activities_by_room and olpc_activities_by_mdns when closing the factory - - - 20070820130301-7fe3f-2fe11469e1b16c160d9c5bf921e07bbdfee8e9f9.gz - - src/salut-contact-manager.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit a0e9600fb264d13c962782e37c9966d5a3c6daca -Author: Guillaume Desmottes -Date: Mon Aug 20 14:34:24 2007 +0000 - - salut-muc-channel.c: fix 2 TpIntSet when changing group members - - - 20070820143424-7fe3f-e593c8b427aed6c20450690a3c9319ba8f281361.gz - - src/salut-muc-channel.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 6c7ded3b8204f77de8f97941699e4746bb976388 -Author: Guillaume Desmottes -Date: Mon Aug 20 14:33:45 2007 +0000 - - salut-contact: fix 2 OLPC specifc string leaks - - - 20070820143345-7fe3f-b8f97c1fc0a7fa5efda734354c09c14ce877334a.gz - - src/salut-contact.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 308be05c33a85afd95c025ac40cb01bdb0fa0e6b -Author: Guillaume Desmottes -Date: Mon Aug 20 14:28:52 2007 +0000 - - gibber-r-multicast-transport.c: fix priv->name leak - - - 20070820142852-7fe3f-260c3a4dbc6823a936c2c11cc6fa86b6b549d0c5.gz - - lib/gibber/gibber-r-multicast-transport.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 9e24a392dc54a4f53e9dc5362e092e11eca055ea -Author: Sjoerd Simons -Date: Sun Aug 12 23:18:48 2007 +0000 - - SalutImChannel: Remove connected and received-stanza signalling, their obsoleted by the XmppConnectionManager - - - 20070812231848-b58c9-2e31870684c67253f31123ee117f58e1af411c2d.gz - - src/salut-im-channel.c | 40 ---------------------------------------- - 1 files changed, 0 insertions(+), 40 deletions(-) - -commit 5726d9bfa9c3612379097a35c6d7d4986aae62e2 -Author: Sjoerd Simons -Date: Sun Aug 12 23:12:25 2007 +0000 - - SalutXmppManager: When the connection is fully closed, first remove it from the hash tables then disconned the tcp connection. Ensures we don't accidentally emit connection-failed - - - 20070812231225-b58c9-5f80d55c57e7e4b636993d3d3ec14feee1ea634b.gz - - src/salut-xmpp-connection-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c75766f954ae67993dcbf1ebd2efe2c9a2349a22 -Author: Sjoerd Simons -Date: Sun Aug 12 22:59:22 2007 +0000 - - SalutImChannel: Let _intialise_connection cope with receiving stanza's form half-closed connections - - - 20070812225922-b58c9-455d94189e87cacf6133d0b480a8362c38f6cf99.gz - - src/salut-im-channel.c | 30 ++++++++++++++++++++++-------- - 1 files changed, 22 insertions(+), 8 deletions(-) - -commit d20a66427b759c95d80ef5db68683c982eb28611 -Author: Sjoerd Simons -Date: Sun Aug 12 21:58:21 2007 +0000 - - SalutXmppConnection: Make incoming connection handle from a machine with only one announce contact more in line with the normal handle. Also fixes a race condition which caused a new connection to be signaled before it was actually opened - - - 20070812215821-b58c9-79f6dd6c647b8f87c701e41991351a2ed363475a.gz - - src/salut-xmpp-connection-manager.c | 113 ++++++++++++++++++++-------------- - 1 files changed, 66 insertions(+), 47 deletions(-) - -commit 6dde6c97f408e4af813c8c59d2d8fc6ed670973e -Author: Sjoerd Simons -Date: Sun Aug 12 21:03:21 2007 +0000 - - Start listening for new connections directly after the channel is created - - - 20070812210321-b58c9-1d0b5135b9ab638f67760b5c8f689f1f8f1597df.gz - - src/salut-im-channel.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit d4d623fa2949334dd4175700a12a55acb00d4e9c -Author: Sjoerd Simons -Date: Sun Aug 12 20:30:56 2007 +0000 - - SalutXmppConnectManager: Don't start the refcount for outgoing connections at 1 - - - 20070812203056-b58c9-dbfe3b8bd0f247b9127afc0e7985f36ce5ae3fb8.gz - - src/salut-xmpp-connection-manager.c | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -commit 32cdff393d2ac57b1d4705b0553da0f03fe900a1 -Author: Sjoerd Simons -Date: Sun Aug 12 20:30:07 2007 +0000 - - SalutImChannel: Start waiting for a new xmpp connection as soon as the connection backing the im channel goes away - - - 20070812203007-b58c9-6e71a778815b3cb10f62b1d7b8925b73f58d9972.gz - - src/salut-im-channel.c | 13 ++++++++++--- - 1 files changed, 10 insertions(+), 3 deletions(-) - -commit a38db11b9908eeb1fab2a102a837ed5ad564a3f2 -Author: Guillaume Desmottes -Date: Wed Aug 1 14:08:53 2007 +0000 - - fix IBB NS - - - 20070801140853-7fe3f-6e410e615a9619db3b6b62bd7f0aa763ab2a715e.gz - - lib/gibber/gibber-namespaces.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d1e0e11245b0be47eb07958356ccf96ad800de2e -Author: Guillaume Desmottes -Date: Tue Jul 31 16:49:19 2007 +0000 - - salut-xmpp-connection-manager.c: disconnect transport signal in disconnect_signals_foreach - - - 20070731164919-7fe3f-aaf127a32c97c42409baa2a3cd656683f1b70360.gz - - src/salut-xmpp-connection-manager.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 094a165a4c28c5b4b0f1c51f56a3322495a4bb80 -Author: Guillaume Desmottes -Date: Tue Jul 31 11:43:43 2007 +0000 - - disconnect all signals from connection when disposing the XCM - - - 20070731114343-7fe3f-7b0bc3a3a0511f401e8ed90085c6194c92337c2f.gz - - src/salut-xmpp-connection-manager.c | 19 +++++++++++++++++++ - 1 files changed, 19 insertions(+), 0 deletions(-) - -commit 12293c9c3c72598b7bc3f1925330b4ffead658f3 -Author: Guillaume Desmottes -Date: Mon Jul 30 12:48:34 2007 +0000 - - salut-xmpp-connection-manager.c: remove remaining timer when a connection is fully open - - - 20070730124834-7fe3f-ad61b12523c600bb8d1ecd8b201dc259672eb18f.gz - - src/salut-xmpp-connection-manager.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 7f944a638936f3314e1ae54cfe43f6d52a8c5cc5 -Author: Guillaume Desmottes -Date: Thu Jul 26 14:25:15 2007 +0000 - - salut-xmpp-connection-manager.c: remove timer when got a tranport disconnected signal - - - 20070726142515-7fe3f-5f2b03fa795732d9d3d5c69d306373809cc2cfac.gz - - src/salut-xmpp-connection-manager.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 5cbc2f35338214994a22a12b326ee98da310d150 -Author: Guillaume Desmottes -Date: Thu Jul 26 10:43:54 2007 +0000 - - salut-xmpp-connection-manager.c: remove connection's timer in remove_connection - - - 20070726104354-7fe3f-f1e09594a5e1e881ced46c35218b1fab4a67274c.gz - - src/salut-xmpp-connection-manager.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit ed848a0c933ed86f0cf4ad2ce29fec0f9aa6c3ab -Author: Guillaume Desmottes -Date: Sat Jul 21 21:13:14 2007 +0000 - - salut-xmpp-connection-manager.c: fix timers confusion bug - - - 20070721211314-7fe3f-e827290bc8e1fbab46f38eed8d142cb993e29dd8.gz - - src/salut-xmpp-connection-manager.c | 80 ++++++++++++++++++++--------------- - 1 files changed, 46 insertions(+), 34 deletions(-) - -commit cc830f0309697480a6036e3e473235245421ab72 -Author: Guillaume Desmottes -Date: Fri Jul 20 16:54:35 2007 +0000 - - salut-xmpp-connection-manager.c: new_connection_cb: don't close the XMPP connection if we don't know the contact as we already close the transport and this connection wasn't opened anyway - - - 20070720165435-7fe3f-dd50fba9f252b51d657c983fb0dcced49d24d672.gz - - src/salut-xmpp-connection-manager.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 03d317fc9946b91e645dc3b37a73d47379e31313 -Author: Guillaume Desmottes -Date: Wed Jul 18 22:54:15 2007 +0000 - - salut-im-channel.c: reset connection timer when we send a stanza trought it - - - 20070718225415-7fe3f-850021f86dfebeb69dbb0b650048b4f3b714df85.gz - - src/salut-im-channel.c | 12 +++++++++--- - src/salut-xmpp-connection-manager.c | 32 +++++++++++++++++++++++++------- - src/salut-xmpp-connection-manager.h | 4 ++++ - 3 files changed, 38 insertions(+), 10 deletions(-) - -commit f6c3098019e27c49e377f1f1b466daf388744f43 -Author: Guillaume Desmottes -Date: Wed Jul 18 22:32:16 2007 +0000 - - salut-im-channel.c: don't take the connection so XCM will automatically close it if we don't receive messages on it - - - 20070718223216-7fe3f-d67b25fb41ec35fbb79a695da48672e3af0e53c6.gz - - src/salut-im-channel.c | 10 ---------- - src/salut-xmpp-connection-manager.c | 2 ++ - 2 files changed, 2 insertions(+), 10 deletions(-) - -commit fe3e61ff1354b2111a63a71d4c1d73de0c61e447 -Author: Guillaume Desmottes -Date: Tue Jul 17 14:31:27 2007 +0000 - - salut-xmpp-connection-manager.c: add a FIXME about incoming connections that shoudln't be announced until we receive the first stanza on it - - - 20070717143127-7fe3f-38bd37f670af003142cff82b44cf31d3f7d367ce.gz - - src/salut-xmpp-connection-manager.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit fe52dc75d96185d6d305bddafde30c575ede411d -Author: Guillaume Desmottes -Date: Tue Jul 17 14:23:35 2007 +0000 - - salut-muc-channel.c: set contact as remote_pending when we invite him - - - 20070717142335-7fe3f-4950dd85a2f373fe6eb04286e0fb7dc135d35028.gz - - src/salut-muc-channel.c | 31 +++++++++++++++++++++++++++++++ - 1 files changed, 31 insertions(+), 0 deletions(-) - -commit 006a458c2dc03a27eff703d3b0a0e4c90d0bcb57 -Author: Guillaume Desmottes -Date: Tue Jul 17 14:22:46 2007 +0000 - - add debug messages - - - 20070717142246-7fe3f-6b7fb8163bf461ca4f881eef64195cf4c4637ee3.gz - - src/salut-im-channel.c | 1 + - src/salut-xmpp-connection-manager.c | 3 ++- - 2 files changed, 3 insertions(+), 1 deletions(-) - -commit df248fcad55501d16c5847763874b662e6e9eb1d -Author: Guillaume Desmottes -Date: Tue Jul 17 10:02:02 2007 +0000 - - gibber-fd-transport.c: when disconnecting don't set the state if we are disposing - - - 20070717100202-7fe3f-e2254367554f51931ae3cdcf15cce0b135d3b252.gz - - lib/gibber/gibber-fd-transport.c | 6 ++++-- - src/salut-xmpp-connection-manager.c | 5 ----- - 2 files changed, 4 insertions(+), 7 deletions(-) - -commit dd9757f1b05869f83a8a8ab7c3182417c42b8027 -Author: Guillaume Desmottes -Date: Mon Jul 16 15:09:28 2007 +0000 - - gibber-linklocal-transport.c: define GIBBER_LL_TRANSPORT_ERROR and use them in gibber_ll_transport_open_sockaddr so the error is set as expected by the caller (fix crash in XCM) - - - 20070716150928-7fe3f-67ae2daaedfffba7773f137df17557e3132c0c3b.gz - - lib/gibber/gibber-linklocal-transport.c | 31 +++++++++++++++++-------------- - lib/gibber/gibber-linklocal-transport.h | 9 +++++++++ - 2 files changed, 26 insertions(+), 14 deletions(-) - -commit c468d1f37113ef42b31d5cfdd2a1df1a7f8227b8 -Author: Guillaume Desmottes -Date: Mon Jul 16 15:16:52 2007 +0000 - - salut-muc-channel.c: tweak muc_channel_add_member to fit Collabora coding style - - - 20070716151652-7fe3f-821039e76c7cb4afc6aec74d14d9e9cb8d8c99f1.gz - - src/salut-muc-channel.c | 58 ++++++++++++++++++++++++++--------------------- - 1 files changed, 32 insertions(+), 26 deletions(-) - -commit 4eb97b0b73d47599bb17e1565bf8ee939049adf5 -Author: Guillaume Desmottes -Date: Mon Jul 16 15:09:52 2007 +0000 - - salut-muc-manager.c: check the stanza type in invite_stanza_filter - - - 20070716150952-7fe3f-a4e6b330141fbf24df8dc84895121a345878c409.gz - - src/salut-muc-manager.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 52f9fa5d3cecfd8f3acb6c183f7b32245b5be473 -Author: Guillaume Desmottes -Date: Mon Jul 16 15:02:47 2007 +0000 - - salut_im_channel_add_connection: assert priv->xmpp_connection == NULL - - - 20070716150247-7fe3f-fe096010a6de199a06bc2b76827439e1c873007f.gz - - src/salut-im-channel.c | 10 +--------- - 1 files changed, 1 insertions(+), 9 deletions(-) - -commit ea746942405892fe8f6acc53fd1558be79adcbc9 -Author: Guillaume Desmottes -Date: Mon Jul 16 14:58:10 2007 +0000 - - salut-im-channel.c: request a new connection instead of raise an error if we try to send a message when the channel is closing - - - 20070716145810-7fe3f-4240b9fe5bd479e7cb252d6a7427aea437001218.gz - - src/salut-im-channel.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit c10fd2153176c4534ba54d2507457b347e0f32d8 -Author: Guillaume Desmottes -Date: Mon Jul 16 14:53:10 2007 +0000 - - salut-im-channel.c: don't call _error_flush_queue when connection is gracefully closed - - - 20070716145310-7fe3f-ec0d9b4a465a2e0512e0386e112cb6e1ebb71018.gz - - src/salut-im-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c79488fdfafe6339addebb860cfc4e9c8d62ae63 -Author: Guillaume Desmottes -Date: Mon Jul 16 14:43:55 2007 +0000 - - salut-xmpp-connection-manager.c: use tp_strdiff instead of strcmp - - - 20070716144355-7fe3f-54a1575dcf7b2b99d2cd117a56ae2d0bdf2999d8.gz - - src/salut-xmpp-connection-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9e97878de90e4dc4e1932506e3d40a6eda6a2b8e -Author: Guillaume Desmottes -Date: Mon Jul 16 14:42:00 2007 +0000 - - salut-xmpp-connection-manager.c: add comment - - - 20070716144200-7fe3f-f42275ee38aa984cfdfa14930354e2425020a4d6.gz - - src/salut-xmpp-connection-manager.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit cc639a41544b2e7c17d646783d7d39ddec34f741 -Author: Guillaume Desmottes -Date: Mon Jul 16 14:39:37 2007 +0000 - - salut-xmpp-connection-manager.c: emit the closed signal before call check_if_waiting_for_connection_closed - - - 20070716143937-7fe3f-2e557327cb9a28e3e2e4149550272db7deb0e192.gz - - src/salut-xmpp-connection-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a64ae0c9b2b05f6b21dc9d236a86b9a09524e395 -Author: Guillaume Desmottes -Date: Mon Jul 16 14:37:59 2007 +0000 - - salut-xmpp-connection-manager.c: add few contact != NULL asserts - - - 20070716143759-7fe3f-3a7436c8592834b6f6cb78863f40ac7eeae878b5.gz - - src/salut-xmpp-connection-manager.c | 8 +++----- - 1 files changed, 3 insertions(+), 5 deletions(-) - -commit 26c4f540a822e1b84478da676bdaecd86755708a -Author: Guillaume Desmottes -Date: Mon Jul 16 14:30:22 2007 +0000 - - salut-xmpp-connection-manager.c: print the contact name in debug output when it's possible - - - 20070716143022-7fe3f-7f25d5b78dd8a772ac7b3f525a0a8314c25fa693.gz - - src/salut-xmpp-connection-manager.c | 38 ++++++++++++++++++++-------------- - 1 files changed, 22 insertions(+), 16 deletions(-) - -commit b994c3cd133f850edc76b6acd0ed243436e061f6 -Author: Guillaume Desmottes -Date: Mon Jul 16 14:22:29 2007 +0000 - - salut-xmpp-connection-manager.c: fix typo in debug messages - - - 20070716142229-7fe3f-6c40f8872a508c6e49b1f006ee0cba2fff1b7e27.gz - - src/salut-xmpp-connection-manager.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 7ba4df0ccf5bff984da8b82722846dde19483b17 -Author: Guillaume Desmottes -Date: Mon Jul 16 14:20:37 2007 +0000 - - salut-xmpp-connection-manager.c: add one TODO and FIXME - - - 20070716142037-7fe3f-40c9305de2857a7e5605208d723ce7ef14b6b8a9.gz - - src/salut-xmpp-connection-manager.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 823ddded99653b8df28aae7d946ee95f99fadcc4 -Author: Guillaume Desmottes -Date: Mon Jul 16 14:12:26 2007 +0000 - - salut-xmpp-connection-manager.c: reset timer when we receive a stanza - - - 20070716141226-7fe3f-2d0ab51af1fb863e49109b4809e8be21733079f0.gz - - src/salut-xmpp-connection-manager.c | 124 ++++++++++++++++++++--------------- - 1 files changed, 70 insertions(+), 54 deletions(-) - -commit 6dde95979f53585774dac7ddaacbfeb84ec16581 -Author: Guillaume Desmottes -Date: Mon Jul 16 13:44:58 2007 +0000 - - salut-xmpp-connection-manager.c: add debug messages - - - 20070716134458-7fe3f-42400316eb9197769e107280f18535d21dbfe0a9.gz - - src/salut-xmpp-connection-manager.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 111385fedabb507b4bde6e67dfce3ddd57ce4ae0 -Author: Guillaume Desmottes -Date: Mon Jul 16 13:43:41 2007 +0000 - - salut-xmpp-connection-manager.c: open the incoming connection when there is only one contact that could be associated with it and so we consider it fully open - - - 20070716134341-7fe3f-a2c2db755a335eb16da3376d394f33c45bc0f6f3.gz - - src/salut-xmpp-connection-manager.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit 2efa3150bca046a9121e2002b139dc5a6687f5de -Author: Guillaume Desmottes -Date: Wed Jul 11 14:06:42 2007 +0000 - - remove salut_im_channel_send_stanza as we don't need it anymore thanks to XCM - - - 20070711140642-7fe3f-fef963431af3d2f965b9532aea9ad528514e5a40.gz - - src/salut-im-channel.c | 41 ----------------------------------------- - src/salut-im-channel.h | 3 --- - 2 files changed, 0 insertions(+), 44 deletions(-) - -commit 074d4bb0d6bb057aacca441ffd4c0f2d3b2b5d84 -Author: Guillaume Desmottes -Date: Wed Jul 11 14:03:49 2007 +0000 - - add salut_im_channel_is_text_message - - - 20070711140349-7fe3f-21c7f8a25039d64852d467a8218e94793c21a735.gz - - src/salut-im-channel.c | 24 ++++++++++++++++++------ - src/salut-im-channel.h | 3 +++ - src/salut-im-manager.c | 8 +------- - 3 files changed, 22 insertions(+), 13 deletions(-) - -commit 88bc27a6cd33a2ccdafe6679ffbb8e6e86996fb2 -Author: Guillaume Desmottes -Date: Wed Jul 11 13:52:48 2007 +0000 - - Muc now use XCM for handling invitations - - - 20070711135248-7fe3f-7bfc214cf69ed0fb1d8e2964d5dffc032aad26fb.gz - - src/salut-im-manager.c | 6 ++ - src/salut-muc-channel.c | 210 +++++++++++++++++++++++++++++++++++++--------- - 2 files changed, 175 insertions(+), 41 deletions(-) - -commit dbc452f7278b124db1100632204ab39cd321be48 -Author: Guillaume Desmottes -Date: Wed Jul 11 13:06:56 2007 +0000 - - salut-connection.c: don't set the G_PARAM_CONSTRUCT_ONLY to the contact manager property as it's a ro property - - - 20070711130656-7fe3f-1e49a12d82794079a965c5e72dd50e04010c9799.gz - - src/salut-connection.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 419a3df97f508e220577a76f79cd2548a94458cd -Author: Guillaume Desmottes -Date: Wed Jul 11 11:59:03 2007 +0000 - - salut-connection.c: set the contact manager as a read only property - - - 20070711115903-7fe3f-bb996d608e17a414823522f15fbe8f6312bc75a4.gz - - src/salut-connection.c | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -commit 857e0beba90da6502de0d8459dc77574163ed98e -Author: Guillaume Desmottes -Date: Wed Jul 11 11:56:41 2007 +0000 - - s/salut_xmpp_connection_request_connection/ salut_xmpp_connection_manager_request_connection - - - 20070711115641-7fe3f-b1e9630a1dcbdab36eb571d81117bf29f4fda217.gz - - src/salut-im-channel.c | 2 +- - src/salut-xmpp-connection-manager.c | 9 +++++---- - src/salut-xmpp-connection-manager.h | 5 +++-- - 3 files changed, 9 insertions(+), 7 deletions(-) - -commit dc0a79058eca390033027184a6b5c3aa170327c4 -Author: Guillaume Desmottes -Date: Wed Jul 11 10:58:28 2007 +0000 - - fix DEBUG_XCM flag - - - 20070711105828-7fe3f-da40f406bcb6681da7646cf9e7286986961889ff.gz - - src/debug.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d7af28707416340984febb80d82a1e5efe7d20f9 -Author: Guillaume Desmottes -Date: Wed Jul 11 10:50:56 2007 +0000 - - salut-muc-manager: use XCM to catch invitation request - - - 20070711105056-7fe3f-af859a2bd818c4513288f9dc1b6c3fe9eb524f98.gz - - src/salut-connection.c | 3 +- - src/salut-muc-manager.c | 228 ++++++++++++++++++++++++++--------------------- - src/salut-muc-manager.h | 6 +- - 3 files changed, 133 insertions(+), 104 deletions(-) - -commit e7eefc5e469d14fc45546e617bfdd165431130a0 -Author: Guillaume Desmottes -Date: Wed Jul 11 09:37:55 2007 +0000 - - salut-xmpp-connection-manager.c: use increment_connection_refcount to init the refcount - - - 20070711093755-7fe3f-43146224155d06e1a4b761c8b338798fa3078ecc.gz - - src/salut-xmpp-connection-manager.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit 45aa8bb1bfcdd76df22bc19cad0be87a0780f3f2 -Author: Guillaume Desmottes -Date: Wed Jul 11 09:19:19 2007 +0000 - - fix GIBBER_XMPP_CONNECTION_CLOSE_FULLY_CLOSED flag - - - 20070711091919-7fe3f-6ef819ed805180f8c37574ff13147a9955a711e2.gz - - lib/gibber/gibber-xmpp-connection.h | 1 + - src/salut-xmpp-connection-manager.c | 2 +- - 2 files changed, 2 insertions(+), 1 deletions(-) - -commit 6cd06078c4ead54180ea24c28888a4fb645c77ee -Author: Guillaume Desmottes -Date: Wed Jul 11 08:26:55 2007 +0000 - - salut-xmpp-connection-manager.c: s/pending_connection_got_from/incoming_pending_connection_got_from - - - 20070711082655-7fe3f-cb8a4153fffdcc3002af1ccc2ea7b5943c784e53.gz - - src/salut-xmpp-connection-manager.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 2f37524374bc81973ba4c73a4cc7e798ef24dce4 -Author: Guillaume Desmottes -Date: Wed Jul 11 08:18:10 2007 +0000 - - properly manage connection refcount with incoming connection. So if nobody care about it, the connection will be freed when its timer expired - - - 20070711081810-7fe3f-08200cb29f95fe9cb70cb6a4f0a4a26d9052839b.gz - - src/salut-im-channel.c | 8 ++++++++ - src/salut-xmpp-connection-manager.c | 2 ++ - 2 files changed, 10 insertions(+), 0 deletions(-) - -commit 606253e115de443e68ab9776b5fad6330875048e -Author: Guillaume Desmottes -Date: Wed Jul 11 08:01:45 2007 +0000 - - remove refcount timer when refcount raised 1 - - - 20070711080145-7fe3f-fd03dfcd1ea4b6b9b22518eb1a4d5bc819f54543.gz - - src/salut-xmpp-connection-manager.c | 19 +++++++++++++++---- - 1 files changed, 15 insertions(+), 4 deletions(-) - -commit e10c6c67035c5d75f499b473630c9bbe1fe2c790 -Author: Guillaume Desmottes -Date: Tue Jul 10 18:44:58 2007 +0000 - - set a timer instead of immediately close the connection when its refcount fails to 0 - - - 20070710184458-7fe3f-32df05a5c8b24bc0a09054de441a093c0f4e1f06.gz - - src/salut-xmpp-connection-manager.c | 66 ++++++++++++++++++++++++++++------- - 1 files changed, 53 insertions(+), 13 deletions(-) - -commit 57d1e6e462cb1e4d37342db7336edb5af757acaa -Author: Guillaume Desmottes -Date: Tue Jul 10 18:24:51 2007 +0000 - - rename salut_xmpp_connection_release_connection to salut_xmpp_connection_manager_release_connection and add salut_xmpp_connection_manager_take_connection - - - 20070710182451-7fe3f-7625da0bf837f70948a4985271c294a67311accd.gz - - src/salut-im-channel.c | 2 +- - src/salut-xmpp-connection-manager.c | 13 +++++++++++-- - src/salut-xmpp-connection-manager.h | 8 ++++++-- - 3 files changed, 18 insertions(+), 5 deletions(-) - -commit 17cc920fc993a1f2baa58e55c9229e4b36cb7e46 -Author: Guillaume Desmottes -Date: Tue Jul 10 16:52:13 2007 +0000 - - salut-xmpp-connection-manager.c: create_new_outgoing_connection return a specif GError if we can't find addresse for the contact - - - 20070710165213-7fe3f-8ffb49a8628c23a1beecf6d43cdbb59e08bec541.gz - - src/salut-xmpp-connection-manager.c | 13 +++++++++++++ - src/salut-xmpp-connection-manager.h | 1 + - 2 files changed, 14 insertions(+), 0 deletions(-) - -commit f23eeec57a1d8c5b9489614d2c2d69da5052a708 -Author: Guillaume Desmottes -Date: Tue Jul 10 16:37:44 2007 +0000 - - salut_xmpp_connection_request_connection now checks if there is an existing pending incoming/outgoing connection before create a new one - - - 20070710163744-7fe3f-075f7ee5e5bf0eafc0c73c6560f29f9c0568285b.gz - - src/salut-xmpp-connection-manager.c | 49 +++++++++++++++++++++++++++++++++- - 1 files changed, 47 insertions(+), 2 deletions(-) - -commit 2a3eac89d8fcd5c964416f6b54d580022a49673d -Author: Guillaume Desmottes -Date: Tue Jul 10 16:06:31 2007 +0000 - - salut_xmpp_connection_request_connection now check if the connection isn't closing. If it is, wait this connection is closed before requesting a new one - - - 20070710160631-7fe3f-2f59dd5ee92e830af983d45926522068408bb2ed.gz - - src/salut-im-channel.c | 2 +- - src/salut-xmpp-connection-manager.c | 157 ++++++++++++++++++++++++++++------ - src/salut-xmpp-connection-manager.h | 2 +- - 3 files changed, 131 insertions(+), 30 deletions(-) - -commit 44620cedb8b357ee4eb6d4ab61032df897d2fbc6 -Author: Guillaume Desmottes -Date: Tue Jul 10 14:49:03 2007 +0000 - - salut-xmpp-connection-manager.c: increment the refcount of existing connection and set it to 1 for new one (not the opposite..) - - - 20070710144903-7fe3f-e411cbdac127a695614992ba8e0565a43cd844d9.gz - - src/salut-xmpp-connection-manager.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit bcbcca1e89f7e9601b4aa887f1058a37291c77ba -Author: Guillaume Desmottes -Date: Tue Jul 10 14:42:41 2007 +0000 - - salut-im-channel.c: add the closing state - - - 20070710144241-7fe3f-8dc68b7f077f16852b83869d261f366916f675d6.gz - - src/salut-im-channel.c | 61 ++++++++++++++++++++++++++++++++++++++++++----- - 1 files changed, 54 insertions(+), 7 deletions(-) - -commit 46d6aef7ac2c21a978404ed39e5b117aa79e2146 -Author: Guillaume Desmottes -Date: Tue Jul 10 13:58:53 2007 +0000 - - salut-xmpp-connection-manager.c: connection_transport_disconnected_cb check if we are disposing to avoid to unref twice the same connection - - - 20070710135853-7fe3f-9d06bd61d10aa8302a900263920e16f8a6d77739.gz - - src/salut-xmpp-connection-manager.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -commit f1c6d7cf0744c68ea04e35f2d82f6b4cc5e4e499 -Author: Guillaume Desmottes -Date: Tue Jul 10 13:57:50 2007 +0000 - - salut-xmpp-connection-manager.c: factor out remove_connection and add few debug output - - - 20070710135750-7fe3f-f5b1a677b40220cf17613a2a901f16c661e60e3c.gz - - src/salut-xmpp-connection-manager.c | 28 ++++++++++++++++++++-------- - 1 files changed, 20 insertions(+), 8 deletions(-) - -commit c854d8a78bb754725a4b709e11901717d55b412f -Author: Guillaume Desmottes -Date: Tue Jul 10 10:27:44 2007 +0000 - - salut-xmpp-connection-manager.c: add connection refcount support - - - 20070710102744-7fe3f-f267d90eb631aa4e7112af2bb05a7988fa29e08b.gz - - src/salut-xmpp-connection-manager.c | 114 +++++++++++++++++++++++++++++++---- - src/salut-xmpp-connection-manager.h | 4 + - 2 files changed, 107 insertions(+), 11 deletions(-) - -commit 22c034ccad13fbef940e976af7314791c5800fc2 -Author: Guillaume Desmottes -Date: Tue Jul 10 08:46:59 2007 +0000 - - gibber-xmpp-connection.c: add CLOSE flags - - - 20070710084659-7fe3f-4ae9b76c8176493817626c6725f61aa7ea3c90d3.gz - - lib/gibber/gibber-xmpp-connection.c | 4 ++++ - lib/gibber/gibber-xmpp-connection.h | 17 +++++++++++------ - 2 files changed, 15 insertions(+), 6 deletions(-) - -commit 4e329f68e4cdaa1a097059540add383684da8478 -Author: Guillaume Desmottes -Date: Tue Jul 10 08:14:52 2007 +0000 - - salut-im-channel.c: connection_disconnected: remove useless dispose_has_run check and set xmpp connection to NLL after removing the filters - - - 20070710081452-7fe3f-a8bf1a61737c8e3078a181e92475590d3f9fb2df.gz - - src/salut-im-channel.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 497cb8993495ae8119eec6d00ef40a9ea7e20257 -Author: Guillaume Desmottes -Date: Tue Jul 10 08:01:53 2007 +0000 - - salut-xmpp-connection-manager.c: add stanza_filter_new and stanza_filter_free - - - 20070710080153-7fe3f-c9f1cddd2a166bd74dd3bd1d73c0cd30fd6feccf.gz - - src/salut-xmpp-connection-manager.c | 24 ++++++++++++++++++------ - 1 files changed, 18 insertions(+), 6 deletions(-) - -commit 7e4089643581d2fb93ee3c93274eeb8730973f7b -Author: Guillaume Desmottes -Date: Tue Jul 10 07:55:32 2007 +0000 - - salut-xmpp-connection-manager.c: add outgoing_connection_timeout_data_new () - - - 20070710075532-7fe3f-7c279b6374448f28d4937785dca9e000221bf872.gz - - src/salut-xmpp-connection-manager.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit 77bc7782a75bbb76e02b5e45a671545edbe6f1bc -Author: Guillaume Desmottes -Date: Mon Jul 9 15:54:42 2007 +0000 - - salut-im-channel.c: factor our common code in xmpp_connection_manager_connection_closed_cb and xmpp_connection_manager_connection_failed_cb - - - 20070709155442-7fe3f-58c0524165d14b49571a00bc5dc4bc4c46ddb8e4.gz - - src/salut-im-channel.c | 61 +++++++++++++++++++++++------------------------ - 1 files changed, 30 insertions(+), 31 deletions(-) - -commit 865e05c0b962131c837ab0af4b5eefadec9600cd -Author: Guillaume Desmottes -Date: Mon Jul 9 15:40:47 2007 +0000 - - salut-xmpp-connection-manager.c: better DEBUG messages - - - 20070709154047-7fe3f-45d0114c4b5715b1ec6d5affe5ea7eac5bc1aef4.gz - - src/salut-xmpp-connection-manager.c | 30 +++++++++++++++--------------- - 1 files changed, 15 insertions(+), 15 deletions(-) - -commit cc9f47442029542ddbae0a33f5c31c0242a637f3 -Author: Guillaume Desmottes -Date: Mon Jul 9 15:34:08 2007 +0000 - - salut-im-channel.c: disconnect XCM signals in xmpp_connection_manager_connection_closed_cb - - - 20070709153408-7fe3f-1eac606985daaf359de5b5c48025282eb5e34f0a.gz - - src/salut-im-channel.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 450f4f5343e7c4f7344ddd7421defb0413166d6a -Author: Guillaume Desmottes -Date: Mon Jul 9 15:19:43 2007 +0000 - - SalutXmppConnectionManager new listen for connection closing/failure and report them. IM channel now catch XCM's signal instead of those from connection - - - 20070709151943-7fe3f-87b6f81f8071d0ad825d7244c716c0586f8ac9b6.gz - - src/salut-im-channel.c | 100 +++++++++++++++------------------- - src/salut-xmpp-connection-manager.c | 95 +++++++++++++++++++++++++++++++++ - src/salut-xmpp-connection-manager.h | 2 + - 3 files changed, 141 insertions(+), 56 deletions(-) - -commit ab63d37768d71a61bde43e67b0efb276182f2250 -Author: Guillaume Desmottes -Date: Mon Jul 9 13:18:30 2007 +0000 - - salut-im-channel.c: modify channel's state management to fit to the new design - - - 20070709131830-7fe3f-3ba1ea4c7b67c7418a3a598a04d3291ee6c20741.gz - - src/salut-im-channel.c | 55 +++++++++++++---------------------------------- - 1 files changed, 15 insertions(+), 40 deletions(-) - -commit a99ff3cbfa61ba7da3acdd9808a2139e4f4745b1 -Author: Guillaume Desmottes -Date: Mon Jul 9 13:01:53 2007 +0000 - - XCM set a timer on outgoing connection and fire the connection-failed signal if it expires - - - 20070709130153-7fe3f-d6aa971098207c270892301f5d07ae0baac86b23.gz - - src/salut-im-channel.c | 23 +++++++- - src/salut-xmpp-connection-manager.c | 111 ++++++++++++++++++++++++++++++++++- - src/salut-xmpp-connection-manager.h | 9 +++ - 3 files changed, 140 insertions(+), 3 deletions(-) - -commit a8a69a76495599b7159f24bedfe32606e2ac003d -Author: Guillaume Desmottes -Date: Mon Jul 9 10:44:39 2007 +0000 - - salut-im-channel.c: xmpp_connection_manager_new_connection_cb checks if the connection is for the right contact - - - 20070709104439-7fe3f-8c764a567f9894fc7bff2086b1aa5a8af9c19cea.gz - - src/salut-im-channel.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit b78ba5ef11a846ebc0ba7919599149f07ad94a97 -Author: Guillaume Desmottes -Date: Mon Jul 9 10:37:13 2007 +0000 - - salut-xmpp-connection-manager.c: don't send features stanza for outgoing connections - - - 20070709103713-7fe3f-21f86e44b6248f7e90422f2f839fb37062b7590a.gz - - src/salut-xmpp-connection-manager.c | 8 -------- - 1 files changed, 0 insertions(+), 8 deletions(-) - -commit 7febdfe0ef92b4e59c94881bfee8da18964fa411 -Author: Guillaume Desmottes -Date: Mon Jul 9 10:36:48 2007 +0000 - - salut-xmpp-connection-manager.c: remove outgoing_pending_connection_stanza_received_cb - - - 20070709103648-7fe3f-345f0e4ca53e2effe2fab988dd579982927dfb59.gz - - src/salut-xmpp-connection-manager.c | 15 --------------- - 1 files changed, 0 insertions(+), 15 deletions(-) - -commit 3caa0ffe05e8e6bfeef597f91cb48bebbb69e913 -Author: Guillaume Desmottes -Date: Mon Jul 9 10:21:16 2007 +0000 - - incoming_pending_connection_stream_opened_cb: check if version == 1.0 before send features stanza - - - 20070709102116-7fe3f-c623e90c8927237517cdc1e131354eddcf5577b3.gz - - src/salut-xmpp-connection-manager.c | 16 ++++++++++------ - 1 files changed, 10 insertions(+), 6 deletions(-) - -commit c5fe3d795b608786631998cb48e7e3d642101a9b -Author: Guillaume Desmottes -Date: Mon Jul 9 10:09:34 2007 +0000 - - salut-im-channel.c: we don't need addresses and address_index anymore - - - 20070709100934-7fe3f-0bee3ab9302544e95d017e9f5fc383a0d6188af1.gz - - src/salut-im-channel.c | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -commit 269c80bb77d7eb09f8e7db143d1c9afd2cd063b9 -Author: Guillaume Desmottes -Date: Mon Jul 9 10:00:01 2007 +0000 - - salut-xmpp-connection-manager.c: pending_connection_got_from doesn't handle the stanza (if any) now. Let's the called do that if needed - - - 20070709100001-7fe3f-df5c0939a0713a4fd75b45866bf2695822f476ba.gz - - src/salut-xmpp-connection-manager.c | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) - -commit 48ff14f0b4160748f2f0580f3d2892ad04c29047 -Author: Guillaume Desmottes -Date: Mon Jul 9 09:54:12 2007 +0000 - - replace salut_xmpp_connection_get_connection to salut_xmpp_connection_request_connection and so wait the connection is fully open before pass it to others components - - - 20070709095412-7fe3f-0871748d9d84a761bebe7c906893af0efb406482.gz - - src/salut-im-channel.c | 51 ++++++++++-- - src/salut-xmpp-connection-manager.c | 155 +++++++++++++++++++++++++++++++---- - src/salut-xmpp-connection-manager.h | 13 ++- - 3 files changed, 191 insertions(+), 28 deletions(-) - -commit 14a5b1b426d886275766e748ab50d4d7b441bf02 -Author: Guillaume Desmottes -Date: Fri Jul 6 16:29:00 2007 +0000 - - salut-xmpp-connection-manager.c: rename pending_connections to incoming_pending_connections - - - 20070706162900-7fe3f-0d1fb88d184736e3d2580ea9cd354b7a9d955bca.gz - - src/salut-xmpp-connection-manager.c | 66 ++++++++++++++++++---------------- - 1 files changed, 35 insertions(+), 31 deletions(-) - -commit 9b69fd07c16c1372cba06d58a3f8d38f1e76c1c9 -Author: Guillaume Desmottes -Date: Fri Jul 6 15:26:52 2007 +0000 - - salut-xmpp-connection-manager: salut_xmpp_connection_manager_listen takes now a GError** as 2nd arg - - - 20070706152652-7fe3f-3fcbac0161dfc178afc74a33f76de0de31ce954d.gz - - src/salut-connection.c | 3 ++- - src/salut-xmpp-connection-manager.c | 15 ++++++++------- - src/salut-xmpp-connection-manager.h | 3 ++- - 3 files changed, 12 insertions(+), 9 deletions(-) - -commit e8b7dc866f1e2386b48d62adb24bbf0ed59fe50c -Author: Guillaume Desmottes -Date: Fri Jul 6 15:25:44 2007 +0000 - - remove forgotten debug g_print - - - 20070706152544-7fe3f-f846740ba2d92f26bd33749154d3789d8741052f.gz - - src/salut-im-manager.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 502f77e70bf4e708315120035999190cc3f239f5 -Author: Guillaume Desmottes -Date: Fri Jul 6 15:04:38 2007 +0000 - - assert salut_xmpp_connection_manager_new arguments - - - 20070706150438-7fe3f-d1bc30c16e0d49da4271e96604937150b2ef56cb.gz - - src/salut-xmpp-connection-manager.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit c5dfacd97471858fc37ec8a6c89976a9c94cfd68 -Author: Guillaume Desmottes -Date: Fri Jul 6 15:02:38 2007 +0000 - - drop salut_xmpp_connection_manager_constructor as we can create the listener in _init - - - 20070706150238-7fe3f-27f3c1d8762d01cb6f9d16d9bba7621847325241.gz - - src/salut-xmpp-connection-manager.c | 36 ++++++++-------------------------- - 1 files changed, 9 insertions(+), 27 deletions(-) - -commit a5b672829373cefdafbdc0af9416973f64604b77 -Author: Guillaume Desmottes -Date: Fri Jul 6 14:59:34 2007 +0000 - - salut-xmpp-connection-manager.c: use for loop in pending_connection_got_from - - - 20070706145934-7fe3f-451ca6e29f2e3c1d644df6f3a15ee5c2eb6a0904.gz - - src/salut-xmpp-connection-manager.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 4eef8ac39470907a760be02f702eab7561ab312a -Author: Guillaume Desmottes -Date: Fri Jul 6 14:55:14 2007 +0000 - - salut-xmpp-connection-manager.c: use a for loop in contact_list_destroy - - - 20070706145514-7fe3f-e20aa9e9ec4517c418062d47b4748a32e7b78998.gz - - src/salut-xmpp-connection-manager.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit 7de58aad7b10bb76d247d73ff0fd771e682e9f39 -Author: Guillaume Desmottes -Date: Fri Jul 6 14:48:42 2007 +0000 - - salut-xmpp-connection-manager.c: use g_slist_next - - - 20070706144842-7fe3f-ddc9aa6ae20e5e78e599be7e3a6776feb8bf88b1.gz - - src/salut-xmpp-connection-manager.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 76fc8d0ee5f3ed44da87ff661a57b2b5a0b2972e -Author: Guillaume Desmottes -Date: Fri Jul 6 14:46:08 2007 +0000 - - SALUT_XMPP_CONNECTION_MANAGER_GET_PRIVATE cast object to SalutXmppConnectionManager before reffing ->priv - - - 20070706144608-7fe3f-7da84c81a53477ff90458cc76c7ba04d6b0c4b16.gz - - src/salut-xmpp-connection-manager.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 8803619f045b40c207b9ba2e31195f77a8784ae6 -Author: Guillaume Desmottes -Date: Fri Jul 6 14:40:19 2007 +0000 - - XCM uses its own debug flag - - - 20070706144019-7fe3f-9a844b869cc1378086864529c21eff850f8cdab5.gz - - src/debug.c | 1 + - src/debug.h | 1 + - src/salut-xmpp-connection-manager.c | 2 +- - 3 files changed, 3 insertions(+), 1 deletions(-) - -commit 1e823fbeb885b66d1d87adce5a1adbf71d0b6014 -Author: Guillaume Desmottes -Date: Fri Jul 6 14:37:40 2007 +0000 - - remove bytestream debug flag as we don't use it (bytestream stuffs are in Gibber) - - - 20070706143740-7fe3f-a5ea2985f7379711127bea965f49e00de4a40570.gz - - src/debug.c | 1 - - src/debug.h | 1 - - 2 files changed, 0 insertions(+), 2 deletions(-) - -commit 4915e6d6b41652babcb3e80c7a3c1f796d2e9814 -Author: Guillaume Desmottes -Date: Fri Jul 6 14:35:05 2007 +0000 - - salut_self_announce takes a GError as 3rd arg - - - 20070706143505-7fe3f-70cf129d5a03631672c64f957411e0b32b12f8b3.gz - - src/salut-connection.c | 2 +- - src/salut-im-manager.c | 1 + - src/salut-self.c | 9 +++++---- - src/salut-self.h | 2 +- - 4 files changed, 8 insertions(+), 6 deletions(-) - -commit e7d24ccf67b3b2ba83ddbc7e5ec7987004a7e1cd -Author: Guillaume Desmottes -Date: Fri Jul 6 13:56:12 2007 +0000 - - salut-im-manager: create incoming text channel when we receive the first stanza - - - 20070706135612-7fe3f-c581794041613a1531d971a6e43cbaa8833b8081.gz - - src/salut-im-manager.c | 85 ++++++++++++++++++++++++++++++++--------------- - 1 files changed, 58 insertions(+), 27 deletions(-) - -commit 7b826e52a69d9a47146bb87bfc47e6101c841e48 -Author: Guillaume Desmottes -Date: Fri Jul 6 13:00:35 2007 +0000 - - salut-xmpp-connection-manager.c: pending_connection_got_from manages the stanza if we properly identified the connection - - - 20070706130035-7fe3f-0b04506db62bbadb129ad0f899adf105464a13d4.gz - - src/salut-xmpp-connection-manager.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit d50f8dbe561c7bb73b391981f6fffa77a027a215 -Author: Guillaume Desmottes -Date: Fri Jul 6 12:26:44 2007 +0000 - - salut-im-channel: use filters instead of directly listen the received-stanza signal - - - 20070706122644-7fe3f-3731e8119ff2c669ecb3ad9f2e3105a455ed90f4.gz - - src/salut-im-channel.c | 43 ++++++++++++++++++++++++++++++++++++------- - 1 files changed, 36 insertions(+), 7 deletions(-) - -commit c797ab33d0ec24379cb1be1b3c1afcaedfa1a21b -Author: Guillaume Desmottes -Date: Fri Jul 6 11:22:00 2007 +0000 - - add salut_xmpp_connection_manager_remove_stanza_filter. Check if filter already exists before add it. Fix memory corruption if the callback remove the filter - - - 20070706112200-7fe3f-63e22423091594bcaa7304f42ba67357a1f59aa3.gz - - src/salut-xmpp-connection-manager.c | 90 ++++++++++++++++++++++++++++++++++- - src/salut-xmpp-connection-manager.h | 8 +++ - 2 files changed, 96 insertions(+), 2 deletions(-) - -commit 2eb13bf73122d14e33fbe66d32f8e4bf4f8276ce -Author: Guillaume Desmottes -Date: Fri Jul 6 11:20:24 2007 +0000 - - salut-xmpp-connection-manager.c: don't keep a ref on the SalutConnection as it keep as ref on the XCM - - - 20070706112024-7fe3f-6ed958a4d2ecdf2f3cc108625669b823a7b2f4a6.gz - - src/salut-xmpp-connection-manager.c | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) - -commit c318dd9a27682670d484bd4588b85159cadc6124 -Author: Guillaume Desmottes -Date: Fri Jul 6 11:05:41 2007 +0000 - - salut-im-channel: salut_im_channel_add_connection ignore connection of it's the one we requested - - - 20070706110541-7fe3f-0eacec920988803be1d2d5ab3fcdb3592a1e4d05.gz - - src/salut-im-channel.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 12494ae75d12053f0f18d42d3300780f37e71f17 -Author: Guillaume Desmottes -Date: Thu Jul 5 16:16:56 2007 +0000 - - add salut_xmpp_connection_manager_add_stanza_filter - - - 20070705161656-7fe3f-82daa53356a86fe9584471de8826c58ca73226d5.gz - - src/salut-xmpp-connection-manager.c | 114 +++++++++++++++++++++++++++++++++++ - src/salut-xmpp-connection-manager.h | 16 +++++ - 2 files changed, 130 insertions(+), 0 deletions(-) - -commit 71125dde515e3800d1ce0e9c75875f5ad33bb54b -Author: Guillaume Desmottes -Date: Thu Jul 5 16:08:36 2007 +0000 - - salut-xmpp-connection-manager: add the connection in the hash table and connect signals when we create a new connection - - - 20070705160836-7fe3f-f69eae9810c9f8315ceaa70beb4861c7fc93ff99.gz - - src/salut-xmpp-connection-manager.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit f494fbe7e1ab4435cbce3ef1a3cb9029c338e367 -Author: Guillaume Desmottes -Date: Thu Jul 5 14:13:52 2007 +0000 - - salut-connection: set connection status to disconnected if salut_xmpp_connection_manager_listen failed - - - 20070705141352-7fe3f-a66633b0b9b2375343c4c47afbff29d9d4a179cf.gz - - src/salut-connection.c | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -commit aa2a0e04de068fb57ccb1b0a32b8e8d35e95d651 -Author: Guillaume Desmottes -Date: Thu Jul 5 14:04:13 2007 +0000 - - im-channel: don't call _initialise_connection if salut_xmpp_connection_get_connection failed - - - 20070705140413-7fe3f-65aeea81c16cff730098fbf5bfd722de54727b5f.gz - - src/salut-im-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 951ecaf3f870d0ef42c3ad46b622896e57af2e5b -Author: Guillaume Desmottes -Date: Thu Jul 5 13:52:26 2007 +0000 - - move connection creation from im-channel to xmpp-connection-manager - - - 20070705135226-7fe3f-56ce210b526fb388fa37934af24f0268be24e5f2.gz - - src/salut-im-channel.c | 99 +++++++++++------------------ - src/salut-im-manager.c | 1 + - src/salut-xmpp-connection-manager.c | 118 ++++++++++++++++++++++++++++------- - src/salut-xmpp-connection-manager.h | 8 +++ - 4 files changed, 142 insertions(+), 84 deletions(-) - -commit 13dcbd5f33ac1f458302eea7c8ed4a4ed1d6e6f6 -Author: Guillaume Desmottes -Date: Thu Jul 5 10:05:59 2007 +0000 - - gibber-xmpp-connection-listener.c unref the connection so we don't leak it if there is no listenner of the new-connection signal to unref it - - - 20070705100559-7fe3f-36f38acdbb767354a313783846b2bd7cbafd8481.gz - - lib/gibber/gibber-xmpp-connection-listener.c | 1 + - src/salut-xmpp-connection-manager.c | 7 +++---- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit d56cec5b7eb5bba9158613f278e158a51a685f58 -Author: Guillaume Desmottes -Date: Thu Jul 5 09:33:17 2007 +0000 - - move connection identification from im-manager to xmpp-connection-manager - - - 20070705093317-7fe3f-17c8b743563d4cbdf115e07bf370493c61387324.gz - - src/salut-connection.c | 43 +---- - src/salut-im-manager.c | 250 ++++-------------------- - src/salut-im-manager.h | 9 +- - src/salut-xmpp-connection-manager.c | 363 ++++++++++++++++++++++++++++++++++- - src/salut-xmpp-connection-manager.h | 4 +- - 5 files changed, 413 insertions(+), 256 deletions(-) - -commit 937a4c43ef184e5e9230d43c8729e992d4c7cb89 -Author: Guillaume Desmottes -Date: Wed Jul 4 13:24:28 2007 +0000 - - use SalutXmppConnectionManager to listen incoming connections - - - 20070704132428-7fe3f-64372f9c184480516d8b91cb14966f2b245bb2cd.gz - - src/Makefile.am | 2 + - src/salut-connection.c | 80 +++++++++++++++++++--------- - src/salut-im-manager.c | 67 ++++++++++------------- - src/salut-im-manager.h | 3 +- - src/salut-self.c | 137 ++--------------------------------------------- - src/salut-self.h | 3 +- - 6 files changed, 96 insertions(+), 196 deletions(-) - -commit 2b8943f8317925519ced05476843690915b86922 -Author: Guillaume Desmottes -Date: Wed Jul 4 13:22:50 2007 +0000 - - add salut-xmpp-connection-manager.[ch] - - - 20070704132250-7fe3f-f6c2adfd3ab62b1999f2c42239762a7a72a0dfe0.gz - - src/salut-xmpp-connection-manager.c | 223 +++++++++++++++++++++++++++++++++++ - src/salut-xmpp-connection-manager.h | 71 +++++++++++ - 2 files changed, 294 insertions(+), 0 deletions(-) - -commit 2e363500a31835779880b04da1db2cc98e505996 -Author: Simon McVittie -Date: Thu Aug 2 14:54:39 2007 +0000 - - Fix misleading debug messages - - - 20070802145439-53eee-7ff4ad23d0f00fb107b006fd2a21f8c6d7ef3459.gz - - src/salut-contact-manager.c | 2 +- - src/salut-contact.c | 1 - - 2 files changed, 1 insertions(+), 2 deletions(-) - -commit b93049ad7be53537ad2704e13f2776efddcbe009 -Author: Simon McVittie -Date: Thu Aug 2 13:35:14 2007 +0000 - - Avoid unnecessary rebuilds by only replacing signals-marshal.list if needed - - - 20070802133514-53eee-913034fb0e77f1d075fa5fb0e3f6ea53fe5538f5.gz - - src/Makefile.am | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit 3c98501eb355e5cf95f6757659d478b78611f1bb -Author: Simon McVittie -Date: Tue Jul 3 11:37:33 2007 +0000 - - Emit activity-changed from contact even if it contains no room name. In contact-manager, cope with that by considering the activity advertisement to be absent - - - 20070703113733-53eee-4eb79bb0c139673672bdb8568b3258a2ec593b1d.gz - - src/salut-contact-manager.c | 7 +++++++ - src/salut-contact.c | 15 ++++----------- - 2 files changed, 11 insertions(+), 11 deletions(-) - -commit 7de054fd897498a3da39ea6ce20bdaff5213cf0a -Author: Simon McVittie -Date: Wed Aug 8 18:55:07 2007 +0000 - - _boring: add signals-marshal.*, check-main, sasl-test.db - - - 20070808185507-53eee-07a2458a0a23cb737ddad8eda8eddf27e76a8082.gz - - _boring | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit cbf94a3dddacff2beada5e2cb1d8a96e5a97e66d -Author: Simon McVittie -Date: Wed Aug 8 18:08:32 2007 +0000 - - Add the version of the tubes spec we implement - - - 20070808180832-53eee-d2b870d9ab6de0ec0fbba4b5bfebb87c309b44cf.gz - - extensions/Channel_Type_Tubes.xml | 292 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 292 insertions(+), 0 deletions(-) - -commit 552c8bd65219811553f19c8a6ac783e17c2a1ef3 -Author: Simon McVittie -Date: Wed Aug 8 15:22:46 2007 +0000 - - Fix distcheck - - - 20070808152246-53eee-723fa93453a0b867bda34585cc12055daa5c6f28.gz - - src/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 638b69f658a17cbb2853d2012e9308d0f1269af4 -Author: Simon McVittie -Date: Wed Aug 8 15:19:02 2007 +0000 - - Drop dependency on libtelepathy-glib-unstable; instead implement Tubes channels using a file in extensions/. This changes the namespace from TP_foo to SALUT_foo. - - - 20070808151902-53eee-65c62fdd80e54482fccd86446281d62705d7719a.gz - - configure.ac | 7 -- - extensions/all.xml | 1 + - src/Makefile.am | 8 +-- - src/salut-muc-manager.c | 4 +- - src/salut-tubes-channel.c | 167 ++++++++++++++++++++++----------------------- - src/tube-dbus.c | 32 ++++----- - 6 files changed, 103 insertions(+), 116 deletions(-) - -commit 80f9297d307a902e0d092e1f31ff079e95e9431e -Author: Sjoerd Simons -Date: Fri Jul 20 11:12:18 2007 +0000 - - SalutContact: Ignore failures from the service resolver, should make things more reliable in flakey networks - - - 20070720111218-b58c9-d2c1752a3771cd32a8de9b019f758cbac55cea28.gz - - src/salut-contact.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 712eeb5d4ecde5c03196d12e1d547d0e031f74f7 -Author: Sjoerd Simons -Date: Thu Jul 19 17:25:02 2007 +0000 - - SalutContact: improve debug information - - - 20070719172502-b58c9-d8ed281e51416e9752125839193150f86540e68a.gz - - src/salut-contact.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- - 1 files changed, 47 insertions(+), 4 deletions(-) - -commit 9385de778bae0e2c4bbc711e04c3eadf15fa38f7 -Author: Guillaume Desmottes -Date: Thu Jul 19 10:14:30 2007 +0000 - - bump dbus version to 1.1.0 as we need it for D-Bus tubes - - - 20070719101430-7fe3f-40707917773e2be7054de717326796c7af1f1312.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 95a4860bcfecc10519c62e963fa0f8c8eaff75bf -Author: Sjoerd Simons -Date: Thu Jul 19 00:07:01 2007 +0000 - - SalutDebug: Truncate the logfile on opening - - - 20070719000701-b58c9-a6fa918167b7d979e78fba857c7d4aefb4ae028b.gz - - src/debug.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9133d1a0e1c20490716b4350b4c975bd5e37e081 -Author: Sjoerd Simons -Date: Sun Jul 15 22:19:38 2007 +0000 - - SalutContact: Set SALUT_CONTACT_OLPC_CURRENT_ACTIVITY when changing the current activity - - - 20070715221938-b58c9-b635a27c05c20e02950fd0a96e836a57564451e6.gz - - src/salut-contact.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 84142ac569daf3fa25867d7e40333c417a75b83d -Author: Sjoerd Simons -Date: Fri Jul 13 11:10:20 2007 +0000 - - SalutConnection: Add olpc activity properties to the interfaces list - - - 20070713111020-93b9a-907d7e589fdda4e64972c80b11092d366f7e0a16.gz - - src/salut-connection.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit f23650f97296a6b56d7f938c21a7f5f82cc0e078 -Author: Sjoerd Simons -Date: Fri Jul 13 07:32:26 2007 +0000 - - SalutContactManager: Set the activity's mgr field. Fixes crash on activity disappearance - - - 20070713073226-b58c9-42ca7753fbb024442eb30dd0165505748ed93464.gz - - src/salut-contact-manager.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 91f6d8abcba5393087c385f9f75dd43b4d74e395 -Author: Sjoerd Simons -Date: Mon Jul 9 20:20:03 2007 +0000 - - GibberRMulticastTransport: Cut down long lines - - - 20070709202003-b58c9-aa6dcb784491511cd3785fddedef0e3cf7ec3d41.gz - - lib/gibber/gibber-r-multicast-transport.c | 20 +++++++++++++------- - 1 files changed, 13 insertions(+), 7 deletions(-) - -commit 45646d77ba4ccad1b5caf60485d7e4af94465d6a -Author: Sjoerd Simons -Date: Mon Jul 9 20:19:37 2007 +0000 - - Remove trailing whitespace - - - 20070709201937-b58c9-c5e304c059bf4fc987b7d782e0e171c1c9daa6b4.gz - - lib/gibber/gibber-r-multicast-transport.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit 6195091142ecf404fc9aeddbe41d0342bbc1fa9e -Author: Sjoerd Simons -Date: Mon Jul 9 20:19:29 2007 +0000 - - Remove trailing whitespace - - - 20070709201929-b58c9-009185a3cd78d9017e8fb9c390fc747defedaac0.gz - - lib/gibber/gibber-r-multicast-packet.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 9006cd55da47c5c8b6e805cce3c45f3fabd9410b -Author: Sjoerd Simons -Date: Mon Jul 9 20:18:53 2007 +0000 - - Print multicast group on all debug messages from gibber-r-multicast-transport - - - 20070709201853-b58c9-a9bb0fc6ea6cabfbf82cbf4a62600075a8896b63.gz - - lib/gibber/gibber-r-multicast-transport.c | 34 ++++++++++++++++------------ - 1 files changed, 19 insertions(+), 15 deletions(-) - -commit 79722ef597d924c2196f91284df22ab8054a7ca7 -Author: Sjoerd Simons -Date: Mon Jul 9 18:57:03 2007 +0000 - - Fix some silly typos - - - 20070709185703-b58c9-14fa773ecbfbaf77cb338b99a0a0e1c5345e659d.gz - - lib/gibber/gibber-r-multicast-transport.c | 2 +- - tests/check-gibber-r-multicast-transport.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit c1e5632c880dd4228c835f0e247fb7ceb89b3eb5 -Author: Sjoerd Simons -Date: Mon Jul 9 18:56:52 2007 +0000 - - GibberRMulticastTransport: Don't init priv->sender_id in _connect as it's already inited in start_joining - - - 20070709185652-b58c9-30eafa56208bad10f41ac1fe3044cf68bd96a657.gz - - lib/gibber/gibber-r-multicast-transport.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit a31a7ce139dc4e176eb4965ad27c44b8d13fc8e2 -Author: Sjoerd Simons -Date: Mon Jul 9 17:51:55 2007 +0000 - - GibberRMulticastTransport: Implement unique id selection protocol - - - 20070709175155-b58c9-141cb06b3bb632b9bd064ec8cac2c929be08c7c0.gz - - lib/gibber/gibber-r-multicast-transport.c | 340 ++++++++++++++++++++-------- - 1 files changed, 243 insertions(+), 97 deletions(-) - -commit 1c30d5f9ee61f61b4f0f409278751a100646568d -Author: Sjoerd Simons -Date: Mon Jul 9 17:47:40 2007 +0000 - - Mesh simulations: First let nodes be connected before sending data - - - 20070709174740-b58c9-ecff44d56d47a694315a00e8a6ab27da07d11cdc.gz - - tests/causalorderingtest.py | 18 ++++++++++-------- - tests/mesh.py | 19 +++++++++++++++++-- - tests/simplemeshtest.py | 11 +++++++---- - 3 files changed, 34 insertions(+), 14 deletions(-) - -commit 0771a1f88fbc2c594c88acb899565fb458173096 -Author: Sjoerd Simons -Date: Mon Jul 9 17:46:45 2007 +0000 - - check-gibber-r-multicast-transport: Set data on our reply packet, not on the incoming packet - - - 20070709174645-b58c9-5894f4d8832ee8fdaeda2c972bf89f0b1d556a9b.gz - - tests/check-gibber-r-multicast-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8d477a34a80fe02f0422d81d88170a5f481967e1 -Author: Sjoerd Simons -Date: Mon Jul 9 17:46:26 2007 +0000 - - check-gibber-r-multicast-transport: Only do function calls after variable declarations - - - 20070709174626-b58c9-2e451ca45c087d2d1c978b94676d1ffce3126df1.gz - - tests/check-gibber-r-multicast-transport.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 96a41e494cdc1ee814309344a0fd34da6ce3fc65 -Author: Sjoerd Simons -Date: Mon Jul 9 17:45:45 2007 +0000 - - check-gibber-r-multicast-transport: Turn on echoing in the test transport - - - 20070709174545-b58c9-2331e90e3d365bbbe74ea85cb1f1d8b58db10458.gz - - tests/check-gibber-r-multicast-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 4868f1ddf4d040659e2b9246ecb61d40abb5ad7d -Author: Sjoerd Simons -Date: Mon Jul 9 17:45:05 2007 +0000 - - test-r-multicast-transport-io: Signal connected on stdout - - - 20070709174505-b58c9-53d93a4cd869e4a98e8892dced5b62a1f994b1f8.gz - - tests/test-r-multicast-transport-io.c | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -commit 3a6a4542eb2288a3150ba9273f813e1e6e468c4e -Author: Sjoerd Simons -Date: Mon Jul 9 17:23:47 2007 +0000 - - Move echo simulation to the test-transport - - - 20070709172347-b58c9-e9247d9abb39eae564081ed7e0a4db7b78e5aca8.gz - - tests/test-r-multicast-transport-io.c | 5 +---- - tests/test-transport.c | 17 ++++++++++++++++- - tests/test-transport.h | 5 ++++- - 3 files changed, 21 insertions(+), 6 deletions(-) - -commit b3af7ae56adb926269e0e8148379f53fc2e12f08 -Author: Sjoerd Simons -Date: Mon Jul 9 16:51:27 2007 +0000 - - check-gibber-r-multicast-transport.c: Set info in our own reply packet, not the incoming packet - - - 20070709165127-b58c9-fe114573921d19b20ad94f1d41467280cd04704c.gz - - tests/check-gibber-r-multicast-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d076505337941fa49d40a42d67c079a300203a6b -Author: Sjoerd Simons -Date: Mon Jul 9 16:50:22 2007 +0000 - - Only send data through the transport after it has been connected - - - 20070709165022-b58c9-1954062fd6c4b404b9ccffa4e58a2af4446eefa8.gz - - tests/check-gibber-r-multicast-transport.c | 57 ++++++++++++++++++--------- - 1 files changed, 38 insertions(+), 19 deletions(-) - -commit ca33f58855249a0757e3515c6ccfff27250e2ee9 -Author: Sjoerd Simons -Date: Thu Jul 5 12:30:27 2007 +0000 - - Whitespace fixes - - - 20070705123027-b58c9-ebd140b5c657fce26ccc28613e98ff286250a34a.gz - - lib/gibber/gibber-transport.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit 80c36e7a44c865a7729403ebc92adf0cedf92a7e -Author: Sjoerd Simons -Date: Thu Jul 5 12:27:45 2007 +0000 - - GibberRMulticastTransport: Whitespace fixes - - - 20070705122745-b58c9-b3e4224a2a90136fae4cbee44fa6cbbc444da8c5.gz - - lib/gibber/gibber-r-multicast-transport.c | 24 +++++++++++++++--------- - 1 files changed, 15 insertions(+), 9 deletions(-) - -commit 512590e48bf75bfe3157f40a4e3ca61842ef4364 -Author: Sjoerd Simons -Date: Thu Jul 5 12:27:17 2007 +0000 - - check-gibber-r-multicast-transport: Add test to check the right behaviour when there is a conflict in id generation - - - 20070705122717-b58c9-f410655391969c846a5c5fd903f872b31bb614d4.gz - - tests/check-gibber-r-multicast-transport.c | 197 +++++++++++++++++++++++++++- - 1 files changed, 193 insertions(+), 4 deletions(-) - -commit fd9d841c49affb137e27a1a163990481cd4275d1 -Author: Sjoerd Simons -Date: Mon Jul 9 15:11:48 2007 +0000 - - Fix make distclean - - - 20070709151148-b58c9-c194453eb343d04604f0c3c10599ef29488187d4.gz - - rules/check.mak | 2 +- - tests/Makefile.am | 2 ++ - 2 files changed, 3 insertions(+), 1 deletions(-) - -commit fd9e5374074a9c0a724f952fb73cdf581fc02362 -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 e709f1b5e60e985c34a7b4c2aa96b84b89b1d9b8 -Author: Emanuele Aina -Date: Thu Jul 5 22:51:35 2007 +0000 - - Deleted some gstreamer specific function identifiers in the valgrind suppressions - - - 20070705225135-f974e-fe58f9e2c4313eac345bab89f465089018645e73.gz - - tests/valgrind.supp | 41 ----------------------------------------- - 1 files changed, 0 insertions(+), 41 deletions(-) - -commit dec992727967165aa3f7fac4e8fa1a5340771e17 -Author: Emanuele Aina -Date: Thu Jul 5 22:38:34 2007 +0000 - - Deleted othe duplicated suppressions - - - 20070705223834-f974e-3652c0b0fa43cc3793598db11916fce6dd2b6929.gz - - tests/valgrind.supp | 77 --------------------------------------------------- - 1 files changed, 0 insertions(+), 77 deletions(-) - -commit d8eb43fef0fbf6aec849214783e3146a3b239ecb -Author: Emanuele Aina -Date: Thu Jul 5 22:33:06 2007 +0000 - - Deleted other suppressions related to alsa/gconf/bonobo/liboil - - - 20070705223306-f974e-5667fbfa3ead52bf9bf0a981117019de7212ae54.gz - - tests/valgrind.supp | 843 --------------------------------------------------- - 1 files changed, 0 insertions(+), 843 deletions(-) - -commit 8ec51e6a096c56b283d7c221fe7162f7aa55e9cd -Author: Emanuele Aina -Date: Thu Jul 5 22:19:03 2007 +0000 - - Removed some duplicated suppressions - - - 20070705221903-f974e-7edee070c5cb7a369e04dfd0a9240fe46e6f2417.gz - - tests/valgrind.supp | 63 --------------------------------------------------- - 1 files changed, 0 insertions(+), 63 deletions(-) - -commit e8520388f597a39eb668869f7719ebfe0553f520 -Author: Emanuele Aina -Date: Thu Jul 5 22:15:33 2007 +0000 - - Removed valgrind suppressions relative to gconf, bonobo and fontconfig - - - 20070705221533-f974e-7970dec3497c01d7262298f15d6a375bdbab946d.gz - - tests/valgrind.supp | 987 +-------------------------------------------------- - 1 files changed, 16 insertions(+), 971 deletions(-) - -commit 8cab241b7d31dea8de07b100242eb65fef899f1a -Author: Emanuele Aina -Date: Thu Jul 5 22:03:35 2007 +0000 - - Don't delete the valgrind log files after each test is run - - - 20070705220335-f974e-e5477b052437e5377505aeed7d0726c2288b993f.gz - - rules/check.mak | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit 5074de4b10a0531cc96e3c870217d24ad74bf3bd -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 e1cdb3597122ce053e2e42908c97e1dfc215ffb8 -Author: Emanuele Aina -Date: Thu Jul 5 21:03:47 2007 +0000 - - Don't try to make executable the deleted internal lcov copy - - - 20070705210347-f974e-c9a263c7a81ccf006d5436f64b179b715a40919b.gz - - Makefile.am | 17 ----------------- - 1 files changed, 0 insertions(+), 17 deletions(-) - -commit ea5ac2cb3d6965132b784e6fd608b30900f991fa -Author: Emanuele Aina -Date: Wed Jul 4 14:14:32 2007 +0000 - - Resolved some conflicts - - - 20070704141432-f974e-a353e5e778760a7739a9865311e4d9ad7d5a1003.gz - - lib/gibber/gibber-r-multicast-packet.c | 40 +++++++++++++++++++------------ - 1 files changed, 24 insertions(+), 16 deletions(-) - -commit 5716d5963bb82426346050d81fff7d77bac4f9ea -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/salut-lcov.m4 | 7 +------ - rules/lcov.mak | 5 +++++ - 2 files changed, 6 insertions(+), 6 deletions(-) - -commit 2a3e8870926a20d41426a54cccaa97617f9adf76 -Author: Emanuele Aina -Date: Tue Jul 3 16:45:34 2007 +0000 - - Use 'all' to enable vebose debugging in the test - - - 20070703164534-f974e-96a35afa37f840b6653ac142ad806def8562ac50.gz - - rules/check.mak | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b9e3e57c6aa2076194e4d7c8281d4c5c826b4d52 -Author: Emanuele Aina -Date: Tue Jul 3 16:44:55 2007 +0000 - - Delete some cruft due to the fact that I took the Check rules from GStreamer - - - 20070703164455-f974e-1725c0d5583185bbc32600cbcf7a93643c22bd22.gz - - rules/check.mak | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit db041c45528c5cc37962192a74a6b5ddd206b506 -Author: Emanuele Aina -Date: Mon Jul 2 16:15:40 2007 +0000 - - Resolved a little conflict - - - 20070702161540-f974e-0280dc942d3369d2f1a4b6c8de74f08081f9a273.gz - - lib/gibber/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit dc1eadc87b2ca87b6c35dc01c6c4ba815db25ffb -Author: Emanuele Aina -Date: Sun Jul 1 13:51:27 2007 +0000 - - Add valgrind suppressions for some dlopen errors - - - 20070701135127-f974e-1413b3e1ec17fb1e4e788efb1b6bfc37443211a2.gz - - tests/Makefile.am | 2 +- - tests/dlopen.supp | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 128 insertions(+), 1 deletions(-) - -commit e0f9bd49fe1b5ade46ce6286ccffc3111e682e96 -Author: Emanuele Aina -Date: Sun Jul 1 11:34:19 2007 +0000 - - Add the valgrind suppressions taken from gstreamer - - - 20070701113419-f974e-60de2ac0150933ff1ef36cb5d1b0fff4abb091cf.gz - - tests/Makefile.am | 2 + - tests/valgrind.supp | 2690 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 2692 insertions(+), 0 deletions(-) - -commit a8d4e49547685aebf934328dbfb48ab2b5d97f6e -Author: Emanuele Aina -Date: Fri Jun 29 09:53:52 2007 +0000 - - Resolved some conflicts - - - 20070629095352-f974e-b08a4652188c9ba3d6d8195f144b6578a4f7226c.gz - -commit a5ea0b052fceb47d0b61bcc60485e200336f2343 -Author: Emanuele Aina -Date: Wed Jun 27 07:38:24 2007 +0000 - - Plugged some small memleaks in GibberRMulticastPacket - - - 20070627073824-f974e-aa940bedd6dc9e282d45f46e829a982de9b13363.gz - - lib/gibber/gibber-r-multicast-packet.c | 40 ++++++++++++------------------- - 1 files changed, 16 insertions(+), 24 deletions(-) - -commit b16ba4d7dff8967bd96df92717cc7105f88f2a3b -Author: Emanuele Aina -Date: Tue Jun 26 13:57:25 2007 +0000 - - Removed the SALUT_ARG_PROFILING macro as it was not used - - - 20070626135725-f974e-b1677955092885f6058bde781f7ef59d6008dfb3.gz - - configure.ac | 1 - - m4/salut-args.m4 | 16 ---------------- - 2 files changed, 0 insertions(+), 17 deletions(-) - -commit c3f686a13352ff60bff32bab88c4e972b7539680 -Author: Emanuele Aina -Date: Tue Jun 26 13:55:32 2007 +0000 - - Use the macro in salut-args.m4 for the --disable-debug compilation option - - - 20070626135532-f974e-64ef20e58f99096af411ffca76684609f810658a.gz - - configure.ac | 10 +--------- - m4/salut-args.m4 | 11 +++++++---- - 2 files changed, 8 insertions(+), 13 deletions(-) - -commit ecd806d9ca7b6a5623b6940fb6d9875526a76e56 -Author: Emanuele Aina -Date: Tue Jun 26 13:52:49 2007 +0000 - - Allow specifying the Valgrind version for the SALUT_VALGRIND macro - - - 20070626135249-f974e-6aa4befe1ddb18615b25bda3fb8d74001473ce3e.gz - - m4/salut-args.m4 | 2 +- - m4/salut-valgrind.m4 | 8 ++++++-- - 2 files changed, 7 insertions(+), 3 deletions(-) - -commit 0e15968b5ee1c61bf9e1720e5240b598a1143660 -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 - - configure.ac | 11 --------- - m4/salut-args.m4 | 17 ++++++++------ - m4/salut-gcov.m4 | 57 +++++++++++++++++++++++++++---------------------- - m4/salut-lcov.m4 | 12 +++++++--- - m4/salut-valgrind.m4 | 24 ++++++++++++-------- - 5 files changed, 63 insertions(+), 58 deletions(-) - -commit ee29278e4d92f0057277199c3947a666ec3c4aa1 -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 1fc154436700293ff1c591ce699870ee065df4e3 -Author: Emanuele Aina -Date: Mon Jun 25 10:11:36 2007 +0000 - - Make the internal lcov copy executable as darcs doesn't store the exec bit - - - 20070625101136-f974e-dab77336d1fdfc3da4fa88c7e983f37190daada9.gz - - Makefile.am | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) - -commit 6b69cdbb9d80d729bffecd8a2f235d48c134d394 -Author: Emanuele Aina -Date: Mon Jun 25 09:39:16 2007 +0000 - - Use the variable instead of calling make directly - - - 20070625093916-f974e-a951f658ae1ad2ae4198505fcc9a57e164d1924d.gz - - Makefile.am | 6 +++--- - rules/check.mak | 8 ++++---- - rules/lcov.mak | 8 ++++---- - 3 files changed, 11 insertions(+), 11 deletions(-) - -commit 41dbc77310f4eefe92075c97d1b27122c57553fc -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/salut-lcov.m4 | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit f9223be7ec3f3ba3f78580c191aacc5fbf28b023 -Author: Emanuele Aina -Date: Mon Jun 25 09:13:06 2007 +0000 - - Corrected the HAVE_GCOV variable name - - - 20070625091306-f974e-cf057c7c9978d567f3eb46a56e476f5cf4afcc75.gz - - m4/salut-gcov.m4 | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit c5fbbdf2f1f5691d3d1dc6b6b30507624640bf4b -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 - - configure.ac | 15 +++++- - m4/salut-args.m4 | 119 +++++++++---------------------------------------- - m4/salut-gcov.m4 | 48 ++++++++++++++++++++ - m4/salut-lcov.m4 | 22 +++++++++ - m4/salut-valgrind.m4 | 23 ++++++++++ - 5 files changed, 128 insertions(+), 99 deletions(-) - -commit 97e025f19370a7b8d5170195683570390fdd6c3d -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 956ad19e8f1b6e364d673abcf4a68cf62d12306b -Author: Emanuele Aina -Date: Sun Jun 24 21:57:11 2007 +0000 - - Add coverage and valgrind support for tests - - - 20070624215711-f974e-565c5019028294ac2c333e9e863af6699abfb83f.gz - - Makefile.am | 13 +++++ - configure.ac | 6 ++ - extensions/Makefile.am | 4 +- - lib/gibber/Makefile.am | 4 +- - m4/salut-args.m4 | 141 ++++++++++++++++++++++++++++++++++++++++++++++++ - rules/check.mak | 124 ++++++++++++++++++++++++++++++++++++++++++ - rules/lcov.mak | 25 +++++++++ - src/Makefile.am | 4 +- - tests/Makefile.am | 2 + - 9 files changed, 317 insertions(+), 6 deletions(-) - -commit 36212d3ca8e67bdfd7c5dcc18cfa6632dfef109b -Author: Sjoerd Simons -Date: Mon Jul 9 15:00:01 2007 +0000 - - set srdir to a default value if unset - - - 20070709150001-b58c9-ba6cacaa62d84be9417ef21407aef7a5aa820f05.gz - - tests/run-xmpp-connection-test.sh | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit c3c4558484d6d6af64602f0c2c2caff345e28a10 -Author: Sjoerd Simons -Date: Sat Jul 7 19:04:42 2007 +0000 - - Some extra debugging info when creating muc services - - - 20070707190442-b58c9-bd62d6ae54fea4f9853cd4f90e6d009c922786f4.gz - - src/salut-muc-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 63f4add4ab89025fd066ea19bcfe45465fedacf8 -Author: Sjoerd Simons -Date: Sat Jul 7 19:03:15 2007 +0000 - - Only announce rooms on the address family to which their multicast address belongs - - - 20070707190315-b58c9-9ed76de915d94f585acb31ecd50cdb0f2be08ae3.gz - - src/salut-muc-channel.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit d210d3fc8e68160ba6a542105e86fa541282a241 -Author: Simon McVittie -Date: Thu Jul 5 17:27:15 2007 +0000 - - Fix distcheck by grepping the srcdir, not the builddir - - - 20070705172715-53eee-239115e337f8dbc34e6149179bd15977b502ea98.gz - - lib/gibber/Makefile.am | 3 ++- - src/Makefile.am | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -commit 765c67bc350261a9cbffb3976314c1a58eb17387 -Author: Sjoerd Simons -Date: Wed Jul 4 14:22:51 2007 +0000 - - GibberRMulticastTransport. Change the logic to cope with the fact that WHOIS_REQUEST puts the requested sender name in another field and add forward compatibility with unique id polling - - - 20070704142251-b58c9-ec4ea7e85490a518c1b48a7c59e1a4c4e0e93ba2.gz - - lib/gibber/gibber-r-multicast-transport.c | 30 +++++++++++++++++++++------- - 1 files changed, 22 insertions(+), 8 deletions(-) - -commit 5d2fbca0f8960df42defb9ee3842b5ea39dbff7c -Author: Sjoerd Simons -Date: Wed Jul 4 14:20:39 2007 +0000 - - GibberRMulticastSender: Requested whois sender is now in data.whois_request.sender_id instead of sender - - - 20070704142039-b58c9-84867314698c2ef7ce779d35f7a31dbd71a04a88.gz - - lib/gibber/gibber-r-multicast-sender.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 4a874ab5a10e836fee5f8e561c512b381fe39f9c -Author: Sjoerd Simons -Date: Wed Jul 4 14:18:36 2007 +0000 - - check-gibber-r-multicast-transport.c: Sender id's should never be 0, cope with polling for a unique id - - - 20070704141836-b58c9-0106ed736d8d1420dc4545514721d3bf4ff87b2f.gz - - tests/check-gibber-r-multicast-transport.c | 16 ++++++++++------ - 1 files changed, 10 insertions(+), 6 deletions(-) - -commit 76339be19101fd08704a49e4a501eac6d8659c86 -Author: Sjoerd Simons -Date: Wed Jul 4 13:37:54 2007 +0000 - - Whitespace fixes - - - 20070704133754-b58c9-d0f6af5acdb882398d8037df0706954bbf3a2c85.gz - - lib/gibber/gibber-r-multicast-packet.h | 30 ++++++++++++++---------------- - 1 files changed, 14 insertions(+), 16 deletions(-) - -commit 787604cd8983220dc91b90006eae051e0ef150ac -Author: Sjoerd Simons -Date: Wed Jul 4 13:36:24 2007 +0000 - - Seperate sender and requested sender in Whois Request packets - - - 20070704133624-b58c9-acb12b67092dcffe106519be50140a900cbf1362.gz - - lib/gibber/gibber-r-multicast-packet.c | 16 ++++++++++++++++ - lib/gibber/gibber-r-multicast-packet.h | 5 +++++ - 2 files changed, 21 insertions(+), 0 deletions(-) - -commit 708139adde37b373568f6dd66a6aa5c4f746236f -Author: Sjoerd Simons -Date: Wed Jul 4 11:06:40 2007 +0000 - - test-r-multicast-transport-io.c: Simulate behaviour of IP_MULTICAST_LOOP - - - 20070704110640-b58c9-1f60c611c9988f414bdc978fdaa0cfdb0f7571b5.gz - - tests/test-r-multicast-transport-io.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 7041a1c0de63c7399f98e44962f624f033471403 -Author: Sjoerd Simons -Date: Tue Jul 3 16:06:24 2007 +0000 - - Let the tests cope with the new GibberRMulticastPacket - - - 20070703160624-b58c9-2c9cf4486ff46a3c384bb9de7c7460c042b9f887.gz - - tests/check-gibber-r-multicast-packet.c | 58 +++++++++++++++++----------- - tests/check-gibber-r-multicast-sender.c | 12 +++-- - tests/check-gibber-r-multicast-transport.c | 45 +++++++++++---------- - 3 files changed, 66 insertions(+), 49 deletions(-) - -commit 5f30352212443c4494482fe7fd7f46c99ee9ed09 -Author: Sjoerd Simons -Date: Tue Jul 3 16:03:19 2007 +0000 - - GibberRMulticastTransport: Use new refactorized GibberRMultcastPacket - - - 20070703160319-b58c9-65e53a92a9eabb264a5ed6a6fad7e60572259d77.gz - - lib/gibber/gibber-r-multicast-transport.c | 204 +++++++++++++++-------------- - 1 files changed, 104 insertions(+), 100 deletions(-) - -commit 353d937ff4375f28ae745a6f8579cd4e6bfa4dcc -Author: Sjoerd Simons -Date: Tue Jul 3 16:02:27 2007 +0000 - - GibberRMulticastSender: Use new refactorized GibberRMultcastPacket - - - 20070703160227-b58c9-989a7305597a2af9b7d6b738e473364e0b309662.gz - - lib/gibber/gibber-r-multicast-sender.c | 99 +++++++++++++++++--------------- - lib/gibber/gibber-r-multicast-sender.h | 2 +- - 2 files changed, 53 insertions(+), 48 deletions(-) - -commit cc2a2a8971bddb8eb444b3fa5af2d3b5cb4e10b2 -Author: Sjoerd Simons -Date: Tue Jul 3 16:01:36 2007 +0000 - - Refactor GibberRMulticastPacket to allow for multiple packets types/serialisations - - - 20070703160136-b58c9-6bcdb84dde08d2605e54452d79693694a0d5de81.gz - - lib/gibber/gibber-r-multicast-packet.c | 439 ++++++++++++++++++-------------- - lib/gibber/gibber-r-multicast-packet.h | 137 ++++++----- - 2 files changed, 326 insertions(+), 250 deletions(-) - -commit ba0021bcaefe1723202a3bbe39e8a05f10b405e2 -Author: Sjoerd Simons -Date: Mon Jul 2 09:48:15 2007 +0000 - - Add whois packet support - - - 20070702094815-b58c9-4dfd4bc0eda24d1fcddfe7291741266a5bf3a372.gz - - lib/gibber/gibber-r-multicast-sender.c | 158 +++++++++++++++++++++++++-- - lib/gibber/gibber-r-multicast-sender.h | 10 +- - lib/gibber/gibber-r-multicast-transport.c | 159 +++++++++++++++++++++------- - tests/check-gibber-r-multicast-sender.c | 27 +++-- - tests/check-gibber-r-multicast-transport.c | 38 +++++-- - 5 files changed, 316 insertions(+), 76 deletions(-) - -commit 597a4b0409dd6c8633df3392a6b234f6c3a99327 -Author: Sjoerd Simons -Date: Mon Jul 2 09:46:33 2007 +0000 - - GibberRMulticastPacket: Add Whois capabilities - - - 20070702094633-b58c9-d720f97ad5b159b205c3181d87c6086ba6bf69e8.gz - - lib/gibber/gibber-r-multicast-packet.c | 21 ++++++++++++++++----- - lib/gibber/gibber-r-multicast-packet.h | 13 +++++++++---- - tests/check-gibber-r-multicast-packet.c | 21 +++++++++++---------- - 3 files changed, 36 insertions(+), 19 deletions(-) - -commit 66a3097310d515ed3840671331d4a851e36a4406 -Author: Sjoerd Simons -Date: Thu Jun 28 13:09:02 2007 +0000 - - Add Whois packet parser/builder - - - 20070628130902-93b9a-537e64e55880f548354b20daf7b65d83f88ae601.gz - - lib/gibber/gibber-r-multicast-packet.c | 56 +++++++++++++++++++++++++++++ - lib/gibber/gibber-r-multicast-packet.h | 28 ++++++++++++++- - lib/gibber/gibber-r-multicast-transport.c | 4 +- - 3 files changed, 85 insertions(+), 3 deletions(-) - -commit 4db1d315ab7f4d1dd5630f22d096a3dffd84a0a7 -Author: Sjoerd Simons -Date: Thu Jun 28 13:07:25 2007 +0000 - - Make the {add_,get_}_{guint8,guint32,string} functions more generic - - - 20070628130725-93b9a-371ed79228351236ec870e5b8779c28b8c9ccf6b.gz - - lib/gibber/gibber-r-multicast-packet.c | 105 +++++++++++++++++--------------- - 1 files changed, 57 insertions(+), 48 deletions(-) - -commit 7addf292653cd5e37cb3b7c0d133590d97af25c3 -Author: Sjoerd Simons -Date: Thu Jun 28 11:35:10 2007 +0000 - - Convert sender/receiver names to 32 bit id's - - - 20070628113510-93b9a-ab87f89d7aad80fe26582c3bd4c4ca59649d25b0.gz - - lib/gibber/gibber-r-multicast-packet.c | 44 +++++++++++++------------------ - lib/gibber/gibber-r-multicast-packet.h | 8 +++--- - 2 files changed, 23 insertions(+), 29 deletions(-) - -commit 074438844816fb1bd7bf5d89cb3d8713fc87d19a -Author: Guillaume Desmottes -Date: Wed Jul 4 09:19:11 2007 +0000 - - gibber-xmpp-connection-listener.c: rename normalize_to_ipv4 to normalize_to_address - - - 20070704091911-7fe3f-cc78b0f1dc0fb4d9ecba02618b1d98ef05642b80.gz - - lib/gibber/gibber-xmpp-connection-listener.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit b4b4012f9dd6175e07c80dc2466886eac3197ee6 -Author: Guillaume Desmottes -Date: Tue Jul 3 16:34:40 2007 +0000 - - fix typo in gibber-fd-transport.c debug message - - - 20070703163440-7fe3f-1079331757b1acf167464f831ab034ab807c8cd7.gz - - lib/gibber/gibber-fd-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c247d93fffb14374ff390576a7dd81c5aeb07711 -Author: Guillaume Desmottes -Date: Tue Jul 3 16:25:28 2007 +0000 - - gibber-xmpp-connection-listener.c: normalize IPv6 address to IPv4 if needed - - - 20070703162528-7fe3f-e4260688f49716e7fa277fe7bb2bc93293b30d1c.gz - - lib/gibber/gibber-xmpp-connection-listener.c | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) - -commit 3985de51105bab4f0ea83024592eb8b6f607cf12 -Author: Guillaume Desmottes -Date: Tue Jul 3 15:11:14 2007 +0000 - - debug.c: add DEBUG_IM - - - 20070703151114-7fe3f-0ecb27c5d28469c38e589817d868c0ebf016ade1.gz - - src/debug.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit b0e2b9f0fbc7129268fd86259c53fa5942d0daf7 -Author: Guillaume Desmottes -Date: Tue Jul 3 12:42:48 2007 +0000 - - gibber-xmpp-connection-listener.c: check if errno == EADDRINUSE before return the error - - - 20070703124248-7fe3f-fc6b712c8801abc744ade2e37c5a925618cc3116.gz - - lib/gibber/gibber-xmpp-connection-listener.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit 20081ea0dc069b67c8bcbd1e50492ddb6389d73a -Author: Guillaume Desmottes -Date: Tue Jul 3 12:31:25 2007 +0000 - - fix conflicts. Use auto-generated marshallers magic - - - 20070703123125-7fe3f-056287f54cd2603471342dae94688fe5e8c79e0a.gz - - lib/gibber/Makefile.am | 34 +++----------------- - ...r-xmpp-connection-listener-signals-marshal.list | 1 - - lib/gibber/gibber-xmpp-connection-listener.c | 4 +- - 3 files changed, 7 insertions(+), 32 deletions(-) - -commit 38fca45a1121cb0e1736eb7027dd96e99c94b8dd -Author: Guillaume Desmottes -Date: Fri Jun 29 10:14:34 2007 +0000 - - check-gibber-xmpp-connection-listener: check the type of error when gibber_xmpp_connection_listener_listen fails - - - 20070629101434-7fe3f-827164b504356644474b9c7c00265df5beed9ed0.gz - - tests/check-gibber-xmpp-connection-listener.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit 8b0100271e3e4dd8e399d4097bbacd95c12e74a8 -Author: Guillaume Desmottes -Date: Fri Jun 29 10:09:53 2007 +0000 - - check-gibber-xmpp-connection-listener: no need to create a XMPP connection in connect_to_port - - - 20070629100953-7fe3f-8b3296a8808211fcb49c4fcb14bf287acf759d6c.gz - - tests/check-gibber-xmpp-connection-listener.c | 6 +----- - 1 files changed, 1 insertions(+), 5 deletions(-) - -commit d83c01f78ca7b8ded02971adb3c27ee764362764 -Author: Guillaume Desmottes -Date: Fri Jun 29 10:06:12 2007 +0000 - - gibber-xmpp-connection-listener: simplify error codes - - - 20070629100612-7fe3f-8dbe6dde0e66b9327f8e00341f59f6663fab2dc3.gz - - lib/gibber/gibber-xmpp-connection-listener.c | 10 +++++----- - lib/gibber/gibber-xmpp-connection-listener.h | 7 ++----- - 2 files changed, 7 insertions(+), 10 deletions(-) - -commit 839ad4330860d50c0388c8b9e44428a836e9e97f -Author: Guillaume Desmottes -Date: Fri Jun 29 10:00:04 2007 +0000 - - gibber-xmpp-connection-listener: pass the addrinfo size with the new-connection signal - - - 20070629100004-7fe3f-b9c14e355d76a2da411fe327cfb35125ca928313.gz - - ...r-xmpp-connection-listener-signals-marshal.list | 2 +- - lib/gibber/gibber-xmpp-connection-listener.c | 7 ++++--- - tests/check-gibber-xmpp-connection-listener.c | 1 + - 3 files changed, 6 insertions(+), 4 deletions(-) - -commit d911f8678375622b47fcdd93efb970da4dc737dc -Author: Guillaume Desmottes -Date: Fri Jun 29 08:53:39 2007 +0000 - - gibber-xmpp-connection-listener: NEW_CONNECTION signal gives a ptr to the sockaddr - - - 20070629085339-7fe3f-5e64a2837ffd5b806d31b4130f9b81dd883ea655.gz - - lib/gibber/Makefile.am | 30 ++++++++++++++++++-- - ...r-xmpp-connection-listener-signals-marshal.list | 1 + - lib/gibber/gibber-xmpp-connection-listener.c | 8 +++-- - tests/check-gibber-xmpp-connection-listener.c | 1 + - 4 files changed, 34 insertions(+), 6 deletions(-) - -commit 2e08907a878251cce4f4972ac7600f190050272c -Author: Guillaume Desmottes -Date: Fri Jun 29 08:35:11 2007 +0000 - - gibber_xmpp_connection_listener_listen now takes the port and a GError as arguments and returns a boolean - - - 20070629083511-7fe3f-844a5bca782b04e786df5fc2f5ae735a9a0a2586.gz - - lib/gibber/gibber-xmpp-connection-listener.c | 60 ++++++++++++++++++------ - lib/gibber/gibber-xmpp-connection-listener.h | 18 +++++++- - tests/check-gibber-xmpp-connection-listener.c | 8 +++- - 3 files changed, 67 insertions(+), 19 deletions(-) - -commit d5d89251136bafb39ac0a3831cf49969112673eb -Author: Guillaume Desmottes -Date: Fri Jun 29 07:41:07 2007 +0000 - - add check-gibber-xmpp-connection-listener.c - - - 20070629074107-7fe3f-5cd4aec47ff544b99382143013119f7ac935cd98.gz - - tests/Makefile.am | 3 +- - tests/check-gibber-xmpp-connection-listener.c | 110 +++++++++++++++++++++++++ - tests/check-gibber.h | 1 + - tests/check-main.c | 1 + - 4 files changed, 114 insertions(+), 1 deletions(-) - -commit 973bc7d99191df09d4f3b0ea213d5d4b52d0f8bb -Author: Guillaume Desmottes -Date: Fri Jun 29 07:40:21 2007 +0000 - - add gibber-xmpp-connection-listener.[ch] - - - 20070629074021-7fe3f-6419e96689c08be2898d45fee656ce06ad0ab1b5.gz - - lib/gibber/Makefile.am | 2 + - lib/gibber/gibber-xmpp-connection-listener.c | 259 ++++++++++++++++++++++++++ - lib/gibber/gibber-xmpp-connection-listener.h | 68 +++++++ - 3 files changed, 329 insertions(+), 0 deletions(-) - -commit 0e11a71ed21aa4758b52bdda1ffd5f4d3f38feeb -Author: Sjoerd Simons -Date: Tue Jul 3 12:08:39 2007 +0000 - - Fully open an incoming stream before passing it to the im-channel if we took control of it - - - 20070703120839-b58c9-6665367f46e4537de51993d958d09387545a08c9.gz - - src/salut-im-manager.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit 344749684c8bbe566ad69674b35a63a99247c2b8 -Author: Sjoerd Simons -Date: Mon Jul 2 21:47:17 2007 +0000 - - Check if the connection is precisely fully open, doesn't change functionality, but makes the code more readable - - - 20070702214717-93b9a-619c64c1e31b641885ea82db22f16771b6366f8a.gz - - src/salut-im-channel.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit e54fb6c07188f9ad090eb2e8205f95e517e8f8e3 -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/check-gibber-sasl-auth.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 7bb825fd2719dffd921b4a05ee707d2cb5dbcad6 -Author: Sjoerd Simons -Date: Mon Jul 2 07:57:09 2007 +0000 - - Use GibberXmppConnections stream flags instead of the old stream_open var - - - 20070702075709-b58c9-5d5b22f820f3fec921bbeed8ac276d41cb06613e.gz - - src/salut-im-channel.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit c458f732bc193236cf89ced60ccde3d94279805a -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 - - lib/gibber/gibber-xmpp-connection.c | 22 +++++++++++----------- - lib/gibber/gibber-xmpp-connection.h | 9 ++++++++- - 2 files changed, 19 insertions(+), 12 deletions(-) - -commit d5c6c7383be03ef5b2cea4787197323093af0a7d -Author: Simon McVittie -Date: Tue Jul 3 11:36:33 2007 +0000 - - Correct use of presence mixin - - - 20070703113633-53eee-ee896d1ab855a347ea812e6c9f2ed133ad5fa46b.gz - - src/salut-connection.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 6e8c48e576a4b35a1af8b76d6ff5075de1f97b40 -Author: Sjoerd Simons -Date: Mon Jul 2 21:51:52 2007 +0000 - - Fix conflicts - - - 20070702215152-93b9a-d88d231649d18e18f4f65beb97359ad08b03f1e3.gz - - tests/test-sasl-auth.c | 222 ------------------------------------------------ - 1 files changed, 0 insertions(+), 222 deletions(-) - -commit f2dbb414f9dee9c052cc9578e0aec25b0f3bc985 -Author: Sjoerd Simons -Date: Mon Jul 2 08:03:56 2007 +0000 - - Remove test-sasl-auth as it has been obsoleted by check-gibber-sasl-auth.c - - - 20070702080356-b58c9-6e51cce173507fdfda230b33e963c6f0ae735ac1.gz - - tests/test-sasl-auth.c | 222 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 222 insertions(+), 0 deletions(-) - -commit 6fbcaef4ead92411e925146d73e7164cde186ecf -Author: Simon McVittie -Date: Mon Jul 2 19:33:03 2007 +0000 - - Remove .list files from gibber EXTRA_DIST - - - 20070702193303-53eee-0e7888b959eeab9e154c8341926f0480d161523b.gz - - lib/gibber/Makefile.am | 11 ----------- - 1 files changed, 0 insertions(+), 11 deletions(-) - -commit be6609cb27ee5405aed13feecfe0d8a13c5c731d -Author: Simon McVittie -Date: Mon Jul 2 14:40:17 2007 +0000 - - Add missing declarations of TpBaseConnection cast - - - 20070702144017-53eee-024bcc40ff44d4e1f2a691247b296a70b0b2332b.gz - - src/salut-connection.c | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -commit c8e9945baa001b22cf5f322bc1a65f9fcc631fb7 -Author: Simon McVittie -Date: Mon Jul 2 14:32:07 2007 +0000 - - salut-connection.c: error out if functions are called while not connected, rather than crashing - - - 20070702143207-53eee-15dd74ef70721dd896c7cafbbcb84c73e2484276.gz - - src/salut-connection.c | 27 +++++++++++++++++++++++++++ - 1 files changed, 27 insertions(+), 0 deletions(-) - -commit d95a17002537cb9aa0edac51cdee0071f7ba7b27 -Author: Emanuele Aina -Date: Mon Jul 2 16:49:18 2007 +0000 - - Fix a memleak in the GibberXmppConnection test - - - 20070702164918-f974e-d961a1edd7f9d983588abecbc339095b1ab43e67.gz - - tests/check-gibber-xmpp-connection.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 85f03537063c6e7d4cd033017561b4c7b59c1ef6 -Author: Emanuele Aina -Date: Sun Jul 1 14:13:34 2007 +0000 - - Fix a memleak in the GibberSaslAuth test - - - 20070701141334-f974e-cf2e6f47799a9e6abb864d32ffa13a3ac9a8a52e.gz - - tests/check-gibber-sasl-auth.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit a45a7d2ceca6b123aae29b96068386b8f7ea31c7 -Author: Emanuele Aina -Date: Sun Jul 1 14:08:36 2007 +0000 - - Fix two memleaks in TestSaslAuthServer - - - 20070701140836-f974e-f6fc59db3a7309773cc92cf5699405169e342aaf.gz - - tests/test-sasl-auth-server.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit a8f396cb96a4c091e42210cc678df20d12675360 -Author: Emanuele Aina -Date: Sun Jul 1 14:07:33 2007 +0000 - - Fix some memleaks in the GibberRMulticastTransport test - - - 20070701140733-f974e-ef2370a43efe1e309f8b8ddf3595d3c572e6222e.gz - - tests/check-gibber-r-multicast-transport.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 4eda7443430c8518874896b7035072e591662ea9 -Author: Emanuele Aina -Date: Sun Jul 1 14:05:33 2007 +0000 - - Fix a memleak with some circular references in the GibberRMulticastSender test - - - 20070701140533-f974e-bade69880950d8f5b6b0088ba9f2326cf688b23b.gz - - tests/check-gibber-r-multicast-sender.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 7a2dcfb5b1ce78ca1a1a8a2608cedb16e212d998 -Author: Emanuele Aina -Date: Sun Jul 1 13:56:48 2007 +0000 - - Fix a memleak in the GibberIqHelper test - - - 20070701135648-f974e-fc5b23ab037cde3db7d82d483906623526b077ab.gz - - tests/check-gibber-iq-helper.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 339b2f2b12fa3b9f6514fda7ce0f532b4fd42700 -Author: Emanuele Aina -Date: Sun Jul 1 13:55:50 2007 +0000 - - Fix two small memleak in GibberSaslAuth - - - 20070701135550-f974e-01e921aff6b722104ea1262ac39980d2dbef55b5.gz - - lib/gibber/gibber-sasl-auth.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit d2445e26f71813db72c3e79f4acca0b66a4c8f4e -Author: Emanuele Aina -Date: Sun Jul 1 13:53:55 2007 +0000 - - Fix a memleak in GibberRMulticastTransport - - - 20070701135355-f974e-9147fba427fe27ccc65bb6e84301960856a10d4f.gz - - lib/gibber/gibber-r-multicast-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 8e5b066666f286f0fec9157f7d3f4edc84ef10f5 -Author: Emanuele Aina -Date: Wed Jun 27 07:36:41 2007 +0000 - - Plugged some memleak in the GibberRMulticastPacket test - - - 20070627073641-f974e-be3c9aebf53fc36e8a393554a2e4ed5e02ffe156.gz - - tests/check-gibber-r-multicast-packet.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 9c8ca6b5adc95443d20544b32c240440bd00fa54 -Author: Emanuele Aina -Date: Wed Jun 27 07:35:36 2007 +0000 - - Plugged some memleak in the GibberXmppNode test - - - 20070627073536-f974e-6a436afcf511a352fa14ce4ab3e0b765c3465f44.gz - - tests/check-gibber-xmpp-node.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit e7772144f3692cb64f56effa5412ca37a8ed03fe -Author: Emanuele Aina -Date: Wed Jun 27 07:34:16 2007 +0000 - - Plugged some memleak in the GibberXmppReader test - - - 20070627073416-f974e-564b33d2af26cac3d2c7065fbe0bee9c9acd9be3.gz - - tests/check-gibber-xmpp-reader.c | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -commit 222e6aab5866b842b68e7133516838e9f99e52ae -Author: Emanuele Aina -Date: Wed Jun 27 13:30:58 2007 +0000 - - Make check-main fail again if there are failing tests - - - 20070627133058-f974e-9acf9c459d46dfb8c164e3838be3a1a1c7322edd.gz - - tests/check-main.c | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit 22d0442e249d7a2444202284c1b5148bd88fea51 -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/check-gibber-xmpp-connection.c | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) - -commit d1f370ca3b8a0631b9ed3cc0be27c18f62c9b661 -Author: Emanuele Aina -Date: Fri Jun 22 12:08:42 2007 +0000 - - Deleted the old test-sasl-auth.c file as it was replaced by the Check test - - - 20070622120842-f974e-c92843bc26f0d8c834909e268478c0b6485b4885.gz - - tests/test-sasl-auth.c | 222 ------------------------------------------------ - 1 files changed, 0 insertions(+), 222 deletions(-) - -commit 593d62c8bff4ee6aad5839a6e55bcb391cd1bc1c -Author: Simon McVittie -Date: Mon Jul 2 14:25:23 2007 +0000 - - text-helper.h: kill trailing whitespace - - - 20070702142523-53eee-664f1ce9e69ee82fc8756087d604763456af010f.gz - - src/text-helper.h | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit f460c973bb247fc565f43bbc2ceb6b670f37ab59 -Author: Simon McVittie -Date: Mon Jul 2 14:25:10 2007 +0000 - - text-helper.c: kill trailing whitespace - - - 20070702142510-53eee-5ba22b77c118801906dee0debcd4a650e867b0a1.gz - - src/text-helper.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 8f8d8188af86df2dbedff990664829a4e4de2397 -Author: Simon McVittie -Date: Mon Jul 2 14:25:01 2007 +0000 - - salut-self.c: kill trailing whitespace - - - 20070702142501-53eee-da5289ec429b3725123dc6ab5b964465bbd6be51.gz - - src/salut-self.c | 46 +++++++++++++++++++++++----------------------- - 1 files changed, 23 insertions(+), 23 deletions(-) - -commit f371b0e9bd4c7f272e418d73e6b2138593261f3a -Author: Simon McVittie -Date: Mon Jul 2 14:24:50 2007 +0000 - - salut-muc-manager.h: kill trailing whitespace - - - 20070702142450-53eee-74058e09acc51322c5bc9eb623c9bc53748f2386.gz - - src/salut-muc-manager.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c1b8a7dd1b11131a309822c8d6dec68420e57506 -Author: Simon McVittie -Date: Mon Jul 2 14:24:41 2007 +0000 - - salut-muc-manager.c: kill trailing whitespace - - - 20070702142441-53eee-39c287e8d55c5bf0f2140f9fc7d5331a2438c6dd.gz - - src/salut-muc-manager.c | 34 +++++++++++++++++----------------- - 1 files changed, 17 insertions(+), 17 deletions(-) - -commit a34383a6e3975c07e46cf53008e655f6f4fc646c -Author: Simon McVittie -Date: Mon Jul 2 14:24:28 2007 +0000 - - salut-muc-channel.h: kill trailing whitespace - - - 20070702142428-53eee-2b1ce4c3cf02bec4e08bff1b32f3c21d04813fe5.gz - - src/salut-muc-channel.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a493b5279277888fa3a2fc210ba89d84e175edb9 -Author: Simon McVittie -Date: Mon Jul 2 14:24:19 2007 +0000 - - salut-muc-channel.c: kill trailing whitespace - - - 20070702142419-53eee-66e57a5bb858e8fbfece5bc8bb8c393f7063dd1d.gz - - src/salut-muc-channel.c | 120 +++++++++++++++++++++++----------------------- - 1 files changed, 60 insertions(+), 60 deletions(-) - -commit 82e8431ba955793dcdc47c59a60535394336d4d1 -Author: Simon McVittie -Date: Mon Jul 2 14:24:12 2007 +0000 - - salut-contact.h: kill trailing whitespace - - - 20070702142412-53eee-dd7626e879eb4f9097e0e49188a701c0f0880ee3.gz - - src/salut-contact.h | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit d42e7ea8dff7b0c742b5b3d3f1cef5862d072cb3 -Author: Simon McVittie -Date: Mon Jul 2 14:24:01 2007 +0000 - - salut-contact.c: kill trailing whitespace - - - 20070702142401-53eee-f6adef67157e505eb097c485914243d56eee4e8d.gz - - src/salut-contact.c | 102 +++++++++++++++++++++++++------------------------- - 1 files changed, 51 insertions(+), 51 deletions(-) - -commit b55955407943ec7a1538283f0a359fff4263215e -Author: Simon McVittie -Date: Mon Jul 2 14:22:58 2007 +0000 - - salut-contact-manager.h: kill trailing whitespace - - - 20070702142258-53eee-85b8524d3d50200eb5d0d37d67249779faf7c9d3.gz - - src/salut-contact-manager.h | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit f5c9683088ca0ca857257905384c698f5868bb13 -Author: Simon McVittie -Date: Mon Jul 2 14:22:48 2007 +0000 - - salut-contact-manager.c: kill trailing whitespace - - - 20070702142248-53eee-57e3341234ce7c9baca56da2feb1e25821bd1277.gz - - src/salut-contact-manager.c | 68 +++++++++++++++++++++--------------------- - 1 files changed, 34 insertions(+), 34 deletions(-) - -commit c1d69c97529aa2d5ac45036ded9c999da8560a1e -Author: Simon McVittie -Date: Mon Jul 2 14:22:37 2007 +0000 - - salut-contact-channel.c: kill trailing whitespace - - - 20070702142237-53eee-bf8eb99dc9f4e189a553ec2d3895dc77f24cacd3.gz - - src/salut-contact-channel.c | 22 +++++++++++----------- - 1 files changed, 11 insertions(+), 11 deletions(-) - -commit 23d3e2607ccf449c4172d65fc7600395fb66e679 -Author: Simon McVittie -Date: Mon Jul 2 14:22:29 2007 +0000 - - salut-connection.c: kill trailing whitespace - - - 20070702142229-53eee-e4d81d3170e5467d3b4958547c09972597a1e852.gz - - src/salut-connection.c | 76 ++++++++++++++++++++++++------------------------ - 1 files changed, 38 insertions(+), 38 deletions(-) - -commit 6da76481d1eca7474427344d38d053af71623aba -Author: Simon McVittie -Date: Mon Jul 2 14:22:19 2007 +0000 - - salut-connection-manager.c: kill trailing whitespace - - - 20070702142219-53eee-bb136463b92d0157fd2f3b6c401e9f7bbd477ef5.gz - - src/salut-connection-manager.c | 34 +++++++++++++++++----------------- - 1 files changed, 17 insertions(+), 17 deletions(-) - -commit 26a37678fd2614a45ba0fd192c76c6e348189e00 -Author: Simon McVittie -Date: Mon Jul 2 14:22:06 2007 +0000 - - salut-avahi-service-resolver.h: kill trailing whitespace - - - 20070702142206-53eee-5f7ea74d9bd209ac4f120ada666927b9edf3b8b6.gz - - src/salut-avahi-service-resolver.h | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit b010869fa20d24e7b1614e094bf0ce1e986d9cb0 -Author: Simon McVittie -Date: Mon Jul 2 14:20:57 2007 +0000 - - salut-avahi-service-resolver.c: kill trailing whitespace - - - 20070702142057-53eee-88cf75487c8abd2228d7a358bc71e5d7ab3495a9.gz - - src/salut-avahi-service-resolver.c | 46 ++++++++++++++++++------------------ - 1 files changed, 23 insertions(+), 23 deletions(-) - -commit bc9817e6ed684a88fbd78c9674d295e558e1ebbf -Author: Simon McVittie -Date: Mon Jul 2 14:20:44 2007 +0000 - - salut-avahi-service-browser.h: kill trailing whitespace - - - 20070702142044-53eee-9f55465fd21eb5c4079844d3c03f037edbd1178a.gz - - src/salut-avahi-service-browser.h | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit bc26f515be1ed656684496679a978d1321169a27 -Author: Simon McVittie -Date: Mon Jul 2 14:20:33 2007 +0000 - - salut-avahi-service-browser.c: kill trailing whitespace - - - 20070702142033-53eee-82cddea48f4d68dadc7b4570fd0df7e87e5c09e6.gz - - src/salut-avahi-service-browser.c | 48 ++++++++++++++++++------------------ - 1 files changed, 24 insertions(+), 24 deletions(-) - -commit e01f956db74437611e3d0a2161fd2a5de51812ef -Author: Simon McVittie -Date: Mon Jul 2 14:20:19 2007 +0000 - - salut-avahi-record-browser.h: kill trailing whitespace - - - 20070702142019-53eee-df455d4f54f0a48f4ac71bee08997f007aeb174d.gz - - src/salut-avahi-record-browser.h | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 4bbd9a121131dc54634bdb34e37c554b809af54b -Author: Simon McVittie -Date: Mon Jul 2 14:20:02 2007 +0000 - - salut-avahi-record-browser.c: kill trailing whitespace - - - 20070702142002-53eee-c65ea6c52196d7df7804e180ae8423d437ed543d.gz - - src/salut-avahi-record-browser.c | 32 ++++++++++++++++---------------- - 1 files changed, 16 insertions(+), 16 deletions(-) - -commit 999934696c331c08f038b4ed7a52f52da89e3af4 -Author: Simon McVittie -Date: Mon Jul 2 14:19:49 2007 +0000 - - salut-avahi-enums.h: kill trailing whitespace - - - 20070702141949-53eee-40d8971f05ef389546cc61a347bb41655d27cb1a.gz - - src/salut-avahi-enums.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit ab903ca5ff84058ce333e64ddcc9e49740a22175 -Author: Simon McVittie -Date: Mon Jul 2 14:19:33 2007 +0000 - - /salut-avahi-entry-group.h: kill trailing whitespace - - - 20070702141933-53eee-0f0c38633215034e432ad817ca4a4b02428732b6.gz - - src/salut-avahi-entry-group.h | 46 ++++++++++++++++++++-------------------- - 1 files changed, 23 insertions(+), 23 deletions(-) - -commit d7c535e4574494755ffa34811e6a78113f0ce94f -Author: Simon McVittie -Date: Mon Jul 2 14:16:43 2007 +0000 - - salut-avahi-entry-group.c: trailing whitespace must die - - - 20070702141643-53eee-a142f50375382509bcf8b9e04b1ef76c350c2b0d.gz - - src/salut-avahi-entry-group.c | 114 ++++++++++++++++++++-------------------- - 1 files changed, 57 insertions(+), 57 deletions(-) - -commit b37c0b9ba9d8645d3defc8143514e57de0e4858d -Author: Simon McVittie -Date: Mon Jul 2 14:16:27 2007 +0000 - - salut-avahi-client.c: trailing whitespace must die - - - 20070702141627-53eee-427bf58ca81d4ef82793f8790abc1ba1cbe542d1.gz - - src/salut-avahi-client.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit a35af60ce27f1df3405fe4296ef4ef46f1b02fa3 -Author: Simon McVittie -Date: Mon Jul 2 13:02:05 2007 +0000 - - Omit missing or empty status messages from the TpPresenceStatus - - - 20070702130205-53eee-9c5ee10b131e290be9a13a217ba4d5669b24ed41.gz - - src/salut-connection.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit c3b4d19a505f570b7aada2483f032df6a1d104ee -Author: Simon McVittie -Date: Mon Jul 2 12:32:18 2007 +0000 - - Use the presence mixin - - - 20070702123218-53eee-12eb832709114057458fa7400475ec6637f1d0e3.gz - - src/salut-connection.c | 623 +++++++++++++++--------------------------------- - src/salut-connection.h | 13 +- - src/salut-contact.c | 2 +- - src/salut-presence.h | 13 +- - src/salut-self.c | 8 +- - 5 files changed, 204 insertions(+), 455 deletions(-) - -commit 2f2358c7f60188b907bdc15297db85f0fbf2d02a -Author: Simon McVittie -Date: Mon Jul 2 11:04:24 2007 +0000 - - Resolve conflict by re-deleting hold_unref_and_return_handles() and salut_connection_request_handles() - - - 20070702110424-53eee-56b0091f8afb395030befed70f311d2a1ff73071.gz - - src/salut-connection.c | 142 ------------------------------------------------ - 1 files changed, 0 insertions(+), 142 deletions(-) - -commit 6ab85b269bf4f84dd41e0d1f54259cce39456f1b -Author: Simon McVittie -Date: Wed Jun 27 18:00:13 2007 +0000 - - Oops, make salut_connection_class_init::interfaces static - - - 20070627180013-53eee-24bc0cee9747097b578e6d12f7bf43cd3b9f100d.gz - - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 67206a3977d20aebb380b5d14a83ad32ea72b71f -Author: Simon McVittie -Date: Wed Jun 27 17:43:51 2007 +0000 - - Remove obsolete declaration of salut_connection_connection_service_iface_init - - - 20070627174351-53eee-8037c081206d27ed3d86060a7b131210c177009e.gz - - src/salut-connection.c | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit c080c974df304f0955e012b1ad4d50a2d425f6e1 -Author: Simon McVittie -Date: Wed Jun 27 17:43:03 2007 +0000 - - Correct signature of handle_normalize_require_nonempty - - - 20070627174303-53eee-20301f659d0af60be989a405125528b541c961c6.gz - - src/salut-connection.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit fde71f1d153a95e55675b47ca503b3497503c61d -Author: Simon McVittie -Date: Wed Jun 27 17:38:34 2007 +0000 - - SalutConnection: let TpBaseConnection implement RequestHandles. Supply a validation function to ensure that requested handle IDs are non-empty - - - 20070627173834-53eee-431f56f4f3a541aa2d4bcbe0a9e1fddc05434d78.gz - - src/salut-connection.c | 48 ++++++++++++++++++++++++++---------------------- - 1 files changed, 26 insertions(+), 22 deletions(-) - -commit b38bbc58d02f4b6bd979199856374cd4711fc226 -Author: Simon McVittie -Date: Wed Jun 27 17:28:22 2007 +0000 - - SalutConnection: use TpBaseConnection implementation of GetInterfaces() - - - 20070627172822-53eee-5fdb2e487c78507bf6b9cb1b12ccbe5d888d4478.gz - - src/salut-connection.c | 27 +++++++++------------------ - 1 files changed, 9 insertions(+), 18 deletions(-) - -commit c4f151c968f71213ba31a78075dedb2eaec74d32 -Author: Simon McVittie -Date: Wed Jun 27 17:28:05 2007 +0000 - - configure.ac: require telepathy-glib 0.5.13 - - - 20070627172805-53eee-61bec6cda83c1c700234d499ce454457cca2c43a.gz - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit bde74bbe707f7eb3196e81fdc26f4d7147b0327a -Author: Simon McVittie -Date: Mon Jul 2 10:57:25 2007 +0000 - - Remove salut-self-signals-marshal.list - - - 20070702105725-53eee-789f727495c2e2d14d77d3ab0b9ab1a7ce1ebc90.gz - - 0 files changed, 0 insertions(+), 0 deletions(-) - -commit adfbaa5d3c07136f47cff164513861439ea2cece -Author: Simon McVittie -Date: Mon Jul 2 10:57:11 2007 +0000 - - Remove salut-muc-manager-signals-marshal.list - - - 20070702105711-53eee-dd20765dcb9ea054cafe1ca629fae592d26ea693.gz - - 0 files changed, 0 insertions(+), 0 deletions(-) - -commit fd69dbc44ab490001b0419aa6aba109f426c1759 -Author: Simon McVittie -Date: Mon Jul 2 10:57:01 2007 +0000 - - Remove salut-muc-channel-signals-marshal.list - - - 20070702105701-53eee-17483efde9412e369af62b9d9e9dd9a51726fc7d.gz - - src/salut-muc-channel-signals-marshal.list | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -commit 848c34e120ea33fc96b4236a2df4949fa50beeef -Author: Simon McVittie -Date: Mon Jul 2 10:56:52 2007 +0000 - - Remove salut-im-manager-signals-marshal.list - - - 20070702105652-53eee-a917d9656c9beb8e0b9eb27269157cd0722f040d.gz - - src/salut-im-manager-signals-marshal.list | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 3156e70a056003279a6bf3a6ef3f49f2975372fd -Author: Simon McVittie -Date: Mon Jul 2 10:56:43 2007 +0000 - - Remove salut-im-channel-signals-marshal.list - - - 20070702105643-53eee-75b6417f1eeb8001f72c40efc1da017462339885.gz - - src/salut-im-channel-signals-marshal.list | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -commit 879df5e41fb4ef565f4dc0e047fc27bdaad75b62 -Author: Simon McVittie -Date: Mon Jul 2 10:56:36 2007 +0000 - - Remove salut-contact-signals-marshal.list - - - 20070702105636-53eee-53dd8175a08ac198625922dabf0664e20ae633e2.gz - - src/salut-contact-signals-marshal.list | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit a0a739f002e36ec9eb97a994ecd796b40deab9e8 -Author: Simon McVittie -Date: Mon Jul 2 10:56:27 2007 +0000 - - Remove salut-contact-manager-signals-marshal.list - - - 20070702105627-53eee-d9947bad568b503cc340de4e5fdaab1b0be25bde.gz - - src/salut-contact-manager-signals-marshal.list | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit cd25c1e115b84a3616886439d49696fbd818741c -Author: Simon McVittie -Date: Mon Jul 2 10:56:18 2007 +0000 - - Remove salut-contact-channel-signals-marshal.list - - - 20070702105618-53eee-0cb18e2546725a171a6d00b00f63be4faace1f04.gz - - src/salut-contact-channel-signals-marshal.list | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit f0223e1f19526e9f4dfa4450a5af26a04869e71a -Author: Simon McVittie -Date: Mon Jul 2 10:56:10 2007 +0000 - - Remove salut-avahi-service-resolver-signals-marshal.list - - - 20070702105610-53eee-9dd62327589c2ec88a1cd37a850573796b882562.gz - - ...lut-avahi-service-resolver-signals-marshal.list | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit f29acd089f615a80ed5428fc464f4facbe6f03ff -Author: Simon McVittie -Date: Mon Jul 2 10:55:59 2007 +0000 - - Remove salut-avahi-service-browser-signals-marshal.list - - - 20070702105559-53eee-cf1a845d0c5e82fee9d784b52a4dfbbf46e25f17.gz - - ...alut-avahi-service-browser-signals-marshal.list | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit fe4d4098474d364bd4885e0e36ed8f01543a93d8 -Author: Simon McVittie -Date: Mon Jul 2 10:55:50 2007 +0000 - - Remove salut-avahi-record-browser-signals-marshal.list - - - 20070702105550-53eee-c0223a07043be22acd7910a9e84ed7842a71cc97.gz - - ...salut-avahi-record-browser-signals-marshal.list | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 68fc3ab315345bea5ee8f14c9ffc14c2bed8136e -Author: Simon McVittie -Date: Mon Jul 2 10:55:37 2007 +0000 - - Remove salut-avahi-entry-group-signals-marshal.list - - - 20070702105537-53eee-ade866b961586e0f32a405020449970c909ec721.gz - - src/salut-avahi-entry-group-signals-marshal.list | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 61485993d646432750a1ce7351519d969bbef15c -Author: Simon McVittie -Date: Mon Jul 2 10:55:25 2007 +0000 - - Remove salut-avahi-client-signals-marshal.list - - - 20070702105525-53eee-a34623296b89f56c559dded5dfee44ea1a020630.gz - - src/salut-avahi-client-signals-marshal.list | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit c82d8c08a7c0cbabcc3c83722f735684e25c1297 -Author: Simon McVittie -Date: Mon Jul 2 10:55:22 2007 +0000 - - src/: generate all signal marshallers together. - - Avoid .list files by grepping source code to discover what marshallers we need. - - 20070702105522-53eee-8a1eb02128914dccb2a9fa29503f8121e44aa36b.gz - - src/Makefile.am | 67 +++++++---------------------------- - src/salut-avahi-client.c | 1 - - src/salut-avahi-entry-group.c | 1 - - src/salut-avahi-record-browser.c | 6 ++-- - src/salut-avahi-service-browser.c | 6 ++-- - src/salut-avahi-service-resolver.c | 4 +- - src/salut-contact-manager.c | 4 +- - src/salut-contact.c | 4 +- - src/salut-im-channel.c | 4 +- - src/salut-im-manager.c | 1 - - src/salut-muc-channel.c | 1 - - src/salut-muc-manager.c | 1 - - src/salut-self.c | 1 - - 13 files changed, 28 insertions(+), 73 deletions(-) - -commit b80247b362d73500f642e466b4fc2be7674e8a8d -Author: Simon McVittie -Date: Mon Jul 2 10:52:26 2007 +0000 - - Remove gibber-xmpp-stanza-signals-marshal.list - - - 20070702105226-53eee-6343847face069354b96f81e0dc3fcf4158bd685.gz - - 0 files changed, 0 insertions(+), 0 deletions(-) - -commit 66f8636715d9c45ea265671e348a3628e5807964 -Author: Simon McVittie -Date: Mon Jul 2 10:52:18 2007 +0000 - - Remove gibber-xmpp-reader-signals-marshal.list - - - 20070702105218-53eee-fe2ae26699b4a8611ceae0b38f0d893e8ae6b8a4.gz - - lib/gibber/gibber-xmpp-reader-signals-marshal.list | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit e3fe198ea29a2eb1412d52c4c58efb0cc8961d5c -Author: Simon McVittie -Date: Mon Jul 2 10:52:05 2007 +0000 - - Remove gibber-xmpp-connection-signals-marshal.list - - - 20070702105205-53eee-f0ab46818330c1cd2c500321cba87b47be229141.gz - - .../gibber-xmpp-connection-signals-marshal.list | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit f053296bd23c65609c51cc7cf463f24ec5695d0b -Author: Simon McVittie -Date: Mon Jul 2 10:51:58 2007 +0000 - - Remove gibber-transport-signals-marshal.list - - - 20070702105158-53eee-b85e4c42c5b2cc66e381d400f5c77184d0dac6e9.gz - - lib/gibber/gibber-transport-signals-marshal.list | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 6a8becbc6afa8e49388e58104d195f43b0d88997 -Author: Simon McVittie -Date: Mon Jul 2 10:51:49 2007 +0000 - - Remove gibber-ssl-transport-signals-marshal.list - - - 20070702105149-53eee-169a2ae30b1e01bcea11fcd8e361ee2659517760.gz - - 0 files changed, 0 insertions(+), 0 deletions(-) - -commit e6fc22d9cb6414ced375cd100df88960bd26a390 -Author: Simon McVittie -Date: Mon Jul 2 10:51:42 2007 +0000 - - Remove gibber-sasl-auth-signals-marshal.list - - - 20070702105142-53eee-3f38afd91482a9b40437131645ae6a913590fa39.gz - - lib/gibber/gibber-sasl-auth-signals-marshal.list | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 860956ee3ddf4beebbc8ce000db11408621685aa -Author: Simon McVittie -Date: Mon Jul 2 10:51:31 2007 +0000 - - Remove gibber-r-multicast-sender-signals-marshal.list - - - 20070702105131-53eee-5a1f20cbd646d01f0c57852ff3a677ce8606f61e.gz - - .../gibber-r-multicast-sender-signals-marshal.list | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit bd7b2285124bcb7fd400722704b4a2b2b88a9ff0 -Author: Simon McVittie -Date: Mon Jul 2 10:51:22 2007 +0000 - - Remove gibber-muc-connection-signals-marshal.list - - - 20070702105122-53eee-1a8f8535dd9c022217e5ee00d8d7b0a991de9f37.gz - - .../gibber-muc-connection-signals-marshal.list | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 0821420f935d158a51d1291cfa9d7707ba147fe6 -Author: Simon McVittie -Date: Mon Jul 2 10:51:05 2007 +0000 - - Remove gibber-bytestream-ibb-signals-marshal.list - - - 20070702105105-53eee-64b2981aa769e3f65cfd61e39603f5f5009c9110.gz - - .../gibber-bytestream-ibb-signals-marshal.list | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit aa673b9ebb7b181a3d7e899420c977b11bc151db -Author: Simon McVittie -Date: Mon Jul 2 10:50:50 2007 +0000 - - lib/gibber/Makefile.am: kill trailing whitespace - - - 20070702105050-53eee-1fec2ed3b7b347fc709c45a7ca858921e4050e10.gz - - lib/gibber/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit f4fc2d242b22d5b311c24ddb511289eca1335d83 -Author: Simon McVittie -Date: Mon Jul 2 10:48:55 2007 +0000 - - lib/gibber/: 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 - - lib/gibber/Makefile.am | 45 +++++++++++-------------------- - lib/gibber/gibber-bytestream-ibb.c | 4 +- - lib/gibber/gibber-muc-connection.c | 6 ++-- - lib/gibber/gibber-r-multicast-sender.c | 4 +- - lib/gibber/gibber-sasl-auth.c | 8 +++--- - lib/gibber/gibber-ssl-transport.c | 1 - - lib/gibber/gibber-transport.c | 4 +- - lib/gibber/gibber-xmpp-connection.c | 4 +- - lib/gibber/gibber-xmpp-reader.c | 4 +- - 9 files changed, 33 insertions(+), 47 deletions(-) - -commit b9072927eb3aa7628a12b1590b28a231cbfc1d62 -Author: Simon McVittie -Date: Mon Jul 2 10:48:19 2007 +0000 - - src/: use g_cclosure_marshal_VOID__ENUM instead of making our own - - - 20070702104819-53eee-f72c27f9b873eb6a2b3fcde9c1999b6ca10cc2c6.gz - - src/salut-avahi-client.c | 2 +- - src/salut-avahi-entry-group.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit a8307b007d4771d74acf1c50901cc92555c44524 -Author: Simon McVittie -Date: Mon Jul 2 10:47:29 2007 +0000 - - lib/gibber/gibber-bytestream-ibb.c: replace custom marshaller with generic one from GLib - - - 20070702104729-53eee-a8d899ad5b8f99edeb77f03cc692baa417f1dff1.gz - - lib/gibber/gibber-bytestream-ibb.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 884e67cc27bda2a5a15ffafba75180e7f04c0f84 -Author: Guillaume Desmottes -Date: Thu Jun 28 14:06:46 2007 +0000 - - xmpp-stanza: assert stanza->node != NULL - - - 20070628140646-7fe3f-6e9a2388bc757c87c00addad2f36c7d9a917d420.gz - - lib/gibber/gibber-xmpp-stanza.c | 8 +------- - 1 files changed, 1 insertions(+), 7 deletions(-) - -commit 89d890722afef5c85e0b37f398dfcfa09e6a2d7b -Author: Guillaume Desmottes -Date: Thu Jun 28 13:57:42 2007 +0000 - - xmpp-stanza: factor out (sub) type name -> GibberStanza(Sub)Type to simplify code - - - 20070628135742-7fe3f-63c98e9add085256738a6d841354e8ac4a5d7366.gz - - lib/gibber/gibber-xmpp-stanza.c | 90 ++++++++++++++++++++------------------- - 1 files changed, 46 insertions(+), 44 deletions(-) - -commit 06da20f68908d97dbbe849d65df10e0401557580 -Author: Guillaume Desmottes -Date: Thu Jun 28 13:39:32 2007 +0000 - - rename LAST_GIBBER_STANZA_(SUB_)TYPE to NUM_GIBBER_STANZA_(SUB_)TYPE - - - 20070628133932-7fe3f-12f50c87a912fdcaf632cbd2496162fdb95d6019.gz - - lib/gibber/gibber-xmpp-stanza.c | 26 +++++++++++++------------- - lib/gibber/gibber-xmpp-stanza.h | 4 ++-- - 2 files changed, 15 insertions(+), 15 deletions(-) - -commit b2d4e0f8011dde6799b1d65c2e143611bd995645 -Author: Guillaume Desmottes -Date: Thu Jun 28 12:45:07 2007 +0000 - - add gibber_xmpp_stanza_get_type_info tests - - - 20070628124507-7fe3f-e3bea7b1169127a3c9bb6d285f975509cc90ad37.gz - - tests/check-gibber-xmpp-stanza.c | 72 ++++++++++++++++++++++++++++++++++++++ - 1 files changed, 72 insertions(+), 0 deletions(-) - -commit 9eea02d7c7874de569b1c6d69d311ebbc557678f -Author: Guillaume Desmottes -Date: Thu Jun 28 12:44:49 2007 +0000 - - add gibber_xmpp_stanza_get_type_info - - - 20070628124449-7fe3f-7ce76716162f4ef37a00cfaf0135f998fe684df0.gz - - lib/gibber/gibber-xmpp-stanza.c | 63 +++++++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-xmpp-stanza.h | 4 ++ - 2 files changed, 67 insertions(+), 0 deletions(-) - -commit 22b3b96c5fce176931e07227ec5fc1f9ce364f60 -Author: Guillaume Desmottes -Date: Thu Jun 28 11:52:15 2007 +0000 - - add GIBBER_STANZA_TYPE_UNKNOWN and GIBBER_STANZA_SUB_TYPE_UNKNOWN - - - 20070628115215-7fe3f-b1554b27ca4159ccabfb0440253f4511dd2cd9f6.gz - - lib/gibber/gibber-xmpp-stanza.c | 3 +++ - lib/gibber/gibber-xmpp-stanza.h | 2 ++ - 2 files changed, 5 insertions(+), 0 deletions(-) - -commit 7fcb63d423556f5f9a10cafc1454b47cb378ad78 -Author: Guillaume Desmottes -Date: Thu Jun 28 11:39:04 2007 +0000 - - rename make_gibber_stanza_build_tcase to make_gibber_xmpp_stanza_tcase - - - 20070628113904-7fe3f-ee388ffdaaab323dcad6e75b25913ea24c79a443.gz - - tests/check-gibber-xmpp-stanza.c | 8 ++++---- - tests/check-gibber.h | 2 +- - tests/check-main.c | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -commit 7c20a14669f6f0d5ed435fb0ce24f595856d7f79 -Author: Guillaume Desmottes -Date: Thu Jun 28 11:34:08 2007 +0000 - - rename check-gibber-stanza-build.c to check-gibber-xmpp-stanza.c - - - 20070628113408-7fe3f-8a2482b98112f845ad957014cab31e0686287c85.gz - - tests/Makefile.am | 2 +- - tests/check-gibber-stanza-build.c | 90 ------------------------------------- - tests/check-gibber-xmpp-stanza.c | 90 +++++++++++++++++++++++++++++++++++++ - 3 files changed, 91 insertions(+), 91 deletions(-) - -commit c6a53633ce8018132fd54b07254fb835da2135d8 -Author: Emanuele Aina -Date: Fri Jun 22 12:07:14 2007 +0000 - - Ported the GibberXmppStanza test to Check - - - 20070622120714-f974e-b79026380d9091aee62db779e4387a9b7441891f.gz - - tests/Makefile.am | 15 +----- - tests/check-gibber-stanza-build.c | 90 +++++++++++++++++++++++++++++++++++++ - tests/check-gibber.h | 3 +- - tests/check-main.c | 1 + - tests/test-stanza-build.c | 88 ------------------------------------ - 5 files changed, 95 insertions(+), 102 deletions(-) - -commit 3293dc1ac4cd2263b66f63ac4701c115567f2566 -Author: Guillaume Desmottes -Date: Thu Jun 28 10:49:24 2007 +0000 - - salut_im_channel_send_stanza doesn't unref the stanza - - - 20070628104924-7fe3f-18e00ce80eaa3a739b5ff0ad9a3f93190b75421c.gz - - src/salut-im-channel.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 77255e609abaa386adfec432f46ab3d6d5dff02f -Author: Guillaume Desmottes -Date: Wed Jun 27 16:03:21 2007 +0000 - - muc-channel: fix invitation stanza leak - - - 20070627160321-7fe3f-33646b33e15e93789cc55e7659c117d37dd741f2.gz - - src/salut-muc-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 04b2a8272930838b4aefbc6eac1d571f7ccb018e -Author: Guillaume Desmottes -Date: Wed Jun 27 16:00:41 2007 +0000 - - fix sender leak in hold_unref_and_return_handles - - - 20070627160041-7fe3f-fb456f927961e089599597ff73fb6b2b7a58c1df.gz - - src/salut-connection.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 9c3796e4205b985f3aafd469a7bb188104b2187a -Author: Guillaume Desmottes -Date: Wed Jun 27 15:40:13 2007 +0000 - - xmpp writer: gibber_xmpp_writer_write_stanza: properly end the XML document if we opened it - - - 20070627154013-7fe3f-4531ab5c3ffdc7098d6a7cb10cbf53b1fbd4ae9f.gz - - lib/gibber/gibber-xmpp-writer.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 4db0dd4a9e746dd31a94fb97cb81c7ea4b70ac82 -Author: Guillaume Desmottes -Date: Wed Jun 27 15:29:50 2007 +0000 - - xmpp-reader: fix parser leak - - - 20070627152950-7fe3f-66c9308c55f88482fc97277bf40d24a9f382e6fc.gz - - lib/gibber/gibber-xmpp-reader.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 8b52e7a192ae4117708833a7f520189f945723b7 -Author: Guillaume Desmottes -Date: Wed Jun 27 15:13:23 2007 +0000 - - rewrote default alias code to make it easier to read - - - 20070627151323-7fe3f-e4658ad49daeacf51d5ddb38668d9bb62d6682ed.gz - - src/salut-self.c | 40 +++++++++++++++++----------------------- - 1 files changed, 17 insertions(+), 23 deletions(-) - -commit e2f950697304cfaef41e221bc254bea5643cc427 -Author: Guillaume Desmottes -Date: Wed Jun 27 15:13:10 2007 +0000 - - salut-self: fix alias leak - - - 20070627151310-7fe3f-6f642fe2ba8190026cc0a4302d15bb7cda21c2b4.gz - - src/salut-self.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit c4d59d614bf002e08315c09872433e9d5db1d3b5 -Author: Guillaume Desmottes -Date: Wed Jun 27 13:46:13 2007 +0000 - - fix str leak in gibber_r_multicast_packet_parse - - - 20070627134613-7fe3f-2434ae12552696c337932913a3af1c169d5db089.gz - - lib/gibber/gibber-r-multicast-packet.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit a1ff1aa8bedb1e565e669d6fff097abf601371b6 -Author: Guillaume Desmottes -Date: Wed Jun 27 11:45:29 2007 +0000 - - gibber-r-multicast-packet.c: fix name leak in gibber_r_multicast_packet_add_receiver - - - 20070627114529-7fe3f-1e3e5c2eb1d7f560376fce0daa26ece6168c93b1.gz - - lib/gibber/gibber-r-multicast-packet.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 79e700d47502dd5ea769380a5df1df42b5c3e6b9 -Author: Guillaume Desmottes -Date: Wed Jun 27 11:30:42 2007 +0000 - - salut-contact: free name, type and domain in compare_resolver - - - 20070627113042-7fe3f-3f60ba8c92a6724f2ded85ac116910eb14242bba.gz - - src/salut-contact.c | 13 +++++++++++-- - 1 files changed, 11 insertions(+), 2 deletions(-) - -commit 3ab903bf5ab8dadf69801a1d035c5a7b5160bf2c -Author: Simon McVittie -Date: Wed Jun 27 17:28:45 2007 +0000 - - SalutContactManager: whitespace - - - 20070627172845-53eee-819598b0d3b59c1e36119be6d22bd66f99b1229e.gz - - src/salut-contact-manager.c | 21 ++++++++++----------- - 1 files changed, 10 insertions(+), 11 deletions(-) - -commit 8ecfa82c2069957c679b1aff944df8b2be66c8ef -Author: Simon McVittie -Date: Wed Jun 27 17:27:25 2007 +0000 - - configure.ac: provide bug URL - - - 20070627172725-53eee-c81c26ae9a2f7158be69f2dba8018bde403a8902.gz - - configure.ac | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 0a9e1b80c085721a70ea29b40b928a4b7fa4ce0f -Author: Simon McVittie -Date: Wed Jun 27 16:45:25 2007 +0000 - - SalutMucManager: rename room_info to room_resolvers to indicate what it contains, add a comment - - - 20070627164525-53eee-2d1c08e206e5c2a92b658b4364b6892414b7e6db.gz - - src/salut-muc-manager.c | 19 ++++++++++--------- - 1 files changed, 10 insertions(+), 9 deletions(-) - -commit c74e0d6af9389bc564acd307c2ae624aa98cd68d -Author: Simon McVittie -Date: Wed Jun 27 17:12:45 2007 +0000 - - Set _olpc-activity txtvers to 0 and check for it - - - 20070627171245-53eee-f4df8080ca23348e12d84054e2b7d376b6edcc26.gz - - src/salut-contact.c | 15 +++++++++++++++ - src/salut-self.c | 2 +- - 2 files changed, 16 insertions(+), 1 deletions(-) - -commit f074471fa359fd842de404eb04051fe77fb5fd74 -Author: Simon McVittie -Date: Wed Jun 27 17:12:24 2007 +0000 - - Set _salut-room txtvers to 0 - - - 20070627171224-53eee-f3e4853d4a818c48729d000a6b8d25a5aae0a2e7.gz - - src/salut-muc-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8b249f839ea718c745c67c2dceba300239b7eb9c -Author: Simon McVittie -Date: Wed Jun 27 16:50:55 2007 +0000 - - Simplify selection of DNS record payload - - - 20070627165055-53eee-1400c8eaa767943b5220b21f2d5b21a51a2e7e78.gz - - src/salut-muc-channel.c | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -commit fcd6143b12cc1f5a0f65f67c87b9aee236fc50ba -Author: Simon McVittie -Date: Wed Jun 27 16:33:17 2007 +0000 - - salut-muc-manager, salut-muc-channel: support IPv6 using AvahiAddress functions - - - 20070627163317-53eee-bb6ad8968beddc225a11dbb2e4272dff5bcfd9a8.gz - - src/salut-muc-channel.c | 37 +++++++++++++++++++++++++++-------- - src/salut-muc-manager.c | 48 +++++++++++++++++++++------------------------- - 2 files changed, 50 insertions(+), 35 deletions(-) - -commit 78925f7ab23dc263f27dd15048c26763bedde46f -Author: Simon McVittie -Date: Wed Jun 27 15:42:00 2007 +0000 - - salut-im-manager: handles are unsigned - - - 20070627154200-53eee-9a16715a042390ca2ab4056e821dacabfc785686.gz - - src/salut-im-manager.c | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) - -commit c8257563b9a087a8f77e2c7dc4b7cc98791c02f2 -Author: Simon McVittie -Date: Wed Jun 27 15:19:23 2007 +0000 - - salut_muc_manager_factory_iface_request: reformat, treat TpHandle as unsigned - - - 20070627151923-53eee-5c2ebb82316f06cee5952d8e1c554498464f0b62.gz - - src/salut-muc-manager.c | 48 +++++++++++++++++++++++++--------------------- - 1 files changed, 26 insertions(+), 22 deletions(-) - -commit abdb219fa9c64f29ce395065e5fa76032793b770 -Author: Simon McVittie -Date: Wed Jun 27 15:19:01 2007 +0000 - - salut_muc_manager_request_new_muc_channel: reformat - - - 20070627151901-53eee-6d15e2e63b4896f673256f03f5d900a1ecf6ce05.gz - - src/salut-muc-manager.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit afc1affd331e86645ac2e168392958e724e0714f -Author: Simon McVittie -Date: Wed Jun 27 15:14:59 2007 +0000 - - salut-muc-manager: new_tubes_channel: reformat, treat TpHandle as unsigned - - - 20070627151459-53eee-211c877f4d30c337d4ddd2f5a9513db89891c086.gz - - src/salut-muc-manager.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -commit 2b1648e3e28fa8c4d1c941fcb6179b880f4251ec -Author: Simon McVittie -Date: Wed Jun 27 15:14:17 2007 +0000 - - salut_muc_manager_new_muc_channel: reformat, treat TpHandleType as unsigned - - - 20070627151417-53eee-6bc90d37833d5e0a9282f841a72669179f925554.gz - - src/salut-muc-manager.c | 45 +++++++++++++++++++++++---------------------- - 1 files changed, 23 insertions(+), 22 deletions(-) - -commit fd7807ce9762347ce3bff9d7862981bfb17d1248 -Author: Simon McVittie -Date: Wed Jun 27 14:45:04 2007 +0000 - - salut-muc-manager: _get_connection_parameters: make static, reformat - - - 20070627144504-53eee-31eaacea316370c2c409c8284d624cc1cbabac5f.gz - - src/salut-muc-manager.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit fd4d6710ca83fda5027efb9fd6fe1a773e02ed83 -Author: Simon McVittie -Date: Wed Jun 27 14:44:24 2007 +0000 - - salut-muc-manager: _get_connection: make static, reformat - - - 20070627144424-53eee-3fc1b2b95de794a96e9286f23e62b523ffa0bc17.gz - - src/salut-muc-manager.c | 13 ++++++++----- - 1 files changed, 8 insertions(+), 5 deletions(-) - -commit 6f0a01efa7da07b967da3a947d43a925398f1f17 -Author: Simon McVittie -Date: Wed Jun 27 14:43:16 2007 +0000 - - salut-muc-manager: tubes_channel_closed_cb: TpHandle is unsigned, treat it accordingly. Replace FIXME comment with the chosen resolution - - - 20070627144316-53eee-774334d2071b38eb542babf12e0bb7c25d67ca2a.gz - - src/salut-muc-manager.c | 10 ++++------ - 1 files changed, 4 insertions(+), 6 deletions(-) - -commit 2ab50444561d15eb90f9a2e74a2482547a3eafde -Author: Simon McVittie -Date: Wed Jun 27 14:39:13 2007 +0000 - - salut-muc-manager: muc_channel_closed_cb: reformat to Collabora style. Correct for unsignedness of TpHandle. - - - 20070627143913-53eee-152199a82d9cc9aefcb30684b426659ed85621f4.gz - - src/salut-muc-manager.c | 35 +++++++++++++++++++---------------- - 1 files changed, 19 insertions(+), 16 deletions(-) - -commit 98e256231ae9b205e7873ceaa5ee4ef39a3c41b7 -Author: Simon McVittie -Date: Wed Jun 27 14:33:20 2007 +0000 - - salut-connection: emit_presence_update: whitespace - - - 20070627143320-53eee-99e76a7d9e665882b93a9a75ab95060f9cf1399a.gz - - src/salut-connection.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 70126c966cfecf8d778ef8aa65913f7b0bed6118 -Author: Simon McVittie -Date: Wed Jun 27 14:32:22 2007 +0000 - - salut_contact_manager_new_channel: use Collabora coding style, use GUINT_TO_POINTER for handles - - - 20070627143222-53eee-8ff8fc3fa85975f1b546985008448b8a397d4e2e.gz - - src/salut-contact-manager.c | 38 ++++++++++++++++++++------------------ - 1 files changed, 20 insertions(+), 18 deletions(-) - -commit 3c8f568a2eb0b165baaba86627cf8461fe9e8971 -Author: Simon McVittie -Date: Wed Jun 27 14:32:02 2007 +0000 - - salut-connection: use GUINT_TO_POINTER for handles - - - 20070627143202-53eee-1c7d35cb90483bad723e07cf3fa0fc124e5fdc3a.gz - - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0dcc98f9beadbe500c01e2e475f5898b3d6b68c1 -Author: Simon McVittie -Date: Wed Jun 27 14:29:34 2007 +0000 - - salut_contact_manager_get_channel: reformat to Collabora coding style, use GUINT_TO_POINTER for handles - - - 20070627142934-53eee-45126371e1e988fe38e082bfd020b603c2910d2e.gz - - src/salut-contact-manager.c | 23 +++++++++++++---------- - 1 files changed, 13 insertions(+), 10 deletions(-) - -commit f884dcd34263909adb9a5eb3c5cab8bc65057638 -Author: Simon McVittie -Date: Wed Jun 27 14:26:53 2007 +0000 - - Rename salut_*_get_olpc_activity_properties to ..._merge_... - - - 20070627142653-53eee-6fed9bac6d4cba8cbe5a980dd044c1ac6803369a.gz - - src/salut-connection.c | 4 ++-- - src/salut-contact-manager.c | 11 ++++++----- - src/salut-contact-manager.h | 2 +- - src/salut-self.c | 10 +++++----- - src/salut-self.h | 2 +- - 5 files changed, 15 insertions(+), 14 deletions(-) - -commit 3472067527a6aa66d25a49973e2c3a664c4898a9 -Author: Simon McVittie -Date: Wed Jun 27 13:57:02 2007 +0000 - - Resolve conflict in src/Makefile.am: we've removed both tube-dbus-signals-marshal.list and salut-muc-connection-signals-marshal.list - - - 20070627135702-53eee-7ebc99f9edaa51f02d6d461250e42b1cfdc66c45.gz - - src/Makefile.am | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 3f59be55c0fe991570c5ff061344a4d59e4f50b6 -Author: Guillaume Desmottes -Date: Wed Jun 27 10:12:04 2007 +0000 - - gibber-bystream-ibb: rephrase PROP_XMPP_CONNECTION and PROP_MUC_CONNECTION description - - - 20070627101204-7fe3f-240a21b52adbccee0a29dad8532a320e1623e0a3.gz - - lib/gibber/gibber-bytestream-ibb.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit d18921b145c48481ddc4e33034a313a2adc5d692 -Author: Guillaume Desmottes -Date: Wed Jun 27 10:09:46 2007 +0000 - - salut_tubes_channel_get_handle: set the right handle type - - - 20070627100946-7fe3f-c7ead1fec730090200e0199d59335b059a60f95f.gz - - src/salut-tubes-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 455fb0e4e3e7f5dcd16c19c79f916262c2e97243 -Author: Guillaume Desmottes -Date: Wed Jun 27 10:08:37 2007 +0000 - - tubes-channel: remove not ready private tubes code - - - 20070627100837-7fe3f-82c3fb14d4b3f8f205b824053be82a84513888c9.gz - - src/salut-tubes-channel.c | 19 ------------------- - 1 files changed, 0 insertions(+), 19 deletions(-) - -commit 33dd7b0fdceeb0139adac7e080311bc7a47ee633 -Author: Guillaume Desmottes -Date: Wed Jun 27 10:05:18 2007 +0000 - - simplify generate_stream_id - - - 20070627100518-7fe3f-45ff4c5bbe4e6099ff817a0a94ff5c3ce9bdf3ca.gz - - src/salut-tubes-channel.c | 11 +++-------- - 1 files changed, 3 insertions(+), 8 deletions(-) - -commit 3a1cef055ba4938e6810b5efe6ae856d7a7751d4 -Author: Guillaume Desmottes -Date: Wed Jun 27 10:03:06 2007 +0000 - - tubes-channel: remove start_initiation as we don't use it now - - - 20070627100306-7fe3f-60910fd99088df05586c4ce4dc25a8f9a9a64619.gz - - src/salut-tubes-channel.c | 83 +------------------------------------------- - 1 files changed, 2 insertions(+), 81 deletions(-) - -commit 4b1f646b9a7cb70b280f84929d6f37ca7dda2520 -Author: Guillaume Desmottes -Date: Wed Jun 27 09:58:29 2007 +0000 - - update_tubes_info returns a boolean so caller can know if it worked fine - - - 20070627095829-7fe3f-149db30883657c0cecf45a703896fe4e4b391ecb.gz - - src/salut-tubes-channel.c | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 937cf8d20cc0b65005f4086392fc2118a81ad9dc -Author: Guillaume Desmottes -Date: Wed Jun 27 09:51:44 2007 +0000 - - tubes-channel: set the initiator in publish_tube_in_node and not in publish_tubes_in_node - - - 20070627095144-7fe3f-b511e5ea5f276a8cef1972205cddd8d9dca9e1d6.gz - - src/salut-tubes-channel.c | 29 ++++++++++++----------------- - 1 files changed, 12 insertions(+), 17 deletions(-) - -commit 9f92ce309ecd2c345ba406f61eec291f732fd0ba -Author: Guillaume Desmottes -Date: Wed Jun 27 09:42:10 2007 +0000 - - tube-dbus: we really have to check if destination != NULL to manage broadcasted messages - - - 20070627094210-7fe3f-dcf7b034dd3a0eacd25ed935bb8d32665c8f474f.gz - - src/tube-dbus.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit bc6e023c4c65999db48f1c5189cb3d8ea20f79e1 -Author: Guillaume Desmottes -Date: Wed Jun 27 09:35:59 2007 +0000 - - publish_tube_in_node: set stream-id instead of stream_id as attribute to be more consistent - - - 20070627093559-7fe3f-f63d6cd411b44f27171b72ce020b923c805f1a2f.gz - - src/salut-tubes-channel.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 3d91b7543afe5515457769deff8e69bf95e36ac9 -Author: Guillaume Desmottes -Date: Wed Jun 27 09:28:38 2007 +0000 - - tubes-channel: extract_tube_information have to check the value of this initiator_handle and not the pointer - - - 20070627092838-7fe3f-8f00b5a82fc534378f0ff509ab6668afd54a9f70.gz - - src/salut-tubes-channel.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 76c5dab37351d42404a7d980a7df2c512f3d3d89 -Author: Guillaume Desmottes -Date: Wed Jun 27 09:25:03 2007 +0000 - - tubes-channel: extract_tube_information: check if tube id is numeric - - - 20070627092503-7fe3f-e8953541a73ad2d57596ac414a5231cbb132bb77.gz - - src/salut-tubes-channel.c | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -commit 9ae96cecc31ece867bf314fb68d19461338419fe -Author: Guillaume Desmottes -Date: Wed Jun 27 09:05:42 2007 +0000 - - tubes-channel: Unknow -> Unknown - - - 20070627090542-7fe3f-65079e008927fbcf3c8856092cf505ae452e3902.gz - - src/salut-tubes-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a8038c20ca57a26eff560a105710c0d8f2c8f7a8 -Author: Guillaume Desmottes -Date: Wed Jun 27 08:56:55 2007 +0000 - - rename SalutMucChannel property from "muc connection" to "muc-connection" - - - 20070627085655-7fe3f-7d847ab58da3e28b0e65b7e7e43c35c0aff4e6d8.gz - - src/salut-muc-channel.c | 10 +++++----- - src/salut-tubes-channel.c | 4 ++-- - 2 files changed, 7 insertions(+), 7 deletions(-) - -commit d205a0f7f90f9d7a134d5b97fefbca1df4dbe4f8 -Author: Guillaume Desmottes -Date: Wed Jun 27 08:47:51 2007 +0000 - - don't generate and build tube-dbus-signals-marshal.[ch] - - - 20070627084751-7fe3f-b1a46a34fea9892fc1be242a429540d2e87afcbc.gz - - src/Makefile.am | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 4afe03cf80dacd191380f5dfcabec0a61f7d4aca -Author: Guillaume Desmottes -Date: Wed Jun 27 08:47:35 2007 +0000 - - remove tube-dbus-signals-marshal.list - - - 20070627084735-7fe3f-ac3018d2529b6679c651b26f0dfc1db23ae22cfb.gz - - src/tube-dbus-signals-marshal.list | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit f8cfdf35833c6504f5778d0387f93b56398c54bc -Author: Guillaume Desmottes -Date: Wed Jun 27 08:45:29 2007 +0000 - - tube-dbus.c: directly use g_cclosure_marshal_VOID__VOID instead of our own marshaller - - - 20070627084529-7fe3f-461fe280ecc7962cbde2709620685cb241a85cb0.gz - - src/tube-dbus.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 23f74c26236baf249d713a042d3984335835d052 -Author: Guillaume Desmottes -Date: Wed Jun 27 08:41:47 2007 +0000 - - intented > intended - - - 20070627084147-7fe3f-c1e12f275b5c4c3f58595f487873144db624f2f3.gz - - src/tube-dbus.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 14e90d28bdcdb55bbf5dd92c7553fe23e898219d -Author: Guillaume Desmottes -Date: Wed Jun 27 08:38:35 2007 +0000 - - tube-dbus: remove useless dbus_message_get_destination extra calls - - - 20070627083835-7fe3f-0c95290bb980906baab6f177db9251b8172f5efc.gz - - src/tube-dbus.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 4f71399f510744703e7c2b55f568c001cf7fa823 -Author: Guillaume Desmottes -Date: Wed Jun 27 08:35:46 2007 +0000 - - tube-dbus: rewrite PROP_MUC_CONNECTION description - - - 20070627083546-7fe3f-25398c56115738c687f11d3c2be3a7299de9a572.gz - - src/tube-dbus.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 5705829b9c20cf851c7985e169428d93cbe3789a -Author: Guillaume Desmottes -Date: Wed Jun 27 08:29:58 2007 +0000 - - tube-dbus.c: set bytestream state in a variable to avoid double g_object_new - - - 20070627082958-7fe3f-c77af90a4c0af3863e5762160ac9f5f1c5e196a2.gz - - src/tube-dbus.c | 29 ++++++++++++----------------- - 1 files changed, 12 insertions(+), 17 deletions(-) - -commit 2801498a83cd472a7eb2218b53d918eb0545bf7f -Author: Sjoerd Simons -Date: Tue Jun 26 20:35:50 2007 +0000 - - Remove salut-muc-connection-signals-marshal.list from makefile.am which accidentally disappeared - - - 20070626203550-93b9a-5109dc6c1800cc24e437a08e8551529e7f9079b6.gz - - src/Makefile.am | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 71f3e802f9dca672a3600bf2f936fd6dcaecd87d -Author: Guillaume Desmottes -Date: Tue Jun 26 15:45:50 2007 +0000 - - salut-tubes-channel.c: when a contact left the muc, remove him from all tubes - - - 20070626154550-7fe3f-01b050cee5059b940c4b04790b244f2b3fec1a23.gz - - src/salut-tubes-channel.c | 39 +++++++++++++++++++++++++++++++++++++++ - 1 files changed, 39 insertions(+), 0 deletions(-) - -commit 47ff43febe9bfdc38a1d807c9a44366d4bd75a1e -Author: Guillaume Desmottes -Date: Tue Jun 26 15:11:57 2007 +0000 - - remove unwanted double space - - - 20070626151157-7fe3f-6b9a04d03ca30cd54329c79d778c24796a4a1600.gz - - src/tube-dbus.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d288b70ef7415617e652dbaada30afe9f249ca90 -Author: Guillaume Desmottes -Date: Tue Jun 26 15:07:53 2007 +0000 - - tube-dbus.c: pass the contact_repo to unref_handle_foreach instead of the tube object - - - 20070626150753-7fe3f-790115bce80771083c9abb9666f56accf0784197.gz - - src/tube-dbus.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 542fd0d6db881f2379cdcc6fee4aea91d061e22f -Author: Guillaume Desmottes -Date: Tue Jun 26 14:51:46 2007 +0000 - - salut-connection: don't include salut-tubes-manager.h - - - 20070626145146-7fe3f-5c445802e663a1a56756b572a5b8d69d42ad9201.gz - - src/salut-connection.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 50467330458686592f727fe52ca35d1fbba2e199 -Author: Guillaume Desmottes -Date: Tue Jun 26 14:38:00 2007 +0000 - - don't build salut-tubes-manager.c as we don't use it - - - 20070626143800-7fe3f-e6847c6971da9632e0ef0f4aabd53eca362efd5f.gz - - src/Makefile.am | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 86ea3089579f9db0b21d7b0c53cba9cecb37f013 -Author: Guillaume Desmottes -Date: Tue Jun 26 14:31:53 2007 +0000 - - tubes-channel.c: don't use // comments - - - 20070626143153-7fe3f-aacbeca6f4b29c9037ec60aeac212362962216c9.gz - - src/salut-tubes-channel.c | 11 +++++++---- - 1 files changed, 7 insertions(+), 4 deletions(-) - -commit a6f47b0ce5679a282625e2130c04df6916743bab -Author: Guillaume Desmottes -Date: Tue Jun 26 14:29:58 2007 +0000 - - salut-connection: don't use // comments - - - 20070626142958-7fe3f-1266648654da6fd63e7939b0ad408d0664ebb342.gz - - src/salut-connection.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 7b47d379562415e3286ed666a4c1db52caf1f89b -Author: Guillaume Desmottes -Date: Tue Jun 26 14:26:08 2007 +0000 - - salut-muc-manager.c: fix typo in comment in salut_muc_manager_factory_iface_request - - - 20070626142608-7fe3f-b16618e29d21f88cd18c359d5c0f333882e5b332.gz - - src/salut-muc-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c39ea1185e8e65578718ee28da590716c06480d1 -Author: Guillaume Desmottes -Date: Tue Jun 26 14:23:59 2007 +0000 - - salut_muc_manager_factory_iface_foreach iterates on tubes hash table too - - - 20070626142359-7fe3f-b126831b0bb816abecdfc8052c6f019d0a2ba3a2.gz - - src/salut-muc-manager.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 07d9996671b302de58b6712a918fad90e93c3cb1 -Author: Guillaume Desmottes -Date: Tue Jun 26 14:10:35 2007 +0000 - - tube-dbus.c: set priv->muc_connection to NULL after we unrefed it - - - 20070626141035-7fe3f-b77ac10471c0c623d1194b0d75371e438119d2ab.gz - - src/tube-dbus.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 4b321327002c95e669fb29ac994ed8a1f836a348 -Author: Guillaume Desmottes -Date: Tue Jun 26 14:09:52 2007 +0000 - - salut-tubes-channel.c: disconnect signals and unref the muc connection when disposing - - - 20070626140952-7fe3f-da7936e1446c3a57613d1829ac7dce31a8260152.gz - - src/salut-tubes-channel.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit fa7cb7afd54c3929e2fa87ac7085ca3642331f1a -Author: Guillaume Desmottes -Date: Tue Jun 26 13:34:38 2007 +0000 - - tube-dbus: ref the muc-connection - - - 20070626133438-7fe3f-4084576d9065a2314f465a7b4330f8479ee557be.gz - - src/salut-tubes-channel.c | 7 ++++--- - src/tube-dbus.c | 6 ++++++ - 2 files changed, 10 insertions(+), 3 deletions(-) - -commit fc7376f3d22eb9e42378de69b81b4d9aa7cc697b -Author: Guillaume Desmottes -Date: Tue Jun 26 12:52:43 2007 +0000 - - disable the tubes manager as private tubes aren't working anyway - - - 20070626125243-7fe3f-d4564a4eb918cfca55271b58d37a44750a1d18ca.gz - - src/salut-connection.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 615730abc300a897f9637fd3c85f844003536209 -Author: Simon McVittie -Date: Tue Jun 26 13:00:29 2007 +0000 - - Recognise NULL activity/room (i.e. no =) as being the same as "" - - - 20070626130029-53eee-06d78cf93fdafc0c979169452357056153ae35ad.gz - - src/salut-contact.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 39dc33ea97532e72fed65bcaa61ae6c56bdeffae -Author: Simon McVittie -Date: Tue Jun 26 12:56:17 2007 +0000 - - Pass NULL for key to avahi_string_list_get_pair when we don't want it anyway. - - Also use char * rather than gchar * for strings that should be freed with - avahi_free(), and narrow the scope of some variables. - - 20070626125617-53eee-da4a7a807b4550c864b7610bde238efeee78e8de.gz - - src/salut-contact.c | 59 +++++++++++++++++--------------------------------- - 1 files changed, 20 insertions(+), 39 deletions(-) - -commit 98daef16dca01a8dfc175fe67f67caac0f7587ea -Author: Simon McVittie -Date: Tue Jun 26 12:48:02 2007 +0000 - - Fix some contact ref leaks - - - 20070626124802-53eee-be92d42679993a9021467ded7d75ded06fbb3d75.gz - - src/salut-connection.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit f555193d6f547f788e12dda32aa74cb098076156 -Author: Simon McVittie -Date: Tue Jun 26 12:45:41 2007 +0000 - - Remove comment which is no longer true - - - 20070626124541-53eee-6fc44e1c2645f67c02f1e7f161120875787d83ca.gz - - src/salut-connection.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 86da6500cf70de41f7d80c299b0ee77d65d63942 -Author: Simon McVittie -Date: Tue Jun 26 01:47:50 2007 +0000 - - Don't build SalutContactActivity code unless ENABLE_OLPC - - - 20070626014750-53eee-228bb016f1bef751cf2a604914f42a8362ec7d71.gz - - src/salut-contact.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit aa7f4128cfcb5ca34212010c30c829ea1996c45a -Author: Simon McVittie -Date: Tue Jun 26 01:47:05 2007 +0000 - - Don't try to hook activity resolved callback unless ENABLE_OLPC - - - 20070626014705-53eee-9aabe5fae2a4c3c78be250fe185cc2f4fe319564.gz - - src/salut-contact.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit cc1a138e598345d4b3edf2fc9c8a05d8decff6a6 -Author: Simon McVittie -Date: Tue Jun 26 01:45:25 2007 +0000 - - Don't build activity_new and activity_unref unless ENABLE_OLPC - - - 20070626014525-53eee-a08f1944d5058603ac3f720599090e9a51dd5230.gz - - src/salut-contact-manager.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 2617220f2d86ec88c49159e1504bf61df67c16c5 -Author: Simon McVittie -Date: Tue Jun 26 00:52:47 2007 +0000 - - Merge -tubes and -publish branches - - - 20070626005247-53eee-6ac648ee662a7333e07225b2c1eb3a1ac82f2b2f.gz - - src/salut-muc-manager.c | 206 ++++++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 193 insertions(+), 13 deletions(-) - -commit b26547199ffb1e215b19f92e9dd408b0309a368d -Author: Guillaume Desmottes -Date: Mon Jun 25 18:23:06 2007 +0000 - - tubes-channel: changes to fit "old" tube API - - - 20070625182306-7fe3f-a404fecc4c69ffc7590faf3635323e010e76428c.gz - - src/salut-tubes-channel.c | 45 ++++++++++++++++++++++++++++++++------------- - 1 files changed, 32 insertions(+), 13 deletions(-) - -commit a899175d84f860f7d39f180e31cef352473a991c -Author: Guillaume Desmottes -Date: Mon Jun 25 15:37:56 2007 +0000 - - tube-dbus.c: properly initiate the bytestream when we create it the local pending state - - - 20070625153756-7fe3f-2dfcbbcad363b7bd04bb90f0b98f04f5e8c1c441.gz - - src/tube-dbus.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 2e5a7ce8b8a5efd6af5d581fd0fedb930aaa3eb7 -Author: Guillaume Desmottes -Date: Fri Jun 22 13:58:29 2007 +0000 - - add tube-iface.[ch] - - - 20070622135829-7fe3f-97faceea183a749388a153c614f995e4ede9ebab.gz - - src/tube-iface.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/tube-iface.h | 66 +++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 141 insertions(+), 0 deletions(-) - -commit b17e3bc100c715a92e2d8b772359fdd194f523d6 -Author: Guillaume Desmottes -Date: Fri Jun 22 13:52:23 2007 +0000 - - add salut-tubes-channel.[ch] - - - 20070622135223-7fe3f-696f55a8d76e82ea3fc03a2086cf56d4e8ab10e4.gz - - src/salut-tubes-channel.c | 1912 +++++++++++++++++++++++++++++++++++++++++++++ - src/salut-tubes-channel.h | 69 ++ - 2 files changed, 1981 insertions(+), 0 deletions(-) - -commit 2e6b837d3f27390de679b506864ccb5fa688ca70 -Author: Guillaume Desmottes -Date: Fri Jun 22 13:49:10 2007 +0000 - - add tube-dbus.[ch] and tube-dbus-signals-marshal.list - - - 20070622134910-7fe3f-83fb81d9497b57532d083cd6f309b9e8983e2af7.gz - - src/tube-dbus-signals-marshal.list | 1 + - src/tube-dbus.c | 1031 ++++++++++++++++++++++++++++++++++++ - src/tube-dbus.h | 70 +++ - 3 files changed, 1102 insertions(+), 0 deletions(-) - -commit f0ab4d11cea3e8792b2c9cd2e8eff18b89ea54b4 -Author: Guillaume Desmottes -Date: Fri Jun 22 13:44:44 2007 +0000 - - add gibber-bytestream-ibb.[ch] - - - 20070622134444-7fe3f-24065ba089eab1e1c260a0a2185d6f3a738fbc1e.gz - - lib/gibber/gibber-bytestream-ibb.c | 730 ++++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-bytestream-ibb.h | 98 +++++ - 2 files changed, 828 insertions(+), 0 deletions(-) - -commit c26773f86417639a36e6bd1f81a03b8ae99be6d0 -Author: Guillaume Desmottes -Date: Fri Jun 22 13:38:41 2007 +0000 - - add gibber-bytestream-ibb-signals-marshal.list - - - 20070622133841-7fe3f-8e586a828c0b679f2c76596dfe86086911852321.gz - - .../gibber-bytestream-ibb-signals-marshal.list | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 4097f6baad80144d190601bb2bd72fdfb3e0f9f2 -Author: Guillaume Desmottes -Date: Wed Jun 20 16:11:39 2007 +0000 - - muc-manager: no need to remove twice the same channel when closing it - - - 20070620161139-7fe3f-fa015e5fe75a980191fe6005a9b380ecff5ae984.gz - - src/salut-muc-manager.c | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit bd5446cab1acbf164bbc742f4ad827e1ff0a3f74 -Author: Guillaume Desmottes -Date: Wed Jun 20 09:29:58 2007 +0000 - - instantiate the tubes manager - - - 20070620092958-7fe3f-66a180415c0789c83308a3df7aecf7118ca21cf4.gz - - src/salut-connection.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 8c07dba51d31c6184f1ec5e468fd3a2d0a79f4eb -Author: Guillaume Desmottes -Date: Wed Jun 20 09:29:40 2007 +0000 - - build tube support - - - 20070620092940-7fe3f-c849b6e31079c130460bd7766951b734ed6094c3.gz - - src/Makefile.am | 16 ++++++++++++++-- - 1 files changed, 14 insertions(+), 2 deletions(-) - -commit e947e37069b65c831f4f9bac6dcd60ac8eb5dd1c -Author: Guillaume Desmottes -Date: Wed Jun 20 09:29:00 2007 +0000 - - build GibberBytestreamIBB - - - 20070620092900-7fe3f-349091ce378d98ae8763e22dcb775c67aa8c2082.gz - - lib/gibber/Makefile.am | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit a553ffc7eeb305988d525c398ec3d9dc9ec94696 -Author: Guillaume Desmottes -Date: Fri Jun 15 15:14:41 2007 +0000 - - resolve conflicts in salut-muc-manager.c - - - 20070615151441-7fe3f-552aa74907c3aa9bf2b4dc7c6e6b626540495644.gz - - src/salut-muc-manager.c | 48 +++++++++++++++++++++++++++++++--------------- - 1 files changed, 32 insertions(+), 16 deletions(-) - -commit cbf463081b59259f014752fcaefe08c9f842bc52 -Author: Guillaume Desmottes -Date: Fri Jun 15 15:06:26 2007 +0000 - - make Salut link on telepathy-glib-unstable - - - 20070615150626-7fe3f-38250f12280ae1fc213a4c5ff97fb969b44b371b.gz - - src/Makefile.am | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit ae26d08815af3cbaa899298ba521cd63d8d04a84 -Author: Guillaume Desmottes -Date: Fri Jun 15 11:55:34 2007 +0000 - - gibber-namespaces.h: add tubes NS - - - 20070615115534-7fe3f-bc808f4784fbc66fb160f25de84058a26800d4ea.gz - - lib/gibber/gibber-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 9c34f478769d8041b66178082c16063c27d024e5 -Author: Guillaume Desmottes -Date: Wed Jun 13 17:10:56 2007 +0000 - - add IBB and AMP NS - - - 20070613171056-7fe3f-42a9b52794f2a1ddab3aec7d9e65c68fc4f1c5f9.gz - - lib/gibber/gibber-namespaces.h | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit d3d700d7652f078beaeae1852ef2160c3b1b831a -Author: Guillaume Desmottes -Date: Wed Jun 13 13:54:46 2007 +0000 - - salut-muc-manager.c: add muc tubes support - - - 20070613135446-7fe3f-c434fd2ba0482d5b9cd2fda602783310fea5fa31.gz - - src/salut-muc-manager.c | 181 +++++++++++++++++++---------------------------- - 1 files changed, 72 insertions(+), 109 deletions(-) - -commit 38ff041716e28ca8741b4c77c012f3e484fbc827 -Author: Guillaume Desmottes -Date: Wed Jun 13 11:24:50 2007 +0000 - - salut-muc-manager: rename priv->channels to priv->text_channels - - - 20070613112450-7fe3f-19253cf199fa35861bc486d1c3f9837587d84967.gz - - src/salut-muc-manager.c | 41 ++++++++++++++++++++--------------------- - 1 files changed, 20 insertions(+), 21 deletions(-) - -commit e5fe59d9d3641e5b55ce80564782a16567303e8c -Author: Guillaume Desmottes -Date: Wed Jun 13 09:21:29 2007 +0000 - - resolve conflicts - - - 20070613092129-7fe3f-2b6baa02dcd135f33a8f7b8a9c02d8453d962d23.gz - - lib/gibber/gibber-debug.c | 2 ++ - lib/gibber/gibber-debug.h | 3 +++ - 2 files changed, 5 insertions(+), 0 deletions(-) - -commit e6b0bd3e701fb3d074cfdd41103ddf185041b045 -Author: Guillaume Desmottes -Date: Mon Jun 11 14:22:49 2007 +0000 - - add bytestream debug flag in salut debug - - - 20070611142249-7fe3f-4853be583b3ab86ea67005ecbb9f73d45c1a3bf9.gz - - src/debug.c | 1 + - src/debug.h | 3 ++- - 2 files changed, 3 insertions(+), 1 deletions(-) - -commit 8bd339c8d69f6814fed59536d6cbfdee96f49aee -Author: Guillaume Desmottes -Date: Mon Jun 11 10:14:31 2007 +0000 - - add bytestream flag in gibber-debug - - - 20070611101431-7fe3f-d1f9d74df54bc1e246ab75826b931d6bd9695999.gz - - lib/gibber/gibber-debug.c | 1 - - lib/gibber/gibber-debug.h | 1 - - 2 files changed, 0 insertions(+), 2 deletions(-) - -commit 0ed40c5ada725f69d9a57908cc459cd8f1e50bfb -Author: Guillaume Desmottes -Date: Thu Jun 7 14:16:37 2007 +0000 - - add a tube debug flag - - - 20070607141637-7fe3f-11bb2bdaea985b530e39b1aa65bcc6dbc8f920dd.gz - - src/debug.c | 1 + - src/debug.h | 3 ++- - 2 files changed, 3 insertions(+), 1 deletions(-) - -commit b535fad91e784bdbc4d4fe1fa85e0d0628522181 -Author: Guillaume Desmottes -Date: Thu Jun 7 14:15:56 2007 +0000 - - add telepathy-glib-unstable C and LIBS flags when building - - - 20070607141556-7fe3f-52c503901ce789a156c4d46167c6210843c074ab.gz - - src/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 6a87f8973efabf2de23fa42210d7e232cfc5b419 -Author: Guillaume Desmottes -Date: Thu Jun 7 14:11:34 2007 +0000 - - configure.ac: check fo telepathy-glib-unstable - - - 20070607141134-7fe3f-8878d6e532ac03c5559d3cf17d50eef78e3af781.gz - - configure.ac | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit f1a2897d0b0775fe77ee86d6867f464571910562 -Author: Simon McVittie -Date: Tue Jun 26 01:00:40 2007 +0000 - - Correctly return handle type ROOM from GetHandle() on MUC channels - - - 20070626010040-53eee-8b68170ea2130bee506fa0fffac9c30c761d4d3b.gz - - src/salut-muc-channel.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 3277fc2a74eb7e13a6d089c84b6f8dd77632efaf -Author: Simon McVittie -Date: Tue Jun 26 00:30:09 2007 +0000 - - Implement activity properties and activity advertisement - - - 20070626003009-53eee-e2e4b71540baab65936fa34a837814605a3c1898.gz - - src/salut-connection.c | 302 ++++++++++++++++++++++++++++++-- - src/salut-contact-manager.c | 279 +++++++++++++++++++++++++++-- - src/salut-contact-manager.h | 8 + - src/salut-contact-signals-marshal.list | 1 + - src/salut-contact.c | 250 +++++++++++++++++++++++++-- - src/salut-contact.h | 11 +- - src/salut-self.c | 220 +++++++++++++++++++---- - src/salut-self.h | 16 ++- - 8 files changed, 1006 insertions(+), 81 deletions(-) - -commit dbc2e4f31d893ee39d67e39f6d453396534c114f -Author: Simon McVittie -Date: Mon Jun 25 14:20:02 2007 +0000 - - Correct sense of assertions in salut_self_add_olpc_activity - - - 20070625142002-53eee-dc134fc1bcee2ca4e1e8d1e468ba71d1319b77d2.gz - - src/salut-self.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit f3b28aad56f280a12a416fdcbc76053ea5c23a8b -Author: Simon McVittie -Date: Mon Jun 25 14:15:23 2007 +0000 - - Correct sense of return from salut_self_set_olpc_activities - - - 20070625141523-53eee-f130d85ed269dd2233156dcf92bd03f1e685d98f.gz - - src/salut-self.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit adba3211129b90a9597ab5cac0909080cc1225f3 -Author: Simon McVittie -Date: Mon Jun 25 14:10:06 2007 +0000 - - Fix name of dbus_g_method_return_error (not dbus_g_return_error) - - - 20070625141006-53eee-e130639817e4f72042e94fe6b3c79a6937d60308.gz - - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4220b8fc04f5e216c0c0c6968364106b5e632ee0 -Author: Simon McVittie -Date: Mon Jun 25 14:09:04 2007 +0000 - - Fix debug message - - - 20070625140904-53eee-c8cbdec57ba82daa25ee9f2f59727f26c848a66d.gz - - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 75b0f6880f02aa6887cc511337fba4f962e4f1e1 -Author: Simon McVittie -Date: Mon Jun 25 14:02:12 2007 +0000 - - Add support for OLPC SetActivities, SetCurrentActivity and GetCurrentActivity, along with stub for GetActivities - - - 20070625140212-53eee-8488e35f461962d5a8770833cf42ae24ab0a3b8b.gz - - src/salut-connection.c | 196 +++++++++++++++++++++++++++++++- - src/salut-contact-manager.c | 4 +- - src/salut-contact.c | 105 +++++++++++++++++- - src/salut-contact.h | 9 +- - src/salut-self.c | 268 +++++++++++++++++++++++++++++++++++++++++++ - src/salut-self.h | 20 +++- - 6 files changed, 594 insertions(+), 8 deletions(-) - -commit 6a20b9e0c8fd120c4e55d4e8a9407aab5f0fffea -Author: Simon McVittie -Date: Mon Jun 25 14:01:32 2007 +0000 - - GetBuddyProperties: use stack-allocated GError - - - 20070625140132-53eee-fe6288393515e999364653c327fe8ab103a09cbd.gz - - src/salut-connection.c | 9 ++++----- - 1 files changed, 4 insertions(+), 5 deletions(-) - -commit 2fdab47145d249a7a378dd8fc108a8863a387652 -Author: Guillaume Desmottes -Date: Fri Jun 22 11:15:29 2007 +0000 - - add comments about DNS record - - - 20070622111529-7fe3f-7a002a45c9d4e8dea2b4977c48e2afc004c25cd8.gz - - src/salut-muc-channel.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit e882baa14f93b63561dbd36cf1b598260e997f2e -Author: Guillaume Desmottes -Date: Thu Jun 21 12:15:46 2007 +0000 - - salut-muc-manager.c: try to use announced address/port when we request a muc channel - - - 20070621121546-7fe3f-68ebc3cab47d2c2b470af68f745d93dcd11fa520.gz - - src/salut-muc-manager.c | 173 +++++++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 167 insertions(+), 6 deletions(-) - -commit 5668b45353152d80be20303fd76766a8d4bf84c7 -Author: Guillaume Desmottes -Date: Thu Jun 21 08:35:03 2007 +0000 - - muc_channel_publish_service: properly destroy the muc_group if error - - - 20070621083503-7fe3f-ce39983764da2489a3137a065cbd4a502dd3327c.gz - - src/salut-muc-channel.c | 47 +++++++++++++++++++++++++++++------------------ - 1 files changed, 29 insertions(+), 18 deletions(-) - -commit 4515adfc665c0564d9fdf8ec6e5adae6a10a903c -Author: Guillaume Desmottes -Date: Wed Jun 20 16:33:04 2007 +0000 - - salut-muc-manager: add priv->client to store the AvahiClient and the method salut_muc_manager_start (re-recorded) - - - 20070620163304-7fe3f-51715729be1360d772953caad18538ada1f35094.gz - - src/salut-muc-manager.c | 23 +++++++++++++++++++++++ - src/salut-muc-manager.h | 5 +++++ - 2 files changed, 28 insertions(+), 0 deletions(-) - -commit 9c39c7fd7a0c7ed83bb49a3b33866c329822c4f1 -Author: Guillaume Desmottes -Date: Wed Jun 20 16:11:04 2007 +0000 - - muc-channel: unref the entry group when destroying the channel - - - 20070620161104-7fe3f-e280614a1d84ae8c4718bebbbe032760cb6b4fd7.gz - - src/salut-muc-channel.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 288550fa4fcd2ba717ffbd9199afdbbf92c221d8 -Author: Guillaume Desmottes -Date: Wed Jun 20 14:06:20 2007 +0000 - - muc-channel: publish the muc service when we join it - - - 20070620140620-7fe3f-b66e231417b2397c59359a320dfc8cab9cd90d84.gz - - src/salut-muc-channel.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 93 insertions(+), 0 deletions(-) - -commit 8241851cee73e52e811aadffa2166554a7f43fb5 -Author: Guillaume Desmottes -Date: Wed Jun 20 10:26:53 2007 +0000 - - salut-muc-channel: add a "client" property containing the SalutAvahiClient - - - 20070620102653-7fe3f-31c96de2345dcb1a886c809feb02df7d139bd76a.gz - - src/salut-muc-channel.c | 23 +++++++++++++++++++++++ - src/salut-muc-manager.c | 1 + - 2 files changed, 24 insertions(+), 0 deletions(-) - -commit 3150b6c864e3338df695b1d7806f10473b603eb6 -Author: Guillaume Desmottes -Date: Wed Jun 20 10:26:14 2007 +0000 - - salut-connection: call salut_muc_manager_start - - - 20070620102614-7fe3f-fc85cd01a4615608866ae78104c0c66b7044a5d6.gz - - src/salut-connection.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit b881020058217df21e8e9fe062ae7bae0f90bc53 -Author: Sjoerd Simons -Date: Tue Jun 26 21:14:36 2007 +0000 - - Add the check_SCRIPTS to EXTRA_DIST, so run-xmpp-connection-test.sh is included in the dist tarball - - - 20070626211436-93b9a-6ed85bcfefcf68b9584432e331566f3fd3e327cd.gz - - tests/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d1312a7f18cfeb25b487eabf596703d11c020e29 -Author: Sjoerd Simons -Date: Tue Jun 26 20:51:04 2007 +0000 - - Add check-salut.h to the check_main _SOURCES - - - 20070626205104-93b9a-9906919573cc916e2b8e4fee8f22e89c24bed5a5.gz - - tests/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 934f1b532ae3648dda2be043914ccba719d796ed -Author: Guillaume Desmottes -Date: Tue Jun 26 13:44:59 2007 +0000 - - salut-muc-channel.c: disconnect muc connection signals when disposing the channel - - - 20070626134459-7fe3f-586a3e3a061eb79d159e54e7739d04cb5cb93e94.gz - - src/salut-muc-channel.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 2391a5de7da32ec74b5051c18dd4fe71f0fc4645 -Author: Sjoerd Simons -Date: Tue Jun 26 12:55:47 2007 +0000 - - Missed one DATA_RECEIVED to RECEIVED_DATA change - - - 20070626125547-93b9a-c298d949e1f88c2a3bac46837e89c7a0f768c4f2.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 946f3dc60888f17b6330686d0534bab193be3524 -Author: Sjoerd Simons -Date: Tue Jun 26 10:15:08 2007 +0000 - - Unref the hash table in dispose instead of ref - - - 20070626101508-b58c9-5787f10423f19c8a4a45ae4ee606fb62be03651d.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a14a77e47267f38f231a3a49a431da4c2914e4fd -Author: Sjoerd Simons -Date: Tue Jun 26 10:14:25 2007 +0000 - - Add comment to the hash table about what key, value's it has - - - 20070626101425-b58c9-e810f3e801502179b9a9ec5cc1966c764b0df398.gz - - lib/gibber/gibber-r-multicast-sender.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 886abff75c9d74038a21605af33c528ff464d91a -Author: Sjoerd Simons -Date: Tue Jun 26 09:42:14 2007 +0000 - - Fix conflicts - - - 20070626094214-b58c9-2bcce1566adc1e89a23cbabae30c5af02b91cd3b.gz - - lib/gibber/gibber-r-multicast-sender.c | 15 +++++++++++++-- - 1 files changed, 13 insertions(+), 2 deletions(-) - -commit 2fbf01f1247e2830cec9a37fe4fa7f888a544ec7 -Author: Sjoerd Simons -Date: Tue Jun 26 09:33:13 2007 +0000 - - Add initial causal ordering support - - - 20070626093313-b58c9-55ca70e29aed3c0ccb25d82b16c305d6653db7d1.gz - - lib/gibber/gibber-r-multicast-sender.c | 214 +++++++++++++++------------- - lib/gibber/gibber-r-multicast-sender.h | 9 +- - lib/gibber/gibber-r-multicast-transport.c | 60 +++++++- - tests/check-gibber-r-multicast-sender.c | 23 +++- - tests/check-gibber-r-multicast-transport.c | 2 +- - 5 files changed, 193 insertions(+), 115 deletions(-) - -commit a3684b7221ce6af0b076f9ac45277941410b2e51 -Author: Sjoerd Simons -Date: Tue Jun 26 09:32:47 2007 +0000 - - Test with 3 senders instead of two - - - 20070626093247-b58c9-ac917962ed67e9e766d6e55fdf1c69ae8ff1ab3e.gz - - tests/causalorderingtest.py | 35 ++++++++++++++++++++++++++--------- - 1 files changed, 26 insertions(+), 9 deletions(-) - -commit f67fb76ba4a4708fd5929d1beb7df671b45cc910 -Author: Sjoerd Simons -Date: Tue Jun 26 09:30:29 2007 +0000 - - Add a utility function to add MeshNode objects directly - - - 20070626093029-b58c9-f6ccc5c38bf9747775b51d9a35ae9a72d6d4c127.gz - - tests/mesh.py | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit cedec5196b7d7504092671040f0df722a21fd34f -Author: Sjoerd Simons -Date: Tue Jun 26 09:29:58 2007 +0000 - - Add an overriddable UnknownOutput function - - - 20070626092958-b58c9-f23cc2440bf9e14a1da1d6ca00862cf026300092.gz - - tests/mesh.py | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit c67428a47c44320fbfc4d9380de65c512e0b2295 -Author: Sjoerd Simons -Date: Mon Jun 25 15:15:45 2007 +0000 - - rename data-received to received-data for more consistency - - - 20070625151545-93b9a-74eced51ef4f5b09713339bd92f8a8526eef3e74.gz - - lib/gibber/gibber-r-multicast-sender.c | 8 ++++---- - lib/gibber/gibber-r-multicast-transport.c | 2 +- - tests/check-gibber-r-multicast-sender.c | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -commit e7c1dfff90790c4baec9e0d18d93dbe96248c2f0 -Author: Sjoerd Simons -Date: Mon Jun 25 15:01:44 2007 +0000 - - Add stream_id to the RECEIVED_DATA signal - - - 20070625150144-93b9a-f59609e95f725d83da61006953d948291b33b573.gz - - lib/gibber/gibber-muc-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 5ce8fb77eddada86f8d695afc67b27701e7be7c2 -Author: Sjoerd Simons -Date: Mon Jun 25 15:01:25 2007 +0000 - - Use GIBBER_R_MULTICAST_DEFAULT_STREAM - - - 20070625150125-93b9a-c3870ee5e3e3c12cb2cc71fb214db6367fe6eadf.gz - - lib/gibber/gibber-muc-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bfe507fdaed1bb46a5196b19a3b8a63ba86563d8 -Author: Sjoerd Simons -Date: Mon Jun 25 14:20:17 2007 +0000 - - Add default stream define and use that for more code readability - - - 20070625142017-93b9a-c1dab3ac0da757486b5e98651546f459640a9136.gz - - lib/gibber/gibber-muc-connection.c | 5 +++-- - lib/gibber/gibber-r-multicast-transport.c | 4 +++- - lib/gibber/gibber-r-multicast-transport.h | 2 ++ - 3 files changed, 8 insertions(+), 3 deletions(-) - -commit d7c11aadc7edca6ee88b6790dd30630d7eb29d3b -Author: Sjoerd Simons -Date: Mon Jun 25 14:18:37 2007 +0000 - - data-received marshaller - - - 20070625141837-93b9a-5379e7bebb0d14d42ea3981900de6638899e0550.gz - - lib/gibber/gibber-r-multicast-sender.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9e2aff5eeb7226c27be662f26fce1d47f27c2fb8 -Author: Sjoerd Simons -Date: Fri Jun 22 23:50:01 2007 +0000 - - Add tests for the stream id - - - 20070622235001-b58c9-c26a313f3325d85352ce22858b0b510ccfacfb6e.gz - - tests/check-gibber-r-multicast-sender.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit dabe8ed81feefd8bf48029b82e6857ab860bbec5 -Author: Sjoerd Simons -Date: Fri Jun 22 23:17:54 2007 +0000 - - Also compare stream_id in packet test - - - 20070622231754-b58c9-c8bd8181de62ce1d6e981c7c6089f70505f875b9.gz - - tests/check-gibber-r-multicast-packet.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 9b3df246c6d1fbd0e2fcf978a1ff38047c7c0466 -Author: Sjoerd Simons -Date: Fri Jun 22 22:31:47 2007 +0000 - - resolve conflicts - - - 20070622223147-b58c9-963623d9f374cead7fb1a5a86c8bf8b959ddab46.gz - - tests/test-r-multicast-sender.c | 190 --------------------------------------- - 1 files changed, 0 insertions(+), 190 deletions(-) - -commit 6e34f047410de3c8cbcb830291ddb27f11001dea -Author: Sjoerd Simons -Date: Fri Jun 22 22:31:27 2007 +0000 - - resolve conflicts - - - 20070622223127-b58c9-152f4b15206027682049bccc2646fb15987e0655.gz - - tests/test-r-multicast-packet.c | 114 --------------------------------------- - 1 files changed, 0 insertions(+), 114 deletions(-) - -commit 5030389d14b8abe815c756ef1bf793c05cd51958 -Author: Sjoerd Simons -Date: Fri Jun 22 22:30:51 2007 +0000 - - Update to stream_id using api - - - 20070622223051-b58c9-3ee304e946c79da89e345a21f8575326994641ce.gz - - tests/check-gibber-r-multicast-packet.c | 3 ++- - tests/check-gibber-r-multicast-sender.c | 9 ++++++--- - 2 files changed, 8 insertions(+), 4 deletions(-) - -commit 37aa6282d1b5d4569e296efb225b48645918ae93 -Author: Sjoerd Simons -Date: Fri Jun 22 22:05:20 2007 +0000 - - Fix leak of GPtrArray when fragmenting - - - 20070622220520-b58c9-1df292a3298c139fdeef780327225156225656cb.gz - - lib/gibber/gibber-r-multicast-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 507e168cf9305d211c7239e7bb6ee9ce7df85e8d -Author: Sjoerd Simons -Date: Fri Jun 22 21:58:48 2007 +0000 - - Add support for multiplexing multiple substreams - - - 20070622215848-b58c9-d08c8fc9bce4108064b443afa208626ea6ac4897.gz - - .../gibber-muc-connection-signals-marshal.list | 1 + - lib/gibber/gibber-muc-connection.c | 35 ++++- - lib/gibber/gibber-muc-connection.h | 5 + - lib/gibber/gibber-r-multicast-packet.c | 13 +- - lib/gibber/gibber-r-multicast-packet.h | 4 + - .../gibber-r-multicast-sender-signals-marshal.list | 2 +- - lib/gibber/gibber-r-multicast-sender.c | 11 +- - lib/gibber/gibber-r-multicast-transport.c | 40 +++-- - lib/gibber/gibber-r-multicast-transport.h | 9 + - tests/check-gibber-r-multicast-transport.c | 4 +- - tests/test-r-multicast-packet.c | 114 ++++++++++++ - tests/test-r-multicast-sender.c | 190 ++++++++++++++++++++ - 12 files changed, 401 insertions(+), 27 deletions(-) - -commit 21c6cd22ca5768d4600b96e6ce86cf2b4f5a43ff -Author: Guillaume Desmottes -Date: Fri Jun 22 11:11:19 2007 +0000 - - gibber-r-multicast-transport.c: don't leak the senders hash table - - - 20070622111119-7fe3f-9b08fd2442492537c6a5ebdd998a234ddd2e970c.gz - - lib/gibber/gibber-r-multicast-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit c392dfe886bc662fbc7300e59b601de70740e4cd -Author: Guillaume Desmottes -Date: Thu Jun 21 08:21:59 2007 +0000 - - salut-avahi-entry-group.c: store the service in the hash table to don't leak - - - 20070621082159-7fe3f-2df5106f31fcb876de06b982c60052795cf2658f.gz - - src/salut-avahi-entry-group.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 2ea1c68843748d43725ab77e62559dceb89b1439 -Author: Guillaume Desmottes -Date: Fri Jun 22 10:14:22 2007 +0000 - - salut-self.c: fix addrinfo leaks - - - 20070622101422-7fe3f-1145399f95af123ac2827a153101033583382229.gz - - src/salut-self.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit a89aef18d25d1d326ef4eb88a47f5fcf248fb2f7 -Author: Guillaume Desmottes -Date: Fri Jun 22 09:58:09 2007 +0000 - - salut-self: don't leak the name - - - 20070622095809-7fe3f-9c5c1f0587436d847bc67aaba60bfe9d1571f180.gz - - src/salut-self.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 205dcff2656cc0745202412428a1e1910ede1a4b -Author: Guillaume Desmottes -Date: Fri Jun 22 09:50:36 2007 +0000 - - gibber-xmpp-reader: don't leak the nodes queue - - - 20070622095036-7fe3f-38a0c4ea6789444c6b04a1f6df11e6ef84f99c0e.gz - - lib/gibber/gibber-xmpp-reader.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 2bfef43909a39479ca3db154814755e5c83835eb -Author: Guillaume Desmottes -Date: Fri Jun 22 09:47:27 2007 +0000 - - muc-channel: don't leak the muc name - - - 20070622094727-7fe3f-df4d3d0e4f05585f706db153b11b744ddc13134d.gz - - src/salut-muc-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 6c6447854f05ba3a0f7770671ed3a9bd225cd9d7 -Author: Sjoerd Simons -Date: Tue Jun 19 20:25:45 2007 +0000 - - Don't print out that new nodes have been added - - - 20070619202545-b58c9-41e0ce592d4def4a94c9e4dd664a4b19160af6ba.gz - - tests/mesh.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ae14fb2e0618bc75a21ec32161f7b9944438e0ee -Author: Sjoerd Simons -Date: Tue Jun 19 20:25:28 2007 +0000 - - Only print an error if there was a non-zero exit status - - - 20070619202528-b58c9-f8bd5f44f482ce71c2b4e297e9e51c6b67e0235e.gz - - tests/mesh.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 212e215564755d3bce22fd37c2c79ae985549c26 -Author: Sjoerd Simons -Date: Tue Jun 19 20:24:10 2007 +0000 - - Put the global definition at the start of the function - - - 20070619202410-b58c9-e0de93474c3dfcc0e3073fdcd82f6446f793bcfb.gz - - tests/simplemeshtest.py | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 8dd7a9fa9a52d9bd82855876ecfc9fd32ab8648c -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/check-gibber-xmpp-connection.c | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 58030ce879e4fb483d343186e4b371c6a983d360 -Author: Sjoerd Simons -Date: Fri Jun 22 22:59:37 2007 +0000 - - Add destructor for the file chunker - - - 20070622225937-b58c9-b293278434eaacc2671e4bf79cf4abc5b7278033.gz - - tests/check-gibber-xmpp-connection.c | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) - -commit 32eaebd673b75a1094ca0085b102fe2389a2da25 -Author: Emanuele Aina -Date: Fri Jun 22 10:43:32 2007 +0000 - - Fixed some conflicts - - - 20070622104332-f974e-a57db028cb8652a8473572df59cc9e6fd87130ab.gz - - tests/Makefile.am | 23 ++++++++++++++++------- - tests/check-gibber.h | 10 ++++++++-- - tests/check-main.c | 8 ++++++++ - 3 files changed, 32 insertions(+), 9 deletions(-) - -commit f75f9d451a907dc669608d2bd29ebf00f606db24 -Author: Emanuele Aina -Date: Thu Jun 21 21:03:43 2007 +0000 - - Ported the GibberRMulticastSender test to Check using its looping tests support - - - 20070621210343-f974e-3ef1d329c700792ea0573fdebd4d2564a6441d72.gz - - tests/Makefile.am | 14 +-- - tests/check-gibber-r-multicast-sender.c | 183 +++++++++++++++++++++++++++++ - tests/test-r-multicast-sender.c | 190 ------------------------------- - 3 files changed, 184 insertions(+), 203 deletions(-) - -commit fc895886f1ffd97aca420e78e46c48174697a557 -Author: Emanuele Aina -Date: Thu Jun 21 21:00:31 2007 +0000 - - Ported the GibberRMulticastPacket test to Check using its looping tests support - - - 20070621210031-f974e-9038bfd198a6c6125f30e2f23a703198a9eaa7df.gz - - tests/Makefile.am | 13 ---- - tests/check-gibber-r-multicast-packet.c | 112 ++++++++++++++++++++++++++++++ - tests/test-r-multicast-packet.c | 114 ------------------------------- - 3 files changed, 112 insertions(+), 127 deletions(-) - -commit 3faab157b4800d52bbab57858186f8ab09e260e3 -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/Makefile.am | 32 ++----- - tests/check-gibber-sasl-auth.c | 198 ++++++++++++++++++++++++++++++++++++++++ - tests/check-main.c | 2 + - 3 files changed, 210 insertions(+), 22 deletions(-) - -commit c5001a8cb179d3dd74de219c3afd1d1fc4d8bdd8 -Author: Emanuele Aina -Date: Thu Jun 21 19:54:36 2007 +0000 - - Resolved some conflicts - - - 20070621195436-f974e-2d84149a5e569b85568ecafb856457b130831336.gz - -commit 4566c009ceaf231838ac04767b21e2691e5a7322 -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/check-gibber-xmpp-connection.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit e7088727bb4ad0a9cf742ea00bf2f7937aa2e2f3 -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/check-gibber-xmpp-connection.c | 51 ++++++++++++++++++++++++++++------ - 1 files changed, 42 insertions(+), 9 deletions(-) - -commit b8a4e675310a34d281598b11781ae88dac040438 -Author: Emanuele Aina -Date: Wed Jun 13 15:36:14 2007 +0000 - - Check the parsing of a valid message - - - 20070613153614-f974e-8c309a7855465643f05f322e1366640a9656f2c6.gz - - tests/check-gibber-xmpp-connection.c | 36 ++++++++++++++++++++++++++++++++++ - 1 files changed, 36 insertions(+), 0 deletions(-) - -commit 20829c6b042bb725ba0f9fdb43c358eed05b54c6 -Author: Emanuele Aina -Date: Wed Jun 13 14:02:35 2007 +0000 - - Add a testcase for GibberXmppConnection and check its istantiation - - - 20070613140235-f974e-38a23919dc403a05ad6852760c6b13bd9ad2e6f5.gz - - tests/Makefile.am | 20 ++++++------------ - tests/check-gibber-xmpp-connection.c | 35 ++++++++++++++++++++++++++++++++++ - tests/check-gibber.h | 6 +--- - tests/check-main.c | 2 - - 4 files changed, 44 insertions(+), 19 deletions(-) - -commit 4494a391824e8ee3af4e5740b49c5f6007666675 -Author: Sjoerd Simons -Date: Sun Jun 17 09:54:05 2007 +0000 - - Add test for causal ordering in the mesh - - - 20070617095405-b58c9-9ab6e2595221018b7886c7ec909608dc941a91f5.gz - - tests/causalorderingtest.py | 59 +++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 59 insertions(+), 0 deletions(-) - -commit 370367ea04eee184acd89990657e296455a02c3f -Author: Sjoerd Simons -Date: Sun Jun 17 09:53:24 2007 +0000 - - Add a utility method to make full duplex connections - - - 20070617095324-b58c9-a4710161b24e154e84155d4f46e856b398748efd.gz - - tests/mesh.py | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit e64ecaf54efb300cf6bab98ed618bfdc5f2a293e -Author: Sjoerd Simons -Date: Fri Jun 22 16:21:27 2007 +0000 - - Add id's to all stanza. the xmpp connection will generate them automagically otherwise, which breaks the tests - - - 20070622162127-b58c9-a3e2324f3a3865612a8e6dbf719c83ee30a241dc.gz - - tests/inputs/groupchat-invite.input | 4 ++-- - tests/inputs/simple-message-attrnamespace.input | 5 +++-- - tests/inputs/simple-message.input | 5 +++-- - tests/inputs/strange-streamopening.input | 2 +- - tests/inputs/tls-stream-start.input | 4 ++-- - 5 files changed, 11 insertions(+), 9 deletions(-) - -commit 3b475406ef2bdea33c2ce4e03fbcfed3b582becf -Author: Guillaume Desmottes -Date: Thu Jun 21 15:01:38 2007 +0000 - - gibber-iq-helper.c: no need to copy twice the id - - - 20070621150138-7fe3f-435629f09924f3a95705a62c4819a7a630590cd9.gz - - lib/gibber/gibber-iq-helper.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit fb06649f69b26f90ea834007c40af12c4c04d014 -Author: Guillaume Desmottes -Date: Thu Jun 21 14:58:25 2007 +0000 - - gibber-iq-helper.c: merge ObjectDestroyNotifyData to ReplyHandlerData - - - 20070621145825-7fe3f-3b9b92d1431924c8b9484bae618e1e55a62663d0.gz - - lib/gibber/gibber-iq-helper.c | 48 ++++++++++++---------------------------- - 1 files changed, 15 insertions(+), 33 deletions(-) - -commit 76fe0425e884758c8eb15cb006016608f0f6c056 -Author: Guillaume Desmottes -Date: Thu Jun 21 13:45:17 2007 +0000 - - gibber-xmpp-connection.c: generate an id for stanza who doesn't have one before sending - - - 20070621134517-7fe3f-74190255a1c13b53ffe1d07aac675e0e925c58e6.gz - - lib/gibber/gibber-xmpp-connection.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit f58a165b6a814ac6e7669a47243d904ead3efd9b -Author: Guillaume Desmottes -Date: Thu Jun 21 13:39:27 2007 +0000 - - gibber-iq-helper.c: use gibber_xmpp_connection_new_id instead of our own id generator - - - 20070621133927-7fe3f-8ccb4c802d97588be2fcbd25e1a8221ae6e1b2da.gz - - lib/gibber/gibber-iq-helper.c | 15 +-------------- - 1 files changed, 1 insertions(+), 14 deletions(-) - -commit d4f70fe7b67302fefc6a2f187bdd577fba79ecaa -Author: Guillaume Desmottes -Date: Thu Jun 21 13:39:08 2007 +0000 - - add gibber_xmpp_connection_new_id public method[3~ - - - 20070621133908-7fe3f-086b66767bad06086b6f74f8dc19bc04d6fa01e6.gz - - lib/gibber/gibber-xmpp-connection.c | 20 +++++++++++++++++++- - lib/gibber/gibber-xmpp-connection.h | 3 +++ - 2 files changed, 22 insertions(+), 1 deletions(-) - -commit 4a77aead455b9a47528dbf50d653918672c7908b -Author: Guillaume Desmottes -Date: Thu Jun 21 13:29:36 2007 +0000 - - remove useless create_iq_helper function - - - 20070621132936-7fe3f-a282f3205389139b6dbb18b71710d89496207019.gz - - tests/check-gibber-iq-helper.c | 28 +++++++++------------------- - 1 files changed, 9 insertions(+), 19 deletions(-) - -commit 78fe97f5208bc4dba9fd00ec8eb8aa1fa9f41bff -Author: Guillaume Desmottes -Date: Thu Jun 21 11:08:13 2007 +0000 - - gibber-iq-helper.c: s/_id/tmp - - - 20070621110813-7fe3f-46eecc1ef785aee3dddce683440aa6c962d25804.gz - - lib/gibber/gibber-iq-helper.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit ab6511522393a393a003ad6fc937df4075da535c -Author: Guillaume Desmottes -Date: Thu Jun 21 11:06:25 2007 +0000 - - gibber-iq-helper.c: properly cast GibberIqHelper in GIBBER_IQ_HELPER_GET_PRIVATE macro definition - - - 20070621110625-7fe3f-e046b5c7c169f31ff87044af29de5f0340bf37c0.gz - - lib/gibber/gibber-iq-helper.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 634075bc1c6a5f317b0368aeea86d1d04e57be44 -Author: Guillaume Desmottes -Date: Thu Jun 21 11:04:27 2007 +0000 - - don't use global variable to store the xmpp connection and iq helper so each test is really independent - - - 20070621110427-7fe3f-db9e6182685f16a11e41abf46ca775cfbe2e2e14.gz - - tests/check-gibber-iq-helper.c | 78 +++++++++++++++++++++++++++++++++------- - 1 files changed, 65 insertions(+), 13 deletions(-) - -commit 943d9b5d36f647650e74392977aa9c6b3db07aba -Author: Guillaume Desmottes -Date: Wed Jun 20 09:28:07 2007 +0000 - - salut-muc-channel.c: fix a typo in invitations - - - 20070620092807-7fe3f-7347e416d6355218ef56b9486341ebaca6040b96.gz - - src/salut-muc-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 326c1be74d278d082f0b10f22e9e0326c36baef2 -Author: Guillaume Desmottes -Date: Tue Jun 19 15:34:35 2007 +0000 - - move g_type_init call from tests to check-main - - - 20070619153435-7fe3f-1df47a73bc35241362899dd998bae50997428b59.gz - - tests/check-gibber-iq-helper.c | 3 --- - tests/check-gibber-r-multicast-transport.c | 4 ---- - tests/check-gibber-xmpp-reader.c | 3 --- - tests/check-main.c | 2 ++ - tests/check-node-properties.c | 1 - - 5 files changed, 2 insertions(+), 11 deletions(-) - -commit 28f560c1e2b0b6efbb4ab37986672127248a147d -Author: Guillaume Desmottes -Date: Tue Jun 19 15:09:56 2007 +0000 - - include "check-helpers.h" instead of - - - 20070619150956-7fe3f-00efa9a49fa420976acb13caaf602566e705afb5.gz - - tests/check-gibber-iq-helper.c | 2 +- - tests/check-gibber-xmpp-node.c | 2 +- - tests/check-node-properties.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -commit 98a42508f97d4c11e116675c384ac20a6346a049 -Author: Guillaume Desmottes -Date: Tue Jun 19 14:50:21 2007 +0000 - - fix conflicts with HEAD - - - 20070619145021-7fe3f-ba8d92168715a2c8804d10599e90a15c79ea62c2.gz - - tests/Makefile.am | 19 ++++++++++++------- - tests/check-gibber.h | 6 ++++-- - tests/check-main.c | 2 ++ - 3 files changed, 18 insertions(+), 9 deletions(-) - -commit 58fa1b76bfd3dadac2ad264c83f683326e793bb8 -Author: Guillaume Desmottes -Date: Tue Jun 19 14:45:51 2007 +0000 - - add gibber IQ helper tests in check-main - - - 20070619144551-7fe3f-098f1f1d884d4b9b178f6cccec3531207f29327a.gz - - tests/check-gibber.h | 5 ++--- - tests/check-main.c | 2 -- - 2 files changed, 2 insertions(+), 5 deletions(-) - -commit f32f9597e8ee1c7f68ea71cb6b49786eaff6a97d -Author: Guillaume Desmottes -Date: Tue Jun 19 14:45:23 2007 +0000 - - build check-gibber-iq-helper.c - - - 20070619144523-7fe3f-31f843b27a086e0a82ce645cb103c864e828f314.gz - - tests/Makefile.am | 18 +++++++----------- - 1 files changed, 7 insertions(+), 11 deletions(-) - -commit cbde0580c604248e696ec64aab68988807e7810f -Author: Guillaume Desmottes -Date: Tue Jun 19 14:44:47 2007 +0000 - - add check-gibber-iq-helper.c - - - 20070619144447-7fe3f-e04487804ec0cc01c21725905bb214df66e4167d.gz - - tests/check-gibber-iq-helper.c | 370 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 370 insertions(+), 0 deletions(-) - -commit 6de2b225c61d4d0acbe1f817f5d1e34acb82151a -Author: Guillaume Desmottes -Date: Tue Jun 19 14:43:51 2007 +0000 - - build gibber-iq-helper.c - - - 20070619144351-7fe3f-676eaf717e9d99d8e49933ccb9e1dad7a1ba2602.gz - - lib/gibber/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 2b32393f6cf473801cd2855c227fd840dd44fab9 -Author: Guillaume Desmottes -Date: Tue Jun 19 14:42:43 2007 +0000 - - add gibber-iq-helper.[ch] - - - 20070619144243-7fe3f-14fd8ee4d49c42fed4ae73bbf6f7743886965b60.gz - - lib/gibber/gibber-iq-helper.c | 416 +++++++++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-iq-helper.h | 85 +++++++++ - 2 files changed, 501 insertions(+), 0 deletions(-) - -commit 989f6f739765b7a230f1d2253a2b4521ae839279 -Author: Guillaume Desmottes -Date: Tue Jun 19 11:17:05 2007 +0000 - - test-transport.c: fix a GArray leak in send_data - - - 20070619111705-7fe3f-c2d88524186f36416b901090a48c0c369fbb5d0c.gz - - tests/test-transport.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit c0b410f23989420693e04cc4cad8aa97ed42e429 -Author: Sjoerd Simons -Date: Tue Jun 19 20:31:24 2007 +0000 - - If the data has been payloaded when using _set_part, then change the serialisation - - - 20070619203124-b58c9-0a9d395f35e2adcdfe78cad371ba2126060942fc.gz - - lib/gibber/gibber-r-multicast-packet.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 86d71c7d31ebb90e6ccdcb7e45dcc3eacbe0dddf -Author: Sjoerd Simons -Date: Tue Jun 19 20:30:39 2007 +0000 - - Assert that the data hasn't been serialized yet when adding receivers - - - 20070619203039-b58c9-e40aee2c94dae79bf5d60e1830200e1aee3462cd.gz - - lib/gibber/gibber-r-multicast-packet.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 1d2a0e84395429fea8eca103cb75a6927d8ec399 -Author: Sjoerd Simons -Date: Tue Jun 19 12:06:42 2007 +0000 - - Fix conflicts - - - 20070619120642-b58c9-d5602f4dd0608b070108ef1ab85c0379babbde4a.gz - - tests/Makefile.am | 18 +++++++++++------- - 1 files changed, 11 insertions(+), 7 deletions(-) - -commit 6e6205515dfb65420972b89b80a7c67f1e32fda2 -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 - - lib/gibber/gibber-debug.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit cf78a2bfe0c1840962132a593c855bfc6687fe37 -Author: Sjoerd Simons -Date: Mon Jun 18 15:42:09 2007 +0000 - - Even more coding style fixes - - - 20070618154209-b58c9-e41b4709367f2e45beb9def51998aa1f8555b395.gz - - tests/check-gibber-r-multicast-transport.c | 16 +++++++++++----- - 1 files changed, 11 insertions(+), 5 deletions(-) - -commit a38355a05e37bcb9643266989cb4388f0fc84531 -Author: Sjoerd Simons -Date: Mon Jun 18 14:20:11 2007 +0000 - - More coding style fixes - - - 20070618142011-b58c9-9dcc303545a1bd9c731f5042ae1659b1cc19ca75.gz - - tests/check-gibber-r-multicast-transport.c | 19 ++++++++++--------- - 1 files changed, 10 insertions(+), 9 deletions(-) - -commit 51de80d6053ba6852780b99c6983056fb4b3fac0 -Author: Sjoerd Simons -Date: Mon Jun 18 13:44:06 2007 +0000 - - Convert to collabora coding style - - - 20070618134406-b58c9-1ea2c406073688ac13c1cec76e0a1f420eae7795.gz - - tests/check-gibber-r-multicast-transport.c | 187 ++++++++++++++++----------- - 1 files changed, 111 insertions(+), 76 deletions(-) - -commit e2f646ee01f90821fcdc1b936b97ecf1555bb4a7 -Author: Sjoerd Simons -Date: Mon Jun 18 13:29:07 2007 +0000 - - Add test to see if dependencies are correctly add to packages - - - 20070618132907-b58c9-39054681be70d5c7d9b60dc74bce89c16be65f1b.gz - - tests/check-gibber-r-multicast-transport.c | 116 +++++++++++++++++++++++++++- - 1 files changed, 115 insertions(+), 1 deletions(-) - -commit c77dfe17d5aa7fa3e5edcf73270afafa8cd7aeef -Author: Sjoerd Simons -Date: Sun Jun 17 17:51:10 2007 +0000 - - Assert that the send function is valid - - - 20070617175110-b58c9-88f71686093cd978bd56334deeadea9335aa5089.gz - - tests/test-transport.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit d86c2e43f695e15874609d3979d3bdcc7af8cfd1 -Author: Sjoerd Simons -Date: Sun Jun 17 14:38:19 2007 +0000 - - refactor the transport test a bit - - - 20070617143819-b58c9-d9b50cd39cf57e5cb69a6981e843c5a5455c8b01.gz - - tests/check-gibber-r-multicast-transport.c | 32 +++++++++++++++++++++------- - 1 files changed, 24 insertions(+), 8 deletions(-) - -commit c7d4bfb22762584cb4593f3cf09b517362900ce5 -Author: Sjoerd Simons -Date: Sun Jun 17 14:07:47 2007 +0000 - - Fragment to big payloads and add dependency information - - - 20070617140747-b58c9-477e8126f906798225c90f2f9264614c9f0c884d.gz - - lib/gibber/gibber-r-multicast-transport.c | 65 ++++++++++++++++++++++++---- - 1 files changed, 55 insertions(+), 10 deletions(-) - -commit f0121e8974a2977388c65e55bdb52ad0a583ec5b -Author: Sjoerd Simons -Date: Sun Jun 17 14:06:01 2007 +0000 - - GibberRMulticastSender: Put last_output_packet in the Public struct and move the last_output_packet to the Private struct - - - 20070617140601-b58c9-025209e24845c76b0729fa7b22f3c08ca1eb997f.gz - - lib/gibber/gibber-r-multicast-sender.c | 27 +++++++++++++++------------ - lib/gibber/gibber-r-multicast-sender.h | 4 ++-- - 2 files changed, 17 insertions(+), 14 deletions(-) - -commit 4e240d942de82f1fdd58fb3a3af54e784d68e46b -Author: Sjoerd Simons -Date: Sun Jun 17 14:00:53 2007 +0000 - - Add a fragmentation testcase - - - 20070617140053-b58c9-5d8fb34aaba6b9f66479ff616175f85d2f3d842d.gz - - tests/Makefile.am | 3 +- - tests/check-gibber-r-multicast-transport.c | 90 ++++++++++++++++++++++++++++ - tests/check-gibber.h | 5 +- - tests/check-main.c | 2 + - 4 files changed, 96 insertions(+), 4 deletions(-) - -commit de65a20f18f9113a7375f3d905b47969f1e66e6a -Author: Sjoerd Simons -Date: Tue Jun 19 12:01:26 2007 +0000 - - Format type fixes from misc@mandriva.org - - - 20070619120126-b58c9-44b9271200324439d74cb1969dc22f6f661c4de8.gz - - lib/gibber/gibber-fd-transport.c | 4 ++-- - lib/gibber/gibber-multicast-transport.c | 2 +- - lib/gibber/gibber-ssl-transport.c | 2 +- - lib/gibber/gibber-xmpp-reader.c | 2 +- - lib/gibber/gibber-xmpp-writer.c | 6 +++--- - src/salut-contact.c | 2 +- - 6 files changed, 9 insertions(+), 9 deletions(-) - -commit 8ad7add6294d511979fb4a41bb4e9d5c0370ee7a -Author: Guillaume Desmottes -Date: Mon Jun 18 09:09:43 2007 +0000 - - checkify node properties tests - - - 20070618090943-7fe3f-675d6b40a2625137ddf3ee562a6870f082413ea5.gz - - tests/Makefile.am | 28 ++--- - tests/check-main.c | 25 ++++- - tests/check-node-properties.c | 232 ++++++++++++++++++++++++++++++++++++ - tests/check-salut.h | 6 + - tests/test-xmpp-node-properties.c | 234 ------------------------------------- - 5 files changed, 272 insertions(+), 253 deletions(-) - -commit 56cd153f401fab849b8b3fe65ade2adde7a82cb2 -Author: Guillaume Desmottes -Date: Fri Jun 15 17:00:09 2007 +0000 - - salut-util.c: use g_critical instead of g_debug in set_child_from_property - - - 20070615170009-7fe3f-1e6d59614a1cec4040db465937c15d1c6d811fee.gz - - src/salut-util.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e9c7baa670d4499787b44069fc0d17a6c6665059 -Author: Guillaume Desmottes -Date: Fri Jun 15 15:40:22 2007 +0000 - - fix test-xmpp-node-properties.c header - - - 20070615154022-7fe3f-93bb9d21ff768f89f38addccb28c2331b4aaa128.gz - - tests/test-xmpp-node-properties.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 40bf30f02ef63db155c3ec17fb03014461c0da74 -Author: Guillaume Desmottes -Date: Fri Jun 15 15:22:32 2007 +0000 - - fix conflict in tests/Makefile.am - - - 20070615152232-7fe3f-00ea31c52979c524a32fd3e5eb7bb691ec9c69bb.gz - -commit 50ee7de54d1ee6b1999cf8414642c3b259d71403 -Author: Guillaume Desmottes -Date: Fri Jun 15 12:30:45 2007 +0000 - - reimplement gibber_debug_stanza to use gibber_xmpp_node_to_string - - - 20070615123045-7fe3f-bb91394e6454c0d035256c299c86aab08d365e06.gz - - lib/gibber/gibber-debug.c | 77 ++++---------------------------------------- - 1 files changed, 7 insertions(+), 70 deletions(-) - -commit bb16743426cd7d6e7207e06e35e7b0a966dedbc1 -Author: Guillaume Desmottes -Date: Fri Jun 15 12:23:06 2007 +0000 - - add gibber_xmpp_node_to_string - - - 20070615122306-7fe3f-2f268e618ce79a7d8d06c310612a3a596f74a327.gz - - lib/gibber/gibber-xmpp-node.c | 72 +++++++++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-xmpp-node.h | 4 ++ - 2 files changed, 76 insertions(+), 0 deletions(-) - -commit d523a0850fcb593abc50da7aa31c2279c1533f69 -Author: Guillaume Desmottes -Date: Thu Jun 14 17:02:42 2007 +0000 - - build test-xmpp-node-properties.c - - - 20070614170242-7fe3f-e09f2dd08de5d33836593421b86126aea2677d99.gz - - tests/Makefile.am | 22 +++++++++++++++------- - 1 files changed, 15 insertions(+), 7 deletions(-) - -commit 065b1264f1da34572dec969241f6f8de1473209f -Author: Guillaume Desmottes -Date: Thu Jun 14 17:02:13 2007 +0000 - - add test-xmpp-node-properties.c - - - 20070614170213-7fe3f-47dac06e9fbef36dceaac86409fc15ef69bf5c6e.gz - - tests/test-xmpp-node-properties.c | 232 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 232 insertions(+), 0 deletions(-) - -commit 5133c5be25b9fa70f5b7c95d3fbaeb648e962ca8 -Author: Guillaume Desmottes -Date: Thu Jun 14 17:01:24 2007 +0000 - - build salut-util.c - - - 20070614170124-7fe3f-74532eed6c71ee157ffac95d83a68efcbce52de0.gz - - src/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit bf3ff2ea4def48c2130d5e8bc546a86802c076de -Author: Guillaume Desmottes -Date: Thu Jun 14 16:59:48 2007 +0000 - - create salut-util.[ch] containing salut_gibber_xmpp_node_extract_properties and salut_gibber_xmpp_node_add_children_from_properties - - - 20070614165948-7fe3f-5107adb0c4028e23f923832c7ff4b69a2d80c3ab.gz - - src/salut-util.c | 261 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/salut-util.h | 33 +++++++ - 2 files changed, 294 insertions(+), 0 deletions(-) - -commit 061f285542d7d71505c3b78d401c3b7a60767228 -Author: Guillaume Desmottes -Date: Thu Jun 14 13:39:07 2007 +0000 - - test-stanza-build.c: move g_type_init and debug init to main - - - 20070614133907-7fe3f-4d1e71a0db3835ed70379fa9da3ecb971b192745.gz - - tests/test-stanza-build.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 3440ff44dac15619a2b6fe819dbc9b375e7a92c7 -Author: Guillaume Desmottes -Date: Thu Jun 14 09:31:20 2007 +0000 - - salut-muc-channel.c: use text_helper_create_message_groupchat instead of text_helper_create_message - - - 20070614093120-7fe3f-aba359cb884a8476e54b8093d0c6c1b4c4235823.gz - - src/salut-muc-channel.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 304d5e33a45f6f1d469c7b54b041ffc99a554e55 -Author: Guillaume Desmottes -Date: Thu Jun 14 09:27:11 2007 +0000 - - text-helper: add text_helper_create_message_groupchat - - - 20070614092711-7fe3f-6bb01027e7c056509dffa821d5fca7d02144b439.gz - - src/text-helper.c | 103 ++++++++++++++++++++++++++++++++++++++-------------- - src/text-helper.h | 4 ++ - 2 files changed, 79 insertions(+), 28 deletions(-) - -commit b0b1c83f78e2a5be60ef7d1f05a1ee5477026768 -Author: Guillaume Desmottes -Date: Wed Jun 13 16:19:06 2007 +0000 - - gibber-xmpp-stanza.c: fix an argument error in gibber_xmpp_stanza_build documentation - - - 20070613161906-7fe3f-3c14588a9ea94511993588092993b6629aaf7e8a.gz - - lib/gibber/gibber-xmpp-stanza.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 5686b5758c537f55b6dae646cfd102922a08774d -Author: Sjoerd Simons -Date: Fri Jun 15 17:33:39 2007 +0000 - - Set AM_CFLAGS and friends outside of the HAVE_CHECK ifdef - - - 20070615173339-93b9a-b42dbf37bccf6909bb85d897db37b9fa86424e26.gz - - tests/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 9dc01600cd92a428768ac50f9451969ce8822bf0 -Author: Sjoerd Simons -Date: Fri Jun 15 17:34:16 2007 +0000 - - Put run-xmpp-connection-test.sh in check_SCRIPTS which ensures it's set +x when make check is run (thanks to some other magical rules) - - - 20070615173416-93b9a-74015b145c455ee8911103017a783e3d35b993c5.gz - - tests/Makefile.am | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 8263d06bbe7dff9ded945f31f2a3dad7d15b6376 -Author: Sjoerd Simons -Date: Fri Jun 15 13:09:34 2007 +0000 - - Dont do a space between macro's and their arguments, gcc won't like it - - - 20070615130934-93b9a-50067b51f235c582c0e00d892131896cd9a53d73.gz - - tests/check-helpers.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 80a0e1bfaaa3e4600783350535a845b9b383d722 -Author: Simon McVittie -Date: Fri Jun 15 14:55:32 2007 +0000 - - SalutSelf: if the OLPC key changes and is shortened, remove any stray segments from the old key - - - 20070615145532-53eee-194a17f6796bebf4d400fd5005c19cffbf3576e0.gz - - src/salut-self.c | 19 ++++++++++++++++++- - 1 files changed, 18 insertions(+), 1 deletions(-) - -commit 2312a638709b4bd780604d51404a98b9cbd93c9d -Author: Simon McVittie -Date: Fri Jun 15 14:15:44 2007 +0000 - - Fix various typos in base64 -> binary key port - - - 20070615141544-53eee-afc17704ad017c983d870b2173a5385bec4c0aa7.gz - - src/salut-connection.c | 2 +- - src/salut-self.c | 22 +++++++++++----------- - src/salut-self.h | 2 +- - 3 files changed, 13 insertions(+), 13 deletions(-) - -commit 179dc22d4e9d869013b59d79a1775a4b5074f98e -Author: Simon McVittie -Date: Fri Jun 15 14:15:23 2007 +0000 - - SalutAvahiEntryGroup: make sure entries are NUL-terminated in case we later use them as strings - - - 20070615141523-53eee-b6a2441fb4ae453c16bb77e5d6eb31c36a94c947.gz - - src/salut-avahi-entry-group.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 1c69b82c736c29567ef0067c43b6f8bcdea90b34 -Author: Simon McVittie -Date: Fri Jun 15 13:36:35 2007 +0000 - - Deal with OLPC key correctly, avoiding having two copies - - - 20070615133635-53eee-3ea445a51a94e1b1fc2f703637c80b79ea6aff30.gz - - src/salut-connection.c | 30 +++++++----------------------- - src/salut-self.c | 38 ++++++++++++++++++-------------------- - src/salut-self.h | 4 ++-- - 3 files changed, 27 insertions(+), 45 deletions(-) - -commit d0bbde15c03afdd05a3e5c390a48e0655147f22e -Author: Simon McVittie -Date: Fri Jun 15 13:36:18 2007 +0000 - - Don't crash on finalize if there is no OLPC key - - - 20070615133618-53eee-73dc7a1cd198b27afe3fd9cca6e866b4b6bc1e6b.gz - - src/salut-connection.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit ad350a83aa9654c94dffeede3a94d60a47edcde0 -Author: Simon McVittie -Date: Fri Jun 15 13:24:01 2007 +0000 - - Parse contacts' OLPC keys as byte array, not base64 string - - - 20070615132401-53eee-609b4a4076637afd1a729ba8a03fbd02346f4ab2.gz - - src/salut-contact.c | 70 ++++++++++++++++++++++++--------------------------- - src/salut-contact.h | 4 +- - 2 files changed, 35 insertions(+), 39 deletions(-) - -commit fa5e9dfa94c64742bbba9d50dfb689ca5d2d22e7 -Author: Simon McVittie -Date: Fri Jun 15 13:23:41 2007 +0000 - - If ENABLE_OLPC, don't leak contacts' OLPC key/color - - - 20070615132341-53eee-5d59437ebe2d948433377d8bb743fe14ffabd7a5.gz - - src/salut-contact.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit f74eb28b508adf66af862a31a8be89d1f04cd792 -Author: Simon McVittie -Date: Fri Jun 15 12:49:01 2007 +0000 - - Use correct free function for SalutConnectionPrivate::olpc_key - - - 20070615124901-53eee-8daea803032fa3190839dca24511ba24b288d4ab.gz - - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3413569857b2df1813dff92279ae69812cc2425b -Author: Simon McVittie -Date: Fri Jun 15 12:46:02 2007 +0000 - - Use GArray of binary data, rather than gchar*, for OLPC key. Put it in olpc-key-partN as binary rather than olpc-key-partN-b64 as base64. Be more const-correct. - - - 20070615124602-53eee-ffb238b5384504d7e64c7e62ab3f0ea3656f0ff4.gz - - src/salut-connection.c | 69 ++++++++++++++++++++++++++---------------- - src/salut-self.c | 78 ++++++++++++++++++++++++++++++++--------------- - src/salut-self.h | 12 +++---- - 3 files changed, 100 insertions(+), 59 deletions(-) - -commit 81a7624c53ea839d2d3ba54a58e84d982b6e3a8f -Author: Simon McVittie -Date: Thu Jun 14 15:14:25 2007 +0000 - - Correct key segmentation, this time for the initial TXT record - - - 20070614151425-53eee-f782d0318d8908893aca928413c7ee3c74b8317d.gz - - src/salut-self.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a626d3e3eaf18802a4ce7fc84335caca0caec1ea -Author: Simon McVittie -Date: Thu Jun 14 12:47:27 2007 +0000 - - If we're asked to SetProperties (OLPC BuddyInfo interface) and we aren't yet connected, save the changes up for later - - - 20070614124727-53eee-e8df40a828051a3cf5d52bc8d59fe3b6331ba93c.gz - - src/salut-connection.c | 27 +++++++++++++++++++++++++-- - 1 files changed, 25 insertions(+), 2 deletions(-) - -commit 4bfbb5f26e52a7797684475d53be24647ebada25 -Author: Simon McVittie -Date: Thu Jun 14 11:10:34 2007 +0000 - - Correct key segmentation - - - 20070614111034-53eee-44c1bcaf22558b745bc992428079bddb6973afb5.gz - - src/salut-self.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 350881fbc455d719e320300e04f0bcb781f8dc1c -Author: Simon McVittie -Date: Wed Jun 13 16:04:34 2007 +0000 - - Stop expecting an empty segment to terminate OLPC buddy keys - - - 20070613160434-53eee-43447dd7de7e49a1f9f33a62ab58a2acdbc090f5.gz - - src/salut-contact.c | 17 ++++------------- - 1 files changed, 4 insertions(+), 13 deletions(-) - -commit f8dc372992d0309f88f3737c90cb4606c2a3b9e8 -Author: Simon McVittie -Date: Wed Jun 13 15:41:20 2007 +0000 - - Allow OLPC key, color to be set before we go CONNECTED, in principle. Simplify the code for key-splitting. - - - 20070613154120-53eee-3b8312d9e71df1c6650aa4efc83109fe73e52074.gz - - src/salut-connection.c | 10 ++++- - src/salut-self.c | 122 ++++++++++++++++++++++++++--------------------- - src/salut-self.h | 3 +- - 3 files changed, 78 insertions(+), 57 deletions(-) - -commit b50d25acbc3acd0dec61d87bdfeaeeba51e4b06f -Author: Simon McVittie -Date: Tue Jun 12 15:00:35 2007 +0000 - - Split OLPC keys into 200 byte segments to bypass the 255-character limit in TXT records - - - 20070612150035-53eee-63453a450aced5e63875d869b74ff5ce29d3941b.gz - - src/salut-contact.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ - src/salut-self.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- - 2 files changed, 86 insertions(+), 2 deletions(-) - -commit faff375fa17671d0961a0ae8cd84469896bb5584 -Author: Simon McVittie -Date: Fri Jun 15 12:41:16 2007 +0000 - - More whitespace - - - 20070615124116-53eee-a82f2ec506a4cd05dca42493a8f90dd5d9299c32.gz - - src/salut-connection.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit d7f2aebe72ec618506c40b5bfbaf126263f30379 -Author: Simon McVittie -Date: Fri Jun 15 12:34:10 2007 +0000 - - Whitespace, indentation, Collabora style - - - 20070615123410-53eee-bf74434c1d3a7fef3d50d1a6c4777b401d5a8720.gz - - src/salut-connection.c | 191 ++++++++++++++++++++++------------------------- - src/salut-self.h | 15 ++-- - 2 files changed, 95 insertions(+), 111 deletions(-) - -commit e4c6efc75f6abb8ef96a6ac56be6562c1b3e8504 -Author: Sjoerd Simons -Date: Fri Jun 15 12:44:24 2007 +0000 - - Add spaces between function definitions/prototypes and ( - - - 20070615124424-93b9a-5b639b4996c49c643acdd8f5fadf0d9cb75aee50.gz - - tests/check-helpers.c | 14 +++++++------- - tests/check-helpers.h | 8 ++++---- - 2 files changed, 11 insertions(+), 11 deletions(-) - -commit e640b79054a3bcb69f8b1bad3d388fa1ca91b0f6 -Author: Sjoerd Simons -Date: Fri Jun 15 12:31:53 2007 +0000 - - Try to conform with collabora coding style - - - 20070615123153-93b9a-70de06bb19669841cfa08f3f511ea0bbe862304f.gz - - tests/check-helpers.c | 21 ++++++++++++++------- - 1 files changed, 14 insertions(+), 7 deletions(-) - -commit ad536ac8234433d482d89d031812026a4676e4f0 -Author: Sjoerd Simons -Date: Fri Jun 15 12:29:16 2007 +0000 - - Add standard license blurp - - - 20070615122916-93b9a-e66b9bc6178828c84ff72a99f0fcd632f587fcc6.gz - - tests/check-helpers.h | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) - -commit 037b144b56ebc71f9f1f6b272457e129ac287b15 -Author: Sjoerd Simons -Date: Fri Jun 15 12:10:00 2007 +0000 - - Add a comment that Unit tests aren't API examples - - - 20070615121000-93b9a-4f849da45981962416be9e1f181aaa88a2f73b87.gz - - tests/check-gibber-xmpp-node.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit b54782c836a86e39c72f7e563bc2d48d6a80a297 -Author: Sjoerd Simons -Date: Fri Jun 15 11:41:54 2007 +0000 - - Test that a gibber_xmpp_node_get_language on a NULL node throws a critical error and returns NULL - - - 20070615114154-93b9a-1a7904cca1d23229f19fc03dbe33f7f8ea914993.gz - - tests/check-gibber-xmpp-node.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit f9a221fae8519734a93163997711f2fcb4209880 -Author: Sjoerd Simons -Date: Fri Jun 15 11:40:07 2007 +0000 - - remove some trailing spaces - - - 20070615114007-93b9a-2338f688e7b0ce01c5070bac8708adb0aaff78d5.gz - - lib/gibber/gibber-xmpp-node.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 50e777a46324213954a3bf8319eeef25870d223a -Author: Sjoerd Simons -Date: Fri Jun 15 11:39:49 2007 +0000 - - Use g_return_val_if_fail in gibber_xmpp_node_get_language when a NULL node is passed - - - 20070615113949-93b9a-775a9a54736ba1c8f382daf936a060760e78b9df.gz - - lib/gibber/gibber-xmpp-node.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit a05b3202308a0472597182d2c39edfe8d0e4aea0 -Author: Sjoerd Simons -Date: Fri Jun 15 11:36:52 2007 +0000 - - Add some helpers for check to check for critical error logs - - - 20070615113652-93b9a-8916c144b9a7c2a21ee98eefade4e8151040d298.gz - - tests/Makefile.am | 2 + - tests/check-helpers.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ - tests/check-helpers.h | 25 +++++++++++++++++++++ - tests/check-main.c | 3 ++ - 4 files changed, 86 insertions(+), 0 deletions(-) - -commit 547160606a070ad817c6d54fa4959d80b5aba7b1 -Author: Sjoerd Simons -Date: Fri Jun 15 09:40:15 2007 +0000 - - Cope with check not being available and tidy up a bit - - - 20070615094015-93b9a-15dce497e539466994733927630b71003b70d9de.gz - - tests/Makefile.am | 35 ++++++++++++++++++++--------------- - 1 files changed, 20 insertions(+), 15 deletions(-) - -commit b5a0e2d741d577c700ddc7cb59409242513c78ee -Author: Sjoerd Simons -Date: Fri Jun 15 09:39:58 2007 +0000 - - Don't error if the check framework isn't available - - - 20070615093958-93b9a-6e1ed65a42882237bcf166d845175f01dd0eae20.gz - - configure.ac | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 1770514f61207ac1dd2cd1af5360bef4ed0ac4eb -Author: Sjoerd Simons -Date: Fri Jun 15 09:37:43 2007 +0000 - - Use the srcdir env variable to determine the path of the input files - - - 20070615093743-93b9a-312f72e33b5748509d6963a3478de320d4bfd4de.gz - - tests/check-gibber-xmpp-reader.c | 12 ++++++++++-- - 1 files changed, 10 insertions(+), 2 deletions(-) - -commit 6be995149829d9ffc2153360edfcac2306442e12 -Author: Emanuele Aina -Date: Sat Jun 9 15:17:46 2007 +0000 - - Also test signals emissions during XMPP parsing - - - 20070609151746-f974e-51d743b04add1147f9bf0a9ef4a64936c37886b5.gz - - tests/check-gibber-xmpp-reader.c | 62 +++++++++++++++++++++++++++++++++++++- - 1 files changed, 61 insertions(+), 1 deletions(-) - -commit 89aa2fe03d823ee171e2f9d33fe39af62e5be303 -Author: Emanuele Aina -Date: Sat Jun 9 13:44:05 2007 +0000 - - Tested the parsing of a simple XMPP message - - - 20070609134405-f974e-cc262423822f79edefa81da64bfd39c4c6ebeb7d.gz - - tests/check-gibber-xmpp-reader.c | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) - -commit a2e4d30764776f4040a06674136ea8456b970771 -Author: Emanuele Aina -Date: Sat Jun 9 13:24:56 2007 +0000 - - Add a testcase for GibberXmppReader and check its istantiation - - - 20070609132456-f974e-ac2d4b24963f8b3e8e1b05f1b1ef078a7063f001.gz - - tests/Makefile.am | 3 ++- - tests/check-gibber-xmpp-reader.c | 24 ++++++++++++++++++++++++ - tests/check-gibber.h | 1 + - tests/check-main.c | 1 + - 4 files changed, 28 insertions(+), 1 deletions(-) - -commit b07d3dcf028250aa0147cb5d50d6ce3da1085db9 -Author: Emanuele Aina -Date: Sat Jun 9 13:03:31 2007 +0000 - - Tested the [add|get]_child functions for GibberXmppNode - - - 20070609130331-f974e-53c92b3b05436875527df980e402c4984152a3d9.gz - - tests/check-gibber-xmpp-node.c | 32 ++++++++++++++++++++++++++++++++ - 1 files changed, 32 insertions(+), 0 deletions(-) - -commit b8fb922bd8ea6ee76078069f735423c6320fe8e0 -Author: Emanuele Aina -Date: Sat Jun 9 10:46:53 2007 +0000 - - Tested the namespace and attribute accesor functions in GibberXmppNode - - - 20070609104653-f974e-586a4d9c8d0288ed33195c3bee7d68c2cc4a4822.gz - - tests/check-gibber-xmpp-node.c | 61 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 61 insertions(+), 0 deletions(-) - -commit 98b15487246af73f858b42c51191d94aad26c7d9 -Author: Emanuele Aina -Date: Sat Jun 9 09:19:16 2007 +0000 - - Tested gibber_xmpp_node_set_language_n() and fixed gibber_xmpp_node_set_language() with a NULL lang - - - 20070609091916-f974e-25d6e0593963b0bd7c33fce670639d08b476bf55.gz - - lib/gibber/gibber-xmpp-node.c | 6 +++++- - tests/check-gibber-xmpp-node.c | 16 ++++++++++++++-- - 2 files changed, 19 insertions(+), 3 deletions(-) - -commit 6e8c57486c946f2a5d2cad3c540c463b0e647418 -Author: Emanuele Aina -Date: Sat Jun 9 08:52:06 2007 +0000 - - Test and fix gibber_xmpp_node_get_language() with a NULL node - - - 20070609085206-f974e-1b61af2304ed7605d44148e95e77f6ebad7707aa.gz - - lib/gibber/gibber-xmpp-node.c | 2 +- - tests/check-gibber-xmpp-node.c | 3 +++ - 2 files changed, 4 insertions(+), 1 deletions(-) - -commit eb6f229e66a6d86499b00a806297a8610620f9cb -Author: Emanuele Aina -Date: Sat Jun 9 08:47:41 2007 +0000 - - Test gibber_xmpp_node_[gs]et_language() and node creation with a NULL name - - - 20070609084741-f974e-602d6f3a4ba28432895c80518d5ea7daa5c85389.gz - - tests/check-gibber-xmpp-node.c | 19 +++++++++++++++++++ - 1 files changed, 19 insertions(+), 0 deletions(-) - -commit 603b58abeae13ae1d77a36f7596261fe0ec237eb -Author: Emanuele Aina -Date: Fri Jun 8 23:38:59 2007 +0000 - - Added a real testcase for GibberXmppNode testing its istantiation - - - 20070608233859-f974e-2b0934c30930115018bba26ff98a1ea8c188bb38.gz - - tests/Makefile.am | 6 +++++- - tests/check-gibber-xmpp-node.c | 23 +++++++++++++++++++++++ - tests/check-gibber.h | 6 ++++++ - tests/check-main.c | 5 +++-- - 4 files changed, 37 insertions(+), 3 deletions(-) - -commit 1ed11190975100f68b6e3fdbcc96a8f12c3544b5 -Author: Emanuele Aina -Date: Fri Jun 8 23:26:22 2007 +0000 - - Added support for the Check unit testing framework - - - 20070608232622-f974e-8464ef6a8f51a46d31d1e1832bf7443111a1becd.gz - - configure.ac | 3 +++ - tests/Makefile.am | 10 ++++++++++ - tests/check-main.c | 29 +++++++++++++++++++++++++++++ - 3 files changed, 42 insertions(+), 0 deletions(-) - -commit c8f396ae71f561a50e4e383dec02007aa6be5430 -Author: Sjoerd Simons -Date: Thu Jun 14 15:31:06 2007 +0000 - - Remove some trailing spaces - - - 20070614153106-93b9a-69e1691737920c59ab89ccdfb8c6ac041acdc5b5.gz - - src/salut-contact-channel.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 8c6274a1f8bb9b0b1c7862156bbfc1afcaf1c795 -Author: Sjoerd Simons -Date: Thu Jun 14 15:29:02 2007 +0000 - - Don't do things with side-effects in asserts, bad! - - - 20070614152902-93b9a-77e036072852649ecbfb622014a610bdaabbee2e.gz - - lib/gibber/gibber-r-multicast-transport.c | 11 +++++++---- - src/salut-muc-channel.c | 4 +++- - src/salut-muc-manager.c | 6 ++++-- - 3 files changed, 14 insertions(+), 7 deletions(-) - -commit bd57687a700332bbcc4af2d640b5833c3e0340f9 -Author: Simon McVittie -Date: Tue Jun 12 14:59:37 2007 +0000 - - Support setting your own alias (uses the 'nick' field) - - - 20070612145937-53eee-39b2d1cf692a50857b4dc146d0d9aa703fbdc8d3.gz - - src/salut-connection.c | 30 ++++++++++++++++++++++++++++++ - src/salut-self.c | 22 ++++++++++++++++++++++ - src/salut-self.h | 3 +++ - 3 files changed, 55 insertions(+), 0 deletions(-) - -commit 4b1e3485dac40cd744fb856e19d2a60250ae4955 -Author: Simon McVittie -Date: Tue Jun 12 11:03:14 2007 +0000 - - Correct typo when constructing self alias - - - 20070612110314-53eee-c671c9538d428432236b690f1e0b0e429ed9f6a0.gz - - src/salut-self.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 80045812a71aeb7e6458f60cc030609098d73511 -Author: Simon McVittie -Date: Thu Jun 7 12:24:14 2007 +0000 - - Change TP_IFACE_OLPC_BUDDY_INFO back to SALUT_IFACE_OLPC_BUDDY_INFO now the constants generator is properly namespacing - - - 20070607122414-53eee-c48d75b9c38e3f6479e29d4307fd99d6f613eb77.gz - - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1029bcca5d967604fb1efa1482b818f790cfd3c3 -Author: Simon McVittie -Date: Thu Jun 7 12:20:35 2007 +0000 - - Resolve salut-connection.c - - - 20070607122035-53eee-05146e4c7835efded7bfe1768ea3ed6951c45830.gz - - src/salut-connection.c | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 88ffcb529642c292c75b24a31a65763e38ea8ab9 -Author: Simon McVittie -Date: Thu Jun 7 12:20:04 2007 +0000 - - Resolve extensions/Makefile.am - - - 20070607122004-53eee-9a1d4202543f5f10c62471a5d68f039d388ca24f.gz - - extensions/Makefile.am | 18 +++++++++++++++++- - 1 files changed, 17 insertions(+), 1 deletions(-) - -commit a9d4a4f8124ea42d7141abf84672a366cccba6bd -Author: Simon McVittie -Date: Thu Jun 7 12:12:05 2007 +0000 - - Update genginterface.py from telepathy-glib - - - 20070607121205-53eee-b2443e52ee0f55ca9ac091342fdc0a4936bf46f3.gz - - extensions/tools/genginterface.py | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 6e1ed7a03fdd32024c08a3f69f8a803df3d34cf4 -Author: Simon McVittie -Date: Thu Jun 7 12:07:23 2007 +0000 - - Update c-constants-generator from telepathy-glib (requires --stringparam mixed-case-prefix) - - - 20070607120723-53eee-9918302df001ec6649c73b5072c21c0454c4d4cb.gz - - extensions/tools/c-constants-generator.xsl | 134 ++++++++++++++++++++-------- - 1 files changed, 97 insertions(+), 37 deletions(-) - -commit 18981b9ccbee44b6db0dcbce68f4414db9585a11 -Author: Simon McVittie -Date: Thu Jun 7 11:45:38 2007 +0000 - - Update c-interfaces-generator.xsl from telepathy-glib. - - It now takes a --stringparam to set the prefix for interface constants. - Also use the generated SALUT_IFACE_OLPC_BUDDY_INFO in salut-connection.c. - - 20070607114538-53eee-7cdbed4e64c697c71f4364f3dfc3e869b6cd0551.gz - - extensions/Makefile.am | 16 +------ - extensions/tools/c-interfaces-generator.xsl | 70 ++++++++++++++++++++++----- - src/salut-connection.c | 4 ++ - 3 files changed, 62 insertions(+), 28 deletions(-) - -commit c8c309ddc557359c1cffa9f20117e84f8a15695d -Author: Sjoerd Simons -Date: Thu Jun 14 15:00:50 2007 +0000 - - Don't do things with side-effects in asserts, bad! - - - 20070614150050-93b9a-1bbf3a5834dcab4755d50601226817d6292612c9.gz - - src/salut-avahi-entry-group.c | 19 +++++++++++-------- - 1 files changed, 11 insertions(+), 8 deletions(-) - -commit b89bb172ce20ac7309917457bbf9c8db2b784469 -Author: Sjoerd Simons -Date: Thu Jun 14 14:59:26 2007 +0000 - - include avahi-common/malloc.h for the definition of avahi_free - - - 20070614145926-93b9a-c5a28c9350b995a1a8ac3c51ef231fce8bf9dd71.gz - - src/salut-avahi-entry-group.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 423ad7531a24978d9dac08936ad69cae29e71bab -Author: Sjoerd Simons -Date: Thu Jun 14 14:37:04 2007 +0000 - - Allow setting of arbitrary binary data in txt records - - - 20070614143704-93b9a-3c112c79012f9da3dc9f82286073db033c08beca.gz - - src/salut-avahi-entry-group.c | 141 +++++++++++++++++++++++++++++++++++------ - src/salut-avahi-entry-group.h | 8 ++- - 2 files changed, 127 insertions(+), 22 deletions(-) - -commit 1654222c2c5839affc67d8ce5ce6c30f8e80628c -Author: Sjoerd Simons -Date: Wed Jun 13 21:26:23 2007 +0000 - - salut_avahi_service_resolver_new should always be passed the specific interface/protocol, so replace _new by _new_full - - - 20070613212623-93b9a-943d132d86e4300168e62df70624c56aad17c14a.gz - - src/salut-avahi-service-resolver.c | 16 +++------------- - src/salut-avahi-service-resolver.h | 11 +++-------- - src/salut-contact.c | 8 ++++---- - 3 files changed, 10 insertions(+), 25 deletions(-) - -commit f6f0d4c3298957a5e5b34b0ef92d056ea5a00a33 -Author: Sjoerd Simons -Date: Wed Jun 13 16:17:40 2007 +0000 - - version 0.1.3.1 - - - 20070613161740-93b9a-b51fb26d80a5de655981530fc6d78880c0bc40cc.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1475e3df398ef7fc32e3e662b11796bc698b28bd -Author: Sjoerd Simons -Date: Wed Jun 13 16:16:41 2007 +0000 - - Listen to new and lost sender on the muc connection - - - 20070613161641-93b9a-3bea5e8704a8b57da423935635aebc257af6ce3d.gz - - src/salut-muc-channel.c | 53 ++++++++++++++++++++++++++++++++++++++++++---- - 1 files changed, 48 insertions(+), 5 deletions(-) - -commit 647ac636c37ebf7618ab42a2964f8db8fbb8e610 -Author: Sjoerd Simons -Date: Wed Jun 13 16:15:32 2007 +0000 - - Signal new and lost sender from the muc connection - - - 20070613161532-93b9a-e4bf9aaad0b83a4e8ee9d9294476ae3c0018e8bf.gz - - lib/gibber/gibber-muc-connection.c | 39 ++++++++++++++++++++++++++++++++++++ - 1 files changed, 39 insertions(+), 0 deletions(-) - -commit 8ce06cfa5d16d5e762169a730420b43b1bd10087 -Author: Sjoerd Simons -Date: Wed Jun 13 13:05:59 2007 +0000 - - version 0.1.3 - - - 20070613130559-93b9a-b3585b2ed41eb5231623cd47bb8e5a6fe251df18.gz - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 6fc3a913bbdd5fdb34dc3a7aab5f9ecdd1253a0c -Author: Sjoerd Simons -Date: Wed Jun 13 13:04:19 2007 +0000 - - Require that both nickname and published-name are non-empthy when set - - - 20070613130419-93b9a-fba1c90485b43f8ede046558646547dd17e1b254.gz - - src/salut-connection-manager.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit ef31885c1fe6daeac2250c464000d9d93547acf2 -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 - - lib/gibber/gibber-xmpp-stanza.c | 26 +++++++++++++++++--------- - 1 files changed, 17 insertions(+), 9 deletions(-) - -commit 4b995f539e49ecda7d849650370359a6c1c67b4b -Author: Guillaume Desmottes -Date: Wed Jun 13 08:50:15 2007 +0000 - - gibber-xmpp-stanza.c: use gibber_goto_if_reached and gibber_goto_if_fail during stanza build parsing to fix a leak - - - 20070613085015-7fe3f-6959e93f20bab7ce55761ba4a19d5cba606925ad.gz - - lib/gibber/gibber-xmpp-stanza.c | 14 ++++++++------ - 1 files changed, 8 insertions(+), 6 deletions(-) - -commit 9393c61604e578d3ac0e8c3834570db4ce56cee8 -Author: Guillaume Desmottes -Date: Wed Jun 13 08:49:50 2007 +0000 - - gibber-debug: add gibber_goto_if_reached and gibber_goto_if_fail macros - - - 20070613084950-7fe3f-279be93f5843f3e83cf19c8ea065266813e27e44.gz - - lib/gibber/gibber-debug.h | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+), 0 deletions(-) - -commit 1ff2c4f395dfe0cd9cde0e79f33f11a16c319626 -Author: Guillaume Desmottes -Date: Wed Jun 13 08:21:06 2007 +0000 - - gibber-xmpp-stanza.c: use g_return_if_reached instead of g_assert_not_reached during stanza_build args parsing - - - 20070613082106-7fe3f-fea96904e7c8341ec782ef7adb4010051b54c1fd.gz - - lib/gibber/gibber-xmpp-stanza.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 00afdaa005cd2cb1546c94d69b9a4af9a0a633c1 -Author: Guillaume Desmottes -Date: Wed Jun 13 08:18:50 2007 +0000 - - gibber-xmpp-stanza: typedef GibberBuildTag - - - 20070613081850-7fe3f-de42e6fe3365b02f563fea147bcf931159d0b0fc.gz - - lib/gibber/gibber-xmpp-stanza.c | 9 +++++---- - lib/gibber/gibber-xmpp-stanza.h | 4 ++-- - 2 files changed, 7 insertions(+), 6 deletions(-) - -commit 427122313388bf90812701e5fda5148a8dc6cd51 -Author: Guillaume Desmottes -Date: Tue Jun 12 16:37:54 2007 +0000 - - gibber-xmpp-stanza.c: use type_names array to find the optionnal NS associated with a type - - - 20070612163754-7fe3f-a3af4d83860cdfabecfcad53976adf601434aa4b.gz - - lib/gibber/gibber-xmpp-stanza.c | 42 +++++++++++++++++++++++--------------- - 1 files changed, 25 insertions(+), 17 deletions(-) - -commit ed6ec2ee7390c3e7873e83d398a461eed571b552 -Author: Guillaume Desmottes -Date: Tue Jun 12 16:26:37 2007 +0000 - - gibber-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 - - lib/gibber/gibber-xmpp-stanza.c | 122 +++++++++++++++++---------------------- - 1 files changed, 54 insertions(+), 68 deletions(-) - -commit 3a616787a66a1ee90a9fd1b1d831269abf6421d2 -Author: Guillaume Desmottes -Date: Tue Jun 12 16:24:11 2007 +0000 - - test-stanza-build.c: test if the stanza is not NULL - - - 20070612162411-7fe3f-aef253e629c40c91a313f405eb018c80cbd73c4f.gz - - tests/test-stanza-build.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit ce91bad9157c05d576e449d0f60f7fa4738f1a91 -Author: Guillaume Desmottes -Date: Tue Jun 12 14:24:34 2007 +0000 - - gibber-namespaces.h: add #define test to protect against multi inclusion - - - 20070612142434-7fe3f-09ccbc7bd36ab724a53220376d1e7c46c842b4f8.gz - - lib/gibber/gibber-namespaces.h | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 9cc0ad5a07afbbba57b5e4f5c1a9df5359e6c56f -Author: Guillaume Desmottes -Date: Tue Jun 12 13:23:50 2007 +0000 - - gibber-xmpp-stanza.c: properly handle STREAM types - - - 20070612132350-7fe3f-7d209e6f707c34287d5bf777d569184ae06e8204.gz - - lib/gibber/gibber-xmpp-stanza.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit 3eb52d74dbb79cffe1463b93797dc49dcb497cf0 -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 - - lib/gibber/gibber-xmpp-stanza.c | 92 +++++++++++++++----------------------- - lib/gibber/gibber-xmpp-stanza.h | 2 +- - tests/test-stanza-build.c | 2 +- - 3 files changed, 38 insertions(+), 58 deletions(-) - -commit 772202783883c18c0ec63995dc0b0208611fd355 -Author: Guillaume Desmottes -Date: Tue Jun 12 12:42:10 2007 +0000 - - gibber-xmpp-stanza.c: use static array instead of big switch to find type's name - - - 20070612124210-7fe3f-09e3c49ea8a4d1d3c76d1b7474082e771cf75bab.gz - - lib/gibber/gibber-xmpp-stanza.c | 65 ++++++++++++++++---------------------- - lib/gibber/gibber-xmpp-stanza.h | 2 +- - 2 files changed, 28 insertions(+), 39 deletions(-) - -commit fb791275bc07900dc4cbfc980e0582b636aaa54a -Author: Guillaume Desmottes -Date: Tue Jun 12 11:33:57 2007 +0000 - - gibber-xmpp-stanza.c: use g_slist_delete_link instead of 4 instructions doing exactly that - - - 20070612113357-7fe3f-d5ec9f715c4648b185b34189b65e2fcf5981818b.gz - - lib/gibber/gibber-xmpp-stanza.c | 8 ++------ - 1 files changed, 2 insertions(+), 6 deletions(-) - -commit ca10f956000fb9bd19b5093320e8f9dc1cc45ab0 -Author: Guillaume Desmottes -Date: Tue Jun 12 11:18:15 2007 +0000 - - gibber-xmpp-stanza.c: remove useless case GIBBER_STANZA_END in gibber_xmpp_stanza_build parsing - - - 20070612111815-7fe3f-4cc369ea682244bda2023a2139e745de97de32dc.gz - - lib/gibber/gibber-xmpp-stanza.c | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit cd5d8b9845f183ff3c717a64104105955a970f31 -Author: Guillaume Desmottes -Date: Tue Jun 12 11:02:56 2007 +0000 - - gibber-debug.c: fix a leak in gibber_debug_stanza - - - 20070612110256-7fe3f-877bb91429285528b2850f12fa6de368b8abc29d.gz - - lib/gibber/gibber-debug.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 51348718f29d85f6f3a9a726f87375d0f1956149 -Author: Guillaume Desmottes -Date: Tue Jun 12 10:44:36 2007 +0000 - - test-stanza-build.c: we have to unref the stanza - - - 20070612104436-7fe3f-96c4d540a7c5d54630c3c52623da11559971f8c7.gz - - tests/test-stanza-build.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b2d7b6352984f8cf48937dfae743a5d00c0ea8c8 -Author: Guillaume Desmottes -Date: Tue Jun 12 10:14:34 2007 +0000 - - add a gibber_xmpp_stanza_build simple test - - - 20070612101434-7fe3f-0f3766f0c9925d7363f5799ad1d576bdf9a12116.gz - - tests/Makefile.am | 13 ++++++- - tests/test-stanza-build.c | 87 +++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 99 insertions(+), 1 deletions(-) - -commit 0223d88c3837cebb3c18f3459c0fdc9d901ed4b3 -Author: Guillaume Desmottes -Date: Tue Jun 12 10:13:18 2007 +0000 - - gibber-xmpp-stanza: implement gibber_xmpp_stanza_build - - - 20070612101318-7fe3f-b362200f7804bace88b1c37e219a7c2a6dfd6b5e.gz - - lib/gibber/gibber-xmpp-stanza.c | 307 ++++++++++++++++++++++++++++++++++++++- - lib/gibber/gibber-xmpp-stanza.h | 54 +++++++- - 2 files changed, 359 insertions(+), 2 deletions(-) - -commit 18ad4081a2442f34dfaae1302a6777dc0e80361d -Author: Guillaume Desmottes -Date: Mon Jun 11 18:17:48 2007 +0000 - - move DEBUG_STANZA to gibber-debug - - - 20070611181748-7fe3f-e4fe05a3b32cde8da6bbafc991d35af099fd2f4f.gz - - lib/gibber/gibber-debug.c | 84 +++++++++++++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-debug.h | 11 ++++++ - src/debug.c | 79 ------------------------------------------ - src/debug.h | 7 ---- - 4 files changed, 95 insertions(+), 86 deletions(-) - -commit 9b45f533cc0aede2299952683dee04534b0477a8 -Author: Guillaume Desmottes -Date: Mon Jun 11 17:44:46 2007 +0000 - - resolve conflict in src/debug.h due to merge with barisione's branch - - - 20070611174446-7fe3f-1eb4ae6a5d90014732e1ad9c0ca147fbcefd9440.gz - - src/debug.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 779a76841a2d6d09afcd8b9f95c429eeacc23efb -Author: Simon McVittie -Date: Wed Jun 6 17:53:25 2007 +0000 - - Resolve src/debug.h - - - 20070606175325-53eee-2940ac9e776631cfbebb4573a969fa2391b2f975.gz - - src/debug.h | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 861730196211c43a89075dde1ee1df07cd9dd976 -Author: Marco Barisione -Date: Sun May 27 14:08:36 2007 +0000 - - Print the namespace of tags in debug_stanza - - - 20070527140836-f1355-f2ddf6423c342fb4dedf975ae8f2d32c9d3e8466.gz - - src/debug.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 6689ad07db97c1ffa3942b40cbd0e96f15765cff -Author: Marco Barisione -Date: Thu May 17 17:33:55 2007 +0000 - - Add a DEBUG_STANZA macro to print the content of a stanza - - - 20070517173355-f1355-864dc5d2fc6ea51fb276d7da1994a2922dd254bf.gz - - src/debug.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/debug.h | 9 +++++++ - 2 files changed, 83 insertions(+), 0 deletions(-) - -commit 03dde9046aed90304ac17b337e22b6bab56c8b1c -Author: Guillaume Desmottes -Date: Fri Jun 8 09:47:09 2007 +0000 - - salut-im-manager: return TP_CHANNEL_FACTORY_REQUEST_STATUS_NOT_AVAILABLE when requesting a channel with a unknown contact (fix a crasher) - - - 20070608094709-7fe3f-8ddf9cbed1edfe81e4723ff60d2cd95e095af932.gz - - src/salut-im-manager.c | 15 +++++++++------ - 1 files changed, 9 insertions(+), 6 deletions(-) - -commit 7499de1dffb60756506077452e6d540bf44c4dfd -Author: Sjoerd Simons -Date: Tue Jun 12 16:18:38 2007 +0000 - - Remove salut-muc-transport-iface, it's not used anymore - - - 20070612161838-93b9a-6fa97bae2317380dee90b15e4bc27aaa3c260948.gz - - src/Makefile.am | 2 - - src/salut-muc-transport-iface.c | 107 --------------------------------------- - src/salut-muc-transport-iface.h | 76 --------------------------- - 3 files changed, 0 insertions(+), 185 deletions(-) - -commit ac156549d30ab1df1e9df607d0f1996baf803fe9 -Author: Sjoerd Simons -Date: Tue Jun 12 16:09:01 2007 +0000 - - Move SalutMucConnection to gibber as GibberMucConnection - - - 20070612160901-93b9a-3c886d3735de02ed4b8193747040b2d2aff41ae0.gz - - lib/gibber/Makefile.am | 17 +- - lib/gibber/gibber-debug.c | 1 + - lib/gibber/gibber-debug.h | 1 + - .../gibber-muc-connection-signals-marshal.list | 1 + - lib/gibber/gibber-muc-connection.c | 536 ++++++++++++++++++++ - lib/gibber/gibber-muc-connection.h | 110 ++++ - src/Makefile.am | 7 +- - src/salut-muc-channel.c | 23 +- - src/salut-muc-connection-signals-marshal.list | 1 - - src/salut-muc-connection.c | 536 -------------------- - src/salut-muc-connection.h | 110 ---- - src/salut-muc-manager.c | 16 +- - 12 files changed, 680 insertions(+), 679 deletions(-) - -commit 9d4e97caca1ed4979c3adbf11a8c71592a742de6 -Author: Sjoerd Simons -Date: Tue Jun 12 12:55:44 2007 +0000 - - Don't try to marshal enum's as int's - - - 20070612125544-93b9a-beae9f950dd8049c26b49ff45cde11d31ec4efdd.gz - - src/salut-avahi-client-signals-marshal.list | 2 +- - src/salut-avahi-client.c | 2 +- - src/salut-avahi-entry-group-signals-marshal.list | 2 +- - src/salut-avahi-entry-group.c | 2 +- - ...salut-avahi-record-browser-signals-marshal.list | 2 +- - src/salut-avahi-record-browser.c | 4 ++-- - ...alut-avahi-service-browser-signals-marshal.list | 2 +- - src/salut-avahi-service-browser.c | 4 ++-- - ...lut-avahi-service-resolver-signals-marshal.list | 2 +- - src/salut-avahi-service-resolver.c | 2 +- - 10 files changed, 12 insertions(+), 12 deletions(-) - -commit 6c0c54bb2e90c98afdb225a950421dc3d5399de0 -Author: Sjoerd Simons -Date: Mon Jun 11 14:22:59 2007 +0000 - - Don't ref the SalutConnection in SalutMucChannel - - - 20070611142259-93b9a-9c3a9c9d952caf4e7939bf2c7ed942b58626d39f.gz - - src/salut-muc-channel.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 59523236d42b43be19320bc2ec22a72bb1fcdefd -Author: Sjoerd Simons -Date: Mon Jun 11 14:22:09 2007 +0000 - - Give an NOT_AVAILABLE error instead of INVALID_ARGUMENT when asking olpc properties for an offline contact - - - 20070611142209-93b9a-fc894e3b9bbe4ba814a9e9a82d526e21b9c352fc.gz - - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 09044e8df65c2bef92f029682ff58865d420adf0 -Author: Sjoerd Simons -Date: Mon Jun 11 14:21:26 2007 +0000 - - Return "" when requesting aliases for an offline contact - - - 20070611142126-93b9a-b30ffce6063088d1e36dba70e72fafb35b3ef160.gz - - src/salut-connection.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -commit 2a3301689bdcb2d21d04d4bdedb34418d07ac416 -Author: Sjoerd Simons -Date: Mon Jun 11 13:01:12 2007 +0000 - - Fix some silly memleaks in gibber-xmpp-node, spotted by Marco Barisione and Mikael Hallendal - - - 20070611130112-93b9a-24d1d091e1c29656fbb77310229ac46ab8a6a646.gz - - lib/gibber/gibber-xmpp-node.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit c875658211adb4cc64254b392fe1eb8c5729b415 -Author: Sjoerd Simons -Date: Mon Jun 11 11:04:15 2007 +0000 - - Properly unref the multicast and rmulticast transports - - - 20070611110415-93b9a-532fa26a024f55e9180d13b10298f5fe4d6aa2c7.gz - - src/salut-muc-connection.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 4dc1b4afc05d7d24ebf0ec506eb15557af92d066 -Author: Sjoerd Simons -Date: Mon Jun 11 10:41:35 2007 +0000 - - Use max_packet_size of the underlying transport instead of hardcoding 1500 - - - 20070611104135-93b9a-6ebb0047930b8f8eda8e6728479b2cce08417cbd.gz - - lib/gibber/gibber-r-multicast-transport.c | 13 ++++++++++--- - 1 files changed, 10 insertions(+), 3 deletions(-) - -commit f0939ba9aacf28cb7bdb206c20311deeff6c125c -Author: Sjoerd Simons -Date: Mon Jun 11 10:40:30 2007 +0000 - - GibberMulticastTransport: Set max_packet_size - - - 20070611104030-93b9a-35f96be931b8d615d402218d39f29dccedf0c716.gz - - lib/gibber/gibber-multicast-transport.c | 9 +-------- - 1 files changed, 1 insertions(+), 8 deletions(-) - -commit c471bfb221766f41f68571867c434d036f4dc572 -Author: Sjoerd Simons -Date: Mon Jun 11 10:34:39 2007 +0000 - - Put the packet to repair in the receivers list so the sender in the packet is always the one who originally sent the packet - - - 20070611103439-93b9a-45df6116eb6a45ca705377060477fe78cfd19a41.gz - - lib/gibber/gibber-r-multicast-transport.c | 31 +++++++++++++++++++++------- - 1 files changed, 23 insertions(+), 8 deletions(-) - -commit 14f511bb193cca4e30408856ea07fa7a19167234 -Author: Sjoerd Simons -Date: Mon Jun 11 10:33:16 2007 +0000 - - Enabled multicast looping - - - 20070611103316-93b9a-ee40230a89b0d7a1d30a63747bb7f009b47d5b87.gz - - lib/gibber/gibber-multicast-transport.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 65ea96d0e10748c31857440bb39a2f91e946fa69 -Author: Sjoerd Simons -Date: Mon Jun 11 09:39:10 2007 +0000 - - No need to pass the name parameter to _get_connection, it's always the same - - - 20070611093910-93b9a-709b2114b626f475df1f88082c38407ae23855a9.gz - - src/salut-muc-manager.c | 13 ++++++------- - 1 files changed, 6 insertions(+), 7 deletions(-) - -commit 02a974c9e1e9f7928d9c0e7c844f1f8d7a805211 -Author: Sjoerd Simons -Date: Mon Jun 11 09:35:40 2007 +0000 - - SalutMucConnection: Use the right marshaller for receveived-stanza - - - 20070611093540-93b9a-5a791e70de5a01473a0c4feccc6dbc0aac4bcd89.gz - - src/salut-muc-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit be3c8b0a4f867d996804bc4eb8608eb4d0405541 -Author: Sjoerd Simons -Date: Mon Jun 11 09:35:00 2007 +0000 - - Use the right signature for the received-stanza signal from a salut-muc-connection - - - 20070611093500-93b9a-3b04bf24e79143d5f26455d31f07664e098eab04.gz - - src/salut-muc-channel.c | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 4fa157af56da83b1319b1d8d406534a7f0854fdf -Author: Sjoerd Simons -Date: Sun Jun 10 19:09:59 2007 +0000 - - Properly return errors if we can't connect to the multicast channel in RequestChannel. Listen to signals on the muc-connection instead of it's transports - - - 20070610190959-b58c9-cb1847b070c9ba87ff2e0833e90295c547819df8.gz - - src/salut-muc-channel.c | 34 ++++++++--------------- - src/salut-muc-channel.h | 8 +++--- - src/salut-muc-connection.c | 63 +++++++++++++++++++++++++++++++++++++++---- - src/salut-muc-connection.h | 9 +++++- - src/salut-muc-manager.c | 58 +++++++++++++++++++++++++-------------- - 5 files changed, 118 insertions(+), 54 deletions(-) - -commit 869e84b751edf823b0f003eb86fc068ae5b1b47f -Author: Sjoerd Simons -Date: Sun Jun 10 19:07:57 2007 +0000 - - Output transport errors as debug too - - - 20070610190757-b58c9-086462bdf1f535ee996c1f1ce867b3ed6fb0ac57.gz - - lib/gibber/gibber-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit efa3b3765c54c92fdf64134765009c2c85438807 -Author: Sjoerd Simons -Date: Sun Jun 10 19:07:25 2007 +0000 - - Check setsockopt returns and return/set error on failure. Also not that SO_REUSEADDR needs an int optval instead of unsigned char - - - 20070610190725-b58c9-36295ae5d0936bb68a430c88cca5653ce9fa00e0.gz - - lib/gibber/gibber-multicast-transport.c | 56 ++++++++++++++++--------------- - 1 files changed, 29 insertions(+), 27 deletions(-) - -commit b33bfab89d74a234a6d37c3f70b049f90973cd51 -Author: Sjoerd Simons -Date: Sat Jun 9 12:01:06 2007 +0000 - - Streaming property no long exists - - - 20070609120106-b58c9-591196b73410755f9547fcba3db24a3ee42d6236.gz - - lib/gibber/gibber-xmpp-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bf2f0ec2a6fc585ec6510ebcc08b14e4857c0cb3 -Author: Sjoerd Simons -Date: Sat Jun 9 10:14:25 2007 +0000 - - Actually disconnect from the rmulticast channel when the muc channel is closed - - - 20070609101425-b58c9-5362a8dcabdb542790a325380874eaf646433a4d.gz - - src/salut-muc-channel.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 6faa91e6d3c3f36937efde46e53463ddaf426440 -Author: Sjoerd Simons -Date: Sat Jun 9 10:12:29 2007 +0000 - - Disconnect the multicast transport if the rmulticast connection function returned an error - - - 20070609101229-b58c9-373534290e9779e573cc5ccb33272eb400f2bbb9.gz - - src/salut-muc-connection.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 3b07bdfb00a13273e3c76bb674e333e912dc1dd7 -Author: Sjoerd Simons -Date: Sat Jun 9 10:11:47 2007 +0000 - - Add _disconnect api to SalutMucConnection - - - 20070609101147-b58c9-03b852e2cb87a328758adb64651480a159688e27.gz - - src/salut-muc-connection.c | 5 +++++ - src/salut-muc-connection.h | 3 +++ - 2 files changed, 8 insertions(+), 0 deletions(-) - -commit 0f33c4e4bb085cb2e56f9308f7fae6869e8c5499 -Author: Sjoerd Simons -Date: Sat Jun 9 10:10:45 2007 +0000 - - Remove the session timeout on dispose and disconnect - - - 20070609101045-b58c9-1df0d4bee059979dd26e8570a4cc45979ac1700a.gz - - lib/gibber/gibber-r-multicast-transport.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 05db9d0ca305438065a33b46e552b30fe539f2b8 -Author: Sjoerd Simons -Date: Fri Jun 8 20:57:27 2007 +0000 - - Make salut-muc-connection a full transport handler instead of a child of gibberxmppconnection, so we can handle the extra info send by the rmulticast protocol. Also remove the plain multicast option, it's not worth it to support both - - - 20070608205727-b58c9-b30877fee39718d4a8bacf48eab5d692c481b013.gz - - src/salut-muc-channel.c | 135 +-------------------- - src/salut-muc-connection-signals-marshal.list | 1 + - src/salut-muc-connection.c | 161 ++++++++++++++++++------- - src/salut-muc-connection.h | 12 ++- - 4 files changed, 133 insertions(+), 176 deletions(-) - -commit 6472b6bfca85ada59b7c81246b2d441e7a379854 -Author: Sjoerd Simons -Date: Fri Jun 8 20:55:58 2007 +0000 - - Remove non-streaming mode - - - 20070608205558-b58c9-1f43c402d842d1568296e44f0d45dc6028af7ffc.gz - - lib/gibber/gibber-xmpp-connection.c | 83 +++-------------------------------- - lib/gibber/gibber-xmpp-connection.h | 3 - - 2 files changed, 7 insertions(+), 79 deletions(-) - -commit c5ac6964c4ebec1d182ac54fd79db17d38a01c5f -Author: Sjoerd Simons -Date: Fri Jun 8 16:20:31 2007 +0000 - - emit new-sender signal when new senders are detected - - - 20070608162031-b58c9-51e4284da0092abc3fa4a41aa6982c7dd3be29ea.gz - - lib/gibber/gibber-r-multicast-transport.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 8183528e56ff632441bfe0edae76119d2238a473 -Author: Sjoerd Simons -Date: Fri Jun 8 16:16:47 2007 +0000 - - Let the mesh take into account the sender info - - - 20070608161647-b58c9-650fe35a23bc489e19e5bcac2075ce72eecf0ebb.gz - - tests/mesh.py | 31 +++++++++++++++++++++++-------- - tests/simplemeshtest.py | 8 +++++++- - tests/test-r-multicast-transport-io.c | 14 +++++++++++++- - 3 files changed, 43 insertions(+), 10 deletions(-) - -commit b9c2ffd407a9c7dd30b01ded790ad1d358db1eb4 -Author: Sjoerd Simons -Date: Fri Jun 8 16:15:44 2007 +0000 - - Add a custom buffer derivative for GibberRMulticast - - - 20070608161544-b58c9-24119bbe85dc296dbd74390cb0f7b80961812276.gz - - lib/gibber/gibber-r-multicast-transport.c | 7 ++++++- - lib/gibber/gibber-r-multicast-transport.h | 5 +++++ - 2 files changed, 11 insertions(+), 1 deletions(-) - -commit b2cc6c6ded0c139887c34b42a4ae296bd94558b6 -Author: Sjoerd Simons -Date: Fri Jun 8 15:48:40 2007 +0000 - - Allow subclasses to send custom GibberBuffer derivatives to upstream - - - 20070608154840-b58c9-17406fee1945c5ea7f7d7bbc82378a40aab53440.gz - - lib/gibber/gibber-transport.c | 8 +++++++- - lib/gibber/gibber-transport.h | 4 ++++ - 2 files changed, 11 insertions(+), 1 deletions(-) - -commit 19134ee353f2ad645b0a6d1514e4fc6d89b5db31 -Author: Sjoerd Simons -Date: Fri Jun 8 11:51:31 2007 +0000 - - Be better in detecting no command output - - - 20070608115131-93b9a-b92a22f53b771de026083d47877bde535425d21d.gz - - tests/mesh.py | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) - -commit 5298cc16713069c25bef7d0626b377f09574e137 -Author: Sjoerd Simons -Date: Fri Jun 8 11:50:54 2007 +0000 - - Print the process node and pid, usefull for debugging - - - 20070608115054-93b9a-bec9721b79d6d1c0026be90dcd481533f4439e38.gz - - tests/test-r-multicast-transport-io.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 9a268afdd0ed726f6fa77b5dcd9946a4e99fef83 -Author: Sjoerd Simons -Date: Fri Jun 8 11:50:08 2007 +0000 - - Don't add new senders to the session packet, there isn't any usefull info just yet - - - 20070608115008-93b9a-bf24cc02a3e7fce689921f6ff34fc225b7c94a1a.gz - - lib/gibber/gibber-r-multicast-transport.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit e25f8636a14783518ff671aadd7c4f6a34a05357 -Author: Sjoerd Simons -Date: Fri Jun 8 11:49:34 2007 +0000 - - Various fixes caused by the change in semantic of the packet_id in the een packet and the extra state - - - 20070608114934-93b9a-0dcc898c833b7f4ce3ed928a2c3f79f6e89d1100.gz - - lib/gibber/gibber-r-multicast-sender.c | 27 +++++++++++++++++++-------- - 1 files changed, 19 insertions(+), 8 deletions(-) - -commit 5450fab71f9d8cdb7763c9db29989079be3fecf5 -Author: Sjoerd Simons -Date: Fri Jun 8 09:44:04 2007 +0000 - - Handle the cases where _repair and/or _seen are called before _push - - - 20070608094404-93b9a-97f25f6eebcc07133879462c059b0a78d7782ba0.gz - - lib/gibber/gibber-r-multicast-sender.c | 42 +++++++++++++++++++++++++++---- - 1 files changed, 36 insertions(+), 6 deletions(-) - -commit dba6834c308cd7ea69114f3106207f06a2b8fc42 -Author: Sjoerd Simons -Date: Fri Jun 8 09:22:08 2007 +0000 - - Test with multiple offsets and calling _seen and _repair before _push - - - 20070608092208-93b9a-4b789b9b96a17ba4580011d070aa29388c41df2d.gz - - tests/test-r-multicast-sender.c | 72 +++++++++++++++++++++++++++++--------- - 1 files changed, 55 insertions(+), 17 deletions(-) - -commit 1a879bc171db78192abaf3144d6cc2dfe9c7c571 -Author: Sjoerd Simons -Date: Fri Jun 8 09:21:07 2007 +0000 - - Don't init two different states to the same value - - - 20070608092107-93b9a-629df4a2a2a34bf47819601f5ae2d12ba2eb2dad.gz - - lib/gibber/gibber-r-multicast-sender.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1e4299f11dff5ac12c94312735da88484ed1fd82 -Author: Sjoerd Simons -Date: Thu Jun 7 15:34:19 2007 +0000 - - test-r-multicast-sender: Improve macro's so they will react correctly on overflow - - - 20070607153419-93b9a-fc3a677ba8170c38608f8da073b66b42c43dad17.gz - - tests/test-r-multicast-sender.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit bf81ccc6df84fbdc439b79a929b71b4a238eebf5 -Author: Sjoerd Simons -Date: Thu Jun 7 15:28:23 2007 +0000 - - Fix the behaviour that diff(a,b) == -diff(a,b) - - - 20070607152823-93b9a-389884ffd15e8e7be47fc0fb9b183b1be0fe14b9.gz - - lib/gibber/gibber-r-multicast-packet.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 14d3f37a80e55736db7eef43fbbc37f2d88f0cda -Author: Sjoerd Simons -Date: Thu Jun 7 15:27:47 2007 +0000 - - Add the behaviour that diff(a,b) == -diff(a,b) - - - 20070607152747-93b9a-d45be56cd9ab761fa6217265d5264c5dab97c7fb.gz - - tests/test-r-multicast-packet.c | 14 +++++++++----- - 1 files changed, 9 insertions(+), 5 deletions(-) - -commit c84753dc12fc2273a004e104c7730f3a44cf7b4e -Author: Sjoerd Simons -Date: Thu Jun 7 14:29:52 2007 +0000 - - Fix silly errors gibber_r_multicast_packet_diff - - - 20070607142952-93b9a-27c8a4acfaa945d2a26e734d426258e513a4af9c.gz - - lib/gibber/gibber-r-multicast-packet.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 22e498ea487b9a1329ef20b47db04f1845a197d2 -Author: Sjoerd Simons -Date: Thu Jun 7 14:27:20 2007 +0000 - - Add a test for gibber_r_multicast_packet_diff - - - 20070607142720-93b9a-48f4e64599e4d3eb75080d9bb28bdd97aa4aa5c6.gz - - tests/test-r-multicast-packet.c | 39 +++++++++++++++++++++++++++++++++++++++ - 1 files changed, 39 insertions(+), 0 deletions(-) - -commit 28ee0f68f9a8849cfbb7abc0fc567daf1487218d -Author: Sjoerd Simons -Date: Thu Jun 7 13:15:47 2007 +0000 - - Correctly detect out of range packets - - - 20070607131547-93b9a-2441b4d8c75706bb5d0e681e3a29f97833796aac.gz - - lib/gibber/gibber-r-multicast-sender.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 489ce7e169ccf97e2444043015088c4d4e863c46 -Author: Sjoerd Simons -Date: Thu Jun 7 13:00:50 2007 +0000 - - Use guint32 for the serial everywhere, to get the right overflow behaviour - - - 20070607130050-93b9a-debd298832fef28f1c615abba8dc6109780d89ff.gz - - tests/test-r-multicast-sender.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 09cb8e920f84327b425c9df5ad85d33fb1a1b74a -Author: Sjoerd Simons -Date: Thu Jun 7 12:58:18 2007 +0000 - - Test at the point of id counter overflow - - - 20070607125818-93b9a-9c0ccd3ffeaa2f36eb196e3b01b43f94a9c714fa.gz - - tests/test-r-multicast-sender.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b84c9382131238039bbf97aa9c824a6bf47e8a74 -Author: Guillaume Desmottes -Date: Thu Jun 7 12:52:28 2007 +0000 - - salut-im-channel.h: more coding style tweaks - - - 20070607125228-7fe3f-b1276ce058ca67f31755e4cff8c3aea91773d7e5.gz - - src/salut-im-channel.h | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 86599c7de2204cd95c9c00f73c178cecebe3a5fe -Author: Guillaume Desmottes -Date: Thu Jun 7 12:45:12 2007 +0000 - - salut-im-channel.c: tweak to fit Collabora coding style - - - 20070607124512-7fe3f-1f71fadbc21624f848f8d8ff59fffc8c9a73cc9b.gz - - src/salut-im-channel.c | 914 ++++++++++++++++++++++++++---------------------- - 1 files changed, 494 insertions(+), 420 deletions(-) - -commit 31b638d516abf5ef418fcd56dbea04f14fd1a19f -Author: Guillaume Desmottes -Date: Thu Jun 7 12:08:11 2007 +0000 - - salut-im-channel.h: tweak to fit Collabora coding style - - - 20070607120811-7fe3f-0771ec994f1fceeeb089536897b566221f15af25.gz - - src/salut-im-channel.h | 19 +++++++++++-------- - 1 files changed, 11 insertions(+), 8 deletions(-) - -commit 3eb5ca2fb342f46468a504d3f2d3bf771235bddc -Author: Sjoerd Simons -Date: Thu Jun 7 12:55:59 2007 +0000 - - Let the sender keep a record of the next packet it expects as input, instead of the last packet it got as input - - - 20070607125559-93b9a-be3232009bc2e14339f7391502313ea8c2d545c3.gz - - lib/gibber/gibber-r-multicast-sender.c | 62 +++++++++++++++-------------- - lib/gibber/gibber-r-multicast-sender.h | 12 ++++-- - lib/gibber/gibber-r-multicast-transport.c | 6 ++- - 3 files changed, 44 insertions(+), 36 deletions(-) - -commit 495ea682869cd7a68d7035eac37a71da00d5aaa6 -Author: Guillaume Desmottes -Date: Thu Jun 7 11:12:12 2007 +0000 - - salut-im-manager.c: tweaks to fit Collabora coding style - - - 20070607111212-7fe3f-c4016123468b82a15ba9f6e12fed08f53e1d7fa2.gz - - src/salut-im-manager.c | 592 +++++++++++++++++++++++++----------------------- - 1 files changed, 313 insertions(+), 279 deletions(-) - -commit 5e1fec73fa45d51447190b67825d3c9f366e6b9f -Author: Guillaume Desmottes -Date: Thu Jun 7 10:38:16 2007 +0000 - - salut-im-manager.h: tweaks to fit Collabora coding style - - - 20070607103816-7fe3f-1b84c7cd3d85ae9e3c847a2824f0c01149ae0c1b.gz - - src/salut-im-manager.h | 20 ++++++++++++-------- - 1 files changed, 12 insertions(+), 8 deletions(-) - -commit 628ed27fbf01aa2e6b351289dd394b7e180f153b -Author: Guillaume Desmottes -Date: Thu Jun 7 09:20:53 2007 +0000 - - use generated TP_IFACE_OLPC_BUDDY_INFO - - - 20070607092053-7fe3f-08cd2b90b4ed04fff6818b9fea0296bb0ebf263f.gz - - src/salut-connection.c | 6 +----- - 1 files changed, 1 insertions(+), 5 deletions(-) - -commit af44794b437af8752a314522364f11b93ee3c48b -Author: Simon McVittie -Date: Wed Jun 6 17:52:25 2007 +0000 - - Add Channel_Type_File_Transfer.xml to all.xml - - - 20070606175225-53eee-fdda8cdc858c978f1c6007cd6146b698b51c770c.gz - - extensions/all.xml | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 45ec7864542610cabf633edc7cce55ddf4e4619b -Author: Simon McVittie -Date: Wed Jun 6 17:51:18 2007 +0000 - - Fix conflict in extensions/ in favour of using normal extension build process for everything, even with --disable-olpc - - - 20070606175118-53eee-210ac216bf7e178ef2c1589f9c4b5d06c5ed64f4.gz - - extensions/Makefile.am | 47 ++++++++++++++++++++++----------------------- - extensions/spec-ft-gen.am | 6 ----- - extensions/spec-gen.am | 6 ----- - 3 files changed, 23 insertions(+), 36 deletions(-) - -commit c5b3a15a9258fb666118e0c15c174bb2027a613a -Author: Simon McVittie -Date: Wed Jun 6 17:50:11 2007 +0000 - - Remove extensions/spec-gen.am (no longer used) - - - 20070606175011-53eee-65be44e03e2170d05099de7079721ff73466c310.gz - - extensions/spec-gen.am | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit e35fbd550e4b567a82ff1c3d21f9369a72e81a01 -Author: Marco Barisione -Date: Tue Jun 5 16:55:43 2007 +0000 - - Emit the "connected" signal when a connection is established - - - 20070605165543-f1355-a37bf5c4d64c08f88f8171a412e376e75dd00d3e.gz - - src/salut-im-channel.c | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -commit f29d172a28b5de6771a366be8073d01c1b9fc665 -Author: Marco Barisione -Date: Tue May 29 14:02:33 2007 +0000 - - Make the published name configurable - - - 20070529140233-f1355-7f1d63da6dc1824e3bd217520a0ff131181a8610.gz - - src/salut-connection-manager.c | 6 ++++++ - src/salut-connection.c | 18 +++++++++++++++++- - src/salut-self.c | 13 +++++++++++-- - src/salut-self.h | 3 ++- - 4 files changed, 36 insertions(+), 4 deletions(-) - -commit 905c9ba60862a801227396943ddea07310c7b96d -Author: Marco Barisione -Date: Fri May 18 20:59:46 2007 +0000 - - Link libsalut-extensions even if OLPC extensions are not enabled - - - 20070518205946-f1355-679bf66bdc77bb3964fb264d5d61456ec418ce22.gz - - src/Makefile.am | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit e213fd234cc910a7a24f244f15af819ba2d07d7d -Author: Marco Barisione -Date: Tue May 15 19:14:56 2007 +0000 - - Add a copy of the file transfer interface to the extensions dir - - - 20070515191456-f1355-d83b1a705a3ee0f0d6793b5e06a86d40e41302fe.gz - - extensions/Channel_Type_File_Transfer.xml | 229 +++++++++++++++++++++++++++++ - extensions/Makefile.am | 47 +++--- - extensions/spec-ft-gen.am | 6 + - extensions/spec-gen.am | 12 +- - 4 files changed, 265 insertions(+), 29 deletions(-) - -commit 1fbb238def8b110d52537ac41b236f62c79c411f -Author: Simon McVittie -Date: Wed Jun 6 17:37:29 2007 +0000 - - Fix out-of-tree tests - - - 20070606173729-53eee-80a314a88f338b125daf139dae051cc28bd52246.gz - - tests/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6c283e2288d9656349f6911182f27be2c07663a7 -Author: Simon McVittie -Date: Wed Jun 6 17:34:00 2007 +0000 - - Use correct member to store JID. Fix compilation without --enable-olpc - - - 20070606173400-53eee-71a318a8d0b2c741ac0c0f816597182b16262847.gz - - src/salut-contact.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 8af10a1d8cceb60663417d89cb62f7ee7ad6c80d -Author: Simon McVittie -Date: Wed Jun 6 17:31:04 2007 +0000 - - Include gibber-r-multicast-sender-signals-marshal.list in dist - - - 20070606173104-53eee-aa4c5b5f87fd078f5ca111e38196771045bb0659.gz - - lib/gibber/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 2c35c3b4c3d6312866335a7f9c0e762ce25400d3 -Author: Simon McVittie -Date: Wed Jun 6 17:29:06 2007 +0000 - - extensions/Makefile.am: get all.xml from $(srcdir) - - - 20070606172906-53eee-2a28d52a045207de41a4abd5dc2a4eb7af9ed861.gz - - extensions/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 95a759c903aa8d029e6d66833fd9f84bda8c8668 -Author: Simon McVittie -Date: Wed Jun 6 17:26:27 2007 +0000 - - Add _boring - - - 20070606172627-53eee-f77fa53bca3a94a7ed5c9b9eda57a9d65fc1021f.gz - - _boring | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 67 insertions(+), 0 deletions(-) - -commit 05844235a1b8d21bfed48adf0a069d70f6997a0e -Author: Simon McVittie -Date: Wed Jun 6 17:13:50 2007 +0000 - - tests/: make sure test scripts are executable - - - 20070606171350-53eee-124fa868c9ab5cd9cf9ed07fc86fb85afdbe121a.gz - - tests/Makefile.am | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -commit e1cd09b7984775e559f1e9241395b543a091af75 -Author: Simon McVittie -Date: Wed Jun 6 16:58:43 2007 +0000 - - Pull in auto-generation machinery from Gabble. Move tools from lib/ to extensions/ to resemble Gabble - - - 20070606165843-53eee-ee2cd10c63a285e337237aa70c295477b0be051d.gz - - autogen.sh | 27 +- - configure.ac | 2 +- - extensions/Makefile.am | 94 ++-- - extensions/extensions.h | 9 + - extensions/tools/Makefile.am | 11 + - extensions/tools/c-constants-generator.xsl | 195 +++++++ - extensions/tools/c-interfaces-generator.xsl | 38 ++ - extensions/tools/doc-generator.xsl | 427 ++++++++++++++++ - extensions/tools/genginterface.py | 707 ++++++++++++++++++++++++++ - extensions/tools/glib-errors-enum-body.xsl | 51 ++ - extensions/tools/glib-errors-enum-header.xsl | 52 ++ - extensions/tools/ls-interfaces.xsl | 33 ++ - extensions/tools/make-all-async.xsl | 22 + - extensions/tools/spec-to-introspect.xsl | 26 + - extensions/tools/update-spec-gen-am.sh | 75 +++ - lib/Makefile.am | 2 +- - lib/tools/Makefile.am | 9 - - lib/tools/c-constants-generator.xsl | 195 ------- - lib/tools/c-interfaces-generator.xsl | 38 -- - lib/tools/genginterface.py | 668 ------------------------ - lib/tools/glib-errors-enum-body.xsl | 51 -- - lib/tools/glib-errors-enum-header.xsl | 52 -- - lib/tools/ls-interfaces.xsl | 33 -- - lib/tools/make-all-async.xsl | 22 - - lib/tools/spec-to-introspect.xsl | 26 - - src/salut-connection.c | 24 +- - 26 files changed, 1738 insertions(+), 1151 deletions(-) - -commit 8df55d38b2c7326afa3f07ec9c0665929da93300 -Author: Simon McVittie -Date: Wed Jun 6 12:02:28 2007 +0000 - - Sync extensions XML from Gabble - - - 20070606120228-53eee-530e86ad4e4e29cd5f4d8e47c55686810d238c24.gz - - extensions/OLPC_Buddy_Info.xml | 64 +++++++++++++++++++++++---------------- - extensions/all.xml | 2 +- - 2 files changed, 39 insertions(+), 27 deletions(-) - -commit abe8bc6865c0ed9602b01d421558e224e5dd9728 -Author: Marco Barisione -Date: Tue May 15 19:32:26 2007 +0000 - - The extensions dir need to be compiled before the other ones - - - 20070515193226-f1355-76b386b9383cb44d93201a5fd6762b0bad599817.gz - - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0a4deb1abd08a517577bc44f81a538f790b94f41 -Author: Simon McVittie -Date: Mon May 21 17:21:09 2007 +0000 - - as-ac-expand.m4: update from autostars.sf.net CVS, fixing recursive expansion - - - 20070521172109-53eee-afc635dfb3a0eb48c849ec41d55bec0c2625b1ab.gz - - m4/as-ac-expand.m4 | 17 +++++++++++++---- - 1 files changed, 13 insertions(+), 4 deletions(-) - -commit ad44fa03268ed67fa637ab8d2ac8b38495d0803f -Author: Sjoerd Simons -Date: Thu Jun 7 08:15:47 2007 +0000 - - Initial coupling of transport to sender abstraction and sending of session packets - - - 20070607081547-93b9a-269795ceb33181a17ebb756f16af1e059040bbe7.gz - - lib/gibber/gibber-r-multicast-transport.c | 235 +++++++++++++++++++++++++++-- - 1 files changed, 225 insertions(+), 10 deletions(-) - -commit 1ca156d9226fe9b292ff09881869d8a88822950a -Author: Sjoerd Simons -Date: Thu Jun 7 08:14:50 2007 +0000 - - Move packet id diff utility to r-multicast-packet, change the receiver naming to be more in line with the rest of the code - - - 20070607081450-93b9a-85bf66e5196c1acf8abee21f178d28490081dd1f.gz - - lib/gibber/gibber-r-multicast-packet.c | 41 +++++++++++------ - lib/gibber/gibber-r-multicast-packet.h | 16 ++++--- - lib/gibber/gibber-r-multicast-sender.c | 77 ++++++++++++++----------------- - lib/gibber/gibber-r-multicast-sender.h | 6 ++- - tests/test-r-multicast-packet.c | 16 +++--- - 5 files changed, 85 insertions(+), 71 deletions(-) - -commit 90b2733f01dfe6b7306ae27f609342176eb29c9c -Author: Sjoerd Simons -Date: Thu Jun 7 08:14:13 2007 +0000 - - Connect the rmulticast transport, print debug info if we got an error on stdin - - - 20070607081413-93b9a-3a0af0e936dc429b5604dadef0018a6518ea69c6.gz - - tests/test-r-multicast-transport-io.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit ba94d49796f83017059d57d422f625e7e29ed7cd -Author: Sjoerd Simons -Date: Thu Jun 7 07:41:23 2007 +0000 - - GibberTransport: Assert that a transport is in the CONNECTED state when sending - - - 20070607074123-93b9a-dcce4f84d1b2c507c8851530cb2f28782815f76a.gz - - lib/gibber/gibber-transport.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit e35d261bd00ca8ce0af9a5d4dbb2bea08e1bf9f9 -Author: Sjoerd Simons -Date: Thu Jun 7 07:40:34 2007 +0000 - - Add a fatal timeout, send the packets in a 100 ms interval instead of as fast as possible - - - 20070607074034-93b9a-4eeff4f737805d4e7d9eee615fdb553231c0e592.gz - - tests/simplemeshtest.py | 16 +++++++++++++--- - 1 files changed, 13 insertions(+), 3 deletions(-) - -commit 4a1ae9d6c2ac920e7ce98700e35226f9d5440cdd -Author: Sjoerd Simons -Date: Thu Jun 7 07:37:44 2007 +0000 - - Print unknown output, don't print packet loss - - - 20070607073744-93b9a-bbfae74835baebe0fea842dcee6109803fa26045.gz - - tests/mesh.py | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit 6c283caf5edc6933d102f61cca14ed4e52857a55 -Author: Sjoerd Simons -Date: Thu Jun 7 07:36:13 2007 +0000 - - Only print process ended reason if it was unexpected error - - - 20070607073613-93b9a-7735b2c254526f07a753a9672d7093968c5047d9.gz - - tests/mesh.py | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit a09b9685edeeb9b63c728ab58b518758dd65a676 -Author: Sjoerd Simons -Date: Thu Jun 7 07:34:40 2007 +0000 - - Inherit the environment from the parent - - - 20070607073440-93b9a-a347833d504b10d4f066de077e63b520381743f1.gz - - tests/mesh.py | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 489ad86be8ebd6629df906ac68b5624c9f782758 -Author: Sjoerd Simons -Date: Thu Jun 7 07:31:23 2007 +0000 - - TestTransport set to CONNECTED upon construction - - - 20070607073123-93b9a-4544918e27103eaa28e1350203e37ef2a0c25e7e.gz - - tests/test-transport.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 62ece88485b335086f76335095ccf348a123ee69 -Author: Sjoerd Simons -Date: Tue Jun 5 06:37:52 2007 +0000 - - Add a very basis test (just test if messages are output in the right order by all nodes - - - 20070605063752-93b9a-171c986a65ac8fcdb791ea4ab34f870f087478dc.gz - - tests/simplemeshtest.py | 58 +++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 58 insertions(+), 0 deletions(-) - -commit c37c4cacb37259c2e726423cf64b25f38777acbd -Author: Sjoerd Simons -Date: Tue Jun 5 06:35:34 2007 +0000 - - Mesh: Start of link emulations and simulate packat loss - - - 20070605063534-93b9a-3c8d84ecd19b70ea0ffc16d0337e07b799b6b3d2.gz - - tests/mesh.py | 30 +++++++++++++++++++++++++++--- - 1 files changed, 27 insertions(+), 3 deletions(-) - -commit 43c59b1149e6cb786ea35ed48426d24d4c55a9b7 -Author: Sjoerd Simons -Date: Tue Jun 5 06:34:32 2007 +0000 - - TestTransport: Ensure that the sendout buffers are really written out in seperate function calls - - - 20070605063432-93b9a-85b988b746dc934516b3cc08d55b6e9b197ac9fa.gz - - tests/test-transport.c | 32 ++++++++++++++++++++++++-------- - 1 files changed, 24 insertions(+), 8 deletions(-) - -commit a48bb17850e1c59dcbce7ee32c695a70b5c993b8 -Author: Guillaume Desmottes -Date: Wed Jun 6 15:04:08 2007 +0000 - - use tp_g_value_slice_free instead of our own free_gvalue - - - 20070606150408-7fe3f-14164b365cff62c661a15aa8d0f806dbd3747ef5.gz - - src/salut-connection.c | 9 +-------- - 1 files changed, 1 insertions(+), 8 deletions(-) - -commit 9365d49dc4a1b3f32bbea1d03aebe7166cf997d0 -Author: Guillaume Desmottes -Date: Wed Jun 6 15:01:52 2007 +0000 - - salut-connection.c: tweak OLPC specific code to fit Collabora coding style - - - 20070606150152-7fe3f-8e8496e5a176d21dfa9c5518f8e1a63030a5a719.gz - - src/salut-connection.c | 283 ++++++++++++++++++++++++++---------------------- - 1 files changed, 156 insertions(+), 127 deletions(-) - -commit 74c5cb09cce357f6698e46275a01d49daffcc452 -Author: Guillaume Desmottes -Date: Wed Jun 6 14:50:30 2007 +0000 - - move void debug_set_log_file_from_env declaration to avoid double G_BEGIN_DECLS - - - 20070606145030-7fe3f-a533f7687afb09ed4f1c287a897668d7959e1604.gz - - src/debug.h | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -commit 3ef791052e0caf1c6500e9943624ac01eb39cc31 -Author: Guillaume Desmottes -Date: Wed Jun 6 13:31:17 2007 +0000 - - few coding style tweaks - - - 20070606133117-7fe3f-efc901592f4c80cd48998495026da371a05bd2ab.gz - - src/salut-connection.c | 2 +- - src/salut-self.c | 14 +++++++------- - 2 files changed, 8 insertions(+), 8 deletions(-) - -commit 83d2d1acafcbdaecb6defe28906fc056ea2258c5 -Author: Guillaume Desmottes -Date: Wed Jun 6 13:19:13 2007 +0000 - - BuddyInfo interface: add jid key support to GetProperties and PropertiesChanged - - - 20070606131913-7fe3f-6f3258200880d1b4fe1376f60c40a60c18b258a6.gz - - src/salut-connection.c | 39 ++++++++++++++++++++++++++++----------- - 1 files changed, 28 insertions(+), 11 deletions(-) - -commit 5262751a466e4638d4a2a3ef718e25e965f823bb -Author: Guillaume Desmottes -Date: Wed Jun 6 13:16:28 2007 +0000 - - salut-contact: add jid public variable - - - 20070606131628-7fe3f-5a9e2422192854fbf519de1f547a924332a94814.gz - - src/salut-contact.c | 19 +++++++++++++++++++ - src/salut-contact.h | 1 + - 2 files changed, 20 insertions(+), 0 deletions(-) - -commit 72ede91224f895e6339ed710ffc6d636ac32275a -Author: Guillaume Desmottes -Date: Wed Jun 6 12:09:43 2007 +0000 - - move jid from _SalutSelfPrivate to _SalutSelf as the OLPC BuddyInfo interface will need it - - - 20070606120943-7fe3f-b2bd9384959ef1e628075d960907685a811ee73e.gz - - src/salut-self.c | 17 +++++++++-------- - src/salut-self.h | 1 + - 2 files changed, 10 insertions(+), 8 deletions(-) - -commit f33be5f6a1edcf9292895aadeec90f07f002b97a -Author: Guillaume Desmottes -Date: Wed Jun 6 11:41:08 2007 +0000 - - add jid key support to BuddyInfo.SetProperties implementation - - - 20070606114108-7fe3f-ca2fa1e9d190fab82118c7a81e383f363c335899.gz - - src/salut-connection.c | 27 ++++++++++++++++++++++++--- - src/salut-self.c | 17 +++++++++++++++-- - src/salut-self.h | 4 ++-- - 3 files changed, 41 insertions(+), 7 deletions(-) - -commit 01bcb8190fec2b5484668a5b5bdad73914741348 -Author: Guillaume Desmottes -Date: Wed Jun 6 10:22:33 2007 +0000 - - add support for SALUT_LOGFILE env variable to log output to a file - - - 20070606102233-7fe3f-94ed9d813bc24e4630ecb141e14708132cf7a8cd.gz - - src/debug.c | 39 +++++++++++++++++++++++++++++++++++++++ - src/debug.h | 6 ++++++ - src/salut.c | 1 + - 3 files changed, 46 insertions(+), 0 deletions(-) - -commit db837df6bce80e134dd6c93824d1c0ff53f75ad6 -Author: Sjoerd Simons -Date: Mon Jun 4 12:19:38 2007 +0000 - - Mesh.py: Simple mesh and meshnode abstractions for usage in tests - - - 20070604121938-93b9a-4984c5cabb2108da19078552ca1feb30103dd674.gz - - tests/mesh.py | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 77 insertions(+), 0 deletions(-) - -commit be45c73f524c7db6963787002ddea013f2aee189 -Author: Sjoerd Simons -Date: Mon Jun 4 12:18:24 2007 +0000 - - Don't do the multiplexing in C, let python spawn one process for each node and do the multiplexing - - - 20070604121824-93b9a-e4ae372f57675496dad97a92cb056d992fa0fb94.gz - - tests/test-r-multicast-transport-io.c | 69 ++++++++++++++------------------ - 1 files changed, 30 insertions(+), 39 deletions(-) - -commit 414b0a19def540b5c1fa48e997adc159c0fcbc5f -Author: Sjoerd Simons -Date: Mon Jun 4 07:09:01 2007 +0000 - - test-r-multicast-transport-io: Simple wrapper around rmulticast which does input/output via base64 lines - - - 20070604070901-b58c9-1d545f68be924d3c37b6cbdfd40f3ab7c7b30978.gz - - tests/Makefile.am | 16 ++++- - tests/test-r-multicast-transport-io.c | 114 +++++++++++++++++++++++++++++++++ - 2 files changed, 129 insertions(+), 1 deletions(-) - -commit bfa6d13b794349b976ed2ae9bb59e38e96230c5f -Author: Sjoerd Simons -Date: Mon Jun 4 07:06:51 2007 +0000 - - TestTransport: Add user_data to the _new function for use in the send_hook - - - 20070604070651-b58c9-90c06264462d033ee90049b5a1208ce44dd172c4.gz - - tests/test-sasl-auth.c | 6 +++--- - tests/test-transport.c | 7 +++++-- - tests/test-transport.h | 6 ++++-- - tests/test-xmpp-connection.c | 4 ++-- - 4 files changed, 14 insertions(+), 9 deletions(-) - -commit a118eabc4a9f4d8210ccf1fdb260fc8a2c369298 -Author: Sjoerd Simons -Date: Mon Jun 4 07:04:30 2007 +0000 - - GibberRMulticastTransport: whitespace fixes - - - 20070604070430-b58c9-8f21738769f5bfe05e91cdf165326e49c7fa4d8c.gz - - lib/gibber/gibber-r-multicast-transport.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 2c278e48fbfcc3a82da5fb4c8de6712d5dfa3a6d -Author: Sjoerd Simons -Date: Mon Jun 4 07:04:12 2007 +0000 - - GibberRMulticastTransport: Make it just a passthrough for now to test the test - - - 20070604070412-b58c9-aca9e90f37aba92612c87b17ba43e20e2c6c7b31.gz - - lib/gibber/gibber-r-multicast-transport.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 1936caf777f942e2abdb783fba3c98139b0d471a -Author: Sjoerd Simons -Date: Mon Jun 4 07:03:45 2007 +0000 - - GibberRMulticastTransport: Include debugging and set debug flag to rmulticast - - - 20070604070345-b58c9-481e8e474c83887a18fd8bb6ca2df338fcf0becb.gz - - lib/gibber/gibber-r-multicast-transport.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit f2ff0252262121196f9d43905b27011fa3f33622 -Author: Sjoerd Simons -Date: Mon Jun 4 07:02:40 2007 +0000 - - GibberRMulticastTransport: Change the mtransport property to transport (we use normal transports now) - - - 20070604070240-b58c9-9066432857743c6e6a5a622f37200ee4f1cf703a.gz - - lib/gibber/gibber-r-multicast-transport.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 0060b0fb5d1615e288842639868d959e2e45dbc5 -Author: Sjoerd Simons -Date: Mon Jun 4 07:01:47 2007 +0000 - - GibberRMulticast: Add signals for adding and removing of senders - - - 20070604070147-b58c9-7bc0fc56b05848cf9dae421fbe0e089b6e0540c8.gz - - lib/gibber/gibber-r-multicast-transport.c | 23 ++++++++++++++++++++--- - 1 files changed, 20 insertions(+), 3 deletions(-) - -commit 7b7da68361ae26210478b49391d8174f0a1d9a88 -Author: Sjoerd Simons -Date: Mon Jun 4 06:58:45 2007 +0000 - - Remove unused gibber-r-multicast-transport-signals-marshal.list - - - 20070604065845-b58c9-7a4f78b16d8813e44f989c7a8e39bd27d7fa7adb.gz - - 0 files changed, 0 insertions(+), 0 deletions(-) - -commit c5f69b23a1786ab82399f5867d33758b33c0a789 -Author: Sjoerd Simons -Date: Mon Jun 4 06:56:47 2007 +0000 - - GibberRMulticastTransport: Take a GibberTransport instead of a GibberMulticastTransport in the _new function - - - 20070604065647-b58c9-6c94c3a699ed32929dfe35039b9c193160573266.gz - - lib/gibber/gibber-r-multicast-transport.c | 40 ++++++++++++++++------------ - lib/gibber/gibber-r-multicast-transport.h | 4 +- - src/salut-muc-connection.c | 5 ++- - 3 files changed, 28 insertions(+), 21 deletions(-) - -commit ff6f05ae30bc11c3132be29ab9028ced3bdb3b32 -Author: Sjoerd Simons -Date: Mon Jun 4 06:55:15 2007 +0000 - - GibberTransport: Add max_packet_size info the the instance struct, so the r-multicast transport can use any Transport - - - 20070604065515-b58c9-f8cb5e4797ade21fc196c9ac947623dcf4561bbf.gz - - lib/gibber/gibber-transport.h | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit f22b5cf9c73232832678b2fb342f70dc3ebaffd8 -Author: Sjoerd Simons -Date: Mon Jun 4 06:53:29 2007 +0000 - - gibber-debug: Add a specific rmulticast debugging category - - - 20070604065329-b58c9-068df8879b1a105a2989f236df4bb093276a8e9e.gz - - lib/gibber/gibber-debug.c | 1 + - lib/gibber/gibber-debug.h | 3 ++- - 2 files changed, 3 insertions(+), 1 deletions(-) - -commit 16a63d7b012880a673babc951bf7df12e20c50a5 -Author: Sjoerd Simons -Date: Mon May 28 12:36:42 2007 +0000 - - GibberRMulticastSender: Add functions to indicate which packets ids are seen and for requestion repairs. Including a simple test ofcourse - - - 20070528123642-93b9a-518714fe70c116a2ad7a7d6611ab202f535f5660.gz - - lib/gibber/gibber-r-multicast-sender.c | 112 +++++++++++++++++++++++++++++++- - lib/gibber/gibber-r-multicast-sender.h | 9 ++- - tests/test-r-multicast-sender.c | 29 +++++++- - 3 files changed, 145 insertions(+), 5 deletions(-) - -commit 11a559aa52c6662677d2621c79a90f48d26668b2 -Author: Sjoerd Simons -Date: Mon May 28 10:01:56 2007 +0000 - - Add MulticastSender objects and small testcase - - - 20070528100156-b58c9-2b99538658a2862baaba897901f5a0c7f05a11f0.gz - - lib/gibber/Makefile.am | 10 +- - .../gibber-r-multicast-sender-signals-marshal.list | 1 + - lib/gibber/gibber-r-multicast-sender.c | 445 ++++++++++++++++++++ - lib/gibber/gibber-r-multicast-sender.h | 77 ++++ - tests/Makefile.am | 16 +- - tests/test-r-multicast-sender.c | 129 ++++++ - 6 files changed, 673 insertions(+), 5 deletions(-) - -commit 85e49ac0e4404e3bdb319fec24b1ebe53e12cf42 -Author: Sjoerd Simons -Date: Mon May 28 10:01:10 2007 +0000 - - Make payload_size public - - - 20070528100110-b58c9-07b2c302239c9acd0674d852f47f914eb6295353.gz - - lib/gibber/gibber-r-multicast-packet.c | 4 +++- - lib/gibber/gibber-r-multicast-packet.h | 3 +++ - 2 files changed, 6 insertions(+), 1 deletions(-) - -commit 1aed195b8e573ff713cc9d7e5c639eb270cbb0ab -Author: Sjoerd Simons -Date: Mon May 21 11:51:57 2007 +0000 - - Add debug category for the multicast sender - - - 20070521115157-93b9a-2300e537dcec6524cef474128ad490b38999bea5.gz - - lib/gibber/gibber-debug.c | 17 +++++++++-------- - lib/gibber/gibber-debug.h | 13 +++++++------ - 2 files changed, 16 insertions(+), 14 deletions(-) - -commit 7e414c6c27563a2d3eb3121c9569f4f1ece7d5b8 -Author: Sjoerd Simons -Date: Mon May 21 11:29:09 2007 +0000 - - Add r-multicast packet builder/parser and simple test - - - 20070521112909-b58c9-56bc73b324ac2a80fd32b6d4ce73199840933b3c.gz - - lib/gibber/Makefile.am | 10 +- - lib/gibber/gibber-r-multicast-packet.c | 376 ++++++++++++++++++++++++++++++++ - lib/gibber/gibber-r-multicast-packet.h | 121 ++++++++++ - tests/Makefile.am | 13 +- - tests/test-r-multicast-packet.c | 71 ++++++ - 5 files changed, 586 insertions(+), 5 deletions(-) - -commit e593101cc872ed7b553784597bf8d9ab745bc7b3 -Author: Sjoerd Simons -Date: Thu May 3 21:28:25 2007 +0000 - - SalutImChannel: Ignore disconnects while connecting, their expected and handled elsewhere - - - 20070503212825-93b9a-a6cda2c49fef24a4b1deddf3278939dce99027a0.gz - - src/salut-im-channel.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit caf01402ff8f19abd159452773f39d1c10a78e73 -Author: Sjoerd Simons -Date: Thu May 3 21:15:32 2007 +0000 - - Always send version="1.0" in stream openings - - - 20070503211532-93b9a-4468e58ba19ee556ccbb39169c77d0b775b97cfe.gz - - src/salut-im-channel.c | 4 ++-- - src/salut-im-manager.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit ea0552611d96ddf6ef30de19c6b0d6a2e84fb86c -Author: Sjoerd Simons -Date: Thu Apr 26 16:34:39 2007 +0000 - - s/TP_ALIAS_PAIR_TYPE/SALUT_TP_ALIAS_PAIR_TYPE/, remove obsolete TP_CHANNEL_LIST_ENTRY_TYPE and use TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED instead of our custom ERROR_IF_NOT_CONNECTED_ASYNC - - - 20070426163439-93b9a-1045e2424f4ac03576247b10a95048014042d6a3.gz - - src/salut-connection.c | 38 +++++++++++--------------------------- - 1 files changed, 11 insertions(+), 27 deletions(-) - -commit dc24a21c1dec9176521422ebd27598ae4b35647f -Author: Sjoerd Simons -Date: Mon Apr 23 09:19:50 2007 +0000 - - version 0.1.2.1 - - - 20070423091950-93b9a-0a8628a697a9b35ac44a624824706d6f7feda437.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2a319918e4368cd7f3ba9148b7ca27a86c87dece -Author: Sjoerd Simons -Date: Mon Apr 23 09:19:12 2007 +0000 - - version 0.1.2 - - - 20070423091912-93b9a-c5a5b8995b484306abe716faae2a79e28ca8d1b8.gz - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 4085b3b0096526370e617be976a89c58c1a062b4 -Author: Sjoerd Simons -Date: Fri Apr 20 11:44:04 2007 +0000 - - Add salut-avahi-record-browser-signals-marshal.list to EXTRA_DIST - - - 20070420114404-93b9a-495d462e3aef0e18844af955095be70453c67881.gz - - src/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 30be82f006aa30e9b3c30d1f89f192ea15f15863 -Author: Sjoerd Simons -Date: Fri Apr 20 11:27:55 2007 +0000 - - Use instead of make in makefiles - - - 20070420112755-93b9a-3bda8af9b3bd1777fb6e75a02b7ceaccb9519c81.gz - - lib/gibber/examples/Makefile.am | 2 +- - src/Makefile.am | 2 +- - tests/Makefile.am | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -commit a040d0cfbc321bf20ff4b2f6615f1e13e7e3d63d -Author: Sjoerd Simons -Date: Fri Apr 20 11:26:52 2007 +0000 - - Pass a GObject as the first argument to tp_group_mixin_change_members - - - 20070420112652-93b9a-85f97e16faf6a0223c68ef022c317c219e59aa87.gz - - src/salut-contact-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 44069696edaa8d40e3a26d866c7f5e1fcccd8896 -Author: Sjoerd Simons -Date: Fri Apr 20 11:18:22 2007 +0000 - - remove _TP_CM_UPDATED_FOR_0_5_7 and depend on tp-glib >= 0.5.10 - - - 20070420111822-93b9a-6f5b6f48e1f1000b9ea8620b51642f840bcf11ab.gz - - configure.ac | 2 +- - src/salut-contact-channel.c | 2 -- - src/salut-muc-channel.c | 3 --- - 3 files changed, 1 insertions(+), 6 deletions(-) - -commit c8301b4e635f1fb28cc17591b72560549b0cd082 -Author: Sjoerd Simons -Date: Tue Apr 17 19:44:01 2007 +0000 - - Implement OLPC BuddyInfo *Properties - - - 20070417194401-93b9a-3e65bb7fdf2cac6b1f3f1f5c295da95b9c93ffa6.gz - - src/salut-connection.c | 332 +++++++++++++++++++----- - src/salut-contact-manager-signals-marshal.list | 4 +- - src/salut-contact-manager.c | 63 +---- - src/salut-contact-signals-marshal.list | 2 - - src/salut-contact.c | 126 +++++----- - src/salut-contact.h | 14 + - src/salut-self.c | 32 +++ - src/salut-self.h | 11 + - 8 files changed, 403 insertions(+), 181 deletions(-) - -commit ce582772460d886c73f0eb58bcbd2581ed85bf51 -Author: Sjoerd Simons -Date: Tue Apr 17 19:43:01 2007 +0000 - - Add codegeneration and build infrastructure for OLPC - - - 20070417194301-93b9a-f4bb96a6c6ae35d9a4354d0f099860b0c32c9df6.gz - - extensions/Makefile.am | 83 ++++ - extensions/OLPC_Activity_Properties.xml | 99 +++++ - extensions/OLPC_Buddy_Info.xml | 232 +++++++++++ - extensions/all.xml | 28 ++ - extensions/spec-gen.am | 6 + - lib/tools/Makefile.am | 9 + - lib/tools/c-constants-generator.xsl | 195 +++++++++ - lib/tools/c-interfaces-generator.xsl | 38 ++ - lib/tools/genginterface.py | 668 +++++++++++++++++++++++++++++++ - lib/tools/glib-errors-enum-body.xsl | 51 +++ - lib/tools/glib-errors-enum-header.xsl | 52 +++ - lib/tools/ls-interfaces.xsl | 33 ++ - lib/tools/make-all-async.xsl | 22 + - lib/tools/spec-to-introspect.xsl | 26 ++ - 14 files changed, 1542 insertions(+), 0 deletions(-) - -commit f08a86ab088b7a9c5016c978de3e93212db874a1 -Author: Sjoerd Simons -Date: Mon Apr 16 20:33:45 2007 +0000 - - Add the necessary BuddyInfo infrastructure (code generation etc) - - - 20070416203345-93b9a-598b1b1316cfced072d4d4a021d64b6f1eed7f62.gz - - Makefile.am | 2 +- - configure.ac | 38 ++++++++++++++++++++++++++++++-------- - lib/Makefile.am | 2 +- - src/Makefile.am | 6 ++++-- - src/salut-connection.c | 31 +++++++++++++++++++++++++++++++ - 5 files changed, 67 insertions(+), 12 deletions(-) - -commit 9641f0766989c54c3423e7f8164ca1582da2e258 -Author: Sjoerd Simons -Date: Mon Apr 16 20:33:35 2007 +0000 - - Add autogen.sh to make jhbuild like us - - - 20070416203335-93b9a-40adfb67b157a570387ec0970b79798cf698cb66.gz - - autogen.sh | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit cd9340bd218987851046be4e942d005f8c59082a -Author: Sjoerd Simons -Date: Mon Apr 16 20:32:00 2007 +0000 - - Muc connection needs the name of the sender, not the muc - - - 20070416203200-93b9a-64e2b2f0158a0259fa579aebabef15928959f407.gz - - src/salut-muc-manager.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit c5ee24fe927b2fc1be27ebd94ac9d1672f47c5a3 -Author: Sjoerd Simons -Date: Tue Apr 10 14:34:05 2007 +0000 - - Conver to post tp-glib 0.5.7 groups api - - - 20070410143405-93b9a-d59a8bc0018c27615ed11dba2a063b9a06b74c68.gz - - src/salut-contact-channel.c | 10 ++++++---- - src/salut-muc-channel.c | 25 ++++++++++++++----------- - 2 files changed, 20 insertions(+), 15 deletions(-) - -commit a4beb8eae37eafb37f64662a015b0d3eea229e92 -Author: Sjoerd Simons -Date: Wed Apr 4 14:36:13 2007 +0000 - - SalutContact: Add some extra debugging info for avatars - - - 20070404143613-93b9a-74e72eacf10676f8d43de1e8813772f9e598e4d6.gz - - src/salut-contact.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit 4b5422e502dd566effad5935bf60a97fc87b81df -Author: Sjoerd Simons -Date: Wed Apr 4 12:19:49 2007 +0000 - - SalutConnection: Implement the Avatar interface - - - 20070404121949-93b9a-f1eda59667d6002ebef7be5faf61989f5cde9894.gz - - src/salut-connection.c | 203 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 203 insertions(+), 0 deletions(-) - -commit d8a58c575e8daa4d7cbb57a8b074c36becc0a400 -Author: Sjoerd Simons -Date: Wed Apr 4 12:19:24 2007 +0000 - - SalutContactManager: Relay avatar changed signals from contacts - - - 20070404121924-93b9a-f9595d8b0e66048979777722d4983008d39f69b1.gz - - src/salut-contact-manager.c | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) - -commit 2b313f531bb69f7e63c386182dfc8d35e739fa3e -Author: Sjoerd Simons -Date: Wed Apr 4 12:18:47 2007 +0000 - - SalutContact: Add avatar watching and retreiving code - - - 20070404121847-93b9a-7c405740d3121e13d40d6668fd55c59fe6fc526f.gz - - src/salut-contact.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++- - src/salut-contact.h | 11 ++++ - 2 files changed, 176 insertions(+), 1 deletions(-) - -commit 34ad15469cdce8afe9d483c953689be9d9797e75 -Author: Sjoerd Simons -Date: Wed Apr 4 12:17:55 2007 +0000 - - SalutSelf: Add posibility to publish avatars - - - 20070404121755-93b9a-93d5bc10c7981c56577ed0d20b7298cb318335d6.gz - - src/salut-self.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++- - src/salut-self.h | 7 ++++ - 2 files changed, 103 insertions(+), 2 deletions(-) - -commit 5b6376b5e0de51bb0dc76182c4701201ec3ba24b -Author: Sjoerd Simons -Date: Wed Apr 4 12:16:52 2007 +0000 - - SalutAvahiEntryGroup: Add posibility to publish raw records - - - 20070404121652-93b9a-753a130774f08a9de562e50a3885976087810450.gz - - src/salut-avahi-entry-group.c | 46 +++++++++++++++++++++++++++++++++++++++++ - src/salut-avahi-entry-group.h | 25 ++++++++++++++++++++++ - 2 files changed, 71 insertions(+), 0 deletions(-) - -commit 0316c489e4098d3f0b2ec31a5204d17a7f7bee6c -Author: Sjoerd Simons -Date: Wed Apr 4 12:16:06 2007 +0000 - - Add sha1 utilities - - - 20070404121606-93b9a-a5ec2ef5e01ba8065647fbf064951a705a0f2392.gz - - configure.ac | 3 + - src/Makefile.am | 4 + - src/sha1/sha1-util.c | 45 ++++ - src/sha1/sha1-util.h | 28 ++ - src/sha1/sha1.c | 626 +++++++++++++++++++++++++++++++++++++++++++++++ - src/sha1/sha1.h | 72 ++++++ - 6 files changed, 778 insertions(+), 0 deletions(-) - -commit eaaf974f52dcb27f05e1f206c1b12c1246479b2f -Author: Sjoerd Simons -Date: Wed Apr 4 12:15:21 2007 +0000 - - SalutAvahiRecordBrowser: Add an avahi record browser wrapper - - - 20070404121521-93b9a-8fc3320fc75bb571979acc0351c6725d042cd50a.gz - - src/Makefile.am | 4 + - ...salut-avahi-record-browser-signals-marshal.list | 1 + - src/salut-avahi-record-browser.c | 409 ++++++++++++++++++++ - src/salut-avahi-record-browser.h | 77 ++++ - 4 files changed, 491 insertions(+), 0 deletions(-) - -commit d7f37dc979008708dc4653cb705a5e0d98faa648 -Author: Sjoerd Simons -Date: Mon Apr 2 20:52:10 2007 +0000 - - SalutConnection: Use TP_ERROR_DISCONNECTED to throw errors when we're not connected - - - 20070402205210-93b9a-5b10e88573883c3bae5981bd908d428eb4068590.gz - - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit aabb0d4bd96df01eebd18fc27f0fbabfe4681315 -Author: Sjoerd Simons -Date: Mon Apr 2 09:56:42 2007 +0000 - - SalutImManger: Ensure that we don't use the channels hash-table while destorying it - - - 20070402095642-93b9a-2333e667fcdeedcfaa5dbe82ffca05409d088ced.gz - - src/salut-im-manager.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 52fe88509dda444dea228ab6fd7f8e8f03dcb443 -Author: Sjoerd Simons -Date: Mon Apr 2 09:55:52 2007 +0000 - - Unref the channel handle after setting dispose_has_run - - - 20070402095552-93b9a-69eefdd87dc5a5e1ce9a7068da970a3abeb0cc80.gz - - src/salut-im-channel.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit cea4f5b4be058823f723724c3969c7979067ca82 -Author: Sjoerd Simons -Date: Mon Apr 2 09:55:17 2007 +0000 - - WHen closing the connection also disconnect the transport - - - 20070402095517-93b9a-59afb396373cbd426768ffb32d347abd922c0c5c.gz - - src/salut-im-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 7705e03667c3b821c2f27725265702d575a949aa -Author: Sjoerd Simons -Date: Mon Apr 2 08:45:26 2007 +0000 - - Don't hook up the gibber connect signal twice - - - 20070402084526-93b9a-91be78a52544d4a5198581d90d0c30ae4d6080f4.gz - - src/salut-muc-channel.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit cfcb3fca3d3517d6e086c7780f362e272867385a -Author: Sjoerd Simons -Date: Fri Mar 30 10:44:23 2007 +0000 - - Megapatch to port to telepathy-glib - - - 20070330104423-93b9a-d86c98af93de306470bd26138e7ed05e08b60dd6.gz - - Makefile.am | 2 +- - configure.ac | 7 +- - generate/Makefile.am | 8 - - generate/README | 21 - - generate/async_annotate.py | 59 - - generate/async_implementations | 5 - - generate/do_src.sh | 47 - - generate/do_xml.sh | 24 - - generate/salut.def | 10 - - .../salut-connection-manager-signals-marshal.list | 1 - - generate/src/salut-connection-manager.c | 183 --- - generate/src/salut-connection-manager.h | 81 - - generate/src/salut-connection-signals-marshal.list | 2 - - generate/src/salut-connection.c | 621 -------- - generate/src/salut-connection.h | 184 --- - .../src/salut-contact-channel-signals-marshal.list | 2 - - generate/src/salut-contact-channel.c | 435 ----- - generate/src/salut-contact-channel.h | 137 -- - generate/src/salut-im-channel-signals-marshal.list | 3 - - generate/src/salut-im-channel.c | 326 ---- - generate/src/salut-im-channel.h | 104 -- - .../src/salut-muc-channel-signals-marshal.list | 5 - - generate/src/salut-muc-channel.c | 561 ------- - generate/src/salut-muc-channel.h | 159 -- - generate/src/telepathy-errors.h | 61 - - generate/xml-modified/salut-connection-manager.xml | 23 - - generate/xml-modified/salut-connection.xml | 107 -- - generate/xml-modified/salut-contact-channel.xml | 67 - - generate/xml-modified/salut-im-channel.xml | 53 - - generate/xml-modified/salut-muc-channel.xml | 103 -- - generate/xml-pristine/salut-connection-manager.xml | 23 - - generate/xml-pristine/salut-connection.xml | 102 -- - generate/xml-pristine/salut-contact-channel.xml | 67 - - generate/xml-pristine/salut-im-channel.xml | 53 - - generate/xml-pristine/salut-muc-channel.xml | 103 -- - src/Makefile.am | 71 +- - src/debug.c | 6 +- - src/gheap.c | 153 -- - src/gheap.h | 40 - - src/gintset.c | 415 ----- - src/gintset.h | 50 - - src/group-mixin-signals-marshal.list | 2 - - src/group-mixin.c | 877 ---------- - src/group-mixin.h | 97 -- - src/handle-repository.c | 871 ---------- - src/handle-repository.h | 76 - - src/handle-set.c | 266 ---- - src/handle-set.h | 53 - - src/handle-types.h | 29 - - src/salut-connection-manager-signals-marshal.list | 1 - - src/salut-connection-manager.c | 515 +------ - src/salut-connection-manager.h | 46 +- - src/salut-connection-signals-marshal.list | 2 - - src/salut-connection.c | 1672 +++++++------------- - src/salut-connection.h | 153 +-- - src/salut-contact-channel.c | 356 +---- - src/salut-contact-channel.h | 84 +- - src/salut-contact-manager.c | 211 ++-- - src/salut-contact-manager.h | 11 +- - src/salut-im-channel.c | 315 ++-- - src/salut-im-channel.h | 17 +- - src/salut-im-manager.c | 63 +- - src/salut-im-manager.h | 4 +- - src/salut-muc-channel.c | 830 ++++------ - src/salut-muc-channel.h | 115 +-- - src/salut-muc-connection.c | 2 +- - src/salut-muc-manager.c | 73 +- - src/salut-presence.h | 10 +- - src/salut-self.c | 6 +- - src/salut.c | 63 +- - src/telepathy-constants.h | 187 --- - src/telepathy-errors.c | 31 - - src/telepathy-errors.h | 63 - - src/telepathy-helpers.c | 98 -- - src/telepathy-helpers.h | 43 - - src/telepathy-interfaces.h | 79 - - src/text-helper.c | 154 ++ - src/text-helper.h | 41 + - src/text-mixin-signals-marshal.list | 3 - - src/text-mixin.c | 689 -------- - src/text-mixin.h | 107 -- - src/tp-channel-factory-iface-signals-marshal.list | 1 - - src/tp-channel-factory-iface.c | 119 -- - src/tp-channel-factory-iface.h | 87 - - src/tp-channel-iface.c | 96 -- - src/tp-channel-iface.h | 63 - - src/util.c | 34 - - src/util.h | 28 - - src/write-mgr-file.c | 14 +- - 89 files changed, 1638 insertions(+), 11603 deletions(-) - -commit eb7916d33c0e1ffc23c075c55e844f5556556c61 -Author: Sjoerd Simons -Date: Thu Mar 29 18:31:52 2007 +0000 - - GibberRMulticastTransport: Correctly the name property to the right enum value - - - 20070329183152-93b9a-b89239cabc80abd65d505ef0cca1c9dbe1d02d72.gz - - lib/gibber/gibber-r-multicast-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bcc55103d4b67b797e4707933adbdc5d4c5dd5fa -Author: Sjoerd Simons -Date: Sat Mar 24 12:24:26 2007 +0000 - - Add basic code to support reliable multicast in mucs - - - 20070324122426-93b9a-236725c511cc6d5ca36e99e40ed3c362cbf42db5.gz - - src/salut-muc-connection.c | 61 ++++++++++++++++++++++++++++++++++++-------- - src/salut-muc-connection.h | 1 + - 2 files changed, 51 insertions(+), 11 deletions(-) - -commit 6b8a0f54bbb58062e5c697684ef7502a3e407719 -Author: Sjoerd Simons -Date: Sat Mar 24 12:23:56 2007 +0000 - - Add function to get the maximum packet size - - - 20070324122356-93b9a-536ecf2e0f5a41b1060d3ede167c0038cd3e01d9.gz - - lib/gibber/gibber-multicast-transport.c | 14 ++++++++++++-- - lib/gibber/gibber-multicast-transport.h | 4 ++++ - 2 files changed, 16 insertions(+), 2 deletions(-) - -commit 2381f4d720ab5051a7dcea2f7468663a4027a2f7 -Author: Sjoerd Simons -Date: Sat Mar 24 12:23:29 2007 +0000 - - Add reliable multicast transport - - - 20070324122329-93b9a-60fb2ce55e4da4f42eaa7cbb5f6e02a12a739737.gz - - lib/gibber/Makefile.am | 2 + - lib/gibber/gibber-r-multicast-transport.c | 242 ++++++++++++++++++++ - lib/gibber/gibber-r-multicast-transport.h | 67 ++++++ - 3 files changed, 311 insertions(+), 0 deletions(-) - -commit a8967f96e1a787a3c016c9140d000ca31173a370 -Author: Sjoerd Simons -Date: Sat Mar 17 22:39:30 2007 +0000 - - version 0.1.1.1 - - - 20070317223930-93b9a-427bec35d839d83f98ebc76a8d9058f5a17f6c7f.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 72aa17fffba2a68b159bbc7bb2f9d28b9a4ec28d -Author: Sjoerd Simons -Date: Sat Mar 17 21:29:00 2007 +0000 - - Version 0.1.1 - - - 20070317212900-93b9a-41e70bf8decd224baac983ee49e0488265e7f5bf.gz - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 15d97fa7d34fab0fd395ac350b1a768f24a0bab3 -Author: Sjoerd Simons -Date: Sat Mar 17 21:24:17 2007 +0000 - - lib/gibber/Makefile.am: Add the signal marshal lists to EXTRA_DIST - - - 20070317212417-93b9a-4d981d30bce5ded446e35a2fc3c4cfeaa48db92e.gz - - lib/gibber/Makefile.am | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 63171a27c79087bf948b0f89425dc7d1b43ca0fe -Author: Sjoerd Simons -Date: Sat Mar 17 21:21:52 2007 +0000 - - Remove sasl-test.db when cleaning - - - 20070317212152-93b9a-17e61c15c84f6291342f0346c11dfb6019bf5d48.gz - - tests/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit ac8e854afc45bdbf8f1c8c6ad48423993fab656b -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/test-sasl-auth-server.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c4738610b91bfd8bf638d4e85db40bb5b1ad73dd -Author: Sjoerd Simons -Date: Sat Mar 17 21:00:25 2007 +0000 - - tests/Makefile.am: rename run-test.sh to run-xmpp-connection-test.sh - - - 20070317210025-93b9a-6aec9cc8987a2f8e02bc0abbd6b40b755a0c3c04.gz - - tests/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c04c6c1ebd62a4175a192ef489a15b4c45479e2e -Author: Sjoerd Simons -Date: Sat Mar 17 20:39:31 2007 +0000 - - SalutContactManager: Rethink refcounting. Fixes chrashes after disconnect - - - 20070317203931-93b9a-c98626aaf04a182444958507f10de9d1447ccf7c.gz - - src/salut-contact-manager.c | 27 +++++++++++++++++++++++---- - 1 files changed, 23 insertions(+), 4 deletions(-) - -commit fc26f28e0bd30c47555931eadeb3c998357ea6bb -Author: Sjoerd Simons -Date: Sat Mar 17 20:37:42 2007 +0000 - - SalutContact: Add function to know if the contact is still backed by services - - - 20070317203742-93b9a-5c3a5e711d58329eb6aa390ce78653d54a76b371.gz - - src/salut-contact.c | 7 +++++++ - src/salut-contact.h | 3 +++ - 2 files changed, 10 insertions(+), 0 deletions(-) - -commit 3233515fd7ebe5a494931d3b03ed3486d74638f2 -Author: Sjoerd Simons -Date: Fri Mar 16 21:36:31 2007 +0000 - - SalutSelf: Set port.p2pj to the port we're listening on.. Some clients still use this deprecated record - - - 20070316213631-93b9a-193b0204c36b10a6679b6cde6326c614a3cdd855.gz - - src/salut-self.c | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) - -commit d5f0c1c4e0013f53bb362ad10b39720081371574 -Author: Sjoerd Simons -Date: Fri Mar 16 21:28:05 2007 +0000 - - TextMixin: Put both an xhtml-im and a plaintext node in messages, works around a sill Adium bug - - - 20070316212805-93b9a-3eb68271da96ea8decf29a877971af2877322f82.gz - - src/text-mixin.c | 19 +++++++++++++++++-- - 1 files changed, 17 insertions(+), 2 deletions(-) - -commit 22a04f32bae2446bd7ca32386592b386cbc5fe38 -Author: Sjoerd Simons -Date: Fri Mar 16 21:26:30 2007 +0000 - - Add xhtml-im and w3c xhtml namespace - - - 20070316212630-93b9a-bcdbd042585561b0f20076b5e7f5f1c41c1e2867.gz - - lib/gibber/gibber-namespaces.h | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 6e0c02d515da91f3b8004203f40b3a05255c62c6 -Author: Sjoerd Simons -Date: Fri Mar 16 19:33:47 2007 +0000 - - SalutSelf: Add hardcoded port.p2pj in TXT and set txtvers=1 for iChat and Adium compatibility - - - 20070316193347-93b9a-13b44323079ab6d54c85d66477be4e1fa41ad6f5.gz - - src/salut-self.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 628abf5c4eaa9d552bd6cc272d69d8ae20593b5d -Author: Sjoerd Simons -Date: Fri Mar 16 19:33:03 2007 +0000 - - SalutImManager: Fix typo stream-opened signal name and fix callback prototype - - - 20070316193303-93b9a-f6f51bcb5be4669bc9e167ed6311c7fafecaad0d.gz - - src/salut-im-manager.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit a178d8c2af4f058a9aa3dc7be450712d12dd7718 -Author: Sjoerd Simons -Date: Fri Mar 16 16:09:06 2007 +0000 - - Send to and from on stream opening.. And an empty stream features if we are the receiving party - - - 20070316160906-93b9a-95b0e550687f868a5f1e210e287a2a29cd6afd11.gz - - src/salut-im-channel.c | 14 +++++++++- - src/salut-im-manager.c | 65 ++++++++++++++++++++++++++++++++++-------------- - 2 files changed, 58 insertions(+), 21 deletions(-) - -commit 8282e8266cd0b16878087421999b5eaa2882dab1 -Author: Sjoerd Simons -Date: Fri Mar 16 14:50:35 2007 +0000 - - SalutContact: First try to use the nick TXT field as the contact alias, fallback to 1st + last if that's not available - - - 20070316145035-93b9a-f2464884c38219a410a611f17ebacf52be0b8e6a.gz - - src/salut-contact.c | 106 +++++++++++++++++++++++++++++++-------------------- - 1 files changed, 65 insertions(+), 41 deletions(-) - -commit 7f783b02a954677d20c906d747cca2a2a9c2fb9d -Author: Sjoerd Simons -Date: Thu Mar 15 18:35:45 2007 +0000 - - SalutContact: Signal presence and alias changed when the contact is first found - - - 20070315183545-93b9a-92f03cffc3d665dac77ebc72a7f521959d33a859.gz - - src/salut-contact.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit ad57dbd0803be03fb42abec3c6ce95e244d38727 -Author: Sjoerd Simons -Date: Thu Mar 15 15:33:16 2007 +0000 - - Add nickname parameter to the connection and publish it in the presence as specified by the latest XEP-0174 revision - - - 20070315153316-93b9a-d8f5195ef43ccbddb8393db48e1f162f57e56c57.gz - - src/salut-connection-manager.c | 9 ++++++- - src/salut-connection.c | 21 ++++++++++++++++- - src/salut-self.c | 50 +++++++++++++++++++++++---------------- - src/salut-self.h | 1 + - 4 files changed, 58 insertions(+), 23 deletions(-) - -commit ba22f2da089343fc8bfb80955805bae88ece072c -Author: Sjoerd Simons -Date: Thu Mar 15 15:29:18 2007 +0000 - - SalutSelf: Only set the msg TXT record if a status_message is set - - - 20070315152918-93b9a-6fd251727025af844a424a322827c8750663280d.gz - - src/salut-self.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 85af00f0132578b2d3381d7097daa60b83b83419 -Author: Sjoerd Simons -Date: Thu Mar 15 15:24:37 2007 +0000 - - SalutSelf: Initially there is no status messages (instead of Available) - - - 20070315152437-93b9a-c495a5c3b1b66be5cffda18a45f001c463df40a9.gz - - src/salut-self.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 388c60db704b33e8f8c0eb94ae5d7287ad306ce3 -Author: Sjoerd Simons -Date: Thu Mar 15 15:02:18 2007 +0000 - - lib/gibber/examples/Makefile.am: remove unused _CFLAGS definition - - - 20070315150218-93b9a-653c19203005dbfc354ad237a68a362d0dc0d0dd.gz - - lib/gibber/examples/Makefile.am | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 9666d271a2c722549aee1eb5cd05643f38d10fb9 -Author: Sjoerd Simons -Date: Thu Mar 15 15:00:48 2007 +0000 - - configure.ac: fix HAVE_LIBSSL misspelling - - - 20070315150048-93b9a-ddd623db9af29010cd2f5676fd2ca61db1766c74.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 71670c4b383788289bd86508deee8af73b994ea5 -Author: Sjoerd Simons -Date: Thu Mar 15 14:38:53 2007 +0000 - - Make libssl and libsasl2 build depencies optional - - - 20070315143853-93b9a-4fcd8fdd618e7b85020028ba273ea03fbb48ef75.gz - - configure.ac | 18 ++++++++++++++++-- - lib/gibber/Makefile.am | 31 ++++++++++++++++++++++++------- - lib/gibber/examples/Makefile.am | 4 ++++ - tests/Makefile.am | 20 +++++++++++++++----- - tests/run-test.sh | 26 -------------------------- - tests/run-xmpp-connection-test.sh | 26 ++++++++++++++++++++++++++ - 6 files changed, 85 insertions(+), 40 deletions(-) - -commit 8b276236f62567cfc4d47df0be9d4b4998ded280 -Author: Sjoerd Simons -Date: Thu Mar 15 12:36:50 2007 +0000 - - SalutContact: Set a contacts status_message to NULL if there is no msg TXT record - - - 20070315123650-93b9a-d145514f856d639a0930eb5631404483e78b6c11.gz - - src/salut-contact.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 2c721bc731567637375cc8c10cdf301db7a1d682 -Author: Sjoerd Simons -Date: Thu Mar 15 12:19:59 2007 +0000 - - SalutConnection: Only pass a status message if their is actually one - - - 20070315121959-93b9a-eeaffa9bc2e21e2d31adea1cbd4f199f9195eeb9.gz - - src/salut-connection.c | 15 +++++++-------- - 1 files changed, 7 insertions(+), 8 deletions(-) - -commit 03b40ce2465697e511f66d66a4d662d589b57c4a -Author: Sjoerd Simons -Date: Thu Mar 15 12:17:32 2007 +0000 - - SalutSelf: Only set the msg field iff a status messages has been set - - - 20070315121732-93b9a-c87e872f168cb5371fcaaec6032f0679ee11675a.gz - - src/salut-self.c | 14 ++++++++------ - 1 files changed, 8 insertions(+), 6 deletions(-) - -commit 7be915a5c851e4db05760daaf5c54139b9f034f2 -Author: Sjoerd Simons -Date: Thu Mar 15 12:16:19 2007 +0000 - - SalutAvahiEntryGroup: Allow single records to be removed by key - - - 20070315121619-93b9a-ad498c5a4d775a5a88a8e047ec9a3773c900ef03.gz - - src/salut-avahi-entry-group.c | 14 ++++++++++++++ - src/salut-avahi-entry-group.h | 5 +++++ - 2 files changed, 19 insertions(+), 0 deletions(-) - -commit 912270a371f36f035de2b13d4031404c174b0fc5 -Author: Sjoerd Simons -Date: Wed Mar 14 12:35:37 2007 +0000 - - Refactor the multicast muc transport into gibber and the multicast-muc-connection - - - 20070314123537-93b9a-911bd8ae98918d78b75869a82fe88e75500091a5.gz - - src/Makefile.am | 2 - - src/salut-muc-channel.c | 63 ++-- - src/salut-muc-connection-signals-marshal.list | 1 - - src/salut-muc-connection.c | 357 ++++++++++---- - src/salut-muc-connection.h | 50 ++- - src/salut-muc-manager.c | 31 +- - src/salut-multicast-muc-transport.c | 656 ------------------------- - src/salut-multicast-muc-transport.h | 79 --- - 8 files changed, 342 insertions(+), 897 deletions(-) - -commit efb6dea20d237b53a19cdb67ac1a6cddb0701794 -Author: Sjoerd Simons -Date: Wed Mar 14 12:33:04 2007 +0000 - - GibberMulticastTranport: Make an internal function static - - - 20070314123304-93b9a-f0fe79c9ab14b8321d3937c3f8b0576b8eb8743a.gz - - lib/gibber/gibber-multicast-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 63fb6f356134435bed4e76f325109e9f2f365ee4 -Author: Sjoerd Simons -Date: Wed Mar 14 12:32:28 2007 +0000 - - GibberMulticastTransport: fix #include of gibber-transport - - - 20070314123228-93b9a-30787f6d443a487513bad4433f6083f7947c981e.gz - - lib/gibber/gibber-multicast-transport.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6182825a95aa519559934403687c3d3df98a0dfd -Author: Sjoerd Simons -Date: Tue Mar 13 18:43:38 2007 +0000 - - GibberXmppConnection: Compile fixes - - - 20070313184338-93b9a-5922970bfa5ca6805d2a89777d47dd5d02dba8e5.gz - - lib/gibber/gibber-xmpp-connection.c | 13 ++++++++----- - 1 files changed, 8 insertions(+), 5 deletions(-) - -commit 7cae8db3ad9b915fa43349ae65b69184a55dec47 -Author: Sjoerd Simons -Date: Tue Mar 13 12:59:15 2007 +0000 - - GibberXmppConnection: Add a non-streaming mode - - - 20070313125915-93b9a-da87a011ed0cb9e681d3912fb1a7620ab3850548.gz - - lib/gibber/gibber-xmpp-connection.c | 123 +++++++++++++++++++++++++++++++---- - lib/gibber/gibber-xmpp-connection.h | 4 + - 2 files changed, 113 insertions(+), 14 deletions(-) - -commit 19265f05822dcabc6ba6c4b924e3bca88769ecf7 -Author: Sjoerd Simons -Date: Tue Mar 13 11:58:10 2007 +0000 - - GibberXmppConnection: Allow the connection to be created without an underlying transport - - - 20070313115810-93b9a-3e0ad2e51ba1732a87de2d306e29d803871c35d4.gz - - lib/gibber/gibber-xmpp-connection.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 9e2777f02c39c976c254a0bc0ce6d6688dce1ebc -Author: Sjoerd Simons -Date: Thu Mar 1 14:51:12 2007 +0000 - - Refactor the multicast code from salut into GibberMulticastTransport - - - 20070301145112-93b9a-90e6faf121c1830621627aa8a915658674972e11.gz - - lib/gibber/Makefile.am | 2 + - lib/gibber/gibber-multicast-transport.c | 463 +++++++++++++++++++++++++++++++ - lib/gibber/gibber-multicast-transport.h | 78 ++++++ - 3 files changed, 543 insertions(+), 0 deletions(-) - -commit 2a99d7cb0d1d4be4bdc3a9555e5309f3a89b4630 -Author: Sjoerd Simons -Date: Thu Mar 1 14:49:17 2007 +0000 - - gibber-debug.h: Fix typo in __DEBUG_H__ define - - - 20070301144917-93b9a-28b4ed528b50e24b899889e30576e620069476aa.gz - - lib/gibber/gibber-debug.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b924cec988874cf4bf474eb4587fcb3a3cf2b682 -Author: Sjoerd Simons -Date: Mon Feb 19 22:54:20 2007 +0000 - - test-ssl: Change from doing old-style ssl to proper tls with starttls - - - 20070219225420-93b9a-d62d94442c35f48b9fe0484120fec848db930f37.gz - - lib/gibber/examples/test-ssl.c | 140 +++++++++++++++++++++++++++++++--------- - 1 files changed, 110 insertions(+), 30 deletions(-) - -commit 0ee7d6ace4751e933d8af02462e6857b0d40fc7e -Author: Sjoerd Simons -Date: Mon Feb 19 22:53:07 2007 +0000 - - GibberXmppConnection: Add functions to disengage the connection from the transport and re-engage it on top of a new transport - - - 20070219225307-93b9a-dad771f4cc6e83f618d5e41d3ef3171df3148d71.gz - - lib/gibber/gibber-xmpp-connection.c | 27 ++++++++++++++++++++++----- - lib/gibber/gibber-xmpp-connection.h | 5 +++++ - 2 files changed, 27 insertions(+), 5 deletions(-) - -commit ab25c79ab944f704695b5d028345bcb05fb72e7c -Author: Sjoerd Simons -Date: Mon Feb 19 22:52:17 2007 +0000 - - gibber-namespaces.h: Add TLS namespace - - - 20070219225217-93b9a-a939a12c3ca9cc6a087d08e9e3b045b0a2568f60.gz - - lib/gibber/gibber-namespaces.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 89c4b8aa5b440d0d9b4a2f1c710447d4c6d8d3bc -Author: Sjoerd Simons -Date: Sun Feb 18 23:02:11 2007 +0000 - - GibberSSLTransport: Ensure libssl fully drained the input buffer after receiving input - - - 20070218230211-93b9a-3f3b0efa07864e102a5fa4d4b33974d1fede3b1f.gz - - lib/gibber/gibber-ssl-transport.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit 6fc8d5367084a4739bfb4556f65be4b6dabe5858 -Author: Sjoerd Simons -Date: Sat Feb 17 22:11:39 2007 +0000 - - tests/Makefile.am: Add test-sasl-auth to TESTS - - - 20070217221139-93b9a-ece2772937da02035113b799f53bed385081aab9.gz - - tests/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 695ef99cf5cb2adee354528d9bfa019a4984800e -Author: Sjoerd Simons -Date: Sat Feb 17 22:10:59 2007 +0000 - - test-sasl-auth.c: Run several test cases - - - 20070217221059-93b9a-7dc074934682047abbbcb6efeb720bea40bb6262.gz - - tests/test-sasl-auth.c | 157 ++++++++++++++++++++++++++++++++++++++++++------ - 1 files changed, 139 insertions(+), 18 deletions(-) - -commit e87f9981b353ee1d7496a2fcdaecd42b81514fce -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/test-sasl-auth-server.c | 122 +++++++++++++++++++++++------------------ - tests/test-sasl-auth-server.h | 9 +++- - 2 files changed, 77 insertions(+), 54 deletions(-) - -commit da62536474294e4af385ebae4719d08851120ddb -Author: Sjoerd Simons -Date: Sat Feb 17 22:09:00 2007 +0000 - - test-xmpp-connection: Iterate the main context untill there are no more events pending - - - 20070217220900-93b9a-eab2b67e53b13263d45f395afc4eaba6569f4b82.gz - - tests/test-xmpp-connection.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit a4cfc0ff13afb30a7268e1eaf8d6d972321d43dd -Author: Sjoerd Simons -Date: Sat Feb 17 22:08:15 2007 +0000 - - TestTransport: Send out data only in the idle loop to prevert ordering issues - - - 20070217220815-93b9a-6fe704ed17d18fc32569199202c1bd53efd07b02.gz - - tests/test-transport.c | 36 +++++++++++++++++++++++++++++++----- - 1 files changed, 31 insertions(+), 5 deletions(-) - -commit b14c152dd30836f24f453075c9cc48df850c7467 -Author: Sjoerd Simons -Date: Sat Feb 17 22:07:03 2007 +0000 - - GibberXmppConnection: Mark stream as closed after calling connection_restart - - - 20070217220703-93b9a-e72fce05b9ca351dc6500cb684edd735e26ad680.gz - - lib/gibber/gibber-xmpp-connection.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit cb61b431a2de9ca86c28e0598af7339721a5af54 -Author: Sjoerd Simons -Date: Sat Feb 17 17:06:05 2007 +0000 - - Add start of a sasl auth test - - - 20070217170605-93b9a-9af2313bab57fb9611f352d47bd5cd08af3eb92d.gz - - tests/Makefile.am | 17 +- - tests/test-sasl-auth-server.c | 411 ++++++++++++++++++++++ - tests/test-sasl-auth-server.h | 64 ++++ - tests/test-sasl-auth.c | 101 ++++++ - 4 files changed, 592 insertions(+), 1 deletions(-) - -commit cecd221cfcb1d1e7e558eb7014a21ce8f65046fd -Author: Sjoerd Simons -Date: Sat Feb 17 17:05:37 2007 +0000 - - configure.ac: Check for libsasl2 - - - 20070217170537-93b9a-fc004609a093ed39a61d6da346ee5d8eedd6ccf5.gz - - configure.ac | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 18368c8b03db7715f61c12ba23069085c47b026b -Author: Sjoerd Simons -Date: Sat Feb 17 17:05:05 2007 +0000 - - GibberXmppConnection: Add function to restart the stream, which allows the other side to reopen the connection (After say a sasl authentication) - - - 20070217170505-93b9a-15e939bb4095cee5e33b12455685e8349929a3c6.gz - - lib/gibber/gibber-xmpp-connection.c | 9 +++++++++ - lib/gibber/gibber-xmpp-connection.h | 6 ++++++ - 2 files changed, 15 insertions(+), 0 deletions(-) - -commit 1ea13337092f473b465b1d67c54fc97a529c72a0 -Author: Sjoerd Simons -Date: Sat Feb 17 17:03:28 2007 +0000 - - GibberSaslAuth: Remove spurious arguments to a debug statement - - - 20070217170328-93b9a-59bd06add72df19d2f3edd1a28886a22e9c9d10b.gz - - lib/gibber/gibber-sasl-auth.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit c57bbe47ca3d1d4518550f84fde54adece13237e -Author: Sjoerd Simons -Date: Sat Feb 17 17:02:55 2007 +0000 - - GibberSaslAuth: Cope with empty challenges (which are invalid) - - - 20070217170255-93b9a-22ca1a043a082b8e1632749d468c8540e0b7958b.gz - - lib/gibber/gibber-sasl-auth.c | 17 +++++++++++------ - 1 files changed, 11 insertions(+), 6 deletions(-) - -commit fc70e71659a972349c507367078216ecd23388ad -Author: Sjoerd Simons -Date: Sat Feb 17 12:35:57 2007 +0000 - - gibber-namespaces: Add the jabber stream namespace - - - 20070217123557-93b9a-2efee7ed7fe5077289e66078c13d9480f975e699.gz - - lib/gibber/gibber-namespaces.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 2960693357584ee97db42f0595b409b2189e993a -Author: Sjoerd Simons -Date: Sat Feb 17 12:34:45 2007 +0000 - - GibberXmppReader: Make gibber_xmpp_reader_push reentrant - - - 20070217123445-93b9a-e4981edf60f86e15232a86156acb3ff36d8843b6.gz - - lib/gibber/gibber-xmpp-reader.c | 74 +++++++++++++++++++++++++++------------ - 1 files changed, 51 insertions(+), 23 deletions(-) - -commit c99c013c0ea66aa4bd0492ae865c7298b6b72e67 -Author: Sjoerd Simons -Date: Fri Feb 16 11:19:50 2007 +0000 - - GibberSaslAuth: Generate a 256 bit random cnonce instead of using a hardcoded one - - - 20070216111950-93b9a-6ec73801d3febe68b79942103981dc68edc5efc0.gz - - lib/gibber/gibber-sasl-auth.c | 16 +++++++++++++++- - 1 files changed, 15 insertions(+), 1 deletions(-) - -commit deaf6f3218427efb4638db1d45b71002a3f23e7e -Author: Sjoerd Simons -Date: Fri Feb 16 10:35:42 2007 +0000 - - GibberXmppConnection: Only reset after we reopen our own stream, not after the other side has opened their stream - - - 20070216103542-93b9a-7b716672297079528284236d21f1d4549b4263b4.gz - - lib/gibber/gibber-xmpp-connection.c | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit c7a0406cf9c1b7bb7d4d16ee36ea51bd53f97253 -Author: Sjoerd Simons -Date: Fri Feb 16 10:34:54 2007 +0000 - - TestXmppConnection: Immediately stop the test if parsing has failed - - - 20070216103454-93b9a-9da10c1732624cb088aa64957144522526a90dd0.gz - - tests/test-xmpp-connection.c | 11 +++++++---- - 1 files changed, 7 insertions(+), 4 deletions(-) - -commit d920aea3fbdfc0a702770d2af32a294ee6f99e30 -Author: Sjoerd Simons -Date: Thu Feb 15 19:55:10 2007 +0000 - - GibberSaslAuth: Add support for the PLAIN auth mechanism - - - 20070215195510-93b9a-40b76ba500725cb5f704c9d8a305494e5adb5604.gz - - lib/gibber/gibber-sasl-auth.c | 130 +++++++++++++++++++++++++++++++++++------ - 1 files changed, 112 insertions(+), 18 deletions(-) - -commit a1237036e434e8b5e2d84f7f9865deab1aba4b3a -Author: Sjoerd Simons -Date: Thu Feb 15 19:54:17 2007 +0000 - - GibberXmppConnection: If the stream is re-opened reset the xml reader - - - 20070215195417-93b9a-36e408dd62df217b236f334913da992957612110.gz - - lib/gibber/gibber-xmpp-connection.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit 67f37ea4ea663d99388ddf2b584d7bc0b0bd6182 -Author: Sjoerd Simons -Date: Thu Feb 15 19:53:41 2007 +0000 - - GibberXmppWriter: Turn of indenting of the output stream for now - - - 20070215195341-93b9a-06a6024612b2c75cf254a05be028c776e605a2f9.gz - - lib/gibber/gibber-xmpp-writer.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 572d406814273a067062458d1f9101c25840cade -Author: Sjoerd Simons -Date: Thu Feb 15 19:50:36 2007 +0000 - - GibberXmppReader: Add ability to reset the reader when needed - - - 20070215195036-93b9a-101186da1a23a1456991feb9e5e9ac6312856eac.gz - - lib/gibber/gibber-xmpp-reader.c | 26 +++++++++++++++++++++++--- - lib/gibber/gibber-xmpp-reader.h | 1 + - 2 files changed, 24 insertions(+), 3 deletions(-) - -commit 4b7782f2dac89024f7988bb01547242a41e0285d -Author: Sjoerd Simons -Date: Thu Feb 15 16:06:33 2007 +0000 - - Implement an SSL transport for gibber - - - 20070215160633-93b9a-bbb1468c182c157f593dcf07ef21d5bed09e8f7f.gz - - configure.ac | 7 + - lib/gibber/Makefile.am | 10 +- - lib/gibber/examples/Makefile.am | 9 +- - lib/gibber/examples/test-ssl.c | 187 +++++ - lib/gibber/gibber-debug.c | 1 + - lib/gibber/gibber-debug.h | 1 + - lib/gibber/gibber-fd-transport.c | 4 +- - lib/gibber/gibber-ssl-transport.c | 727 ++++++++++++++++++++ - lib/gibber/gibber-ssl-transport.h | 76 ++ - 9 files changed, 1016 insertions(+), 6 deletions(-) - -commit 8bb1cfd59d717073d7d51d7ac362fc26b150a4c3 -Author: Sjoerd Simons -Date: Thu Feb 15 16:06:10 2007 +0000 - - GibberSaslAuth: Rename the error quak from salut_gibber_auth_failed to gibber_sasl_auth_error - - - 20070215160610-93b9a-5677d3a6fca4f248e779c043fdb6e8c7199fda77.gz - - lib/gibber/gibber-sasl-auth.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1c418ee7907aab69433916d74c93e2b60189a7c1 -Author: Sjoerd Simons -Date: Thu Feb 15 11:31:55 2007 +0000 - - Add newlines add the end of the authentication successfull/failed messages - - - 20070215113155-93b9a-96197efd0448dd669c85cf5dfa1f321f87b288e2.gz - - lib/gibber/examples/test-tcp.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 6e41bd0da8c3f5fee5f7e0602dfbe4aa6807c730 -Author: Sjoerd Simons -Date: Thu Feb 15 11:31:17 2007 +0000 - - Add makefile rules to always build libgibber.la when needed - - - 20070215113117-93b9a-d715d9edab8249a3bef4cd13b6d0b0c7d0f78cbe.gz - - lib/gibber/examples/Makefile.am | 7 ++++++- - src/Makefile.am | 6 ++++++ - tests/Makefile.am | 6 ++++++ - 3 files changed, 18 insertions(+), 1 deletions(-) - -commit 5a58801092ce96a2116f6199f17082df0627a05e -Author: Sjoerd Simons -Date: Thu Feb 15 10:55:01 2007 +0000 - - Added SASL authentication helper for gibber (just digest-md5 for now) - - - 20070215105501-93b9a-f19f851129b23241b015579541e73f827e5ff373.gz - - lib/gibber/Makefile.am | 9 +- - lib/gibber/examples/test-tcp.c | 56 ++- - lib/gibber/gibber-debug.c | 1 + - lib/gibber/gibber-debug.h | 1 + - lib/gibber/gibber-namespaces.h | 3 + - lib/gibber/gibber-sasl-auth-signals-marshal.list | 2 + - lib/gibber/gibber-sasl-auth.c | 700 ++++++++++++++++++++++ - lib/gibber/gibber-sasl-auth.h | 94 +++ - lib/gibber/libmd5-rfc/md5.c | 381 ++++++++++++ - lib/gibber/libmd5-rfc/md5.h | 91 +++ - lib/gibber/libmd5-rfc/md5main.c | 139 +++++ - 11 files changed, 1472 insertions(+), 5 deletions(-) - -commit b54241d5356d83781a31371ef8a7758b1a374e92 -Author: Sjoerd Simons -Date: Tue Feb 13 15:52:32 2007 +0000 - - Add normal TCP transport and a tiny example using it - - - 20070213155232-93b9a-55d9fe57cab7017a77ee6b1503e8163f8c4a40b6.gz - - configure.ac | 17 ++-- - lib/gibber/Makefile.am | 4 + - lib/gibber/examples/Makefile.am | 21 +++++ - lib/gibber/examples/test-tcp.c | 99 +++++++++++++++++++++ - lib/gibber/gibber-tcp-transport.c | 166 ++++++++++++++++++++++++++++++++++++ - lib/gibber/gibber-tcp-transport.h | 66 ++++++++++++++ - lib/gibber/gibber-transport.c | 1 - - 7 files changed, 365 insertions(+), 9 deletions(-) - -commit 2e447616175a3b30a137d787a110df4c5186cb31 -Author: Sjoerd Simons -Date: Tue Feb 13 15:51:44 2007 +0000 - - SalutXmppWriter: Add debugging to stream open and close - - - 20070213155144-93b9a-8fa834e31dda7628e45ca7cfcce8dcf34fccbca3.gz - - lib/gibber/gibber-xmpp-writer.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 63baeba762b2e4260f77a6d0abcff430939a5020 -Author: Sjoerd Simons -Date: Tue Feb 13 14:45:00 2007 +0000 - - Add GibberFdTransport - - - Added a GibberFdTransport Object, which can be used as a bse for any transport - using a file descriptors. Includes overridable read and write virtual - functions for transport that don't want to use the default - g_io_channel_{read,write}_chars based functionality - - - 20070213144500-93b9a-9796d0dc6ba8fa1fbd0ba34ffdc63e9ae8f615f6.gz - - lib/gibber/Makefile.am | 6 +- - lib/gibber/gibber-fd-transport.c | 352 +++++++++++++++++++++++++++++++ - lib/gibber/gibber-fd-transport.h | 80 +++++++ - lib/gibber/gibber-linklocal-transport.c | 226 +------------------- - lib/gibber/gibber-linklocal-transport.h | 9 +- - 5 files changed, 448 insertions(+), 225 deletions(-) - -commit 89838a73c680611fff75b70f9caf5368ea83bfd7 -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 - - lib/gibber/gibber-debug.c | 1 + - lib/gibber/gibber-debug.h | 7 ++++--- - lib/gibber/gibber-transport.c | 34 ++++++++++++++++++++++++---------- - lib/gibber/gibber-transport.h | 15 +++++++++++++++ - lib/gibber/gibber-xmpp-connection.c | 21 +++++++++++---------- - src/salut-muc-connection.c | 19 ++++++++++--------- - 6 files changed, 65 insertions(+), 32 deletions(-) - -commit b290b493da62ba2c8f6e3108ce9cef59b777d8f7 -Author: Sjoerd Simons -Date: Tue Feb 13 12:54:32 2007 +0000 - - SalutMucChannel: Discard stanza's from other groups - - - 20070213125432-93b9a-34b66d68b9ec4362e8b42e248f944a50db19618f.gz - - src/salut-muc-channel.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit caeaa25a163ff2aff9fdd21675abcc39e04b32b5 -Author: Sjoerd Simons -Date: Tue Feb 13 12:52:55 2007 +0000 - - SalutMucChannel: Throw errors if joining the muc failed - - - 20070213125255-93b9a-8bf1e6fcfb94f352b877db7d71bc7457583dd9ad.gz - - src/salut-muc-channel.c | 35 ++++++++++++++++++++++------------- - 1 files changed, 22 insertions(+), 13 deletions(-) - -commit 0dea6b5b36ce58fca9f4e9660272410e882007a9 -Author: Sjoerd Simons -Date: Tue Feb 13 12:52:12 2007 +0000 - - SalutMulticastMucTransport: Truly join random link-local multicast addresses when a new group is created and return errors if joining failes - - - 20070213125212-93b9a-3ecc147e253890ef7e45c7dbd6d7f62a2e290c4f.gz - - src/salut-multicast-muc-transport.c | 202 +++++++++++++++++++++++++++-------- - src/salut-multicast-muc-transport.h | 12 ++ - 2 files changed, 171 insertions(+), 43 deletions(-) - -commit 8c2293d923cb94f51f6cefd7c6e80f7b9a5cb49b -Author: Sjoerd Simons -Date: Tue Feb 13 10:08:07 2007 +0000 - - SalutMucChannel, SalutMucManager: Specify the on-the-wire muc name in a SalutMucChannel property - - - 20070213100807-93b9a-7206d685903637d15adb09f4c26ed456e40b41ae.gz - - src/salut-muc-channel.c | 63 +++++++++++++++++++++++++++++++++------------- - src/salut-muc-manager.c | 3 ++ - 2 files changed, 48 insertions(+), 18 deletions(-) - -commit a624b6f28364b9af81f3d2f366a4655372c64ec5 -Author: Sjoerd Simons -Date: Tue Feb 13 10:06:37 2007 +0000 - - GibberLLTransport: Don't writeout the raw data in debugging, it could be binary - - - 20070213100637-93b9a-166df7aa1a604eb6e095c2eee197eedf0088c5f2.gz - - lib/gibber/gibber-linklocal-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 82198c35b440903c685bc9e625e7a3c266f0446c -Author: Sjoerd Simons -Date: Tue Feb 13 10:05:59 2007 +0000 - - GibberXmppNode: Assert that attribute values are !NULL - - - 20070213100559-93b9a-407f99a9c26a5769c78345098b0bc53a6a44eb19.gz - - lib/gibber/gibber-xmpp-node.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit b8274633596123c6aedfa16cda9b685f0506b639 -Author: Sjoerd Simons -Date: Tue Feb 13 10:05:08 2007 +0000 - - GibberXmppWriter: Add debugging - - - 20070213100508-93b9a-82ec00ac21ed4b0b4094ab1b5dfbcc35784c8c67.gz - - lib/gibber/gibber-xmpp-writer.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 1ff93408f03b9e70e5937b39eb56f2cd2ddd918d -Author: Sjoerd Simons -Date: Tue Feb 13 10:04:19 2007 +0000 - - Makefile.am: Add lib to SUBDIRS - - - 20070213100419-93b9a-1b72ea540b9a653c7c83dec632d9570aa7d69d9a.gz - - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 41e091f5e742d6f995eca42b0b1d1f5fff5093f3 -Author: Sjoerd Simons -Date: Thu Feb 8 15:51:21 2007 +0000 - - Add debugging - - - 20070208155121-93b9a-e6a5117ddeea13f4b3f69a984ad6819e6559d4ea.gz - - src/salut-muc-connection.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 848e06793708b5160b7649895b6aa7137b427e57 -Author: Sjoerd Simons -Date: Thu Feb 8 15:50:51 2007 +0000 - - Don't print out the received data, just the size. It might be purely binary - - - 20070208155051-93b9a-8b2befc7fd372fee182b3a14597f6f120dc0fd80.gz - - src/salut-multicast-muc-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 393820dbbd6f173b2d93a5913d869aab844f7bfb -Author: Sjoerd Simons -Date: Thu Feb 8 15:49:09 2007 +0000 - - Add the right intset to localpending in the group mixin - - - 20070208154909-93b9a-e45dcaa8035b27c1966d4a5c1aa47ed8188bbb52.gz - - src/group-mixin.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 158e44fb30585c5ec47d6eee8672d71ad4337899 -Author: Sjoerd Simons -Date: Thu Feb 8 15:48:29 2007 +0000 - - Aadd debugging category for the muc connection - - - 20070208154829-93b9a-ed8c30954c08b89c860dec9fdbfee38d395332a6.gz - - src/debug.c | 27 ++++++++++++++------------- - src/debug.h | 27 ++++++++++++++------------- - 2 files changed, 28 insertions(+), 26 deletions(-) - -commit c4177648bbe6c78686df6f5a1038e662c15cf8e4 -Author: Sjoerd Simons -Date: Thu Feb 8 15:47:57 2007 +0000 - - Add libgibber.la to LDADD of telepathy_salut and write_mgr, so Make can work out the depends correctly - - - 20070208154757-93b9a-114491cddc5a655f8b9fe319530745599df8a889.gz - - src/Makefile.am | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 26523a0f942c3f81b91d50dd69ae43dc9043c822 -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 - - lib/gibber/gibber-xmpp-reader.c | 21 ++++++++++++++++----- - 1 files changed, 16 insertions(+), 5 deletions(-) - -commit 7f98f1ddc3affd9e7d396e55c5cb4f6a0058a7cf -Author: Sjoerd Simons -Date: Thu Feb 8 15:46:31 2007 +0000 - - Add debugging - - - 20070208154631-93b9a-fb77ac76d5b324196b2b84a8f57077cadc6ec14e.gz - - lib/gibber/gibber-xmpp-reader.c | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit a35f57a7884ff7bda270b705c1774b220615530e -Author: Sjoerd Simons -Date: Thu Feb 8 15:46:05 2007 +0000 - - Don't print input data just the number of bytes we receiverd. Input might be purely binary - - - 20070208154605-93b9a-deacd8e1a9552aee83bd3c1e1ca1a299acf28b7d.gz - - lib/gibber/gibber-linklocal-transport.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit caac54e17d77743ef5611b12f9af241f6f34808c -Author: Sjoerd Simons -Date: Thu Feb 8 15:45:34 2007 +0000 - - Add xmpp debugging categories - - - 20070208154534-93b9a-be8e1257a1ccf376fd7134229d62d5187219f7cb.gz - - lib/gibber/gibber-debug.c | 6 +++++- - lib/gibber/gibber-debug.h | 4 ++++ - 2 files changed, 9 insertions(+), 1 deletions(-) - -commit 548690f733637d6c62423e997079628f970834b8 -Author: Sjoerd Simons -Date: Mon Feb 5 23:46:50 2007 +0000 - - Implement GetPresence on the connections Presence interface - - - 20070205234650-93b9a-44027f5b4b04baa35ea19f29017ed1ed5779afac.gz - - src/salut-connection.c | 62 +++++++++++++++++++----- - src/salut-connection.h | 126 ++++++++++++++++++++++++++++++++++++++++------- - 2 files changed, 156 insertions(+), 32 deletions(-) - -commit 2cb59eafbafc9e338a8a98e05abc60d52ecdf741 -Author: Sjoerd Simons -Date: Mon Feb 5 23:46:07 2007 +0000 - - Merge with the telepathy-errors generated out of the spec - - - 20070205234607-93b9a-c6d7ef5c8c220a0a4b86ec2ab234f7acdc2cdba4.gz - - src/telepathy-errors.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit fce1b18cb0604844ea62e88120fa07f83853e7f1 -Author: Sjoerd Simons -Date: Mon Feb 5 23:45:32 2007 +0000 - - Implement GetLocalPendingMembersWithInfo on the group interface - - - 20070205234532-93b9a-0fd22f31e04d65ebb11ca3276bdbb318d5bd9690.gz - - src/salut-muc-channel.c | 23 +++++++++++++++++++++++ - src/salut-muc-channel.h | 5 +++++ - 2 files changed, 28 insertions(+), 0 deletions(-) - -commit 05cb646bdfc262a6887ee2eec16023f81c79437c -Author: Sjoerd Simons -Date: Mon Feb 5 23:45:10 2007 +0000 - - Implement GetLocalPendingMembersWithInfo on the group interface - - - 20070205234510-93b9a-273f007932217882767ab660c02d98a60361be9a.gz - - src/salut-contact-channel.c | 22 +++++++++++ - src/salut-contact-channel.h | 88 ++++++++++++++++++++++++++++++++++++------ - 2 files changed, 97 insertions(+), 13 deletions(-) - -commit 41f27748f1299ef173cbc3387ddc2d52e6b7c47f -Author: Sjoerd Simons -Date: Mon Feb 5 23:44:01 2007 +0000 - - Implement GetLocalPendingMembersWithInfo helper in the group-mixin - - - 20070205234401-93b9a-20fc5a0ac0784e0a6ba87d8e627fee2e00e1eb0b.gz - - src/group-mixin.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/group-mixin.h | 1 + - 2 files changed, 126 insertions(+), 0 deletions(-) - -commit e3ea810f63c1ba111183dda9fbe347530b8fb8ae -Author: Sjoerd Simons -Date: Mon Feb 5 23:42:53 2007 +0000 - - Update to the latest spec revision - - - 20070205234253-93b9a-ff2e5cb8b0bf0967fef1f046f350ce8c3066cb59.gz - - generate/src/salut-connection.c | 22 ++++++++++++++++++++++ - generate/src/salut-connection.h | 6 ++++++ - generate/src/salut-contact-channel.c | 21 +++++++++++++++++++++ - generate/src/salut-contact-channel.h | 5 +++++ - generate/src/salut-muc-channel.c | 21 +++++++++++++++++++++ - generate/src/salut-muc-channel.h | 5 +++++ - generate/src/telepathy-errors.h | 2 +- - generate/xml-modified/salut-connection.xml | 4 ++++ - generate/xml-modified/salut-contact-channel.xml | 3 +++ - generate/xml-modified/salut-muc-channel.xml | 3 +++ - generate/xml-pristine/salut-connection.xml | 4 ++++ - generate/xml-pristine/salut-contact-channel.xml | 3 +++ - generate/xml-pristine/salut-muc-channel.xml | 3 +++ - 13 files changed, 101 insertions(+), 1 deletions(-) - -commit d57e2437e22547c94450ad91948a21d1adb6d32a -Author: Sjoerd Simons -Date: Fri Feb 2 14:08:44 2007 +0000 - - port'' to gibber - - - 20070202140844-93b9a-08347a50f2d0cd8fd77a0783f6493e76f86551e7.gz - - src/salut-muc-channel.c | 71 ++++++++++++++++++----------------- - src/salut-muc-connection.c | 40 ++++++++++---------- - src/salut-muc-connection.h | 10 ++-- - src/salut-muc-manager.c | 24 ++++++------ - src/salut-muc-transport-iface.h | 2 +- - src/salut-multicast-muc-transport.c | 26 ++++++------ - src/salut-multicast-muc-transport.h | 6 +- - 7 files changed, 90 insertions(+), 89 deletions(-) - -commit f44aed71cf7c5833dda80a7291cfe3efa21fdc0a -Author: Sjoerd Simons -Date: Fri Feb 2 14:08:00 2007 +0000 - - Merge conflicts causes by gibber splitout - - - 20070202140800-93b9a-7ef000e684ac8368afb6caaea78dc1b5a15dd1ca.gz - - src/Makefile.am | 59 ++++++++++++++++++++---------------------------------- - 1 files changed, 22 insertions(+), 37 deletions(-) - -commit 006d213b52e647d1ce8adcb7b61fba756eef8d0a -Author: Sjoerd Simons -Date: Fri Feb 2 13:48:00 2007 +0000 - - Fix conflicts in libgibber - - - 20070202134800-93b9a-accfe9e4ec5f2ac7d7d4360889743b8e09d9ca4b.gz - - lib/gibber/gibber-xmpp-reader.c | 8 ++++---- - lib/gibber/gibber-xmpp-reader.h | 6 ++++-- - lib/gibber/gibber-xmpp-writer.c | 8 ++++---- - lib/gibber/gibber-xmpp-writer.h | 3 ++- - 4 files changed, 14 insertions(+), 11 deletions(-) - -commit 7cd55145777829797b0a1c5b0437e7992dda5ad2 -Author: Sjoerd Simons -Date: Fri Jan 26 14:27:00 2007 +0000 - - Ref the SalutConnection that the mucchannel holds - - - 20070126142700-93b9a-528d39ed012ad0795644b0139896bc3bb5ffe0f9.gz - - src/salut-muc-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit f3034e61e2986beed879592efa03a07f479623d9 -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 - - lib/gibber/gibber-xmpp-reader.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 0fcf75fe84e68fdd9a6c421fb9a58b36e759e21d -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 - - lib/gibber/gibber-xmpp-reader.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e6e5e17e0decc1bcd7da0eb5c18c6e8e5b397cb0 -Author: Sjoerd Simons -Date: Wed Jan 24 22:51:08 2007 +0000 - - Let the muc manager listen for stanza's instead of messages and add some extra debugging info - + connection: port to undrafted ContactCapabilities - 20070124225108-93b9a-230e507f93b014c9e6c578c7fcf458aab7f034af.gz - - src/salut-muc-manager.c | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) + Signed-off-by: Jonny Lamb -commit 7134c32127aa1cb6266dc2adcc002c4763afa0d9 -Author: Sjoerd Simons -Date: Wed Jan 24 22:11:17 2007 +0000 +commit 137833bf895865765abd0e719f5ca52a510bd253 +Author: Jonny Lamb +Date: 2011-03-17 14:36:36 +0000 - Let the muc channel use a muc connection + connection: create SalutSelf earlier + This is so we can reference it before we connect for, say, + UpdateCapabilities. - 20070124221117-93b9a-cb17eb0a5dae657e4be5b7048b2aa90fcf6ba857.gz - - src/salut-muc-channel.c | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) + Signed-off-by: Jonny Lamb -commit 1f68c5661005f46dbc024fc230bb173103c54100 -Author: Sjoerd Simons -Date: Wed Jan 24 22:10:41 2007 +0000 +commit 0018ac8a41cb3b59bac226446ac233337bb04306 +Author: Jonny Lamb +Date: 2011-03-17 12:58:43 +0000 - Remove unneeded signals from the muc-connection and open reader and writer in non stream mode - + disco: use WockyNode instead of GibberXmppNode - 20070124221041-93b9a-2376c80bb100319cb56d8beb43d4041f60a8ecba.gz - - src/salut-muc-connection.c | 23 +++++------------------ - 1 files changed, 5 insertions(+), 18 deletions(-) + Signed-off-by: Jonny Lamb -commit cc6382f2d2ded09ef313fbfe3e545146e9135b9b -Author: Sjoerd Simons -Date: Wed Jan 24 22:09:34 2007 +0000 +commit 79e42ba994fad7271e9e5e9eca6c45f643e9cdfd +Author: Jonny Lamb +Date: 2011-03-17 12:58:21 +0000 - Let the xmpp reader provide a non-stream mode - + presence-cache: fix leak and used uninitialized warning - 20070124220934-93b9a-b436df2985b6622eb18b66a2116af4ed6375c65f.gz - - lib/gibber/gibber-xmpp-reader.c | 18 +++++++++++++++--- - lib/gibber/gibber-xmpp-reader.h | 4 ++-- - 2 files changed, 17 insertions(+), 5 deletions(-) + Signed-off-by: Jonny Lamb -commit e88acb662aaa5a1f35e9c515c715dd3868b52c9c -Author: Sjoerd Simons -Date: Wed Jan 24 22:09:05 2007 +0000 +commit 318dfd3cdcc3549e3fca8d0ddba7e00fca3d3e2f +Merge: 1400816 0eba2ff +Author: Jonny Lamb +Date: 2011-03-17 12:51:40 +0000 - Provide a non-stream mode + Merge branch contact-caps + Conflicts: + src/salut-caps-channel-manager.c + src/salut-caps-channel-manager.h + src/salut-disco.c + src/salut-ft-manager.c + src/salut-presence-cache.c + src/salut-tubes-manager.c - 20070124220905-93b9a-4d27e82d447907538d5b5e9215583bc4fb6fa0f9.gz - - lib/gibber/gibber-xmpp-writer.c | 15 +++++++++++++++ - lib/gibber/gibber-xmpp-writer.h | 2 +- - 2 files changed, 16 insertions(+), 1 deletions(-) + Signed-off-by: Jonny Lamb -commit 108d899cffdf2aa2416b71e259e9a76f27bab898 -Author: Sjoerd Simons -Date: Wed Jan 24 22:08:27 2007 +0000 +commit 140081643caa1eda5763e52d616616408994b366 +Author: Jonny Lamb +Date: 2011-03-17 12:45:51 +0000 - Cut away trailing whitespace - + {ft,tubes} managers: don't use G_GNUC_UNUSED on used arguments - 20070124220827-93b9a-4600dbae0bb82ae7dc7528060c19174ad6eca60f.gz - - lib/gibber/gibber-linklocal-transport.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + Signed-off-by: Jonny Lamb -commit 3d3d897faad27f8c9ec1d1434d066c8021acfbac -Author: Sjoerd Simons -Date: Wed Jan 24 20:58:21 2007 +0000 +commit 14e2d72bbeae565a53fe8bd32f375c0cec3715c0 +Author: Jonny Lamb +Date: 2011-03-16 14:28:47 +0000 - Finish the renaming to SalutMucConnection and friends - + sidecar: update copyright years - 20070124205821-93b9a-9d7248f3e53743406d9666305476dad1dbbc2fb5.gz - - src/salut-muc-connection.h | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) + Signed-off-by: Jonny Lamb -commit 73a043a1730988c2aa9c5618fb8763340de3e440 -Author: Sjoerd Simons -Date: Wed Jan 24 20:47:44 2007 +0000 +commit f89e2b1d8bb03138c11437148ef3c85a95aa4b2f +Author: Jonny Lamb +Date: 2011-03-16 10:56:09 +0000 - Add a specialized connection for mucs - + gibber: update to meta porter API changes - 20070124204744-93b9a-e9103ef1e0fbd5ea6382c3e8e8736d9233db9e2e.gz - - src/salut-muc-connection-signals-marshal.list | 1 + - src/salut-muc-connection.c | 214 +++++++++++++++++++++++++ - src/salut-muc-connection.h | 69 ++++++++ - 3 files changed, 284 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit 263e68efc14e5d387091ba510aab067ec33531ad -Author: Sjoerd Simons -Date: Wed Jan 24 20:46:36 2007 +0000 +commit 67c4ee0d757d0165b9bc6f38202fe6bfee389b85 +Author: Jonny Lamb +Date: 2011-03-15 15:19:59 +0000 - Also compile the salut-muc-connection - + sidecars test: added - 20070124204636-93b9a-53ebf63dd908b526b7153a024ef51eaceab682ca.gz - - src/Makefile.am | 20 ++++++++++++++++++++ - 1 files changed, 20 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit c7f7c8f9a59c1a9a0f6d439a9af4d9dd31d18d66 -Author: Sjoerd Simons -Date: Wed Jan 24 20:46:16 2007 +0000 +commit e7fe1cceac51e7e4e9f72f74523962af4905c974 +Author: Jonny Lamb +Date: 2011-03-15 15:19:36 +0000 - Finalize the text mixin when finalizing muc channels - + connection: implement FUTURE interface - 20070124204616-93b9a-9961dc21a11a51e78955df2ad25e88335c177368.gz - - src/salut-muc-channel.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit 3bab92dc2de2070ff98e373f1533bb4c26c606c1 -Author: Sjoerd Simons -Date: Tue Jan 23 12:02:45 2007 +0000 +commit 459624a34cb65c30ede5887166d038d900b2216e +Author: Jonny Lamb +Date: 2011-03-15 14:39:22 +0000 - Only recognize the standard stream namespaces after a stream open - + test plugin: add simple sidecar support - 20070123120245-93b9a-78aa5121c17e4668e8fdf11b6a0a66d5848751ce.gz - - lib/gibber/gibber-xmpp-writer.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) + Signed-off-by: Jonny Lamb -commit f6ccc7b3e745243453294e87d35df38792a0fe23 -Author: Sjoerd Simons -Date: Mon Jan 22 20:50:18 2007 +0000 +commit 04c5ef4799db15e400bb407396c161e930ab2389 +Author: Jonny Lamb +Date: 2011-03-15 14:39:03 +0000 - Merge EXTRA_DIST of both branches - + plugins: add sidecar support to plugins - 20070122205018-93b9a-75c7919ed97f2d69b02992c76028ec505d0fdd93.gz + Signed-off-by: Jonny Lamb -commit dfd6e988904584271fd5c4d3b6168f3d112de96a -Author: Sjoerd Simons -Date: Mon Jan 22 20:42:34 2007 +0000 +commit 5262d495ae17c65b654d22bcb9f1699d4d866143 +Author: Jonny Lamb +Date: 2011-03-15 14:11:34 +0000 - Add namespaces.h to the CORE_SOURCES - + salut: define SalutConnection so it can be referred to in plugins - 20070122204234-93b9a-956236c617f53d92a68c86e78ebb7f60560953e3.gz - - src/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit 0d1b27fc149f645b08f68823df60528d3dde8a76 -Author: Sjoerd Simons -Date: Sun Jan 21 19:24:01 2007 +0000 +commit 0eba2ffb56ed5f612e6d2a9657fe38522a3bd2b1 +Merge: c98fa2f 627a15e +Author: Jonny Lamb +Date: 2011-03-15 13:44:34 +0000 - Port the muc stuff to use the new internal xmpp magic.. Compiles, but won't just work yet + Merge branch 'plugin' + Conflicts: + .gitignore + configure.ac + tests/Makefile.am - 20070121192401-93b9a-86dd1d0cb2b9dbf7c920c93a19a00b280438d0ba.gz - - src/salut-muc-channel.c | 165 +++++++++++++++++++---------------- - src/salut-muc-manager.c | 43 +++++----- - src/salut-muc-transport-iface.c | 39 -------- - src/salut-muc-transport-iface.h | 14 +--- - src/salut-multicast-muc-transport.c | 104 ++++++++--------------- - src/salut-multicast-muc-transport.h | 5 +- - 6 files changed, 148 insertions(+), 222 deletions(-) + Signed-off-by: Jonny Lamb -commit c25c88a30e4afcbfbcfe58bc9a0dfeb137e6ff30 -Author: Sjoerd Simons -Date: Sat Jan 20 14:48:36 2007 +0000 +commit e623f4b62512508af7f9bd30965e1d8e17a6f74c +Author: Jonny Lamb +Date: 2011-03-14 12:02:32 +0000 - Merge Makefile.am from salut head an groups branch - + all: use hold/unhold instead of ref/unref - 20070120144836-93b9a-c5ac1543c6bc05e129983587a9f8edef3ea91ee8.gz - - src/Makefile.am | 15 +++++++++++---- - 1 files changed, 11 insertions(+), 4 deletions(-) + Signed-off-by: Jonny Lamb -commit f19c985fe55c058891d2998cd034f5a5dbf0cbdd -Author: Sjoerd Simons -Date: Wed Dec 13 13:59:04 2006 +0000 +commit 68771fd034b1b2df3d286352479d687c32c199e0 +Author: Jonny Lamb +Date: 2011-03-14 09:44:36 +0000 - Remove the source watches when closing the multicast io channel - + all: use specific to/from when referring to contacts in stanzas now - 20061213135904-93b9a-6a844a6db9bf1de7cb335d6d05fca3ee0f3c10e3.gz - - src/salut-multicast-muc-transport.c | 23 ++++++++++++++++++----- - 1 files changed, 18 insertions(+), 5 deletions(-) - -commit 75341a7a0395432e1f3bb941edb409c72214de5e -Author: Sjoerd Simons -Date: Tue Dec 12 19:47:57 2006 +0000 + Signed-off-by: Jonny Lamb - Send and use multicast group parameters - - - 20061212194757-93b9a-c88c4e416cf912e3e21e85aa6d53ecd759405af5.gz +commit c98fa2f0585d1752db4c37af6ea9abcb13c31ff3 +Author: Stef Walter +Date: 2011-03-12 10:14:13 +0100 - src/salut-muc-channel.c | 40 +++++++-- - src/salut-muc-manager.c | 89 ++++++++++++++++++- - src/salut-muc-transport-iface.c | 20 ++++- - src/salut-muc-transport-iface.h | 14 +++- - src/salut-multicast-muc-transport.c | 162 ++++++++++++++++++++++++++--------- - src/salut-multicast-muc-transport.h | 9 ++ - 6 files changed, 279 insertions(+), 55 deletions(-) + Distribute *.pc.in files, and different text for uninstalled version. -commit 1f354066576ab6dfd008df69864f0027d939f565 -Author: Sjoerd Simons -Date: Thu Nov 30 14:19:06 2006 +0000 +commit 84fab29e9bba4dc5b8f4e19e94a81dd4f262c49d +Author: Stef Walter +Date: 2011-03-11 15:36:57 +0100 - Add initial muc support with a multicast backend + Add a telepathy-salut.pc file which contains the executable path. + For use in tests. - 20061130141906-93b9a-fb4308f17283a615a489bdc017fdbca18905ea2f.gz - - generate/do_src.sh | 6 +- - generate/salut.def | 4 +- - .../src/salut-muc-channel-signals-marshal.list | 5 + - generate/src/salut-muc-channel.c | 540 +++++++++++ - generate/src/salut-muc-channel.h | 154 +++ - generate/xml-modified/salut-muc-channel.xml | 100 ++ - generate/xml-pristine/salut-muc-channel.xml | 100 ++ - src/Makefile.am | 39 +- - src/group-mixin.c | 1 + - src/namespaces.h | 25 + - src/salut-connection.c | 68 +- - src/salut-muc-channel-signals-marshal.list | 5 + - src/salut-muc-channel.c | 1004 ++++++++++++++++++++ - src/salut-muc-channel.h | 162 ++++ - src/salut-muc-manager.c | 385 ++++++++ - src/salut-muc-manager.h | 63 ++ - src/salut-muc-transport-iface.c | 128 +++ - src/salut-muc-transport-iface.h | 76 ++ - src/salut-multicast-muc-transport.c | 477 ++++++++++ - src/salut-multicast-muc-transport.h | 57 ++ - 20 files changed, 3355 insertions(+), 44 deletions(-) + https://bugs.freedesktop.org/show_bug.cgi?id=35211 -commit bae08ae539c4c39b181919d6407e8bdcac8dca7c -Author: Sjoerd Simons -Date: Fri Feb 2 13:37:11 2007 +0000 +commit 627a15ea32138a4406dc2bd8c29e879b1a8f14e9 +Author: Jonny Lamb +Date: 2011-03-02 16:51:12 +0000 - Refactor xmpp magic into it's own seperate library - + plugin: clarify the ownership of the returned array - 20070202133711-93b9a-4dec550fce51511f5f452fa5e1c2158049fdc2f6.gz - - configure.ac | 2 + - lib/Makefile.am | 1 + - lib/gibber/Makefile.am | 46 +++ - lib/gibber/gibber-debug.c | 55 +++ - lib/gibber/gibber-debug.h | 49 +++ - lib/gibber/gibber-linklocal-transport.c | 412 ++++++++++++++++++++ - lib/gibber/gibber-linklocal-transport.h | 86 ++++ - lib/gibber/gibber-transport-signals-marshal.list | 2 + - lib/gibber/gibber-transport.c | 187 +++++++++ - lib/gibber/gibber-transport.h | 86 ++++ - .../gibber-xmpp-connection-signals-marshal.list | 1 + - lib/gibber/gibber-xmpp-connection.c | 275 +++++++++++++ - lib/gibber/gibber-xmpp-connection.h | 73 ++++ - lib/gibber/gibber-xmpp-node.c | 281 +++++++++++++ - lib/gibber/gibber-xmpp-node.h | 131 +++++++ - lib/gibber/gibber-xmpp-reader-signals-marshal.list | 1 + - lib/gibber/gibber-xmpp-reader.c | 310 +++++++++++++++ - lib/gibber/gibber-xmpp-reader.h | 63 +++ - lib/gibber/gibber-xmpp-stanza.c | 99 +++++ - lib/gibber/gibber-xmpp-stanza.h | 62 +++ - lib/gibber/gibber-xmpp-writer.c | 271 +++++++++++++ - lib/gibber/gibber-xmpp-writer.h | 76 ++++ - src/Makefile.am | 38 +-- - src/salut-connection.c | 2 +- - src/salut-im-channel.c | 72 ++-- - src/salut-im-channel.h | 10 +- - src/salut-im-manager.c | 48 ++-- - src/salut-im-manager.h | 4 +- - src/salut-linklocal-transport.c | 410 ------------------- - src/salut-linklocal-transport.h | 86 ---- - src/salut-self.c | 10 +- - src/salut-transport-signals-marshal.list | 2 - - src/salut-transport.c | 187 --------- - src/salut-transport.h | 86 ---- - src/salut-xmpp-connection-signals-marshal.list | 1 - - src/salut-xmpp-connection.c | 275 ------------- - src/salut-xmpp-connection.h | 73 ---- - src/salut-xmpp-node.c | 281 ------------- - src/salut-xmpp-node.h | 131 ------- - src/salut-xmpp-reader-signals-marshal.list | 1 - - src/salut-xmpp-reader.c | 310 --------------- - src/salut-xmpp-reader.h | 63 --- - src/salut-xmpp-stanza.c | 99 ----- - src/salut-xmpp-stanza.h | 62 --- - src/salut-xmpp-writer.c | 271 ------------- - src/salut-xmpp-writer.h | 76 ---- - src/text-mixin.c | 26 +- - src/text-mixin.h | 7 +- - tests/Makefile.am | 13 +- - tests/test-transport.c | 20 +- - tests/test-transport.h | 8 +- - tests/test-xmpp-connection.c | 42 +- - 52 files changed, 2714 insertions(+), 2569 deletions(-) + Signed-off-by: Jonny Lamb -commit 8c483cd3a6d3cc15cbfbb069101b1dd7279e03f8 -Author: Sjoerd Simons -Date: Mon Jan 29 11:14:01 2007 +0000 +commit d63fd99f448a10cf34b881c478861b603ffd2c6d +Author: Jonny Lamb +Date: 2011-03-02 16:46:54 +0000 - Add a ref to our self_handle - + connection: fix typo when freeing the actual pointer array - 20070129111401-93b9a-9ae5e3ed06329a63487cc126ea71b31234f6a9bc.gz - - src/salut-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Signed-off-by: Jonny Lamb -commit f4621a6124488a5a665f9856dfb2ed3f1680ee9b -Author: Sjoerd Simons -Date: Mon Jan 29 11:09:34 2007 +0000 +commit 4fd95fb998e8bd4143504d8c99a564a34246cd49 +Author: Jonny Lamb +Date: 2011-03-02 16:43:39 +0000 - Add a ref to our self_handle - + avahi-{contact,self}: fix typo in making contact/self jid - 20070129110934-93b9a-8562ffabc772c634c09373e9470e9428d29e766e.gz - - src/salut-connection.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit 4582ed78ce1f34a7c58ce52a2ad4d08d1e90b52f -Author: Sjoerd Simons -Date: Wed Jan 24 22:49:07 2007 +0000 +commit 9190abbe5e9041444424a49b6a6d6c45b453170f +Author: Jonny Lamb +Date: 2011-03-02 16:39:34 +0000 - Fix searching for attributes and searching for children with namespaces in xmpp-node + plugin: use G_DEFINE_INTERFACE + We need GLib 2.24 for this. - 20070124224907-93b9a-9525fadf2d5593960463796dd3fd30e41b829e24.gz - - src/salut-xmpp-node.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + Signed-off-by: Jonny Lamb -commit 3ad9528e88e1c2284621b830e7c06ca281128df5 -Author: Sjoerd Simons -Date: Tue Jan 23 15:04:29 2007 +0000 +commit edcba4c589ff2b6954d46de3bdeda4ff91455eb5 +Author: Jonny Lamb +Date: 2011-03-02 16:31:15 +0000 - Finalize the text mixin if the im channel is finalizing - + connection: wocky_session_new now has a _ll suffix - 20070123150429-93b9a-819fbf38f11dfbea15be0b4312bc04c6739171b9.gz - - src/salut-im-channel.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit 6204b16dec8e243578277a3b93596cf499f51eb1 -Author: Sjoerd Simons -Date: Mon Jan 22 20:11:31 2007 +0000 +commit a6bf9ee54e934988f59a3d3296e3cc476b1bb703 +Author: Jonny Lamb +Date: 2011-03-02 15:40:40 +0000 - Clean up the test output in a clean-local makefile rule - + ft-manager: only get the contact with an actual ft offer - 20070122201131-93b9a-204d5ac30c8dcd1a7126d260bed23493a3b20239.gz - - tests/Makefile.am | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit 989bfec3b15d0d185c47a13df735e2145cfa09b1 -Author: Sjoerd Simons -Date: Mon Jan 22 19:55:52 2007 +0000 +commit e35953ceb721c30e7808edccf8a00ca9a185adc7 +Author: Jonny Lamb +Date: 2011-03-02 15:37:42 +0000 - If nodes or attributes are in the stream namespace, use the stream prefix - + gibber-xmpp-connection: removed - 20070122195552-93b9a-2c4283096f1e90fd1aadabda6a34da46686a7911.gz + Signed-off-by: Jonny Lamb + +commit 51bd65fd96c762fea7990507db13b144cee50abc +Author: Guillaume Desmottes +Date: 2011-03-02 16:34:55 +0100 - src/salut-xmpp-writer.c | 31 +++++++++++++++++++++++++------ - 1 files changed, 25 insertions(+), 6 deletions(-) + add Messages properties to immutable properties -commit bc0e2e796d31f9e1cc0f8a4c041c8eda2a40ac4a -Author: Sjoerd Simons -Date: Mon Jan 22 19:54:11 2007 +0000 +commit e4bd1f21c86cbd949f70a911f6dc8dfd795e1baa +Author: Jonny Lamb +Date: 2011-03-02 15:34:16 +0000 - Add TLS stream opening test input.. Shows that we understand the stream prefix when reading and writing - + gibber-iq-helper: removed - 20070122195411-93b9a-dcd275277fa8edc004f3c67cccbc8a59ac5f0b98.gz - - tests/inputs/tls-stream-start.input | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit 9d3edb81d1c81cf6f7eef274e3d2cde62a651c47 -Author: Sjoerd Simons -Date: Mon Jan 22 19:23:53 2007 +0000 +commit dbd43829b8370a7fb2b5120594b3e30752452a55 +Author: Jonny Lamb +Date: 2011-03-02 15:32:16 +0000 - Make sure the test inputs are in the dist - + si-bytestream-manager: remove stray include of Gibber iq helper - 20070122192353-93b9a-eaeb7aaf18e7065d5c88ea8316713e4c08249751.gz - - configure.ac | 13 +++++++------ - tests/Makefile.am | 4 +++- - tests/inputs/Makefile.am | 5 +++++ - 3 files changed, 15 insertions(+), 7 deletions(-) + Signed-off-by: Jonny Lamb -commit 4645dbabd43d78c5c5ab4c4a8be81113a7e9ae4e -Author: Sjoerd Simons -Date: Mon Jan 22 19:23:13 2007 +0000 +commit f8bc814ca4f1343080f5e5b384143cc63ee81f08 +Author: Jonny Lamb +Date: 2011-03-02 15:30:06 +0000 - Let run-test.sh return with a non-zero status if a test failed and use so make distcheck correctly runs the tests - + gibber-xmpp-connection-listener: removed - 20070122192313-93b9a-3681e204aced89f35129bd12dd147245692c0669.gz - - tests/run-test.sh | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) + Signed-off-by: Jonny Lamb -commit 9f49e6811cd02db75331fe25aac2977d775e871a -Author: Sjoerd Simons -Date: Mon Jan 22 18:30:48 2007 +0000 +commit 423253450d567702bd427448f52bb14992c4321e +Author: Jonny Lamb +Date: 2011-03-02 15:20:55 +0000 - Ensure that the xmpp connection isn't disposed while pushing data into the reader - + xcm: remove files - 20070122183048-93b9a-d91934bea88d123dc2b023900eaf59fbb653c112.gz - - src/salut-xmpp-connection.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit 3d6a83fdf0a9fc589e7c604b8fa34bf64b27b80c -Author: Sjoerd Simons -Date: Mon Jan 22 18:19:01 2007 +0000 +commit 75c4a6d047cb5833afb410fcb7fc38b00d2e4804 +Author: Jonny Lamb +Date: 2011-03-02 15:20:37 +0000 - Add version parameter to the stream opening functions and signals - + connection: stop creating an XCM - 20070122181901-93b9a-3b7f7ba79f2c8f5b17f8e6a09b844c152e0530fc.gz - - src/salut-im-channel.c | 5 +++-- - src/salut-im-manager.c | 2 +- - src/salut-xmpp-connection-signals-marshal.list | 2 +- - src/salut-xmpp-connection.c | 16 ++++++++++------ - src/salut-xmpp-connection.h | 3 ++- - src/salut-xmpp-reader-signals-marshal.list | 2 +- - src/salut-xmpp-reader.c | 11 ++++++++--- - src/salut-xmpp-writer.c | 8 ++++---- - src/salut-xmpp-writer.h | 3 ++- - tests/test-xmpp-connection.c | 8 +++++--- - 10 files changed, 37 insertions(+), 23 deletions(-) + Signed-off-by: Jonny Lamb -commit db11c9d616ee95f8c6f2bef460dc946ed43ee3d5 -Author: Sjoerd Simons -Date: Mon Jan 22 18:17:40 2007 +0000 +commit bc601fcaf79be77d8b87e33c3685f68204aa44b3 +Author: Jonny Lamb +Date: 2011-03-02 15:18:02 +0000 - If ns == NULL use 0 for the Quark - + presence-cache: stop using the XCM - 20070122181740-93b9a-0fe349ae161fae8858f270f40fe8e07f768d6007.gz - - src/salut-xmpp-node.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Signed-off-by: Jonny Lamb -commit 7642be14e0e38984027546c44905b73ccacb36e6 -Author: Sjoerd Simons -Date: Mon Jan 22 17:57:11 2007 +0000 +commit 437ecdf19f385a28d3a9ac4a92a3dfaa732b2695 +Author: Jonny Lamb +Date: 2011-03-02 15:17:20 +0000 - Force the parser to replace all entities, even &! - + bytestream-oob: stop using GibberXmppConnections - 20070122175711-93b9a-b5d06e5890aaa93305c8bf8abe9e5bc051aa8526.gz - - src/salut-xmpp-reader.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit f922d3c57a7aba2e9b71d5180150c59bcaa70d97 -Author: Sjoerd Simons -Date: Mon Jan 22 17:55:10 2007 +0000 +commit e56b5d3319ce696568fd813361b7ec742c8704ee +Author: Jonny Lamb +Date: 2011-03-02 14:00:48 +0000 - Add the xmpp writer object implementation - + bytestream-ibb: stop using GibberXmppConnections - 20070122175510-93b9a-44ce3316d6ae3e1ce18b16043dae34329d8cc220.gz - - src/salut-xmpp-writer.c | 252 +++++++++++++++++++++++++++++++++++++++++++++++ - src/salut-xmpp-writer.h | 75 ++++++++++++++ - 2 files changed, 327 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit 7004325e37bc387d0155f122ee3bde545da4d6a5 -Author: Sjoerd Simons -Date: Mon Jan 22 16:24:48 2007 +0000 +commit 923da48ffc4735a139c950bcd2f1e911cc68f15d +Author: Jonny Lamb +Date: 2011-03-02 14:00:09 +0000 - Factor out the xmpp writer to a seperate object - + si-bytestream-manager: stop using the XCM - 20070122162448-93b9a-e8ec3aaa29957f45e26a25e677e6c88ecf49aed6.gz - - src/Makefile.am | 2 + - src/salut-xmpp-connection.c | 137 ++++++++++-------------------------------- - 2 files changed, 35 insertions(+), 104 deletions(-) + Signed-off-by: Jonny Lamb -commit 75d5bfe021271632679d71afaf62ddbc70be576e -Author: Sjoerd Simons -Date: Mon Jan 22 16:24:18 2007 +0000 +commit 0e37db997eecb5b8646a2f362da2fa53ec0c78a2 +Author: Jonny Lamb +Date: 2011-03-02 13:59:43 +0000 - Add a stream opening with some nice xml entities - + tubes-channel: stop using the XCM - 20070122162418-93b9a-abc51b8f4427326079c1d72884e557e8f9075731.gz - - tests/inputs/strange-streamopening.input | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit 6652d28cf2693c485a9708e902c8223c3793d814 -Author: Sjoerd Simons -Date: Mon Jan 22 14:43:53 2007 +0000 +commit 898b111ab4a296052fcc333b911d3626af990916 +Author: Jonny Lamb +Date: 2011-03-02 13:56:06 +0000 - Let the connection test print the stream openings to and from attibutes - + tubes-manager: stop using the XCM - 20070122144353-93b9a-45755a9de969a356bd9985fff68005c9dced1482.gz - - tests/test-xmpp-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Signed-off-by: Jonny Lamb -commit 5919ac655a0f34bd68b10ee9f3b8f4c2494a5cfd -Author: Sjoerd Simons -Date: Mon Jan 22 14:41:35 2007 +0000 +commit f6fa1694a73010ac0134a648cfcfea93cb9ccd76 +Author: Jonny Lamb +Date: 2011-03-02 13:54:14 +0000 - The xmpp reader needs to return when no error has been encountered instead of false - + muc-manager: stop using the XCM - 20070122144135-93b9a-dd12c9ab41ea8ed1963eab7d246719e87bb203d0.gz - - src/salut-xmpp-reader.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Signed-off-by: Jonny Lamb -commit ba5649bf74305fbb615da2d8f23c246edf92ac2f -Author: Sjoerd Simons -Date: Mon Jan 22 14:40:03 2007 +0000 +commit 2857f6212a3e2e9136469f224f77b3e21472ac72 +Author: Jonny Lamb +Date: 2011-03-02 13:50:05 +0000 - Actually parse to and from stream attributes - + connection: stop using the XCM for OLPC uninvite stanzas - 20070122144003-93b9a-c09c9a787409be29fd8aa079fdd920707bbbc6b2.gz - - src/salut-xmpp-reader.c | 15 ++++++++++++++- - 1 files changed, 14 insertions(+), 1 deletions(-) + Signed-off-by: Jonny Lamb -commit 7188e6b4f8bf39e078bca7ab83608f7602b9e70f -Author: Sjoerd Simons -Date: Mon Jan 22 12:08:34 2007 +0000 +commit 5dfe4eafe41678ea7291825f3fe8128a59a651a7 +Author: Jonny Lamb +Date: 2011-03-02 13:48:49 +0000 - Refactor xmmp reading code into it's own object - + olpc-activity: stop using the XCM - 20070122120834-93b9a-dceae0697df9404085ddc94bfdd75a15a992edeb.gz - - src/Makefile.am | 5 + - src/salut-xmpp-connection.c | 197 +++++-------------- - src/salut-xmpp-reader-signals-marshal.list | 1 + - src/salut-xmpp-reader.c | 290 ++++++++++++++++++++++++++++ - src/salut-xmpp-reader.h | 63 ++++++ - 5 files changed, 409 insertions(+), 147 deletions(-) + Signed-off-by: Jonny Lamb -commit c3792ca0099398b56bcbc1417e49a866065a1dc6 -Author: Sjoerd Simons -Date: Sat Jan 20 17:20:37 2007 +0000 +commit aff3ae0fa99b1ecd7078505e1d8503e997ce0bd8 +Author: Jonny Lamb +Date: 2011-03-02 13:48:04 +0000 - Implement salut_xmpp_node_get_child_ns - + roomlist-manager: stop using the XCM - 20070120172037-93b9a-647c5f78587e8df3ee16469b47eb5c11ce839679.gz - - src/salut-xmpp-node.c | 64 ++++++++++++++++++++++++++++++++----------------- - 1 files changed, 42 insertions(+), 22 deletions(-) + Signed-off-by: Jonny Lamb -commit 53fc04901ae43edee640e3c328abe6e82b506508 -Author: Sjoerd Simons -Date: Sat Jan 20 16:02:49 2007 +0000 +commit 900449dfacf9518f3fcc52972f8ef0a4850f75af +Author: Jonny Lamb +Date: 2011-03-02 13:47:28 +0000 - Set to attribute in messages - + file transfers: stop using the XCM - 20070120160249-93b9a-769869ca30abb2e196a878d4ac2710ffd8b62f47.gz - - src/text-mixin.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit 164b44164ce9ce7d6f775215f7c65b1f129f514f -Author: Sjoerd Simons -Date: Sat Jan 20 15:37:47 2007 +0000 +commit 5b1e6d98e994e33d234db050fba28c533d41ac65 +Author: Jonny Lamb +Date: 2011-03-02 13:45:45 +0000 - Remove the unused salut_transport_emit_send_error prototype - + presence-cache: handle errors when discoing contacts - 20070120153747-93b9a-f229d57de984bb03ae2d42d25ac2e8f41247b341.gz - - src/salut-transport.h | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + Signed-off-by: Jonny Lamb -commit e7f73a28ce12a54e0ca6f0227ae7c7f1b0d8e0bd -Author: Sjoerd Simons -Date: Sat Jan 20 14:26:11 2007 +0000 +commit b2c345adeb8f9df81b5eecd0d00583e8b90deefb +Author: Jonny Lamb +Date: 2011-03-02 13:45:09 +0000 - Also write namespaces for the attributes if needed - + im-channel: stop using the XCM - 20070120142611-93b9a-95d206ba517aa956cf6aec8c0d8c188dbbf47c3e.gz - - src/salut-xmpp-connection.c | 14 ++++++++++++-- - 1 files changed, 12 insertions(+), 2 deletions(-) + Signed-off-by: Jonny Lamb -commit 4871f55c9d0acdd267d24fe9b7a182ae10bba727 -Author: Sjoerd Simons -Date: Sat Jan 20 14:06:42 2007 +0000 +commit 31e26a89bc3d052ef2d29a2afdb5bd297c8e15d5 +Author: Jonny Lamb +Date: 2011-03-02 13:44:05 +0000 - Add some state to the xmlwriter, so it only defines a new namespace only when it's necessary - + im-manager: stop using the XCM - 20070120140642-93b9a-95793d7f3353f767033edd8b665436c0f4e962f3.gz - - src/salut-xmpp-connection.c | 55 +++++++++++++++++++++++++++++-------------- - 1 files changed, 37 insertions(+), 18 deletions(-) + Signed-off-by: Jonny Lamb -commit d436f90ac96e26bf00d30d449ac3ad626b866d71 -Author: Sjoerd Simons -Date: Sat Jan 20 11:25:15 2007 +0000 +commit 408b0ccb7919cdaef808357c9d65355c261f5f4e +Author: Jonny Lamb +Date: 2011-03-02 13:42:23 +0000 - Rename the simple-message2 test to simple-message-attrnamespace - + disco: stop using the XCM - 20070120112515-93b9a-9565fb28cc2303164b428975abbebd9e2f53abf3.gz - - tests/inputs/simple-message-attrnamespace.input | 16 ++++++++++++++++ - tests/inputs/simple-message2.input | 16 ---------------- - 2 files changed, 16 insertions(+), 16 deletions(-) + Signed-off-by: Jonny Lamb -commit eaf1c26809a0e0bb0cc3df35bcfe8fc4725c098d -Author: Sjoerd Simons -Date: Sat Jan 20 11:23:51 2007 +0000 +commit 60fe494dd65dac6a46aa19fded9b2b9bef9f9822 +Author: Jonny Lamb +Date: 2011-03-02 13:35:53 +0000 - Add groupchat invite testcase - + avahi-contact-manager: add contacts to Wocky's contact factory too when created - 20070120112351-93b9a-99d0e376b04992c0e022102514ff32ccd265842a.gz - - tests/inputs/groupchat-invite.input | 32 ++++++++++++++++++++++++++++++++ - 1 files changed, 32 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit e0e2f1165c930ac058e87227d3b8a3d0ea62c149 -Author: Sjoerd Simons -Date: Thu Jan 18 19:35:20 2007 +0000 +commit e4c52c08713c044949fd825986d832b4687c24c7 +Author: Jonny Lamb +Date: 2011-03-02 13:34:41 +0000 - Contrived change to simple-message to give an attribute a namespace - + avahi-contact: make a subclass of WockyLLContact - 20070118193520-93b9a-0ce2fd977eca71a4d6babb882b63eb51e5d51abd.gz - - tests/inputs/simple-message2.input | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit bac0eb63aa06c483fe7dad96277a8a85230b7519 -Author: Sjoerd Simons -Date: Thu Jan 18 19:34:20 2007 +0000 +commit 5cf592b7034bebfc0be623bc662b43897fd71b09 +Author: Jonny Lamb +Date: 2011-03-02 13:28:17 +0000 - Check for tests failure by comparing the exit code with 0 - + connection: close all porters when disconnecting - 20070118193420-93b9a-f64d3b681b2ce59f358cd6819f95244b3c60896c.gz - - tests/run-test.sh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + Signed-off-by: Jonny Lamb -commit 790f03f8c9606ae9c33bc855a5a05423d4e73bd2 -Author: Sjoerd Simons -Date: Thu Jan 18 19:29:55 2007 +0000 +commit 97a6813723e5fa96109c82f3aa31e296ec8cfc2a +Author: Jonny Lamb +Date: 2011-03-02 12:16:58 +0000 - Recognize namespace for attributes - + connection: create a WockySession - 20070118192955-93b9a-00bdab6237b275f7f9182ae662b3b3b3ef2ded2d.gz + Signed-off-by: Jonny Lamb - src/salut-xmpp-connection.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) +commit b79d0489bc6ef6b912af020d4014170a79827bb1 +Merge: 7e4e2b4 8843f79 +Author: Jonny Lamb +Date: 2011-03-02 08:04:06 +0000 -commit 46fbcb5c9affc2ad6dfbb4689322d66a24cf2686 -Author: Sjoerd Simons -Date: Thu Jan 18 19:21:01 2007 +0000 + Merge remote branch 'stef/test-using-gtest' - Handle passing NULL to salut_xmpp_node_set_ns - - - 20070118192101-93b9a-6f06d0668b9bb645bddb3d47dcf7df17284381b6.gz +commit 7e4e2b44d35cc8e7321e4f62cc8dbb84a4f43f1e +Author: Danielle Madeley +Date: 2011-03-02 09:52:26 +1100 - src/salut-xmpp-node.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + message-sent and message-received are int64, not uint64 or uint32 -commit 84bda5f19d7f070c25644037b351a707fd0fcff7 -Author: Sjoerd Simons -Date: Thu Jan 18 19:20:28 2007 +0000 +commit 8843f79f35f40e517154d0b231681c220ddebce0 +Author: Stef Walter +Date: 2011-02-16 16:50:27 +0100 - SUCCESS should be printed to stderr too and correctly recognize a failed exit - + Migrate from 'check' to glib tests. - 20070118192028-93b9a-e39540b8bff5d3e2859c87aa75490652af350187.gz + https://bugs.freedesktop.org/show_bug.cgi?id=34341 - tests/run-test.sh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) +commit 1b1060dc25d6a027b02a2c3a928fef0bff239dbc +Author: Stef Walter +Date: 2011-02-13 16:08:51 +0100 -commit 90b2413dfc2edcea80177f17de79be92b650f490 -Author: Sjoerd Simons -Date: Thu Jan 18 19:13:51 2007 +0000 + Cleanup comments that no longer match source. - Cast xmlChar to gchar when setting the namespace - - - 20070118191351-93b9a-6954044f6412f61ba2d40c52f2094b9ec4fe0eb5.gz +commit aec9acb11cc830b199571cc675577a40669cc3cf +Author: Stef Walter +Date: 2011-02-13 16:00:57 +0100 - src/salut-xmpp-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Remove unused member variable. + + SalutImManagerPrivate::pending_connections -commit 0352e5feb118bd1d2ff7a7cf7a9545532baf3ee9 -Author: Sjoerd Simons -Date: Thu Jan 18 19:12:54 2007 +0000 +commit 8ff71251a3e5dd85645b85fe16e161eb126bfe1e +Author: Jonny Lamb +Date: 2011-02-09 12:41:43 +0000 - Set the node namespace in a common code path - + gibber: remove node and stanza tests - 20070118191254-93b9a-4c0ca351139c088504744ed94e21d8df868ac857.gz - - src/salut-xmpp-connection.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) + Signed-off-by: Jonny Lamb -commit 175eb4448f32c36d0db12c09bca31f0ac91206a7 -Author: Sjoerd Simons -Date: Thu Jan 18 19:11:19 2007 +0000 +commit e36cc7e902fec88a1fb979e10cf1f2b86611464d +Author: Jonny Lamb +Date: 2011-02-09 12:37:59 +0000 - Set the language in the output xml - + gibber: remove GibberXmppNode wrapper - 20070118191119-93b9a-ba40a37cdca51bd9647f24e58910f0bddfd62efe.gz - - src/salut-xmpp-connection.c | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit b6af218ce72b136da9ecee29d1ef09f1ee451320 -Author: Sjoerd Simons -Date: Thu Jan 18 19:09:59 2007 +0000 +commit c06e646052ad30573ee2404b841eda6352e036e7 +Author: Jonny Lamb +Date: 2011-02-09 12:37:46 +0000 - Recognize xml:lang to set the langauge of a node - + gibber: remove GibberXmppStanza wrapper - 20070118190959-93b9a-d1d614b4583a2f4c650cea5f5dc4ee42cf7b377d.gz - - src/salut-xmpp-connection.c | 17 +++++++++++++---- - 1 files changed, 13 insertions(+), 4 deletions(-) + Signed-off-by: Jonny Lamb -commit df83f1065e07e0f411d0f5900f4c143425426a86 -Author: Sjoerd Simons -Date: Thu Jan 18 19:08:59 2007 +0000 +commit ebdffdf082dc15538815517970c5af10184b1115 +Author: Jonny Lamb +Date: 2011-02-08 14:42:20 +0000 - Print language of it's node if set - + salut: include wocky as part of the salut plugin API - 20070118190859-93b9a-04bbb90542bc9e82f8d658337ff506fc6fdbbbc5.gz - - tests/test-xmpp-connection.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit 256fc8134464fd6dd1a4891fb15b2e41289a50c8 -Author: Sjoerd Simons -Date: Thu Jan 18 19:07:52 2007 +0000 +commit d09a602e12e25484dce07a22973fbbc111b7ae3d +Author: Jonny Lamb +Date: 2011-02-08 11:14:53 +0000 - Add an xml output file and re-send-out received stanza - + plugin: fix up pkg-config files - 20070118190752-93b9a-3ffd7bde441f2834b6077ed26797e56652a5682f.gz - - tests/test-xmpp-connection.c | 23 +++++++++++++++++++---- - 1 files changed, 19 insertions(+), 4 deletions(-) + Signed-off-by: Jonny Lamb -commit 4a21a0abe9947680b382f0f64770fff75fdf981f -Author: Sjoerd Simons -Date: Thu Jan 18 19:06:15 2007 +0000 +commit 95ed3ebfffdbbe6da7db659c06cb9aeb11d252db +Author: Jonny Lamb +Date: 2011-02-08 10:26:31 +0000 - Add a test script to run the tests :) - + salut: move protocol.h to salut's public API - 20070118190615-93b9a-4b5a481ad531a07cd14ddd6ca5bf6faba9b4342a.gz - - tests/Makefile.am | 2 ++ - tests/run-test.sh | 20 ++++++++++++++++++++ - 2 files changed, 22 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit 8dc214076a34bbc74603042b3ba9f56362cff347 -Author: Sjoerd Simons -Date: Thu Jan 18 19:05:08 2007 +0000 +commit baf67f53e38d8ac0d4e7355f832d4065bd9c6553 +Author: Jonny Lamb +Date: 2011-02-08 10:17:19 +0000 - Add language as a property for xmpp node - + protocol: specify the DNSSD name and have a backend fallback - 20070118190508-93b9a-9b81763ffaa103ea3466dcee4943dff36a30f965.gz - - src/salut-xmpp-node.c | 18 ++++++++++++++++++ - src/salut-xmpp-node.h | 8 ++++++++ - 2 files changed, 26 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit d8952910c7e635db14c02eb60fbc39a88ab30cc8 -Author: Sjoerd Simons -Date: Thu Jan 18 14:13:25 2007 +0000 +commit 3f2f6de25ce5a5d7d5d335682548c1a95b72feb1 +Author: Jonny Lamb +Date: 2011-02-08 09:51:26 +0000 - Add a simple testcase + src/: remove backend static libraries + Just throw it all into the convenience library. - 20070118141325-93b9a-f07a339435e691730510090e6ccd061d09567406.gz - - tests/inputs/simple-message.input | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit 7fc311f6e52f12794072c73e4726fc2a0bf12f1d -Author: Sjoerd Simons -Date: Thu Jan 18 14:13:08 2007 +0000 +commit 8d8cbbdd95e420c34916da95bd2ce2b34e4f57b4 +Author: Jonny Lamb +Date: 2011-02-07 16:48:53 +0000 - Let the xmpp connection test print out a parse tree like we get from the connection - + avahi-{contact-manager,self,contact}: don't assume dnssd name is _presence._tcp - 20070118141308-93b9a-155c5b3bf9cc255cf93e65833886d84a092cb940.gz - - tests/test-xmpp-connection.c | 107 ++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 107 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit 4e0de2ca8e8b0a0b52e845fb2e9a317d19b177cf -Author: Sjoerd Simons -Date: Thu Jan 18 13:42:51 2007 +0000 +commit 96da3972933b51037593c92a395a96e26f2c0f4f +Author: Jonny Lamb +Date: 2011-02-07 16:48:03 +0000 - If a node's content is purely whitespace remove it - + avahi-discovery-client: add a get_dnssd_name function - 20070118134251-93b9a-ac25c581649d541eb28a95cbcd9bb99f6df1182d.gz + Signed-off-by: Jonny Lamb + +commit 6db2272c47e4ba7cadf623940e2877d820359cf1 +Author: Jonny Lamb +Date: 2011-02-07 16:15:41 +0000 - src/salut-xmpp-connection.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) + protocol: allow the name, icon name and English to be set easier + + Signed-off-by: Jonny Lamb -commit 51a65fda95f2041d2a5ab28c7234786169bf91ad -Author: Sjoerd Simons -Date: Thu Jan 18 13:13:00 2007 +0000 +commit 0a4e239e80474e990475c987546adc80c4af6008 +Author: Jonny Lamb +Date: 2011-02-07 14:06:08 +0000 - Let the xmpp connection send the stream-closed signal when the stream is closed - + test plugin: document how to add another protocol - 20070118131300-93b9a-1766c71463c4360bd0626da9d839423dd1530c57.gz - - src/salut-xmpp-connection.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + Signed-off-by: Jonny Lamb -commit 04564301e811acb4ebfcda9d1d459007c562a33a -Author: Sjoerd Simons -Date: Thu Jan 18 12:30:43 2007 +0000 +commit e343336ffb798eccfae8b3e5f0fdb5ab6b294e6d +Author: Jonny Lamb +Date: 2011-02-07 13:48:42 +0000 - Add test transport object - + plugin: add initialize method to give access to the CM - 20070118123043-93b9a-6e9dadb865d4e2237b5555408a55cd5deb4f92d3.gz - - tests/Makefile.am | 4 +- - tests/test-transport.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++++ - tests/test-transport.h | 68 ++++++++++++++++++++++++ - 3 files changed, 206 insertions(+), 1 deletions(-) + Signed-off-by: Jonny Lamb -commit d29bad00a0b365c723e9d2e53ebce6b788b36d63 -Author: Sjoerd Simons -Date: Thu Jan 18 12:29:59 2007 +0000 +commit 5700f08ca7b05df559a0829c04d7874e3c4d86b9 +Author: Jonny Lamb +Date: 2011-02-07 13:28:30 +0000 - Fix convenience typo in tests/Makefile.am - + plugin: add padding and API version - 20070118122959-93b9a-826eca41ba27fe3b8166ac70f0a455541b4cb086.gz - - tests/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + Signed-off-by: Jonny Lamb -commit a2cc0ac7edae443687696f99ecd39c16192265f5 -Author: Sjoerd Simons -Date: Thu Jan 18 12:05:45 2007 +0000 +commit 16b379a0df1128cdc22c64fc06b2fb55001129d1 +Author: Jonny Lamb +Date: 2011-02-07 12:40:18 +0000 - Setup a dummy testing infrastructure - + plugin: clarify the return type of CreateChannelManagersImpl - 20070118120545-93b9a-e6ce9e3c3eb33fc9bda410cbf7a9ea2a9fa452ff.gz - - Makefile.am | 2 +- - configure.ac | 11 ++++++----- - tests/Makefile.am | 17 +++++++++++++++++ - tests/test-xmpp-connection.c | 4 ++++ - 4 files changed, 28 insertions(+), 6 deletions(-) + Signed-off-by: Jonny Lamb -commit 4f3399ee82de0a4ed1c11bea58cb54ac3bcdaf5e -Author: Sjoerd Simons -Date: Thu Jan 18 11:51:39 2007 +0000 +commit c241268980bcbdc00e768343eb56d7ae27162020 +Author: Jonny Lamb +Date: 2011-02-07 12:37:32 +0000 - Changed xmpp node to support namespaces - + test plugin: implement create_channel_managers - 20070118115139-93b9a-d112332d3516129161e9ba332e45f97c560a6d24.gz - - src/salut-xmpp-connection.c | 8 ++- - src/salut-xmpp-node.c | 105 ++++++++++++++++++++++++++++++++++-------- - src/salut-xmpp-node.h | 54 +++++++++++++++++++--- - src/salut-xmpp-stanza.c | 2 +- - src/text-mixin.c | 4 +- - 5 files changed, 139 insertions(+), 34 deletions(-) + Signed-off-by: Jonny Lamb -commit 26e723ea9a539616fec6d6bc99816b1b114a47ea -Author: Sjoerd Simons -Date: Thu Jan 18 11:47:18 2007 +0000 +commit 9acaad58f52a2d337126968aa173b35a4fb14c2d +Author: Jonny Lamb +Date: 2011-02-07 12:37:11 +0000 - Bump version to 0.1.0.1 - + connection: add channel managers from plugins - 20070118114718-93b9a-efd32a3288717fd33b064770a5612afd3c2bb485.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Signed-off-by: Jonny Lamb -commit 272ce980390ec2572ed651b617149e357a919c9b -Author: Sjoerd Simons -Date: Wed Jan 17 22:27:18 2007 +0000 +commit 091287566f168fd2a26900d4d8980973b889f144 +Author: Jonny Lamb +Date: 2011-02-07 12:36:45 +0000 - Remote stray obsolete marshal list files from the makefile - + plugin-loader: add create_channel_managers method to iterate the plugins - 20070117222718-93b9a-8d12ce9d36e9167ade8616f303de0a4480a5cb7a.gz - - src/Makefile.am | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + Signed-off-by: Jonny Lamb -commit 4c4966119876c2dcce78c74869a5f71495503423 -Author: Sjoerd Simons -Date: Wed Jan 17 22:17:35 2007 +0000 +commit 60f4cffc76886b2cc16a5672ef540e6aa346058d +Author: Jonny Lamb +Date: 2011-02-07 12:35:16 +0000 - bump version to 0.1.0 - + plugin: add a create_channel_managers plugin member - 20070117221735-93b9a-63ff6b3ec0e5442646621b81d670f0a4c7c9efcb.gz - - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + Signed-off-by: Jonny Lamb -commit 0f31e5a7bf810daf6d280ae8fb270e49e5cc595c -Author: Sjoerd Simons -Date: Wed Jan 17 22:03:04 2007 +0000 +commit be34bffd864816dbd82a8097a955eec3ed4131fa +Author: Jonny Lamb +Date: 2011-02-07 11:57:31 +0000 - Remove stray debug message - + plugin-loader: add plugin loader from gabble - 20070117220304-93b9a-a4378230437d235f2a9cd33fc09dca87204fda82.gz - - src/salut-xmpp-connection.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + Signed-off-by: Jonny Lamb -commit 6b53111d0d99aff2cf1ed2a2f4e1a8f49487f7d3 -Author: Sjoerd Simons -Date: Wed Jan 17 21:40:53 2007 +0000 +commit 6195e787e6fb2c92cebe85ebd815210f0952a2f0 +Author: Jonny Lamb +Date: 2011-02-07 11:49:59 +0000 - Add all marshal listings to EXTRA_DIST - + plugins: add a test plugin - 20070117214053-93b9a-f50b54655b72f54bd3334975294a7417484c57a2.gz - - src/Makefile.am | 37 +++++++++++++++++++++---------------- - 1 files changed, 21 insertions(+), 16 deletions(-) + Signed-off-by: Jonny Lamb -commit f779ee32dde4a296b9efb3beae5b4d5b1c0d3562 -Author: Sjoerd Simons -Date: Wed Jan 17 19:15:30 2007 +0000 +commit aacd617f299de8836b41383634c452060f0dcf4f +Author: Jonny Lamb +Date: 2011-02-07 11:44:15 +0000 - Copy the gabble dist-hook to write darcs changes in the the Changelog - + plugins: start defining SalutPlugin interface - 20070117191530-93b9a-553e7fb4de2b7a9081722a640ae56800fca3d4de.gz - - Makefile.am | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit e9ae50e65f215e5989d6ba859b979b5ff393de74 -Author: Sjoerd Simons -Date: Wed Jan 17 18:45:41 2007 +0000 +commit fc8261c9098be490635c7f6eea3fa47d0a134263 +Author: Jonny Lamb +Date: 2011-02-07 11:37:46 +0000 - If a contact is lost also signal it's presence as offline - + configure: add --enable-plugins option and link to gmodule - 20070117184541-93b9a-5096de81111a40658e091e8764250814fc91e5c7.gz - - src/salut-contact.c | 20 ++++++++++++++++---- - 1 files changed, 16 insertions(+), 4 deletions(-) + Signed-off-by: Jonny Lamb -commit 7d177b30239885b9fedb1b18ef73d91a9425ed3a -Author: Sjoerd Simons -Date: Wed Jan 17 17:34:52 2007 +0000 +commit af380d713a0fe6a74b84e30d0ebd576ed2904f2c +Author: Jonny Lamb +Date: 2011-02-07 11:34:08 +0000 - Also throw a stream error the stream isn't opened with the right namespace and localname (stream) - + debug: add plugin debug categories - 20070117173452-93b9a-26fad2643a2b29ec4c364d3ac276921075a54f3c.gz - - src/salut-xmpp-connection.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) + Signed-off-by: Jonny Lamb -commit d9c8502d92d05f5df0e3aa69c5befed1516473e3 -Author: Sjoerd Simons -Date: Wed Jan 17 17:27:17 2007 +0000 +commit 395324b1dab0e8b03b0ae44704a1347fefb3776b +Author: Jonny Lamb +Date: 2011-02-04 14:43:55 +0000 - Disconnect the transport on parse errors - + caps-hash: use wocky_caps_hash_compute_from_lists - 20070117172717-93b9a-c9065f4f3ba01f0b722845ecc10259d6f6653b89.gz + Signed-off-by: Jonny Lamb - src/salut-im-channel.c | 8 ++++++++ - src/salut-im-manager.c | 11 +++++++++++ - 2 files changed, 19 insertions(+), 0 deletions(-) +commit 56d7666e1bf58b3bed1301e039338765f181239a +Author: Guillaume Desmottes +Date: 2011-02-03 09:58:55 +0100 -commit dbd2f2b232e2b65064f225817ba8bbeac066aa79 -Author: Sjoerd Simons -Date: Wed Jan 17 17:26:37 2007 +0000 + add mising space - Ensure that we aren't disposed inside the xml parser callbacks - - - 20070117172637-93b9a-a866c1b5b5c576a512a0eb63fa0ff2bd5a0d6b3f.gz +commit 7be0c14026bc0d6c2b48cf63ef8078ada04b3fb4 +Author: Guillaume Desmottes +Date: 2011-02-03 09:58:26 +0100 - src/salut-xmpp-connection.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + file_transfer_channel_allowed_properties: update comment regarding properties ordering -commit 0d0c1cd6568740fa4d9d91e2133469671a4ce56c -Author: Sjoerd Simons -Date: Wed Jan 17 17:17:03 2007 +0000 +commit e5e96f1eb0f55daf657d696b7871e70ee22e9f4c +Author: Jonny Lamb +Date: 2011-02-02 16:30:48 +0000 - Let SalutXmppConnection thow parse-error signals when a xml error occurs + caps-hash: remove caps hashing code + This has moved to Wocky. - 20070117171703-93b9a-20404a82e8425c21c50b445f287c8b56138d42e6.gz - - src/salut-xmpp-connection.c | 23 ++++++++++++++++++++--- - 1 files changed, 20 insertions(+), 3 deletions(-) + Signed-off-by: Jonny Lamb -commit 366b010aa894dea1b736b702a1a325fe65637b05 -Author: Sjoerd Simons -Date: Wed Jan 17 16:38:52 2007 +0000 +commit 2ae55c56418a3eca478503b345a11505280b4341 +Author: Jonny Lamb +Date: 2011-02-02 16:30:26 +0000 - Add various missing files - - - Various files added that i forgot to add. Including the salut trasnport base - class and the salut xmpp connection + presence-cache: use wocky's caps hashing code - 20070117163852-93b9a-2966166b00cf398e1528cab21f84b3a89cb6599c.gz - - src/salut-transport.c | 187 +++++++++++++ - src/salut-transport.h | 88 ++++++ - src/salut-xmpp-connection-signals-marshal.list | 1 + - src/salut-xmpp-connection.c | 346 ++++++++++++++++++++++++ - src/salut-xmpp-connection.h | 72 +++++ - 5 files changed, 694 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit fc5fa400c79334363e60c99f2142d7823ce0b719 -Author: Sjoerd Simons -Date: Wed Jan 17 16:33:21 2007 +0000 +commit 5232222c686297476efa5d0480b59380cdbb23d4 +Author: Jonny Lamb +Date: 2011-02-02 16:29:59 +0000 - Add another forgotten file - + configure: test for python-avahi - 20070117163321-93b9a-2ca11e08b63888dc5eaee664edc186d4b3cf16a8.gz - - src/salut-transport-signals-marshal.list | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + Signed-off-by: Jonny Lamb -commit a4b12bd3b87939194d581e79885ec862352db651 -Author: Sjoerd Simons -Date: Wed Jan 17 16:28:09 2007 +0000 +commit 015fd9530cbbe4b010e8314dc2e7bfa7eb55c985 +Author: Jonny Lamb +Date: 2011-02-02 16:12:24 +0000 - Convert a few calls to the old transport mixin to using the new base class instead - + configure: check for xmldiff - 20070117162809-93b9a-99dea4e3b63306c2a0f912a5fbaa53301d5aebaa.gz - - src/salut-linklocal-transport.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + Signed-off-by: Jonny Lamb -commit 4ef0fc03bc387566536aa10e1192f13fd1675533 -Author: Sjoerd Simons -Date: Wed Jan 17 16:24:44 2007 +0000 +commit 4b6c7eae9d1f338ce9f7bc5a08b47175f23937be +Author: Jonny Lamb +Date: 2011-02-02 15:50:13 +0000 - Throw out the old transport mixin code - + update wocky snapshot - 20070117162444-93b9a-1a87e4e1e5da5b215aabe3277b88aece5f1b8025.gz - - src/salut-transport-mixin.c | 217 ------------------------------------------- - src/salut-transport-mixin.h | 100 -------------------- - 2 files changed, 0 insertions(+), 317 deletions(-) + Signed-off-by: Jonny Lamb -commit 15c6e87a6b9f9d0157d2c0c9557de5952b7daa99 -Author: Sjoerd Simons -Date: Wed Jan 17 16:17:12 2007 +0000 +commit a05c46e046b564c4a9f1a5a5f438ede6e33f0029 +Author: Guillaume Desmottes +Date: 2011-02-02 16:45:31 +0100 - Actually add the link-local transport, woops - - - 20070117161712-93b9a-3a52815e61835caa6454c069dc72b6bf37b2b811.gz + test URI property - src/salut-linklocal-transport.c | 410 +++++++++++++++++++++++++++++++++++++++ - src/salut-linklocal-transport.h | 86 ++++++++ - 2 files changed, 496 insertions(+), 0 deletions(-) +commit 1cb100517f2e430ef31b310acbbd7cf35463021e +Author: Guillaume Desmottes +Date: 2011-02-02 16:31:36 +0100 -commit 734cdad226d1e16b6b3c3802744eda668c90f485 -Author: Sjoerd Simons -Date: Wed Jan 17 16:06:33 2007 +0000 + Implement FileTransfer.FileURI (fdo #33833) - implement parser, transform salut-transport-mixin to a base class - - - Big code commit: - - * Add libxml2 based xml parsing and writing to salut-xmpp-connection - * expand the SalutXmppNode code as needed for salut-xmpp-connection - * Refactor the salut-transport mixin into a base class - - 20070117160633-93b9a-13aa468677e088da2b876bfb27863c47827f2281.gz +commit 4a2f0b9d5c36dd085a93d3e8a0fc3d87e7829f69 +Author: Guillaume Desmottes +Date: 2011-02-02 15:21:20 +0100 - configure.ac | 6 ++ - src/Makefile.am | 12 ++-- - src/salut-connection.c | 1 + - src/salut-im-channel.c | 37 ++++++++---- - src/salut-im-channel.h | 10 ++- - src/salut-im-manager.c | 32 ++++++---- - src/salut-self.c | 2 +- - src/salut-transport-mixin-signals-marshal.list | 2 - - src/salut-transport-mixin.c | 2 +- - src/salut-xmpp-node.c | 76 +++++++++++++++++++++--- - src/salut-xmpp-node.h | 32 +++++++++- - src/text-mixin.c | 3 +- - 12 files changed, 163 insertions(+), 52 deletions(-) + file transfer tests: use constants.py -commit bd002836c9506a5d9c10ba5a4c3d4aaf593201c3 -Author: Sjoerd Simons -Date: Fri Jan 12 15:42:43 2007 +0000 +commit 317ad67e47170acf2cdc3fe0c6ab045b3093f628 +Author: Guillaume Desmottes +Date: 2011-02-02 14:29:28 +0100 - Correct type for salut transport disconnected signal - + constants.py: sync with Gabble - 20070112154243-93b9a-1036a3ea18a4b840de5bf89f31480c664126a7a0.gz - - src/salut-im-channel.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) + Remaining change: ContactCapabilities is still a DRAFT in Salut. -commit e05abef02e1e7a4705deaa82a87534d5265a5fbe -Author: Sjoerd Simons -Date: Fri Jan 12 14:34:27 2007 +0000 +commit 8783513aa2c5fde5d408054d10d8c89f48e7ea92 +Author: Guillaume Desmottes +Date: 2011-02-02 13:16:22 +0100 - the received_signal_id in the right variableof the transport mixin - + file_transfer_channel_allowed_properties: use tp-glib constants - 20070112143427-93b9a-48e3242927cbb7c955c0e5e17af9879f7c502964.gz - - src/salut-transport-mixin.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Also re-order it to match Gabble's ordering. -commit 506857a5a3134d271eb5dc77de112d80a184b7e9 -Author: Sjoerd Simons -Date: Fri Jan 12 14:33:49 2007 +0000 +commit 7dffc1e2c000a36d8cae2f69b43e8144e89d6b26 +Author: Guillaume Desmottes +Date: 2011-02-02 13:10:52 +0100 - Make the stanza received signals more consistent - + Depends on telepathy-glib 0.13.12 - 20070112143349-93b9a-f1c84fc006e19ee320442e6ae7e7e2815bb62736.gz - - src/salut-im-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + We need it to implement FileTransfer.URI. -commit fc984ece84c623b6dd40c194f22db98059e275c2 -Author: Sjoerd Simons -Date: Fri Jan 12 14:17:34 2007 +0000 +commit e8e06a9d1c688d7b56ccc1f8267ece7cb9a96d62 +Author: Guillaume Desmottes +Date: 2011-02-02 13:25:19 +0100 - Get rid of the account parameter - + saluttest: silence the queue if we hit an error - 20070112141734-93b9a-d96ac75babf8dadffa41a4dcd723b6f76476cad7.gz - - src/salut-connection-manager.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) + This a backport of the Gabble commit ee177cfb2a13a8374e2f1037e806b7bc58aa708b -commit b9684ae74b9726a457cbfe656dfbb63fd7ea0091 -Author: Sjoerd Simons -Date: Fri Jan 12 13:56:29 2007 +0000 +commit f7687c7da88feccd4a225d17397ee83118018052 +Author: Simon McVittie +Date: 2010-12-03 15:59:35 +0000 - first compilable non-loudmouth version - - - First compilable version with the new xmpp infrastructure. Currently the xmpp - connection is just a dummy for now. + test-close-local-pending-room.py: be more specific in our expectations - 20070112135629-93b9a-c315cde73954264a7a5121782aede9ea41f11633.gz + When not on a LAN, the events don't come out in the order we'd assumed. - configure.ac | 19 - - src/Makefile.am | 20 +- - src/debug.h | 7 - - src/lm-parser.h | 40 -- - src/salut-connection.c | 7 +- - src/salut-im-channel-signals-marshal.list | 2 +- - src/salut-im-channel.c | 232 ++++++------ - src/salut-im-channel.h | 8 +- - src/salut-im-manager.c | 106 ++++-- - src/salut-im-manager.h | 3 +- - src/salut-lm-connection-signals-marshal.list | 2 - - src/salut-lm-connection.c | 544 -------------------------- - src/salut-lm-connection.h | 106 ----- - src/salut-self.c | 13 +- - src/salut-transport-mixin.c | 50 ++- - src/salut-transport-mixin.h | 16 +- - src/salut-xmpp-node.c | 9 +- - src/salut-xmpp-node.h | 14 +- - src/text-mixin.c | 64 ++-- - src/text-mixin.h | 7 +- - src/util.c | 97 ----- - src/util.h | 6 - - 22 files changed, 314 insertions(+), 1058 deletions(-) +commit a15d92f646d661207f947c65554bc2421a42fe57 +Author: Simon McVittie +Date: 2010-12-03 15:58:34 +0000 -commit 71b52a1a3588a9bff133df3690a75a2b4df1db1b -Author: Sjoerd Simons -Date: Thu Jan 11 13:59:17 2007 +0000 + test-close-local-pending-room.py: use constants.py - Implement xmpp stanza, nodes and a transport mixin - +commit 5527c3226d98a1afd3b0df3c63b36712d9149f09 +Author: Simon McVittie +Date: 2010-12-03 12:30:29 +0000 + + test-muc-invite.py: avoid implicit assertion that no non-Text channels appear - 20070111135917-93b9a-3f06eb6df42abdbf38f476d369299bf68ec73e5c.gz + This failed at least once for me while on an offline laptop. - src/Makefile.am | 8 + - src/salut-transport-mixin-signals-marshal.list | 2 + - src/salut-transport-mixin.c | 189 ++++++++++++++++++++++++ - src/salut-transport-mixin.h | 90 +++++++++++ - src/salut-xmpp-node.c | 119 +++++++++++++++ - src/salut-xmpp-node.h | 61 ++++++++ - src/salut-xmpp-stanza.c | 99 ++++++++++++ - src/salut-xmpp-stanza.h | 62 ++++++++ - 8 files changed, 630 insertions(+), 0 deletions(-) +commit 8a26a635ad7249d650afede4201030e34c567cc5 +Author: Simon McVittie +Date: 2010-12-03 12:29:55 +0000 -commit e807ae1ca88c068395124bd14fa03c7d9627ac01 -Author: Sjoerd Simons -Date: Sun Jan 14 16:07:57 2007 +0000 + test-muc-invite.py: make better use of constants.py - Signal connecting right at the start of the connect sequence - - - 20070114160757-93b9a-1be8288f7daad45667bee499fd762f74f99f1103.gz +commit ff4a8979d408daaebd19ff041b2d908aa3a3bc76 +Merge: ee83ae0 cbe5cc6 +Author: Simon McVittie +Date: 2010-12-03 12:18:21 +0000 - src/salut-connection.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) + Merge branch 'master' into mock-avahi -commit 7eeb2f06b719b45f1006688e7a2e896a98d7a77d -Author: Sjoerd Simons -Date: Sun Jan 14 16:07:20 2007 +0000 +commit cbe5cc6fdeb62706f03bf212f2fd747dae8bde15 +Author: Simon McVittie +Date: 2010-11-17 17:48:01 +0000 - Only signal connected iff we're announcing ourselves - + fd.o #31665: use TpDBusDaemon, not tp_get_bus() - 20070114160720-93b9a-922c649841c50d09cd23fb1de78073d3a2bbf62b.gz - - src/salut-connection.c | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) + Reviewed-by: Guillaume Desmottes -commit 66e1f26a546de9fc74b96242a08cda015d906ab5 -Author: Sjoerd Simons -Date: Thu Nov 30 13:37:38 2006 +0000 +commit ee83ae0811a5753316766ded2d85f8758f83ba43 +Merge: 2cb3acc 279099c +Author: Tomeu Vizoso +Date: 2010-11-05 14:03:04 +0100 - Remove unneeded signals identifiers from the signals enum - - - 20061130133738-93b9a-5bd2752312aa6adf14ccb6e74d1e2d23b793dd42.gz + Merge branch 'mock-avahi-3' into mock-avahi-4 - src/salut-contact-channel.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) +commit d68cc47ccbc09a02f997eb2e09d8e6977099cdeb +Author: Simon McVittie +Date: 2010-10-07 15:45:53 +0100 -commit fd77fc9ba4f4a4645e038df9b2cd185336e7657c -Author: Sjoerd Simons -Date: Thu Nov 30 13:06:24 2006 +0000 + Remove SalutCapsChannelManager - [project @ 6b2e54f0e59c541de51549cb8d013d8145c55bcb] - - Salut's text-mixin doesn\'t need namespaces - - 20061130130624-93b9a-e14441e976c58c9aa180102fe9085ebc00bdabf3.gz +commit 4f5e6848885df1e4418a6ea525533399d2cf52bc +Author: Simon McVittie +Date: 2010-11-01 12:23:03 +0000 - src/text-mixin.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + SalutPresenceCache: don't store per_channel_manager_caps -commit 0f01cb57c707700da29603ab911bbdf5b0fee0b0 -Author: Sjoerd Simons -Date: Tue Nov 28 11:35:12 2006 +0000 +commit a66e59e57fb9d5a0db5e7a783d918552c9b853f7 +Author: Simon McVittie +Date: 2010-10-07 15:40:34 +0100 - [project @ 183ce80ae2d66b922c6e95bcc8afc2117598be68] - - * If only one contact can match with a new connection, use that.. Don't wait - for the first message with a from (Fixes iChat compatibility) - - 20061128113512-93b9a-1a6f8a1db616644bf9f7a0df6c06418a6ed48316.gz + SalutContact: don't store per_channel_manager_caps - src/salut-im-channel.c | 1 + - src/salut-im-manager.c | 23 ++++++++++++++--------- - 2 files changed, 15 insertions(+), 9 deletions(-) +commit ff8a9257edd2347d65c49c7a1e70b1fa685f535d +Author: Simon McVittie +Date: 2010-10-07 15:39:13 +0100 -commit c2c01d2514a1e12ce04fe474f36a2d97d24cdff8 -Author: Sjoerd Simons -Date: Tue Nov 28 11:33:01 2006 +0000 + SalutPresenceCache: don't emit the actual capabilities in capabilities-update - [project @ 65ff030b3845d652b6f05c4d15c1742917bb5b7f] - - Don\'t force the existance of the from tag - - 20061128113301-93b9a-7acb39994f0cd99b7c8c45a7494c573b9934688c.gz +commit 2d79e55cae1bc970738bbea23f7f29bb609c2841 +Author: Simon McVittie +Date: 2010-10-07 15:35:06 +0100 - src/text-mixin.c | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) + Remove now-unused functionality from SalutCapsChannelManager -commit abc2ad321cf2630945055843fb0e64558504bd8a -Author: Sjoerd Simons -Date: Mon Nov 27 13:55:37 2006 +0000 +commit 5ab4bfc3d804e3d7f13c02f74204c33c5fcab02b +Author: Simon McVittie +Date: 2010-10-07 15:14:15 +0100 - [project @ 8ba1d430dd558e14ddee3bb85e3effd90a6db365] - - Make _message_parsed static like it should be + SalutSelf: work entirely in terms of a GabbleCapabilitySet, with no "per-channel-manager caps" - 20061127135537-93b9a-bd3021ca5bda91fee32674e3fcb753e8b5977913.gz - - src/salut-lm-connection.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + In the process, convert salut_connection_set_self_capabilities to use + gabble_caps_channel_manager_represent_client. -commit 2f2849e53fbe490667abe2d64aec4149cab64453 -Author: Sjoerd Simons -Date: Mon Nov 27 09:49:02 2006 +0000 +commit 85c6d6055dac41fb9426c7fd80c921996d1d3e0c +Author: Simon McVittie +Date: 2010-10-07 14:59:33 +0100 - [project @ fe6663f0a1ae57747f75fd353632035fe52f8ac7] - - Add the received-message signal back, which was actually reverted + salut_self_swap_per_channel_manager_caps: stop returning the old caps - 20061127094902-93b9a-61ed949c8fbefe5e11bc43a0d142e31b3e31d8f1.gz + They're no longer needed. + +commit 185f79efa3815df1f0d808a329ea8092ed773f15 +Author: Simon McVittie +Date: 2010-10-07 14:57:19 +0100 - src/salut-im-channel.c | 14 ++++++++++++-- - 1 files changed, 12 insertions(+), 2 deletions(-) + _emit_contact_capabilities_changed: no longer needs the old/new caps -commit 59ebe26f2c0b60f136460c15b49fa354b7f635d0 -Author: Sjoerd Simons -Date: Wed Nov 22 14:12:45 2006 +0000 +commit 6780d912b70569152df058fb3087d1d12e7f468e +Author: Simon McVittie +Date: 2010-10-07 14:56:09 +0100 - [project @ c3d548c5f783f8255f98ca6949edd8be4aa0fb5d] - - Let salut-im-channel use the text-mixin + _emit_contact_capabilities_changed: always emit the signal - 20061122141245-93b9a-c300c6d9fe74623e57e5120e4e6db04971b7918c.gz + Both of its callers now check for a difference. - src/salut-im-channel.c | 305 +++++++++++------------------------------------- - src/salut-im-channel.h | 3 + - src/text-mixin.c | 6 +- - src/text-mixin.h | 5 +- - 4 files changed, 75 insertions(+), 244 deletions(-) +commit 94cb205fc725d6522f6c8072565140f0e3206c65 +Author: Simon McVittie +Date: 2010-10-07 14:55:09 +0100 -commit 096eb2dd9100671d27d5805a8f1e548e15c9316e -Author: Sjoerd Simons -Date: Wed Nov 22 11:55:58 2006 +0000 + salut_connection_set_self_capabilities: only call _emit_contact_capabilities_changed if caps have changed - [project @ 67d0a4a58c5fb9682843847dafe1068d25cc4c49] - - Add a gabble derived text mixin - - 20061122115558-93b9a-d017921d0c0337706c4a5cb5f5a9776115b47b6d.gz +commit 107e5f62fe1e1d3e459ecc6f0d459a68c6886b44 +Author: Simon McVittie +Date: 2010-10-07 14:51:51 +0100 - src/Makefile.am | 5 +++++ - src/util.c | 9 +++++++++ - src/util.h | 1 + - 3 files changed, 15 insertions(+), 0 deletions(-) + connection_capabilities_update_cb: always call _emit_contact_capabilities_changed -commit 8cfc0e9cc033fa5050718c03e59bef888b8df31a -Author: Sjoerd Simons -Date: Wed Nov 22 11:55:50 2006 +0000 +commit af3395399d83d916035e2df1209f7fe959352568 +Author: Simon McVittie +Date: 2010-10-07 14:51:15 +0100 - [project @ af5f52f32a68abbb35c2133276469a87c9d3ba31] - - Add a gabble derived text mixin - - 20061122115550-93b9a-f7a1feca3bac37992169db5189e89326f08ad802.gz + salut_presence_cache_change_caps: do nothing if contact's caps are unchanged - src/text-mixin-signals-marshal.list | 3 + - src/text-mixin.c | 688 +++++++++++++++++++++++++++++++++++ - src/text-mixin.h | 104 ++++++ - 3 files changed, 795 insertions(+), 0 deletions(-) +commit be3658ad0df3a4a81d66e255cecd559dcaa69ec3 +Author: Simon McVittie +Date: 2010-10-07 14:47:36 +0100 -commit dedad4642ba53577be9e77b15372da4dcbb5a59e -Author: Sjoerd Simons -Date: Mon Nov 20 13:37:19 2006 +0000 + SalutCapsChannelManagerGetContactCapsFunc: remove, unused - [project @ 7bfde2bd2eabf5b20abab8c27ff31903562a6963] - - * Rename SalutIMChannel to SalutImChannel - * Add a function to get a channel to a given contact handle - - 20061120133719-93b9a-eec8fa11e60f755f4e7c0f8249205afa1e7b4734.gz +commit 9e348a4b7be07c544bcae015e08b1f0c157e5959 +Author: Simon McVittie +Date: 2010-10-07 13:19:42 +0100 - src/salut-im-manager.c | 27 +++++++++++++++++++++------ - src/salut-im-manager.h | 3 +++ - 2 files changed, 24 insertions(+), 6 deletions(-) + SalutConnection: use GabbleCapsChannelManager to read contacts' caps -commit a9cc486d08adcc1a2ae1553c23f456e65a587121 -Author: Sjoerd Simons -Date: Mon Nov 20 13:36:21 2006 +0000 +commit 568c4516d414d3027ad1d707235a4e009a9beb42 +Author: Simon McVittie +Date: 2010-10-07 13:17:50 +0100 - [project @ cf8211bb2d01fe1c61e6dedfa331de8b2615a4b1] - - * Before the default handling of incoming messages send out a signal so - other handlers can catch and handle it instead - * Rename SalutIMChannel to the more consistent SalutImChannel - - 20061120133621-93b9a-2461734c6fb7d186a83b0dc4d93fd4c9d9f4a9a1.gz + Implement a trivial GabbleCapsChannelManager on channel managers that have no caps - src/salut-im-channel-signals-marshal.list | 1 + - src/salut-im-channel.c | 229 +++++++++++++++++++---------- - src/salut-im-channel.h | 38 +++-- - 3 files changed, 176 insertions(+), 92 deletions(-) +commit 96b3489f713a0c2cdb31f304aad8e0ca9a82ba95 +Author: Simon McVittie +Date: 2010-10-07 13:10:15 +0100 -commit 7523600901f52df89ef7ca2350d8c1c55d0a63ff -Author: Sjoerd Simons -Date: Mon Nov 20 12:47:57 2006 +0000 + SalutImManager: implement new-style get_contact_caps - [project @ 8ec6c3474a7c812abd5adb7434cbfda5692d97f6] - - * Fix leaking of GIntSet\'s - - 20061120124757-93b9a-95a74d5544895672ff1f1e988bb7a52274a5b9d2.gz +commit 739c94ced26cabe12bb5bc87760983c4e24d845e +Author: Simon McVittie +Date: 2010-10-07 12:59:46 +0100 - src/salut-contact-manager.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + SalutSelf: limit per_channel_manager_caps editing to a "swap" operation -commit 3a0532b5896f654cb699e47b61730f4cba60a4d4 -Author: Sjoerd Simons -Date: Mon Nov 20 13:37:48 2006 +0000 +commit 824aa6b7b2143632186997facff1e6c545d2e9dd +Author: Simon McVittie +Date: 2010-10-07 12:53:41 +0100 - [project @ 7ac4cc6615b71fb0668040d9d49dfdca41510a2e] - - Add some small LM utilities + Change signature of salut_caps_channel_manager_add_capability - 20061120133748-93b9a-e56a10a6d946148917e60fb3a542a492c4f45661.gz + - it implicitly acts on the self-handle (nothing else makes sense) + - it takes the per_channel_manager_caps to modify as an argument + instead of editing the SalutSelf directly - src/Makefile.am | 2 + - src/util.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/util.h | 33 +++++++++++++++ - 3 files changed, 157 insertions(+), 0 deletions(-) +commit bc579b149883f032c124aece99e8098db69ffdb9 +Author: Simon McVittie +Date: 2010-10-07 12:39:04 +0100 -commit 7afec45d4679869825c6f5e62f9b6d1e6e3bb906 -Author: Sjoerd Simons -Date: Thu Nov 16 11:22:11 2006 +0000 + Add simple accessors for SalutSelf's per_channel_manager_caps - [project @ a3798216d87de9797e62997bf7a2d807db8048c5] - - * Bump nano for another test-release, some changes were mistakenly reverted - before 0.0.0.3 - - 20061116112211-93b9a-3cf79c3ccc38dd84a89e3a0c27c286cf77c7248b.gz +commit 2e526e88acb15a9a2c45d523ee772ab1b582e154 +Author: Simon McVittie +Date: 2010-10-07 12:17:15 +0100 - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + salut_self_get_features: make static -commit 2141313fd651b5418f8c3758cf66f82ffc7d67d0 -Author: Sjoerd Simons -Date: Tue Nov 7 14:57:26 2006 +0000 +commit 492ff26eeea595bbf9bfcf36bee76ba87be59a6a +Author: Simon McVittie +Date: 2010-10-07 12:06:27 +0100 - [project @ 906ba0a2d64ba4939755efb8cd17023c66261e7e] - - * Also close the connection's fd if dispose is being run before setting - up the channel - * Let get_address normalize an ipv4 in ipv6 address to a normal ipv4 address - - 20061107145726-93b9a-8780fa39de19a8008a375c6b7ccadd499a5e449e.gz + Use salut_self_get_caps instead of salut_self_get_features - src/salut-lm-connection.c | 17 +++++++++++++++-- - 1 files changed, 15 insertions(+), 2 deletions(-) +commit 83e66a0af3117bc559b31eab52d8e4d62b2ee292 +Author: Simon McVittie +Date: 2010-10-07 12:06:08 +0100 -commit 74271c208c89f87568ae1c75bc073b711d5b80f7 -Author: Sjoerd Simons -Date: Wed Nov 15 11:30:09 2006 +0000 + SalutSelf: add an accessor for a capabilities set - [project @ 22a29117beb63fe54c845b0bfd37e10a13c9640a] - - Revert "Remove the dummy offline presence", we need this for contacts requested that don't exist (or we don't know about yet) - - This reverts commit 0e135f0779ac6d2c2a61fdc5305b7d98db50c123. - - 20061115113009-93b9a-d6b7b9ae658dd3d14c5ffbb037579d5922d80c72.gz +commit a13c8e58094b9524ada5c54edb7ca8c9c6a99518 +Author: Simon McVittie +Date: 2010-10-06 19:08:22 +0100 - src/salut-presence.h | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + FT, Tubes channel managers: implement GabbleCapsChannelManager -commit 39754683a078bd140a2d26025d83fb29c799dc7f -Author: Sjoerd Simons -Date: Wed Nov 15 11:28:49 2006 +0000 +commit dbae0daf521292779949dd1a20650be09295f9c6 +Author: Simon McVittie +Date: 2010-10-06 18:58:14 +0100 - [project @ 79c650af42fe6d4445bc9430fa94ec32643bd68d] - - Revert "Sync PresenceId enum and PresenceStatusInfo array" - - This reverts commit 3ae5906d355f2a7acd23de23f71b54338d273bdb. - - 20061115112849-93b9a-4dcaf1ec54d3ce8144054abdd8588fb595981981.gz + Add a quirk (pseudo-capability) to anyone without XEP-0115 caps - src/salut-presence.h | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) +commit 3412b586ac693e2d1b73ec276cd36b1e5d25bc28 +Author: Simon McVittie +Date: 2010-10-06 18:53:53 +0100 -commit e774aab31555265f0ad870826320c9c2eb207579 -Author: Sjoerd Simons -Date: Tue Nov 14 09:50:09 2006 +0000 + SalutContact: have guaranteed non-NULL new-style capabilities - [project @ 3ae5906d355f2a7acd23de23f71b54338d273bdb] - - Sync PresenceId enum and PresenceStatusInfo array - - 20061114095009-93b9a-83915752b9fb4d6951e8c1772235fa6e2ce8bf8a.gz +commit ec01a9a74666325d6cd3601aabb132b302bb3206 +Author: Simon McVittie +Date: 2010-10-06 18:38:04 +0100 - src/salut-presence.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + SalutPresenceCache: remember a CapabilityInfo struct for those without caps -commit 66fdfdc441d434642e4f3b46f2396fdfe31a7edc -Author: Sjoerd Simons -Date: Fri Nov 10 16:40:49 2006 +0000 +commit 14136a6e2d57fd0a6b7d0581f308405f978a49ab +Author: Simon McVittie +Date: 2010-11-01 12:22:20 +0000 - [project @ 54fb1a4f1ed1aa95e7876c426798e46ad2a6b485] - - Bump nano version for another test release + Give capability_info_get the semantics you'd expect - 20061110164049-93b9a-b1ab38e5f2f801612d180820f716649b322a8732.gz - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + In particular, this means the struct's members never need to be NULL. -commit b3d40f8f1df86ce74c87c9fd6aa6a4a005560cc5 -Author: Sjoerd Simons -Date: Fri Nov 10 12:57:38 2006 +0000 +commit 124e8bfca5dda0a74b55b36eb98656f3d1ebba88 +Author: Simon McVittie +Date: 2010-10-06 17:54:24 +0100 - [project @ c0393177ba3c6775d98d69398c400f49f1665a34] - - * salut-contact-manager: Change the function to find a contact from an address - to return a list of contacts instead - * salut-im-manager: When matching a connection to a contact look at the first - "from" attribute in a message and match it to all contacts known on that - address at the time the connection came in. This ensures correct handling if - multiple contacts are on one host. - - 20061110125738-93b9a-4b23b4040bd495fa76c6ab2e26a2ad5d0a1fb38f.gz + salut_presence_cache_change_caps: factor out - src/salut-contact-manager.c | 28 +++++++--- - src/salut-contact-manager.h | 4 +- - src/salut-im-manager.c | 116 +++++++++++++++++++++++++++++++++++++------ - 3 files changed, 123 insertions(+), 25 deletions(-) +commit 764398884d19debfbefd380e4bf7aa477c867b5b +Author: Simon McVittie +Date: 2010-11-01 12:21:28 +0000 -commit 942a4bdef492f7e31f33bfe45493e483d17b3c9d -Author: Sjoerd Simons -Date: Thu Nov 9 12:34:35 2006 +0000 + SalutPresenceCache: store a GabbleCapabilitySet too - [project @ 563b7cc0dfb660568368c0b269ac68438197c35a] - - s/initialize/initialise/g - - 20061109123435-93b9a-8eb6ed4288d3ceeb3132e7e311a81e78edc2ce18.gz +commit 6d9edc433b2ee0d94eacd638a073a410242a44eb +Author: Simon McVittie +Date: 2010-10-06 13:23:46 +0100 - src/salut-im-channel.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + SalutPresenceCache: imply caps_set by (per_channel_manager_caps != NULL) -commit 9da0d6e10c292d42e3e95142d29d2fab2d9d0701 -Author: Sjoerd Simons -Date: Thu Nov 9 12:20:50 2006 +0000 +commit ac7f670911cabd895f5af1240b2e3784d299b057 +Author: Simon McVittie +Date: 2010-10-06 13:20:07 +0100 - [project @ 68acdc6e5b150c1af94c9e8b658c52fb1fcbebb5] - - Add api for users to sync to the state of the lm-connection api and change the - im-channel to do exactly that. This will allow us to receive some messages - before passing the connection to an im channel. + SalutPresenceCache: don't create per_channel_manager_caps until needed - 20061109122050-93b9a-7efe7d918b36b4e55a55a9bff361824468bf7326.gz - - src/salut-im-channel.c | 57 +++++++++++++++++++++++++++++++----------- - src/salut-lm-connection.c | 60 ++++++++++++++++++++++++++------------------ - src/salut-lm-connection.h | 13 ++++++--- - 3 files changed, 85 insertions(+), 45 deletions(-) + This also fixes a theoretical leak if we get a redundant disco response + when caps_set is already TRUE. -commit e7bb016534c4fc37ab0dd5f5830f68c5bc88cb94 -Author: Sjoerd Simons -Date: Tue Nov 7 14:58:24 2006 +0000 +commit 21b30751bcf16356363db168ec33a1582822b198 +Author: Simon McVittie +Date: 2010-10-06 13:09:37 +0100 - [project @ 3c8db52cc3681c79f41a374ea78c09c7f173891a] - - Add more debug info to trace the path an incoming connection follows - - 20061107145824-93b9a-3726d3dbd1e8f1f45f1988014e24ac58b2f8ec24.gz + SalutPresenceCache: inline capability_info_recvd into its one caller - src/salut-connection.c | 2 ++ - src/salut-im-manager.c | 3 +++ - 2 files changed, 5 insertions(+), 0 deletions(-) +commit 4e7982bf4aed630addfd31d4d123d41e9da0620f +Author: Simon McVittie +Date: 2010-10-06 13:37:41 +0100 -commit 34388a4e3754669aa82a3d91e1ba0d08490137bd -Author: Sjoerd Simons -Date: Tue Nov 7 14:57:26 2006 +0000 + SalutTubesManager: add_service_to_array: remove unused argument - [project @ ec090eaec6dcbf116761758af039e8622870d81a] - - * Also close the connection's fd if dispose is being run before setting - up the channel - * Let get_address normalize an ipv4 in ipv6 address to a normal ipv4 address - - 20061107145726-93b9a-8a35b7082485e98fa76655729c2a1c005c38fe80.gz +commit ef65ffffd9b883dc5eae9fd0aac4cba5542a1ef5 +Author: Simon McVittie +Date: 2010-10-06 12:57:33 +0100 - src/salut-lm-connection.c | 17 +++++++++++++++-- - 1 files changed, 15 insertions(+), 2 deletions(-) + SalutFTManager: add_file_transfer_channel_class: remove unused argument -commit 472e80b86e23264b661d51cc1d8290df921fb2f8 -Author: Sjoerd Simons -Date: Tue Nov 7 14:56:01 2006 +0000 +commit c26759d1cda55c8212c9f3c4700f62c646fdd837 +Author: Simon McVittie +Date: 2010-11-01 13:16:32 +0000 - [project @ 51ed3c32e2a009beadb3eb181f88f2200604d32c] + Import GabbleCapsChannelManager and related classes - Compare ipv6 address as ipv6 and ipv4 as ipv4, not the other way around + From Gabble, with minimal modifications: - 20061107145601-93b9a-e8ec950677a9ab1a3ed288c6e7c02448e32bf3c2.gz - - src/salut-contact.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + - put gabble/namespaces.h in gabble_namespaces.h + - include capabilities-set.h instead of gabble/capabilities-set.h + - use DEBUG_PRESENCE instead of GABBLE_DEBUG_PRESENCE -commit 6629ec213794d3bc4ef8ac2d58a44f1e0004a5e3 -Author: Sjoerd Simons -Date: Tue Nov 7 13:55:14 2006 +0000 +commit 2cb3acc20fcf252517a6b94f66f37f09756ba2b9 +Merge: 93e1ace 401d722 +Author: Simon McVittie +Date: 2010-11-05 12:28:03 +0000 - [project @ b61b015c7459754ff6718c48352964f521fdea9d] - - Fix typo in TXT record textvers -> txtvers + Merge branch 'reliability' - 20061107135514-93b9a-8c034f9d59533f6e300ad3904f19bab59660f932.gz + Reviewed-by: Guillaume Desmottes - src/salut-self.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) +commit 279099cd64e7f337ce13f73bbb1f14b975a9c8ee +Author: Tomeu Vizoso +Date: 2010-11-04 14:32:43 +0100 -commit a4c73ccd1d8f347e9bd239960a29c2f8a799920b -Author: Sjoerd Simons -Date: Mon Nov 6 19:06:13 2006 +0000 + Only emit ServiceResolver.Found signals that match the protocol - [project @ c68a881aa0ac2f6ad3d710dea1066a74615e3c6c] - - Use socklen_t for size instead of size_t for socket fucntions, fixes compile on AMD64 - - 20061106190613-93b9a-fcbebd4b01596825e2608b208cf571b7994ce5cd.gz +commit 0e0532968984ef1e49a61d463364202aeb9dc4a1 +Author: Tomeu Vizoso +Date: 2010-11-04 12:57:44 +0100 - src/salut-im-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Get the event for the expected protocol -commit fa7c34f23d9708795e4ae1a4a291a48fac61a287 -Author: Sjoerd Simons -Date: Mon Nov 6 18:44:47 2006 +0000 +commit 401d722e8adcc275e8c77416e57a2fcfc302bc8f +Author: Simon McVittie +Date: 2010-11-01 18:34:54 +0000 - [project @ ddcc44eae0855f8a9981b0e0d7adda06af0e3c58] - - Bump nano version for new beta release - - 20061106184447-93b9a-bb993304943105e868ad51d9e3b783795db89610.gz + Use wait_for_contact_in_publish more - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) +commit c4537936793e9980f3c79b52851150ad5a365fd7 +Author: Simon McVittie +Date: 2010-11-01 17:42:44 +0000 -commit f38a08211a0295d649864ff48a63d00f94eaf37d -Author: Sjoerd Simons -Date: Mon Nov 6 18:44:06 2006 +0000 + test-caps-file-transfer: expect ContactCapabilitiesChanged in a non-racy way - [project @ fe6f1cac772eadff5b1b9033466c36c34fd8166e] - - Remove some unnecessary debug info - - 20061106184406-93b9a-41965e46d917e5299636638af81ad99f3becf3c4.gz +commit 788dd4105660df6de1a7caee5cd8417f21488f79 +Author: Simon McVittie +Date: 2010-11-01 17:31:22 +0000 - src/salut-avahi-service-resolver.c | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) + file-transfer/test-ichat-receive-file.py: re-enable if no other llXMPP is running -commit 23fcf685b0b8def10ca2004ffe2df7a18db7a5fc -Author: Sjoerd Simons -Date: Mon Nov 6 18:33:50 2006 +0000 +commit ad25a0c9081965c5ca1d8ff27bbcaf6f277eb9ed +Author: Simon McVittie +Date: 2010-11-01 17:30:59 +0000 - [project @ 2551f42dda7f1e9a0d2da2d61e36e0d71fada514] - - Start requiring the first and last name parameters + salut_file_transfer_channel_new_from_stanza: force the 'from' address - 20061106183350-93b9a-d5064359a5390c2fe85a240954a4b4964c8ef05b.gz + This is necessary to interop with iChat, which doesn't specify. This + appears to have regressed in November 2008, but the test was disabled, + so nobody noticed... - src/salut-connection-manager.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) +commit 7b2aa8033044ef7c49303a4af4429b6a19b5421a +Author: Simon McVittie +Date: 2010-11-01 17:27:44 +0000 -commit 1d19be619e7322140c945e9df41de3ce797feac1 -Author: Sjoerd Simons -Date: Mon Nov 6 18:27:33 2006 +0000 + gibber_file_transfer_new_from_stanza and friends: raise a GError - [project @ f40066638fd4511d836c7c69feeabadfaee8aa7e] - - Implement Aliasing interface on the Connection - - 20061106182733-93b9a-48776b80964acc8321aa6a3108045b78b6a7f2eb.gz +commit 1a44c03aa82541f38ca91e92f6f568c26a86fc56 +Author: Simon McVittie +Date: 2010-11-01 16:04:40 +0000 + + avahi/test-muc-invite.py: use wait_for_contact_in_publish() - src/salut-connection-signals-marshal.list | 5 +- - src/salut-connection.c | 136 +++++++++++++++++++++++- - src/salut-connection.h | 15 +++ - src/salut-contact-manager-signals-marshal.list | 1 + - src/salut-contact-manager.c | 21 ++++ - src/salut-contact-signals-marshal.list | 1 + - src/salut-contact.c | 79 +++++++++++++- - src/salut-contact.h | 2 + - src/salut-self.c | 32 ++++++ - src/salut-self.h | 3 +- - 10 files changed, 286 insertions(+), 9 deletions(-) +commit 033bb4edc3aa0e150b8e7bc2488c7a2491e00170 +Author: Simon McVittie +Date: 2010-11-01 16:04:22 +0000 -commit 12de0d598590a4b52ee09dc174e1ed377e422202 -Author: Sjoerd Simons -Date: Mon Nov 6 18:03:34 2006 +0000 + Tests: factor out wait_for_contact_in_publish() - [project @ d4f910d73d979759dcd37c5165e388cbc74d7de5] - - Add Aliasing interface to the Connection object. Causes everything to be regenerated - - 20061106180334-93b9a-3460eaeb0f8627b9c11f13d59aee6466f57608f2.gz +commit 03688071f04208f2cf500512ac6c8247f7ffe6fd +Author: Simon McVittie +Date: 2010-11-01 15:53:56 +0000 - generate/salut.def | 2 +- - generate/src/salut-connection-manager.c | 47 ++- - generate/src/salut-connection-manager.h | 24 ++- - generate/src/salut-connection-signals-marshal.list | 5 +- - generate/src/salut-connection.c | 304 ++++++++++++++------ - generate/src/salut-connection.h | 137 ++++++++-- - .../src/salut-contact-channel-signals-marshal.list | 5 +- - generate/src/salut-contact-channel.c | 164 +++++++---- - generate/src/salut-contact-channel.h | 85 +++++- - generate/src/salut-im-channel-signals-marshal.list | 8 +- - generate/src/salut-im-channel.c | 110 +++++--- - generate/src/salut-im-channel.h | 52 +++- - generate/xml-modified/salut-connection.xml | 15 + - generate/xml-pristine/salut-connection.xml | 15 + - 14 files changed, 723 insertions(+), 250 deletions(-) + Only skip file-transfer/test-ichat-receive-directory.py if needed -commit 05684e87cd3107b3ec2afe761f263f6edabc437b -Author: Sjoerd Simons -Date: Mon Nov 6 16:32:29 2006 +0000 +commit ac6eef30becd54315ed8cd908f13e9eec112e4ef +Author: Simon McVittie +Date: 2010-11-01 15:53:21 +0000 - [project @ 6f560aeb900456475e63d6990e4d53905d9d81de] - - Keep track of contacts as long their alive. Even when the contact leaves - the network it can stay alive iff there is an IMChannel to it - - 20061106163229-93b9a-d58336243e1b011e90c502ce42540ec91c7f6d9f.gz + SalutFtManager: allow salut_file_transfer_channel_new_from_stanza to fail - src/salut-contact-manager.c | 28 +++++++++++++++++++++++----- - 1 files changed, 23 insertions(+), 5 deletions(-) +commit 292c52e13cfef7aabe523cd145eede1bdede4133 +Author: Simon McVittie +Date: 2010-11-01 15:53:07 +0000 -commit b3117b8d61b4f264e18dd46b84ef5a838d769325 -Author: Sjoerd Simons -Date: Mon Nov 6 16:31:23 2006 +0000 + salut_file_transfer_channel_new_from_stanza: don't use FALSE as a null pointer - [project @ 09939bee3fefaf4fb3a65f5dbdd116f5bc213d60] - - * Send out SendError signals if connecting to our peer failed - * Ensure we add messages to the queue before setting up the connection - - 20061106163123-93b9a-49a9fbed8db07cedc8255d6c0407e0b6ed32acb8.gz +commit 90313495b1546a5134ddc77235f5ae327218e551 +Author: Simon McVittie +Date: 2010-11-01 15:29:46 +0000 - src/salut-im-channel.c | 31 +++++++++++++++++++++++++------ - 1 files changed, 25 insertions(+), 6 deletions(-) + avahi/test-ichat-incoming-msg.py: enable if we're not running another Salut -commit 29296bdb4a976d72902237500e9d7ac9d53408a2 -Author: Sjoerd Simons -Date: Mon Nov 6 16:13:32 2006 +0000 +commit 93c7575637ed3b3663a2d17deccb5f2e97e67e6c +Author: Simon McVittie +Date: 2010-11-01 15:28:54 +0000 - [project @ 559b2a63b1e4b43dadecda8e5315c34246462d46] - - Removed a ref-count leak on a contact when making a new channel + avahitest: add a method to check whether another Salut is running - 20061106161332-93b9a-eb6910b84f4a3aae1c56c80ef20bbc5ce8cc64ae.gz - - src/salut-im-manager.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + Some of the tests can fail if there is one. -commit b215dc88455cb2ddd41bf22cb2f654bc5feb4fc3 -Author: Sjoerd Simons -Date: Mon Nov 6 11:15:21 2006 +0000 +commit 2d24d3b662714f379592e35ce0ba26ed30631c2f +Author: Simon McVittie +Date: 2010-10-18 16:18:03 +0100 - [project @ 0e135f0779ac6d2c2a61fdc5305b7d98db50c123] - - Remove the dummy offline presence + receive_presence_and_ask_caps: only match the IQ result, not random other IQs - 20061106111521-93b9a-0d428dbfdb689985e8dd57e4e33cf37a38f57148.gz + When running these tests on a live network, we can see queries from + other contacts, which this overly-broad expectation would match. - src/salut-presence.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) +commit 243711910a0e2a1f2fb62c6f39a303704ed45cd6 +Author: Simon McVittie +Date: 2010-10-18 15:59:41 +0100 -commit bafcb43daa360f5e8ceb9ced16e584b4815f7f21 -Author: Sjoerd Simons -Date: Mon Nov 6 11:15:04 2006 +0000 + SalutDisco: echo @id in caps results - [project @ 38707100c870aa0cfd8b8147f5dfb21f1eeb729b] - - Cast the data data element of a GList to SalutAvahiResolver instead of the GList itself - - 20061106111504-93b9a-a685fd56f591a435d0f9329410158bc1b7b9ce9a.gz +commit 54c4095ae197d0c840a1d1938c4d255aa9feb318 +Author: Simon McVittie +Date: 2010-10-18 12:56:32 +0100 - src/salut-contact.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Put Wocky debug information in test logs, now we use it -commit c4b96aa7b77cfc87b0cbbc59aa5469b735d7da4e -Author: Sjoerd Simons -Date: Mon Nov 6 10:20:00 2006 +0000 +commit a4d42fb98e4049eee0bee2e9469a4191f58df662 +Author: Simon McVittie +Date: 2010-10-18 12:56:13 +0100 - [project @ 119e19c3d80653f6154f258644ba82662cc07c60] - - Close the connection when avahil fails + Add more information to stream events, based on Gabble - 20061106102000-93b9a-df0beebcf2ecb0135fced35fb4712a69045119ec.gz + - to and from_ are the same as name and remote_name, which are also kept + - iq_id on IQs + - presence_status on presences - src/salut-connection.c | 11 +++++------ - 1 files changed, 5 insertions(+), 6 deletions(-) +commit e81a81f343dc8488810710f6a58461fca42bc993 +Author: Tomeu Vizoso +Date: 2010-10-25 16:20:14 +0200 -commit e1feb5974757a74a12cfa4bb9a3e300e0c80c792 -Author: Sjoerd Simons -Date: Fri Nov 3 16:34:03 2006 +0000 + Announce for both ipv4 and ipv6 those entries created with AVAHI_PROTO_UNSPEC - [project @ d6342f17563b02069b3d1a1f54bcd0731a81aac2] - - Fix a stupid typo in a debug message - - 20061103163403-93b9a-a395388b0d6d227f401d351ec80eca4efc0b8568.gz +commit 47e13f5fdc1c342e925b400cdc823f97710513ad +Author: Tomeu Vizoso +Date: 2010-10-25 14:10:00 +0200 - src/salut-connection-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Resolve to ipv6 addresses -commit e8820b5bf18517a13e9c093ea171443f4bf6edfc -Author: Sjoerd Simons -Date: Fri Nov 3 16:30:59 2006 +0000 +commit 83df5595eba196eab1418074f3dec0773798aed5 +Author: Tomeu Vizoso +Date: 2010-10-25 13:12:43 +0200 - [project @ 47a1be6bf403d1b1ef8ca1114eee0b9dd599b4d1] - - Remove unneeded debug message + Add a .service file for the mock avahi service - 20061103163059-93b9a-c32a1d46eb3d42b693a7d309270f439bf2d3367d.gz + as recent versions of avahi-client expects it to be there. + +commit 93594c0f17ccfa9d5e62aad11da4d488721c17bf +Author: Tomeu Vizoso +Date: 2010-10-22 18:30:33 +0200 - src/salut-connection.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + Allow multiple removals of the same entry -commit e5ace93d761614c0d5569ca078dc4c1a6db6c3cf -Author: Sjoerd Simons -Date: Fri Nov 3 15:43:14 2006 +0000 +commit 8f507a22a32a2141abbe00baa2f81d9f5638c4f5 +Author: Tomeu Vizoso +Date: 2010-10-20 19:08:03 +0200 - [project @ 5592f5271c42960ccdede21ed3e53eb8d3f1030e] - - Fix bogus debug message + Implement EntryGroup.AddRecord - 20061103154314-93b9a-44e2750a98830eb8e6fdcb9d44e63e6a1e3719bd.gz - - src/salut-contact-manager.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + Use it to lookup multicast groups for clique -commit d241957619593d2d38d9cc3e9915e9c89bbfa734 -Author: Sjoerd Simons -Date: Fri Nov 3 15:33:43 2006 +0000 +commit d5c3c7fccdc8db7a2453d4a9c6f9bed98ec365e0 +Author: Tomeu Vizoso +Date: 2010-10-20 17:50:16 +0200 - [project @ 25f0d336d2f1411cc681b12e1badc9cf36abbebf] - - When getting the name property actually return the name value and not the type - - 20061103153343-93b9a-f01ac54a17766ffa7257e35f7af895eaa10bafd2.gz + Remove superfluous timeout_add to speed up tests - src/salut-avahi-service-resolver.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) +commit e393717c71fb98170baa89a4ec5a026d7bcd4d20 +Author: Tomeu Vizoso +Date: 2010-10-20 17:31:28 +0200 -commit 1f4454b6e59d383b9ffe68dc6da86950d909d7df -Author: Sjoerd Simons -Date: Fri Nov 3 13:43:53 2006 +0000 + Remove ServiceBrowser and ServiceResolver when their client disappears - [project @ d36befd597b51bbdd35bc547ca8b468532637e88] - - More debugging info - - 20061103134353-93b9a-169ddb49dee44d9bc08d1ebfbad80da17e743972.gz +commit 84ac518af1149f11ed7f6b1fd1ae27bd4e7f71a5 +Author: Tomeu Vizoso +Date: 2010-10-20 17:22:48 +0200 - src/salut-contact-manager.c | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) + Free entry groups when its client disappears -commit 579cfeb71f9e4c6d625fd73a288b7ca7bf15f64e -Author: Sjoerd Simons -Date: Fri Nov 3 13:42:25 2006 +0000 +commit e1890770b83d4c9538ade442d83adcfa14b79ea4 +Author: Tomeu Vizoso +Date: 2010-10-20 15:25:33 +0200 - [project @ 3568c3e9ff6a2d6c472023b75819c74f92202436] - - Throw InvalidArgument if an empty contact string is requested - - 20061103134225-93b9a-9f77de955479b16ead8451afca60418510ca7042.gz + Preserve original exception in test - src/salut-connection.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) +commit c3af031143062b7431c747994eedd0b56b57e083 +Author: Tomeu Vizoso +Date: 2010-10-20 12:03:47 +0200 -commit 340a61f1ca6df266f8313a8d3ea389c85335e516 -Author: Sjoerd Simons -Date: Fri Nov 3 12:50:48 2006 +0000 + Emit ServiceBrowser.ItemRemove when an EntryGroup is freed - [project @ 78ba86d114d3854eb2cc96748eef99e86ae17140] - - Return InvalidHandle if a text channel to ourselves is requested - - 20061103125048-93b9a-c8ec69148a70d45729d7cc5c9cd612b5ecec792d.gz +commit 4cac324669d7744546741f6c78c6f2ce6e958b5d +Author: Tomeu Vizoso +Date: 2010-10-20 11:54:58 +0200 - src/salut-im-manager.c | 17 +++++++++++++---- - 1 files changed, 13 insertions(+), 4 deletions(-) + Remove unimplemented methods because of clutter -commit cf121b546be8a585ca833f6af12fbe1c7a3c2b5f -Author: Sjoerd Simons -Date: Fri Nov 3 10:01:23 2006 +0000 +commit a6ded5eb4d586453142599c6d8b5aa9f7bf9e244 +Author: Tomeu Vizoso +Date: 2010-10-20 11:20:25 +0200 - [project @ d428c1708d26cab7f0fac329b3949af3646a5a20] - - Don't try to cast a GList * to a SalutIMChannelMessage, it causes crashes. + Properly get the local hostname and domain - 20061103100123-93b9a-38945d40d48ced645eeb1e4e9f98c5d02ac32945.gz + and resolve it to a real address + +commit facd128d30492156e659271352b5c2ece36d6471 +Author: Tomeu Vizoso +Date: 2010-10-20 11:00:17 +0200 - src/salut-im-channel.c | 24 ++++++++++++------------ - 1 files changed, 12 insertions(+), 12 deletions(-) + Don't overwrite host and port if they didn't change -commit ecd3a34d5fc5938643f9d86222014b71ee3f9e75 -Author: Sjoerd Simons -Date: Fri Nov 3 10:00:33 2006 +0000 +commit 899351b0dda94455997ee5cb523077b0b36f8f4b +Author: Tomeu Vizoso +Date: 2010-10-20 10:31:14 +0200 - [project @ 5e6c89cf501d6e0ac5377ad6036e860142f282b9] - - Also print the requested channel type in the debug info + When a ServiceBrowser is created, emit ItemNew for every entry - 20061103100033-93b9a-1e8bff801a8fb19cd8e23d59bacd3e36b92937fd.gz - - src/salut-connection.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + that matches. -commit 1ad788ed2d1b953d99e26ee3d3725ec4cc7ace78 -Author: Sjoerd Simons -Date: Thu Nov 2 16:03:11 2006 +0000 +commit 06c7ae32288d16b282a3f6a10b502995db9c3f78 +Author: Tomeu Vizoso +Date: 2010-10-19 17:58:47 +0200 - [project @ 5e69e72e9cdf60cf75fe7d9cea48fe1a6c65b876] - - * Exit after 5 seconds is there are no connections unless the persist debug flag is given + Refactor the state and logic into avahimock.Model - 20061102160311-93b9a-4bd0d19a4b7f45fae62d51bbcf99a2fad425b492.gz + which is called by the dbus methods and emits the appropriate signals - src/salut.c | 40 +++++++++++++++++++++++++++++++++++++++- - 1 files changed, 39 insertions(+), 1 deletions(-) +commit eb6255d392d59f099024e7552a68bb5e013b7fbe +Author: Tomeu Vizoso +Date: 2010-10-19 11:38:12 +0200 -commit 0813b030ecb5c859de20cace5c389a3745339a57 -Author: Sjoerd Simons -Date: Thu Nov 2 16:02:04 2006 +0000 + Implement some o.f.Avahi.*.Free methods - [project @ 893f1359634ec5c7529cf3c0073468aec82e67b3] - - * Unref the connections if it sent out disconnected - * Send out no-more-connections if all connections are gone - - 20061102160204-93b9a-0d9be9639167de9d99b3811fd988766719642b5d.gz +commit 8b6cbd052584a52409351950b0374d82afb78105 +Author: Tomeu Vizoso +Date: 2010-10-19 10:48:17 +0200 - src/salut-connection-manager.c | 45 +++++++++++++++++++++++++++++++++++++-- - 1 files changed, 42 insertions(+), 3 deletions(-) + Also emit ServiceResolver.Found when a record is updated -commit e2e7669d7a18444ab1daeebf8d0d1de25306d800 -Author: Sjoerd Simons -Date: Thu Nov 2 16:01:26 2006 +0000 +commit 94733e1daa8874ab232c91d048e7f7215c8637bc +Author: Tomeu Vizoso +Date: 2010-10-19 10:01:53 +0200 - [project @ a9a8ede99491a44a730dfa90278391d92964c066] - - * Send out the disconnected signal if disconnected - * Release our dbus bus name + Implement o.f.Avahi.Server.ServiceResolverNew and emit - 20061102160126-93b9a-4a3bca15063ff02acdf8c39c1769049377df12b7.gz - - src/salut-connection.c | 27 +++++++++++++++++++++++++-- - 1 files changed, 25 insertions(+), 2 deletions(-) + ServiceBrowser.ItemNew and ServiceResolver.Found. -commit 76680e308ef6f1467d6c64c0bbf22a5bf90202e6 -Author: Sjoerd Simons -Date: Thu Nov 2 15:57:23 2006 +0000 +commit 93e1acef5a3297a3f1d2609f7cb2bd4346fd0fb9 +Merge: e637925 ed363eb +Author: Simon McVittie +Date: 2010-10-18 17:06:01 +0100 - [project @ e5927e7d60e2e177b8cedf3b1caeefe6c1880c16] - - Dereference the connection when disposing + Merge branch 'protocol' - 20061102155723-93b9a-fed0ca72a7f9e648437fa8bf3943f1a6e23a75e7.gz + Reviewed-by: Tomeu Vizoso - src/salut-im-manager.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) +commit 44243b8c3b7bdf0f24367fa1c06df9f32d0b9aab +Author: Tomeu Vizoso +Date: 2010-10-15 13:49:54 +0200 -commit 3167306e776f4cc26d0c1147be947f54882ce126 -Author: Sjoerd Simons -Date: Thu Nov 2 10:52:07 2006 +0000 + Implement emitting StateChanged in terms of SignalMessage - [project @ 155ad10df59bc1631cf59e80d64d48f52bfe0473] - - Pass the right parameters to the ERROR_IF_NOT_CONNECTED macros so it actually compiles - - 20061102105207-93b9a-0919ecb3eececd5f18396440a4c65b0d93433ad6.gz +commit e6379255daebc533d84f5e82fbc86dfbd412174c +Author: Tomeu Vizoso +Date: 2010-10-15 10:28:06 +0200 - src/salut-connection.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) + Preserve existing PYTHONPATH when running tests -commit b4d29b45c7c7674d2bb5469a7703a73c0e311747 -Author: Sjoerd Simons -Date: Thu Nov 2 10:39:50 2006 +0000 +commit 91963b4df2ff519fafb38c5832065e601dbdc856 +Author: Tomeu Vizoso +Date: 2010-10-15 12:06:05 +0200 - [project @ 91a3317728fe8df9c74e7e95989380a1aa7c5cec] - - Let more Connect methods thow an error if we're not connected: - * HoldHandles - * ListChannels - * ReleaseHandles - * RequestPresence - - 20061102103950-93b9a-e5f31396bfdd59bb7f8d2df308c5e6f42c58f6e0.gz + Implement o.f.Avahi.Server.ServiceBrowserNew - src/salut-connection.c | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) +commit 2edd4d741a42cebd86fa2b0d342118538c0929f3 +Author: Tomeu Vizoso +Date: 2010-10-15 12:05:24 +0200 -commit b8e82ee33a846cf9737ff2461f818dd93a74fa52 -Author: Sjoerd Simons -Date: Thu Nov 2 10:20:49 2006 +0000 + Make entry group's object paths unique - [project @ 7e5c643e529e5d6706fa35c4d7b0fa1136fd7df1] - - Throw errors if GetSelfHandle or InspectHandles is called on the Connection - when disconnected - - 20061102102049-93b9a-0a3291ce53f3d3d2dd1577c23d5a9984c3e480af.gz +commit d3624f3edcc833c8bbf0582df1cffc0a738f9e20 +Author: Tomeu Vizoso +Date: 2010-10-15 10:28:27 +0200 - src/salut-connection.c | 16 ++++++++++------ - src/salut-connection.h | 2 +- - 2 files changed, 11 insertions(+), 7 deletions(-) + Emit o.f.A.EntryGroup.StateChanged -commit b028773b2878a2c459195566175b10d4b958c874 -Author: Sjoerd Simons -Date: Tue Oct 31 13:57:08 2006 +0000 +commit 4b1779eb3b4a37cd428bc4463f9c00b3a5608e5d +Author: Tomeu Vizoso +Date: 2010-10-15 10:28:06 +0200 - [project @ 4026b6b3544a3fa919c7bf04c1cd93017a27a27f] - - Fix the spelling of telepathy. Woops! - - 20061031135708-93b9a-4c24c12d427c4a6f859101894b392e0b385db377.gz + Preserve existing PYTHONPATH when running tests - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) +commit ed363ebe811bd6adbfe03c95c4909bccd607c489 +Author: Simon McVittie +Date: 2010-10-01 14:13:57 +0100 -commit 9ca768ef31ebe19c27ae57851d624510655b4bfe -Author: Sjoerd Simons -Date: Tue Oct 31 13:48:15 2006 +0000 + Add a test for Protocol objects - [project @ f21050ffddf860e34abbbc56724cba941a628e2d] - - Fix Makefile.am so make distcheck succeeds - - 20061031134815-93b9a-4d4d37c8c253a730664c706a547a31ddc9ced6dc.gz +commit a1e965e5c36c0a2e66d266c04d993de50404741c +Author: Simon McVittie +Date: 2010-10-01 11:42:50 +0100 - src/Makefile.am | 134 ++++++++++++++++++++++++++++++++---------------------- - 1 files changed, 79 insertions(+), 55 deletions(-) + Add Protocol objects -commit 2c62ed37e611c6f171d56d3b59647d463af629e8 -Author: Sjoerd Simons -Date: Mon Oct 30 16:55:08 2006 +0000 +commit bf32c4eb6b1ad30d33a42dcda666fb2b53f268ed +Author: Simon McVittie +Date: 2010-10-01 12:38:47 +0100 - [project @ e4d51b6951124d70cf7859729f292b36aa86d342] - - Correctly handle the suppress_handler option - - 20061030165508-93b9a-a54c160f763841cacf0112319cc0352460afd567.gz + All channel managers: implement type_foreach_channel_class - src/salut-connection.c | 13 ++++++++++--- - 1 files changed, 10 insertions(+), 3 deletions(-) +commit a6d8e7856005e86b829fb452e972c662360fadc3 +Author: Simon McVittie +Date: 2010-09-23 16:52:04 +0100 -commit c2979f602affb74ff4c5d2afd615d4d623221357 -Author: Sjoerd Simons -Date: Mon Oct 30 11:24:30 2006 +0000 + Depend on telepathy-glib 0.12 release candidate, for Protocol etc. - [project @ e75c9f7005577a670a5cfdef5c40b6c4d4d38b7b] - - Implement list_pending and acknowledge_pending messages calls - - 20061030112430-93b9a-90d4c623f215aa431c9dd13eb4b153827e298a0f.gz +commit 9dbd9864fd9e0b3fb4badb638fb183d54047a45a +Author: Tomeu Vizoso +Date: 2010-10-14 13:31:14 +0200 - src/salut-im-channel.c | 91 ++++++++++++++++++++++++++++++++++++++++++++--- - src/salut-im-channel.h | 16 ++++---- - 2 files changed, 93 insertions(+), 14 deletions(-) + Implement o.f.A.EntryGroup.GetState -commit 326885204ef405a0e38f3c8a99873ea4aaabf19f -Author: Sjoerd Simons -Date: Mon Oct 30 10:21:24 2006 +0000 +commit 075914a2cf7afceb32fba2462328209df9c78ca6 +Author: Tomeu Vizoso +Date: 2010-10-14 12:47:23 +0200 - [project @ 4beca9c58931a734a8219f7233159cbc3ad30658] - - * Write out the message to tcp connection - * Send out signals if messages are received - - 20061030102124-93b9a-bba6edd632fd14ef9f99085fb786d042cc3ec368.gz + Return expected values in o.f.Avahi.Server.GetAPIVersion and GetState - src/salut-lm-connection.c | 17 ++++++++++++++++- - 1 files changed, 16 insertions(+), 1 deletions(-) +commit a69372ddb701967d0faadbb8bfdfa874d9c8c801 +Author: Tomeu Vizoso +Date: 2010-10-14 12:46:30 +0200 -commit 26d5cb17a66ea51c774f52e07b06d04a1abccbf8 -Author: Sjoerd Simons -Date: Mon Oct 30 09:59:38 2006 +0000 + Set DBUS_SYSTEM_BUS_ADDRESS before launching the CM process - [project @ a03f468a0ca8ae60dc00d4859b06d8d5f2073dc7] - - Only clean up the addrs array if it actually existed - - 20061030095938-93b9a-9d7e9a7e3c4951e13beb5b39f07c1ac4f87209c4.gz +commit fbe4a4782ee22b373a322412bfbc7ef19c33e62c +Author: Tomeu Vizoso +Date: 2010-10-13 16:52:26 +0200 - src/salut-im-channel.c | 6 ++++-- - src/salut-lm-connection.c | 3 ++- - 2 files changed, 6 insertions(+), 3 deletions(-) + Implement o.f.Avahi.EntryGroup.AddService and Commit -commit 15109724ae62b22744bb45ae0aacb34bac446464 -Author: Sjoerd Simons -Date: Mon Oct 30 09:51:25 2006 +0000 +commit 71a00c2cbf7a4a19ee19b57795e5d4e98c43210b +Merge: 54017f0 a9ef4a4 +Author: Simon McVittie +Date: 2010-10-13 15:35:59 +0100 - [project @ b05a9cefcd91ca39931421f024980f541699e762] - - A connection from an fd starts in the connecting state + Merge branch 'wocky' - 20061030095125-93b9a-da6b1a0a0c9d4f94710a8c136dbbc42cfbef31c2.gz - - src/salut-lm-connection.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + Reviewed-by: Guillaume Desmottes -commit 1afb1ea829910d0e31ab83b77993ff926276c28a -Author: Sjoerd Simons -Date: Mon Oct 30 09:47:49 2006 +0000 +commit a9ef4a4cef43ecf469d06ef5792359c0688ad7f4 +Author: Simon McVittie +Date: 2010-10-13 15:04:36 +0100 - [project @ c0c1cac6903d4cd718114a9251052420a39bda1e] - - Add extra debug info - - 20061030094749-93b9a-eceed59343432f8944ca3f9616d75d8cee59c260.gz + Enable gtk-doc in distcheck so Wocky can also distcheck - src/salut-lm-connection.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) +commit 789c6be33c7db6b8e1b4e0319f19a4e280cfd8be +Author: Simon McVittie +Date: 2010-10-13 14:52:13 +0100 -commit 975f092ebcac7835b966251b8a55e9327df06924 -Author: Sjoerd Simons -Date: Mon Oct 30 09:45:53 2006 +0000 + GibberXmppStanza: include wocky-stanza.h in a way that works out-of-tree - [project @ 61eb3c0d2b1c636b5c45e3bcb964c388b9f2744a] - - In Close first set the state to NOT_CONNECTED and then do the actual closing - - 20061030094553-93b9a-7ebc515c660e2d90bec19cabff39db9825b9721b.gz +commit 74a80043531c0cca12a19d8e2d612f33fee7f8a2 +Author: Tomeu Vizoso +Date: 2010-10-13 13:39:45 +0200 - src/salut-im-channel.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + Implement o.f.Avahi.Server.GetHostNameFqdn and GetDomainName -commit 934aa2f5b018b7bfe927d6d3d3da888513c8ebff -Author: Sjoerd Simons -Date: Mon Oct 30 09:11:45 2006 +0000 +commit ae31ed7c0ab1280285cfccbcae213a87163cf230 +Author: Tomeu Vizoso +Date: 2010-10-13 13:07:01 +0200 - [project @ 89e71246e4ad1000de140e62e1d5b09a7c04a69b] - - Don't send disconnected signal if already disconnected - - 20061030091145-93b9a-867ff6af3c27a9a3642ae3cf5d18dda90f231bd1.gz + Implement o.f.Avahi.Server.EntryGroupNew - src/salut-lm-connection.c | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) +commit 4559c4691e3f68cac18dba3990e367d16ba38d0f +Author: Tomeu Vizoso +Date: 2010-10-13 13:06:22 +0200 -commit 5998abebdc1e82911d66d5531f0ad2e402a9c54c -Author: Sjoerd Simons -Date: Mon Oct 30 08:55:00 2006 +0000 + Implement o.f.Avahi.Server.GetHostName - [project @ fb7e5dfe12617395b7ebea9a3df98b16bdd168d2] - - If an incoming lm connection fails while connecting, discard it. - - 20061030085500-93b9a-e60d5278a1f7d475b67ab996c70220861952562c.gz +commit f476cd509c630408f6fbb08abdc373c98877284c +Author: Tomeu Vizoso +Date: 2010-10-11 14:01:50 +0200 - src/salut-im-channel.c | 14 ++++---------- - src/salut-lm-connection.c | 6 ++++++ - src/salut-lm-connection.h | 3 +++ - 3 files changed, 13 insertions(+), 10 deletions(-) + Add mock service implementing org.freedesktop.Avahi* -commit c0d66443b3aac4177261d7e255a63275a6a2cf37 -Author: Sjoerd Simons -Date: Wed Oct 25 19:55:05 2006 +0000 +commit 087e05ca156bf1b133de1d21f738a8cee7ec2be4 +Author: Tomeu Vizoso +Date: 2010-10-11 13:57:31 +0200 - [project @ 1adca4404fbb670c60e597f250650faddbead1ac] - - Throw away the lm connection object after final disconnect + Make sure that the mock Avahi service is running - 20061025195505-93b9a-60c629e398006991c3d092c174daf12b498bc1e1.gz - - src/salut-im-channel.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + ...before executing every test. -commit d14de08ae94ce831ad6f7b7397bd2c7c30a27da7 -Author: Sjoerd Simons -Date: Wed Oct 25 19:53:14 2006 +0000 +commit 0d500b026d044c615e4e3a8219ae5fd773deba2c +Author: Tomeu Vizoso +Date: 2010-10-11 13:56:02 +0200 - [project @ cc45c584aa6fa2c255939e84cb6698d0d55b319d] - - Don't try next connection if the connection object doesn't has an address array set + Move call to Avahi from the class definition to the constructor - 20061025195314-93b9a-e47d20ec9fdfee95eaab394d4d06a7a4a464ec7d.gz - - src/salut-im-channel.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + so we don't depend on Avahi on module import -commit 4a4feb0fc7bdb266e5336c8755d2591f669348b7 -Author: Sjoerd Simons -Date: Wed Oct 25 19:48:59 2006 +0000 +commit e214e31e95f68c7088950daaa6acc39f2eaa1173 +Author: Simon McVittie +Date: 2010-10-08 15:24:34 +0100 - [project @ eb61fc6c83b90193f8925f9e80bc55d5e76a59b9] - - Add debug message when all connects failed + Implement GibberXmppReader in terms of WockyXmppReader - 20061025194859-93b9a-8fa87a499e779851a1c39f7979aea478687ba6f4.gz - - src/salut-im-channel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + It has a different programming model (it emits signals rather than just + having a stanza queue) so instead of being the same, it's a subclass. -commit 2c474edb407cd540e448600a2a0c1b617ae7201f -Author: Sjoerd Simons -Date: Wed Oct 25 19:45:32 2006 +0000 +commit 2dfe5319d5a3603a450717a271a59f8b575e0588 +Author: Simon McVittie +Date: 2010-10-08 14:52:51 +0100 - [project @ e956f4f2487cdc182f97063d2096db4ddd60d3fb] - - Don't close the parser while parsing + saluttest.exec_test_deferred: if make_connection fails, die - 20061025194532-93b9a-4cb3eb86c4d6558a7b560127f1ae68adfa348572.gz - - src/salut-lm-connection.c | 15 ++++++++++----- - 1 files changed, 10 insertions(+), 5 deletions(-) + Adapted from Will's commit 9071c1af4 in Gabble, although that one needs + to cope with multiple connections. -commit 4109acc2977699b71f366422729048709e63b1ba -Author: Sjoerd Simons -Date: Wed Oct 25 19:42:40 2006 +0000 +commit 0febecdd02df4f4b73f2825159a6f6aa36e7b506 +Author: Simon McVittie +Date: 2010-10-08 14:46:20 +0100 - [project @ aabf9b01c23cfd9a9f4579a809ea49729162dc63] - - Fix typo in stream init string - - 20061025194240-93b9a-d42e6f0b103b8547ef167c4e2780c65a46647b86.gz + Replace GibberXmppWriter with WockyXmppWriter and some inlines - src/salut-lm-connection.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) +commit aa933d09fda320cdafa99e6a2816f5071078015c +Author: Tomeu Vizoso +Date: 2010-10-08 15:26:40 +0200 -commit 787124399327333a733903b8578ac2011c9d701b -Author: Sjoerd Simons -Date: Wed Oct 25 19:33:18 2006 +0000 + Use the temporary bus as the system bus in the avahi tests - [project @ 5731b1842f438b1905511060708469b12afeebf4] - - * Make it compile again - * Disconnect if the other site sends data before stream initiation - - 20061025193318-93b9a-2a7437aebf23a9202e966da87aa00aa46bab12f7.gz +commit 3aad39ef4ea2aaf37a210800ef72570dcc197fd4 +Author: Simon McVittie +Date: 2010-10-08 14:25:57 +0100 - src/salut-lm-connection.c | 14 +++++++++----- - 1 files changed, 9 insertions(+), 5 deletions(-) + Fix a few remaining instances of stanza->node -commit 40ee3dbc2292b799399c7754d2681741fc5b5133 -Author: Sjoerd Simons -Date: Wed Oct 25 19:30:27 2006 +0000 +commit 7cf0935a252015bb9fd08466e8cef8cca9a4cabd +Author: Simon McVittie +Date: 2010-10-08 14:25:43 +0100 - [project @ d3edf23d0ce4ba0516a9d70d9be744fd198e5184] - - * Go to connected side if we received stream initiation from the other side - * Send back stream initiation upon receiving the one of the other side - if it's an incoming connection + GibberXmppReader: cope with stanzas with no namespace - 20061025193027-93b9a-e8df3290ea79ea878f7596b18b9c51273581bd78.gz - - src/salut-lm-connection.c | 17 ++++++++++++++--- - 1 files changed, 14 insertions(+), 3 deletions(-) + Backported from WockyXmppReader. -commit e24f2b372cd7d61bb7205a4f0f07c4f761b5daf4 -Author: Sjoerd Simons -Date: Wed Oct 25 19:20:10 2006 +0000 +commit 8418b6f5cde587b444c45a308e8a8698e39b383f +Author: Simon McVittie +Date: 2010-10-08 13:42:34 +0100 - [project @ 1bb64ea213a158f7986926f46167e7c1d8049dfc] + Replace GibberXmppNode and GibberXmppStanza with WockyNode and WockyStanza - Connect new connections to a channel for a contact + Most of the API is similar enough to add a pile of #defines and not touch + application code. Exceptions: - 20061025192010-93b9a-88df01ca38f02e9e9f3cb939c41bfb276f5a5c5f.gz - - src/salut-connection.c | 16 ++++++++++++++ - src/salut-contact-manager.c | 15 +++++++++++++ - src/salut-contact-manager.h | 4 +++ - src/salut-contact.c | 47 +++++++++++++++++++++++++++++++++++++++++++ - src/salut-contact.h | 4 +++ - src/salut-im-channel.c | 42 ++++++++++++++++++++++++++++++++------ - src/salut-im-channel.h | 3 ++ - src/salut-im-manager.c | 34 +++++++++++++++++++++++++++++++ - src/salut-im-manager.h | 3 ++ - src/salut-lm-connection.c | 5 +++- - src/salut-self.c | 1 + - 11 files changed, 166 insertions(+), 8 deletions(-) + - wocky_node_each_attribute passes an extra argument to the callback, + so adjust GibberXmppWriter and test-xmpp-connection to cope + - WockyStanza->node doesn't exist, so use wocky_xmpp_stanza_get_top_node + a lot -commit 855c8786e305dcdff2f68c3e98010f85a9a0a012 -Author: Sjoerd Simons -Date: Wed Oct 25 16:03:13 2006 +0000 +commit e6efc9a197db675f84df2e84ebb38e283f90ed22 +Author: Simon McVittie +Date: 2010-10-08 13:39:13 +0100 - [project @ 9d8854b008ef6909781e62db4648a11319d424ae] - - Better detect when contacts are gone + Remove Gibber tests for things Wocky won't let us do anyway - 20061025160313-93b9a-3884fa9e7c255dec21986441ae7901649c5f1850.gz + - nodes with a NULL name + - nodes with a NULL or omitted namespace - src/salut-contact-manager.c | 5 +++++ - src/salut-contact.c | 16 +++++++++++++++- - 2 files changed, 20 insertions(+), 1 deletions(-) +commit 93e80f65abec276c7c2f3888665e23057b71152f +Author: Simon McVittie +Date: 2010-10-08 13:38:20 +0100 -commit 7ca2ce49de891f18cb9766113a08a04751424bff -Author: Sjoerd Simons -Date: Wed Oct 25 15:49:43 2006 +0000 + init and deinit wocky in the Gibber tests - [project @ 62652edc3ea0d0b7cbb0392b0cfd9e7e49e60c6f] - - Disconnect when an error has occurred - - 20061025154943-93b9a-8a5d7315c13b2989c92994deae87b0863273d53b.gz +commit e73c51ad7414eb150dca9c7eb432a44edf469b2e +Author: Simon McVittie +Date: 2010-10-08 13:37:57 +0100 - src/salut-lm-connection.c | 51 +++++++++++++++++++++++++++++--------------- - 1 files changed, 33 insertions(+), 18 deletions(-) + yet another set of WOCKY_CFLAGS -commit 8a39f1ffe128a6c9224d99fc37272a86de4e6e84 -Author: Sjoerd Simons -Date: Wed Oct 25 15:30:24 2006 +0000 +commit 2f8d86cd0927d3f1f76bf62414357e117f4cb9bb +Author: Simon McVittie +Date: 2010-10-08 12:23:41 +0100 - [project @ 3da302206516dc8fcb6e41c6a8086e00ff1b18de] - - Listen on a port for incoming connections - - 20061025153024-93b9a-eb71c2ff10ae8ce950d33c4203c4e662f283409e.gz + GibberXMPPNode test: don't change nodes' namespace - src/salut-self.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 146 insertions(+), 6 deletions(-) +commit 834d18332f3d585dcdba4abda430dcc2a59131ae +Author: Simon McVittie +Date: 2010-10-08 12:23:20 +0100 -commit adc1382c13c13c2939159b124cefc768d0a236cf -Author: Sjoerd Simons -Date: Wed Oct 25 15:29:19 2006 +0000 + SalutTubeStream: don't change the namespace of a node after creation - [project @ 4f56b0125350decdd85e50c9b28735e8ebe56498] - - Add SALUT_SELF as debug flag - - 20061025152919-93b9a-c10684f404b0f448e8dbcd7e252ceb15a9e7d01f.gz +commit a880ca796c8fb9d3a761c6cd22f435617b3d6e68 +Author: Simon McVittie +Date: 2010-10-08 11:48:27 +0100 - src/debug.c | 1 + - src/debug.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) + Remove gibber_xmpp_stanza_new -commit 7c6499616c0d6c283affc30d62cb1fb847822115 -Author: Sjoerd Simons -Date: Wed Oct 25 15:29:02 2006 +0000 +commit e55f92ff9b68b102f4b39895004ab4c5112eafac +Author: Simon McVittie +Date: 2010-10-08 11:38:48 +0100 - [project @ 180c92cf90c9ace227f4590215515a738908c13e] + Always create stanzas with a specified namespace - * Add api to take up a connection from a fd - * Only the enable G_IO_OUT when we've got something buffered + Also create nodes that already have an XMLNS where possible. - 20061025152902-93b9a-e94fb042f4909d15a16582860e570aebb0d66b5a.gz + The Wocky equivalents enforce having an XMLNS. + +commit ec55ac9cd25a418468de7db819cc5a44dfadcec3 +Author: Simon McVittie +Date: 2010-10-08 11:34:50 +0100 - src/salut-lm-connection.c | 103 +++++++++++++++++++++++++++++++++++---------- - src/salut-lm-connection.h | 12 +++++ - 2 files changed, 92 insertions(+), 23 deletions(-) + gibber_xmpp_stanza_new_ns: add -commit 5f1db4fd30fcd7bc045e3c27df99939cb44be930 -Author: Sjoerd Simons -Date: Wed Oct 25 12:41:57 2006 +0000 +commit d8f2be17257d44cd50b0590937fa3e5fd9dfc7b3 +Author: Simon McVittie +Date: 2010-10-08 11:36:35 +0100 - [project @ c18277068a9518b641bac92d7d3aeb8228a67e49] - - * Create a custom lm session handler.. - * Uses non-public loudmount api (needs to be solved) - - 20061025124157-93b9a-fbcda3c407c04405f4db727e567ec432d6437192.gz + gibber_xmpp_node_new_ns: add - src/Makefile.am | 5 + - src/lm-parser.h | 40 +++ - src/salut-im-channel.c | 253 ++++++++++++------ - src/salut-lm-connection-signals-marshal.list | 2 + - src/salut-lm-connection.c | 386 ++++++++++++++++++++++++++ - src/salut-lm-connection.h | 88 ++++++ - 6 files changed, 693 insertions(+), 81 deletions(-) +commit b175d097d4e574ea2c4fe272bdc982dd83fbf4f3 +Author: Simon McVittie +Date: 2010-10-08 12:01:47 +0100 -commit c2a824a5fb056dea35e24c4748d03f8b8c2a7aca -Author: Sjoerd Simons -Date: Wed Oct 25 12:33:40 2006 +0000 + Add Wocky CFLAGS to Gibber tests so we can use Wocky's constants - [project @ ba4ec029ec909263595b9726965c9112ce91dbdc] - - Remove unneeded debugging printf - - 20061025123340-93b9a-fd24e509354aeeff5446b09ee2402817afab79e4.gz +commit 8b5cf4ba620eccfdc63146f7fb7cb9524ccf4620 +Author: Simon McVittie +Date: 2010-10-08 11:18:28 +0100 - src/salut-avahi-service-resolver.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + Glue Wocky into the build system -commit 0c07e66b1d544b88a97830de18527b66e75a06af -Author: Sjoerd Simons -Date: Wed Oct 25 12:25:44 2006 +0000 +commit 64a0d8635871b9f85e335d05c65765774c99c497 +Author: Simon McVittie +Date: 2010-10-08 11:04:23 +0100 - [project @ a0096facf17c0e315e557843b820187882cd83b2] - - Add DEBUG_NET flag - - 20061025122544-93b9a-eae4d3809af35190ff2083f5d00f9aed6de8fbc1.gz + Set up Wocky in autogen.sh - src/debug.c | 1 + - src/debug.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) +commit 7cc3f4a29e1c106eafd1146ae5c630a939d1eeed +Author: Simon McVittie +Date: 2010-10-08 11:03:52 +0100 -commit 9a4e8b25a98b678a3dce3832a53ece90d28032d5 -Author: Sjoerd Simons -Date: Mon Oct 23 18:04:25 2006 +0000 + Add Wocky as a submodule - [project @ fe095386b0d00c7018072a732bf20643ab5de0df] - - Removed slaut-contact.c, was created by mistake - - 20061023180425-93b9a-402b24aeeb0660dc3a35fa7c12df687fac390cbf.gz +commit 54017f0527fb4487e1ae386f7762af46272f83e7 +Author: Simon McVittie +Date: 2010-10-07 15:58:07 +0100 - 0 files changed, 0 insertions(+), 0 deletions(-) + Nano version for development branch -commit 976aa5bfc213732d960614150cea12c06988c339 -Author: Sjoerd Simons -Date: Mon Oct 23 17:21:35 2006 +0000 +commit 931c49c5eefede516a80d6721f49c134d2a652d9 +Author: Simon McVittie +Date: 2010-10-07 15:57:24 +0100 - [project @ 94458aec8a5f2139cc075945f7336e4307c8d96e] - - First commit! + Revert "Adjust configure.ac for stable branch" - 20061023172135-93b9a-ce433f8baae54b25e36a061c2863bd4304ac3f8a.gz + This reverts commit 9bd0a0719e394c42f8f95e29ce811360437a8016. + +commit 9bd0a0719e394c42f8f95e29ce811360437a8016 +Author: Simon McVittie +Date: 2010-10-07 15:57:00 +0100 - .gitignore | 1 + - AUTHORS | 1 + - COPYING | 510 +++++++ - Makefile.am | 4 + - configure.ac | 127 ++ - data/Makefile.am | 24 + - ...op.Telepathy.ConnectionManager.salut.service.in | 3 + - generate/Makefile.am | 8 + - generate/README | 21 + - generate/async_annotate.py | 59 + - generate/async_implementations | 5 + - generate/do_src.sh | 47 + - generate/do_xml.sh | 24 + - generate/salut.def | 12 + - .../salut-connection-manager-signals-marshal.list | 1 + - generate/src/salut-connection-manager.c | 166 ++ - generate/src/salut-connection-manager.h | 63 + - generate/src/salut-connection-signals-marshal.list | 3 + - generate/src/salut-connection.c | 459 ++++++ - generate/src/salut-connection.h | 79 + - .../src/salut-contact-channel-signals-marshal.list | 3 + - generate/src/salut-contact-channel.c | 366 +++++ - generate/src/salut-contact-channel.h | 73 + - generate/src/salut-im-channel-signals-marshal.list | 5 + - generate/src/salut-im-channel.c | 296 ++++ - generate/src/salut-im-channel.h | 68 + - generate/src/telepathy-errors.h | 61 + - generate/xml-modified/salut-connection-manager.xml | 23 + - generate/xml-modified/salut-connection.xml | 88 ++ - generate/xml-modified/salut-contact-channel.xml | 64 + - generate/xml-modified/salut-im-channel.xml | 53 + - generate/xml-pristine/salut-connection-manager.xml | 23 + - generate/xml-pristine/salut-connection.xml | 83 + - generate/xml-pristine/salut-contact-channel.xml | 64 + - generate/xml-pristine/salut-im-channel.xml | 53 + - m4/Makefile.am | 3 + - m4/as-ac-expand.m4 | 40 + - m4/as-compiler-flag.m4 | 33 + - src/Makefile.am | 154 ++ - src/ansi.h | 24 + - src/debug.c | 64 + - src/debug.h | 67 + - src/gheap.c | 153 ++ - src/gheap.h | 40 + - src/gintset.c | 415 +++++ - src/gintset.h | 50 + - src/group-mixin-signals-marshal.list | 2 + - src/group-mixin.c | 751 +++++++++ - src/group-mixin.h | 96 ++ - src/handle-repository.c | 871 +++++++++++ - src/handle-repository.h | 76 + - src/handle-set.c | 266 ++++ - src/handle-set.h | 53 + - src/handle-types.h | 29 + - src/salut-avahi-client-signals-marshal.list | 1 + - src/salut-avahi-client.c | 271 ++++ - src/salut-avahi-client.h | 81 + - src/salut-avahi-entry-group-signals-marshal.list | 1 + - src/salut-avahi-entry-group.c | 505 ++++++ - src/salut-avahi-entry-group.h | 150 ++ - src/salut-avahi-enums.h | 70 + - src/salut-avahi-errors.c | 29 + - src/salut-avahi-errors.h | 34 + - ...alut-avahi-service-browser-signals-marshal.list | 2 + - src/salut-avahi-service-browser.c | 400 +++++ - src/salut-avahi-service-browser.h | 74 + - ...lut-avahi-service-resolver-signals-marshal.list | 1 + - src/salut-avahi-service-resolver.c | 440 ++++++ - src/salut-avahi-service-resolver.h | 82 + - src/salut-connection-manager-signals-marshal.list | 1 + - src/salut-connection-manager.c | 482 ++++++ - src/salut-connection-manager.h | 98 ++ - src/salut-connection-signals-marshal.list | 3 + - src/salut-connection.c | 1601 ++++++++++++++++++++ - src/salut-connection.h | 96 ++ - src/salut-contact-channel-signals-marshal.list | 3 + - src/salut-contact-channel.c | 525 +++++++ - src/salut-contact-channel.h | 76 + - src/salut-contact-manager-signals-marshal.list | 2 + - src/salut-contact-manager.c | 463 ++++++ - src/salut-contact-manager.h | 68 + - src/salut-contact-signals-marshal.list | 1 + - src/salut-contact.c | 379 +++++ - src/salut-contact.h | 88 ++ - src/salut-im-channel-signals-marshal.list | 5 + - src/salut-im-channel.c | 684 +++++++++ - src/salut-im-channel.h | 67 + - src/salut-im-manager-signals-marshal.list | 2 + - src/salut-im-manager.c | 306 ++++ - src/salut-im-manager.h | 61 + - src/salut-presence.h | 55 + - src/salut-self.c | 283 ++++ - src/salut-self.h | 76 + - src/salut.c | 37 + - src/telepathy-constants.h | 187 +++ - src/telepathy-errors.c | 31 + - src/telepathy-errors.h | 63 + - src/telepathy-helpers.c | 98 ++ - src/telepathy-helpers.h | 43 + - src/telepathy-interfaces.h | 79 + - src/tp-channel-factory-iface-signals-marshal.list | 1 + - src/tp-channel-factory-iface.c | 119 ++ - src/tp-channel-factory-iface.h | 87 ++ - src/tp-channel-iface.c | 96 ++ - src/tp-channel-iface.h | 63 + - src/write-mgr-file.c | 104 ++ - 106 files changed, 14701 insertions(+), 0 deletions(-) + Adjust configure.ac for stable branch -commit 36e7ba52d4397763aca609c368bc6f2472b644a1 -Author: git-darcs-import <> -Date: Thu Jan 1 00:00:00 1970 +0000 +commit 5f2c842b817732d0a77759139ee562150e7863c0 +Author: Tomeu Vizoso +Date: 2010-10-06 19:00:23 +0200 - New empty repository + Bump nano version to 0.4.0.1 diff -Nru telepathy-salut-0.5.0/config.guess telepathy-salut-0.7.0/config.guess --- telepathy-salut-0.5.0/config.guess 2011-05-03 12:15:12.000000000 +0000 +++ telepathy-salut-0.7.0/config.guess 2011-11-16 10:10:15.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2009-12-30' +timestamp='2011-05-11' # 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 @@ -57,7 +57,7 @@ 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 Free +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -181,7 +181,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -224,7 +224,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -270,7 +270,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -296,7 +299,7 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -395,23 +398,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -481,8 +484,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -495,7 +498,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -552,7 +555,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -595,52 +598,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -731,22 +734,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -770,14 +773,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -805,14 +808,14 @@ echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -867,7 +870,7 @@ EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@ -879,7 +882,13 @@ then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) @@ -892,7 +901,7 @@ echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo frv-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -960,7 +969,7 @@ echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -968,6 +977,9 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-tilera-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; @@ -975,7 +987,7 @@ echo x86_64-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -984,11 +996,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1020,7 +1032,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1048,13 +1060,13 @@ exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1089,8 +1101,8 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1133,10 +1145,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1162,11 +1174,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1231,6 +1243,9 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1276,13 +1291,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1322,11 +1337,11 @@ #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff -Nru telepathy-salut-0.5.0/config.sub telepathy-salut-0.7.0/config.sub --- telepathy-salut-0.5.0/config.sub 2011-05-03 12:15:12.000000000 +0000 +++ telepathy-salut-0.7.0/config.sub 2011-11-16 10:10:15.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2010-01-22' +timestamp='2011-03-23' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -76,7 +76,7 @@ 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 Free +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -124,8 +124,9 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os @@ -157,8 +158,8 @@ os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -174,10 +175,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -282,11 +283,13 @@ | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ | rx \ | score \ @@ -294,15 +297,24 @@ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; m6811 | m68hc11 | m6812 | m68hc12 | picochip) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -314,6 +326,18 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -334,7 +358,7 @@ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ @@ -368,26 +392,28 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile-* | tilegx-* \ | tron-* \ | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -412,7 +438,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -482,11 +508,20 @@ basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -518,7 +553,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -734,7 +769,7 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -841,6 +876,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -923,9 +964,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1019,6 +1061,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1075,20 +1120,8 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - # This must be matched before tile*. - tilegx*) + # This must be matched before tile*. + tilegx*) basic_machine=tilegx-unknown os=-linux-gnu ;; @@ -1163,6 +1196,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1260,11 +1296,11 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1301,7 +1337,8 @@ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1348,7 +1385,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1397,7 +1434,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1442,8 +1479,8 @@ -dicos*) os=-dicos ;; - -nacl*) - ;; + -nacl*) + ;; -none) ;; *) @@ -1466,10 +1503,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1481,8 +1518,17 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1509,7 +1555,7 @@ m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1536,7 +1582,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff -Nru telepathy-salut-0.5.0/configure telepathy-salut-0.7.0/configure --- telepathy-salut-0.5.0/configure 2011-05-03 13:29:18.000000000 +0000 +++ telepathy-salut-0.7.0/configure 2011-11-16 10:27:29.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.5.0. +# Generated by GNU Autoconf 2.68 for Telepathy Salut 0.7.0. # # Report bugs to . # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='Telepathy Salut' PACKAGE_TARNAME='telepathy-salut' -PACKAGE_VERSION='0.5.0' -PACKAGE_STRING='Telepathy Salut 0.5.0' +PACKAGE_VERSION='0.7.0' +PACKAGE_STRING='Telepathy Salut 0.7.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=telepathy-salut' PACKAGE_URL='' @@ -652,6 +652,8 @@ GTK_DOC_BUILD_HTML_TRUE ENABLE_GTK_DOC_FALSE ENABLE_GTK_DOC_TRUE +GTKDOC_DEPS_LIBS +GTKDOC_DEPS_CFLAGS HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE @@ -673,7 +675,6 @@ PYTHON_PREFIX PYTHON_VERSION PYTHON -XMLDIFF XSLTPROC ENABLE_CODING_STYLE_CHECKS ERROR_CFLAGS @@ -708,8 +709,11 @@ LIPO NMEDIT DSYMUTIL +MANIFEST_TOOL RANLIB +ac_ct_AR AR +DLLTOOL OBJDUMP LN_S NM @@ -818,6 +822,7 @@ enable_fast_install enable_dependency_tracking with_gnu_ld +with_sysroot enable_libtool_lock enable_debug enable_valgrind @@ -849,6 +854,8 @@ PKG_CONFIG_LIBDIR VALGRIND_CFLAGS VALGRIND_LIBS +GTKDOC_DEPS_CFLAGS +GTKDOC_DEPS_LIBS GLIB_CFLAGS GLIB_LIBS DBUS_CFLAGS @@ -1409,7 +1416,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.5.0 to adapt to many kinds of systems. +\`configure' configures Telepathy Salut 0.7.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1479,7 +1486,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Telepathy Salut 0.5.0:";; + short | recursive ) echo "Configuration of Telepathy Salut 0.7.0:";; esac cat <<\_ACEOF @@ -1517,9 +1524,11 @@ 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 + (or the compiler's sysroot if not specified). --with-html-dir=PATH path to installed docs Some influential environment variables: @@ -1542,6 +1551,10 @@ C compiler flags for VALGRIND, overriding pkg-config VALGRIND_LIBS linker flags for VALGRIND, overriding pkg-config + GTKDOC_DEPS_CFLAGS + C compiler flags for GTKDOC_DEPS, overriding pkg-config + GTKDOC_DEPS_LIBS + linker flags for GTKDOC_DEPS, overriding pkg-config GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config GLIB_LIBS linker flags for GLIB, overriding pkg-config DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config @@ -1637,7 +1650,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Telepathy Salut configure 0.5.0 +Telepathy Salut configure 0.7.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1915,7 +1928,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.5.0, which was +It was created by Telepathy Salut $as_me 0.7.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2274,6 +2287,11 @@ +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu am__api_version='1.11' @@ -2742,7 +2760,7 @@ # Define the identity of the package. PACKAGE='telepathy-salut' - VERSION='0.5.0' + VERSION='0.7.0' cat >>confdefs.h <<_ACEOF @@ -2883,8 +2901,8 @@ -macro_version='2.2.10' -macro_revision='1.3175' +macro_version='2.4.2' +macro_revision='1.3337' @@ -2995,7 +3013,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then @@ -4708,6 +4726,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 @@ -4747,7 +4770,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 @@ -4790,8 +4813,8 @@ # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -4840,6 +4863,80 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac + +fi + +to_host_file_cmd=$lt_cv_to_host_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac + +fi + +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : @@ -4856,6 +4953,11 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -5097,7 +5199,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 ;; @@ -5179,6 +5281,21 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi + file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -5194,9 +5311,163 @@ + + + + + + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + +test -z "$DLLTOOL" && DLLTOOL=dlltool + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + + + + + + + + +if test -n "$ac_tool_prefix"; then + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_AR+:} false; then : @@ -5212,7 +5483,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="${ac_tool_prefix}ar" + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5232,11 +5503,15 @@ fi + test -n "$AR" && break + done fi -if test -z "$ac_cv_prog_AR"; then +if test -z "$AR"; then ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_ac_ct_AR+:} false; then : @@ -5252,7 +5527,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="ar" + ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5271,6 +5546,10 @@ $as_echo "no" >&6; } fi + + test -n "$ac_ct_AR" && break +done + if test "x$ac_ct_AR" = x; then AR="false" else @@ -5282,17 +5561,73 @@ esac AR=$ac_ct_AR fi -else - AR="$ac_cv_prog_AR" fi -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru +: ${AR=ar} +: ${AR_FLAGS=cru} + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi + @@ -5505,13 +5840,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 @@ -5633,8 +5968,8 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -5658,6 +5993,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};"\ @@ -5670,6 +6006,7 @@ else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -5711,6 +6048,18 @@ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + #ifdef __cplusplus extern "C" { #endif @@ -5722,7 +6071,7 @@ cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -const struct { +LT_DLSYM_CONST struct { const char *name; void *address; } @@ -5748,8 +6097,8 @@ _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 @@ -5759,8 +6108,8 @@ test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&5 fi @@ -5797,6 +6146,16 @@ $as_echo "ok" >&6; } fi +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + + + + @@ -5819,6 +6178,44 @@ + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; +else + with_sysroot=no +fi + + +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +$as_echo "${with_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } + + + + + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; @@ -5985,7 +6382,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 @@ -5996,7 +6393,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" @@ -6012,6 +6422,123 @@ need_locks="$enable_libtool_lock" +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +if test -n "$MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. +set dummy mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +if test -n "$ac_ct_MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL + fi +else + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" +fi + +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi + + + + + case $host_os in rhapsody* | darwin*) @@ -6519,7 +7046,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 @@ -6530,6 +7063,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 : @@ -6562,6 +7096,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 : @@ -6583,7 +7118,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 @@ -6988,7 +7525,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 @@ -7066,6 +7618,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -7426,8 +7982,6 @@ lt_prog_compiler_pic= lt_prog_compiler_static= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -7527,7 +8081,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 @@ -7592,6 +8148,12 @@ lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -7612,18 +8174,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 @@ -7711,13 +8288,17 @@ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 -$as_echo "$lt_prog_compiler_pic" >&6; } - - - - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. @@ -7778,6 +8359,11 @@ + + + + + # # Check to make sure the static flag actually works. # @@ -7976,7 +8562,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 @@ -8020,7 +8605,7 @@ openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | gnu*) link_all_deplibs=no ;; esac @@ -8131,7 +8716,8 @@ allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -8179,7 +8765,7 @@ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -8228,8 +8814,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~ @@ -8249,8 +8834,8 @@ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -8268,8 +8853,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -8315,8 +8900,8 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -8447,7 +9032,13 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -8460,22 +9051,29 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" @@ -8487,7 +9085,13 @@ else # Determine the default libpath from the value encoded in an # empty executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -8500,22 +9104,29 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, @@ -8560,20 +9171,64 @@ # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes + case $cc_basename in + cl*) + # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes + file_list_spec='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # 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' + postlink_cmds='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + enable_shared_with_static_runtimes=yes + ;; + esac ;; darwin* | rhapsody*) @@ -8585,6 +9240,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 @@ -8613,10 +9269,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 @@ -8629,7 +9281,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 @@ -8638,7 +9290,7 @@ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no @@ -8646,7 +9298,7 @@ hpux9*) if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -8662,13 +9314,12 @@ hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 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 @@ -8686,10 +9337,10 @@ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -8768,23 +9419,36 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int foo(void) {} +int foo (void) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - + lt_cv_irix_exported_symbol=yes +else + lt_cv_irix_exported_symbol=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS="$save_LDFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test "$lt_cv_irix_exported_symbol" = yes; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' @@ -8869,7 +9533,7 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' @@ -8888,9 +9552,9 @@ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -9125,13 +9789,8 @@ ;; esac fi - ;; -esac - - - - - + ;; +esac @@ -9373,7 +10032,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 @@ -9382,7 +10041,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 @@ -9447,7 +10106,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' @@ -9466,8 +10125,9 @@ need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -9500,13 +10160,71 @@ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -9527,7 +10245,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' @@ -9535,10 +10253,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. @@ -9546,7 +10260,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -9564,7 +10278,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -9584,17 +10298,18 @@ ;; 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}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; 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" @@ -9655,7 +10370,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}' @@ -9671,7 +10386,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 ;; @@ -9708,9 +10423,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}' @@ -9804,7 +10519,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 @@ -9873,7 +10588,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}' @@ -9898,7 +10613,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 @@ -9922,7 +10637,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 @@ -9953,7 +10668,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}' @@ -9963,7 +10678,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 @@ -10454,10 +11169,10 @@ /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -10560,10 +11275,10 @@ /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -10745,6 +11460,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -11881,6 +12598,7 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -12031,6 +12749,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VALGRIND_CFLAGS=`$PKG_CONFIG --cflags "valgrind > "$valgrind_req"" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12047,6 +12766,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_VALGRIND_LIBS=`$PKG_CONFIG --libs "valgrind > "$valgrind_req"" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12066,9 +12786,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - VALGRIND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "valgrind > "$valgrind_req"" 2>&1` + VALGRIND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "valgrind > "$valgrind_req"" 2>&1` else - VALGRIND_PKG_ERRORS=`$PKG_CONFIG --print-errors "valgrind > "$valgrind_req"" 2>&1` + VALGRIND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "valgrind > "$valgrind_req"" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$VALGRIND_PKG_ERRORS" >&5 @@ -12704,53 +13424,6 @@ as_fn_error $? "xsltproc (from the libxslt source package) is required" "$LINENO" 5 fi -XMLDIFF= -for ac_prog in xmldiff -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_XMLDIFF+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$XMLDIFF"; then - ac_cv_prog_XMLDIFF="$XMLDIFF" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_XMLDIFF="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -XMLDIFF=$ac_cv_prog_XMLDIFF -if test -n "$XMLDIFF"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLDIFF" >&5 -$as_echo "$XMLDIFF" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$XMLDIFF" && break -done - -if test -z "$XMLDIFF"; then - as_fn_error $? "xmldiff is required for the gibber tests" "$LINENO" 5 -fi - @@ -13002,7 +13675,7 @@ if test "${enable_avahi_tests+set}" = set; then : enableval=$enable_avahi_tests; enable_avahi_tests=$enableval else - enable_avahi_tests=no + enable_avahi_tests=yes fi @@ -13287,6 +13960,7 @@ + # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -13444,6 +14118,99 @@ else as_fn_error $? "gtk-doc not installed and --enable-gtk-doc requested" "$LINENO" 5 fi + if test "x$PACKAGE_NAME" != "xglib"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 +$as_echo_n "checking for GTKDOC_DEPS... " >&6; } + +if test -n "$GTKDOC_DEPS_CFLAGS"; then + pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GTKDOC_DEPS_LIBS"; then + pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + else + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met: + +$GTKDOC_DEPS_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS + GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 @@ -13528,6 +14295,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.24, gobject-2.0 >= 2.16, gthread-2.0 >= 2.4" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13544,6 +14312,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.24, gobject-2.0 >= 2.16, gthread-2.0 >= 2.4" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13563,9 +14332,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.24, gobject-2.0 >= 2.16, gthread-2.0 >= 2.4" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.24, gobject-2.0 >= 2.16, gthread-2.0 >= 2.4" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.24, gobject-2.0 >= 2.16, gthread-2.0 >= 2.4" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.24, gobject-2.0 >= 2.16, gthread-2.0 >= 2.4" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 @@ -13624,6 +14393,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.1.0, dbus-glib-1 >= 0.61" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13640,6 +14410,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.1.0, dbus-glib-1 >= 0.61" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13659,9 +14430,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 1.1.0, dbus-glib-1 >= 0.61" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 1.1.0, dbus-glib-1 >= 0.61" 2>&1` else - DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 1.1.0, dbus-glib-1 >= 0.61" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 1.1.0, dbus-glib-1 >= 0.61" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DBUS_PKG_ERRORS" >&5 @@ -13717,6 +14488,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13733,6 +14505,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13752,9 +14525,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0" 2>&1` + LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0" 2>&1` else - LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0" 2>&1` + LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBXML2_PKG_ERRORS" >&5 @@ -13804,12 +14577,13 @@ pkg_cv_TELEPATHY_GLIB_CFLAGS="$TELEPATHY_GLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"telepathy-glib >= 0.13.12\""; } >&5 - ($PKG_CONFIG --exists --print-errors "telepathy-glib >= 0.13.12") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"telepathy-glib >= 0.17.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "telepathy-glib >= 0.17.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_TELEPATHY_GLIB_CFLAGS=`$PKG_CONFIG --cflags "telepathy-glib >= 0.13.12" 2>/dev/null` + pkg_cv_TELEPATHY_GLIB_CFLAGS=`$PKG_CONFIG --cflags "telepathy-glib >= 0.17.1" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13820,12 +14594,13 @@ pkg_cv_TELEPATHY_GLIB_LIBS="$TELEPATHY_GLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"telepathy-glib >= 0.13.12\""; } >&5 - ($PKG_CONFIG --exists --print-errors "telepathy-glib >= 0.13.12") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"telepathy-glib >= 0.17.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "telepathy-glib >= 0.17.1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_TELEPATHY_GLIB_LIBS=`$PKG_CONFIG --libs "telepathy-glib >= 0.13.12" 2>/dev/null` + pkg_cv_TELEPATHY_GLIB_LIBS=`$PKG_CONFIG --libs "telepathy-glib >= 0.17.1" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13845,14 +14620,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - TELEPATHY_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "telepathy-glib >= 0.13.12" 2>&1` + TELEPATHY_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "telepathy-glib >= 0.17.1" 2>&1` else - TELEPATHY_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "telepathy-glib >= 0.13.12" 2>&1` + TELEPATHY_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "telepathy-glib >= 0.17.1" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$TELEPATHY_GLIB_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (telepathy-glib >= 0.13.12) were not met: + as_fn_error $? "Package requirements (telepathy-glib >= 0.17.1) were not met: $TELEPATHY_GLIB_PKG_ERRORS @@ -13903,6 +14678,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_AVAHI_CFLAGS=`$PKG_CONFIG --cflags "avahi-gobject, avahi-client" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13919,6 +14695,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_AVAHI_LIBS=`$PKG_CONFIG --libs "avahi-gobject, avahi-client" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13938,9 +14715,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "avahi-gobject, avahi-client" 2>&1` + AVAHI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "avahi-gobject, avahi-client" 2>&1` else - AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors "avahi-gobject, avahi-client" 2>&1` + AVAHI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "avahi-gobject, avahi-client" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$AVAHI_PKG_ERRORS" >&5 @@ -13995,6 +14772,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBSOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14011,6 +14789,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBSOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14030,9 +14809,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsoup-2.4" 2>&1` + LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsoup-2.4" 2>&1` else - LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsoup-2.4" 2>&1` + LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsoup-2.4" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBSOUP_PKG_ERRORS" >&5 @@ -14087,6 +14866,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_UUID_CFLAGS=`$PKG_CONFIG --cflags "uuid" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14103,6 +14883,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_UUID_LIBS=`$PKG_CONFIG --libs "uuid" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14122,9 +14903,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - UUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "uuid" 2>&1` + UUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "uuid" 2>&1` else - UUID_PKG_ERRORS=`$PKG_CONFIG --print-errors "uuid" 2>&1` + UUID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "uuid" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$UUID_PKG_ERRORS" >&5 @@ -14179,6 +14960,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14195,6 +14977,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14214,9 +14997,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmodule-2.0" 2>&1` + GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-2.0" 2>&1` else - GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmodule-2.0" 2>&1` + GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GMODULE_PKG_ERRORS" >&5 @@ -14299,6 +15082,18 @@ prev_ac_configure_args=$ac_configure_args ac_configure_args="$ac_configure_args --with-installed-headers=${wocky_install_headers_dir}" +if test "x$ENABLE_CODING_STYLE_CHECKS" = xyes ; then + ac_configure_args+=" --enable-coding-style-checks" +else + ac_configure_args+=" --disable-coding-style-checks" +fi + +if test "x$tp_werror" = xyes && test "x$official_release" = xno; then + ac_configure_args+=" --enable-Werror" +else + ac_configure_args+=" --disable-Werror" +fi + prev_top_build_prefix=$ac_top_build_prefix @@ -14450,6 +15245,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WOCKY_CFLAGS=`$PKG_CONFIG --cflags "wocky >= 0.0.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14466,6 +15262,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WOCKY_LIBS=`$PKG_CONFIG --libs "wocky >= 0.0.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -14485,9 +15282,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - WOCKY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "wocky >= 0.0.0" 2>&1` + WOCKY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "wocky >= 0.0.0" 2>&1` else - WOCKY_PKG_ERRORS=`$PKG_CONFIG --print-errors "wocky >= 0.0.0" 2>&1` + WOCKY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "wocky >= 0.0.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$WOCKY_PKG_ERRORS" >&5 @@ -14529,7 +15326,7 @@ -ac_config_files="$ac_config_files Makefile docs/Makefile lib/Makefile lib/ext/Makefile lib/gibber/Makefile lib/gibber/tests/Makefile lib/gibber/tests/inputs/Makefile src/Makefile m4/Makefile data/Makefile extensions/Makefile tools/Makefile tests/Makefile tests/twisted/Makefile tests/twisted/tools/Makefile plugins/Makefile salut/Makefile salut/telepathy-salut-uninstalled.pc salut/telepathy-salut.pc" +ac_config_files="$ac_config_files Makefile docs/Makefile lib/Makefile lib/ext/Makefile lib/gibber/Makefile lib/gibber/tests/Makefile src/Makefile m4/Makefile data/Makefile extensions/Makefile tools/Makefile tests/Makefile tests/twisted/Makefile tests/twisted/tools/Makefile plugins/Makefile salut/Makefile salut/telepathy-salut-uninstalled.pc salut/telepathy-salut.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -15125,7 +15922,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.5.0, which was +This file was extended by Telepathy Salut $as_me 0.7.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15191,7 +15988,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.5.0 +Telepathy Salut config.status 0.7.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -15328,6 +16125,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"`' @@ -15348,13 +16146,20 @@ lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' @@ -15369,14 +16174,17 @@ lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' @@ -15400,7 +16208,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"`' @@ -15409,12 +16216,12 @@ hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -15456,6 +16263,7 @@ # Quote evaled strings. for var in SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -15469,8 +16277,13 @@ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ +file_magic_glob \ +want_nocaseglob \ +DLLTOOL \ +sharedlib_from_linklib_cmd \ AR \ AR_FLAGS \ +archiver_list_spec \ STRIP \ RANLIB \ CC \ @@ -15480,12 +16293,14 @@ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +nm_file_list_spec \ lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_wl \ lt_prog_compiler_pic \ +lt_prog_compiler_wl \ lt_prog_compiler_static \ lt_cv_prog_compiler_c_o \ need_locks \ +MANIFEST_TOOL \ DSYMUTIL \ NMEDIT \ LIPO \ @@ -15499,9 +16314,7 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ -fix_srcfile_path \ exclude_expsyms \ include_expsyms \ file_list_spec \ @@ -15537,6 +16350,7 @@ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ +postlink_cmds \ postinstall_cmds \ postuninstall_cmds \ finish_cmds \ @@ -15589,7 +16403,6 @@ "lib/ext/Makefile") CONFIG_FILES="$CONFIG_FILES lib/ext/Makefile" ;; "lib/gibber/Makefile") CONFIG_FILES="$CONFIG_FILES lib/gibber/Makefile" ;; "lib/gibber/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/gibber/tests/Makefile" ;; - "lib/gibber/tests/inputs/Makefile") CONFIG_FILES="$CONFIG_FILES lib/gibber/tests/inputs/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; @@ -16313,8 +17126,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. @@ -16368,6 +17181,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 @@ -16417,19 +17233,42 @@ # turn newlines into spaces. NL2SP=$lt_lt_NL2SP +# convert \$build file names to \$host format. +to_host_file_cmd=$lt_cv_to_host_file_cmd + +# convert \$build files to toolchain format. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd + # An object symbol dumper. OBJDUMP=$lt_OBJDUMP # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method -# Command to use when deplibs_check_method == "file_magic". +# Command to use when deplibs_check_method = "file_magic". file_magic_cmd=$lt_file_magic_cmd +# How to find potential files when deplibs_check_method = "file_magic". +file_magic_glob=$lt_file_magic_glob + +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +want_nocaseglob=$lt_want_nocaseglob + +# DLL creation program. +DLLTOOL=$lt_DLLTOOL + +# Command to associate shared and link libraries. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd + # The archiver. AR=$lt_AR + +# Flags to create an archive. AR_FLAGS=$lt_AR_FLAGS +# How to feed a file listing to the archiver. +archiver_list_spec=$lt_archiver_list_spec + # A symbol stripping program. STRIP=$lt_STRIP @@ -16459,6 +17298,12 @@ # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# Specify filename containing input files for \$NM. +nm_file_list_spec=$lt_nm_file_list_spec + +# The root where to search for dependent libraries,and in which our libraries should be installed. +lt_sysroot=$lt_sysroot + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -16468,6 +17313,9 @@ # Must we lock files when doing compilation? need_locks=$lt_need_locks +# Manifest tool. +MANIFEST_TOOL=$lt_MANIFEST_TOOL + # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL @@ -16582,12 +17430,12 @@ # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - # Additional compiler flags for building library objects. pic_flag=$lt_lt_prog_compiler_pic +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl + # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static @@ -16637,10 +17485,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 @@ -16674,9 +17518,6 @@ # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols @@ -16692,6 +17533,9 @@ # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds + # Specify filename containing input files. file_list_spec=$lt_file_list_spec @@ -16724,210 +17568,169 @@ # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $* )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} - -# sed scripts: -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[^=]*=//' - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$@"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` -} - -_LT_EOF -esac - -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1+=\$2" -} -_LT_EOF - ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1=\$$1\$2" -} - -_LT_EOF - ;; - esac + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_basename ()$/,/^} # func_basename /c\ +func_basename ()\ +{\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ +func_dirname_and_basename ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ +func_stripname ()\ +{\ +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ +\ # positional parameters, so assign one to ordinary parameter first.\ +\ func_stripname_result=${3}\ +\ func_stripname_result=${func_stripname_result#"${1}"}\ +\ func_stripname_result=${func_stripname_result%"${2}"}\ +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ +func_split_long_opt ()\ +{\ +\ func_split_long_opt_name=${1%%=*}\ +\ func_split_long_opt_arg=${1#*=}\ +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ +func_split_short_opt ()\ +{\ +\ func_split_short_opt_arg=${1#??}\ +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ +func_lo2o ()\ +{\ +\ case ${1} in\ +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ +\ *) func_lo2o_result=${1} ;;\ +\ esac\ +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_xform ()$/,/^} # func_xform /c\ +func_xform ()\ +{\ + func_xform_result=${1%.*}.lo\ +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_arith ()$/,/^} # func_arith /c\ +func_arith ()\ +{\ + func_arith_result=$(( $* ))\ +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_len ()$/,/^} # func_len /c\ +func_len ()\ +{\ + func_len_result=${#1}\ +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + +fi + +if test x"$lt_shell_append" = xyes; then + sed -e '/^func_append ()$/,/^} # func_append /c\ +func_append ()\ +{\ + eval "${1}+=\\${2}"\ +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ +func_append_quoted ()\ +{\ +\ func_quote_for_eval "${2}"\ +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" diff -Nru telepathy-salut-0.5.0/configure.ac telepathy-salut-0.7.0/configure.ac --- telepathy-salut-0.5.0/configure.ac 2011-05-03 13:27:54.000000000 +0000 +++ telepathy-salut-0.7.0/configure.ac 2011-11-16 10:27:18.000000000 +0000 @@ -8,7 +8,7 @@ # set salut_nano_version to 0. m4_define([salut_major_version], [0]) -m4_define([salut_minor_version], [5]) +m4_define([salut_minor_version], [7]) m4_define([salut_micro_version], [0]) m4_define([salut_nano_version], [0]) @@ -22,7 +22,7 @@ [https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=telepathy-salut]) AC_CONFIG_MACRO_DIR([m4]) - +AC_LANG([C]) AM_INIT_AUTOMAKE([1.9 -Wno-portability tar-ustar]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) AM_PROG_LIBTOOL @@ -87,13 +87,6 @@ AC_MSG_ERROR([xsltproc (from the libxslt source package) is required]) fi -dnl check for xmldiff -XMLDIFF= -AC_CHECK_PROGS([XMLDIFF], [xmldiff]) -if test -z "$XMLDIFF"; then - AC_MSG_ERROR([xmldiff is required for the gibber tests]) -fi - AM_PATH_PYTHON([2.5]) # Check for a python >= 2.5 with twisted to run python tests @@ -111,7 +104,7 @@ AC_ARG_ENABLE(avahi-tests, AC_HELP_STRING([ --enable-avahi-tests], [Enable tests that use the system avahi to hit the network ]), - enable_avahi_tests=$enableval, enable_avahi_tests=no) + enable_avahi_tests=$enableval, enable_avahi_tests=yes) if test x$enable_avahi_tests = xyes; then if test false = "$TEST_PYTHON"; then @@ -186,7 +179,7 @@ AC_SUBST(LIBXML2_LIBS) dnl Check for telepathy-glib -PKG_CHECK_MODULES(TELEPATHY_GLIB, [telepathy-glib >= 0.13.12]) +PKG_CHECK_MODULES(TELEPATHY_GLIB, [telepathy-glib >= 0.17.1]) AC_SUBST(TELEPATHY_GLIB_CFLAGS) AC_SUBST(TELEPATHY_GLIB_LIBS) @@ -250,6 +243,18 @@ prev_ac_configure_args=$ac_configure_args ac_configure_args="$ac_configure_args --with-installed-headers=${wocky_install_headers_dir}" +if test "x$ENABLE_CODING_STYLE_CHECKS" = xyes ; then + ac_configure_args+=" --enable-coding-style-checks" +else + ac_configure_args+=" --disable-coding-style-checks" +fi + +if test "x$tp_werror" = xyes && test "x$official_release" = xno; then + ac_configure_args+=" --enable-Werror" +else + ac_configure_args+=" --disable-Werror" +fi + prev_top_build_prefix=$ac_top_build_prefix AX_CONFIG_DIR([lib/ext/wocky]) ac_top_build_prefix=$prev_top_build_prefix @@ -270,7 +275,6 @@ lib/ext/Makefile \ lib/gibber/Makefile \ lib/gibber/tests/Makefile \ - lib/gibber/tests/inputs/Makefile \ src/Makefile \ m4/Makefile \ data/Makefile \ diff -Nru telepathy-salut-0.5.0/data/Makefile.in telepathy-salut-0.7.0/data/Makefile.in --- telepathy-salut-0.5.0/data/Makefile.in 2011-05-03 13:29:17.000000000 +0000 +++ telepathy-salut-0.7.0/data/Makefile.in 2011-11-16 10:27:29.000000000 +0000 @@ -109,6 +109,7 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -132,6 +133,8 @@ GMODULE_LIBS = @GMODULE_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ @@ -154,6 +157,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MOSTLYCLEANFILES = @MOSTLYCLEANFILES@ NM = @NM@ @@ -194,12 +198,12 @@ VERSION = @VERSION@ WOCKY_CFLAGS = @WOCKY_CFLAGS@ WOCKY_LIBS = @WOCKY_LIBS@ -XMLDIFF = @XMLDIFF@ XSLTPROC = @XSLTPROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ diff -Nru telepathy-salut-0.5.0/debian/changelog telepathy-salut-0.7.0/debian/changelog --- telepathy-salut-0.5.0/debian/changelog 2011-07-04 14:34:07.000000000 +0000 +++ telepathy-salut-0.7.0/debian/changelog 2011-12-05 12:11:40.000000000 +0000 @@ -1,14 +1,44 @@ -telepathy-salut (0.5.0-3ubuntu1) oneiric; urgency=low +telepathy-salut (0.7.0-1ubuntu2~ppa11.10+1) oneiric; urgency=low - * debian/patches/0003-drop-xmldiff.patch: don't check for xmldiff in - configure. It's supposedly only required for tests, but they don't - use it and we don't build or run them anyway. - * debian/control: drop the Build-Depends requirement for xmldiff. - * debian/control: add dh-autoreconf to Build-Depends. - * debian/rules: call autoreconf due to the added 0003-drop-xmldiff.patch - patch which modifies configure. + * Upload to telepathy/ppa PPA - -- Mathieu Trudel-Lapierre Mon, 04 Jul 2011 10:34:04 -0400 + -- Xavier Claessens Mon, 05 Dec 2011 13:11:40 +0100 + +telepathy-salut (0.7.0-1ubuntu2) precise; urgency=low + + * debian/control + - added build depends for python-twisted-words and python-twisted-core + needed to run tests, fixes FTBFS + + -- Ken VanDine Wed, 23 Nov 2011 12:12:17 -0500 + +telepathy-salut (0.7.0-1ubuntu1) precise; urgency=low + + * debian/control + - added build depends for python-avahi needed to run tests + + -- Ken VanDine Wed, 23 Nov 2011 11:47:38 -0500 + +telepathy-salut (0.7.0-1) experimental; urgency=low + + * New upstream release. + * debian/control: Up build-dep version on libtelepathy-glib-dev. + + -- Jonny Lamb Wed, 16 Nov 2011 19:18:50 +0000 + +telepathy-salut (0.6.0-1) unstable; urgency=low + + * New upstream release. + + -- Jonny Lamb Wed, 19 Oct 2011 10:39:08 +0100 + +telepathy-salut (0.5.2-1) unstable; urgency=low + + * New upstream release. + * debian/patches/: Removed all old patches. + * debian/control: Removed xmldiff build-dep. + + -- Jonny Lamb Wed, 05 Oct 2011 12:13:29 +0100 telepathy-salut (0.5.0-3) unstable; urgency=low diff -Nru telepathy-salut-0.5.0/debian/control telepathy-salut-0.7.0/debian/control --- telepathy-salut-0.5.0/debian/control 2011-07-04 14:06:05.000000000 +0000 +++ telepathy-salut-0.7.0/debian/control 2011-11-23 17:17:21.000000000 +0000 @@ -1,7 +1,6 @@ Source: telepathy-salut Standards-Version: 3.9.1 -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Telepathy maintainers +Maintainer: Debian Telepathy maintainers Uploaders: Sjoerd Simons , Laurent Bigonville , Simon McVittie , @@ -10,12 +9,14 @@ Priority: optional Build-Depends: cdbs, debhelper (>= 5), - dh-autoreconf, libglib2.0-dev (>= 2.24.0), libdbus-1-dev (>= 1.1.0), libxml2-dev, libavahi-gobject-dev, - libtelepathy-glib-dev (>= 0.13.12), + python-avahi, + python-twisted-core, + python-twisted-words, + libtelepathy-glib-dev (>= 0.17.1), xsltproc, python (>= 2.5), libsoup2.4-dev, diff -Nru telepathy-salut-0.5.0/debian/gbp.conf telepathy-salut-0.7.0/debian/gbp.conf --- telepathy-salut-0.5.0/debian/gbp.conf 2011-07-04 13:35:19.000000000 +0000 +++ telepathy-salut-0.7.0/debian/gbp.conf 2011-11-23 16:42:36.000000000 +0000 @@ -1,6 +1,6 @@ [DEFAULT] -debian-branch = debian -upstream-branch = upstream +debian-branch = debian-experimental +upstream-branch = upstream-experimental pristine-tar = True [git-buildpackage] diff -Nru telepathy-salut-0.5.0/debian/patches/0001-contact-channel-treat-TP_UNKNOWN_HANDLE_TYPE-has-uns.patch telepathy-salut-0.7.0/debian/patches/0001-contact-channel-treat-TP_UNKNOWN_HANDLE_TYPE-has-uns.patch --- telepathy-salut-0.5.0/debian/patches/0001-contact-channel-treat-TP_UNKNOWN_HANDLE_TYPE-has-uns.patch 2011-07-04 13:35:19.000000000 +0000 +++ telepathy-salut-0.7.0/debian/patches/0001-contact-channel-treat-TP_UNKNOWN_HANDLE_TYPE-has-uns.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -From 96bfc261c256fd6de9d727f378dc2bc43c9358b8 Mon Sep 17 00:00:00 2001 -From: Jonny Lamb -Date: Fri, 24 Jun 2011 10:10:32 +0100 -Subject: [PATCH] contact-channel: treat TP_UNKNOWN_HANDLE_TYPE has unset - handle type - -Signed-off-by: Jonny Lamb ---- - src/contact-channel.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/contact-channel.c b/src/contact-channel.c -index d87a81a..103f411 100644 ---- a/src/contact-channel.c -+++ b/src/contact-channel.c -@@ -225,8 +225,10 @@ salut_contact_channel_set_property (GObject *object, - priv->conn = g_value_get_object (value); - break; - case PROP_HANDLE_TYPE: -- g_assert (g_value_get_uint (value) == 0 -- || g_value_get_uint (value) == TP_HANDLE_TYPE_LIST); -+ g_assert (g_value_get_uint (value) == 0 /* old tp-glib value for unset */ -+ || g_value_get_uint (value) == TP_HANDLE_TYPE_LIST -+ /* new tp-glib value for unset */ -+ || g_value_get_uint (value) == TP_UNKNOWN_HANDLE_TYPE); - break; - case PROP_CHANNEL_TYPE: - tmp = g_value_get_string (value); diff -Nru telepathy-salut-0.5.0/debian/patches/0002-Cope-with-the-default-value-of-handle-type-being-cha.patch telepathy-salut-0.7.0/debian/patches/0002-Cope-with-the-default-value-of-handle-type-being-cha.patch --- telepathy-salut-0.5.0/debian/patches/0002-Cope-with-the-default-value-of-handle-type-being-cha.patch 2011-07-04 13:35:19.000000000 +0000 +++ telepathy-salut-0.7.0/debian/patches/0002-Cope-with-the-default-value-of-handle-type-being-cha.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ -From d1e2397dc684b609ac5f9b78fd4d5b1e2b24c452 Mon Sep 17 00:00:00 2001 -From: Sjoerd Simons -Date: Sat, 25 Jun 2011 00:24:10 +0200 -Subject: [PATCH] Cope with the default value of handle-type being changed in - new tp-glib - -In recent versions of tp-glib the handle-type property defaults to -TP_UNKNOWN_HANDLE_TYPE instead of 0. Update the various assertions which -verify a channel doesn't get constructed with an unexpected handle type -to accept both 0 and TP_UNKNOWN_HANDLE_TYPE so we're compatible with -both versions. ---- - src/file-transfer-channel.c | 5 ++++- - src/im-channel.c | 7 +++++-- - src/muc-channel.c | 5 ++++- - src/roomlist-channel.c | 6 ++++-- - 4 files changed, 17 insertions(+), 6 deletions(-) - -diff --git a/src/file-transfer-channel.c b/src/file-transfer-channel.c -index 794631f..4d93a46 100644 ---- a/src/file-transfer-channel.c -+++ b/src/file-transfer-channel.c -@@ -354,8 +354,11 @@ salut_file_transfer_channel_set_property (GObject *object, - self->priv->connection = g_value_get_object (value); - break; - case PROP_HANDLE_TYPE: -+ /* 0 is the old tp-glib value of unset, TP_UNKNOWN_HANDLE_TYPE is the -+ * new version */ - g_assert (g_value_get_uint (value) == 0 -- || g_value_get_uint (value) == TP_HANDLE_TYPE_CONTACT); -+ || g_value_get_uint (value) == TP_HANDLE_TYPE_CONTACT -+ || g_value_get_uint (value) == TP_UNKNOWN_HANDLE_TYPE); - break; - case PROP_CHANNEL_TYPE: - /* these properties are writable in the interface, but not actually -diff --git a/src/im-channel.c b/src/im-channel.c -index 4843e38..722f1ba 100644 ---- a/src/im-channel.c -+++ b/src/im-channel.c -@@ -250,8 +250,11 @@ salut_im_channel_set_property (GObject *object, - priv->connection = g_value_get_object (value); - break; - case PROP_HANDLE_TYPE: -- g_assert (g_value_get_uint (value) == 0 || -- g_value_get_uint (value) == TP_HANDLE_TYPE_CONTACT); -+ /* 0 is the old tp-glib value of unset, TP_UNKNOWN_HANDLE_TYPE is the -+ * new version */ -+ g_assert (g_value_get_uint (value) == 0 -+ || g_value_get_uint (value) == TP_HANDLE_TYPE_CONTACT -+ || g_value_get_uint (value) == TP_UNKNOWN_HANDLE_TYPE); - break; - case PROP_CHANNEL_TYPE: - tmp = g_value_get_string (value); -diff --git a/src/muc-channel.c b/src/muc-channel.c -index b8b0fbb..9be5bf7 100644 ---- a/src/muc-channel.c -+++ b/src/muc-channel.c -@@ -268,8 +268,11 @@ salut_muc_channel_set_property (GObject *object, - priv->muc_connection = g_value_get_object (value); - break; - case PROP_HANDLE_TYPE: -+ /* 0 is the old tp-glib value of unset, TP_UNKNOWN_HANDLE_TYPE is the -+ * new version */ - g_assert (g_value_get_uint (value) == 0 -- || g_value_get_uint (value) == TP_HANDLE_TYPE_ROOM); -+ || g_value_get_uint (value) == TP_HANDLE_TYPE_ROOM -+ || g_value_get_uint (value) == TP_UNKNOWN_HANDLE_TYPE); - break; - case PROP_CHANNEL_TYPE: - tmp = g_value_get_string (value); -diff --git a/src/roomlist-channel.c b/src/roomlist-channel.c -index aad3c48..362c37c 100644 ---- a/src/roomlist-channel.c -+++ b/src/roomlist-channel.c -@@ -227,8 +227,10 @@ salut_roomlist_channel_set_property (GObject *object, - break; - case PROP_HANDLE_TYPE: - /* this property is writable in the interface, but not actually -- * meaningfully changable on this channel, so we do nothing */ -- g_assert (g_value_get_uint (value) == TP_HANDLE_TYPE_NONE); -+ * meaningfully changable on this channel, so we do nothing. -+ * */ -+ g_assert (g_value_get_uint (value) == TP_HANDLE_TYPE_NONE -+ || g_value_get_uint (value) == TP_UNKNOWN_HANDLE_TYPE); - break; - case PROP_CONNECTION: - priv->connection = g_value_get_object (value); --- -1.7.5.4 - diff -Nru telepathy-salut-0.5.0/debian/patches/0003-drop-xmldiff.patch telepathy-salut-0.7.0/debian/patches/0003-drop-xmldiff.patch --- telepathy-salut-0.5.0/debian/patches/0003-drop-xmldiff.patch 2011-07-04 14:01:45.000000000 +0000 +++ telepathy-salut-0.7.0/debian/patches/0003-drop-xmldiff.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -From: Mathieu Trudel-Lapierre -Subject: Drop the check for xmldiff; it should only be required for tests - -... and even those don't seem to use it. Dropping it will allow building -telepathy-salut without bringing xmldiff to main on Ubuntu. - -Index: telepathy-salut/configure.ac -=================================================================== ---- telepathy-salut.orig/configure.ac 2011-07-04 09:39:52.837908493 -0400 -+++ telepathy-salut/configure.ac 2011-07-04 09:40:01.877908510 -0400 -@@ -87,13 +87,6 @@ - AC_MSG_ERROR([xsltproc (from the libxslt source package) is required]) - fi - --dnl check for xmldiff --XMLDIFF= --AC_CHECK_PROGS([XMLDIFF], [xmldiff]) --if test -z "$XMLDIFF"; then -- AC_MSG_ERROR([xmldiff is required for the gibber tests]) --fi -- - AM_PATH_PYTHON([2.5]) - - # Check for a python >= 2.5 with twisted to run python tests diff -Nru telepathy-salut-0.5.0/debian/patches/series telepathy-salut-0.7.0/debian/patches/series --- telepathy-salut-0.5.0/debian/patches/series 2011-07-04 13:39:47.000000000 +0000 +++ telepathy-salut-0.7.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -0001-contact-channel-treat-TP_UNKNOWN_HANDLE_TYPE-has-uns.patch -0002-Cope-with-the-default-value-of-handle-type-being-cha.patch -0003-drop-xmldiff.patch diff -Nru telepathy-salut-0.5.0/debian/rules telepathy-salut-0.7.0/debian/rules --- telepathy-salut-0.5.0/debian/rules 2011-07-04 14:04:11.000000000 +0000 +++ telepathy-salut-0.7.0/debian/rules 2011-11-23 16:11:08.000000000 +0000 @@ -2,7 +2,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/autoreconf.mk # List any files which are not installed include /usr/share/cdbs/1/rules/utils.mk diff -Nru telepathy-salut-0.5.0/docs/Makefile.in telepathy-salut-0.7.0/docs/Makefile.in --- telepathy-salut-0.5.0/docs/Makefile.in 2011-05-03 13:29:17.000000000 +0000 +++ telepathy-salut-0.7.0/docs/Makefile.in 2011-11-16 10:27:29.000000000 +0000 @@ -112,6 +112,7 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -135,6 +136,8 @@ GMODULE_LIBS = @GMODULE_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HTML_DIR = @HTML_DIR@ @@ -157,6 +160,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MOSTLYCLEANFILES = @MOSTLYCLEANFILES@ NM = @NM@ @@ -197,12 +201,12 @@ VERSION = @VERSION@ WOCKY_CFLAGS = @WOCKY_CFLAGS@ WOCKY_LIBS = @WOCKY_LIBS@ -XMLDIFF = @XMLDIFF@ XSLTPROC = @XSLTPROC@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ diff -Nru telepathy-salut-0.5.0/extensions/all.xml telepathy-salut-0.7.0/extensions/all.xml --- telepathy-salut-0.5.0/extensions/all.xml 2011-04-22 08:08:27.000000000 +0000 +++ telepathy-salut-0.7.0/extensions/all.xml 2011-11-16 08:53:50.000000000 +0000 @@ -43,6 +43,8 @@ from="Telepathy specification"/> + /dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -141,9 +143,9 @@ AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/ChangeLog telepathy-salut-0.7.0/lib/ext/wocky/ChangeLog --- telepathy-salut-0.5.0/lib/ext/wocky/ChangeLog 2011-05-03 13:29:43.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/ChangeLog 2011-11-16 10:28:02.000000000 +0000 @@ -1,3 +1,1028 @@ +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 | 90 +++++++++++++++++++++++++++-------------------------- + 1 files changed, 46 insertions(+), 44 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 @@ -2860,8 +3885,8 @@ Signed-off-by: Jonny Lamb - wocky/wocky-porter.c | 182 +++++++++++++++++++++++++------------------------- - 1 files changed, 91 insertions(+), 91 deletions(-) + wocky/wocky-porter.c | 198 +++++++++++++++++++++++++------------------------- + 1 files changed, 99 insertions(+), 99 deletions(-) commit 39b1a9431f4d96f8b8daa836ac6fbf848005b787 Author: Jonny Lamb @@ -7670,8 +8695,8 @@ Generalize event propagation from PubsubService to Node wocky/wocky-pubsub-node-protected.h | 3 + - wocky/wocky-pubsub-service.c | 131 ++++++++++++++++------------------ - 2 files changed, 65 insertions(+), 69 deletions(-) + wocky/wocky-pubsub-service.c | 129 ++++++++++++++++------------------ + 2 files changed, 64 insertions(+), 68 deletions(-) commit 2a5f4f613af27951bd5f5833583e28a8ce1ec99d Author: Will Thompson @@ -7788,8 +8813,8 @@ docs: adapt to WockyDataForm being singular - docs/reference/wocky-sections.txt | 54 ++++++++++++++++++++----------------- - 1 files changed, 29 insertions(+), 25 deletions(-) + docs/reference/wocky-sections.txt | 60 +++++++++++++++++++----------------- + 1 files changed, 32 insertions(+), 28 deletions(-) commit 16e729516b8f2a12e552a858005a70646497ee06 Author: Simon McVittie @@ -16333,10 +17358,10 @@ XEP 0077 Registration/Cancellation tests. - tests/wocky-connector-test.c | 357 ++++++++++++++++++++++++++++++++-- + tests/wocky-connector-test.c | 353 +++++++++++++++++++++++++++++++++-- tests/wocky-test-connector-server.c | 265 +++++++++++++++++++++++++- tests/wocky-test-connector-server.h | 19 ++ - 3 files changed, 610 insertions(+), 31 deletions(-) + 3 files changed, 608 insertions(+), 29 deletions(-) commit c7645384313de5b6778a031c0d393d0bf2cc5ba6 Author: Vivek Dasmohapatra diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/config.guess telepathy-salut-0.7.0/lib/ext/wocky/config.guess --- telepathy-salut-0.5.0/lib/ext/wocky/config.guess 2011-05-03 12:15:21.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/config.guess 2011-11-16 10:10:26.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2009-12-30' +timestamp='2011-05-11' # 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 @@ -57,7 +57,7 @@ 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 Free +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -181,7 +181,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -224,7 +224,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -270,7 +270,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -296,7 +299,7 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@ -395,23 +398,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -481,8 +484,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -495,7 +498,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -552,7 +555,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -595,52 +598,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -731,22 +734,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -770,14 +773,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -805,14 +808,14 @@ echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -867,7 +870,7 @@ EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@ -879,7 +882,13 @@ then echo ${UNAME_MACHINE}-unknown-linux-gnu else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi fi exit ;; avr32*:Linux:*:*) @@ -892,7 +901,7 @@ echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo frv-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -960,7 +969,7 @@ echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -968,6 +977,9 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-tilera-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; @@ -975,7 +987,7 @@ echo x86_64-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -984,11 +996,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1020,7 +1032,7 @@ fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1048,13 +1060,13 @@ exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1089,8 +1101,8 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1133,10 +1145,10 @@ echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1162,11 +1174,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1231,6 +1243,9 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@ -1276,13 +1291,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1322,11 +1337,11 @@ #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/config.h.in telepathy-salut-0.7.0/lib/ext/wocky/config.h.in --- telepathy-salut-0.5.0/lib/ext/wocky/config.h.in 2011-05-03 12:15:20.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/config.h.in 2011-11-16 10:10:25.000000000 +0000 @@ -6,6 +6,9 @@ /* Enable debug code */ #undef ENABLE_DEBUG +/* Prefer stream ciphers over block ones to save bandwidth */ +#undef ENABLE_PREFER_STREAM_CIPHERS + /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/config.sub telepathy-salut-0.7.0/lib/ext/wocky/config.sub --- telepathy-salut-0.5.0/lib/ext/wocky/config.sub 2011-05-03 12:15:21.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/config.sub 2011-11-16 10:10:26.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011 Free Software Foundation, Inc. -timestamp='2010-01-22' +timestamp='2011-03-23' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -76,7 +76,7 @@ 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 Free +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -124,8 +124,9 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os @@ -157,8 +158,8 @@ os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -174,10 +175,10 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -282,11 +283,13 @@ | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ | rx \ | score \ @@ -294,15 +297,24 @@ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; m6811 | m68hc11 | m6812 | m68hc12 | picochip) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -314,6 +326,18 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -334,7 +358,7 @@ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ @@ -368,26 +392,28 @@ | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile-* | tilegx-* \ | tron-* \ | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -412,7 +438,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -482,11 +508,20 @@ basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -518,7 +553,7 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -734,7 +769,7 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@ -841,6 +876,12 @@ np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -923,9 +964,10 @@ ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -1019,6 +1061,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1075,20 +1120,8 @@ basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - # This must be matched before tile*. - tilegx*) + # This must be matched before tile*. + tilegx*) basic_machine=tilegx-unknown os=-linux-gnu ;; @@ -1163,6 +1196,9 @@ xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1260,11 +1296,11 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1301,7 +1337,8 @@ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1348,7 +1385,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1397,7 +1434,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1442,8 +1479,8 @@ -dicos*) os=-dicos ;; - -nacl*) - ;; + -nacl*) + ;; -none) ;; *) @@ -1466,10 +1503,10 @@ # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1481,8 +1518,17 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1509,7 +1555,7 @@ m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1536,7 +1582,7 @@ *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/configure telepathy-salut-0.7.0/lib/ext/wocky/configure --- telepathy-salut-0.5.0/lib/ext/wocky/configure 2011-05-03 12:15:20.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/configure 2011-11-16 10:10:24.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for Wocky 0.0.0.1. +# Generated by GNU Autoconf 2.68 for Wocky 0.0.0.1. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -89,6 +89,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -222,11 +223,18 @@ # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. BASH_ENV=/dev/null ENV=/dev/null (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -615,6 +623,8 @@ GTK_DOC_BUILD_HTML_TRUE ENABLE_GTK_DOC_FALSE ENABLE_GTK_DOC_TRUE +GTKDOC_DEPS_LIBS +GTKDOC_DEPS_CFLAGS HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE @@ -643,6 +653,8 @@ LIBXML2_LIBS LIBXML2_CFLAGS GLIB_GENMARSHAL +GNUTLS_FOR_STREAM_CIPHERS_LIBS +GNUTLS_FOR_STREAM_CIPHERS_CFLAGS USING_OPENSSL_FALSE USING_OPENSSL_TRUE TLS_LIBS @@ -672,8 +684,11 @@ LIPO NMEDIT DSYMUTIL +MANIFEST_TOOL RANLIB +ac_ct_AR AR +DLLTOOL OBJDUMP LN_S NM @@ -779,6 +794,7 @@ enable_fast_install enable_dependency_tracking with_gnu_ld +with_sysroot enable_libtool_lock enable_silent_rules enable_Werror @@ -786,6 +802,7 @@ enable_debug with_installed_headers with_tls +enable_prefer_stream_ciphers enable_coverage with_html_dir enable_gtk_doc @@ -810,12 +827,16 @@ GLIB_LIBS TLS_CFLAGS TLS_LIBS +GNUTLS_FOR_STREAM_CIPHERS_CFLAGS +GNUTLS_FOR_STREAM_CIPHERS_LIBS LIBXML2_CFLAGS LIBXML2_LIBS SQLITE_CFLAGS SQLITE_LIBS LIBIPHB_CFLAGS -LIBIPHB_LIBS' +LIBIPHB_LIBS +GTKDOC_DEPS_CFLAGS +GTKDOC_DEPS_LIBS' # Initialize some variables set by options. @@ -1220,7 +1241,7 @@ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1450,6 +1471,9 @@ --disable-coding-style-checks do not check coding style using grep --disable-debug compile without debug code + --enable-prefer-stream-ciphers + prefer stream ciphers over block ciphers to save + bandwidth (at the possible expense of security) --enable-coverage compile with coverage profiling instrumentation (gcc only) --enable-gtk-doc use gtk-doc to build documentation [[default=no]] @@ -1459,9 +1483,11 @@ 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 + (or the compiler's sysroot if not specified). --with-installed-headers=DIR install development headers to DIR [default=nowhere] --with-tls=BACKEND which TLS backend to use (gnutls, openssl, or auto) @@ -1488,6 +1514,12 @@ GLIB_LIBS linker flags for GLIB, overriding pkg-config TLS_CFLAGS C compiler flags for TLS, overriding pkg-config TLS_LIBS linker flags for TLS, overriding pkg-config + GNUTLS_FOR_STREAM_CIPHERS_CFLAGS + C compiler flags for GNUTLS_FOR_STREAM_CIPHERS, overriding + pkg-config + GNUTLS_FOR_STREAM_CIPHERS_LIBS + linker flags for GNUTLS_FOR_STREAM_CIPHERS, overriding + pkg-config LIBXML2_CFLAGS C compiler flags for LIBXML2, overriding pkg-config LIBXML2_LIBS @@ -1499,6 +1531,10 @@ C compiler flags for LIBIPHB, overriding pkg-config LIBIPHB_LIBS linker flags for LIBIPHB, overriding pkg-config + GTKDOC_DEPS_CFLAGS + C compiler flags for GTKDOC_DEPS, overriding pkg-config + GTKDOC_DEPS_LIBS + linker flags for GTKDOC_DEPS, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1567,7 +1603,7 @@ if $ac_init_version; then cat <<\_ACEOF Wocky configure 0.0.0.1 -generated by GNU Autoconf 2.67 +generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -1613,7 +1649,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1659,7 +1695,7 @@ # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1673,7 +1709,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1691,7 +1727,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1727,7 +1763,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1769,7 +1805,7 @@ ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1782,7 +1818,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1837,7 +1873,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func @@ -1849,10 +1885,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval "test \"\${$3+set}\"" = set; then : + if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1915,7 +1951,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1924,7 +1960,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel cat >config.log <<_ACEOF @@ -1932,7 +1968,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by Wocky $as_me 0.0.0.1, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2190,7 +2226,7 @@ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2330,7 +2366,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2417,11 +2453,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2507,7 +2543,7 @@ set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2547,7 +2583,7 @@ set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2600,7 +2636,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then : + if ${ac_cv_path_mkdir+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2651,7 +2687,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then : +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2691,7 +2727,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2857,7 +2893,7 @@ done rm -rf conftest.dir -if test "${am_cv_prog_tar_ustar+set}" = set; then : +if ${am_cv_prog_tar_ustar+:} false; then : $as_echo_n "(cached) " >&6 else am_cv_prog_tar_ustar=$_am_tool @@ -2878,8 +2914,8 @@ -macro_version='2.2.10' -macro_revision='1.3175' +macro_version='2.4.2' +macro_revision='1.3337' @@ -2901,7 +2937,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias @@ -2917,7 +2953,7 @@ $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2935,7 +2971,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then @@ -2950,7 +2986,7 @@ $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2990,7 +3026,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 $as_echo_n "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \ +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then ECHO='print -r --' elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then @@ -3107,7 +3143,7 @@ set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3147,7 +3183,7 @@ set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3200,7 +3236,7 @@ set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3240,7 +3276,7 @@ set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3299,7 +3335,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3343,7 +3379,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3398,7 +3434,7 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3513,7 +3549,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3556,7 +3592,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3615,7 +3651,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3626,7 +3662,7 @@ ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3667,7 +3703,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3677,7 +3713,7 @@ ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3714,7 +3750,7 @@ ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3792,7 +3828,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3891,7 +3927,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -4016,7 +4052,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then : +if ${ac_cv_path_SED+:} false; then : $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ @@ -4098,7 +4134,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -4161,7 +4197,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4228,7 +4264,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 $as_echo_n "checking for fgrep... " >&6; } -if test "${ac_cv_path_FGREP+set}" = set; then : +if ${ac_cv_path_FGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 @@ -4359,7 +4395,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${lt_cv_path_LD+set}" = set; then : +if ${lt_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -4399,7 +4435,7 @@ test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then : +if ${lt_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. @@ -4426,7 +4462,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if test "${lt_cv_path_NM+set}" = set; then : +if ${lt_cv_path_NM+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NM"; then @@ -4489,7 +4525,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DUMPBIN+set}" = set; then : +if ${ac_cv_prog_DUMPBIN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then @@ -4533,7 +4569,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then @@ -4605,7 +4641,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 $as_echo_n "checking the name lister ($NM) interface... " >&6; } -if test "${lt_cv_nm_interface+set}" = set; then : +if ${lt_cv_nm_interface+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_nm_interface="BSD nm" @@ -4640,7 +4676,7 @@ # find the maximum length of command line arguments { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 $as_echo_n "checking the maximum length of command line arguments... " >&6; } -if test "${lt_cv_sys_max_cmd_len+set}" = set; then : +if ${lt_cv_sys_max_cmd_len+:} false; then : $as_echo_n "(cached) " >&6 else i=0 @@ -4703,6 +4739,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 @@ -4742,7 +4783,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 @@ -4785,8 +4826,8 @@ # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,b/c, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -4835,9 +4876,83 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac + +fi + +to_host_file_cmd=$lt_cv_to_host_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac + +fi + +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } -if test "${lt_cv_ld_reload_flag+set}" = set; then : +if ${lt_cv_ld_reload_flag+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_reload_flag='-r' @@ -4851,6 +4966,11 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -4873,7 +4993,7 @@ set dummy ${ac_tool_prefix}objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then : +if ${ac_cv_prog_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then @@ -4913,7 +5033,7 @@ set dummy objdump; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then @@ -4972,7 +5092,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 $as_echo_n "checking how to recognize dependent libraries... " >&6; } -if test "${lt_cv_deplibs_check_method+set}" = set; then : +if ${lt_cv_deplibs_check_method+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' @@ -5092,7 +5212,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 ;; @@ -5174,6 +5294,21 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi + file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -5189,12 +5324,166 @@ + + + + + + + + + + if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AR+set}" = set; then : +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + +test -z "$DLLTOOL" && DLLTOOL=dlltool + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + + + + + + + + +if test -n "$ac_tool_prefix"; then + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -5207,7 +5496,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="${ac_tool_prefix}ar" + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5227,14 +5516,18 @@ fi + test -n "$AR" && break + done fi -if test -z "$ac_cv_prog_AR"; then +if test -z "$AR"; then ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : +if ${ac_cv_prog_ac_ct_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -5247,7 +5540,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="ar" + ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5266,6 +5559,10 @@ $as_echo "no" >&6; } fi + + test -n "$ac_ct_AR" && break +done + if test "x$ac_ct_AR" = x; then AR="false" else @@ -5277,12 +5574,10 @@ esac AR=$ac_ct_AR fi -else - AR="$ac_cv_prog_AR" fi -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru +: ${AR=ar} +: ${AR_FLAGS=cru} @@ -5294,12 +5589,70 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } + +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi + + + + + + + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -5339,7 +5692,7 @@ set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -5398,7 +5751,7 @@ set dummy ${ac_tool_prefix}ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then : +if ${ac_cv_prog_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -5438,7 +5791,7 @@ set dummy ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -5500,13 +5853,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 @@ -5567,7 +5920,7 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : +if ${lt_cv_sys_global_symbol_pipe+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5628,8 +5981,8 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -5653,6 +6006,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};"\ @@ -5665,6 +6019,7 @@ else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -5706,6 +6061,18 @@ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + #ifdef __cplusplus extern "C" { #endif @@ -5717,7 +6084,7 @@ cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -const struct { +LT_DLSYM_CONST struct { const char *name; void *address; } @@ -5743,8 +6110,8 @@ _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 @@ -5754,8 +6121,8 @@ test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS else echo "cannot find nm_test_func in $nlist" >&5 fi @@ -5792,6 +6159,12 @@ $as_echo "ok" >&6; } fi +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' +fi @@ -5814,6 +6187,48 @@ + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; +else + with_sysroot=no +fi + + +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +$as_echo "${with_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } + + + + + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; @@ -5939,7 +6354,7 @@ CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if test "${lt_cv_cc_needs_belf+set}" = set; then : +if ${lt_cv_cc_needs_belf+:} false; then : $as_echo_n "(cached) " >&6 else ac_ext=c @@ -5980,7 +6395,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 @@ -5991,7 +6406,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" @@ -6007,6 +6435,123 @@ need_locks="$enable_libtool_lock" +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +if test -n "$MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. +set dummy mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +if test -n "$ac_ct_MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL + fi +else + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" +fi + +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi + + + + + case $host_os in rhapsody* | darwin*) @@ -6015,7 +6560,7 @@ set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : +if ${ac_cv_prog_DSYMUTIL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then @@ -6055,7 +6600,7 @@ set dummy dsymutil; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then @@ -6107,7 +6652,7 @@ set dummy ${ac_tool_prefix}nmedit; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_NMEDIT+set}" = set; then : +if ${ac_cv_prog_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then @@ -6147,7 +6692,7 @@ set dummy nmedit; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then @@ -6199,7 +6744,7 @@ set dummy ${ac_tool_prefix}lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LIPO+set}" = set; then : +if ${ac_cv_prog_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then @@ -6239,7 +6784,7 @@ set dummy lipo; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then @@ -6291,7 +6836,7 @@ set dummy ${ac_tool_prefix}otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL+set}" = set; then : +if ${ac_cv_prog_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then @@ -6331,7 +6876,7 @@ set dummy otool; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then @@ -6383,7 +6928,7 @@ set dummy ${ac_tool_prefix}otool64; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_OTOOL64+set}" = set; then : +if ${ac_cv_prog_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then @@ -6423,7 +6968,7 @@ set dummy otool64; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then @@ -6498,7 +7043,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 $as_echo_n "checking for -single_module linker flag... " >&6; } -if test "${lt_cv_apple_cc_single_mod+set}" = set; then : +if ${lt_cv_apple_cc_single_mod+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no @@ -6514,7 +7059,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 @@ -6525,9 +7076,10 @@ 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 test "${lt_cv_ld_exported_symbols_list+set}" = set; then : +if ${lt_cv_ld_exported_symbols_list+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no @@ -6557,9 +7109,10 @@ 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 test "${lt_cv_ld_force_load+set}" = set; then : +if ${lt_cv_ld_force_load+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_ld_force_load=no @@ -6578,7 +7131,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 @@ -6636,7 +7191,7 @@ CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -6752,7 +7307,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -6764,7 +7319,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6895,7 +7450,7 @@ do : ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " -if test "x$ac_cv_header_dlfcn_h" = x""yes; then : +if test "x$ac_cv_header_dlfcn_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_DLFCN_H 1 _ACEOF @@ -6983,7 +7538,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 @@ -7061,6 +7631,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -7082,7 +7656,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 $as_echo_n "checking for objdir... " >&6; } -if test "${lt_cv_objdir+set}" = set; then : +if ${lt_cv_objdir+:} false; then : $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null @@ -7160,7 +7734,7 @@ if test "$file_magic_cmd" = '$MAGIC_CMD'; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -7226,7 +7800,7 @@ if test -n "$ac_tool_prefix"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 $as_echo_n "checking for file... " >&6; } -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : +if ${lt_cv_path_MAGIC_CMD+:} false; then : $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in @@ -7368,7 +7942,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no @@ -7421,8 +7995,6 @@ lt_prog_compiler_pic= lt_prog_compiler_static= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -7522,7 +8094,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 @@ -7587,6 +8161,12 @@ lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -7607,18 +8187,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 @@ -7706,13 +8301,17 @@ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 -$as_echo "$lt_prog_compiler_pic" >&6; } - - - - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. @@ -7720,7 +8319,7 @@ if test -n "$lt_prog_compiler_pic"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : +if ${lt_cv_prog_compiler_pic_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no @@ -7773,13 +8372,18 @@ + + + + + # # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if test "${lt_cv_prog_compiler_static_works+set}" = set; then : +if ${lt_cv_prog_compiler_static_works+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no @@ -7822,7 +8426,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then : +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -7877,7 +8481,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if test "${lt_cv_prog_compiler_c_o+set}" = set; then : +if ${lt_cv_prog_compiler_c_o+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no @@ -7971,7 +8575,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 @@ -8015,7 +8618,7 @@ openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | gnu*) link_all_deplibs=no ;; esac @@ -8126,7 +8729,8 @@ allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -8174,7 +8778,7 @@ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag= + tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler @@ -8223,8 +8827,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~ @@ -8244,8 +8847,8 @@ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -8263,8 +8866,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -8310,8 +8913,8 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -8442,7 +9045,13 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -8455,22 +9064,29 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" @@ -8482,7 +9098,13 @@ else # Determine the default libpath from the value encoded in an # empty executable. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -8495,22 +9117,29 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\(.*\)$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, @@ -8555,20 +9184,64 @@ # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes + case $cc_basename in + cl*) + # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes + file_list_spec='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # 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' + postlink_cmds='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + enable_shared_with_static_runtimes=yes + ;; + esac ;; darwin* | rhapsody*) @@ -8580,6 +9253,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 @@ -8608,10 +9282,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 @@ -8624,7 +9294,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 @@ -8633,7 +9303,7 @@ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no @@ -8641,7 +9311,7 @@ hpux9*) if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -8657,13 +9327,12 @@ hpux10*) if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' 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 @@ -8681,10 +9350,10 @@ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -8701,7 +9370,7 @@ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 $as_echo_n "checking if $CC understands -b... " >&6; } -if test "${lt_cv_prog_compiler__b+set}" = set; then : +if ${lt_cv_prog_compiler__b+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no @@ -8763,23 +9432,36 @@ irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int foo(void) {} +int foo (void) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - + lt_cv_irix_exported_symbol=yes +else + lt_cv_irix_exported_symbol=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS="$save_LDFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test "$lt_cv_irix_exported_symbol" = yes; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' @@ -8864,7 +9546,7 @@ osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' @@ -8883,9 +9565,9 @@ no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -9073,7 +9755,7 @@ # to ld, don't add -lc before -lgcc. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if test "${lt_cv_archive_cmds_need_lc+set}" = set; then : +if ${lt_cv_archive_cmds_need_lc+:} false; then : $as_echo_n "(cached) " >&6 else $RM conftest* @@ -9274,11 +9956,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -9368,7 +10045,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 @@ -9377,7 +10054,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 @@ -9442,7 +10119,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' @@ -9461,8 +10138,9 @@ need_version=no need_lib_prefix=no - case $GCC,$host_os in - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) + case $GCC,$cc_basename in + yes,*) + # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -9495,13 +10173,71 @@ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' ;; *) + # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' ;; esac - dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -9522,7 +10258,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' @@ -9530,10 +10266,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. @@ -9541,7 +10273,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -9559,7 +10291,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -9579,17 +10311,18 @@ ;; 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}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; 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" @@ -9650,7 +10383,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}' @@ -9666,7 +10399,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 ;; @@ -9703,9 +10436,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}' @@ -9715,7 +10448,7 @@ shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH - if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then : + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : $as_echo_n "(cached) " >&6 else lt_cv_shlibpath_overrides_runpath=no @@ -9799,7 +10532,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 @@ -9868,7 +10601,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}' @@ -9893,7 +10626,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 @@ -9917,7 +10650,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 @@ -9948,7 +10681,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}' @@ -9958,7 +10691,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 @@ -10147,7 +10880,7 @@ # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10181,7 +10914,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -10195,12 +10928,12 @@ *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = x""yes; then : +if test "x$ac_cv_func_shl_load" = xyes; then : lt_cv_dlopen="shl_load" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then : +if ${ac_cv_lib_dld_shl_load+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10234,16 +10967,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = x""yes; then : +if test "x$ac_cv_func_dlopen" = xyes; then : lt_cv_dlopen="dlopen" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10277,12 +11010,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then : +if ${ac_cv_lib_svld_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10316,12 +11049,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then : +if ${ac_cv_lib_dld_dld_link+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10355,7 +11088,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = x""yes; then : +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -10396,7 +11129,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 $as_echo_n "checking whether a program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self+set}" = set; then : +if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -10449,10 +11182,10 @@ /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -10502,7 +11235,7 @@ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if test "${lt_cv_dlopen_self_static+set}" = set; then : +if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -10555,10 +11288,10 @@ /* When -fvisbility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -void fnord () __attribute__((visibility("default"))); +int fnord () __attribute__((visibility("default"))); #endif -void fnord () { int i=42; } +int fnord () { return 42; } int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -10740,6 +11473,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -10774,7 +11509,7 @@ set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -10814,7 +11549,7 @@ set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -10867,7 +11602,7 @@ set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -10907,7 +11642,7 @@ set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -10966,7 +11701,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -11010,7 +11745,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -11065,7 +11800,7 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -11094,7 +11829,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11131,7 +11866,7 @@ ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -11209,7 +11944,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -11308,7 +12043,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -11437,7 +12172,7 @@ *) : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 $as_echo_n "checking for $CC option to accept ISO C99... " >&6; } -if test "${ac_cv_prog_cc_c99+set}" = set; then : +if ${ac_cv_prog_cc_c99+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c99=no @@ -11612,7 +12347,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -11708,7 +12443,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5 $as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; } - if test "${ac_cv_prog_cc_stdc+set}" = set; then : + if ${ac_cv_prog_cc_stdc+:} false; then : $as_echo_n "(cached) " >&6 fi @@ -11735,7 +12470,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CCAS_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -12117,7 +12852,7 @@ enableval=$enable_debug; case "${enableval}" in yes|no) enable_debug="${enableval}" ;; - *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;; esac else @@ -12156,7 +12891,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12288,7 +13023,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 $as_echo_n "checking for inline... " >&6; } -if test "${ac_cv_c_inline+set}" = set; then : +if ${ac_cv_c_inline+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_c_inline=no @@ -12331,7 +13066,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then : +if ${ac_cv_c_bigendian+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_c_bigendian=unknown @@ -12550,7 +13285,7 @@ ;; #( *) as_fn_error $? "unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac @@ -12560,13 +13295,14 @@ + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -12609,7 +13345,7 @@ set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -12691,6 +13427,7 @@ test $ac_status = 0; }; then pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.16, gobject-2.0 >= 2.16, gthread-2.0 >= 2.4, gio-2.0 >= 2.26" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12710,6 +13447,7 @@ test $ac_status = 0; }; then pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.16, gobject-2.0 >= 2.16, gthread-2.0 >= 2.4, gio-2.0 >= 2.26" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12729,10 +13467,10 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.16, gobject-2.0 >= 2.16, gthread-2.0 >= + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.16, gobject-2.0 >= 2.16, gthread-2.0 >= 2.4, gio-2.0 >= 2.26" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.16, gobject-2.0 >= 2.16, gthread-2.0 >= + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.16, gobject-2.0 >= 2.16, gthread-2.0 >= 2.4, gio-2.0 >= 2.26" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -12763,7 +13501,7 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS GLIB_LIBS=$pkg_cv_GLIB_LIBS @@ -12825,6 +13563,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 2.8.2 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12841,6 +13580,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 2.8.2 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12860,9 +13600,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - TLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnutls >= 2.8.2 " 2>&1` + TLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 2.8.2 " 2>&1` else - TLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnutls >= 2.8.2 " 2>&1` + TLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 2.8.2 " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$TLS_PKG_ERRORS" >&5 @@ -12891,7 +13631,7 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else TLS_CFLAGS=$pkg_cv_TLS_CFLAGS TLS_LIBS=$pkg_cv_TLS_LIBS @@ -12919,6 +13659,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TLS_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 0.9.8g" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12935,6 +13676,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TLS_LIBS=`$PKG_CONFIG --libs "openssl >= 0.9.8g" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -12954,9 +13696,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - TLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "openssl >= 0.9.8g" 2>&1` + TLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl >= 0.9.8g" 2>&1` else - TLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "openssl >= 0.9.8g" 2>&1` + TLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl >= 0.9.8g" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$TLS_PKG_ERRORS" >&5 @@ -12985,7 +13727,7 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else TLS_CFLAGS=$pkg_cv_TLS_CFLAGS TLS_LIBS=$pkg_cv_TLS_LIBS @@ -13009,6 +13751,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 2.8.2 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13025,6 +13768,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 2.8.2 " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13044,9 +13788,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - TLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnutls >= 2.8.2 " 2>&1` + TLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 2.8.2 " 2>&1` else - TLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnutls >= 2.8.2 " 2>&1` + TLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 2.8.2 " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$TLS_PKG_ERRORS" >&5 @@ -13070,6 +13814,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TLS_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 0.9.8g" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13086,6 +13831,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TLS_LIBS=`$PKG_CONFIG --libs "openssl >= 0.9.8g" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13105,9 +13851,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - TLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "openssl >= 0.9.8g" 2>&1` + TLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl >= 0.9.8g" 2>&1` else - TLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "openssl >= 0.9.8g" 2>&1` + TLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl >= 0.9.8g" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$TLS_PKG_ERRORS" >&5 @@ -13146,6 +13892,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TLS_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 0.9.8g" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13162,6 +13909,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TLS_LIBS=`$PKG_CONFIG --libs "openssl >= 0.9.8g" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13181,9 +13929,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - TLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "openssl >= 0.9.8g" 2>&1` + TLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl >= 0.9.8g" 2>&1` else - TLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "openssl >= 0.9.8g" 2>&1` + TLS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl >= 0.9.8g" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$TLS_PKG_ERRORS" >&5 @@ -13208,7 +13956,7 @@ with_tls=gnutls fi ;; #( *) : - as_fn_error $? "Must have a TLS backend (gnutls or openssl)" "$LINENO" 5 ;; #( + as_fn_error $? "Must have a TLS backend (gnutls or openssl)" "$LINENO" 5 ;; #( *) : ;; esac @@ -13224,6 +13972,96 @@ fi +# Check whether --enable-prefer-stream-ciphers was given. +if test "${enable_prefer_stream_ciphers+set}" = set; then : + enableval=$enable_prefer_stream_ciphers; prefer_stream_ciphers=$enableval +else + prefer_stream_ciphers=no +fi + + +if test x$prefer_stream_ciphers = xyes; then + +$as_echo "#define ENABLE_PREFER_STREAM_CIPHERS /**/" >>confdefs.h + + if test $with_tls = gnutls; then + # The *-ALL priority strings require gnutls 2.12.0. + # We do this check here and not earlier to avoid accidentally falling + # back to openssl because of the use of --enable-prefer-stream-ciphers. + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNUTLS_FOR_STREAM_CIPHERS" >&5 +$as_echo_n "checking for GNUTLS_FOR_STREAM_CIPHERS... " >&6; } + +if test -n "$GNUTLS_FOR_STREAM_CIPHERS_CFLAGS"; then + pkg_cv_GNUTLS_FOR_STREAM_CIPHERS_CFLAGS="$GNUTLS_FOR_STREAM_CIPHERS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.12.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gnutls >= 2.12.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GNUTLS_FOR_STREAM_CIPHERS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 2.12.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GNUTLS_FOR_STREAM_CIPHERS_LIBS"; then + pkg_cv_GNUTLS_FOR_STREAM_CIPHERS_LIBS="$GNUTLS_FOR_STREAM_CIPHERS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.12.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gnutls >= 2.12.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GNUTLS_FOR_STREAM_CIPHERS_LIBS=`$PKG_CONFIG --libs "gnutls >= 2.12.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GNUTLS_FOR_STREAM_CIPHERS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnutls >= 2.12.0" 2>&1` + else + GNUTLS_FOR_STREAM_CIPHERS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnutls >= 2.12.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GNUTLS_FOR_STREAM_CIPHERS_PKG_ERRORS" >&5 + + as_fn_error $? "gnutls 2.12.0 is needed to use --enable-prefer-stream-cihpers" "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "gnutls 2.12.0 is needed to use --enable-prefer-stream-cihpers" "$LINENO" 5 +else + GNUTLS_FOR_STREAM_CIPHERS_CFLAGS=$pkg_cv_GNUTLS_FOR_STREAM_CIPHERS_CFLAGS + GNUTLS_FOR_STREAM_CIPHERS_LIBS=$pkg_cv_GNUTLS_FOR_STREAM_CIPHERS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + fi +fi + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` @@ -13242,6 +14080,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13258,6 +14097,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13277,9 +14117,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0" 2>&1` + LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0" 2>&1` else - LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0" 2>&1` + LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBXML2_PKG_ERRORS" >&5 @@ -13308,7 +14148,7 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS @@ -13334,6 +14174,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13350,6 +14191,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13369,9 +14211,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SQLITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sqlite3" 2>&1` + SQLITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sqlite3" 2>&1` else - SQLITE_PKG_ERRORS=`$PKG_CONFIG --print-errors "sqlite3" 2>&1` + SQLITE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sqlite3" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$SQLITE_PKG_ERRORS" >&5 @@ -13400,7 +14242,7 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else SQLITE_CFLAGS=$pkg_cv_SQLITE_CFLAGS SQLITE_LIBS=$pkg_cv_SQLITE_LIBS @@ -13413,7 +14255,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_server_new in -lsasl2" >&5 $as_echo_n "checking for sasl_server_new in -lsasl2... " >&6; } -if test "${ac_cv_lib_sasl2_sasl_server_new+set}" = set; then : +if ${ac_cv_lib_sasl2_sasl_server_new+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -13447,9 +14289,9 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_sasl_server_new" >&5 $as_echo "$ac_cv_lib_sasl2_sasl_server_new" >&6; } -if test "x$ac_cv_lib_sasl2_sasl_server_new" = x""yes; then : +if test "x$ac_cv_lib_sasl2_sasl_server_new" = xyes; then : ac_fn_c_check_header_mongrel "$LINENO" "sasl/sasl.h" "ac_cv_header_sasl_sasl_h" "$ac_includes_default" -if test "x$ac_cv_header_sasl_sasl_h" = x""yes; then : +if test "x$ac_cv_header_sasl_sasl_h" = xyes; then : LIBSASL2_LIBS="-lsasl2" LIBSASL2_CFLAGS="" HAVE_LIBSASL2=yes @@ -13465,6 +14307,8 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsasl2 not found: skipping sasl tests" >&5 $as_echo "$as_me: WARNING: libsasl2 not found: skipping sasl tests" >&2;} + HAVE_LIBSASL2=no + fi @@ -13488,12 +14332,13 @@ pkg_cv_LIBIPHB_CFLAGS="$LIBIPHB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiphb\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libiphb") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiphb >= 0.61.31\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libiphb >= 0.61.31") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBIPHB_CFLAGS=`$PKG_CONFIG --cflags "libiphb" 2>/dev/null` + pkg_cv_LIBIPHB_CFLAGS=`$PKG_CONFIG --cflags "libiphb >= 0.61.31" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13504,12 +14349,13 @@ pkg_cv_LIBIPHB_LIBS="$LIBIPHB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiphb\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libiphb") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiphb >= 0.61.31\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libiphb >= 0.61.31") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBIPHB_LIBS=`$PKG_CONFIG --libs "libiphb" 2>/dev/null` + pkg_cv_LIBIPHB_LIBS=`$PKG_CONFIG --libs "libiphb >= 0.61.31" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13529,9 +14375,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBIPHB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libiphb" 2>&1` + LIBIPHB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libiphb >= 0.61.31" 2>&1` else - LIBIPHB_PKG_ERRORS=`$PKG_CONFIG --print-errors "libiphb" 2>&1` + LIBIPHB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libiphb >= 0.61.31" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBIPHB_PKG_ERRORS" >&5 @@ -13560,7 +14406,7 @@ enableval=$enable_coverage; case "${enableval}" in "yes"|"no") enable_coverage="${enableval}" ;; - *) as_fn_error $? "bad value ${enableval} for --enable-coverage" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-coverage" "$LINENO" 5 ;; esac @@ -13575,7 +14421,7 @@ set dummy $GCOV; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_have_gcov+set}" = set; then : +if ${ac_cv_prog_have_gcov+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$have_gcov"; then @@ -13738,7 +14584,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LCOV_PATH+set}" = set; then : +if ${ac_cv_prog_LCOV_PATH+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$LCOV_PATH"; then @@ -13813,11 +14659,12 @@ + # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then : +if ${ac_cv_path_GTKDOC_CHECK+:} false; then : $as_echo_n "(cached) " >&6 else case $GTKDOC_CHECK in @@ -13859,7 +14706,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then : +if ${ac_cv_path_GTKDOC_REBASE+:} false; then : $as_echo_n "(cached) " >&6 else case $GTKDOC_REBASE in @@ -13903,7 +14750,7 @@ set dummy gtkdoc-mkpdf; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then : +if ${ac_cv_path_GTKDOC_MKPDF+:} false; then : $as_echo_n "(cached) " >&6 else case $GTKDOC_MKPDF in @@ -13961,15 +14808,108 @@ if test x$enable_gtk_doc = xyes; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.10\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.10") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.17\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.17") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then : else - as_fn_error $? "You need to have gtk-doc >= 1.10 installed to build $PACKAGE_NAME" "$LINENO" 5 + as_fn_error $? "You need to have gtk-doc >= 1.17 installed to build $PACKAGE_NAME" "$LINENO" 5 +fi + if test "x$PACKAGE_NAME" != "xglib"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 +$as_echo_n "checking for GTKDOC_DEPS... " >&6; } + +if test -n "$GTKDOC_DEPS_CFLAGS"; then + pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GTKDOC_DEPS_LIBS"; then + pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + else + GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met: + +$GTKDOC_DEPS_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS + GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + fi + fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 @@ -14105,10 +15045,21 @@ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -14209,7 +15160,7 @@ Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -14310,6 +15261,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -14617,7 +15569,7 @@ # values after options handling. ac_log=" This file was extended by Wocky $as_me 0.0.0.1, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -14683,7 +15635,7 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ Wocky config.status 0.0.0.1 -configured by $0, generated by GNU Autoconf 2.67, +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" Copyright (C) 2010 Free Software Foundation, Inc. @@ -14819,6 +15771,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"`' @@ -14839,13 +15792,20 @@ lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' @@ -14860,14 +15820,17 @@ lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' @@ -14891,7 +15854,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"`' @@ -14900,12 +15862,12 @@ hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`' always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' @@ -14947,6 +15909,7 @@ # Quote evaled strings. for var in SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -14960,8 +15923,13 @@ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ +file_magic_glob \ +want_nocaseglob \ +DLLTOOL \ +sharedlib_from_linklib_cmd \ AR \ AR_FLAGS \ +archiver_list_spec \ STRIP \ RANLIB \ CC \ @@ -14971,12 +15939,14 @@ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +nm_file_list_spec \ lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_wl \ lt_prog_compiler_pic \ +lt_prog_compiler_wl \ lt_prog_compiler_static \ lt_cv_prog_compiler_c_o \ need_locks \ +MANIFEST_TOOL \ DSYMUTIL \ NMEDIT \ LIPO \ @@ -14990,9 +15960,7 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ -fix_srcfile_path \ exclude_expsyms \ include_expsyms \ file_list_spec \ @@ -15028,6 +15996,7 @@ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ +postlink_cmds \ postinstall_cmds \ postuninstall_cmds \ finish_cmds \ @@ -15084,7 +16053,7 @@ "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -15107,9 +16076,10 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -15117,12 +16087,13 @@ { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -15144,7 +16115,7 @@ ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -15172,7 +16143,7 @@ rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -15220,7 +16191,7 @@ rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -15252,7 +16223,7 @@ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF @@ -15286,7 +16257,7 @@ # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -15298,8 +16269,8 @@ # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 @@ -15400,7 +16371,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -15419,7 +16390,7 @@ for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -15428,7 +16399,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -15454,8 +16425,8 @@ esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -15591,21 +16562,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -15616,20 +16588,20 @@ if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ + mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. @@ -15791,8 +16763,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. @@ -15846,6 +16818,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 @@ -15895,19 +16870,42 @@ # turn newlines into spaces. NL2SP=$lt_lt_NL2SP +# convert \$build file names to \$host format. +to_host_file_cmd=$lt_cv_to_host_file_cmd + +# convert \$build files to toolchain format. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd + # An object symbol dumper. OBJDUMP=$lt_OBJDUMP # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method -# Command to use when deplibs_check_method == "file_magic". +# Command to use when deplibs_check_method = "file_magic". file_magic_cmd=$lt_file_magic_cmd +# How to find potential files when deplibs_check_method = "file_magic". +file_magic_glob=$lt_file_magic_glob + +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +want_nocaseglob=$lt_want_nocaseglob + +# DLL creation program. +DLLTOOL=$lt_DLLTOOL + +# Command to associate shared and link libraries. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd + # The archiver. AR=$lt_AR + +# Flags to create an archive. AR_FLAGS=$lt_AR_FLAGS +# How to feed a file listing to the archiver. +archiver_list_spec=$lt_archiver_list_spec + # A symbol stripping program. STRIP=$lt_STRIP @@ -15937,6 +16935,12 @@ # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# Specify filename containing input files for \$NM. +nm_file_list_spec=$lt_nm_file_list_spec + +# The root where to search for dependent libraries,and in which our libraries should be installed. +lt_sysroot=$lt_sysroot + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -15946,6 +16950,9 @@ # Must we lock files when doing compilation? need_locks=$lt_need_locks +# Manifest tool. +MANIFEST_TOOL=$lt_MANIFEST_TOOL + # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL @@ -16060,12 +17067,12 @@ # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - # Additional compiler flags for building library objects. pic_flag=$lt_lt_prog_compiler_pic +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl + # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static @@ -16115,10 +17122,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 @@ -16152,9 +17155,6 @@ # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path=$lt_fix_srcfile_path - # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols @@ -16170,6 +17170,9 @@ # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds + # Specify filename containing input files. file_list_spec=$lt_file_list_spec @@ -16202,210 +17205,169 @@ # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - case $xsi_shell in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac -} - -# func_basename file -func_basename () -{ - func_basename_result="${1##*/}" -} - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}" -} - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -func_stripname () -{ - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"} -} - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=${1%%=*} - func_opt_split_arg=${1#*=} -} - -# func_lo2o object -func_lo2o () -{ - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=${1%.*}.lo -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=$(( $* )) -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=${#1} -} - -_LT_EOF - ;; - *) # Bourne compatible functions. - cat << \_LT_EOF >> "$cfgfile" - -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} - -# sed scripts: -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' -my_sed_long_arg='1s/^-[^=]*=//' - -# func_opt_split -func_opt_split () -{ - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"` - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"` -} - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "$@"` -} - -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` -} - -_LT_EOF -esac - -case $lt_shell_append in - yes) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1+=\$2" -} -_LT_EOF - ;; - *) - cat << \_LT_EOF >> "$cfgfile" - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "$1=\$$1\$2" -} - -_LT_EOF - ;; - esac + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_basename ()$/,/^} # func_basename /c\ +func_basename ()\ +{\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ +func_dirname_and_basename ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ +func_stripname ()\ +{\ +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ +\ # positional parameters, so assign one to ordinary parameter first.\ +\ func_stripname_result=${3}\ +\ func_stripname_result=${func_stripname_result#"${1}"}\ +\ func_stripname_result=${func_stripname_result%"${2}"}\ +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ +func_split_long_opt ()\ +{\ +\ func_split_long_opt_name=${1%%=*}\ +\ func_split_long_opt_arg=${1#*=}\ +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ +func_split_short_opt ()\ +{\ +\ func_split_short_opt_arg=${1#??}\ +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ +func_lo2o ()\ +{\ +\ case ${1} in\ +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ +\ *) func_lo2o_result=${1} ;;\ +\ esac\ +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_xform ()$/,/^} # func_xform /c\ +func_xform ()\ +{\ + func_xform_result=${1%.*}.lo\ +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_arith ()$/,/^} # func_arith /c\ +func_arith ()\ +{\ + func_arith_result=$(( $* ))\ +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_len ()$/,/^} # func_len /c\ +func_len ()\ +{\ + func_len_result=${#1}\ +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + +fi + +if test x"$lt_shell_append" = xyes; then + sed -e '/^func_append ()$/,/^} # func_append /c\ +func_append ()\ +{\ + eval "${1}+=\\${2}"\ +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ +func_append_quoted ()\ +{\ +\ func_quote_for_eval "${2}"\ +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +else + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: +fi + +if test x"$_lt_function_replace_fail" = x":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +fi - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -16460,6 +17422,7 @@ Features: TLS Backend..........: ${with_tls} + Prefer stream ciphers: ${prefer_stream_ciphers} SASL2 Tests..........: ${HAVE_LIBSASL2} gtk-doc documentation: ${enable_gtk_doc} libiphb integration..: ${have_iphb} diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/configure.ac telepathy-salut-0.7.0/lib/ext/wocky/configure.ac --- telepathy-salut-0.5.0/lib/ext/wocky/configure.ac 2011-04-22 08:13:03.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/configure.ac 2011-11-15 09:14:09.000000000 +0000 @@ -147,6 +147,23 @@ AC_SUBST(TLS_LIBS) AM_CONDITIONAL(USING_OPENSSL, test x$USING_OPENSSL = xyes) +AC_ARG_ENABLE([prefer-stream-ciphers], + AC_HELP_STRING([--enable-prefer-stream-ciphers], + [prefer stream ciphers over block ciphers to save bandwidth (at the possible expense of security)]), + [prefer_stream_ciphers=$enableval], [prefer_stream_ciphers=no]) + +if test x$prefer_stream_ciphers = xyes; then + AC_DEFINE(ENABLE_PREFER_STREAM_CIPHERS, [], + [Prefer stream ciphers over block ones to save bandwidth]) + if test $with_tls = gnutls; then + # The *-ALL priority strings require gnutls 2.12.0. + # We do this check here and not earlier to avoid accidentally falling + # back to openssl because of the use of --enable-prefer-stream-ciphers. + PKG_CHECK_MODULES(GNUTLS_FOR_STREAM_CIPHERS, [gnutls >= 2.12.0],[], + AC_MSG_ERROR([gnutls 2.12.0 is needed to use --enable-prefer-stream-cihpers])) + fi +fi + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` AC_SUBST(GLIB_GENMARSHAL) @@ -169,13 +186,15 @@ HAVE_LIBSASL2=yes AC_DEFINE(HAVE_LIBSASL2, 1, [Define if libsasl2 is available]) ], [ AC_MSG_WARN(libsasl2 headers missing: skipping sasl tests)]) ], - [ AC_MSG_WARN(libsasl2 not found: skipping sasl tests) ]) + [ AC_MSG_WARN(libsasl2 not found: skipping sasl tests) + HAVE_LIBSASL2=no + ]) AC_SUBST(LIBSASL2_LIBS) AC_SUBST(LIBSASL2_CFLAGS) AM_CONDITIONAL(HAVE_LIBSASL2, test "x$HAVE_LIBSASL2" = "xyes") -PKG_CHECK_MODULES(LIBIPHB, [libiphb], +PKG_CHECK_MODULES(LIBIPHB, [libiphb >= 0.61.31], [AC_DEFINE(HAVE_IPHB, 1, [libiphb is available]) have_iphb=yes ], @@ -206,7 +225,7 @@ WOCKY_CFLAGS='-I${top_builddir} -I${top_srcdir}' AC_SUBST(WOCKY_CFLAGS) -GTK_DOC_CHECK([1.10]) +GTK_DOC_CHECK([1.17],[--flavour no-tmpl]) AC_OUTPUT( Makefile \ wocky/Makefile \ @@ -230,6 +249,7 @@ Features: TLS Backend..........: ${with_tls} + Prefer stream ciphers: ${prefer_stream_ciphers} SASL2 Tests..........: ${HAVE_LIBSASL2} gtk-doc documentation: ${enable_gtk_doc} libiphb integration..: ${have_iphb} diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/Makefile.in telepathy-salut-0.7.0/lib/ext/wocky/docs/Makefile.in --- telepathy-salut-0.5.0/lib/ext/wocky/docs/Makefile.in 2011-05-03 12:15:21.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/docs/Makefile.in 2011-11-16 10:10:26.000000000 +0000 @@ -119,6 +119,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -136,8 +137,12 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ +GNUTLS_FOR_STREAM_CIPHERS_CFLAGS = @GNUTLS_FOR_STREAM_CIPHERS_CFLAGS@ +GNUTLS_FOR_STREAM_CIPHERS_LIBS = @GNUTLS_FOR_STREAM_CIPHERS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ HEADER_DIR = @HEADER_DIR@ @@ -163,6 +168,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MOSTLYCLEANFILES = @MOSTLYCLEANFILES@ NM = @NM@ @@ -197,6 +203,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/annotation-glossary.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/annotation-glossary.html --- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/annotation-glossary.html 2011-05-03 13:29:41.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/annotation-glossary.html 2011-11-16 10:28:01.000000000 +0000 @@ -7,7 +7,7 @@ - + @@ -48,6 +48,6 @@
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/api-index-full.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/api-index-full.html --- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/api-index-full.html 2011-05-03 13:29:41.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/api-index-full.html 2011-11-16 10:28:01.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -71,7 +71,7 @@
-WockyAuthError, enum in WockyAuthRegistry +WockyAuthError, enum in WockyAuthRegistry
@@ -103,10 +103,6 @@
-WockyAuthRegistryPrivate, struct in WockyAuthRegistry -
-
-
WockyAuthRegistryStartAuthAsyncFunc, user_function in WockyAuthRegistry
@@ -135,10 +131,6 @@
-wocky_auth_error_get_type, function in wocky-auth-registry-enumtypes -
-
-
wocky_auth_error_quark, function in WockyAuthRegistry
@@ -183,6 +175,10 @@
+WOCKY_AUTH_MECH_SASL_SCRAM_SHA_1, macro in WockyAuthRegistry +
+
+
wocky_auth_registry_add_handler, function in WockyAuthRegistry
@@ -230,6 +226,10 @@ wocky_auth_registry_success_finish, function in WockyAuthRegistry
+
+wocky_auth_registry_supports_one_of, function in WockyAuthRegistry +
+

B

WockyBareContact, struct in wocky-types @@ -256,10 +256,6 @@
-WockyBareContactPrivate, struct in WockyBareContact -
-
-
wocky_bare_contact_add_group, function in WockyBareContact
@@ -329,10 +325,6 @@
-WockyC2SPorterPrivate, struct in WockyC2SPorter -
-
-
wocky_c2s_porter_enable_power_saving_mode, function in WockyC2SPorter
@@ -353,19 +345,23 @@
-WockyCapsCache, struct in WockyCapsCache +wocky_c2s_porter_send_whitespace_ping_async, function in WockyC2SPorter
-WockyCapsCache:path, object property in WockyCapsCache +wocky_c2s_porter_send_whitespace_ping_finish, function in WockyC2SPorter
-WockyCapsCacheClass, struct in WockyCapsCache +WockyCapsCache, struct in WockyCapsCache +
+
+
+WockyCapsCache:path, object property in WockyCapsCache
-WockyCapsCachePrivate, struct in WockyCapsCache +WockyCapsCacheClass, struct in WockyCapsCache
@@ -405,11 +401,7 @@
-WockyConnectorError, enum in WockyConnector -
-
-
-WockyConnectorPrivate, struct in WockyConnector +WockyConnectorError, enum in WockyConnector
@@ -425,10 +417,6 @@
-wocky_connector_error_get_type, function in wocky-connector-enumtypes -
-
-
wocky_connector_error_quark, function in WockyConnector
@@ -469,14 +457,6 @@
-WockyContactFactoryPrivate, struct in WockyContactFactory -
-
-
-WockyContactPrivate, struct in WockyContact -
-
-
wocky_contact_dup_jid, function in WockyContact
@@ -522,7 +502,7 @@
-WockyDataFormError, enum in WockyDataForm +WockyDataFormError, enum in WockyDataForm
@@ -534,11 +514,7 @@
-WockyDataFormFieldType, enum in WockyDataForm -
-
-
-WockyDataFormPrivate, struct in WockyDataForm +WockyDataFormFieldType, enum in WockyDataForm
@@ -550,10 +526,6 @@
-wocky_data_form_error_get_type, function in wocky-data-form-enumtypes -
-
-
wocky_data_form_error_quark, function in WockyDataForm
@@ -562,10 +534,6 @@
-wocky_data_form_field_type_get_type, function in wocky-data-form-enumtypes -
-
-
wocky_data_form_get_instructions, function in WockyDataForm
@@ -694,10 +662,6 @@
-wocky_disco_identity_get_type, function in WockyDiscoIdentity -
-
-
wocky_disco_identity_new, function in WockyDiscoIdentity
@@ -831,18 +795,6 @@
-WockyJabberAuthDigestPrivate, struct in wocky-jabber-auth-digest -
-
-
-WockyJabberAuthPasswordPrivate, struct in wocky-jabber-auth-password -
-
-
-WockyJabberAuthPrivate, struct in WockyJabberAuth -
-
-
wocky_jabber_auth_add_handler, function in WockyJabberAuth
@@ -875,7 +827,7 @@
-WockyJingleError, enum in wocky-xmpp-error +WockyJingleError, enum in wocky-xmpp-error
@@ -883,10 +835,6 @@
-wocky_jingle_error_get_type, function in wocky-xmpp-error-enumtypes -
-
-
wocky_jingle_error_quark, function in wocky-xmpp-error
@@ -904,10 +852,6 @@
-WockyLLConnectionFactoryPrivate, struct in WockyLLConnectionFactory -
-
-
WockyLLConnectorClass, struct in WockyLLConnector
@@ -916,10 +860,6 @@
-WockyLLConnectorPrivate, struct in WockyLLConnector -
-
-
WockyLLContact, struct in wocky-types
@@ -936,10 +876,6 @@
-WockyLLContactPrivate, struct in WockyLLContact -
-
-
WOCKY_LL_CONNECTION_FACTORY_ERROR, macro in WockyLLConnectionFactory
@@ -1004,10 +940,6 @@
-WockyLoopbackStreamPrivate, struct in WockyLoopbackStream -
-
-
wocky_loopback_stream_new, function in WockyLoopbackStream
@@ -1021,10 +953,6 @@
-WockyMetaPorterPrivate, struct in WockyMetaPorter -
-
-
wocky_meta_porter_borrow_connection, function in WockyMetaPorter
@@ -1065,7 +993,7 @@
-WockyMucAffiliation, enum in WockyMuc +WockyMucAffiliation, enum in WockyMuc
@@ -1073,7 +1001,7 @@
-WockyMucFeature, enum in WockyMuc +WockyMucFeature, enum in WockyMuc
@@ -1081,27 +1009,23 @@
-WockyMucMsgState, enum in WockyMuc +WockyMucMsgState, enum in WockyMuc
-WockyMucMsgType, enum in WockyMuc +WockyMucMsgType, enum in WockyMuc
-WockyMucPrivate, struct in WockyMuc +WockyMucRole, enum in WockyMuc
-WockyMucRole, enum in WockyMuc +WockyMucState, enum in WockyMuc
-WockyMucState, enum in WockyMuc -
-
-
-WockyMucStatusCode, enum in WockyMuc +WockyMucStatusCode, enum in WockyMuc
@@ -1109,10 +1033,6 @@
-wocky_muc_affiliation_get_type, function in wocky-muc-enumtypes -
-
-
wocky_muc_create_presence, function in WockyMuc
@@ -1125,10 +1045,6 @@
-wocky_muc_feature_get_type, function in wocky-muc-enumtypes -
-
-
wocky_muc_get_state, function in WockyMuc
@@ -1153,30 +1069,10 @@
-wocky_muc_msg_state_get_type, function in wocky-muc-enumtypes -
-
-
-wocky_muc_msg_type_get_type, function in wocky-muc-enumtypes -
-
-
wocky_muc_role, function in WockyMuc
-wocky_muc_role_get_type, function in wocky-muc-enumtypes -
-
-
-wocky_muc_state_get_type, function in wocky-muc-enumtypes -
-
-
-wocky_muc_status_code_get_type, function in wocky-muc-enumtypes -
-
-
wocky_muc_user, function in WockyMuc
@@ -1206,10 +1102,6 @@
-WockyNodeTreePrivate, struct in WockyNodeTree -
-
-
wocky_node_add_build, function in WockyNode
@@ -1266,10 +1158,6 @@
-NODE_DEBUG, macro in wocky-debug -
-
-
wocky_node_deinit, function in WockyNode
@@ -1471,10 +1359,6 @@
-WockyPepServicePrivate, struct in WockyPepService -
-
-
wocky_pep_service_get_async, function in WockyPepService
@@ -1499,10 +1383,6 @@
-WockyPingPrivate, struct in WockyPing -
-
-
wocky_ping_error_quark, function in WockyPing
@@ -1639,7 +1519,7 @@
-WockyPubsubAffiliationState, enum in WockyPubsubNode +WockyPubsubAffiliationState, enum in WockyPubsubNode
@@ -1679,19 +1559,11 @@
-WockyPubsubNodePrivate, struct in WockyPubsubNode -
-
-
WockyPubsubServiceClass, struct in WockyPubsubService
-WockyPubsubServiceError, enum in WockyPubsubService -
-
-
-WockyPubsubServicePrivate, struct in WockyPubsubService +WockyPubsubServiceError, enum in WockyPubsubService
@@ -1699,7 +1571,7 @@
-WockyPubsubSubscriptionState, enum in WockyPubsubService +WockyPubsubSubscriptionState, enum in WockyPubsubService
@@ -1711,10 +1583,6 @@
-wocky_pubsub_affiliation_get_type, function in WockyPubsubNode -
-
-
wocky_pubsub_affiliation_list_copy, function in WockyPubsubNode
@@ -1727,10 +1595,6 @@
-wocky_pubsub_affiliation_state_get_type, function in wocky-pubsub-node-enumtypes -
-
-
wocky_pubsub_distill_ambivalent_iq_reply, function in wocky-pubsub-helpers
@@ -1883,10 +1747,6 @@
-wocky_pubsub_service_error_get_type, function in wocky-pubsub-service-enumtypes -
-
-
wocky_pubsub_service_error_quark, function in WockyPubsubService
@@ -1939,10 +1799,6 @@
-wocky_pubsub_subscription_get_type, function in WockyPubsubService -
-
-
wocky_pubsub_subscription_list_copy, function in WockyPubsubService
@@ -1954,10 +1810,6 @@ wocky_pubsub_subscription_new, function in WockyPubsubService
-
-wocky_pubsub_subscription_state_get_type, function in wocky-pubsub-service-enumtypes -
-

R

WockyResourceContact, struct in wocky-types @@ -1976,10 +1828,6 @@
-WockyResourceContactPrivate, struct in WockyResourceContact -
-
-
wocky_resource_contact_equal, function in WockyResourceContact
@@ -2004,10 +1852,6 @@
-WockyRosterPrivate, struct in WockyRoster -
-
-
WockyRosterSubscriptionFlags, enum in WockyRoster
@@ -2089,22 +1933,6 @@
-WockySaslAuthPrivate, struct in WockySaslAuth -
-
-
-WockySaslDigestMd5Private, struct in wocky-sasl-digest-md5 -
-
-
-WockySaslPlainPrivate, struct in wocky-sasl-plain -
-
-
-WockySaslScramPrivate, struct in wocky-sasl-scram -
-
-
wocky_sasl_auth_add_handler, function in WockySaslAuth
@@ -2165,10 +1993,6 @@
-WockySessionPrivate, struct in WockySession -
-
-
wocky_session_get_contact_factory, function in WockySession
@@ -2205,7 +2029,7 @@
-WockySIError, enum in wocky-xmpp-error +WockySIError, enum in wocky-xmpp-error
@@ -2213,10 +2037,6 @@
-wocky_si_error_get_type, function in wocky-xmpp-error-enumtypes -
-
-
wocky_si_error_quark, function in wocky-xmpp-error
@@ -2225,10 +2045,6 @@
-WockyStanzaPrivate, struct in WockyStanza -
-
-
WockyStanzaSubType, enum in WockyStanza
@@ -2338,11 +2154,11 @@
-WockyTLSCertStatus, enum in Wocky GnuTLS TLS +WockyTLSCertStatus, enum in Wocky GnuTLS TLS
-WockyTLSCertType, enum in Wocky GnuTLS TLS +WockyTLSCertType, enum in Wocky GnuTLS TLS
@@ -2358,18 +2174,10 @@
-WockyTLSConnectorPrivate, struct in WockyTLSConnector -
-
-
WockyTLSHandlerClass, struct in WockyTLSHandler
-WockyTLSHandlerPrivate, struct in WockyTLSHandler -
-
-
WockyTLSHandlerVerifyAsyncFunc, user_function in WockyTLSHandler
@@ -2402,7 +2210,7 @@
-WockyTLSVerificationLevel, enum in Wocky GnuTLS TLS +WockyTLSVerificationLevel, enum in Wocky GnuTLS TLS
@@ -2414,22 +2222,6 @@
-wocky_tls_cert_status_get_type, function in wocky-tls-enumtypes -
-
-
-wocky_tls_cert_type_get_type, function in wocky-tls-enumtypes -
-
-
-WOCKY_TLS_CONNECTION, macro in Wocky GnuTLS TLS -
-
-
-wocky_tls_connection_get_type, function in Wocky GnuTLS TLS -
-
-
wocky_tls_connector_new, function in WockyTLSConnector
@@ -2478,10 +2270,6 @@
-WOCKY_TLS_SESSION, macro in Wocky GnuTLS TLS -
-
-
wocky_tls_session_add_ca, function in Wocky GnuTLS TLS
@@ -2494,10 +2282,6 @@
-wocky_tls_session_get_type, function in Wocky GnuTLS TLS -
-
-
wocky_tls_session_handshake, function in Wocky GnuTLS TLS
@@ -2521,126 +2305,6 @@ wocky_tls_session_verify_peer, function in Wocky GnuTLS TLS
-
-wocky_tls_verification_level_get_type, function in wocky-tls-enumtypes -
-
-
-WOCKY_TYPE_AUTH_ERROR, macro in wocky-auth-registry-enumtypes -
-
-
-WOCKY_TYPE_CONNECTOR_ERROR, macro in wocky-connector-enumtypes -
-
-
-WOCKY_TYPE_DATA_FORM_ERROR, macro in wocky-data-form-enumtypes -
-
-
-WOCKY_TYPE_DATA_FORM_FIELD_TYPE, macro in wocky-data-form-enumtypes -
-
-
-WOCKY_TYPE_DISCO_IDENTITY, macro in WockyDiscoIdentity -
-
-
-WOCKY_TYPE_JINGLE_ERROR, macro in wocky-xmpp-error-enumtypes -
-
-
-WOCKY_TYPE_MUC_AFFILIATION, macro in wocky-muc-enumtypes -
-
-
-WOCKY_TYPE_MUC_FEATURE, macro in wocky-muc-enumtypes -
-
-
-WOCKY_TYPE_MUC_MSG_STATE, macro in wocky-muc-enumtypes -
-
-
-WOCKY_TYPE_MUC_MSG_TYPE, macro in wocky-muc-enumtypes -
-
-
-WOCKY_TYPE_MUC_ROLE, macro in wocky-muc-enumtypes -
-
-
-WOCKY_TYPE_MUC_STATE, macro in wocky-muc-enumtypes -
-
-
-WOCKY_TYPE_MUC_STATUS_CODE, macro in wocky-muc-enumtypes -
-
-
-WOCKY_TYPE_PUBSUB_AFFILIATION, macro in WockyPubsubNode -
-
-
-WOCKY_TYPE_PUBSUB_AFFILIATION_STATE, macro in wocky-pubsub-node-enumtypes -
-
-
-WOCKY_TYPE_PUBSUB_SERVICE_ERROR, macro in wocky-pubsub-service-enumtypes -
-
-
-WOCKY_TYPE_PUBSUB_SUBSCRIPTION, macro in WockyPubsubService -
-
-
-WOCKY_TYPE_PUBSUB_SUBSCRIPTION_STATE, macro in wocky-pubsub-service-enumtypes -
-
-
-WOCKY_TYPE_SI_ERROR, macro in wocky-xmpp-error-enumtypes -
-
-
-WOCKY_TYPE_TLS_CERT_STATUS, macro in wocky-tls-enumtypes -
-
-
-WOCKY_TYPE_TLS_CERT_TYPE, macro in wocky-tls-enumtypes -
-
-
-WOCKY_TYPE_TLS_CONNECTION, macro in Wocky GnuTLS TLS -
-
-
-WOCKY_TYPE_TLS_SESSION, macro in Wocky GnuTLS TLS -
-
-
-WOCKY_TYPE_TLS_VERIFICATION_LEVEL, macro in wocky-tls-enumtypes -
-
-
-WOCKY_TYPE_XMPP_ERROR, macro in wocky-xmpp-error-enumtypes -
-
-
-WOCKY_TYPE_XMPP_ERROR_TYPE, macro in wocky-xmpp-error-enumtypes -
-
-
-WOCKY_TYPE_XMPP_READER_ERROR, macro in wocky-xmpp-reader-enumtypes -
-
-
-WOCKY_TYPE_XMPP_READER_STATE, macro in wocky-xmpp-reader-enumtypes -
-
-
-WOCKY_TYPE_XMPP_STREAM_ERROR, macro in wocky-xmpp-error-enumtypes -
-

W

WOCKY_W3C_NS_XHTML, macro in wocky-namespaces @@ -2672,11 +2336,7 @@
-WockyXmppConnectionPrivate, struct in WockyXmppConnection -
-
-
-WockyXmppError, enum in wocky-xmpp-error +WockyXmppError, enum in wocky-xmpp-error
@@ -2688,7 +2348,7 @@
-WockyXmppErrorType, enum in wocky-xmpp-error +WockyXmppErrorType, enum in wocky-xmpp-error
@@ -2696,19 +2356,15 @@
-WockyXmppReaderError, enum in WockyXmppReader +WockyXmppReaderError, enum in WockyXmppReader
-WockyXmppReaderPrivate, struct in WockyXmppReader +WockyXmppReaderState, enum in WockyXmppReader
-WockyXmppReaderState, enum in WockyXmppReader -
-
-
-WockyXmppStreamError, enum in wocky-xmpp-error +WockyXmppStreamError, enum in wocky-xmpp-error
@@ -2716,10 +2372,6 @@
-WockyXmppWriterPrivate, struct in WockyXmppWriter -
-
-
WOCKY_XMPP_CONNECTION_ERROR, macro in WockyXmppConnection
@@ -2788,6 +2440,14 @@
+wocky_xmpp_connection_send_whitespace_ping_async, function in WockyXmppConnection +
+
+
+wocky_xmpp_connection_send_whitespace_ping_finish, function in WockyXmppConnection +
+
+
WOCKY_XMPP_ERROR, macro in wocky-xmpp-error
@@ -2804,10 +2464,6 @@
-wocky_xmpp_error_get_type, function in wocky-xmpp-error-enumtypes -
-
-
wocky_xmpp_error_init, function in wocky-xmpp-error
@@ -2824,10 +2480,6 @@
-wocky_xmpp_error_type_get_type, function in wocky-xmpp-error-enumtypes -
-
-
WOCKY_XMPP_NS_AMP, macro in wocky-namespaces
@@ -2856,6 +2508,10 @@
+WOCKY_XMPP_NS_IQ_OOB, macro in wocky-namespaces +
+
+
WOCKY_XMPP_NS_JABBER_CLIENT, macro in wocky-namespaces
@@ -2888,10 +2544,6 @@
-WOCKY_XMPP_NS_OOB, macro in wocky-namespaces -
-
-
WOCKY_XMPP_NS_PING, macro in wocky-namespaces
@@ -2952,11 +2604,11 @@
-WOCKY_XMPP_READER_ERROR, macro in WockyXmppReader +WOCKY_XMPP_NS_X_OOB, macro in wocky-namespaces
-wocky_xmpp_reader_error_get_type, function in wocky-xmpp-reader-enumtypes +WOCKY_XMPP_READER_ERROR, macro in WockyXmppReader
@@ -2996,10 +2648,6 @@
-wocky_xmpp_reader_state_get_type, function in wocky-xmpp-reader-enumtypes -
-
-
wocky_xmpp_stanza_error_to_string, function in wocky-xmpp-error
@@ -3012,10 +2660,6 @@
-wocky_xmpp_stream_error_get_type, function in wocky-xmpp-error-enumtypes -
-
-
wocky_xmpp_stream_error_quark, function in wocky-xmpp-error
@@ -3050,6 +2694,6 @@
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/ch01.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/ch01.html --- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/ch01.html 2011-05-03 13:29:41.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/ch01.html 2011-11-16 10:28:01.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -21,7 +21,7 @@

-API Reference

+API Reference
WockyAuthHandler @@ -199,6 +199,6 @@
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/index.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/index.html --- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/index.html 2011-05-03 13:29:41.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/index.html 2011-11-16 10:28:01.000000000 +0000 @@ -6,7 +6,7 @@ - + @@ -198,6 +198,6 @@
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/index.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/index.sgml --- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/index.sgml 2011-05-03 13:29:38.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/index.sgml 2011-11-16 10:28:01.000000000 +0000 @@ -2,31 +2,33 @@ - + + - - + - + - - - - + + + + + + @@ -38,66 +40,63 @@ - - - - - - - + + + + + + - - - + + + + + - - - - - + - - - + + + - + + + + + + - + - - - - - + - - - - - + + + + - - - - + + + + @@ -106,33 +105,32 @@ - - - - + + + - - - + - + + + @@ -160,57 +158,55 @@ - - - - - + + + + - - - + - - - - - + - + + + + - + - - - - - - + - + + + + + + + + @@ -222,51 +218,42 @@ - - - - - + - - + + + - + + - - - - - - - + + + + - - - - + - + - - - - - + + + + - + @@ -289,117 +276,72 @@ - - - - - - - + + + + + - - + - - - - - + + + - - + - - + + - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + @@ -418,96 +360,122 @@ - - - - - - + + - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + - + - - + + + + + - - - - - + + + + + + - - - - - + + - - - - - - - - - - - + + + + + + + + + + + + @@ -516,182 +484,173 @@ - + + + + + + + + + + + + + + + + - + + + - - - - - - - - - - - - - - - - + + + - - - - - - - - - - + - - - - + - - + + + + + + + + + + - - - + - - - + + - + - + + + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + - - + - - + + - - - - - + + + + + - - - + - - - - - - - - - - - - + + - - - - + + + + + + + + + + - - - + + + + @@ -699,178 +658,150 @@ - - - + - + - + + + - - - - - + - - - - + + + + + + + + + + - + + + - - - - - - - - - - - - + + + + - - - - - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + - - + + + + + + + + - - - + - - + - - + + + - - - - - + - - - - - - - - - - - - - - @@ -889,26 +820,39 @@ - - - + + + + + + + + + + + + + + - - - - - - - + + + + + - + - + + + + + - + @@ -917,111 +861,99 @@ - - - - - - - - - + + - - - - - - - - - - - - + + + + + + + + + - - - - + + - + - - - - - + + + - - - + + + + + + + + + + - - - - - - - + + - - - - - - - - - + + + + + + + + + @@ -1029,55 +961,50 @@ - - + + - - + - - + - - - - - + + + + + + - - - - - - - - - - - - + + - - - - - - - + + + + + + + + + + + + + @@ -1100,24 +1027,15 @@ - - - - - - - - - - - - - - - - - + + + + + + + + @@ -1143,64 +1061,61 @@ - - - - - + + - + + - + + + + + + - - - - - + + - + + + + - - - - + + - - - - + + - + - - + - - + diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/object-tree.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/object-tree.html --- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/object-tree.html 2011-05-03 13:29:41.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/object-tree.html 2011-11-16 10:28:01.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -48,7 +48,6 @@ WockyMucMsgType WockyMucRole WockyMucState - WockyMucStatusCode WockyPubsubAffiliationState WockyPubsubServiceError WockyPubsubSubscriptionState @@ -67,10 +66,11 @@ WockyPubsubSubscription GFlags WockyMucFeature + WockyMucStatusCode
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/WockyAuthRegistry.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/WockyAuthRegistry.html --- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/WockyAuthRegistry.html 2011-05-03 13:29:41.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/WockyAuthRegistry.html 2011-11-16 10:28:01.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -39,14 +39,27 @@

Synopsis

-
GQuark              wocky_auth_error_quark              (void);
-#define             WOCKY_AUTH_ERROR
-enum                WockyAuthError;
+
#define             WOCKY_AUTH_ERROR
 #define             WOCKY_AUTH_MECH_JABBER_DIGEST
 #define             WOCKY_AUTH_MECH_JABBER_PASSWORD
 #define             WOCKY_AUTH_MECH_SASL_DIGEST_MD5
 #define             WOCKY_AUTH_MECH_SASL_PLAIN
-                    WockyAuthRegistryStartData;
+#define             WOCKY_AUTH_MECH_SASL_SCRAM_SHA_1
+enum                WockyAuthError;
+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);
+struct              WockyAuthRegistryClass;
+void                (*WockyAuthRegistryFailureFunc)     (WockyAuthRegistry *self,
+                                                         GError *error);
 void                (*WockyAuthRegistryStartAuthAsyncFunc)
                                                         (WockyAuthRegistry *self,
                                                          const GSList *mechanisms,
@@ -63,28 +76,29 @@
                                                          GAsyncResult *result,
                                                          WockyAuthRegistryStartData **start_data,
                                                          GError **error);
-void                (*WockyAuthRegistryChallengeAsyncFunc)
+                    WockyAuthRegistryStartData;
+void                (*WockyAuthRegistrySuccessAsyncFunc)
                                                         (WockyAuthRegistry *self,
-                                                         const GString *challenge_data,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);
-gboolean            (*WockyAuthRegistryChallengeFinishFunc)
+gboolean            (*WockyAuthRegistrySuccessFinishFunc)
                                                         (WockyAuthRegistry *self,
                                                          GAsyncResult *result,
-                                                         GString **response,
                                                          GError **error);
-void                (*WockyAuthRegistrySuccessAsyncFunc)
-                                                        (WockyAuthRegistry *self,
+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            (*WockyAuthRegistrySuccessFinishFunc)
+gboolean            wocky_auth_registry_challenge_finish
                                                         (WockyAuthRegistry *self,
-                                                         GAsyncResult *result,
+                                                         GAsyncResult *res,
+                                                         GString **response,
                                                          GError **error);
-void                (*WockyAuthRegistryFailureFunc)     (WockyAuthRegistry *self,
+void                wocky_auth_registry_failure         (WockyAuthRegistry *self,
                                                          GError *error);
-struct              WockyAuthRegistry;
-struct              WockyAuthRegistryClass;
 WockyAuthRegistry * wocky_auth_registry_new             (void);
 void                wocky_auth_registry_start_auth_async
                                                         (WockyAuthRegistry *self,
@@ -102,32 +116,21 @@
                                                          GAsyncResult *result,
                                                          WockyAuthRegistryStartData **start_data,
                                                          GError **error);
-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);
+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);
 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);
-void                wocky_auth_registry_add_handler     (WockyAuthRegistry *self,
-                                                         WockyAuthHandler *handler);
-void                wocky_auth_registry_start_data_free (WockyAuthRegistryStartData *start_data);
-WockyAuthRegistryStartData *  wocky_auth_registry_start_data_new
-                                                        (const gchar *mechanism,
-                                                         const GString *initial_response);
-WockyAuthRegistryStartData *  wocky_auth_registry_start_data_dup
-                                                        (WockyAuthRegistryStartData *start_data);
-void                wocky_auth_registry_failure         (WockyAuthRegistry *self,
-                                                         GError *error);
-                    WockyAuthRegistryPrivate;
+gboolean            wocky_auth_registry_supports_one_of (WockyAuthRegistry *self,
+                                                         const GSList *mechanisms,
+                                                         gboolean allow_plain);
@@ -149,23 +152,53 @@

Details

-

wocky_auth_error_quark ()

-
GQuark              wocky_auth_error_quark              (void);
+

WOCKY_AUTH_ERROR

+
#define             WOCKY_AUTH_ERROR

-

WOCKY_AUTH_ERROR

-
#define             WOCKY_AUTH_ERROR
+

WOCKY_AUTH_MECH_JABBER_DIGEST

+
#define WOCKY_AUTH_MECH_JABBER_DIGEST "X-WOCKY-JABBER-DIGEST"
+
+

+

+
+
+
+

WOCKY_AUTH_MECH_JABBER_PASSWORD

+
#define WOCKY_AUTH_MECH_JABBER_PASSWORD "X-WOCKY-JABBER-PASSWORD"
+
+

+

+
+
+
+

WOCKY_AUTH_MECH_SASL_DIGEST_MD5

+
#define WOCKY_AUTH_MECH_SASL_DIGEST_MD5 "DIGEST-MD5"
+
+

+

+
+
+
+

WOCKY_AUTH_MECH_SASL_PLAIN

+
#define WOCKY_AUTH_MECH_SASL_PLAIN "PLAIN"
+

-

enum WockyAuthError

-
typedef enum
-{
+
WOCKY_AUTH_MECH_SASL_SCRAM_SHA_1

+
#define WOCKY_AUTH_MECH_SASL_SCRAM_SHA_1 "SCRAM-SHA-1"
+

+
+
+
+

enum WockyAuthError

+
typedef enum {
   WOCKY_AUTH_ERROR_INIT_FAILED,
   WOCKY_AUTH_ERROR_NOT_SUPPORTED,
   WOCKY_AUTH_ERROR_NO_SUPPORTED_MECHANISMS,
@@ -251,57 +284,174 @@
-

WOCKY_AUTH_MECH_JABBER_DIGEST

-
#define WOCKY_AUTH_MECH_JABBER_DIGEST "X-WOCKY-JABBER-DIGEST"
-
+

struct WockyAuthRegistry

+
struct WockyAuthRegistry;

-

WOCKY_AUTH_MECH_JABBER_PASSWORD

-
#define WOCKY_AUTH_MECH_JABBER_PASSWORD "X-WOCKY-JABBER-PASSWORD"
-
+

WockyAuthRegistryChallengeAsyncFunc ()

+
void                (*WockyAuthRegistryChallengeAsyncFunc)
+                                                        (WockyAuthRegistry *self,
+                                                         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.

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

self :

a WockyAuthRegistry object

challenge_data :

the challenge data string

callback :

a callback to call when finished

user_data :

data to pass to callback +
-

WOCKY_AUTH_MECH_SASL_DIGEST_MD5

-
#define WOCKY_AUTH_MECH_SASL_DIGEST_MD5 "DIGEST-MD5"
-
+

WockyAuthRegistryChallengeFinishFunc ()

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

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

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

self :

a WockyAuthRegistry object

result :

a GAsyncResult object

response :

a location to be filled with the response string

error :

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

Returns :

 +TRUE on success, otherwise FALSE +
-

WOCKY_AUTH_MECH_SASL_PLAIN

-
#define WOCKY_AUTH_MECH_SASL_PLAIN "PLAIN"
+
struct WockyAuthRegistryClass

+
struct WockyAuthRegistryClass {
+  WockyAuthRegistryStartAuthAsyncFunc start_auth_async_func;
+  WockyAuthRegistryStartAuthFinishFunc start_auth_finish_func;
+
+  WockyAuthRegistryChallengeAsyncFunc challenge_async_func;
+  WockyAuthRegistryChallengeFinishFunc challenge_finish_func;
+
+  WockyAuthRegistrySuccessAsyncFunc success_async_func;
+  WockyAuthRegistrySuccessFinishFunc success_finish_func;
+
+  WockyAuthRegistryFailureFunc failure_func;
+};
 

 

+The class of a WockyAuthRegistry.
 

+

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


WockyAuthRegistryStartAuthAsyncFunc start_auth_async_func;
a function to call to start an asynchronous
+start auth operation; see wocky_auth_registry_start_auth_async() for
+more details.
WockyAuthRegistryStartAuthFinishFunc start_auth_finish_func;
a function to call to finish an
+asynchronous start auth operation; see
+wocky_auth_registry_start_auth_finish() for more details.
WockyAuthRegistryChallengeAsyncFunc challenge_async_func;
a function to call to start an asynchronous
+challenge operation; see wocky_auth_registry_challenge_async() for
+more details.
WockyAuthRegistryChallengeFinishFunc challenge_finish_func;
a function to call to finish an asynchronous
+challenge operation; see wocky_auth_registry_challenge_finish() for
+more details.
WockyAuthRegistrySuccessAsyncFunc success_async_func;
a function to call to start an asynchronous
+success operation; see wocky_auth_registry_success_async() for
+more details.
WockyAuthRegistrySuccessFinishFunc success_finish_func;
a function to call to finish an asynchronous
+success operation; see wocky_auth_registry_success_finish() for
+more details.
WockyAuthRegistryFailureFunc failure_func;
a function to call on failure; see
+wocky_auth_registry_failure() for more details.
-

WockyAuthRegistryStartData

-
typedef struct {
-  gchar *mechanism;
-  GString *initial_response;
-} WockyAuthRegistryStartData;
-
+

WockyAuthRegistryFailureFunc ()

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

-A structure to hold the mechanism and response data. +Notifies the client of a server-side error. By default this is not +implemented.

- - + + - - + +

gchar *mechanism;

the name of the mechanism

self :

a WockyAuthRegistry object

GString *initial_response;

the data in the response

error :

a GError describing the failure
@@ -421,78 +571,25 @@
-

WockyAuthRegistryChallengeAsyncFunc ()

-
void                (*WockyAuthRegistryChallengeAsyncFunc)
-                                                        (WockyAuthRegistry *self,
-                                                         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. -

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

self :

a WockyAuthRegistry object

challenge_data :

the challenge data string

callback :

a callback to call when finished

user_data :

data to pass to callback -
-
-
-
-

WockyAuthRegistryChallengeFinishFunc ()

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

WockyAuthRegistryStartData

+
typedef struct {
+  gchar *mechanism;
+  GString *initial_response;
+} WockyAuthRegistryStartData;
+

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

- - - - - - - - - - - - - - + + - - + +

self :

a WockyAuthRegistry object

result :

a GAsyncResult object

response :

a location to be filled with the response string

error :

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

gchar *mechanism;

the name of the mechanism

Returns :

 -TRUE on success, otherwise FALSE -

GString *initial_response;

the data in the response
@@ -567,99 +664,47 @@
-

WockyAuthRegistryFailureFunc ()

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

wocky_auth_error_quark ()

+
GQuark              wocky_auth_error_quark              (void);

-Notifies the client of a server-side error. By default this is not -implemented.

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

self :

a WockyAuthRegistry object

error :

a GError describing the failure
-

struct WockyAuthRegistry

-
struct WockyAuthRegistry;
+

wocky_auth_registry_add_handler ()

+
void                wocky_auth_registry_add_handler     (WockyAuthRegistry *self,
+                                                         WockyAuthHandler *handler);

-

struct WockyAuthRegistryClass

-
struct WockyAuthRegistryClass {
-  WockyAuthRegistryStartAuthAsyncFunc start_auth_async_func;
-  WockyAuthRegistryStartAuthFinishFunc start_auth_finish_func;
-
-  WockyAuthRegistryChallengeAsyncFunc challenge_async_func;
-  WockyAuthRegistryChallengeFinishFunc challenge_finish_func;
-
-  WockyAuthRegistrySuccessAsyncFunc success_async_func;
-  WockyAuthRegistrySuccessFinishFunc success_finish_func;
-
-  WockyAuthRegistryFailureFunc failure_func;
-};
-
+

wocky_auth_registry_challenge_async ()

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

+

+
+
+
+

wocky_auth_registry_challenge_finish ()

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

+

+
+
+
+

wocky_auth_registry_failure ()

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

-The class of a WockyAuthRegistry.

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

WockyAuthRegistryStartAuthAsyncFunc start_auth_async_func;

a function to call to start an asynchronous -start auth operation; see wocky_auth_registry_start_auth_async() for -more details.

WockyAuthRegistryStartAuthFinishFunc start_auth_finish_func;

a function to call to finish an -asynchronous start auth operation; see -wocky_auth_registry_start_auth_finish() for more details.

WockyAuthRegistryChallengeAsyncFunc challenge_async_func;

a function to call to start an asynchronous -challenge operation; see wocky_auth_registry_challenge_async() for -more details.

WockyAuthRegistryChallengeFinishFunc challenge_finish_func;

a function to call to finish an asynchronous -challenge operation; see wocky_auth_registry_challenge_finish() for -more details.

WockyAuthRegistrySuccessAsyncFunc success_async_func;

a function to call to start an asynchronous -success operation; see wocky_auth_registry_success_async() for -more details.

WockyAuthRegistrySuccessFinishFunc success_finish_func;

a function to call to finish an asynchronous -success operation; see wocky_auth_registry_success_finish() for -more details.

WockyAuthRegistryFailureFunc failure_func;

a function to call on failure; see -wocky_auth_registry_failure() for more details.
@@ -698,48 +743,9 @@
-

wocky_auth_registry_challenge_async ()

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

-

-
-
-
-

wocky_auth_registry_challenge_finish ()

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

-

-
-
-
-

wocky_auth_registry_success_async ()

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

-

-
-
-
-

wocky_auth_registry_success_finish ()

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

-

-
-
-
-

wocky_auth_registry_add_handler ()

-
void                wocky_auth_registry_add_handler     (WockyAuthRegistry *self,
-                                                         WockyAuthHandler *handler);
+

wocky_auth_registry_start_data_dup ()

+
WockyAuthRegistryStartData * wocky_auth_registry_start_data_dup
+                                                        (WockyAuthRegistryStartData *start_data);

@@ -753,7 +759,7 @@

wocky_auth_registry_start_data_new ()

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

 

@@ -761,31 +767,33 @@
-

wocky_auth_registry_start_data_dup ()

-
WockyAuthRegistryStartData *  wocky_auth_registry_start_data_dup
-                                                        (WockyAuthRegistryStartData *start_data);
+

wocky_auth_registry_success_async ()

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

-

wocky_auth_registry_failure ()

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

wocky_auth_registry_success_finish ()

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

-

WockyAuthRegistryPrivate

-
typedef struct _WockyAuthRegistryPrivate WockyAuthRegistryPrivate;
-

-

+

wocky_auth_registry_supports_one_of ()

+
gboolean            wocky_auth_registry_supports_one_of (WockyAuthRegistry *self,
+                                                         const GSList *mechanisms,
+                                                         gboolean allow_plain);
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/WockyBareContact.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/WockyBareContact.html --- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/WockyBareContact.html 2011-05-03 13:29:41.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/WockyBareContact.html 2011-11-16 10:28:01.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,32 +41,31 @@ #include <wocky/wocky-bare-contact.h> struct WockyBareContactClass; -WockyBareContact * wocky_bare_contact_new (const gchar *jid); +void wocky_bare_contact_add_group (WockyBareContact *contact, + 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, + 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); -void wocky_bare_contact_set_name (WockyBareContact *contact, - const gchar *name); -WockyRosterSubscriptionFlags wocky_bare_contact_get_subscription +GSList * wocky_bare_contact_get_resources (WockyBareContact *contact); +WockyRosterSubscriptionFlags wocky_bare_contact_get_subscription (WockyBareContact *contact); -void wocky_bare_contact_set_subscription (WockyBareContact *contact, - WockyRosterSubscriptionFlags subscription); -const gchar * const * wocky_bare_contact_get_groups (WockyBareContact *contact); -void wocky_bare_contact_set_groups (WockyBareContact *contact, - gchar **groups); -gboolean wocky_bare_contact_equal (WockyBareContact *a, - WockyBareContact *b); -void wocky_bare_contact_add_group (WockyBareContact *contact, - const gchar *group); 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); -WockyBareContact * wocky_bare_contact_copy (WockyBareContact *contact); -void wocky_bare_contact_debug_print (WockyBareContact *contact); -void wocky_bare_contact_add_resource (WockyBareContact *contact, - WockyResourceContact *resource); -GSList * wocky_bare_contact_get_resources (WockyBareContact *contact); - WockyBareContactPrivate; +void wocky_bare_contact_set_groups (WockyBareContact *contact, + gchar **groups); +void wocky_bare_contact_set_name (WockyBareContact *contact, + const gchar *name); +void wocky_bare_contact_set_subscription (WockyBareContact *contact, + WockyRosterSubscriptionFlags subscription);
@@ -89,32 +88,34 @@
-

wocky_bare_contact_new ()

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

wocky_bare_contact_add_group ()

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

-Creates a new WockyBareContact for a given JID. +Adds group to contact's groups.

- - + + - - + +

jid :

the JID of the contact to create

contact :

a WockyBareContact instance

Returns :

a newly constructed WockyBareContact -

group :

a group
-

wocky_bare_contact_get_jid ()

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

wocky_bare_contact_add_resource ()

+
void                wocky_bare_contact_add_resource     (WockyBareContact *contact,
+                                                         WockyResourceContact *resource);

-Returns the JID of the contact wrapped by contact. +Adds resource to the contact's resources. +The WockyBareContact instance doesn't assume a reference to resource.

@@ -124,89 +125,84 @@ - - + +
a WockyBareContact instance

Returns :

 -contact's JID.

resource :

a WockyResourceContact instance
-

wocky_bare_contact_get_name ()

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

wocky_bare_contact_copy ()

+
WockyBareContact *  wocky_bare_contact_copy             (WockyBareContact *contact);

-Returns the name of the contact wrapped by contact. +Convenience function to obtain a copy of the given WockyBareContact.

- + - +

contact :

 -WockyBareContact instancea WockyBareContact instance

Returns :

 -contact's namea newly created WockyBareContact which is a copy of the given +one.
-

wocky_bare_contact_set_name ()

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

wocky_bare_contact_debug_print ()

+
void                wocky_bare_contact_debug_print      (WockyBareContact *contact);

-Sets contact's name to name. +Prints debug information for the given WockyBareContact.

- - + - - - - - - +

contact :

 a WockyBareContact instance

name :

the name to set contact -
-

wocky_bare_contact_get_subscription ()

-
WockyRosterSubscriptionFlags  wocky_bare_contact_get_subscription
-                                                        (WockyBareContact *contact);
+

wocky_bare_contact_equal ()

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

-Gets the subscription type contact has. +Compares whether two WockyBareContact instances refer to the same +roster item.

- + + + + + +TRUE if the two contacts match.

contact :

a :

 a WockyBareContact instance

b :

a WockyBareContact instance to compare with a +

Returns :

 -contact's subscription.
-

wocky_bare_contact_set_subscription ()

-
void                wocky_bare_contact_set_subscription (WockyBareContact *contact,
-                                                         WockyRosterSubscriptionFlags subscription);
+

wocky_bare_contact_get_groups ()

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

-Sets the subscription of contact. +Returns the list of the groups of contact.

@@ -216,18 +212,18 @@ - - + +
a WockyBareContact instance

subscription :

the new subscription type

Returns :

a list of contact's groups
-

wocky_bare_contact_get_groups ()

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

wocky_bare_contact_get_jid ()

+
const gchar *       wocky_bare_contact_get_jid          (WockyBareContact *contact);

-Returns the list of the groups of contact. +Returns the JID of the contact wrapped by contact.

@@ -238,69 +234,64 @@ - +

Returns :

a list of contact's groups +contact's JID.
-

wocky_bare_contact_set_groups ()

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

wocky_bare_contact_get_name ()

+
const gchar *       wocky_bare_contact_get_name         (WockyBareContact *contact);

-Sets contact's groups. +Returns the name of the contact wrapped by contact.

- + - - + +

contact :

a WockyBareContact instance +WockyBareContact instance

groups :

a list of groups

Returns :

 +contact's name
-

wocky_bare_contact_equal ()

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

wocky_bare_contact_get_resources ()

+
GSList *            wocky_bare_contact_get_resources    (WockyBareContact *contact);

-Compares whether two WockyBareContact instances refer to the same -roster item. +Gets a GSList of all the contact's resources. +You should call g_slist_free on the list when done with it.

- + - - - - - +

a :

contact :

 a WockyBareContact instance

b :

a WockyBareContact instance to compare with a -

Returns :

 -TRUE if the two contacts match.a GSList of WockyResourceContact objects.
-

wocky_bare_contact_add_group ()

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

wocky_bare_contact_get_subscription ()

+
WockyRosterSubscriptionFlags wocky_bare_contact_get_subscription
+                                                        (WockyBareContact *contact);

-Adds group to contact's groups. +Gets the subscription type contact has.

@@ -310,8 +301,9 @@ - - + +
a WockyBareContact instance

group :

a group

Returns :

 +contact's subscription.
@@ -345,32 +337,33 @@
-

wocky_bare_contact_remove_group ()

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

wocky_bare_contact_new ()

+
WockyBareContact *  wocky_bare_contact_new              (const gchar *jid);

-Removes group from the contact's groups. +Creates a new WockyBareContact for a given JID.

- - + + - - + +

contact :

a WockyBareContact instance

jid :

the JID of the contact to create

group :

a group

Returns :

a newly constructed WockyBareContact +
-

wocky_bare_contact_copy ()

-
WockyBareContact *  wocky_bare_contact_copy             (WockyBareContact *contact);
+

wocky_bare_contact_remove_group ()

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

-Convenience function to obtain a copy of the given WockyBareContact. +Removes group from the contact's groups.

@@ -380,36 +373,41 @@ - - + +
a WockyBareContact instance

Returns :

a newly created WockyBareContact which is a copy of the given -one.

group :

a group
-

wocky_bare_contact_debug_print ()

-
void                wocky_bare_contact_debug_print      (WockyBareContact *contact);
+

wocky_bare_contact_set_groups ()

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

-Prints debug information for the given WockyBareContact. +Sets contact's groups.

- + + - + + + + + +

contact :

 a WockyBareContact instance

groups :

a list of groups
-

wocky_bare_contact_add_resource ()

-
void                wocky_bare_contact_add_resource     (WockyBareContact *contact,
-                                                         WockyResourceContact *resource);
+

wocky_bare_contact_set_name ()

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

-Adds resource to the contact's resources. -The WockyBareContact instance doesn't assume a reference to resource. +Sets contact's name to name.

@@ -419,19 +417,20 @@ - - + +
a WockyBareContact instance

resource :

a WockyResourceContact instance

name :

the name to set contact +
-

wocky_bare_contact_get_resources ()

-
GSList *            wocky_bare_contact_get_resources    (WockyBareContact *contact);
+

wocky_bare_contact_set_subscription ()

+
void                wocky_bare_contact_set_subscription (WockyBareContact *contact,
+                                                         WockyRosterSubscriptionFlags subscription);

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

@@ -441,23 +440,16 @@ - - + +
a WockyBareContact instance

Returns :

a GSList of WockyResourceContact objects.

subscription :

the new subscription type
-
-
-

WockyBareContactPrivate

-
typedef struct _WockyBareContactPrivate WockyBareContactPrivate;
-

-

-
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/WockyCapsCache.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/WockyCapsCache.html --- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/WockyCapsCache.html 2011-05-03 13:29:41.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/WockyCapsCache.html 2011-11-16 10:28:01.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -43,15 +43,14 @@

Synopsis

struct              WockyCapsCache;
 struct              WockyCapsCacheClass;
-WockyNodeTree *     wocky_caps_cache_lookup             (WockyCapsCache *self,
-                                                         const gchar *node);
+WockyCapsCache *    wocky_caps_cache_dup_shared         (void);
+void                wocky_caps_cache_free_shared        (void);
 void                wocky_caps_cache_insert             (WockyCapsCache *self,
                                                          const gchar *node,
                                                          WockyNodeTree *query_node);
+WockyNodeTree *     wocky_caps_cache_lookup             (WockyCapsCache *self,
+                                                         const gchar *node);
 WockyCapsCache *    wocky_caps_cache_new                (const gchar *path);
-WockyCapsCache *    wocky_caps_cache_dup_shared         (void);
-void                wocky_caps_cache_free_shared        (void);
-                    WockyCapsCachePrivate;
@@ -93,35 +92,38 @@
-

wocky_caps_cache_lookup ()

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

wocky_caps_cache_dup_shared ()

+
WockyCapsCache *    wocky_caps_cache_dup_shared         (void);

-Look up node in the caps cache self. The caller is responsible -for unreffing the returned WockyNodeTree. +Returns a new or existing WockyCapsCache object. +

+

+The returned WockyCapsCache is cached; the same WockyCapsCache +object will be returned by this function repeatedly in the same +process. At the end of the process, the caller should call +wocky_caps_cache_free_shared() to shared the shared WockyCapsCache +object.

- - - - - - - - - - + - - - + +

self :

a WockyCapsCache -

node :

the node to look up in the cache

Returns :

a WockyNodeTree if node was found in the cache, or NULL -if a match was not found
a new, or cached, WockyCapsCache.
+

wocky_caps_cache_free_shared ()

+
void                wocky_caps_cache_free_shared        (void);
+

+Free the shared WockyCapsCache instance which was created by +calling wocky_caps_cache_dup_shared(), or do nothing if said +function was not called. +

+
+
+

wocky_caps_cache_insert ()

void                wocky_caps_cache_insert             (WockyCapsCache *self,
                                                          const gchar *node,
@@ -153,64 +155,54 @@
-

wocky_caps_cache_new ()

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

wocky_caps_cache_lookup ()

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

-Convenience function to create a new WockyCapsCache. +Look up node in the caps cache self. The caller is responsible +for unreffing the returned WockyNodeTree.

- - + + + + + + - +

path :

full path to where the cache SQLite database should be stored

self :

a WockyCapsCache +

node :

the node to look up in the cache

Returns :

a new WockyCapsCache.a WockyNodeTree if node was found in the cache, or NULL +if a match was not found
-

wocky_caps_cache_dup_shared ()

-
WockyCapsCache *    wocky_caps_cache_dup_shared         (void);
-

-Returns a new or existing WockyCapsCache object. -

+

wocky_caps_cache_new ()

+
WockyCapsCache *    wocky_caps_cache_new                (const gchar *path);

-The returned WockyCapsCache is cached; the same WockyCapsCache -object will be returned by this function repeatedly in the same -process. At the end of the process, the caller should call -wocky_caps_cache_free_shared() to shared the shared WockyCapsCache -object. +Convenience function to create a new WockyCapsCache.

- + + + + + + - - + + +

path :

full path to where the cache SQLite database should be stored

Returns :

a new, or cached, WockyCapsCache.
a new WockyCapsCache.
-
-
-

wocky_caps_cache_free_shared ()

-
void                wocky_caps_cache_free_shared        (void);
-

-Free the shared WockyCapsCache instance which was created by -calling wocky_caps_cache_dup_shared(), or do nothing if said -function was not called. -

-
-
-
-

WockyCapsCachePrivate

-
typedef struct _WockyCapsCachePrivate WockyCapsCachePrivate;
-

-

-

Property Details

@@ -227,6 +219,6 @@
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/WockyContact.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/WockyContact.html --- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/WockyContact.html 2011-05-03 13:29:41.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/WockyContact.html 2011-11-16 10:28:01.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -40,10 +40,9 @@ 
 #include <wocky/wocky-contact.h>
 
-gchar *             (*WockyContactDupJidImpl)           (WockyContact *self);
 struct              WockyContactClass;
+gchar *             (*WockyContactDupJidImpl)           (WockyContact *self);
 gchar *             wocky_contact_dup_jid               (WockyContact *self);
-                    WockyContactPrivate;
@@ -52,13 +51,6 @@

Details

-

WockyContactDupJidImpl ()

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

-

-
-
-

struct WockyContactClass

struct WockyContactClass {
 };
@@ -69,15 +61,15 @@
-

wocky_contact_dup_jid ()

-
gchar *             wocky_contact_dup_jid               (WockyContact *self);
+

WockyContactDupJidImpl ()

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

-

WockyContactPrivate

-
typedef struct _WockyContactPrivate WockyContactPrivate;
+

wocky_contact_dup_jid ()

+
gchar *             wocky_contact_dup_jid               (WockyContact *self);

@@ -85,6 +77,6 @@
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18
\ No newline at end of file diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky.devhelp telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky.devhelp --- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky.devhelp 2011-05-03 13:29:38.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky.devhelp 1970-01-01 00:00:00.000000000 +0000 @@ -1,759 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky.devhelp2 telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky.devhelp2 --- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky.devhelp2 2011-05-03 13:29:38.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky.devhelp2 2011-11-16 10:28:01.000000000 +0000 @@ -66,695 +66,610 @@ - + + - - + - - - - + - - - - + + + + + + + + - - - + + + + + - - - - - + - - - + + + - + + + + + + - + - - - - - + - - - - - + + + + - - - - + + + + - - - - + + + - - - - - + - - + + + + + - - - + - - - - - + - - + + + + + - - - - - - - - - - + + + + + + + + + - + + - - - - - - - + + + + - - - - + - + - - - - - - + + + + + - - - - - - - + + + + + - - + - - - - - + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - + - - - - - - - - - + + + + + + - - - - + + + + + + + - + - - + + + + + - - - - - + + + + + + - - - - - + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - - - - - - - - - - - - - - - - + + + - - - - - - - - - - + - - - - + - - + + + + + + + + + + - - - + - - - - + + + - - - + - + - - + + + + + + + - - - - - - - - - - + + + + + + + - - + - - - - - - + + - + - - - - - - - - - - - - - - + + + + - - - + + + + + + + + + + + - - - + + + + - - - + - + - - - - - - - + + + - + + + + + - + + + - - - - - - - - + + + + - - - - - - - - + + + + - - - - - - - + - - + + + + + + + + - - - + - - + - - + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - + - + + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - + + - + - - - - - - - - + + + + + + + + + + + + + - - - - - - - + + - - - - - - - - - + + + - - + + + + + + + + - - + - - + - - - - - - - - - - - - - - - - - - + + + + + + + + - + + + + - - + + + - - - - - - - - - - + + - - - - - + + + + + + + - - + + - + + - - - - + + - + - - + - - + @@ -793,6 +708,8 @@ + + @@ -804,32 +721,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -853,20 +744,44 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -890,25 +805,12 @@ + + - - - - - - - - - - - - - - - @@ -926,16 +828,30 @@ + + + + + + + + + + + + + - - - - - + + + + + + @@ -958,12 +874,11 @@ - - - - - - + + + + + @@ -989,11 +904,11 @@ + + - - diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/WockyDiscoIdentity.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/WockyDiscoIdentity.html --- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/WockyDiscoIdentity.html 2011-05-03 13:29:41.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/WockyDiscoIdentity.html 2011-11-16 10:28:01.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -40,19 +40,17 @@

Synopsis

struct              WockyDiscoIdentity;
-#define             WOCKY_TYPE_DISCO_IDENTITY
-GType               wocky_disco_identity_get_type       (void);
+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_copy          (const WockyDiscoIdentity *source);
-void                wocky_disco_identity_free           (WockyDiscoIdentity *identity);
-gint                wocky_disco_identity_cmp            (WockyDiscoIdentity *left,
-                                                         WockyDiscoIdentity *right);
-GPtrArray *         wocky_disco_identity_array_new      (void);
-GPtrArray *         wocky_disco_identity_array_copy     (const GPtrArray *source);
-void                wocky_disco_identity_array_free     (GPtrArray *arr);
@@ -73,87 +71,59 @@

Details

struct WockyDiscoIdentity

-
struct WockyDiscoIdentity;
+
struct WockyDiscoIdentity {
+  gchar *category;
+  gchar *type;
+  gchar *lang;
+  gchar *name;
+};
+

A structure used to hold information regarding an identity from a disco reply as described in XEP-0030.

- -
-
-
-
-

WOCKY_TYPE_DISCO_IDENTITY

-
#define WOCKY_TYPE_DISCO_IDENTITY (wocky_disco_identity_get_type ())
-
-

-

-
-
-
-

wocky_disco_identity_get_type ()

-
GType               wocky_disco_identity_get_type       (void);
-

-

-
-
-
-

wocky_disco_identity_new ()

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

- -

-
- - - - - - - + + - - + + - - + + - - + +

category :

disco category

type :

disco type

gchar *category;

the identity category

lang :

disco language

gchar *type;

the identity type

name :

disco name

gchar *lang;

the identity language

Returns :

a new WockyDiscoIdentity which should be freed using -wocky_disco_identity_free().

gchar *name;

the identity name
-

wocky_disco_identity_copy ()

-
WockyDiscoIdentity * wocky_disco_identity_copy          (const WockyDiscoIdentity *source);
+

wocky_disco_identity_array_copy ()

+
GPtrArray *         wocky_disco_identity_array_copy     (const GPtrArray *source);

-Creates a new WockyDiscoIdentity structure with the data given by -source. The copy also copies the internal data so source can be -freed after this function is called. +Copies an array of WockyDiscoIdentity objects. The returned array contains +new copies of the contents of the source array.

- + - @@ -161,16 +131,43 @@
-

wocky_disco_identity_free ()

-
void                wocky_disco_identity_free           (WockyDiscoIdentity *identity);
+

wocky_disco_identity_array_free ()

+
void                wocky_disco_identity_array_free     (GPtrArray *arr);

-Frees the memory used by identity. +Frees an array of WockyDiscoIdentity objects created with +wocky_disco_identity_array_new() or returned by +wocky_disco_identity_array_copy(). +

+

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

+

+See: wocky_disco_identity_array_new(), wocky_disco_identity_array_copy()

source :

the WockyDiscoIdentity to copyThe source array to be copied.

Returns :

a new WockyDiscoIdentity which is a deep copy of source +A newly instantiated array with new copies of the contents of the +source array. +See: wocky_disco_identity_array_new()
- - + + +

identity :

a WockyDiscoIdentity +

arr :

Array to be freed.
+
+
+
+

wocky_disco_identity_array_new ()

+
GPtrArray *         wocky_disco_identity_array_new      (void);
+

+Creates a new array of WockyDiscoIdentity structures. +

+
++ + +

Returns :

A newly instantiated +array. wocky_disco_identity_array_free() should beq used +to free the memory allocated by this array. +See: wocky_disco_identity_array_free()
@@ -212,43 +209,23 @@
-

wocky_disco_identity_array_new ()

-
GPtrArray *         wocky_disco_identity_array_new      (void);
-

-Creates a new array of WockyDiscoIdentity structures. -

-
-- - - - -

Returns :

A newly instantiated -array. wocky_disco_identity_array_free() should beq used -to free the memory allocated by this array. -See: wocky_disco_identity_array_free() -
-
-
-
-

wocky_disco_identity_array_copy ()

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

wocky_disco_identity_copy ()

+
WockyDiscoIdentity * wocky_disco_identity_copy          (const WockyDiscoIdentity *source);

-Copies an array of WockyDiscoIdentity objects. The returned array contains -new copies of the contents of the source array. +Creates a new WockyDiscoIdentity structure with the data given by +source. The copy also copies the internal data so source can be +freed after this function is called.

- + - @@ -256,32 +233,61 @@
-

wocky_disco_identity_array_free ()

-
void                wocky_disco_identity_array_free     (GPtrArray *arr);
-

-Frees an array of WockyDiscoIdentity objects created with -wocky_disco_identity_array_new() or returned by -wocky_disco_identity_array_copy(). -

-

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

+

wocky_disco_identity_free ()

+
void                wocky_disco_identity_free           (WockyDiscoIdentity *identity);

-See: wocky_disco_identity_array_new(), wocky_disco_identity_array_copy() +Frees the memory used by identity.

source :

The source array to be copied.the WockyDiscoIdentity to copy

Returns :

A newly instantiated array with new copies of the contents of the -source array. -See: wocky_disco_identity_array_new() +a new WockyDiscoIdentity which is a deep copy of source
- - + +

arr :

Array to be freed.

identity :

a WockyDiscoIdentity +
+
+
+

wocky_disco_identity_new ()

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

+ +

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

category :

disco category

type :

disco type

lang :

disco language

name :

disco name

Returns :

a new WockyDiscoIdentity which should be freed using +wocky_disco_identity_free().
+
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/WockyNodeTree.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/WockyNodeTree.html --- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/WockyNodeTree.html 2011-05-03 13:29:41.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/WockyNodeTree.html 2011-11-16 10:28:01.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -38,15 +38,14 @@

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_from_node       (WockyNode *node);
 WockyNodeTree *     wocky_node_tree_new_va              (const gchar *name,
                                                          const char *ns,
                                                          va_list va);
-WockyNodeTree *     wocky_node_tree_new_from_node       (WockyNode *node);
-WockyNode *         wocky_node_tree_get_top_node        (WockyNodeTree *self);
-                    WockyNodeTreePrivate;
@@ -67,6 +66,13 @@
+

wocky_node_tree_get_top_node ()

+
WockyNode *         wocky_node_tree_get_top_node        (WockyNodeTree *self);
+

+

+
+
+

wocky_node_tree_new ()

WockyNodeTree *     wocky_node_tree_new                 (const gchar *name,
                                                          const gchar *ns,
@@ -78,7 +84,7 @@
 

 

 

-
Example 2. 

+
Example 2. 

 

   
@@ -87,14 +93,10 @@
 2
 3
 4
-5
-6
-7
+5
@@ -117,12 +119,6 @@
 
-
-
-
-
@@ -131,15 +127,6 @@
 

-
wocky_node_tree_new_va ()

-
WockyNodeTree *     wocky_node_tree_new_va              (const gchar *name,
-                                                         const char *ns,
-                                                         va_list va);

-

-

-

-

-

 
wocky_node_tree_new_from_node ()

 
WockyNodeTree *     wocky_node_tree_new_from_node       (WockyNode *node);

 

@@ -161,15 +148,10 @@
 

-
wocky_node_tree_get_top_node ()

-
WockyNode *         wocky_node_tree_get_top_node        (WockyNodeTree *self);

-

-

-

-

-

-
WockyNodeTreePrivate

-
typedef struct _WockyNodeTreePrivate WockyNodeTreePrivate;

+
wocky_node_tree_new_va ()

+
WockyNodeTree *     wocky_node_tree_new_va              (const gchar *name,
+                                                         const char *ns,
+                                                         va_list va);

 

 

 

@@ -177,6 +159,6 @@
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/WockyPubsubNode.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/WockyPubsubNode.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/WockyPubsubNode.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/WockyPubsubNode.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
-
+
@@ -39,38 +39,42 @@
 

     
         
wocky_node_tree_new ("html", "http://www.w3.org/1999/xhtml",
-   '(', "html", ':', "http://www.w3.org/1999/xhtml",
-     '(', "body", '@', "textcolor", "red",
-        '$', "Wocky wooo",
-     ')',
+   '(', "body", '@', "textcolor", "red",
+      '$', "Wocky wooo",
    ')',
   NULL);

       
The namespace of the toplevel node
 

 
... :
the description of the node tree to build,
-terminated with NULL
-

 
Returns :

 a new node-tree object
 

 
 
 
 
 
 
 
 
 
 
 
 

 

 
Synopsis

-
struct              WockyPubsubNodeClass;
-const gchar *       wocky_pubsub_node_get_name          (WockyPubsubNode *self);
-WockyStanza *       wocky_pubsub_node_make_publish_stanza
-                                                        (WockyPubsubNode *self,
-                                                         WockyNode **pubsub_out,
-                                                         WockyNode **publish_out,
-                                                         WockyNode **item_out);
-void                wocky_pubsub_node_subscribe_async   (WockyPubsubNode *self,
+
struct              WockyPubsubAffiliation;
+enum                WockyPubsubAffiliationState;
+struct              WockyPubsubNodeClass;
+WockyPubsubAffiliation * wocky_pubsub_affiliation_copy  (WockyPubsubAffiliation *aff);
+void                wocky_pubsub_affiliation_free       (WockyPubsubAffiliation *aff);
+GList *             wocky_pubsub_affiliation_list_copy  (GList *affs);
+void                wocky_pubsub_affiliation_list_free  (GList *affs);
+WockyPubsubAffiliation * wocky_pubsub_affiliation_new   (WockyPubsubNode *node,
                                                          const gchar *jid,
+                                                         WockyPubsubAffiliationState state);
+void                wocky_pubsub_node_delete_async      (WockyPubsubNode *self,
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);
-WockyPubsubSubscription * wocky_pubsub_node_subscribe_finish
-                                                        (WockyPubsubNode *self,
+gboolean            wocky_pubsub_node_delete_finish     (WockyPubsubNode *self,
                                                          GAsyncResult *result,
                                                          GError **error);
-void                wocky_pubsub_node_unsubscribe_async (WockyPubsubNode *self,
-                                                         const gchar *jid,
-                                                         const gchar *subid,
+void                wocky_pubsub_node_get_configuration_async
+                                                        (WockyPubsubNode *self,
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);
-gboolean            wocky_pubsub_node_unsubscribe_finish
+WockyDataForm *     wocky_pubsub_node_get_configuration_finish
                                                         (WockyPubsubNode *self,
                                                          GAsyncResult *result,
                                                          GError **error);
-void                wocky_pubsub_node_delete_async      (WockyPubsubNode *self,
+const gchar *       wocky_pubsub_node_get_name          (WockyPubsubNode *self);
+void                wocky_pubsub_node_list_affiliates_async
+                                                        (WockyPubsubNode *self,
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);
-gboolean            wocky_pubsub_node_delete_finish     (WockyPubsubNode *self,
+gboolean            wocky_pubsub_node_list_affiliates_finish
+                                                        (WockyPubsubNode *self,
                                                          GAsyncResult *result,
+                                                         GList **affiliates,
                                                          GError **error);
 void                wocky_pubsub_node_list_subscribers_async
                                                         (WockyPubsubNode *self,
@@ -82,59 +86,52 @@
                                                          GAsyncResult *result,
                                                          GList **subscribers,
                                                          GError **error);
-enum                WockyPubsubAffiliationState;
-struct              WockyPubsubAffiliation;
-#define             WOCKY_TYPE_PUBSUB_AFFILIATION
-GType               wocky_pubsub_affiliation_get_type   (void);
-WockyPubsubAffiliation * wocky_pubsub_affiliation_new   (WockyPubsubNode *node,
-                                                         const gchar *jid,
-                                                         WockyPubsubAffiliationState state);
-WockyPubsubAffiliation * wocky_pubsub_affiliation_copy  (WockyPubsubAffiliation *aff);
-void                wocky_pubsub_affiliation_free       (WockyPubsubAffiliation *aff);
-GList *             wocky_pubsub_affiliation_list_copy  (GList *affs);
-void                wocky_pubsub_affiliation_list_free  (GList *affs);
-void                wocky_pubsub_node_list_affiliates_async
+WockyStanza *       wocky_pubsub_node_make_publish_stanza
+                                                        (WockyPubsubNode *self,
+                                                         WockyNode **pubsub_out,
+                                                         WockyNode **publish_out,
+                                                         WockyNode **item_out);
+void                wocky_pubsub_node_modify_affiliates_async
                                                         (WockyPubsubNode *self,
+                                                         const GList *affiliates,
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);
-gboolean            wocky_pubsub_node_list_affiliates_finish
+gboolean            wocky_pubsub_node_modify_affiliates_finish
                                                         (WockyPubsubNode *self,
                                                          GAsyncResult *result,
-                                                         GList **affiliates,
                                                          GError **error);
-void                wocky_pubsub_node_modify_affiliates_async
-                                                        (WockyPubsubNode *self,
-                                                         const GList *affiliates,
+void                wocky_pubsub_node_subscribe_async   (WockyPubsubNode *self,
+                                                         const gchar *jid,
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);
-gboolean            wocky_pubsub_node_modify_affiliates_finish
+WockyPubsubSubscription * wocky_pubsub_node_subscribe_finish
                                                         (WockyPubsubNode *self,
                                                          GAsyncResult *result,
                                                          GError **error);
-void                wocky_pubsub_node_get_configuration_async
-                                                        (WockyPubsubNode *self,
+void                wocky_pubsub_node_unsubscribe_async (WockyPubsubNode *self,
+                                                         const gchar *jid,
+                                                         const gchar *subid,
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);
-WockyDataForm *     wocky_pubsub_node_get_configuration_finish
+gboolean            wocky_pubsub_node_unsubscribe_finish
                                                         (WockyPubsubNode *self,
                                                          GAsyncResult *result,
                                                          GError **error);
-                    WockyPubsubNodePrivate;
 

 

 

 
Object Hierarchy

 
-  GEnum
-   +----WockyPubsubAffiliationState
-

-
   GBoxed
    +----WockyPubsubAffiliation
 

+
+  GEnum
+   +----WockyPubsubAffiliationState
+

 

 

 
Description

@@ -144,67 +141,32 @@
 

 
Details

 

-
struct WockyPubsubNodeClass

-
struct WockyPubsubNodeClass {
+
struct WockyPubsubAffiliation

+
struct WockyPubsubAffiliation {
+    WockyPubsubNode *node;
+    gchar *jid;
+    WockyPubsubAffiliationState state;
 };
 

 

-The class of a WockyPubsubNode.
-

-

-

-

-
wocky_pubsub_node_get_name ()

-
const gchar *       wocky_pubsub_node_get_name          (WockyPubsubNode *self);

-

-

-

-

-

-
wocky_pubsub_node_make_publish_stanza ()

-
WockyStanza *       wocky_pubsub_node_make_publish_stanza
-                                                        (WockyPubsubNode *self,
-                                                         WockyNode **pubsub_out,
-                                                         WockyNode **publish_out,
-                                                         WockyNode **item_out);

-

-

-

-

-

-
wocky_pubsub_node_subscribe_async ()

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

-

-Attempts to subscribe to self.
+Represents an affiliation to a node, as returned by
+wocky_pubsub_node_list_affiliates_finish().
 

 

-
-
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
+
@@ -212,54 +174,52 @@
 

-
wocky_pubsub_node_subscribe_finish ()

-
WockyPubsubSubscription * wocky_pubsub_node_subscribe_finish
-                                                        (WockyPubsubNode *self,
-                                                         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);

+
enum WockyPubsubAffiliationState

+
typedef enum {
+    WOCKY_PUBSUB_AFFILIATION_OWNER,
+    WOCKY_PUBSUB_AFFILIATION_PUBLISHER,
+    WOCKY_PUBSUB_AFFILIATION_PUBLISH_ONLY,
+    WOCKY_PUBSUB_AFFILIATION_MEMBER,
+    WOCKY_PUBSUB_AFFILIATION_NONE,
+    WOCKY_PUBSUB_AFFILIATION_OUTCAST
+} WockyPubsubAffiliationState;
+

 

-Attempts to unsubscribe from self.
+Possible affiliations to a PubSub node, which determine privileges an entity
+has. See XEP-0060
+§4.1 for the details.
 

 

 
 
 
self :
a pubsub node
WockyPubsubNode *node;
the node to which this affiliation relates
 

 
jid :
the JID to use as the subscribed JID (usually the connection's bare or
-full JID); may not be NULL
+
gchar *jid;
the bare JID affiliated to node
 
 

 
cancellable :
optional GCancellable object, NULL to ignore
callback :
a callback to call when the request is completed
user_data :
data to pass to callback
+
WockyPubsubAffiliationState state;
the state of jid's affiliation to node
 
 

 
 
 

-
-
+
+
-
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
@@ -267,247 +227,177 @@
 

-
wocky_pubsub_node_unsubscribe_finish ()

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

-

-

-

-

-

-
wocky_pubsub_node_delete_async ()

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

-

-

-

-

-

-
wocky_pubsub_node_delete_finish ()

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

+
struct WockyPubsubNodeClass

+
struct WockyPubsubNodeClass {
+};
+

 

+The class of a WockyPubsubNode.
 

 

-
wocky_pubsub_node_list_subscribers_async ()

-
void                wocky_pubsub_node_list_subscribers_async
-                                                        (WockyPubsubNode *self,
-                                                         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().
-

+
wocky_pubsub_affiliation_copy ()

+
WockyPubsubAffiliation * wocky_pubsub_affiliation_copy  (WockyPubsubAffiliation *aff);

 

-(A note on naming: this is §8.8.1 — Retrieve Subscriptions List — in
-XEP-0060, not to be confused with §5.6 — Retrieve Subscriptions. The
-different terminology in Wocky is intended to help disambiguate!)
+
 

 

 
 
 
self :
a pubsub node
WOCKY_PUBSUB_AFFILIATION_OWNER
Owner
+
 

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

 
subid :
the identifier associated with the subscription
WOCKY_PUBSUB_AFFILIATION_PUBLISH_ONLY
Publish-Only
+
 

 
cancellable :
optional GCancellable object, NULL to ignore
WOCKY_PUBSUB_AFFILIATION_MEMBER
Member
+
 

 
callback :
a callback to call when the request is completed
WOCKY_PUBSUB_AFFILIATION_NONE
None
+
 

 
user_data :
data to pass to callback
+
WOCKY_PUBSUB_AFFILIATION_OUTCAST
Outcast
 
 

 
 
 
 
 

-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+

 
 
 
self :
a pubsub node
cancellable :
optional GCancellable object
callback :
function to call when the subscribers have been retrieved or an
-error has occured
aff :
an existing affiliation structure
 

 
user_data :
data to pass to callback.
Returns :
a duplicate of aff; the duplicate should ultimately be freed
+with wocky_pubsub_affiliation_free()
+
 

 
 

 

 

 

-
wocky_pubsub_node_list_subscribers_finish ()

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

+
wocky_pubsub_affiliation_free ()

+
void                wocky_pubsub_affiliation_free       (WockyPubsubAffiliation *aff);

 

-Completes a call to wocky_pubsub_node_list_subscribers_async(). The list
-returned in subscribers should be freed with
-wocky_pubsub_subscription_list_free() when it is no longer needed.
+Frees an affiliation, previously allocated with
+wocky_pubsub_affiliation_new() or wocky_pubsub_affiliation_copy()
+

+

++
+
+
+
+


aff :
an affiliation

+

+

+

+
wocky_pubsub_affiliation_list_copy ()

+
GList *             wocky_pubsub_affiliation_list_copy  (GList *affs);

+

+Shorthand for manually copying affs, duplicating each element with
+wocky_pubsub_affiliation_copy().
 

 

-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+

 
 
 
self :
a pubsub node
result :
the result passed to a callback
subscribers :
location at which to store a list of WockyPubsubSubscription
-pointers, or NULL
-
error :
location at which to store an error, or NULL
+
affs :
a list of WockyPubsubAffiliation
 
 

 

 
Returns :

-TRUE if the list of subscribers was successfully retrieved; FALSE
-and sets error if an error occured.a deep copy of affs, which should ultimately be freed with
+wocky_pubsub_affiliation_list_free().
 

 
 

 

 

 

-
enum WockyPubsubAffiliationState

-
typedef enum {
-    WOCKY_PUBSUB_AFFILIATION_OWNER,
-    WOCKY_PUBSUB_AFFILIATION_PUBLISHER,
-    WOCKY_PUBSUB_AFFILIATION_PUBLISH_ONLY,
-    WOCKY_PUBSUB_AFFILIATION_MEMBER,
-    WOCKY_PUBSUB_AFFILIATION_NONE,
-    WOCKY_PUBSUB_AFFILIATION_OUTCAST
-} WockyPubsubAffiliationState;
-

+
wocky_pubsub_affiliation_list_free ()

+
void                wocky_pubsub_affiliation_list_free  (GList *affs);

 

-Possible affiliations to a PubSub node, which determine privileges an entity
-has. See XEP-0060
-§4.1 for the details.
+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_OWNER
Owner
-
WOCKY_PUBSUB_AFFILIATION_PUBLISHER
Publisher
-
WOCKY_PUBSUB_AFFILIATION_PUBLISH_ONLY
Publish-Only
-
WOCKY_PUBSUB_AFFILIATION_MEMBER
Member
-
WOCKY_PUBSUB_AFFILIATION_NONE
None
-
WOCKY_PUBSUB_AFFILIATION_OUTCAST
Outcast
+
affs :
a list of WockyPubsubAffiliation
 

 

 

 

 

-
struct WockyPubsubAffiliation

-
struct WockyPubsubAffiliation {
-    WockyPubsubNode *node;
-    gchar *jid;
-    WockyPubsubAffiliationState state;
-};
-

+
wocky_pubsub_affiliation_new ()

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

 

-Represents an affiliation to a node, as returned by
-wocky_pubsub_node_list_affiliates_finish().
+
 

 

-
-
+
+
-
-
+
-
+
+
+
+
+

 
 
 
WockyPubsubNode *node;
the node to which this affiliation relates
node :
a node
 

 
gchar *jid;
the bare JID affiliated to node
+
jid :
the JID affiliated to node
 
 

 
WockyPubsubAffiliationState state;
state :

 the state of jid's affiliation to node
 
 
Returns :
a new structure representing an affiliation, which should
+ultimately be freed with wocky_pubsub_affiliation_free()
+

 
 

 

 

 

-
WOCKY_TYPE_PUBSUB_AFFILIATION

-
#define             WOCKY_TYPE_PUBSUB_AFFILIATION

+
wocky_pubsub_node_delete_async ()

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

 

 

 

 

 

-
wocky_pubsub_affiliation_get_type ()

-
GType               wocky_pubsub_affiliation_get_type   (void);

+
wocky_pubsub_node_delete_finish ()

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

 

 

 

 

 

-
wocky_pubsub_affiliation_new ()

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

+
wocky_pubsub_node_get_configuration_async ()

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

 

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

 

-
+
-
-
+
+
-
-
+
+
-
-
+
@@ -515,100 +405,144 @@
 

-
wocky_pubsub_affiliation_copy ()

-
WockyPubsubAffiliation * wocky_pubsub_affiliation_copy  (WockyPubsubAffiliation *aff);

+
wocky_pubsub_node_get_configuration_finish ()

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

 

-
+Complete a call to wocky_pubsub_node_get_configuration_async().
 

 

 
 
 
node :
self :

 a node
 

 
jid :
the JID affiliated to node
-
cancellable :
optional GCancellable object, NULL to ignore
 

 
state :
the state of jid's affiliation to node
-
callback :
a callback to call when the request is completed
 

 
Returns :
a new structure representing an affiliation, which should
-ultimately be freed with wocky_pubsub_affiliation_free()
+
user_data :
data to pass to callback
 
 

 
 
 

-
-
+
+
+
+
+
+
+
+
+
+
-
+

 
 
 
aff :
an existing affiliation structure
self :
a node
result :
the result
error :
location at which to store an error, if one occurred.
 

 

 
Returns :
a duplicate of aff; the duplicate should ultimately be freed
-with wocky_pubsub_affiliation_free()
-a form representing the node configuration on success; NULL and
+sets error otherwise
 

 
 

 

 

 

-
wocky_pubsub_affiliation_free ()

-
void                wocky_pubsub_affiliation_free       (WockyPubsubAffiliation *aff);

+
wocky_pubsub_node_get_name ()

+
const gchar *       wocky_pubsub_node_get_name          (WockyPubsubNode *self);

 

-Frees an affiliation, previously allocated with
-wocky_pubsub_affiliation_new() or wocky_pubsub_affiliation_copy()
 

-

--
-
-
-
-


aff :
an affiliation

 

 

 

-
wocky_pubsub_affiliation_list_copy ()

-
GList *             wocky_pubsub_affiliation_list_copy  (GList *affs);

+
wocky_pubsub_node_list_affiliates_async ()

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

 

-Shorthand for manually copying affs, duplicating each element with
-wocky_pubsub_affiliation_copy().
+Retrieves the list of entities affilied to a node you own. callback may
+complete the call using wocky_pubsub_node_list_affiliates_finish().
+

+

+(A note on naming: this is §8.9.1 — Retrieve Affiliations List — in
+XEP-0060, not to be confused with §5.7 — Retrieve Affiliations. The
+slightly different terminology in Wocky is intended to help disambiguate!)
 

 

-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+

 
 
 
affs :
a list of WockyPubsubAffiliation
-
self :
a pubsub node
 

 
Returns :
a deep copy of affs, which should ultimately be freed with
-wocky_pubsub_affiliation_list_free().
cancellable :
optional GCancellable object
callback :
function to call when the affiliates have been retrieved or an
+error has occured
user_data :
data to pass to callback.
 

 
 

 

 

 

-
wocky_pubsub_affiliation_list_free ()

-
void                wocky_pubsub_affiliation_list_free  (GList *affs);

+
wocky_pubsub_node_list_affiliates_finish ()

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

 

-Frees a list of WockyPubsubAffiliation structures, as shorthand for calling
-wocky_pubsub_affiliation_free() for each element, followed by g_list_free().
+Completes a call to wocky_pubsub_node_list_affiliates_async(). The list
+returned in affiliates should be freed with
+wocky_pubsub_affiliation_list_free() when it is no longer needed.
 

 
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+

 

affs :
a list of WockyPubsubAffiliation
+
self :
a pubsub node
result :
the result passed to a callback
affiliates :
location at which to store a list of WockyPubsubAffiliation
+pointers, or NULL
 
error :
location at which to store an error, or NULL
+
Returns :

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

 

 

 

 

-
wocky_pubsub_node_list_affiliates_async ()

-
void                wocky_pubsub_node_list_affiliates_async
+
wocky_pubsub_node_list_subscribers_async ()

+
void                wocky_pubsub_node_list_subscribers_async
                                                         (WockyPubsubNode *self,
                                                          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().
+Retrieves the list of subscriptions to a node you own. callback may
+complete the call using wocky_pubsub_node_list_subscribers_finish().
 

 

-(A note on naming: this is §8.9.1 — Retrieve Affiliations List — in
-XEP-0060, not to be confused with §5.7 — Retrieve Affiliations. The
-slightly different terminology in Wocky is intended to help disambiguate!)
+(A note on naming: this is §8.8.1 — Retrieve Subscriptions List — in
+XEP-0060, not to be confused with §5.6 — Retrieve Subscriptions. The
+different terminology in Wocky is intended to help disambiguate!)
 

 
@@ -623,7 +557,7 @@
 
-
@@ -635,16 +569,16 @@
 

-
wocky_pubsub_node_list_affiliates_finish ()

-
gboolean            wocky_pubsub_node_list_affiliates_finish
+
wocky_pubsub_node_list_subscribers_finish ()

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

 

-Completes a call to wocky_pubsub_node_list_affiliates_async(). The list
-returned in affiliates should be freed with
-wocky_pubsub_affiliation_list_free() when it is no longer needed.
+Completes a call to wocky_pubsub_node_list_subscribers_async(). The list
+returned in subscribers should be freed with
+wocky_pubsub_subscription_list_free() when it is no longer needed.
 

 

 

 

 
callback :
function to call when the affiliates have been retrieved or an
+function to call when the subscribers have been retrieved or an
 error has occured
 

 

 
 
@@ -658,8 +592,8 @@
 
-
-
+
@@ -679,6 +613,17 @@
 

+
wocky_pubsub_node_make_publish_stanza ()

+
WockyStanza *       wocky_pubsub_node_make_publish_stanza
+                                                        (WockyPubsubNode *self,
+                                                         WockyNode **pubsub_out,
+                                                         WockyNode **publish_out,
+                                                         WockyNode **item_out);

+

+

+

+

+

 
wocky_pubsub_node_modify_affiliates_async ()

 
void                wocky_pubsub_node_modify_affiliates_async
                                                         (WockyPubsubNode *self,
@@ -753,21 +698,27 @@
 

-
wocky_pubsub_node_get_configuration_async ()

-
void                wocky_pubsub_node_get_configuration_async
-                                                        (WockyPubsubNode *self,
+
wocky_pubsub_node_subscribe_async ()

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

 

-Retrieves the current configuration for a node owned by the user.
+Attempts to subscribe to self.
 

 

 

the result passed to a callback
 

 
affiliates :
location at which to store a list of WockyPubsubAffiliation
+
subscribers :
location at which to store a list of WockyPubsubSubscription
 pointers, or NULL
 
 

 
 
 
 

-
+
+
+
+
+
@@ -787,41 +738,66 @@
 

-
wocky_pubsub_node_get_configuration_finish ()

-
WockyDataForm *     wocky_pubsub_node_get_configuration_finish
+
wocky_pubsub_node_subscribe_finish ()

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

 

-Complete a call to wocky_pubsub_node_get_configuration_async().
+

+

+

+

+
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);

+

+Attempts to unsubscribe from self.
 

 

 
 
 

 
self :
a nodea pubsub node
jid :
the JID to use as the subscribed JID (usually the connection's bare or
+full JID); may not be NULL
+
 

 

 
cancellable :

 
 

-
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+

 
 
 

 
self :
a nodea pubsub node
 

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

 
error :
location at which to store an error, if one occurred.
subid :
the identifier associated with the subscription
 

 
Returns :
a form representing the node configuration on success; NULL and
-sets error otherwise
cancellable :
optional GCancellable object, NULL to ignore
callback :
a callback to call when the request is completed
user_data :
data to pass to callback
+
 

 
 

 

 

 

-
WockyPubsubNodePrivate

-
typedef struct _WockyPubsubNodePrivate WockyPubsubNodePrivate;

+
wocky_pubsub_node_unsubscribe_finish ()

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

 

 

 

@@ -829,6 +805,6 @@
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/WockyResourceContact.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/WockyResourceContact.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/WockyResourceContact.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/WockyResourceContact.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,14 +41,13 @@
 #include <wocky/wocky-resource-contact.h>
 
 struct              WockyResourceContactClass;
-WockyResourceContact *  wocky_resource_contact_new      (WockyBareContact *bare,
-                                                         const gchar *resource);
-const gchar *       wocky_resource_contact_get_resource (WockyResourceContact *contact);
-WockyBareContact *  wocky_resource_contact_get_bare_contact
-                                                        (WockyResourceContact *contact);
 gboolean            wocky_resource_contact_equal        (WockyResourceContact *a,
                                                          WockyResourceContact *b);
-                    WockyResourceContactPrivate;
+WockyBareContact *  wocky_resource_contact_get_bare_contact
+                                                        (WockyResourceContact *contact);
+const gchar *       wocky_resource_contact_get_resource (WockyResourceContact *contact);
+WockyResourceContact * wocky_resource_contact_new       (WockyBareContact *bare,
+                                                         const gchar *resource);
@@ -67,16 +66,9 @@
-

wocky_resource_contact_new ()

-
WockyResourceContact *  wocky_resource_contact_new      (WockyBareContact *bare,
-                                                         const gchar *resource);
-

-

-
-
-
-

wocky_resource_contact_get_resource ()

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

wocky_resource_contact_equal ()

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

@@ -90,16 +82,16 @@
-

wocky_resource_contact_equal ()

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

wocky_resource_contact_get_resource ()

+
const gchar *       wocky_resource_contact_get_resource (WockyResourceContact *contact);

-

WockyResourceContactPrivate

-
typedef struct _WockyResourceContactPrivate WockyResourceContactPrivate;
+

wocky_resource_contact_new ()

+
WockyResourceContact * wocky_resource_contact_new       (WockyBareContact *bare,
+                                                         const gchar *resource);

@@ -107,6 +99,6 @@
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/WockySession.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/WockySession.html --- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/WockySession.html 2011-05-03 13:29:41.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/WockySession.html 2011-11-16 10:28:01.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,17 +41,15 @@ #include <wocky/wocky-session.h> struct WockySessionClass; +WockyContactFactory * wocky_session_get_contact_factory (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_with_connection (WockyXmppConnection *conn, const gchar *full_jid); -void wocky_session_start (WockySession *session); -WockyPorter * wocky_session_get_porter (WockySession *session); -WockyContactFactory * wocky_session_get_contact_factory - (WockySession *session); void wocky_session_set_jid (WockySession *session, const gchar *jid); -const gchar * wocky_session_get_jid (WockySession *session); - WockySessionPrivate; +void wocky_session_start (WockySession *session);
@@ -70,38 +68,37 @@
-

wocky_session_new_ll ()

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

wocky_session_get_contact_factory ()

+
WockyContactFactory * wocky_session_get_contact_factory (WockySession *session);

-

wocky_session_new_with_connection ()

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

wocky_session_get_jid ()

+
const gchar *       wocky_session_get_jid               (WockySession *session);

-

wocky_session_start ()

-
void                wocky_session_start                 (WockySession *session);
+

wocky_session_get_porter ()

+
WockyPorter *       wocky_session_get_porter            (WockySession *session);

-

wocky_session_get_porter ()

-
WockyPorter *       wocky_session_get_porter            (WockySession *session);
+

wocky_session_new_ll ()

+
WockySession *      wocky_session_new_ll                (const gchar *full_jid);

-

wocky_session_get_contact_factory ()

-
WockyContactFactory *  wocky_session_get_contact_factory
-                                                        (WockySession *session);
+

wocky_session_new_with_connection ()

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

@@ -115,15 +112,8 @@
-

wocky_session_get_jid ()

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

-

-
-
-
-

WockySessionPrivate

-
typedef struct _WockySessionPrivate WockySessionPrivate;
+

wocky_session_start ()

+
void                wocky_session_start                 (WockySession *session);

@@ -131,6 +121,6 @@
- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyAuthHandler.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyAuthHandler.html --- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyAuthHandler.html 2011-05-03 13:29:41.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyAuthHandler.html 2011-11-16 10:28:01.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -37,29 +37,29 @@

Synopsis

-
gboolean            (*WockyAuthInitialResponseFunc)     (WockyAuthHandler *handler,
-                                                         GString **initial_data,
-                                                         GError **error);
-gboolean            (*WockyAuthAuthDataFunc)            (WockyAuthHandler *handler,
+
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);
 void                wocky_auth_handler_free             (WockyAuthHandler *handler);
-const gchar *       wocky_auth_handler_get_mechanism    (WockyAuthHandler *handler);
-gboolean            wocky_auth_handler_is_plain         (WockyAuthHandler *handler);
 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);
-struct              WockyAuthHandlerIface;
+gboolean            wocky_auth_handler_is_plain         (WockyAuthHandler *handler);
@@ -70,6 +70,63 @@

Details

+

WockyAuthAuthDataFunc ()

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

+

+
+
+
+

struct WockyAuthHandlerIface

+
struct WockyAuthHandlerIface {
+    GTypeInterface parent;
+    gchar *mechanism;
+    gboolean plain;
+    WockyAuthInitialResponseFunc initial_response_func;
+    WockyAuthAuthDataFunc auth_data_func;
+    WockyAuthSuccessFunc success_func;
+};
+
+
++ + + + + + + + + + + + + + + + + + + + + + + + + + +

GTypeInterface parent;

The parent interface.

gchar *mechanism;

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

gboolean plain;

Whether the mechanism this handler handles sends secrets in +plaintext.

WockyAuthInitialResponseFunc initial_response_func;

Called when the initial <auth +/> stanza is generated

WockyAuthAuthDataFunc auth_data_func;

Called when any authentication data from the +server is received

WockyAuthSuccessFunc success_func;

Called when a <success/> stanza +is received.
+
+
+

WockyAuthInitialResponseFunc ()

gboolean            (*WockyAuthInitialResponseFunc)     (WockyAuthHandler *handler,
                                                          GString **initial_data,
@@ -113,16 +170,6 @@
-

WockyAuthAuthDataFunc ()

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

-

-
-
-

WockyAuthSuccessFunc ()

gboolean            (*WockyAuthSuccessFunc)             (WockyAuthHandler *handler,
                                                          GError **error);
@@ -163,20 +210,6 @@
-

wocky_auth_handler_get_mechanism ()

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

-

-
-
-
-

wocky_auth_handler_is_plain ()

-
gboolean            wocky_auth_handler_is_plain         (WockyAuthHandler *handler);
-

-

-
-
-

wocky_auth_handler_get_initial_response ()

gboolean            wocky_auth_handler_get_initial_response
                                                         (WockyAuthHandler *handler,
@@ -187,6 +220,13 @@
+

wocky_auth_handler_get_mechanism ()

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

+

+
+
+

wocky_auth_handler_handle_auth_data ()

gboolean            wocky_auth_handler_handle_auth_data (WockyAuthHandler *handler,
                                                          const GString *data,
@@ -205,55 +245,15 @@
-

struct WockyAuthHandlerIface

-
struct WockyAuthHandlerIface {
-    GTypeInterface parent;
-    gchar *mechanism;
-    gboolean plain;
-    WockyAuthInitialResponseFunc initial_response_func;
-    WockyAuthAuthDataFunc auth_data_func;
-    WockyAuthSuccessFunc success_func;
-};
-
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - -

GTypeInterface parent;

The parent interface.

gchar *mechanism;

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

gboolean plain;

Whether the mechanism this handler handles sends secrets in -plaintext.

WockyAuthInitialResponseFunc initial_response_func;

Called when the initial <auth -/> stanza is generated

WockyAuthAuthDataFunc auth_data_func;

Called when any authentication data from the -server is received

WockyAuthSuccessFunc success_func;

Called when a <success/> stanza -is received.
+

wocky_auth_handler_is_plain ()

+
gboolean            wocky_auth_handler_is_plain         (WockyAuthHandler *handler);
+

+

- Generated by GTK-Doc V1.17
+ Generated by GTK-Doc V1.18 \ No newline at end of file diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-auth-registry-enumtypes.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-auth-registry-enumtypes.html --- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-auth-registry-enumtypes.html 2011-05-03 13:29:41.000000000 +0000 +++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-auth-registry-enumtypes.html 2011-11-16 10:28:01.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -37,9 +37,7 @@

Synopsis

-
GType               wocky_auth_error_get_type           (void);
-#define             WOCKY_TYPE_AUTH_ERROR
-
+

 

 

 
Description

@@ -48,24 +46,10 @@
 

 

 
Details

-

-
wocky_auth_error_get_type ()

-
GType               wocky_auth_error_get_type           (void);

-

-

-

-

-

-
WOCKY_TYPE_AUTH_ERROR

-
#define WOCKY_TYPE_AUTH_ERROR (wocky_auth_error_get_type())
-

-

-

-

 

 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyC2SPorter.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyC2SPorter.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyC2SPorter.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyC2SPorter.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -39,16 +39,19 @@
 

 
Synopsis

 
struct              WockyC2SPorterClass;
+void                wocky_c2s_porter_enable_power_saving_mode
+                                                        (WockyC2SPorter *porter,
+                                                         gboolean enable);
 WockyPorter *       wocky_c2s_porter_new                (WockyXmppConnection *connection,
                                                          const gchar *full_jid);
-guint               wocky_c2s_porter_register_handler_from_server_va
+guint               wocky_c2s_porter_register_handler_from_server
                                                         (WockyC2SPorter *self,
                                                          WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
                                                          guint priority,
                                                          WockyPorterHandlerFunc callback,
                                                          gpointer user_data,
-                                                         va_list ap);
+                                                         ...);
 guint               wocky_c2s_porter_register_handler_from_server_by_stanza
                                                         (WockyC2SPorter *self,
                                                          WockyStanzaType type,
@@ -57,18 +60,23 @@
                                                          WockyPorterHandlerFunc callback,
                                                          gpointer user_data,
                                                          WockyStanza *stanza);
-guint               wocky_c2s_porter_register_handler_from_server
+guint               wocky_c2s_porter_register_handler_from_server_va
                                                         (WockyC2SPorter *self,
                                                          WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
                                                          guint priority,
                                                          WockyPorterHandlerFunc callback,
                                                          gpointer user_data,
-                                                         ...);
-void                wocky_c2s_porter_enable_power_saving_mode
-                                                        (WockyC2SPorter *porter,
-                                                         gboolean enable);
-                    WockyC2SPorterPrivate;
+                                                         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
+                                                        (WockyC2SPorter *self,
+                                                         GAsyncResult *result,
+                                                         GError **error);
 

 

 

@@ -91,6 +99,55 @@
 

 

 

+
wocky_c2s_porter_enable_power_saving_mode ()

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

+

+Enable or disable power saving. In power saving mode, Wocky will
+attempt to queue "uninteresting" stanza until it is either manually
+flushed, until important stanza arrives, or until the power saving
+mode is disabled.
+

+

+Queueable stanzas are:
+

+

+

+
    
+
  • 
+<presence/> and
+     <presence type="unavailable"/>;
    • 
+
  • PEP updates for a hardcoded list of namespaces.
    • 
+

+

+

+

+Whenever stanza is handled, all previously queued stanzas
+(if any) are handled as well, in the order they arrived. This preserves
+stanza ordering.
+

+

+Note that exiting the power saving mode will immediately handle any
+queued stanzas.
+

+

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


porter :
a WockyC2SPorter
+
enable :
A boolean specifying whether power saving mode should be used

+

+

+

 
wocky_c2s_porter_new ()

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

@@ -120,19 +177,47 @@
 

 

 

-
wocky_c2s_porter_register_handler_from_server_va ()

-
guint               wocky_c2s_porter_register_handler_from_server_va
+
wocky_c2s_porter_register_handler_from_server ()

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

+                                                         ...);

+

+Registers a handler for incoming stanzas from the local user's server; that
+is, stanzas with no "from" attribute, or where the sender is the user's own
+bare or full JID.
+

+

+For example, to register a handler for roster pushes, call:
+

+

+

+

+  
+    
+      
+        
+        
+      
+    
+  
1
+2
+3
+4
+5
+6
id = wocky_c2s_porter_register_handler_from_server (porter,
+  WOCKY_STANZA_TYPE_MESSAGE, WOCKY_STANZA_SUB_TYPE_SET,
+  WOCKY_PORTER_HANDLER_PRIORITY_NORMAL, roster_push_received_cb, NULL,
+  '(',
+    "query", ':', WOCKY_XMPP_NS_ROSTER,
+  ')', NULL);

+

+
 

-A va_list version of
-wocky_c2s_porter_register_handler_from_server(); see that function for more
-details.
 

 
@@ -169,12 +254,6 @@
 
-
-
-
-
@@ -246,47 +325,19 @@
 

-
wocky_c2s_porter_register_handler_from_server ()

-
guint               wocky_c2s_porter_register_handler_from_server
+
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,
                                                          WockyPorterHandlerFunc callback,
                                                          gpointer user_data,
-                                                         ...);

-

-Registers a handler for incoming stanzas from the local user's server; that
-is, stanzas with no "from" attribute, or where the sender is the user's own
-bare or full JID.
-

-

-For example, to register a handler for roster pushes, call:
-

-

-

-

-  

 

Passed to callback.
 

 
ap :
a wocky_stanza_build() specification. The handler
-will match a stanza only if the stanza received is a superset of the one
-passed to this function, as per wocky_node_is_superset().

 
Returns :

 a non-zero ID for use with wocky_porter_unregister_handler().
 

 
 

-    
-      
-        
-        
-      
-    
-  
1
-2
-3
-4
-5
-6
id = wocky_c2s_porter_register_handler_from_server (porter,
-  WOCKY_STANZA_TYPE_MESSAGE, WOCKY_STANZA_SUB_TYPE_SET,
-  WOCKY_PORTER_HANDLER_PRIORITY_NORMAL, roster_push_received_cb, NULL,
-  '(',
-    "query", ':', WOCKY_XMPP_NS_ROSTER,
-  ')', NULL);

-

-
+                                                         va_list ap);
 

+A va_list version of
+wocky_c2s_porter_register_handler_from_server(); see that function for more
+details.
 

 
@@ -323,7 +374,7 @@
 
-
+
@@ -337,56 +388,80 @@
 

-
wocky_c2s_porter_enable_power_saving_mode ()

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

-

-Enable or disable power saving. In power saving mode, Wocky will
-attempt to queue "uninteresting" stanza until it is either manually
-flushed, until important stanza arrives, or until the power saving
-mode is disabled.
-

-

-Queueable stanzas are:
- - <presence></presence> and <presence></presence>
- - all PEP updates
-

-

-Whenever stanza is handled, all previously queued stanzas
-(if any) are handled as well, in the order they arrived. This preserves
-stanza ordering.
-

-

-Note that exiting the power saving mode will immediately handle any
-queued stanzas.
+
wocky_c2s_porter_send_whitespace_ping_async ()

+
void                wocky_c2s_porter_send_whitespace_ping_async
+                                                        (WockyC2SPorter *self,
+                                                         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
+wocky_c2s_porter_send_whitespace_ping_finish() to get the result of the
+operation.
+No pings are sent if there are already other stanzas or pings being sent
+when this function is called; it would be useless.
 

 

 

Passed to callback.
 

 
... :
ap :

 a wocky_stanza_build() specification. The handler
 will match a stanza only if the stanza received is a superset of the one
 passed to this function, as per wocky_node_is_superset().
 
 

-
+
-
-
+
+
+
+
+
+
+
+
+
+

 
 
 
porter :
self :

 a WockyC2SPorter
 
 

 
enable :
A boolean specifying whether power saving mode should be used
cancellable :
optional GCancellable object, NULL to ignore.
callback :
callback to call when the request is satisfied.
user_data :
the data to pass to callback function.
 

 
 

 

 

 

-
WockyC2SPorterPrivate

-
typedef struct _WockyC2SPorterPrivate WockyC2SPorterPrivate;

+
wocky_c2s_porter_send_whitespace_ping_finish ()

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

 

+Finishes sending a whitespace ping.
 

+

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


self :
a WockyC2SPorter
+
result :
a GAsyncResult.
error :
a GError location to store the error occuring, or NULL to ignore.
Returns :
TRUE if the ping was succesfully sent, FALSE on error.

 

 
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyCapsHash.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyCapsHash.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyCapsHash.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyCapsHash.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,10 +37,10 @@
 
 

 
Synopsis

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

 

 

@@ -52,34 +52,6 @@
 

 
Details

 

-
wocky_caps_hash_compute_from_node ()

-
gchar *             wocky_caps_hash_compute_from_node   (WockyNode *node);

-

-Compute the hash as defined by the XEP-0115 from a received
-WockyNode.
-

-

-node should be the top-level node from a disco response such as
-the example given in XEP-0115 §5.3 "Complex Generation Example".
-

-

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


node :
a WockyNode
-
Returns :
the hash. The called must free the returned hash with
-g_free().

-

-

-

 
wocky_caps_hash_compute_from_lists ()

 
gchar *             wocky_caps_hash_compute_from_lists  (GPtrArray *features,
                                                          GPtrArray *identities,
@@ -113,10 +85,38 @@
 
 

 

+

+

+
wocky_caps_hash_compute_from_node ()

+
gchar *             wocky_caps_hash_compute_from_node   (WockyNode *node);

+

+Compute the hash as defined by the XEP-0115 from a received
+WockyNode.
+

+

+node should be the top-level node from a disco response such as
+the example given in XEP-0115 §5.3 "Complex Generation Example".
+

+

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


node :
a WockyNode
+
Returns :
the hash. The called must free the returned hash with
+g_free().

+

 

 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-connector-enumtypes.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-connector-enumtypes.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-connector-enumtypes.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-connector-enumtypes.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,9 +37,7 @@
 
 

 
Synopsis

-
GType               wocky_connector_error_get_type      (void);
-#define             WOCKY_TYPE_CONNECTOR_ERROR
-

+

 

 

 
Description

@@ -48,24 +46,10 @@
 

 

 
Details

-

-
wocky_connector_error_get_type ()

-
GType               wocky_connector_error_get_type      (void);

-

-

-

-

-

-
WOCKY_TYPE_CONNECTOR_ERROR

-
#define WOCKY_TYPE_CONNECTOR_ERROR (wocky_connector_error_get_type())
-

-

-

-

 

 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyConnector.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyConnector.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyConnector.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyConnector.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -42,24 +42,19 @@
 
 #include <wocky/wocky-connector.h>
 
-enum                WockyConnectorError;
-GQuark              wocky_connector_error_quark         (void);
 #define             WOCKY_CONNECTOR_ERROR
 struct              WockyConnectorClass;
+enum                WockyConnectorError;
+void                wocky_connector_connect_async       (WockyConnector *self,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback cb,
+                                                         gpointer user_data);
 WockyXmppConnection * wocky_connector_connect_finish    (WockyConnector *self,
                                                          GAsyncResult *res,
                                                          gchar **jid,
                                                          gchar **sid,
                                                          GError **error);
-WockyXmppConnection * wocky_connector_register_finish   (WockyConnector *self,
-                                                         GAsyncResult *res,
-                                                         gchar **jid,
-                                                         gchar **sid,
-                                                         GError **error);
-void                wocky_connector_connect_async       (WockyConnector *self,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback cb,
-                                                         gpointer user_data);
+GQuark              wocky_connector_error_quark         (void);
 WockyConnector *    wocky_connector_new                 (const gchar *jid,
                                                          const gchar *pass,
                                                          const gchar *resource,
@@ -69,6 +64,13 @@
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback cb,
                                                          gpointer user_data);
+WockyXmppConnection * wocky_connector_register_finish   (WockyConnector *self,
+                                                         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,
@@ -76,9 +78,6 @@
 gboolean            wocky_connector_unregister_finish   (WockyConnector *self,
                                                          GAsyncResult *res,
                                                          GError **error);
-void                wocky_connector_set_auth_registry   (WockyConnector *self,
-                                                         WockyAuthRegistry *registry);
-                    WockyConnectorPrivate;
 

 
 

@@ -200,7 +199,26 @@
 

 
Details

 

-
enum WockyConnectorError

+
WOCKY_CONNECTOR_ERROR

+
#define WOCKY_CONNECTOR_ERROR (wocky_connector_error_quark ())
+

+

+Get access to the error quark of the connector.
+

+

+

+

+
struct WockyConnectorClass

+
struct WockyConnectorClass {
+};
+

+

+The class of a WockyConnector.
+

+

+

+

+
enum WockyConnectorError

 
typedef enum {
   WOCKY_CONNECTOR_ERROR_UNKNOWN,
   WOCKY_CONNECTOR_ERROR_IN_PROGRESS,
@@ -387,40 +405,14 @@
 

 

 

-
wocky_connector_error_quark ()

-
GQuark              wocky_connector_error_quark         (void);

-

-

-

-

-

-
WOCKY_CONNECTOR_ERROR

-
#define WOCKY_CONNECTOR_ERROR (wocky_connector_error_quark ())
-

-

-Get access to the error quark of the connector.
-

-

-

-

-
struct WockyConnectorClass

-
struct WockyConnectorClass {
-};
-

-

-The class of a WockyConnector.
-

-

-

-

-
wocky_connector_connect_finish ()

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

+
wocky_connector_connect_async ()

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

 

-Called by the callback passed to wocky_connector_connect_async().
+Connect to the account/server specified by the self.
+cb should invoke wocky_connector_connect_finish().
 

 
@@ -430,38 +422,31 @@
 
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+

 

a WockyConnector instance.
 

 
res :
a GAsyncResult (from your wocky_connector_connect_async() callback).
jid :
(NULL to ignore) the user JID from the server is stored here.
sid :
(NULL to ignore) the Session ID is stored here.
cancellable :
an GCancellable, or NULL
+
 

 
error :
(NULL to ignore) the GError (if any) is sored here.
cb :
a GAsyncReadyCallback to call when the operation completes.
 

 
Returns :
a WockyXmppConnection instance (success), or NULL (failure).
user_data :
a gpointer to pass to the callback.
 

 
 

 

 

 

-
wocky_connector_register_finish ()

-
WockyXmppConnection * wocky_connector_register_finish   (WockyConnector *self,
+
wocky_connector_connect_finish ()

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

 

-Called by the callback passed to wocky_connector_register_async().
+Called by the callback passed to wocky_connector_connect_async().
 

 
@@ -472,19 +457,19 @@
 
-
+
-
+
-
+
-
+
@@ -495,37 +480,10 @@
 

-
wocky_connector_connect_async ()

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

+
wocky_connector_error_quark ()

+
GQuark              wocky_connector_error_quark         (void);

 

-Connect to the account/server specified by the self.
-cb should invoke wocky_connector_connect_finish().
 

-

 

 

 
res :
a GAsyncResult (from your wocky_connector_register_async() callback).a GAsyncResult (from your wocky_connector_connect_async() callback).
 

 

 
jid :
(NULL to ignore) the JID in effect after connection is stored here.(NULL to ignore) the user JID from the server is stored here.
 

 

 
sid :
(NULL to ignore) the Session ID after connection is stored here.(NULL to ignore) the Session ID is stored here.
 

 

 
error :
(NULL to ignore) the GError (if any) is stored here.(NULL to ignore) the GError (if any) is sored here.
 

 

 
Returns :

 
 

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


self :
a WockyConnector instance.
cancellable :
an GCancellable, or NULL
-
cb :
a GAsyncReadyCallback to call when the operation completes.
user_data :
a gpointer to pass to the callback.

 

 

 

@@ -609,6 +567,55 @@
 

 

 

+
wocky_connector_register_finish ()

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

+

+Called by the callback passed to wocky_connector_register_async().
+

+

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


self :
a WockyConnector instance.
res :
a GAsyncResult (from your wocky_connector_register_async() callback).
jid :
(NULL to ignore) the JID in effect after connection is stored here.
sid :
(NULL to ignore) the Session ID after connection is stored here.
error :
(NULL to ignore) the GError (if any) is stored here.
Returns :
a WockyXmppConnection instance (success), or NULL (failure).

+

+

+

+
wocky_connector_set_auth_registry ()

+
void                wocky_connector_set_auth_registry   (WockyConnector *self,
+                                                         WockyAuthRegistry *registry);

+

+

+

+

+

 
wocky_connector_unregister_async ()

 
void                wocky_connector_unregister_async    (WockyConnector *self,
                                                          GCancellable *cancellable,
@@ -673,25 +680,10 @@
 
 

 

-

-

-
wocky_connector_set_auth_registry ()

-
void                wocky_connector_set_auth_registry   (WockyConnector *self,
-                                                         WockyAuthRegistry *registry);

-

-

-

-

-

-
WockyConnectorPrivate

-
typedef struct _WockyConnectorPrivate WockyConnectorPrivate;

-

-

-

 

 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyContactFactory.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyContactFactory.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyContactFactory.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyContactFactory.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,31 +41,30 @@
 #include <wocky/wocky-contact-factory.h>
 
 struct              WockyContactFactoryClass;
-WockyContactFactory *  wocky_contact_factory_new        (void);
-WockyBareContact *  wocky_contact_factory_ensure_bare_contact
+void                wocky_contact_factory_add_ll_contact
                                                         (WockyContactFactory *factory,
-                                                         const gchar *bare_jid);
-WockyBareContact *  wocky_contact_factory_lookup_bare_contact
+                                                         WockyLLContact *contact);
+WockyBareContact *  wocky_contact_factory_ensure_bare_contact
                                                         (WockyContactFactory *factory,
                                                          const gchar *bare_jid);
-WockyResourceContact *  wocky_contact_factory_ensure_resource_contact
+WockyLLContact *    wocky_contact_factory_ensure_ll_contact
                                                         (WockyContactFactory *factory,
-                                                         const gchar *full_jid);
-WockyResourceContact *  wocky_contact_factory_lookup_resource_contact
+                                                         const gchar *jid);
+WockyResourceContact * wocky_contact_factory_ensure_resource_contact
                                                         (WockyContactFactory *factory,
                                                          const gchar *full_jid);
-WockyLLContact *    wocky_contact_factory_ensure_ll_contact
+GList *             wocky_contact_factory_get_ll_contacts
+                                                        (WockyContactFactory *factory);
+WockyBareContact *  wocky_contact_factory_lookup_bare_contact
                                                         (WockyContactFactory *factory,
-                                                         const gchar *jid);
+                                                         const gchar *bare_jid);
 WockyLLContact *    wocky_contact_factory_lookup_ll_contact
                                                         (WockyContactFactory *factory,
                                                          const gchar *jid);
-void                wocky_contact_factory_add_ll_contact
+WockyResourceContact * wocky_contact_factory_lookup_resource_contact
                                                         (WockyContactFactory *factory,
-                                                         WockyLLContact *contact);
-GList *             wocky_contact_factory_get_ll_contacts
-                                                        (WockyContactFactory *factory);
-                    WockyContactFactoryPrivate;
+                                                         const gchar *full_jid);
+WockyContactFactory * wocky_contact_factory_new         (void);
 
 
 

@@ -89,18 +88,26 @@
 

 

 

-
wocky_contact_factory_new ()

-
WockyContactFactory *  wocky_contact_factory_new        (void);

+
wocky_contact_factory_add_ll_contact ()

+
void                wocky_contact_factory_add_ll_contact
+                                                        (WockyContactFactory *factory,
+                                                         WockyLLContact *contact);

 

-Convenience function to create a new WockyContactFactory object.
+Adds contact to the contact factory.
 

 
-
-
-
+
+
+
+
+
+
+
-
+
+

 

Returns :
a newly created instance of WockyContactFactory
+
factory :
a WockyContactFactory instance
contact :
a WockyLLContact
 

 

 

 

@@ -135,13 +142,14 @@
 
 

 

-
wocky_contact_factory_lookup_bare_contact ()

-
WockyBareContact *  wocky_contact_factory_lookup_bare_contact
+
wocky_contact_factory_ensure_ll_contact ()

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

+                                                         const gchar *jid);

 

-Looks up if there's a WockyBareContact for bare_jid in the cache, and
-returns it if it's found.
+Returns an instance of WockyLLContact for jid.
+The factory cache is used, but if the contact is not found in the cache,
+a new WockyLLContact is created and cached for future use.
 

 
@@ -151,14 +159,13 @@
 
-
-
+
+
-
+

 

a WockyContactFactory instance
 

 
bare_jid :
the JID of a bare contact
jid :
the JID of a contact
 

 

 
Returns :
a borrowed WockyBareContact instance (which the caller should
-reference with g_object_ref() if it will be kept), or NULL if the
-contact is not found.a new reference to a WockyLLContact instance, which the
+caller is expected to release with g_object_unref() after use.
 

 
 

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

 

 
wocky_contact_factory_ensure_resource_contact ()

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

 

@@ -195,13 +202,11 @@
 

 

 

-
wocky_contact_factory_lookup_resource_contact ()

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

+
wocky_contact_factory_get_ll_contacts ()

+
GList *             wocky_contact_factory_get_ll_contacts
+                                                        (WockyContactFactory *factory);

 

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

 
@@ -211,28 +216,22 @@
 
-
-
-
-
-
+

 

a WockyContactFactory instance
 

 
full_jid :
the full JID of a resource

 
Returns :
a borrowed WockyResourceContact instance (which the caller should
-reference with g_object_ref() if it will be kept), or NULL if the
-contact is not found.a newly allocated GList of WockyLLContacts which
+should be freed using g_list_free().
 

 
 

 

 

 

-
wocky_contact_factory_ensure_ll_contact ()

-
WockyLLContact *    wocky_contact_factory_ensure_ll_contact
+
wocky_contact_factory_lookup_bare_contact ()

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

+                                                         const gchar *bare_jid);

 

-Returns an instance of WockyLLContact for jid.
-The factory cache is used, but if the contact is not found in the cache,
-a new WockyLLContact is created and cached for future use.
+Looks up if there's a WockyBareContact for bare_jid in the cache, and
+returns it if it's found.
 

 
@@ -242,13 +241,14 @@
 
-
-
+
+
-
+

 

a WockyContactFactory instance
 

 
jid :
the JID of a contact
bare_jid :
the JID of a bare contact
 

 

 
Returns :
a new reference to a WockyLLContact instance, which the
-caller is expected to release with g_object_unref() after use.a borrowed WockyBareContact instance (which the caller should
+reference with g_object_ref() if it will be kept), or NULL if the
+contact is not found.
 

 
 

@@ -285,12 +285,13 @@
 

 

 

-
wocky_contact_factory_add_ll_contact ()

-
void                wocky_contact_factory_add_ll_contact
+
wocky_contact_factory_lookup_resource_contact ()

+
WockyResourceContact * wocky_contact_factory_lookup_resource_contact
                                                         (WockyContactFactory *factory,
-                                                         WockyLLContact *contact);

+                                                         const gchar *full_jid);

 

-Adds contact to the contact factory.
+Looks up if there's a WockyResourceContact for full_jid in the cache, and
+returns it if it's found.
 

 
@@ -300,47 +301,38 @@
 
-
-
+
+
+
+
+
+

 

a WockyContactFactory instance
 

 
contact :
a WockyLLContact
-
full_jid :
the full JID of a resource
Returns :
a borrowed WockyResourceContact instance (which the caller should
+reference with g_object_ref() if it will be kept), or NULL if the
+contact is not found.
 

 
 

 

 

 

-
wocky_contact_factory_get_ll_contacts ()

-
GList *             wocky_contact_factory_get_ll_contacts
-                                                        (WockyContactFactory *factory);

+
wocky_contact_factory_new ()

+
WockyContactFactory * wocky_contact_factory_new         (void);

 

-
+Convenience function to create a new WockyContactFactory object.
 

 
-
-
-
-
-
-
+
-
-
-
+
+

 

factory :
a WockyContactFactory instance

 
Returns :
a newly allocated GList of WockyLLContacts which
-should be freed using g_list_free().
a newly created instance of WockyContactFactory
+

 

 

-

-

-
WockyContactFactoryPrivate

-
typedef struct _WockyContactFactoryPrivate WockyContactFactoryPrivate;

-

-

-

 

 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-data-form-enumtypes.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-data-form-enumtypes.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-data-form-enumtypes.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-data-form-enumtypes.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,11 +37,7 @@
 
 

 
Synopsis

-
GType               wocky_data_form_field_type_get_type (void);
-#define             WOCKY_TYPE_DATA_FORM_FIELD_TYPE
-GType               wocky_data_form_error_get_type      (void);
-#define             WOCKY_TYPE_DATA_FORM_ERROR
-

+

 

 

 
Description

@@ -50,39 +46,10 @@
 

 

 
Details

-

-
wocky_data_form_field_type_get_type ()

-
GType               wocky_data_form_field_type_get_type (void);

-

-

-

-

-

-
WOCKY_TYPE_DATA_FORM_FIELD_TYPE

-
#define WOCKY_TYPE_DATA_FORM_FIELD_TYPE (wocky_data_form_field_type_get_type())
-

-

-

-

-

-

-
wocky_data_form_error_get_type ()

-
GType               wocky_data_form_error_get_type      (void);

-

-

-

-

-

-
WOCKY_TYPE_DATA_FORM_ERROR

-
#define WOCKY_TYPE_DATA_FORM_ERROR (wocky_data_form_error_get_type())
-

-

-

-

 

 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyDataForm.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyDataForm.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyDataForm.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyDataForm.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -39,22 +39,29 @@
 
 

 
Synopsis

-
+
 #include <wocky/wocky-data-form.h>
 
-enum                WockyDataFormFieldType;
-struct              WockyDataFormFieldOption;
-struct              WockyDataFormField;
-enum                WockyDataFormError;
-GQuark              wocky_data_form_error_quark         (void);
 #define             WOCKY_DATA_FORM_ERROR
 struct              WockyDataFormClass;
+enum                WockyDataFormError;
+struct              WockyDataFormField;
+struct              WockyDataFormFieldOption;
+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,
+                                                         const WockyDataFormField *right);
+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);
 WockyDataForm *     wocky_data_form_new_from_node       (WockyNode *x,
                                                          GError **error);
-gboolean            wocky_data_form_set_type            (WockyDataForm *self,
-                                                         const gchar *form_type);
+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,
@@ -67,29 +74,21 @@
                                                          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);
-gboolean            wocky_data_form_parse_result        (WockyDataForm *self,
-                                                         WockyNode *node,
-                                                         GError **error);
-const gchar *       wocky_data_form_get_title           (WockyDataForm *self);
-const gchar *       wocky_data_form_get_instructions    (WockyDataForm *self);
-gint                wocky_data_form_field_cmp           (const WockyDataFormField *left,
-                                                         const WockyDataFormField *right);
-void                wocky_data_form_add_to_node         (WockyDataForm *self,
-                                                         WockyNode *node);
-                    WockyDataFormPrivate;
 

 

 

 
Object Hierarchy

 
   GEnum
-   +----WockyDataFormFieldType
+   +----WockyDataFormError
 

 
   GEnum
-   +----WockyDataFormError
+   +----WockyDataFormFieldType
 

 

 

@@ -102,110 +101,45 @@
 

 
Details

 

-
enum WockyDataFormFieldType

-
typedef enum
-{
-  WOCKY_DATA_FORM_FIELD_TYPE_UNSPECIFIED, /*< skip >*/
-  WOCKY_DATA_FORM_FIELD_TYPE_BOOLEAN,
-  WOCKY_DATA_FORM_FIELD_TYPE_FIXED,
-  WOCKY_DATA_FORM_FIELD_TYPE_HIDDEN,
-  WOCKY_DATA_FORM_FIELD_TYPE_JID_MULTI,
-  WOCKY_DATA_FORM_FIELD_TYPE_JID_SINGLE,
-  WOCKY_DATA_FORM_FIELD_TYPE_LIST_MULTI,
-  WOCKY_DATA_FORM_FIELD_TYPE_LIST_SINGLE,
-  WOCKY_DATA_FORM_FIELD_TYPE_TEXT_MULTI,
-  WOCKY_DATA_FORM_FIELD_TYPE_TEXT_PRIVATE,
-  WOCKY_DATA_FORM_FIELD_TYPE_TEXT_SINGLE
-} WockyDataFormFieldType;
+
WOCKY_DATA_FORM_ERROR

+
#define WOCKY_DATA_FORM_ERROR (wocky_data_form_error_quark ())
 

 

-Data form field types, as documented in XEP-0004 §3.3.
 

-

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


WOCKY_DATA_FORM_FIELD_TYPE_UNSPECIFIED
Unspecified field type
-
WOCKY_DATA_FORM_FIELD_TYPE_BOOLEAN
Boolean field type
-
WOCKY_DATA_FORM_FIELD_TYPE_FIXED
Fixed description field type
-
WOCKY_DATA_FORM_FIELD_TYPE_HIDDEN
Hidden field type
-
WOCKY_DATA_FORM_FIELD_TYPE_JID_MULTI
A list of multiple JIDs
-
WOCKY_DATA_FORM_FIELD_TYPE_JID_SINGLE
A single JID
-
WOCKY_DATA_FORM_FIELD_TYPE_LIST_MULTI
Many options to choose one
-  or more from
-
WOCKY_DATA_FORM_FIELD_TYPE_LIST_SINGLE
Many options to choose one
-  from
-
WOCKY_DATA_FORM_FIELD_TYPE_TEXT_MULTI
Multiple lines of text
-
WOCKY_DATA_FORM_FIELD_TYPE_TEXT_PRIVATE
A single line of text
-  that should be obscured (by, say, asterisks)
-
WOCKY_DATA_FORM_FIELD_TYPE_TEXT_SINGLE
A single line of text
-

 

 

 

-
struct WockyDataFormFieldOption

-
struct WockyDataFormFieldOption {
-  gchar *label;
-  gchar *value;
+
struct WockyDataFormClass

+
struct WockyDataFormClass {
 };
 

 

-A single data form field option.
+The class of a WockyDataForm.
+

+

+

+

+
enum WockyDataFormError

+
typedef enum {
+  WOCKY_DATA_FORM_ERROR_NOT_FORM,
+  WOCKY_DATA_FORM_ERROR_WRONG_TYPE,
+} WockyDataFormError;
+

+

+WockyDataForm specific errors.
 

 

-
-
+
+
-
-
+
+

 
 
 
gchar *label;
the option label
WOCKY_DATA_FORM_ERROR_NOT_FORM
Node is not a data form
+
 

 
gchar *value;
the option value
WOCKY_DATA_FORM_ERROR_WRONG_TYPE
Data form is of the wrong type
+
 

 
 

@@ -281,26 +215,108 @@
 

 

 

-
enum WockyDataFormError

+
struct WockyDataFormFieldOption

+
struct WockyDataFormFieldOption {
+  gchar *label;
+  gchar *value;
+};
+

+

+A single data form field option.
+

+

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


gchar *label;
the option label
gchar *value;
the option value

+

+

+

+
enum WockyDataFormFieldType

 
typedef enum {
-  WOCKY_DATA_FORM_ERROR_NOT_FORM,
-  WOCKY_DATA_FORM_ERROR_WRONG_TYPE,
-} WockyDataFormError;
+  WOCKY_DATA_FORM_FIELD_TYPE_UNSPECIFIED, /*< skip >*/
+  WOCKY_DATA_FORM_FIELD_TYPE_BOOLEAN,
+  WOCKY_DATA_FORM_FIELD_TYPE_FIXED,
+  WOCKY_DATA_FORM_FIELD_TYPE_HIDDEN,
+  WOCKY_DATA_FORM_FIELD_TYPE_JID_MULTI,
+  WOCKY_DATA_FORM_FIELD_TYPE_JID_SINGLE,
+  WOCKY_DATA_FORM_FIELD_TYPE_LIST_MULTI,
+  WOCKY_DATA_FORM_FIELD_TYPE_LIST_SINGLE,
+  WOCKY_DATA_FORM_FIELD_TYPE_TEXT_MULTI,
+  WOCKY_DATA_FORM_FIELD_TYPE_TEXT_PRIVATE,
+  WOCKY_DATA_FORM_FIELD_TYPE_TEXT_SINGLE
+} WockyDataFormFieldType;
 

 

-WockyDataForm specific errors.
+Data form field types, as documented in XEP-0004 §3.3.
 

 

-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -308,6 +324,35 @@
 

+
wocky_data_form_add_to_node ()

+
void                wocky_data_form_add_to_node         (WockyDataForm *self,
+                                                         WockyNode *node);

+

+Adds a node tree with default values of self based on the defaults
+set on each field when first created.
+

+

+This function is for adding a data form to an existing node, like
+the query node of a disco response. wocky_data_form_submit(), in
+contrast, is for adding a node tree which submits the data form
+based on the current values set on its fields.
+

+

 
 
 
WOCKY_DATA_FORM_ERROR_NOT_FORM
Node is not a data form
+
WOCKY_DATA_FORM_FIELD_TYPE_UNSPECIFIED
Unspecified field type
 
 

 
WOCKY_DATA_FORM_ERROR_WRONG_TYPE
Data form is of the wrong type
+
WOCKY_DATA_FORM_FIELD_TYPE_BOOLEAN
Boolean field type
+
WOCKY_DATA_FORM_FIELD_TYPE_FIXED
Fixed description field type
+
WOCKY_DATA_FORM_FIELD_TYPE_HIDDEN
Hidden field type
+
WOCKY_DATA_FORM_FIELD_TYPE_JID_MULTI
A list of multiple JIDs
+
WOCKY_DATA_FORM_FIELD_TYPE_JID_SINGLE
A single JID
+
WOCKY_DATA_FORM_FIELD_TYPE_LIST_MULTI
Many options to choose one
+  or more from
+
WOCKY_DATA_FORM_FIELD_TYPE_LIST_SINGLE
Many options to choose one
+  from
+
WOCKY_DATA_FORM_FIELD_TYPE_TEXT_MULTI
Multiple lines of text
+
WOCKY_DATA_FORM_FIELD_TYPE_TEXT_PRIVATE
A single line of text
+  that should be obscured (by, say, asterisks)
+
WOCKY_DATA_FORM_FIELD_TYPE_TEXT_SINGLE
A single line of text
 
 

 
 
 

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


self :
the WockyDataForm object
node :
a node to which to add the form

+

+

+

 
wocky_data_form_error_quark ()

 
GQuark              wocky_data_form_error_quark         (void);

 

@@ -315,20 +360,24 @@
 

 

 

-
WOCKY_DATA_FORM_ERROR

-
#define WOCKY_DATA_FORM_ERROR (wocky_data_form_error_quark ())
-

+
wocky_data_form_field_cmp ()

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

 

 

 

 

 

-
struct WockyDataFormClass

-
struct WockyDataFormClass {
-};
-

+
wocky_data_form_get_instructions ()

+
const gchar *       wocky_data_form_get_instructions    (WockyDataForm *self);

+

+

+

+

+

+
wocky_data_form_get_title ()

+
const gchar *       wocky_data_form_get_title           (WockyDataForm *self);

 

-The class of a WockyDataForm.
 

 

 

@@ -349,35 +398,12 @@
 

 

 

-
wocky_data_form_set_type ()

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

+
wocky_data_form_parse_result ()

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

 

-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
-submission.
 

-

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


self :
a WockyDataForm
-
form_type :
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
-type.

 

 

 

@@ -438,98 +464,63 @@
 

 

 

-
wocky_data_form_submit ()

-
void                wocky_data_form_submit              (WockyDataForm *self,
-                                                         WockyNode *node);

+
wocky_data_form_set_type ()

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

 

-Adds a node tree which submits self based on the current values set on
-self's fields.
+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
+submission.
 

 

-
+
-
-
+
+
+
+
+
+

 
 
 

 
self :
a data forma WockyDataForm
+
 

 
node :
a node to which to add a form submission
form_type :
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
+type.
 

 
 

 

 

 

-
wocky_data_form_parse_result ()

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

-

-

-

-

-

-
wocky_data_form_get_title ()

-
const gchar *       wocky_data_form_get_title           (WockyDataForm *self);

-

-

-

-

-

-
wocky_data_form_get_instructions ()

-
const gchar *       wocky_data_form_get_instructions    (WockyDataForm *self);

-

-

-

-

-

-
wocky_data_form_field_cmp ()

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

-

-

-

-

-

-
wocky_data_form_add_to_node ()

-
void                wocky_data_form_add_to_node         (WockyDataForm *self,
+
wocky_data_form_submit ()

+
void                wocky_data_form_submit              (WockyDataForm *self,
                                                          WockyNode *node);

 

-Adds a node tree with default values of self based on the defaults
-set on each field when first created.
-

-

-This function is for adding a data form to an existing node, like
-the query node of a disco response. wocky_data_form_submit(), in
-contrast, is for adding a node tree which submits the data form
-based on the current values set on its fields.
+Adds a node tree which submits self based on the current values set on
+self's fields.
 

 

-
+
-
+

 
 
 

 
self :
the WockyDataForm objecta data form
 

 

 
node :
a node to which to add the forma node to which to add a form submission
 

 
 

 

-

-

-
WockyDataFormPrivate

-
typedef struct _WockyDataFormPrivate WockyDataFormPrivate;

-

-

-

 

 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-debug.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-debug.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-debug.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-debug.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,36 +37,34 @@
 
 

 
Synopsis

-
enum                WockyDebugFlags;
+
#define             DEBUG                               (format,
+                                                         ...)
+#define             DEBUGGING
+#define             DEBUG_NODE_TREE                     (tree,
+                                                         format,
+                                                         ...)
+#define             DEBUG_STANZA                        (stanza,
+                                                         format,
+                                                         ...)
 #define             DEBUG_XMPP
-void                wocky_debug_set_flags_from_env      (void);
-void                wocky_debug_set_flags               (WockyDebugFlags flags);
-gboolean            wocky_debug_flag_is_set             (WockyDebugFlags flag);
-void                wocky_debug_valist                  (WockyDebugFlags flag,
-                                                         const gchar *format,
-                                                         va_list args);
+enum                WockyDebugFlags;
 void                wocky_debug                         (WockyDebugFlags flag,
                                                          const gchar *format,
                                                          ...);
+gboolean            wocky_debug_flag_is_set             (WockyDebugFlags flag);
+void                wocky_debug_node_tree               (WockyDebugFlags flag,
+                                                         WockyNodeTree *tree,
+                                                         const gchar *format,
+                                                         ...);
+void                wocky_debug_set_flags               (WockyDebugFlags flags);
+void                wocky_debug_set_flags_from_env      (void);
 void                wocky_debug_stanza                  (WockyDebugFlags flag,
                                                          WockyStanza *stanza,
                                                          const gchar *format,
                                                          ...);
-void                wocky_debug_node_tree               (WockyDebugFlags flag,
-                                                         WockyNodeTree *tree,
+void                wocky_debug_valist                  (WockyDebugFlags flag,
                                                          const gchar *format,
-                                                         ...);
-#define             DEBUG                               (format,
-                                                         ...)
-#define             DEBUG_STANZA                        (stanza,
-                                                         format,
-                                                         ...)
-#define             DEBUG_NODE_TREE                     (tree,
-                                                         format,
-                                                         ...)
-#define             DEBUGGING
-#define             NODE_DEBUG                          (n,
-                                                         s)
+                                                         va_list args);
 

 

 

@@ -77,71 +75,47 @@
 

 
Details

 

-
enum WockyDebugFlags

-
typedef enum
-{
-  /*< private > */
-  DEBUG_TRANSPORT         = 1 << 0,
-  DEBUG_NET               = 1 << 1,
-  DEBUG_XMPP_READER       = 1 << 2,
-  DEBUG_XMPP_WRITER       = 1 << 3,
-  DEBUG_AUTH              = 1 << 4,
-  DEBUG_SSL               = 1 << 5,
-  DEBUG_RMULTICAST        = 1 << 6,
-  DEBUG_RMULTICAST_SENDER = 1 << 7,
-  DEBUG_MUC_CONNECTION    = 1 << 8,
-  DEBUG_BYTESTREAM        = 1 << 9,
-  DEBUG_FILE_TRANSFER     = 1 << 10,
-  DEBUG_PORTER            = 1 << 11,
-  DEBUG_CONNECTOR         = 1 << 12,
-  DEBUG_ROSTER            = 1 << 13,
-  DEBUG_TLS               = 1 << 14,
-  DEBUG_PUBSUB            = 1 << 15,
-  DEBUG_DATA_FORM         = 1 << 16,
-  DEBUG_PING              = 1 << 17,
-  DEBUG_HEARTBEAT         = 1 << 18,
-  DEBUG_PRESENCE          = 1 << 19,
-  DEBUG_CONNECTION_FACTORY= 1 << 20,
-} WockyDebugFlags;
-

+
DEBUG()

+
#define             DEBUG(format, ...)

 

 

 

 

 

-
DEBUG_XMPP

-
#define DEBUG_XMPP (DEBUG_XMPP_READER | DEBUG_XMPP_WRITER)
+
DEBUGGING

+
#define DEBUGGING wocky_debug_flag_is_set(DEBUG_FLAG)
 

 

 

 

 

 

-
wocky_debug_set_flags_from_env ()

-
void                wocky_debug_set_flags_from_env      (void);

+
DEBUG_NODE_TREE()

+
#define             DEBUG_NODE_TREE(tree, format, ...)

 

 

 

 

 

-
wocky_debug_set_flags ()

-
void                wocky_debug_set_flags               (WockyDebugFlags flags);

+
DEBUG_STANZA()

+
#define             DEBUG_STANZA(stanza, format, ...)

 

 

 

 

 

-
wocky_debug_flag_is_set ()

-
gboolean            wocky_debug_flag_is_set             (WockyDebugFlags flag);

+
DEBUG_XMPP

+
#define DEBUG_XMPP (DEBUG_XMPP_READER | DEBUG_XMPP_WRITER)
+

 

 

 

 

 

-
wocky_debug_valist ()

-
void                wocky_debug_valist                  (WockyDebugFlags flag,
-                                                         const gchar *format,
-                                                         va_list args);

+
enum WockyDebugFlags

+
typedef enum {
+} WockyDebugFlags;
+

 

 

 

@@ -156,11 +130,8 @@
 

 

 

-
wocky_debug_stanza ()

-
void                wocky_debug_stanza                  (WockyDebugFlags flag,
-                                                         WockyStanza *stanza,
-                                                         const gchar *format,
-                                                         ...);

+
wocky_debug_flag_is_set ()

+
gboolean            wocky_debug_flag_is_set             (WockyDebugFlags flag);

 

 

 

@@ -176,37 +147,34 @@
 

 

 

-
DEBUG()

-
#define             DEBUG(format, ...)

-

-

-

-

-

-
DEBUG_STANZA()

-
#define             DEBUG_STANZA(stanza, format, ...)

+
wocky_debug_set_flags ()

+
void                wocky_debug_set_flags               (WockyDebugFlags flags);

 

 

 

 

 

-
DEBUG_NODE_TREE()

-
#define             DEBUG_NODE_TREE(tree, format, ...)

+
wocky_debug_set_flags_from_env ()

+
void                wocky_debug_set_flags_from_env      (void);

 

 

 

 

 

-
DEBUGGING

-
#define DEBUGGING wocky_debug_flag_is_set(DEBUG_FLAG)
-

+
wocky_debug_stanza ()

+
void                wocky_debug_stanza                  (WockyDebugFlags flag,
+                                                         WockyStanza *stanza,
+                                                         const gchar *format,
+                                                         ...);

 

 

 

 

 

-
NODE_DEBUG()

-
#define             NODE_DEBUG(n, s)

+
wocky_debug_valist ()

+
void                wocky_debug_valist                  (WockyDebugFlags flag,
+                                                         const gchar *format,
+                                                         va_list args);

 

 

 

@@ -214,6 +182,6 @@
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-Wocky-GnuTLS-TLS.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-Wocky-GnuTLS-TLS.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-Wocky-GnuTLS-TLS.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-Wocky-GnuTLS-TLS.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,23 +41,19 @@
 
 

 
Synopsis

-
#define             WOCKY_TYPE_TLS_CONNECTION
-#define             WOCKY_TYPE_TLS_SESSION
-#define             WOCKY_TLS_SESSION                   (inst)
-#define             WOCKY_TLS_CONNECTION                (inst)
-enum                WockyTLSVerificationLevel;
+
#define             WOCKY_TLS_CERT_ERROR
+#define             WOCKY_TLS_ERROR
+enum                WockyTLSCertStatus;
+enum                WockyTLSCertType;
+                    WockyTLSConnection;
+                    WockyTLSSession;
+enum                WockyTLSVerificationLevel;
 GQuark              wocky_tls_cert_error_quark          (void);
-#define             WOCKY_TLS_CERT_ERROR
 GQuark              wocky_tls_error_quark               (void);
-#define             WOCKY_TLS_ERROR
-enum                WockyTLSCertStatus;
-enum                WockyTLSCertType;
-GType               wocky_tls_connection_get_type       (void);
-GType               wocky_tls_session_get_type          (void);
-int                 wocky_tls_session_verify_peer       (WockyTLSSession *session,
-                                                         const gchar *peername,
-                                                         WockyTLSVerificationLevel level,
-                                                         WockyTLSCertStatus *status);
+void                wocky_tls_session_add_ca            (WockyTLSSession *session,
+                                                         const gchar *path);
+void                wocky_tls_session_add_crl           (WockyTLSSession *session,
+                                                         const gchar *path);
 GPtrArray *         wocky_tls_session_get_peers_certificate
                                                         (WockyTLSSession *session,
                                                          WockyTLSCertType *type);
@@ -72,27 +68,22 @@
 WockyTLSConnection * wocky_tls_session_handshake_finish (WockyTLSSession *session,
                                                          GAsyncResult *result,
                                                          GError **error);
-void                wocky_tls_session_add_ca            (WockyTLSSession *session,
-                                                         const gchar *path);
-void                wocky_tls_session_add_crl           (WockyTLSSession *session,
-                                                         const gchar *path);
 WockyTLSSession *   wocky_tls_session_new               (GIOStream *stream);
 WockyTLSSession *   wocky_tls_session_server_new        (GIOStream *stream,
                                                          guint dhbits,
                                                          const gchar *key,
                                                          const gchar *cert);
-                    WockyTLSSession;
-                    WockyTLSConnection;
+int                 wocky_tls_session_verify_peer       (WockyTLSSession *session,
+                                                         const gchar *peername,
+                                                         GStrv extra_identities,
+                                                         WockyTLSVerificationLevel level,
+                                                         WockyTLSCertStatus *status);
 

 

 

 
Object Hierarchy

 
   GEnum
-   +----WockyTLSVerificationLevel
-

-
-  GEnum
    +----WockyTLSCertStatus
 

 
@@ -101,23 +92,27 @@
 

 
   GObject
-   +----WockyTLSSession
+   +----GIOStream
+         +----WockyTLSConnection
 

 
   GObject
-   +----GIOStream
-         +----WockyTLSConnection
+   +----WockyTLSSession
+

+
+  GEnum
+   +----WockyTLSVerificationLevel
 

 

 

 
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
-  "session"                  WockyTLSSession*      : Write / Construct Only
 

 

 

@@ -142,56 +137,6 @@
 

 
Details

 

-
WOCKY_TYPE_TLS_CONNECTION

-
#define WOCKY_TYPE_TLS_CONNECTION (wocky_tls_connection_get_type ())
-

-

-

-

-

-

-
WOCKY_TYPE_TLS_SESSION

-
#define WOCKY_TYPE_TLS_SESSION    (wocky_tls_session_get_type ())
-

-

-

-

-

-

-
WOCKY_TLS_SESSION()

-
#define             WOCKY_TLS_SESSION(inst)

-

-

-

-

-

-
WOCKY_TLS_CONNECTION()

-
#define             WOCKY_TLS_CONNECTION(inst)

-

-

-

-

-

-
enum WockyTLSVerificationLevel

-
typedef enum
-{
-  WOCKY_TLS_VERIFY_STRICT = 0,
-  WOCKY_TLS_VERIFY_NORMAL,
-  WOCKY_TLS_VERIFY_LENIENT,
-} WockyTLSVerificationLevel;
-

-

-

-

-

-

-
wocky_tls_cert_error_quark ()

-
GQuark              wocky_tls_cert_error_quark          (void);

-

-

-

-

-

 
WOCKY_TLS_CERT_ERROR

 
#define WOCKY_TLS_CERT_ERROR (wocky_tls_cert_error_quark ())
 

@@ -200,13 +145,6 @@
 

 

 

-
wocky_tls_error_quark ()

-
GQuark              wocky_tls_error_quark               (void);

-

-

-

-

-

 
WOCKY_TLS_ERROR

 
#define WOCKY_TLS_ERROR (wocky_tls_error_quark ())
 

@@ -215,9 +153,8 @@
 

 

 

-
enum WockyTLSCertStatus

-
typedef enum
-{
+
enum WockyTLSCertStatus

+
typedef enum {
   WOCKY_TLS_CERT_OK = 0,
   WOCKY_TLS_CERT_INVALID,
   WOCKY_TLS_CERT_NAME_MISMATCH,
@@ -238,9 +175,8 @@
 

 

 

-
enum WockyTLSCertType

-
typedef enum
-{
+
enum WockyTLSCertType

+
typedef enum {
   WOCKY_TLS_CERT_TYPE_NONE = 0,
   WOCKY_TLS_CERT_TYPE_X509,
   WOCKY_TLS_CERT_TYPE_OPENPGP,
@@ -251,25 +187,57 @@
 

 

 

-
wocky_tls_connection_get_type ()

-
GType               wocky_tls_connection_get_type       (void);

+
WockyTLSConnection

+
typedef struct _WockyTLSConnection WockyTLSConnection;

+

+

+

+

+

+
WockyTLSSession

+
typedef struct _WockyTLSSession WockyTLSSession;

+

+

+

+

+

+
enum WockyTLSVerificationLevel

+
typedef enum {
+  WOCKY_TLS_VERIFY_STRICT = 0,
+  WOCKY_TLS_VERIFY_NORMAL,
+  WOCKY_TLS_VERIFY_LENIENT,
+} WockyTLSVerificationLevel;
+

+

+

+

+

+

+
wocky_tls_cert_error_quark ()

+
GQuark              wocky_tls_cert_error_quark          (void);

 

 

 

 

 

-
wocky_tls_session_get_type ()

-
GType               wocky_tls_session_get_type          (void);

+
wocky_tls_error_quark ()

+
GQuark              wocky_tls_error_quark               (void);

 

 

 

 

 

-
wocky_tls_session_verify_peer ()

-
int                 wocky_tls_session_verify_peer       (WockyTLSSession *session,
-                                                         const gchar *peername,
-                                                         WockyTLSVerificationLevel level,
-                                                         WockyTLSCertStatus *status);

+
wocky_tls_session_add_ca ()

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

+

+

+

+

+

+
wocky_tls_session_add_crl ()

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

 

 

 

@@ -313,22 +281,6 @@
 

 

 

-
wocky_tls_session_add_ca ()

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

-

-

-

-

-

-
wocky_tls_session_add_crl ()

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

-

-

-

-

-

 
wocky_tls_session_new ()

 
WockyTLSSession *   wocky_tls_session_new               (GIOStream *stream);

 

@@ -372,15 +324,12 @@
 

 

 

-
WockyTLSSession

-
typedef struct _WockyTLSSession WockyTLSSession;

-

-

-

-

-

-
WockyTLSConnection

-
typedef struct _WockyTLSConnection WockyTLSConnection;

+
wocky_tls_session_verify_peer ()

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

 

 

 

@@ -388,6 +337,12 @@
 

 
Property Details

 

+
The "session" property

+
  "session"                  WockyTLSSession*      : Write / Construct Only

+
the TLS session object for this connection.

+

+

+

 
The "base-stream" property

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

 
the stream that TLS communicates over.

@@ -421,16 +376,10 @@
 
x509 PEM key file.

 
Default value: NULL

 

-

-

-
The "session" property

-
  "session"                  WockyTLSSession*      : Write / Construct Only

-
the TLS session object for this connection.

-

 

 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-heartbeat-source.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-heartbeat-source.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-heartbeat-source.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-heartbeat-source.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -118,6 +118,6 @@
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,8 +37,8 @@
 
 

 
Synopsis

-
void                wocky_init                          (void);
-void                wocky_deinit                        (void);
+
void                wocky_deinit                        (void);
+void                wocky_init                          (void);
 

 

 

@@ -49,17 +49,6 @@
 

 
Details

 

-
wocky_init ()

-
void                wocky_init                          (void);

-

-Initializes the Wocky library.
-

-

-This function should be called before calling any other Wocky functions.
-

-

-

-

 
wocky_deinit ()

 
void                wocky_deinit                        (void);

 

@@ -75,10 +64,21 @@
 After this call Wocky (including this method) should not be used anymore.
 

 

+

+

+
wocky_init ()

+
void                wocky_init                          (void);

+

+Initializes the Wocky library.
+

+

+This function should be called before calling any other Wocky functions.
+

+

 

 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-http-proxy.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-http-proxy.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-http-proxy.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-http-proxy.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -82,6 +82,6 @@
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-digest.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-digest.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-digest.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-digest.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -39,7 +39,6 @@
 
Synopsis

 
WockyJabberAuthDigest * wocky_jabber_auth_digest_new    (const gchar *server,
                                                          const gchar *password);
-                    WockyJabberAuthDigestPrivate;
 

 
 

@@ -56,17 +55,10 @@
 

 

 

-

-

-
WockyJabberAuthDigestPrivate

-
typedef struct _WockyJabberAuthDigestPrivate WockyJabberAuthDigestPrivate;

-

-

-

 
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyJabberAuth.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyJabberAuth.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyJabberAuth.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyJabberAuth.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -38,12 +38,6 @@
 

 
Synopsis

 
struct              WockyJabberAuthClass;
-WockyJabberAuth *   wocky_jabber_auth_new               (const gchar *server,
-                                                         const gchar *username,
-                                                         const gchar *resource,
-                                                         const gchar *password,
-                                                         WockyXmppConnection *connection,
-                                                         WockyAuthRegistry *auth_registry);
 void                wocky_jabber_auth_add_handler       (WockyJabberAuth *self,
                                                          WockyAuthHandler *handler);
 void                wocky_jabber_auth_authenticate_async
@@ -57,7 +51,12 @@
                                                         (WockyJabberAuth *self,
                                                          GAsyncResult *result,
                                                          GError **error);
-                    WockyJabberAuthPrivate;
+WockyJabberAuth *   wocky_jabber_auth_new               (const gchar *server,
+                                                         const gchar *username,
+                                                         const gchar *resource,
+                                                         const gchar *password,
+                                                         WockyXmppConnection *connection,
+                                                         WockyAuthRegistry *auth_registry);
 

 

 

@@ -78,18 +77,6 @@
 

 

 

-
wocky_jabber_auth_new ()

-
WockyJabberAuth *   wocky_jabber_auth_new               (const gchar *server,
-                                                         const gchar *username,
-                                                         const gchar *resource,
-                                                         const gchar *password,
-                                                         WockyXmppConnection *connection,
-                                                         WockyAuthRegistry *auth_registry);

-

-

-

-

-

 
wocky_jabber_auth_add_handler ()

 
void                wocky_jabber_auth_add_handler       (WockyJabberAuth *self,
                                                          WockyAuthHandler *handler);

@@ -121,8 +108,13 @@
 

 

 

-
WockyJabberAuthPrivate

-
typedef struct _WockyJabberAuthPrivate WockyJabberAuthPrivate;

+
wocky_jabber_auth_new ()

+
WockyJabberAuth *   wocky_jabber_auth_new               (const gchar *server,
+                                                         const gchar *username,
+                                                         const gchar *resource,
+                                                         const gchar *password,
+                                                         WockyXmppConnection *connection,
+                                                         WockyAuthRegistry *auth_registry);

 

 

 

@@ -130,6 +122,6 @@
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-password.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-password.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-password.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-password.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -39,7 +39,6 @@
 
Synopsis

 
WockyJabberAuthPassword * wocky_jabber_auth_password_new
                                                         (const gchar *password);
-                    WockyJabberAuthPasswordPrivate;
 

 
 

@@ -56,17 +55,10 @@
 

 

 

-

-

-
WockyJabberAuthPasswordPrivate

-
typedef struct _WockyJabberAuthPasswordPrivate WockyJabberAuthPasswordPrivate;

-

-

-

 
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyMetaPorter.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyMetaPorter.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyMetaPorter.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyMetaPorter.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,19 +37,17 @@
 
 

 
Synopsis

-
enum                WockyMetaPorterError;
-GQuark              wocky_meta_porter_error_quark       (void);
-#define             WOCKY_META_PORTER_ERROR
+
#define             WOCKY_META_PORTER_ERROR
 struct              WockyMetaPorterClass;
-WockyPorter *       wocky_meta_porter_new               (const gchar *jid,
-                                                         WockyContactFactory *contact_factory);
-guint16             wocky_meta_porter_get_port          (WockyMetaPorter *porter);
+enum                WockyMetaPorterError;
+GSocketConnection * wocky_meta_porter_borrow_connection (WockyMetaPorter *porter,
+                                                         WockyLLContact *contact);
+GQuark              wocky_meta_porter_error_quark       (void);
+guint16             wocky_meta_porter_get_port          (WockyMetaPorter *porter);
 void                wocky_meta_porter_hold              (WockyMetaPorter *porter,
                                                          WockyContact *contact);
-void                wocky_meta_porter_unhold            (WockyMetaPorter *porter,
-                                                         WockyContact *contact);
-void                wocky_meta_porter_set_jid           (WockyMetaPorter *porter,
-                                                         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,
@@ -58,10 +56,10 @@
 gboolean            wocky_meta_porter_open_finish       (WockyMetaPorter *porter,
                                                          GAsyncResult *result,
                                                          GError **error);
-GSocketConnection *  wocky_meta_porter_borrow_connection
-                                                        (WockyMetaPorter *porter,
-                                                         WockyLLContact *contact);
-                    WockyMetaPorterPrivate;
+void                wocky_meta_porter_set_jid           (WockyMetaPorter *porter,
+                                                         const gchar *jid);
+void                wocky_meta_porter_unhold            (WockyMetaPorter *porter,
+                                                         WockyContact *contact);
 

 

 

@@ -72,74 +70,80 @@
 

 
Details

 

-
enum WockyMetaPorterError

-
typedef enum
-{
-  WOCKY_META_PORTER_ERROR_NO_CONTACT_ADDRESS,
-  WOCKY_META_PORTER_ERROR_FAILED_TO_CLOSE,
-} WockyMetaPorterError;
+
WOCKY_META_PORTER_ERROR

+
#define WOCKY_META_PORTER_ERROR (wocky_meta_porter_error_quark ())
 

 

 

 

 

 

-
wocky_meta_porter_error_quark ()

-
GQuark              wocky_meta_porter_error_quark       (void);

+
struct WockyMetaPorterClass

+
struct WockyMetaPorterClass {
+  GObjectClass parent_class;
+};
+

 

 

 

 

 

-
WOCKY_META_PORTER_ERROR

-
#define WOCKY_META_PORTER_ERROR (wocky_meta_porter_error_quark ())
+
enum WockyMetaPorterError

+
typedef enum {
+  WOCKY_META_PORTER_ERROR_NO_CONTACT_ADDRESS,
+  WOCKY_META_PORTER_ERROR_FAILED_TO_CLOSE,
+} WockyMetaPorterError;
 

 

 

 

 

 

-
struct WockyMetaPorterClass

-
struct WockyMetaPorterClass {
-  GObjectClass parent_class;
-};
-

+
wocky_meta_porter_borrow_connection ()

+
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.
 

-

-

-

-
wocky_meta_porter_new ()

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

 

-Convenience function to create a new WockyMetaPorter object. The
-JID can be set later by using wocky_meta_porter_set_jid().
+Note that the connection returned should be reffed using
+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.
 

 

-
-
+
-
-
+
+
-
+

 
 
 
jid :
the JID of the local user, or NULL
+
porter :
a WockyMetaPorter
 
 

 
contact_factory :
a WockyContactFactory object
contact :
the WockyContact
+
 

 

 
Returns :
a new WockyMetaPorter
-the GSocketConnection or NULL if no connection is open
 

 
 

 

 

 

+
wocky_meta_porter_error_quark ()

+
GQuark              wocky_meta_porter_error_quark       (void);

+

+

+

+

+

 
wocky_meta_porter_get_port ()

-
guint16             wocky_meta_porter_get_port          (WockyMetaPorter *porter);

+
guint16             wocky_meta_porter_get_port          (WockyMetaPorter *porter);

 

 Returns the port porter is listening in on for new incoming XMPP
 connections, or 0 if it has not been started yet with
@@ -195,54 +199,30 @@
 

 

 

-
wocky_meta_porter_unhold ()

-
void                wocky_meta_porter_unhold            (WockyMetaPorter *porter,
-                                                         WockyContact *contact);

+
wocky_meta_porter_new ()

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

 

-Decreases the hold count of the porter to contact by
-one. This means that if there is a connection open to contact and
-the hold count is zero, a connection timeout will be
-started.
+Convenience function to create a new WockyMetaPorter object. The
+JID can be set later by using wocky_meta_porter_set_jid().
 

 

-
-
+
-
-
+
+
-
-

 
 
 
porter :
a WockyMetaPorter
+
jid :
the JID of the local user, or NULL
 
 

 
contact :
a WockyContact
-
contact_factory :
a WockyContactFactory object
 

-

-

-

-
wocky_meta_porter_set_jid ()

-
void                wocky_meta_porter_set_jid           (WockyMetaPorter *porter,
-                                                         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
-wocky_meta_porter_new() when creating porter. Calling it again
-will be a no-op.
-

-

--
-
-
+
-
-
-
-


 
porter :
a WockyMetaPorter
+
Returns :
a new WockyMetaPorter
 
 
jid :
a new JID

 
 

 

@@ -333,20 +313,14 @@
 

 

 

-
wocky_meta_porter_borrow_connection ()

-
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.
-

+
wocky_meta_porter_set_jid ()

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

 

-Note that the connection returned should be reffed using
-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.
+Changes the local JID according to porter. Note that this function
+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.
 

 
@@ -357,28 +331,43 @@
 
-
-
-
-
-
-
+
+

 

 
 
contact :
the WockyContact
-
Returns :
the GSocketConnection or NULL if no connection is open
jid :
a new JID
 

 
 

 

 

 

-
WockyMetaPorterPrivate

-
typedef struct _WockyMetaPorterPrivate WockyMetaPorterPrivate;

+
wocky_meta_porter_unhold ()

+
void                wocky_meta_porter_unhold            (WockyMetaPorter *porter,
+                                                         WockyContact *contact);

 

+Decreases the hold count of the porter to contact by
+one. This means that if there is a connection open to contact and
+the hold count is zero, a connection timeout will be
+started.
 

+

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


porter :
a WockyMetaPorter
+
contact :
a WockyContact
+

 

 

 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-muc-enumtypes.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-muc-enumtypes.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-muc-enumtypes.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-muc-enumtypes.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,21 +37,7 @@
 
 

 
Synopsis

-
GType               wocky_muc_status_code_get_type      (void);
-#define             WOCKY_TYPE_MUC_STATUS_CODE
-GType               wocky_muc_role_get_type             (void);
-#define             WOCKY_TYPE_MUC_ROLE
-GType               wocky_muc_affiliation_get_type      (void);
-#define             WOCKY_TYPE_MUC_AFFILIATION
-GType               wocky_muc_feature_get_type          (void);
-#define             WOCKY_TYPE_MUC_FEATURE
-GType               wocky_muc_msg_type_get_type         (void);
-#define             WOCKY_TYPE_MUC_MSG_TYPE
-GType               wocky_muc_msg_state_get_type        (void);
-#define             WOCKY_TYPE_MUC_MSG_STATE
-GType               wocky_muc_state_get_type            (void);
-#define             WOCKY_TYPE_MUC_STATE
-

+

 

 

 
Description

@@ -60,114 +46,10 @@
 

 

 
Details

-

-
wocky_muc_status_code_get_type ()

-
GType               wocky_muc_status_code_get_type      (void);

-

-

-

-

-

-
WOCKY_TYPE_MUC_STATUS_CODE

-
#define WOCKY_TYPE_MUC_STATUS_CODE (wocky_muc_status_code_get_type())
-

-

-

-

-

-

-
wocky_muc_role_get_type ()

-
GType               wocky_muc_role_get_type             (void);

-

-

-

-

-

-
WOCKY_TYPE_MUC_ROLE

-
#define WOCKY_TYPE_MUC_ROLE (wocky_muc_role_get_type())
-

-

-

-

-

-

-
wocky_muc_affiliation_get_type ()

-
GType               wocky_muc_affiliation_get_type      (void);

-

-

-

-

-

-
WOCKY_TYPE_MUC_AFFILIATION

-
#define WOCKY_TYPE_MUC_AFFILIATION (wocky_muc_affiliation_get_type())
-

-

-

-

-

-

-
wocky_muc_feature_get_type ()

-
GType               wocky_muc_feature_get_type          (void);

-

-

-

-

-

-
WOCKY_TYPE_MUC_FEATURE

-
#define WOCKY_TYPE_MUC_FEATURE (wocky_muc_feature_get_type())
-

-

-

-

-

-

-
wocky_muc_msg_type_get_type ()

-
GType               wocky_muc_msg_type_get_type         (void);

-

-

-

-

-

-
WOCKY_TYPE_MUC_MSG_TYPE

-
#define WOCKY_TYPE_MUC_MSG_TYPE (wocky_muc_msg_type_get_type())
-

-

-

-

-

-

-
wocky_muc_msg_state_get_type ()

-
GType               wocky_muc_msg_state_get_type        (void);

-

-

-

-

-

-
WOCKY_TYPE_MUC_MSG_STATE

-
#define WOCKY_TYPE_MUC_MSG_STATE (wocky_muc_msg_state_get_type())
-

-

-

-

-

-

-
wocky_muc_state_get_type ()

-
GType               wocky_muc_state_get_type            (void);

-

-

-

-

-

-
WOCKY_TYPE_MUC_STATE

-
#define WOCKY_TYPE_MUC_STATE (wocky_muc_state_get_type())
-

-

-

-

 

 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyMuc.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyMuc.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyMuc.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyMuc.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -39,15 +39,19 @@
 
 

 
Synopsis

-
enum                WockyMucStatusCode;
-enum                WockyMucRole;
-enum                WockyMucAffiliation;
-enum                WockyMucFeature;
-enum                WockyMucMsgType;
-enum                WockyMucMsgState;
-enum                WockyMucState;
-                    WockyMucMember;
+
enum                WockyMucAffiliation;
 struct              WockyMucClass;
+enum                WockyMucFeature;
+                    WockyMucMember;
+enum                WockyMucMsgState;
+enum                WockyMucMsgType;
+enum                WockyMucRole;
+enum                WockyMucState;
+enum                WockyMucStatusCode;
+WockyMucAffiliation wocky_muc_affiliation               (WockyMuc *muc);
+WockyStanza *       wocky_muc_create_presence           (WockyMuc *muc,
+                                                         WockyStanzaSubType type,
+                                                         const gchar *status);
 void                wocky_muc_disco_info_async          (WockyMuc *muc,
                                                          GAsyncReadyCallback callback,
                                                          GCancellable *cancel,
@@ -55,9 +59,7 @@
 gboolean            wocky_muc_disco_info_finish         (WockyMuc *muc,
                                                          GAsyncResult *res,
                                                          GError **error);
-WockyStanza *       wocky_muc_create_presence           (WockyMuc *muc,
-                                                         WockyStanzaSubType type,
-                                                         const gchar *status);
+WockyMucState       wocky_muc_get_state                 (WockyMuc *muc);
 void                wocky_muc_initiate_async            (WockyMuc *muc,
                                                          GAsyncReadyCallback callback,
                                                          GCancellable *cancel,
@@ -65,29 +67,18 @@
 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);
-const gchar *       wocky_muc_jid                       (WockyMuc *muc);
-const gchar *       wocky_muc_user                      (WockyMuc *muc);
-WockyMucRole        wocky_muc_role                      (WockyMuc *muc);
-WockyMucAffiliation  wocky_muc_affiliation              (WockyMuc *muc);
 GHashTable *        wocky_muc_members                   (WockyMuc *muc);
-WockyMucState       wocky_muc_get_state                 (WockyMuc *muc);
-                    WockyMucPrivate;
+WockyMucRole        wocky_muc_role                      (WockyMuc *muc);
+const gchar *       wocky_muc_user                      (WockyMuc *muc);
 

 

 

 
Object Hierarchy

 
   GEnum
-   +----WockyMucStatusCode
-

-
-  GEnum
-   +----WockyMucRole
-

-
-  GEnum
    +----WockyMucAffiliation
 

 
@@ -96,16 +87,24 @@
 

 
   GEnum
+   +----WockyMucMsgState
+

+
+  GEnum
    +----WockyMucMsgType
 

 
   GEnum
-   +----WockyMucMsgState
+   +----WockyMucRole
 

 
   GEnum
    +----WockyMucState
 

+
+  GFlags
+   +----WockyMucStatusCode
+

 

 

 
Description

@@ -115,182 +114,7 @@
 

 
Details

 

-
enum WockyMucStatusCode

-
typedef enum {
-  WOCKY_MUC_CODE_UNKNOWN = 0,
-  WOCKY_MUC_CODE_ONYMOUS,
-  WOCKY_MUC_CODE_AF_CHANGE_OOB,
-  WOCKY_MUC_CODE_CFG_SHOW_UNAVAILABLE,
-  WOCKY_MUC_CODE_CFG_HIDE_UNAVAILABLE,
-  WOCKY_MUC_CODE_CFG_NONPRIVACY,
-  WOCKY_MUC_CODE_OWN_PRESENCE,
-  WOCKY_MUC_CODE_CFG_LOGGING_ENABLED,
-  WOCKY_MUC_CODE_CFG_LOGGING_DISABLED,
-  WOCKY_MUC_CODE_CFG_ONYMOUS,
-  WOCKY_MUC_CODE_CFG_SEMIONYMOUS,
-  WOCKY_MUC_CODE_CFG_ANONYMOUS,
-  WOCKY_MUC_CODE_NEW_ROOM,
-  WOCKY_MUC_CODE_NICK_CHANGE_FORCED,
-  WOCKY_MUC_CODE_BANNED,
-  WOCKY_MUC_CODE_NICK_CHANGE_USER,
-  WOCKY_MUC_CODE_KICKED,
-  WOCKY_MUC_CODE_KICKED_AFFILIATION,
-  WOCKY_MUC_CODE_KICKED_ROOM_PRIVATISED,
-  WOCKY_MUC_CODE_KICKED_SHUTDOWN,
-} WockyMucStatusCode;
-

-

-WockyMuc specific codes
-

-

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


WOCKY_MUC_CODE_UNKNOWN
Unknown code
-
WOCKY_MUC_CODE_ONYMOUS
Room entered is not anonymous
-
WOCKY_MUC_CODE_AF_CHANGE_OOB
Affiliation changed when not present
-
WOCKY_MUC_CODE_CFG_SHOW_UNAVAILABLE
Unavailable members visible
-
WOCKY_MUC_CODE_CFG_HIDE_UNAVAILABLE
Unavailable members invisible
-
WOCKY_MUC_CODE_CFG_NONPRIVACY
Non-privacy config change
-
WOCKY_MUC_CODE_OWN_PRESENCE
User's own presence
-
WOCKY_MUC_CODE_CFG_LOGGING_ENABLED
Logging enabled
-
WOCKY_MUC_CODE_CFG_LOGGING_DISABLED
Logging disabled
-
WOCKY_MUC_CODE_CFG_ONYMOUS
Room is now non-anonymous
-
WOCKY_MUC_CODE_CFG_SEMIONYMOUS
Room is now semi-anonymous
-
WOCKY_MUC_CODE_CFG_ANONYMOUS
Room is now fully-anonymous
-
WOCKY_MUC_CODE_NEW_ROOM
Room created (eg by joining)
-
WOCKY_MUC_CODE_NICK_CHANGE_FORCED
Service enforced nick change
-
WOCKY_MUC_CODE_BANNED
User has been banned
-
WOCKY_MUC_CODE_NICK_CHANGE_USER
User's nick changed
-
WOCKY_MUC_CODE_KICKED
Kicked from the room
-
WOCKY_MUC_CODE_KICKED_AFFILIATION
Kicked (affiliation change)
-
WOCKY_MUC_CODE_KICKED_ROOM_PRIVATISED
Kicked (room is now
-  members-only)
-
WOCKY_MUC_CODE_KICKED_SHUTDOWN
Kicked (shutdown)
-

-

-

-

-
enum WockyMucRole

-
typedef enum {
-  WOCKY_MUC_ROLE_NONE = 0,
-  WOCKY_MUC_ROLE_VISITOR,
-  WOCKY_MUC_ROLE_PARTICIPANT,
-  WOCKY_MUC_ROLE_MODERATOR
-} WockyMucRole;
-

-

-WockyMuc roles as described in XEP-0045 §5.1.
-

-

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


WOCKY_MUC_ROLE_NONE
no role
-
WOCKY_MUC_ROLE_VISITOR
visitor role
-
WOCKY_MUC_ROLE_PARTICIPANT
participant role
-
WOCKY_MUC_ROLE_MODERATOR
moderator role
-

-

-

-

-
enum WockyMucAffiliation

+
enum WockyMucAffiliation

 
typedef enum {
   WOCKY_MUC_AFFILIATION_OUTCAST = -1,
   WOCKY_MUC_AFFILIATION_NONE = 0,
@@ -335,7 +159,17 @@
 

 

 

-
enum WockyMucFeature

+
struct WockyMucClass

+
struct WockyMucClass {
+};
+

+

+The class of a WockyMuc.
+

+

+

+

+
enum WockyMucFeature

 
typedef enum {
   WOCKY_MUC_MODERN = 1,
   WOCKY_MUC_FORM_REGISTER = (1 << 1),
@@ -461,46 +295,55 @@
 

 

 

-
enum WockyMucMsgType

-
typedef enum {
-  WOCKY_MUC_MSG_NONE,
-  WOCKY_MUC_MSG_NORMAL,
-  WOCKY_MUC_MSG_ACTION,
-  WOCKY_MUC_MSG_NOTICE,
-} WockyMucMsgType;
+
WockyMucMember

+
typedef struct {
+  gchar *from;   /* room@service/nick     */
+  gchar *jid;    /* owner@domain/resource */
+  gchar *nick;   /* nick */
+  WockyMucRole role;
+  WockyMucAffiliation affiliation;
+  gchar *status; /* user set status string */
+  WockyStanza *presence_stanza;
+} WockyMucMember;
 

-

-XMPP MUC message types.
-

 

-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 
 
 
WOCKY_MUC_MSG_NONE
no message type
-
gchar *from;
the JID of the member (roomserver/nick)
 

 
WOCKY_MUC_MSG_NORMAL
a normal message
-
gchar *jid;
the JID of the owner (ownerdomain/resource)
 

 
WOCKY_MUC_MSG_ACTION
an action message
-
gchar *nick;
the nickname of the member
 

 
WOCKY_MUC_MSG_NOTICE
a notice message
-
WockyMucRole role;
the WockyMucRole of the member
WockyMucAffiliation affiliation;
the WockyMucAffiliation of the member
gchar *status;
the user set status string
WockyStanza *presence_stanza;
the WockyStanza that was received regarding the
+member's presence
 

 
 

 

 

 

-
enum WockyMucMsgState

+
enum WockyMucMsgState

 
typedef enum {
   WOCKY_MUC_MSG_STATE_NONE = -1,
   WOCKY_MUC_MSG_STATE_ACTIVE,
@@ -547,7 +390,85 @@
 

 

 

-
enum WockyMucState

+
enum WockyMucMsgType

+
typedef enum {
+  WOCKY_MUC_MSG_NONE,
+  WOCKY_MUC_MSG_NORMAL,
+  WOCKY_MUC_MSG_ACTION,
+  WOCKY_MUC_MSG_NOTICE,
+} WockyMucMsgType;
+

+

+XMPP MUC message types.
+

+

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


WOCKY_MUC_MSG_NONE
no message type
+
WOCKY_MUC_MSG_NORMAL
a normal message
+
WOCKY_MUC_MSG_ACTION
an action message
+
WOCKY_MUC_MSG_NOTICE
a notice message
+

+

+

+

+
enum WockyMucRole

+
typedef enum {
+  WOCKY_MUC_ROLE_NONE = 0,
+  WOCKY_MUC_ROLE_VISITOR,
+  WOCKY_MUC_ROLE_PARTICIPANT,
+  WOCKY_MUC_ROLE_MODERATOR
+} WockyMucRole;
+

+

+WockyMuc roles as described in XEP-0045 §5.1.
+

+

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


WOCKY_MUC_ROLE_NONE
no role
+
WOCKY_MUC_ROLE_VISITOR
visitor role
+
WOCKY_MUC_ROLE_PARTICIPANT
participant role
+
WOCKY_MUC_ROLE_MODERATOR
moderator role
+

+

+

+

+
enum WockyMucState

 
typedef enum {
   WOCKY_MUC_CREATED = 0,
   WOCKY_MUC_INITIATED,
@@ -592,60 +513,155 @@
 

 

 

-
WockyMucMember

-
typedef struct {
-  gchar *from;   /* room@service/nick     */
-  gchar *jid;    /* owner@domain/resource */
-  gchar *nick;   /* nick */
-  WockyMucRole role;
-  WockyMucAffiliation affiliation;
-  gchar *status; /* user set status string */
-  WockyStanza *presence_stanza;
-} WockyMucMember;
+
enum WockyMucStatusCode

+
typedef enum {
+  WOCKY_MUC_CODE_UNKNOWN = 0,
+  WOCKY_MUC_CODE_ONYMOUS = 1 << 0,
+  WOCKY_MUC_CODE_AF_CHANGE_OOB = 1 << 1,
+  WOCKY_MUC_CODE_CFG_SHOW_UNAVAILABLE = 1 << 2,
+  WOCKY_MUC_CODE_CFG_HIDE_UNAVAILABLE = 1 << 3,
+  WOCKY_MUC_CODE_CFG_NONPRIVACY = 1 << 4,
+  WOCKY_MUC_CODE_OWN_PRESENCE = 1 << 5,
+  WOCKY_MUC_CODE_CFG_LOGGING_ENABLED = 1 << 6,
+  WOCKY_MUC_CODE_CFG_LOGGING_DISABLED = 1 << 7,
+  WOCKY_MUC_CODE_CFG_ONYMOUS = 1 << 8,
+  WOCKY_MUC_CODE_CFG_SEMIONYMOUS = 1 << 9,
+  WOCKY_MUC_CODE_CFG_ANONYMOUS = 1 << 10,
+  WOCKY_MUC_CODE_NEW_ROOM = 1 << 11,
+  WOCKY_MUC_CODE_NICK_CHANGE_FORCED = 1 << 12,
+  WOCKY_MUC_CODE_BANNED = 1 << 13,
+  WOCKY_MUC_CODE_NICK_CHANGE_USER = 1 << 14,
+  WOCKY_MUC_CODE_KICKED = 1 << 15,
+  WOCKY_MUC_CODE_KICKED_AFFILIATION = 1 << 16,
+  WOCKY_MUC_CODE_KICKED_ROOM_PRIVATISED = 1 << 17,
+  WOCKY_MUC_CODE_KICKED_SHUTDOWN = 1 << 18,
+} WockyMucStatusCode;
 

+

+MUC status codes, as defined by XEP-0045
+§15.6.
+

 

-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 
 
 
gchar *from;
the JID of the member (roomserver/nick)
WOCKY_MUC_CODE_UNKNOWN
Unknown code
+
 

 
gchar *jid;
the JID of the owner (ownerdomain/resource)
WOCKY_MUC_CODE_ONYMOUS
Room entered is not anonymous
+
 

 
gchar *nick;
the nickname of the member
WOCKY_MUC_CODE_AF_CHANGE_OOB
Affiliation changed when not present
+
 

 
WockyMucRole role;
the WockyMucRole of the member
WOCKY_MUC_CODE_CFG_SHOW_UNAVAILABLE
Unavailable members visible
+
 

 
WockyMucAffiliation affiliation;
the WockyMucAffiliation of the member
WOCKY_MUC_CODE_CFG_HIDE_UNAVAILABLE
Unavailable members invisible
+
 

 
gchar *status;
the user set status string
WOCKY_MUC_CODE_CFG_NONPRIVACY
Non-privacy config change
+
 

 
WockyStanza *presence_stanza;
the WockyStanza that was received regarding the
-member's presence
WOCKY_MUC_CODE_OWN_PRESENCE
User's own presence
+
WOCKY_MUC_CODE_CFG_LOGGING_ENABLED
Logging enabled
+
WOCKY_MUC_CODE_CFG_LOGGING_DISABLED
Logging disabled
+
WOCKY_MUC_CODE_CFG_ONYMOUS
Room is now non-anonymous
+
WOCKY_MUC_CODE_CFG_SEMIONYMOUS
Room is now semi-anonymous
+
WOCKY_MUC_CODE_CFG_ANONYMOUS
Room is now fully-anonymous
+
WOCKY_MUC_CODE_NEW_ROOM
Room created (eg by joining)
+
WOCKY_MUC_CODE_NICK_CHANGE_FORCED
Service enforced nick change
+
WOCKY_MUC_CODE_BANNED
User has been banned
+
WOCKY_MUC_CODE_NICK_CHANGE_USER
User's nick changed
+
WOCKY_MUC_CODE_KICKED
Kicked from the room
+
WOCKY_MUC_CODE_KICKED_AFFILIATION
Kicked (affiliation change)
+
WOCKY_MUC_CODE_KICKED_ROOM_PRIVATISED
Kicked (room is now
+  members-only)
+
WOCKY_MUC_CODE_KICKED_SHUTDOWN
Kicked (shutdown)
+
 

 
 

 

 

 

-
struct WockyMucClass

-
struct WockyMucClass {
-};
-

+
wocky_muc_affiliation ()

+
WockyMucAffiliation wocky_muc_affiliation               (WockyMuc *muc);

+

+

+

+

+

+
wocky_muc_create_presence ()

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

 

-The class of a WockyMuc.
 

 

 

@@ -669,10 +685,8 @@
 

 

 

-
wocky_muc_create_presence ()

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

+
wocky_muc_get_state ()

+
WockyMucState       wocky_muc_get_state                 (WockyMuc *muc);

 

 

 

@@ -697,14 +711,6 @@
 

 

 

-
wocky_muc_join ()

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

-

-

-

-

-

 
wocky_muc_jid ()

 
const gchar *       wocky_muc_jid                       (WockyMuc *muc);

 

@@ -712,22 +718,9 @@
 

 

 

-
wocky_muc_user ()

-
const gchar *       wocky_muc_user                      (WockyMuc *muc);

-

-

-

-

-

-
wocky_muc_role ()

-
WockyMucRole        wocky_muc_role                      (WockyMuc *muc);

-

-

-

-

-

-
wocky_muc_affiliation ()

-
WockyMucAffiliation  wocky_muc_affiliation              (WockyMuc *muc);

+
wocky_muc_join ()

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

 

 

 

@@ -740,15 +733,15 @@
 
 

 

-
wocky_muc_get_state ()

-
WockyMucState       wocky_muc_get_state                 (WockyMuc *muc);

+
wocky_muc_role ()

+
WockyMucRole        wocky_muc_role                      (WockyMuc *muc);

 

 

 

 

 

-
WockyMucPrivate

-
typedef struct _WockyMucPrivate WockyMucPrivate;

+
wocky_muc_user ()

+
const gchar *       wocky_muc_user                      (WockyMuc *muc);

 

 

 

@@ -756,6 +749,6 @@
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-namespaces.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-namespaces.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-namespaces.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-namespaces.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,56 +37,57 @@
 
 

 
Synopsis

-
#define             WOCKY_XMPP_NS_JABBER_CLIENT
-#define             WOCKY_XMPP_NS_STREAM
-#define             WOCKY_XMPP_NS_STREAMS
-#define             WOCKY_XMPP_NS_BIND
-#define             WOCKY_XMPP_NS_SESSION
-#define             WOCKY_XMPP_NS_TLS
-#define             WOCKY_XMPP_NS_SASL_AUTH
+
#define             WOCKY_GOOGLE_NS_AUTH
+#define             WOCKY_JABBER_NS_AUTH
+#define             WOCKY_JABBER_NS_AUTH_FEATURE
+#define             WOCKY_NS_CHATSTATE
 #define             WOCKY_NS_DISCO_INFO
 #define             WOCKY_NS_DISCO_ITEMS
-#define             WOCKY_XMPP_NS_XHTML_IM
-#define             WOCKY_XMPP_NS_IBB
-#define             WOCKY_XMPP_NS_AMP
-#define             WOCKY_W3C_NS_XHTML
+#define             WOCKY_NS_GOOGLE_SESSION_PHONE
+#define             WOCKY_NS_GOOGLE_SESSION_VIDEO
+#define             WOCKY_NS_MUC
+#define             WOCKY_NS_MUC_ADMIN
+#define             WOCKY_NS_MUC_OWNER
+#define             WOCKY_NS_MUC_UNIQUE
+#define             WOCKY_NS_MUC_USER
 #define             WOCKY_TELEPATHY_NS_CAPS
-#define             WOCKY_TELEPATHY_NS_TUBES
+#define             WOCKY_TELEPATHY_NS_CLIQUE
 #define             WOCKY_TELEPATHY_NS_OLPC_ACTIVITY_PROPS
-#define             WOCKY_XMPP_NS_SI
-#define             WOCKY_XMPP_NS_FEATURENEG
+#define             WOCKY_TELEPATHY_NS_TUBES
+#define             WOCKY_W3C_NS_XHTML
+#define             WOCKY_XEP77_NS_REGISTER
+#define             WOCKY_XMPP_NS_AMP
+#define             WOCKY_XMPP_NS_BIND
 #define             WOCKY_XMPP_NS_DATA
-#define             WOCKY_XMPP_NS_EVENT
 #define             WOCKY_XMPP_NS_DELAY
-#define             WOCKY_XMPP_NS_STANZAS
-#define             WOCKY_XMPP_NS_OOB
-#define             WOCKY_TELEPATHY_NS_CLIQUE
-#define             WOCKY_XEP77_NS_REGISTER
+#define             WOCKY_XMPP_NS_EVENT
+#define             WOCKY_XMPP_NS_FEATURENEG
+#define             WOCKY_XMPP_NS_IBB
+#define             WOCKY_XMPP_NS_IQ_OOB
+#define             WOCKY_XMPP_NS_JABBER_CLIENT
 #define             WOCKY_XMPP_NS_JINGLE
 #define             WOCKY_XMPP_NS_JINGLE_ERRORS
 #define             WOCKY_XMPP_NS_JINGLE_RTP
+#define             WOCKY_XMPP_NS_JINGLE_RTP_AUDIO
 #define             WOCKY_XMPP_NS_JINGLE_RTP_ERRORS
 #define             WOCKY_XMPP_NS_JINGLE_RTP_INFO
-#define             WOCKY_XMPP_NS_JINGLE_RTP_AUDIO
 #define             WOCKY_XMPP_NS_JINGLE_RTP_VIDEO
-#define             WOCKY_JABBER_NS_AUTH
-#define             WOCKY_JABBER_NS_AUTH_FEATURE
-#define             WOCKY_GOOGLE_NS_AUTH
-#define             WOCKY_XMPP_NS_ROSTER
+#define             WOCKY_XMPP_NS_PING
 #define             WOCKY_XMPP_NS_PUBSUB
+#define             WOCKY_XMPP_NS_PUBSUB_ERRORS
 #define             WOCKY_XMPP_NS_PUBSUB_EVENT
-#define             WOCKY_XMPP_NS_PUBSUB_OWNER
 #define             WOCKY_XMPP_NS_PUBSUB_NODE_CONFIG
-#define             WOCKY_XMPP_NS_PUBSUB_ERRORS
-#define             WOCKY_XMPP_NS_PING
-#define             WOCKY_NS_MUC
-#define             WOCKY_NS_MUC_USER
-#define             WOCKY_NS_MUC_ADMIN
-#define             WOCKY_NS_MUC_OWNER
-#define             WOCKY_NS_MUC_UNIQUE
-#define             WOCKY_NS_CHATSTATE
-#define             WOCKY_NS_GOOGLE_SESSION_PHONE
-#define             WOCKY_NS_GOOGLE_SESSION_VIDEO
+#define             WOCKY_XMPP_NS_PUBSUB_OWNER
+#define             WOCKY_XMPP_NS_ROSTER
+#define             WOCKY_XMPP_NS_SASL_AUTH
+#define             WOCKY_XMPP_NS_SESSION
+#define             WOCKY_XMPP_NS_SI
+#define             WOCKY_XMPP_NS_STANZAS
+#define             WOCKY_XMPP_NS_STREAM
+#define             WOCKY_XMPP_NS_STREAMS
+#define             WOCKY_XMPP_NS_TLS
+#define             WOCKY_XMPP_NS_XHTML_IM
+#define             WOCKY_XMPP_NS_X_OOB
 

 

 

@@ -97,92 +98,92 @@
 

 
Details

 

-
WOCKY_XMPP_NS_JABBER_CLIENT

-
#define             WOCKY_XMPP_NS_JABBER_CLIENT

+
WOCKY_GOOGLE_NS_AUTH

+
#define             WOCKY_GOOGLE_NS_AUTH

 

 

 

 

 

-
WOCKY_XMPP_NS_STREAM

-
#define             WOCKY_XMPP_NS_STREAM

+
WOCKY_JABBER_NS_AUTH

+
#define             WOCKY_JABBER_NS_AUTH

 

 

 

 

 

-
WOCKY_XMPP_NS_STREAMS

-
#define             WOCKY_XMPP_NS_STREAMS

+
WOCKY_JABBER_NS_AUTH_FEATURE

+
#define             WOCKY_JABBER_NS_AUTH_FEATURE

 

 

 

 

 

-
WOCKY_XMPP_NS_BIND

-
#define             WOCKY_XMPP_NS_BIND

+
WOCKY_NS_CHATSTATE

+
#define             WOCKY_NS_CHATSTATE

 

 

 

 

 

-
WOCKY_XMPP_NS_SESSION

-
#define             WOCKY_XMPP_NS_SESSION

+
WOCKY_NS_DISCO_INFO

+
#define             WOCKY_NS_DISCO_INFO

 

 

 

 

 

-
WOCKY_XMPP_NS_TLS

-
#define             WOCKY_XMPP_NS_TLS

+
WOCKY_NS_DISCO_ITEMS

+
#define             WOCKY_NS_DISCO_ITEMS

 

 

 

 

 

-
WOCKY_XMPP_NS_SASL_AUTH

-
#define             WOCKY_XMPP_NS_SASL_AUTH

+
WOCKY_NS_GOOGLE_SESSION_PHONE

+
#define             WOCKY_NS_GOOGLE_SESSION_PHONE

 

 

 

 

 

-
WOCKY_NS_DISCO_INFO

-
#define             WOCKY_NS_DISCO_INFO

+
WOCKY_NS_GOOGLE_SESSION_VIDEO

+
#define             WOCKY_NS_GOOGLE_SESSION_VIDEO

 

 

 

 

 

-
WOCKY_NS_DISCO_ITEMS

-
#define             WOCKY_NS_DISCO_ITEMS

+
WOCKY_NS_MUC

+
#define             WOCKY_NS_MUC

 

 

 

 

 

-
WOCKY_XMPP_NS_XHTML_IM

-
#define             WOCKY_XMPP_NS_XHTML_IM

+
WOCKY_NS_MUC_ADMIN

+
#define             WOCKY_NS_MUC_ADMIN

 

 

 

 

 

-
WOCKY_XMPP_NS_IBB

-
#define             WOCKY_XMPP_NS_IBB

+
WOCKY_NS_MUC_OWNER

+
#define             WOCKY_NS_MUC_OWNER

 

 

 

 

 

-
WOCKY_XMPP_NS_AMP

-
#define             WOCKY_XMPP_NS_AMP

+
WOCKY_NS_MUC_UNIQUE

+
#define             WOCKY_NS_MUC_UNIQUE

 

 

 

 

 

-
WOCKY_W3C_NS_XHTML

-
#define             WOCKY_W3C_NS_XHTML

+
WOCKY_NS_MUC_USER

+
#define             WOCKY_NS_MUC_USER

 

 

 

@@ -195,8 +196,8 @@
 

 

 

-
WOCKY_TELEPATHY_NS_TUBES

-
#define             WOCKY_TELEPATHY_NS_TUBES

+
WOCKY_TELEPATHY_NS_CLIQUE

+
#define             WOCKY_TELEPATHY_NS_CLIQUE

 

 

 

@@ -209,141 +210,141 @@
 

 

 

-
WOCKY_XMPP_NS_SI

-
#define             WOCKY_XMPP_NS_SI

+
WOCKY_TELEPATHY_NS_TUBES

+
#define             WOCKY_TELEPATHY_NS_TUBES

 

 

 

 

 

-
WOCKY_XMPP_NS_FEATURENEG

-
#define             WOCKY_XMPP_NS_FEATURENEG

+
WOCKY_W3C_NS_XHTML

+
#define             WOCKY_W3C_NS_XHTML

 

 

 

 

 

-
WOCKY_XMPP_NS_DATA

-
#define             WOCKY_XMPP_NS_DATA

+
WOCKY_XEP77_NS_REGISTER

+
#define             WOCKY_XEP77_NS_REGISTER

 

 

 

 

 

-
WOCKY_XMPP_NS_EVENT

-
#define             WOCKY_XMPP_NS_EVENT

+
WOCKY_XMPP_NS_AMP

+
#define             WOCKY_XMPP_NS_AMP

 

 

 

 

 

-
WOCKY_XMPP_NS_DELAY

-
#define             WOCKY_XMPP_NS_DELAY

+
WOCKY_XMPP_NS_BIND

+
#define             WOCKY_XMPP_NS_BIND

 

 

 

 

 

-
WOCKY_XMPP_NS_STANZAS

-
#define             WOCKY_XMPP_NS_STANZAS

+
WOCKY_XMPP_NS_DATA

+
#define             WOCKY_XMPP_NS_DATA

 

 

 

 

 

-
WOCKY_XMPP_NS_OOB

-
#define             WOCKY_XMPP_NS_OOB

+
WOCKY_XMPP_NS_DELAY

+
#define             WOCKY_XMPP_NS_DELAY

 

 

 

 

 

-
WOCKY_TELEPATHY_NS_CLIQUE

-
#define             WOCKY_TELEPATHY_NS_CLIQUE

+
WOCKY_XMPP_NS_EVENT

+
#define             WOCKY_XMPP_NS_EVENT

 

 

 

 

 

-
WOCKY_XEP77_NS_REGISTER

-
#define             WOCKY_XEP77_NS_REGISTER

+
WOCKY_XMPP_NS_FEATURENEG

+
#define             WOCKY_XMPP_NS_FEATURENEG

 

 

 

 

 

-
WOCKY_XMPP_NS_JINGLE

-
#define             WOCKY_XMPP_NS_JINGLE

+
WOCKY_XMPP_NS_IBB

+
#define             WOCKY_XMPP_NS_IBB

 

 

 

 

 

-
WOCKY_XMPP_NS_JINGLE_ERRORS

-
#define             WOCKY_XMPP_NS_JINGLE_ERRORS

+
WOCKY_XMPP_NS_IQ_OOB

+
#define             WOCKY_XMPP_NS_IQ_OOB

 

 

 

 

 

-
WOCKY_XMPP_NS_JINGLE_RTP

-
#define             WOCKY_XMPP_NS_JINGLE_RTP

+
WOCKY_XMPP_NS_JABBER_CLIENT

+
#define             WOCKY_XMPP_NS_JABBER_CLIENT

 

 

 

 

 

-
WOCKY_XMPP_NS_JINGLE_RTP_ERRORS

-
#define             WOCKY_XMPP_NS_JINGLE_RTP_ERRORS

+
WOCKY_XMPP_NS_JINGLE

+
#define             WOCKY_XMPP_NS_JINGLE

 

 

 

 

 

-
WOCKY_XMPP_NS_JINGLE_RTP_INFO

-
#define             WOCKY_XMPP_NS_JINGLE_RTP_INFO

+
WOCKY_XMPP_NS_JINGLE_ERRORS

+
#define             WOCKY_XMPP_NS_JINGLE_ERRORS

 

 

 

 

 

-
WOCKY_XMPP_NS_JINGLE_RTP_AUDIO

-
#define             WOCKY_XMPP_NS_JINGLE_RTP_AUDIO

+
WOCKY_XMPP_NS_JINGLE_RTP

+
#define             WOCKY_XMPP_NS_JINGLE_RTP

 

 

 

 

 

-
WOCKY_XMPP_NS_JINGLE_RTP_VIDEO

-
#define             WOCKY_XMPP_NS_JINGLE_RTP_VIDEO

+
WOCKY_XMPP_NS_JINGLE_RTP_AUDIO

+
#define             WOCKY_XMPP_NS_JINGLE_RTP_AUDIO

 

 

 

 

 

-
WOCKY_JABBER_NS_AUTH

-
#define             WOCKY_JABBER_NS_AUTH

+
WOCKY_XMPP_NS_JINGLE_RTP_ERRORS

+
#define             WOCKY_XMPP_NS_JINGLE_RTP_ERRORS

 

 

 

 

 

-
WOCKY_JABBER_NS_AUTH_FEATURE

-
#define             WOCKY_JABBER_NS_AUTH_FEATURE

+
WOCKY_XMPP_NS_JINGLE_RTP_INFO

+
#define             WOCKY_XMPP_NS_JINGLE_RTP_INFO

 

 

 

 

 

-
WOCKY_GOOGLE_NS_AUTH

-
#define             WOCKY_GOOGLE_NS_AUTH

+
WOCKY_XMPP_NS_JINGLE_RTP_VIDEO

+
#define             WOCKY_XMPP_NS_JINGLE_RTP_VIDEO

 

 

 

 

 

-
WOCKY_XMPP_NS_ROSTER

-
#define             WOCKY_XMPP_NS_ROSTER

+
WOCKY_XMPP_NS_PING

+
#define             WOCKY_XMPP_NS_PING

 

 

 

@@ -356,15 +357,15 @@
 
 

 

-
WOCKY_XMPP_NS_PUBSUB_EVENT

-
#define             WOCKY_XMPP_NS_PUBSUB_EVENT

+
WOCKY_XMPP_NS_PUBSUB_ERRORS

+
#define             WOCKY_XMPP_NS_PUBSUB_ERRORS

 

 

 

 

 

-
WOCKY_XMPP_NS_PUBSUB_OWNER

-
#define             WOCKY_XMPP_NS_PUBSUB_OWNER

+
WOCKY_XMPP_NS_PUBSUB_EVENT

+
#define             WOCKY_XMPP_NS_PUBSUB_EVENT

 

 

 

@@ -377,71 +378,78 @@
 
 

 

-
WOCKY_XMPP_NS_PUBSUB_ERRORS

-
#define             WOCKY_XMPP_NS_PUBSUB_ERRORS

+
WOCKY_XMPP_NS_PUBSUB_OWNER

+
#define             WOCKY_XMPP_NS_PUBSUB_OWNER

 

 

 

 

 

-
WOCKY_XMPP_NS_PING

-
#define             WOCKY_XMPP_NS_PING

+
WOCKY_XMPP_NS_ROSTER

+
#define             WOCKY_XMPP_NS_ROSTER

 

 

 

 

 

-
WOCKY_NS_MUC

-
#define             WOCKY_NS_MUC

+
WOCKY_XMPP_NS_SASL_AUTH

+
#define             WOCKY_XMPP_NS_SASL_AUTH

 

 

 

 

 

-
WOCKY_NS_MUC_USER

-
#define             WOCKY_NS_MUC_USER

+
WOCKY_XMPP_NS_SESSION

+
#define             WOCKY_XMPP_NS_SESSION

 

 

 

 

 

-
WOCKY_NS_MUC_ADMIN

-
#define             WOCKY_NS_MUC_ADMIN

+
WOCKY_XMPP_NS_SI

+
#define             WOCKY_XMPP_NS_SI

 

 

 

 

 

-
WOCKY_NS_MUC_OWNER

-
#define             WOCKY_NS_MUC_OWNER

+
WOCKY_XMPP_NS_STANZAS

+
#define             WOCKY_XMPP_NS_STANZAS

 

 

 

 

 

-
WOCKY_NS_MUC_UNIQUE

-
#define             WOCKY_NS_MUC_UNIQUE

+
WOCKY_XMPP_NS_STREAM

+
#define             WOCKY_XMPP_NS_STREAM

 

 

 

 

 

-
WOCKY_NS_CHATSTATE

-
#define             WOCKY_NS_CHATSTATE

+
WOCKY_XMPP_NS_STREAMS

+
#define             WOCKY_XMPP_NS_STREAMS

 

 

 

 

 

-
WOCKY_NS_GOOGLE_SESSION_PHONE

-
#define             WOCKY_NS_GOOGLE_SESSION_PHONE

+
WOCKY_XMPP_NS_TLS

+
#define             WOCKY_XMPP_NS_TLS

 

 

 

 

 

-
WOCKY_NS_GOOGLE_SESSION_VIDEO

-
#define             WOCKY_NS_GOOGLE_SESSION_VIDEO

+
WOCKY_XMPP_NS_XHTML_IM

+
#define             WOCKY_XMPP_NS_XHTML_IM

+

+

+

+

+

+
WOCKY_XMPP_NS_X_OOB

+
#define             WOCKY_XMPP_NS_X_OOB

 

 

 

@@ -449,6 +457,6 @@
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyNode.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyNode.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyNode.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyNode.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -40,129 +40,129 @@
 
 #include <wocky/wocky-node.h>
 
-enum                WockyNodeBuildTag;
 struct              WockyNode;
+enum                WockyNodeBuildTag;
+                    WockyNodeIter;
+void                wocky_node_add_build                (WockyNode *node,
+                                                         ...);
+void                wocky_node_add_build_va             (WockyNode *node,
+                                                         va_list va);
+WockyNode *         wocky_node_add_child                (WockyNode *node,
+                                                         const gchar *name);
+WockyNode *         wocky_node_add_child_ns             (WockyNode *node,
+                                                         const gchar *name,
+                                                         const gchar *ns);
+WockyNode *         wocky_node_add_child_ns_q           (WockyNode *node,
+                                                         const gchar *name,
+                                                         GQuark ns);
+WockyNode *         wocky_node_add_child_with_content   (WockyNode *node,
+                                                         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);
+WockyNode *         wocky_node_add_child_with_content_ns_q
+                                                        (WockyNode *node,
+                                                         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);
+void                wocky_node_append_content_n         (WockyNode *node,
+                                                         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);
+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_child_func)       (WockyNode *node,
-                                                         gpointer user_data);
 void                wocky_node_each_attribute           (WockyNode *node,
                                                          wocky_node_each_attr_func func,
                                                          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,
+                                                         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);
-void                wocky_node_set_attribute            (WockyNode *node,
-                                                         const gchar *key,
-                                                         const gchar *value);
-void                wocky_node_set_attributes           (WockyNode *node,
-                                                         const gchar *key,
-                                                         ...);
-void                wocky_node_set_attribute_ns         (WockyNode *node,
-                                                         const gchar *key,
-                                                         const gchar *value,
-                                                         const gchar *ns);
-void                wocky_node_set_attribute_n          (WockyNode *node,
-                                                         const gchar *key,
-                                                         const gchar *value,
-                                                         gsize value_size);
-void                wocky_node_set_attribute_n_ns       (WockyNode *node,
-                                                         const gchar *key,
-                                                         const gchar *value,
-                                                         gsize value_size,
-                                                         const gchar *ns);
-const gchar *       wocky_node_attribute_ns_get_prefix_from_urn
-                                                        (const gchar *urn);
-const gchar *       wocky_node_attribute_ns_get_prefix_from_quark
-                                                        (GQuark ns);
-void                wocky_node_attribute_ns_set_prefix  (GQuark ns,
-                                                         const gchar *prefix);
 WockyNode *         wocky_node_get_child                (WockyNode *node,
                                                          const gchar *name);
 WockyNode *         wocky_node_get_child_ns             (WockyNode *node,
                                                          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_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);
-WockyNode *         wocky_node_add_child                (WockyNode *node,
-                                                         const gchar *name);
-WockyNode *         wocky_node_add_child_ns             (WockyNode *node,
-                                                         const gchar *name,
-                                                         const gchar *ns);
-WockyNode *         wocky_node_add_child_ns_q           (WockyNode *node,
-                                                         const gchar *name,
-                                                         GQuark ns);
-WockyNode *         wocky_node_add_child_with_content   (WockyNode *node,
-                                                         const gchar *name,
-                                                         const char *content);
-WockyNode *         wocky_node_add_child_with_content_ns
-                                                        (WockyNode *node,
-                                                         const gchar *name,
-                                                         const gchar *content,
+WockyNode *         wocky_node_get_first_child          (WockyNode *node);
+WockyNode *         wocky_node_get_first_child_ns       (WockyNode *node,
                                                          const gchar *ns);
-WockyNode *         wocky_node_add_child_with_content_ns_q
-                                                        (WockyNode *node,
-                                                         const gchar *name,
-                                                         const gchar *content,
-                                                         GQuark 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 *       wocky_node_get_language             (WockyNode *node);
-void                wocky_node_set_language             (WockyNode *node,
-                                                         const gchar *lang);
-void                wocky_node_set_language_n           (WockyNode *node,
-                                                         const gchar *lang,
-                                                         gsize lang_size);
-void                wocky_node_set_content              (WockyNode *node,
-                                                         const gchar *content);
-void                wocky_node_append_content           (WockyNode *node,
-                                                         const gchar *content);
-void                wocky_node_append_content_n         (WockyNode *node,
-                                                         const gchar *content,
-                                                         gsize size);
-gchar *             wocky_node_to_string                (WockyNode *node);
-WockyNode *         wocky_node_new                      (const char *name,
-                                                         const gchar *ns);
-void                wocky_node_free                     (WockyNode *node);
-gboolean            wocky_node_equal                    (WockyNode *node0,
-                                                         WockyNode *node1);
+void                wocky_node_init                     (void);
 gboolean            wocky_node_is_superset              (WockyNode *node,
                                                          WockyNode *subset);
-                    WockyNodeIter;
 void                wocky_node_iter_init                (WockyNodeIter *iter,
                                                          WockyNode *node,
                                                          const gchar *name,
                                                          const gchar *ns);
 gboolean            wocky_node_iter_next                (WockyNodeIter *iter,
                                                          WockyNode **next);
-void                wocky_node_add_build                (WockyNode *node,
-                                                         ...);
-void                wocky_node_add_build_va             (WockyNode *node,
-                                                         va_list va);
-void                wocky_node_add_node_tree            (WockyNode *node,
-                                                         WockyNodeTree *tree);
+WockyNode *         wocky_node_new                      (const char *name,
+                                                         const gchar *ns);
 void                wocky_node_prepend_node_tree        (WockyNode *node,
                                                          WockyNodeTree *tree);
-void                wocky_node_init                     (void);
-void                wocky_node_deinit                   (void);
+void                wocky_node_set_attribute            (WockyNode *node,
+                                                         const gchar *key,
+                                                         const gchar *value);
+void                wocky_node_set_attribute_n          (WockyNode *node,
+                                                         const gchar *key,
+                                                         const gchar *value,
+                                                         gsize value_size);
+void                wocky_node_set_attribute_n_ns       (WockyNode *node,
+                                                         const gchar *key,
+                                                         const gchar *value,
+                                                         gsize value_size,
+                                                         const gchar *ns);
+void                wocky_node_set_attribute_ns         (WockyNode *node,
+                                                         const gchar *key,
+                                                         const gchar *value,
+                                                         const gchar *ns);
+void                wocky_node_set_attributes           (WockyNode *node,
+                                                         const gchar *key,
+                                                         ...);
+void                wocky_node_set_content              (WockyNode *node,
+                                                         const gchar *content);
+void                wocky_node_set_language             (WockyNode *node,
+                                                         const gchar *lang);
+void                wocky_node_set_language_n           (WockyNode *node,
+                                                         const gchar *lang,
+                                                         gsize lang_size);
+gchar *             wocky_node_to_string                (WockyNode *node);
 

 
 

@@ -176,9 +176,34 @@
 

 
Details

 

+
struct WockyNode

+
struct WockyNode {
+  gchar *name;
+  gchar *content;
+};
+

+

+A single WockyNode structure that relates to an element in an XMPP
+stanza.
+

+

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


gchar *name;
name of the node
gchar *content;
content of the node

+

+

+

 
enum WockyNodeBuildTag

-
typedef enum
-{
+
typedef enum {
   WOCKY_NODE_START = '(',
   WOCKY_NODE_TEXT = '$',
   WOCKY_NODE_END = 41, /* this is actually ')', but gtk-doc is broken: bgo#644291 */
@@ -235,80 +260,80 @@
 

 

 

-
struct WockyNode

-
struct WockyNode {
-  gchar *name;
-  gchar *content;
-};
+
WockyNodeIter

+
typedef struct {
+} WockyNodeIter;
+

+

+Iterate over a node's children. See wocky_node_iter_init() for more
+details.
+

+

+

+

+
wocky_node_add_build ()

+
void                wocky_node_add_build                (WockyNode *node,
+                                                         ...);

+

+Add a node subtree to an existing parent node.
+

+

+
Example 1. 

+

+  
+    
+      
+        
+        
+      
+    
+  
1
+2
+3
+4
+5
wocky_node_add_build (node,
+   '(', "body",
+       '$', "Telepathy rocks!",
+   ')',
+  NULL);

+

+
+

+


+

+

+The above examples adds the following subtree under the given node:
+

+
+<body>
+   Telepathy rocks!
+</body>
 

 

-A single WockyNode structure that relates to an element in an XMPP
-stanza.
 

 
-
-
-
-
-
-
-
-
-
-
+
+
+
+

 

gchar *name;
name of the node
gchar *content;
content of the node
node :
The node under which to add a new subtree

 

 

 

 

-
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);

+
wocky_node_add_build_va ()

+
void                wocky_node_add_build_va             (WockyNode *node,
+                                                         va_list va);

 

-Specifies the type of functions passed to wocky_node_each_attribute().
 

-

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


key :
the attribute's key
value :
the attribute's value
pref :
the attribute's prefix
ns :
the attribute's namespace
user_data :
user data passed to wocky_node_each_attribute()
-
Returns :

-FALSE to stop further attributes from being examined.

 

 

 

-
wocky_node_each_child_func ()

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

+
wocky_node_add_child ()

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

 

-Specifies the type of functions passed to wocky_node_each_child().
+Adds a WockyNode with the specified name to an already existing node.
 

 
@@ -319,26 +344,26 @@
 
-
-
+
+
-
+

 

 
 
user_data :
user data passed to wocky_node_each_child()
-
name :
the name of the child to add
 

 

 
Returns :

-FALSE to stop further children from being examined.the newly added WockyNode.
 

 
 

 

 

 

-
wocky_node_each_attribute ()

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

+
wocky_node_add_child_ns ()

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

 

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

 
@@ -349,24 +374,30 @@
 
-
-
+
+
-
-
+
+
+
+
+
+

 

 
 
func :
the function to be called on each node's attribute
name :
the name of the child to add
 

 
user_data :
user data to pass to the function
ns :
a namespace
Returns :
the newly added WockyNode.
 

 
 

 

 

 

-
wocky_node_each_child ()

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

+
wocky_node_add_child_ns_q ()

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

 

-Calls a function for each child of a WockyNode.
+Adds a WockyNode with the specified name to an already existing node,
+under the specified namespace. If the namespace is 0, this is equivalent
+to wocky_node_add_child().
 

 
@@ -377,23 +408,29 @@
 
-
-
+
+
-
-
+
+
+
+
+
+

 

 
 
func :
the function to be called on each node's child
name :
the name of the child to add
 

 
user_data :
user data to pass to the function
ns :
a namespace
Returns :
the newly added WockyNode.
 

 
 

 

 

 

-
wocky_node_get_attribute ()

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

+
wocky_node_add_child_with_content ()

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

 

-Returns the value of an attribute in a WockyNode.
+Adds a WockyNode with the specified name and containing the
+specified content to an already existing node.
 

 
@@ -404,27 +441,33 @@
 
-
-
+
+
+
+
+
+
-
+

 

 
 
key :
the attribute name
name :
the name of the child to add
content :
the content of the child to add
 

 

 
Returns :
the value of the attribute key, or NULL if node doesn't
-have such attribute.the newly added WockyNode.
 

 
 

 

 

 

-
wocky_node_get_attribute_ns ()

-
const gchar *       wocky_node_get_attribute_ns         (WockyNode *node,
-                                                         const gchar *key,
+
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);

 

-Returns the value of an attribute in a WockyNode, limiting the search
-within a specific namespace. If the namespace is NULL, this is equivalent
-to wocky_node_get_attribute().
+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
+wocky_node_add_child_with_content().
 

 
@@ -435,30 +478,37 @@
 
-
-
+
+
+
+
+
+
-
+
-
+

 

 
 
key :
the attribute name
name :
the name of the child to add
content :
the content of the child to add
 

 

 
ns :
the namespace to search within, or NULL
-a namespace
 

 

 
Returns :
the value of the attribute key, or NULL if node doesn't
-have such attribute in ns.the newly added WockyNode.
 

 
 

 

 

 

-
wocky_node_set_attribute ()

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

+
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);

 

-Sets an attribute in a WockyNode to a specific value.
+Adds a WockyNode with the specified name and the specified content
+to an already existing node, under the specified namespace.
+If the namespace is 0, this is equivalent to
+wocky_node_add_child_with_content().
 

 
@@ -469,56 +519,53 @@
 
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+

 

 
 
key :
the attribute name to set
name :
the name of the child to add
 

 
value :
the value to set
content :
the content of the child to add
ns :
a namespace
Returns :
the newly added WockyNode.
 

 
 

 

 

 

-
wocky_node_set_attributes ()

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

+
wocky_node_add_node_tree ()

+
void                wocky_node_add_node_tree            (WockyNode *node,
+                                                         WockyNodeTree *tree);

 

-Sets attributes in a WockyNode to specific values.
+Copies the nodes from tree, and appends them to node's children.
 

 

-
-
-
-
-
+
-
-
+
+

 
 
 

 
node :
a WockyNode
-
key :
the attribute name to setA node
 

 
... :
pairs of keys and values, terminated by NULL
-
tree :
The node tree to add
 

 
 

 

 

 

-
wocky_node_set_attribute_ns ()

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

+
wocky_node_append_content ()

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

 

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

 
@@ -529,30 +576,21 @@
 
-
-
-
-
-
-
-
-
-
-
+
+

 

 
 
key :
the attribute name to set
value :
the value to set
ns :
a namespace, or NULL
-
content :
the content to append to the node
 

 
 

 

 

 

-
wocky_node_set_attribute_n ()

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

+
wocky_node_append_content_n ()

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

 

-Sets a new attribute to a WockyNode, with the supplied values.
+Appends a specified number of content bytes to the content of a
+WockyNode.
 

 
@@ -563,57 +601,34 @@
 
-
-
-
-
-
-
+
+
-
-
+
+

 

 
 
key :
the attribute to set
value :
the value to set
content :
the content to append to the node
 

 
value_size :
the number of bytes of value to set as a value
size :
the size of the content to append
 

 
 

 

 

 

-
wocky_node_set_attribute_n_ns ()

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

+
wocky_node_attribute_ns_get_prefix_from_quark ()

+
const gchar *       wocky_node_attribute_ns_get_prefix_from_quark
+                                                        (GQuark ns);

 

-Sets a new attribute to a WockyNode, with the supplied values.
-If the namespace is NULL, this is equivalent to
-wocky_node_set_attribute_n().
+Gets the prefix of the namespace identified by the quark.
 

 

-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+

 
 
 
node :
a WockyNode
-
key :
the attribute to set
value :
the value to set
value_size :
the number of bytes of value to set as a value
ns :
a quark corresponding to an XML namespace URN
 

 
ns :
a namespace, or NULL
-
Returns :
a string containing the prefix of the namespace ns.
 

 
 

@@ -642,56 +657,86 @@
 

 

 

-
wocky_node_attribute_ns_get_prefix_from_quark ()

-
const gchar *       wocky_node_attribute_ns_get_prefix_from_quark
-                                                        (GQuark ns);

+
wocky_node_attribute_ns_set_prefix ()

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

 

-Gets the prefix of the namespace identified by the quark.
+Sets a desired prefix for a namespace.
 

 

-
+
-
-
+
+

 
 
 

 
ns :
a quark corresponding to an XML namespace URNa GQuark
+
 

 
Returns :
a string containing the prefix of the namespace ns.
prefix :
a string containing the desired prefix
 

 
 

 

 

 

-
wocky_node_attribute_ns_set_prefix ()

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

+
wocky_node_deinit ()

+
void                wocky_node_deinit                   (void);

 

-Sets a desired prefix for a namespace.
+Releases all the resources used by the WockyNode caches.
+

+

+

+

+
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);

+

+Specifies the type of functions passed to wocky_node_each_attribute().
 

 

+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
-
+
+

 
 
 
key :
the attribute's key
value :
the attribute's value
pref :
the attribute's prefix

 
ns :
a GQuark
+the attribute's namespace
user_data :
user data passed to wocky_node_each_attribute()
 
 

 
prefix :
a string containing the desired prefix
Returns :

+FALSE to stop further attributes from being examined.
 

 
 

 

 

 

-
wocky_node_get_child ()

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

+
wocky_node_each_attribute ()

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

 

-Gets a child of a node, searching by name.
+Calls a function for each attribute of a WockyNode.
 

 
@@ -702,26 +747,24 @@
 
-
-
+
+
-
-
+
+

 

 
 
name :
the name of the child to get
func :
the function to be called on each node's attribute
 

 
Returns :
a WockyNode.
user_data :
user data to pass to the function
 

 
 

 

 

 

-
wocky_node_get_child_ns ()

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

+
wocky_node_each_child ()

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

 

-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()
+Calls a function for each child of a WockyNode.
 

 
@@ -732,27 +775,23 @@
 
-
-
-
-
-
-
+
+
-
-
+
+

 

 
 
name :
the name of the child to get
ns :
the namespace of the child to get, or NULL
-
func :
the function to be called on each node's child
 

 
Returns :
a WockyNode.
user_data :
user data to pass to the function
 

 
 

 

 

 

-
wocky_node_get_first_child ()

-
WockyNode *         wocky_node_get_first_child          (WockyNode *node);

+
wocky_node_each_child_func ()

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

 

-Convenience function to return the first child of a WockyNode.
+Specifies the type of functions passed to wocky_node_each_child().
 

 
@@ -763,48 +802,70 @@
 
+
+
+
+
-
+

 

 
 
user_data :
user data passed to wocky_node_each_child()
+

 
Returns :
a WockyNode, or NULL if node has no children.
+FALSE to stop further children from being examined.
 

 
 

 

 

 

-
wocky_node_get_first_child_ns ()

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

+
wocky_node_equal ()

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

 

-Returns the first child of node whose namespace is ns, saving you the
-bother of faffing around with a WockyNodeIter.
+Compares two WockyNodes for equality.
 

 

-
+
-
-
+
+
-
+

 
 
 
node :
node0 :

 a WockyNode
 
 

 
ns :
the namespace of the child node you seek.
node1 :
a WockyNode to compare to node0
+
 

 

 
Returns :
the first child of node whose namespace is ns, or NULL if none
-is found.
+TRUE if the two nodes are equal.
 

 
 

 

 

 

-
wocky_node_get_content_from_child ()

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

+
wocky_node_free ()

+
void                wocky_node_free                     (WockyNode *node);

 

-Retrieves the content from a child of a node, if it exists.
+Convenience function that frees the passed in WockyNode and
+all of its children.
+

+

++
+
+
+
+


node :
a WockyNode.

+

+

+

+
wocky_node_get_attribute ()

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

+

+Returns the value of an attribute in a WockyNode.
 

 
@@ -815,26 +876,27 @@
 
-
-
+
+
-
+

 

 
 
name :
the name of the child whose content to retrieve
key :
the attribute name
 

 

 
Returns :
the content of the child of node named name, or NULL if node
-has no such child.the value of the attribute key, or NULL if node doesn't
+have such attribute.
 

 
 

 

 

 

-
wocky_node_get_content_from_child_ns ()

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

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

 

-Retrieves the content from a child of a node, if it exists.
+Returns the value of an attribute in a WockyNode, limiting the search
+within a specific namespace. If the namespace is NULL, this is equivalent
+to wocky_node_get_attribute().
 

 
@@ -845,28 +907,29 @@
 
-
-
+
+
-
+
-
+

 

 
 
name :
the name of the child whose content to retrieve
key :
the attribute name
 

 

 
ns :
the namespace of the child whose content to retrievethe namespace to search within, or NULL
+
 

 

 
Returns :
the content of the child of node named name in ns, or NULL if
-node has no such child.the value of the attribute key, or NULL if node doesn't
+have such attribute in ns.
 

 
 

 

 

 

-
wocky_node_add_child ()

-
WockyNode *         wocky_node_add_child                (WockyNode *node,
+
wocky_node_get_child ()

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

 

-Adds a WockyNode with the specified name to an already existing node.
+Gets a child of a node, searching by name.
 

 
@@ -878,25 +941,25 @@
 
-
+
-
+

 

 

 
name :
the name of the child to addthe name of the child to get
 

 

 
Returns :
the newly added WockyNode.a WockyNode.
 

 
 

 

 

 

-
wocky_node_add_child_ns ()

-
WockyNode *         wocky_node_add_child_ns             (WockyNode *node,
+
wocky_node_get_child_ns ()

+
WockyNode *         wocky_node_get_child_ns             (WockyNode *node,
                                                          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
-to wocky_node_add_child().
+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()
 

 
@@ -908,29 +971,27 @@
 
-
+
-
+
-
+

 

 

 
name :
the name of the child to addthe name of the child to get
 

 

 
ns :
a namespacethe namespace of the child to get, or NULL
+
 

 

 
Returns :
the newly added WockyNode.a WockyNode.
 

 
 

 

 

 

-
wocky_node_add_child_ns_q ()

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

+
wocky_node_get_content_from_child ()

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

 

-Adds a WockyNode with the specified name to an already existing node,
-under the specified namespace. If the namespace is 0, this is equivalent
-to wocky_node_add_child().
+Retrieves the content from a child of a node, if it exists.
 

 
@@ -942,28 +1003,25 @@
 
-
-
-
-
-
+
-
+

 

 

 
name :
the name of the child to add
ns :
a namespacethe name of the child whose content to retrieve
 

 

 
Returns :
the newly added WockyNode.the content of the child of node named name, or NULL if node
+has no such child.
 

 
 

 

 

 

-
wocky_node_add_child_with_content ()

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

+
wocky_node_get_content_from_child_ns ()

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

 

-Adds a WockyNode with the specified name and containing the
-specified content to an already existing node.
+Retrieves the content from a child of a node, if it exists.
 

 
@@ -975,32 +1033,26 @@
 
-
+
-
-
+
+
-
+

 

 

 
name :
the name of the child to addthe name of the child whose content to retrieve
 

 
content :
the content of the child to add
ns :
the namespace of the child whose content to retrieve
 

 

 
Returns :
the newly added WockyNode.the content of the child of node named name in ns, or NULL if
+node has no such child.
 

 
 

 

 

 

-
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);

+
wocky_node_get_first_child ()

+
WockyNode *         wocky_node_get_first_child          (WockyNode *node);

 

-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
-wocky_node_add_child_with_content().
+Convenience function to return the first child of a WockyNode.
 

 
@@ -1011,37 +1063,47 @@
 
-
-
+
+
+
+

 

 
 
name :
the name of the child to add
Returns :
a WockyNode, or NULL if node has no children.
 

+

+

+

+
wocky_node_get_first_child_ns ()

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

+

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

+

++
-
-
+
+
-
+
-
+


 
content :
the content of the child to add
node :
a WockyNode
+
 

 

 
ns :
a namespacethe namespace of the child node you seek.
 

 

 
Returns :
the newly added WockyNode.the first child of node whose namespace is ns, or NULL if none
+is found.
 

 
 

 

 

 

-
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);

+
wocky_node_get_language ()

+
const gchar *       wocky_node_get_language             (WockyNode *node);

 

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

 
@@ -1052,20 +1114,8 @@
 
-
-
-
-
-
-
-
-
-
-
-
-
-
+

 

 
 
name :
the name of the child to add
content :
the content of the child to add
ns :
a namespace

 
Returns :
the newly added WockyNode.a string containing the language of the node.
 

 
 

@@ -1110,132 +1160,189 @@
 

 

 

-
wocky_node_get_language ()

-
const gchar *       wocky_node_get_language             (WockyNode *node);

+
wocky_node_init ()

+
void                wocky_node_init                     (void);

 

-Gets the language of a WockyNode
+Initializes the caches used by WockyNode.
+This should be always called before using WockyNode structs.
 

+

+

+

+
wocky_node_is_superset ()

+
gboolean            wocky_node_is_superset              (WockyNode *node,
+                                                         WockyNode *subset);

 

-
+
+
+
+
+
-
+

 
 
 

 
node :
a WockyNode
-the WockyNode to test
subset :
the supposed subset
 

 

 
Returns :
a string containing the language of the node.
+TRUE if node is a superset of subset.
 

 
 

 

 

 

-
wocky_node_set_language ()

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

+
wocky_node_iter_init ()

+
void                wocky_node_iter_init                (WockyNodeIter *iter,
+                                                         WockyNode *node,
+                                                         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
+

+

+  
+    
+      
+        
+        
+      
+    
+  
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
WockyNodeIter iter;
+WockyNode *child;
+
+wocky_node_iter_init (&iter, wocky_stanza_get_top_node (stanza),
+   "payload-type",
+   WOCKY_XMPP_NS_JINGLE_RTP);
+while (wocky_node_iter_next (iter, &child))
+  {
+    /* do something with the child */
+  }

+

+
 

-Sets the language of a WockyNode.
 

 

+
+
+
+
-
+
+
+
+
-
-
+
+

 
 
 
iter :
unitialized iterator

 
node :
a WockyNode
+Node whose children to iterate over
name :
Name to filter on or NULL
 
 

 
lang :
a NULL-terminated string containing the language
ns :
namespace to filter on or NULL
+
 

 
 

 

 

 

-
wocky_node_set_language_n ()

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

+
wocky_node_iter_next ()

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

 

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

 

-
-
+
+
-
-
+
+
-
-
+
+

 
 
 
node :
a WockyNode
-
iter :
an initialized WockyNodeIter
 

 
lang :
a language
next :
a location to store the next child
 

 
lang_size :
the length of lang, in bytes.
Returns :

+FALSE if the last child has been reached
 

 
 

 

 

 

-
wocky_node_set_content ()

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

+
wocky_node_new ()

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

 

-Sets the content of a WockyNode.
+Convenience function which creates a WockyNode and sets its
+name to name.
 

 

-
-
+
+
-
-
+
+
+
+
+
+

 
 
 
node :
a WockyNode
-
name :
the node's name (may not be NULL)
 

 
content :
the content to set to the node
ns :
the nodes namespace (may not be NULL)
Returns :
a newly allocated WockyNode.
 

 
 

 

 

 

-
wocky_node_append_content ()

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

+
wocky_node_prepend_node_tree ()

+
void                wocky_node_prepend_node_tree        (WockyNode *node,
+                                                         WockyNodeTree *tree);

 

-Appends some content to the content of a WockyNode.
+Copies the nodes from tree, and inserts them as the first child of node,
+before any existing children.
 

 

-
+
-
-
+
+

 
 
 

 
node :
a WockyNode
-a node
 

 
content :
the content to append to the node
tree :
the node tree to prepend to node's children
 

 
 

 

 

 

-
wocky_node_append_content_n ()

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

+
wocky_node_set_attribute ()

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

 

-Appends a specified number of content bytes to the content of a
-WockyNode.
+Sets an attribute in a WockyNode to a specific value.
 

 
@@ -1246,22 +1353,25 @@
 
-
-
+
+
-
-
+
+

 

 
 
content :
the content to append to the node
key :
the attribute name to set
 

 
size :
the size of the content to append
value :
the value to set
 

 
 

 

 

 

-
wocky_node_to_string ()

-
gchar *             wocky_node_to_string                (WockyNode *node);

+
wocky_node_set_attribute_n ()

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

 

-Obtains a string representation of a WockyNode.
+Sets a new attribute to a WockyNode, with the supplied values.
 

 
@@ -1272,346 +1382,222 @@
 
-
-
-
-
-

 

 
 
Returns :
a newly allocated string containing a serialization of
-the node.

-

-

-

-
wocky_node_new ()

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

-

-Convenience function which creates a WockyNode and sets its
-name to name.
-

-

--
-
-
-
+
+
-
-
+
+
-
-
+
+


name :
the node's name (may not be NULL)
key :
the attribute to set
 

 
ns :
the nodes namespace (may not be NULL)
value :
the value to set
 

 
Returns :
a newly allocated WockyNode.
value_size :
the number of bytes of value to set as a value
 

 
 

 

 

 

-
wocky_node_free ()

-
void                wocky_node_free                     (WockyNode *node);

-

-Convenience function that frees the passed in WockyNode and
-all of its children.
-

-

--
-
-
-
-


node :
a WockyNode.

-

-

-

-
wocky_node_equal ()

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

+
wocky_node_set_attribute_n_ns ()

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

 

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

 

-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+

 
 
 
node0 :
node :

 a WockyNode
 
 

 
node1 :
a WockyNode to compare to node0
-
key :
the attribute to set
 

 
Returns :

-TRUE if the two nodes are equal.
value :
the value to set
value_size :
the number of bytes of value to set as a value
ns :
a namespace, or NULL
+
 

 
 

 

 

 

-
wocky_node_is_superset ()

-
gboolean            wocky_node_is_superset              (WockyNode *node,
-                                                         WockyNode *subset);

+
wocky_node_set_attribute_ns ()

+
void                wocky_node_set_attribute_ns         (WockyNode *node,
+                                                         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
+wocky_node_set_attribute().
+

 

-
+
-
-
+
+
-
-
+
+
+
+
+
+

 
 
 

 
node :
the WockyNode to testa WockyNode
+
 

 
subset :
the supposed subset
key :
the attribute name to set
 

 
Returns :

-TRUE if node is a superset of subset.
value :
the value to set
ns :
a namespace, or NULL
+
 

 
 

 

 

 

-
WockyNodeIter

-
typedef struct {
-} WockyNodeIter;
-

-

-Iterate over a node's children. See wocky_node_iter_init() for more
-details.
-

-

-

-

-
wocky_node_iter_init ()

-
void                wocky_node_iter_init                (WockyNodeIter *iter,
-                                                         WockyNode *node,
-                                                         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
-

-

-  
-    
-      
-        
-        
-      
-    
-  
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
WockyNodeIter iter;
-WockyNode *child;
-
-wocky_node_iter_init (&iter, wocky_stanza_get_top_node (stanza),
-   "payload-type",
-   WOCKY_XMPP_NS_JINGLE_RTP);
-while (wocky_node_iter_next (iter, &child))
-  {
-    /* do something with the child */
-  }

-

-
+
wocky_node_set_attributes ()

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

 

+Sets attributes in a WockyNode to specific values.
 

 

-
-
-
-
-
-
-
-
-
-
-
+
+

 
 
 
iter :
unitialized iterator

 
node :
Node whose children to iterate over
name :
Name to filter on or NULL
+a WockyNode
 
 

 
ns :
namespace to filter on or NULL
-
key :
the attribute name to set
 

 
 

 

 

 

-
wocky_node_iter_next ()

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

+
wocky_node_set_content ()

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

 

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

 

-
-
-
-
-
-
+
+
-
-
+
+

 
 
 
iter :
an initialized WockyNodeIter
next :
a location to store the next child
node :
a WockyNode
+
 

 
Returns :

-FALSE if the last child has been reached
content :
the content to set to the node
 

 
 

 

 

 

-
wocky_node_add_build ()

-
void                wocky_node_add_build                (WockyNode *node,
-                                                         ...);

-

-Add a node subtree to an existing parent node.
-

-

-
Example 1. 

-

-  
-    
-      
-        
-        
-      
-    
-  
1
-2
-3
-4
-5
wocky_node_add_build (node,
-   '(', "body",
-       '$', "Telepathy rocks!",
-   ')',
-  NULL);

-

-
-

-


-

-

-The above examples adds the following subtree under the given node:
-

-
-<body>
-   Telepathy rocks!
-</body>
-

+
wocky_node_set_language ()

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

 

+Sets the language of a WockyNode.
 

 

-
+
-
-
+
+

 
 
 

 
node :
The node under which to add a new subtreea WockyNode
+
 

 
... :
the description of the stanza to build,
-terminated with NULL
-
lang :
a NULL-terminated string containing the language
 

 
 

 

 

 

-
wocky_node_add_build_va ()

-
void                wocky_node_add_build_va             (WockyNode *node,
-                                                         va_list va);

-

-

-

-

-

-
wocky_node_add_node_tree ()

-
void                wocky_node_add_node_tree            (WockyNode *node,
-                                                         WockyNodeTree *tree);

+
wocky_node_set_language_n ()

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

 

-Copies the nodes from tree, and appends them to node's children.
+Sets the language of a WockyNode.
 

 

-
+
-
-
+
+
+
+
+
+

 
 
 

 
node :
A nodea WockyNode
+
 

 
tree :
The node tree to add
lang :
a language
lang_size :
the length of lang, in bytes.
 

 
 

 

 

 

-
wocky_node_prepend_node_tree ()

-
void                wocky_node_prepend_node_tree        (WockyNode *node,
-                                                         WockyNodeTree *tree);

+
wocky_node_to_string ()

+
gchar *             wocky_node_to_string                (WockyNode *node);

 

-Copies the nodes from tree, and inserts them as the first child of node,
-before any existing children.
+Obtains a string representation of a WockyNode.
 

 

-
+
-
-
+
+

 
 
 

 
node :
a nodea WockyNode
+
 

 
tree :
the node tree to prepend to node's children
Returns :
a newly allocated string containing a serialization of
+the node.
 

 
 

 

-

-

-
wocky_node_init ()

-
void                wocky_node_init                     (void);

-

-Initializes the caches used by WockyNode.
-This should be always called before using WockyNode structs.
-

-

-

-

-
wocky_node_deinit ()

-
void                wocky_node_deinit                   (void);

-

-Releases all the resources used by the WockyNode caches.
-

-

 

 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyPepService.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyPepService.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyPepService.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyPepService.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -41,10 +41,6 @@
 #include <wocky/wocky-pep-service.h>
 
 struct              WockyPepServiceClass;
-WockyPepService *   wocky_pep_service_new               (const gchar *node,
-                                                         gboolean subscribe);
-void                wocky_pep_service_start             (WockyPepService *self,
-                                                         WockySession *session);
 void                wocky_pep_service_get_async         (WockyPepService *self,
                                                          WockyBareContact *contact,
                                                          GCancellable *cancellable,
@@ -56,7 +52,10 @@
 WockyStanza *       wocky_pep_service_make_publish_stanza
                                                         (WockyPepService *self,
                                                          WockyNode **item);
-                    WockyPepServicePrivate;
+WockyPepService *   wocky_pep_service_new               (const gchar *node,
+                                                         gboolean subscribe);
+void                wocky_pep_service_start             (WockyPepService *self,
+                                                         WockySession *session);
 
 
 

@@ -78,59 +77,6 @@
 

 

 

-
wocky_pep_service_new ()

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

-

-A convenience function to create a new WockyPepService object.
-

-

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


node :
the namespace of the PEP node
subscribe :

-TRUE if Wocky is to subscribe to the notifications of
-the node, otherwise FALSE
-
Returns :
a new WockyPepService
-

-

-

-

-
wocky_pep_service_start ()

-
void                wocky_pep_service_start             (WockyPepService *self,
-                                                         WockySession *session);

-

-Start listening to the PEP node node and signal changes by using
-"changed".
-

-

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


self :
a WockyPepService object
session :
a WockySession object

-

-

-

 
wocky_pep_service_get_async ()

 
void                wocky_pep_service_get_async         (WockyPepService *self,
                                                          WockyBareContact *contact,
@@ -239,15 +185,61 @@
 

 

 

-
WockyPepServicePrivate

-
typedef struct _WockyPepServicePrivate WockyPepServicePrivate;

+
wocky_pep_service_new ()

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

+

+A convenience function to create a new WockyPepService object.
+

+

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


node :
the namespace of the PEP node
subscribe :

+TRUE if Wocky is to subscribe to the notifications of
+the node, otherwise FALSE
+
Returns :
a new WockyPepService
+

+

+

+

+
wocky_pep_service_start ()

+
void                wocky_pep_service_start             (WockyPepService *self,
+                                                         WockySession *session);

 

+Start listening to the PEP node node and signal changes by using
+"changed".
 

+

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


self :
a WockyPepService object
session :
a WockySession object

 

 
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyPing.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyPing.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyPing.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyPing.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,11 +37,10 @@
 
 

 
Synopsis

-
GQuark              wocky_ping_error_quark              (void);
-struct              WockyPingClass;
-WockyPing *         wocky_ping_new                      (WockyPorter *porter,
+
struct              WockyPingClass;
+GQuark              wocky_ping_error_quark              (void);
+WockyPing *         wocky_ping_new                      (WockyC2SPorter *porter,
                                                          guint interval);
-                    WockyPingPrivate;
 

 

 

@@ -53,13 +52,6 @@
 

 
Details

 

-
wocky_ping_error_quark ()

-
GQuark              wocky_ping_error_quark              (void);

-

-

-

-

-

 
struct WockyPingClass

 
struct WockyPingClass {
 };
@@ -70,16 +62,16 @@
 

 

 

-
wocky_ping_new ()

-
WockyPing *         wocky_ping_new                      (WockyPorter *porter,
-                                                         guint interval);

+
wocky_ping_error_quark ()

+
GQuark              wocky_ping_error_quark              (void);

 

 

 

 

 

-
WockyPingPrivate

-
typedef struct _WockyPingPrivate WockyPingPrivate;

+
wocky_ping_new ()

+
WockyPing *         wocky_ping_new                      (WockyC2SPorter *porter,
+                                                         guint interval);

 

 

 

@@ -87,6 +79,6 @@
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyPorter.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyPorter.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyPorter.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyPorter.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,56 +37,60 @@
 
 

 
Synopsis

-
enum                WockyPorterError;
-GQuark              wocky_porter_error_quark            (void);
-#define             WOCKY_PORTER_ERROR
+
#define             WOCKY_PORTER_ERROR
+#define             WOCKY_PORTER_HANDLER_PRIORITY_MAX
 #define             WOCKY_PORTER_HANDLER_PRIORITY_MIN
 #define             WOCKY_PORTER_HANDLER_PRIORITY_NORMAL
-#define             WOCKY_PORTER_HANDLER_PRIORITY_MAX
+enum                WockyPorterError;
 gboolean            (*WockyPorterHandlerFunc)           (WockyPorter *porter,
                                                          WockyStanza *stanza,
                                                          gpointer user_data);
 struct              WockyPorterInterface;
-void                wocky_porter_start                  (WockyPorter *porter);
-const gchar *       wocky_porter_get_full_jid           (WockyPorter *self);
-const gchar *       wocky_porter_get_bare_jid           (WockyPorter *self);
-const gchar *       wocky_porter_get_resource           (WockyPorter *self);
-void                wocky_porter_send_async             (WockyPorter *porter,
+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_send_finish            (WockyPorter *porter,
+gboolean            wocky_porter_close_finish           (WockyPorter *porter,
                                                          GAsyncResult *result,
                                                          GError **error);
-void                wocky_porter_send                   (WockyPorter *porter,
-                                                         WockyStanza *stanza);
-guint               wocky_porter_register_handler_from_va
-                                                        (WockyPorter *self,
+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,
                                                          WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
                                                          const gchar *from,
                                                          guint priority,
                                                          WockyPorterHandlerFunc callback,
                                                          gpointer user_data,
-                                                         va_list ap);
-guint               wocky_porter_register_handler_from_by_stanza
+                                                         ...);
+guint               wocky_porter_register_handler_from_anyone
                                                         (WockyPorter *self,
                                                          WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
-                                                         const gchar *from,
                                                          guint priority,
                                                          WockyPorterHandlerFunc callback,
                                                          gpointer user_data,
-                                                         WockyStanza *stanza);
-guint               wocky_porter_register_handler_from  (WockyPorter *self,
+                                                         ...);
+guint               wocky_porter_register_handler_from_anyone_by_stanza
+                                                        (WockyPorter *self,
                                                          WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
-                                                         const gchar *from,
                                                          guint priority,
                                                          WockyPorterHandlerFunc callback,
                                                          gpointer user_data,
-                                                         ...);
+                                                         WockyStanza *stanza);
 guint               wocky_porter_register_handler_from_anyone_va
                                                         (WockyPorter *self,
                                                          WockyStanzaType type,
@@ -95,29 +99,32 @@
                                                          WockyPorterHandlerFunc callback,
                                                          gpointer user_data,
                                                          va_list ap);
-guint               wocky_porter_register_handler_from_anyone_by_stanza
+guint               wocky_porter_register_handler_from_by_stanza
                                                         (WockyPorter *self,
                                                          WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
+                                                         const gchar *from,
                                                          guint priority,
                                                          WockyPorterHandlerFunc callback,
                                                          gpointer user_data,
                                                          WockyStanza *stanza);
-guint               wocky_porter_register_handler_from_anyone
+guint               wocky_porter_register_handler_from_va
                                                         (WockyPorter *self,
                                                          WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
+                                                         const gchar *from,
                                                          guint priority,
                                                          WockyPorterHandlerFunc callback,
                                                          gpointer user_data,
-                                                         ...);
-void                wocky_porter_unregister_handler     (WockyPorter *porter,
-                                                         guint id);
-void                wocky_porter_close_async            (WockyPorter *porter,
+                                                         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_close_finish           (WockyPorter *porter,
+gboolean            wocky_porter_send_finish            (WockyPorter *porter,
                                                          GAsyncResult *result,
                                                          GError **error);
 void                wocky_porter_send_iq_async          (WockyPorter *porter,
@@ -125,26 +132,19 @@
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);
-WockyStanza *       wocky_porter_send_iq_finish         (WockyPorter *porter,
-                                                         GAsyncResult *result,
-                                                         GError **error);
-void                wocky_porter_acknowledge_iq         (WockyPorter *porter,
-                                                         WockyStanza *stanza,
-                                                         ...);
 void                wocky_porter_send_iq_error          (WockyPorter *porter,
                                                          WockyStanza *stanza,
                                                          WockyXmppError error_code,
                                                          const gchar *message);
+WockyStanza *       wocky_porter_send_iq_finish         (WockyPorter *porter,
+                                                         GAsyncResult *result,
+                                                         GError **error);
 void                wocky_porter_send_iq_gerror         (WockyPorter *porter,
                                                          WockyStanza *stanza,
                                                          const GError *error);
-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);
+void                wocky_porter_start                  (WockyPorter *porter);
+void                wocky_porter_unregister_handler     (WockyPorter *porter,
+                                                         guint id);
 

 

 

@@ -155,6 +155,39 @@
 

 
Details

 

+
WOCKY_PORTER_ERROR

+
#define WOCKY_PORTER_ERROR (wocky_porter_error_quark ())
+

+

+Get access to the error quark of the xmpp porter.
+

+

+

+

+
WOCKY_PORTER_HANDLER_PRIORITY_MAX

+
#define WOCKY_PORTER_HANDLER_PRIORITY_MAX G_MAXUINT
+

+

+

+

+

+

+
WOCKY_PORTER_HANDLER_PRIORITY_MIN

+
#define WOCKY_PORTER_HANDLER_PRIORITY_MIN 0
+

+

+

+

+

+

+
WOCKY_PORTER_HANDLER_PRIORITY_NORMAL

+
#define WOCKY_PORTER_HANDLER_PRIORITY_NORMAL (guint) (G_MAXUINT / 2)
+

+

+

+

+

+

 
enum WockyPorterError

 
typedef enum {
   WOCKY_PORTER_ERROR_NOT_STARTED,
@@ -201,54 +234,6 @@
 

 

 

-
wocky_porter_error_quark ()

-
GQuark              wocky_porter_error_quark            (void);

-

-Get the error quark used by the porter.
-

-

--
-
-
-
-


Returns :
the quark for porter errors.

-

-

-

-
WOCKY_PORTER_ERROR

-
#define WOCKY_PORTER_ERROR (wocky_porter_error_quark ())
-

-

-Get access to the error quark of the xmpp porter.
-

-

-

-

-
WOCKY_PORTER_HANDLER_PRIORITY_MIN

-
#define WOCKY_PORTER_HANDLER_PRIORITY_MIN 0
-

-

-

-

-

-

-
WOCKY_PORTER_HANDLER_PRIORITY_NORMAL

-
#define WOCKY_PORTER_HANDLER_PRIORITY_NORMAL (guint) (G_MAXUINT / 2)
-

-

-

-

-

-

-
WOCKY_PORTER_HANDLER_PRIORITY_MAX

-
#define WOCKY_PORTER_HANDLER_PRIORITY_MAX G_MAXUINT
-

-

-

-

-

-

 
WockyPorterHandlerFunc ()

 
gboolean            (*WockyPorterHandlerFunc)           (WockyPorter *porter,
                                                          WockyStanza *stanza,
@@ -460,37 +445,26 @@
 

 

 

-
wocky_porter_start ()

-
void                wocky_porter_start                  (WockyPorter *porter);

+
wocky_porter_acknowledge_iq ()

+
void                wocky_porter_acknowledge_iq         (WockyPorter *porter,
+                                                         WockyStanza *stanza,
+                                                         ...);

 

-Start a WockyPorter to make it read and dispatch incoming stanzas.
+Sends an acknowledgement for stanza back to the sender, as a shorthand for
+calling wocky_stanza_build_iq_result() and wocky_porter_send().
 

 
-
+
+
-
-

 


 
porter :

 a WockyPorter
 

-

-

-

-
wocky_porter_get_full_jid ()

-
const gchar *       wocky_porter_get_full_jid           (WockyPorter *self);

-

-
-

-

--
-
-
-
-
-
+
@@ -498,61 +472,50 @@
 

-
wocky_porter_get_bare_jid ()

-
const gchar *       wocky_porter_get_bare_jid           (WockyPorter *self);

+
wocky_porter_close_async ()

+
void                wocky_porter_close_async            (WockyPorter *porter,
+                                                         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
+stream and waits that the other side closes the XMPP stream as well.
+When this is done, callback is called.
+You can then call wocky_porter_close_finish() to get the result of
+the operation.
 

 


self :
a porter
 

 
Returns :
the value of "full-jid". [transfer none]
+
stanza :
a stanza of type WOCKY_STANZA_TYPE_IQ and sub-type either
+WOCKY_STANZA_SUB_TYPE_SET or WOCKY_STANZA_SUB_TYPE_GET
 
 

 
 
 

-
-
+
+
-
-
+
+
-
-

 
 
 
self :
a porter
porter :
a WockyPorter
+
 

 
Returns :
the value of "bare-jid". [transfer none]
-
cancellable :
optional GCancellable object, NULL to ignore
 

-

-

-

-
wocky_porter_get_resource ()

-
const gchar *       wocky_porter_get_resource           (WockyPorter *self);

-

-
-

-

--
-
-
+
+
-
-
+
+


 
self :
a porter
callback :
callback to call when the request is satisfied
 

 
Returns :
the value of "resource". [transfer none]
-
user_data :
the data to pass to callback function
 

 
 

 

 

 

-
wocky_porter_send_async ()

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

+
wocky_porter_close_finish ()

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

 

-Request asynchronous sending of a WockyStanza.
-When the stanza has been sent callback will be called.
-You can then call wocky_porter_send_finish() to get the result
-of the operation.
+Finishes a close operation.
 

 
@@ -563,12 +526,64 @@
 
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+

 

 
 
stanza :
the WockyStanza to send
result :
a GAsyncResult
+
error :
a GError location to store the error occuring, or NULL to ignore.
Returns :

+TRUE on success or FALSE on error.

+

+

+

+
wocky_porter_error_quark ()

+
GQuark              wocky_porter_error_quark            (void);

+

+Get the error quark used by the porter.
+

+

++
+
+
+
+


Returns :
the quark for porter errors.

+

+

+

+
wocky_porter_force_close_async ()

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

+

+Force the WockyPorter to close the TCP connection of the underlying
+WockyXmppConnection.
+If a close operation is pending, it will be completed with the
+WOCKY_PORTER_ERROR_FORCIBLY_CLOSED error.
+When the connection has been closed, callback will be called.
+You can then call wocky_porter_force_close_finish() to get the result of
+the operation.
+

+

++
+
+
+
+
-
+
@@ -583,12 +598,12 @@
 

-
wocky_porter_send_finish ()

-
gboolean            wocky_porter_send_finish            (WockyPorter *porter,
+
wocky_porter_force_close_finish ()

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

 

-Finishes sending a WockyStanza.
+Finishes a force close operation.
 

 


porter :
a WockyPorter
+

 

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

 

 
callback :

 
 
@@ -605,8 +620,7 @@
 
-
+
@@ -618,161 +632,66 @@
 

-
wocky_porter_send ()

-
void                wocky_porter_send                   (WockyPorter *porter,
-                                                         WockyStanza *stanza);

+
wocky_porter_get_bare_jid ()

+
const gchar *       wocky_porter_get_bare_jid           (WockyPorter *self);

 

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

 

 

 

 
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 :

 
 

-
-
+
+
-
-
+
+

 
 
 
porter :
a WockyPorter
-
self :
a porter
 

 
stanza :
the WockyStanza to send
Returns :
the value of "bare-jid". [transfer none]
+
 

 
 

 

 

 

-
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,
-                                                         WockyPorterHandlerFunc callback,
-                                                         gpointer user_data,
-                                                         va_list ap);

+
wocky_porter_get_full_jid ()

+
const gchar *       wocky_porter_get_full_jid           (WockyPorter *self);

 

-A va_list version of wocky_porter_register_handler_from(); see
-that function for more details.
+
 

 

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+

 
 
 

 
self :
A WockyPorter instance (passed to callback).
type :
The type of stanza to be handled, or WOCKY_STANZA_TYPE_NONE to match
-any type of stanza.
sub_type :
The subtype of stanza to be handled, or
-WOCKY_STANZA_SUB_TYPE_NONE to match any type of stanza.
from :
the JID whose messages this handler is intended for (may not be
-NULL)
priority :
a priority between WOCKY_PORTER_HANDLER_PRIORITY_MIN and
-WOCKY_PORTER_HANDLER_PRIORITY_MAX (often
-WOCKY_PORTER_HANDLER_PRIORITY_NORMAL). Handlers with a higher priority
-(larger number) are called first.
callback :
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.
user_data :
Passed to callback.
ap :
a wocky_stanza_build() specification. The handler
-will match a stanza only if the stanza received is a superset of the one
-passed to this function, as per wocky_node_is_superset().a porter
 

 

 
Returns :
a non-zero ID for use with wocky_porter_unregister_handler().the value of "full-jid". [transfer none]
+
 

 
 

 

 

 

-
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,
-                                                         WockyPorterHandlerFunc callback,
-                                                         gpointer user_data,
-                                                         WockyStanza *stanza);

+
wocky_porter_get_resource ()

+
const gchar *       wocky_porter_get_resource           (WockyPorter *self);

 

-A WockyStanza version of wocky_porter_register_handler_from(); see
-that function for more details.
+
 

 

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+

 
 
 

 
self :
A WockyPorter instance (passed to callback).
type :
The type of stanza to be handled, or WOCKY_STANZA_TYPE_NONE to match
-any type of stanza.
sub_type :
The subtype of stanza to be handled, or
-WOCKY_STANZA_SUB_TYPE_NONE to match any type of stanza.
from :
the JID whose messages this handler is intended for (may not be
-NULL)
priority :
a priority between WOCKY_PORTER_HANDLER_PRIORITY_MIN and
-WOCKY_PORTER_HANDLER_PRIORITY_MAX (often
-WOCKY_PORTER_HANDLER_PRIORITY_NORMAL). Handlers with a higher priority
-(larger number) are called first.
callback :
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.
user_data :
Passed to callback.
stanza :
a WockyStanza. The handler will match a stanza only if
-the stanza received is a superset of the one passed to this
-function, as per wocky_node_is_superset().a porter
 

 

 
Returns :
a non-zero ID for use with wocky_porter_unregister_handler().the value of "resource". [transfer none]
+
 

 
 

@@ -880,12 +799,6 @@
 Passed to callback.
 
 
-
... :

-a wocky_stanza_build() specification. The handler
-will match a stanza only if the stanza received is a superset of the one
-passed to this function, as per wocky_node_is_superset().
-
-
 
Returns :

 a non-zero ID for use with wocky_porter_unregister_handler().
 
@@ -894,19 +807,82 @@
 

 

 

-
wocky_porter_register_handler_from_anyone_va ()

-
guint               wocky_porter_register_handler_from_anyone_va
+
wocky_porter_register_handler_from_anyone ()

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

+                                                         ...);

+

+Registers a handler for incoming stanzas from anyone, including those where
+the from attribute is missing.
+

+

+For example, to register a handler matching all message stanzas received
+from anyone, call:
+

+

+

+

+  
+    
+      
+        
+        
+      
+    
+  
1
+2
+3
+4
id = wocky_porter_register_handler (porter,
+  WOCKY_STANZA_TYPE_MESSAGE, WOCKY_STANZA_SUB_TYPE_NONE, NULL,
+  WOCKY_PORTER_HANDLER_PRIORITY_NORMAL, message_received_cb, NULL,
+  NULL);

+

+
+

+

+

+As a more interesting example, the following matches incoming PEP
+notifications for contacts' geolocation information:
+

+

+

+

+  
+    
+      
+        
+        
+      
+    
+  
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
id = wocky_porter_register_handler_from_anyone (porter,
+   WOCKY_STANZA_TYPE_MESSAGE, WOCKY_STANZA_SUB_TYPE_NONE,
+   WOCKY_PORTER_HANDLER_PRIORITY_MAX,
+   msg_event_cb, self,
+   '(', "event",
+     ':', WOCKY_XMPP_NS_PUBSUB_EVENT,
+     '(', "items",
+       '@', "node", "http://jabber.org/protocol/geoloc",
+     ')',
+   ')',
+   NULL);

+

+
 

-A va_list version of
-wocky_porter_register_handler_from_anyone(); see that function for more
-details.
 

 
@@ -943,12 +919,6 @@
 
-
-
-
-
@@ -1020,82 +990,150 @@
 

-
wocky_porter_register_handler_from_anyone ()

-
guint               wocky_porter_register_handler_from_anyone
+
wocky_porter_register_handler_from_anyone_va ()

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

-

-Registers a handler for incoming stanzas from anyone, including those where
-the from attribute is missing.
-

-

-For example, to register a handler matching all message stanzas received
-from anyone, call:
-

+                                                         va_list ap);

 

+A va_list version of
+wocky_porter_register_handler_from_anyone(); see that function for more
+details.
 

-

-  

 

Passed to callback.
 

 
ap :
a wocky_stanza_build() specification. The handler
-will match a stanza only if the stanza received is a superset of the one
-passed to this function, as per wocky_node_is_superset().

 
Returns :

 a non-zero ID for use with wocky_porter_unregister_handler().
 

 
 

-    
-      
-        
-        
-      
-    
-  
1
-2
-3
-4
id = wocky_porter_register_handler (porter,
-  WOCKY_STANZA_TYPE_MESSAGE, WOCKY_STANZA_SUB_TYPE_NONE, NULL,
-  WOCKY_PORTER_HANDLER_PRIORITY_NORMAL, message_received_cb, NULL,
-  NULL);

+

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


self :
A WockyPorter instance (passed to callback).
type :
The type of stanza to be handled, or WOCKY_STANZA_TYPE_NONE to match
+any type of stanza.
sub_type :
The subtype of stanza to be handled, or
+WOCKY_STANZA_SUB_TYPE_NONE to match any type of stanza.
priority :
a priority between WOCKY_PORTER_HANDLER_PRIORITY_MIN and
+WOCKY_PORTER_HANDLER_PRIORITY_MAX (often
+WOCKY_PORTER_HANDLER_PRIORITY_NORMAL). Handlers with a higher priority
+(larger number) are called first.
callback :
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.
user_data :
Passed to callback.
ap :
a wocky_stanza_build() specification. The handler
+will match a stanza only if the stanza received is a superset of the one
+passed to this function, as per wocky_node_is_superset().
Returns :
a non-zero ID for use with wocky_porter_unregister_handler().

 

-
-

-

-

-As a more interesting example, the following matches incoming PEP
-notifications for contacts' geolocation information:
-

+

+

+
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,
+                                                         WockyPorterHandlerFunc callback,
+                                                         gpointer user_data,
+                                                         WockyStanza *stanza);

 

+A WockyStanza version of wocky_porter_register_handler_from(); see
+that function for more details.
 

-

-  
-    
-      
-        
-        
-      
-    
-  
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
id = wocky_porter_register_handler_from_anyone (porter,
-   WOCKY_STANZA_TYPE_MESSAGE, WOCKY_STANZA_SUB_TYPE_NONE,
-   WOCKY_PORTER_HANDLER_PRIORITY_MAX,
-   msg_event_cb, self,
-   '(', "event",
-     ':', WOCKY_XMPP_NS_PUBSUB_EVENT,
-     '(', "items",
-       '@', "node", "http://jabber.org/protocol/geoloc",
-     ')',
-   ')',
-   NULL);

+

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


self :
A WockyPorter instance (passed to callback).
type :
The type of stanza to be handled, or WOCKY_STANZA_TYPE_NONE to match
+any type of stanza.
sub_type :
The subtype of stanza to be handled, or
+WOCKY_STANZA_SUB_TYPE_NONE to match any type of stanza.
from :
the JID whose messages this handler is intended for (may not be
+NULL)
priority :
a priority between WOCKY_PORTER_HANDLER_PRIORITY_MIN and
+WOCKY_PORTER_HANDLER_PRIORITY_MAX (often
+WOCKY_PORTER_HANDLER_PRIORITY_NORMAL). Handlers with a higher priority
+(larger number) are called first.
callback :
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.
user_data :
Passed to callback.
stanza :
a WockyStanza. The handler will match a stanza only if
+the stanza received is a superset of the one passed to this
+function, as per wocky_node_is_superset().
Returns :
a non-zero ID for use with wocky_porter_unregister_handler().

 

-
+

+

+
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,
+                                                         WockyPorterHandlerFunc callback,
+                                                         gpointer user_data,
+                                                         va_list ap);

 

+A va_list version of wocky_porter_register_handler_from(); see
+that function for more details.
 

 
@@ -1115,6 +1153,11 @@
 WOCKY_STANZA_SUB_TYPE_NONE to match any type of stanza.
+
+
+
+
-
+
@@ -1146,12 +1189,13 @@
 

-
wocky_porter_unregister_handler ()

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

+
wocky_porter_send ()

+
void                wocky_porter_send                   (WockyPorter *porter,
+                                                         WockyStanza *stanza);

 

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

 

 

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

 
priority :

 a priority between WOCKY_PORTER_HANDLER_PRIORITY_MIN and
 WOCKY_PORTER_HANDLER_PRIORITY_MAX (often
@@ -1132,7 +1175,7 @@
 Passed to callback.
 

 
... :
ap :

 a wocky_stanza_build() specification. The handler
 will match a stanza only if the stanza received is a superset of the one
 passed to this function, as per wocky_node_is_superset().
 
 
@@ -1162,26 +1206,25 @@
 
-
-
+
+

 

 
 
id :
the id of the handler to unregister
stanza :
the WockyStanza to send
 

 
 

 

 

 

-
wocky_porter_close_async ()

-
void                wocky_porter_close_async            (WockyPorter *porter,
+
wocky_porter_send_async ()

+
void                wocky_porter_send_async             (WockyPorter *porter,
+                                                         WockyStanza *stanza,
                                                          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
-stream and waits that the other side closes the XMPP stream as well.
-When this is done, callback is called.
-You can then call wocky_porter_close_finish() to get the result of
-the operation.
+Request asynchronous sending of a WockyStanza.
+When the stanza has been sent callback will be called.
+You can then call wocky_porter_send_finish() to get the result
+of the operation.
 

 
@@ -1192,8 +1235,12 @@
 
+
+
+
+
-
+
@@ -1208,12 +1255,12 @@
 

-
wocky_porter_close_finish ()

-
gboolean            wocky_porter_close_finish           (WockyPorter *porter,
+
wocky_porter_send_finish ()

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

 

-Finishes a close operation.
+Finishes sending a WockyStanza.
 

 

 

 
 
stanza :
the WockyStanza to send

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

 

 
callback :

 
 
@@ -1230,7 +1277,8 @@
 
-
+
@@ -1284,71 +1332,6 @@
 

-
wocky_porter_send_iq_finish ()

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

-

-Get the reply of an IQ query.
-

-

 

 

 
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 :

 
 

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


porter :
a WockyPorter
-
result :
a GAsyncResult
-
error :
a GError location to store the error occuring, or NULL to ignore.
Returns :
a reffed WockyStanza on success, NULL on error

-

-

-

-
wocky_porter_acknowledge_iq ()

-
void                wocky_porter_acknowledge_iq         (WockyPorter *porter,
-                                                         WockyStanza *stanza,
-                                                         ...);

-

-Sends an acknowledgement for stanza back to the sender, as a shorthand for
-calling wocky_stanza_build_iq_result() and wocky_porter_send().
-

-

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


porter :
a WockyPorter
-
stanza :
a stanza of type WOCKY_STANZA_TYPE_IQ and sub-type either
-WOCKY_STANZA_SUB_TYPE_SET or WOCKY_STANZA_SUB_TYPE_GET
-
... :
a wocky_stanza_build() specification; pass NULL to include no
-body in the reply.

-

-

-

 
wocky_porter_send_iq_error ()

 
void                wocky_porter_send_iq_error          (WockyPorter *porter,
                                                          WockyStanza *stanza,
@@ -1392,6 +1375,39 @@
 

 

 

+
wocky_porter_send_iq_finish ()

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

+

+Get the reply of an IQ query.
+

+

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


porter :
a WockyPorter
+
result :
a GAsyncResult
+
error :
a GError location to store the error occuring, or NULL to ignore.
Returns :
a reffed WockyStanza on success, NULL on error

+

+

+

 
wocky_porter_send_iq_gerror ()

 
void                wocky_porter_send_iq_gerror         (WockyPorter *porter,
                                                          WockyStanza *stanza,
@@ -1428,51 +1444,28 @@
 

 

 

-
wocky_porter_force_close_async ()

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

+
wocky_porter_start ()

+
void                wocky_porter_start                  (WockyPorter *porter);

 

-Force the WockyPorter to close the TCP connection of the underlying
-WockyXmppConnection.
-If a close operation is pending, it will be completed with the
-WOCKY_PORTER_ERROR_FORCIBLY_CLOSED error.
-When the connection has been closed, callback will be called.
-You can then call wocky_porter_force_close_finish() to get the result of
-the operation.
+Start a WockyPorter to make it read and dispatch incoming stanzas.
 

 
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+

 


 
porter :

 a WockyPorter
 
cancellable :
optional GCancellable object, NULL to ignore
callback :
callback to call when the request is satisfied
user_data :
the data to pass to callback function

 

 

 

 

-
wocky_porter_force_close_finish ()

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

+
wocky_porter_unregister_handler ()

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

 

-Finishes a force close operation.
+Unregister a registered handler. This handler won't be called when
+receiving stanzas anymore.
 

 
@@ -1483,18 +1476,8 @@
 
-
-
-
-
-
-
-
-
-
-
+
+

 

 
 
result :
a GAsyncResult
-
error :
a GError location to store the error occuring, or NULL to ignore.
Returns :

-TRUE on success or FALSE on error.
id :
the id of the handler to unregister
 

 
 

@@ -1503,6 +1486,6 @@
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-helpers.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-helpers.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-helpers.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-helpers.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,42 +37,42 @@
 

 

 
Synopsis

-
WockyStanza *       wocky_pubsub_make_event_stanza      (const gchar *node,
-                                                         const gchar *from,
-                                                         WockyNode **item_out);
-WockyStanza *       wocky_pubsub_make_stanza            (const gchar *service,
-                                                         WockyStanzaSubType sub_type,
-                                                         const gchar *pubsub_ns,
-                                                         const gchar *action_name,
-                                                         WockyNode **pubsub_node,
-                                                         WockyNode **action_node);
-WockyStanza *       wocky_pubsub_make_publish_stanza    (const gchar *service,
-                                                         const gchar *node,
-                                                         WockyNode **pubsub_out,
-                                                         WockyNode **publish_out,
-                                                         WockyNode **item_out);
-gboolean            wocky_pubsub_distill_iq_reply       (GObject *source,
+
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_ambivalent_iq_reply
-                                                        (GObject *source,
+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_void_iq_reply  (GObject *source,
-                                                         GAsyncResult *res,
-                                                         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,
+                                                         WockyNode **item_out);
+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,
+                                                         WockyStanzaSubType sub_type,
+                                                         const gchar *pubsub_ns,
+                                                         const gchar *action_name,
+                                                         WockyNode **pubsub_node,
+                                                         WockyNode **action_node);
 

 

 

@@ -83,131 +83,60 @@
 

 
Details

 

-
wocky_pubsub_make_event_stanza ()

-
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
-updated PEP node.
-

-

-Note that this should only be used in link-local
-connections. Regular pubsub consists of making a publish stanza
-with wocky_pubsub_make_publish_stanza() and sending it to your own
-server. The server will then send the event stanza on to your
-contacts who have the appropriate capability.
-

-

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


node :
the the name of the pubsub node; may not be NULL
-
from :
a JID to use as the 'from' attribute, or NULL
-
item_out :
a location to store the item WockyNode, or NULL
-
Returns :
a new WockyStanza pubsub event stanza; free with g_object_unref()
-

-

-

-

-
wocky_pubsub_make_stanza ()

-
WockyStanza *       wocky_pubsub_make_stanza            (const gchar *service,
-                                                         WockyStanzaSubType sub_type,
+
wocky_pubsub_distill_ambivalent_iq_reply ()

+
gboolean            wocky_pubsub_distill_ambivalent_iq_reply
+                                                        (GObject *source,
+                                                         GAsyncResult *res,
                                                          const gchar *pubsub_ns,
-                                                         const gchar *action_name,
-                                                         WockyNode **pubsub_node,
-                                                         WockyNode **action_node);

+                                                         const gchar *child_name,
+                                                         WockyNodeTree **child_out,
+                                                         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
+present. This is like wocky_pubsub_distill_iq_reply(), but is ambivalent as
+to whether the <pubsub/> structure has to be included.
 

 

-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-

 
 
 
service :
the JID of a PubSub service, or NULL
-
pubsub_ns :
the namespace for the <pubsub/> node of the stanza
action_name :
the action node to add to <pubsub/>
pubsub_node :
address at which to store a pointer to the <pubsub/> node
action_node :
address at wihch to store a pointer to the <action/>
-node
source :
a WockyPorter instance
 

 
Returns :
a new iq[type='set']/pubsub/action stanza

-

-

-

-
wocky_pubsub_make_publish_stanza ()

-
WockyStanza *       wocky_pubsub_make_publish_stanza    (const gchar *service,
-                                                         const gchar *node,
-                                                         WockyNode **pubsub_out,
-                                                         WockyNode **publish_out,
-                                                         WockyNode **item_out);

-

-
-

-

--
-
-
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+


service :
the JID of a PubSub service, or NULL
+
res :
a result passed to the callback for wocky_porter_send_iq_async()
 
 

 
node :
the name of a node on service; may not be NULL
-
pubsub_ns :
the namespace of the <pubsub/> node accepted in this reply
+(such as WOCKY_XMPP_NS_PUBSUB)
 

 
pubsub_out :
address at which to store a pointer to the <pubsub/> node
child_name :
the name of the child of <pubsub/> accepted in this reply
+(such as "subscriptions")
 

 
publish_out :
address at which to store a pointer to the <publish/>
-node
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
+found
 

 
item_out :
address at which to store a pointer to the <item/> node
error :
location at which to store an error if the call to
+wocky_porter_send_iq_async() returned an error, or if the reply was
+an error
 

 

 
Returns :
a new iq[type='set']/pubsub/publish/item stanza
+TRUE if the IQ was a success; FALSE if
+sending the IQ failed or the reply had type='error',
+with error set appropriately.
 

 
 

@@ -271,60 +200,63 @@
 

 

 

-
wocky_pubsub_distill_ambivalent_iq_reply ()

-
gboolean            wocky_pubsub_distill_ambivalent_iq_reply
-                                                        (GObject *source,
-                                                         GAsyncResult *res,
+
wocky_pubsub_distill_stanza ()

+
gboolean            wocky_pubsub_distill_stanza         (WockyStanza *result,
                                                          const gchar *pubsub_ns,
                                                          const gchar *child_name,
+                                                         gboolean body_optional,
                                                          WockyNodeTree **child_out,
                                                          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
-present. This is like wocky_pubsub_distill_iq_reply(), but is ambivalent as
-to whether the <pubsub/> structure has to be included.
+Helper function to extract a particular pubsub child node from a reply, if
+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.
+

+

+If you are happy to delegate calling wocky_porter_send_iq_finish() and
+extracting stanza errors, you would probably be better served by one of
+wocky_pubsub_distill_iq_reply() or
+wocky_pubsub_distill_ambivalent_iq_reply().
 

 

-
-
-
-
-
-
+
+
-
-
+
+
+
+
+child_name, if it is found, or to be set to NULL if it is not.
-
+
+TRUE if the child was found or was optional; FALSE with error
+set otherwise.

 
 
 
source :
a WockyPorter instance
res :
a result passed to the callback for wocky_porter_send_iq_async()
-
result :
an iq type='result'
 

 

 
pubsub_ns :
the namespace of the <pubsub/> node accepted in this reply
+the namespace of the <pubsub/> node expected in this reply
 (such as WOCKY_XMPP_NS_PUBSUB)
 

 

 
child_name :
the name of the child of <pubsub/> accepted in this reply
+the name of the child of <pubsub/> expected in this reply
 (such as "subscriptions")
 

 
body_optional :
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
-found
 

 

 
error :
location at which to store an error if the call to
-wocky_porter_send_iq_async() returned an error, or if the reply was
-an errorlocation at which to store an error if the child node is not found
+and body_optional is FALSE
+
 

 

 
Returns :

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

 
 

@@ -369,63 +301,131 @@
 

 

 

-
wocky_pubsub_distill_stanza ()

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

+
wocky_pubsub_make_event_stanza ()

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

 

-Helper function to extract a particular pubsub child node from a reply, if
-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.
+Generates a new message stanza to send to other contacts about an
+updated PEP node.
 

 

-If you are happy to delegate calling wocky_porter_send_iq_finish() and
-extracting stanza errors, you would probably be better served by one of
-wocky_pubsub_distill_iq_reply() or
-wocky_pubsub_distill_ambivalent_iq_reply().
+Note that this should only be used in link-local
+connections. Regular pubsub consists of making a publish stanza
+with wocky_pubsub_make_publish_stanza() and sending it to your own
+server. The server will then send the event stanza on to your
+contacts who have the appropriate capability.
 

 

-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+

 
 
 
result :
an iq type='result'
node :
the the name of the pubsub node; may not be NULL
+
 

 
pubsub_ns :
the namespace of the <pubsub/> node expected in this reply
-(such as WOCKY_XMPP_NS_PUBSUB)
from :
a JID to use as the 'from' attribute, or NULL
+
 

 
child_name :
the name of the child of <pubsub/> expected in this reply
-(such as "subscriptions")
item_out :
a location to store the item WockyNode, or NULL
+
 

 
body_optional :
If TRUE, the child being absent is not considered an error
Returns :
a new WockyStanza pubsub event stanza; free with g_object_unref()
+
 

+

+

+

+
wocky_pubsub_make_publish_stanza ()

+
WockyStanza *       wocky_pubsub_make_publish_stanza    (const gchar *service,
+                                                         const gchar *node,
+                                                         WockyNode **pubsub_out,
+                                                         WockyNode **publish_out,
+                                                         WockyNode **item_out);

+

+
+

+

++
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+


 
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.
service :
the JID of a PubSub service, or NULL
+
 

 
error :
location at which to store an error if the child node is not found
-and body_optional is FALSE
+
node :
the name of a node on service; may not be NULL
 
 

 
pubsub_out :
address at which to store a pointer to the <pubsub/> node
publish_out :
address at which to store a pointer to the <publish/>
+node
item_out :
address at which to store a pointer to the <item/> node

 
Returns :

-TRUE if the child was found or was optional; FALSE with error
-set otherwise.a new iq[type='set']/pubsub/publish/item stanza

+

+

+

+
wocky_pubsub_make_stanza ()

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

+

+
+

+

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


service :
the JID of a PubSub service, or NULL
+
pubsub_ns :
the namespace for the <pubsub/> node of the stanza
action_name :
the action node to add to <pubsub/>
pubsub_node :
address at which to store a pointer to the <pubsub/> node
action_node :
address at wihch to store a pointer to the <action/>
+node
Returns :
a new iq[type='set']/pubsub/action stanza
 

 
 

@@ -434,6 +434,6 @@
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-node-enumtypes.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-node-enumtypes.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-node-enumtypes.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-node-enumtypes.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,10 +37,7 @@
 

 

 
Synopsis

-
GType               wocky_pubsub_affiliation_state_get_type
-                                                        (void);
-#define             WOCKY_TYPE_PUBSUB_AFFILIATION_STATE
-

+

 

 

 
Description

@@ -49,25 +46,10 @@
 

 

 
Details

-

-
wocky_pubsub_affiliation_state_get_type ()

-
GType               wocky_pubsub_affiliation_state_get_type
-                                                        (void);

-

-

-

-

-

-
WOCKY_TYPE_PUBSUB_AFFILIATION_STATE

-
#define WOCKY_TYPE_PUBSUB_AFFILIATION_STATE (wocky_pubsub_affiliation_state_get_type())
-

-

-

-

 

 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-node-protected.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-node-protected.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-node-protected.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-node-protected.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -43,41 +43,41 @@
                                                          WockyNode *action_node);
                     WockyPubsubNodeEventMapping;
 WockyPorter *       wocky_pubsub_node_get_porter        (WockyPubsubNode *self);
-WockyStanza *       wocky_pubsub_node_make_subscribe_stanza
-                                                        (WockyPubsubNode *self,
-                                                         const gchar *jid,
-                                                         WockyNode **pubsub_node,
-                                                         WockyNode **subscribe_node);
-WockyStanza *       wocky_pubsub_node_make_unsubscribe_stanza
-                                                        (WockyPubsubNode *self,
-                                                         const gchar *jid,
-                                                         const gchar *subid,
-                                                         WockyNode **pubsub_node,
-                                                         WockyNode **unsubscribe_node);
 WockyStanza *       wocky_pubsub_node_make_delete_stanza
                                                         (WockyPubsubNode *self,
                                                          WockyNode **pubsub_node,
                                                          WockyNode **delete_node);
-WockyStanza *       wocky_pubsub_node_make_list_subscribers_stanza
+WockyStanza *       wocky_pubsub_node_make_get_configuration_stanza
                                                         (WockyPubsubNode *self,
                                                          WockyNode **pubsub_node,
-                                                         WockyNode **subscriptions_node);
+                                                         WockyNode **configure_node);
 WockyStanza *       wocky_pubsub_node_make_list_affiliates_stanza
                                                         (WockyPubsubNode *self,
                                                          WockyNode **pubsub_node,
                                                          WockyNode **affiliations_node);
-GList *             wocky_pubsub_node_parse_affiliations
+WockyStanza *       wocky_pubsub_node_make_list_subscribers_stanza
                                                         (WockyPubsubNode *self,
-                                                         WockyNode *affiliations_node);
+                                                         WockyNode **pubsub_node,
+                                                         WockyNode **subscriptions_node);
 WockyStanza *       wocky_pubsub_node_make_modify_affiliates_stanza
                                                         (WockyPubsubNode *self,
                                                          const GList *affiliates,
                                                          WockyNode **pubsub_node,
                                                          WockyNode **affiliations_node);
-WockyStanza *       wocky_pubsub_node_make_get_configuration_stanza
+WockyStanza *       wocky_pubsub_node_make_subscribe_stanza
                                                         (WockyPubsubNode *self,
+                                                         const gchar *jid,
                                                          WockyNode **pubsub_node,
-                                                         WockyNode **configure_node);
+                                                         WockyNode **subscribe_node);
+WockyStanza *       wocky_pubsub_node_make_unsubscribe_stanza
+                                                        (WockyPubsubNode *self,
+                                                         const gchar *jid,
+                                                         const gchar *subid,
+                                                         WockyNode **pubsub_node,
+                                                         WockyNode **unsubscribe_node);
+GList *             wocky_pubsub_node_parse_affiliations
+                                                        (WockyPubsubNode *self,
+                                                         WockyNode *affiliations_node);
 
 
 

@@ -116,29 +116,6 @@
 

 

 

-
wocky_pubsub_node_make_subscribe_stanza ()

-
WockyStanza *       wocky_pubsub_node_make_subscribe_stanza
-                                                        (WockyPubsubNode *self,
-                                                         const gchar *jid,
-                                                         WockyNode **pubsub_node,
-                                                         WockyNode **subscribe_node);

-

-

-

-

-

-
wocky_pubsub_node_make_unsubscribe_stanza ()

-
WockyStanza *       wocky_pubsub_node_make_unsubscribe_stanza
-                                                        (WockyPubsubNode *self,
-                                                         const gchar *jid,
-                                                         const gchar *subid,
-                                                         WockyNode **pubsub_node,
-                                                         WockyNode **unsubscribe_node);

-

-

-

-

-

 
wocky_pubsub_node_make_delete_stanza ()

 
WockyStanza *       wocky_pubsub_node_make_delete_stanza
                                                         (WockyPubsubNode *self,
@@ -149,13 +126,37 @@
 

 

 

-
wocky_pubsub_node_make_list_subscribers_stanza ()

-
WockyStanza *       wocky_pubsub_node_make_list_subscribers_stanza
+
wocky_pubsub_node_make_get_configuration_stanza ()

+
WockyStanza *       wocky_pubsub_node_make_get_configuration_stanza
                                                         (WockyPubsubNode *self,
                                                          WockyNode **pubsub_node,
-                                                         WockyNode **subscriptions_node);

-

-

+                                                         WockyNode **configure_node);

+

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


self :
a pubsub node
pubsub_node :
location at which to store a pointer to the <pubsub/>
+node, or NULL
+
configure_node :
location at which to store a pointer to the
+<configure/> node, or NULL
+
Returns :
an IQ stanza to retrieve the configuration of self
+

 

 

 

@@ -169,10 +170,11 @@
 

 

 

-
wocky_pubsub_node_parse_affiliations ()

-
GList *             wocky_pubsub_node_parse_affiliations
+
wocky_pubsub_node_make_list_subscribers_stanza ()

+
WockyStanza *       wocky_pubsub_node_make_list_subscribers_stanza
                                                         (WockyPubsubNode *self,
-                                                         WockyNode *affiliations_node);

+                                                         WockyNode **pubsub_node,
+                                                         WockyNode **subscriptions_node);

 

 

 

@@ -218,42 +220,40 @@
 
 

 

-
wocky_pubsub_node_make_get_configuration_stanza ()

-
WockyStanza *       wocky_pubsub_node_make_get_configuration_stanza
+
wocky_pubsub_node_make_subscribe_stanza ()

+
WockyStanza *       wocky_pubsub_node_make_subscribe_stanza
                                                         (WockyPubsubNode *self,
+                                                         const gchar *jid,
                                                          WockyNode **pubsub_node,
-                                                         WockyNode **configure_node);

-

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


self :
a pubsub node
pubsub_node :
location at which to store a pointer to the <pubsub/>
-node, or NULL
-
configure_node :
location at which to store a pointer to the
-<configure/> node, or NULL
-
Returns :
an IQ stanza to retrieve the configuration of self
-

+                                                         WockyNode **subscribe_node);

+

+

+

+

+

+
wocky_pubsub_node_make_unsubscribe_stanza ()

+
WockyStanza *       wocky_pubsub_node_make_unsubscribe_stanza
+                                                        (WockyPubsubNode *self,
+                                                         const gchar *jid,
+                                                         const gchar *subid,
+                                                         WockyNode **pubsub_node,
+                                                         WockyNode **unsubscribe_node);

+

+

+

+

+

+
wocky_pubsub_node_parse_affiliations ()

+
GList *             wocky_pubsub_node_parse_affiliations
+                                                        (WockyPubsubNode *self,
+                                                         WockyNode *affiliations_node);

+

+

 

 
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-service-enumtypes.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-service-enumtypes.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-service-enumtypes.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-service-enumtypes.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,12 +37,7 @@
 
 

 
Synopsis

-
GType               wocky_pubsub_service_error_get_type (void);
-#define             WOCKY_TYPE_PUBSUB_SERVICE_ERROR
-GType               wocky_pubsub_subscription_state_get_type
-                                                        (void);
-#define             WOCKY_TYPE_PUBSUB_SUBSCRIPTION_STATE
-

+

 

 

 
Description

@@ -51,40 +46,10 @@
 

 

 
Details

-

-
wocky_pubsub_service_error_get_type ()

-
GType               wocky_pubsub_service_error_get_type (void);

-

-

-

-

-

-
WOCKY_TYPE_PUBSUB_SERVICE_ERROR

-
#define WOCKY_TYPE_PUBSUB_SERVICE_ERROR (wocky_pubsub_service_error_get_type())
-

-

-

-

-

-

-
wocky_pubsub_subscription_state_get_type ()

-
GType               wocky_pubsub_subscription_state_get_type
-                                                        (void);

-

-

-

-

-

-
WOCKY_TYPE_PUBSUB_SUBSCRIPTION_STATE

-
#define WOCKY_TYPE_PUBSUB_SUBSCRIPTION_STATE (wocky_pubsub_subscription_state_get_type())
-

-

-

-

 

 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyPubsubService.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyPubsubService.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyPubsubService.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyPubsubService.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -39,16 +39,25 @@
 
 

 
Synopsis

-
enum                WockyPubsubServiceError;
-GQuark              wocky_pubsub_service_error_quark    (void);
-#define             WOCKY_PUBSUB_SERVICE_ERROR
+
#define             WOCKY_PUBSUB_SERVICE_ERROR
 struct              WockyPubsubServiceClass;
-WockyPubsubService *  wocky_pubsub_service_new          (WockySession *session,
-                                                         const gchar *jid);
+enum                WockyPubsubServiceError;
+                    WockyPubsubSubscription;
+enum                WockyPubsubSubscriptionState;
+void                wocky_pubsub_service_create_node_async
+                                                        (WockyPubsubService *self,
+                                                         const gchar *name,
+                                                         WockyDataForm *config,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+WockyPubsubNode *   wocky_pubsub_service_create_node_finish
+                                                        (WockyPubsubService *self,
+                                                         GAsyncResult *result,
+                                                         GError **error);
 WockyPubsubNode *   wocky_pubsub_service_ensure_node    (WockyPubsubService *self,
                                                          const gchar *name);
-WockyPubsubNode *   wocky_pubsub_service_lookup_node    (WockyPubsubService *self,
-                                                         const gchar *name);
+GQuark              wocky_pubsub_service_error_quark    (void);
 void                wocky_pubsub_service_get_default_node_configuration_async
                                                         (WockyPubsubService *self,
                                                          GCancellable *cancellable,
@@ -58,6 +67,10 @@
                                                         (WockyPubsubService *self,
                                                          GAsyncResult *result,
                                                          GError **error);
+WockyPubsubNode *   wocky_pubsub_service_lookup_node    (WockyPubsubService *self,
+                                                         const gchar *name);
+WockyPubsubService * wocky_pubsub_service_new           (WockySession *session,
+                                                         const gchar *jid);
 void                wocky_pubsub_service_retrieve_subscriptions_async
                                                         (WockyPubsubService *self,
                                                          WockyPubsubNode *node,
@@ -69,31 +82,15 @@
                                                          GAsyncResult *result,
                                                          GList **subscriptions,
                                                          GError **error);
-void                wocky_pubsub_service_create_node_async
-                                                        (WockyPubsubService *self,
-                                                         const gchar *name,
-                                                         WockyDataForm *config,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-WockyPubsubNode *   wocky_pubsub_service_create_node_finish
-                                                        (WockyPubsubService *self,
-                                                         GAsyncResult *result,
-                                                         GError **error);
-enum                WockyPubsubSubscriptionState;
-                    WockyPubsubSubscription;
-#define             WOCKY_TYPE_PUBSUB_SUBSCRIPTION
-GType               wocky_pubsub_subscription_get_type  (void);
-WockyPubsubSubscription * wocky_pubsub_subscription_new (WockyPubsubNode *node,
-                                                         const gchar *jid,
-                                                         WockyPubsubSubscriptionState state,
-                                                         const gchar *subid);
 WockyPubsubSubscription * wocky_pubsub_subscription_copy
                                                         (WockyPubsubSubscription *sub);
 void                wocky_pubsub_subscription_free      (WockyPubsubSubscription *sub);
 GList *             wocky_pubsub_subscription_list_copy (GList *subs);
 void                wocky_pubsub_subscription_list_free (GList *subs);
-                    WockyPubsubServicePrivate;
+WockyPubsubSubscription * wocky_pubsub_subscription_new (WockyPubsubNode *node,
+                                                         const gchar *jid,
+                                                         WockyPubsubSubscriptionState state,
+                                                         const gchar *subid);
 

 

 

@@ -103,13 +100,13 @@
    +----WockyPubsubServiceError
 
 
-  GEnum
-   +----WockyPubsubSubscriptionState
-

-
   GBoxed
    +----WockyPubsubSubscription
 

+
+  GEnum
+   +----WockyPubsubSubscriptionState
+

 

 

 
Description

@@ -119,32 +116,6 @@
 

 
Details

 

-
enum WockyPubsubServiceError

-
typedef enum {
-  WOCKY_PUBSUB_SERVICE_ERROR_WRONG_REPLY,
-} WockyPubsubServiceError;
-

-

-WockyPubsubService specific errors.
-

-

--
-
-
-
-


WOCKY_PUBSUB_SERVICE_ERROR_WRONG_REPLY
A wrong reply was received
-

-

-

-

-
wocky_pubsub_service_error_quark ()

-
GQuark              wocky_pubsub_service_error_quark    (void);

-

-

-

-

-

 
WOCKY_PUBSUB_SERVICE_ERROR

 
#define WOCKY_PUBSUB_SERVICE_ERROR (wocky_pubsub_service_error_quark ())
 

@@ -180,68 +151,111 @@
 

 

 

-
wocky_pubsub_service_new ()

-
WockyPubsubService *  wocky_pubsub_service_new          (WockySession *session,
-                                                         const gchar *jid);

+
enum WockyPubsubServiceError

+
typedef enum {
+  WOCKY_PUBSUB_SERVICE_ERROR_WRONG_REPLY,
+} WockyPubsubServiceError;
+

 

+WockyPubsubService specific errors.
 

+

++
+
+
+
+


WOCKY_PUBSUB_SERVICE_ERROR_WRONG_REPLY
A wrong reply was received
+

 

 

 

-
wocky_pubsub_service_ensure_node ()

-
WockyPubsubNode *   wocky_pubsub_service_ensure_node    (WockyPubsubService *self,
-                                                         const gchar *name);

+
WockyPubsubSubscription

+
typedef struct {
+    WockyPubsubNode *node;
+    gchar *jid;
+    WockyPubsubSubscriptionState state;
+    gchar *subid;
+} WockyPubsubSubscription;
+

 

-Fetches or creates an object representing a node on the pubsub service. Note
-that this does not ensure that a node exists on the server; it merely
-ensures a local representation.
+Represents a subscription to a node on a pubsub service, as seen when
+listing your own subscriptions on a service with
+wocky_pubsub_service_retrieve_subscriptions_async() or subscribing to a node
+with wocky_pubsub_node_subscribe_async().
 

 

-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+

 
 
 
self :
a pubsub service
WockyPubsubNode *node;
a PubSub node
 

 
name :
the name of a node on self
-
gchar *jid;
the JID which is subscribed to node. This may be a bare JID, or a
+full JID with a resource, depending on which was specified when
+subscribing to node. See XEP-0060 §6.1 Subscribe to a Node
 

 
Returns :
a new reference to an object representing a node named name on
-self
-
WockyPubsubSubscriptionState state;
the state of this subscription
gchar *subid;
a unique identifier for this subscription, if a JID is subscribed to
+a node multiple times, or NULL if there is no such identifier. See
+XEP-0060 §6.1.6 “Multiple Subscriptions”
 

 
 

 

 

 

-
wocky_pubsub_service_lookup_node ()

-
WockyPubsubNode *   wocky_pubsub_service_lookup_node    (WockyPubsubService *self,
-                                                         const gchar *name);

+
enum WockyPubsubSubscriptionState

+
typedef enum {
+    WOCKY_PUBSUB_SUBSCRIPTION_NONE,
+    WOCKY_PUBSUB_SUBSCRIPTION_PENDING,
+    WOCKY_PUBSUB_SUBSCRIPTION_SUBSCRIBED,
+    WOCKY_PUBSUB_SUBSCRIPTION_UNCONFIGURED
+} WockyPubsubSubscriptionState;
+

 

-Fetches an object representing a node on a pubsub service, if the object
-already exists; if not, returns NULL. Note that this does not check whether
-a node exists on the server; it only checks for a local representation.
+Describes the state of a subscription to a node. Definitions are taken from
+XEP-0060
+§4.2.
 

 

-
-
+
+
-
-
+
-
-
+
+
+
+
+
@@ -249,9 +263,11 @@
 

-
wocky_pubsub_service_get_default_node_configuration_async ()

-
void                wocky_pubsub_service_get_default_node_configuration_async
+
wocky_pubsub_service_create_node_async ()

+
void                wocky_pubsub_service_create_node_async
                                                         (WockyPubsubService *self,
+                                                         const gchar *name,
+                                                         WockyDataForm *config,
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);

@@ -260,8 +276,8 @@
 

-
wocky_pubsub_service_get_default_node_configuration_finish ()

-
WockyDataForm *     wocky_pubsub_service_get_default_node_configuration_finish
+
wocky_pubsub_service_create_node_finish ()

+
WockyPubsubNode *   wocky_pubsub_service_create_node_finish
                                                         (WockyPubsubService *self,
                                                          GAsyncResult *result,
                                                          GError **error);

@@ -270,34 +286,47 @@
 

-
wocky_pubsub_service_retrieve_subscriptions_async ()

-
void                wocky_pubsub_service_retrieve_subscriptions_async
-                                                        (WockyPubsubService *self,
-                                                         WockyPubsubNode *node,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);

+
wocky_pubsub_service_ensure_node ()

+
WockyPubsubNode *   wocky_pubsub_service_ensure_node    (WockyPubsubService *self,
+                                                         const gchar *name);

 

+Fetches or creates an object representing a node on the pubsub service. Note
+that this does not ensure that a node exists on the server; it merely
+ensures a local representation.
 

+

 
 
 
self :
a pubsub service
WOCKY_PUBSUB_SUBSCRIPTION_NONE
The node MUST NOT send event notifications
+ or payloads to the Entity.
+
 

 
name :
the name of a node on self
+
WOCKY_PUBSUB_SUBSCRIPTION_PENDING
An entity has requested to subscribe to
+ a node and the request has not yet been approved by a node owner. The node
+ MUST NOT send event notifications or payloads to the entity while it is in
+ this state.
 
 

 
Returns :
a borrowed reference to a node, or NULL
+
WOCKY_PUBSUB_SUBSCRIPTION_SUBSCRIBED
An entity has subscribed but its
+ subscription options have not yet been configured. The node MAY send event
+ notifications or payloads to the entity while it is in this state. The
+ service MAY timeout unconfigured subscriptions.
+
WOCKY_PUBSUB_SUBSCRIPTION_UNCONFIGURED
An entity is subscribed to a node.
+ The node MUST send all event notifications (and, if configured, payloads)
+ to the entity while it is in this state (subject to subscriber
+ configuration and content filtering).
 
 

 
 
 
 
 
 
 

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


self :
a pubsub service
name :
the name of a node on self
+
Returns :
a new reference to an object representing a node named name on
+self
+

 

 

 

-
wocky_pubsub_service_retrieve_subscriptions_finish ()

-
gboolean            wocky_pubsub_service_retrieve_subscriptions_finish
-                                                        (WockyPubsubService *self,
-                                                         GAsyncResult *result,
-                                                         GList **subscriptions,
-                                                         GError **error);

+
wocky_pubsub_service_error_quark ()

+
GQuark              wocky_pubsub_service_error_quark    (void);

 

 

 

 

 

-
wocky_pubsub_service_create_node_async ()

-
void                wocky_pubsub_service_create_node_async
+
wocky_pubsub_service_get_default_node_configuration_async ()

+
void                wocky_pubsub_service_get_default_node_configuration_async
                                                         (WockyPubsubService *self,
-                                                         const gchar *name,
-                                                         WockyDataForm *config,
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);

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

 

 

-
wocky_pubsub_service_create_node_finish ()

-
WockyPubsubNode *   wocky_pubsub_service_create_node_finish
+
wocky_pubsub_service_get_default_node_configuration_finish ()

+
WockyDataForm *     wocky_pubsub_service_get_default_node_configuration_finish
                                                         (WockyPubsubService *self,
                                                          GAsyncResult *result,
                                                          GError **error);

@@ -316,50 +345,29 @@
 

 

 

-
enum WockyPubsubSubscriptionState

-
typedef enum {
-    WOCKY_PUBSUB_SUBSCRIPTION_NONE,
-    WOCKY_PUBSUB_SUBSCRIPTION_PENDING,
-    WOCKY_PUBSUB_SUBSCRIPTION_SUBSCRIBED,
-    WOCKY_PUBSUB_SUBSCRIPTION_UNCONFIGURED
-} WockyPubsubSubscriptionState;
-

+
wocky_pubsub_service_lookup_node ()

+
WockyPubsubNode *   wocky_pubsub_service_lookup_node    (WockyPubsubService *self,
+                                                         const gchar *name);

 

-Describes the state of a subscription to a node. Definitions are taken from
-XEP-0060
-§4.2.
+Fetches an object representing a node on a pubsub service, if the object
+already exists; if not, returns NULL. Note that this does not check whether
+a node exists on the server; it only checks for a local representation.
 

 

-
-
-
-
-
-
+
+
-
-
+
-
-
+
@@ -367,67 +375,32 @@
 

-
WockyPubsubSubscription

-
typedef struct {
-    WockyPubsubNode *node;
-    gchar *jid;
-    WockyPubsubSubscriptionState state;
-    gchar *subid;
-} WockyPubsubSubscription;
-

-

-Represents a subscription to a node on a pubsub service, as seen when
-listing your own subscriptions on a service with
-wocky_pubsub_service_retrieve_subscriptions_async() or subscribing to a node
-with wocky_pubsub_node_subscribe_async().
-

-

 
 
 
WOCKY_PUBSUB_SUBSCRIPTION_NONE
The node MUST NOT send event notifications
- or payloads to the Entity.
-
WOCKY_PUBSUB_SUBSCRIPTION_PENDING
An entity has requested to subscribe to
- a node and the request has not yet been approved by a node owner. The node
- MUST NOT send event notifications or payloads to the entity while it is in
- this state.
-
self :
a pubsub service
 

 
WOCKY_PUBSUB_SUBSCRIPTION_SUBSCRIBED
An entity has subscribed but its
- subscription options have not yet been configured. The node MAY send event
- notifications or payloads to the entity while it is in this state. The
- service MAY timeout unconfigured subscriptions.
+
name :
the name of a node on self
 
 

 
WOCKY_PUBSUB_SUBSCRIPTION_UNCONFIGURED
An entity is subscribed to a node.
- The node MUST send all event notifications (and, if configured, payloads)
- to the entity while it is in this state (subject to subscriber
- configuration and content filtering).
+
Returns :
a borrowed reference to a node, or NULL
 
 

 
 
 

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


WockyPubsubNode *node;
a PubSub node
gchar *jid;
the JID which is subscribed to node. This may be a bare JID, or a
-full JID with a resource, depending on which was specified when
-subscribing to node. See XEP-0060 §6.1 Subscribe to a Node
WockyPubsubSubscriptionState state;
the state of this subscription
gchar *subid;
a unique identifier for this subscription, if a JID is subscribed to
-a node multiple times, or NULL if there is no such identifier. See
-XEP-0060 §6.1.6 “Multiple Subscriptions”

-

-

-

-
WOCKY_TYPE_PUBSUB_SUBSCRIPTION

-
#define             WOCKY_TYPE_PUBSUB_SUBSCRIPTION

+
wocky_pubsub_service_new ()

+
WockyPubsubService * wocky_pubsub_service_new           (WockySession *session,
+                                                         const gchar *jid);

 

 

 

 

 

-
wocky_pubsub_subscription_get_type ()

-
GType               wocky_pubsub_subscription_get_type  (void);

+
wocky_pubsub_service_retrieve_subscriptions_async ()

+
void                wocky_pubsub_service_retrieve_subscriptions_async
+                                                        (WockyPubsubService *self,
+                                                         WockyPubsubNode *node,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);

 

 

 

 

 

-
wocky_pubsub_subscription_new ()

-
WockyPubsubSubscription * wocky_pubsub_subscription_new (WockyPubsubNode *node,
-                                                         const gchar *jid,
-                                                         WockyPubsubSubscriptionState state,
-                                                         const gchar *subid);

+
wocky_pubsub_service_retrieve_subscriptions_finish ()

+
gboolean            wocky_pubsub_service_retrieve_subscriptions_finish
+                                                        (WockyPubsubService *self,
+                                                         GAsyncResult *result,
+                                                         GList **subscriptions,
+                                                         GError **error);

 

 

 

@@ -462,8 +435,11 @@
 

 

 

-
WockyPubsubServicePrivate

-
typedef struct _WockyPubsubServicePrivate WockyPubsubServicePrivate;

+
wocky_pubsub_subscription_new ()

+
WockyPubsubSubscription * wocky_pubsub_subscription_new (WockyPubsubNode *node,
+                                                         const gchar *jid,
+                                                         WockyPubsubSubscriptionState state,
+                                                         const gchar *subid);

 

 

 

@@ -471,6 +447,6 @@
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-service-protected.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-service-protected.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-service-protected.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-service-protected.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,11 +37,23 @@
 
 

 
Synopsis

-
WockyStanza *       wocky_pubsub_service_create_retrieve_subscriptions_stanza
+
WockyStanza *       wocky_pubsub_service_create_create_node_stanza
+                                                        (WockyPubsubService *self,
+                                                         const gchar *name,
+                                                         WockyDataForm *config,
+                                                         WockyNode **pubsub_node,
+                                                         WockyNode **create_node);
+WockyStanza *       wocky_pubsub_service_create_retrieve_subscriptions_stanza
                                                         (WockyPubsubService *self,
                                                          WockyPubsubNode *node,
                                                          WockyNode **pubsub_node,
                                                          WockyNode **subscriptions_node);
+WockyPorter *       wocky_pubsub_service_get_porter     (WockyPubsubService *self);
+WockyPubsubNode *   wocky_pubsub_service_handle_create_node_reply
+                                                        (WockyPubsubService *self,
+                                                         WockyNodeTree *create_tree,
+                                                         const gchar *requested_name,
+                                                         GError **error);
 WockyPubsubSubscription * wocky_pubsub_service_parse_subscription
                                                         (WockyPubsubService *self,
                                                          WockyNode *subscription_node,
@@ -51,18 +63,6 @@
                                                         (WockyPubsubService *self,
                                                          WockyNode *subscriptions_node,
                                                          GList **subscription_nodes);
-WockyStanza *       wocky_pubsub_service_create_create_node_stanza
-                                                        (WockyPubsubService *self,
-                                                         const gchar *name,
-                                                         WockyDataForm *config,
-                                                         WockyNode **pubsub_node,
-                                                         WockyNode **create_node);
-WockyPubsubNode *   wocky_pubsub_service_handle_create_node_reply
-                                                        (WockyPubsubService *self,
-                                                         WockyNodeTree *create_tree,
-                                                         const gchar *requested_name,
-                                                         GError **error);
-WockyPorter *       wocky_pubsub_service_get_porter     (WockyPubsubService *self);
 

 

 

@@ -73,45 +73,31 @@
 

 
Details

 

-
wocky_pubsub_service_create_retrieve_subscriptions_stanza ()

-
WockyStanza *       wocky_pubsub_service_create_retrieve_subscriptions_stanza
+
wocky_pubsub_service_create_create_node_stanza ()

+
WockyStanza *       wocky_pubsub_service_create_create_node_stanza
                                                         (WockyPubsubService *self,
-                                                         WockyPubsubNode *node,
+                                                         const gchar *name,
+                                                         WockyDataForm *config,
                                                          WockyNode **pubsub_node,
-                                                         WockyNode **subscriptions_node);

-

-

-

-

-

-
wocky_pubsub_service_parse_subscription ()

-
WockyPubsubSubscription * wocky_pubsub_service_parse_subscription
-                                                        (WockyPubsubService *self,
-                                                         WockyNode *subscription_node,
-                                                         const gchar *parent_node_attr,
-                                                         GError **error);

+                                                         WockyNode **create_node);
 

 

 

 

 

-
wocky_pubsub_service_parse_subscriptions ()

-
GList *             wocky_pubsub_service_parse_subscriptions
+
wocky_pubsub_service_create_retrieve_subscriptions_stanza ()

+
WockyStanza *       wocky_pubsub_service_create_retrieve_subscriptions_stanza
                                                         (WockyPubsubService *self,
-                                                         WockyNode *subscriptions_node,
-                                                         GList **subscription_nodes);

+                                                         WockyPubsubNode *node,
+                                                         WockyNode **pubsub_node,
+                                                         WockyNode **subscriptions_node);

 

 

 

 

 

-
wocky_pubsub_service_create_create_node_stanza ()

-
WockyStanza *       wocky_pubsub_service_create_create_node_stanza
-                                                        (WockyPubsubService *self,
-                                                         const gchar *name,
-                                                         WockyDataForm *config,
-                                                         WockyNode **pubsub_node,
-                                                         WockyNode **create_node);

+
wocky_pubsub_service_get_porter ()

+
WockyPorter *       wocky_pubsub_service_get_porter     (WockyPubsubService *self);

 

 

 

@@ -161,8 +147,22 @@
 

 

 

-
wocky_pubsub_service_get_porter ()

-
WockyPorter *       wocky_pubsub_service_get_porter     (WockyPubsubService *self);

+
wocky_pubsub_service_parse_subscription ()

+
WockyPubsubSubscription * wocky_pubsub_service_parse_subscription
+                                                        (WockyPubsubService *self,
+                                                         WockyNode *subscription_node,
+                                                         const gchar *parent_node_attr,
+                                                         GError **error);

+

+

+

+

+

+
wocky_pubsub_service_parse_subscriptions ()

+
GList *             wocky_pubsub_service_parse_subscriptions
+                                                        (WockyPubsubService *self,
+                                                         WockyNode *subscriptions_node,
+                                                         GList **subscription_nodes);

 

 

 

@@ -170,6 +170,6 @@
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyRoster.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyRoster.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyRoster.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyRoster.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,22 +37,10 @@
 
 

 
Synopsis

-
GQuark              wocky_roster_error_quark            (void);
+
#define             WOCKY_ROSTER_ERROR
 struct              WockyRosterClass;
-enum                WockyRosterSubscriptionFlags;
 enum                WockyRosterError;
-#define             WOCKY_ROSTER_ERROR
-WockyRoster *       wocky_roster_new                    (WockySession *session);
-void                wocky_roster_fetch_roster_async     (WockyRoster *self,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            wocky_roster_fetch_roster_finish    (WockyRoster *self,
-                                                         GAsyncResult *result,
-                                                         GError **error);
-WockyBareContact *  wocky_roster_get_contact            (WockyRoster *self,
-                                                         const gchar *jid);
-GSList *            wocky_roster_get_all_contacts       (WockyRoster *self);
+enum                WockyRosterSubscriptionFlags;
 void                wocky_roster_add_contact_async      (WockyRoster *self,
                                                          const gchar *jid,
                                                          const gchar *name,
@@ -63,14 +51,6 @@
 gboolean            wocky_roster_add_contact_finish     (WockyRoster *self,
                                                          GAsyncResult *result,
                                                          GError **error);
-void                wocky_roster_remove_contact_async   (WockyRoster *self,
-                                                         WockyBareContact *contact,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-gboolean            wocky_roster_remove_contact_finish  (WockyRoster *self,
-                                                         GAsyncResult *result,
-                                                         GError **error);
 void                wocky_roster_change_contact_name_async
                                                         (WockyRoster *self,
                                                          WockyBareContact *contact,
@@ -104,8 +84,27 @@
                                                         (WockyRoster *self,
                                                          GAsyncResult *result,
                                                          GError **error);
+GQuark              wocky_roster_error_quark            (void);
+void                wocky_roster_fetch_roster_async     (WockyRoster *self,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            wocky_roster_fetch_roster_finish    (WockyRoster *self,
+                                                         GAsyncResult *result,
+                                                         GError **error);
+GSList *            wocky_roster_get_all_contacts       (WockyRoster *self);
+WockyBareContact *  wocky_roster_get_contact            (WockyRoster *self,
+                                                         const gchar *jid);
+WockyRoster *       wocky_roster_new                    (WockySession *session);
+void                wocky_roster_remove_contact_async   (WockyRoster *self,
+                                                         WockyBareContact *contact,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);
+gboolean            wocky_roster_remove_contact_finish  (WockyRoster *self,
+                                                         GAsyncResult *result,
+                                                         GError **error);
 const gchar *       wocky_roster_subscription_to_string (WockyRosterSubscriptionFlags subscription);
-                    WockyRosterPrivate;
 

 

 

@@ -117,18 +116,12 @@
 

 
Details

 

-
wocky_roster_error_quark ()

-
GQuark              wocky_roster_error_quark            (void);

+
WOCKY_ROSTER_ERROR

+
#define WOCKY_ROSTER_ERROR (wocky_roster_error_quark ())
+

 

-Get the error quark used by the roster.
+Get access to the error quark of the roster.
 

-

--
-
-
-
-


Returns :
the quark for roster errors.

 

 

 

@@ -142,16 +135,41 @@
 

 

 

+
enum WockyRosterError

+
typedef enum {
+  WOCKY_ROSTER_ERROR_INVALID_STANZA,
+  WOCKY_ROSTER_ERROR_NOT_IN_ROSTER,
+} WockyRosterError;
+

+

+The WockyRosterError specific errors.
+

+

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


WOCKY_ROSTER_ERROR_INVALID_STANZA
received an invalid roster stanza
+from the server
+
WOCKY_ROSTER_ERROR_NOT_IN_ROSTER
the contact is not in the roster
+

+

+

+

 
enum WockyRosterSubscriptionFlags

-
typedef enum
-{
+
typedef enum {
   WOCKY_ROSTER_SUBSCRIPTION_TYPE_NONE = 0,
   WOCKY_ROSTER_SUBSCRIPTION_TYPE_TO   = 1 << 0,
   WOCKY_ROSTER_SUBSCRIPTION_TYPE_FROM = 1 << 1,
   WOCKY_ROSTER_SUBSCRIPTION_TYPE_BOTH =
     WOCKY_ROSTER_SUBSCRIPTION_TYPE_TO | WOCKY_ROSTER_SUBSCRIPTION_TYPE_FROM,
-  /*< private >*/
-  LAST_WOCKY_ROSTER_SUBSCRIPTION_TYPE = WOCKY_ROSTER_SUBSCRIPTION_TYPE_BOTH
 } WockyRosterSubscriptionFlags;
 

 

@@ -194,52 +212,11 @@
 

 

 

-
enum WockyRosterError

-
typedef enum {
-  WOCKY_ROSTER_ERROR_INVALID_STANZA,
-  WOCKY_ROSTER_ERROR_NOT_IN_ROSTER,
-} WockyRosterError;
-

-

-The WockyRosterError specific errors.
-

-

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


WOCKY_ROSTER_ERROR_INVALID_STANZA
received an invalid roster stanza
-from the server
-
WOCKY_ROSTER_ERROR_NOT_IN_ROSTER
the contact is not in the roster
-

-

-

-

-
WOCKY_ROSTER_ERROR

-
#define WOCKY_ROSTER_ERROR (wocky_roster_error_quark ())
-

-

-Get access to the error quark of the roster.
-

-

-

-

-
wocky_roster_new ()

-
WockyRoster *       wocky_roster_new                    (WockySession *session);

-

-

-

-

-

-
wocky_roster_fetch_roster_async ()

-
void                wocky_roster_fetch_roster_async     (WockyRoster *self,
+
wocky_roster_add_contact_async ()

+
void                wocky_roster_add_contact_async      (WockyRoster *self,
+                                                         const gchar *jid,
+                                                         const gchar *name,
+                                                         const gchar * const *groups,
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);

@@ -248,8 +225,8 @@
 

 

 

-
wocky_roster_fetch_roster_finish ()

-
gboolean            wocky_roster_fetch_roster_finish    (WockyRoster *self,
+
wocky_roster_add_contact_finish ()

+
gboolean            wocky_roster_add_contact_finish     (WockyRoster *self,
                                                          GAsyncResult *result,
                                                          GError **error);

 

@@ -257,26 +234,34 @@
 

 

 

-
wocky_roster_get_contact ()

-
WockyBareContact *  wocky_roster_get_contact            (WockyRoster *self,
-                                                         const gchar *jid);

+
wocky_roster_change_contact_name_async ()

+
void                wocky_roster_change_contact_name_async
+                                                        (WockyRoster *self,
+                                                         WockyBareContact *contact,
+                                                         const gchar *name,
+                                                         GCancellable *cancellable,
+                                                         GAsyncReadyCallback callback,
+                                                         gpointer user_data);

 

 

 

 

 

-
wocky_roster_get_all_contacts ()

-
GSList *            wocky_roster_get_all_contacts       (WockyRoster *self);

+
wocky_roster_change_contact_name_finish ()

+
gboolean            wocky_roster_change_contact_name_finish
+                                                        (WockyRoster *self,
+                                                         GAsyncResult *result,
+                                                         GError **error);

 

 

 

 

 

-
wocky_roster_add_contact_async ()

-
void                wocky_roster_add_contact_async      (WockyRoster *self,
-                                                         const gchar *jid,
-                                                         const gchar *name,
-                                                         const gchar * const *groups,
+
wocky_roster_contact_add_group_async ()

+
void                wocky_roster_contact_add_group_async
+                                                        (WockyRoster *self,
+                                                         WockyBareContact *contact,
+                                                         const gchar *group,
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);

@@ -285,8 +270,9 @@
 

 

 

-
wocky_roster_add_contact_finish ()

-
gboolean            wocky_roster_add_contact_finish     (WockyRoster *self,
+
wocky_roster_contact_add_group_finish ()

+
gboolean            wocky_roster_contact_add_group_finish
+                                                        (WockyRoster *self,
                                                          GAsyncResult *result,
                                                          GError **error);

 

@@ -294,9 +280,11 @@
 

 

 

-
wocky_roster_remove_contact_async ()

-
void                wocky_roster_remove_contact_async   (WockyRoster *self,
+
wocky_roster_contact_remove_group_async ()

+
void                wocky_roster_contact_remove_group_async
+                                                        (WockyRoster *self,
                                                          WockyBareContact *contact,
+                                                         const gchar *group,
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);

@@ -305,8 +293,9 @@
 

 

 

-
wocky_roster_remove_contact_finish ()

-
gboolean            wocky_roster_remove_contact_finish  (WockyRoster *self,
+
wocky_roster_contact_remove_group_finish ()

+
gboolean            wocky_roster_contact_remove_group_finish
+                                                        (WockyRoster *self,
                                                          GAsyncResult *result,
                                                          GError **error);

 

@@ -314,11 +303,23 @@
 

 

 

-
wocky_roster_change_contact_name_async ()

-
void                wocky_roster_change_contact_name_async
-                                                        (WockyRoster *self,
-                                                         WockyBareContact *contact,
-                                                         const gchar *name,
+
wocky_roster_error_quark ()

+
GQuark              wocky_roster_error_quark            (void);

+

+Get the error quark used by the roster.
+

+

++
+
+
+
+


Returns :
the quark for roster errors.

+

+

+

+
wocky_roster_fetch_roster_async ()

+
void                wocky_roster_fetch_roster_async     (WockyRoster *self,
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);

@@ -327,9 +328,8 @@
 

 

 

-
wocky_roster_change_contact_name_finish ()

-
gboolean            wocky_roster_change_contact_name_finish
-                                                        (WockyRoster *self,
+
wocky_roster_fetch_roster_finish ()

+
gboolean            wocky_roster_fetch_roster_finish    (WockyRoster *self,
                                                          GAsyncResult *result,
                                                          GError **error);

 

@@ -337,34 +337,31 @@
 

 

 

-
wocky_roster_contact_add_group_async ()

-
void                wocky_roster_contact_add_group_async
-                                                        (WockyRoster *self,
-                                                         WockyBareContact *contact,
-                                                         const gchar *group,
-                                                         GCancellable *cancellable,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);

+
wocky_roster_get_all_contacts ()

+
GSList *            wocky_roster_get_all_contacts       (WockyRoster *self);

 

 

 

 

 

-
wocky_roster_contact_add_group_finish ()

-
gboolean            wocky_roster_contact_add_group_finish
-                                                        (WockyRoster *self,
-                                                         GAsyncResult *result,
-                                                         GError **error);

+
wocky_roster_get_contact ()

+
WockyBareContact *  wocky_roster_get_contact            (WockyRoster *self,
+                                                         const gchar *jid);

 

 

 

 

 

-
wocky_roster_contact_remove_group_async ()

-
void                wocky_roster_contact_remove_group_async
-                                                        (WockyRoster *self,
+
wocky_roster_new ()

+
WockyRoster *       wocky_roster_new                    (WockySession *session);

+

+

+

+

+

+
wocky_roster_remove_contact_async ()

+
void                wocky_roster_remove_contact_async   (WockyRoster *self,
                                                          WockyBareContact *contact,
-                                                         const gchar *group,
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);

@@ -373,9 +370,8 @@
 

 

 

-
wocky_roster_contact_remove_group_finish ()

-
gboolean            wocky_roster_contact_remove_group_finish
-                                                        (WockyRoster *self,
+
wocky_roster_remove_contact_finish ()

+
gboolean            wocky_roster_remove_contact_finish  (WockyRoster *self,
                                                          GAsyncResult *result,
                                                          GError **error);

 

@@ -388,17 +384,10 @@
 

 

 

-

-

-
WockyRosterPrivate

-
typedef struct _WockyRosterPrivate WockyRosterPrivate;

-

-

-

 

 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockySaslAuth.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockySaslAuth.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockySaslAuth.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockySaslAuth.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -38,11 +38,6 @@
 

 
Synopsis

 
struct              WockySaslAuthClass;
-WockySaslAuth *     wocky_sasl_auth_new                 (const gchar *server,
-                                                         const gchar *username,
-                                                         const gchar *password,
-                                                         WockyXmppConnection *connection,
-                                                         WockyAuthRegistry *auth_registry);
 void                wocky_sasl_auth_add_handler         (WockySaslAuth *sasl,
                                                          WockyAuthHandler *handler);
 void                wocky_sasl_auth_authenticate_async  (WockySaslAuth *sasl,
@@ -55,7 +50,11 @@
 gboolean            wocky_sasl_auth_authenticate_finish (WockySaslAuth *sasl,
                                                          GAsyncResult *result,
                                                          GError **error);
-                    WockySaslAuthPrivate;
+WockySaslAuth *     wocky_sasl_auth_new                 (const gchar *server,
+                                                         const gchar *username,
+                                                         const gchar *password,
+                                                         WockyXmppConnection *connection,
+                                                         WockyAuthRegistry *auth_registry);
 

 

 

@@ -76,17 +75,6 @@
 

 

 

-
wocky_sasl_auth_new ()

-
WockySaslAuth *     wocky_sasl_auth_new                 (const gchar *server,
-                                                         const gchar *username,
-                                                         const gchar *password,
-                                                         WockyXmppConnection *connection,
-                                                         WockyAuthRegistry *auth_registry);

-

-

-

-

-

 
wocky_sasl_auth_add_handler ()

 
void                wocky_sasl_auth_add_handler         (WockySaslAuth *sasl,
                                                          WockyAuthHandler *handler);

@@ -117,8 +105,12 @@
 

 

 

-
WockySaslAuthPrivate

-
typedef struct _WockySaslAuthPrivate WockySaslAuthPrivate;

+
wocky_sasl_auth_new ()

+
WockySaslAuth *     wocky_sasl_auth_new                 (const gchar *server,
+                                                         const gchar *username,
+                                                         const gchar *password,
+                                                         WockyXmppConnection *connection,
+                                                         WockyAuthRegistry *auth_registry);

 

 

 

@@ -126,6 +118,6 @@
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-digest-md5.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-digest-md5.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-digest-md5.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-digest-md5.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -40,7 +40,6 @@
 
WockySaslDigestMd5 * wocky_sasl_digest_md5_new          (const gchar *server,
                                                          const gchar *username,
                                                          const gchar *password);
-                    WockySaslDigestMd5Private;
 

 
 

@@ -58,17 +57,10 @@
 

 

 

-

-

-
WockySaslDigestMd5Private

-
typedef struct _WockySaslDigestMd5Private WockySaslDigestMd5Private;

-

-

-

 
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-plain.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-plain.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-plain.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-plain.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -39,7 +39,6 @@
 
Synopsis

 
WockySaslPlain *    wocky_sasl_plain_new                (const gchar *username,
                                                          const gchar *password);
-                    WockySaslPlainPrivate;
 

 
 

@@ -56,17 +55,10 @@
 

 

 

-

-

-
WockySaslPlainPrivate

-
typedef struct _WockySaslPlainPrivate WockySaslPlainPrivate;

-

-

-

 
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-scram.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-scram.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-scram.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-scram.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -40,7 +40,6 @@
 
WockySaslScram *    wocky_sasl_scram_new                (const gchar *server,
                                                          const gchar *username,
                                                          const gchar *password);
-                    WockySaslScramPrivate;
 

 
 

@@ -58,17 +57,10 @@
 

 

 

-

-

-
WockySaslScramPrivate

-
typedef struct _WockySaslScramPrivate WockySaslScramPrivate;

-

-

-

 
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-utils.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-utils.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-utils.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-utils.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -39,11 +39,11 @@
 
Synopsis

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

 
 

@@ -70,18 +70,18 @@
 

 

 

-
sasl_generate_base64_nonce ()

-
gchar *             sasl_generate_base64_nonce          (void);

+
sasl_calculate_hmac_sha1 ()

+
GByteArray *        sasl_calculate_hmac_sha1            (guint8 *key,
+                                                         gsize key_len,
+                                                         guint8 *text,
+                                                         gsize text_len);

 

 

 

 

 

-
sasl_calculate_hmac_sha1 ()

-
GByteArray *        sasl_calculate_hmac_sha1            (guint8 *key,
-                                                         gsize key_len,
-                                                         guint8 *text,
-                                                         gsize text_len);

+
sasl_generate_base64_nonce ()

+
gchar *             sasl_generate_base64_nonce          (void);

 

 

 

@@ -89,6 +89,6 @@
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyStanza.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyStanza.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyStanza.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyStanza.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -38,40 +38,32 @@
 

 
Synopsis

 
struct              WockyStanzaClass;
-enum                WockyStanzaType;
 enum                WockyStanzaSubType;
-WockyStanza *       wocky_stanza_new                    (const gchar *name,
-                                                         const gchar *ns);
-WockyStanza *       wocky_stanza_copy                   (WockyStanza *old);
-WockyNode *         wocky_stanza_get_top_node           (WockyStanza *self);
+enum                WockyStanzaType;
 WockyStanza *       wocky_stanza_build                  (WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
                                                          const gchar *from,
                                                          const gchar *to,
                                                          ...);
+WockyStanza *       wocky_stanza_build_iq_error         (WockyStanza *iq,
+                                                         ...);
+WockyStanza *       wocky_stanza_build_iq_error_va      (WockyStanza *iq,
+                                                         va_list ap);
+WockyStanza *       wocky_stanza_build_iq_result        (WockyStanza *iq,
+                                                         ...);
+WockyStanza *       wocky_stanza_build_iq_result_va     (WockyStanza *iq,
+                                                         va_list ap);
 WockyStanza *       wocky_stanza_build_to_contact       (WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
                                                          const gchar *from,
                                                          WockyContact *to,
                                                          ...);
-void                wocky_stanza_get_type_info          (WockyStanza *stanza,
-                                                         WockyStanzaType *type,
-                                                         WockyStanzaSubType *sub_type);
-const gchar *       wocky_stanza_get_from               (WockyStanza *self);
-const gchar *       wocky_stanza_get_to                 (WockyStanza *self);
 WockyStanza *       wocky_stanza_build_va               (WockyStanzaType type,
                                                          WockyStanzaSubType sub_type,
                                                          const gchar *from,
                                                          const gchar *to,
                                                          va_list ap);
-WockyStanza *       wocky_stanza_build_iq_result        (WockyStanza *iq,
-                                                         ...);
-WockyStanza *       wocky_stanza_build_iq_result_va     (WockyStanza *iq,
-                                                         va_list ap);
-WockyStanza *       wocky_stanza_build_iq_error         (WockyStanza *iq,
-                                                         ...);
-WockyStanza *       wocky_stanza_build_iq_error_va      (WockyStanza *iq,
-                                                         va_list ap);
+WockyStanza *       wocky_stanza_copy                   (WockyStanza *old);
 gboolean            wocky_stanza_extract_errors         (WockyStanza *stanza,
                                                          WockyXmppErrorType *type,
                                                          GError **core,
@@ -79,13 +71,20 @@
                                                          WockyNode **specialized_node);
 gboolean            wocky_stanza_extract_stream_error   (WockyStanza *stanza,
                                                          GError **stream_error);
-WockyContact *      wocky_stanza_get_to_contact         (WockyStanza *self);
+const gchar *       wocky_stanza_get_from               (WockyStanza *self);
 WockyContact *      wocky_stanza_get_from_contact       (WockyStanza *self);
-void                wocky_stanza_set_to_contact         (WockyStanza *self,
-                                                         WockyContact *contact);
+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);
 void                wocky_stanza_set_from_contact       (WockyStanza *self,
                                                          WockyContact *contact);
-                    WockyStanzaPrivate;
+void                wocky_stanza_set_to_contact         (WockyStanza *self,
+                                                         WockyContact *contact);
 

 

 

@@ -106,116 +105,8 @@
 

 

 

-
enum WockyStanzaType

-
typedef enum
-{
-  WOCKY_STANZA_TYPE_NONE,
-  WOCKY_STANZA_TYPE_MESSAGE,
-  WOCKY_STANZA_TYPE_PRESENCE,
-  WOCKY_STANZA_TYPE_IQ,
-  WOCKY_STANZA_TYPE_STREAM,
-  WOCKY_STANZA_TYPE_STREAM_FEATURES,
-  WOCKY_STANZA_TYPE_AUTH,
-  WOCKY_STANZA_TYPE_CHALLENGE,
-  WOCKY_STANZA_TYPE_RESPONSE,
-  WOCKY_STANZA_TYPE_SUCCESS,
-  WOCKY_STANZA_TYPE_FAILURE,
-  WOCKY_STANZA_TYPE_STREAM_ERROR,
-  WOCKY_STANZA_TYPE_UNKNOWN,
-  /*< private >*/
-  NUM_WOCKY_STANZA_TYPE
-} WockyStanzaType;
-

-

-XMPP stanza types.
-

-

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


WOCKY_STANZA_TYPE_NONE
no stanza type
-
WOCKY_STANZA_TYPE_MESSAGE

-<message/> stanza
-
WOCKY_STANZA_TYPE_PRESENCE

-<presence/> stanza
-
WOCKY_STANZA_TYPE_IQ

-<iq/> stanza
-
WOCKY_STANZA_TYPE_STREAM

-<stream/> stanza
-
WOCKY_STANZA_TYPE_STREAM_FEATURES

-<stream:features/> stanza
-
WOCKY_STANZA_TYPE_AUTH

-<auth/> stanza
-
WOCKY_STANZA_TYPE_CHALLENGE

-<challenge/> stanza
-
WOCKY_STANZA_TYPE_RESPONSE

-<response/> stanza
-
WOCKY_STANZA_TYPE_SUCCESS

-<success/> stanza
-
WOCKY_STANZA_TYPE_FAILURE

-<failure/> stanza
-
WOCKY_STANZA_TYPE_STREAM_ERROR

-<stream:error/> stanza
-
WOCKY_STANZA_TYPE_UNKNOWN
unknown stanza type
-

-

-

-

 
enum WockyStanzaSubType

-
typedef enum
-{
+
typedef enum {
   WOCKY_STANZA_SUB_TYPE_NONE,
   WOCKY_STANZA_SUB_TYPE_AVAILABLE,
   WOCKY_STANZA_SUB_TYPE_NORMAL,
@@ -233,8 +124,6 @@
   WOCKY_STANZA_SUB_TYPE_RESULT,
   WOCKY_STANZA_SUB_TYPE_ERROR,
   WOCKY_STANZA_SUB_TYPE_UNKNOWN,
-  /*< private >*/
-  NUM_WOCKY_STANZA_SUB_TYPE
 } WockyStanzaSubType;
 

 

@@ -333,33 +222,104 @@
 

 

 

-
wocky_stanza_new ()

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

-

-

-

-

-

-
wocky_stanza_copy ()

-
WockyStanza *       wocky_stanza_copy                   (WockyStanza *old);

+
enum WockyStanzaType

+
typedef enum {
+  WOCKY_STANZA_TYPE_NONE,
+  WOCKY_STANZA_TYPE_MESSAGE,
+  WOCKY_STANZA_TYPE_PRESENCE,
+  WOCKY_STANZA_TYPE_IQ,
+  WOCKY_STANZA_TYPE_STREAM,
+  WOCKY_STANZA_TYPE_STREAM_FEATURES,
+  WOCKY_STANZA_TYPE_AUTH,
+  WOCKY_STANZA_TYPE_CHALLENGE,
+  WOCKY_STANZA_TYPE_RESPONSE,
+  WOCKY_STANZA_TYPE_SUCCESS,
+  WOCKY_STANZA_TYPE_FAILURE,
+  WOCKY_STANZA_TYPE_STREAM_ERROR,
+  WOCKY_STANZA_TYPE_UNKNOWN,
+} WockyStanzaType;
+

 

+XMPP stanza types.
 

-

-

-

-
wocky_stanza_get_top_node ()

-
WockyNode *         wocky_stanza_get_top_node           (WockyStanza *self);

 

-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 
 
 
self :
a stanza
WOCKY_STANZA_TYPE_NONE
no stanza type
+
 

 
Returns :
A pointer to the topmost node of the stanza
WOCKY_STANZA_TYPE_MESSAGE

+<message/> stanza
+
WOCKY_STANZA_TYPE_PRESENCE

+<presence/> stanza
+
WOCKY_STANZA_TYPE_IQ

+<iq/> stanza
+
WOCKY_STANZA_TYPE_STREAM

+<stream/> stanza
+
WOCKY_STANZA_TYPE_STREAM_FEATURES

+<stream:features/> stanza
+
WOCKY_STANZA_TYPE_AUTH

+<auth/> stanza
+
WOCKY_STANZA_TYPE_CHALLENGE

+<challenge/> stanza
+
WOCKY_STANZA_TYPE_RESPONSE

+<response/> stanza
+
WOCKY_STANZA_TYPE_SUCCESS

+<success/> stanza
+
WOCKY_STANZA_TYPE_FAILURE

+<failure/> stanza
+
WOCKY_STANZA_TYPE_STREAM_ERROR

+<stream:error/> stanza
+
WOCKY_STANZA_TYPE_UNKNOWN
unknown stanza type
+
 

 
 

@@ -442,7 +402,7 @@
 

 

 

-
Example 4. 

+
Example 4. 

 

   
@@ -495,12 +455,6 @@
 
-
-
-
-
@@ -509,95 +463,6 @@
 

-
wocky_stanza_build_to_contact ()

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

-

-

-

-

-

-
wocky_stanza_get_type_info ()

-
void                wocky_stanza_get_type_info          (WockyStanza *stanza,
-                                                         WockyStanzaType *type,
-                                                         WockyStanzaSubType *sub_type);

-

-

-

-

-

-
wocky_stanza_get_from ()

-
const gchar *       wocky_stanza_get_from               (WockyStanza *self);

-

-
-

-

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

 
... :
the description of the stanza to build,
-terminated with NULL
-

 
Returns :

 a new stanza object
 

 
 

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


self :
a stanza
Returns :
The sender of self, or NULL if no sender was specified.

-

-

-

-
wocky_stanza_get_to ()

-
const gchar *       wocky_stanza_get_to                 (WockyStanza *self);

-

-
-

-

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


self :
a stanza
Returns :
The recipient of self, or NULL if no recipient was specified.

-

-

-

-
wocky_stanza_build_va ()

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

-

-

-

-

-

-
wocky_stanza_build_iq_result ()

-
WockyStanza *       wocky_stanza_build_iq_result        (WockyStanza *iq,
-                                                         ...);

-

-

-

-

-

-
wocky_stanza_build_iq_result_va ()

-
WockyStanza *       wocky_stanza_build_iq_result_va     (WockyStanza *iq,
-                                                         va_list ap);

-

-

-

-

-

 
wocky_stanza_build_iq_error ()

 
WockyStanza *       wocky_stanza_build_iq_error         (WockyStanza *iq,
                                                          ...);

@@ -652,10 +517,6 @@
 
 
 
-
... :

-a wocky_stanza_build() specification
-
-
 
Returns :

 an error reply for iq
 
@@ -673,6 +534,51 @@
 

 

 

+
wocky_stanza_build_iq_result ()

+
WockyStanza *       wocky_stanza_build_iq_result        (WockyStanza *iq,
+                                                         ...);

+

+

+

+

+

+
wocky_stanza_build_iq_result_va ()

+
WockyStanza *       wocky_stanza_build_iq_result_va     (WockyStanza *iq,
+                                                         va_list ap);

+

+

+

+

+

+
wocky_stanza_build_to_contact ()

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

+

+

+

+

+

+
wocky_stanza_build_va ()

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

+

+

+

+

+

+
wocky_stanza_copy ()

+
WockyStanza *       wocky_stanza_copy                   (WockyStanza *old);

+

+

+

+

+

 
wocky_stanza_extract_errors ()

 
gboolean            wocky_stanza_extract_errors         (WockyStanza *stanza,
                                                          WockyXmppErrorType *type,
@@ -753,10 +659,24 @@
 

 

 

-
wocky_stanza_get_to_contact ()

-
WockyContact *      wocky_stanza_get_to_contact         (WockyStanza *self);

+
wocky_stanza_get_from ()

+
const gchar *       wocky_stanza_get_from               (WockyStanza *self);

 

+
 

+

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


self :
a stanza
Returns :
The sender of self, or NULL if no sender was specified.

 

 

 

@@ -767,9 +687,64 @@
 

 

 

-
wocky_stanza_set_to_contact ()

-
void                wocky_stanza_set_to_contact         (WockyStanza *self,
-                                                         WockyContact *contact);

+
wocky_stanza_get_to ()

+
const gchar *       wocky_stanza_get_to                 (WockyStanza *self);

+

+
+

+

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


self :
a stanza
Returns :
The recipient of self, or NULL if no recipient was specified.

+

+

+

+
wocky_stanza_get_to_contact ()

+
WockyContact *      wocky_stanza_get_to_contact         (WockyStanza *self);

+

+

+

+

+

+
wocky_stanza_get_top_node ()

+
WockyNode *         wocky_stanza_get_top_node           (WockyStanza *self);

+

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


self :
a stanza
Returns :
A pointer to the topmost node of the stanza

+

+

+

+
wocky_stanza_get_type_info ()

+
void                wocky_stanza_get_type_info          (WockyStanza *stanza,
+                                                         WockyStanzaType *type,
+                                                         WockyStanzaSubType *sub_type);

+

+

+

+

+

+
wocky_stanza_new ()

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

 

 

 

@@ -783,8 +758,9 @@
 

 

 

-
WockyStanzaPrivate

-
typedef struct _WockyStanzaPrivate WockyStanzaPrivate;

+
wocky_stanza_set_to_contact ()

+
void                wocky_stanza_set_to_contact         (WockyStanza *self,
+                                                         WockyContact *contact);

 

 

 

@@ -792,6 +768,6 @@
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyTLSConnector.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyTLSConnector.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyTLSConnector.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyTLSConnector.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -38,18 +38,18 @@
 

 
Synopsis

 
struct              WockyTLSConnectorClass;
-WockyTLSConnector *  wocky_tls_connector_new            (WockyTLSHandler *handler);
+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);
 WockyXmppConnection * wocky_tls_connector_secure_finish (WockyTLSConnector *self,
                                                          GAsyncResult *res,
                                                          GError **error);
-                    WockyTLSConnectorPrivate;
 

 

 

@@ -71,7 +71,7 @@
 

 

 
wocky_tls_connector_new ()

-
WockyTLSConnector *  wocky_tls_connector_new            (WockyTLSHandler *handler);

+
WockyTLSConnector * wocky_tls_connector_new             (WockyTLSHandler *handler);

 

 

 

@@ -82,6 +82,7 @@
                                                          WockyXmppConnection *connection,
                                                          gboolean old_style_ssl,
                                                          const gchar *peername,
+                                                         GStrv extra_identities,
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);
@@ -97,17 +98,10 @@
 

 

 

-

-

-
WockyTLSConnectorPrivate

-
typedef struct _WockyTLSConnectorPrivate WockyTLSConnectorPrivate;

-

-

-

 
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-tls-enumtypes.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-tls-enumtypes.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-tls-enumtypes.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-tls-enumtypes.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,14 +37,7 @@
 
 

 
Synopsis

-
GType               wocky_tls_verification_level_get_type
-                                                        (void);
-#define             WOCKY_TYPE_TLS_VERIFICATION_LEVEL
-GType               wocky_tls_cert_status_get_type      (void);
-#define             WOCKY_TYPE_TLS_CERT_STATUS
-GType               wocky_tls_cert_type_get_type        (void);
-#define             WOCKY_TYPE_TLS_CERT_TYPE
-

+

 

 

 
Description

@@ -53,55 +46,10 @@
 

 

 
Details

-

-
wocky_tls_verification_level_get_type ()

-
GType               wocky_tls_verification_level_get_type
-                                                        (void);

-

-

-

-

-

-
WOCKY_TYPE_TLS_VERIFICATION_LEVEL

-
#define WOCKY_TYPE_TLS_VERIFICATION_LEVEL (wocky_tls_verification_level_get_type())
-

-

-

-

-

-

-
wocky_tls_cert_status_get_type ()

-
GType               wocky_tls_cert_status_get_type      (void);

-

-

-

-

-

-
WOCKY_TYPE_TLS_CERT_STATUS

-
#define WOCKY_TYPE_TLS_CERT_STATUS (wocky_tls_cert_status_get_type())
-

-

-

-

-

-

-
wocky_tls_cert_type_get_type ()

-
GType               wocky_tls_cert_type_get_type        (void);

-

-

-

-

-

-
WOCKY_TYPE_TLS_CERT_TYPE

-
#define WOCKY_TYPE_TLS_CERT_TYPE (wocky_tls_cert_type_get_type())
-

-

-

-

 

 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyTLSHandler.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyTLSHandler.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyTLSHandler.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyTLSHandler.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,31 +37,32 @@
 
 

 
Synopsis

-
void                (*WockyTLSHandlerVerifyAsyncFunc)   (WockyTLSHandler *self,
+
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);
-struct              WockyTLSHandlerClass;
+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);
-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);
-                    WockyTLSHandlerPrivate;
 

 

 

@@ -72,26 +73,6 @@
 

 
Details

 

-
WockyTLSHandlerVerifyAsyncFunc ()

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

-

-

-

-

-

-
WockyTLSHandlerVerifyFinishFunc ()

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

-

-

-

-

-

 
struct WockyTLSHandlerClass

 
struct WockyTLSHandlerClass {
   WockyTLSHandlerVerifyAsyncFunc verify_async_func;
@@ -121,17 +102,11 @@
 

 

 

-
wocky_tls_handler_new ()

-
WockyTLSHandler *   wocky_tls_handler_new               (gboolean ignore_ssl_errors);

-

-

-

-

-

-
wocky_tls_handler_verify_async ()

-
void                wocky_tls_handler_verify_async      (WockyTLSHandler *self,
+
WockyTLSHandlerVerifyAsyncFunc ()

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

 

@@ -139,9 +114,9 @@
 

 

 

-
wocky_tls_handler_verify_finish ()

-
gboolean            wocky_tls_handler_verify_finish     (WockyTLSHandler *self,
-                                                         GAsyncResult *result,
+
WockyTLSHandlerVerifyFinishFunc ()

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

 

 

@@ -228,8 +203,29 @@
 

 

 

-
WockyTLSHandlerPrivate

-
typedef struct _WockyTLSHandlerPrivate WockyTLSHandlerPrivate;

+
wocky_tls_handler_new ()

+
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);

+

+

+

+

+

+
wocky_tls_handler_verify_finish ()

+
gboolean            wocky_tls_handler_verify_finish     (WockyTLSHandler *self,
+                                                         GAsyncResult *result,
+                                                         GError **error);

 

 

 

@@ -237,6 +233,6 @@
 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18

 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-utils.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-utils.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-utils.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-utils.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,48 +37,41 @@
 
 

 
Synopsis

-
gboolean            wocky_strdiff                       (const gchar *left,
-                                                         const gchar *right);
-gchar *             wocky_normalise_jid                 (const gchar *jid);
+
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);
-gchar *             wocky_compose_jid                   (const gchar *node,
-                                                         const gchar *domain,
-                                                         const 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_int         (gint n);
-GValue *            wocky_g_value_slice_new_int64       (gint64 n);
-GValue *            wocky_g_value_slice_new_uint        (guint n);
-GValue *            wocky_g_value_slice_new_uint64      (guint64 n);
-GValue *            wocky_g_value_slice_new_double      (double d);
-GValue *            wocky_g_value_slice_new_string      (const gchar *string);
-GValue *            wocky_g_value_slice_new_static_string
-                                                        (const gchar *string);
-GValue *            wocky_g_value_slice_new_take_string (gchar *string);
 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);
-void                wocky_g_value_slice_free            (GValue *value);
-GValue *            wocky_g_value_slice_dup             (const GValue *value);
-gboolean            wocky_enum_from_nick                (GType enum_type,
-                                                         const gchar *nick,
-                                                         gint *value);
-const gchar *       wocky_enum_to_nick                  (GType enum_type,
-                                                         gint value);
-gchar *             wocky_absolutize_path               (const gchar *path);
-GList *             wocky_list_deep_copy                (GBoxedCopyFunc copy,
-                                                         const GList *items);
-GString *           wocky_g_string_dup                  (const GString *str);
-void                wocky_g_string_free                 (GString *str);
-#define             wocky_implement_finish_void         (source,
-                                                         tag)
+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,
@@ -88,6 +81,13 @@
                                                          copy_func)
 #define             wocky_implement_finish_return_pointer(source,
                                                          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);
 

 

 

@@ -98,50 +98,60 @@
 

 
Details

 

-
wocky_strdiff ()

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

+
wocky_absolutize_path ()

+
gchar *             wocky_absolutize_path               (const gchar *path);

 

-Return TRUE if the given strings are different. Unlike strcmp this
-function will handle null pointers, treating them as distinct from any
-string.
+Return an absolute form of path. This cleans up duplicate slashes, "." or
+".." path segments, etc., and prepends g_get_current_dir() if necessary, but
+does not necessarily resolve symlinks.
 

 

-
-
-
-
-
-
+
+
-
+

 
 
 
left :
The first string to compare (may be NULL)
right :
The second string to compare (may be NULL)
path :
an absolute or relative path
 

 

 
Returns :

-FALSE if left and right are both NULL, or if
-neither is NULL and both have the same contents; TRUE otherwisean absolute path which must be freed with g_free(), or possibly
+NULL for invalid filenames
 

 
 

 

 

 

-
wocky_normalise_jid ()

-
gchar *             wocky_normalise_jid                 (const gchar *jid);

+
wocky_compose_jid ()

+
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
+is also omitted.
+

 

-
-
+
+
+
+
+
+
+
+
+
+
-
+

 
 
 
jid :
a JID
node :
the node part of a JID, possibly empty or NULL
+
domain :
the non-NULL domain part of a JID
resource :
the resource part of a JID, possibly empty or NULL
+
 

 

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

 
 

@@ -195,35 +205,64 @@
 

 

 

-
wocky_compose_jid ()

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

+
wocky_enum_from_nick ()

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

 

-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.
+
 

 

-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
+
+

 
 
 
node :
the node part of a JID, possibly empty or NULL
+
enum_type :
the GType of a subtype of GEnum
nick :
a non-NULL string purporting to be the nickname of a value of
+enum_type
 
 

 
domain :
the non-NULL domain part of a JID
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.
 

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

+TRUE if nick is a member of enum_type, or FALSE otherwise

+

+

+

+
wocky_enum_to_nick ()

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

+

+
+

+

++
+
+
+
+
+
+
+
-
@@ -231,6 +270,62 @@
 

+
wocky_g_string_dup ()

+
GString *           wocky_g_string_dup                  (const GString *str);

+

+

+

+

+

+
wocky_g_string_free ()

+
void                wocky_g_string_free                 (GString *str);

+

+

+

+

+

+
wocky_g_value_slice_dup ()

+
GValue *            wocky_g_value_slice_dup             (const GValue *value);

+

+
+

+


enum_type :
the GType of a subtype of GEnum
value :
a value of enum_type
 
 

 

 
Returns :
a JID constructed from node, domain and resource
+the nickname of value, or NULL if it is not, in fact, a value of
+enum_type
 
 

 
 
 

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


value :
A GValue
Returns :
a newly allocated copy of value, to be freed with
+wocky_g_value_slice_free() or g_slice_free().

+
Since 0.5.14

+

+

+

+
wocky_g_value_slice_free ()

+
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.
+

+

++
+
+
+
+


value :
A GValue which was allocated with the g_slice API

+

+

+

 
wocky_g_value_slice_new ()

 
GValue *            wocky_g_value_slice_new             (GType type);

 

@@ -280,8 +375,9 @@
 

 

 

-
wocky_g_value_slice_new_int ()

-
GValue *            wocky_g_value_slice_new_int         (gint n);

+
wocky_g_value_slice_new_boxed ()

+
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.
@@ -290,13 +386,17 @@
 
 
 
-
n :

-an integer
+
type :

+a boxed type
+
+
+
p :

+a pointer of type type, which will be copied
 
 
 
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 type whose value is a copy of p,
+to be freed with wocky_g_value_slice_free() or g_slice_free()
 
 
 
@@ -305,8 +405,8 @@
 

 

 

-
wocky_g_value_slice_new_int64 ()

-
GValue *            wocky_g_value_slice_new_int64       (gint64 n);

+
wocky_g_value_slice_new_double ()

+
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.
@@ -315,12 +415,12 @@
 
 
 
-
n :

-a 64-bit integer
+
d :

+a number
 
 
 
Returns :

-a GValue of type G_TYPE_INT64 with value n, to be freed with
+a GValue of type G_TYPE_DOUBLE with value n, to be freed with
 wocky_g_value_slice_free() or g_slice_free()
 
 
@@ -330,8 +430,8 @@
 

 

 

-
wocky_g_value_slice_new_uint ()

-
GValue *            wocky_g_value_slice_new_uint        (guint n);

+
wocky_g_value_slice_new_int ()

+
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.
@@ -341,11 +441,11 @@
 
 
 
n :

-an unsigned integer
+an integer
 
 
 
Returns :

-a GValue of type G_TYPE_UINT with value n, to be freed with
+a GValue of type G_TYPE_INT with value n, to be freed with
 wocky_g_value_slice_free() or g_slice_free()
 
 
@@ -355,8 +455,8 @@
 

 

 

-
wocky_g_value_slice_new_uint64 ()

-
GValue *            wocky_g_value_slice_new_uint64      (guint64 n);

+
wocky_g_value_slice_new_int64 ()

+
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.
@@ -366,11 +466,11 @@
 
 
 
n :

-a 64-bit unsigned integer
+a 64-bit integer
 
 
 
Returns :

-a GValue of type G_TYPE_UINT64 with value n, to be freed with
+a GValue of type G_TYPE_INT64 with value n, to be freed with
 wocky_g_value_slice_free() or g_slice_free()
 
 
@@ -380,8 +480,10 @@
 

 

 

-
wocky_g_value_slice_new_double ()

-
GValue *            wocky_g_value_slice_new_double      (double d);

+
wocky_g_value_slice_new_static_boxed ()

+
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.
@@ -390,13 +492,17 @@
 
 
 
-
d :

-a number
+
type :

+a boxed type
+
+
+
p :

+a pointer of type type, which must remain valid forever
 
 
 
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 type whose value is p,
+to be freed with wocky_g_value_slice_free() or g_slice_free()
 
 
 
@@ -405,8 +511,9 @@
 

 

 

-
wocky_g_value_slice_new_string ()

-
GValue *            wocky_g_value_slice_new_string      (const gchar *string);

+
wocky_g_value_slice_new_static_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.
@@ -416,11 +523,12 @@
 
 
 
string :

-a string to be copied into the value
+a static string which must remain valid forever, to be pointed to
+by the value
 
 
 
Returns :

-a GValue of type G_TYPE_STRING whose value is a copy of string,
+a GValue of type G_TYPE_STRING whose value is string,
 to be freed with wocky_g_value_slice_free() or g_slice_free()
 
 
@@ -430,9 +538,8 @@
 

 

 

-
wocky_g_value_slice_new_static_string ()

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

+
wocky_g_value_slice_new_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.
@@ -442,12 +549,11 @@
 
 
 
string :

-a static string which must remain valid forever, to be pointed to
-by the value
+a string to be copied into the value
 
 
 
Returns :

-a GValue of type G_TYPE_STRING whose value is string,
+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()
 
 
@@ -457,8 +563,9 @@
 

 

 

-
wocky_g_value_slice_new_take_string ()

-
GValue *            wocky_g_value_slice_new_take_string (gchar *string);

+
wocky_g_value_slice_new_take_boxed ()

+
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.
@@ -467,14 +574,18 @@
 
 
 
-
string :

-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)
+
type :

+a boxed type
+
+
+
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
+no longer owns it after this function returns)
 
 
 
Returns :

-a GValue of type G_TYPE_STRING whose value is string,
+a GValue of type type whose value is p,
 to be freed with wocky_g_value_slice_free() or g_slice_free()
 
 
@@ -484,9 +595,8 @@
 

 

 

-
wocky_g_value_slice_new_boxed ()

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

+
wocky_g_value_slice_new_take_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.
@@ -495,16 +605,14 @@
 
 
 
-
type :

-a boxed type
-
-
-
p :

-a pointer of type type, which will be copied
+
string :

+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 type whose value is a copy of p,
+a GValue of type G_TYPE_STRING whose value is string,
 to be freed with wocky_g_value_slice_free() or g_slice_free()
 
 
@@ -514,10 +622,8 @@
 

 

 

-
wocky_g_value_slice_new_static_boxed ()

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

+
wocky_g_value_slice_new_uint ()

+
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.
@@ -526,17 +632,13 @@
 
 
 
-
type :

-a boxed type
-
-
-
p :

-a pointer of type type, which must remain valid forever
+
n :

+an unsigned integer
 
 
 
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 G_TYPE_UINT with value n, to be freed with
+wocky_g_value_slice_free() or g_slice_free()
 
 
 
@@ -545,9 +647,8 @@
 

 

 

-
wocky_g_value_slice_new_take_boxed ()

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

+
wocky_g_value_slice_new_uint64 ()

+
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.
@@ -556,19 +657,13 @@
 
 
 
-
type :

-a boxed type
-
-
-
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
-no longer owns it after this function returns)
+
n :

+a 64-bit unsigned integer
 
 
 
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 G_TYPE_UINT64 with value n, to be freed with
+wocky_g_value_slice_free() or g_slice_free()
 
 
 
@@ -577,191 +672,96 @@
 

 

 

-
wocky_g_value_slice_free ()

-
void                wocky_g_value_slice_free            (GValue *value);

+
wocky_implement_finish_copy_pointer()

+
#define             wocky_implement_finish_copy_pointer(source, tag, copy_func, \
+                out_param)

 

-Unset and free a slice-allocated GValue.
 

+

+

+

+
wocky_implement_finish_return_copy_pointer()

+
#define             wocky_implement_finish_return_copy_pointer(source, tag, \
+                copy_func)

 

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

-

--
-
-
-
-


value :
A GValue which was allocated with the g_slice API

 

 

 

-
wocky_g_value_slice_dup ()

-
GValue *            wocky_g_value_slice_dup             (const GValue *value);

+
wocky_implement_finish_return_pointer()

+
#define             wocky_implement_finish_return_pointer(source, tag)

 

-
 

-

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


value :
A GValue
Returns :
a newly allocated copy of value, to be freed with
-wocky_g_value_slice_free() or g_slice_free().

-
Since 0.5.14

 

 

 

-
wocky_enum_from_nick ()

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

+
wocky_implement_finish_void()

+
#define             wocky_implement_finish_void(source, tag)

 

-
 

-

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


enum_type :
the GType of a subtype of GEnum
nick :
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.
Returns :

-TRUE if nick is a member of enum_type, or FALSE otherwise

 

 

 

-
wocky_enum_to_nick ()

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

+
wocky_list_deep_copy ()

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

 

-
 

+

+

+

+
wocky_normalise_jid ()

+
gchar *             wocky_normalise_jid                 (const gchar *jid);

 

-
-
-
-
-
-
+
+
-
+

 
 
 
enum_type :
the GType of a subtype of GEnum
value :
a value of enum_type
-
jid :
a JID
 

 

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

 
 

 

 

 

-
wocky_absolutize_path ()

-
gchar *             wocky_absolutize_path               (const gchar *path);

+
wocky_strdiff ()

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

 

-Return an absolute form of path. This cleans up duplicate slashes, "." or
-".." path segments, etc., and prepends g_get_current_dir() if necessary, but
-does not necessarily resolve symlinks.
+Return TRUE if the given strings are different. Unlike strcmp this
+function will handle null pointers, treating them as distinct from any
+string.
 

 

-
-
+
+
+
+
+
+
-
+

 
 
 
path :
an absolute or relative path
left :
The first string to compare (may be NULL)
right :
The second string to compare (may be NULL)
 

 

 
Returns :
an absolute path which must be freed with g_free(), or possibly
-NULL for invalid filenames
+FALSE if left and right are both NULL, or if
+neither is NULL and both have the same contents; TRUE otherwise
 

 
 

 

-

-

-
wocky_list_deep_copy ()

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

-

-

-

-

-

-
wocky_g_string_dup ()

-
GString *           wocky_g_string_dup                  (const GString *str);

-

-

-

-

-

-
wocky_g_string_free ()

-
void                wocky_g_string_free                 (GString *str);

-

-

-

-

-

-
wocky_implement_finish_void()

-
#define             wocky_implement_finish_void(source, tag)

-

-

-

-

-

-
wocky_implement_finish_copy_pointer()

-
#define             wocky_implement_finish_copy_pointer(source, tag, copy_func, \
-                out_param)

-

-

-

-

-

-
wocky_implement_finish_return_copy_pointer()

-
#define             wocky_implement_finish_return_copy_pointer(source, tag, \
-                copy_func)

-

-

-

-

-

-
wocky_implement_finish_return_pointer()

-
#define             wocky_implement_finish_return_pointer(source, tag)

-

-

-

 

 

 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyXmppConnection.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyXmppConnection.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyXmppConnection.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyXmppConnection.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,25 +37,21 @@
 
 

 
Synopsis

-
enum                WockyXmppConnectionError;
-GQuark              wocky_xmpp_connection_error_quark   (void);
-#define             WOCKY_XMPP_CONNECTION_ERROR
+
#define             WOCKY_XMPP_CONNECTION_ERROR
 struct              WockyXmppConnectionClass;
-WockyXmppConnection * wocky_xmpp_connection_new         (GIOStream *stream);
-void                wocky_xmpp_connection_send_open_async
+enum                WockyXmppConnectionError;
+GQuark              wocky_xmpp_connection_error_quark   (void);
+void                wocky_xmpp_connection_force_close_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
+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,
@@ -70,46 +66,58 @@
                                                          gchar **lang,
                                                          gchar **id,
                                                          GError **error);
-void                wocky_xmpp_connection_send_stanza_async
+void                wocky_xmpp_connection_recv_stanza_async
                                                         (WockyXmppConnection *connection,
-                                                         WockyStanza *stanza,
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);
-gboolean            wocky_xmpp_connection_send_stanza_finish
+WockyStanza *       wocky_xmpp_connection_recv_stanza_finish
                                                         (WockyXmppConnection *connection,
                                                          GAsyncResult *result,
                                                          GError **error);
-void                wocky_xmpp_connection_recv_stanza_async
+void                wocky_xmpp_connection_reset         (WockyXmppConnection *connection);
+void                wocky_xmpp_connection_send_close_async
                                                         (WockyXmppConnection *connection,
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);
-WockyStanza *       wocky_xmpp_connection_recv_stanza_finish
+gboolean            wocky_xmpp_connection_send_close_finish
                                                         (WockyXmppConnection *connection,
                                                          GAsyncResult *result,
                                                          GError **error);
-void                wocky_xmpp_connection_send_close_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);
-gboolean            wocky_xmpp_connection_send_close_finish
+gboolean            wocky_xmpp_connection_send_open_finish
                                                         (WockyXmppConnection *connection,
                                                          GAsyncResult *result,
                                                          GError **error);
-void                wocky_xmpp_connection_force_close_async
+void                wocky_xmpp_connection_send_stanza_async
                                                         (WockyXmppConnection *connection,
+                                                         WockyStanza *stanza,
                                                          GCancellable *cancellable,
                                                          GAsyncReadyCallback callback,
                                                          gpointer user_data);
-gboolean            wocky_xmpp_connection_force_close_finish
+gboolean            wocky_xmpp_connection_send_stanza_finish
+                                                        (WockyXmppConnection *connection,
+                                                         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
                                                         (WockyXmppConnection *connection,
                                                          GAsyncResult *result,
                                                          GError **error);
-void                wocky_xmpp_connection_reset         (WockyXmppConnection *connection);
-gchar *             wocky_xmpp_connection_new_id        (WockyXmppConnection *self);
-                    WockyXmppConnectionPrivate;
 

 

 

@@ -121,6 +129,25 @@
 

 
Details

 

+
WOCKY_XMPP_CONNECTION_ERROR

+
#define WOCKY_XMPP_CONNECTION_ERROR (wocky_xmpp_connection_error_quark ())
+

+

+Get access to the error quark of the xmpp connection.
+

+

+

+

+
struct WockyXmppConnectionClass

+
struct WockyXmppConnectionClass {
+};
+

+

+The class of a WockyXmppConnection.
+

+

+

+

 
enum WockyXmppConnectionError

 
typedef enum {
   WOCKY_XMPP_CONNECTION_ERROR_EOS,
@@ -186,21 +213,23 @@
 

 

 

-
WOCKY_XMPP_CONNECTION_ERROR

-
#define WOCKY_XMPP_CONNECTION_ERROR (wocky_xmpp_connection_error_quark ())
-

+
wocky_xmpp_connection_force_close_async ()

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

 

-Get access to the error quark of the xmpp connection.
 

 

 

 

-
struct WockyXmppConnectionClass

-
struct WockyXmppConnectionClass {
-};
-

+
wocky_xmpp_connection_force_close_finish ()

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

 

-The class of a WockyXmppConnection.
 

 

 

@@ -226,92 +255,19 @@
 

 

 

-
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);

-

-Request asynchronous sending of an XMPP stream opening over the stream. When
-the operation is finished callback will be called. You can then call
-wocky_xmpp_connection_send_open_finish() to get the result of the operation.
-

-

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


connection :
a WockyXmppConnection.
to :
destination in the XMPP opening (can be NULL).
from :
sender in the XMPP opening (can be NULL).
version :
XMPP version sent (can be NULL).
lang :
language sent (can be NULL).
id :
XMPP Stream ID, if any, or NULL
cancellable :
optional GCancellable object, NULL to ignore.
callback :
callback to call when the request is satisfied.
user_data :
the data to pass to callback function.

-

-

-

-
wocky_xmpp_connection_send_open_finish ()

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

-

-Finishes sending a stream opening.
-

+
wocky_xmpp_connection_new_id ()

+
gchar *             wocky_xmpp_connection_new_id        (WockyXmppConnection *self);

 

-
+
-
-
-
-
-
-
-
-
-
+

 
 
 
connection :
self :

 a WockyXmppConnection.
 

 
result :
a GAsyncResult.
error :
a GError location to store the error occuring, or NULL to ignore.

 
Returns :
TRUE if the opening was succesfully sent, FALSE on error.A short unique string for usage as the id attribute on a stanza
+(free after usage).
 

 
 

@@ -415,21 +371,20 @@
 

 

 

-
wocky_xmpp_connection_send_stanza_async ()

-
void                wocky_xmpp_connection_send_stanza_async
+
wocky_xmpp_connection_recv_stanza_async ()

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

 

-Request asynchronous sending of a WockyStanza. When the operation is
+Asynchronous receive a WockyStanza. When the operation is
 finished callback will be called. You can then call
-wocky_xmpp_connection_send_stanza_finish() to get the result of
+wocky_xmpp_connection_recv_stanza_finish() to get the result of
 the operation.
 

 

-Can only be called after wocky_xmpp_connection_send_open_async has finished
+Can only be called after wocky_xmpp_connection_recv_open_async has finished
 its operation.
 

 

@@ -441,11 +396,6 @@
 
-
-
-
-
@@ -462,13 +412,13 @@
 

-
wocky_xmpp_connection_send_stanza_finish ()

-
gboolean            wocky_xmpp_connection_send_stanza_finish
+
wocky_xmpp_connection_recv_stanza_finish ()

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

 

-Finishes sending a stanza.
+Finishes receiving a stanza
 

 

 
 
stanza :

-WockyStanza to send.

 
cancellable :

 optional GCancellable object, NULL to ignore.
 

 
 
@@ -487,27 +437,44 @@
 
-
+

 

 

 
Returns :
TRUE if the stanza was succesfully sent, FALSE on error.A WockyStanza or NULL on error (unref after usage)
 

 
 

 

 

 

-
wocky_xmpp_connection_recv_stanza_async ()

-
void                wocky_xmpp_connection_recv_stanza_async
+
wocky_xmpp_connection_reset ()

+
void                wocky_xmpp_connection_reset         (WockyXmppConnection *connection);

+

+Reset the XMPP Connection. After the reset the connection is back in its
+initial state (as if wocky_xmpp_connection_send_open_async() and
+wocky_xmpp_connection_recv_open_async() were never called).
+

+

++
+
+
+
+


connection :
a WockyXmppConnection.

+

+

+

+
wocky_xmpp_connection_send_close_async ()

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

 

-Asynchronous receive a WockyStanza. When the operation is
-finished callback will be called. You can then call
-wocky_xmpp_connection_recv_stanza_finish() to get the result of
-the operation.
+Request asynchronous sending of an XMPP stream close. When
+the operation is finished callback will be called. You can then call
+wocky_xmpp_connection_send_close_finish() to get the result of the
+operation.
 

 

-Can only be called after wocky_xmpp_connection_recv_open_async has finished
+Can only be called after wocky_xmpp_connection_send_open_async has finished
 its operation.
 

 

@@ -515,8 +482,7 @@
 
-
+
@@ -535,13 +501,13 @@
 

-
wocky_xmpp_connection_recv_stanza_finish ()

-
WockyStanza *       wocky_xmpp_connection_recv_stanza_finish
+
wocky_xmpp_connection_send_close_finish ()

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

 

-Finishes receiving a stanza
+Finishes send the xmpp stream close.
 

 

 

 
connection :
a WockyXmppConnection
-a WockyXmppConnection.
 

 

 
cancellable :

 
 
@@ -560,28 +526,28 @@
 
-
+

 

 

 
Returns :
A WockyStanza or NULL on error (unref after usage)TRUE on success or FALSE on error.
 

 
 

 

 

 

-
wocky_xmpp_connection_send_close_async ()

-
void                wocky_xmpp_connection_send_close_async
+
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);

 

-Request asynchronous sending of an XMPP stream close. When
+Request asynchronous sending of an XMPP stream opening over the stream. When
 the operation is finished callback will be called. You can then call
-wocky_xmpp_connection_send_close_finish() to get the result of the
-operation.
-

-

-Can only be called after wocky_xmpp_connection_send_open_async has finished
-its operation.
+wocky_xmpp_connection_send_open_finish() to get the result of the operation.
 

 
@@ -591,6 +557,26 @@
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -607,13 +593,13 @@
 

-
wocky_xmpp_connection_send_close_finish ()

-
gboolean            wocky_xmpp_connection_send_close_finish
+
wocky_xmpp_connection_send_open_finish ()

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

 

-Finishes send the xmpp stream close.
+Finishes sending a stream opening.
 

 

 

a WockyXmppConnection.
 

 
to :
destination in the XMPP opening (can be NULL).
from :
sender in the XMPP opening (can be NULL).
version :
XMPP version sent (can be NULL).
lang :
language sent (can be NULL).
id :
XMPP Stream ID, if any, or NULL

 
cancellable :

 optional GCancellable object, NULL to ignore.
 

 
 
@@ -632,79 +618,167 @@
 
-
+

 

 

 
Returns :
TRUE on success or FALSE on error.TRUE if the opening was succesfully sent, FALSE on error.
 

 
 

 

 

 

-
wocky_xmpp_connection_force_close_async ()

-
void                wocky_xmpp_connection_force_close_async
+
wocky_xmpp_connection_send_stanza_async ()

+
void                wocky_xmpp_connection_send_stanza_async
                                                         (WockyXmppConnection *connection,
+                                                         WockyStanza *stanza,
                                                          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
+wocky_xmpp_connection_send_stanza_finish() to get the result of
+the operation.
+

+

+Can only be called after wocky_xmpp_connection_send_open_async has finished
+its operation.
 

+

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


connection :
a WockyXmppConnection
+
stanza :

+WockyStanza to send.
cancellable :
optional GCancellable object, NULL to ignore.
callback :
callback to call when the request is satisfied.
user_data :
the data to pass to callback function.

 

 

 

-
wocky_xmpp_connection_force_close_finish ()

-
gboolean            wocky_xmpp_connection_force_close_finish
+
wocky_xmpp_connection_send_stanza_finish ()

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

 

+Finishes sending a stanza.
 

+

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


connection :
a WockyXmppConnection.
result :
a GAsyncResult.
error :
a GError location to store the error occuring, or NULL to ignore.
Returns :
TRUE if the stanza was succesfully sent, FALSE on error.

 

 

 

-
wocky_xmpp_connection_reset ()

-
void                wocky_xmpp_connection_reset         (WockyXmppConnection *connection);

+
wocky_xmpp_connection_send_whitespace_ping_async ()

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

 

-Reset the XMPP Connection. After the reset the connection is back in its
-initial state (as if wocky_xmpp_connection_send_open_async() and
-wocky_xmpp_connection_recv_open_async() were never called).
+Request asynchronous sending of a whitespace ping. When the operation is
+finished callback will be called. You can then call
+wocky_xmpp_connection_send_whitespace_ping_finish() to get the result of
+the operation.
+

+

+Can only be called after wocky_xmpp_connection_send_open_async has finished
+its operation.
 

 
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 


 
connection :
a WockyXmppConnection.
a WockyXmppConnection
+
cancellable :
optional GCancellable object, NULL to ignore.
callback :
callback to call when the request is satisfied.
user_data :
the data to pass to callback function.

 

 

 

 

-
wocky_xmpp_connection_new_id ()

-
gchar *             wocky_xmpp_connection_new_id        (WockyXmppConnection *self);

+
wocky_xmpp_connection_send_whitespace_ping_finish ()

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

+

+Finishes sending a whitespace ping.
+

 

-
+
+
+
+
+
+
+
+
+
-
+

 
 
 
self :
connection :

 a WockyXmppConnection.
 

 
result :
a GAsyncResult.
error :
a GError location to store the error occuring, or NULL to ignore.

 
Returns :
A short unique string for usage as the id attribute on a stanza
-(free after usage).TRUE if the ping was succesfully sent, FALSE on error.
 

 
 

 

-

-

-
WockyXmppConnectionPrivate

-
typedef struct _WockyXmppConnectionPrivate WockyXmppConnectionPrivate;

-

-

-

 

 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error-enumtypes.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error-enumtypes.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error-enumtypes.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error-enumtypes.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,17 +37,7 @@
 
 

 
Synopsis

-
GType               wocky_xmpp_error_type_get_type      (void);
-#define             WOCKY_TYPE_XMPP_ERROR_TYPE
-GType               wocky_xmpp_error_get_type           (void);
-#define             WOCKY_TYPE_XMPP_ERROR
-GType               wocky_jingle_error_get_type         (void);
-#define             WOCKY_TYPE_JINGLE_ERROR
-GType               wocky_si_error_get_type             (void);
-#define             WOCKY_TYPE_SI_ERROR
-GType               wocky_xmpp_stream_error_get_type    (void);
-#define             WOCKY_TYPE_XMPP_STREAM_ERROR
-

+

 

 

 
Description

@@ -56,84 +46,10 @@
 

 

 
Details

-

-
wocky_xmpp_error_type_get_type ()

-
GType               wocky_xmpp_error_type_get_type      (void);

-

-

-

-

-

-
WOCKY_TYPE_XMPP_ERROR_TYPE

-
#define WOCKY_TYPE_XMPP_ERROR_TYPE (wocky_xmpp_error_type_get_type())
-

-

-

-

-

-

-
wocky_xmpp_error_get_type ()

-
GType               wocky_xmpp_error_get_type           (void);

-

-

-

-

-

-
WOCKY_TYPE_XMPP_ERROR

-
#define WOCKY_TYPE_XMPP_ERROR (wocky_xmpp_error_get_type())
-

-

-

-

-

-

-
wocky_jingle_error_get_type ()

-
GType               wocky_jingle_error_get_type         (void);

-

-

-

-

-

-
WOCKY_TYPE_JINGLE_ERROR

-
#define WOCKY_TYPE_JINGLE_ERROR (wocky_jingle_error_get_type())
-

-

-

-

-

-

-
wocky_si_error_get_type ()

-
GType               wocky_si_error_get_type             (void);

-

-

-

-

-

-
WOCKY_TYPE_SI_ERROR

-
#define WOCKY_TYPE_SI_ERROR (wocky_si_error_get_type())
-

-

-

-

-

-

-
wocky_xmpp_stream_error_get_type ()

-
GType               wocky_xmpp_stream_error_get_type    (void);

-

-

-

-

-

-
WOCKY_TYPE_XMPP_STREAM_ERROR

-
#define WOCKY_TYPE_XMPP_STREAM_ERROR (wocky_xmpp_stream_error_get_type())
-

-

-

-

 

 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -39,54 +39,54 @@
 
 

 
Synopsis

-
enum                WockyXmppErrorType;
-enum                WockyXmppError;
-GQuark              wocky_xmpp_error_quark              (void);
+
#define             WOCKY_JINGLE_ERROR
+#define             WOCKY_SI_ERROR
 #define             WOCKY_XMPP_ERROR
-struct              WockyXmppErrorSpecialization;
+#define             WOCKY_XMPP_STREAM_ERROR
+enum                WockyJingleError;
+enum                WockySIError;
+enum                WockyXmppError;
 struct              WockyXmppErrorDomain;
-void                wocky_xmpp_error_register_domain    (WockyXmppErrorDomain *domain);
-enum                WockyJingleError;
+struct              WockyXmppErrorSpecialization;
+enum                WockyXmppErrorType;
+enum                WockyXmppStreamError;
 GQuark              wocky_jingle_error_quark            (void);
-#define             WOCKY_JINGLE_ERROR
-enum                WockySIError;
 GQuark              wocky_si_error_quark                (void);
-#define             WOCKY_SI_ERROR
-enum                WockyXmppStreamError;
-GQuark              wocky_xmpp_stream_error_quark       (void);
-#define             WOCKY_XMPP_STREAM_ERROR
-const gchar *       wocky_xmpp_error_string             (WockyXmppError error);
-const gchar *       wocky_xmpp_error_description        (WockyXmppError error);
-GError *            wocky_xmpp_stream_error_from_node   (WockyNode *error);
 WockyNode *         wocky_stanza_error_to_node          (const GError *error,
                                                          WockyNode *parent_node);
-const gchar *       wocky_xmpp_stanza_error_to_string   (GError *error);
+void                wocky_xmpp_error_deinit             (void);
+const gchar *       wocky_xmpp_error_description        (WockyXmppError error);
 void                wocky_xmpp_error_extract            (WockyNode *error,
                                                          WockyXmppErrorType *type,
                                                          GError **core,
                                                          GError **specialized,
                                                          WockyNode **specialized_node);
 void                wocky_xmpp_error_init               (void);
-void                wocky_xmpp_error_deinit             (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);
 

 

 

 
Object Hierarchy

 
   GEnum
-   +----WockyXmppErrorType
+   +----WockyJingleError
 

 
   GEnum
-   +----WockyXmppError
+   +----WockySIError
 

 
   GEnum
-   +----WockyJingleError
+   +----WockyXmppError
 

 
   GEnum
-   +----WockySIError
+   +----WockyXmppErrorType
 

 
   GEnum
@@ -101,48 +101,105 @@
 

 
Details

 

-
enum WockyXmppErrorType

-
typedef enum
-{
-  WOCKY_XMPP_ERROR_TYPE_CANCEL,
-  WOCKY_XMPP_ERROR_TYPE_CONTINUE,
-  WOCKY_XMPP_ERROR_TYPE_MODIFY,
-  WOCKY_XMPP_ERROR_TYPE_AUTH,
-  WOCKY_XMPP_ERROR_TYPE_WAIT
-} WockyXmppErrorType;
+
WOCKY_JINGLE_ERROR

+
#define WOCKY_JINGLE_ERROR (wocky_jingle_error_quark ())
 

 

-XMPP error types as described in RFC 3920 §9.3.2.
+

+

+

+

+
WOCKY_SI_ERROR

+
#define WOCKY_SI_ERROR (wocky_si_error_quark ())
+

+

+

+

+

+

+
WOCKY_XMPP_ERROR

+
#define WOCKY_XMPP_ERROR (wocky_xmpp_error_quark ())
+

+

+

+

+

+

+
WOCKY_XMPP_STREAM_ERROR

+
#define WOCKY_XMPP_STREAM_ERROR (wocky_xmpp_stream_error_quark ())
+

+

+Get access to the error quark of the xmpp stream errors.
+

+

+

+

+
enum WockyJingleError

+
typedef enum {
+    WOCKY_JINGLE_ERROR_OUT_OF_ORDER,
+    WOCKY_JINGLE_ERROR_TIE_BREAK,
+    WOCKY_JINGLE_ERROR_UNKNOWN_SESSION,
+    WOCKY_JINGLE_ERROR_UNSUPPORTED_INFO
+} WockyJingleError;
+

+

+Jingle specific errors.
 

 

-
-
+
-
-
+
-
-
+
-
-
+
+
+

 
 
 
WOCKY_XMPP_ERROR_TYPE_CANCEL
do not retry (the error is
-  unrecoverable)
+
WOCKY_JINGLE_ERROR_OUT_OF_ORDER
the request cannot occur at this
+  point in the state machine
 
 

 
WOCKY_XMPP_ERROR_TYPE_CONTINUE
proceed (the condition was only a
-  warning)
+
WOCKY_JINGLE_ERROR_TIE_BREAK
the request is rejected because it
+  was sent while the initiator was awaiting a reply on a similar
+  request
 
 

 
WOCKY_XMPP_ERROR_TYPE_MODIFY
retry after changing the data sent
+
WOCKY_JINGLE_ERROR_UNKNOWN_SESSION
the 'sid' attribute specifies
+  a session that is unknown to the recipient
 
 

 
WOCKY_XMPP_ERROR_TYPE_AUTH
retry after providing credentials
+
WOCKY_JINGLE_ERROR_UNSUPPORTED_INFO
the recipient does not
+  support the informational payload of a session-info action.
 
 

+

+

+

+
enum WockySIError

+
typedef enum {
+    WOCKY_SI_ERROR_NO_VALID_STREAMS,
+    WOCKY_SI_ERROR_BAD_PROFILE
+} WockySIError;
+

+

+SI specific errors.
+

+

++
-
-
+
+
+
+
+
@@ -150,7 +207,7 @@
 

-
enum WockyXmppError

+
enum WockyXmppError

 
typedef enum {
     WOCKY_XMPP_ERROR_UNDEFINED_CONDITION = 0, /* 500 */
 
@@ -188,9 +245,6 @@
     WOCKY_XMPP_ERROR_FEATURE_NOT_IMPLEMENTED, /* 501 */
 
     WOCKY_XMPP_ERROR_SERVICE_UNAVAILABLE,     /* 502, 503, 510 */
-
-    /*< private >*/
-    NUM_WOCKY_XMPP_ERRORS /*< skip >*/ /* don't want this in the GEnum */
 } WockyXmppError;
 

 

@@ -346,18 +400,33 @@
 

-
wocky_xmpp_error_quark ()

-
GQuark              wocky_xmpp_error_quark              (void);

-

-

-

-

-

-
WOCKY_XMPP_ERROR

-
#define WOCKY_XMPP_ERROR (wocky_xmpp_error_quark ())
+
struct WockyXmppErrorDomain

+
struct WockyXmppErrorDomain {
+  GQuark domain;
+  GType enum_type;
+  WockyXmppErrorSpecialization *codes;
+};
 

 

+A struct to represent extra XMPP error domains added.
 

+


 
WOCKY_XMPP_ERROR_TYPE_WAIT
retry after waiting (the error is
-  temporary)
+
WOCKY_SI_ERROR_NO_VALID_STREAMS
none of the available streams are
+  acceptable
+
WOCKY_SI_ERROR_BAD_PROFILE
the profile is not understood or
+  invalid
 
 

 
 
 
 
 

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


GQuark domain;
a GQuark of the error domain
GType enum_type;
the GType of the error enum
WockyXmppErrorSpecialization *codes;
a NULL-terminated array of of WockyXmppErrorSpecializations

 

 

 

@@ -399,135 +468,47 @@
 

 

 

-
struct WockyXmppErrorDomain

-
struct WockyXmppErrorDomain {
-  GQuark domain;
-  GType enum_type;
-  WockyXmppErrorSpecialization *codes;
-};
-

-

-A struct to represent extra XMPP error domains added.
-

-

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


GQuark domain;
a GQuark of the error domain
GType enum_type;
the GType of the error enum
WockyXmppErrorSpecialization *codes;
a NULL-terminated array of of WockyXmppErrorSpecializations

-

-

-

-
wocky_xmpp_error_register_domain ()

-
void                wocky_xmpp_error_register_domain    (WockyXmppErrorDomain *domain);

-

-Registers a new set of application-specific stanza errors. This allows
-GErrors in that domain to be passed to wocky_stanza_error_to_node(), and to
-be recognized and returned by wocky_xmpp_error_extract() (and
-wocky_stanza_extract_errors(), by extension).
-

-

--
-
-
-
-


domain :
a description of the error domain

-

-

-

-
enum WockyJingleError

+
enum WockyXmppErrorType

 
typedef enum {
-    WOCKY_JINGLE_ERROR_OUT_OF_ORDER,
-    WOCKY_JINGLE_ERROR_TIE_BREAK,
-    WOCKY_JINGLE_ERROR_UNKNOWN_SESSION,
-    WOCKY_JINGLE_ERROR_UNSUPPORTED_INFO
-} WockyJingleError;
+  WOCKY_XMPP_ERROR_TYPE_CANCEL,
+  WOCKY_XMPP_ERROR_TYPE_CONTINUE,
+  WOCKY_XMPP_ERROR_TYPE_MODIFY,
+  WOCKY_XMPP_ERROR_TYPE_AUTH,
+  WOCKY_XMPP_ERROR_TYPE_WAIT
+} WockyXmppErrorType;
 

 

-Jingle specific errors.
+XMPP error types as described in RFC 3920 §9.3.2.
 

 

-
-
-
-
-
-
+
-
-
+
-
-
+
-
-

 
 
 
WOCKY_JINGLE_ERROR_OUT_OF_ORDER
the request cannot occur at this
-  point in the state machine
-
WOCKY_JINGLE_ERROR_TIE_BREAK
the request is rejected because it
-  was sent while the initiator was awaiting a reply on a similar
-  request
+
WOCKY_XMPP_ERROR_TYPE_CANCEL
do not retry (the error is
+  unrecoverable)
 
 

 
WOCKY_JINGLE_ERROR_UNKNOWN_SESSION
the 'sid' attribute specifies
-  a session that is unknown to the recipient
+
WOCKY_XMPP_ERROR_TYPE_CONTINUE
proceed (the condition was only a
+  warning)
 
 

 
WOCKY_JINGLE_ERROR_UNSUPPORTED_INFO
the recipient does not
-  support the informational payload of a session-info action.
+
WOCKY_XMPP_ERROR_TYPE_MODIFY
retry after changing the data sent
 
 

-

-

-

-
wocky_jingle_error_quark ()

-
GQuark              wocky_jingle_error_quark            (void);

-

-

-

-

-

-
WOCKY_JINGLE_ERROR

-
#define WOCKY_JINGLE_ERROR (wocky_jingle_error_quark ())
-

-

-

-

-

-

-
enum WockySIError

-
typedef enum {
-    WOCKY_SI_ERROR_NO_VALID_STREAMS,
-    WOCKY_SI_ERROR_BAD_PROFILE
-} WockySIError;
-

-

-SI specific errors.
-

-

--
-
-
+
-
-
+
@@ -535,22 +516,7 @@
 

-
wocky_si_error_quark ()

-
GQuark              wocky_si_error_quark                (void);

-

-

-

-

-

-
WOCKY_SI_ERROR

-
#define WOCKY_SI_ERROR (wocky_si_error_quark ())
-

-

-

-

-

-

-
enum WockyXmppStreamError

+
enum WockyXmppStreamError

 
typedef enum {
   WOCKY_XMPP_STREAM_ERROR_BAD_FORMAT,
   WOCKY_XMPP_STREAM_ERROR_BAD_NAMESPACE_PREFIX,
@@ -759,32 +725,37 @@
 

-
wocky_xmpp_stream_error_quark ()

-
GQuark              wocky_xmpp_stream_error_quark       (void);

+
wocky_jingle_error_quark ()

+
GQuark              wocky_jingle_error_quark            (void);

 

-Get the error quark used for stream errors
 

-


 
WOCKY_SI_ERROR_NO_VALID_STREAMS
none of the available streams are
-  acceptable
+
WOCKY_XMPP_ERROR_TYPE_AUTH
retry after providing credentials
 
 

 
WOCKY_SI_ERROR_BAD_PROFILE
the profile is not understood or
-  invalid
+
WOCKY_XMPP_ERROR_TYPE_WAIT
retry after waiting (the error is
+  temporary)
 
 

 
 
 
 
 

--
-
-
-
-


Returns :
the quark for stream errors.

 

 

 

-
WOCKY_XMPP_STREAM_ERROR

-
#define WOCKY_XMPP_STREAM_ERROR (wocky_xmpp_stream_error_quark ())
-

+
wocky_si_error_quark ()

+
GQuark              wocky_si_error_quark                (void);

 

-Get access to the error quark of the xmpp stream errors.
 

 

 

 

-
wocky_xmpp_error_string ()

-
const gchar *       wocky_xmpp_error_string             (WockyXmppError error);

+
wocky_stanza_error_to_node ()

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

+

+

+

+

+

+
wocky_xmpp_error_deinit ()

+
void                wocky_xmpp_error_deinit             (void);

+

+

+

+

+

+
wocky_xmpp_error_description ()

+
const gchar *       wocky_xmpp_error_description        (WockyXmppError error);

 

 
 

@@ -797,61 +768,115 @@
 
 
 
Returns :

-the name of the tag corresponding to error
-
+a description of the error, in English, as specified in XMPP Core
 
 
 

 

 

 

-
wocky_xmpp_error_description ()

-
const gchar *       wocky_xmpp_error_description        (WockyXmppError error);

+
wocky_xmpp_error_extract ()

+
void                wocky_xmpp_error_extract            (WockyNode *error,
+                                                         WockyXmppErrorType *type,
+                                                         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.
+

+

+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.
 

 

-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 
 
 

 
error :
a core stanza errorthe <error/> child of a stanza with type='error'
 

 
Returns :
a description of the error, in English, as specified in XMPP Core
type :
location at which to store the error type
core :
location at which to store an error in the domain WOCKY_XMPP_ERROR
+
specialized :
location at which to store an error in an application-specific
+domain, if one is found
specialized_node :
location at which to store the node representing an
+application-specific error, if one is found
 

 
 

 

 

 

-
wocky_xmpp_stream_error_from_node ()

-
GError *            wocky_xmpp_stream_error_from_node   (WockyNode *error);

+
wocky_xmpp_error_init ()

+
void                wocky_xmpp_error_init               (void);

+

+

+

+

+

+
wocky_xmpp_error_quark ()

+
GQuark              wocky_xmpp_error_quark              (void);

+

+

+

+

+

+
wocky_xmpp_error_register_domain ()

+
void                wocky_xmpp_error_register_domain    (WockyXmppErrorDomain *domain);

+

+Registers a new set of application-specific stanza errors. This allows
+GErrors in that domain to be passed to wocky_stanza_error_to_node(), and to
+be recognized and returned by wocky_xmpp_error_extract() (and
+wocky_stanza_extract_errors(), by extension).
+

+

++
+
+
+
+


domain :
a description of the error domain

+

+

+

+
wocky_xmpp_error_string ()

+
const gchar *       wocky_xmpp_error_string             (WockyXmppError error);

+

+
+

 

-
+
-
+

 
 
 

 
error :
the root node of a WOCKY_STANZA_TYPE_STREAM_ERROR stanzaa core stanza error
 

 

 
Returns :
a GError in the WOCKY_XMPP_STREAM_ERROR domain.the name of the tag corresponding to error
+
 

 
 

 

 

 

-
wocky_stanza_error_to_node ()

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

-

-

-

-

-

 
wocky_xmpp_stanza_error_to_string ()

 
const gchar *       wocky_xmpp_stanza_error_to_string   (GError *error);

 

@@ -878,70 +903,41 @@
 

 

 

-
wocky_xmpp_error_extract ()

-
void                wocky_xmpp_error_extract            (WockyNode *error,
-                                                         WockyXmppErrorType *type,
-                                                         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.
-

-

-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.
-

+
wocky_xmpp_stream_error_from_node ()

+
GError *            wocky_xmpp_stream_error_from_node   (WockyNode *error);

 

-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+

 
 
 

 
error :
the <error/> child of a stanza with type='error'
type :
location at which to store the error type
core :
location at which to store an error in the domain WOCKY_XMPP_ERROR
-
specialized :
location at which to store an error in an application-specific
-domain, if one is foundthe root node of a WOCKY_STANZA_TYPE_STREAM_ERROR stanza
 

 
specialized_node :
location at which to store the node representing an
-application-specific error, if one is found
Returns :
a GError in the WOCKY_XMPP_STREAM_ERROR domain.
 

 
 

 

 

 

-
wocky_xmpp_error_init ()

-
void                wocky_xmpp_error_init               (void);

-

-

-

-

-

-
wocky_xmpp_error_deinit ()

-
void                wocky_xmpp_error_deinit             (void);

+
wocky_xmpp_stream_error_quark ()

+
GQuark              wocky_xmpp_stream_error_quark       (void);

 

+Get the error quark used for stream errors
 

+

++
+
+
+
+


Returns :
the quark for stream errors.

 

 

 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-reader-enumtypes.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-reader-enumtypes.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-reader-enumtypes.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-reader-enumtypes.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -37,11 +37,7 @@
 
 

 
Synopsis

-
GType               wocky_xmpp_reader_state_get_type    (void);
-#define             WOCKY_TYPE_XMPP_READER_STATE
-GType               wocky_xmpp_reader_error_get_type    (void);
-#define             WOCKY_TYPE_XMPP_READER_ERROR
-

+

 

 

 
Description

@@ -50,39 +46,10 @@
 

 

 
Details

-

-
wocky_xmpp_reader_state_get_type ()

-
GType               wocky_xmpp_reader_state_get_type    (void);

-

-

-

-

-

-
WOCKY_TYPE_XMPP_READER_STATE

-
#define WOCKY_TYPE_XMPP_READER_STATE (wocky_xmpp_reader_state_get_type())
-

-

-

-

-

-

-
wocky_xmpp_reader_error_get_type ()

-
GType               wocky_xmpp_reader_error_get_type    (void);

-

-

-

-

-

-
WOCKY_TYPE_XMPP_READER_ERROR

-
#define WOCKY_TYPE_XMPP_READER_ERROR (wocky_xmpp_reader_error_get_type())
-

-

-

-

 

 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyXmppReader.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyXmppReader.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyXmppReader.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyXmppReader.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -39,33 +39,32 @@
 
 

 
Synopsis

-
struct              WockyXmppReaderClass;
-enum                WockyXmppReaderState;
-enum                WockyXmppReaderError;
+
#define             WOCKY_XMPP_READER_ERROR
+struct              WockyXmppReaderClass;
+enum                WockyXmppReaderError;
+enum                WockyXmppReaderState;
 GQuark              wocky_xmpp_reader_error_quark       (void);
-#define             WOCKY_XMPP_READER_ERROR
+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);
-WockyXmppReaderState  wocky_xmpp_reader_get_state       (WockyXmppReader *reader);
-void                wocky_xmpp_reader_push              (WockyXmppReader *reader,
-                                                         const guint8 *data,
-                                                         gsize length);
-WockyStanza *       wocky_xmpp_reader_pop_stanza        (WockyXmppReader *reader);
 WockyStanza *       wocky_xmpp_reader_peek_stanza       (WockyXmppReader *reader);
-GError *            wocky_xmpp_reader_get_error         (WockyXmppReader *reader);
+WockyStanza *       wocky_xmpp_reader_pop_stanza        (WockyXmppReader *reader);
+void                wocky_xmpp_reader_push              (WockyXmppReader *reader,
+                                                         const guint8 *data,
+                                                         gsize length);
 void                wocky_xmpp_reader_reset             (WockyXmppReader *reader);
-                    WockyXmppReaderPrivate;
 

 

 

 
Object Hierarchy

 
   GEnum
-   +----WockyXmppReaderState
+   +----WockyXmppReaderError
 

 
   GEnum
-   +----WockyXmppReaderError
+   +----WockyXmppReaderState
 

 

 

@@ -78,6 +77,15 @@
 

 
Details

 

+
WOCKY_XMPP_READER_ERROR

+
#define WOCKY_XMPP_READER_ERROR (wocky_xmpp_reader_error_quark ())
+

+

+Get access to the error quark of the reader.
+

+

+

+

 
struct WockyXmppReaderClass

 
struct WockyXmppReaderClass {
 };
@@ -88,7 +96,34 @@
 

 

 

-
enum WockyXmppReaderState

+
enum WockyXmppReaderError

+
typedef enum {
+  WOCKY_XMPP_READER_ERROR_INVALID_STREAM_START,
+  WOCKY_XMPP_READER_ERROR_PARSE_ERROR,
+} WockyXmppReaderError;
+

+

+The different errors that can occur while reading a stream
+

+

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


WOCKY_XMPP_READER_ERROR_INVALID_STREAM_START
invalid start of xmpp stream
+
WOCKY_XMPP_READER_ERROR_PARSE_ERROR
error in parsing the XML
+

+

+

+

+
enum WockyXmppReaderState

 
typedef enum {
   WOCKY_XMPP_READER_STATE_INITIAL,
   WOCKY_XMPP_READER_STATE_OPENED,
@@ -127,57 +162,63 @@
 

 

 

-
enum WockyXmppReaderError

-
typedef enum {
-  WOCKY_XMPP_READER_ERROR_INVALID_STREAM_START,
-  WOCKY_XMPP_READER_ERROR_PARSE_ERROR,
-} WockyXmppReaderError;
-

+
wocky_xmpp_reader_error_quark ()

+
GQuark              wocky_xmpp_reader_error_quark       (void);

 

-The different errors that can occur while reading a stream
+Get the error quark used by the reader.
+

+

++
+
+
+
+


Returns :
the quark for reader errors.

+

+

+

+
wocky_xmpp_reader_get_error ()

+
GError *            wocky_xmpp_reader_get_error         (WockyXmppReader *reader);

+

+Get the error from the reader
 

 

-
-
+
-
-
+
+

 
 
 
WOCKY_XMPP_READER_ERROR_INVALID_STREAM_START
invalid start of xmpp stream
+
reader :
a WockyXmppReader
 
 

 
WOCKY_XMPP_READER_ERROR_PARSE_ERROR
error in parsing the XML
-
Returns :
A copy of the error as encountered by the reader or NULL if there
+was no error. Free after use.
 

 
 

 

 

 

-
wocky_xmpp_reader_error_quark ()

-
GQuark              wocky_xmpp_reader_error_quark       (void);

-

-Get the error quark used by the reader.
-

+
wocky_xmpp_reader_get_state ()

+
WockyXmppReaderState wocky_xmpp_reader_get_state        (WockyXmppReader *reader);

 
-
+
+
+
+
+
+
-
-
+
+
+

 

reader :
a WockyXmppReader
+

 
Returns :
the quark for reader errors.
The current state of the reader

 

 

 

 

-
WOCKY_XMPP_READER_ERROR

-
#define WOCKY_XMPP_READER_ERROR (wocky_xmpp_reader_error_quark ())
-

-

-Get access to the error quark of the reader.
-

-

-

-

 
wocky_xmpp_reader_new ()

 
WockyXmppReader *   wocky_xmpp_reader_new               (void);

 

@@ -210,8 +251,13 @@
 

 

 

-
wocky_xmpp_reader_get_state ()

-
WockyXmppReaderState  wocky_xmpp_reader_get_state       (WockyXmppReader *reader);

+
wocky_xmpp_reader_peek_stanza ()

+
WockyStanza *       wocky_xmpp_reader_peek_stanza       (WockyXmppReader *reader);

+

+Returns the first WockyStanza available from reader or NULL
+if there are no available stanzas. The stanza is not removed from the
+readers queue
+

 

@@ -222,34 +268,8 @@
 
-
-
-
-

 
 
 

 
Returns :
The current state of the reader

-

-

-

-
wocky_xmpp_reader_push ()

-
void                wocky_xmpp_reader_push              (WockyXmppReader *reader,
-                                                         const guint8 *data,
-                                                         gsize length);

-

-Push an amount of data to parse.
-

-

--
-
-
-
-
-
-
-
-
-
-
-
@@ -281,50 +301,29 @@
 

-
wocky_xmpp_reader_peek_stanza ()

-
WockyStanza *       wocky_xmpp_reader_peek_stanza       (WockyXmppReader *reader);

+
wocky_xmpp_reader_push ()

+
void                wocky_xmpp_reader_push              (WockyXmppReader *reader,
+                                                         const guint8 *data,
+                                                         gsize length);

 

-Returns the first WockyStanza available from reader or NULL
-if there are no available stanzas. The stanza is not removed from the
-readers queue
+Push an amount of data to parse.
 

 


reader :
a WockyXmppReader
data :
Data to read
length :
Size of data
+One WockyStanza or NULL if there are no available stanzas. The
+stanza is owned by the WockyXmppReader
 
 

 
 
 

-
+
-
-
+
+
-
-

 
 
 

 
reader :
a WockyXmppReader
-a WockyXmppReader
 

 
Returns :
One WockyStanza or NULL if there are no available stanzas. The
-stanza is owned by the WockyXmppReader
-
data :
Data to read
 

-

-

-

-
wocky_xmpp_reader_get_error ()

-
GError *            wocky_xmpp_reader_get_error         (WockyXmppReader *reader);

-

-Get the error from the reader
-

-

--
-
-
+
-
-
-
-


 
reader :
a WockyXmppReader
+
length :
Size of data
 
 
Returns :
A copy of the error as encountered by the reader or NULL if there
-was no error. Free after use.

 
 

 

@@ -344,17 +343,10 @@
 
 

 

-

-

-
WockyXmppReaderPrivate

-
typedef struct _WockyXmppReaderPrivate WockyXmppReaderPrivate;

-

-

-

 
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyXmppWriter.html telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyXmppWriter.html
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/html/wocky-WockyXmppWriter.html	2011-05-03 13:29:41.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/html/wocky-WockyXmppWriter.html	2011-11-16 10:28:01.000000000 +0000
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -38,29 +38,28 @@
 

 
Synopsis

 
struct              WockyXmppWriterClass;
+void                wocky_xmpp_writer_flush             (WockyXmppWriter *writer);
 WockyXmppWriter *   wocky_xmpp_writer_new               (void);
 WockyXmppWriter *   wocky_xmpp_writer_new_no_stream     (void);
+void                wocky_xmpp_writer_stream_close      (WockyXmppWriter *writer,
+                                                         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 guint8 **data,
-                                                         gsize *length);
-void                wocky_xmpp_writer_stream_close      (WockyXmppWriter *writer,
-                                                         const guint8 **data,
-                                                         gsize *length);
-void                wocky_xmpp_writer_write_stanza      (WockyXmppWriter *writer,
-                                                         WockyStanza *stanza,
-                                                         const guint8 **data,
-                                                         gsize *length);
+                                                         const guint8 **data,
+                                                         gsize *length);
 void                wocky_xmpp_writer_write_node_tree   (WockyXmppWriter *writer,
                                                          WockyNodeTree *tree,
-                                                         const guint8 **data,
-                                                         gsize *length);
-void                wocky_xmpp_writer_flush             (WockyXmppWriter *writer);
-                    WockyXmppWriterPrivate;
+                                                         const guint8 **data,
+                                                         gsize *length);
+void                wocky_xmpp_writer_write_stanza      (WockyXmppWriter *writer,
+                                                         WockyStanza *stanza,
+                                                         const guint8 **data,
+                                                         gsize *length);
 

 

 

@@ -84,6 +83,21 @@
 

 

 

+
wocky_xmpp_writer_flush ()

+
void                wocky_xmpp_writer_flush             (WockyXmppWriter *writer);

+

+Flushes and frees the internal data buffer
+

+

++
+
+
+
+


writer :
a WockyXmppWriter

+

+

+

 
wocky_xmpp_writer_new ()

 
WockyXmppWriter *   wocky_xmpp_writer_new               (void);

 

@@ -116,6 +130,38 @@
 

 

 

+
wocky_xmpp_writer_stream_close ()

+
void                wocky_xmpp_writer_stream_close      (WockyXmppWriter *writer,
+                                                         const guint8 **data,
+                                                         gsize *length);

+

+Create the XML closing footer of an XMPP stream . The result is available
+in the data buffer. The buffer is only valid until the next call to a
+function
+

+

+This function can only be called in streaming mode.
+

+

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


writer :
a WockyXmppWriter
data :
location to store a pointer to the data buffer
length :
length of the data buffer

+

+

+

 
wocky_xmpp_writer_stream_open ()

 
void                wocky_xmpp_writer_stream_open       (WockyXmppWriter *writer,
                                                          const gchar *to,
@@ -123,8 +169,8 @@
                                                          const gchar *version,
                                                          const gchar *lang,
                                                          const gchar *id,
-                                                         const guint8 **data,
-                                                         gsize *length);

+                                                         const guint8 **data,
+                                                         gsize *length);
 

 Create the XML opening header of an XMPP stream. The result is available in
 the data buffer. The buffer is only valid until the next call to a function
@@ -173,17 +219,15 @@
 

 

 

-
wocky_xmpp_writer_stream_close ()

-
void                wocky_xmpp_writer_stream_close      (WockyXmppWriter *writer,
-                                                         const guint8 **data,
-                                                         gsize *length);

-

-Create the XML closing footer of an XMPP stream . The result is available
-in the data buffer. The buffer is only valid until the next call to a
-function
-

+
wocky_xmpp_writer_write_node_tree ()

+
void                wocky_xmpp_writer_write_node_tree   (WockyXmppWriter *writer,
+                                                         WockyNodeTree *tree,
+                                                         const guint8 **data,
+                                                         gsize *length);

 

-This function can only be called in streaming mode.
+Serialize the tree to XML. The result is available in the
+data buffer. The buffer is only valid until the next call to a function.
+This function may only be called in non-streaming mode.
 

 
@@ -193,6 +237,10 @@
 
+
+
+
+
@@ -208,8 +256,8 @@
 
wocky_xmpp_writer_write_stanza ()
void                wocky_xmpp_writer_write_stanza      (WockyXmppWriter *writer,
                                                          WockyStanza *stanza,
-                                                         const guint8 **data,
-                                                         gsize *length);

+                                                         const guint8 **data,
+                                                         gsize *length);

 Serialize the stanza to XML. The result is available in the
 data buffer. The buffer is only valid until the next call to a function
@@ -236,66 +284,10 @@
 

 

a WockyXmppWriter
 

 
tree :
the node tree to serialize

 
data :

 location to store a pointer to the data buffer
 

 
 
 

 

-

-

-
wocky_xmpp_writer_write_node_tree ()

-
void                wocky_xmpp_writer_write_node_tree   (WockyXmppWriter *writer,
-                                                         WockyNodeTree *tree,
-                                                         const guint8 **data,
-                                                         gsize *length);

-

-Serialize the tree to XML. The result is available in the
-data buffer. The buffer is only valid until the next call to a function.
-This function may only be called in non-streaming mode.
-

-

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


writer :
a WockyXmppWriter
tree :
the node tree to serialize
data :
location to store a pointer to the data buffer
length :
length of the data buffer

-

-

-

-
wocky_xmpp_writer_flush ()

-
void                wocky_xmpp_writer_flush             (WockyXmppWriter *writer);

-

-Flushes and frees the internal data buffer
-

-

--
-
-
-
-


writer :
a WockyXmppWriter

-

-

-

-
WockyXmppWriterPrivate

-
typedef struct _WockyXmppWriterPrivate WockyXmppWriterPrivate;

-

-

-

 
 
 

 

-          Generated by GTK-Doc V1.17

+          Generated by GTK-Doc V1.18
 
 
\ No newline at end of file
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/Makefile.am telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/Makefile.am
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/Makefile.am	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/Makefile.am	2011-11-15 09:14:09.000000000 +0000
@@ -18,11 +18,11 @@
 # The top-level SGML file. You can change this if you want to.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 
-# The directory containing the source code. Relative to $(srcdir).
-# gtk-doc will search all .c & .h files beneath here for inline comments
-# documenting the functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../../wocky
+# Directories containing the source code, relative to $(srcdir).
+# gtk-doc will search all .c and .h files beneath these paths
+# for inline comments documenting functions and macros.
+# e.g. DOC_SOURCE_DIR=../../../gtk ../../../gdk
+DOC_SOURCE_DIR=$(abs_top_srcdir)/wocky $(abs_top_builddir)/wocky
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
@@ -32,7 +32,7 @@
 SCAN_OPTIONS=--rebuild-types --rebuild-sections
 
 # Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
+# e.g. MKDB_OPTIONS=--xml-mode --output-format=xml
 MKDB_OPTIONS=--sgml-mode --output-format=xml
 
 # Extra options to supply to gtkdoc-mktmpl
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/Makefile.in telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/Makefile.in
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/Makefile.in	2011-05-03 12:15:21.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/Makefile.in	2011-11-16 10:10:26.000000000 +0000
@@ -86,6 +86,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -103,8 +104,12 @@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
+GNUTLS_FOR_STREAM_CIPHERS_CFLAGS = @GNUTLS_FOR_STREAM_CIPHERS_CFLAGS@
+GNUTLS_FOR_STREAM_CIPHERS_LIBS = @GNUTLS_FOR_STREAM_CIPHERS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HEADER_DIR = @HEADER_DIR@
@@ -130,6 +135,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
 NM = @NM@
@@ -164,6 +170,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -230,11 +237,11 @@
 # The top-level SGML file. You can change this if you want to.
 DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
 
-# The directory containing the source code. Relative to $(srcdir).
-# gtk-doc will search all .c & .h files beneath here for inline comments
-# documenting the functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR = ../../wocky
+# Directories containing the source code, relative to $(srcdir).
+# gtk-doc will search all .c and .h files beneath these paths
+# for inline comments documenting functions and macros.
+# e.g. DOC_SOURCE_DIR=../../../gtk ../../../gdk
+DOC_SOURCE_DIR = $(abs_top_srcdir)/wocky $(abs_top_builddir)/wocky
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS = 
@@ -252,7 +259,7 @@
 	--source-dir=$(abs_top_builddir)/wocky
 
 # Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
+# e.g. MKDB_OPTIONS=--xml-mode --output-format=xml
 MKDB_OPTIONS = --sgml-mode --output-format=xml \
 	--source-dir=$(abs_top_builddir)/wocky
 
@@ -297,10 +304,10 @@
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS = -I$(top_srcdir) -I$(top_builddir) @GLIB_CFLAGS@ @SQLITE_CFLAGS@
 GTKDOC_LIBS = @GLIB_LIBS@ @SQLITE_LIBS@ $(top_builddir)/wocky/libwocky.la
-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = 
 @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_RUN = $(LIBTOOL) --mode=execute
 
@@ -311,17 +318,21 @@
 #
 GPATH = $(srcdir)
 TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+SETUP_FILES = \
+	$(content_files)		\
+	$(DOC_MAIN_SGML_FILE)		\
+	$(DOC_MODULE)-sections.txt	\
+	$(DOC_MODULE)-overrides.txt
+
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \
-	$(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	pdf-build.stamp \
-	$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
-	$(srcdir)/pdf.stamp
+EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES)
+DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
+	html-build.stamp pdf-build.stamp \
+	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = \
 	$(DOC_MODULE).args 	 \
@@ -547,22 +558,44 @@
 
 $(REPORT_FILES): sgml-build.stamp
 
+#### setup ####
+
+setup-build.stamp:
+	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	    echo '  DOC   Preparing build'; \
+	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	    if test "x$$files" != "x" ; then \
+	        for file in $$files ; do \
+	            test -f $(abs_srcdir)/$$file && \
+	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+	        done; \
+	    fi; \
+	fi
+	@touch setup-build.stamp
+
 #### scan ####
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo 'gtk-doc: Scanning header files'
-	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+	@echo '  DOC   Scanning header files'
+	@_source_dir='' ; \
+	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
-	  done ; \
-	  cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	@if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	done ; \
+	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
+	    echo "  DOC   Introspecting gobjects"; \
+	    scanobj_options=""; \
+	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	    if test "$(?)" = "0"; then \
+	        if test "x$(V)" = "x1"; then \
+	            scanobj_options="--verbose"; \
+	        fi; \
+	    fi; \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+	    gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
 	else \
-	    cd $(srcdir) ; \
 	    for i in $(SCANOBJ_FILES) ; do \
-               test -f $$i || touch $$i ; \
+	        test -f $$i || touch $$i ; \
 	    done \
 	fi
 	@touch scan-build.stamp
@@ -570,30 +603,15 @@
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-#### templates ####
-
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo 'gtk-doc: Rebuilding template files'
-	@-chmod -R u+w $(srcdir)
-	@cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	@touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-$(srcdir)/tmpl/*.sgml:
-	@true
-
 #### xml ####
 
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	@echo 'gtk-doc: Building XML'
-	@-chmod -R u+w $(srcdir)
-	@_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+	@echo '  DOC   Building XML'
+	@_source_dir='' ; \
+	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
-	  done ; \
-	  cd $(srcdir) && \
-	  gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+	done ; \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
 	@touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
@@ -602,58 +620,78 @@
 #### html ####
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building HTML'
-	@-chmod -R u+w $(srcdir)
-	@rm -rf $(srcdir)/html
-	@mkdir $(srcdir)/html
+	@echo '  DOC   Building HTML'
+	@rm -rf html
+	@mkdir html
 	@mkhtml_options=""; \
+	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	if test "$(?)" = "0"; then \
+	  if test "x$(V)" = "x1"; then \
+	    mkhtml_options="$$mkhtml_options --verbose"; \
+	  fi; \
+	fi; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
 	if test "$(?)" = "0"; then \
-	  mkhtml_options=--path="$(srcdir)"; \
+	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
 	fi; \
-	cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-	@echo 'gtk-doc: Fixing cross-references'
-	@cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	-@test "x$(HTML_IMAGES)" = "x" || \
+	for file in $(HTML_IMAGES) ; do \
+	  if test -f $(abs_srcdir)/$$file ; then \
+	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
+	  fi; \
+	  if test -f $(abs_builddir)/$$file ; then \
+	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+	  fi; \
+	done;
+	@echo '  DOC   Fixing cross-references'
+	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	@touch html-build.stamp
 
 #### pdf ####
 
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building PDF'
-	@-chmod -R u+w $(srcdir)
-	@rm -rf $(srcdir)/$(DOC_MODULE).pdf
-	@mkpdf_imgdirs=""; \
+	@echo '  DOC   Building PDF'
+	@rm -f $(DOC_MODULE).pdf
+	@mkpdf_options=""; \
+	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	if test "$(?)" = "0"; then \
+	  if test "x$(V)" = "x1"; then \
+	    mkpdf_options="$$mkpdf_options --verbose"; \
+	  fi; \
+	fi; \
 	if test "x$(HTML_IMAGES)" != "x"; then \
 	  for img in $(HTML_IMAGES); do \
 	    part=`dirname $$img`; \
-	    echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+	    echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \
 	    if test $$? != 0; then \
-	      mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+	      mkpdf_options="$$mkpdf_options --imgdir=$$part"; \
 	    fi; \
 	  done; \
 	fi; \
-	cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
 	@touch pdf-build.stamp
 
 ##############
 
 clean-local:
-	rm -f *~ *.bak
-	rm -rf .libs
+	@rm -f *~ *.bak
+	@rm -rf .libs
 
 distclean-local:
-	cd $(srcdir) && \
-	  rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
-	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
+	fi
 
 maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html
+	@rm -rf xml html
 
 install-data-local:
-	@installfiles=`echo $(srcdir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
+	@installfiles=`echo $(builddir)/html/*`; \
+	if test "$$installfiles" = '$(builddir)/html/*'; \
+	then echo 1>&2 'Nothing to install' ; \
 	else \
 	  if test -n "$(DOC_MODULE_VERSION)"; then \
 	    installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
@@ -662,14 +700,12 @@
 	  fi; \
 	  $(mkinstalldirs) $${installdir} ; \
 	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
+	    echo ' $(INSTALL_DATA) '$$i ; \
 	    $(INSTALL_DATA) $$i $${installdir}; \
 	  done; \
 	  if test -n "$(DOC_MODULE_VERSION)"; then \
 	    mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
-	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
-	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
 	  fi; \
 	  $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
 	fi
@@ -691,15 +727,13 @@
 @ENABLE_GTK_DOC_FALSE@	@false
 
 dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	cp $(srcdir)/html/* $(distdir)/html
-	-cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
-	cd $(distdir) && rm -f $(DISTCLEANFILES)
-	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+	@mkdir $(distdir)/html
+	@cp ./html/* $(distdir)/html
+	@-cp ./$(DOC_MODULE).pdf $(distdir)/
+	@-cp ./$(DOC_MODULE).types $(distdir)/
+	@-cp ./$(DOC_MODULE)-sections.txt $(distdir)/
+	@cd $(distdir) && rm -f $(DISTCLEANFILES)
+	@$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
 
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-auth-handler.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-auth-handler.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-auth-handler.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-auth-handler.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,126 +0,0 @@
-
-WockyAuthHandler
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@handler: 
-@initial_data: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@handler: 
-@data: 
-@response: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@handler: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@handler: 
-
-
-
-
-
-
-
-@handler: 
-@Returns: 
-
-
-
-
-
-
-
-@handler: 
-@Returns: 
-
-
-
-
-
-
-
-@handler: 
-@initial_data: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@handler: 
-@data: 
-@response: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@handler: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@parent: 
-@mechanism: 
-@plain: 
-@initial_response_func: 
-@auth_data_func: 
-@success_func: 
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-auth-registry-enumtypes.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-auth-registry-enumtypes.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-auth-registry-enumtypes.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-auth-registry-enumtypes.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-
-wocky-auth-registry-enumtypes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-auth-registry.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-auth-registry.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-auth-registry.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-auth-registry.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,325 +0,0 @@
-
-WockyAuthRegistry
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@WOCKY_AUTH_ERROR_INIT_FAILED: 
-@WOCKY_AUTH_ERROR_NOT_SUPPORTED: 
-@WOCKY_AUTH_ERROR_NO_SUPPORTED_MECHANISMS: 
-@WOCKY_AUTH_ERROR_NETWORK: 
-@WOCKY_AUTH_ERROR_INVALID_REPLY: 
-@WOCKY_AUTH_ERROR_NO_CREDENTIALS: 
-@WOCKY_AUTH_ERROR_FAILURE: 
-@WOCKY_AUTH_ERROR_CONNRESET: 
-@WOCKY_AUTH_ERROR_STREAM: 
-@WOCKY_AUTH_ERROR_RESOURCE_CONFLICT: 
-@WOCKY_AUTH_ERROR_NOT_AUTHORIZED: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@mechanism: 
-@initial_response: 
-
-
-
-
-
-
-@self: 
-@mechanisms: 
-@allow_plain: 
-@is_secure_channel: 
-@username: 
-@password: 
-@server: 
-@session_id: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@start_data: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@challenge_data: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@response: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@error: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@start_auth_async_func: 
-@start_auth_finish_func: 
-@challenge_async_func: 
-@challenge_finish_func: 
-@success_async_func: 
-@success_finish_func: 
-@failure_func: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@mechanisms: 
-@allow_plain: 
-@is_secure_channel: 
-@username: 
-@password: 
-@server: 
-@session_id: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@start_data: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@challenge_data: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@res: 
-@response: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@res: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@handler: 
-
-
-
-
-
-
-
-@start_data: 
-
-
-
-
-
-
-
-@mechanism: 
-@initial_response: 
-@Returns: 
-
-
-
-
-
-
-
-@start_data: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@error: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-bare-contact.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-bare-contact.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-bare-contact.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-bare-contact.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,179 +0,0 @@
-
-WockyBareContact
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@jid: 
-@Returns: 
-
-
-
-
-
-
-
-@contact: 
-@Returns: 
-
-
-
-
-
-
-
-@contact: 
-@Returns: 
-
-
-
-
-
-
-
-@contact: 
-@name: 
-
-
-
-
-
-
-
-@contact: 
-@Returns: 
-
-
-
-
-
-
-
-@contact: 
-@subscription: 
-
-
-
-
-
-
-
-@contact: 
-@Returns: 
-
-
-
-
-
-
-
-@contact: 
-@groups: 
-
-
-
-
-
-
-
-@a: 
-@b: 
-@Returns: 
-
-
-
-
-
-
-
-@contact: 
-@group: 
-
-
-
-
-
-
-
-@contact: 
-@group: 
-@Returns: 
-
-
-
-
-
-
-
-@contact: 
-@group: 
-
-
-
-
-
-
-
-@contact: 
-@Returns: 
-
-
-
-
-
-
-
-@contact: 
-
-
-
-
-
-
-
-@contact: 
-@resource: 
-
-
-
-
-
-
-
-@contact: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-c2s-porter.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-c2s-porter.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-c2s-porter.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-c2s-porter.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-
-WockyC2SPorter
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@full_jid: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@type: 
-@sub_type: 
-@priority: 
-@callback: 
-@user_data: 
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@type: 
-@sub_type: 
-@priority: 
-@callback: 
-@user_data: 
-@stanza: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@type: 
-@sub_type: 
-@priority: 
-@callback: 
-@user_data: 
-@Varargs: 
-@Returns: 
-
-
-
-
-
-
-
-@porter: 
-@enable: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-caps-cache.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-caps-cache.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-caps-cache.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-caps-cache.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-
-WockyCapsCache
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@self: 
-@node: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@node: 
-@query_node: 
-
-
-
-
-
-
-
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-caps-hash.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-caps-hash.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-caps-hash.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-caps-hash.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-
-wocky-caps-hash
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@node: 
-@Returns: 
-
-
-
-
-
-
-
-@features: 
-@identities: 
-@dataforms: 
-@Returns: 
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-connector-enumtypes.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-connector-enumtypes.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-connector-enumtypes.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-connector-enumtypes.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-
-wocky-connector-enumtypes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-connector.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-connector.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-connector.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-connector.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,175 +0,0 @@
-
-WockyConnector
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@WOCKY_CONNECTOR_ERROR_UNKNOWN: 
-@WOCKY_CONNECTOR_ERROR_IN_PROGRESS: 
-@WOCKY_CONNECTOR_ERROR_BAD_JID: 
-@WOCKY_CONNECTOR_ERROR_NON_XMPP_V1_SERVER: 
-@WOCKY_CONNECTOR_ERROR_BAD_FEATURES: 
-@WOCKY_CONNECTOR_ERROR_TLS_UNAVAILABLE: 
-@WOCKY_CONNECTOR_ERROR_TLS_REFUSED: 
-@WOCKY_CONNECTOR_ERROR_TLS_SESSION_FAILED: 
-@WOCKY_CONNECTOR_ERROR_BIND_UNAVAILABLE: 
-@WOCKY_CONNECTOR_ERROR_BIND_FAILED: 
-@WOCKY_CONNECTOR_ERROR_BIND_INVALID: 
-@WOCKY_CONNECTOR_ERROR_BIND_DENIED: 
-@WOCKY_CONNECTOR_ERROR_BIND_CONFLICT: 
-@WOCKY_CONNECTOR_ERROR_BIND_REJECTED: 
-@WOCKY_CONNECTOR_ERROR_SESSION_FAILED: 
-@WOCKY_CONNECTOR_ERROR_SESSION_DENIED: 
-@WOCKY_CONNECTOR_ERROR_SESSION_CONFLICT: 
-@WOCKY_CONNECTOR_ERROR_SESSION_REJECTED: 
-@WOCKY_CONNECTOR_ERROR_INSECURE: 
-@WOCKY_CONNECTOR_ERROR_REGISTRATION_FAILED: 
-@WOCKY_CONNECTOR_ERROR_REGISTRATION_UNAVAILABLE: 
-@WOCKY_CONNECTOR_ERROR_REGISTRATION_UNSUPPORTED: 
-@WOCKY_CONNECTOR_ERROR_REGISTRATION_EMPTY: 
-@WOCKY_CONNECTOR_ERROR_REGISTRATION_CONFLICT: 
-@WOCKY_CONNECTOR_ERROR_REGISTRATION_REJECTED: 
-@WOCKY_CONNECTOR_ERROR_UNREGISTER_FAILED: 
-@WOCKY_CONNECTOR_ERROR_UNREGISTER_DENIED: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@self: 
-@res: 
-@jid: 
-@sid: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@res: 
-@jid: 
-@sid: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@cancellable: 
-@cb: 
-@user_data: 
-
-
-
-
-
-
-
-@jid: 
-@pass: 
-@resource: 
-@auth_registry: 
-@tls_handler: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@cancellable: 
-@cb: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@cancellable: 
-@cb: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@res: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@registry: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-contact-factory.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-contact-factory.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-contact-factory.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-contact-factory.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,121 +0,0 @@
-
-WockyContactFactory
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@factory: 
-@bare_jid: 
-@Returns: 
-
-
-
-
-
-
-
-@factory: 
-@bare_jid: 
-@Returns: 
-
-
-
-
-
-
-
-@factory: 
-@full_jid: 
-@Returns: 
-
-
-
-
-
-
-
-@factory: 
-@full_jid: 
-@Returns: 
-
-
-
-
-
-
-
-@factory: 
-@jid: 
-@Returns: 
-
-
-
-
-
-
-
-@factory: 
-@jid: 
-@Returns: 
-
-
-
-
-
-
-
-@factory: 
-@contact: 
-
-
-
-
-
-
-
-@factory: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-contact.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-contact.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-contact.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-contact.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-
-WockyContact
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-data-form-enumtypes.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-data-form-enumtypes.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-data-form-enumtypes.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-data-form-enumtypes.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-
-wocky-data-form-enumtypes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-data-form.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-data-form.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-data-form.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-data-form.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,221 +0,0 @@
-
-WockyDataForm
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@WOCKY_DATA_FORM_FIELD_TYPE_UNSPECIFIED: 
-@WOCKY_DATA_FORM_FIELD_TYPE_BOOLEAN: 
-@WOCKY_DATA_FORM_FIELD_TYPE_FIXED: 
-@WOCKY_DATA_FORM_FIELD_TYPE_HIDDEN: 
-@WOCKY_DATA_FORM_FIELD_TYPE_JID_MULTI: 
-@WOCKY_DATA_FORM_FIELD_TYPE_JID_SINGLE: 
-@WOCKY_DATA_FORM_FIELD_TYPE_LIST_MULTI: 
-@WOCKY_DATA_FORM_FIELD_TYPE_LIST_SINGLE: 
-@WOCKY_DATA_FORM_FIELD_TYPE_TEXT_MULTI: 
-@WOCKY_DATA_FORM_FIELD_TYPE_TEXT_PRIVATE: 
-@WOCKY_DATA_FORM_FIELD_TYPE_TEXT_SINGLE: 
-
-
-
-
-
-
-@label: 
-@value: 
-
-
-
-
-
-
-@type: 
-@var: 
-@label: 
-@desc: 
-@required: 
-@default_value: 
-@raw_value_contents: 
-@value: 
-@options: 
-
-
-
-
-
-
-@WOCKY_DATA_FORM_ERROR_NOT_FORM: 
-@WOCKY_DATA_FORM_ERROR_WRONG_TYPE: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@node: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@x: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@form_type: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@field_name: 
-@field_value: 
-@create_if_missing: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@field_name: 
-@field_value: 
-@create_if_missing: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@field_name: 
-@field_values: 
-@create_if_missing: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@node: 
-
-
-
-
-
-
-
-@self: 
-@node: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@left: 
-@right: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@node: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-debug.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-debug.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-debug.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-debug.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,147 +0,0 @@
-
-wocky-debug
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-
-
-
-
-
-
-
-@flags: 
-
-
-
-
-
-
-
-@flag: 
-@Returns: 
-
-
-
-
-
-
-
-@flag: 
-@format: 
-@args: 
-
-
-
-
-
-
-
-@flag: 
-@format: 
-@Varargs: 
-
-
-
-
-
-
-
-@flag: 
-@stanza: 
-@format: 
-@Varargs: 
-
-
-
-
-
-
-
-@flag: 
-@tree: 
-@format: 
-@Varargs: 
-
-
-
-
-
-
-
-@format: 
-@...: 
-
-
-
-
-
-
-
-@stanza: 
-@format: 
-@...: 
-
-
-
-
-
-
-
-@tree: 
-@format: 
-@...: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@n: 
-@s: 
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-disco-identity.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-disco-identity.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-disco-identity.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-disco-identity.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-
-wocky-disco-identity
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@category: 
-@type: 
-@lang: 
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@source: 
-@Returns: 
-
-
-
-
-
-
-
-@identity: 
-
-
-
-
-
-
-
-@left: 
-@right: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@source: 
-@Returns: 
-
-
-
-
-
-
-
-@arr: 
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-heartbeat-source.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-heartbeat-source.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-heartbeat-source.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-heartbeat-source.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-
-wocky-heartbeat-source
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@user_data: 
-
-
-
-
-
-
-
-@max_interval: 
-@Returns: 
-
-
-
-
-
-
-
-@source: 
-@max_interval: 
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-http-proxy.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-http-proxy.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-http-proxy.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-http-proxy.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-
-wocky-http-proxy
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-jabber-auth-digest.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-jabber-auth-digest.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-jabber-auth-digest.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-jabber-auth-digest.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-
-wocky-jabber-auth-digest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@server: 
-@password: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-jabber-auth-password.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-jabber-auth-password.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-jabber-auth-password.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-jabber-auth-password.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-
-wocky-jabber-auth-password
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@password: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-jabber-auth.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-jabber-auth.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-jabber-auth.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-jabber-auth.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-
-WockyJabberAuth
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@server: 
-@username: 
-@resource: 
-@password: 
-@connection: 
-@auth_registry: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@handler: 
-
-
-
-
-
-
-
-@self: 
-@allow_plain: 
-@is_secure: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-ll-connection-factory.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-ll-connection-factory.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-ll-connection-factory.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-ll-connection-factory.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-
-WockyLLConnectionFactory
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@WOCKY_LL_CONNECTION_FACTORY_ERROR_NO_CONTACT_ADDRESSES: 
-@WOCKY_LL_CONNECTION_FACTORY_ERROR_NO_CONTACT_ADDRESS_CAN_BE_CONNECTED_TO: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent_class: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@factory: 
-@contact: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@factory: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-ll-connector.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-ll-connector.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-ll-connector.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-ll-connector.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-
-WockyLLConnector
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@WOCKY_LL_CONNECTOR_ERROR_FAILED_TO_SEND_STANZA: 
-@WOCKY_LL_CONNECTOR_ERROR_FAILED_TO_RECEIVE_STANZA: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent_class: 
-
-
-
-
-
-
-@stream: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@local_jid: 
-@remote_jid: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@connector: 
-@result: 
-@from: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-ll-contact.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-ll-contact.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-ll-contact.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-ll-contact.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-
-WockyLLContact
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@Param1: 
-@Returns: 
-
-
-
-
-
-
-
-@parent_class: 
-@get_addresses: 
-
-
-
-
-
-
-@jid: 
-@Returns: 
-
-
-
-
-
-
-
-@contact: 
-@Returns: 
-
-
-
-
-
-
-
-@a: 
-@b: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-loopback-stream.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-loopback-stream.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-loopback-stream.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-loopback-stream.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-
-WockyLoopbackStream
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent_class: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-meta-porter.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-meta-porter.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-meta-porter.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-meta-porter.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,138 +0,0 @@
-
-WockyMetaPorter
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@WOCKY_META_PORTER_ERROR_NO_CONTACT_ADDRESS: 
-@WOCKY_META_PORTER_ERROR_FAILED_TO_CLOSE: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent_class: 
-
-
-
-
-
-
-@jid: 
-@contact_factory: 
-@Returns: 
-
-
-
-
-
-
-
-@porter: 
-@Returns: 
-
-
-
-
-
-
-
-@porter: 
-@contact: 
-
-
-
-
-
-
-
-@porter: 
-@contact: 
-
-
-
-
-
-
-
-@porter: 
-@jid: 
-
-
-
-
-
-
-
-@porter: 
-@contact: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@porter: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@porter: 
-@contact: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-muc-enumtypes.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-muc-enumtypes.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-muc-enumtypes.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-muc-enumtypes.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,134 +0,0 @@
-
-wocky-muc-enumtypes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-muc.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-muc.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-muc.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-muc.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,268 +0,0 @@
-
-WockyMuc
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@WOCKY_MUC_CODE_UNKNOWN: 
-@WOCKY_MUC_CODE_ONYMOUS: 
-@WOCKY_MUC_CODE_AF_CHANGE_OOB: 
-@WOCKY_MUC_CODE_CFG_SHOW_UNAVAILABLE: 
-@WOCKY_MUC_CODE_CFG_HIDE_UNAVAILABLE: 
-@WOCKY_MUC_CODE_CFG_NONPRIVACY: 
-@WOCKY_MUC_CODE_OWN_PRESENCE: 
-@WOCKY_MUC_CODE_CFG_LOGGING_ENABLED: 
-@WOCKY_MUC_CODE_CFG_LOGGING_DISABLED: 
-@WOCKY_MUC_CODE_CFG_ONYMOUS: 
-@WOCKY_MUC_CODE_CFG_SEMIONYMOUS: 
-@WOCKY_MUC_CODE_CFG_ANONYMOUS: 
-@WOCKY_MUC_CODE_NEW_ROOM: 
-@WOCKY_MUC_CODE_NICK_CHANGE_FORCED: 
-@WOCKY_MUC_CODE_BANNED: 
-@WOCKY_MUC_CODE_NICK_CHANGE_USER: 
-@WOCKY_MUC_CODE_KICKED: 
-@WOCKY_MUC_CODE_KICKED_AFFILIATION: 
-@WOCKY_MUC_CODE_KICKED_ROOM_PRIVATISED: 
-@WOCKY_MUC_CODE_KICKED_SHUTDOWN: 
-
-
-
-
-
-
-@WOCKY_MUC_ROLE_NONE: 
-@WOCKY_MUC_ROLE_VISITOR: 
-@WOCKY_MUC_ROLE_PARTICIPANT: 
-@WOCKY_MUC_ROLE_MODERATOR: 
-
-
-
-
-
-
-@WOCKY_MUC_AFFILIATION_OUTCAST: 
-@WOCKY_MUC_AFFILIATION_NONE: 
-@WOCKY_MUC_AFFILIATION_MEMBER: 
-@WOCKY_MUC_AFFILIATION_ADMIN: 
-@WOCKY_MUC_AFFILIATION_OWNER: 
-
-
-
-
-
-
-@WOCKY_MUC_MODERN: 
-@WOCKY_MUC_FORM_REGISTER: 
-@WOCKY_MUC_FORM_ROOMCONFIG: 
-@WOCKY_MUC_FORM_ROOMINFO: 
-@WOCKY_MUC_HIDDEN: 
-@WOCKY_MUC_MEMBERSONLY: 
-@WOCKY_MUC_MODERATED: 
-@WOCKY_MUC_NONANONYMOUS: 
-@WOCKY_MUC_OPEN: 
-@WOCKY_MUC_PASSWORDPROTECTED: 
-@WOCKY_MUC_PERSISTENT: 
-@WOCKY_MUC_PUBLIC: 
-@WOCKY_MUC_ROOMS: 
-@WOCKY_MUC_SEMIANONYMOUS: 
-@WOCKY_MUC_TEMPORARY: 
-@WOCKY_MUC_UNMODERATED: 
-@WOCKY_MUC_UNSECURED: 
-@WOCKY_MUC_OBSOLETE: 
-
-
-
-
-
-
-@WOCKY_MUC_MSG_NONE: 
-@WOCKY_MUC_MSG_NORMAL: 
-@WOCKY_MUC_MSG_ACTION: 
-@WOCKY_MUC_MSG_NOTICE: 
-
-
-
-
-
-
-@WOCKY_MUC_MSG_STATE_NONE: 
-@WOCKY_MUC_MSG_STATE_ACTIVE: 
-@WOCKY_MUC_MSG_STATE_COMPOSING: 
-@WOCKY_MUC_MSG_STATE_INACTIVE: 
-@WOCKY_MUC_MSG_STATE_PAUSED: 
-
-
-
-
-
-
-@WOCKY_MUC_CREATED: 
-@WOCKY_MUC_INITIATED: 
-@WOCKY_MUC_AUTH: 
-@WOCKY_MUC_JOINED: 
-@WOCKY_MUC_ENDED: 
-
-
-
-
-
-
-@from: 
-@jid: 
-@nick: 
-@role: 
-@affiliation: 
-@status: 
-@presence_stanza: 
-
-
-
-
-
-
-
-
-
-
-
-
-@muc: 
-@callback: 
-@cancel: 
-@data: 
-
-
-
-
-
-
-
-@muc: 
-@res: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@muc: 
-@type: 
-@status: 
-@Returns: 
-
-
-
-
-
-
-
-@muc: 
-@callback: 
-@cancel: 
-@data: 
-
-
-
-
-
-
-
-@source: 
-@res: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@muc: 
-@cancel: 
-
-
-
-
-
-
-
-@muc: 
-@Returns: 
-
-
-
-
-
-
-
-@muc: 
-@Returns: 
-
-
-
-
-
-
-
-@muc: 
-@Returns: 
-
-
-
-
-
-
-
-@muc: 
-@Returns: 
-
-
-
-
-
-
-
-@muc: 
-@Returns: 
-
-
-
-
-
-
-
-@muc: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-namespaces.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-namespaces.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-namespaces.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-namespaces.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,372 +0,0 @@
-
-wocky-namespaces
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-node.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-node.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-node.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-node.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,527 +0,0 @@
-
-wocky-node
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@WOCKY_NODE_START: 
-@WOCKY_NODE_TEXT: 
-@WOCKY_NODE_END: 
-@WOCKY_NODE_ATTRIBUTE: 
-@WOCKY_NODE_XMLNS: 
-@WOCKY_NODE_ASSIGN_TO: 
-@WOCKY_NODE_LANGUAGE: 
-
-
-
-
-
-
-@name: 
-@content: 
-
-
-
-
-
-
-@key: 
-@value: 
-@pref: 
-@ns: 
-@user_data: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@user_data: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@func: 
-@user_data: 
-
-
-
-
-
-
-
-@node: 
-@func: 
-@user_data: 
-
-
-
-
-
-
-
-@node: 
-@key: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@key: 
-@ns: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@key: 
-@value: 
-
-
-
-
-
-
-
-@node: 
-@key: 
-@Varargs: 
-
-
-
-
-
-
-
-@node: 
-@key: 
-@value: 
-@ns: 
-
-
-
-
-
-
-
-@node: 
-@key: 
-@value: 
-@value_size: 
-
-
-
-
-
-
-
-@node: 
-@key: 
-@value: 
-@value_size: 
-@ns: 
-
-
-
-
-
-
-
-@urn: 
-@Returns: 
-
-
-
-
-
-
-
-@ns: 
-@Returns: 
-
-
-
-
-
-
-
-@ns: 
-@prefix: 
-
-
-
-
-
-
-
-@node: 
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@name: 
-@ns: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@ns: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@name: 
-@ns: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@name: 
-@ns: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@name: 
-@ns: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@name: 
-@content: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@name: 
-@content: 
-@ns: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@name: 
-@content: 
-@ns: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@ns: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@ns: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@lang: 
-
-
-
-
-
-
-
-@node: 
-@lang: 
-@lang_size: 
-
-
-
-
-
-
-
-@node: 
-@content: 
-
-
-
-
-
-
-
-@node: 
-@content: 
-
-
-
-
-
-
-
-@node: 
-@content: 
-@size: 
-
-
-
-
-
-
-
-@node: 
-@Returns: 
-
-
-
-
-
-
-
-@name: 
-@ns: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-
-
-
-
-
-
-
-@node0: 
-@node1: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@subset: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@iter: 
-@node: 
-@name: 
-@ns: 
-
-
-
-
-
-
-
-@iter: 
-@next: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@Varargs: 
-
-
-
-
-
-
-
-@node: 
-@va: 
-
-
-
-
-
-
-
-@node: 
-@tree: 
-
-
-
-
-
-
-
-@node: 
-@tree: 
-
-
-
-
-
-
-
-@void: 
-
-
-
-
-
-
-
-@void: 
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-node-tree.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-node-tree.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-node-tree.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-node-tree.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-
-WockyNodeTree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@name: 
-@ns: 
-@Varargs: 
-@Returns: 
-
-
-
-
-
-
-
-@name: 
-@ns: 
-@va: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-pep-service.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-pep-service.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-pep-service.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-pep-service.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-
-WockyPepService
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@node: 
-@subscribe: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@session: 
-
-
-
-
-
-
-
-@self: 
-@contact: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@item: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-ping.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-ping.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-ping.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-ping.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-
-WockyPing
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@porter: 
-@interval: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-porter.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-porter.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-porter.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-porter.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,370 +0,0 @@
-
-WockyPorter
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@WOCKY_PORTER_ERROR_NOT_STARTED: 
-@WOCKY_PORTER_ERROR_CLOSING: 
-@WOCKY_PORTER_ERROR_CLOSED: 
-@WOCKY_PORTER_ERROR_NOT_IQ: 
-@WOCKY_PORTER_ERROR_FORCIBLY_CLOSED: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@porter: 
-@stanza: 
-@user_data: 
-@Returns: 
-
-
-
-
-
-
-
-@parent_iface: 
-@get_full_jid: 
-@get_bare_jid: 
-@get_resource: 
-@start: 
-@send_async: 
-@send_finish: 
-@register_handler_from_by_stanza: 
-@register_handler_from_anyone_by_stanza: 
-@unregister_handler: 
-@close_async: 
-@close_finish: 
-@send_iq_async: 
-@send_iq_finish: 
-@force_close_async: 
-@force_close_finish: 
-
-
-
-
-
-
-@porter: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@porter: 
-@stanza: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@porter: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@porter: 
-@stanza: 
-
-
-
-
-
-
-
-@self: 
-@type: 
-@sub_type: 
-@from: 
-@priority: 
-@callback: 
-@user_data: 
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@type: 
-@sub_type: 
-@from: 
-@priority: 
-@callback: 
-@user_data: 
-@stanza: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@type: 
-@sub_type: 
-@from: 
-@priority: 
-@callback: 
-@user_data: 
-@Varargs: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@type: 
-@sub_type: 
-@priority: 
-@callback: 
-@user_data: 
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@type: 
-@sub_type: 
-@priority: 
-@callback: 
-@user_data: 
-@stanza: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@type: 
-@sub_type: 
-@priority: 
-@callback: 
-@user_data: 
-@Varargs: 
-@Returns: 
-
-
-
-
-
-
-
-@porter: 
-@id: 
-
-
-
-
-
-
-
-@porter: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@porter: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@porter: 
-@stanza: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@porter: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@porter: 
-@stanza: 
-@Varargs: 
-
-
-
-
-
-
-
-@porter: 
-@stanza: 
-@error_code: 
-@message: 
-
-
-
-
-
-
-
-@porter: 
-@stanza: 
-@error: 
-
-
-
-
-
-
-
-@porter: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@porter: 
-@result: 
-@error: 
-@Returns: 
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-helpers.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-helpers.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-helpers.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-helpers.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,113 +0,0 @@
-
-wocky-pubsub-helpers
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@node: 
-@from: 
-@item_out: 
-@Returns: 
-
-
-
-
-
-
-
-@service: 
-@sub_type: 
-@pubsub_ns: 
-@action_name: 
-@pubsub_node: 
-@action_node: 
-@Returns: 
-
-
-
-
-
-
-
-@service: 
-@node: 
-@pubsub_out: 
-@publish_out: 
-@item_out: 
-@Returns: 
-
-
-
-
-
-
-
-@source: 
-@res: 
-@pubsub_ns: 
-@child_name: 
-@child_out: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@source: 
-@res: 
-@pubsub_ns: 
-@child_name: 
-@child_out: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@source: 
-@res: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@result: 
-@pubsub_ns: 
-@child_name: 
-@body_optional: 
-@child_out: 
-@error: 
-@Returns: 
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-node-enumtypes.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-node-enumtypes.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-node-enumtypes.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-node-enumtypes.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-
-wocky-pubsub-node-enumtypes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-node-protected.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-node-protected.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-node-protected.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-node-protected.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,141 +0,0 @@
-
-wocky-pubsub-node-protected
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@self: 
-@event_stanza: 
-@event_node: 
-@action_node: 
-
-
-
-
-
-
-
-@action: 
-@method: 
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@jid: 
-@pubsub_node: 
-@subscribe_node: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@jid: 
-@subid: 
-@pubsub_node: 
-@unsubscribe_node: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@pubsub_node: 
-@delete_node: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@pubsub_node: 
-@subscriptions_node: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@pubsub_node: 
-@affiliations_node: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@affiliations_node: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@affiliates: 
-@pubsub_node: 
-@affiliations_node: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@pubsub_node: 
-@configure_node: 
-@Returns: 
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-node.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-node.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-node.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-node.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,297 +0,0 @@
-
-WockyPubsubNode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@pubsub_out: 
-@publish_out: 
-@item_out: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@jid: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@jid: 
-@subid: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@subscribers: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@WOCKY_PUBSUB_AFFILIATION_OWNER: 
-@WOCKY_PUBSUB_AFFILIATION_PUBLISHER: 
-@WOCKY_PUBSUB_AFFILIATION_PUBLISH_ONLY: 
-@WOCKY_PUBSUB_AFFILIATION_MEMBER: 
-@WOCKY_PUBSUB_AFFILIATION_NONE: 
-@WOCKY_PUBSUB_AFFILIATION_OUTCAST: 
-
-
-
-
-
-
-@node: 
-@jid: 
-@state: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@jid: 
-@state: 
-@Returns: 
-
-
-
-
-
-
-
-@aff: 
-@Returns: 
-
-
-
-
-
-
-
-@aff: 
-
-
-
-
-
-
-
-@affs: 
-@Returns: 
-
-
-
-
-
-
-
-@affs: 
-
-
-
-
-
-
-
-@self: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@affiliates: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@affiliates: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-service-enumtypes.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-service-enumtypes.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-service-enumtypes.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-service-enumtypes.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-
-wocky-pubsub-service-enumtypes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-service-protected.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-service-protected.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-service-protected.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-service-protected.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-
-wocky-pubsub-service-protected
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@self: 
-@node: 
-@pubsub_node: 
-@subscriptions_node: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@subscription_node: 
-@parent_node_attr: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@subscriptions_node: 
-@subscription_nodes: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@name: 
-@config: 
-@pubsub_node: 
-@create_node: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@create_tree: 
-@requested_name: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-service.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-service.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-service.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-pubsub-service.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,241 +0,0 @@
-
-WockyPubsubService
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@WOCKY_PUBSUB_SERVICE_ERROR_WRONG_REPLY: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent_class: 
-@node_object_type: 
-
-
-
-
-
-
-@session: 
-@jid: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@node: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@subscriptions: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@name: 
-@config: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@WOCKY_PUBSUB_SUBSCRIPTION_NONE: 
-@WOCKY_PUBSUB_SUBSCRIPTION_PENDING: 
-@WOCKY_PUBSUB_SUBSCRIPTION_SUBSCRIBED: 
-@WOCKY_PUBSUB_SUBSCRIPTION_UNCONFIGURED: 
-
-
-
-
-
-
-@node: 
-@jid: 
-@state: 
-@subid: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@jid: 
-@state: 
-@subid: 
-@Returns: 
-
-
-
-
-
-
-
-@sub: 
-@Returns: 
-
-
-
-
-
-
-
-@sub: 
-
-
-
-
-
-
-
-@subs: 
-@Returns: 
-
-
-
-
-
-
-
-@subs: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-resource-contact.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-resource-contact.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-resource-contact.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-resource-contact.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-
-WockyResourceContact
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@bare: 
-@resource: 
-@Returns: 
-
-
-
-
-
-
-
-@contact: 
-@Returns: 
-
-
-
-
-
-
-
-@contact: 
-@Returns: 
-
-
-
-
-
-
-
-@a: 
-@b: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-roster.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-roster.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-roster.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-roster.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,247 +0,0 @@
-
-WockyRoster
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@WOCKY_ROSTER_SUBSCRIPTION_TYPE_NONE: 
-@WOCKY_ROSTER_SUBSCRIPTION_TYPE_TO: 
-@WOCKY_ROSTER_SUBSCRIPTION_TYPE_FROM: 
-@WOCKY_ROSTER_SUBSCRIPTION_TYPE_BOTH: 
-
-
-
-
-
-
-@WOCKY_ROSTER_ERROR_INVALID_STANZA: 
-@WOCKY_ROSTER_ERROR_NOT_IN_ROSTER: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@session: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@jid: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@jid: 
-@name: 
-@groups: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@contact: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@contact: 
-@name: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@contact: 
-@group: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@contact: 
-@group: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@subscription: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-auth.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-auth.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-auth.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-auth.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-
-WockySaslAuth
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@server: 
-@username: 
-@password: 
-@connection: 
-@auth_registry: 
-@Returns: 
-
-
-
-
-
-
-
-@sasl: 
-@handler: 
-
-
-
-
-
-
-
-@sasl: 
-@features: 
-@allow_plain: 
-@is_secure: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@sasl: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-digest-md5.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-digest-md5.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-digest-md5.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-digest-md5.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-
-wocky-sasl-digest-md5
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@server: 
-@username: 
-@password: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-plain.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-plain.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-plain.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-plain.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-
-wocky-sasl-plain
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@username: 
-@password: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-scram.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-scram.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-scram.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-scram.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-
-wocky-sasl-scram
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@server: 
-@username: 
-@password: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-utils.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-utils.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-utils.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-sasl-utils.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-
-wocky-sasl-utils
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@key: 
-@key_len: 
-@text: 
-@text_len: 
-@Returns: 
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-session.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-session.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-session.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-session.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-
-WockySession
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@full_jid: 
-@Returns: 
-
-
-
-
-
-
-
-@conn: 
-@full_jid: 
-@Returns: 
-
-
-
-
-
-
-
-@session: 
-
-
-
-
-
-
-
-@session: 
-@Returns: 
-
-
-
-
-
-
-
-@session: 
-@Returns: 
-
-
-
-
-
-
-
-@session: 
-@jid: 
-
-
-
-
-
-
-
-@session: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-
-wocky
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-
-
-
-
-
-
-
-@void: 
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-stanza.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-stanza.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-stanza.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-stanza.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,270 +0,0 @@
-
-WockyStanza
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@WOCKY_STANZA_TYPE_NONE: 
-@WOCKY_STANZA_TYPE_MESSAGE: 
-@WOCKY_STANZA_TYPE_PRESENCE: 
-@WOCKY_STANZA_TYPE_IQ: 
-@WOCKY_STANZA_TYPE_STREAM: 
-@WOCKY_STANZA_TYPE_STREAM_FEATURES: 
-@WOCKY_STANZA_TYPE_AUTH: 
-@WOCKY_STANZA_TYPE_CHALLENGE: 
-@WOCKY_STANZA_TYPE_RESPONSE: 
-@WOCKY_STANZA_TYPE_SUCCESS: 
-@WOCKY_STANZA_TYPE_FAILURE: 
-@WOCKY_STANZA_TYPE_STREAM_ERROR: 
-@WOCKY_STANZA_TYPE_UNKNOWN: 
-
-
-
-
-
-
-@WOCKY_STANZA_SUB_TYPE_NONE: 
-@WOCKY_STANZA_SUB_TYPE_AVAILABLE: 
-@WOCKY_STANZA_SUB_TYPE_NORMAL: 
-@WOCKY_STANZA_SUB_TYPE_CHAT: 
-@WOCKY_STANZA_SUB_TYPE_GROUPCHAT: 
-@WOCKY_STANZA_SUB_TYPE_HEADLINE: 
-@WOCKY_STANZA_SUB_TYPE_UNAVAILABLE: 
-@WOCKY_STANZA_SUB_TYPE_PROBE: 
-@WOCKY_STANZA_SUB_TYPE_SUBSCRIBE: 
-@WOCKY_STANZA_SUB_TYPE_UNSUBSCRIBE: 
-@WOCKY_STANZA_SUB_TYPE_SUBSCRIBED: 
-@WOCKY_STANZA_SUB_TYPE_UNSUBSCRIBED: 
-@WOCKY_STANZA_SUB_TYPE_GET: 
-@WOCKY_STANZA_SUB_TYPE_SET: 
-@WOCKY_STANZA_SUB_TYPE_RESULT: 
-@WOCKY_STANZA_SUB_TYPE_ERROR: 
-@WOCKY_STANZA_SUB_TYPE_UNKNOWN: 
-
-
-
-
-
-
-@name: 
-@ns: 
-@Returns: 
-
-
-
-
-
-
-
-@old: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@type: 
-@sub_type: 
-@from: 
-@to: 
-@Varargs: 
-@Returns: 
-
-
-
-
-
-
-
-@type: 
-@sub_type: 
-@from: 
-@to: 
-@Varargs: 
-@Returns: 
-
-
-
-
-
-
-
-@stanza: 
-@type: 
-@sub_type: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@type: 
-@sub_type: 
-@from: 
-@to: 
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@iq: 
-@Varargs: 
-@Returns: 
-
-
-
-
-
-
-
-@iq: 
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@iq: 
-@Varargs: 
-@Returns: 
-
-
-
-
-
-
-
-@iq: 
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@stanza: 
-@type: 
-@core: 
-@specialized: 
-@specialized_node: 
-@Returns: 
-
-
-
-
-
-
-
-@stanza: 
-@stream_error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@contact: 
-
-
-
-
-
-
-
-@self: 
-@contact: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-tls-connector.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-tls-connector.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-tls-connector.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-tls-connector.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-
-WockyTLSConnector
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@handler: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@connection: 
-@old_style_ssl: 
-@peername: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@res: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-tls-enumtypes.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-tls-enumtypes.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-tls-enumtypes.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-tls-enumtypes.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-
-wocky-tls-enumtypes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-tls-handler.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-tls-handler.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-tls-handler.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-tls-handler.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,129 +0,0 @@
-
-WockyTLSHandler
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@self: 
-@tls_session: 
-@peername: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@res: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@verify_async_func: 
-@verify_finish_func: 
-
-
-
-
-
-
-@ignore_ssl_errors: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@tls_session: 
-@peername: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-tls.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-tls.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-tls.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-tls.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,276 +0,0 @@
-
-wocky-tls
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@inst: 
-
-
-
-
-
-
-
-@inst: 
-
-
-
-
-
-
-
-@WOCKY_TLS_VERIFY_STRICT: 
-@WOCKY_TLS_VERIFY_NORMAL: 
-@WOCKY_TLS_VERIFY_LENIENT: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@WOCKY_TLS_CERT_OK: 
-@WOCKY_TLS_CERT_INVALID: 
-@WOCKY_TLS_CERT_NAME_MISMATCH: 
-@WOCKY_TLS_CERT_REVOKED: 
-@WOCKY_TLS_CERT_SIGNER_UNKNOWN: 
-@WOCKY_TLS_CERT_SIGNER_UNAUTHORISED: 
-@WOCKY_TLS_CERT_INSECURE: 
-@WOCKY_TLS_CERT_NOT_ACTIVE: 
-@WOCKY_TLS_CERT_EXPIRED: 
-@WOCKY_TLS_CERT_NO_CERTIFICATE: 
-@WOCKY_TLS_CERT_MAYBE_DOS: 
-@WOCKY_TLS_CERT_INTERNAL_ERROR: 
-@WOCKY_TLS_CERT_UNKNOWN_ERROR: 
-
-
-
-
-
-
-@WOCKY_TLS_CERT_TYPE_NONE: 
-@WOCKY_TLS_CERT_TYPE_X509: 
-@WOCKY_TLS_CERT_TYPE_OPENPGP: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@session: 
-@peername: 
-@level: 
-@status: 
-@Returns: 
-
-
-
-
-
-
-
-@session: 
-@type: 
-@Returns: 
-
-
-
-
-
-
-
-@session: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@session: 
-@io_priority: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@session: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@session: 
-@path: 
-
-
-
-
-
-
-
-@session: 
-@path: 
-
-
-
-
-
-
-
-@stream: 
-@Returns: 
-
-
-
-
-
-
-
-@stream: 
-@dhbits: 
-@key: 
-@cert: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-types.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-types.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-types.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-types.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,160 +0,0 @@
-
-wocky-types
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@wockypubsubnode: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-
-
-
-
-
-
-@wockypubsubnode: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-@arg4: 
-
-
-
-
-
-
-@wockypubsubnode: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-@arg4: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-unused.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-unused.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-unused.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-unused.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,840 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@wockycontactfactory: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-@wockycontactfactory: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-@wockycontactfactory: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-@fields: 
-@fields_list: 
-@results: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@wockymuc: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-
-
-
-
-
-
-@wockymuc: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-@wockymuc: the object which received the signal.
-@arg1: 
-@arg2: 
-
-
-
-
-
-
-@wockymuc: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-@arg4: 
-@arg5: 
-@arg6: 
-
-
-
-
-
-
-@wockymuc: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-@arg4: 
-@arg5: 
-@arg6: 
-@arg7: 
-@arg8: 
-
-
-
-
-
-
-@wockymuc: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-@arg4: 
-@arg5: 
-@arg6: 
-@arg7: 
-@arg8: 
-
-
-
-
-
-
-@wockymuc: the object which received the signal.
-@arg1: 
-@arg2: 
-
-
-
-
-
-
-@wockymuc: the object which received the signal.
-@arg1: 
-@arg2: 
-
-
-
-
-
-
-@wockymuc: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-@arg4: 
-@arg5: 
-
-
-
-
-
-
-@wockymuc: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-@arg4: 
-
-
-
-
-
-
-@wockymuc: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@wockypepservice: the object which received the signal.
-@arg1: 
-@arg2: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@wockyporter: the object which received the signal.
-
-
-
-
-
-
-@wockyporter: the object which received the signal.
-
-
-
-
-
-
-@wockyporter: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-
-
-
-
-
-
-@wockyporter: the object which received the signal.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@wockypubsubservice: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-@arg4: 
-@arg5: 
-
-
-
-
-
-
-@wockypubsubservice: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-@arg4: 
-
-
-
-
-
-
-@wockypubsubservice: the object which received the signal.
-@arg1: 
-@arg2: 
-@arg3: 
-@arg4: 
-@arg5: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@wockyroster: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-@wockyroster: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@wockyxep0115capabilities: the object which received the signal.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-utils.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-utils.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-utils.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-utils.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,297 +0,0 @@
-
-wocky-utils
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@left: 
-@right: 
-@Returns: 
-
-
-
-
-
-
-
-@jid: 
-@Returns: 
-
-
-
-
-
-
-
-@jid: 
-@node: 
-@domain: 
-@resource: 
-@Returns: 
-
-
-
-
-
-
-
-@node: 
-@domain: 
-@resource: 
-@Returns: 
-
-
-
-
-
-
-
-@type: 
-@Returns: 
-
-
-
-
-
-
-
-@b: 
-@Returns: 
-
-
-
-
-
-
-
-@n: 
-@Returns: 
-
-
-
-
-
-
-
-@n: 
-@Returns: 
-
-
-
-
-
-
-
-@n: 
-@Returns: 
-
-
-
-
-
-
-
-@n: 
-@Returns: 
-
-
-
-
-
-
-
-@d: 
-@Returns: 
-
-
-
-
-
-
-
-@string: 
-@Returns: 
-
-
-
-
-
-
-
-@string: 
-@Returns: 
-
-
-
-
-
-
-
-@string: 
-@Returns: 
-
-
-
-
-
-
-
-@type: 
-@p: 
-@Returns: 
-
-
-
-
-
-
-
-@type: 
-@p: 
-@Returns: 
-
-
-
-
-
-
-
-@type: 
-@p: 
-@Returns: 
-
-
-
-
-
-
-
-@value: 
-
-
-
-
-
-
-
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@enum_type: 
-@nick: 
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@enum_type: 
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@copy: 
-@items: 
-@Returns: 
-
-
-
-
-
-
-
-@str: 
-@Returns: 
-
-
-
-
-
-
-
-@str: 
-
-
-
-
-
-
-
-@source: 
-@tag: 
-
-
-
-
-
-
-
-@source: 
-@tag: 
-@copy_func: 
-@out_param: 
-
-
-
-
-
-
-
-@source: 
-@tag: 
-@copy_func: 
-
-
-
-
-
-
-
-@source: 
-@tag: 
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-xep-0115-capabilities.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-xep-0115-capabilities.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-xep-0115-capabilities.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-xep-0115-capabilities.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-
-WockyXep0115Capabilities
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@contact: 
-@Returns: 
-
-
-
-
-
-
-
-@contact: 
-@Returns: 
-
-
-
-
-
-
-
-@parent: 
-@get_data_forms: 
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-connection.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-connection.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-connection.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-connection.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,230 +0,0 @@
-
-WockyXmppConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@WOCKY_XMPP_CONNECTION_ERROR_EOS: 
-@WOCKY_XMPP_CONNECTION_ERROR_CLOSED: 
-@WOCKY_XMPP_CONNECTION_ERROR_NOT_OPEN: 
-@WOCKY_XMPP_CONNECTION_ERROR_IS_CLOSED: 
-@WOCKY_XMPP_CONNECTION_ERROR_IS_OPEN: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@stream: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@to: 
-@from: 
-@version: 
-@lang: 
-@id: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@result: 
-@to: 
-@from: 
-@version: 
-@lang: 
-@id: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@stanza: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-error-enumtypes.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-error-enumtypes.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-error-enumtypes.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-error-enumtypes.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-
-wocky-xmpp-error-enumtypes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-error.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-error.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-error.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-error.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,275 +0,0 @@
-
-wocky-xmpp-error
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@WOCKY_XMPP_ERROR_TYPE_CANCEL: 
-@WOCKY_XMPP_ERROR_TYPE_CONTINUE: 
-@WOCKY_XMPP_ERROR_TYPE_MODIFY: 
-@WOCKY_XMPP_ERROR_TYPE_AUTH: 
-@WOCKY_XMPP_ERROR_TYPE_WAIT: 
-
-
-
-
-
-
-@WOCKY_XMPP_ERROR_UNDEFINED_CONDITION: 
-@WOCKY_XMPP_ERROR_REDIRECT: 
-@WOCKY_XMPP_ERROR_GONE: 
-@WOCKY_XMPP_ERROR_BAD_REQUEST: 
-@WOCKY_XMPP_ERROR_UNEXPECTED_REQUEST: 
-@WOCKY_XMPP_ERROR_JID_MALFORMED: 
-@WOCKY_XMPP_ERROR_NOT_AUTHORIZED: 
-@WOCKY_XMPP_ERROR_PAYMENT_REQUIRED: 
-@WOCKY_XMPP_ERROR_FORBIDDEN: 
-@WOCKY_XMPP_ERROR_ITEM_NOT_FOUND: 
-@WOCKY_XMPP_ERROR_RECIPIENT_UNAVAILABLE: 
-@WOCKY_XMPP_ERROR_REMOTE_SERVER_NOT_FOUND: 
-@WOCKY_XMPP_ERROR_NOT_ALLOWED: 
-@WOCKY_XMPP_ERROR_NOT_ACCEPTABLE: 
-@WOCKY_XMPP_ERROR_REGISTRATION_REQUIRED: 
-@WOCKY_XMPP_ERROR_SUBSCRIPTION_REQUIRED: 
-@WOCKY_XMPP_ERROR_REMOTE_SERVER_TIMEOUT: 
-@WOCKY_XMPP_ERROR_CONFLICT: 
-@WOCKY_XMPP_ERROR_INTERNAL_SERVER_ERROR: 
-@WOCKY_XMPP_ERROR_RESOURCE_CONSTRAINT: 
-@WOCKY_XMPP_ERROR_FEATURE_NOT_IMPLEMENTED: 
-@WOCKY_XMPP_ERROR_SERVICE_UNAVAILABLE: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@description: 
-@specializes: 
-@override_type: 
-@type: 
-
-
-
-
-
-
-@domain: 
-@enum_type: 
-@codes: 
-
-
-
-
-
-
-@domain: 
-
-
-
-
-
-
-
-@WOCKY_JINGLE_ERROR_OUT_OF_ORDER: 
-@WOCKY_JINGLE_ERROR_TIE_BREAK: 
-@WOCKY_JINGLE_ERROR_UNKNOWN_SESSION: 
-@WOCKY_JINGLE_ERROR_UNSUPPORTED_INFO: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@WOCKY_SI_ERROR_NO_VALID_STREAMS: 
-@WOCKY_SI_ERROR_BAD_PROFILE: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@WOCKY_XMPP_STREAM_ERROR_BAD_FORMAT: 
-@WOCKY_XMPP_STREAM_ERROR_BAD_NAMESPACE_PREFIX: 
-@WOCKY_XMPP_STREAM_ERROR_CONFLICT: 
-@WOCKY_XMPP_STREAM_ERROR_CONNECTION_TIMEOUT: 
-@WOCKY_XMPP_STREAM_ERROR_HOST_GONE: 
-@WOCKY_XMPP_STREAM_ERROR_HOST_UNKNOWN: 
-@WOCKY_XMPP_STREAM_ERROR_IMPROPER_ADDRESSING: 
-@WOCKY_XMPP_STREAM_ERROR_INTERNAL_SERVER_ERROR: 
-@WOCKY_XMPP_STREAM_ERROR_INVALID_FROM: 
-@WOCKY_XMPP_STREAM_ERROR_INVALID_ID: 
-@WOCKY_XMPP_STREAM_ERROR_INVALID_NAMESPACE: 
-@WOCKY_XMPP_STREAM_ERROR_INVALID_XML: 
-@WOCKY_XMPP_STREAM_ERROR_NOT_AUTHORIZED: 
-@WOCKY_XMPP_STREAM_ERROR_POLICY_VIOLATION: 
-@WOCKY_XMPP_STREAM_ERROR_REMOTE_CONNECTION_FAILED: 
-@WOCKY_XMPP_STREAM_ERROR_RESOURCE_CONSTRAINT: 
-@WOCKY_XMPP_STREAM_ERROR_RESTRICTED_XML: 
-@WOCKY_XMPP_STREAM_ERROR_SEE_OTHER_HOST: 
-@WOCKY_XMPP_STREAM_ERROR_SYSTEM_SHUTDOWN: 
-@WOCKY_XMPP_STREAM_ERROR_UNDEFINED_CONDITION: 
-@WOCKY_XMPP_STREAM_ERROR_UNSUPPORTED_ENCODING: 
-@WOCKY_XMPP_STREAM_ERROR_UNSUPPORTED_STANZA_TYPE: 
-@WOCKY_XMPP_STREAM_ERROR_UNSUPPORTED_VERSION: 
-@WOCKY_XMPP_STREAM_ERROR_XML_NOT_WELL_FORMED: 
-@WOCKY_XMPP_STREAM_ERROR_UNKNOWN: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@error: 
-@parent_node: 
-@Returns: 
-
-
-
-
-
-
-
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@error: 
-@type: 
-@core: 
-@specialized: 
-@specialized_node: 
-
-
-
-
-
-
-
-@void: 
-
-
-
-
-
-
-
-@void: 
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-reader-enumtypes.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-reader-enumtypes.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-reader-enumtypes.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-reader-enumtypes.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-
-wocky-xmpp-reader-enumtypes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-reader.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-reader.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-reader.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-reader.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-
-WockyXmppReader
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@WOCKY_XMPP_READER_STATE_INITIAL: 
-@WOCKY_XMPP_READER_STATE_OPENED: 
-@WOCKY_XMPP_READER_STATE_CLOSED: 
-@WOCKY_XMPP_READER_STATE_ERROR: 
-
-
-
-
-
-
-@WOCKY_XMPP_READER_ERROR_INVALID_STREAM_START: 
-@WOCKY_XMPP_READER_ERROR_PARSE_ERROR: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@reader: 
-@Returns: 
-
-
-
-
-
-
-
-@reader: 
-@data: 
-@length: 
-
-
-
-
-
-
-
-@reader: 
-@Returns: 
-
-
-
-
-
-
-
-@reader: 
-@Returns: 
-
-
-
-
-
-
-
-@reader: 
-@Returns: 
-
-
-
-
-
-
-
-@reader: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-writer.sgml telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-writer.sgml
--- telepathy-salut-0.5.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-writer.sgml	2011-05-03 13:29:38.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/docs/reference/tmpl/wocky-xmpp-writer.sgml	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-
-WockyXmppWriter
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@writer: 
-@to: 
-@from: 
-@version: 
-@lang: 
-@id: 
-@data: 
-@length: 
-
-
-
-
-
-
-
-@writer: 
-@data: 
-@length: 
-
-
-
-
-
-
-
-@writer: 
-@stanza: 
-@data: 
-@length: 
-
-
-
-
-
-
-
-@writer: 
-@tree: 
-@data: 
-@length: 
-
-
-
-
-
-
-
-@writer: 
-
-
-
-
-
-
-
-
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/examples/Makefile.in telepathy-salut-0.7.0/lib/ext/wocky/examples/Makefile.in
--- telepathy-salut-0.5.0/lib/ext/wocky/examples/Makefile.in	2011-05-03 12:15:21.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/examples/Makefile.in	2011-11-16 10:10:26.000000000 +0000
@@ -126,6 +126,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -143,8 +144,12 @@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
+GNUTLS_FOR_STREAM_CIPHERS_CFLAGS = @GNUTLS_FOR_STREAM_CIPHERS_CFLAGS@
+GNUTLS_FOR_STREAM_CIPHERS_LIBS = @GNUTLS_FOR_STREAM_CIPHERS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HEADER_DIR = @HEADER_DIR@
@@ -170,6 +175,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
 NM = @NM@
@@ -204,6 +210,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/gtk-doc.make telepathy-salut-0.7.0/lib/ext/wocky/gtk-doc.make
--- telepathy-salut-0.5.0/lib/ext/wocky/gtk-doc.make	2011-04-20 18:39:46.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/gtk-doc.make	2011-09-15 07:16:07.000000000 +0000
@@ -5,12 +5,12 @@
 ####################################
 
 if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 GTKDOC_RUN = $(LIBTOOL) --mode=execute
 else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
 GTKDOC_RUN =
 endif
 
@@ -30,11 +30,12 @@
 	$(DOC_MODULE)-overrides.txt
 
 EXTRA_DIST = 				\
+	$(HTML_IMAGES)			\
 	$(SETUP_FILES)
 
-DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
-	setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp
+	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = 		 \
 	$(DOC_MODULE).args 	 \
@@ -75,38 +76,41 @@
 
 setup-build.stamp:
 	-@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	   echo 'gtk-doc: Preparing build'; \
-	   files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
-	   if test "x$$files" != "x" ; then \
-	       for file in $$files ; do \
-	           test -f $(abs_srcdir)/$$file && \
-	               cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
-	       done \
-	   fi; \
-	   test -f $(abs_srcdir)/tmpl && \
-	       cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
+	    echo '  DOC   Preparing build'; \
+	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	    if test "x$$files" != "x" ; then \
+	        for file in $$files ; do \
+	            test -f $(abs_srcdir)/$$file && \
+	                cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \
+	        done; \
+	    fi; \
 	fi
 	@touch setup-build.stamp
 
 
-setup.stamp: setup-build.stamp
-	@true
-
-
 #### scan ####
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo 'gtk-doc: Scanning header files'
+	@echo '  DOC   Scanning header files'
 	@_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
 	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \
+	    echo "  DOC   Introspecting gobjects"; \
+	    scanobj_options=""; \
+	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	    if test "$(?)" = "0"; then \
+	        if test "x$(V)" = "x1"; then \
+	            scanobj_options="--verbose"; \
+	        fi; \
+	    fi; \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+	    gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
 	else \
 	    for i in $(SCANOBJ_FILES) ; do \
-               test -f $$i || touch $$i ; \
+	        test -f $$i || touch $$i ; \
 	    done \
 	fi
 	@touch scan-build.stamp
@@ -114,29 +118,10 @@
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-#### templates ####
-
-tmpl-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo 'gtk-doc: Rebuilding template files'
-	@gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	  if test -w $(abs_srcdir) ; then \
-	    cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
-	  fi \
-	fi
-	@touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-$(srcdir)/tmpl/*.sgml:
-	@true
-
 #### xml ####
 
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	@echo 'gtk-doc: Building XML'
-	@-chmod -R u+w $(srcdir)
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+	@echo '  DOC   Building XML'
 	@_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
@@ -150,13 +135,19 @@
 #### html ####
 
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building HTML'
+	@echo '  DOC   Building HTML'
 	@rm -rf html
 	@mkdir html
 	@mkhtml_options=""; \
+	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	if test "$(?)" = "0"; then \
+	  if test "x$(V)" = "x1"; then \
+	    mkhtml_options="$$mkhtml_options --verbose"; \
+	  fi; \
+	fi; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
 	if test "$(?)" = "0"; then \
-	  mkhtml_options=--path="$(abs_srcdir)"; \
+	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
 	fi; \
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 	-@test "x$(HTML_IMAGES)" = "x" || \
@@ -168,49 +159,54 @@
 	    cp $(abs_builddir)/$$file $(abs_builddir)/html; \
 	  fi; \
 	done;
-	@echo 'gtk-doc: Fixing cross-references'
+	@echo '  DOC   Fixing cross-references'
 	@gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	@touch html-build.stamp
 
 #### pdf ####
 
 pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building PDF'
-	@rm -rf $(DOC_MODULE).pdf
-	@mkpdf_imgdirs=""; \
+	@echo '  DOC   Building PDF'
+	@rm -f $(DOC_MODULE).pdf
+	@mkpdf_options=""; \
+	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	if test "$(?)" = "0"; then \
+	  if test "x$(V)" = "x1"; then \
+	    mkpdf_options="$$mkpdf_options --verbose"; \
+	  fi; \
+	fi; \
 	if test "x$(HTML_IMAGES)" != "x"; then \
 	  for img in $(HTML_IMAGES); do \
 	    part=`dirname $$img`; \
-	    echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
+	    echo $$mkpdf_options | grep >/dev/null "\-\-imgdir=$$part "; \
 	    if test $$? != 0; then \
-	      mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
+	      mkpdf_options="$$mkpdf_options --imgdir=$$part"; \
 	    fi; \
 	  done; \
 	fi; \
-	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+	gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
 	@touch pdf-build.stamp
 
 ##############
 
 clean-local:
-	rm -f *~ *.bak
-	rm -rf .libs
+	@rm -f *~ *.bak
+	@rm -rf .libs
 
 distclean-local:
-	rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
+	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-	if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
-	    rm -rf tmpl; \
 	fi
 
 maintainer-clean-local: clean
-	rm -rf xml html
+	@rm -rf xml html
 
 install-data-local:
-	@installfiles=`echo $(srcdir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
+	@installfiles=`echo $(builddir)/html/*`; \
+	if test "$$installfiles" = '$(builddir)/html/*'; \
+	then echo 1>&2 'Nothing to install' ; \
 	else \
 	  if test -n "$(DOC_MODULE_VERSION)"; then \
 	    installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
@@ -219,14 +215,12 @@
 	  fi; \
 	  $(mkinstalldirs) $${installdir} ; \
 	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
+	    echo ' $(INSTALL_DATA) '$$i ; \
 	    $(INSTALL_DATA) $$i $${installdir}; \
 	  done; \
 	  if test -n "$(DOC_MODULE_VERSION)"; then \
 	    mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
 	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
-	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
-	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
 	  fi; \
 	  $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
 	fi
@@ -251,14 +245,12 @@
 endif
 
 dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/html
-	-cp $(build)/tmpl/*.sgml $(distdir)/tmpl
-	cp $(builddir)/html/* $(distdir)/html
-	-cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
-	-cp $(build)/$(DOC_MODULE).types $(distdir)/
-	-cp $(build)/$(DOC_MODULE)-sections.txt $(distdir)/
-	cd $(distdir) && rm -f $(DISTCLEANFILES)
-	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+	@mkdir $(distdir)/html
+	@cp ./html/* $(distdir)/html
+	@-cp ./$(DOC_MODULE).pdf $(distdir)/
+	@-cp ./$(DOC_MODULE).types $(distdir)/
+	@-cp ./$(DOC_MODULE)-sections.txt $(distdir)/
+	@cd $(distdir) && rm -f $(DISTCLEANFILES)
+	@$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/ltmain.sh telepathy-salut-0.7.0/lib/ext/wocky/ltmain.sh
--- telepathy-salut-0.5.0/lib/ext/wocky/ltmain.sh	2011-05-03 12:15:17.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/ltmain.sh	2011-11-16 10:10:21.000000000 +0000
@@ -1,10 +1,9 @@
-# Generated from ltmain.m4sh.
 
-# libtool (GNU libtool) 2.2.10
+# 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.
 
@@ -42,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
@@ -70,17 +70,19 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.2.10 Debian-2.2.10-1
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
 # Report bugs to .
+# GNU libtool home page: .
+# General help using GNU software: .
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.2.10 Debian-2.2.10-1"
+VERSION="2.4.2 Debian-2.4.2-1"
 TIMESTAMP=""
-package_revision=1.3175
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -135,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//"}
 
@@ -163,6 +160,27 @@
 dirname="s,/[^/]*$,,"
 basename="s,^.*/,,"
 
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
 # func_dirname_and_basename file append nondir_replacement
 # perform func_basename and func_dirname in a single function
 # call:
@@ -177,17 +195,31 @@
 # those functions but instead duplicate the functionality here.
 func_dirname_and_basename ()
 {
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-  func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-}
+    # Extract subdirectory from the argument.
+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+} # func_dirname_and_basename may be replaced by extended shell implementation
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+    case ${2} in
+      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+    esac
+} # func_stripname may be replaced by extended shell implementation
 
-# Generated shell functions inserted here.
 
 # These SED scripts presuppose an absolute path with a trailing slash.
 pathcar='s,^/\([^/]*\).*$,\1,'
@@ -351,7 +383,7 @@
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -370,6 +402,15 @@
 # Same as above, but do not quote variable references.
 double_quote_subst='s/\(["`\\]\)/\\\1/g'
 
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+
+# Sed substitution that converts a w32 file name or path
+# which contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
 # Re-`\' parameter expansions in output of double_quote_subst that were
 # `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
 # in input to double_quote_subst, that '$' was protected from expansion.
@@ -398,7 +439,7 @@
 # name if it has been set yet.
 func_echo ()
 {
-    $ECHO "$progname${mode+: }$mode: $*"
+    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
 }
 
 # func_verbose arg...
@@ -424,14 +465,14 @@
 # Echo program name prefixed message to standard error.
 func_error ()
 {
-    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
 }
 
 # func_warning arg...
 # Echo program name prefixed warning message to standard error.
 func_warning ()
 {
-    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
 
     # bash bug again:
     :
@@ -650,11 +691,30 @@
     fi
 }
 
+# func_tr_sh
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+  case $1 in
+  [0-9]* | *[!a-zA-Z0-9_]*)
+    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
+    ;;
+  * )
+    func_tr_sh_result=$1
+    ;;
+  esac
+}
+
 
 # func_version
 # Echo version message to standard output and exit.
 func_version ()
 {
+    $opt_debug
+
     $SED -n '/(C)/!b go
 	:more
 	/\./!{
@@ -676,6 +736,8 @@
 # Echo short help message to standard output and exit.
 func_usage ()
 {
+    $opt_debug
+
     $SED -n '/^# Usage:/,/^#  *.*--help/ {
         s/^# //
 	s/^# *$//
@@ -692,7 +754,10 @@
 # unless 'noexit' is passed as argument.
 func_help ()
 {
+    $opt_debug
+
     $SED -n '/^# Usage:/,/# Report bugs to/ {
+	:print
         s/^# //
 	s/^# *$//
 	s*\$progname*'$progname'*
@@ -702,10 +767,14 @@
 	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
-     }' < "$progpath"
+	d
+     }
+     /^# .* home page:/b print
+     /^# General help using/b print
+     ' < "$progpath"
     ret=$?
     if test -z "$1"; then
       exit $ret
@@ -717,12 +786,39 @@
 # exit_cmd.
 func_missing_arg ()
 {
+    $opt_debug
+
     func_error "missing argument for $1."
     exit_cmd=exit
 }
 
-exit_cmd=:
 
+# func_split_short_opt shortopt
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+func_split_short_opt ()
+{
+    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
+    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+
+    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
+    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
+} # func_split_short_opt may be replaced by extended shell implementation
+
+
+# func_split_long_opt longopt
+# Set func_split_long_opt_name and func_split_long_opt_arg shell
+# variables after splitting LONGOPT at the `=' sign.
+func_split_long_opt ()
+{
+    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+    my_sed_long_arg='1s/^--[^=]*=//'
+
+    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
+    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
+} # func_split_long_opt may be replaced by extended shell implementation
+
+exit_cmd=:
 
 
 
@@ -732,25 +828,64 @@
 magic_exe="%%%MAGIC EXE variable%%%"
 
 # Global variables.
-# $mode is unset
 nonopt=
-execute_dlfiles=
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
 extracted_archives=
 extracted_serial=0
 
-opt_dry_run=false
-opt_duplicate_deps=false
-opt_silent=false
-opt_debug=:
-
 # If this variable is set in any of the actions, the command in it
 # will be execed at the end.  This prevents here-documents from being
 # left over by shells.
 exec_cmd=
 
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+    eval "${1}=\$${1}\${2}"
+} # func_append may be replaced by extended shell implementation
+
+# func_append_quoted var value
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+func_append_quoted ()
+{
+    func_quote_for_eval "${2}"
+    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
+} # func_append_quoted may be replaced by extended shell implementation
+
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+    func_arith_result=`expr "${@}"`
+} # func_arith may be replaced by extended shell implementation
+
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
+} # func_len may be replaced by extended shell implementation
+
+
+# func_lo2o object
+func_lo2o ()
+{
+    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+} # func_lo2o may be replaced by extended shell implementation
+
+
+# func_xform libobj-or-source
+func_xform ()
+{
+    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+} # func_xform may be replaced by extended shell implementation
+
+
 # func_fatal_configuration arg...
 # Echo program name prefixed message to standard error, followed by
 # a configuration failure hint, and exit.
@@ -840,129 +975,209 @@
   esac
 }
 
-# Parse options once, thoroughly.  This comes as soon as possible in
-# the script to make things like `libtool --version' happen quickly.
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
 {
+  if test "$package_revision" != "$macro_revision"; then
+    if test "$VERSION" != "$macro_version"; then
+      if test -z "$macro_version"; then
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      fi
+    else
+      cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+    fi
+
+    exit $EXIT_MISMATCH
+  fi
+}
 
-  # Shorthand for --mode=foo, only valid as the first argument
-  case $1 in
-  clean|clea|cle|cl)
-    shift; set dummy --mode clean ${1+"$@"}; shift
-    ;;
-  compile|compil|compi|comp|com|co|c)
-    shift; set dummy --mode compile ${1+"$@"}; shift
-    ;;
-  execute|execut|execu|exec|exe|ex|e)
-    shift; set dummy --mode execute ${1+"$@"}; shift
-    ;;
-  finish|finis|fini|fin|fi|f)
-    shift; set dummy --mode finish ${1+"$@"}; shift
-    ;;
-  install|instal|insta|inst|ins|in|i)
-    shift; set dummy --mode install ${1+"$@"}; shift
-    ;;
-  link|lin|li|l)
-    shift; set dummy --mode link ${1+"$@"}; shift
-    ;;
-  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-    shift; set dummy --mode uninstall ${1+"$@"}; shift
-    ;;
-  esac
 
-  # Parse non-mode specific arguments:
-  while test "$#" -gt 0; do
+# Shorthand for --mode=foo, only valid as the first argument
+case $1 in
+clean|clea|cle|cl)
+  shift; set dummy --mode clean ${1+"$@"}; shift
+  ;;
+compile|compil|compi|comp|com|co|c)
+  shift; set dummy --mode compile ${1+"$@"}; shift
+  ;;
+execute|execut|execu|exec|exe|ex|e)
+  shift; set dummy --mode execute ${1+"$@"}; shift
+  ;;
+finish|finis|fini|fin|fi|f)
+  shift; set dummy --mode finish ${1+"$@"}; shift
+  ;;
+install|instal|insta|inst|ins|in|i)
+  shift; set dummy --mode install ${1+"$@"}; shift
+  ;;
+link|lin|li|l)
+  shift; set dummy --mode link ${1+"$@"}; shift
+  ;;
+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+  shift; set dummy --mode uninstall ${1+"$@"}; shift
+  ;;
+esac
+
+
+
+# Option defaults:
+opt_debug=:
+opt_dry_run=false
+opt_config=false
+opt_preserve_dup_deps=false
+opt_features=false
+opt_finish=false
+opt_help=false
+opt_help_all=false
+opt_silent=:
+opt_warning=:
+opt_verbose=:
+opt_silent=false
+opt_verbose=false
+
+
+# Parse options once, thoroughly.  This comes as soon as possible in the
+# script to make things like `--version' happen as quickly as we can.
+{
+  # this just eases exit handling
+  while test $# -gt 0; do
     opt="$1"
     shift
-
     case $opt in
-      --config)		func_config					;;
-
-      --debug)		preserve_args="$preserve_args $opt"
+      --debug|-x)	opt_debug='set -x'
 			func_echo "enabling shell trace mode"
-			opt_debug='set -x'
 			$opt_debug
 			;;
-
-      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			execute_dlfiles="$execute_dlfiles $1"
-			shift
+      --dry-run|--dryrun|-n)
+			opt_dry_run=:
 			;;
-
-      --dry-run | -n)	opt_dry_run=:					;;
-      --features)       func_features					;;
-      --finish)		mode="finish"					;;
-
-      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			case $1 in
-			  # Valid mode arguments:
-			  clean)	;;
-			  compile)	;;
-			  execute)	;;
-			  finish)	;;
-			  install)	;;
-			  link)		;;
-			  relink)	;;
-			  uninstall)	;;
-
-			  # Catch anything else as an error
-			  *) func_error "invalid argument for $opt"
-			     exit_cmd=exit
-			     break
-			     ;;
-		        esac
-
-			mode="$1"
+      --config)
+			opt_config=:
+func_config
+			;;
+      --dlopen|-dlopen)
+			optarg="$1"
+			opt_dlopen="${opt_dlopen+$opt_dlopen
+}$optarg"
 			shift
 			;;
-
       --preserve-dup-deps)
-			opt_duplicate_deps=:				;;
-
-      --quiet|--silent)	preserve_args="$preserve_args $opt"
-			opt_silent=:
-			opt_verbose=false
+			opt_preserve_dup_deps=:
 			;;
-
-      --no-quiet|--no-silent)
-			preserve_args="$preserve_args $opt"
-			opt_silent=false
+      --features)
+			opt_features=:
+func_features
 			;;
-
-      --verbose| -v)	preserve_args="$preserve_args $opt"
+      --finish)
+			opt_finish=:
+set dummy --mode finish ${1+"$@"}; shift
+			;;
+      --help)
+			opt_help=:
+			;;
+      --help-all)
+			opt_help_all=:
+opt_help=': help-all'
+			;;
+      --mode)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_mode="$optarg"
+case $optarg in
+  # Valid mode arguments:
+  clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+  # Catch anything else as an error
+  *) func_error "invalid argument for $opt"
+     exit_cmd=exit
+     break
+     ;;
+esac
+			shift
+			;;
+      --no-silent|--no-quiet)
 			opt_silent=false
-			opt_verbose=:
+func_append preserve_args " $opt"
 			;;
-
-      --no-verbose)	preserve_args="$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"
 			;;
-
-      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			preserve_args="$preserve_args $opt $1"
-			func_enable_tag "$1"	# tagname is set here
+      --silent|--quiet)
+			opt_silent=:
+func_append preserve_args " $opt"
+        opt_verbose=false
+			;;
+      --verbose|-v)
+			opt_verbose=:
+func_append preserve_args " $opt"
+opt_silent=false
+			;;
+      --tag)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_tag="$optarg"
+func_append preserve_args " $opt $optarg"
+func_enable_tag "$optarg"
 			shift
 			;;
 
+      -\?|-h)		func_usage				;;
+      --help)		func_help				;;
+      --version)	func_version				;;
+
       # Separate optargs to long options:
-      -dlopen=*|--mode=*|--tag=*)
-			func_opt_split "$opt"
-			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+      --*=*)
+			func_split_long_opt "$opt"
+			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
 			shift
 			;;
 
-      -\?|-h)		func_usage					;;
-      --help)		opt_help=:					;;
-      --help-all)	opt_help=': help-all'				;;
-      --version)	func_version					;;
-
-      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
-
-      *)		nonopt="$opt"
-			break
+      # Separate non-argument short options:
+      -\?*|-h*|-n*|-v*)
+			func_split_short_opt "$opt"
+			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
+			shift
 			;;
+
+      --)		break					;;
+      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
+      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
     esac
   done
 
+  # Validate options:
+
+  # save first non-option argument
+  if test "$#" -gt 0; then
+    nonopt="$opt"
+    shift
+  fi
+
+  # preserve --debug
+  test "$opt_debug" = : || func_append preserve_args " --debug"
 
   case $host in
     *cygwin* | *mingw* | *pw32* | *cegcc*)
@@ -970,82 +1185,44 @@
       opt_duplicate_compiler_generated_deps=:
       ;;
     *)
-      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
       ;;
   esac
 
-  # Having warned about all mis-specified options, bail out if
-  # anything was wrong.
-  $exit_cmd $EXIT_FAILURE
-}
+  $opt_help || {
+    # Sanity checks first:
+    func_check_version_match
 
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      else
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      fi
-    else
-      cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
+    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+      func_fatal_configuration "not configured to build any kind of library"
     fi
 
-    exit $EXIT_MISMATCH
-  fi
-}
-
-
-## ----------- ##
-##    Main.    ##
-## ----------- ##
+    # Darwin sucks
+    eval std_shrext=\"$shrext_cmds\"
 
-$opt_help || {
-  # Sanity checks first:
-  func_check_version_match
-
-  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-    func_fatal_configuration "not configured to build any kind of library"
-  fi
+    # Only execute mode is allowed to have -dlopen flags.
+    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
+      func_error "unrecognized option \`-dlopen'"
+      $ECHO "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
 
-  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+    # Change the help message to a mode-specific one.
+    generic_help="$help"
+    help="Try \`$progname --help --mode=$opt_mode' for more information."
+  }
 
 
-  # Darwin sucks
-  eval std_shrext=\"$shrext_cmds\"
+  # Bail if the options were screwed
+  $exit_cmd $EXIT_FAILURE
+}
 
 
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    func_error "unrecognized option \`-dlopen'"
-    $ECHO "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
 
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$progname --help --mode=$mode' for more information."
-}
 
+## ----------- ##
+##    Main.    ##
+## ----------- ##
 
 # func_lalib_p file
 # True iff FILE is a libtool `.la' library or `.lo' object file.
@@ -1110,12 +1287,9 @@
 # temporary ltwrapper_script.
 func_ltwrapper_scriptname ()
 {
-    func_ltwrapper_scriptname_result=""
-    if func_ltwrapper_executable_p "$1"; then
-	func_dirname_and_basename "$1" "" "."
-	func_stripname '' '.exe' "$func_basename_result"
-	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-    fi
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
 }
 
 # func_ltwrapper_p file
@@ -1161,6 +1335,37 @@
 }
 
 
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case "$lt_sysroot:$1" in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result="=$func_stripname_result"
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
+
 # func_infer_tag arg
 # Infer tagged configuration to use if any are available and
 # if one wasn't chosen via the "--tag" command line option.
@@ -1173,8 +1378,7 @@
     if test -n "$available_tags" && test -z "$tagname"; then
       CC_quoted=
       for arg in $CC; do
-        func_quote_for_eval "$arg"
-	CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	func_append_quoted CC_quoted "$arg"
       done
       CC_expanded=`func_echo_all $CC`
       CC_quoted_expanded=`func_echo_all $CC_quoted`
@@ -1193,8 +1397,7 @@
 	    CC_quoted=
 	    for arg in $CC; do
 	      # Double-quote args containing other shell metacharacters.
-	      func_quote_for_eval "$arg"
-	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	      func_append_quoted CC_quoted "$arg"
 	    done
 	    CC_expanded=`func_echo_all $CC`
 	    CC_quoted_expanded=`func_echo_all $CC_quoted`
@@ -1225,43 +1428,523 @@
 }
 
 
-
-# func_write_libtool_object output_name pic_name nonpic_name
-# Create a libtool object file (analogous to a ".la" file),
-# but don't create it if we're doing a dry run.
-func_write_libtool_object ()
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=${1}
+    if test "$build_libtool_libs" = yes; then
+      write_lobj=\'${2}\'
+    else
+      write_lobj=none
+    fi
+
+    if test "$build_old_libs" = yes; then
+      write_oldobj=\'${3}\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T </dev/null`
+    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$lt_sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $opt_debug
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=""
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $opt_debug
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $opt_debug
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $opt_debug
+  if test -z "$2" && test -n "$1" ; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  \`$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result="$1"
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $opt_debug
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  \`$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result="$3"
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $opt_debug
+  case $4 in
+  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via `$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $opt_debug
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $opt_debug
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result="$1"
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via `$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $opt_debug
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd="func_convert_path_${func_stripname_result}"
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $opt_debug
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result="$1"
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from ARG.  MSYS
+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+    # and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
 {
-    write_libobj=${1}
-    if test "$build_libtool_libs" = yes; then
-      write_lobj=\'${2}\'
-    else
-      write_lobj=none
-    fi
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
 
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
-    else
-      write_oldobj=none
-    fi
 
-    $opt_dry_run || {
-      cat >${write_libobj}T < "$lockfile"
     fi
 
     $opt_dry_run || $RM $removelist
-    removelist="$removelist $lockfile"
+    func_append removelist " $lockfile"
     trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
 
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
     func_quote_for_eval "$srcfile"
     qsrcfile=$func_quote_for_eval_result
 
@@ -1515,7 +2195,7 @@
 
       if test -z "$output_obj"; then
 	# Place PIC objects in $objdir
-	command="$command -o $lobj"
+	func_append command " -o $lobj"
       fi
 
       func_show_eval_locale "$command"	\
@@ -1562,11 +2242,11 @@
 	command="$base_compile $qsrcfile $pic_flag"
       fi
       if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
+	func_append command " -o $obj"
       fi
 
       # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
+      func_append command "$suppress_output"
       func_show_eval_locale "$command" \
         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 
@@ -1611,13 +2291,13 @@
 }
 
 $opt_help || {
-  test "$mode" = compile && func_mode_compile ${1+"$@"}
+  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
 }
 
 func_mode_help ()
 {
     # We need to display help for each of the modes.
-    case $mode in
+    case $opt_mode in
       "")
         # Generic help is extracted from the usage comments
         # at the start of this file.
@@ -1793,7 +2473,7 @@
         ;;
 
       *)
-        func_fatal_help "invalid operation mode \`$mode'"
+        func_fatal_help "invalid operation mode \`$opt_mode'"
         ;;
     esac
 
@@ -1808,13 +2488,13 @@
   else
     {
       func_help noexit
-      for mode in compile link execute install finish uninstall clean; do
+      for opt_mode in compile link execute install finish uninstall clean; do
 	func_mode_help
       done
     } | sed -n '1p; 2,$s/^Usage:/  or: /p'
     {
       func_help noexit
-      for mode in compile link execute install finish uninstall clean; do
+      for opt_mode in compile link execute install finish uninstall clean; do
 	echo
 	func_mode_help
       done
@@ -1843,13 +2523,16 @@
       func_fatal_help "you must specify a COMMAND"
 
     # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
+    for file in $opt_dlopen; do
       test -f "$file" \
 	|| func_fatal_help "\`$file' is not a file"
 
       dir=
       case $file in
       *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
 	  || func_fatal_help "\`$lib' is not a valid libtool archive"
@@ -1871,7 +2554,7 @@
 	dir="$func_dirname_result"
 
 	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
+	  func_append dir "/$objdir"
 	else
 	  if test ! -f "$dir/$dlname"; then
 	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
@@ -1928,8 +2611,7 @@
 	;;
       esac
       # Quote arguments (to preserve shell metacharacters).
-      func_quote_for_eval "$file"
-      args="$args $func_quote_for_eval_result"
+      func_append_quoted args "$file"
     done
 
     if test "X$opt_dry_run" = Xfalse; then
@@ -1961,22 +2643,59 @@
     fi
 }
 
-test "$mode" = execute && func_mode_execute ${1+"$@"}
+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
 
 
 # func_mode_finish arg...
 func_mode_finish ()
 {
     $opt_debug
-    libdirs="$nonopt"
+    libs=
+    libdirs=
     admincmds=
 
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "\`$opt' is not a valid libtool archive"
+	fi
 
+      else
+	func_fatal_error "invalid argument \`$opt'"
+      fi
+    done
+
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
+
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
       for libdir in $libdirs; do
 	if test -n "$finish_cmds"; then
 	  # Do each command in the finish commands.
@@ -1986,7 +2705,7 @@
 	if test -n "$finish_eval"; then
 	  # Do the single finish_eval.
 	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
        $cmds"
 	fi
       done
@@ -1995,53 +2714,55 @@
     # Exit here if they wanted silent mode.
     $opt_silent && exit $EXIT_SUCCESS
 
-    echo "----------------------------------------------------------------------"
-    echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $ECHO "   $libdir"
-    done
-    echo
-    echo "If you ever happen to want to link against installed libraries"
-    echo "in a given directory, LIBDIR, you must either use libtool, and"
-    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+	$ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+	echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+	echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+	libdir=LIBDIR
+	eval flag=\"$hardcode_libdir_flag_spec\"
 
-      $ECHO "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $ECHO "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    echo
+	$ECHO "   - use the \`$flag' linker flag"
+      fi
+      if test -n "$admincmds"; then
+	$ECHO "   - have your system administrator run these commands:$admincmds"
+      fi
+      if test -f /etc/ld.so.conf; then
+	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+      fi
+      echo
 
-    echo "See any operating system documentation about shared libraries for"
-    case $host in
-      solaris2.[6789]|solaris2.1[0-9])
-        echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	echo "pages."
-	;;
-      *)
-        echo "more information, such as the ld(1) and ld.so(8) manual pages."
-        ;;
-    esac
-    echo "----------------------------------------------------------------------"
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+	solaris2.[6789]|solaris2.1[0-9])
+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	  echo "pages."
+	  ;;
+	*)
+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
+	  ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
     exit $EXIT_SUCCESS
 }
 
-test "$mode" = finish && func_mode_finish ${1+"$@"}
+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
 
 
 # func_mode_install arg...
@@ -2066,7 +2787,7 @@
     # The real first argument should be the name of the installation program.
     # Aesthetically quote it.
     func_quote_for_eval "$arg"
-    install_prog="$install_prog$func_quote_for_eval_result"
+    func_append install_prog "$func_quote_for_eval_result"
     install_shared_prog=$install_prog
     case " $install_prog " in
       *[\\\ /]cp\ *) install_cp=: ;;
@@ -2086,7 +2807,7 @@
     do
       arg2=
       if test -n "$dest"; then
-	files="$files $dest"
+	func_append files " $dest"
 	dest=$arg
 	continue
       fi
@@ -2124,11 +2845,11 @@
 
       # Aesthetically quote the argument.
       func_quote_for_eval "$arg"
-      install_prog="$install_prog $func_quote_for_eval_result"
+      func_append install_prog " $func_quote_for_eval_result"
       if test -n "$arg2"; then
 	func_quote_for_eval "$arg2"
       fi
-      install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
+      func_append install_shared_prog " $func_quote_for_eval_result"
     done
 
     test -z "$install_prog" && \
@@ -2140,7 +2861,7 @@
     if test -n "$install_override_mode" && $no_mode; then
       if $install_cp; then :; else
 	func_quote_for_eval "$install_override_mode"
-	install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
       fi
     fi
 
@@ -2198,10 +2919,13 @@
       case $file in
       *.$libext)
 	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
+	func_append staticlibs " $file"
 	;;
 
       *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
 	  || func_fatal_help "\`$file' is not a valid libtool archive"
@@ -2215,19 +2939,19 @@
 	if test "X$destdir" = "X$libdir"; then
 	  case "$current_libdirs " in
 	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  *) func_append current_libdirs " $libdir" ;;
 	  esac
 	else
 	  # Note the libdir as a future libdir.
 	  case "$future_libdirs " in
 	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  *) func_append future_libdirs " $libdir" ;;
 	  esac
 	fi
 
 	func_dirname "$file" "/" ""
 	dir="$func_dirname_result"
-	dir="$dir$objdir"
+	func_append dir "$objdir"
 
 	if test -n "$relink_command"; then
 	  # Determine the prefix the user has applied to our future dir.
@@ -2304,7 +3028,7 @@
 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
 
 	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
 	;;
 
       *.lo)
@@ -2478,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.
@@ -2501,7 +3227,7 @@
     fi
 }
 
-test "$mode" = install && func_mode_install ${1+"$@"}
+test "$opt_mode" = install && func_mode_install ${1+"$@"}
 
 
 # func_generate_dlsyms outputname originator pic_p
@@ -2548,6 +3274,18 @@
 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
 #endif
 
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
 /* External symbol declarations for the compiler. */\
 "
 
@@ -2559,8 +3297,9 @@
 	  # Add our own program objects to the symbol list.
 	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
 	  for progfile in $progfiles; do
-	    func_verbose "extracting global C symbols from \`$progfile'"
-	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
 	  done
 
 	  if test -n "$exclude_expsyms"; then
@@ -2609,10 +3348,52 @@
 	  func_verbose "extracting global C symbols from \`$dlprefile'"
 	  func_basename "$dlprefile"
 	  name="$func_basename_result"
-	  $opt_dry_run || {
-	    eval '$ECHO ": $name " >> "$nlist"'
-	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	  }
+          case $host in
+	    *cygwin* | *mingw* | *cegcc* )
+	      # if an import library, we need to obtain dlname
+	      if func_win32_import_lib_p "$dlprefile"; then
+	        func_tr_sh "$dlprefile"
+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
+	        dlprefile_dlbasename=""
+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+	          # Use subshell, to avoid clobbering current variable values
+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+	          if test -n "$dlprefile_dlname" ; then
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename="$func_basename_result"
+	          else
+	            # no lafile. user explicitly requested -dlpreopen .
+	            $sharedlib_from_linklib_cmd "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename" ; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
 	done
 
 	$opt_dry_run || {
@@ -2650,26 +3431,9 @@
   const char *name;
   void *address;
 } lt_dlsymlist;
-"
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc* )
-	    echo >> "$output_objdir/$my_dlsyms" "\
-/* DATA imports from DLLs on WIN32 con't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs.  */"
-	    lt_dlsym_const= ;;
-	  *osf5*)
-	    echo >> "$output_objdir/$my_dlsyms" "\
-/* This system does not cope well with relocations in const data */"
-	    lt_dlsym_const= ;;
-	  *)
-	    lt_dlsym_const=const ;;
-	  esac
-
-	  echo >> "$output_objdir/$my_dlsyms" "\
-extern $lt_dlsym_const lt_dlsymlist
+extern LT_DLSYM_CONST lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols[];
-$lt_dlsym_const lt_dlsymlist
+LT_DLSYM_CONST lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols[] =
 {\
   { \"$my_originator\", (void *) 0 },"
@@ -2709,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"  ;;
@@ -2725,7 +3489,7 @@
 	for arg in $LTCFLAGS; do
 	  case $arg in
 	  -pie | -fpie | -fPIE) ;;
-	  *) symtab_cflags="$symtab_cflags $arg" ;;
+	  *) func_append symtab_cflags " $arg" ;;
 	  esac
 	done
 
@@ -2788,7 +3552,8 @@
     # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
        $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-      win32_nmres=`eval $NM -f posix -A $1 |
+      func_to_tool_file "$1" func_convert_file_msys_to_w32
+      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
 	$SED -n -e '
 	    1,100{
 		/ I /{
@@ -2817,6 +3582,131 @@
   $ECHO "$win32_libid_type"
 }
 
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $opt_debug
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $opt_debug
+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[	 ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive which possess that section. Heuristic: eliminate
+    # all those which have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $opt_debug
+  if func_cygming_gnu_implib_p "$1" ; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1" ; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=""
+  fi
+}
 
 
 # func_extract_an_archive dir oldlib
@@ -3095,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+\"\$@\"}
 }
 
@@ -3195,6 +4088,18 @@
 
   if test -f \"\$progdir/\$program\"; then"
 
+	# fixup the dll searchpath if we need to.
+	#
+	# Fix the DLL searchpath if we need to.  Do this before prepending
+	# to shlibpath, because on Windows, both are PATH and uninstalled
+	# libraries must come first.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
 	# Export our shlibpath_var if we have one.
 	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
 	  $ECHO "\
@@ -3209,14 +4114,6 @@
 "
 	fi
 
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
 	$ECHO "\
     if test \"\$libtool_execute_magic\" != \"$magic\"; then
       # Run the actual program with our arguments.
@@ -3234,166 +4131,6 @@
 }
 
 
-# func_to_host_path arg
-#
-# Convert paths to host format when used with build tools.
-# Intended for use with "native" mingw (where libtool itself
-# is running under the msys shell), or in the following cross-
-# build environments:
-#    $build          $host
-#    mingw (msys)    mingw  [e.g. native]
-#    cygwin          mingw
-#    *nix + wine     mingw
-# where wine is equipped with the `winepath' executable.
-# In the native mingw case, the (msys) shell automatically
-# converts paths for any non-msys applications it launches,
-# but that facility isn't available from inside the cwrapper.
-# Similar accommodations are necessary for $host mingw and
-# $build cygwin.  Calling this function does no harm for other
-# $host/$build combinations not listed above.
-#
-# ARG is the path (on $build) that should be converted to
-# the proper representation for $host. The result is stored
-# in $func_to_host_path_result.
-func_to_host_path ()
-{
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        case $build in
-          *mingw* ) # actually, msys
-            # awkward: cmd appends spaces to result
-            func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
-              $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_path_result=`cygpath -w "$1" |
-	      $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # Unfortunately, winepath does not exit with a non-zero
-            # error code, so we are forced to check the contents of
-            # stdout. On the other hand, if the command is not
-            # found, the shell will set an exit code of 127 and print
-            # *an error message* to stdout. So we must check for both
-            # error code of zero AND non-empty stdout, which explains
-            # the odd construction:
-            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
-            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
-              func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
-                $SED -e "$lt_sed_naive_backslashify"`
-            else
-              # Allow warning below.
-              func_to_host_path_result=
-            fi
-            ;;
-        esac
-        if test -z "$func_to_host_path_result" ; then
-          func_error "Could not determine host path corresponding to"
-          func_error "  \`$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback:
-          func_to_host_path_result="$1"
-        fi
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_path
-
-# func_to_host_pathlist arg
-#
-# Convert pathlists to host format when used with build tools.
-# See func_to_host_path(), above. This function supports the
-# following $build/$host combinations (but does no harm for
-# combinations not listed here):
-#    $build          $host
-#    mingw (msys)    mingw  [e.g. native]
-#    cygwin          mingw
-#    *nix + wine     mingw
-#
-# Path separators are also converted from $build format to
-# $host format. If ARG begins or ends with a path separator
-# character, it is preserved (but converted to $host format)
-# on output.
-#
-# ARG is a pathlist (on $build) that should be converted to
-# the proper representation on $host. The result is stored
-# in $func_to_host_pathlist_result.
-func_to_host_pathlist ()
-{
-  func_to_host_pathlist_result="$1"
-  if test -n "$1"; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        # Remove leading and trailing path separator characters from
-        # ARG. msys behavior is inconsistent here, cygpath turns them
-        # into '.;' and ';.', and winepath ignores them completely.
-	func_stripname : : "$1"
-        func_to_host_pathlist_tmp1=$func_stripname_result
-        case $build in
-          *mingw* ) # Actually, msys.
-            # Awkward: cmd appends spaces to result.
-            func_to_host_pathlist_result=`
-	      ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
-	      $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # unfortunately, winepath doesn't convert pathlists
-            func_to_host_pathlist_result=""
-            func_to_host_pathlist_oldIFS=$IFS
-            IFS=:
-            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
-              IFS=$func_to_host_pathlist_oldIFS
-              if test -n "$func_to_host_pathlist_f" ; then
-                func_to_host_path "$func_to_host_pathlist_f"
-                if test -n "$func_to_host_path_result" ; then
-                  if test -z "$func_to_host_pathlist_result" ; then
-                    func_to_host_pathlist_result="$func_to_host_path_result"
-                  else
-                    func_append func_to_host_pathlist_result ";$func_to_host_path_result"
-                  fi
-                fi
-              fi
-            done
-            IFS=$func_to_host_pathlist_oldIFS
-            ;;
-        esac
-        if test -z "$func_to_host_pathlist_result"; then
-          func_error "Could not determine the host path(s) corresponding to"
-          func_error "  \`$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback. This may break if $1 contains DOS-style drive
-          # specifications. The fix is not to complicate the expression
-          # below, but for the user to provide a working wine installation
-          # with winepath so that path translation in the cross-to-mingw
-          # case works properly.
-          lt_replace_pathsep_nix_to_dos="s|:|;|g"
-          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
-            $SED -e "$lt_replace_pathsep_nix_to_dos"`
-        fi
-        # Now, add the leading and trailing path separators back
-        case "$1" in
-          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
-            ;;
-        esac
-        case "$1" in
-          *: ) func_append func_to_host_pathlist_result ";"
-            ;;
-        esac
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_pathlist
-
 # func_emit_cwrapperexe_src
 # emit the source code for a wrapper executable on stdout
 # Must ONLY be called from within func_mode_link because
@@ -3563,14 +4300,14 @@
 EOF
 
 	    cat </dev/null`
+		  if test "$want_nocaseglob" = yes; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		  fi
 		  for potent_lib in $potential_libs; do
 		      # Follow soft links.
 		      if ls -lLd "$potent_lib" 2>/dev/null |
@@ -7005,7 +7833,7 @@
 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
 			 $SED -e 10q |
 			 $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
+			func_append newdeplibs " $a_deplib"
 			a_deplib=""
 			break 2
 		      fi
@@ -7030,7 +7858,7 @@
 	      ;;
 	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
+	      func_append newdeplibs " $a_deplib"
 	      ;;
 	    esac
 	  done # Gone through all deplibs.
@@ -7046,7 +7874,7 @@
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
+		  func_append newdeplibs " $a_deplib"
 		  a_deplib=""
 		  ;;
 		esac
@@ -7059,7 +7887,7 @@
 		    potlib="$potent_lib" # see symlink-check above in file_magic test
 		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
 		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
+		      func_append newdeplibs " $a_deplib"
 		      a_deplib=""
 		      break 2
 		    fi
@@ -7084,7 +7912,7 @@
 	      ;;
 	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
+	      func_append newdeplibs " $a_deplib"
 	      ;;
 	    esac
 	  done # Gone through all deplibs.
@@ -7188,7 +8016,7 @@
 	*)
 	  case " $deplibs " in
 	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
+	    func_append new_libs " -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -7198,10 +8026,10 @@
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
+	  *) func_append new_libs " $deplib" ;;
 	  esac
 	  ;;
-	*) new_libs="$new_libs $deplib" ;;
+	*) func_append new_libs " $deplib" ;;
 	esac
       done
       deplibs="$new_libs"
@@ -7213,15 +8041,22 @@
 
       # 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=
 	  dep_rpath=
 	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
 	  for libdir in $rpath; do
 	    if test -n "$hardcode_libdir_flag_spec"; then
 	      if test -n "$hardcode_libdir_separator"; then
+		func_replace_sysroot "$libdir"
+		libdir=$func_replace_sysroot_result
 		if test -z "$hardcode_libdirs"; then
 		  hardcode_libdirs="$libdir"
 		else
@@ -7230,18 +8065,18 @@
 		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		    ;;
 		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		    ;;
 		  esac
 		fi
 	      else
 		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
+		func_append dep_rpath " $flag"
 	      fi
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -7249,17 +8084,13 @@
 	  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.
 	    rpath=
 	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
+	      func_append rpath "$dir:"
 	    done
 	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
 	  fi
@@ -7267,7 +8098,7 @@
 	fi
 
 	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
 	if test -n "$shlibpath"; then
 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 	fi
@@ -7293,7 +8124,7 @@
 	linknames=
 	for link
 	do
-	  linknames="$linknames $link"
+	  func_append linknames " $link"
 	done
 
 	# Use standard objects if they are pic
@@ -7304,7 +8135,7 @@
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
 	  export_symbols="$output_objdir/$libname.uexp"
-	  delfiles="$delfiles $export_symbols"
+	  func_append delfiles " $export_symbols"
 	fi
 
 	orig_export_symbols=
@@ -7335,13 +8166,45 @@
 	    $opt_dry_run || $RM $export_symbols
 	    cmds=$export_symbols_cmds
 	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
+	    for cmd1 in $cmds; do
 	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      func_len " $cmd"
-	      len=$func_len_result
-	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	      # Take the normal branch if the nm_file_list_spec branch
+	      # doesn't work or if tool conversion is not needed.
+	      case $nm_file_list_spec~$to_tool_file_cmd in
+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+		  try_normal_branch=yes
+		  eval cmd=\"$cmd1\"
+		  func_len " $cmd"
+		  len=$func_len_result
+		  ;;
+		*)
+		  try_normal_branch=no
+		  ;;
+	      esac
+	      if test "$try_normal_branch" = yes \
+		 && { test "$len" -lt "$max_cmd_len" \
+		      || test "$max_cmd_len" -le -1; }
+	      then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		func_basename "$output"
+		output_la=$func_basename_result
+		save_libobjs=$libobjs
+		save_output=$output
+		output=${output_objdir}/${output_la}.nm
+		func_to_tool_file "$output"
+		libobjs=$nm_file_list_spec$func_to_tool_file_result
+		func_append delfiles " $output"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  func_to_tool_file "$obj"
+		  $ECHO "$func_to_tool_file_result"
+		done > "$output"
+		eval cmd=\"$cmd1\"
 		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
 		skipped_export=false
 	      else
 		# The command line is too long to execute in one step.
@@ -7375,7 +8238,7 @@
 	  # global variables. join(1) would be nice here, but unfortunately
 	  # isn't a blessed tool.
 	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
 	  export_symbols=$output_objdir/$libname.def
 	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	fi
@@ -7385,7 +8248,7 @@
 	  case " $convenience " in
 	  *" $test_deplib "*) ;;
 	  *)
-	    tmp_deplibs="$tmp_deplibs $test_deplib"
+	    func_append tmp_deplibs " $test_deplib"
 	    ;;
 	  esac
 	done
@@ -7405,21 +8268,21 @@
 	    test "X$libobjs" = "X " && libobjs=
 	  else
 	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
+	    func_append generated " $gentop"
 
 	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
+	    func_append libobjs " $func_extract_archives_result"
 	    test "X$libobjs" = "X " && libobjs=
 	  fi
 	fi
 
 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
+	  func_append linker_flags " $flag"
 	fi
 
 	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
+	if test "$opt_mode" = relink; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
 	fi
 
@@ -7481,10 +8344,13 @@
 	    echo 'INPUT (' > $output
 	    for obj in $save_libobjs
 	    do
-	      $ECHO "$obj" >> $output
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
 	    done
 	    echo ')' >> $output
-	    delfiles="$delfiles $output"
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
 	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
 	    output=${output_objdir}/${output_la}.lnk
 	    func_verbose "creating linker input file list: $output"
@@ -7498,10 +8364,12 @@
 	    fi
 	    for obj
 	    do
-	      $ECHO "$obj" >> $output
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
 	    done
-	    delfiles="$delfiles $output"
-	    output=$firstobj\"$file_list_spec$output\"
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
 	  else
 	    if test -n "$save_libobjs"; then
 	      func_verbose "creating reloadable object files..."
@@ -7552,7 +8420,7 @@
 	      if test -n "$last_robj"; then
 	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
 	      fi
-	      delfiles="$delfiles $output"
+	      func_append delfiles " $output"
 
 	    else
 	      output=
@@ -7586,7 +8454,7 @@
 		lt_exit=$?
 
 		# Restore the uninstalled library and exit
-		if test "$mode" = relink; then
+		if test "$opt_mode" = relink; then
 		  ( cd "$output_objdir" && \
 		    $RM "${realname}T" && \
 		    $MV "${realname}U" "$realname" )
@@ -7619,7 +8487,7 @@
 	      # global variables. join(1) would be nice here, but unfortunately
 	      # isn't a blessed tool.
 	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
 	      export_symbols=$output_objdir/$libname.def
 	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	    fi
@@ -7660,10 +8528,10 @@
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
 	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
-	  libobjs="$libobjs $func_extract_archives_result"
+	  func_append libobjs " $func_extract_archives_result"
 	  test "X$libobjs" = "X " && libobjs=
 	fi
 
@@ -7679,7 +8547,7 @@
 	    lt_exit=$?
 
 	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
+	    if test "$opt_mode" = relink; then
 	      ( cd "$output_objdir" && \
 	        $RM "${realname}T" && \
 		$MV "${realname}U" "$realname" )
@@ -7691,7 +8559,7 @@
 	IFS="$save_ifs"
 
 	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
+	if test "$opt_mode" = relink; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
 
 	  if test -n "$convenience"; then
@@ -7775,13 +8643,16 @@
 	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $convenience
 	  reload_conv_objs="$reload_objs $func_extract_archives_result"
 	fi
       fi
 
+      # If we're not building shared, we need to use non_pic_objs
+      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
       # Create the old-style object.
       reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
 
@@ -7855,8 +8726,8 @@
 	if test "$tagname" = CXX ; then
 	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
 	    10.[0123])
-	      compile_command="$compile_command ${wl}-bind_at_load"
-	      finalize_command="$finalize_command ${wl}-bind_at_load"
+	      func_append compile_command " ${wl}-bind_at_load"
+	      func_append finalize_command " ${wl}-bind_at_load"
 	    ;;
 	  esac
 	fi
@@ -7876,7 +8747,7 @@
 	*)
 	  case " $compile_deplibs " in
 	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
+	    func_append new_libs " -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -7886,17 +8757,17 @@
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
+	  *) func_append new_libs " $deplib" ;;
 	  esac
 	  ;;
-	*) new_libs="$new_libs $deplib" ;;
+	*) func_append new_libs " $deplib" ;;
 	esac
       done
       compile_deplibs="$new_libs"
 
 
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
 
       if test -n "$rpath$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -7904,7 +8775,7 @@
 	  # This is the magic to use -rpath.
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
       fi
@@ -7923,18 +8794,18 @@
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
+	  *) func_append perm_rpath " $libdir" ;;
 	  esac
 	fi
 	case $host in
@@ -7943,12 +8814,12 @@
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
 	  ::) dllsearchpath=$libdir;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
+	  *) func_append dllsearchpath ":$libdir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
 	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  *) func_append dllsearchpath ":$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -7974,18 +8845,18 @@
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$finalize_perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
 	  esac
 	fi
       done
@@ -8036,6 +8907,12 @@
 	exit_status=0
 	func_show_eval "$link_command" 'exit_status=$?'
 
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
 	# Delete the generated files.
 	if test -f "$output_objdir/${outputname}S.${objext}"; then
 	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
@@ -8058,7 +8935,7 @@
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -8066,7 +8943,7 @@
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -8081,6 +8958,13 @@
 	$opt_dry_run || $RM $output
 	# Link the executable and exit
 	func_show_eval "$link_command" 'exit $?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
 	exit $EXIT_SUCCESS
       fi
 
@@ -8114,6 +8998,12 @@
 
       func_show_eval "$link_command" 'exit $?'
 
+      if test -n "$postlink_cmds"; then
+	func_to_tool_file "$output_objdir/$outputname"
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
       # Now create the wrapper script.
       func_verbose "creating $output"
 
@@ -8211,7 +9101,7 @@
 	else
 	  oldobjs="$old_deplibs $non_pic_objects"
 	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    oldobjs="$oldobjs $symfileobj"
+	    func_append oldobjs " $symfileobj"
 	  fi
 	fi
 	addlibs="$old_convenience"
@@ -8219,10 +9109,10 @@
 
       if test -n "$addlibs"; then
 	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
+	func_append generated " $gentop"
 
 	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
+	func_append oldobjs " $func_extract_archives_result"
       fi
 
       # Do each command in the archive commands.
@@ -8233,10 +9123,10 @@
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
 	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
-	  oldobjs="$oldobjs $func_extract_archives_result"
+	  func_append oldobjs " $func_extract_archives_result"
 	fi
 
 	# POSIX demands no paths to be encoded in archives.  We have
@@ -8254,7 +9144,7 @@
 	else
 	  echo "copying selected object files to avoid basename conflicts..."
 	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 	  func_mkdir_p "$gentop"
 	  save_oldobjs=$oldobjs
 	  oldobjs=
@@ -8278,18 +9168,30 @@
 		esac
 	      done
 	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
 	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
+	    *) func_append oldobjs " $obj" ;;
 	    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"
 	len=$func_len_result
 	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 	  cmds=$old_archive_cmds
+	elif test -n "$archiver_list_spec"; then
+	  func_verbose "using command file archive linking..."
+	  for obj in $oldobjs
+	  do
+	    func_to_tool_file "$obj"
+	    $ECHO "$func_to_tool_file_result"
+	  done > $output_objdir/$libname.libcmd
+	  func_to_tool_file "$output_objdir/$libname.libcmd"
+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+	  cmds=$old_archive_cmds
 	else
 	  # the command line is too long to link in one step, link in parts
 	  func_verbose "using piecewise archive linking..."
@@ -8383,12 +9285,23 @@
 	      *.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"
-		newdependency_libs="$newdependency_libs $libdir/$name"
+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      -L*)
+		func_stripname -L '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -L$func_replace_sysroot_result"
+		;;
+	      -R*)
+		func_stripname -R '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -R$func_replace_sysroot_result"
 		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+	      *) func_append newdependency_libs " $deplib" ;;
 	      esac
 	    done
 	    dependency_libs="$newdependency_libs"
@@ -8402,9 +9315,9 @@
 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlfiles="$newdlfiles $libdir/$name"
+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
-	      *) newdlfiles="$newdlfiles $lib" ;;
+	      *) func_append newdlfiles " $lib" ;;
 	      esac
 	    done
 	    dlfiles="$newdlfiles"
@@ -8421,7 +9334,7 @@
 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlprefiles="$newdlprefiles $libdir/$name"
+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
 	      esac
 	    done
@@ -8433,7 +9346,7 @@
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      newdlfiles="$newdlfiles $abs"
+	      func_append newdlfiles " $abs"
 	    done
 	    dlfiles="$newdlfiles"
 	    newdlprefiles=
@@ -8442,7 +9355,7 @@
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      newdlprefiles="$newdlprefiles $abs"
+	      func_append newdlprefiles " $abs"
 	    done
 	    dlprefiles="$newdlprefiles"
 	  fi
@@ -8527,7 +9440,7 @@
     exit $EXIT_SUCCESS
 }
 
-{ test "$mode" = link || test "$mode" = relink; } &&
+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
     func_mode_link ${1+"$@"}
 
 
@@ -8547,9 +9460,9 @@
     for arg
     do
       case $arg in
-      -f) RM="$RM $arg"; rmforce=yes ;;
-      -*) RM="$RM $arg" ;;
-      *) files="$files $arg" ;;
+      -f) func_append RM " $arg"; rmforce=yes ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
       esac
     done
 
@@ -8558,24 +9471,23 @@
 
     rmdirs=
 
-    origobjdir="$objdir"
     for file in $files; do
       func_dirname "$file" "" "."
       dir="$func_dirname_result"
       if test "X$dir" = X.; then
-	objdir="$origobjdir"
+	odir="$objdir"
       else
-	objdir="$dir/$origobjdir"
+	odir="$dir/$objdir"
       fi
       func_basename "$file"
       name="$func_basename_result"
-      test "$mode" = uninstall && objdir="$dir"
+      test "$opt_mode" = uninstall && odir="$dir"
 
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test "$opt_mode" = clean; then
 	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
+	  *" $odir "*) ;;
+	  *) func_append rmdirs " $odir" ;;
 	esac
       fi
 
@@ -8601,18 +9513,17 @@
 
 	  # Delete the libtool libraries and symlinks.
 	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
+	    func_append rmfiles " $odir/$n"
 	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
 
-	  case "$mode" in
+	  case "$opt_mode" in
 	  clean)
-	    case "  $library_names " in
-	    # "  " in the beginning catches empty $dlname
+	    case " $library_names " in
 	    *" $dlname "*) ;;
-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
 	    esac
-	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
 	    ;;
 	  uninstall)
 	    if test -n "$library_names"; then
@@ -8640,19 +9551,19 @@
 	  # Add PIC object to the list of files to remove.
 	  if test -n "$pic_object" &&
 	     test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
+	    func_append rmfiles " $dir/$pic_object"
 	  fi
 
 	  # Add non-PIC object to the list of files to remove.
 	  if test -n "$non_pic_object" &&
 	     test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
+	    func_append rmfiles " $dir/$non_pic_object"
 	  fi
 	fi
 	;;
 
       *)
-	if test "$mode" = clean ; then
+	if test "$opt_mode" = clean ; then
 	  noexename=$name
 	  case $file in
 	  *.exe)
@@ -8662,7 +9573,7 @@
 	    noexename=$func_stripname_result
 	    # $file with .exe has already been added to rmfiles,
 	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
+	    func_append rmfiles " $file"
 	    ;;
 	  esac
 	  # Do a test to see if this is a libtool program.
@@ -8671,7 +9582,7 @@
 	      func_ltwrapper_scriptname "$file"
 	      relink_command=
 	      func_source $func_ltwrapper_scriptname_result
-	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
 	    else
 	      relink_command=
 	      func_source $dir/$noexename
@@ -8679,12 +9590,12 @@
 
 	    # note $name still contains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
 	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
+	      func_append rmfiles " $odir/lt-$name"
 	    fi
 	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	      func_append rmfiles " $odir/lt-${noexename}.c"
 	    fi
 	  fi
 	fi
@@ -8692,7 +9603,6 @@
       esac
       func_show_eval "$RM $rmfiles" 'exit_status=1'
     done
-    objdir="$origobjdir"
 
     # Try to remove the ${objdir}s in the directories where we deleted files
     for dir in $rmdirs; do
@@ -8704,16 +9614,16 @@
     exit $exit_status
 }
 
-{ test "$mode" = uninstall || test "$mode" = clean; } &&
+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
     func_mode_uninstall ${1+"$@"}
 
-test -z "$mode" && {
+test -z "$opt_mode" && {
   help="$generic_help"
   func_fatal_help "you must specify a MODE"
 }
 
 test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$mode'"
+  func_fatal_help "invalid operation mode \`$opt_mode'"
 
 if test -n "$exec_cmd"; then
   eval exec "$exec_cmd"
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/m4/gtk-doc.m4 telepathy-salut-0.7.0/lib/ext/wocky/m4/gtk-doc.m4
--- telepathy-salut-0.5.0/lib/ext/wocky/m4/gtk-doc.m4	2011-04-20 18:39:46.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/m4/gtk-doc.m4	2011-09-15 07:16:07.000000000 +0000
@@ -6,6 +6,7 @@
 dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
 AC_DEFUN([GTK_DOC_CHECK],
 [
+  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
   AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
   AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
 
@@ -33,6 +34,11 @@
                         AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
       [PKG_CHECK_EXISTS([gtk-doc >= $1],,
                         AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
+    dnl don't check for glib if we build glib
+    if test "x$PACKAGE_NAME" != "xglib"; then
+      dnl don't fail if someone does not have glib
+      PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,)
+    fi
   fi
 
   AC_MSG_CHECKING([whether to build gtk-doc documentation])
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/m4/libtool.m4 telepathy-salut-0.7.0/lib/ext/wocky/m4/libtool.m4
--- telepathy-salut-0.5.0/lib/ext/wocky/m4/libtool.m4	2011-05-03 12:15:17.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/m4/libtool.m4	2011-11-16 10:10:21.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
@@ -168,10 +170,13 @@
 dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
 m4_require([_LT_CMD_RELOAD])dnl
 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
 
 _LT_CONFIG_LIBTOOL_INIT([
 # See if we are running on zsh, and set the options which allow our
@@ -634,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."
 
@@ -748,15 +753,12 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_XSI_SHELLFNS
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
 
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
+  _LT_PROG_REPLACE_SHELLFNS
 
-  mv -f "$cfgfile" "$ofile" ||
+   mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 ],
@@ -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
@@ -1073,30 +1117,41 @@
   fi
 ])
 
-# _LT_SYS_MODULE_PATH_AIX
-# -----------------------
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
 # Links a minimal program and checks the executable
 # for the system default hardcoded library path. In most cases,
 # this is /usr/lib:/lib, but when the MPI compilers are used
 # the location of the communication and MPI libs are included too.
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
 m4_defun([_LT_SYS_MODULE_PATH_AIX],
 [m4_require([_LT_DECL_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
 ])# _LT_SYS_MODULE_PATH_AIX
 
 
@@ -1121,7 +1176,7 @@
 
 AC_MSG_CHECKING([how to print strings])
 # Test print first, because it will be a builtin if present.
-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
    test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
   ECHO='print -r --'
 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
@@ -1165,6 +1220,39 @@
 ])# _LT_PROG_ECHO_BACKSLASH
 
 
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[  --with-sysroot[=DIR] Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([${with_sysroot}])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and in which our libraries should be installed.])])
+
 # _LT_ENABLE_LOCK
 # ---------------
 m4_defun([_LT_ENABLE_LOCK],
@@ -1286,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"
@@ -1311,14 +1412,47 @@
 ])# _LT_ENABLE_LOCK
 
 
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
 # _LT_CMD_OLD_ARCHIVE
 # -------------------
 m4_defun([_LT_CMD_OLD_ARCHIVE],
-[AC_CHECK_TOOL(AR, ar, false)
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1])
+[_LT_PROG_AR
 
 AC_CHECK_TOOL(STRIP, strip, :)
 test -z "$STRIP" && STRIP=:
@@ -1337,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
@@ -1523,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
@@ -1562,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
@@ -1658,10 +1797,10 @@
 /* When -fvisbility=hidden is used, assume the code has been annotated
    correspondingly for the symbols needed.  */
 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-void fnord () __attribute__((visibility("default")));
+int fnord () __attribute__((visibility("default")));
 #endif
 
-void fnord () { int i=42; }
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -2108,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
 
@@ -2117,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
@@ -2182,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'
@@ -2201,8 +2340,9 @@
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -2235,13 +2375,71 @@
       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
+    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -2262,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'
@@ -2270,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.
@@ -2281,7 +2475,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -2299,7 +2493,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2319,17 +2513,18 @@
   ;;
 
 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}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 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"
@@ -2390,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}'
@@ -2406,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 ;;
@@ -2443,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}'
@@ -2520,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
@@ -2589,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}'
@@ -2614,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
@@ -2638,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
@@ -2669,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}'
@@ -2679,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
@@ -2957,6 +3152,11 @@
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
   darwin*)
     if test "$GCC" = yes; then
       reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -3096,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
   ;;
@@ -3175,6 +3375,21 @@
   ;;
 esac
 ])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -3182,7 +3397,11 @@
 _LT_DECL([], [deplibs_check_method], [1],
     [Method to check whether dependent libraries are shared objects])
 _LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method == "file_magic"])
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
 ])# _LT_CHECK_MAGIC_METHOD
 
 
@@ -3285,6 +3504,67 @@
 dnl AC_DEFUN([AM_PROG_NM], [])
 dnl AC_DEFUN([AC_PROG_NM], [])
 
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
 
 # LT_LIB_M
 # --------
@@ -3411,8 +3691,8 @@
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -3436,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};"\
@@ -3448,6 +3729,7 @@
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -3481,6 +3763,18 @@
       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -3492,7 +3786,7 @@
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
-const struct {
+LT@&t@_DLSYM_CONST struct {
   const char *name;
   void       *address;
 }
@@ -3518,15 +3812,15 @@
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
 	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
 	else
 	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
 	fi
@@ -3559,6 +3853,13 @@
   AC_MSG_RESULT(ok)
 fi
 
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
     [Take the output of nm and produce a listing of raw symbols and C names])
 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
@@ -3569,6 +3870,8 @@
 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
     [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
     [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
 ]) # _LT_CMD_GLOBAL_SYMBOLS
 
 
@@ -3580,7 +3883,6 @@
 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 _LT_TAGVAR(lt_prog_compiler_static, $1)=
 
-AC_MSG_CHECKING([for $compiler option to produce PIC])
 m4_if([$1], [CXX], [
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -3685,6 +3987,12 @@
 	  ;;
 	esac
 	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
       dgux*)
 	case $cc_basename in
 	  ec++*)
@@ -3993,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
@@ -4059,6 +4369,12 @@
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
 	;;
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -4079,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
@@ -4178,9 +4509,11 @@
     _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
     ;;
 esac
-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
 
 #
 # Check to make sure the PIC flag actually works.
@@ -4199,6 +4532,8 @@
 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
 	[Additional compiler flags for building library objects])
 
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
 #
 # Check to make sure the static flag actually works.
 #
@@ -4219,6 +4554,7 @@
 m4_defun([_LT_LINKER_SHLIBS],
 [AC_REQUIRE([LT_PATH_LD])dnl
 AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_EGREP])dnl
 m4_require([_LT_DECL_SED])dnl
@@ -4227,6 +4563,7 @@
 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 m4_if([$1], [CXX], [
   _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   case $host_os in
   aix[[4-9]]*)
     # If we're using GNU nm, then we don't want the "-C" option.
@@ -4241,18 +4578,25 @@
     ;;
   pw32*)
     _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
+    ;;
   cygwin* | mingw* | cegcc*)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  linux* | k*bsd*-gnu)
+    case $cc_basename in
+    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']
+      ;;
+    esac
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
     _LT_TAGVAR(link_all_deplibs, $1)=no
-  ;;
+    ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
+    ;;
   esac
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 ], [
   runpath_var=
   _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -4267,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
@@ -4312,7 +4655,7 @@
   openbsd*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu)
+  linux* | k*bsd*-gnu | gnu*)
     _LT_TAGVAR(link_all_deplibs, $1)=no
     ;;
   esac
@@ -4423,7 +4766,8 @@
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_TAGVAR(always_export_symbols, $1)=no
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _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'
+      _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']
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -4471,7 +4815,7 @@
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 	 && test "$tmp_diet" = no
       then
-	tmp_addflag=
+	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
@@ -4520,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~
@@ -4541,8 +4884,8 @@
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -4560,8 +4903,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -4607,8 +4950,8 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -4739,7 +5082,7 @@
 	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        _LT_SYS_MODULE_PATH_AIX
+        _LT_SYS_MODULE_PATH_AIX([$1])
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
         _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       else
@@ -4750,7 +5093,7 @@
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX
+	 _LT_SYS_MODULE_PATH_AIX([$1])
 	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
@@ -4794,20 +5137,64 @@
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# 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'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -4820,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
@@ -4836,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
@@ -4845,7 +5228,7 @@
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -4853,7 +5236,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -4869,13 +5252,12 @@
 
     hpux10*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       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
@@ -4893,10 +5275,10 @@
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
@@ -4943,16 +5325,31 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        AC_LINK_IFELSE(int foo(void) {},
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-        )
-        LDFLAGS="$save_LDFLAGS"
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS="$save_LDFLAGS"])
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
       else
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
@@ -5037,7 +5434,7 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -5056,9 +5453,9 @@
       _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
@@ -5302,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],
@@ -5330,8 +5724,6 @@
     to runtime path list])
 _LT_TAGDECL([], [link_all_deplibs], [0],
     [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [fix_srcfile_path], [1],
-    [Fix the shell variable $srcfile for the compiler])
 _LT_TAGDECL([], [always_export_symbols], [0],
     [Set to "yes" if exported symbols are required])
 _LT_TAGDECL([], [export_symbols_cmds], [2],
@@ -5342,6 +5734,8 @@
     [Symbols that must always be exported])
 _LT_TAGDECL([], [prelink_cmds], [2],
     [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
 _LT_TAGDECL([], [file_list_spec], [1],
     [Specify filename containing input files])
 dnl FIXME: Not yet implemented
@@ -5443,6 +5837,7 @@
 m4_defun([_LT_LANG_CXX_CONFIG],
 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
     ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
     (test "X$CXX" != "Xg++"))) ; then
@@ -5461,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
@@ -5504,6 +5898,7 @@
 
   # Allow CC to be a program name with arguments.
   lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
   lt_save_LD=$LD
   lt_save_GCC=$GCC
   GCC=$GXX
@@ -5521,6 +5916,7 @@
   fi
   test -z "${LDCXX+set}" || LD=$LDCXX
   CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
   _LT_CC_BASENAME([$compiler])
@@ -5542,8 +5938,8 @@
       # Check if GNU C++ uses GNU ld as the underlying linker, since the
       # archiving commands below assume that GNU ld is being used.
       if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -5684,7 +6080,7 @@
           _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
           # Determine the default libpath from the value encoded in an empty
           # executable.
-          _LT_SYS_MODULE_PATH_AIX
+          _LT_SYS_MODULE_PATH_AIX([$1])
           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 
           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
@@ -5696,7 +6092,7 @@
           else
 	    # Determine the default libpath from the value encoded in an
 	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX
+	    _LT_SYS_MODULE_PATH_AIX([$1])
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 	    # Warning - without using the other run time loading flags,
 	    # -berok will link without error, but may produce a broken library.
@@ -5738,29 +6134,75 @@
         ;;
 
       cygwin* | mingw* | pw32* | cegcc*)
-        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-        # as there is no search path for DLLs.
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-        _LT_TAGVAR(always_export_symbols, $1)=no
-        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-          # If the export-symbols file already is a .def file (1st line
-          # is EXPORTS), use it as is; otherwise, prepend...
-          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    cp $export_symbols $output_objdir/$soname.def;
-          else
-	    echo EXPORTS > $output_objdir/$soname.def;
-	    cat $export_symbols >> $output_objdir/$soname.def;
-          fi~
-          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-        else
-          _LT_TAGVAR(ld_shlibs, $1)=no
-        fi
-        ;;
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # 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
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
       darwin* | rhapsody*)
         _LT_DARWIN_LINKER_FEATURES($1)
 	;;
@@ -5783,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
@@ -5835,7 +6277,7 @@
             ;;
           *)
             if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
             else
               # FIXME: insert proper C++ library support
               _LT_TAGVAR(ld_shlibs, $1)=no
@@ -5906,10 +6348,10 @@
 	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	        esac
 	      fi
@@ -5950,9 +6392,9 @@
           *)
 	    if test "$GXX" = yes; then
 	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
 	      fi
 	    fi
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6230,7 +6672,7 @@
 	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	      esac
 
@@ -6317,9 +6759,9 @@
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
@@ -6448,6 +6890,7 @@
   fi # test -n "$compiler"
 
   CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
   LDCXX=$LD
   LD=$lt_save_LD
   GCC=$lt_save_GCC
@@ -6462,6 +6905,29 @@
 ])# _LT_LANG_CXX_CONFIG
 
 
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
 # ---------------------------------
 # Figure out "hidden" library dependencies from verbose
@@ -6470,6 +6936,7 @@
 # objects, libraries and library flags.
 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
 # Dependencies to place before and after the object being linked:
 _LT_TAGVAR(predep_objects, $1)=
 _LT_TAGVAR(postdep_objects, $1)=
@@ -6519,7 +6986,20 @@
   }
 };
 _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
 dnl objects, libraries and library flags.
 if AC_TRY_EVAL(ac_compile); then
@@ -6531,7 +7011,7 @@
   pre_test_object_deps_done=no
 
   for p in `eval "$output_verbose_link_cmd"`; do
-    case $p in
+    case ${prev}${p} in
 
     -L* | -R* | -l*)
        # Some compilers place space between "-{L,R}" and the path.
@@ -6540,13 +7020,22 @@
           test $p = "-R"; then
 	 prev=$p
 	 continue
-       else
-	 prev=
        fi
 
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
        if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
+	 case ${prev} in
+	 -L | -R)
 	   # Internal compiler library paths should come after those
 	   # provided the user.  The postdeps already come after the
 	   # user supplied libs so there is no need to process them.
@@ -6566,8 +7055,10 @@
 	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
 	 fi
        fi
+       prev=
        ;;
 
+    *.lto.$objext) ;; # Ignore GCC LTO objects
     *.$objext)
        # This assumes that the test object file only shows up
        # once in the compiler output.
@@ -6603,6 +7094,7 @@
 fi
 
 $RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
 
 # PORTME: override above test on systems where it is broken
 m4_if([$1], [CXX],
@@ -6702,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
@@ -6752,7 +7243,9 @@
   # Allow CC to be a program name with arguments.
   lt_save_CC="$CC"
   lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
   CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
   _LT_CC_BASENAME([$compiler])
@@ -6806,6 +7299,7 @@
 
   GCC=$lt_save_GCC
   CC="$lt_save_CC"
+  CFLAGS="$lt_save_CFLAGS"
 fi # test "$_lt_disable_F77" != yes
 
 AC_LANG_POP
@@ -6832,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
@@ -6882,7 +7375,9 @@
   # Allow CC to be a program name with arguments.
   lt_save_CC="$CC"
   lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
   CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
   compiler=$CC
   GCC=$ac_cv_fc_compiler_gnu
 
@@ -6938,7 +7433,8 @@
   fi # test -n "$compiler"
 
   GCC=$lt_save_GCC
-  CC="$lt_save_CC"
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
 fi # test "$_lt_disable_FC" != yes
 
 AC_LANG_POP
@@ -6975,10 +7471,12 @@
 _LT_LINKER_BOILERPLATE
 
 # Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=yes
 CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
 _LT_TAGVAR(LD, $1)="$LD"
@@ -7009,10 +7507,82 @@
 AC_LANG_RESTORE
 
 GCC=$lt_save_GCC
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
 ])# _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
@@ -7044,9 +7614,11 @@
 
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
+lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=
 CC=${RC-"windres"}
+CFLAGS=
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
 _LT_CC_BASENAME([$compiler])
@@ -7059,7 +7631,8 @@
 
 GCC=$lt_save_GCC
 AC_LANG_RESTORE
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_RC_CONFIG
 
 
@@ -7079,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],
@@ -7118,6 +7698,15 @@
 AC_SUBST([OBJDUMP])
 ])
 
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
 
 # _LT_DECL_SED
 # ------------
@@ -7211,8 +7800,8 @@
 # Try some XSI features
 xsi_shell=no
 ( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
@@ -7251,206 +7840,162 @@
 ])# _LT_CHECK_SHELL_FEATURES
 
 
-# _LT_PROG_XSI_SHELLFNS
-# ---------------------
-# Bourne and XSI compatible variants of some useful shell functions.
-m4_defun([_LT_PROG_XSI_SHELLFNS],
-[case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $[*] ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-}
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
+m4_defun([_LT_PROG_FUNCTION_REPLACE],
+[dnl {
+sed -e '/^$1 ()$/,/^} # $1 /c\
+$1 ()\
+{\
+m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+])
 
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
 
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-  esac
-}
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
+# Replace existing portable implementations of several shell functions with
+# equivalent extended shell implementations where those features are available..
+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
+[if test x"$xsi_shell" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac
+    func_basename_result="${1##*/}"])
 
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
+  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary parameter first.
+    func_stripname_result=${3}
+    func_stripname_result=${func_stripname_result#"${1}"}
+    func_stripname_result=${func_stripname_result%"${2}"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+    func_split_long_opt_name=${1%%=*}
+    func_split_long_opt_arg=${1#*=}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
+    func_split_short_opt_arg=${1#??}
+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+    case ${1} in
+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+      *)    func_lo2o_result=${1} ;;
+    esac])
 
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
 
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
 
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
+fi
 
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$[@]"`
-}
+if test x"$lt_shell_append" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
 
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
+    func_quote_for_eval "${2}"
+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
 
-_LT_EOF
-esac
+if test x"$_lt_function_replace_fail" = x":"; then
+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
 
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]+=\$[2]"
-}
-_LT_EOF
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine which file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
     ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]=\$$[1]\$[2]"
-}
-
-_LT_EOF
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
     ;;
-  esac
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
 ])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/m4/ltoptions.m4 telepathy-salut-0.7.0/lib/ext/wocky/m4/ltoptions.m4
--- telepathy-salut-0.5.0/lib/ext/wocky/m4/ltoptions.m4	2011-05-03 12:15:17.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/m4/ltoptions.m4	2011-11-16 10:10:21.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.5.0/lib/ext/wocky/m4/ltversion.m4 telepathy-salut-0.7.0/lib/ext/wocky/m4/ltversion.m4
--- telepathy-salut-0.5.0/lib/ext/wocky/m4/ltversion.m4	2011-05-03 12:15:17.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/m4/ltversion.m4	2011-11-16 10:10:21.000000000 +0000
@@ -7,17 +7,17 @@
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# Generated from ltversion.in.
+# @configure_input@
 
-# serial 3175 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.2.10])
-m4_define([LT_PACKAGE_REVISION], [1.3175])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.10'
-macro_revision='1.3175'
+[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.5.0/lib/ext/wocky/m4/Makefile.in telepathy-salut-0.7.0/lib/ext/wocky/m4/Makefile.in
--- telepathy-salut-0.5.0/lib/ext/wocky/m4/Makefile.in	2011-05-03 12:15:21.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/m4/Makefile.in	2011-11-16 10:10:26.000000000 +0000
@@ -79,6 +79,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -96,8 +97,12 @@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
+GNUTLS_FOR_STREAM_CIPHERS_CFLAGS = @GNUTLS_FOR_STREAM_CIPHERS_CFLAGS@
+GNUTLS_FOR_STREAM_CIPHERS_LIBS = @GNUTLS_FOR_STREAM_CIPHERS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HEADER_DIR = @HEADER_DIR@
@@ -123,6 +128,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
 NM = @NM@
@@ -157,6 +163,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/Makefile.in telepathy-salut-0.7.0/lib/ext/wocky/Makefile.in
--- telepathy-salut-0.5.0/lib/ext/wocky/Makefile.in	2011-05-03 12:15:21.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/Makefile.in	2011-11-16 10:10:26.000000000 +0000
@@ -135,6 +135,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -152,8 +153,12 @@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
+GNUTLS_FOR_STREAM_CIPHERS_CFLAGS = @GNUTLS_FOR_STREAM_CIPHERS_CFLAGS@
+GNUTLS_FOR_STREAM_CIPHERS_LIBS = @GNUTLS_FOR_STREAM_CIPHERS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HEADER_DIR = @HEADER_DIR@
@@ -179,6 +184,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
 NM = @NM@
@@ -213,6 +219,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/tests/Makefile.in telepathy-salut-0.7.0/lib/ext/wocky/tests/Makefile.in
--- telepathy-salut-0.5.0/lib/ext/wocky/tests/Makefile.in	2011-05-03 12:15:21.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/tests/Makefile.in	2011-11-16 10:10:26.000000000 +0000
@@ -307,6 +307,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -324,8 +325,12 @@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
+GNUTLS_FOR_STREAM_CIPHERS_CFLAGS = @GNUTLS_FOR_STREAM_CIPHERS_CFLAGS@
+GNUTLS_FOR_STREAM_CIPHERS_LIBS = @GNUTLS_FOR_STREAM_CIPHERS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HEADER_DIR = @HEADER_DIR@
@@ -351,6 +356,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
 NM = @NM@
@@ -385,6 +391,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/tests/test-resolver.h telepathy-salut-0.7.0/lib/ext/wocky/tests/test-resolver.h
--- telepathy-salut-0.5.0/lib/ext/wocky/tests/test-resolver.h	2011-01-17 16:19:05.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/tests/test-resolver.h	2011-11-15 09:14:09.000000000 +0000
@@ -22,7 +22,7 @@
 #define __TEST_RESOLVER_H__
 
 #include 
-#include 
+#include 
 
 G_BEGIN_DECLS
 
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/tests/wocky-caps-hash-test.c telepathy-salut-0.7.0/lib/ext/wocky/tests/wocky-caps-hash-test.c
--- telepathy-salut-0.5.0/lib/ext/wocky/tests/wocky-caps-hash-test.c	2011-04-22 10:01:35.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/tests/wocky-caps-hash-test.c	2011-11-15 09:14:09.000000000 +0000
@@ -339,8 +339,7 @@
       wocky_stanza_get_top_node (stanza));
   g_object_unref (stanza);
 
-  /* should have failed, so no output. of course if the test fails
-   * then the string won't be freed! oh no!  */
+  /* should be NULL because of type="lol" */
   g_assert (out == NULL);
 
   /* now with no FORM_TYPE field but fine otherwise */
@@ -363,11 +362,32 @@
       ')',
       NULL);
 
-  out = wocky_caps_hash_compute_from_node (
-      wocky_stanza_get_top_node (stanza));
-  g_object_unref (stanza);
+  /* should just be ignoring the invalid data form as XEP-0115 section
+   * "5.4 Processing Method", bullet point 3.6 tells us */
+  check_hash (stanza, "9LXnSGAOqGkjoewMq7WHTF4wK/U=");
 
-  g_assert (out == NULL);
+  /* now with a FORM_TYPE but not type="hidden" */
+  stanza = wocky_stanza_build (WOCKY_STANZA_TYPE_IQ,
+      WOCKY_STANZA_SUB_TYPE_NONE, NULL, "badger",
+      '(', "identity",
+        '@', "category", "client",
+        '@', "name", "Psi 0.11",
+        '@', "type", "pc",
+        '#', "en",
+      ')',
+      '(', "x",
+        ':', "jabber:x:data",
+        '@', "type", "result",
+        '(', "field",
+          '@', "var", "FORM_TYPE",
+          '(', "value", '$', "urn:xmpp:dataforms:softwareinfo", ')',
+        ')',
+      ')',
+      NULL);
+
+  /* should just be ignoring the invalid data form as XEP-0115 section
+   * "5.4 Processing Method", bullet point 3.6 tells us */
+  check_hash (stanza, "9LXnSGAOqGkjoewMq7WHTF4wK/U=");
 
   /* now with  but fine otherwise;
    * this will fail because we have everything about the field but the
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/tests/wocky-connector-test.c telepathy-salut-0.7.0/lib/ext/wocky/tests/wocky-connector-test.c
--- telepathy-salut-0.5.0/lib/ext/wocky/tests/wocky-connector-test.c	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/tests/wocky-connector-test.c	2011-09-07 14:05:52.000000000 +0000
@@ -3428,7 +3428,7 @@
 
           g_object_get (wcon, "identity", &identity, "features", &feat, NULL);
           g_assert (identity != NULL);
-          g_assert (*identity |= '\0');
+          g_assert (*identity != '\0');
           g_assert (feat != NULL);
           g_assert (G_OBJECT_TYPE (feat) == WOCKY_TYPE_STANZA);
           g_free (identity);
@@ -3442,7 +3442,7 @@
 
           g_object_get (wcon, "resource", &identity, NULL);
           g_assert (identity != NULL);
-          g_assert (*identity |= '\0');
+          g_assert (*identity != '\0');
           g_free (identity);
 
           g_object_get (wcon, "legacy", &jabber, "old-ssl", &oldssl, NULL);
@@ -3477,22 +3477,23 @@
           g_object_unref (tmp);
         }
     }
-  else if (test->result.domain == S_ANY_ERROR)
-    {
-      g_assert (test->result.xmpp == NULL);
-    }
   else
     {
-      /* We want the error to match either of result.code or
-       * result.fallback_code, but don't care which.
-       * The expected error domain is the same for either code.
-       */
-      if (error->code == test->result.fallback_code)
-        g_assert_error (error, map_static_domain (test->result.domain),
-          test->result.fallback_code);
-      else
-        g_assert_error (error, map_static_domain (test->result.domain),
-          test->result.code);
+      g_assert (test->result.xmpp == NULL);
+
+      if (test->result.domain != S_ANY_ERROR)
+        {
+          /* We want the error to match either of result.code or
+           * result.fallback_code, but don't care which.
+           * The expected error domain is the same for either code.
+           */
+          if (error->code == test->result.fallback_code)
+            g_assert_error (error, map_static_domain (test->result.domain),
+              test->result.fallback_code);
+          else
+            g_assert_error (error, map_static_domain (test->result.domain),
+              test->result.code);
+        }
     }
 
   if (wcon != NULL)
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/tests/wocky-ping-test.c telepathy-salut-0.7.0/lib/ext/wocky/tests/wocky-ping-test.c
--- telepathy-salut-0.5.0/lib/ext/wocky/tests/wocky-ping-test.c	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/tests/wocky-ping-test.c	2011-09-07 14:05:52.000000000 +0000
@@ -22,20 +22,20 @@
  */
 #define TOTAL_TIMEOUT (PING_COUNT * PING_INTERVAL + 1) * 3
 
-static gboolean
-ping_recv_cb (WockyPorter *porter, WockyStanza *stanza, gpointer user_data)
+static void
+ping_recv_cb (const gchar *buff, gsize len, gpointer user_data)
 {
-  test_data_t *data = (test_data_t *) user_data;
-  WockyStanza *reply;
+  test_data_t *data = user_data;
+  gchar *tmp_buff;
 
-  reply = wocky_stanza_build_iq_result (stanza, NULL);
-  wocky_porter_send (porter, reply);
-  g_object_unref (reply);
+  /* There is no g_assert_cmpnstr */
+  tmp_buff = g_strndup (buff, len);
+  g_assert_cmpstr (tmp_buff, ==, " ");
+  g_free (tmp_buff);
 
   g_assert_cmpuint (data->outstanding, >, 0);
   data->outstanding--;
   g_main_loop_quit (data->loop);
-  return TRUE;
 }
 
 static gboolean
@@ -54,21 +54,26 @@
 {
   WockyPing *ping;
   test_data_t *test = setup_test_with_timeout (TOTAL_TIMEOUT);
+  WockyXmppConnection *connection;
+  GIOStream *stream;
+  GInputStream *stream_in;
 
+  g_assert (WOCKY_IS_C2S_PORTER (test->sched_in));
   /* First, we ping every n seconds */
-  ping = wocky_ping_new (test->sched_in, PING_INTERVAL);
+  ping = wocky_ping_new (WOCKY_C2S_PORTER (test->sched_in), PING_INTERVAL);
 
   test_open_both_connections (test);
 
   wocky_porter_start (test->sched_in);
   wocky_porter_start (test->sched_out);
 
-  wocky_porter_register_handler_from_anyone (test->sched_out,
-      WOCKY_STANZA_TYPE_IQ, WOCKY_STANZA_SUB_TYPE_GET,
-      WOCKY_PORTER_HANDLER_PRIORITY_NORMAL, ping_recv_cb, test,
-      '(', "ping",
-          ':', WOCKY_XMPP_NS_PING,
-      ')', NULL);
+  g_object_get (test->sched_out, "connection", &connection, NULL);
+  g_object_get (connection, "base-stream", &stream, NULL);
+  stream_in = g_io_stream_get_input_stream (stream);
+  g_object_unref (stream);
+  g_object_unref (connection);
+
+  wocky_test_stream_set_direct_read_callback (stream_in, ping_recv_cb, test);
 
   test->outstanding += PING_COUNT;
 
@@ -86,6 +91,8 @@
   test->outstanding += 1;
   test_wait_pending (test);
 
+  wocky_test_stream_set_direct_read_callback (stream_in, NULL, NULL);
+
   test_close_both_porters (test);
   g_object_unref (ping);
 
@@ -113,7 +120,8 @@
   WockyPing *ping;
   test_data_t *test = setup_test ();
 
-  ping = wocky_ping_new (test->sched_in, 0);
+  g_assert (WOCKY_IS_C2S_PORTER (test->sched_in));
+  ping = wocky_ping_new (WOCKY_C2S_PORTER (test->sched_in), 0);
 
   test_open_both_connections (test);
 
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/tests/wocky-porter-test.c telepathy-salut-0.7.0/lib/ext/wocky/tests/wocky-porter-test.c
--- telepathy-salut-0.5.0/lib/ext/wocky/tests/wocky-porter-test.c	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/tests/wocky-porter-test.c	2011-11-15 09:14:09.000000000 +0000
@@ -648,8 +648,10 @@
 {
   test_data_t *test = setup_test ();
 
-  test_open_both_connections (test);
+  wocky_test_stream_set_write_mode (test->stream->stream0_output,
+    WOCKY_TEST_STREAM_WRITE_COMPLETE);
 
+  test_open_both_connections (test);
   wocky_porter_start (test->sched_out);
 
   wocky_xmpp_connection_recv_stanza_async (test->in, NULL,
@@ -2352,6 +2354,9 @@
 {
   test_data_t *test = setup_test ();
 
+  wocky_test_stream_set_write_mode (test->stream->stream0_output,
+    WOCKY_TEST_STREAM_WRITE_COMPLETE);
+
   test_open_both_connections (test);
   wocky_porter_start (test->sched_in);
 
@@ -2552,6 +2557,9 @@
   test_data_t *test = setup_test ();
   WockyStanza *s;
 
+  wocky_test_stream_set_write_mode (test->stream->stream0_output,
+    WOCKY_TEST_STREAM_WRITE_COMPLETE);
+
   test_open_both_connections (test);
   wocky_porter_start (test->sched_in);
 
@@ -3083,10 +3091,9 @@
   send_query_from (test, "tybalt@capulet.lit", "anyone");
   send_query_from (test, "tybalt@capulet.lit/FIXME", "anyone");
 
-  /* Slightly counterintuitively, a stanza from our server's domain should not
-   * be matched by got_stanza_from_server().
-   */
-  send_query_from (test, "capulet.lit", "anyone");
+  /* A stanza from our server's domain should be matched by
+   * got_stanza_from_server(). See fd.o#39057. */
+  send_query_from (test, "capulet.lit", "server");
 
   /* On the other hand, a stanza with no sender should be picked up by
    * got_stanza_from_server(). */
@@ -3282,12 +3289,83 @@
   teardown_test (test);
 }
 
+static gboolean
+test_reply_from_domain_handler_cb (WockyPorter *porter,
+    WockyStanza *stanza,
+    gpointer user_data)
+{
+  test_data_t *test = (test_data_t *) user_data;
+  WockyStanza *reply;
+  const gchar *id;
+
+  test_expected_stanza_received (test, stanza);
+
+  id = wocky_node_get_attribute (wocky_stanza_get_top_node (stanza),
+      "id");
+
+  /* Reply with from="domain" */
+  reply = wocky_stanza_build (WOCKY_STANZA_TYPE_IQ,
+    WOCKY_STANZA_SUB_TYPE_RESULT, "example.com", "juliet@example.com",
+    '@', "id", id,
+    NULL);
+  wocky_porter_send_async (porter, reply,
+      NULL, test_send_iq_sent_cb, test);
+  g_queue_push_tail (test->expected_stanzas, reply);
+  test->outstanding++;
+
+  return TRUE;
+}
+
+static void
+test_reply_from_domain (void)
+{
+  test_data_t *test = setup_test ();
+  WockyStanza *iq;
+
+  g_test_bug ("39057");
+
+  /* Testing that when we send an iq to server, it can reply from the domain
+     instead of full/bare jid. This happens with xmpp.messenger.live.com.
+
+     ...
+     ...
+   */
+
+  test_open_both_connections (test);
+  wocky_porter_start (test->sched_out);
+  wocky_porter_start (test->sched_in);
+
+  /* register an IQ handler */
+  wocky_porter_register_handler_from_anyone (test->sched_out,
+      WOCKY_STANZA_TYPE_IQ, WOCKY_STANZA_SUB_TYPE_NONE,
+      0,
+      test_reply_from_domain_handler_cb, test, NULL);
+
+  /* Send an IQ query */
+  iq = wocky_stanza_build (WOCKY_STANZA_TYPE_IQ,
+    WOCKY_STANZA_SUB_TYPE_GET, NULL, NULL,
+    '@', "id", "1",
+    NULL);
+
+  wocky_porter_send_iq_async (test->sched_in, iq,
+      NULL, test_send_iq_reply_cb, test);
+  g_queue_push_tail (test->expected_stanzas, iq);
+
+  test->outstanding += 2;
+  test_wait_pending (test);
+
+  test_close_both_porters (test);
+  teardown_test (test);
+}
+
 int
 main (int argc, char **argv)
 {
   int result;
 
   test_init (argc, argv);
+  g_test_bug_base ("http://bugs.freedesktop.org/show_bug.cgi?id=");
 
   g_test_add_func ("/xmpp-porter/initiation", test_instantiation);
   g_test_add_func ("/xmpp-porter/send", test_send);
@@ -3344,6 +3422,8 @@
       close_from_send_callback);
   g_test_add_func ("/xmpp-porter/send-from-send-callback",
       send_from_send_callback);
+  g_test_add_func ("/xmpp-porter/reply-from-domain",
+      test_reply_from_domain);
 
   result = g_test_run ();
   test_deinit ();
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/tests/wocky-test-connector-server.c telepathy-salut-0.7.0/lib/ext/wocky/tests/wocky-test-connector-server.c
--- telepathy-salut-0.5.0/lib/ext/wocky/tests/wocky-test-connector-server.c	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/tests/wocky-test-connector-server.c	2011-07-07 11:03:56.000000000 +0000
@@ -520,9 +520,15 @@
           NULL, NULL,
           '@', "id", id,
           '(', "error", '@', "type", "modify",
-          '(', "not-acceptable",
-          ':', WOCKY_XMPP_NS_STANZAS,
-          ')',
+            '(', "not-acceptable",
+              ':', WOCKY_XMPP_NS_STANZAS,
+            ')',
+            '(', "text", ':', WOCKY_XMPP_NS_STANZAS,
+              '$',
+                "You must include the username in the initial IQ get to work "
+                "around a bug in jabberd 1.4. See "
+                "https://bugs.freedesktop.org/show_bug.cgi?id=24013",
+            ')',
           ')',
           NULL);
     }
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/tests/wocky-test-sasl-auth-server.c telepathy-salut-0.7.0/lib/ext/wocky/tests/wocky-test-sasl-auth-server.c
--- telepathy-salut-0.5.0/lib/ext/wocky/tests/wocky-test-sasl-auth-server.c	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/tests/wocky-test-sasl-auth-server.c	2011-11-15 10:11:34.000000000 +0000
@@ -36,6 +36,7 @@
 #ifdef HAVE_LIBSASL2
 
 #include 
+#include 
 #define CHECK_SASL_RETURN(x)                                \
 G_STMT_START   {                                            \
     if (x < SASL_OK) {                                      \
@@ -45,6 +46,13 @@
     }                                                       \
 } G_STMT_END
 
+/* Apparently, we're allowed to typedef the same thing *again* if it's
+ * the same signature, so this allows for backwards compatiblity with
+ * older libsasl2s and also works with newer ones too. This'll only
+ * break if libsasl2 change the type of sasl_callback_ft. I sure hope
+ * they don't! */
+typedef int (*sasl_callback_ft)(void);
+
 #else
 
 #define SASL_OK 0
@@ -929,8 +937,8 @@
   static gboolean sasl_initialized = FALSE;
   int ret;
   static sasl_callback_t callbacks[] = {
-    { SASL_CB_LOG, test_sasl_server_auth_log, NULL },
-    { SASL_CB_GETOPT, test_sasl_server_auth_getopt, NULL },
+    { SASL_CB_LOG, (sasl_callback_ft) test_sasl_server_auth_log, NULL },
+    { SASL_CB_GETOPT, (sasl_callback_ft) test_sasl_server_auth_getopt, NULL },
     { SASL_CB_LIST_END, NULL, NULL },
   };
 
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/tests/wocky-test-stream.c telepathy-salut-0.7.0/lib/ext/wocky/tests/wocky-test-stream.c
--- telepathy-salut-0.5.0/lib/ext/wocky/tests/wocky-test-stream.c	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/tests/wocky-test-stream.c	2011-09-07 14:05:52.000000000 +0000
@@ -52,6 +52,7 @@
 typedef struct {
   GOutputStream parent;
   GAsyncQueue *queue;
+  WockyTestStreamWriteMode mode;
   GError *write_error /* no, this is not a coding style violation */;
   gboolean dispose_has_run;
 } WockyTestOutputStream;
@@ -72,7 +73,9 @@
   gsize count;
   GError *read_error /* no, this is not a coding style violation */;
   gboolean dispose_has_run;
-  WockyTestSTreamReadMode mode;
+  WockyTestStreamReadMode mode;
+  WockyTestStreamDirectReadCb direct_read_cb;
+  gpointer direct_read_user_data;
   gboolean corked;
 } WockyTestInputStream;
 
@@ -297,6 +300,9 @@
   } while (self->mode != WOCK_TEST_STREAM_READ_EXACT
     && written < count && self->out_array != NULL);
 
+  if (self->direct_read_cb != NULL)
+    self->direct_read_cb (buffer, written, self->direct_read_user_data);
+
   return written;
 }
 
@@ -473,6 +479,10 @@
 {
   WockyTestOutputStream *self = WOCKY_TEST_OUTPUT_STREAM (stream);
   GArray *data;
+  gsize written = count;
+
+  if (self->mode == WOCKY_TEST_STREAM_WRITE_INCOMPLETE)
+    written = MAX (count/2, 1);
 
   if (self->write_error != NULL)
     {
@@ -481,14 +491,14 @@
       return -1;
     }
 
-  data = g_array_sized_new (FALSE, FALSE, sizeof (guint8), count);
+  data = g_array_sized_new (FALSE, FALSE, sizeof (guint8), written);
 
-  g_array_insert_vals (data, 0, buffer, count);
+  g_array_insert_vals (data, 0, buffer, written);
 
   g_async_queue_push (self->queue, data);
   g_signal_emit (self, output_signals[OUTPUT_DATA_WRITTEN], 0);
 
-  return count;
+  return written;
 }
 
 static void
@@ -623,7 +633,7 @@
 
 void
 wocky_test_stream_set_mode (GInputStream *stream,
-  WockyTestSTreamReadMode mode)
+  WockyTestStreamReadMode mode)
 {
   WOCKY_TEST_INPUT_STREAM (stream)->mode = mode;
 }
@@ -639,3 +649,21 @@
     wocky_test_input_stream_try_read (tstream);
 
 }
+
+void
+wocky_test_stream_set_direct_read_callback (GInputStream *stream,
+  WockyTestStreamDirectReadCb cb,
+  gpointer user_data)
+{
+  WockyTestInputStream *tstream = WOCKY_TEST_INPUT_STREAM (stream);
+
+  tstream->direct_read_cb = cb;
+  tstream->direct_read_user_data = user_data;
+}
+
+void
+wocky_test_stream_set_write_mode (GOutputStream *stream,
+  WockyTestStreamWriteMode mode)
+{
+  WOCKY_TEST_OUTPUT_STREAM (stream)->mode = mode;
+}
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/tests/wocky-test-stream.h telepathy-salut-0.7.0/lib/ext/wocky/tests/wocky-test-stream.h
--- telepathy-salut-0.5.0/lib/ext/wocky/tests/wocky-test-stream.h	2011-01-17 16:19:05.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/tests/wocky-test-stream.h	2011-09-07 14:05:52.000000000 +0000
@@ -78,10 +78,26 @@
   WOCK_TEST_STREAM_READ_COMBINE,
   /* one read reads only data from one write */
   WOCK_TEST_STREAM_READ_EXACT,
-} WockyTestSTreamReadMode;
+} WockyTestStreamReadMode;
+
+typedef enum {
+  /* all writes are only half-done, default */
+  WOCKY_TEST_STREAM_WRITE_INCOMPLETE = 0,
+  /* Always succeed in writing everything */
+  WOCKY_TEST_STREAM_WRITE_COMPLETE = 1,
+} WockyTestStreamWriteMode;
 
 void wocky_test_stream_set_mode (GInputStream *stream,
-  WockyTestSTreamReadMode mode);
+  WockyTestStreamReadMode mode);
+
+void wocky_test_stream_set_write_mode (GOutputStream *stream,
+  WockyTestStreamWriteMode mode);
+
+typedef void (*WockyTestStreamDirectReadCb) (const gchar *buff, gsize len,
+  gpointer user_data);
+
+void wocky_test_stream_set_direct_read_callback (GInputStream *stream,
+  WockyTestStreamDirectReadCb cb, gpointer user_data);
 
 G_END_DECLS
 
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/tests/wocky-tls-test.c telepathy-salut-0.7.0/lib/ext/wocky/tests/wocky-tls-test.c
--- telepathy-salut-0.5.0/lib/ext/wocky/tests/wocky-tls-test.c	2011-01-17 16:19:05.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/tests/wocky-tls-test.c	2011-09-07 14:05:52.000000000 +0000
@@ -23,6 +23,11 @@
   test_data_t *test;
   char cli_buf[BUF_SIZE];
   char srv_buf[BUF_SIZE];
+
+  char *cli_send;
+  gsize cli_send_len;
+  gsize cli_sent;
+
   WockyTLSConnection *client;
   WockyTLSConnection *server;
   GString *cli_data;
@@ -43,13 +48,25 @@
   GOutputStream *output = G_OUTPUT_STREAM (source);
   ssl_test_t *ssl_test = data;
   GError *error = NULL;
+  gsize ret;
 
-  g_assert (g_output_stream_write_finish (output, result, &error)
-    == TEST_SSL_DATA_LEN);
+  ret = g_output_stream_write_finish (output, result, &error);
+  g_assert_cmpint (ret, <=, ssl_test->cli_send_len - ssl_test->cli_sent);
   g_assert_no_error (error);
 
-  ssl_test->test->outstanding--;
-  g_main_loop_quit (ssl_test->test->loop);
+  ssl_test->cli_sent += ret;
+
+  if (ssl_test->cli_sent == ssl_test->cli_send_len)
+    {
+      ssl_test->test->outstanding--;
+      g_main_loop_quit (ssl_test->test->loop);
+      return;
+    }
+
+  g_output_stream_write_async (output,
+    ssl_test->cli_send + ssl_test->cli_sent,
+    ssl_test->cli_send_len - ssl_test->cli_sent,
+    G_PRIORITY_DEFAULT, ssl_test->test->cancellable, client_write_cb, data);
 }
 
 static void
@@ -95,8 +112,9 @@
         {
           GIOStream *io = G_IO_STREAM (ssl_test->client);
           GOutputStream *output = g_io_stream_get_output_stream (io);
+
           g_output_stream_write_async (output,
-              TEST_SSL_DATA_A, TEST_SSL_DATA_LEN, G_PRIORITY_DEFAULT,
+              ssl_test->cli_send, ssl_test->cli_send_len, G_PRIORITY_DEFAULT,
               ssl_test->test->cancellable, client_write_cb, data);
           return;
         }
@@ -141,8 +159,16 @@
 
   g_string_append_len (ssl_test->srv_data, ssl_test->srv_buf, count);
 
-  ssl_test->test->outstanding--;
-  g_main_loop_quit (ssl_test->test->loop);
+  if (ssl_test->srv_data->len < ssl_test->cli_send_len)
+    {
+      g_input_stream_read_async (input, ssl_test->srv_buf, BUF_SIZE,
+       G_PRIORITY_DEFAULT, ssl_test->test->cancellable, server_read_cb, data);
+    }
+  else
+    {
+      ssl_test->test->outstanding--;
+      g_main_loop_quit (ssl_test->test->loop);
+    }
 }
 
 
@@ -222,6 +248,7 @@
 static void
 teardown_ssl_test (ssl_test_t *ssl_test)
 {
+  g_free (ssl_test->cli_send);
   g_string_free (ssl_test->cli_data, TRUE);
   g_string_free (ssl_test->srv_data, TRUE);
   g_io_stream_close (G_IO_STREAM (ssl_test->server), NULL, NULL);
@@ -231,7 +258,7 @@
 }
 
 static void
-test_openssl_handshake_rw (void)
+test_tls_handshake_rw (void)
 {
   ssl_test_t ssl_test = { NULL, } ;
   test_data_t *test = setup_test ();
@@ -243,6 +270,15 @@
     TEST_SSL_DATA_A "\0" TEST_SSL_DATA_B "\0"
     TEST_SSL_DATA_A "\0" TEST_SSL_DATA_B "\0" TEST_SSL_DATA_A;
 
+  ssl_test.cli_send = g_malloc0 (32 * 1024);
+
+  while (ssl_test.cli_send_len + 4 < 32 * 1024)
+    {
+      guint32 r = g_random_int ();
+      memcpy (ssl_test.cli_send + ssl_test.cli_send_len, &r, 4);
+      ssl_test.cli_send_len += 4;
+    }
+
   setup_ssl_test (&ssl_test, test);
 
   wocky_tls_session_handshake_async (client, G_PRIORITY_DEFAULT,
@@ -255,12 +291,12 @@
 
   test_wait_pending (test);
 
-  g_assert (test->outstanding == 0);
-  g_assert (ssl_test.cli_data->len == expected);
-  g_assert (ssl_test.srv_data->len == TEST_SSL_DATA_LEN);
+  g_assert_cmpint (test->outstanding, ==, 0);
+  g_assert_cmpint (ssl_test.cli_data->len, ==, expected);
+  g_assert_cmpint (ssl_test.srv_data->len, ==, ssl_test.cli_send_len);
   g_assert (!memcmp (ssl_test.cli_data->str, target, expected));
   g_assert (!memcmp (ssl_test.srv_data->str,
-    TEST_SSL_DATA_A, TEST_SSL_DATA_LEN));
+    ssl_test.cli_send, ssl_test.cli_send_len));
 
   teardown_test (test);
   teardown_ssl_test (&ssl_test);
@@ -275,7 +311,7 @@
   int result;
 
   test_init (argc, argv);
-  g_test_add_func ("/openssl/handshake+rw", test_openssl_handshake_rw);
+  g_test_add_func ("/tls/handshake+rw", test_tls_handshake_rw);
   result = g_test_run ();
   test_deinit ();
 
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/tools/Makefile.in telepathy-salut-0.7.0/lib/ext/wocky/tools/Makefile.in
--- telepathy-salut-0.5.0/lib/ext/wocky/tools/Makefile.in	2011-05-03 12:15:21.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/tools/Makefile.in	2011-11-16 10:10:26.000000000 +0000
@@ -79,6 +79,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -96,8 +97,12 @@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
+GNUTLS_FOR_STREAM_CIPHERS_CFLAGS = @GNUTLS_FOR_STREAM_CIPHERS_CFLAGS@
+GNUTLS_FOR_STREAM_CIPHERS_LIBS = @GNUTLS_FOR_STREAM_CIPHERS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HEADER_DIR = @HEADER_DIR@
@@ -123,6 +128,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
 NM = @NM@
@@ -157,6 +163,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/Makefile.in telepathy-salut-0.7.0/lib/ext/wocky/wocky/Makefile.in
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/Makefile.in	2011-05-03 12:15:21.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/Makefile.in	2011-11-16 10:10:26.000000000 +0000
@@ -256,6 +256,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -273,8 +274,12 @@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
+GNUTLS_FOR_STREAM_CIPHERS_CFLAGS = @GNUTLS_FOR_STREAM_CIPHERS_CFLAGS@
+GNUTLS_FOR_STREAM_CIPHERS_LIBS = @GNUTLS_FOR_STREAM_CIPHERS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HEADER_DIR = @HEADER_DIR@
@@ -300,6 +305,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
 NM = @NM@
@@ -334,6 +340,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-auth-registry.c telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-auth-registry.c
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-auth-registry.c	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-auth-registry.c	2011-11-15 09:14:09.000000000 +0000
@@ -212,9 +212,15 @@
   g_slice_free (WockyAuthRegistryStartData, start_data);
 }
 
-static WockyAuthHandler *
+static gboolean
 wocky_auth_registry_select_handler (WockyAuthRegistry *self,
-    gboolean allow_plain, const GSList *mechanisms)
+    const GSList *mechanisms,
+    gboolean allow_plain,
+    const gchar *username,
+    const gchar *password,
+    const gchar *server,
+    const gchar *session_id,
+    WockyAuthHandler **out_handler)
 {
   WockyAuthRegistryPrivate *priv = self->priv;
   GSList *k;
@@ -229,77 +235,103 @@
 
       if (wocky_auth_registry_has_mechanism (mechanisms, handler_mech))
         {
-          g_object_ref (handler);
-          return handler;
+          if (out_handler != NULL)
+            *out_handler = g_object_ref (handler);
+
+          return TRUE;
         }
     }
 
-  return NULL;
-}
-
-static void
-wocky_auth_registry_start_auth_async_func (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)
-{
-  WockyAuthRegistryPrivate *priv = self->priv;
-  GSimpleAsyncResult *result;
-
-  result = g_simple_async_result_new (G_OBJECT (self), callback, user_data,
-      wocky_auth_registry_start_auth_async);
-
-  g_assert (priv->handler == NULL);
-
-  priv->handler = wocky_auth_registry_select_handler (self, allow_plain,
-      mechanisms);
-
-  if (priv->handler == NULL)
+  if (wocky_auth_registry_has_mechanism (mechanisms,
+          WOCKY_AUTH_MECH_SASL_SCRAM_SHA_1))
     {
-
-      if (wocky_auth_registry_has_mechanism (mechanisms, "SCRAM-SHA-1"))
+      if (out_handler != NULL)
         {
           /* XXX: check for username and password here? */
           DEBUG ("Choosing SCRAM-SHA-1 as auth mechanism");
-          priv->handler = WOCKY_AUTH_HANDLER (wocky_sasl_scram_new (
+          *out_handler = WOCKY_AUTH_HANDLER (wocky_sasl_scram_new (
               server, username, password));
         }
-      else if (wocky_auth_registry_has_mechanism (mechanisms,
-              WOCKY_AUTH_MECH_SASL_DIGEST_MD5))
+      return TRUE;
+    }
+
+  if (wocky_auth_registry_has_mechanism (mechanisms,
+          WOCKY_AUTH_MECH_SASL_DIGEST_MD5))
+    {
+      if (out_handler != NULL)
         {
           /* XXX: check for username and password here? */
-          priv->handler = WOCKY_AUTH_HANDLER (wocky_sasl_digest_md5_new (
+          *out_handler = WOCKY_AUTH_HANDLER (wocky_sasl_digest_md5_new (
                   server, username, password));
         }
-      else if (wocky_auth_registry_has_mechanism (mechanisms,
-              WOCKY_AUTH_MECH_JABBER_DIGEST))
+      return TRUE;
+    }
+
+  if (wocky_auth_registry_has_mechanism (mechanisms,
+          WOCKY_AUTH_MECH_JABBER_DIGEST))
+    {
+      if (out_handler != NULL)
         {
-          priv->handler = WOCKY_AUTH_HANDLER (wocky_jabber_auth_digest_new (
+          *out_handler = WOCKY_AUTH_HANDLER (wocky_jabber_auth_digest_new (
                   session_id, password));
         }
-      else if (allow_plain && wocky_auth_registry_has_mechanism (mechanisms,
-              WOCKY_AUTH_MECH_SASL_PLAIN))
+      return TRUE;
+    }
+
+  if (allow_plain && wocky_auth_registry_has_mechanism (mechanisms,
+          WOCKY_AUTH_MECH_SASL_PLAIN))
+    {
+      if (out_handler != NULL)
         {
           /* XXX: check for username and password here? */
           DEBUG ("Choosing PLAIN as auth mechanism");
-          priv->handler = WOCKY_AUTH_HANDLER (wocky_sasl_plain_new (
+          *out_handler = WOCKY_AUTH_HANDLER (wocky_sasl_plain_new (
                   username, password));
         }
-      else if (allow_plain && wocky_auth_registry_has_mechanism (mechanisms,
-              WOCKY_AUTH_MECH_JABBER_PASSWORD))
+      return TRUE;
+    }
+
+  if (allow_plain && wocky_auth_registry_has_mechanism (mechanisms,
+          WOCKY_AUTH_MECH_JABBER_PASSWORD))
+    {
+      if (out_handler != NULL)
         {
-          priv->handler = WOCKY_AUTH_HANDLER (wocky_jabber_auth_password_new (
+          *out_handler = WOCKY_AUTH_HANDLER (wocky_jabber_auth_password_new (
                   password));
         }
+      return TRUE;
     }
 
-  if (priv->handler == NULL)
+  if (out_handler)
+    *out_handler = NULL;
+
+  return FALSE;
+}
+
+
+static void
+wocky_auth_registry_start_auth_async_func (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)
+{
+  WockyAuthRegistryPrivate *priv = self->priv;
+  GSimpleAsyncResult *result;
+
+  result = g_simple_async_result_new (G_OBJECT (self), callback, user_data,
+      wocky_auth_registry_start_auth_async);
+
+  g_assert (priv->handler == NULL);
+
+  if (!wocky_auth_registry_select_handler (self, mechanisms,
+          allow_plain, username, password, server, session_id,
+          &priv->handler))
     {
       g_simple_async_result_set_error (result, WOCKY_AUTH_ERROR,
           WOCKY_AUTH_ERROR_NO_SUPPORTED_MECHANISMS,
@@ -509,3 +541,24 @@
   g_object_ref (handler);
   priv->handlers = g_slist_append (priv->handlers, handler);
 }
+
+/**
+ * wocky_auth_registry_supports_one_of:
+ * @self: a #WockyAuthRegistry
+ * @allow_plain: Whether auth in plain text is allowed
+ * @mechanisms: a #GSList of gchar* of auth mechanisms
+ *
+ * Checks whether at least one of @mechanisms is supported by Wocky. At present,
+ * Wocky itself only implements password-based authentication mechanisms.
+ *
+ * Returns: %TRUE if one of the @mechanisms is supported by wocky,
+ *  %FALSE otherwise.
+ */
+gboolean
+wocky_auth_registry_supports_one_of (WockyAuthRegistry *self,
+    const GSList *mechanisms,
+    gboolean allow_plain)
+{
+  return wocky_auth_registry_select_handler (self, mechanisms,
+          allow_plain, NULL, NULL, NULL, NULL, NULL);
+}
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-auth-registry.h telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-auth-registry.h
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-auth-registry.h	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-auth-registry.h	2011-11-15 09:14:09.000000000 +0000
@@ -54,6 +54,7 @@
 #define WOCKY_AUTH_MECH_JABBER_PASSWORD "X-WOCKY-JABBER-PASSWORD"
 #define WOCKY_AUTH_MECH_SASL_DIGEST_MD5 "DIGEST-MD5"
 #define WOCKY_AUTH_MECH_SASL_PLAIN "PLAIN"
+#define WOCKY_AUTH_MECH_SASL_SCRAM_SHA_1 "SCRAM-SHA-1"
 
 /**
  * WockyAuthRegistryStartData:
@@ -325,6 +326,10 @@
 void wocky_auth_registry_failure (WockyAuthRegistry *self,
     GError *error);
 
+gboolean wocky_auth_registry_supports_one_of (WockyAuthRegistry *self,
+    const GSList *mechanisms,
+    gboolean allow_plain);
+
 G_END_DECLS
 
 #endif /* _WOCKY_AUTH_REGISTRY_H */
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-c2s-porter.c telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-c2s-porter.c
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-c2s-porter.c	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-c2s-porter.c	2011-11-15 09:14:09.000000000 +0000
@@ -76,10 +76,12 @@
   gchar *full_jid;
   gchar *bare_jid;
   gchar *resource;
+  gchar *domain;
 
   /* Queue of (sending_queue_elem *) */
   GQueue *sending_queue;
   GCancellable *receive_cancellable;
+  gboolean sending_whitespace_ping;
 
   GSimpleAsyncResult *close_result;
   gboolean waiting_to_close;
@@ -102,7 +104,7 @@
   /* Queue of (owned WockyStanza *) */
   GQueue *unimportant_queue;
   /* List of (owned WockyStanza *) */
-  GList *queueable_stanza_patterns;
+  GQueue queueable_stanza_patterns;
 
   WockyXmppConnection *connection;
 };
@@ -340,7 +342,6 @@
   priv->handlers = NULL;
   priv->power_saving_mode = FALSE;
   priv->unimportant_queue = g_queue_new ();
-  priv->queueable_stanza_patterns = NULL;
 
   priv->iq_reply_handlers = g_hash_table_new_full (g_str_hash, g_str_equal,
       NULL, (GDestroyNotify) stanza_iq_handler_free);
@@ -361,7 +362,7 @@
 
   switch (property_id)
     {
-      gchar *node, *domain;
+      gchar *node;
 
       case PROP_CONNECTION:
         g_assert (priv->connection == NULL);
@@ -376,10 +377,9 @@
 
         priv->full_jid = g_value_dup_string (value);
         g_assert (priv->full_jid != NULL);
-        wocky_decode_jid (priv->full_jid, &node, &domain, &priv->resource);
-        priv->bare_jid = wocky_compose_jid (node, domain, NULL);
+        wocky_decode_jid (priv->full_jid, &node, &priv->domain, &priv->resource);
+        priv->bare_jid = wocky_compose_jid (node, priv->domain, NULL);
         g_free (node);
-        g_free (domain);
         break;
 
       default:
@@ -448,6 +448,9 @@
   WockyC2SPorter *self = WOCKY_C2S_PORTER (object);
   WockyC2SPorterPrivate *priv = self->priv;
 
+  if (G_OBJECT_CLASS (wocky_c2s_porter_parent_class)->constructed)
+    G_OBJECT_CLASS (wocky_c2s_porter_parent_class)->constructed (object);
+
   g_assert (priv->connection != NULL);
 
   /* Register the IQ reply handler */
@@ -571,12 +574,13 @@
 
   g_queue_free (priv->unimportant_queue);
 
-  g_list_foreach (priv->queueable_stanza_patterns, (GFunc) g_object_unref, NULL);
-  g_list_free (priv->queueable_stanza_patterns);
+  g_queue_foreach (&priv->queueable_stanza_patterns, (GFunc) g_object_unref, NULL);
+  g_queue_clear (&priv->queueable_stanza_patterns);
 
   g_free (priv->full_jid);
   g_free (priv->bare_jid);
   g_free (priv->resource);
+  g_free (priv->domain);
 
   G_OBJECT_CLASS (wocky_c2s_porter_parent_class)->finalize (object);
 }
@@ -627,35 +631,65 @@
 }
 
 static void
+terminate_sending_operations (WockyC2SPorter *self,
+    GError *error)
+{
+  WockyC2SPorterPrivate *priv = self->priv;
+  sending_queue_elem *elem;
+
+  g_return_if_fail (error != NULL);
+
+  while ((elem = g_queue_pop_head (priv->sending_queue)))
+    {
+      g_simple_async_result_set_from_error (elem->result, error);
+      g_simple_async_result_complete (elem->result);
+      sending_queue_elem_free (elem);
+    }
+}
+
+static gboolean
+sending_in_progress (WockyC2SPorter *self)
+{
+  WockyC2SPorterPrivate *priv = self->priv;
+
+  return g_queue_get_length (priv->sending_queue) > 0 ||
+    priv->sending_whitespace_ping;
+}
+
+static void
+close_if_waiting (WockyC2SPorter *self)
+{
+  WockyC2SPorterPrivate *priv = self->priv;
+
+  if (priv->waiting_to_close && !sending_in_progress (self))
+    {
+      /* Nothing to send left and we are waiting to close the connection. */
+      DEBUG ("Queue has been flushed. Closing the connection.");
+      send_close (self);
+    }
+}
+
+static void
 send_stanza_cb (GObject *source,
     GAsyncResult *res,
     gpointer user_data)
 {
   WockyC2SPorter *self = WOCKY_C2S_PORTER (user_data);
   WockyC2SPorterPrivate *priv = self->priv;
-  sending_queue_elem *elem;
   GError *error = NULL;
 
-  elem = g_queue_pop_head (priv->sending_queue);
-
   if (!wocky_xmpp_connection_send_stanza_finish (
         WOCKY_XMPP_CONNECTION (source), res, &error))
     {
       /* Sending failed. Cancel this sending operation and all the others
        * pending ones as we won't be able to send any more stanza. */
-
-      while (elem != NULL)
-        {
-          g_simple_async_result_set_from_error (elem->result, error);
-          g_simple_async_result_complete (elem->result);
-          sending_queue_elem_free (elem);
-          elem = g_queue_pop_head (priv->sending_queue);
-        }
-
+      terminate_sending_operations (self, error);
       g_error_free (error);
     }
   else
     {
+      sending_queue_elem *elem = g_queue_pop_head (priv->sending_queue);
+
       if (elem == NULL)
         /* The elem could have been removed from the queue if its sending
          * operation has already been completed (for example by forcing to
@@ -673,13 +707,7 @@
         }
     }
 
-  if (priv->waiting_to_close &&
-      g_queue_get_length (priv->sending_queue) == 0)
-    {
-      /* Queue is empty and we are waiting to close the connection. */
-      DEBUG ("Queue has been flushed. Closing the connection.");
-      send_close (self);
-    }
+  close_if_waiting (self);
 
   g_object_unref (self);
 }
@@ -723,7 +751,8 @@
       user_data);
   g_queue_push_tail (priv->sending_queue, elem);
 
-  if (g_queue_get_length (priv->sending_queue) == 1)
+  if (g_queue_get_length (priv->sending_queue) == 1 &&
+      !priv->sending_whitespace_ping)
     {
       send_head_stanza (self);
     }
@@ -788,7 +817,8 @@
 {
   return (nfrom == NULL ||
       !wocky_strdiff (nfrom, self->priv->full_jid) ||
-      !wocky_strdiff (nfrom, self->priv->bare_jid));
+      !wocky_strdiff (nfrom, self->priv->bare_jid) ||
+      !wocky_strdiff (nfrom, self->priv->domain));
 }
 
 /* Return TRUE if not spoofed. */
@@ -816,7 +846,7 @@
     goto finally;
 
   /* if we sent an IQ without a 'to' attribute, it's to our server: allow it
-   * to use our full or bare JID to reply */
+   * to use our full/bare JID or domain to reply */
   if (should_be_from == NULL)
     {
       if (stanza_is_from_server (self, nfrom))
@@ -1006,21 +1036,31 @@
 build_queueable_stanza_patterns (WockyC2SPorter *self)
 {
   WockyC2SPorterPrivate *priv = self->priv;
-  WockyStanza *pattern;
+  gchar **node_name = NULL;
+  gchar *node_names [] = {
+      "http://jabber.org/protocol/geoloc",
+      "http://jabber.org/protocol/nick",
+      "http://laptop.org/xmpp/buddy-properties",
+      "http://laptop.org/xmpp/activities",
+      "http://laptop.org/xmpp/current-activity",
+      "http://laptop.org/xmpp/activity-properties",
+      NULL};
+
+  for (node_name = node_names; *node_name != NULL ; node_name++)
+    {
+      WockyStanza *pattern = wocky_stanza_build (
+          WOCKY_STANZA_TYPE_MESSAGE,
+          WOCKY_STANZA_SUB_TYPE_NONE, NULL, NULL,
+          '(', "event",
+            ':', WOCKY_XMPP_NS_PUBSUB_EVENT,
+            '(', "items",
+            '@', "node", *node_name,
+            ')',
+          ')',
+          NULL);
 
-  if (priv->queueable_stanza_patterns != NULL)
-    return;
-
-  /* all PEP updates are queueable */
-  pattern = wocky_stanza_build (WOCKY_STANZA_TYPE_MESSAGE,
-      WOCKY_STANZA_SUB_TYPE_NONE, NULL, NULL,
-      '(', "event",
-        ':', WOCKY_XMPP_NS_PUBSUB_EVENT,
-      ')',
-      NULL);
-
-  priv->queueable_stanza_patterns = g_list_prepend (
-      priv->queueable_stanza_patterns, pattern);
+      g_queue_push_tail (&priv->queueable_stanza_patterns, pattern);
+    }
 }
 
 static gboolean
@@ -1045,11 +1085,11 @@
         }
     }
 
-  if (priv->queueable_stanza_patterns == NULL)
+  if (priv->queueable_stanza_patterns.length == 0)
     build_queueable_stanza_patterns (self);
 
   /* check whether stanza matches any of the queueable patterns */
-  for (l = priv->queueable_stanza_patterns; l != NULL; l = l->next)
+  for (l = priv->queueable_stanza_patterns.head; l != NULL; l = l->next)
     {
       if (wocky_node_is_superset (node, wocky_stanza_get_top_node (
           WOCKY_STANZA (l->data))))
@@ -1121,9 +1161,10 @@
   WockyC2SPorterPrivate *priv = self->priv;
   gboolean error_occured = TRUE;
 
-  /* Completing a close operation, firing the remote-error signal could make the
-   * user unref the porter. Ref it so, in such case, it would stay alive until
-   * we have finished to threat the error. */
+  /* Completing a close operation and firing the remote-closed/remote-error
+   * signals could make the library user unref the porter. So we take a
+   * reference to ourself for the duration of this function.
+   */
   g_object_ref (self);
 
   /* Complete pending send IQ operations as we won't be able to receive their
@@ -1263,9 +1304,10 @@
       return;
     }
 
-  /* Handling a stanza could make the user unref the porter.
-   * Ref it so, in such case, it would stay alive until we have finished to
-   * threat the stanza. */
+  /* Calling out to a stanza handler could make the library user unref the
+   * porter; hence, we take a reference to ourself for the rest of the
+   * function.
+   */
   g_object_ref (self);
 
   queue_or_handle_stanza (self, stanza);
@@ -1423,7 +1465,7 @@
 
   g_signal_emit_by_name (self, "closing");
 
-  if (g_queue_get_length (priv->sending_queue) > 0)
+  if (sending_in_progress (self))
     {
       DEBUG ("Sending queue is not empty. Flushing it before "
           "closing the connection.");
@@ -1709,8 +1751,12 @@
  * mode is disabled.
  *
  * Queueable stanzas are:
- *  -  and 
- *  - all PEP updates
+ *
+ * 
+ *  <presence/> and
+ *      <presence type="unavailable"/>;
+ *  PEP updates for a hardcoded list of namespaces.
+ * 
  *
  * Whenever stanza is handled, all previously queued stanzas
  * (if any) are handled as well, in the order they arrived. This preserves
@@ -1892,7 +1938,6 @@
 {
   WockyC2SPorter *self = WOCKY_C2S_PORTER (porter);
   WockyC2SPorterPrivate *priv = self->priv;
-  sending_queue_elem *elem;
   GError err = { WOCKY_PORTER_ERROR, WOCKY_PORTER_ERROR_FORCIBLY_CLOSED,
       "Porter was closed forcibly" };
 
@@ -1953,14 +1998,7 @@
   g_object_unref (self);
 
   /* Terminate all the pending sending operations */
-  elem = g_queue_pop_head (priv->sending_queue);
-  while (elem != NULL)
-    {
-      g_simple_async_result_set_from_error (elem->result, &err);
-      g_simple_async_result_complete_in_idle (elem->result);
-      sending_queue_elem_free (elem);
-      elem = g_queue_pop_head (priv->sending_queue);
-    }
+  terminate_sending_operations (self, &err);
 
   /* Terminate all the pending send IQ operations */
   abort_pending_iqs (self, &err);
@@ -2011,6 +2049,113 @@
   return TRUE;
 }
 
+static void
+send_whitespace_ping_cb (GObject *source,
+    GAsyncResult *res,
+    gpointer user_data)
+{
+  GSimpleAsyncResult *res_out = user_data;
+  WockyC2SPorter *self = WOCKY_C2S_PORTER (
+      g_async_result_get_source_object (G_ASYNC_RESULT (res_out)));
+  WockyC2SPorterPrivate *priv = self->priv;
+  GError *error = NULL;
+
+  priv->sending_whitespace_ping = FALSE;
+
+  if (!wocky_xmpp_connection_send_whitespace_ping_finish (
+        WOCKY_XMPP_CONNECTION (source), res, &error))
+    {
+      g_simple_async_result_set_from_error (res_out, error);
+      g_simple_async_result_complete (res_out);
+
+      /* Sending the ping failed; there is no point in trying to send
+       * anything else at this point. */
+      terminate_sending_operations (self, error);
+
+      g_error_free (error);
+    }
+  else
+    {
+      g_simple_async_result_complete (res_out);
+
+      /* Somebody could have tried sending a stanza while we were sending
+       * the ping */
+      if (g_queue_get_length (priv->sending_queue) > 0)
+        send_head_stanza (self);
+    }
+
+  close_if_waiting (self);
+
+  g_object_unref (self);
+  g_object_unref (res_out);
+}
+
+/**
+ * wocky_c2s_porter_send_whitespace_ping_async:
+ * @self: a #WockyC2SPorter
+ * @cancellable: optional GCancellable object, NULL to ignore.
+ * @callback: callback to call when the request is satisfied.
+ * @user_data: the data to pass to callback function.
+ *
+ * Request asynchronous sending of a whitespace ping. When the operation is
+ * finished @callback will be called. You can then call
+ * wocky_c2s_porter_send_whitespace_ping_finish() to get the result of the
+ * operation.
+ * No pings are sent if there are already other stanzas or pings being sent
+ * when this function is called; it would be useless.
+ */
+void
+wocky_c2s_porter_send_whitespace_ping_async (WockyC2SPorter *self,
+    GCancellable *cancellable,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
+{
+  WockyC2SPorterPrivate *priv = self->priv;
+  GSimpleAsyncResult *result = g_simple_async_result_new (G_OBJECT (self),
+      callback, user_data, wocky_c2s_porter_send_whitespace_ping_async);
+
+  if (priv->close_result != NULL || priv->force_close_result != NULL)
+    {
+      g_simple_async_result_set_error (result, WOCKY_PORTER_ERROR,
+          WOCKY_PORTER_ERROR_CLOSING, "Porter is closing");
+      g_simple_async_result_complete_in_idle (result);
+    }
+  else if (sending_in_progress (self))
+    {
+      g_simple_async_result_complete_in_idle (result);
+    }
+  else
+    {
+      priv->sending_whitespace_ping = TRUE;
+
+      wocky_xmpp_connection_send_whitespace_ping_async (priv->connection,
+          cancellable, send_whitespace_ping_cb, g_object_ref (result));
+
+      g_signal_emit_by_name (self, "sending");
+    }
+
+  g_object_unref (result);
+}
+
+/**
+ * wocky_c2s_porter_send_whitespace_ping_finish:
+ * @self: a #WockyC2SPorter
+ * @result: a GAsyncResult.
+ * @error: a GError location to store the error occuring, or NULL to ignore.
+ *
+ * Finishes sending a whitespace ping.
+ *
+ * Returns: TRUE if the ping was succesfully sent, FALSE on error.
+ */
+gboolean
+wocky_c2s_porter_send_whitespace_ping_finish (WockyC2SPorter *self,
+    GAsyncResult *result,
+    GError **error)
+{
+  wocky_implement_finish_void (self,
+      wocky_c2s_porter_send_whitespace_ping_async);
+}
+
 static const gchar *
 wocky_c2s_porter_get_full_jid (WockyPorter *porter)
 {
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-c2s-porter.h telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-c2s-porter.h
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-c2s-porter.h	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-c2s-porter.h	2011-09-07 14:05:52.000000000 +0000
@@ -78,6 +78,17 @@
 WockyPorter * wocky_c2s_porter_new (WockyXmppConnection *connection,
     const gchar *full_jid);
 
+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 (
+    WockyC2SPorter *self,
+    GAsyncResult *result,
+    GError **error);
+
 guint wocky_c2s_porter_register_handler_from_server_va (
     WockyC2SPorter *self,
     WockyStanzaType type,
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-caps-hash.c telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-caps-hash.c
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-caps-hash.c	2011-04-22 10:01:35.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-caps-hash.c	2011-11-15 09:14:09.000000000 +0000
@@ -185,12 +185,21 @@
 
       if (field == NULL)
         {
-          DEBUG ("Data form is missing FORM_TYPE field");
-          goto cleanup;
+          DEBUG ("Data form is missing FORM_TYPE field; ignoring form and "
+              "moving onto next one");
+          continue;
         }
 
       form_name = g_value_get_string (field->default_value);
 
+      if (field->type != WOCKY_DATA_FORM_FIELD_TYPE_HIDDEN)
+        {
+          DEBUG ("FORM_TYPE field of form '%s' is not hidden; "
+              "ignoring form and moving onto next one",
+                 form_name);
+          continue;
+        }
+
       if (g_hash_table_lookup (form_names, form_name) != NULL)
         {
           DEBUG ("error: there are multiple data forms with the "
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-connector.c telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-connector.c
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-connector.c	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-connector.c	2011-09-07 14:05:52.000000000 +0000
@@ -873,20 +873,22 @@
       else
         g_clear_error (&error);
 
-      DEBUG ("Falling back to HOST connection");
-
       priv->state = WCON_TCP_CONNECTING;
-
       /* decode a hostname from the JID here: Don't check for an explicit *
        * connect host supplied by the user as we shouldn't even try a SRV *
        * connection in that case, and should therefore never get here     */
       wocky_decode_jid (priv->jid, &node, &host, NULL);
 
       if ((host != NULL) && (*host != '\0'))
-        connect_to_host_async (connector, host, port);
+        {
+          DEBUG ("Falling back to HOST connection to %s", host);
+          connect_to_host_async (connector, host, port);
+        }
       else
-        abort_connect_code (self, WOCKY_CONNECTOR_ERROR_BAD_JID,
-            "JID contains no domain: %s", priv->jid);
+        {
+          abort_connect_code (self, WOCKY_CONNECTOR_ERROR_BAD_JID,
+              "JID contains no domain: %s", priv->jid);
+        }
 
       g_free (node);
       g_free (host);
@@ -921,11 +923,12 @@
           DEBUG ("we previously hit a GIOError when connecting using SRV; "
               "reporting that error");
           abort_connect_error (connector, &priv->srv_connect_error,
-              "Bad SRV record");
+              "couldn't connect to server specified by SRV record");
         }
       else
         {
-          abort_connect_error (connector, &error, "connection failed");
+          abort_connect_error (connector, &error,
+              "couldn't connect to server");
         }
 
       g_error_free (error);
@@ -1032,7 +1035,7 @@
 
       DEBUG ("Beginning SSL handshake");
       wocky_tls_connector_secure_async (tls_connector,
-          priv->conn, TRUE, get_peername (self),
+          priv->conn, TRUE, get_peername (self), NULL,
           priv->cancellable, tls_connector_secure_cb, self);
 
       g_object_unref (tls_connector);
@@ -1105,7 +1108,8 @@
   priv->session_id = g_strdup (id);
 
   debug = state_message (priv, "");
-  DEBUG ("%s: received XMPP v%s stream open from server", debug, version);
+  DEBUG ("%s: received XMPP version=%s stream open from server", debug,
+      version != NULL ? version : "(unspecified)");
   g_free (debug);
 
   ver = (version != NULL) ? atof (version) : -1;
@@ -1117,12 +1121,13 @@
             "Server not XMPP 1.0 Compliant");
       else
         jabber_request_auth (self);
-      goto out;
     }
-
-  DEBUG ("waiting for feature stanza from server");
-  wocky_xmpp_connection_recv_stanza_async (priv->conn, priv->cancellable,
-      xmpp_features_cb, data);
+  else
+    {
+      DEBUG ("waiting for feature stanza from server");
+      wocky_xmpp_connection_recv_stanza_async (priv->conn, priv->cancellable,
+          xmpp_features_cb, data);
+    }
 
  out:
   g_free (version);
@@ -1223,7 +1228,7 @@
 
       tls_connector = wocky_tls_connector_new (priv->tls_handler);
       wocky_tls_connector_secure_async (tls_connector,
-          priv->conn, FALSE, get_peername (self), priv->cancellable,
+          priv->conn, FALSE, get_peername (self), NULL, priv->cancellable,
           tls_connector_secure_cb, self);
 
       g_object_unref (tls_connector);
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-debug.h telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-debug.h
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-debug.h	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-debug.h	2011-09-07 14:05:52.000000000 +0000
@@ -78,20 +78,30 @@
 
 #ifdef DEBUG_FLAG
 
-#define DEBUG(format, ...) \
-  G_STMT_START { } G_STMT_END
-
-#define DEBUG_STANZA(stanza, format, ...) \
-  G_STMT_START { } G_STMT_END
-
-#define DEBUG_NODE_TREE(stanza, format, ...) \
-  G_STMT_START { } G_STMT_END
+static inline void
+DEBUG (
+    const gchar *format,
+    ...)
+{
+  /* blah blah blah */
+}
+
+static inline void
+DEBUG_STANZA (WockyStanza *stanza,
+    const gchar *format,
+    ...)
+{
+}
+
+static inline void
+DEBUG_NODE_TREE (WockyNodeTree *tree,
+    const gchar *format,
+    ...)
+{
+}
 
 #define DEBUGGING 0
 
-#define NODE_DEBUG(n, s) \
-  G_STMT_START { } G_STMT_END
-
 #endif /* DEBUG_FLAG */
 
 #endif /* ENABLE_DEBUG */
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-heartbeat-source.c telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-heartbeat-source.c
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-heartbeat-source.c	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-heartbeat-source.c	2011-07-07 11:03:56.000000000 +0000
@@ -64,28 +64,64 @@
     }
 }
 
+static guint
+recommended_intervals[] = {
+    IPHB_GS_WAIT_10_HOURS,
+    IPHB_GS_WAIT_2_HOURS,
+    IPHB_GS_WAIT_1_HOUR,
+    IPHB_GS_WAIT_30_MINS,
+    IPHB_GS_WAIT_10_MINS * 2, /* It aligns with the 1 hour slot. */
+    IPHB_GS_WAIT_10_MINS,
+    IPHB_GS_WAIT_5_MINS,
+    IPHB_GS_WAIT_2_5_MINS,
+    IPHB_GS_WAIT_30_SEC};
+
+static guint
+get_system_sync_interval (guint max_interval)
+{
+  guint i;
+
+  for (i = 0; i < G_N_ELEMENTS (recommended_intervals); i++)
+    {
+      if (recommended_intervals[i] <= max_interval)
+        return recommended_intervals[i];
+    }
+
+  return max_interval;
+}
+
 static void
 wocky_heartbeat_source_wait (
     WockyHeartbeatSource *self,
-    guint min_interval,
     guint max_interval)
 {
+  guint interval;
   int ret;
 
-  g_return_if_fail (max_interval == 0 || min_interval < max_interval);
-
   if (self->heartbeat == NULL)
     return;
 
   if (max_interval > 0)
-    ret = iphb_wait (self->heartbeat, min_interval, max_interval, 0);
+    {
+      /* Passing the same minimum and maximum interval to iphb_wait() means
+       * that the iphb daemon will wake us up when its internal time is a
+       * multiple of the interval.
+       * By using recommended intervals across the platform we can get
+       * multiple processes waken up at the same time. */
+      interval = get_system_sync_interval (max_interval);
+      DEBUG ("requested %u as maximum interval; using the recommended %u "
+          "interval", max_interval, interval);
+      ret = iphb_wait (self->heartbeat, interval, interval, 0);
+    }
   else
-    ret = iphb_I_woke_up (self->heartbeat);
+    {
+      ret = iphb_I_woke_up (self->heartbeat);
+    }
 
   if (ret == -1)
     {
-      DEBUG ("waiting (%u, %u) failed: %s; falling back to internal timeouts",
-          min_interval, max_interval, g_strerror (errno));
+      DEBUG ("waiting %u failed: %s; falling back to internal timeouts",
+          max_interval, g_strerror (errno));
       wocky_heartbeat_source_degrade (self);
     }
 }
@@ -217,8 +253,7 @@
   ((WockyHeartbeatCallback) callback) (user_data);
 
 #if HAVE_IPHB
-  wocky_heartbeat_source_wait (self, get_min_interval (self),
-      self->max_interval);
+  wocky_heartbeat_source_wait (self, self->max_interval);
 #endif
 
   /* Record the time we next want to wake up. */
@@ -269,11 +304,7 @@
   self->fd.events = G_IO_IN | G_IO_HUP | G_IO_ERR;
   g_source_add_poll (source, &self->fd);
 
-  /* We initially wait for anywhere between (0, max_interval) rather than
-   * (min_interval, max_interval) to fall into step with other connections,
-   * which may have started waiting at slightly different times.
-   */
-  wocky_heartbeat_source_wait (self, 0, self->max_interval);
+  wocky_heartbeat_source_wait (self, self->max_interval);
 }
 #endif
 
@@ -359,7 +390,7 @@
    * slightly different times.
    */
   if (self->max_interval == 0 || max_interval == 0)
-    wocky_heartbeat_source_wait (self, 0, max_interval);
+    wocky_heartbeat_source_wait (self, max_interval);
 #endif
 
   /* If we were previously disabled, we need to re-initialize next_wakeup, not
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-jabber-auth.c telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-jabber-auth.c
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-jabber-auth.c	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-jabber-auth.c	2011-07-07 11:03:56.000000000 +0000
@@ -647,6 +647,11 @@
       NULL, NULL,
       '@', "id", id,
       '(', "query", ':', WOCKY_JABBER_NS_AUTH,
+      /* This is a workaround for
+       * : while
+       *  doesn't require
+       * us to include a username, it seems to be required by jabberd 1.4.
+       */
       '(', "username",
       '$', priv->username,
       ')',
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-meta-porter.c telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-meta-porter.c
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-meta-porter.c	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-meta-porter.c	2011-07-07 11:03:56.000000000 +0000
@@ -550,10 +550,21 @@
     gpointer user_data)
 {
   WockyMetaPorter *self = user_data;
-  GSocketAddress *addr = g_socket_connection_get_remote_address (
-      socket_connection, NULL);
+  GSocketAddress *addr;
   GInetAddress *inet_address;
   gchar *str;
+  GError *error = NULL;
+
+  addr = g_socket_connection_get_remote_address (
+      socket_connection, &error);
+
+  if (addr == NULL)
+    {
+      DEBUG ("New connection, but failed to get remote address "
+          "so ignoring: %s", error->message);
+      g_clear_error (&error);
+      return FALSE;
+    }
 
   addr = normalize_address (addr);
 
@@ -562,7 +573,7 @@
 
   str = g_inet_address_to_string (inet_address);
 
-  DEBUG ("new connection from %s!", str);
+  DEBUG ("New connection from %s!", str);
 
   wocky_ll_connector_incoming_async (G_IO_STREAM (socket_connection),
       NULL, new_connection_connect_cb, g_object_ref (self));
@@ -680,6 +691,9 @@
   WockyMetaPorter *self = WOCKY_META_PORTER (obj);
   WockyMetaPorterPrivate *priv = self->priv;
 
+  if (G_OBJECT_CLASS (wocky_meta_porter_parent_class)->constructed)
+    G_OBJECT_CLASS (wocky_meta_porter_parent_class)->constructed (obj);
+
   priv->listener = g_socket_service_new ();
   g_signal_connect (priv->listener, "incoming",
       G_CALLBACK (_new_connection), self);
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-muc.c telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-muc.c
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-muc.c	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-muc.c	2011-11-15 09:14:09.000000000 +0000
@@ -349,27 +349,27 @@
 
   signals[SIG_NICK_CHANGE] = g_signal_new ("nick-change", ctype,
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _wocky_signals_marshal_VOID__POINTER_POINTER,
+      _wocky_signals_marshal_VOID__POINTER_UINT,
       G_TYPE_NONE, 2,
-      WOCKY_TYPE_STANZA, G_TYPE_HASH_TABLE);
+      WOCKY_TYPE_STANZA, G_TYPE_UINT);
 
   signals[SIG_PRESENCE] = g_signal_new ("presence", ctype,
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _wocky_signals_marshal_VOID__OBJECT_BOXED_POINTER,
+      _wocky_signals_marshal_VOID__OBJECT_UINT_POINTER,
       G_TYPE_NONE, 3,
-      WOCKY_TYPE_STANZA, G_TYPE_HASH_TABLE, G_TYPE_POINTER);
+      WOCKY_TYPE_STANZA, G_TYPE_UINT, G_TYPE_POINTER);
 
   signals[SIG_OWN_PRESENCE] = g_signal_new ("own-presence", ctype,
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _wocky_signals_marshal_VOID__OBJECT_BOXED,
+      _wocky_signals_marshal_VOID__OBJECT_UINT,
       G_TYPE_NONE, 2,
-      WOCKY_TYPE_STANZA, G_TYPE_HASH_TABLE);
+      WOCKY_TYPE_STANZA, G_TYPE_UINT);
 
   signals[SIG_JOINED] = g_signal_new ("joined", ctype,
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _wocky_signals_marshal_VOID__POINTER_POINTER,
+      _wocky_signals_marshal_VOID__POINTER_UINT,
       G_TYPE_NONE, 2,
-      WOCKY_TYPE_STANZA, G_TYPE_HASH_TABLE);
+      WOCKY_TYPE_STANZA, G_TYPE_UINT);
 
   signals[SIG_PRESENCE_ERROR] = g_signal_new ("error", ctype,
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
@@ -380,27 +380,27 @@
   /* These signals convey actor(jid) + reason */
   signals[SIG_PERM_CHANGE] = g_signal_new ("permissions", ctype,
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _wocky_signals_marshal_VOID__POINTER_POINTER_POINTER_POINTER,
+      _wocky_signals_marshal_VOID__POINTER_UINT_POINTER_POINTER,
       G_TYPE_NONE, 4,
-      WOCKY_TYPE_STANZA, G_TYPE_HASH_TABLE, G_TYPE_STRING, G_TYPE_STRING);
+      WOCKY_TYPE_STANZA, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING);
 
   /* and these two pass on any message as well: */
   signals[SIG_PARTED] = g_signal_new ("parted", ctype,
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _wocky_signals_marshal_VOID__OBJECT_BOXED_STRING_STRING_STRING,
+      _wocky_signals_marshal_VOID__OBJECT_UINT_STRING_STRING_STRING,
       G_TYPE_NONE, 5,
       WOCKY_TYPE_STANZA,
-      G_TYPE_HASH_TABLE,
+      G_TYPE_UINT,
       G_TYPE_STRING,  /* actor jid */
       G_TYPE_STRING,  /* reason    */
       G_TYPE_STRING); /* message: usually none, but allowed by spec */
 
   signals[SIG_LEFT] = g_signal_new ("left", ctype,
       G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      _wocky_signals_marshal_VOID__OBJECT_BOXED_POINTER_STRING_STRING_STRING,
+      _wocky_signals_marshal_VOID__OBJECT_UINT_POINTER_STRING_STRING_STRING,
       G_TYPE_NONE, 6,
       WOCKY_TYPE_STANZA,
-      G_TYPE_HASH_TABLE,
+      G_TYPE_UINT,
       G_TYPE_POINTER,  /* member struct   */
       G_TYPE_STRING,   /* actor jid       */
       G_TYPE_STRING,   /* reason          */
@@ -413,7 +413,7 @@
       WOCKY_TYPE_STANZA,
       WOCKY_TYPE_MUC_MSG_TYPE,    /* WockyMucMsgType  */
       G_TYPE_STRING,  /* XMPP msg ID      */
-      G_TYPE_LONG,    /* time_t           */
+      G_TYPE_DATE_TIME, /* timestamp      */
       G_TYPE_POINTER, /* WockyMucMember * */
       G_TYPE_STRING,  /* content          */
       G_TYPE_STRING,  /* subject          */
@@ -426,7 +426,7 @@
       WOCKY_TYPE_STANZA,
       WOCKY_TYPE_MUC_MSG_TYPE,    /* WockyMucMsgType  */
       G_TYPE_STRING,  /* XMPP msg ID      */
-      G_TYPE_LONG,    /* time_t           */
+      G_TYPE_DATE_TIME, /* timestamp      */
       G_TYPE_POINTER, /* WockyMucMember * */
       G_TYPE_STRING,  /* content          */
       WOCKY_TYPE_XMPP_ERROR,    /* WockyXmppError   */
@@ -563,7 +563,7 @@
 }
 
 static guint
-status_code_to_muc_flag (guint code)
+status_code_to_muc_flag (guint64 code)
 {
   switch (code)
     {
@@ -851,96 +851,59 @@
         NULL);
 }
 
-static gboolean
-presence_code (WockyNode *node, gpointer data)
+static guint
+extract_status_codes (WockyNode *x)
 {
-  const gchar *code = NULL;
-  GHashTable *status = data;
-  gulong cnum = 0;
-
-  if (wocky_strdiff (node->name, "status"))
-    return TRUE;
-
-  code = wocky_node_get_attribute (node, "code");
-
-  if (code == NULL)    return TRUE;
+  guint codes = 0;
+  WockyNodeIter iter;
+  WockyNode *node;
 
-  cnum = (gulong) g_ascii_strtoull (code, NULL, 10);
-
-  if (cnum == 0)
-    return TRUE;
+  wocky_node_iter_init (&iter, x, "status", NULL);
+  while (wocky_node_iter_next (&iter, &node))
+    {
+      const gchar *code;
+      WockyMucStatusCode cnum;
 
-  cnum = status_code_to_muc_flag ((guint) cnum);
+      code = wocky_node_get_attribute (node, "code");
 
-  g_hash_table_insert (status, (gpointer)cnum, (gpointer)cnum);
+      if (code == NULL)
+        continue;
 
-  /* OWN_PRESENCE  is a SHOULD       *
-   * CHANGE_FORCED is a MUST   which *
-   * implies OWN_PRESENCE            */
-  /* 201 (NEW_ROOM) also implies OWN_PRESENCE */
-  if (cnum == WOCKY_MUC_CODE_NICK_CHANGE_FORCED)
-    g_hash_table_insert (status,
-        (gpointer)WOCKY_MUC_CODE_OWN_PRESENCE,
-        (gpointer)WOCKY_MUC_CODE_OWN_PRESENCE);
-
-  if (cnum == WOCKY_MUC_CODE_NEW_ROOM)
-    g_hash_table_insert (status,
-        (gpointer)WOCKY_MUC_CODE_OWN_PRESENCE,
-        (gpointer)WOCKY_MUC_CODE_OWN_PRESENCE);
+      cnum = status_code_to_muc_flag (g_ascii_strtoull (code, NULL, 10));
+      codes |= cnum;
 
-  return TRUE;
-}
+      /* OWN_PRESENCE  is a SHOULD       *
+       * CHANGE_FORCED is a MUST   which *
+       * implies OWN_PRESENCE            */
+      /* 201 (NEW_ROOM) also implies OWN_PRESENCE */
+      if (cnum == WOCKY_MUC_CODE_NICK_CHANGE_FORCED)
+        codes |= WOCKY_MUC_CODE_OWN_PRESENCE;
 
-static gboolean
-presence_status (WockyNode *node, gpointer data)
-{
-  GString **status = data;
-
-  if (wocky_strdiff (node->name, "status"))
-    return TRUE;
-
-  if (node->content != NULL)
-    {
-      if (*status == NULL)
-        *status = g_string_new (node->content);
-      else
-        g_string_append (*status, node->content);
+      if (cnum == WOCKY_MUC_CODE_NEW_ROOM)
+        codes |= WOCKY_MUC_CODE_OWN_PRESENCE;
     }
 
-  return TRUE;
+  return codes;
 }
 
 static void
-presence_features (gpointer key,
-    gpointer val,
-    gpointer data)
+presence_features (
+    WockyMucPrivate *priv,
+    guint codes)
 {
-  WockyMucStatusCode code = (WockyMucStatusCode) key;
-  WockyMucPrivate *priv = data;
-
-  switch (code)
+  if ((codes & WOCKY_MUC_CODE_CFG_ONYMOUS) != 0)
     {
-      case WOCKY_MUC_CODE_CFG_SHOW_UNAVAILABLE:
-      case WOCKY_MUC_CODE_CFG_HIDE_UNAVAILABLE:
-      case WOCKY_MUC_CODE_CFG_NONPRIVACY:
-      case WOCKY_MUC_CODE_CFG_LOGGING_ENABLED:
-      case WOCKY_MUC_CODE_CFG_LOGGING_DISABLED:
-        /* unhandled room config change: */
-        break;
-      case WOCKY_MUC_CODE_CFG_ONYMOUS:
-        priv->room_type |= WOCKY_MUC_NONANONYMOUS;
-        priv->room_type &= ~WOCKY_MUC_SEMIANONYMOUS;
-        break;
-      case WOCKY_MUC_CODE_CFG_SEMIONYMOUS:
-        priv->room_type |= WOCKY_MUC_SEMIANONYMOUS;
-        priv->room_type &= ~WOCKY_MUC_NONANONYMOUS;
-        break;
-      case WOCKY_MUC_CODE_CFG_ANONYMOUS:
-        priv->room_type &= ~(WOCKY_MUC_NONANONYMOUS|WOCKY_MUC_SEMIANONYMOUS);
-        break;
-      default:
-        break;
-        /* non config change, don't care */
+      priv->room_type |= WOCKY_MUC_NONANONYMOUS;
+      priv->room_type &= ~WOCKY_MUC_SEMIANONYMOUS;
+    }
+  else if ((codes & WOCKY_MUC_CODE_CFG_SEMIONYMOUS) != 0)
+    {
+      priv->room_type |= WOCKY_MUC_SEMIANONYMOUS;
+      priv->room_type &= ~WOCKY_MUC_NONANONYMOUS;
+    }
+  else if ((codes & WOCKY_MUC_CODE_CFG_ANONYMOUS) != 0)
+    {
+      priv->room_type &= ~(WOCKY_MUC_NONANONYMOUS|WOCKY_MUC_SEMIANONYMOUS);
     }
 }
 
@@ -951,7 +914,7 @@
       place = g_strdup (val);                   \
     }
 
-static gboolean
+static void
 handle_self_presence (WockyMuc *muc,
     WockyStanza *stanza,
     const gchar *nick,
@@ -960,7 +923,7 @@
     const gchar *actor,
     const gchar *why,
     const gchar *status,
-    GHashTable *code)
+    guint codes)
 {
   gboolean nick_update = FALSE;
   gboolean permission_update = FALSE;
@@ -982,7 +945,7 @@
   priv->role = role;
   priv->affiliation = aff;
 
-  g_hash_table_foreach (code, presence_features, priv);
+  presence_features (priv, codes);
 
   if (nick_update)
     {
@@ -991,13 +954,11 @@
 
       g_free (priv->jid);
       priv->jid = new_jid;
-      g_signal_emit (muc, signals[SIG_NICK_CHANGE], 0, stanza, code);
+      g_signal_emit (muc, signals[SIG_NICK_CHANGE], 0, stanza, codes);
     }
 
   if (permission_update)
-    g_signal_emit (muc, signals[SIG_PERM_CHANGE], 0, stanza, code, actor, why);
-
-  return TRUE;
+    g_signal_emit (muc, signals[SIG_PERM_CHANGE], 0, stanza, codes, actor, why);
 }
 
 static gboolean
@@ -1011,7 +972,7 @@
     const gchar *actor,
     const gchar *why,
     const gchar *status,
-    GHashTable *code)
+    guint codes)
 {
   WockyMucPrivate *priv = muc->priv;
   WockyMucMember *member = NULL;
@@ -1046,7 +1007,7 @@
   member->presence_stanza = g_object_ref (stanza);
 
   if (priv->state >= WOCKY_MUC_JOINED)
-    g_signal_emit (muc, signals[SIG_PRESENCE], 0, stanza, code, member);
+    g_signal_emit (muc, signals[SIG_PRESENCE], 0, stanza, codes, member);
 
   return TRUE;
 }
@@ -1087,12 +1048,9 @@
 static gboolean
 handle_presence_standard (WockyMuc *muc,
     WockyStanza *stanza,
-    WockyStanzaSubType type)
+    WockyStanzaSubType type,
+    const gchar *resource)
 {
-  gchar *room = NULL;
-  gchar *serv = NULL;
-  gchar *nick = NULL;
-  gboolean ok = FALSE;
   WockyNode *node = wocky_stanza_get_top_node (stanza);
   WockyNode *x = wocky_node_get_child_ns (node,
       "x", WOCKY_NS_MUC_USER);
@@ -1102,183 +1060,141 @@
   const gchar *pnic = NULL;
   const gchar *role = NULL;
   const gchar *aff = NULL;
-  GHashTable *code = NULL;
+  guint codes = 0;
   const gchar *ajid = NULL;
   const gchar *why = NULL;
   WockyMucPrivate *priv = muc->priv;
   WockyMucRole r = WOCKY_MUC_ROLE_NONE;
   WockyMucAffiliation a = WOCKY_MUC_AFFILIATION_NONE;
   gboolean self_presence = FALSE;
-  GString *status_msg = NULL;
-  gchar *msg = NULL;
+  const gchar *msg = NULL;
 
-  if (from == NULL)
-    {
-      DEBUG ("presence stanza without from attribute, ignoring");
-      return FALSE;
-    }
+  msg = wocky_node_get_content_from_child (node, "status");
 
-  if (!wocky_decode_jid (from, &room, &serv, &nick))
-    {
-      ok = FALSE;
-      goto out;
-    }
+  if (x == NULL)
+    return FALSE;
 
-  wocky_node_each_child (node, presence_status, &status_msg);
-  if (status_msg != NULL)
-    msg = g_string_free (status_msg, FALSE);
+  item = wocky_node_get_child (x, "item");
 
-  if (x != NULL)
+  if (item != NULL)
     {
-      item = wocky_node_get_child (x, "item");
+      WockyNode *actor = NULL;
+      WockyNode *cause = NULL;
 
-      if (item != NULL)
-        {
-          WockyNode *actor = NULL;
-          WockyNode *cause = NULL;
+      pjid = wocky_node_get_attribute (item, "jid");
+      pnic = wocky_node_get_attribute (item, "nick");
+      role = wocky_node_get_attribute (item, "role");
+      aff = wocky_node_get_attribute (item, "affiliation");
+      actor = wocky_node_get_child (item, "actor");
+      cause = wocky_node_get_child (item, "reason");
 
-          pjid = wocky_node_get_attribute (item, "jid");
-          pnic = wocky_node_get_attribute (item, "nick");
-          role = wocky_node_get_attribute (item, "role");
-          aff = wocky_node_get_attribute (item, "affiliation");
-          actor = wocky_node_get_child (item, "actor");
-          cause = wocky_node_get_child (item, "reason");
+      r = string_to_role (role);
+      a = string_to_aff (aff);
 
-          r = string_to_role (role);
-          a = string_to_aff (aff);
+      if (actor != NULL)
+        ajid = wocky_node_get_attribute (actor, "jid");
 
-          if (actor != NULL)
-            ajid = wocky_node_get_attribute (actor, "jid");
+      if (cause != NULL)
+        why = cause->content;
+    }
 
-          if (cause != NULL)
-            why = cause->content;
-        }
+  /* if this was not in the item, set it from the envelope: */
+  if (pnic == NULL)
+    pnic = resource;
+
+  codes = extract_status_codes (x);
+  /* belt and braces: it is possible OWN_PRESENCE is not set, as it is   *
+   * only a SHOULD in the RFC: check the 'from' stanza attribute and the *
+   * jid item node attribute against the MUC jid and the users full jid  *
+   * respectively to see if this is our own presence                     */
+  if (!wocky_strdiff (priv->jid,  from) ||
+      !wocky_strdiff (priv->user, pjid) )
+    codes |= WOCKY_MUC_CODE_OWN_PRESENCE;
 
-      /* if this was not in the item, set it from the envelope: */
-      if (pnic == NULL)
-        pnic = nick;
-
-      code = g_hash_table_new (g_direct_hash, NULL);
-      wocky_node_each_child (x, presence_code, code);
-      /* belt and braces: it is possible OWN_PRESENCE is not set, as it is   *
-       * only a SHOULD in the RFC: check the 'from' stanza attribute and the *
-       * jid item node attribute against the MUC jid and the users full jid  *
-       * respectively to see if this is our own presence                     */
-      if (!wocky_strdiff (priv->jid,  from) ||
-          !wocky_strdiff (priv->user, pjid) )
-        g_hash_table_insert (code,
-            (gpointer)WOCKY_MUC_CODE_OWN_PRESENCE,
-            (gpointer)WOCKY_MUC_CODE_OWN_PRESENCE);
-
-      self_presence = g_hash_table_lookup (code,
-          (gpointer)WOCKY_MUC_CODE_OWN_PRESENCE) != NULL;
-
-      /* ok, we've extracted all the presence stanza data we should need: *
-       * if this was a presence notification, deal with it:               */
-      if (type == WOCKY_STANZA_SUB_TYPE_NONE)
+  self_presence = (codes & WOCKY_MUC_CODE_OWN_PRESENCE) != 0;
+
+  /* ok, we've extracted all the presence stanza data we should need: *
+   * if this was a presence notification, deal with it:               */
+  if (type == WOCKY_STANZA_SUB_TYPE_NONE)
+    {
+      /* if this was the first time we got our own presence it also means *
+       * we successfully joined the channel, so update our internal state *
+       * and emit the channel-joined signal                               */
+      if (self_presence)
         {
-          /* if this was the first time we got our own presence it also means *
-           * we successfully joined the channel, so update our internal state *
-           * and emit the channel-joined signal                               */
-          if (self_presence)
-            {
-              ok = handle_self_presence (muc, stanza,
-                  pnic, r, a, ajid, why, msg, code);
+          handle_self_presence (muc, stanza,
+              pnic, r, a, ajid, why, msg, codes);
 
-              if (priv->state < WOCKY_MUC_JOINED)
+          if (priv->state < WOCKY_MUC_JOINED)
+            {
+              priv->state = WOCKY_MUC_JOINED;
+              if (priv->join_cb != NULL)
                 {
-                  priv->state = WOCKY_MUC_JOINED;
-                  if (priv->join_cb != NULL)
-                    {
-                      g_simple_async_result_complete (priv->join_cb);
-                      g_object_unref (priv->join_cb);
-                      priv->join_cb = NULL;
-                    }
-                  g_signal_emit (muc, signals[SIG_JOINED], 0, stanza, code);
+                  g_simple_async_result_complete (priv->join_cb);
+                  g_object_unref (priv->join_cb);
+                  priv->join_cb = NULL;
                 }
-              else
-                g_signal_emit (muc, signals[SIG_OWN_PRESENCE], 0,
-                  stanza, code);
+              g_signal_emit (muc, signals[SIG_JOINED], 0, stanza, codes);
             }
-          /* if this is someone else's presence, update internal member list */
           else
-            {
-              ok =
-                handle_user_presence (muc,
-                    stanza,
-                    from, /* room@service/nick */
-                    pjid, /* jid attr from item */
-                    pnic, /* nick attr from item or /res from envelope 'from' */
-                    r, a, ajid, why, msg, code);
-            }
+            g_signal_emit (muc, signals[SIG_OWN_PRESENCE], 0,
+              stanza, codes);
+
+          /* Allow other handlers to run for this stanza. */
+          return FALSE;
         }
-      else if (type == WOCKY_STANZA_SUB_TYPE_UNAVAILABLE)
+      /* if this is someone else's presence, update internal member list */
+      else
+        {
+          return
+            handle_user_presence (muc,
+                stanza,
+                from, /* room@service/nick */
+                pjid, /* jid attr from item */
+                pnic, /* nick attr from item or /res from envelope 'from' */
+                r, a, ajid, why, msg, codes);
+        }
+    }
+  else if (type == WOCKY_STANZA_SUB_TYPE_UNAVAILABLE)
+    {
+      if (self_presence)
         {
-          if (self_presence)
+          priv->state = WOCKY_MUC_ENDED;
+          priv->role = WOCKY_MUC_ROLE_NONE;
+          g_signal_emit (muc, signals[SIG_PARTED], 0,
+              stanza, codes, ajid, why, msg);
+          return TRUE;
+        }
+      else
+        {
+          WockyMucMember *member =
+            g_hash_table_lookup (priv->members, from);
+
+          if (member == NULL)
             {
-              priv->state = WOCKY_MUC_ENDED;
-              priv->role = WOCKY_MUC_ROLE_NONE;
-              g_signal_emit (muc, signals[SIG_PARTED], 0,
-                  stanza, code, ajid, why, msg);
-              ok = TRUE;
+              DEBUG ("Someone not in the muc left!?");
+              return FALSE;
             }
-          else
-            {
-              WockyMucMember *member =
-                g_hash_table_lookup (priv->members, from);
 
-              if (member == NULL)
-                {
-                  DEBUG ("Someone not in the muc left!?");
-                  goto out;
-                }
-
-              g_signal_emit (muc, signals[SIG_LEFT], 0,
-                  stanza, code, member, ajid, why, msg);
+          g_signal_emit (muc, signals[SIG_LEFT], 0,
+              stanza, codes, member, ajid, why, msg);
 
-              g_hash_table_remove (priv->members, from);
-              ok = TRUE;
-            }
-          goto out;
+          g_hash_table_remove (priv->members, from);
+          return TRUE;
         }
     }
 
- out:
-  g_free (room);
-  g_free (serv);
-  g_free (nick);
-
-  g_free (msg);
-  if (code != NULL)
-    g_hash_table_unref (code);
-  return ok;
+  return FALSE;
 }
 
 static gboolean
 handle_presence_error (WockyMuc *muc,
-    WockyStanza *stanza,
-    WockyStanzaSubType type)
+    WockyStanza *stanza)
 {
   gboolean ok = FALSE;
-  gchar *room = NULL;
-  gchar *serv = NULL;
-  gchar *nick = NULL;
-  const gchar *from = wocky_stanza_get_from (stanza);
   WockyMucPrivate *priv = muc->priv;
   GError *error = NULL;
 
-  if (!wocky_decode_jid (from, &room, &serv, &nick))
-    {
-      DEBUG ("malformed 'from' attribute in presence error stanza");
-      goto out;
-    }
-
-  if (wocky_strdiff (room, priv->room) || wocky_strdiff (serv, priv->service))
-    {
-      DEBUG ("presence error is not from MUC - not handled");
-      goto out;
-    }
-
   wocky_stanza_extract_errors (stanza, NULL, &error, NULL, NULL);
 
   if (priv->state >= WOCKY_MUC_JOINED)
@@ -1293,10 +1209,6 @@
       error->message);
   g_clear_error (&error);
 
- out:
-  g_free (room);
-  g_free (serv);
-  g_free (nick);
   return ok;
 }
 
@@ -1306,27 +1218,30 @@
     gpointer data)
 {
   WockyMuc *muc = WOCKY_MUC (data);
-  WockyStanzaType type;
   WockyStanzaSubType subtype;
   gboolean handled = FALSE;
 
-  wocky_stanza_get_type_info (stanza, &type, &subtype);
-
-  if (type != WOCKY_STANZA_TYPE_PRESENCE)
-    {
-      g_warning ("presence handler received '%s' stanza",
-          wocky_stanza_get_top_node (stanza)->name);
-      return FALSE;
-    }
+  wocky_stanza_get_type_info (stanza, NULL, &subtype);
 
   switch (subtype)
     {
       case WOCKY_STANZA_SUB_TYPE_NONE:
       case WOCKY_STANZA_SUB_TYPE_UNAVAILABLE:
-        handled = handle_presence_standard (muc, stanza, subtype);
+      {
+        gchar *resource;
+
+        /* If the JID is unparseable, discard the stanza. The porter shouldn't
+         * even give us such stanzas. */
+        if (!wocky_decode_jid (wocky_stanza_get_from (stanza), NULL, NULL,
+              &resource))
+          return TRUE;
+
+        handled = handle_presence_standard (muc, stanza, subtype, resource);
+        g_free (resource);
         break;
+      }
       case WOCKY_STANZA_SUB_TYPE_ERROR:
-        handled = handle_presence_error (muc, stanza, subtype);
+        handled = handle_presence_error (muc, stanza);
         break;
       default:
         DEBUG ("unexpected stanza sub-type: %d", subtype);
@@ -1389,11 +1304,11 @@
 /*
  * Parse timestamp of delayed messages. For non-delayed, it's 0.
  */
-static time_t
+static GDateTime *
 extract_timestamp (WockyNode *msg)
 {
   WockyNode *x = wocky_node_get_child_ns (msg, "x", WOCKY_XMPP_NS_DELAY);
-  time_t stamp = 0;
+  GDateTime *stamp = NULL;
 
   if (x != NULL)
     {
@@ -1408,10 +1323,11 @@
           GTimeVal timeval = { 0, 0 };
           gchar *tm_dup = g_strdup_printf ("%sZ", tm);
 
+          /* FIXME: GTimeVal should go away */
           if (!g_time_val_from_iso8601 (tm_dup, &timeval))
             DEBUG ("Malformed date string '%s' for " WOCKY_XMPP_NS_DELAY, tm);
           else
-            stamp = timeval.tv_sec;
+            stamp = g_date_time_new_from_timeval_local (&timeval);
 
           g_free (tm_dup);
         }
@@ -1477,7 +1393,7 @@
   const gchar *from = wocky_node_get_attribute (msg, "from");
   const gchar *body = wocky_node_get_content_from_child (msg, "body");
   const gchar *subj = wocky_node_get_content_from_child (msg, "subject");
-  time_t stamp = extract_timestamp (msg);
+  GDateTime *datetime = extract_timestamp (msg);
   WockyStanzaSubType sub_type;
   WockyMucMsgType mtype;
   WockyMucMember *who = NULL;
@@ -1510,7 +1426,7 @@
 
       wocky_stanza_extract_errors (stanza, &etype, &error, NULL, NULL);
       g_signal_emit (muc, signals[SIG_MSG_ERR], 0,
-          stanza, mtype, id, stamp, who, body, error->code, etype);
+          stanza, mtype, id, datetime, who, body, error->code, etype);
       g_clear_error (&error);
     }
   else
@@ -1518,12 +1434,15 @@
       WockyMucMsgState mstate = extract_chat_state (msg);
 
       g_signal_emit (muc, signals[SIG_MSG], 0,
-          stanza, mtype, id, stamp, who, body, subj, mstate);
+          stanza, mtype, id, datetime, who, body, subj, mstate);
     }
 
   if (member_is_temporary)
     free_member (who);
 
+  if (datetime != NULL)
+    g_date_time_unref (datetime);
+
   return TRUE;
 }
 
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-muc.h telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-muc.h
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-muc.h	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-muc.h	2011-07-07 11:03:56.000000000 +0000
@@ -61,29 +61,31 @@
  *   members-only)
  * @WOCKY_MUC_CODE_KICKED_SHUTDOWN: Kicked (shutdown)
  *
- * #WockyMuc specific codes
+ * MUC status codes, as defined by XEP-0045
+ * §15.6.
  */
 typedef enum {
   WOCKY_MUC_CODE_UNKNOWN = 0,
-  WOCKY_MUC_CODE_ONYMOUS,
-  WOCKY_MUC_CODE_AF_CHANGE_OOB,
-  WOCKY_MUC_CODE_CFG_SHOW_UNAVAILABLE,
-  WOCKY_MUC_CODE_CFG_HIDE_UNAVAILABLE,
-  WOCKY_MUC_CODE_CFG_NONPRIVACY,
-  WOCKY_MUC_CODE_OWN_PRESENCE,
-  WOCKY_MUC_CODE_CFG_LOGGING_ENABLED,
-  WOCKY_MUC_CODE_CFG_LOGGING_DISABLED,
-  WOCKY_MUC_CODE_CFG_ONYMOUS,
-  WOCKY_MUC_CODE_CFG_SEMIONYMOUS,
-  WOCKY_MUC_CODE_CFG_ANONYMOUS,
-  WOCKY_MUC_CODE_NEW_ROOM,
-  WOCKY_MUC_CODE_NICK_CHANGE_FORCED,
-  WOCKY_MUC_CODE_BANNED,
-  WOCKY_MUC_CODE_NICK_CHANGE_USER,
-  WOCKY_MUC_CODE_KICKED,
-  WOCKY_MUC_CODE_KICKED_AFFILIATION,
-  WOCKY_MUC_CODE_KICKED_ROOM_PRIVATISED,
-  WOCKY_MUC_CODE_KICKED_SHUTDOWN,
+  WOCKY_MUC_CODE_ONYMOUS = 1 << 0,
+  WOCKY_MUC_CODE_AF_CHANGE_OOB = 1 << 1,
+  WOCKY_MUC_CODE_CFG_SHOW_UNAVAILABLE = 1 << 2,
+  WOCKY_MUC_CODE_CFG_HIDE_UNAVAILABLE = 1 << 3,
+  WOCKY_MUC_CODE_CFG_NONPRIVACY = 1 << 4,
+  WOCKY_MUC_CODE_OWN_PRESENCE = 1 << 5,
+  WOCKY_MUC_CODE_CFG_LOGGING_ENABLED = 1 << 6,
+  WOCKY_MUC_CODE_CFG_LOGGING_DISABLED = 1 << 7,
+  WOCKY_MUC_CODE_CFG_ONYMOUS = 1 << 8,
+  WOCKY_MUC_CODE_CFG_SEMIONYMOUS = 1 << 9,
+  WOCKY_MUC_CODE_CFG_ANONYMOUS = 1 << 10,
+  WOCKY_MUC_CODE_NEW_ROOM = 1 << 11,
+  WOCKY_MUC_CODE_NICK_CHANGE_FORCED = 1 << 12,
+  WOCKY_MUC_CODE_BANNED = 1 << 13,
+  WOCKY_MUC_CODE_NICK_CHANGE_USER = 1 << 14,
+  WOCKY_MUC_CODE_KICKED = 1 << 15,
+  WOCKY_MUC_CODE_KICKED_AFFILIATION = 1 << 16,
+  WOCKY_MUC_CODE_KICKED_ROOM_PRIVATISED = 1 << 17,
+  WOCKY_MUC_CODE_KICKED_SHUTDOWN = 1 << 18,
 } WockyMucStatusCode;
 
 /**
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-namespaces.h telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-namespaces.h
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-namespaces.h	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-namespaces.h	2011-05-09 13:06:44.000000000 +0000
@@ -68,9 +68,12 @@
 #define WOCKY_XMPP_NS_STANZAS \
   "urn:ietf:params:xml:ns:xmpp-stanzas"
 
-#define WOCKY_XMPP_NS_OOB \
+#define WOCKY_XMPP_NS_IQ_OOB \
   "jabber:iq:oob"
 
+#define WOCKY_XMPP_NS_X_OOB \
+  "jabber:x:oob"
+
 
 #define WOCKY_TELEPATHY_NS_CLIQUE \
   "http://telepathy.freedesktop.org/xmpp/clique"
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-node-tree.c telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-node-tree.c
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-node-tree.c	2011-01-17 16:19:05.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-node-tree.c	2011-11-15 09:14:09.000000000 +0000
@@ -151,10 +151,8 @@
  *
  * 
  * wocky_node_tree_new ("html", "http://www.w3.org/1999/xhtml",
- *    '(', "html", ':', "http://www.w3.org/1999/xhtml",
- *      '(', "body", '@', "textcolor", "red",
- *         '$', "Wocky wooo",
- *      ')',
+ *    '(', "body", '@', "textcolor", "red",
+ *       '$', "Wocky wooo",
  *    ')',
  *   NULL);
  * 
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-openssl.c telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-openssl.c
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-openssl.c	2011-05-03 13:00:42.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-openssl.c	2011-09-07 14:05:52.000000000 +0000
@@ -62,6 +62,7 @@
 #define DEBUG_ASYNC_DETAIL_LEVEL 6
 
 #include "wocky-debug.h"
+#include "wocky-tls-enumtypes.h"
 #include "wocky-utils.h"
 
 #include 
@@ -72,6 +73,26 @@
 #include 
 #include 
 
+/* SSL_CTX_set_cipher_list() allows to restrict/alter the list of supported
+ * ciphers; see ciphers(1) for documentation on the format.
+ * Usually the normal ciphers are ok, but on mobile phones we prefer RC4 as
+ * it decreases the size of packets. The bandwidth difference is tiny, but
+ * the difference in power consumption between small and very small packets
+ * can be significant on 3G. */
+#ifdef ENABLE_PREFER_STREAM_CIPHERS
+
+#define CIPHER_LIST \
+  "RC4-SHA:" \
+  "RC4-MD5:" \
+  "ECDHE-RSA-RC4-SHA:" \
+  "ECDHE-ECDSA-RC4-SHA:" \
+  "ECDH-RSA-RC4-SHA:" \
+  "ECDH-ECDSA-RC4-SHA:" \
+  "PSK-RC4-SHA:" \
+  "ALL" /* fall-back to all the other algorithms */
+
+#endif
+
 enum
 {
   PROP_S_NONE,
@@ -685,7 +706,6 @@
 
       if (want_write)
         {
-          int ignored;
           gchar *wbuf;
           GOutputStream *out = g_io_stream_get_output_stream (session->stream);
           long wsize = BIO_get_mem_data (session->wbio, &wbuf);
@@ -694,7 +714,7 @@
           if (wsize > 0)
             sent = g_output_stream_write (out, wbuf, wsize, NULL, error);
           DEBUG ("sent %" G_GSSIZE_FORMAT " cipherbytes", sent);
-          ignored = BIO_reset (session->wbio);
+          (void) BIO_reset (session->wbio);
         }
 
       if (want_read)
@@ -948,6 +968,43 @@
   return rval;
 }
 
+static gboolean
+check_peer_names (const char *peer_name,
+    GStrv extra_identities,
+    X509 *cert)
+{
+  gboolean tried = FALSE;
+
+  if (peer_name != NULL)
+    {
+      if (check_peer_name (peer_name, cert))
+        return TRUE;
+
+      tried = TRUE;
+    }
+
+  if (extra_identities != NULL)
+    {
+      gint i;
+
+      for (i = 0; extra_identities[i] != NULL; i++)
+        {
+          if (wocky_strdiff (extra_identities[i], peer_name))
+            {
+              if (check_peer_name (extra_identities[i], cert))
+                return TRUE;
+
+              tried = TRUE;
+            }
+        }
+    }
+
+  /* If no peer names were passed it means we didn't want to check the
+   * certificate against anything.
+   * If some attempts were made then it means the check failed. */
+  return !tried;
+}
+
 GPtrArray *
 wocky_tls_session_get_peers_certificate (WockyTLSSession *session,
     WockyTLSCertType *type)
@@ -997,11 +1054,11 @@
 int
 wocky_tls_session_verify_peer (WockyTLSSession    *session,
                                const gchar        *peername,
+                               GStrv               extra_identities,
                                WockyTLSVerificationLevel level,
                                WockyTLSCertStatus *status)
 {
   int rval = -1;
-  const gchar *check_level;
   X509 *cert;
   gboolean lenient = (level == WOCKY_TLS_VERIFY_LENIENT);
 
@@ -1012,21 +1069,16 @@
   switch (level)
     {
     case WOCKY_TLS_VERIFY_STRICT:
-      check_level = "WOCKY_TLS_VERIFY_STRICT";
-      break;
     case WOCKY_TLS_VERIFY_NORMAL:
-      check_level = "WOCKY_TLS_VERIFY_NORMAL";
-      break;
     case WOCKY_TLS_VERIFY_LENIENT:
-      check_level = "WOCKY_TLS_VERIFY_LENIENT";
       break;
     default:
       g_warn_if_reached ();
-      check_level = "Unknown strictness level";
       level = WOCKY_TLS_VERIFY_STRICT;
     }
 
-  DEBUG ("setting ssl verify flags level to: %s", check_level);
+  DEBUG ("setting ssl verify flags level to: %s",
+      wocky_enum_to_nick (WOCKY_TYPE_TLS_VERIFICATION_LEVEL, level));
   cert = SSL_get_peer_certificate (session->ssl);
   rval = SSL_get_verify_result (session->ssl);
   DEBUG ("X509 cert: %p; verified: %d", cert, rval);
@@ -1048,7 +1100,7 @@
           rval = X509_V_ERR_CERT_UNTRUSTED;
         }
     }
-  else if (peername != NULL && !check_peer_name (peername, cert))
+  else if (!check_peer_names (peername, extra_identities, cert))
     {
       /* Irrespective of whether the certificate is valid, if it's for the
        * wrong host that's arguably a more useful error condition to report.
@@ -1516,8 +1568,6 @@
   WockyTLSSession *session = WOCKY_TLS_SESSION (user_data);
   gint buffered = BIO_pending (session->wbio);
   gssize written;
-  /* memory BIO ops generally can't fail: suppress compiler/coverity warnings */
-  gint ignore_warning;
 
   if (tls_debug_level >= DEBUG_ASYNC_DETAIL_LEVEL)
     DEBUG ("");
@@ -1528,7 +1578,7 @@
   if (written == buffered)
     {
       DEBUG ("%d bytes written, clearing write BIO", buffered);
-      ignore_warning = BIO_reset (session->wbio);
+      (void) BIO_reset (session->wbio);
       wocky_tls_session_try_operation (session, WOCKY_TLS_OP_WRITE);
     }
   else
@@ -1542,8 +1592,8 @@
         {
           gchar *pending = g_memdup (buffer + written, psize);
 
-          ignore_warning = BIO_reset (session->wbio);
-          ignore_warning = BIO_write (session->wbio, pending, psize);
+          (void) BIO_reset (session->wbio);
+          (void) BIO_write (session->wbio, pending, psize);
           g_free (pending);
         }
 
@@ -1721,11 +1771,9 @@
   X509_STORE_set_flags (SSL_CTX_get_cert_store (session->ctx),
                         X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL);
 
-  /* If you want to restrict/alter the list of supported ciphers, do so *
-   * with this function: (CIPHER_LIST is a ':' separated list of names) *
-   * in which elements can be negated with a ! prefix                   *
-   * eg "all:!some-crypto-we-hate"                                      *
-   * SSL_CTX_set_cipher_list (session->ctx, CIPHER_LIST);               */
+#ifdef CIPHER_LIST
+  SSL_CTX_set_cipher_list (session->ctx, CIPHER_LIST);
+#endif
 
   if (session->server)
     {
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-ping.c telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-ping.c
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-ping.c	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-ping.c	2011-09-07 14:05:52.000000000 +0000
@@ -47,7 +47,7 @@
 /* private structure */
 struct _WockyPingPrivate
 {
-  WockyPorter *porter;
+  WockyC2SPorter *porter;
 
   guint ping_interval;
   GSource *heartbeat;
@@ -57,7 +57,7 @@
   gboolean dispose_has_run;
 };
 
-static void send_xmpp_ping (WockyPing *self);
+static void send_ping (WockyPing *self);
 static gboolean ping_iq_cb (WockyPorter *porter, WockyStanza *stanza,
     gpointer data);
 
@@ -128,7 +128,8 @@
 
   g_assert (priv->porter != NULL);
 
-  priv->ping_iq_cb = wocky_porter_register_handler_from_anyone (priv->porter,
+  priv->ping_iq_cb = wocky_porter_register_handler_from_anyone (
+      WOCKY_PORTER (priv->porter),
       WOCKY_STANZA_TYPE_IQ, WOCKY_STANZA_SUB_TYPE_GET,
       WOCKY_PORTER_HANDLER_PRIORITY_NORMAL, ping_iq_cb, self,
       '(', "ping",
@@ -136,8 +137,8 @@
       ')', NULL);
 
   priv->heartbeat = wocky_heartbeat_source_new (priv->ping_interval);
-  g_source_set_callback (priv->heartbeat, (GSourceFunc) send_xmpp_ping,
-      self, NULL);
+  g_source_set_callback (priv->heartbeat, (GSourceFunc) send_ping, self,
+      NULL);
   g_source_attach (priv->heartbeat, NULL);
 }
 
@@ -154,7 +155,8 @@
 
   if (priv->ping_iq_cb != 0)
     {
-      wocky_porter_unregister_handler (priv->porter, priv->ping_iq_cb);
+      wocky_porter_unregister_handler (WOCKY_PORTER (priv->porter),
+          priv->ping_iq_cb);
       priv->ping_iq_cb = 0;
     }
 
@@ -183,9 +185,9 @@
   object_class->get_property = wocky_ping_get_property;
   object_class->dispose = wocky_ping_dispose;
 
-  spec = g_param_spec_object ("porter", "Wocky porter",
+  spec = g_param_spec_object ("porter", "Wocky C2S porter",
       "the wocky porter to set up keepalive pings on",
-      WOCKY_TYPE_PORTER,
+      WOCKY_TYPE_C2S_PORTER,
       G_PARAM_READWRITE |
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_PORTER, spec);
@@ -199,9 +201,9 @@
 }
 
 WockyPing *
-wocky_ping_new (WockyPorter *porter, guint interval)
+wocky_ping_new (WockyC2SPorter *porter, guint interval)
 {
-  g_return_val_if_fail (WOCKY_IS_PORTER (porter), NULL);
+  g_return_val_if_fail (WOCKY_IS_C2S_PORTER (porter), NULL);
 
   return g_object_new (WOCKY_TYPE_PING,
       "porter", porter,
@@ -210,29 +212,23 @@
 }
 
 static void
-send_xmpp_ping (WockyPing *self)
+send_ping (WockyPing *self)
 {
-  WockyStanza *iq;
-
   g_return_if_fail (WOCKY_IS_PING (self));
 
-  iq = wocky_stanza_build (WOCKY_STANZA_TYPE_IQ,
-      WOCKY_STANZA_SUB_TYPE_GET, NULL, NULL,
-      '(', "ping",
-          ':', WOCKY_XMPP_NS_PING,
-      ')', NULL);
-
+  /* We send a whitespace ping and not a XMPP one to save bandwidth.
+   * As much as it can sound a stupidly small gain, it can be useful when
+   * sending pings on an idle cellular connection; very small packets can
+   * be sent using a low power 3G channel. */
   DEBUG ("pinging");
-  wocky_porter_send_iq_async (self->priv->porter, iq, NULL, NULL, NULL);
-  g_object_unref (iq);
+  wocky_c2s_porter_send_whitespace_ping_async (self->priv->porter, NULL,
+      NULL, NULL);
 }
 
 static gboolean
 ping_iq_cb (WockyPorter *porter, WockyStanza *stanza, gpointer data)
 {
-#ifdef ENABLE_DEBUG
   const gchar *from = wocky_stanza_get_from (stanza);
-#endif
 
   DEBUG ("replying to ping from %s", from ? from : "");
   wocky_porter_acknowledge_iq (porter, stanza, NULL);
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-ping.h telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-ping.h
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-ping.h	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-ping.h	2011-09-07 14:05:52.000000000 +0000
@@ -24,7 +24,7 @@
 #include 
 
 #include "wocky-types.h"
-#include "wocky-porter.h"
+#include "wocky-c2s-porter.h"
 
 G_BEGIN_DECLS
 
@@ -70,7 +70,7 @@
   (G_TYPE_INSTANCE_GET_CLASS ((obj), WOCKY_TYPE_PING, \
    WockyPingClass))
 
-WockyPing * wocky_ping_new (WockyPorter *porter, guint interval);
+WockyPing * wocky_ping_new (WockyC2SPorter *porter, guint interval);
 
 G_END_DECLS
 
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-pubsub-helpers.c telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-pubsub-helpers.c
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-pubsub-helpers.c	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-pubsub-helpers.c	2011-09-07 14:05:52.000000000 +0000
@@ -56,7 +56,7 @@
       '(', "event",
         ':', WOCKY_XMPP_NS_PUBSUB_EVENT,
         '(', "items",
-          ':', node,
+          '@', "node", node,
             '(', "item",
             ')',
         ')',
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-sasl-digest-md5.c telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-sasl-digest-md5.c
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-sasl-digest-md5.c	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-sasl-digest-md5.c	2011-09-07 14:05:52.000000000 +0000
@@ -339,7 +339,7 @@
   /* FIXME properly escape values */
   g_string_append_printf (response, "username=\"%s\"", priv->username);
   g_string_append_printf (response, ",realm=\"%s\"", realm);
-  g_string_append_printf (response, ",digest-uri=\"xmpp/%s\"", realm);
+  g_string_append_printf (response, ",digest-uri=\"xmpp/%s\"", priv->server);
   g_string_append_printf (response, ",nonce=\"%s\",nc=00000001", nonce);
   g_string_append_printf (response, ",cnonce=\"%s\"", cnonce);
   /* FIXME should check if auth is in the cop challenge val */
@@ -357,7 +357,7 @@
 
   g_free (digest_md5);
 
-  a2 = g_strdup_printf ("AUTHENTICATE:xmpp/%s", realm);
+  a2 = g_strdup_printf ("AUTHENTICATE:xmpp/%s", priv->server);
   a2h = md5_hex_hash (a2, -1);
 
   kd = g_strdup_printf ("%s:%s:00000001:%s:auth:%s", a1h, nonce, cnonce, a2h);
@@ -370,7 +370,7 @@
   g_free (a2h);
 
   /* Calculate the response we expect from the server */
-  a2 = g_strdup_printf (":xmpp/%s", realm);
+  a2 = g_strdup_printf (":xmpp/%s", priv->server);
   a2h = md5_hex_hash (a2, -1);
 
   kd =  g_strdup_printf ("%s:%s:00000001:%s:auth:%s", a1h, nonce, cnonce, a2h);
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-tls.c telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-tls.c
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-tls.c	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-tls.c	2011-09-07 14:05:52.000000000 +0000
@@ -41,6 +41,10 @@
  * equivalent to a priority string of "SECURE:+COMP-DEFLATE".
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wocky-tls.h"
 
 #include 
@@ -51,11 +55,26 @@
 #include 
 #include 
 
+#ifdef ENABLE_PREFER_STREAM_CIPHERS
+#define DEFAULT_TLS_OPTIONS \
+  /* start with nothing enabled by default */ \
+  "NONE:" \
+  /* enable all the normal algorithms */ \
+  "+VERS-TLS-ALL:+SIGN-ALL:+MAC-ALL:+CTYPE-ALL:+RSA:" \
+  /* prefer deflate compression, but fall back to null compression */ \
+  "+COMP-DEFLATE:+COMP-NULL:" \
+  /* our preferred stream ciphers */ \
+  "+ARCFOUR-128:+ARCFOUR-40:" \
+  /* all the other ciphers */ \
+  "+AES-128-CBC:+AES-256-CBC:+3DES-CBC:+DES-CBC:+RC2-40:" \
+  "+CAMELLIA-256-CBC:+CAMELLIA-128-CBC"
+#else
 #define DEFAULT_TLS_OPTIONS \
-  "NORMAL:"         /* all secure algorithms */ \
-  "-COMP-NULL:"     /* remove null compression                           */ \
-  "+COMP-DEFLATE:"  /* prefer deflate                                    */ \
-  "+COMP-NULL"      /* fall back to null                                 */
+  "NORMAL:"        /* all secure algorithms */ \
+  "-COMP-NULL:"    /* remove null compression */ \
+  "+COMP-DEFLATE:" /* prefer deflate */ \
+  "+COMP-NULL"     /* fall back to null */
+#endif
 
 #define DEBUG_FLAG DEBUG_TLS
 #define DEBUG_HANDSHAKE_LEVEL 5
@@ -71,6 +90,8 @@
                          GNUTLS_VERIFY_DISABLE_CA_SIGN          )
 
 #include "wocky-debug.h"
+#include "wocky-tls-enumtypes.h"
+#include "wocky-utils.h"
 
 #include 
 #include 
@@ -157,8 +178,8 @@
 {
   WockyTLSOpState state;
 
-  gpointer buffer;
-  gsize requested;
+  guint8 *buffer;
+  gssize requested;
   gssize result;
   GError *error;
 } WockyTLSOp;
@@ -253,7 +274,6 @@
   return quark;
 }
 
-#ifdef ENABLE_DEBUG
 static const gchar *hdesc_to_string (long desc)
 {
 #define HDESC(x) case GNUTLS_HANDSHAKE_##x: return #x; break;
@@ -273,7 +293,6 @@
     }
   return "Unknown State";
 }
-#endif
 
 static const gchar *error_to_string (long error)
 {
@@ -621,11 +640,12 @@
 wocky_tls_session_get_peers_certificate (WockyTLSSession *session,
     WockyTLSCertType *type)
 {
-  guint idx, cls;
+  guint idx;
+  guint n_peers;
   const gnutls_datum_t *peers = NULL;
   GPtrArray *certificates;
 
-  peers = gnutls_certificate_get_peers (session->session, &cls);
+  peers = gnutls_certificate_get_peers (session->session, &n_peers);
 
   if (peers == NULL)
     return NULL;
@@ -633,7 +653,7 @@
   certificates =
     g_ptr_array_new_with_free_func ((GDestroyNotify) g_array_unref);
 
-  for (idx = 0; idx < cls; idx++)
+  for (idx = 0; idx < n_peers; idx++)
     {
       GArray *cert = g_array_sized_new (TRUE, TRUE, sizeof (guchar),
           peers[idx].size);
@@ -663,14 +683,13 @@
 int
 wocky_tls_session_verify_peer (WockyTLSSession    *session,
                                const gchar        *peername,
+                               GStrv               extra_identities,
                                WockyTLSVerificationLevel level,
                                WockyTLSCertStatus *status)
 {
   int rval = -1;
-  guint cls = -1;
   guint _stat = 0;
   gboolean peer_name_ok = TRUE;
-  const gchar *check_level;
   gnutls_certificate_verify_flags check;
 
   /* list gnutls cert error conditions in descending order of noteworthiness *
@@ -689,7 +708,6 @@
       { GNUTLS_CERT_INVALID,            WOCKY_TLS_CERT_INVALID             },
       { ~((long) 0),                    WOCKY_TLS_CERT_UNKNOWN_ERROR       },
       { 0,                              WOCKY_TLS_CERT_OK                  } };
-  /* *********************************************************************** */
 
   g_assert (status != NULL);
   *status = WOCKY_TLS_CERT_OK;
@@ -697,25 +715,22 @@
   switch (level)
     {
     case WOCKY_TLS_VERIFY_STRICT:
-      check_level = "WOCKY_TLS_VERIFY_STRICT";
       check = VERIFY_STRICT;
       break;
     case WOCKY_TLS_VERIFY_NORMAL:
-      check_level = "WOCKY_TLS_VERIFY_NORMAL";
       check = VERIFY_NORMAL;
       break;
     case WOCKY_TLS_VERIFY_LENIENT:
-      check_level = "WOCKY_TLS_VERIFY_LENIENT";
       check = VERIFY_LENIENT;
       break;
     default:
       g_warn_if_reached ();
-      check_level = "Unknown strictness level";
       check = VERIFY_STRICT;
       break;
     }
 
-  DEBUG ("setting gnutls verify flags level to: %s", check_level);
+  DEBUG ("setting gnutls verify flags level to: %s",
+      wocky_enum_to_nick (WOCKY_TYPE_TLS_VERIFICATION_LEVEL, level));
   gnutls_certificate_set_verify_flags (session->gnutls_cert_cred, check);
   rval = gnutls_certificate_verify_peers2 (session->session, &_stat);
 
@@ -745,51 +760,106 @@
 
   /* if we get this far, we have a structurally valid certificate *
    * signed by _someone_: check the hostname matches the peername */
-  if (peername != NULL)
-    switch (gnutls_certificate_type_get (session->session))
-      {
-        gnutls_x509_crt_t x509;
-        gnutls_openpgp_crt_t opgp;
-      case GNUTLS_CRT_X509:
-        DEBUG ("checking X509 cert");
-        if ((rval = gnutls_x509_crt_init (&x509)) == GNUTLS_E_SUCCESS)
-          { /* we know these ops must succeed, or verify_peers2 would have *
-             * failed before we got here: We just need to duplicate a bit  *
-             * of what it does:                                            */
-            const gnutls_datum_t *peers =
-              gnutls_certificate_get_peers (session->session, &cls);
-
-            gnutls_x509_crt_import (x509, &peers[0], GNUTLS_X509_FMT_DER);
-            rval = gnutls_x509_crt_check_hostname (x509, peername);
-            DEBUG ("gnutls_x509_crt_check_hostname: %s -> %d", peername, rval);
-            rval = (rval == 0) ? -1 : GNUTLS_E_SUCCESS;
-            peer_name_ok = (rval == GNUTLS_E_SUCCESS);
-
-            gnutls_x509_crt_deinit (x509);
-          }
-        break;
-      case GNUTLS_CRT_OPENPGP:
-        DEBUG ("checking PGP cert");
-        if ((rval = gnutls_openpgp_crt_init (&opgp)) == GNUTLS_E_SUCCESS)
-          {
-            const gnutls_datum_t *peers =
-              gnutls_certificate_get_peers (session->session, &cls);
-
-            gnutls_openpgp_crt_import (opgp, &peers[0], GNUTLS_OPENPGP_FMT_RAW);
-            rval = gnutls_openpgp_crt_check_hostname (opgp, peername);
-            DEBUG ("gnutls_openpgp_crt_check_hostname: %s -> %d",peername,rval);
-            rval = (rval == 0) ? -1 : GNUTLS_E_SUCCESS;
-            peer_name_ok = (rval == GNUTLS_E_SUCCESS);
-
-            gnutls_openpgp_crt_deinit (opgp);
-          }
-        break;
-      default:
-        /* theoretically, this can't happen if ...verify_peers2 is working: */
-        DEBUG ("unknown cert type!");
-        rval = GNUTLS_E_INVALID_REQUEST;
-        peer_name_ok = FALSE;
-      }
+  if (peername != NULL || extra_identities != NULL)
+    {
+      const gnutls_datum_t *peers;
+      guint n_peers;
+      gnutls_x509_crt_t x509;
+      gnutls_openpgp_crt_t opgp;
+
+      /* we know these ops must succeed, or verify_peers2 would have *
+       * failed before we got here: We just need to duplicate a bit  *
+       * of what it does:                                            */
+      peers = gnutls_certificate_get_peers (session->session, &n_peers);
+
+      switch (gnutls_certificate_type_get (session->session))
+        {
+        case GNUTLS_CRT_X509:
+          DEBUG ("checking X509 cert");
+          if ((rval = gnutls_x509_crt_init (&x509)) == GNUTLS_E_SUCCESS)
+            {
+              gnutls_x509_crt_import (x509, &peers[0], GNUTLS_X509_FMT_DER);
+
+              if (peername != NULL)
+                {
+                  rval = gnutls_x509_crt_check_hostname (x509, peername);
+                  DEBUG ("gnutls_x509_crt_check_hostname: %s -> %d",
+                      peername, rval);
+                }
+              else
+                {
+                  rval = 0;
+                }
+
+              if (rval == 0 && extra_identities != NULL)
+                {
+                  gint i;
+
+                  for (i = 0; extra_identities[i] != NULL; i++)
+                    {
+                      rval = gnutls_x509_crt_check_hostname (x509,
+                          extra_identities[i]);
+                      DEBUG ("gnutls_x509_crt_check_hostname: %s -> %d",
+                          extra_identities[i], rval);
+
+                      if (rval != 0)
+                        break;
+                    }
+                }
+
+              rval = (rval == 0) ? -1 : GNUTLS_E_SUCCESS;
+
+              gnutls_x509_crt_deinit (x509);
+            }
+          break;
+        case GNUTLS_CRT_OPENPGP:
+          DEBUG ("checking PGP cert");
+          if ((rval = gnutls_openpgp_crt_init (&opgp)) == GNUTLS_E_SUCCESS)
+            {
+              gnutls_openpgp_crt_import (opgp, &peers[0], GNUTLS_OPENPGP_FMT_RAW);
+              rval = gnutls_openpgp_crt_check_hostname (opgp, peername);
+              DEBUG ("gnutls_openpgp_crt_check_hostname: %s -> %d", peername, rval);
+
+              if (peername != NULL)
+                {
+                  rval = gnutls_openpgp_crt_check_hostname (opgp, peername);
+                  DEBUG ("gnutls_openpgp_crt_check_hostname: %s -> %d",
+                      peername, rval);
+                }
+              else
+                {
+                  rval = 0;
+                }
+
+              if (rval == 0 && extra_identities != NULL)
+                {
+                  gint i;
+
+                  for (i = 0; extra_identities[i] != NULL; i++)
+                    {
+                      rval = gnutls_openpgp_crt_check_hostname (opgp,
+                          extra_identities[i]);
+                      DEBUG ("gnutls_openpgp_crt_check_hostname: %s -> %d",
+                          extra_identities[i], rval);
+
+                      if (rval != 0)
+                        break;
+                    }
+                }
+
+              rval = (rval == 0) ? -1 : GNUTLS_E_SUCCESS;
+
+              gnutls_openpgp_crt_deinit (opgp);
+            }
+          break;
+        default:
+          /* theoretically, this can't happen if ...verify_peers2 is working: */
+          DEBUG ("unknown cert type!");
+          rval = GNUTLS_E_INVALID_REQUEST;
+        }
+
+      peer_name_ok = (rval == GNUTLS_E_SUCCESS);
+    }
 
   DEBUG ("peer_name_ok: %d", peer_name_ok );
 
@@ -1117,12 +1187,44 @@
                                gpointer      user_data)
 {
   WockyTLSSession *session = WOCKY_TLS_SESSION (user_data);
+  gssize ret;
 
   g_assert (session->write_op.state == WOCKY_TLS_OP_STATE_ACTIVE);
 
-  session->write_op.result =
-    g_output_stream_write_finish (G_OUTPUT_STREAM (object), result,
+  ret = g_output_stream_write_finish (G_OUTPUT_STREAM (object), result,
                                   &session->write_op.error);
+  if (ret > 0)
+    {
+      session->write_op.result += ret;
+
+      if (session->write_op.result < session->write_op.requested)
+        {
+          GOutputStream *stream;
+          WockyTLSJob *active_job;
+
+          stream = g_io_stream_get_output_stream (session->stream);
+
+          if (session->handshake_job.job.active)
+              active_job = &session->handshake_job.job;
+          else
+              active_job = &session->write_job.job;
+
+          g_output_stream_write_async (stream,
+            session->write_op.buffer + session->write_op.result,
+            session->write_op.requested - session->write_op.result,
+            active_job->io_priority,
+            active_job->cancellable,
+            wocky_tls_session_write_ready,
+            session);
+          return;
+        }
+    }
+  else
+    {
+      /* Error or EOF, we're done */
+      session->write_op.result = ret;
+    }
+
   session->write_op.state = WOCKY_TLS_OP_STATE_DONE;
 
   /* don't recurse if the async handler is already running */
@@ -1160,6 +1262,7 @@
           session->write_op.buffer = g_memdup (buffer, count);
           session->write_op.requested = count;
           session->write_op.error = NULL;
+          session->write_op.result = 0;
 
           g_output_stream_write_async (stream,
                                        session->write_op.buffer,
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-tls-connector.c telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-tls-connector.c
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-tls-connector.c	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-tls-connector.c	2011-09-07 14:05:52.000000000 +0000
@@ -38,6 +38,7 @@
 struct _WockyTLSConnectorPrivate {
   gboolean legacy_ssl;
   gchar *peername;
+  GStrv extra_identities;
 
   WockyTLSHandler *handler;
   WockyTLSSession *session;
@@ -107,6 +108,7 @@
   WockyTLSConnector *self = WOCKY_TLS_CONNECTOR (object);
 
   g_free (self->priv->peername);
+  g_strfreev (self->priv->extra_identities);
 
   if (self->priv->session != NULL)
     {
@@ -333,7 +335,7 @@
 
   wocky_tls_handler_verify_async (self->priv->handler,
       self->priv->session, self->priv->peername,
-      tls_handler_verify_async_cb, self);
+      self->priv->extra_identities, tls_handler_verify_async_cb, self);
 }
 
 static void
@@ -458,6 +460,7 @@
     WockyXmppConnection *connection,
     gboolean old_style_ssl,
     const gchar *peername,
+    GStrv extra_identities,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data)
@@ -477,6 +480,7 @@
   self->priv->secure_result = async_result;
   self->priv->legacy_ssl = old_style_ssl;
   self->priv->peername = g_strdup (peername);
+  self->priv->extra_identities = g_strdupv (extra_identities);
 
   if (old_style_ssl)
     do_handshake (self);
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-tls-connector.h telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-tls-connector.h
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-tls-connector.h	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-tls-connector.h	2011-09-07 14:05:52.000000000 +0000
@@ -73,6 +73,7 @@
     WockyXmppConnection *connection,
     gboolean old_style_ssl,
     const gchar *peername,
+    GStrv extra_identities,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-tls.h telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-tls.h
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-tls.h	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-tls.h	2011-09-07 14:05:52.000000000 +0000
@@ -82,6 +82,7 @@
 
 int wocky_tls_session_verify_peer (WockyTLSSession    *session,
                                           const gchar        *peername,
+                                          GStrv               extra_identities,
                                           WockyTLSVerificationLevel level,
                                           WockyTLSCertStatus *status);
 GPtrArray *wocky_tls_session_get_peers_certificate (WockyTLSSession *session,
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-tls-handler.c telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-tls-handler.c
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-tls-handler.c	2011-01-17 16:19:05.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-tls-handler.c	2011-09-07 14:05:52.000000000 +0000
@@ -31,6 +31,7 @@
 real_verify_async (WockyTLSHandler *self,
     WockyTLSSession *tls_session,
     const gchar *peername,
+    GStrv extra_identities,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
@@ -148,6 +149,7 @@
 real_verify_async (WockyTLSHandler *self,
     WockyTLSSession *tls_session,
     const gchar *peername,
+    GStrv extra_identities,
     GAsyncReadyCallback callback,
     gpointer user_data)
 {
@@ -155,24 +157,30 @@
   glong flags = WOCKY_TLS_VERIFY_NORMAL;
   WockyTLSCertStatus status = WOCKY_TLS_CERT_UNKNOWN_ERROR;
   const gchar *verify_peername = NULL;
+  GStrv verify_extra_identities = NULL;
 
   result = g_simple_async_result_new (G_OBJECT (self),
       callback, user_data, wocky_tls_handler_verify_async);
 
-  /* When lenient, don't check the peername, set cert flags accordingly.
-   * When 'strict', leave the flags at NORMAL and check the peername.
-   * Under legacy SSL, the connect hostname is the preferred peername.
-   * Under STARTTLS, we check the domain regardless of the connect server.
+  /* When ignore_ssl_errors is true, don't check the peername. Otherwise:
+   * - Under legacy SSL, the connect hostname is the preferred peername;
+   * - Under STARTTLS, we check the domain regardless of the connect server.
    */
   if (self->priv->ignore_ssl_errors)
-    flags = WOCKY_TLS_VERIFY_LENIENT;
+    {
+      flags = WOCKY_TLS_VERIFY_LENIENT;
+    }
   else
-    verify_peername = peername;
+    {
+      verify_peername = peername;
+      verify_extra_identities = extra_identities;
+    }
 
   DEBUG ("Verifying certificate (peername: %s)",
       (verify_peername == NULL) ? "-" : verify_peername);
 
-  wocky_tls_session_verify_peer (tls_session, verify_peername, flags, &status);
+  wocky_tls_session_verify_peer (tls_session, verify_peername,
+      verify_extra_identities, flags, &status);
 
   if (status != WOCKY_TLS_CERT_OK)
     {
@@ -253,12 +261,14 @@
 wocky_tls_handler_verify_async (WockyTLSHandler *self,
     WockyTLSSession *session,
     const gchar *peername,
+    GStrv extra_identities,
     GAsyncReadyCallback callback,
     gpointer user_data)
 {
   WockyTLSHandlerClass *klass = WOCKY_TLS_HANDLER_GET_CLASS (self);
 
-  klass->verify_async_func (self, session, peername, callback, user_data);
+  klass->verify_async_func (self, session, peername, extra_identities,
+      callback, user_data);
 }
 
 gboolean
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-tls-handler.h telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-tls-handler.h
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-tls-handler.h	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-tls-handler.h	2011-09-07 14:05:52.000000000 +0000
@@ -46,6 +46,7 @@
 typedef void (*WockyTLSHandlerVerifyAsyncFunc) (WockyTLSHandler *self,
     WockyTLSSession *tls_session,
     const gchar *peername,
+    GStrv extra_identities,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
@@ -91,6 +92,7 @@
 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,
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-xmpp-connection.c telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-xmpp-connection.c
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-xmpp-connection.c	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-xmpp-connection.c	2011-09-07 14:05:52.000000000 +0000
@@ -47,6 +47,7 @@
 #include "wocky-xmpp-reader.h"
 #include "wocky-xmpp-writer.h"
 #include "wocky-stanza.h"
+#include "wocky-utils.h"
 
 #define BUFFER_SIZE 1024
 
@@ -1031,6 +1032,98 @@
 }
 
 /**
+ * wocky_xmpp_connection_send_whitespace_ping_async:
+ * @connection: a #WockyXmppConnection
+ * @cancellable: optional GCancellable object, NULL to ignore.
+ * @callback: callback to call when the request is satisfied.
+ * @user_data: the data to pass to callback function.
+ *
+ * Request asynchronous sending of a whitespace ping. When the operation is
+ * finished @callback will be called. You can then call
+ * wocky_xmpp_connection_send_whitespace_ping_finish() to get the result of
+ * the operation.
+ *
+ * Can only be called after wocky_xmpp_connection_send_open_async has finished
+ * its operation.
+ */
+void
+wocky_xmpp_connection_send_whitespace_ping_async (WockyXmppConnection *connection,
+    GCancellable *cancellable,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
+{
+  WockyXmppConnectionPrivate *priv =
+      connection->priv;
+
+  if (G_UNLIKELY (priv->output_result != NULL))
+    goto pending;
+
+  if (G_UNLIKELY (!priv->output_open))
+    goto not_open;
+
+  if (G_UNLIKELY (priv->output_closed))
+    goto is_closed;
+
+  g_assert (!priv->output_closed);
+  g_assert (priv->output_result == NULL);
+  g_assert (priv->output_cancellable == NULL);
+
+  priv->output_result = g_simple_async_result_new (G_OBJECT (connection),
+    callback, user_data, wocky_xmpp_connection_send_whitespace_ping_async);
+
+  if (cancellable != NULL)
+    priv->output_cancellable = g_object_ref (cancellable);
+
+  priv->output_buffer = (guint8 *) " ";
+  priv->length = 1;
+  priv->offset = 0;
+
+  wocky_xmpp_connection_do_write (connection);
+
+  return;
+
+pending:
+  g_simple_async_report_error_in_idle (G_OBJECT (connection),
+    callback, user_data,
+    G_IO_ERROR, G_IO_ERROR_PENDING, "Another send operation is pending");
+  return;
+
+not_open:
+  g_simple_async_report_error_in_idle (G_OBJECT (connection),
+    callback, user_data,
+    WOCKY_XMPP_CONNECTION_ERROR, WOCKY_XMPP_CONNECTION_ERROR_NOT_OPEN,
+    "Connections hasn't been opened for sending");
+  return;
+
+is_closed:
+  g_simple_async_report_error_in_idle (G_OBJECT (connection),
+    callback, user_data,
+    WOCKY_XMPP_CONNECTION_ERROR, WOCKY_XMPP_CONNECTION_ERROR_IS_CLOSED,
+    "Connections has been closed for sending");
+  return;
+}
+
+/**
+ * wocky_xmpp_connection_send_whitespace_ping_finish:
+ * @connection: a #WockyXmppConnection.
+ * @result: a GAsyncResult.
+ * @error: a GError location to store the error occuring, or NULL to ignore.
+ *
+ * Finishes sending a whitespace ping.
+ *
+ * Returns: TRUE if the ping was succesfully sent, FALSE on error.
+ */
+gboolean
+wocky_xmpp_connection_send_whitespace_ping_finish (
+    WockyXmppConnection *connection,
+    GAsyncResult *result,
+    GError **error)
+{
+  wocky_implement_finish_void (connection,
+      wocky_xmpp_connection_send_whitespace_ping_async);
+}
+
+/**
  * wocky_xmpp_connection_reset:
  * @connection: a #WockyXmppConnection.
  *
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-xmpp-connection.h telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-xmpp-connection.h
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-xmpp-connection.h	2011-04-22 08:13:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-xmpp-connection.h	2011-09-07 14:05:52.000000000 +0000
@@ -173,6 +173,16 @@
     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 (
+    WockyXmppConnection *connection,
+    GAsyncResult *result,
+    GError **error);
+
 void wocky_xmpp_connection_reset (WockyXmppConnection *connection);
 
 gchar * wocky_xmpp_connection_new_id (WockyXmppConnection *self);
diff -Nru telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-xmpp-reader.c telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-xmpp-reader.c
--- telepathy-salut-0.5.0/lib/ext/wocky/wocky/wocky-xmpp-reader.c	2011-04-28 15:07:28.000000000 +0000
+++ telepathy-salut-0.7.0/lib/ext/wocky/wocky/wocky-xmpp-reader.c	2011-09-07 14:05:52.000000000 +0000
@@ -439,9 +439,7 @@
        */
       const gchar *attr_name = (const gchar *) attributes[i];
       const gchar *attr_prefix = (const gchar *) attributes[i+1];
-#ifdef ENABLE_DEBUG
       const gchar *attr_uri = (const gchar *) attributes[i+2];
-#endif
       gsize value_len = attributes[i+4] - attributes[i+3];
       gchar *attr_value = g_strndup (
           (const gchar *) attributes[i+3], value_len);
diff -Nru telepathy-salut-0.5.0/lib/gibber/gibber-bytestream-direct.c telepathy-salut-0.7.0/lib/gibber/gibber-bytestream-direct.c
--- telepathy-salut-0.5.0/lib/gibber/gibber-bytestream-direct.c	2011-04-25 13:46:40.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/gibber-bytestream-direct.c	2011-05-09 12:46:34.000000000 +0000
@@ -25,10 +25,11 @@
 
 #include 
 
+#include 
+
 #include "gibber-sockets.h"
 #include "gibber-linklocal-transport.h"
 #include "gibber-util.h"
-#include "gibber-xmpp-error.h"
 
 #define DEBUG_FLAG DEBUG_BYTESTREAM
 #include "gibber-debug.h"
@@ -353,7 +354,7 @@
   if (priv->state == GIBBER_BYTESTREAM_STATE_ACCEPTED)
     {
       /* Connection to host failed */
-      GError e = { GIBBER_XMPP_ERROR, XMPP_ERROR_ITEM_NOT_FOUND,
+      GError e = { WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_ITEM_NOT_FOUND,
           "connection failed" };
 
       gibber_bytestream_iface_close (GIBBER_BYTESTREAM_IFACE (self), &e);
@@ -599,7 +600,7 @@
   g_assert (priv->addresses != NULL);
   if (priv->addresses->len < 1)
     {
-      GError e = { GIBBER_XMPP_ERROR, XMPP_ERROR_ITEM_NOT_FOUND,
+      GError e = { WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_ITEM_NOT_FOUND,
           "Unsable get socket address for this contact" };
       DEBUG ("Could not get socket address for this contact" );
       gibber_bytestream_iface_close (GIBBER_BYTESTREAM_IFACE (self), &e);
diff -Nru telepathy-salut-0.5.0/lib/gibber/gibber-bytestream-ibb.c telepathy-salut-0.7.0/lib/gibber/gibber-bytestream-ibb.c
--- telepathy-salut-0.5.0/lib/gibber/gibber-bytestream-ibb.c	2011-04-25 13:46:40.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/gibber-bytestream-ibb.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,665 +0,0 @@
-/*
- * gibber-bytestream-ibb.c - Source for GibberBytestreamIBB
- * Copyright (C) 2007-2008 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "gibber-bytestream-ibb.h"
-
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-
-#include "gibber-muc-connection.h"
-#include "gibber-namespaces.h"
-#include "gibber-xmpp-error.h"
-
-#define DEBUG_FLAG DEBUG_BYTESTREAM
-#include "gibber-debug.h"
-
-#include "gibber-signals-marshal.h"
-
-/* IMPORTANT NOTE: This bytestream is not used anymore by Salut and so probably
- * a bit rotten */
-
-/* FIXME: implement fragmentation using the "block-size" attribute */
-
-static void
-bytestream_iface_init (gpointer g_iface, gpointer iface_data);
-
-G_DEFINE_TYPE_WITH_CODE (GibberBytestreamIBB, gibber_bytestream_ibb,
-    G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (GIBBER_TYPE_BYTESTREAM_IFACE,
-      bytestream_iface_init));
-
-/* properties */
-enum
-{
-  PROP_PORTER = 1,
-  PROP_CONTACT,
-  PROP_SELF_ID,
-  PROP_PEER_ID,
-  PROP_STREAM_ID,
-  PROP_STREAM_INIT_ID,
-  PROP_STATE,
-  PROP_PROTOCOL,
-  LAST_PROPERTY
-};
-
-typedef struct _GibberBytestreamIBBPrivate GibberBytestreamIBBPrivate;
-struct _GibberBytestreamIBBPrivate
-{
-  WockyPorter *porter;
-  WockyContact *contact;
-  gchar *self_id;
-  gchar *peer_id;
-  gchar *stream_id;
-  gchar *stream_init_id;
-  guint stanza_received_id;
-  GibberBytestreamState state;
-
-  guint16 seq;
-  guint16 last_seq_recv;
-
-  gboolean dispose_has_run;
-};
-
-#define GIBBER_BYTESTREAM_IBB_GET_PRIVATE(obj) \
-    ((GibberBytestreamIBBPrivate *) obj->priv)
-
-static void
-gibber_bytestream_ibb_init (GibberBytestreamIBB *self)
-{
-  GibberBytestreamIBBPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      GIBBER_TYPE_BYTESTREAM_IBB, GibberBytestreamIBBPrivate);
-
-  self->priv = priv;
-}
-
-static gboolean
-received_stanza_cb (WockyPorter *porter,
-                    WockyStanza *stanza,
-                    gpointer user_data)
-{
-  GibberBytestreamIBB *self = (GibberBytestreamIBB *) user_data;
-  GibberBytestreamIBBPrivate *priv = GIBBER_BYTESTREAM_IBB_GET_PRIVATE (self);
-  WockyNode *node = wocky_stanza_get_top_node (stanza);
-  WockyNode *data;
-  GString *str;
-  guchar *decoded;
-  gsize len;
-  const gchar *from, *stream_id;
-
-  data = wocky_node_get_child_ns (node, "data", WOCKY_XMPP_NS_IBB);
-  if (data == NULL)
-    {
-      return FALSE;
-    }
-
-  stream_id = wocky_node_get_attribute (data, "sid");
-  if (stream_id == NULL || strcmp (stream_id, priv->stream_id) != 0)
-    {
-      DEBUG ("bad stream id");
-      return FALSE;
-    }
-
-  if (priv->state != GIBBER_BYTESTREAM_STATE_OPEN)
-    {
-      DEBUG ("can't receive data through a not open bytestream (state: %d)",
-          priv->state);
-      return FALSE;
-    }
-
-  from = wocky_node_get_attribute (node, "from");
-  if (from == NULL)
-    {
-      DEBUG ("got a message without a from field, ignoring");
-      return FALSE;
-    }
-
-  // XXX check sequence number ?
-
-  decoded = g_base64_decode (data->content, &len);
-  str = g_string_new_len ((const gchar *) decoded, len);
-  g_signal_emit_by_name (G_OBJECT (self), "data-received", from, str);
-
-  g_string_free (str, TRUE);
-  g_free (decoded);
-
-  return TRUE;
-}
-
-static void
-gibber_bytestream_ibb_dispose (GObject *object)
-{
-  GibberBytestreamIBB *self = GIBBER_BYTESTREAM_IBB (object);
-  GibberBytestreamIBBPrivate *priv = GIBBER_BYTESTREAM_IBB_GET_PRIVATE (self);
-
-  if (priv->dispose_has_run)
-    return;
-  priv->dispose_has_run = TRUE;
-
-  if (priv->state != GIBBER_BYTESTREAM_STATE_CLOSED)
-    {
-      gibber_bytestream_iface_close (GIBBER_BYTESTREAM_IFACE (self), NULL);
-    }
-
-  G_OBJECT_CLASS (gibber_bytestream_ibb_parent_class)->dispose (object);
-}
-
-static void
-gibber_bytestream_ibb_finalize (GObject *object)
-{
-  GibberBytestreamIBB *self = GIBBER_BYTESTREAM_IBB (object);
-  GibberBytestreamIBBPrivate *priv = GIBBER_BYTESTREAM_IBB_GET_PRIVATE (self);
-
-  g_free (priv->stream_id);
-  g_free (priv->stream_init_id);
-  g_free (priv->self_id);
-  g_free (priv->peer_id);
-
-  G_OBJECT_CLASS (gibber_bytestream_ibb_parent_class)->finalize (object);
-}
-
-static void
-gibber_bytestream_ibb_get_property (GObject *object,
-                                    guint property_id,
-                                    GValue *value,
-                                    GParamSpec *pspec)
-{
-  GibberBytestreamIBB *self = GIBBER_BYTESTREAM_IBB (object);
-  GibberBytestreamIBBPrivate *priv = GIBBER_BYTESTREAM_IBB_GET_PRIVATE (self);
-
-  switch (property_id)
-    {
-      case PROP_PORTER:
-        g_value_set_object (value, priv->porter);
-        break;
-      case PROP_CONTACT:
-        g_value_set_object (value, priv->contact);
-        break;
-      case PROP_SELF_ID:
-        g_value_set_string (value, priv->self_id);
-        break;
-      case PROP_PEER_ID:
-        g_value_set_string (value, priv->peer_id);
-        break;
-      case PROP_STREAM_ID:
-        g_value_set_string (value, priv->stream_id);
-        break;
-      case PROP_STREAM_INIT_ID:
-        g_value_set_string (value, priv->stream_init_id);
-        break;
-      case PROP_STATE:
-        g_value_set_uint (value, priv->state);
-        break;
-      case PROP_PROTOCOL:
-        g_value_set_string (value, GIBBER_XMPP_NS_IBB);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-        break;
-    }
-}
-
-static void
-make_porter_connections (GibberBytestreamIBB *self)
-{
-  GibberBytestreamIBBPrivate *priv = GIBBER_BYTESTREAM_IBB_GET_PRIVATE (self);
-  gchar *jid;
-
-  jid = wocky_contact_dup_jid (priv->contact);
-
-  priv->stanza_received_id = wocky_porter_register_handler_from (priv->porter,
-      WOCKY_STANZA_TYPE_IQ, WOCKY_STANZA_TYPE_NONE, jid,
-      WOCKY_PORTER_HANDLER_PRIORITY_NORMAL, received_stanza_cb, self, NULL);
-
-  g_free (jid);
-}
-
-static void
-gibber_bytestream_ibb_set_property (GObject *object,
-                                    guint property_id,
-                                    const GValue *value,
-                                    GParamSpec *pspec)
-{
-  GibberBytestreamIBB *self = GIBBER_BYTESTREAM_IBB (object);
-  GibberBytestreamIBBPrivate *priv = GIBBER_BYTESTREAM_IBB_GET_PRIVATE (self);
-
-  switch (property_id)
-    {
-      case PROP_PORTER:
-        priv->porter = g_value_dup_object (value);
-        break;
-      case PROP_CONTACT:
-        priv->contact = g_value_dup_object (value);
-        break;
-      case PROP_SELF_ID:
-        g_free (priv->self_id);
-        priv->self_id = g_value_dup_string (value);
-        break;
-      case PROP_PEER_ID:
-        g_free (priv->peer_id);
-        priv->peer_id = g_value_dup_string (value);
-        break;
-      case PROP_STREAM_ID:
-        g_free (priv->stream_id);
-        priv->stream_id = g_value_dup_string (value);
-        break;
-      case PROP_STREAM_INIT_ID:
-        g_free (priv->stream_init_id);
-        priv->stream_init_id = g_value_dup_string (value);
-        break;
-      case PROP_STATE:
-        if (priv->state != g_value_get_uint (value))
-            {
-              priv->state = g_value_get_uint (value);
-              g_signal_emit_by_name (object, "state-changed", priv->state);
-            }
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-        break;
-    }
-}
-
-static GObject *
-gibber_bytestream_ibb_constructor (GType type,
-                                   guint n_props,
-                                   GObjectConstructParam *props)
-{
-  GObject *obj;
-  GibberBytestreamIBBPrivate *priv;
-
-  obj = G_OBJECT_CLASS (gibber_bytestream_ibb_parent_class)->
-           constructor (type, n_props, props);
-
-  priv = GIBBER_BYTESTREAM_IBB_GET_PRIVATE (GIBBER_BYTESTREAM_IBB (obj));
-
-  g_assert (priv->porter != NULL);
-  g_assert (priv->contact != NULL);
-  g_assert (priv->stream_init_id != NULL);
-  g_assert (priv->self_id != NULL);
-  g_assert (priv->peer_id != NULL);
-
-  return obj;
-}
-
-static void
-gibber_bytestream_ibb_constructed (GObject *obj)
-{
-  GibberBytestreamIBB *self = GIBBER_BYTESTREAM_IBB (obj);
-  GibberBytestreamIBBPrivate *priv = GIBBER_BYTESTREAM_IBB_GET_PRIVATE (self);
-
-  if (G_OBJECT_CLASS (gibber_bytestream_ibb_parent_class)->constructed != NULL)
-    G_OBJECT_CLASS (gibber_bytestream_ibb_parent_class)->constructed (obj);
-
-  if (priv->porter != NULL && priv->contact != NULL)
-    make_porter_connections (self);
-}
-
-static void
-gibber_bytestream_ibb_class_init (
-    GibberBytestreamIBBClass *gibber_bytestream_ibb_class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (gibber_bytestream_ibb_class);
-  GParamSpec *param_spec;
-
-  g_type_class_add_private (gibber_bytestream_ibb_class,
-      sizeof (GibberBytestreamIBBPrivate));
-
-  object_class->dispose = gibber_bytestream_ibb_dispose;
-  object_class->finalize = gibber_bytestream_ibb_finalize;
-
-  object_class->get_property = gibber_bytestream_ibb_get_property;
-  object_class->set_property = gibber_bytestream_ibb_set_property;
-  object_class->constructor = gibber_bytestream_ibb_constructor;
-  object_class->constructed = gibber_bytestream_ibb_constructed;
-
-  g_object_class_override_property (object_class, PROP_SELF_ID,
-      "self-id");
-  g_object_class_override_property (object_class, PROP_PEER_ID,
-      "peer-id");
-  g_object_class_override_property (object_class, PROP_STREAM_ID,
-      "stream-id");
-  g_object_class_override_property (object_class, PROP_STATE,
-      "state");
-  g_object_class_override_property (object_class, PROP_PROTOCOL,
-      "protocol");
-
-  param_spec = g_param_spec_object (
-      "porter",
-      "WockyPorter object",
-      "Wocky porter object used for communication by this "
-      "bytestream if it's a private one",
-      WOCKY_TYPE_PORTER,
-      G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_PORTER,
-      param_spec);
-
-  param_spec = g_param_spec_object (
-      "contact",
-      "WockyContact object",
-      "Contact object used for communication by this "
-      "bytestream if it's a private one",
-      WOCKY_TYPE_CONTACT,
-      G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_CONTACT,
-      param_spec);
-
-  param_spec = g_param_spec_string (
-      "stream-init-id",
-      "stream init ID",
-      "the iq ID of the SI request, if any",
-      "",
-      G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_STREAM_INIT_ID,
-      param_spec);
-}
-
-/*
- * gibber_bytestream_ibb_send
- *
- * Implements gibber_bytestream_iface_send on GibberBytestreamIface
- */
-static gboolean
-gibber_bytestream_ibb_send (GibberBytestreamIface *bytestream,
-                            guint len,
-                            const gchar *str)
-{
-  GibberBytestreamIBB *self = GIBBER_BYTESTREAM_IBB (bytestream);
-  GibberBytestreamIBBPrivate *priv = GIBBER_BYTESTREAM_IBB_GET_PRIVATE (self);
-  WockyStanza *stanza;
-  gchar *seq, *encoded;
-
-  if (priv->state != GIBBER_BYTESTREAM_STATE_OPEN)
-    {
-      DEBUG ("can't send data through a not open bytestream (state: %d)",
-          priv->state);
-      return FALSE;
-    }
-
-  seq = g_strdup_printf ("%u", priv->seq++);
-
-  encoded = g_base64_encode ((const guchar *) str, len);
-
-  stanza = wocky_stanza_build_to_contact (WOCKY_STANZA_TYPE_MESSAGE,
-      WOCKY_STANZA_SUB_TYPE_NONE,
-      priv->self_id, priv->contact,
-      '(', "data",
-        ':', GIBBER_XMPP_NS_IBB,
-        '@', "sid", priv->stream_id,
-        '@', "seq", seq,
-        '$', encoded,
-      ')',
-      '(', "amp",
-        ':', GIBBER_XMPP_NS_AMP,
-        '(', "rule",
-          '@', "condition", "deliver-at",
-          '@', "value", "stored",
-          '@', "action", "error",
-        ')',
-        '(', "rule",
-          '@', "condition", "match-resource",
-          '@', "value", "exact",
-          '@', "action", "error",
-        ')',
-      ')',
-      NULL);
-
-  DEBUG ("send %d bytes", len);
-  wocky_porter_send (priv->porter, stanza);
-
-  g_object_unref (stanza);
-  g_free (encoded);
-  g_free (seq);
-
-  return TRUE;
-}
-
-static WockyStanza *
-create_si_accept_iq (GibberBytestreamIBB *self)
-{
-  GibberBytestreamIBBPrivate *priv = GIBBER_BYTESTREAM_IBB_GET_PRIVATE (self);
-
-  return wocky_stanza_build_to_contact (
-      WOCKY_STANZA_TYPE_IQ, WOCKY_STANZA_SUB_TYPE_RESULT,
-      priv->self_id, priv->contact,
-      '@', "id", priv->stream_init_id,
-      '(', "si",
-        ':', GIBBER_XMPP_NS_SI,
-        '(', "feature",
-          ':', GIBBER_XMPP_NS_FEATURENEG,
-          '(', "x",
-            ':', GIBBER_XMPP_NS_DATA,
-            '@', "type", "submit",
-            '(', "field",
-              '@', "var", "stream-method",
-              '(', "value",
-                '$', GIBBER_XMPP_NS_IBB,
-              ')',
-            ')',
-          ')',
-        ')',
-      ')', NULL);
-}
-
-/*
- * gibber_bytestream_ibb_accept
- *
- * Implements gibber_bytestream_iface_accept on GibberBytestreamIface
- */
-static void
-gibber_bytestream_ibb_accept (GibberBytestreamIface *bytestream,
-                              GibberBytestreamAugmentSiAcceptReply func,
-                              gpointer user_data)
-{
-  GibberBytestreamIBB *self = GIBBER_BYTESTREAM_IBB (bytestream);
-  GibberBytestreamIBBPrivate *priv = GIBBER_BYTESTREAM_IBB_GET_PRIVATE (self);
-  WockyStanza *stanza;
-  WockyNode *node;
-  WockyNode *si;
-
-  if (priv->state != GIBBER_BYTESTREAM_STATE_LOCAL_PENDING)
-    {
-      /* The stream was previoulsy or automatically accepted */
-      DEBUG ("stream was already accepted");
-      return;
-    }
-
-  stanza = create_si_accept_iq (self);
-  node = wocky_stanza_get_top_node (stanza);
-  si = wocky_node_get_child_ns (node, "si", GIBBER_XMPP_NS_SI);
-  g_assert (si != NULL);
-
-  if (func != NULL)
-    {
-      /* let the caller add his profile specific data */
-      func (si, user_data);
-    }
-
-  wocky_porter_send (priv->porter, stanza);
-
-  g_object_unref (stanza);
-
-  DEBUG ("stream is now accepted");
-  g_object_set (self, "state", GIBBER_BYTESTREAM_STATE_ACCEPTED, NULL);
-}
-
-static void
-gibber_bytestream_ibb_decline (GibberBytestreamIBB *self,
-                               GError *error)
-{
-  GibberBytestreamIBBPrivate *priv = GIBBER_BYTESTREAM_IBB_GET_PRIVATE (self);
-  WockyStanza *stanza;
-  WockyNode *node;
-
-  g_return_if_fail (priv->state == GIBBER_BYTESTREAM_STATE_LOCAL_PENDING);
-
-  stanza = wocky_stanza_build_to_contact (
-      WOCKY_STANZA_TYPE_IQ, WOCKY_STANZA_SUB_TYPE_ERROR,
-      priv->self_id, priv->contact,
-      '@', "id", priv->stream_init_id,
-      NULL);
-  node = wocky_stanza_get_top_node (stanza);
-
-  if (error != NULL && error->domain == GIBBER_XMPP_ERROR)
-    {
-      gibber_xmpp_error_to_node (error->code, node, error->message);
-    }
-  else
-    {
-      gibber_xmpp_error_to_node (XMPP_ERROR_FORBIDDEN, node,
-          "Offer Declined");
-    }
-
-  wocky_porter_send (priv->porter, stanza);
-
-  g_object_unref (stanza);
-}
-
-/*
- * gibber_bytestream_ibb_close
- *
- * Implements gibber_bytestream_iface_close on GibberBytestreamIface
- */
-static void
-gibber_bytestream_ibb_close (GibberBytestreamIface *bytestream,
-                             GError *error)
-{
-  GibberBytestreamIBB *self = GIBBER_BYTESTREAM_IBB (bytestream);
-  GibberBytestreamIBBPrivate *priv = GIBBER_BYTESTREAM_IBB_GET_PRIVATE (self);
-
-  if (priv->state == GIBBER_BYTESTREAM_STATE_CLOSED)
-     /* bytestream already closed, do nothing */
-     return;
-
-  g_object_set (self, "state", GIBBER_BYTESTREAM_STATE_CLOSING, NULL);
-
-  if (priv->state == GIBBER_BYTESTREAM_STATE_LOCAL_PENDING)
-    {
-      /* Stream was created using SI so we decline the request */
-      gibber_bytestream_ibb_decline (self, error);
-    }
-  else
-    {
-      WockyStanza *stanza;
-
-      DEBUG ("send IBB close stanza");
-
-      stanza = wocky_stanza_build_to_contact (WOCKY_STANZA_TYPE_IQ,
-          WOCKY_STANZA_SUB_TYPE_SET,
-          priv->self_id, priv->contact,
-          '(', "close",
-            ':', GIBBER_XMPP_NS_IBB,
-            '@', "sid", priv->stream_id,
-          ')', NULL);
-
-      wocky_porter_send (priv->porter, stanza);
-
-      g_object_unref (stanza);
-    }
-
-  g_object_set (self, "state", GIBBER_BYTESTREAM_STATE_CLOSED, NULL);
-}
-
-#if 0
-static LmHandlerResult
-ibb_init_reply_cb (GibberConnection *conn,
-                   LmMessage *sent_msg,
-                   LmMessage *reply_msg,
-                   GObject *obj,
-                   gpointer user_data)
-{
-  GibberBytestreamIBB *self = GIBBER_BYTESTREAM_IBB (obj);
-
-  if (lm_message_get_sub_type (reply_msg) == LM_MESSAGE_SUB_TYPE_RESULT)
-    {
-      /* yeah, stream initiated */
-      DEBUG ("IBB stream initiated");
-      g_object_set (self, "state", GIBBER_BYTESTREAM_STATE_OPEN, NULL);
-    }
-  else
-    {
-      DEBUG ("error during IBB initiation");
-      g_object_set (self, "state", GIBBER_BYTESTREAM_STATE_CLOSED, NULL);
-    }
-
-  return LM_HANDLER_RESULT_REMOVE_MESSAGE;
-}
-#endif
-
-/*
- * gibber_bytestream_ibb_initiate
- *
- * Implements gibber_bytestream_iface_initiate on GibberBytestreamIface
- */
-static gboolean
-gibber_bytestream_ibb_initiate (GibberBytestreamIface *bytestream)
-{
-  GibberBytestreamIBB *self = GIBBER_BYTESTREAM_IBB (bytestream);
-  GibberBytestreamIBBPrivate *priv = GIBBER_BYTESTREAM_IBB_GET_PRIVATE (self);
-  WockyStanza *msg;
-
-  if (priv->state != GIBBER_BYTESTREAM_STATE_INITIATING)
-    {
-      DEBUG ("bytestream is not is the initiating state (state %d",
-          priv->state);
-      return FALSE;
-    }
-
-  if (priv->stream_id == NULL)
-    {
-      DEBUG ("stream doesn't have an ID");
-      return FALSE;
-    }
-
-  msg = wocky_stanza_build_to_contact (
-      WOCKY_STANZA_TYPE_IQ, WOCKY_STANZA_SUB_TYPE_SET,
-      priv->self_id, priv->contact,
-      '(', "open",
-        ':', GIBBER_XMPP_NS_IBB,
-        '@', "sid", priv->stream_id,
-        '@', "block-size", "4096",
-      ')', NULL);
-
-  /* XXX should send using _with_reply (ibb_init_reply_cb) */
-  wocky_porter_send (priv->porter, msg);
-
-  g_object_unref (msg);
-
-  return TRUE;
-}
-
-static void
-bytestream_iface_init (gpointer g_iface,
-                       gpointer iface_data)
-{
-  GibberBytestreamIfaceClass *klass = (GibberBytestreamIfaceClass *) g_iface;
-
-  klass->initiate = gibber_bytestream_ibb_initiate;
-  klass->send = gibber_bytestream_ibb_send;
-  klass->close = gibber_bytestream_ibb_close;
-  klass->accept = gibber_bytestream_ibb_accept;
-}
diff -Nru telepathy-salut-0.5.0/lib/gibber/gibber-bytestream-ibb.h telepathy-salut-0.7.0/lib/gibber/gibber-bytestream-ibb.h
--- telepathy-salut-0.5.0/lib/gibber/gibber-bytestream-ibb.h	2011-04-22 08:08:27.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/gibber-bytestream-ibb.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-/*
- * gibber-bytestream-ibb.h - Header for GibberBytestreamIBB
- * Copyright (C) 2007 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef __GIBBER_BYTESTREAM_IBB_H__
-#define __GIBBER_BYTESTREAM_IBB_H__
-
-#include 
-#include "gibber-bytestream-iface.h"
-#include 
-
-G_BEGIN_DECLS
-
-typedef struct _GibberBytestreamIBB GibberBytestreamIBB;
-typedef struct _GibberBytestreamIBBClass GibberBytestreamIBBClass;
-
-struct _GibberBytestreamIBBClass {
-  GObjectClass parent_class;
-};
-
-struct _GibberBytestreamIBB {
-  GObject parent;
-
-  gpointer priv;
-};
-
-GType gibber_bytestream_ibb_get_type (void);
-
-/* TYPE MACROS */
-#define GIBBER_TYPE_BYTESTREAM_IBB \
-  (gibber_bytestream_ibb_get_type ())
-#define GIBBER_BYTESTREAM_IBB(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), GIBBER_TYPE_BYTESTREAM_IBB,\
-                              GibberBytestreamIBB))
-#define GIBBER_BYTESTREAM_IBB_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GIBBER_TYPE_BYTESTREAM_IBB,\
-                           GibberBytestreamIBBClass))
-#define GIBBER_IS_BYTESTREAM_IBB(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GIBBER_TYPE_BYTESTREAM_IBB))
-#define GIBBER_IS_BYTESTREAM_IBB_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), GIBBER_TYPE_BYTESTREAM_IBB))
-#define GIBBER_BYTESTREAM_IBB_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIBBER_TYPE_BYTESTREAM_IBB,\
-                              GibberBytestreamIBBClass))
-
-G_END_DECLS
-
-#endif /* #ifndef __GIBBER_BYTESTREAM_IBB_H__ */
diff -Nru telepathy-salut-0.5.0/lib/gibber/gibber-bytestream-muc.c telepathy-salut-0.7.0/lib/gibber/gibber-bytestream-muc.c
--- telepathy-salut-0.5.0/lib/gibber/gibber-bytestream-muc.c	2008-12-28 15:35:03.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/gibber-bytestream-muc.c	2011-05-09 12:46:34.000000000 +0000
@@ -28,7 +28,8 @@
 #include "gibber-bytestream-iface.h"
 #include "gibber-muc-connection.h"
 #include "gibber-linklocal-transport.h"
-#include "gibber-namespaces.h"
+
+#include 
 
 #define DEBUG_FLAG DEBUG_BYTESTREAM
 #include "gibber-debug.h"
@@ -199,7 +200,7 @@
       case PROP_PROTOCOL:
         /* We use the Clique namespace to signify that we're using streams
          * 1 to 65535 of the reliable multicast layer */
-        g_value_set_string (value, GIBBER_TELEPATHY_NS_CLIQUE);
+        g_value_set_string (value, WOCKY_TELEPATHY_NS_CLIQUE);
         break;
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
diff -Nru telepathy-salut-0.5.0/lib/gibber/gibber-bytestream-oob.c telepathy-salut-0.7.0/lib/gibber/gibber-bytestream-oob.c
--- telepathy-salut-0.5.0/lib/gibber/gibber-bytestream-oob.c	2011-04-25 13:46:40.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/gibber-bytestream-oob.c	2011-06-23 21:54:46.000000000 +0000
@@ -31,12 +31,12 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include "gibber-sockets.h"
 #include "gibber-bytestream-iface.h"
-#include "gibber-namespaces.h"
 #include "gibber-linklocal-transport.h"
-#include "gibber-xmpp-error.h"
 #include "gibber-util.h"
 #include "gibber-transport.h"
 #include "gibber-fd-transport.h"
@@ -63,7 +63,7 @@
   PROP_SELF_ID,
   PROP_PEER_ID,
   PROP_STREAM_ID,
-  PROP_STREAM_INIT_ID,
+  PROP_STREAM_INIT_IQ,
   PROP_STATE,
   PROP_HOST,
   PROP_PROTOCOL,
@@ -78,7 +78,7 @@
   gchar *self_id;
   gchar *peer_id;
   gchar *stream_id;
-  gchar *stream_init_id;
+  WockyStanza *stream_init_iq;
   /* ID of the OOB opening stanza. We'll reply to
    * it when we the bytestream is closed */
   gchar *stream_open_id;
@@ -169,7 +169,7 @@
   if (priv->state == GIBBER_BYTESTREAM_STATE_ACCEPTED)
     {
       /* Connection to host failed */
-      GError e = { GIBBER_XMPP_ERROR, XMPP_ERROR_ITEM_NOT_FOUND,
+      GError e = { WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_ITEM_NOT_FOUND,
           "connection failed" };
 
       gibber_bytestream_iface_close (GIBBER_BYTESTREAM_IFACE (self), &e);
@@ -270,7 +270,7 @@
    {
       /* I'm too lazy to create more specific errors for this  as it should
        * never happen while using salut anyway.. */
-      GError e = { GIBBER_XMPP_ERROR, XMPP_ERROR_NOT_ACCEPTABLE,
+      GError e = { WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_NOT_ACCEPTABLE,
           "Invalid port number" };
       DEBUG ("Invalid port number: %s", port);
       gibber_bytestream_iface_close (GIBBER_BYTESTREAM_IFACE (self), &e);
@@ -287,7 +287,7 @@
     {
       /* I'm too lazy to create more specific errors for this  as it should
        * never happen while using salut anyway.. */
-      GError e = { GIBBER_XMPP_ERROR, XMPP_ERROR_ITEM_NOT_FOUND,
+      GError e = { WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_ITEM_NOT_FOUND,
           "Unsable get socket address for the control connection" };
       DEBUG ("Could not get socket address for the control connection" );
       gibber_bytestream_iface_close (GIBBER_BYTESTREAM_IFACE (self), &e);
@@ -297,7 +297,7 @@
   if (!g_socket_address_to_native (G_SOCKET_ADDRESS (socket_address), &(addr.storage),
           sizeof (addr.storage), &error))
     {
-      GError e = { GIBBER_XMPP_ERROR, XMPP_ERROR_ITEM_NOT_FOUND,
+      GError e = { WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_ITEM_NOT_FOUND,
           "Failed to turn socket address into bytes" };
       DEBUG ("Failed to get native socket address: %s", error->message);
       gibber_bytestream_iface_close (GIBBER_BYTESTREAM_IFACE (self), &e);
@@ -366,7 +366,7 @@
     return FALSE;
 
   query_node = wocky_node_get_child_ns (node, "query",
-      GIBBER_XMPP_NS_IQ_OOB);
+      WOCKY_XMPP_NS_IQ_OOB);
   if (query_node == NULL)
     return FALSE;
 
@@ -385,7 +385,7 @@
 
   if (!g_str_has_prefix (url, "x-tcp://"))
     {
-      GError e = { GIBBER_XMPP_ERROR, XMPP_ERROR_ITEM_NOT_FOUND,
+      GError e = { WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_ITEM_NOT_FOUND,
                    "URL is not a TCP URL" };
 
       DEBUG ("URL is not a TCP URL: %s. Close the bytestream", priv->url);
@@ -501,6 +501,12 @@
       priv->contact = NULL;
     }
 
+  if (priv->stream_init_iq != NULL)
+    {
+      g_object_unref (priv->stream_init_iq);
+      priv->stream_init_iq = NULL;
+    }
+
   G_OBJECT_CLASS (gibber_bytestream_oob_parent_class)->dispose (object);
 }
 
@@ -511,7 +517,6 @@
   GibberBytestreamOOBPrivate *priv = GIBBER_BYTESTREAM_OOB_GET_PRIVATE (self);
 
   g_free (priv->stream_id);
-  g_free (priv->stream_init_id);
   g_free (priv->stream_open_id);
   g_free (priv->host);
   g_free (priv->self_id);
@@ -546,8 +551,8 @@
       case PROP_STREAM_ID:
         g_value_set_string (value, priv->stream_id);
         break;
-      case PROP_STREAM_INIT_ID:
-        g_value_set_string (value, priv->stream_init_id);
+      case PROP_STREAM_INIT_IQ:
+        g_value_set_object (value, priv->stream_init_iq);
         break;
       case PROP_STATE:
         g_value_set_uint (value, priv->state);
@@ -556,7 +561,7 @@
         g_value_set_string (value, priv->host);
         break;
       case PROP_PROTOCOL:
-        g_value_set_string (value, GIBBER_XMPP_NS_IQ_OOB);
+        g_value_set_string (value, WOCKY_XMPP_NS_IQ_OOB);
         break;
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -608,9 +613,8 @@
         g_free (priv->stream_id);
         priv->stream_id = g_value_dup_string (value);
         break;
-      case PROP_STREAM_INIT_ID:
-        g_free (priv->stream_init_id);
-        priv->stream_init_id = g_value_dup_string (value);
+      case PROP_STREAM_INIT_IQ:
+        priv->stream_init_iq = g_value_dup_object (value);
         break;
       case PROP_STATE:
         if (priv->state != g_value_get_uint (value))
@@ -716,14 +720,14 @@
   g_object_class_install_property (object_class, PROP_CONTACT,
       param_spec);
 
-  param_spec = g_param_spec_string (
-      "stream-init-id",
-      "stream init ID",
-      "the iq ID of the SI request, if any",
-      "",
+  param_spec = g_param_spec_object (
+      "stream-init-iq",
+      "stream init IQ",
+      "the iq of the SI request",
+      WOCKY_TYPE_STANZA,
       G_PARAM_CONSTRUCT_ONLY |
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_STREAM_INIT_ID,
+  g_object_class_install_property (object_class, PROP_STREAM_INIT_IQ,
       param_spec);
 
   param_spec = g_param_spec_string (
@@ -789,21 +793,18 @@
 {
   GibberBytestreamOOBPrivate *priv = GIBBER_BYTESTREAM_OOB_GET_PRIVATE (self);
 
-  return wocky_stanza_build_to_contact (
-      WOCKY_STANZA_TYPE_IQ, WOCKY_STANZA_SUB_TYPE_RESULT,
-      priv->self_id, priv->contact,
-      '@', "id", priv->stream_init_id,
+  return wocky_stanza_build_iq_result (priv->stream_init_iq,
       '(', "si",
-        ':', GIBBER_XMPP_NS_SI,
+        ':', WOCKY_XMPP_NS_SI,
         '(', "feature",
-          ':', GIBBER_XMPP_NS_FEATURENEG,
+          ':', WOCKY_XMPP_NS_FEATURENEG,
           '(', "x",
-            ':', GIBBER_XMPP_NS_DATA,
+            ':', WOCKY_XMPP_NS_DATA,
             '@', "type", "submit",
             '(', "field",
               '@', "var", "stream-method",
               '(', "value",
-                '$', GIBBER_XMPP_NS_IQ_OOB,
+                '$', WOCKY_XMPP_NS_IQ_OOB,
               ')',
             ')',
           ')',
@@ -836,7 +837,7 @@
 
   stanza = create_si_accept_iq (self);
   node = wocky_stanza_get_top_node (stanza);
-  si = wocky_node_get_child_ns (node, "si", GIBBER_XMPP_NS_SI);
+  si = wocky_node_get_child_ns (node, "si", WOCKY_XMPP_NS_SI);
   g_assert (si != NULL);
 
   if (func != NULL)
@@ -894,31 +895,19 @@
                                GError *error)
  {
   GibberBytestreamOOBPrivate *priv = GIBBER_BYTESTREAM_OOB_GET_PRIVATE (self);
-  WockyStanza *stanza;
-  WockyNode *node;
 
   g_return_if_fail (priv->state == GIBBER_BYTESTREAM_STATE_LOCAL_PENDING);
 
-  stanza = wocky_stanza_build_to_contact (
-      WOCKY_STANZA_TYPE_IQ, WOCKY_STANZA_SUB_TYPE_ERROR,
-      priv->self_id, priv->contact,
-      '@', "id", priv->stream_init_id,
-      NULL);
-  node = wocky_stanza_get_top_node (stanza);
-
-  if (error != NULL && error->domain == GIBBER_XMPP_ERROR)
+  if (error != NULL
+      && (error->domain == WOCKY_XMPP_ERROR || error->domain == WOCKY_SI_ERROR))
     {
-      gibber_xmpp_error_to_node (error->code, node, error->message);
+      wocky_porter_send_iq_gerror (priv->porter, priv->stream_init_iq, error);
     }
   else
     {
-      gibber_xmpp_error_to_node (XMPP_ERROR_FORBIDDEN, node,
-          "Offer Declined");
+      wocky_porter_send_iq_error (priv->porter, priv->stream_init_iq,
+          WOCKY_XMPP_ERROR_FORBIDDEN, "Offer declined");
     }
-
-  wocky_porter_send (priv->porter, stanza);
-
-  g_object_unref (stanza);
 }
 
 static void
@@ -974,7 +963,7 @@
       WOCKY_STANZA_TYPE_IQ, WOCKY_STANZA_SUB_TYPE_SET,
       from, to,
       '(', "query",
-        ':', GIBBER_XMPP_NS_IQ_OOB,
+        ':', WOCKY_XMPP_NS_IQ_OOB,
         '@', "sid", stream_id,
         '(', "url",
           '$', url,
diff -Nru telepathy-salut-0.5.0/lib/gibber/gibber-debug.h telepathy-salut-0.7.0/lib/gibber/gibber-debug.h
--- telepathy-salut-0.5.0/lib/gibber/gibber-debug.h	2011-04-22 08:08:27.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/gibber-debug.h	2011-08-23 15:54:55.000000000 +0000
@@ -55,17 +55,23 @@
 
 #ifdef DEBUG_FLAG
 
-#define DEBUG(format, ...) \
-  G_STMT_START { } G_STMT_END
-
-#define DEBUG_STANZA(stanza, format, ...) \
-  G_STMT_START { } G_STMT_END
+static inline void
+DEBUG (
+    const gchar *format,
+    ...)
+{
+}
+
+static inline void
+DEBUG_STANZA (
+    WockyStanza *stanza,
+    const gchar *format,
+    ...)
+{
+}
 
 #define DEBUGGING 0
 
-#define NODE_DEBUG(n, s) \
-  G_STMT_START { } G_STMT_END
-
 #endif /* DEBUG_FLAG */
 
 #endif /* ENABLE_DEBUG */
diff -Nru telepathy-salut-0.5.0/lib/gibber/gibber-file-transfer.c telepathy-salut-0.7.0/lib/gibber/gibber-file-transfer.c
--- telepathy-salut-0.5.0/lib/gibber/gibber-file-transfer.c	2011-04-25 13:46:40.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/gibber-file-transfer.c	2011-11-16 08:53:50.000000000 +0000
@@ -339,6 +339,13 @@
       self->priv->contact = NULL;
     }
 
+  if (self->dataforms)
+    {
+      g_list_foreach (self->dataforms, (GFunc) g_object_unref, NULL);
+      g_list_free (self->dataforms);
+      self->dataforms = NULL;
+    }
+
   G_OBJECT_CLASS (gibber_file_transfer_parent_class)->dispose (object);
 }
 
diff -Nru telepathy-salut-0.5.0/lib/gibber/gibber-file-transfer.h telepathy-salut-0.7.0/lib/gibber/gibber-file-transfer.h
--- telepathy-salut-0.5.0/lib/gibber/gibber-file-transfer.h	2011-04-25 13:46:40.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/gibber-file-transfer.h	2011-11-16 08:53:50.000000000 +0000
@@ -80,6 +80,8 @@
   gchar *description;
   gchar *content_type;
 
+  GList *dataforms;
+
   GibberFileTransferDirection direction;
 };
 
diff -Nru telepathy-salut-0.5.0/lib/gibber/gibber-muc-connection.c telepathy-salut-0.7.0/lib/gibber/gibber-muc-connection.c
--- telepathy-salut-0.5.0/lib/gibber/gibber-muc-connection.c	2011-04-22 08:08:27.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/gibber-muc-connection.c	2011-05-09 12:46:34.000000000 +0000
@@ -29,22 +29,20 @@
 #include "gibber-signals-marshal.h"
 
 #include "gibber-sockets.h"
-#include "gibber-namespaces.h"
-#include "gibber-xmpp-reader.h"
-#include "gibber-xmpp-writer.h"
 #include "gibber-multicast-transport.h"
 #include "gibber-r-multicast-transport.h"
 #include "gibber-r-multicast-causal-transport.h"
 
+#include 
+#include 
+#include 
+
 #define ADDRESS_KEY "address"
 #define PORT_KEY "port"
 
 #define DEBUG_FLAG DEBUG_MUC_CONNECTION
 #include "gibber-debug.h"
 
-static void _reader_received_stanza_cb (GibberXmppReader *reader,
-    WockyStanza *stanza, gpointer user_data);
-
 static void _connection_received_data (GibberTransport *transport,
     GibberBuffer *buffer, gpointer user_data);
 
@@ -79,8 +77,8 @@
   gchar *address;
   gchar *port;
 
-  GibberXmppReader *reader;
-  GibberXmppWriter *writer;
+  WockyXmppReader *reader;
+  WockyXmppWriter *writer;
 
   GHashTable *parameters;
 
@@ -88,7 +86,6 @@
   GibberRMulticastCausalTransport *rmctransport;
   GibberRMulticastTransport *rmtransport;
 
-  const gchar *current_sender;
   GArray *streams_used;
   guint16 last_stream_allocated;
   gulong rmc_connected_handler;
@@ -114,10 +111,8 @@
   guint16 stream_id;
 
   /* allocate any data required by the object here */
-  priv->reader = gibber_xmpp_reader_new_no_stream ();
-  priv->writer = gibber_xmpp_writer_new_no_stream ();
-  g_signal_connect (priv->reader, "received-stanza",
-                   G_CALLBACK (_reader_received_stanza_cb), obj);
+  priv->reader = wocky_xmpp_reader_new_no_stream ();
+  priv->writer = wocky_xmpp_writer_new_no_stream ();
 
   priv->streams_used = g_array_sized_new (FALSE, TRUE, sizeof (guint16), 1);
   /* 0 is the "default" stream */
@@ -274,7 +269,7 @@
 const gchar **
 gibber_muc_connection_get_protocols (void)
 {
-  static const gchar *protocols[] = { GIBBER_TELEPATHY_NS_CLIQUE, NULL };
+  static const gchar *protocols[] = { WOCKY_TELEPATHY_NS_CLIQUE, NULL };
   return protocols;
 }
 
@@ -288,7 +283,7 @@
   struct {
     const gchar *protocol;
     const gchar **parameters;
-  } protocols[] = { { GIBBER_TELEPATHY_NS_CLIQUE, parameters },
+  } protocols[] = { { WOCKY_TELEPATHY_NS_CLIQUE, parameters },
                     { NULL, NULL }
                   };
 
@@ -394,7 +389,7 @@
   GibberMucConnection *result;
   GibberMucConnectionPrivate *priv;
 
-  if (protocol != NULL && strcmp (protocol, GIBBER_TELEPATHY_NS_CLIQUE) != 0)
+  if (protocol != NULL && strcmp (protocol, WOCKY_TELEPATHY_NS_CLIQUE) != 0)
     {
       g_set_error (error, GIBBER_MUC_CONNECTION_ERROR,
           GIBBER_MUC_CONNECTION_ERROR_INVALID_PROTOCOL,
@@ -431,7 +426,7 @@
     }
   else
     {
-      priv->protocol = g_strdup (GIBBER_TELEPATHY_NS_CLIQUE);
+      priv->protocol = g_strdup (WOCKY_TELEPATHY_NS_CLIQUE);
     }
 
   priv->address = g_strdup (address);
@@ -631,26 +626,13 @@
 }
 
 static void
-_reader_received_stanza_cb (GibberXmppReader *reader, WockyStanza *stanza,
-    gpointer user_data)
-{
-  GibberMucConnection *self = GIBBER_MUC_CONNECTION (user_data);
-  GibberMucConnectionPrivate *priv = GIBBER_MUC_CONNECTION_GET_PRIVATE (self);
-
-  g_assert (priv->current_sender != NULL);
-  g_signal_emit (self, signals[RECEIVED_STANZA], 0,
-      priv->current_sender, stanza);
-}
-
-
-static void
 _connection_received_data (GibberTransport *transport, GibberBuffer *buffer,
     gpointer user_data)
 {
   GibberMucConnection *self = GIBBER_MUC_CONNECTION (user_data);
   GibberMucConnectionPrivate *priv = GIBBER_MUC_CONNECTION_GET_PRIVATE (self);
   GibberRMulticastBuffer *rmbuffer = (GibberRMulticastBuffer *) buffer;
-  gboolean ret;
+  WockyStanza *stanza;
   GError *error = NULL;
 
   g_assert (buffer->length > 0);
@@ -663,19 +645,31 @@
       return;
     }
 
-  /* Ensure we're not disposed inside while running the reader is busy */
-  g_object_ref (self);
-  priv->current_sender = rmbuffer->sender;
-  ret = gibber_xmpp_reader_push (priv->reader, buffer->data, buffer->length,
-      &error);
-  priv->current_sender = NULL;
+  /* push the data into the reader */
+  wocky_xmpp_reader_push (priv->reader, buffer->data, buffer->length);
 
-  if (!ret)
+  error = wocky_xmpp_reader_get_error (priv->reader);
+
+  if (error != NULL)
     {
+      DEBUG ("reader error: %s", error->message);
       g_signal_emit (self, signals[PARSE_ERROR], 0);
+      g_clear_error (&error);
+
+      wocky_xmpp_reader_reset (priv->reader);
     }
 
-  g_object_unref (self);
+  /* now check if we got a stanza out of it */
+  stanza = wocky_xmpp_reader_pop_stanza (priv->reader);
+
+  if (stanza != NULL)
+    {
+      g_signal_emit (self, signals[RECEIVED_STANZA], 0,
+          rmbuffer->sender, stanza);
+      g_object_unref (stanza);
+
+      wocky_xmpp_reader_reset (priv->reader);
+    }
 }
 
 gboolean
@@ -687,11 +681,8 @@
   const guint8 *data;
   gsize length;
 
-  if (!gibber_xmpp_writer_write_stanza (priv->writer, stanza,
-      &data, &length, error))
-    {
-      return FALSE;
-    }
+  wocky_xmpp_writer_write_stanza (priv->writer, stanza,
+      &data, &length);
 
   return gibber_transport_send (GIBBER_TRANSPORT (priv->rmtransport),
       data, length, error);
diff -Nru telepathy-salut-0.5.0/lib/gibber/gibber-namespaces.h telepathy-salut-0.7.0/lib/gibber/gibber-namespaces.h
--- telepathy-salut-0.5.0/lib/gibber/gibber-namespaces.h	2009-04-25 11:20:50.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/gibber-namespaces.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-
-#ifndef __GIBBER_NAMESPACES_H__
-#define __GIBBER_NAMESPACES_H__
-
-#define GIBBER_XMPP_NS_STREAM \
-  "http://etherx.jabber.org/streams"
-
-#define GIBBER_XMPP_NS_TLS \
-  "urn:ietf:params:xml:ns:xmpp-tls"
-
-#define GIBBER_XMPP_NS_SASL_AUTH \
-  "urn:ietf:params:xml:ns:xmpp-sasl"
-
-#define NS_DISCO_INFO \
-  "http://jabber.org/protocol/disco#info"
-
-#define NS_DISCO_ITEMS \
-  "http://jabber.org/protocol/disco#items"
-
-#define GIBBER_XMPP_NS_XHTML_IM \
-  "http://jabber.org/protocol/xhtml-im"
-
-#define GIBBER_XMPP_NS_IBB \
-  "http://jabber.org/protocol/ibb"
-
-#define GIBBER_XMPP_NS_AMP \
-  "http://jabber.org/protocol/amp"
-
-#define GIBBER_W3C_NS_XHTML \
-  "http://www.w3.org/1999/xhtml"
-
-#define GIBBER_TELEPATHY_NS_CAPS \
-  "http://telepathy.freedesktop.org/caps"
-
-#define GIBBER_TELEPATHY_NS_TUBES \
-  "http://telepathy.freedesktop.org/xmpp/tubes"
-
-#define GIBBER_TELEPATHY_NS_OLPC_ACTIVITY_PROPS \
-  "http://laptop.org/xmpp/activity-properties"
-
-#define GIBBER_XMPP_NS_SI \
-  "http://jabber.org/protocol/si"
-
-#define GIBBER_XMPP_NS_FEATURENEG \
-  "http://jabber.org/protocol/feature-neg"
-
-#define GIBBER_XMPP_NS_DATA \
-  "jabber:x:data"
-
-#define GIBBER_XMPP_NS_EVENT \
-  "jabber:x:event"
-
-#define GIBBER_XMPP_NS_STANZAS \
-  "urn:ietf:params:xml:ns:xmpp-stanzas"
-
-#define GIBBER_XMPP_NS_IQ_OOB \
-  "jabber:iq:oob"
-
-#define GIBBER_XMPP_NS_X_OOB \
-  "jabber:x:oob"
-
-#define GIBBER_XMPP_NS_JINGLE_ERRORS \
-  "http://jabber.org/protocol/jingle#errors"
-
-#define GIBBER_TELEPATHY_NS_CLIQUE \
-  "http://telepathy.freedesktop.org/xmpp/clique"
-
-#endif /* #ifndef __GIBBER_NAMESPACES_H__ */
diff -Nru telepathy-salut-0.5.0/lib/gibber/gibber-oob-file-transfer.c telepathy-salut-0.7.0/lib/gibber/gibber-oob-file-transfer.c
--- telepathy-salut-0.5.0/lib/gibber/gibber-oob-file-transfer.c	2011-05-03 11:19:13.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/gibber-oob-file-transfer.c	2011-11-16 08:53:50.000000000 +0000
@@ -28,9 +28,11 @@
 
 #include 
 #include 
+#include 
+#include 
+
 #include "gibber-oob-file-transfer.h"
 #include "gibber-fd-transport.h"
-#include "gibber-namespaces.h"
 #include "gibber-util.h"
 
 #define DEBUG_FLAG DEBUG_FILE_TRANSFER
@@ -175,6 +177,32 @@
   return TRUE;
 }
 
+static GList *
+extract_dataforms (WockyNode *file)
+{
+  GList *forms = NULL;
+  WockyNodeIter iter;
+  WockyNode *x;
+
+  wocky_node_iter_init (&iter, file, "x", WOCKY_XMPP_NS_DATA);
+  while (wocky_node_iter_next (&iter, &x))
+    {
+      GError *error = NULL;
+      WockyDataForm *form = wocky_data_form_new_from_node (x, &error);
+
+      if (form == NULL)
+        {
+          DEBUG ("Failed to parse data form: %s", error->message);
+          g_clear_error (&error);
+          continue;
+        }
+
+      forms = g_list_append (forms, form);
+    }
+
+  return forms;
+}
+
 GibberFileTransfer *
 gibber_oob_file_transfer_new_from_stanza_with_from (
     WockyStanza *stanza,
@@ -323,6 +351,8 @@
 
   self->priv->transferred_bytes = 0;
 
+  GIBBER_FILE_TRANSFER (self)->dataforms = extract_dataforms (query);
+
   g_free (filename);
 
   return GIBBER_FILE_TRANSFER (self);
@@ -475,12 +505,14 @@
 create_transfer_offer (GibberOobFileTransfer *self,
                        GError **error)
 {
+  GibberFileTransfer *ft = (GibberFileTransfer *) self;
   WockyMetaPorter *porter;
   WockyContact *contact;
   GSocketConnection *conn;
   GSocketAddress *address;
   GInetAddress *addr;
   GSocketFamily family;
+  GList *l;
 
   /* local host name */
   gchar *host_name;
@@ -555,7 +587,7 @@
   node = wocky_stanza_get_top_node (stanza);
 
   query_node = wocky_node_add_child_ns (node, "query",
-      GIBBER_XMPP_NS_IQ_OOB);
+      WOCKY_XMPP_NS_IQ_OOB);
 
   url_node = wocky_node_add_child_with_content (query_node, "url", url);
   wocky_node_set_attribute (url_node, "type", "file");
@@ -579,6 +611,13 @@
   self->priv->url = url;
   self->priv->served_name = served_name;
 
+  /* dataforms */
+  for (l = ft->dataforms; l != NULL; l = l->next)
+    {
+      WockyDataForm *form = l->data;
+      wocky_data_form_add_to_node (form, query_node);
+    }
+
   return stanza;
 }
 
@@ -933,7 +972,7 @@
   node = wocky_stanza_get_top_node (stanza);
 
   query = wocky_node_add_child_ns (node, "query",
-      GIBBER_XMPP_NS_IQ_OOB);
+      WOCKY_XMPP_NS_IQ_OOB);
   wocky_node_add_child_with_content (query, "url", self->priv->url);
 
   error_node = wocky_node_add_child (node, "error");
@@ -945,13 +984,13 @@
         wocky_node_set_attribute (error_node, "code", code_string);
         wocky_node_set_attribute (error_node, "type", "cancel");
         wocky_node_add_child_ns (error_node,
-            "item-not-found", GIBBER_XMPP_NS_STANZAS);
+            "item-not-found", WOCKY_XMPP_NS_STANZAS);
         break;
       case HTTP_STATUS_CODE_NOT_ACCEPTABLE:
         wocky_node_set_attribute (error_node, "code", code_string);
         wocky_node_set_attribute (error_node, "type", "modify");
         wocky_node_add_child_ns (error_node,
-            "not-acceptable", GIBBER_XMPP_NS_STANZAS);
+            "not-acceptable", WOCKY_XMPP_NS_STANZAS);
         break;
       default:
         g_assert_not_reached ();
diff -Nru telepathy-salut-0.5.0/lib/gibber/gibber-xmpp-error.c telepathy-salut-0.7.0/lib/gibber/gibber-xmpp-error.c
--- telepathy-salut-0.5.0/lib/gibber/gibber-xmpp-error.c	2011-04-22 08:08:27.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/gibber-xmpp-error.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,481 +0,0 @@
-/*
- * gibber-xmpp-error.c - Source for Gibber's XMPP error handling API
- * Copyright (C) 2006-2007 Collabora Ltd.
- * Copyright (C) 2006 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "gibber-xmpp-error.h"
-
-#include 
-#include 
-
-#include "gibber-namespaces.h"
-
-#define MAX_LEGACY_ERRORS 3
-
-typedef struct {
-    const gchar *name;
-    const gchar *description;
-    const gchar *type;
-    guint specialises;
-    const gchar *namespace;
-    const guint16 legacy_errors[MAX_LEGACY_ERRORS];
-} XmppErrorSpec;
-
-static const XmppErrorSpec xmpp_errors[NUM_XMPP_ERRORS] =
-{
-    {
-      "undefined-condition",
-      "application-specific condition",
-      NULL,
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 500, 0, },
-    },
-    {
-      "redirect",
-      "the recipient or server is redirecting requests for this information "
-      "to another entity",
-      "modify",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 302, 0, },
-    },
-
-    {
-      "gone",
-      "the recipient or server can no longer be contacted at this address",
-      "modify",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 302, 0, },
-    },
-
-    {
-      "bad-request",
-      "the sender has sent XML that is malformed or that cannot be processed",
-      "modify",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 400, 0, },
-    },
-    {
-      "unexpected-request",
-      "the recipient or server understood the request but was not expecting "
-      "it at this time",
-      "wait",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 400, 0, },
-    },
-    {
-      "jid-malformed",
-      "the sending entity has provided or communicated an XMPP address or "
-      "aspect thereof (e.g., a resource identifier) that does not adhere "
-      "to the syntax defined in Addressing Scheme (Section 3)",
-      "modify",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 400, 0, },
-    },
-
-    {
-      "not-authorized",
-      "the sender must provide proper credentials before being allowed to "
-      "perform the action, or has provided improper credentials",
-      "auth",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 401, 0, },
-    },
-
-    {
-      "payment-required",
-      "the requesting entity is not authorized to access the requested "
-      "service because payment is required",
-      "auth",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 402, 0, },
-    },
-
-    {
-      "forbidden",
-      "the requesting entity does not possess the required permissions to "
-      "perform the action",
-      "auth",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 403, 0, },
-    },
-
-    {
-      "item-not-found",
-      "the addressed JID or item requested cannot be found",
-      "cancel",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 404, 0, },
-    },
-    {
-      "recipient-unavailable",
-      "the intended recipient is temporarily unavailable",
-      "wait",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 404, 0, },
-    },
-    {
-      "remote-server-not-found",
-      "a remote server or service specified as part or all of the JID of the "
-      "intended recipient (or required to fulfill a request) could not be "
-      "contacted within a reasonable amount of time",
-      "cancel",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 404, 0, },
-    },
-
-    {
-      "not-allowed",
-      "the recipient or server does not allow any entity to perform the action",
-      "cancel",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 405, 0, },
-    },
-
-    {
-      "not-acceptable",
-      "the recipient or server understands the request but is refusing to "
-      "process it because it does not meet criteria defined by the recipient "
-      "or server (e.g., a local policy regarding acceptable words in messages)",
-      "modify",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 406, 0, },
-    },
-
-    {
-      "registration-required",
-      "the requesting entity is not authorized to access the requested service "
-      "because registration is required",
-      "auth",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 407, 0, },
-    },
-    {
-      "subscription-required",
-      "the requesting entity is not authorized to access the requested service "
-      "because a subscription is required",
-      "auth",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 407, 0, },
-    },
-
-    {
-      "remote-server-timeout",
-      "a remote server or service specified as part or all of the JID of the "
-      "intended recipient (or required to fulfill a request) could not be "
-      "contacted within a reasonable amount of time",
-      "wait",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 408, 504, 0, },
-    },
-
-    {
-      "conflict",
-      "access cannot be granted because an existing resource or session exists "
-      "with the same name or address",
-      "cancel",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 409, 0, },
-    },
-
-    {
-      "internal-server-error",
-      "the server could not process the stanza because of a misconfiguration "
-      "or an otherwise-undefined internal server error",
-      "wait",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 500, 0, },
-    },
-    {
-      "resource-constraint",
-      "the server or recipient lacks the system resources necessary to service "
-      "the request",
-      "wait",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 500, 0, },
-    },
-
-    {
-      "feature-not-implemented",
-      "the feature requested is not implemented by the recipient or server and "
-      "therefore cannot be processed",
-      "cancel",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 501, 0, },
-    },
-
-    {
-      "service-unavailable",
-      "the server or recipient does not currently provide the requested "
-      "service",
-      "cancel",
-      0,
-      GIBBER_XMPP_NS_STANZAS,
-      { 502, 503, 510, },
-    },
-
-    {
-      "out-of-order",
-      "the request cannot occur at this point in the state machine",
-      "cancel",
-      XMPP_ERROR_UNEXPECTED_REQUEST,
-      GIBBER_XMPP_NS_JINGLE_ERRORS,
-      { 0, },
-    },
-
-    {
-      "unknown-session",
-      "the 'sid' attribute specifies a session that is unknown to the "
-      "recipient",
-      "cancel",
-      XMPP_ERROR_BAD_REQUEST,
-      GIBBER_XMPP_NS_JINGLE_ERRORS,
-      { 0, },
-    },
-
-    {
-      "unsupported-transports",
-      "the recipient does not support any of the desired content transport "
-      "methods",
-      "cancel",
-      XMPP_ERROR_FEATURE_NOT_IMPLEMENTED,
-      GIBBER_XMPP_NS_JINGLE_ERRORS,
-      { 0, },
-    },
-
-    {
-      "unsupported-content",
-      "the recipient does not support any of the desired content description"
-      "formats",
-      "cancel",
-      XMPP_ERROR_FEATURE_NOT_IMPLEMENTED,
-      GIBBER_XMPP_NS_JINGLE_ERRORS,
-      { 0, },
-    },
-
-    {
-      "no-valid-streams",
-      "None of the available streams are acceptable.",
-      "cancel",
-      XMPP_ERROR_BAD_REQUEST,
-      GIBBER_XMPP_NS_SI,
-      { 400, 0 },
-    },
-
-    {
-      "bad-profile",
-      "The profile is not understood or invalid.",
-      "modify",
-      XMPP_ERROR_BAD_REQUEST,
-      GIBBER_XMPP_NS_SI,
-      { 400, 0 },
-    },
-};
-
-GQuark
-gibber_xmpp_error_quark (void)
-{
-  static GQuark quark = 0;
-  if (!quark)
-    quark = g_quark_from_static_string ("gibber-xmpp-error");
-  return quark;
-}
-
-GibberXmppError
-gibber_xmpp_error_from_node (WockyNode *error_node)
-{
-  gint i, j;
-  const gchar *error_code_str;
-
-  g_return_val_if_fail (error_node != NULL, XMPP_ERROR_UNDEFINED_CONDITION);
-
-  /* First, try to look it up the modern way */
-  if (error_node->children)
-    {
-      /* we loop backwards because the most specific errors are the larger
-       * numbers; the >= 0 test is OK because i is signed */
-      for (i = NUM_XMPP_ERRORS - 1; i >= 0; i--)
-        {
-          if (wocky_node_get_child_ns (error_node, xmpp_errors[i].name,
-                xmpp_errors[i].namespace))
-            {
-              return i;
-            }
-        }
-    }
-
-  /* Ok, do it the legacy way */
-  error_code_str = wocky_node_get_attribute (error_node, "code");
-  if (error_code_str)
-    {
-      gint error_code;
-
-      error_code = atoi (error_code_str);
-
-      /* skip UNDEFINED_CONDITION, we want code 500 to be translated
-       * to INTERNAL_SERVER_ERROR */
-      for (i = 1; i < NUM_XMPP_ERRORS; i++)
-        {
-          const XmppErrorSpec *spec = &xmpp_errors[i];
-
-          for (j = 0; j < MAX_LEGACY_ERRORS; j++)
-            {
-              gint cur_code = spec->legacy_errors[j];
-              if (cur_code == 0)
-                break;
-
-              if (cur_code == error_code)
-                return i;
-            }
-        }
-    }
-
-  return XMPP_ERROR_UNDEFINED_CONDITION;
-}
-
-static GError *
-gibber_xmpp_error_to_g_error (GibberXmppError error)
-{
-  if (error >= NUM_XMPP_ERRORS)
-      return g_error_new (GIBBER_XMPP_ERROR, XMPP_ERROR_UNDEFINED_CONDITION,
-          "Unknown or invalid XMPP error");
-
-  return g_error_new_literal (GIBBER_XMPP_ERROR, error,
-      xmpp_errors[error].description);
-}
-
-/*
- * See RFC 3920: 4.7 Stream Errors, 9.3 Stanza Errors.
- */
-WockyNode *
-gibber_xmpp_error_to_node (GibberXmppError error,
-                           WockyNode *parent_node,
-                           const gchar *errmsg)
-{
-  const XmppErrorSpec *spec, *extra;
-  WockyNode *error_node, *node;
-  gchar str[6];
-
-  g_return_val_if_fail (error != XMPP_ERROR_UNDEFINED_CONDITION &&
-      error < NUM_XMPP_ERRORS, NULL);
-
-  if (xmpp_errors[error].specialises)
-    {
-      extra = &xmpp_errors[error];
-      spec = &xmpp_errors[extra->specialises];
-    }
-  else
-    {
-      extra = NULL;
-      spec = &xmpp_errors[error];
-    }
-
-  error_node = wocky_node_add_child (parent_node, "error");
-
-  sprintf (str, "%d", spec->legacy_errors[0]);
-  wocky_node_set_attribute (error_node, "code", str);
-
-  if (spec->type)
-    {
-      wocky_node_set_attribute (error_node, "type", spec->type);
-    }
-
-  node = wocky_node_add_child_ns (error_node, spec->name,
-      GIBBER_XMPP_NS_STANZAS);
-
-  if (extra != NULL)
-    {
-      node = wocky_node_add_child_ns (error_node, extra->name,
-          extra->namespace);
-    }
-
-  if (NULL != errmsg)
-    {
-      node = wocky_node_add_child (error_node, "text");
-      wocky_node_set_content (node, errmsg);
-    }
-
-  return error_node;
-}
-
-const gchar *
-gibber_xmpp_error_string (GibberXmppError error)
-{
-  if (error < NUM_XMPP_ERRORS)
-    return xmpp_errors[error].name;
-  else
-    return NULL;
-}
-
-const gchar *
-gibber_xmpp_error_description (GibberXmppError error)
-{
-  if (error < NUM_XMPP_ERRORS)
-    return xmpp_errors[error].description;
-  else
-    return NULL;
-}
-
-GError *
-gibber_message_get_xmpp_error (WockyStanza *msg)
-{
-  WockyStanzaSubType sub_type;
-  g_return_val_if_fail (msg != NULL, NULL);
-
-  wocky_stanza_get_type_info (msg, NULL, &sub_type);
-
-  if (sub_type == WOCKY_STANZA_SUB_TYPE_ERROR)
-    {
-      WockyNode *error_node = wocky_node_get_child (
-          wocky_stanza_get_top_node (msg), "error");
-
-      if (error_node != NULL)
-        {
-          return gibber_xmpp_error_to_g_error
-              (gibber_xmpp_error_from_node (error_node));
-        }
-      else
-        {
-          return g_error_new (GIBBER_XMPP_ERROR,
-              XMPP_ERROR_UNDEFINED_CONDITION, "Unknown or invalid XMPP error");
-        }
-    }
-
-  /* no error */
-  return NULL;
-}
diff -Nru telepathy-salut-0.5.0/lib/gibber/gibber-xmpp-error.h telepathy-salut-0.7.0/lib/gibber/gibber-xmpp-error.h
--- telepathy-salut-0.5.0/lib/gibber/gibber-xmpp-error.h	2011-04-22 08:08:27.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/gibber-xmpp-error.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-/*
- * gibber-xmpp-error.h - Header for Gibber's XMPP error handling API
- * Copyright (C) 2006-2007 Collabora Ltd.
- * Copyright (C) 2006 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef __GIBBER_XMPP_ERROR_H__
-#define __GIBBER_XMPP_ERROR_H__
-
-#include 
-#include 
-
-typedef enum {
-    XMPP_ERROR_UNDEFINED_CONDITION = 0, /* 500 */
-
-    XMPP_ERROR_REDIRECT,                /* 302 */
-    XMPP_ERROR_GONE,                    /* 302 */
-
-    XMPP_ERROR_BAD_REQUEST,             /* 400 */
-    XMPP_ERROR_UNEXPECTED_REQUEST,      /* 400 */
-    XMPP_ERROR_JID_MALFORMED,           /* 400 */
-
-    XMPP_ERROR_NOT_AUTHORIZED,          /* 401 */
-
-    XMPP_ERROR_PAYMENT_REQUIRED,        /* 402 */
-
-    XMPP_ERROR_FORBIDDEN,               /* 403 */
-
-    XMPP_ERROR_ITEM_NOT_FOUND,          /* 404 */
-    XMPP_ERROR_RECIPIENT_UNAVAILABLE,   /* 404 */
-    XMPP_ERROR_REMOTE_SERVER_NOT_FOUND, /* 404 */
-
-    XMPP_ERROR_NOT_ALLOWED,             /* 405 */
-
-    XMPP_ERROR_NOT_ACCEPTABLE,          /* 406 */
-
-    XMPP_ERROR_REGISTRATION_REQUIRED,   /* 407 */
-    XMPP_ERROR_SUBSCRIPTION_REQUIRED,   /* 407 */
-
-    XMPP_ERROR_REMOTE_SERVER_TIMEOUT,   /* 408, 504 */
-
-    XMPP_ERROR_CONFLICT,                /* 409 */
-
-    XMPP_ERROR_INTERNAL_SERVER_ERROR,   /* 500 */
-    XMPP_ERROR_RESOURCE_CONSTRAINT,     /* 500 */
-
-    XMPP_ERROR_FEATURE_NOT_IMPLEMENTED, /* 501 */
-
-    XMPP_ERROR_SERVICE_UNAVAILABLE,     /* 502, 503, 510 */
-
-    XMPP_ERROR_JINGLE_OUT_OF_ORDER,
-    XMPP_ERROR_JINGLE_UNKNOWN_SESSION,
-    XMPP_ERROR_JINGLE_UNSUPPORTED_CONTENT,
-    XMPP_ERROR_JINGLE_UNSUPPORTED_TRANSPORT,
-
-    XMPP_ERROR_SI_NO_VALID_STREAMS,
-    XMPP_ERROR_SI_BAD_PROFILE,
-
-    NUM_XMPP_ERRORS,
-} GibberXmppError;
-
-GQuark gibber_xmpp_error_quark (void);
-#define GIBBER_XMPP_ERROR (gibber_xmpp_error_quark ())
-
-GibberXmppError gibber_xmpp_error_from_node (WockyNode *error_node);
-WockyNode *gibber_xmpp_error_to_node (GibberXmppError error,
-    WockyNode *parent_node, const gchar *errmsg);
-const gchar *gibber_xmpp_error_string (GibberXmppError error);
-const gchar *gibber_xmpp_error_description (GibberXmppError error);
-GError *gibber_message_get_xmpp_error (WockyStanza *msg);
-
-#endif /* __GIBBER_XMPP_ERROR_H__ */
diff -Nru telepathy-salut-0.5.0/lib/gibber/gibber-xmpp-reader.c telepathy-salut-0.7.0/lib/gibber/gibber-xmpp-reader.c
--- telepathy-salut-0.5.0/lib/gibber/gibber-xmpp-reader.c	2011-04-22 08:08:27.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/gibber-xmpp-reader.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,187 +0,0 @@
-/*
- * gibber-xmpp-reader.c - Source for GibberXmppReader
- * Copyright (C) 2006 Collabora Ltd.
- * @author Sjoerd Simons 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "gibber-xmpp-reader.h"
-
-#include "gibber-signals-marshal.h"
-
-#include 
-
-#define XMPP_STREAM_NAMESPACE "http://etherx.jabber.org/streams"
-
-#define DEBUG_FLAG DEBUG_XMPP_READER
-#include "gibber-debug.h"
-
-G_DEFINE_TYPE (GibberXmppReader, gibber_xmpp_reader, WOCKY_TYPE_XMPP_READER)
-
-/* signal enum */
-enum {
-  RECEIVED_STANZA,
-  STREAM_OPENED,
-  STREAM_CLOSED,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = {0};
-
-/* private structure */
-typedef struct _GibberXmppReaderPrivate GibberXmppReaderPrivate;
-
-struct _GibberXmppReaderPrivate
-{
-  gboolean emitted_opened;
-  gboolean emitted_closed;
-};
-
-#define GIBBER_XMPP_READER_GET_PRIVATE(o)  \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), GIBBER_TYPE_XMPP_READER, \
-   GibberXmppReaderPrivate))
-
-static void
-gibber_xmpp_reader_init (GibberXmppReader *obj)
-{
-  GibberXmppReaderPrivate *priv = GIBBER_XMPP_READER_GET_PRIVATE (obj);
-
-  priv->emitted_opened = FALSE;
-  priv->emitted_closed = FALSE;
-}
-
-static void
-gibber_xmpp_reader_class_init (GibberXmppReaderClass *gibber_xmpp_reader_class)
-{
-  g_type_class_add_private (gibber_xmpp_reader_class,
-      sizeof (GibberXmppReaderPrivate));
-
-  signals[RECEIVED_STANZA] = g_signal_new ("received-stanza",
-      G_OBJECT_CLASS_TYPE(gibber_xmpp_reader_class),
-      G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
-      0,
-      NULL, NULL,
-      g_cclosure_marshal_VOID__OBJECT,
-      G_TYPE_NONE, 1, WOCKY_TYPE_STANZA);
-
-  signals[STREAM_OPENED] = g_signal_new ("stream-opened",
-      G_OBJECT_CLASS_TYPE(gibber_xmpp_reader_class),
-      G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
-      0,
-      NULL, NULL,
-      _gibber_signals_marshal_VOID__STRING_STRING_STRING,
-      G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
-
-  signals[STREAM_CLOSED] = g_signal_new ("stream-closed",
-      G_OBJECT_CLASS_TYPE(gibber_xmpp_reader_class),
-      G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
-      0,
-      NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
-      G_TYPE_NONE, 0);
-}
-
-GibberXmppReader *
-gibber_xmpp_reader_new (void)
-{
-  return g_object_new (GIBBER_TYPE_XMPP_READER,
-      NULL);
-}
-
-GibberXmppReader *
-gibber_xmpp_reader_new_no_stream (void)
-{
-  return g_object_new (GIBBER_TYPE_XMPP_READER,
-      "streaming-mode", FALSE,
-      NULL);
-}
-
-gboolean
-gibber_xmpp_reader_push (GibberXmppReader *reader, const guint8 *data,
-    gsize length, GError **error)
-{
-  WockyXmppReader *wocky = WOCKY_XMPP_READER (reader);
-  GibberXmppReaderPrivate *priv = GIBBER_XMPP_READER_GET_PRIVATE (reader);
-  WockyStanza *stanza;
-  GError *e = NULL;
-  gboolean streaming_mode;
-
-  g_return_val_if_fail (wocky_xmpp_reader_get_state (wocky) !=
-      WOCKY_XMPP_READER_STATE_ERROR, FALSE);
-
-  g_object_get (wocky,
-      "streaming-mode", &streaming_mode,
-      NULL);
-
-  wocky_xmpp_reader_push (wocky, data, length);
-
-  if (wocky_xmpp_reader_get_state (wocky) == WOCKY_XMPP_READER_STATE_OPENED
-      && !priv->emitted_opened)
-    {
-      gchar *from = NULL, *to = NULL, *version = NULL;
-
-      g_object_get (wocky,
-          "from", &from,
-          "to", &to,
-          "version", &version,
-          NULL);
-
-      priv->emitted_opened = TRUE;
-      g_signal_emit (reader, signals[STREAM_OPENED], 0, to, from, version);
-      g_free (to);
-      g_free (from);
-      g_free (version);
-    }
-
-  for (stanza = wocky_xmpp_reader_pop_stanza (wocky);
-      stanza != NULL;
-      stanza = wocky_xmpp_reader_pop_stanza (wocky))
-    {
-      g_signal_emit (reader, signals[RECEIVED_STANZA], 0, stanza);
-      g_object_unref (stanza);
-    }
-
-  if (wocky_xmpp_reader_get_state (wocky) == WOCKY_XMPP_READER_STATE_CLOSED
-      && !priv->emitted_closed)
-    {
-      priv->emitted_closed = TRUE;
-      g_signal_emit (reader, signals[STREAM_CLOSED], 0);
-    }
-
-  if (!streaming_mode)
-    {
-      wocky_xmpp_reader_reset (wocky);
-    }
-
-  e = wocky_xmpp_reader_get_error (wocky);
-
-  if (e == NULL)
-    {
-      return TRUE;
-    }
-  else
-    {
-      g_propagate_error (error, e);
-      return FALSE;
-    }
-}
-
-void
-gibber_xmpp_reader_reset (GibberXmppReader *reader)
-{
-  wocky_xmpp_reader_reset (WOCKY_XMPP_READER (reader));
-}
-
diff -Nru telepathy-salut-0.5.0/lib/gibber/gibber-xmpp-reader.h telepathy-salut-0.7.0/lib/gibber/gibber-xmpp-reader.h
--- telepathy-salut-0.5.0/lib/gibber/gibber-xmpp-reader.h	2011-01-17 16:17:10.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/gibber-xmpp-reader.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-/*
- * gibber-xmpp-reader.h - Header for GibberXmppReader
- * Copyright (C) 2006 Collabora Ltd.
- * @author Sjoerd Simons 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef __GIBBER_XMPP_READER_H__
-#define __GIBBER_XMPP_READER_H__
-
-#include 
-#include 
-
-G_BEGIN_DECLS
-
-typedef struct _GibberXmppReader GibberXmppReader;
-typedef struct _GibberXmppReaderClass GibberXmppReaderClass;
-
-struct _GibberXmppReaderClass {
-    WockyXmppReaderClass parent_class;
-};
-
-struct _GibberXmppReader {
-    WockyXmppReader parent;
-};
-
-GType gibber_xmpp_reader_get_type (void);
-
-/* TYPE MACROS */
-#define GIBBER_TYPE_XMPP_READER \
-  (gibber_xmpp_reader_get_type ())
-#define GIBBER_XMPP_READER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), GIBBER_TYPE_XMPP_READER, \
-   GibberXmppReader))
-#define GIBBER_XMPP_READER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), GIBBER_TYPE_XMPP_READER,  \
-   GibberXmppReaderClass))
-#define GIBBER_IS_XMPP_READER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GIBBER_TYPE_XMPP_READER))
-#define GIBBER_IS_XMPP_READER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), GIBBER_TYPE_XMPP_READER))
-#define GIBBER_XMPP_READER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIBBER_TYPE_XMPP_READER, \
-   GibberXmppReaderClass))
-
-GibberXmppReader * gibber_xmpp_reader_new (void);
-GibberXmppReader * gibber_xmpp_reader_new_no_stream (void);
-void gibber_xmpp_reader_reset (GibberXmppReader *reader);
-
-gboolean gibber_xmpp_reader_push (GibberXmppReader *reader,
-    const guint8 *data, gsize length, GError **error);
-
-G_END_DECLS
-
-#endif /* #ifndef __GIBBER_XMPP_READER_H__*/
diff -Nru telepathy-salut-0.5.0/lib/gibber/gibber-xmpp-writer.c telepathy-salut-0.7.0/lib/gibber/gibber-xmpp-writer.c
--- telepathy-salut-0.5.0/lib/gibber/gibber-xmpp-writer.c	2011-01-17 16:17:10.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/gibber-xmpp-writer.c	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-/* nothing here */
diff -Nru telepathy-salut-0.5.0/lib/gibber/gibber-xmpp-writer.h telepathy-salut-0.7.0/lib/gibber/gibber-xmpp-writer.h
--- telepathy-salut-0.5.0/lib/gibber/gibber-xmpp-writer.h	2011-04-22 08:08:27.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/gibber-xmpp-writer.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-/*
- * gibber-xmpp-writer.h - Header for GibberXmppWriter
- * Copyright (C) 2006 Collabora Ltd.
- * @author Sjoerd Simons 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef __GIBBER_XMPP_WRITER_H__
-#define __GIBBER_XMPP_WRITER_H__
-
-#include 
-
-#include 
-
-G_BEGIN_DECLS
-
-typedef WockyXmppWriter GibberXmppWriter;
-typedef WockyXmppWriterClass GibberXmppWriterClass;
-
-#define GIBBER_TYPE_XMPP_WRITER         (WOCKY_TYPE_XMPP_WRITER)
-#define GIBBER_XMPP_WRITER(o)           (WOCKY_XMPP_WRITER (o))
-#define GIBBER_XMPP_WRITER_CLASS(c)     (WOCKY_XMPP_WRITER_CLASS (c))
-#define GIBBER_IS_XMPP_WRITER(o)        (WOCKY_IS_XMPP_WRITER (o))
-#define GIBBER_IS_XMPP_WRITER_CLASS(c)  (WOCKY_IS_XMPP_WRITER_CLASS (c))
-#define GIBBER_XMPP_WRITER_GET_CLASS(o) (WOCKY_XMPP_WRITER_GET_CLASS (o))
-
-#define gibber_xmpp_writer_new            wocky_xmpp_writer_new
-#define gibber_xmpp_writer_new_no_stream  wocky_xmpp_writer_new_no_stream
-#define gibber_xmpp_writer_stream_close   wocky_xmpp_writer_stream_close
-#define gibber_xmpp_writer_flush          wocky_xmpp_writer_flush
-
-static inline void
-gibber_xmpp_writer_stream_open (GibberXmppWriter *writer,
-    const gchar *to, const gchar *from, const gchar *version,
-    const guint8 **data, gsize *length)
-{
-  /* set dummy language and ID */
-  wocky_xmpp_writer_stream_open (writer, to, from, version, NULL, NULL, data,
-      length);
-}
-
-
-static inline gboolean
-gibber_xmpp_writer_write_stanza (GibberXmppWriter *writer,
-    WockyStanza *stanza, const guint8 **data, gsize *length,
-    GError **error)
-{
-  /* can't fail */
-  wocky_xmpp_writer_write_stanza (writer, stanza, data, length);
-  return TRUE;
-}
-
-G_END_DECLS
-
-#endif /* #ifndef __GIBBER_XMPP_WRITER_H__*/
diff -Nru telepathy-salut-0.5.0/lib/gibber/Makefile.am telepathy-salut-0.7.0/lib/gibber/Makefile.am
--- telepathy-salut-0.5.0/lib/gibber/Makefile.am	2011-04-25 13:46:40.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/Makefile.am	2011-05-09 12:46:34.000000000 +0000
@@ -12,8 +12,6 @@
 HANDWRITTEN_SOURCES =             \
   gibber-muc-connection.c         \
   gibber-muc-connection.h         \
-  gibber-bytestream-ibb.h         \
-  gibber-bytestream-ibb.c         \
   gibber-bytestream-iface.h       \
   gibber-bytestream-iface.c       \
   gibber-bytestream-muc.h         \
@@ -24,10 +22,6 @@
   gibber-bytestream-direct.c      \
   gibber-debug.c                  \
   gibber-debug.h                  \
-  gibber-xmpp-reader.c            \
-  gibber-xmpp-reader.h            \
-  gibber-xmpp-writer.c            \
-  gibber-xmpp-writer.h            \
   gibber-transport.c              \
   gibber-transport.h              \
   gibber-fd-transport.c           \
@@ -49,15 +43,12 @@
   gibber-r-multicast-sender.h     \
   gibber-linklocal-transport.c    \
   gibber-linklocal-transport.h    \
-  gibber-namespaces.h             \
   gibber-file-transfer.c          \
   gibber-file-transfer.h          \
   gibber-oob-file-transfer.c      \
   gibber-oob-file-transfer.h      \
   gibber-listener.c               \
   gibber-listener.h               \
-  gibber-xmpp-error.h             \
-  gibber-xmpp-error.c             \
   gibber-sockets.c                \
   gibber-sockets.h                \
   gibber-sockets-unix.h           \
diff -Nru telepathy-salut-0.5.0/lib/gibber/Makefile.in telepathy-salut-0.7.0/lib/gibber/Makefile.in
--- telepathy-salut-0.5.0/lib/gibber/Makefile.in	2011-05-03 13:29:17.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/Makefile.in	2011-11-16 10:27:30.000000000 +0000
@@ -56,10 +56,9 @@
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgibber_la_LIBADD =
-am__objects_1 = gibber-muc-connection.lo gibber-bytestream-ibb.lo \
-	gibber-bytestream-iface.lo gibber-bytestream-muc.lo \
-	gibber-bytestream-oob.lo gibber-bytestream-direct.lo \
-	gibber-debug.lo gibber-xmpp-reader.lo gibber-xmpp-writer.lo \
+am__objects_1 = gibber-muc-connection.lo gibber-bytestream-iface.lo \
+	gibber-bytestream-muc.lo gibber-bytestream-oob.lo \
+	gibber-bytestream-direct.lo gibber-debug.lo \
 	gibber-transport.lo gibber-fd-transport.lo \
 	gibber-tcp-transport.lo gibber-unix-transport.lo \
 	gibber-multicast-transport.lo gibber-r-multicast-transport.lo \
@@ -67,7 +66,7 @@
 	gibber-r-multicast-packet.lo gibber-r-multicast-sender.lo \
 	gibber-linklocal-transport.lo gibber-file-transfer.lo \
 	gibber-oob-file-transfer.lo gibber-listener.lo \
-	gibber-xmpp-error.lo gibber-sockets.lo gibber-util.lo
+	gibber-sockets.lo gibber-util.lo
 am__objects_2 = gibber-file-transfer-enumtypes.lo \
 	gibber-signals-marshal.lo
 am_libgibber_la_OBJECTS = $(am__objects_1) $(am__objects_2)
@@ -168,6 +167,7 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -191,6 +191,8 @@
 GMODULE_LIBS = @GMODULE_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HTML_DIR = @HTML_DIR@
@@ -213,6 +215,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
 NM = @NM@
@@ -253,12 +256,12 @@
 VERSION = @VERSION@
 WOCKY_CFLAGS = @WOCKY_CFLAGS@
 WOCKY_LIBS = @WOCKY_LIBS@
-XMLDIFF = @XMLDIFF@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -323,8 +326,6 @@
 HANDWRITTEN_SOURCES = \
   gibber-muc-connection.c         \
   gibber-muc-connection.h         \
-  gibber-bytestream-ibb.h         \
-  gibber-bytestream-ibb.c         \
   gibber-bytestream-iface.h       \
   gibber-bytestream-iface.c       \
   gibber-bytestream-muc.h         \
@@ -335,10 +336,6 @@
   gibber-bytestream-direct.c      \
   gibber-debug.c                  \
   gibber-debug.h                  \
-  gibber-xmpp-reader.c            \
-  gibber-xmpp-reader.h            \
-  gibber-xmpp-writer.c            \
-  gibber-xmpp-writer.h            \
   gibber-transport.c              \
   gibber-transport.h              \
   gibber-fd-transport.c           \
@@ -360,15 +357,12 @@
   gibber-r-multicast-sender.h     \
   gibber-linklocal-transport.c    \
   gibber-linklocal-transport.h    \
-  gibber-namespaces.h             \
   gibber-file-transfer.c          \
   gibber-file-transfer.h          \
   gibber-oob-file-transfer.c      \
   gibber-oob-file-transfer.h      \
   gibber-listener.c               \
   gibber-listener.h               \
-  gibber-xmpp-error.h             \
-  gibber-xmpp-error.c             \
   gibber-sockets.c                \
   gibber-sockets.h                \
   gibber-sockets-unix.h           \
@@ -439,7 +433,6 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gibber-bytestream-direct.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gibber-bytestream-ibb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gibber-bytestream-iface.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gibber-bytestream-muc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gibber-bytestream-oob.Plo@am__quote@
@@ -462,9 +455,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gibber-transport.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gibber-unix-transport.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gibber-util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gibber-xmpp-error.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gibber-xmpp-reader.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gibber-xmpp-writer.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -823,12 +813,12 @@
 	if test -n "$(check_misc_sources)"; then \
 		tools_dir=$(top_srcdir)/tools \
 		sh $(top_srcdir)/tools/check-misc.sh \
-			$(check_misc_sources) || fail=1; \
+			$(addprefix $(srcdir)/,$(check_misc_sources)) || fail=1; \
 	fi; \
 	if test -n "$(check_c_sources)"; then \
 		tools_dir=$(top_srcdir)/tools \
 		sh $(top_srcdir)/tools/check-c-style.sh \
-			$(check_c_sources) || fail=1; \
+			$(addprefix $(srcdir)/,$(check_c_sources)) || fail=1; \
 	fi;\
 	if test yes = "$(ENABLE_CODING_STYLE_CHECKS)"; then \
 		exit "$$fail";\
diff -Nru telepathy-salut-0.5.0/lib/gibber/tests/check-gibber-xmpp-error.c telepathy-salut-0.7.0/lib/gibber/tests/check-gibber-xmpp-error.c
--- telepathy-salut-0.5.0/lib/gibber/tests/check-gibber-xmpp-error.c	2011-04-22 08:08:27.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/tests/check-gibber-xmpp-error.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,145 +0,0 @@
-/*
- * check-gibber-xmpp-error.c - Test for gibber-xmpp-error functions
- * Copyright (C) 2007 Collabora Ltd.
- * @author Guillaume Desmottes 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-
-#include 
-#include 
-#include 
-
-#include 
-
-#define DEBUG_FLAG DEBUG_XMPP
-#include 
-
-static void
-test_xmpp_error_to_node_with_bad_request (void)
-{
-  WockyStanza *stanza;
-  WockyNode *node;
-  const gchar *code;
-  const gchar *type;
-
-  stanza = wocky_stanza_build (
-      WOCKY_STANZA_TYPE_IQ, WOCKY_STANZA_SUB_TYPE_ERROR,
-      "from", "to",
-      NULL);
-  node = gibber_xmpp_error_to_node (XMPP_ERROR_BAD_REQUEST,
-      wocky_stanza_get_top_node (stanza), NULL);
-
-  g_assert (node != NULL);
-  g_assert_cmpstr (node->name, ==, "error");
-
-  code = wocky_node_get_attribute (node, "code");
-  g_assert (!(code == NULL || strcmp (code, "400") != 0));
-
-  type = wocky_node_get_attribute (node, "type");
-  g_assert (!(type == NULL || strcmp (type, "modify") != 0));
-
-  g_assert (wocky_node_get_child_ns (node, "bad-request",
-        "urn:ietf:params:xml:ns:xmpp-stanzas") != NULL);
-
-  g_object_unref (stanza);
-}
-
-static void
-test_xmpp_error_to_node_with_si_bad_profile (void)
-{
-  WockyStanza *stanza;
-  WockyNode *node;
-  const gchar *code;
-  const gchar *type;
-
-  stanza = wocky_stanza_build (
-      WOCKY_STANZA_TYPE_IQ, WOCKY_STANZA_SUB_TYPE_ERROR,
-      "from", "to",
-      NULL);
-  node = gibber_xmpp_error_to_node (XMPP_ERROR_SI_BAD_PROFILE,
-      wocky_stanza_get_top_node (stanza), NULL);
-
-  g_assert (node != NULL);
-  g_assert_cmpstr (node->name, ==, "error");
-
-  code = wocky_node_get_attribute (node, "code");
-  g_assert (!(code == NULL || strcmp (code, "400") != 0));
-
-  type = wocky_node_get_attribute (node, "type");
-  g_assert (!(type == NULL || strcmp (type, "modify") != 0));
-
-  g_assert (wocky_node_get_child_ns (node, "bad-request",
-        "urn:ietf:params:xml:ns:xmpp-stanzas") != NULL);
-
-  g_assert (wocky_node_get_child_ns (node, "bad-profile",
-        "http://jabber.org/protocol/si") != NULL);
-
-  g_object_unref (stanza);
-}
-
-static void
-test_xmpp_error_to_node (void)
-{
-  test_xmpp_error_to_node_with_bad_request ();
-  test_xmpp_error_to_node_with_si_bad_profile ();
-}
-
-static void
-test_message_get_xmpp_error (void)
-{
-  GibberXmppError xmpp_error;
-
-  for (xmpp_error = 1; xmpp_error < NUM_XMPP_ERRORS; xmpp_error++)
-    {
-      WockyStanza *stanza;
-      GError *error = NULL;
-
-      stanza = wocky_stanza_build (
-          WOCKY_STANZA_TYPE_IQ, WOCKY_STANZA_SUB_TYPE_ERROR,
-          "from", "to",
-          NULL);
-      gibber_xmpp_error_to_node (xmpp_error,
-          wocky_stanza_get_top_node (stanza), NULL);
-
-      error = gibber_message_get_xmpp_error (stanza);
-      g_assert (error != NULL);
-
-      g_assert (error->domain == GIBBER_XMPP_ERROR);
-      g_assert (error->code == (gint) xmpp_error);
-      g_assert_cmpstr (error->message, ==,
-           gibber_xmpp_error_description (xmpp_error));
-
-      g_object_unref (stanza);
-      g_error_free (error);
-    }
-
-}
-
-int
-main (int argc,
-      char **argv)
-{
-  g_test_init (&argc, &argv, NULL);
-  g_type_init ();
-
-  g_test_add_func ("/gibber/xmpp-error/to-node",
-      test_xmpp_error_to_node);
-  g_test_add_func ("/gibber/xmpp-error/message-get-xmpp-error",
-      test_message_get_xmpp_error);
-
-  return g_test_run ();
-}
diff -Nru telepathy-salut-0.5.0/lib/gibber/tests/check-gibber-xmpp-reader.c telepathy-salut-0.7.0/lib/gibber/tests/check-gibber-xmpp-reader.c
--- telepathy-salut-0.5.0/lib/gibber/tests/check-gibber-xmpp-reader.c	2011-04-28 15:25:29.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/tests/check-gibber-xmpp-reader.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,127 +0,0 @@
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-typedef struct _ReceivedStanzaEvent ReceivedStanzaEvent;
-
-struct _ReceivedStanzaEvent {
-  GibberXmppReader *reader;
-  WockyStanza *stanza;
-};
-
-static void received_stanza_cb (GibberXmppReader *reader,
-    WockyStanza *stanza, gpointer user_data)
-{
-  GQueue *events_queue = (GQueue *) user_data;
-  ReceivedStanzaEvent *event;
-
-  g_assert (reader != NULL);
-  g_assert (stanza != NULL);
-  g_assert (events_queue != NULL);
-
-  g_object_ref (stanza);
-
-  event = g_new (ReceivedStanzaEvent, 1);
-  event->reader = reader;
-  event->stanza = stanza;
-
-  g_queue_push_tail (events_queue, event);
-}
-
-
-static void
-test_instantiation (void)
-{
-  GibberXmppReader *reader;
-  reader = gibber_xmpp_reader_new_no_stream ();
-  g_assert (reader != NULL);
-  g_object_unref (reader);
-}
-
-static void
-test_simple_message (void)
-{
-  GibberXmppReader *reader;
-  WockyNode *node;
-  gchar *data;
-  gsize length;
-  gboolean valid;
-  GQueue *received_stanzas;
-  ReceivedStanzaEvent *event;
-  const gchar *srcdir;
-  gchar *file;
-
-  received_stanzas = g_queue_new ();
-
-  reader = gibber_xmpp_reader_new ();
-  g_signal_connect (reader, "received-stanza",
-      G_CALLBACK (received_stanza_cb), received_stanzas);
-
-  srcdir = g_getenv ("srcdir");
-  if (srcdir == NULL)
-    {
-      file = g_strdup ("inputs/simple-message.input");
-    }
-  else
-    {
-      file = g_strdup_printf ("%s/inputs/simple-message.input", srcdir);
-    }
-
-  g_assert (g_file_get_contents (file, &data, &length, NULL));
-  g_free (file);
-
-  valid = gibber_xmpp_reader_push (reader, (guint8 *) data, length, NULL);
-  g_assert (valid);
-
-  g_assert (g_queue_get_length (received_stanzas) == 2);
-
-  event = g_queue_pop_head (received_stanzas);
-
-  g_assert (event->reader == reader);
-
-  node = wocky_stanza_get_top_node (event->stanza);
-  g_assert (node != NULL);
-  g_assert_cmpstr (node->name, ==, "message");
-  g_assert_cmpstr (wocky_node_get_language (node), ==, "en");
-  g_assert_cmpstr (wocky_node_get_attribute (node, "to"), ==,
-      "juliet@example.com");
-  g_assert_cmpstr (wocky_node_get_attribute (node, "id"), ==, "0");
-
-  g_object_unref (event->stanza);
-  g_free (event);
-
-  event = g_queue_pop_head (received_stanzas);
-
-  g_assert (event->reader == reader);
-
-  node = wocky_stanza_get_top_node (event->stanza);
-  g_assert_cmpstr (node->name, ==, "message");
-  g_assert_cmpstr (wocky_node_get_language (node), ==, "en");
-  g_assert_cmpstr (wocky_node_get_attribute (node, "to"), ==,
-      "juliet@example.com");
-  g_assert_cmpstr (wocky_node_get_attribute (node, "id"), ==, "1");
-
-  g_free (data);
-  g_queue_free (received_stanzas);
-  g_object_unref (event->stanza);
-  g_free (event);
-  g_object_unref (reader);
-}
-
-int
-main (int argc,
-      char **argv)
-{
-  g_test_init (&argc, &argv, NULL);
-  g_type_init ();
-
-  g_test_add_func ("/gibber/xmpp-reader/instantiation",
-      test_instantiation);
-  g_test_add_func ("/gibber/xmpp-reader/simple-message",
-      test_simple_message);
-
-  return g_test_run ();
-}
diff -Nru telepathy-salut-0.5.0/lib/gibber/tests/inputs/groupchat-invite.input telepathy-salut-0.7.0/lib/gibber/tests/inputs/groupchat-invite.input
--- telepathy-salut-0.5.0/lib/gibber/tests/inputs/groupchat-invite.input	2009-04-25 11:20:50.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/tests/inputs/groupchat-invite.input	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-
-
-
-
-  
-    
-      
-        Hey Hecate, this is the place for all good witches!
-      
-    
-  
-
-    
-
-  You have been invited to darkcave@macbeth by crone1@shakespeare.lit.
-  
-    
-      
-        Hey Hecate, this is the place for all good witches!
-      
-    
-    cauldronburn
-  
-
-    
-
-
diff -Nru telepathy-salut-0.5.0/lib/gibber/tests/inputs/Makefile.am telepathy-salut-0.7.0/lib/gibber/tests/inputs/Makefile.am
--- telepathy-salut-0.5.0/lib/gibber/tests/inputs/Makefile.am	2009-04-25 11:20:50.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/tests/inputs/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-EXTRA_DIST =                          \
-  groupchat-invite.input              \
-  simple-message-attrnamespace.input  \
-  simple-message.input                \
-  strange-streamopening.input
diff -Nru telepathy-salut-0.5.0/lib/gibber/tests/inputs/Makefile.in telepathy-salut-0.7.0/lib/gibber/tests/inputs/Makefile.in
--- telepathy-salut-0.5.0/lib/gibber/tests/inputs/Makefile.in	2011-05-03 13:29:17.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/tests/inputs/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,425 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = lib/gibber/tests/inputs
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \
-	$(top_srcdir)/m4/ax_config_dir.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/salut-args.m4 $(top_srcdir)/m4/salut-gcov.m4 \
-	$(top_srcdir)/m4/salut-lcov.m4 \
-	$(top_srcdir)/m4/salut-valgrind.m4 \
-	$(top_srcdir)/m4/tp-compiler-flag.m4 \
-	$(top_srcdir)/m4/tp-compiler-warnings.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-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_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AVAHI_CFLAGS = @AVAHI_CFLAGS@
-AVAHI_LIBS = @AVAHI_LIBS@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASDEPMODE = @CCASDEPMODE@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ENABLE_CODING_STYLE_CHECKS = @ENABLE_CODING_STYLE_CHECKS@
-ENABLE_OLPC = @ENABLE_OLPC@
-ENABLE_PLUGINS = @ENABLE_PLUGINS@
-ERROR_CFLAGS = @ERROR_CFLAGS@
-EXEEXT = @EXEEXT@
-FFLAGS = @FFLAGS@
-FGREP = @FGREP@
-GCOV = @GCOV@
-GCOV_CFLAGS = @GCOV_CFLAGS@
-GCOV_LIBS = @GCOV_LIBS@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_LIBS = @GLIB_LIBS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LCOV_PATH = @LCOV_PATH@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@
-LIBSOUP_LIBS = @LIBSOUP_LIBS@
-LIBTOOL = @LIBTOOL@
-LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
-LIBXML2_LIBS = @LIBXML2_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PYTHON = @PYTHON@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_VERSION = @PYTHON_VERSION@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TELEPATHY_GLIB_CFLAGS = @TELEPATHY_GLIB_CFLAGS@
-TELEPATHY_GLIB_LIBS = @TELEPATHY_GLIB_LIBS@
-TEST_PYTHON = @TEST_PYTHON@
-UUID_CFLAGS = @UUID_CFLAGS@
-UUID_LIBS = @UUID_LIBS@
-VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
-VALGRIND_LIBS = @VALGRIND_LIBS@
-VALGRIND_PATH = @VALGRIND_PATH@
-VERSION = @VERSION@
-WOCKY_CFLAGS = @WOCKY_CFLAGS@
-WOCKY_LIBS = @WOCKY_LIBS@
-XMLDIFF = @XMLDIFF@
-XSLTPROC = @XSLTPROC@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-have_gcov = @have_gcov@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-  groupchat-invite.input              \
-  simple-message-attrnamespace.input  \
-  simple-message.input                \
-  strange-streamopening.input
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/gibber/tests/inputs/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu lib/gibber/tests/inputs/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-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
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir 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 maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff -Nru telepathy-salut-0.5.0/lib/gibber/tests/inputs/simple-message-attrnamespace.input telepathy-salut-0.7.0/lib/gibber/tests/inputs/simple-message-attrnamespace.input
--- telepathy-salut-0.5.0/lib/gibber/tests/inputs/simple-message-attrnamespace.input	2009-04-25 11:20:50.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/tests/inputs/simple-message-attrnamespace.input	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-
-
-
-  
-    Art thou not Romeo, and a Montague?
-  
-
-  
-    Neither, fair saint, if either thee dislike.
-  
-
-
diff -Nru telepathy-salut-0.5.0/lib/gibber/tests/inputs/simple-message.input telepathy-salut-0.7.0/lib/gibber/tests/inputs/simple-message.input
--- telepathy-salut-0.5.0/lib/gibber/tests/inputs/simple-message.input	2009-04-25 11:20:50.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/tests/inputs/simple-message.input	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-
-
-
-  
-    Art thou not Romeo, and a Montague?
-  
-
-  
-    Neither, fair saint, if either thee dislike.
-  
-
-
diff -Nru telepathy-salut-0.5.0/lib/gibber/tests/inputs/strange-streamopening.input telepathy-salut-0.7.0/lib/gibber/tests/inputs/strange-streamopening.input
--- telepathy-salut-0.5.0/lib/gibber/tests/inputs/strange-streamopening.input	2009-04-25 11:20:50.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/tests/inputs/strange-streamopening.input	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-
-
-
-  
-
-
diff -Nru telepathy-salut-0.5.0/lib/gibber/tests/Makefile.am telepathy-salut-0.7.0/lib/gibber/tests/Makefile.am
--- telepathy-salut-0.5.0/lib/gibber/tests/Makefile.am	2011-04-28 15:25:29.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/tests/Makefile.am	2011-08-23 15:54:55.000000000 +0000
@@ -15,8 +15,6 @@
 clean-local:
 	-rm -rf outputs
 
-SUBDIRS = inputs
-
 EXTRA_DIST = \
 	test-transport.h \
 	test-transport.c
@@ -61,12 +59,10 @@
 # Checks
 
 check_PROGRAMS = \
-	check-gibber-xmpp-reader \
 	check-gibber-r-multicast-causal-transport \
 	check-gibber-r-multicast-packet \
 	check-gibber-r-multicast-sender \
 	check-gibber-listener \
-	check-gibber-xmpp-error \
 	check-gibber-unix-transport
 
 test: ${TEST_PROGS}
diff -Nru telepathy-salut-0.5.0/lib/gibber/tests/Makefile.in telepathy-salut-0.7.0/lib/gibber/tests/Makefile.in
--- telepathy-salut-0.5.0/lib/gibber/tests/Makefile.in	2011-05-03 13:29:17.000000000 +0000
+++ telepathy-salut-0.7.0/lib/gibber/tests/Makefile.in	2011-11-16 10:27:30.000000000 +0000
@@ -39,12 +39,10 @@
 	$(top_srcdir)/tools/check-coding-style.mk
 TESTS =
 noinst_PROGRAMS = test-r-multicast-transport-io$(EXEEXT)
-check_PROGRAMS = check-gibber-xmpp-reader$(EXEEXT) \
-	check-gibber-r-multicast-causal-transport$(EXEEXT) \
+check_PROGRAMS = check-gibber-r-multicast-causal-transport$(EXEEXT) \
 	check-gibber-r-multicast-packet$(EXEEXT) \
 	check-gibber-r-multicast-sender$(EXEEXT) \
 	check-gibber-listener$(EXEEXT) \
-	check-gibber-xmpp-error$(EXEEXT) \
 	check-gibber-unix-transport$(EXEEXT)
 subdir = lib/gibber/tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -90,12 +88,6 @@
 check_gibber_unix_transport_OBJECTS =  \
 	check-gibber-unix-transport.$(OBJEXT)
 check_gibber_unix_transport_LDADD = $(LDADD)
-check_gibber_xmpp_error_SOURCES = check-gibber-xmpp-error.c
-check_gibber_xmpp_error_OBJECTS = check-gibber-xmpp-error.$(OBJEXT)
-check_gibber_xmpp_error_LDADD = $(LDADD)
-check_gibber_xmpp_reader_SOURCES = check-gibber-xmpp-reader.c
-check_gibber_xmpp_reader_OBJECTS = check-gibber-xmpp-reader.$(OBJEXT)
-check_gibber_xmpp_reader_LDADD = $(LDADD)
 am_test_r_multicast_transport_io_OBJECTS = test_r_multicast_transport_io-test-r-multicast-transport-io.$(OBJEXT) \
 	test_r_multicast_transport_io-test-transport.$(OBJEXT)
 test_r_multicast_transport_io_OBJECTS =  \
@@ -137,59 +129,19 @@
 	check-gibber-r-multicast-causal-transport.c \
 	check-gibber-r-multicast-packet.c \
 	check-gibber-r-multicast-sender.c \
-	check-gibber-unix-transport.c check-gibber-xmpp-error.c \
-	check-gibber-xmpp-reader.c \
+	check-gibber-unix-transport.c \
 	$(test_r_multicast_transport_io_SOURCES)
 DIST_SOURCES = check-gibber-listener.c \
 	check-gibber-r-multicast-causal-transport.c \
 	check-gibber-r-multicast-packet.c \
 	check-gibber-r-multicast-sender.c \
-	check-gibber-unix-transport.c check-gibber-xmpp-error.c \
-	check-gibber-xmpp-reader.c \
+	check-gibber-unix-transport.c \
 	$(test_r_multicast_transport_io_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
 ETAGS = etags
 CTAGS = ctags
 am__tty_colors = \
 red=; grn=; lgn=; blu=; std=
-DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -214,6 +166,7 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -237,6 +190,8 @@
 GMODULE_LIBS = @GMODULE_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HTML_DIR = @HTML_DIR@
@@ -259,6 +214,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
 NM = @NM@
@@ -299,12 +255,12 @@
 VERSION = @VERSION@
 WOCKY_CFLAGS = @WOCKY_CFLAGS@
 WOCKY_LIBS = @WOCKY_LIBS@
-XMLDIFF = @XMLDIFF@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -368,7 +324,6 @@
 AM_LDFLAGS = @GLIB_LIBS@ \
 	$(top_builddir)/lib/gibber/libgibber.la
 
-SUBDIRS = inputs
 EXTRA_DIST = test-transport.h test-transport.c simplemeshtest.py \
 	mesh.py $(check_SCRIPTS)
 check_SCRIPTS = 
@@ -392,7 +347,7 @@
 check_c_sources = \
     $(test_r_multicast_transport_io_SOURCES)
 
-all: all-recursive
+all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
@@ -459,12 +414,6 @@
 check-gibber-unix-transport$(EXEEXT): $(check_gibber_unix_transport_OBJECTS) $(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)
-check-gibber-xmpp-error$(EXEEXT): $(check_gibber_xmpp_error_OBJECTS) $(check_gibber_xmpp_error_DEPENDENCIES) 
-	@rm -f check-gibber-xmpp-error$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_gibber_xmpp_error_OBJECTS) $(check_gibber_xmpp_error_LDADD) $(LIBS)
-check-gibber-xmpp-reader$(EXEEXT): $(check_gibber_xmpp_reader_OBJECTS) $(check_gibber_xmpp_reader_DEPENDENCIES) 
-	@rm -f check-gibber-xmpp-reader$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_gibber_xmpp_reader_OBJECTS) $(check_gibber_xmpp_reader_LDADD) $(LIBS)
 test-r-multicast-transport-io$(EXEEXT): $(test_r_multicast_transport_io_OBJECTS) $(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)
@@ -480,8 +429,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-gibber-r-multicast-packet.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-gibber-r-multicast-sender.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-gibber-unix-transport.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-gibber-xmpp-error.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-gibber-xmpp-reader.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_r_multicast_transport_io-test-r-multicast-transport-io.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_r_multicast_transport_io-test-transport.Po@am__quote@
 
@@ -547,76 +494,6 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -627,23 +504,10 @@
 	mkid -fID $$unique
 tags: TAGS
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -662,7 +526,7 @@
 	  fi; \
 	fi
 ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -804,50 +668,21 @@
 	    || exit 1; \
 	  fi; \
 	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS)
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
-check: check-recursive
+check: check-am
 all-am: Makefile $(PROGRAMS)
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
-installcheck: installcheck-recursive
+installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -866,84 +701,82 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
+clean: clean-am
 
 clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \
 	clean-noinstPROGRAMS mostlyclean-am
 
-distclean: distclean-recursive
+distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
-dvi: dvi-recursive
+dvi: dvi-am
 
 dvi-am:
 
-html: html-recursive
+html: html-am
 
 html-am:
 
-info: info-recursive
+info: info-am
 
 info-am:
 
 install-data-am:
 
-install-dvi: install-dvi-recursive
+install-dvi: install-dvi-am
 
 install-dvi-am:
 
 install-exec-am:
 
-install-html: install-html-recursive
+install-html: install-html-am
 
 install-html-am:
 
-install-info: install-info-recursive
+install-info: install-info-am
 
 install-info-am:
 
 install-man:
 
-install-pdf: install-pdf-recursive
+install-pdf: install-pdf-am
 
 install-pdf-am:
 
-install-ps: install-ps-recursive
+install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
-maintainer-clean: maintainer-clean-recursive
+maintainer-clean: maintainer-clean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-recursive
+mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
-pdf: pdf-recursive
+pdf: pdf-am
 
 pdf-am:
 
-ps: ps-recursive
+ps: ps-am
 
 ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
-	ctags-recursive install-am install-strip tags-recursive
+.MAKE: check-am install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-TESTS check-am check-local clean \
-	clean-checkPROGRAMS clean-generic clean-libtool clean-local \
-	clean-noinstPROGRAMS ctags ctags-recursive distclean \
+.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am check-local \
+	clean clean-checkPROGRAMS clean-generic clean-libtool \
+	clean-local clean-noinstPROGRAMS ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
@@ -951,10 +784,9 @@
 	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-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
 
 # run any given test by running make test.check
@@ -1099,12 +931,12 @@
 	if test -n "$(check_misc_sources)"; then \
 		tools_dir=$(top_srcdir)/tools \
 		sh $(top_srcdir)/tools/check-misc.sh \
-			$(check_misc_sources) || fail=1; \
+			$(addprefix $(srcdir)/,$(check_misc_sources)) || fail=1; \
 	fi; \
 	if test -n "$(check_c_sources)"; then \
 		tools_dir=$(top_srcdir)/tools \
 		sh $(top_srcdir)/tools/check-c-style.sh \
-			$(check_c_sources) || fail=1; \
+			$(addprefix $(srcdir)/,$(check_c_sources)) || fail=1; \
 	fi;\
 	if test yes = "$(ENABLE_CODING_STYLE_CHECKS)"; then \
 		exit "$$fail";\
diff -Nru telepathy-salut-0.5.0/lib/Makefile.in telepathy-salut-0.7.0/lib/Makefile.in
--- telepathy-salut-0.5.0/lib/Makefile.in	2011-05-03 13:29:17.000000000 +0000
+++ telepathy-salut-0.7.0/lib/Makefile.in	2011-11-16 10:27:30.000000000 +0000
@@ -125,6 +125,7 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -148,6 +149,8 @@
 GMODULE_LIBS = @GMODULE_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HTML_DIR = @HTML_DIR@
@@ -170,6 +173,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
 NM = @NM@
@@ -210,12 +214,12 @@
 VERSION = @VERSION@
 WOCKY_CFLAGS = @WOCKY_CFLAGS@
 WOCKY_LIBS = @WOCKY_LIBS@
-XMLDIFF = @XMLDIFF@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
diff -Nru telepathy-salut-0.5.0/ltmain.sh telepathy-salut-0.7.0/ltmain.sh
--- telepathy-salut-0.5.0/ltmain.sh	2011-05-03 12:15:08.000000000 +0000
+++ telepathy-salut-0.7.0/ltmain.sh	2011-11-16 10:10:11.000000000 +0000
@@ -1,10 +1,9 @@
-# Generated from ltmain.m4sh.
 
-# libtool (GNU libtool) 2.2.10
+# 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.
 
@@ -42,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
@@ -70,17 +70,19 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.2.10 Debian-2.2.10-1
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
 # Report bugs to .
+# GNU libtool home page: .
+# General help using GNU software: .
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.2.10 Debian-2.2.10-1"
+VERSION="2.4.2 Debian-2.4.2-1"
 TIMESTAMP=""
-package_revision=1.3175
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -135,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//"}
 
@@ -163,6 +160,27 @@
 dirname="s,/[^/]*$,,"
 basename="s,^.*/,,"
 
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
 # func_dirname_and_basename file append nondir_replacement
 # perform func_basename and func_dirname in a single function
 # call:
@@ -177,17 +195,31 @@
 # those functions but instead duplicate the functionality here.
 func_dirname_and_basename ()
 {
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-  func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-}
+    # Extract subdirectory from the argument.
+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+} # func_dirname_and_basename may be replaced by extended shell implementation
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+    case ${2} in
+      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+    esac
+} # func_stripname may be replaced by extended shell implementation
 
-# Generated shell functions inserted here.
 
 # These SED scripts presuppose an absolute path with a trailing slash.
 pathcar='s,^/\([^/]*\).*$,\1,'
@@ -351,7 +383,7 @@
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -370,6 +402,15 @@
 # Same as above, but do not quote variable references.
 double_quote_subst='s/\(["`\\]\)/\\\1/g'
 
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+
+# Sed substitution that converts a w32 file name or path
+# which contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
 # Re-`\' parameter expansions in output of double_quote_subst that were
 # `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
 # in input to double_quote_subst, that '$' was protected from expansion.
@@ -398,7 +439,7 @@
 # name if it has been set yet.
 func_echo ()
 {
-    $ECHO "$progname${mode+: }$mode: $*"
+    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
 }
 
 # func_verbose arg...
@@ -424,14 +465,14 @@
 # Echo program name prefixed message to standard error.
 func_error ()
 {
-    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
 }
 
 # func_warning arg...
 # Echo program name prefixed warning message to standard error.
 func_warning ()
 {
-    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
 
     # bash bug again:
     :
@@ -650,11 +691,30 @@
     fi
 }
 
+# func_tr_sh
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+  case $1 in
+  [0-9]* | *[!a-zA-Z0-9_]*)
+    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
+    ;;
+  * )
+    func_tr_sh_result=$1
+    ;;
+  esac
+}
+
 
 # func_version
 # Echo version message to standard output and exit.
 func_version ()
 {
+    $opt_debug
+
     $SED -n '/(C)/!b go
 	:more
 	/\./!{
@@ -676,6 +736,8 @@
 # Echo short help message to standard output and exit.
 func_usage ()
 {
+    $opt_debug
+
     $SED -n '/^# Usage:/,/^#  *.*--help/ {
         s/^# //
 	s/^# *$//
@@ -692,7 +754,10 @@
 # unless 'noexit' is passed as argument.
 func_help ()
 {
+    $opt_debug
+
     $SED -n '/^# Usage:/,/# Report bugs to/ {
+	:print
         s/^# //
 	s/^# *$//
 	s*\$progname*'$progname'*
@@ -702,10 +767,14 @@
 	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
-     }' < "$progpath"
+	d
+     }
+     /^# .* home page:/b print
+     /^# General help using/b print
+     ' < "$progpath"
     ret=$?
     if test -z "$1"; then
       exit $ret
@@ -717,12 +786,39 @@
 # exit_cmd.
 func_missing_arg ()
 {
+    $opt_debug
+
     func_error "missing argument for $1."
     exit_cmd=exit
 }
 
-exit_cmd=:
 
+# func_split_short_opt shortopt
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+func_split_short_opt ()
+{
+    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
+    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+
+    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
+    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
+} # func_split_short_opt may be replaced by extended shell implementation
+
+
+# func_split_long_opt longopt
+# Set func_split_long_opt_name and func_split_long_opt_arg shell
+# variables after splitting LONGOPT at the `=' sign.
+func_split_long_opt ()
+{
+    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+    my_sed_long_arg='1s/^--[^=]*=//'
+
+    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
+    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
+} # func_split_long_opt may be replaced by extended shell implementation
+
+exit_cmd=:
 
 
 
@@ -732,25 +828,64 @@
 magic_exe="%%%MAGIC EXE variable%%%"
 
 # Global variables.
-# $mode is unset
 nonopt=
-execute_dlfiles=
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
 extracted_archives=
 extracted_serial=0
 
-opt_dry_run=false
-opt_duplicate_deps=false
-opt_silent=false
-opt_debug=:
-
 # If this variable is set in any of the actions, the command in it
 # will be execed at the end.  This prevents here-documents from being
 # left over by shells.
 exec_cmd=
 
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+    eval "${1}=\$${1}\${2}"
+} # func_append may be replaced by extended shell implementation
+
+# func_append_quoted var value
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+func_append_quoted ()
+{
+    func_quote_for_eval "${2}"
+    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
+} # func_append_quoted may be replaced by extended shell implementation
+
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+    func_arith_result=`expr "${@}"`
+} # func_arith may be replaced by extended shell implementation
+
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
+} # func_len may be replaced by extended shell implementation
+
+
+# func_lo2o object
+func_lo2o ()
+{
+    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+} # func_lo2o may be replaced by extended shell implementation
+
+
+# func_xform libobj-or-source
+func_xform ()
+{
+    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+} # func_xform may be replaced by extended shell implementation
+
+
 # func_fatal_configuration arg...
 # Echo program name prefixed message to standard error, followed by
 # a configuration failure hint, and exit.
@@ -840,129 +975,209 @@
   esac
 }
 
-# Parse options once, thoroughly.  This comes as soon as possible in
-# the script to make things like `libtool --version' happen quickly.
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
 {
+  if test "$package_revision" != "$macro_revision"; then
+    if test "$VERSION" != "$macro_version"; then
+      if test -z "$macro_version"; then
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      fi
+    else
+      cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+    fi
+
+    exit $EXIT_MISMATCH
+  fi
+}
 
-  # Shorthand for --mode=foo, only valid as the first argument
-  case $1 in
-  clean|clea|cle|cl)
-    shift; set dummy --mode clean ${1+"$@"}; shift
-    ;;
-  compile|compil|compi|comp|com|co|c)
-    shift; set dummy --mode compile ${1+"$@"}; shift
-    ;;
-  execute|execut|execu|exec|exe|ex|e)
-    shift; set dummy --mode execute ${1+"$@"}; shift
-    ;;
-  finish|finis|fini|fin|fi|f)
-    shift; set dummy --mode finish ${1+"$@"}; shift
-    ;;
-  install|instal|insta|inst|ins|in|i)
-    shift; set dummy --mode install ${1+"$@"}; shift
-    ;;
-  link|lin|li|l)
-    shift; set dummy --mode link ${1+"$@"}; shift
-    ;;
-  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-    shift; set dummy --mode uninstall ${1+"$@"}; shift
-    ;;
-  esac
 
-  # Parse non-mode specific arguments:
-  while test "$#" -gt 0; do
+# Shorthand for --mode=foo, only valid as the first argument
+case $1 in
+clean|clea|cle|cl)
+  shift; set dummy --mode clean ${1+"$@"}; shift
+  ;;
+compile|compil|compi|comp|com|co|c)
+  shift; set dummy --mode compile ${1+"$@"}; shift
+  ;;
+execute|execut|execu|exec|exe|ex|e)
+  shift; set dummy --mode execute ${1+"$@"}; shift
+  ;;
+finish|finis|fini|fin|fi|f)
+  shift; set dummy --mode finish ${1+"$@"}; shift
+  ;;
+install|instal|insta|inst|ins|in|i)
+  shift; set dummy --mode install ${1+"$@"}; shift
+  ;;
+link|lin|li|l)
+  shift; set dummy --mode link ${1+"$@"}; shift
+  ;;
+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+  shift; set dummy --mode uninstall ${1+"$@"}; shift
+  ;;
+esac
+
+
+
+# Option defaults:
+opt_debug=:
+opt_dry_run=false
+opt_config=false
+opt_preserve_dup_deps=false
+opt_features=false
+opt_finish=false
+opt_help=false
+opt_help_all=false
+opt_silent=:
+opt_warning=:
+opt_verbose=:
+opt_silent=false
+opt_verbose=false
+
+
+# Parse options once, thoroughly.  This comes as soon as possible in the
+# script to make things like `--version' happen as quickly as we can.
+{
+  # this just eases exit handling
+  while test $# -gt 0; do
     opt="$1"
     shift
-
     case $opt in
-      --config)		func_config					;;
-
-      --debug)		preserve_args="$preserve_args $opt"
+      --debug|-x)	opt_debug='set -x'
 			func_echo "enabling shell trace mode"
-			opt_debug='set -x'
 			$opt_debug
 			;;
-
-      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			execute_dlfiles="$execute_dlfiles $1"
-			shift
+      --dry-run|--dryrun|-n)
+			opt_dry_run=:
 			;;
-
-      --dry-run | -n)	opt_dry_run=:					;;
-      --features)       func_features					;;
-      --finish)		mode="finish"					;;
-
-      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			case $1 in
-			  # Valid mode arguments:
-			  clean)	;;
-			  compile)	;;
-			  execute)	;;
-			  finish)	;;
-			  install)	;;
-			  link)		;;
-			  relink)	;;
-			  uninstall)	;;
-
-			  # Catch anything else as an error
-			  *) func_error "invalid argument for $opt"
-			     exit_cmd=exit
-			     break
-			     ;;
-		        esac
-
-			mode="$1"
+      --config)
+			opt_config=:
+func_config
+			;;
+      --dlopen|-dlopen)
+			optarg="$1"
+			opt_dlopen="${opt_dlopen+$opt_dlopen
+}$optarg"
 			shift
 			;;
-
       --preserve-dup-deps)
-			opt_duplicate_deps=:				;;
-
-      --quiet|--silent)	preserve_args="$preserve_args $opt"
-			opt_silent=:
-			opt_verbose=false
+			opt_preserve_dup_deps=:
 			;;
-
-      --no-quiet|--no-silent)
-			preserve_args="$preserve_args $opt"
-			opt_silent=false
+      --features)
+			opt_features=:
+func_features
 			;;
-
-      --verbose| -v)	preserve_args="$preserve_args $opt"
+      --finish)
+			opt_finish=:
+set dummy --mode finish ${1+"$@"}; shift
+			;;
+      --help)
+			opt_help=:
+			;;
+      --help-all)
+			opt_help_all=:
+opt_help=': help-all'
+			;;
+      --mode)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_mode="$optarg"
+case $optarg in
+  # Valid mode arguments:
+  clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+  # Catch anything else as an error
+  *) func_error "invalid argument for $opt"
+     exit_cmd=exit
+     break
+     ;;
+esac
+			shift
+			;;
+      --no-silent|--no-quiet)
 			opt_silent=false
-			opt_verbose=:
+func_append preserve_args " $opt"
 			;;
-
-      --no-verbose)	preserve_args="$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"
 			;;
-
-      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			preserve_args="$preserve_args $opt $1"
-			func_enable_tag "$1"	# tagname is set here
+      --silent|--quiet)
+			opt_silent=:
+func_append preserve_args " $opt"
+        opt_verbose=false
+			;;
+      --verbose|-v)
+			opt_verbose=:
+func_append preserve_args " $opt"
+opt_silent=false
+			;;
+      --tag)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_tag="$optarg"
+func_append preserve_args " $opt $optarg"
+func_enable_tag "$optarg"
 			shift
 			;;
 
+      -\?|-h)		func_usage				;;
+      --help)		func_help				;;
+      --version)	func_version				;;
+
       # Separate optargs to long options:
-      -dlopen=*|--mode=*|--tag=*)
-			func_opt_split "$opt"
-			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+      --*=*)
+			func_split_long_opt "$opt"
+			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
 			shift
 			;;
 
-      -\?|-h)		func_usage					;;
-      --help)		opt_help=:					;;
-      --help-all)	opt_help=': help-all'				;;
-      --version)	func_version					;;
-
-      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
-
-      *)		nonopt="$opt"
-			break
+      # Separate non-argument short options:
+      -\?*|-h*|-n*|-v*)
+			func_split_short_opt "$opt"
+			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
+			shift
 			;;
+
+      --)		break					;;
+      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
+      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
     esac
   done
 
+  # Validate options:
+
+  # save first non-option argument
+  if test "$#" -gt 0; then
+    nonopt="$opt"
+    shift
+  fi
+
+  # preserve --debug
+  test "$opt_debug" = : || func_append preserve_args " --debug"
 
   case $host in
     *cygwin* | *mingw* | *pw32* | *cegcc*)
@@ -970,82 +1185,44 @@
       opt_duplicate_compiler_generated_deps=:
       ;;
     *)
-      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
       ;;
   esac
 
-  # Having warned about all mis-specified options, bail out if
-  # anything was wrong.
-  $exit_cmd $EXIT_FAILURE
-}
+  $opt_help || {
+    # Sanity checks first:
+    func_check_version_match
 
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      else
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      fi
-    else
-      cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
+    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+      func_fatal_configuration "not configured to build any kind of library"
     fi
 
-    exit $EXIT_MISMATCH
-  fi
-}
-
-
-## ----------- ##
-##    Main.    ##
-## ----------- ##
+    # Darwin sucks
+    eval std_shrext=\"$shrext_cmds\"
 
-$opt_help || {
-  # Sanity checks first:
-  func_check_version_match
-
-  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-    func_fatal_configuration "not configured to build any kind of library"
-  fi
+    # Only execute mode is allowed to have -dlopen flags.
+    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
+      func_error "unrecognized option \`-dlopen'"
+      $ECHO "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
 
-  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+    # Change the help message to a mode-specific one.
+    generic_help="$help"
+    help="Try \`$progname --help --mode=$opt_mode' for more information."
+  }
 
 
-  # Darwin sucks
-  eval std_shrext=\"$shrext_cmds\"
+  # Bail if the options were screwed
+  $exit_cmd $EXIT_FAILURE
+}
 
 
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    func_error "unrecognized option \`-dlopen'"
-    $ECHO "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
 
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$progname --help --mode=$mode' for more information."
-}
 
+## ----------- ##
+##    Main.    ##
+## ----------- ##
 
 # func_lalib_p file
 # True iff FILE is a libtool `.la' library or `.lo' object file.
@@ -1110,12 +1287,9 @@
 # temporary ltwrapper_script.
 func_ltwrapper_scriptname ()
 {
-    func_ltwrapper_scriptname_result=""
-    if func_ltwrapper_executable_p "$1"; then
-	func_dirname_and_basename "$1" "" "."
-	func_stripname '' '.exe' "$func_basename_result"
-	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-    fi
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
 }
 
 # func_ltwrapper_p file
@@ -1161,6 +1335,37 @@
 }
 
 
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case "$lt_sysroot:$1" in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result="=$func_stripname_result"
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
+
 # func_infer_tag arg
 # Infer tagged configuration to use if any are available and
 # if one wasn't chosen via the "--tag" command line option.
@@ -1173,8 +1378,7 @@
     if test -n "$available_tags" && test -z "$tagname"; then
       CC_quoted=
       for arg in $CC; do
-        func_quote_for_eval "$arg"
-	CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	func_append_quoted CC_quoted "$arg"
       done
       CC_expanded=`func_echo_all $CC`
       CC_quoted_expanded=`func_echo_all $CC_quoted`
@@ -1193,8 +1397,7 @@
 	    CC_quoted=
 	    for arg in $CC; do
 	      # Double-quote args containing other shell metacharacters.
-	      func_quote_for_eval "$arg"
-	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	      func_append_quoted CC_quoted "$arg"
 	    done
 	    CC_expanded=`func_echo_all $CC`
 	    CC_quoted_expanded=`func_echo_all $CC_quoted`
@@ -1225,43 +1428,523 @@
 }
 
 
-
-# func_write_libtool_object output_name pic_name nonpic_name
-# Create a libtool object file (analogous to a ".la" file),
-# but don't create it if we're doing a dry run.
-func_write_libtool_object ()
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=${1}
+    if test "$build_libtool_libs" = yes; then
+      write_lobj=\'${2}\'
+    else
+      write_lobj=none
+    fi
+
+    if test "$build_old_libs" = yes; then
+      write_oldobj=\'${3}\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T </dev/null`
+    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$lt_sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $opt_debug
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=""
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $opt_debug
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $opt_debug
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $opt_debug
+  if test -z "$2" && test -n "$1" ; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  \`$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result="$1"
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $opt_debug
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  \`$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result="$3"
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $opt_debug
+  case $4 in
+  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via `$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $opt_debug
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $opt_debug
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result="$1"
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via `$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $opt_debug
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd="func_convert_path_${func_stripname_result}"
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $opt_debug
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result="$1"
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from ARG.  MSYS
+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+    # and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
 {
-    write_libobj=${1}
-    if test "$build_libtool_libs" = yes; then
-      write_lobj=\'${2}\'
-    else
-      write_lobj=none
-    fi
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
 
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
-    else
-      write_oldobj=none
-    fi
 
-    $opt_dry_run || {
-      cat >${write_libobj}T < "$lockfile"
     fi
 
     $opt_dry_run || $RM $removelist
-    removelist="$removelist $lockfile"
+    func_append removelist " $lockfile"
     trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
 
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
     func_quote_for_eval "$srcfile"
     qsrcfile=$func_quote_for_eval_result
 
@@ -1515,7 +2195,7 @@
 
       if test -z "$output_obj"; then
 	# Place PIC objects in $objdir
-	command="$command -o $lobj"
+	func_append command " -o $lobj"
       fi
 
       func_show_eval_locale "$command"	\
@@ -1562,11 +2242,11 @@
 	command="$base_compile $qsrcfile $pic_flag"
       fi
       if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
+	func_append command " -o $obj"
       fi
 
       # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
+      func_append command "$suppress_output"
       func_show_eval_locale "$command" \
         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 
@@ -1611,13 +2291,13 @@
 }
 
 $opt_help || {
-  test "$mode" = compile && func_mode_compile ${1+"$@"}
+  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
 }
 
 func_mode_help ()
 {
     # We need to display help for each of the modes.
-    case $mode in
+    case $opt_mode in
       "")
         # Generic help is extracted from the usage comments
         # at the start of this file.
@@ -1793,7 +2473,7 @@
         ;;
 
       *)
-        func_fatal_help "invalid operation mode \`$mode'"
+        func_fatal_help "invalid operation mode \`$opt_mode'"
         ;;
     esac
 
@@ -1808,13 +2488,13 @@
   else
     {
       func_help noexit
-      for mode in compile link execute install finish uninstall clean; do
+      for opt_mode in compile link execute install finish uninstall clean; do
 	func_mode_help
       done
     } | sed -n '1p; 2,$s/^Usage:/  or: /p'
     {
       func_help noexit
-      for mode in compile link execute install finish uninstall clean; do
+      for opt_mode in compile link execute install finish uninstall clean; do
 	echo
 	func_mode_help
       done
@@ -1843,13 +2523,16 @@
       func_fatal_help "you must specify a COMMAND"
 
     # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
+    for file in $opt_dlopen; do
       test -f "$file" \
 	|| func_fatal_help "\`$file' is not a file"
 
       dir=
       case $file in
       *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
 	  || func_fatal_help "\`$lib' is not a valid libtool archive"
@@ -1871,7 +2554,7 @@
 	dir="$func_dirname_result"
 
 	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
+	  func_append dir "/$objdir"
 	else
 	  if test ! -f "$dir/$dlname"; then
 	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
@@ -1928,8 +2611,7 @@
 	;;
       esac
       # Quote arguments (to preserve shell metacharacters).
-      func_quote_for_eval "$file"
-      args="$args $func_quote_for_eval_result"
+      func_append_quoted args "$file"
     done
 
     if test "X$opt_dry_run" = Xfalse; then
@@ -1961,22 +2643,59 @@
     fi
 }
 
-test "$mode" = execute && func_mode_execute ${1+"$@"}
+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
 
 
 # func_mode_finish arg...
 func_mode_finish ()
 {
     $opt_debug
-    libdirs="$nonopt"
+    libs=
+    libdirs=
     admincmds=
 
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "\`$opt' is not a valid libtool archive"
+	fi
 
+      else
+	func_fatal_error "invalid argument \`$opt'"
+      fi
+    done
+
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
+
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
       for libdir in $libdirs; do
 	if test -n "$finish_cmds"; then
 	  # Do each command in the finish commands.
@@ -1986,7 +2705,7 @@
 	if test -n "$finish_eval"; then
 	  # Do the single finish_eval.
 	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
        $cmds"
 	fi
       done
@@ -1995,53 +2714,55 @@
     # Exit here if they wanted silent mode.
     $opt_silent && exit $EXIT_SUCCESS
 
-    echo "----------------------------------------------------------------------"
-    echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $ECHO "   $libdir"
-    done
-    echo
-    echo "If you ever happen to want to link against installed libraries"
-    echo "in a given directory, LIBDIR, you must either use libtool, and"
-    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+	$ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+	echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+	echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+	libdir=LIBDIR
+	eval flag=\"$hardcode_libdir_flag_spec\"
 
-      $ECHO "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $ECHO "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    echo
+	$ECHO "   - use the \`$flag' linker flag"
+      fi
+      if test -n "$admincmds"; then
+	$ECHO "   - have your system administrator run these commands:$admincmds"
+      fi
+      if test -f /etc/ld.so.conf; then
+	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+      fi
+      echo
 
-    echo "See any operating system documentation about shared libraries for"
-    case $host in
-      solaris2.[6789]|solaris2.1[0-9])
-        echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	echo "pages."
-	;;
-      *)
-        echo "more information, such as the ld(1) and ld.so(8) manual pages."
-        ;;
-    esac
-    echo "----------------------------------------------------------------------"
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+	solaris2.[6789]|solaris2.1[0-9])
+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	  echo "pages."
+	  ;;
+	*)
+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
+	  ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
     exit $EXIT_SUCCESS
 }
 
-test "$mode" = finish && func_mode_finish ${1+"$@"}
+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
 
 
 # func_mode_install arg...
@@ -2066,7 +2787,7 @@
     # The real first argument should be the name of the installation program.
     # Aesthetically quote it.
     func_quote_for_eval "$arg"
-    install_prog="$install_prog$func_quote_for_eval_result"
+    func_append install_prog "$func_quote_for_eval_result"
     install_shared_prog=$install_prog
     case " $install_prog " in
       *[\\\ /]cp\ *) install_cp=: ;;
@@ -2086,7 +2807,7 @@
     do
       arg2=
       if test -n "$dest"; then
-	files="$files $dest"
+	func_append files " $dest"
 	dest=$arg
 	continue
       fi
@@ -2124,11 +2845,11 @@
 
       # Aesthetically quote the argument.
       func_quote_for_eval "$arg"
-      install_prog="$install_prog $func_quote_for_eval_result"
+      func_append install_prog " $func_quote_for_eval_result"
       if test -n "$arg2"; then
 	func_quote_for_eval "$arg2"
       fi
-      install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
+      func_append install_shared_prog " $func_quote_for_eval_result"
     done
 
     test -z "$install_prog" && \
@@ -2140,7 +2861,7 @@
     if test -n "$install_override_mode" && $no_mode; then
       if $install_cp; then :; else
 	func_quote_for_eval "$install_override_mode"
-	install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
       fi
     fi
 
@@ -2198,10 +2919,13 @@
       case $file in
       *.$libext)
 	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
+	func_append staticlibs " $file"
 	;;
 
       *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
 	  || func_fatal_help "\`$file' is not a valid libtool archive"
@@ -2215,19 +2939,19 @@
 	if test "X$destdir" = "X$libdir"; then
 	  case "$current_libdirs " in
 	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  *) func_append current_libdirs " $libdir" ;;
 	  esac
 	else
 	  # Note the libdir as a future libdir.
 	  case "$future_libdirs " in
 	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  *) func_append future_libdirs " $libdir" ;;
 	  esac
 	fi
 
 	func_dirname "$file" "/" ""
 	dir="$func_dirname_result"
-	dir="$dir$objdir"
+	func_append dir "$objdir"
 
 	if test -n "$relink_command"; then
 	  # Determine the prefix the user has applied to our future dir.
@@ -2304,7 +3028,7 @@
 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
 
 	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
 	;;
 
       *.lo)
@@ -2478,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.
@@ -2501,7 +3227,7 @@
     fi
 }
 
-test "$mode" = install && func_mode_install ${1+"$@"}
+test "$opt_mode" = install && func_mode_install ${1+"$@"}
 
 
 # func_generate_dlsyms outputname originator pic_p
@@ -2548,6 +3274,18 @@
 #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
 #endif
 
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
 /* External symbol declarations for the compiler. */\
 "
 
@@ -2559,8 +3297,9 @@
 	  # Add our own program objects to the symbol list.
 	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
 	  for progfile in $progfiles; do
-	    func_verbose "extracting global C symbols from \`$progfile'"
-	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
 	  done
 
 	  if test -n "$exclude_expsyms"; then
@@ -2609,10 +3348,52 @@
 	  func_verbose "extracting global C symbols from \`$dlprefile'"
 	  func_basename "$dlprefile"
 	  name="$func_basename_result"
-	  $opt_dry_run || {
-	    eval '$ECHO ": $name " >> "$nlist"'
-	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	  }
+          case $host in
+	    *cygwin* | *mingw* | *cegcc* )
+	      # if an import library, we need to obtain dlname
+	      if func_win32_import_lib_p "$dlprefile"; then
+	        func_tr_sh "$dlprefile"
+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
+	        dlprefile_dlbasename=""
+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+	          # Use subshell, to avoid clobbering current variable values
+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+	          if test -n "$dlprefile_dlname" ; then
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename="$func_basename_result"
+	          else
+	            # no lafile. user explicitly requested -dlpreopen .
+	            $sharedlib_from_linklib_cmd "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename" ; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
 	done
 
 	$opt_dry_run || {
@@ -2650,26 +3431,9 @@
   const char *name;
   void *address;
 } lt_dlsymlist;
-"
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc* )
-	    echo >> "$output_objdir/$my_dlsyms" "\
-/* DATA imports from DLLs on WIN32 con't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs.  */"
-	    lt_dlsym_const= ;;
-	  *osf5*)
-	    echo >> "$output_objdir/$my_dlsyms" "\
-/* This system does not cope well with relocations in const data */"
-	    lt_dlsym_const= ;;
-	  *)
-	    lt_dlsym_const=const ;;
-	  esac
-
-	  echo >> "$output_objdir/$my_dlsyms" "\
-extern $lt_dlsym_const lt_dlsymlist
+extern LT_DLSYM_CONST lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols[];
-$lt_dlsym_const lt_dlsymlist
+LT_DLSYM_CONST lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols[] =
 {\
   { \"$my_originator\", (void *) 0 },"
@@ -2709,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"  ;;
@@ -2725,7 +3489,7 @@
 	for arg in $LTCFLAGS; do
 	  case $arg in
 	  -pie | -fpie | -fPIE) ;;
-	  *) symtab_cflags="$symtab_cflags $arg" ;;
+	  *) func_append symtab_cflags " $arg" ;;
 	  esac
 	done
 
@@ -2788,7 +3552,8 @@
     # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
        $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-      win32_nmres=`eval $NM -f posix -A $1 |
+      func_to_tool_file "$1" func_convert_file_msys_to_w32
+      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
 	$SED -n -e '
 	    1,100{
 		/ I /{
@@ -2817,6 +3582,131 @@
   $ECHO "$win32_libid_type"
 }
 
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $opt_debug
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $opt_debug
+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[	 ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive which possess that section. Heuristic: eliminate
+    # all those which have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $opt_debug
+  if func_cygming_gnu_implib_p "$1" ; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1" ; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=""
+  fi
+}
 
 
 # func_extract_an_archive dir oldlib
@@ -3095,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+\"\$@\"}
 }
 
@@ -3195,6 +4088,18 @@
 
   if test -f \"\$progdir/\$program\"; then"
 
+	# fixup the dll searchpath if we need to.
+	#
+	# Fix the DLL searchpath if we need to.  Do this before prepending
+	# to shlibpath, because on Windows, both are PATH and uninstalled
+	# libraries must come first.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
 	# Export our shlibpath_var if we have one.
 	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
 	  $ECHO "\
@@ -3209,14 +4114,6 @@
 "
 	fi
 
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
 	$ECHO "\
     if test \"\$libtool_execute_magic\" != \"$magic\"; then
       # Run the actual program with our arguments.
@@ -3234,166 +4131,6 @@
 }
 
 
-# func_to_host_path arg
-#
-# Convert paths to host format when used with build tools.
-# Intended for use with "native" mingw (where libtool itself
-# is running under the msys shell), or in the following cross-
-# build environments:
-#    $build          $host
-#    mingw (msys)    mingw  [e.g. native]
-#    cygwin          mingw
-#    *nix + wine     mingw
-# where wine is equipped with the `winepath' executable.
-# In the native mingw case, the (msys) shell automatically
-# converts paths for any non-msys applications it launches,
-# but that facility isn't available from inside the cwrapper.
-# Similar accommodations are necessary for $host mingw and
-# $build cygwin.  Calling this function does no harm for other
-# $host/$build combinations not listed above.
-#
-# ARG is the path (on $build) that should be converted to
-# the proper representation for $host. The result is stored
-# in $func_to_host_path_result.
-func_to_host_path ()
-{
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        case $build in
-          *mingw* ) # actually, msys
-            # awkward: cmd appends spaces to result
-            func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
-              $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_path_result=`cygpath -w "$1" |
-	      $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # Unfortunately, winepath does not exit with a non-zero
-            # error code, so we are forced to check the contents of
-            # stdout. On the other hand, if the command is not
-            # found, the shell will set an exit code of 127 and print
-            # *an error message* to stdout. So we must check for both
-            # error code of zero AND non-empty stdout, which explains
-            # the odd construction:
-            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
-            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
-              func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
-                $SED -e "$lt_sed_naive_backslashify"`
-            else
-              # Allow warning below.
-              func_to_host_path_result=
-            fi
-            ;;
-        esac
-        if test -z "$func_to_host_path_result" ; then
-          func_error "Could not determine host path corresponding to"
-          func_error "  \`$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback:
-          func_to_host_path_result="$1"
-        fi
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_path
-
-# func_to_host_pathlist arg
-#
-# Convert pathlists to host format when used with build tools.
-# See func_to_host_path(), above. This function supports the
-# following $build/$host combinations (but does no harm for
-# combinations not listed here):
-#    $build          $host
-#    mingw (msys)    mingw  [e.g. native]
-#    cygwin          mingw
-#    *nix + wine     mingw
-#
-# Path separators are also converted from $build format to
-# $host format. If ARG begins or ends with a path separator
-# character, it is preserved (but converted to $host format)
-# on output.
-#
-# ARG is a pathlist (on $build) that should be converted to
-# the proper representation on $host. The result is stored
-# in $func_to_host_pathlist_result.
-func_to_host_pathlist ()
-{
-  func_to_host_pathlist_result="$1"
-  if test -n "$1"; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        # Remove leading and trailing path separator characters from
-        # ARG. msys behavior is inconsistent here, cygpath turns them
-        # into '.;' and ';.', and winepath ignores them completely.
-	func_stripname : : "$1"
-        func_to_host_pathlist_tmp1=$func_stripname_result
-        case $build in
-          *mingw* ) # Actually, msys.
-            # Awkward: cmd appends spaces to result.
-            func_to_host_pathlist_result=`
-	      ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
-	      $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # unfortunately, winepath doesn't convert pathlists
-            func_to_host_pathlist_result=""
-            func_to_host_pathlist_oldIFS=$IFS
-            IFS=:
-            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
-              IFS=$func_to_host_pathlist_oldIFS
-              if test -n "$func_to_host_pathlist_f" ; then
-                func_to_host_path "$func_to_host_pathlist_f"
-                if test -n "$func_to_host_path_result" ; then
-                  if test -z "$func_to_host_pathlist_result" ; then
-                    func_to_host_pathlist_result="$func_to_host_path_result"
-                  else
-                    func_append func_to_host_pathlist_result ";$func_to_host_path_result"
-                  fi
-                fi
-              fi
-            done
-            IFS=$func_to_host_pathlist_oldIFS
-            ;;
-        esac
-        if test -z "$func_to_host_pathlist_result"; then
-          func_error "Could not determine the host path(s) corresponding to"
-          func_error "  \`$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback. This may break if $1 contains DOS-style drive
-          # specifications. The fix is not to complicate the expression
-          # below, but for the user to provide a working wine installation
-          # with winepath so that path translation in the cross-to-mingw
-          # case works properly.
-          lt_replace_pathsep_nix_to_dos="s|:|;|g"
-          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
-            $SED -e "$lt_replace_pathsep_nix_to_dos"`
-        fi
-        # Now, add the leading and trailing path separators back
-        case "$1" in
-          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
-            ;;
-        esac
-        case "$1" in
-          *: ) func_append func_to_host_pathlist_result ";"
-            ;;
-        esac
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_pathlist
-
 # func_emit_cwrapperexe_src
 # emit the source code for a wrapper executable on stdout
 # Must ONLY be called from within func_mode_link because
@@ -3563,14 +4300,14 @@
 EOF
 
 	    cat </dev/null`
+		  if test "$want_nocaseglob" = yes; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		  fi
 		  for potent_lib in $potential_libs; do
 		      # Follow soft links.
 		      if ls -lLd "$potent_lib" 2>/dev/null |
@@ -7005,7 +7833,7 @@
 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
 			 $SED -e 10q |
 			 $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
+			func_append newdeplibs " $a_deplib"
 			a_deplib=""
 			break 2
 		      fi
@@ -7030,7 +7858,7 @@
 	      ;;
 	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
+	      func_append newdeplibs " $a_deplib"
 	      ;;
 	    esac
 	  done # Gone through all deplibs.
@@ -7046,7 +7874,7 @@
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
+		  func_append newdeplibs " $a_deplib"
 		  a_deplib=""
 		  ;;
 		esac
@@ -7059,7 +7887,7 @@
 		    potlib="$potent_lib" # see symlink-check above in file_magic test
 		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
 		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
+		      func_append newdeplibs " $a_deplib"
 		      a_deplib=""
 		      break 2
 		    fi
@@ -7084,7 +7912,7 @@
 	      ;;
 	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
+	      func_append newdeplibs " $a_deplib"
 	      ;;
 	    esac
 	  done # Gone through all deplibs.
@@ -7188,7 +8016,7 @@
 	*)
 	  case " $deplibs " in
 	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
+	    func_append new_libs " -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -7198,10 +8026,10 @@
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
+	  *) func_append new_libs " $deplib" ;;
 	  esac
 	  ;;
-	*) new_libs="$new_libs $deplib" ;;
+	*) func_append new_libs " $deplib" ;;
 	esac
       done
       deplibs="$new_libs"
@@ -7213,15 +8041,22 @@
 
       # 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=
 	  dep_rpath=
 	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
 	  for libdir in $rpath; do
 	    if test -n "$hardcode_libdir_flag_spec"; then
 	      if test -n "$hardcode_libdir_separator"; then
+		func_replace_sysroot "$libdir"
+		libdir=$func_replace_sysroot_result
 		if test -z "$hardcode_libdirs"; then
 		  hardcode_libdirs="$libdir"
 		else
@@ -7230,18 +8065,18 @@
 		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		    ;;
 		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		    ;;
 		  esac
 		fi
 	      else
 		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
+		func_append dep_rpath " $flag"
 	      fi
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -7249,17 +8084,13 @@
 	  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.
 	    rpath=
 	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
+	      func_append rpath "$dir:"
 	    done
 	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
 	  fi
@@ -7267,7 +8098,7 @@
 	fi
 
 	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
 	if test -n "$shlibpath"; then
 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 	fi
@@ -7293,7 +8124,7 @@
 	linknames=
 	for link
 	do
-	  linknames="$linknames $link"
+	  func_append linknames " $link"
 	done
 
 	# Use standard objects if they are pic
@@ -7304,7 +8135,7 @@
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
 	  export_symbols="$output_objdir/$libname.uexp"
-	  delfiles="$delfiles $export_symbols"
+	  func_append delfiles " $export_symbols"
 	fi
 
 	orig_export_symbols=
@@ -7335,13 +8166,45 @@
 	    $opt_dry_run || $RM $export_symbols
 	    cmds=$export_symbols_cmds
 	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
+	    for cmd1 in $cmds; do
 	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      func_len " $cmd"
-	      len=$func_len_result
-	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	      # Take the normal branch if the nm_file_list_spec branch
+	      # doesn't work or if tool conversion is not needed.
+	      case $nm_file_list_spec~$to_tool_file_cmd in
+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+		  try_normal_branch=yes
+		  eval cmd=\"$cmd1\"
+		  func_len " $cmd"
+		  len=$func_len_result
+		  ;;
+		*)
+		  try_normal_branch=no
+		  ;;
+	      esac
+	      if test "$try_normal_branch" = yes \
+		 && { test "$len" -lt "$max_cmd_len" \
+		      || test "$max_cmd_len" -le -1; }
+	      then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		func_basename "$output"
+		output_la=$func_basename_result
+		save_libobjs=$libobjs
+		save_output=$output
+		output=${output_objdir}/${output_la}.nm
+		func_to_tool_file "$output"
+		libobjs=$nm_file_list_spec$func_to_tool_file_result
+		func_append delfiles " $output"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  func_to_tool_file "$obj"
+		  $ECHO "$func_to_tool_file_result"
+		done > "$output"
+		eval cmd=\"$cmd1\"
 		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
 		skipped_export=false
 	      else
 		# The command line is too long to execute in one step.
@@ -7375,7 +8238,7 @@
 	  # global variables. join(1) would be nice here, but unfortunately
 	  # isn't a blessed tool.
 	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
 	  export_symbols=$output_objdir/$libname.def
 	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	fi
@@ -7385,7 +8248,7 @@
 	  case " $convenience " in
 	  *" $test_deplib "*) ;;
 	  *)
-	    tmp_deplibs="$tmp_deplibs $test_deplib"
+	    func_append tmp_deplibs " $test_deplib"
 	    ;;
 	  esac
 	done
@@ -7405,21 +8268,21 @@
 	    test "X$libobjs" = "X " && libobjs=
 	  else
 	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
+	    func_append generated " $gentop"
 
 	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
+	    func_append libobjs " $func_extract_archives_result"
 	    test "X$libobjs" = "X " && libobjs=
 	  fi
 	fi
 
 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
+	  func_append linker_flags " $flag"
 	fi
 
 	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
+	if test "$opt_mode" = relink; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
 	fi
 
@@ -7481,10 +8344,13 @@
 	    echo 'INPUT (' > $output
 	    for obj in $save_libobjs
 	    do
-	      $ECHO "$obj" >> $output
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
 	    done
 	    echo ')' >> $output
-	    delfiles="$delfiles $output"
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
 	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
 	    output=${output_objdir}/${output_la}.lnk
 	    func_verbose "creating linker input file list: $output"
@@ -7498,10 +8364,12 @@
 	    fi
 	    for obj
 	    do
-	      $ECHO "$obj" >> $output
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
 	    done
-	    delfiles="$delfiles $output"
-	    output=$firstobj\"$file_list_spec$output\"
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
 	  else
 	    if test -n "$save_libobjs"; then
 	      func_verbose "creating reloadable object files..."
@@ -7552,7 +8420,7 @@
 	      if test -n "$last_robj"; then
 	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
 	      fi
-	      delfiles="$delfiles $output"
+	      func_append delfiles " $output"
 
 	    else
 	      output=
@@ -7586,7 +8454,7 @@
 		lt_exit=$?
 
 		# Restore the uninstalled library and exit
-		if test "$mode" = relink; then
+		if test "$opt_mode" = relink; then
 		  ( cd "$output_objdir" && \
 		    $RM "${realname}T" && \
 		    $MV "${realname}U" "$realname" )
@@ -7619,7 +8487,7 @@
 	      # global variables. join(1) would be nice here, but unfortunately
 	      # isn't a blessed tool.
 	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
 	      export_symbols=$output_objdir/$libname.def
 	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	    fi
@@ -7660,10 +8528,10 @@
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
 	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
-	  libobjs="$libobjs $func_extract_archives_result"
+	  func_append libobjs " $func_extract_archives_result"
 	  test "X$libobjs" = "X " && libobjs=
 	fi
 
@@ -7679,7 +8547,7 @@
 	    lt_exit=$?
 
 	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
+	    if test "$opt_mode" = relink; then
 	      ( cd "$output_objdir" && \
 	        $RM "${realname}T" && \
 		$MV "${realname}U" "$realname" )
@@ -7691,7 +8559,7 @@
 	IFS="$save_ifs"
 
 	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
+	if test "$opt_mode" = relink; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
 
 	  if test -n "$convenience"; then
@@ -7775,13 +8643,16 @@
 	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $convenience
 	  reload_conv_objs="$reload_objs $func_extract_archives_result"
 	fi
       fi
 
+      # If we're not building shared, we need to use non_pic_objs
+      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
       # Create the old-style object.
       reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
 
@@ -7855,8 +8726,8 @@
 	if test "$tagname" = CXX ; then
 	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
 	    10.[0123])
-	      compile_command="$compile_command ${wl}-bind_at_load"
-	      finalize_command="$finalize_command ${wl}-bind_at_load"
+	      func_append compile_command " ${wl}-bind_at_load"
+	      func_append finalize_command " ${wl}-bind_at_load"
 	    ;;
 	  esac
 	fi
@@ -7876,7 +8747,7 @@
 	*)
 	  case " $compile_deplibs " in
 	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
+	    func_append new_libs " -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -7886,17 +8757,17 @@
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
+	  *) func_append new_libs " $deplib" ;;
 	  esac
 	  ;;
-	*) new_libs="$new_libs $deplib" ;;
+	*) func_append new_libs " $deplib" ;;
 	esac
       done
       compile_deplibs="$new_libs"
 
 
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
 
       if test -n "$rpath$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -7904,7 +8775,7 @@
 	  # This is the magic to use -rpath.
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
       fi
@@ -7923,18 +8794,18 @@
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
+	  *) func_append perm_rpath " $libdir" ;;
 	  esac
 	fi
 	case $host in
@@ -7943,12 +8814,12 @@
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
 	  ::) dllsearchpath=$libdir;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
+	  *) func_append dllsearchpath ":$libdir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
 	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  *) func_append dllsearchpath ":$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -7974,18 +8845,18 @@
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$finalize_perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
 	  esac
 	fi
       done
@@ -8036,6 +8907,12 @@
 	exit_status=0
 	func_show_eval "$link_command" 'exit_status=$?'
 
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
 	# Delete the generated files.
 	if test -f "$output_objdir/${outputname}S.${objext}"; then
 	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
@@ -8058,7 +8935,7 @@
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -8066,7 +8943,7 @@
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -8081,6 +8958,13 @@
 	$opt_dry_run || $RM $output
 	# Link the executable and exit
 	func_show_eval "$link_command" 'exit $?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
 	exit $EXIT_SUCCESS
       fi
 
@@ -8114,6 +8998,12 @@
 
       func_show_eval "$link_command" 'exit $?'
 
+      if test -n "$postlink_cmds"; then
+	func_to_tool_file "$output_objdir/$outputname"
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
       # Now create the wrapper script.
       func_verbose "creating $output"
 
@@ -8211,7 +9101,7 @@
 	else
 	  oldobjs="$old_deplibs $non_pic_objects"
 	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    oldobjs="$oldobjs $symfileobj"
+	    func_append oldobjs " $symfileobj"
 	  fi
 	fi
 	addlibs="$old_convenience"
@@ -8219,10 +9109,10 @@
 
       if test -n "$addlibs"; then
 	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
+	func_append generated " $gentop"
 
 	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
+	func_append oldobjs " $func_extract_archives_result"
       fi
 
       # Do each command in the archive commands.
@@ -8233,10 +9123,10 @@
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
 	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
-	  oldobjs="$oldobjs $func_extract_archives_result"
+	  func_append oldobjs " $func_extract_archives_result"
 	fi
 
 	# POSIX demands no paths to be encoded in archives.  We have
@@ -8254,7 +9144,7 @@
 	else
 	  echo "copying selected object files to avoid basename conflicts..."
 	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 	  func_mkdir_p "$gentop"
 	  save_oldobjs=$oldobjs
 	  oldobjs=
@@ -8278,18 +9168,30 @@
 		esac
 	      done
 	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
 	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
+	    *) func_append oldobjs " $obj" ;;
 	    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"
 	len=$func_len_result
 	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 	  cmds=$old_archive_cmds
+	elif test -n "$archiver_list_spec"; then
+	  func_verbose "using command file archive linking..."
+	  for obj in $oldobjs
+	  do
+	    func_to_tool_file "$obj"
+	    $ECHO "$func_to_tool_file_result"
+	  done > $output_objdir/$libname.libcmd
+	  func_to_tool_file "$output_objdir/$libname.libcmd"
+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+	  cmds=$old_archive_cmds
 	else
 	  # the command line is too long to link in one step, link in parts
 	  func_verbose "using piecewise archive linking..."
@@ -8383,12 +9285,23 @@
 	      *.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"
-		newdependency_libs="$newdependency_libs $libdir/$name"
+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      -L*)
+		func_stripname -L '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -L$func_replace_sysroot_result"
+		;;
+	      -R*)
+		func_stripname -R '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -R$func_replace_sysroot_result"
 		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+	      *) func_append newdependency_libs " $deplib" ;;
 	      esac
 	    done
 	    dependency_libs="$newdependency_libs"
@@ -8402,9 +9315,9 @@
 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlfiles="$newdlfiles $libdir/$name"
+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
-	      *) newdlfiles="$newdlfiles $lib" ;;
+	      *) func_append newdlfiles " $lib" ;;
 	      esac
 	    done
 	    dlfiles="$newdlfiles"
@@ -8421,7 +9334,7 @@
 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlprefiles="$newdlprefiles $libdir/$name"
+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
 	      esac
 	    done
@@ -8433,7 +9346,7 @@
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      newdlfiles="$newdlfiles $abs"
+	      func_append newdlfiles " $abs"
 	    done
 	    dlfiles="$newdlfiles"
 	    newdlprefiles=
@@ -8442,7 +9355,7 @@
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      newdlprefiles="$newdlprefiles $abs"
+	      func_append newdlprefiles " $abs"
 	    done
 	    dlprefiles="$newdlprefiles"
 	  fi
@@ -8527,7 +9440,7 @@
     exit $EXIT_SUCCESS
 }
 
-{ test "$mode" = link || test "$mode" = relink; } &&
+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
     func_mode_link ${1+"$@"}
 
 
@@ -8547,9 +9460,9 @@
     for arg
     do
       case $arg in
-      -f) RM="$RM $arg"; rmforce=yes ;;
-      -*) RM="$RM $arg" ;;
-      *) files="$files $arg" ;;
+      -f) func_append RM " $arg"; rmforce=yes ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
       esac
     done
 
@@ -8558,24 +9471,23 @@
 
     rmdirs=
 
-    origobjdir="$objdir"
     for file in $files; do
       func_dirname "$file" "" "."
       dir="$func_dirname_result"
       if test "X$dir" = X.; then
-	objdir="$origobjdir"
+	odir="$objdir"
       else
-	objdir="$dir/$origobjdir"
+	odir="$dir/$objdir"
       fi
       func_basename "$file"
       name="$func_basename_result"
-      test "$mode" = uninstall && objdir="$dir"
+      test "$opt_mode" = uninstall && odir="$dir"
 
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test "$opt_mode" = clean; then
 	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
+	  *" $odir "*) ;;
+	  *) func_append rmdirs " $odir" ;;
 	esac
       fi
 
@@ -8601,18 +9513,17 @@
 
 	  # Delete the libtool libraries and symlinks.
 	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
+	    func_append rmfiles " $odir/$n"
 	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
 
-	  case "$mode" in
+	  case "$opt_mode" in
 	  clean)
-	    case "  $library_names " in
-	    # "  " in the beginning catches empty $dlname
+	    case " $library_names " in
 	    *" $dlname "*) ;;
-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
 	    esac
-	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
 	    ;;
 	  uninstall)
 	    if test -n "$library_names"; then
@@ -8640,19 +9551,19 @@
 	  # Add PIC object to the list of files to remove.
 	  if test -n "$pic_object" &&
 	     test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
+	    func_append rmfiles " $dir/$pic_object"
 	  fi
 
 	  # Add non-PIC object to the list of files to remove.
 	  if test -n "$non_pic_object" &&
 	     test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
+	    func_append rmfiles " $dir/$non_pic_object"
 	  fi
 	fi
 	;;
 
       *)
-	if test "$mode" = clean ; then
+	if test "$opt_mode" = clean ; then
 	  noexename=$name
 	  case $file in
 	  *.exe)
@@ -8662,7 +9573,7 @@
 	    noexename=$func_stripname_result
 	    # $file with .exe has already been added to rmfiles,
 	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
+	    func_append rmfiles " $file"
 	    ;;
 	  esac
 	  # Do a test to see if this is a libtool program.
@@ -8671,7 +9582,7 @@
 	      func_ltwrapper_scriptname "$file"
 	      relink_command=
 	      func_source $func_ltwrapper_scriptname_result
-	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
 	    else
 	      relink_command=
 	      func_source $dir/$noexename
@@ -8679,12 +9590,12 @@
 
 	    # note $name still contains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
 	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
+	      func_append rmfiles " $odir/lt-$name"
 	    fi
 	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	      func_append rmfiles " $odir/lt-${noexename}.c"
 	    fi
 	  fi
 	fi
@@ -8692,7 +9603,6 @@
       esac
       func_show_eval "$RM $rmfiles" 'exit_status=1'
     done
-    objdir="$origobjdir"
 
     # Try to remove the ${objdir}s in the directories where we deleted files
     for dir in $rmdirs; do
@@ -8704,16 +9614,16 @@
     exit $exit_status
 }
 
-{ test "$mode" = uninstall || test "$mode" = clean; } &&
+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
     func_mode_uninstall ${1+"$@"}
 
-test -z "$mode" && {
+test -z "$opt_mode" && {
   help="$generic_help"
   func_fatal_help "you must specify a MODE"
 }
 
 test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$mode'"
+  func_fatal_help "invalid operation mode \`$opt_mode'"
 
 if test -n "$exec_cmd"; then
   eval exec "$exec_cmd"
diff -Nru telepathy-salut-0.5.0/m4/libtool.m4 telepathy-salut-0.7.0/m4/libtool.m4
--- telepathy-salut-0.5.0/m4/libtool.m4	2011-05-03 12:15:08.000000000 +0000
+++ telepathy-salut-0.7.0/m4/libtool.m4	2011-11-16 10:10:11.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
@@ -168,10 +170,13 @@
 dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
 m4_require([_LT_CMD_RELOAD])dnl
 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
 
 _LT_CONFIG_LIBTOOL_INIT([
 # See if we are running on zsh, and set the options which allow our
@@ -634,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."
 
@@ -748,15 +753,12 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_XSI_SHELLFNS
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
 
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
+  _LT_PROG_REPLACE_SHELLFNS
 
-  mv -f "$cfgfile" "$ofile" ||
+   mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 ],
@@ -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
@@ -1073,30 +1117,41 @@
   fi
 ])
 
-# _LT_SYS_MODULE_PATH_AIX
-# -----------------------
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
 # Links a minimal program and checks the executable
 # for the system default hardcoded library path. In most cases,
 # this is /usr/lib:/lib, but when the MPI compilers are used
 # the location of the communication and MPI libs are included too.
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
 m4_defun([_LT_SYS_MODULE_PATH_AIX],
 [m4_require([_LT_DECL_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
 ])# _LT_SYS_MODULE_PATH_AIX
 
 
@@ -1121,7 +1176,7 @@
 
 AC_MSG_CHECKING([how to print strings])
 # Test print first, because it will be a builtin if present.
-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
    test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
   ECHO='print -r --'
 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
@@ -1165,6 +1220,39 @@
 ])# _LT_PROG_ECHO_BACKSLASH
 
 
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[  --with-sysroot[=DIR] Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([${with_sysroot}])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and in which our libraries should be installed.])])
+
 # _LT_ENABLE_LOCK
 # ---------------
 m4_defun([_LT_ENABLE_LOCK],
@@ -1286,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"
@@ -1311,14 +1412,47 @@
 ])# _LT_ENABLE_LOCK
 
 
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
 # _LT_CMD_OLD_ARCHIVE
 # -------------------
 m4_defun([_LT_CMD_OLD_ARCHIVE],
-[AC_CHECK_TOOL(AR, ar, false)
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1])
+[_LT_PROG_AR
 
 AC_CHECK_TOOL(STRIP, strip, :)
 test -z "$STRIP" && STRIP=:
@@ -1337,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
@@ -1523,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
@@ -1562,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
@@ -1658,10 +1797,10 @@
 /* When -fvisbility=hidden is used, assume the code has been annotated
    correspondingly for the symbols needed.  */
 #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-void fnord () __attribute__((visibility("default")));
+int fnord () __attribute__((visibility("default")));
 #endif
 
-void fnord () { int i=42; }
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -2108,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
 
@@ -2117,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
@@ -2182,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'
@@ -2201,8 +2340,9 @@
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -2235,13 +2375,71 @@
       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
+    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -2262,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'
@@ -2270,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.
@@ -2281,7 +2475,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -2299,7 +2493,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2319,17 +2513,18 @@
   ;;
 
 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}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 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"
@@ -2390,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}'
@@ -2406,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 ;;
@@ -2443,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}'
@@ -2520,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
@@ -2589,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}'
@@ -2614,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
@@ -2638,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
@@ -2669,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}'
@@ -2679,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
@@ -2957,6 +3152,11 @@
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
   darwin*)
     if test "$GCC" = yes; then
       reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -3096,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
   ;;
@@ -3175,6 +3375,21 @@
   ;;
 esac
 ])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -3182,7 +3397,11 @@
 _LT_DECL([], [deplibs_check_method], [1],
     [Method to check whether dependent libraries are shared objects])
 _LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method == "file_magic"])
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
 ])# _LT_CHECK_MAGIC_METHOD
 
 
@@ -3285,6 +3504,67 @@
 dnl AC_DEFUN([AM_PROG_NM], [])
 dnl AC_DEFUN([AC_PROG_NM], [])
 
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
 
 # LT_LIB_M
 # --------
@@ -3411,8 +3691,8 @@
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -3436,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};"\
@@ -3448,6 +3729,7 @@
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -3481,6 +3763,18 @@
       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -3492,7 +3786,7 @@
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
-const struct {
+LT@&t@_DLSYM_CONST struct {
   const char *name;
   void       *address;
 }
@@ -3518,15 +3812,15 @@
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
 	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
 	else
 	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
 	fi
@@ -3559,6 +3853,13 @@
   AC_MSG_RESULT(ok)
 fi
 
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
     [Take the output of nm and produce a listing of raw symbols and C names])
 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
@@ -3569,6 +3870,8 @@
 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
     [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
     [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
 ]) # _LT_CMD_GLOBAL_SYMBOLS
 
 
@@ -3580,7 +3883,6 @@
 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 _LT_TAGVAR(lt_prog_compiler_static, $1)=
 
-AC_MSG_CHECKING([for $compiler option to produce PIC])
 m4_if([$1], [CXX], [
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -3685,6 +3987,12 @@
 	  ;;
 	esac
 	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
       dgux*)
 	case $cc_basename in
 	  ec++*)
@@ -3993,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
@@ -4059,6 +4369,12 @@
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
 	;;
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -4079,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
@@ -4178,9 +4509,11 @@
     _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
     ;;
 esac
-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
 
 #
 # Check to make sure the PIC flag actually works.
@@ -4199,6 +4532,8 @@
 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
 	[Additional compiler flags for building library objects])
 
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
 #
 # Check to make sure the static flag actually works.
 #
@@ -4219,6 +4554,7 @@
 m4_defun([_LT_LINKER_SHLIBS],
 [AC_REQUIRE([LT_PATH_LD])dnl
 AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_EGREP])dnl
 m4_require([_LT_DECL_SED])dnl
@@ -4227,6 +4563,7 @@
 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 m4_if([$1], [CXX], [
   _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   case $host_os in
   aix[[4-9]]*)
     # If we're using GNU nm, then we don't want the "-C" option.
@@ -4241,18 +4578,25 @@
     ;;
   pw32*)
     _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
+    ;;
   cygwin* | mingw* | cegcc*)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  linux* | k*bsd*-gnu)
+    case $cc_basename in
+    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']
+      ;;
+    esac
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
     _LT_TAGVAR(link_all_deplibs, $1)=no
-  ;;
+    ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
+    ;;
   esac
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 ], [
   runpath_var=
   _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -4267,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
@@ -4312,7 +4655,7 @@
   openbsd*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu)
+  linux* | k*bsd*-gnu | gnu*)
     _LT_TAGVAR(link_all_deplibs, $1)=no
     ;;
   esac
@@ -4423,7 +4766,8 @@
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_TAGVAR(always_export_symbols, $1)=no
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _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'
+      _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']
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -4471,7 +4815,7 @@
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 	 && test "$tmp_diet" = no
       then
-	tmp_addflag=
+	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
@@ -4520,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~
@@ -4541,8 +4884,8 @@
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -4560,8 +4903,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -4607,8 +4950,8 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -4739,7 +5082,7 @@
 	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        _LT_SYS_MODULE_PATH_AIX
+        _LT_SYS_MODULE_PATH_AIX([$1])
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
         _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       else
@@ -4750,7 +5093,7 @@
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX
+	 _LT_SYS_MODULE_PATH_AIX([$1])
 	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
@@ -4794,20 +5137,64 @@
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# 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'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -4820,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
@@ -4836,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
@@ -4845,7 +5228,7 @@
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -4853,7 +5236,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -4869,13 +5252,12 @@
 
     hpux10*)
       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       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
@@ -4893,10 +5275,10 @@
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
@@ -4943,16 +5325,31 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        AC_LINK_IFELSE(int foo(void) {},
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-        )
-        LDFLAGS="$save_LDFLAGS"
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS="$save_LDFLAGS"])
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
       else
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
@@ -5037,7 +5434,7 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -5056,9 +5453,9 @@
       _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
@@ -5302,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],
@@ -5330,8 +5724,6 @@
     to runtime path list])
 _LT_TAGDECL([], [link_all_deplibs], [0],
     [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [fix_srcfile_path], [1],
-    [Fix the shell variable $srcfile for the compiler])
 _LT_TAGDECL([], [always_export_symbols], [0],
     [Set to "yes" if exported symbols are required])
 _LT_TAGDECL([], [export_symbols_cmds], [2],
@@ -5342,6 +5734,8 @@
     [Symbols that must always be exported])
 _LT_TAGDECL([], [prelink_cmds], [2],
     [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
 _LT_TAGDECL([], [file_list_spec], [1],
     [Specify filename containing input files])
 dnl FIXME: Not yet implemented
@@ -5443,6 +5837,7 @@
 m4_defun([_LT_LANG_CXX_CONFIG],
 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
 if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
     ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
     (test "X$CXX" != "Xg++"))) ; then
@@ -5461,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
@@ -5504,6 +5898,7 @@
 
   # Allow CC to be a program name with arguments.
   lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
   lt_save_LD=$LD
   lt_save_GCC=$GCC
   GCC=$GXX
@@ -5521,6 +5916,7 @@
   fi
   test -z "${LDCXX+set}" || LD=$LDCXX
   CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
   _LT_CC_BASENAME([$compiler])
@@ -5542,8 +5938,8 @@
       # Check if GNU C++ uses GNU ld as the underlying linker, since the
       # archiving commands below assume that GNU ld is being used.
       if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -5684,7 +6080,7 @@
           _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
           # Determine the default libpath from the value encoded in an empty
           # executable.
-          _LT_SYS_MODULE_PATH_AIX
+          _LT_SYS_MODULE_PATH_AIX([$1])
           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 
           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
@@ -5696,7 +6092,7 @@
           else
 	    # Determine the default libpath from the value encoded in an
 	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX
+	    _LT_SYS_MODULE_PATH_AIX([$1])
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 	    # Warning - without using the other run time loading flags,
 	    # -berok will link without error, but may produce a broken library.
@@ -5738,29 +6134,75 @@
         ;;
 
       cygwin* | mingw* | pw32* | cegcc*)
-        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-        # as there is no search path for DLLs.
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-        _LT_TAGVAR(always_export_symbols, $1)=no
-        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-          # If the export-symbols file already is a .def file (1st line
-          # is EXPORTS), use it as is; otherwise, prepend...
-          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    cp $export_symbols $output_objdir/$soname.def;
-          else
-	    echo EXPORTS > $output_objdir/$soname.def;
-	    cat $export_symbols >> $output_objdir/$soname.def;
-          fi~
-          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-        else
-          _LT_TAGVAR(ld_shlibs, $1)=no
-        fi
-        ;;
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # 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
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
       darwin* | rhapsody*)
         _LT_DARWIN_LINKER_FEATURES($1)
 	;;
@@ -5783,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
@@ -5835,7 +6277,7 @@
             ;;
           *)
             if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
             else
               # FIXME: insert proper C++ library support
               _LT_TAGVAR(ld_shlibs, $1)=no
@@ -5906,10 +6348,10 @@
 	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	        esac
 	      fi
@@ -5950,9 +6392,9 @@
           *)
 	    if test "$GXX" = yes; then
 	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
 	      fi
 	    fi
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6230,7 +6672,7 @@
 	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	      esac
 
@@ -6317,9 +6759,9 @@
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
@@ -6448,6 +6890,7 @@
   fi # test -n "$compiler"
 
   CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
   LDCXX=$LD
   LD=$lt_save_LD
   GCC=$lt_save_GCC
@@ -6462,6 +6905,29 @@
 ])# _LT_LANG_CXX_CONFIG
 
 
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
 # ---------------------------------
 # Figure out "hidden" library dependencies from verbose
@@ -6470,6 +6936,7 @@
 # objects, libraries and library flags.
 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
 # Dependencies to place before and after the object being linked:
 _LT_TAGVAR(predep_objects, $1)=
 _LT_TAGVAR(postdep_objects, $1)=
@@ -6519,7 +6986,20 @@
   }
 };
 _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
 dnl objects, libraries and library flags.
 if AC_TRY_EVAL(ac_compile); then
@@ -6531,7 +7011,7 @@
   pre_test_object_deps_done=no
 
   for p in `eval "$output_verbose_link_cmd"`; do
-    case $p in
+    case ${prev}${p} in
 
     -L* | -R* | -l*)
        # Some compilers place space between "-{L,R}" and the path.
@@ -6540,13 +7020,22 @@
           test $p = "-R"; then
 	 prev=$p
 	 continue
-       else
-	 prev=
        fi
 
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
        if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
+	 case ${prev} in
+	 -L | -R)
 	   # Internal compiler library paths should come after those
 	   # provided the user.  The postdeps already come after the
 	   # user supplied libs so there is no need to process them.
@@ -6566,8 +7055,10 @@
 	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
 	 fi
        fi
+       prev=
        ;;
 
+    *.lto.$objext) ;; # Ignore GCC LTO objects
     *.$objext)
        # This assumes that the test object file only shows up
        # once in the compiler output.
@@ -6603,6 +7094,7 @@
 fi
 
 $RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
 
 # PORTME: override above test on systems where it is broken
 m4_if([$1], [CXX],
@@ -6702,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
@@ -6752,7 +7243,9 @@
   # Allow CC to be a program name with arguments.
   lt_save_CC="$CC"
   lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
   CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
   _LT_CC_BASENAME([$compiler])
@@ -6806,6 +7299,7 @@
 
   GCC=$lt_save_GCC
   CC="$lt_save_CC"
+  CFLAGS="$lt_save_CFLAGS"
 fi # test "$_lt_disable_F77" != yes
 
 AC_LANG_POP
@@ -6832,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
@@ -6882,7 +7375,9 @@
   # Allow CC to be a program name with arguments.
   lt_save_CC="$CC"
   lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
   CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
   compiler=$CC
   GCC=$ac_cv_fc_compiler_gnu
 
@@ -6938,7 +7433,8 @@
   fi # test -n "$compiler"
 
   GCC=$lt_save_GCC
-  CC="$lt_save_CC"
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
 fi # test "$_lt_disable_FC" != yes
 
 AC_LANG_POP
@@ -6975,10 +7471,12 @@
 _LT_LINKER_BOILERPLATE
 
 # Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=yes
 CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
 _LT_TAGVAR(LD, $1)="$LD"
@@ -7009,10 +7507,82 @@
 AC_LANG_RESTORE
 
 GCC=$lt_save_GCC
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
 ])# _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
@@ -7044,9 +7614,11 @@
 
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
+lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=
 CC=${RC-"windres"}
+CFLAGS=
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
 _LT_CC_BASENAME([$compiler])
@@ -7059,7 +7631,8 @@
 
 GCC=$lt_save_GCC
 AC_LANG_RESTORE
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_RC_CONFIG
 
 
@@ -7079,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],
@@ -7118,6 +7698,15 @@
 AC_SUBST([OBJDUMP])
 ])
 
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
 
 # _LT_DECL_SED
 # ------------
@@ -7211,8 +7800,8 @@
 # Try some XSI features
 xsi_shell=no
 ( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
@@ -7251,206 +7840,162 @@
 ])# _LT_CHECK_SHELL_FEATURES
 
 
-# _LT_PROG_XSI_SHELLFNS
-# ---------------------
-# Bourne and XSI compatible variants of some useful shell functions.
-m4_defun([_LT_PROG_XSI_SHELLFNS],
-[case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $[*] ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-}
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
+m4_defun([_LT_PROG_FUNCTION_REPLACE],
+[dnl {
+sed -e '/^$1 ()$/,/^} # $1 /c\
+$1 ()\
+{\
+m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+])
 
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
 
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-  esac
-}
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
+# Replace existing portable implementations of several shell functions with
+# equivalent extended shell implementations where those features are available..
+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
+[if test x"$xsi_shell" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac
+    func_basename_result="${1##*/}"])
 
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
+  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary parameter first.
+    func_stripname_result=${3}
+    func_stripname_result=${func_stripname_result#"${1}"}
+    func_stripname_result=${func_stripname_result%"${2}"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+    func_split_long_opt_name=${1%%=*}
+    func_split_long_opt_arg=${1#*=}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
+    func_split_short_opt_arg=${1#??}
+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+    case ${1} in
+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+      *)    func_lo2o_result=${1} ;;
+    esac])
 
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
 
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
 
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
+fi
 
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$[@]"`
-}
+if test x"$lt_shell_append" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
 
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
+    func_quote_for_eval "${2}"
+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
 
-_LT_EOF
-esac
+if test x"$_lt_function_replace_fail" = x":"; then
+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
 
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]+=\$[2]"
-}
-_LT_EOF
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine which file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
     ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]=\$$[1]\$[2]"
-}
-
-_LT_EOF
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
     ;;
-  esac
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
 ])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
diff -Nru telepathy-salut-0.5.0/m4/ltoptions.m4 telepathy-salut-0.7.0/m4/ltoptions.m4
--- telepathy-salut-0.5.0/m4/ltoptions.m4	2011-05-03 12:15:08.000000000 +0000
+++ telepathy-salut-0.7.0/m4/ltoptions.m4	2011-11-16 10:10:11.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.5.0/m4/ltversion.m4 telepathy-salut-0.7.0/m4/ltversion.m4
--- telepathy-salut-0.5.0/m4/ltversion.m4	2011-05-03 12:15:08.000000000 +0000
+++ telepathy-salut-0.7.0/m4/ltversion.m4	2011-11-16 10:10:11.000000000 +0000
@@ -7,17 +7,17 @@
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# Generated from ltversion.in.
+# @configure_input@
 
-# serial 3175 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.2.10])
-m4_define([LT_PACKAGE_REVISION], [1.3175])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.10'
-macro_revision='1.3175'
+[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.5.0/m4/Makefile.in telepathy-salut-0.7.0/m4/Makefile.in
--- telepathy-salut-0.5.0/m4/Makefile.in	2011-05-03 13:29:17.000000000 +0000
+++ telepathy-salut-0.7.0/m4/Makefile.in	2011-11-16 10:27:30.000000000 +0000
@@ -85,6 +85,7 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -108,6 +109,8 @@
 GMODULE_LIBS = @GMODULE_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HTML_DIR = @HTML_DIR@
@@ -130,6 +133,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
 NM = @NM@
@@ -170,12 +174,12 @@
 VERSION = @VERSION@
 WOCKY_CFLAGS = @WOCKY_CFLAGS@
 WOCKY_LIBS = @WOCKY_LIBS@
-XMLDIFF = @XMLDIFF@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
diff -Nru telepathy-salut-0.5.0/Makefile.am telepathy-salut-0.7.0/Makefile.am
--- telepathy-salut-0.5.0/Makefile.am	2011-05-03 12:14:49.000000000 +0000
+++ telepathy-salut-0.7.0/Makefile.am	2011-07-25 13:18:17.000000000 +0000
@@ -4,13 +4,6 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-debug --enable-gtk-doc
 
-dist-hook:
-	chmod u+w ${distdir}/ChangeLog
-	if test -d ${top_srcdir}/.git; then \
-		git log --stat > ${distdir}/ChangeLog || \
-		git log > ${distdir}/ChangeLog; \
-	fi
-
 valgrind:
 	cd tests && $(MAKE) valgrind
 
@@ -21,3 +14,12 @@
 	cd tests && $(MAKE) forever
 
 include $(top_srcdir)/rules/lcov.mak
+
+# There doesn't seem to be a telepathy-salut-0.4.0 tag! :o
+CHANGELOG_RANGE = 22651d24..
+CHECK_FOR_UNRELEASED = \
+	$(srcdir)/NEWS \
+	$(wildcard $(srcdir)/salut/*.[ch]) \
+	$(wildcard $(srcdir)/src/*.[ch])
+
+include tools/telepathy.am
diff -Nru telepathy-salut-0.5.0/Makefile.in telepathy-salut-0.7.0/Makefile.in
--- telepathy-salut-0.5.0/Makefile.in	2011-05-03 13:29:18.000000000 +0000
+++ telepathy-salut-0.7.0/Makefile.in	2011-11-16 10:27:30.000000000 +0000
@@ -35,9 +35,10 @@
 host_triplet = @host@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure $(top_srcdir)/rules/lcov.mak AUTHORS \
-	COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
-	install-sh ltmain.sh missing
+	$(srcdir)/tools/telepathy.am $(top_srcdir)/configure \
+	$(top_srcdir)/rules/lcov.mak AUTHORS COPYING ChangeLog INSTALL \
+	NEWS config.guess config.sub depcomp install-sh ltmain.sh \
+	missing
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \
@@ -141,6 +142,7 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -164,6 +166,8 @@
 GMODULE_LIBS = @GMODULE_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HTML_DIR = @HTML_DIR@
@@ -186,6 +190,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
 NM = @NM@
@@ -226,12 +231,12 @@
 VERSION = @VERSION@
 WOCKY_CFLAGS = @WOCKY_CFLAGS@
 WOCKY_LIBS = @WOCKY_LIBS@
-XMLDIFF = @XMLDIFF@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -288,13 +293,21 @@
 SUBDIRS = tools extensions lib src data m4 tests docs plugins salut
 DISTCHECK_CONFIGURE_FLAGS = --disable-debug --enable-gtk-doc
 COVERAGE_DIR = coverage
+
+# There doesn't seem to be a telepathy-salut-0.4.0 tag! :o
+CHANGELOG_RANGE = 22651d24..
+CHECK_FOR_UNRELEASED = \
+	$(srcdir)/NEWS \
+	$(wildcard $(srcdir)/salut/*.[ch]) \
+	$(wildcard $(srcdir)/src/*.[ch])
+
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
 am--refresh:
 	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/rules/lcov.mak $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/rules/lcov.mak $(srcdir)/tools/telepathy.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -618,6 +631,7 @@
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcheck-hook \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
@@ -787,13 +801,6 @@
 	ps ps-am tags tags-recursive uninstall uninstall-am
 
 
-dist-hook:
-	chmod u+w ${distdir}/ChangeLog
-	if test -d ${top_srcdir}/.git; then \
-		git log --stat > ${distdir}/ChangeLog || \
-		git log > ${distdir}/ChangeLog; \
-	fi
-
 valgrind:
 	cd tests && $(MAKE) valgrind
 
@@ -828,6 +835,74 @@
 	@echo file://@abs_top_builddir@/$(COVERAGE_DIR)/index.html
 	@echo =================================================
 
+dist-hook:
+	chmod u+w ${distdir}/ChangeLog
+	if test -d ${top_srcdir}/.git; then \
+		git log --date=iso $(CHANGELOG_RANGE) > ${distdir}/ChangeLog; \
+	fi
+
+distcheck-hook:
+	@test "z$(CHECK_FOR_UNRELEASED)" = z || \
+	case @VERSION@ in \
+		*.*.*.*|*+) ;; \
+		*) \
+			if grep -r UNRELEASED $(CHECK_FOR_UNRELEASED); \
+			then \
+				echo "^^^ This is meant to be a release, but some files say UNRELEASED" >&2; \
+				exit 2; \
+			fi \
+			;; \
+	esac
+
+_is-release-check:
+	@case @VERSION@ in \
+		(*.*.*.*|*+) \
+			echo "Hey! @VERSION@ is not a release!" >&2; \
+			exit 2; \
+			;; \
+	esac
+	@if ! git diff --no-ext-diff --quiet --exit-code; then \
+		echo "Hey! Your tree is dirty! No release for you." >&2; \
+		exit 2; \
+	fi
+	@if ! git diff --cached --no-ext-diff --quiet --exit-code; then \
+		echo "Hey! You have changes staged! No release for you." >&2; \
+		exit 2; \
+	fi
+@ENABLE_GTK_DOC_FALSE@	@echo "Hey! You need to pass --enable-gtk-doc to configure!"
+@ENABLE_GTK_DOC_FALSE@	@exit 2;
+
+%.tar.gz.asc: %.tar.gz
+	$(AM_V_GEN)gpg --detach-sign --armor $@
+
+@PACKAGE@-@VERSION@.tar.gz: _is-release-check check distcheck
+
+maintainer-prepare-release: _is-release-check all distcheck release-mail
+	git tag -s @PACKAGE@-@VERSION@ -m @PACKAGE@' '@VERSION@
+	gpg --detach-sign --armor @PACKAGE@-@VERSION@.tar.gz
+
+release-mail: NEWS
+	$(AM_V_GEN)(python $(top_srcdir)/tools/make-release-mail.py \
+		@PACKAGE@ @VERSION@ $(top_srcdir)/NEWS > $@.tmp && \
+		mv $@.tmp $@)
+
+maintainer-upload-release: _maintainer-upload-release
+
+_maintainer-upload-release-check: _is-release-check
+	test -f @PACKAGE@-@VERSION@.tar.gz
+	test -f @PACKAGE@-@VERSION@.tar.gz.asc
+	gpg --verify @PACKAGE@-@VERSION@.tar.gz.asc
+
+_maintainer-upload-release: _maintainer-upload-release-check
+	rsync -vzP @PACKAGE@-@VERSION@.tar.gz telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz
+	rsync -vzP @PACKAGE@-@VERSION@.tar.gz.asc telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz.asc
+
+maintainer-make-release: maintainer-prepare-release maintainer-upload-release
+	@echo "Now:"
+	@echo " • bump the nano-version;"
+	@echo " • push the branch and tags upstream; and"
+	@echo " • send release-mail to ."
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Nru telepathy-salut-0.5.0/NEWS telepathy-salut-0.7.0/NEWS
--- telepathy-salut-0.5.0/NEWS	2011-05-03 13:28:34.000000000 +0000
+++ telepathy-salut-0.7.0/NEWS	2011-11-16 10:27:18.000000000 +0000
@@ -1,3 +1,87 @@
+telepathy-salut 0.7.0 (2011-11-16)
+==================================
+
+This is the start of a new development branch that will lead to 0.8
+in roughly 6 months.
+
+Enhancements:
+
+• fd.o#42348: the Chan.I.FileTransfer.Metadata interface has been
+  implemented. (jonny)
+
+• Updated Wocky:
+  · The SASL auth server test now builds with new and old versions of
+    libsasl2.
+
+telepathy-salut 0.6.0 (2011-10-18)
+==================================
+
+The “the cleaning lady… cleans up… dust. She dusts. And she has weekends
+off, so… Monday. Right?” release. Please enjoy this refreshing stable
+branch.
+
+Enhancements since 0.5.2:
+
+• Salut implements the ContactList interface, which makes
+  TP_CONNECTION_FEATURE_CONTACT_LIST in telepathy-glib work with Salut!
+  (xclaesse)
+
+Big changes since 0.4.0:
+
+• Salut now mostly uses the Wocky XMPP library.
+
+• Protocol, ContactCapabilities and (half of) ContactInfo are
+  implemented.
+
+• Salut has grown a plugin API, rather like Gabble's.
+
+telepathy-salut 0.5.2 (2011-10-05)
+==================================
+
+Enhancements:
+
+ • fd.o#40035: the ContactInfo Connection interface has been
+   implemented, so extra information about contacts, like first and
+   last names, are now exposed in a nice way and can be shown in
+   clients. (wjt)
+
+Fixes:
+
+ • Ensure OLPC tests are included in releases. (jonny)
+
+ • Fix send_ll_pep_event public utility function to construct PEP
+   messages correctly. (jonny)
+
+Dependencies:
+
+ • xmldiff is no longer required for tests.
+
+telepathy-salut 0.5.1 (2011-07-07)
+==================================
+
+The “nyanit.com is high up in the referrals list” release. This release
+fixes a crash triggered by recent versions of telepathy-glib, and a
+crash triggered by portscanning yourself.
+
+Enhancements:
+
+ • More bits and pieces of Gibber have been replaced by Wocky. (jonny)
+
+Fixes:
+
+ • Assumptions made about the default value of
+   TpChannelIface:handle-type (which changed in a recent telepathy-glib
+   release) are now less specific, fixing assertion failures. (jonny,
+   sjoerd)
+
+ • Salut no longer crashes if you 'nmap localhost'. (fd.o#39018, jonny)
+
+ • The tests now pass with telepathy-glib >= 0.14.6, which corrected a
+   longstanding bug in MembersChangedDetailed which saluttest.py was
+   relying on. The tests should still work with older versions, too.
+   (wjt)
+
+
 telepathy-salut 0.5.0 (2011-05-03)
 ==================================
 
diff -Nru telepathy-salut-0.5.0/plugins/Makefile.in telepathy-salut-0.7.0/plugins/Makefile.in
--- telepathy-salut-0.5.0/plugins/Makefile.in	2011-05-03 13:29:17.000000000 +0000
+++ telepathy-salut-0.7.0/plugins/Makefile.in	2011-11-16 10:27:30.000000000 +0000
@@ -143,6 +143,7 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -166,6 +167,8 @@
 GMODULE_LIBS = @GMODULE_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HTML_DIR = @HTML_DIR@
@@ -188,6 +191,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
 NM = @NM@
@@ -228,12 +232,12 @@
 VERSION = @VERSION@
 WOCKY_CFLAGS = @WOCKY_CFLAGS@
 WOCKY_LIBS = @WOCKY_LIBS@
-XMLDIFF = @XMLDIFF@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
diff -Nru telepathy-salut-0.5.0/salut/Makefile.in telepathy-salut-0.7.0/salut/Makefile.in
--- telepathy-salut-0.5.0/salut/Makefile.in	2011-05-03 13:29:17.000000000 +0000
+++ telepathy-salut-0.7.0/salut/Makefile.in	2011-11-16 10:27:30.000000000 +0000
@@ -120,6 +120,7 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -143,6 +144,8 @@
 GMODULE_LIBS = @GMODULE_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HTML_DIR = @HTML_DIR@
@@ -165,6 +168,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
 NM = @NM@
@@ -205,12 +209,12 @@
 VERSION = @VERSION@
 WOCKY_CFLAGS = @WOCKY_CFLAGS@
 WOCKY_LIBS = @WOCKY_LIBS@
-XMLDIFF = @XMLDIFF@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
diff -Nru telepathy-salut-0.5.0/src/avahi-contact.c telepathy-salut-0.7.0/src/avahi-contact.c
--- telepathy-salut-0.5.0/src/avahi-contact.c	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/avahi-contact.c	2011-09-07 14:05:38.000000000 +0000
@@ -586,46 +586,25 @@
 
 static void
 update_alias (SalutAvahiContact *self,
-              const gchar *nick,
-              const gchar *first,
-              const gchar *last)
+              const gchar *nick)
 {
-#define STREMPTY(x) (x == NULL || *x == '\0')
-
-  if (!STREMPTY(nick))
-    {
-      salut_contact_change_alias (SALUT_CONTACT (self), nick);
-      return;
-    }
-
-  if (!STREMPTY(first) && !STREMPTY(last))
-    {
-      gchar *s = g_strdup_printf ("%s %s", first, last);
-
-      salut_contact_change_alias (SALUT_CONTACT (self), s);
-
-      g_free (s);
-      return;
-    }
+  SalutContact *contact = SALUT_CONTACT (self);
 
-  if (!STREMPTY(first))
+  if (!tp_str_empty (nick))
     {
-      salut_contact_change_alias (SALUT_CONTACT (self), first);
+      salut_contact_change_alias (contact, nick);
       return;
     }
 
-  if (!STREMPTY(last))
+  if (!tp_str_empty (contact->full_name))
     {
-      salut_contact_change_alias (SALUT_CONTACT (self), last);
+      salut_contact_change_alias (contact, contact->full_name);
       return;
     }
 
-  salut_contact_change_alias (SALUT_CONTACT (self), NULL);
-
-#undef STREMPTY
+  salut_contact_change_alias (contact, NULL);
 }
 
-
 /* Returned string needs to be freed with avahi_free ! */
 static char *
 _avahi_txt_get_keyval_with_size (AvahiStringList *txt,
@@ -707,12 +686,14 @@
   salut_contact_change_status_message (contact, s);
   avahi_free (s);
 
-  /* nick */
+  /* real name and nick */
   nick = _avahi_txt_get_keyval (txt, "nick");
   first = _avahi_txt_get_keyval (txt, "1st");
   last = _avahi_txt_get_keyval (txt, "last");
 
-  update_alias (self, nick, first, last);
+  salut_contact_change_real_name (contact, first, last);
+  update_alias (self, nick);
+
   avahi_free (nick);
   avahi_free (first);
   avahi_free (last);
@@ -731,12 +712,17 @@
   salut_contact_change_avatar_token (contact, s);
   avahi_free (s);
 
+  /* email */
+  s = _avahi_txt_get_keyval (txt, "email");
+  salut_contact_change_email (contact, s);
+  avahi_free (s);
+
   /* jid */
-#ifdef ENABLE_OLPC
   s = _avahi_txt_get_keyval (txt, "jid");
   salut_contact_change_jid (contact, s);
   avahi_free (s);
 
+#ifdef ENABLE_OLPC
   /* OLPC color */
   s = _avahi_txt_get_keyval (txt, "olpc-color");
   salut_contact_change_olpc_color (contact, s);
diff -Nru telepathy-salut-0.5.0/src/avahi-contact-manager.c telepathy-salut-0.7.0/src/avahi-contact-manager.c
--- telepathy-salut-0.5.0/src/avahi-contact-manager.c	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/avahi-contact-manager.c	2011-10-27 13:00:05.000000000 +0000
@@ -212,6 +212,13 @@
   g_warning ("browser failed -> %s", error->message);
 }
 
+static void
+browser_all_for_now (GaServiceBrowser *browser,
+                     SalutAvahiContactManager *self)
+{
+  g_signal_emit_by_name (self, "all-for-now");
+}
+
 static gboolean
 salut_avahi_contact_manager_start (SalutContactManager *mgr,
                                    GError **error)
@@ -226,6 +233,8 @@
       G_CALLBACK (browser_removed), mgr);
   g_signal_connect (priv->presence_browser, "failure",
       G_CALLBACK (browser_failed), mgr);
+  g_signal_connect (priv->presence_browser, "all-for-now",
+      G_CALLBACK (browser_all_for_now), mgr);
 
   if (!ga_service_browser_attach (priv->presence_browser,
         priv->discovery_client->avahi_client, error))
@@ -278,6 +287,9 @@
       priv->discovery_client);
 
   priv->presence_browser = ga_service_browser_new ((gchar *) dnssd_name);
+
+  if (G_OBJECT_CLASS (salut_avahi_contact_manager_parent_class)->constructed)
+    G_OBJECT_CLASS (salut_avahi_contact_manager_parent_class)->constructed (object);
 }
 
 static void
diff -Nru telepathy-salut-0.5.0/src/avahi-muc-manager.c telepathy-salut-0.7.0/src/avahi-muc-manager.c
--- telepathy-salut-0.5.0/src/avahi-muc-manager.c	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/avahi-muc-manager.c	2011-05-09 12:46:34.000000000 +0000
@@ -28,9 +28,9 @@
 #include 
 #include 
 
+#include 
+
 #include 
-#include 
-#include 
 
 #include "muc-channel.h"
 #include "contact-manager.h"
diff -Nru telepathy-salut-0.5.0/src/avahi-roomlist-manager.c telepathy-salut-0.7.0/src/avahi-roomlist-manager.c
--- telepathy-salut-0.5.0/src/avahi-roomlist-manager.c	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/avahi-roomlist-manager.c	2011-05-09 12:46:34.000000000 +0000
@@ -28,9 +28,9 @@
 #include 
 #include 
 
+#include 
+
 #include 
-#include 
-#include 
 
 #include "contact-manager.h"
 #include "tubes-channel.h"
diff -Nru telepathy-salut-0.5.0/src/capabilities.c telepathy-salut-0.7.0/src/capabilities.c
--- telepathy-salut-0.5.0/src/capabilities.c	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/capabilities.c	2011-11-16 08:53:50.000000000 +0000
@@ -21,10 +21,12 @@
 #include "config.h"
 #include "capabilities.h"
 
-#include 
+#include 
 #include 
 #include 
 
+#include "namespaces.h"
+
 typedef struct _Feature Feature;
 
 struct _Feature
@@ -38,11 +40,11 @@
 
 static const Feature self_advertised_features[] =
 {
-  { FEATURE_FIXED, GIBBER_XMPP_NS_SI},
-  { FEATURE_FIXED, GIBBER_XMPP_NS_IBB},
-  { FEATURE_FIXED, GIBBER_TELEPATHY_NS_TUBES},
-  { FEATURE_FIXED, GIBBER_XMPP_NS_IQ_OOB},
-  { FEATURE_FIXED, GIBBER_XMPP_NS_X_OOB},
+  { FEATURE_FIXED, WOCKY_XMPP_NS_SI},
+  { FEATURE_FIXED, WOCKY_TELEPATHY_NS_TUBES},
+  { FEATURE_FIXED, WOCKY_XMPP_NS_IQ_OOB},
+  { FEATURE_FIXED, WOCKY_XMPP_NS_X_OOB},
+  { FEATURE_FIXED, NS_TP_FT_METADATA},
 
   { 0, NULL}
 };
diff -Nru telepathy-salut-0.5.0/src/capability-set.c telepathy-salut-0.7.0/src/capability-set.c
--- telepathy-salut-0.5.0/src/capability-set.c	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/capability-set.c	2011-11-16 08:53:50.000000000 +0000
@@ -57,10 +57,10 @@
   { FEATURE_FIXED, NS_NICK },
   { FEATURE_FIXED, NS_NICK "+notify" },
   { FEATURE_FIXED, NS_SI },
-  { FEATURE_FIXED, NS_IBB },
   { FEATURE_FIXED, NS_TUBES },
   { FEATURE_FIXED, NS_BYTESTREAMS },
   { FEATURE_OPTIONAL, NS_FILE_TRANSFER },
+  { FEATURE_OPTIONAL, NS_TP_FT_METADATA },
 
   { FEATURE_OPTIONAL, NS_GOOGLE_TRANSPORT_P2P },
   { FEATURE_OPTIONAL, NS_JINGLE_TRANSPORT_ICEUDP },
diff -Nru telepathy-salut-0.5.0/src/connection.c telepathy-salut-0.7.0/src/connection.c
--- telepathy-salut-0.5.0/src/connection.c	2011-05-03 08:40:39.000000000 +0000
+++ telepathy-salut-0.7.0/src/connection.c	2011-10-27 12:43:29.000000000 +0000
@@ -30,6 +30,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -40,19 +41,17 @@
 #include 
 #include 
 
-#include 
-
 #include 
 
+#include 
 #include 
 #include 
 #include 
 
-#include "capabilities.h"
 #include "avahi-discovery-client.h"
 #include "capabilities.h"
 #include "caps-hash.h"
-#include "contact-channel.h"
+#include "connection-contact-info.h"
 #include "contact.h"
 #include "contact-manager.h"
 #include "disco.h"
@@ -68,6 +67,7 @@
 #include "si-bytestream-manager.h"
 #include "tubes-manager.h"
 #include "util.h"
+#include "namespaces.h"
 
 #include "plugin-loader.h"
 
@@ -80,9 +80,6 @@
 #define DEBUG_FLAG DEBUG_CONNECTION
 #include "debug.h"
 
-#define SALUT_TP_ALIAS_PAIR_TYPE (dbus_g_type_get_struct ("GValueArray", \
-      G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID))
-
 #ifdef ENABLE_OLPC
 
 #define ACTIVITY_PAIR_TYPE \
@@ -125,6 +122,8 @@
        tp_dbus_properties_mixin_iface_init);
     G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACTS,
        tp_contacts_mixin_iface_init);
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST,
+      tp_base_contact_list_mixin_list_iface_init);
     G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE,
        tp_presence_mixin_simple_presence_iface_init);
     G_IMPLEMENT_INTERFACE(TP_TYPE_SVC_CONNECTION_INTERFACE_AVATARS,
@@ -132,6 +131,8 @@
     G_IMPLEMENT_INTERFACE
       (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES,
       salut_conn_contact_caps_iface_init);
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_INFO,
+        salut_conn_contact_info_iface_init);
     G_IMPLEMENT_INTERFACE (SALUT_TYPE_SVC_CONNECTION_FUTURE,
       salut_conn_future_iface_init);
 #ifdef ENABLE_OLPC
@@ -357,19 +358,11 @@
 sidecars_conn_status_changed_cb (SalutConnection *conn,
     guint status, guint reason, gpointer unused);
 
-static GObject *
-salut_connection_constructor (GType type,
-                              guint n_props,
-                              GObjectConstructParam *props)
+static void
+salut_connection_constructed (GObject *obj)
 {
-  GObject *obj;
-  SalutConnection *self;
-  SalutConnectionPrivate *priv;
-
-  obj = G_OBJECT_CLASS (salut_connection_parent_class)->
-           constructor (type, n_props, props);
-  self = SALUT_CONNECTION (obj);
-  priv = self->priv;
+  SalutConnection *self = (SalutConnection *) obj;
+  TpBaseConnection *base = (TpBaseConnection *) obj;
 
   self->disco = salut_disco_new (self);
   self->presence_cache = salut_presence_cache_new (self);
@@ -379,8 +372,9 @@
   tp_contacts_mixin_init (obj,
       G_STRUCT_OFFSET (SalutConnection, contacts_mixin));
 
-  tp_base_connection_register_with_contacts_mixin (TP_BASE_CONNECTION (obj));
+  tp_base_connection_register_with_contacts_mixin (base);
   tp_presence_mixin_simple_presence_register_with_contacts_mixin (obj);
+  tp_base_contact_list_mixin_register_with_contacts_mixin (base);
 
   tp_contacts_mixin_add_contact_attributes_iface (obj,
       TP_IFACE_CONNECTION_INTERFACE_AVATARS,
@@ -394,15 +388,18 @@
       TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES,
           conn_contact_capabilities_fill_contact_attributes);
 
-  priv->sidecars = g_hash_table_new_full (g_str_hash, g_str_equal,
+  self->priv->sidecars = g_hash_table_new_full (g_str_hash, g_str_equal,
       g_free, g_object_unref);
-  priv->pending_sidecars = g_hash_table_new_full (g_str_hash, g_str_equal,
+  self->priv->pending_sidecars = g_hash_table_new_full (g_str_hash, g_str_equal,
       g_free, (GDestroyNotify) g_list_free);
 
   g_signal_connect (self, "status-changed",
       (GCallback) sidecars_conn_status_changed_cb, NULL);
 
-  return obj;
+  salut_conn_contact_info_init (self);
+
+  if (G_OBJECT_CLASS (salut_connection_parent_class)->constructed)
+    G_OBJECT_CLASS (salut_connection_parent_class)->constructed (obj);
 }
 
 static void
@@ -721,6 +718,7 @@
   TP_IFACE_CONNECTION_INTERFACE_SIMPLE_PRESENCE,
   TP_IFACE_CONNECTION_INTERFACE_REQUESTS,
   TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES,
+  TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO,
   SALUT_IFACE_CONNECTION_FUTURE,
 #ifdef ENABLE_OLPC
   SALUT_IFACE_OLPC_BUDDY_INFO,
@@ -756,7 +754,7 @@
   g_type_class_add_private (salut_connection_class,
       sizeof (SalutConnectionPrivate));
 
-  object_class->constructor = salut_connection_constructor;
+  object_class->constructed = salut_connection_constructed;
 
   object_class->dispose = salut_connection_dispose;
   object_class->finalize = salut_connection_finalize;
@@ -789,6 +787,10 @@
   tp_contacts_mixin_class_init (object_class,
         G_STRUCT_OFFSET (SalutConnectionClass, contacts_mixin));
 
+  salut_conn_contact_info_class_init (salut_connection_class);
+
+  tp_base_contact_list_mixin_class_init (tp_connection_class);
+
   param_spec = g_param_spec_string ("nickname", "nickname",
       "Nickname used in the published data", NULL,
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
@@ -1057,13 +1059,13 @@
 
   caps_hash = caps_hash_compute_from_self_presence (priv->self);
 
-  ret = salut_self_set_caps (priv->self, GIBBER_TELEPATHY_NS_CAPS, "sha-1",
+  ret = salut_self_set_caps (priv->self, WOCKY_TELEPATHY_NS_CAPS, "sha-1",
         caps_hash, error);
 
   if (ret)
     {
       salut_presence_cache_learn_caps (self->presence_cache,
-          GIBBER_TELEPATHY_NS_CAPS, caps_hash, salut_self_get_caps (priv->self),
+          WOCKY_TELEPATHY_NS_CAPS, caps_hash, salut_self_get_caps (priv->self),
           wocky_xep_0115_capabilities_get_data_forms (WOCKY_XEP_0115_CAPABILITIES (priv->self)));
     }
 
@@ -1534,9 +1536,9 @@
   GPtrArray *aliases;
   GValue entry = {0, };
 
-  g_value_init (&entry, SALUT_TP_ALIAS_PAIR_TYPE);
+  g_value_init (&entry, TP_STRUCT_TYPE_ALIAS_PAIR);
   g_value_take_boxed (&entry,
-      dbus_g_type_specialized_construct (SALUT_TP_ALIAS_PAIR_TYPE));
+      dbus_g_type_specialized_construct (TP_STRUCT_TYPE_ALIAS_PAIR));
 
   dbus_g_type_struct_set (&entry,
       0, handle, 1, salut_contact_get_alias (contact), G_MAXUINT);
@@ -3215,7 +3217,7 @@
   muc_ready_ctx *ctx;
 
   props_node = wocky_node_get_child_ns (invite_node, "properties",
-      GIBBER_TELEPATHY_NS_OLPC_ACTIVITY_PROPS);
+      NS_OLPC_ACTIVITY_PROPS);
 
   if (props_node == NULL)
     return;
@@ -3326,21 +3328,11 @@
 salut_connection_create_handle_repos (TpBaseConnection *self,
     TpHandleRepoIface *repos[NUM_TP_HANDLE_TYPES])
 {
-  static const char *list_handle_strings[] = {
-    "publish",
-    "subscribe",
-    "known",
-    NULL
-  };
-
   repos[TP_HANDLE_TYPE_CONTACT] = tp_dynamic_handle_repo_new
       (TP_HANDLE_TYPE_CONTACT, handle_normalize_require_nonempty, NULL);
 
   repos[TP_HANDLE_TYPE_ROOM] = tp_dynamic_handle_repo_new
       (TP_HANDLE_TYPE_ROOM, handle_normalize_require_nonempty, NULL);
-
-  repos[TP_HANDLE_TYPE_LIST] = tp_static_handle_repo_new (TP_HANDLE_TYPE_LIST,
-      list_handle_strings);
 }
 
 static void
@@ -3369,6 +3361,14 @@
       _contact_manager_contact_avatar_changed (self, contact, handle);
     }
 
+  if (changes & ( SALUT_CONTACT_REAL_NAME_CHANGED
+                | SALUT_CONTACT_EMAIL_CHANGED
+                | SALUT_CONTACT_JID_CHANGED
+                ))
+    {
+      salut_conn_contact_info_changed (self, contact, handle);
+    }
+
 #ifdef ENABLE_OLPC
   if (changes & SALUT_CONTACT_OLPC_PROPERTIES)
     _contact_manager_contact_olpc_properties_changed (self, contact, handle);
@@ -3410,7 +3410,7 @@
   SalutOlpcActivity *activity;
 
   props_node = wocky_node_get_child_ns (node, "properties",
-      GIBBER_TELEPATHY_NS_OLPC_ACTIVITY_PROPS);
+      NS_OLPC_ACTIVITY_PROPS);
 
   if (props_node == NULL)
     return FALSE;
@@ -3456,7 +3456,7 @@
   SalutContact *contact = SALUT_CONTACT (wocky_stanza_get_from_contact (stanza));
 
   node = wocky_node_get_child_ns (top_node, "uninvite",
-        GIBBER_TELEPATHY_NS_OLPC_ACTIVITY_PROPS);
+        NS_OLPC_ACTIVITY_PROPS);
   g_assert (node != NULL);
 
   room = wocky_node_get_attribute (node, "room");
@@ -3515,7 +3515,7 @@
       WOCKY_PORTER_HANDLER_PRIORITY_NORMAL,
       uninvite_stanza_callback, self,
       '(', "uninvite",
-        ':', GIBBER_TELEPATHY_NS_OLPC_ACTIVITY_PROPS,
+        ':', NS_OLPC_ACTIVITY_PROPS,
       ')', NULL);
 
   /* create the OLPC activity manager */
diff -Nru telepathy-salut-0.5.0/src/connection-contact-info.c telepathy-salut-0.7.0/src/connection-contact-info.c
--- telepathy-salut-0.5.0/src/connection-contact-info.c	1970-01-01 00:00:00.000000000 +0000
+++ telepathy-salut-0.7.0/src/connection-contact-info.c	2011-09-07 14:05:38.000000000 +0000
@@ -0,0 +1,375 @@
+/*
+ * connection-contact-info.c - ContactInfo implementation
+ * Copyright © 2011 Collabora Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "connection-contact-info.h"
+
+#include 
+/* Slightly sketchy; included for TpContactInfoFieldSpec. */
+#include 
+#include 
+
+#include "contact-manager.h"
+
+enum {
+    PROP_CONTACT_INFO_FLAGS,
+    PROP_SUPPORTED_FIELDS
+};
+
+static gchar *i_heart_the_internet[] = { "type=internet", NULL };
+
+static GPtrArray *
+get_supported_fields (void)
+{
+  static TpContactInfoFieldSpec supported_fields[] = {
+      /* We omit 'nickname' because it shows up, unmodifiably, as the alias. */
+      { "n", NULL,
+        TP_CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT, 1 },
+      /* It's a little bit sketchy to expose 1st + ' ' + last as FN. But such
+       * are the limitations of the protocol.
+       */
+      { "fn", NULL,
+        TP_CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT, 1 },
+      { "email", i_heart_the_internet,
+        TP_CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT, 1 },
+      /* x-jabber is used for compatibility with Gabble */
+      { "x-jabber", NULL,
+        TP_CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT, 1 },
+      /* Heh, we could also include the contact's IP address(es) here. */
+      { NULL }
+  };
+  static gsize supported_fields_ptr_array = 0;
+
+  if (g_once_init_enter (&supported_fields_ptr_array))
+    {
+      GPtrArray *fields = dbus_g_type_specialized_construct (
+          TP_ARRAY_TYPE_FIELD_SPECS);
+      TpContactInfoFieldSpec *spec;
+
+      for (spec = supported_fields; spec->name != NULL; spec++)
+        g_ptr_array_add (fields,
+            tp_value_array_build (4,
+                G_TYPE_STRING, spec->name,
+                G_TYPE_STRV, spec->parameters,
+                G_TYPE_UINT, spec->flags,
+                G_TYPE_UINT, spec->max,
+                G_TYPE_INVALID));
+
+      g_once_init_leave (&supported_fields_ptr_array, (gsize) fields);
+    }
+
+  return (GPtrArray *) supported_fields_ptr_array;
+}
+
+static void
+salut_conn_contact_info_get_property (
+    GObject *object,
+    GQuark iface,
+    GQuark name,
+    GValue *value,
+    gpointer getter_data)
+{
+  switch (GPOINTER_TO_UINT (getter_data))
+    {
+    case PROP_CONTACT_INFO_FLAGS:
+      g_value_set_uint (value, TP_CONTACT_INFO_FLAG_PUSH);
+      break;
+    case PROP_SUPPORTED_FIELDS:
+      g_value_set_boxed (value, get_supported_fields ());
+      break;
+    default:
+      g_assert_not_reached ();
+    }
+}
+
+void
+salut_conn_contact_info_class_init (
+    SalutConnectionClass *klass)
+{
+  static TpDBusPropertiesMixinPropImpl props[] = {
+      { "ContactInfoFlags", GUINT_TO_POINTER (PROP_CONTACT_INFO_FLAGS), NULL },
+      { "SupportedFields", GUINT_TO_POINTER (PROP_SUPPORTED_FIELDS), NULL },
+      { NULL }
+  };
+
+  tp_dbus_properties_mixin_implement_interface (
+      G_OBJECT_CLASS (klass),
+      TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO,
+      salut_conn_contact_info_get_property,
+      NULL,
+      props);
+}
+
+static void
+add_singleton_field (
+    GPtrArray *contact_info,
+    const gchar *field_name,
+    gchar **parameters,
+    const gchar *value)
+{
+  const gchar *field_value[] = { value, NULL };
+
+  g_ptr_array_add (contact_info,
+      tp_value_array_build (3,
+          G_TYPE_STRING, field_name,
+          G_TYPE_STRV, parameters,
+          G_TYPE_STRV, field_value,
+          G_TYPE_INVALID));
+}
+
+static GPtrArray *
+build_contact_info (
+    const gchar *first,
+    const gchar *last,
+    const gchar *full_name,
+    const gchar *email,
+    const gchar *jid)
+{
+  GPtrArray *contact_info = dbus_g_type_specialized_construct (
+      TP_ARRAY_TYPE_CONTACT_INFO_FIELD_LIST);
+
+  if (first != NULL || last != NULL)
+    {
+      const gchar *field_value[] = {
+          last != NULL ? last : "",
+          first != NULL ? first : "",
+          "",
+          "",
+          "",
+          NULL
+      };
+
+      g_ptr_array_add (contact_info,
+          tp_value_array_build (3,
+              G_TYPE_STRING, "n",
+              G_TYPE_STRV, NULL,
+              G_TYPE_STRV, field_value,
+              G_TYPE_INVALID));
+
+      g_warn_if_fail (full_name != NULL);
+      add_singleton_field (contact_info, "fn", NULL, full_name);
+    }
+
+  if (email != NULL)
+    add_singleton_field (contact_info, "email", i_heart_the_internet, email);
+
+  if (jid != NULL)
+    add_singleton_field (contact_info, "x-jabber", NULL, jid);
+
+  return contact_info;
+}
+
+static GPtrArray *
+build_contact_info_for_contact (
+    SalutContact *contact)
+{
+  g_return_val_if_fail (contact != NULL, NULL);
+
+  return build_contact_info (contact->first, contact->last, contact->full_name,
+      contact->email, contact->jid);
+}
+
+static void
+salut_conn_contact_info_fill_contact_attributes (
+    GObject *obj,
+    const GArray *contacts,
+    GHashTable *attributes_hash)
+{
+  guint i;
+  SalutConnection *self = SALUT_CONNECTION (obj);
+  TpBaseConnection *base = TP_BASE_CONNECTION (self);
+  SalutContactManager *contact_manager;
+
+  g_object_get (self, "contact-manager", &contact_manager, NULL);
+
+  for (i = 0; i < contacts->len; i++)
+    {
+      TpHandle handle = g_array_index (contacts, TpHandle, i);
+      GPtrArray *contact_info = NULL;
+
+      if (base->self_handle == handle)
+        {
+          /* TODO: dig contact info out of SalutSelf. There's overlap with
+           * connection parameters here … should they be DBus_Property
+           * parameters? Should we have a new flag which means “you set this on
+           * ContactInfo”? What?
+           */
+        }
+      else
+        {
+          SalutContact *contact = salut_contact_manager_get_contact (
+              contact_manager, handle);
+          if (contact != NULL)
+            {
+              contact_info = build_contact_info_for_contact (contact);
+              g_object_unref (contact);
+            }
+        }
+
+      if (contact_info != NULL)
+        tp_contacts_mixin_set_contact_attribute (attributes_hash,
+            handle, TP_TOKEN_CONNECTION_INTERFACE_CONTACT_INFO_INFO,
+            tp_g_value_slice_new_take_boxed (
+                TP_ARRAY_TYPE_CONTACT_INFO_FIELD_LIST, contact_info));
+    }
+
+  g_object_unref (contact_manager);
+}
+
+void salut_conn_contact_info_init (
+    SalutConnection *self)
+{
+  tp_contacts_mixin_add_contact_attributes_iface (
+      G_OBJECT (self),
+      TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO,
+      salut_conn_contact_info_fill_contact_attributes);
+}
+
+void
+salut_conn_contact_info_changed (
+    SalutConnection *self,
+    SalutContact *contact,
+    TpHandle handle)
+{
+  GPtrArray *contact_info = build_contact_info_for_contact (contact);
+
+  tp_svc_connection_interface_contact_info_emit_contact_info_changed (self,
+      handle, contact_info);
+  g_boxed_free (TP_ARRAY_TYPE_CONTACT_INFO_FIELD_LIST, contact_info);
+}
+
+static void
+salut_conn_contact_info_get_contact_info (
+    TpSvcConnectionInterfaceContactInfo *iface,
+    const GArray *contacts,
+    DBusGMethodInvocation *context)
+{
+  SalutConnection *self = SALUT_CONNECTION (iface);
+  TpBaseConnection *base = (TpBaseConnection *) self;
+  TpHandleRepoIface *contacts_repo =
+      tp_base_connection_get_handles (base, TP_HANDLE_TYPE_CONTACT);
+  SalutContactManager *contact_manager;
+  guint i;
+  GHashTable *ret;
+  GError *error = NULL;
+
+  TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED (TP_BASE_CONNECTION (iface),
+      context);
+
+  if (!tp_handles_are_valid (contacts_repo, contacts, FALSE, &error))
+    {
+      dbus_g_method_return_error (context, error);
+      g_error_free (error);
+      return;
+    }
+
+  g_object_get (self, "contact-manager", &contact_manager, NULL);
+  ret = dbus_g_type_specialized_construct (TP_HASH_TYPE_CONTACT_INFO_MAP);
+
+  for (i = 0; i < contacts->len; i++)
+    {
+      TpHandle handle = g_array_index (contacts, TpHandle, i);
+      SalutContact *contact = salut_contact_manager_get_contact (
+          contact_manager, handle);
+
+      if (contact != NULL)
+        {
+          g_hash_table_insert (ret, GUINT_TO_POINTER (handle),
+              build_contact_info_for_contact (contact));
+          g_object_unref (contact);
+        }
+    }
+
+  tp_svc_connection_interface_contact_info_return_from_get_contact_info (
+      context, ret);
+  g_boxed_free (TP_HASH_TYPE_CONTACT_INFO_MAP, ret);
+  g_object_unref (contact_manager);
+}
+
+static void
+salut_conn_contact_info_request_contact_info (
+    TpSvcConnectionInterfaceContactInfo *iface,
+    guint handle,
+    DBusGMethodInvocation *context)
+{
+  SalutConnection *self = SALUT_CONNECTION (iface);
+  TpBaseConnection *base = (TpBaseConnection *) self;
+  TpHandleRepoIface *contacts_repo =
+      tp_base_connection_get_handles (base, TP_HANDLE_TYPE_CONTACT);
+  GError *error = NULL;
+
+  TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED (TP_BASE_CONNECTION (iface),
+      context);
+
+  if (!tp_handle_is_valid (contacts_repo, handle, &error))
+    {
+      dbus_g_method_return_error (context, error);
+      g_error_free (error);
+    }
+  else
+    {
+      SalutContactManager *contact_manager;
+      SalutContact *contact;
+
+      g_object_get (self, "contact-manager", &contact_manager, NULL);
+      contact = salut_contact_manager_get_contact (contact_manager, handle);
+      g_object_unref (contact_manager);
+
+      if (contact != NULL)
+        {
+          GPtrArray *contact_info = build_contact_info_for_contact (contact);
+
+          tp_svc_connection_interface_contact_info_return_from_request_contact_info (
+              context, contact_info);
+          g_boxed_free (TP_ARRAY_TYPE_CONTACT_INFO_FIELD_LIST, contact_info);
+        }
+      else
+        {
+          error = g_error_new (TP_ERRORS, TP_ERROR_NOT_AVAILABLE,
+              "No information available for '%s'",
+              tp_handle_inspect (contacts_repo, handle));
+          dbus_g_method_return_error (context, error);
+          g_error_free (error);
+        }
+    }
+}
+
+static void
+salut_conn_contact_info_refresh_contact_info (
+    TpSvcConnectionInterfaceContactInfo *iface,
+    const GArray *contacts,
+    DBusGMethodInvocation *context)
+{
+  /* This is a no-op on link-local XMPP: everything's always pushed to us. */
+  tp_svc_connection_interface_contact_info_return_from_refresh_contact_info (context);
+}
+
+void
+salut_conn_contact_info_iface_init (
+    gpointer g_iface,
+    gpointer iface_data)
+{
+  TpSvcConnectionInterfaceContactInfoClass *klass = g_iface;
+
+#define IMPLEMENT(x) tp_svc_connection_interface_contact_info_implement_##x \
+    (klass, salut_conn_contact_info_##x)
+  IMPLEMENT (get_contact_info);
+  IMPLEMENT (request_contact_info);
+  IMPLEMENT (refresh_contact_info);
+#undef IMPLEMENT
+}
diff -Nru telepathy-salut-0.5.0/src/connection-contact-info.h telepathy-salut-0.7.0/src/connection-contact-info.h
--- telepathy-salut-0.5.0/src/connection-contact-info.h	1970-01-01 00:00:00.000000000 +0000
+++ telepathy-salut-0.7.0/src/connection-contact-info.h	2011-09-07 14:05:38.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+ * connection-contact-info.h - header for ContactInfo implementation
+ * Copyright © 2011 Collabora Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#ifndef SALUT_CONNECTION_CONTACT_INFO_H
+#define SALUT_CONNECTION_CONTACT_INFO_H
+
+#include "connection.h"
+#include "contact.h"
+
+void salut_conn_contact_info_iface_init (
+    gpointer g_iface,
+    gpointer iface_data);
+void salut_conn_contact_info_class_init (
+    SalutConnectionClass *klass);
+void salut_conn_contact_info_init (
+    SalutConnection *self);
+
+void salut_conn_contact_info_changed (
+    SalutConnection *self,
+    SalutContact *contact,
+    TpHandle handle);
+
+#endif // SALUT_CONNECTION_CONTACT_INFO_H
diff -Nru telepathy-salut-0.5.0/src/contact.c telepathy-salut-0.7.0/src/contact.c
--- telepathy-salut-0.5.0/src/contact.c	2011-05-03 11:19:13.000000000 +0000
+++ telepathy-salut-0.7.0/src/contact.c	2011-09-07 14:05:38.000000000 +0000
@@ -341,6 +341,10 @@
   g_free (self->status_message);
   g_free (priv->alias);
   g_free (self->avatar_token);
+  g_free (self->first);
+  g_free (self->last);
+  g_free (self->full_name);
+  g_free (self->email);
   g_free (self->jid);
 
 #ifdef ENABLE_OLPC
@@ -524,6 +528,40 @@
 }
 
 void
+salut_contact_change_real_name (
+    SalutContact *self,
+    const gchar *first,
+    const gchar *last)
+{
+  if (tp_str_empty (first))
+    first = NULL;
+
+  if (tp_str_empty (last))
+    last = NULL;
+
+  if (tp_strdiff (self->first, first) || tp_strdiff (self->last, last))
+    {
+      g_free (self->first);
+      self->first = g_strdup (first);
+      g_free (self->last);
+      self->last = g_strdup (last);
+
+      g_free (self->full_name);
+
+      if (first != NULL && last != NULL)
+        self->full_name = g_strdup_printf ("%s %s", first, last);
+      else if (first != NULL)
+        self->full_name = g_strdup (first);
+      else if (last != NULL)
+        self->full_name = g_strdup (last);
+      else
+        self->full_name = NULL;
+
+      salut_contact_change (self, SALUT_CONTACT_REAL_NAME_CHANGED);
+    }
+}
+
+void
 salut_contact_change_alias (SalutContact *self, const gchar *alias)
 {
   SalutContactPrivate *priv = self->priv;
@@ -570,15 +608,35 @@
 }
 
 void
+salut_contact_change_email (SalutContact *self, gchar *email)
+{
+  if (tp_str_empty (email))
+    email = NULL;
+
+  if (tp_strdiff (self->email, email))
+    {
+      g_free (self->email);
+      self->email = g_strdup (email);
+      salut_contact_change (self, SALUT_CONTACT_EMAIL_CHANGED);
+    }
+}
+
+void
 salut_contact_change_jid (SalutContact *self, gchar *jid)
 {
+  if (tp_str_empty (jid))
+    jid = NULL;
+
   if (tp_strdiff (self->jid, jid))
     {
       g_free (self->jid);
       self->jid = g_strdup (jid);
+      salut_contact_change (self,
+          SALUT_CONTACT_JID_CHANGED
 #ifdef ENABLE_OLPC
-      salut_contact_change (self, SALUT_CONTACT_OLPC_PROPERTIES);
+        | SALUT_CONTACT_OLPC_PROPERTIES
 #endif
+          );
     }
 }
 
diff -Nru telepathy-salut-0.5.0/src/contact-channel.c telepathy-salut-0.7.0/src/contact-channel.c
--- telepathy-salut-0.5.0/src/contact-channel.c	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/contact-channel.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,443 +0,0 @@
-/*
- * contact-channel.c - Source for SalutContactChannel
- * Copyright (C) 2005-2008 Collabora Ltd.
- * Copyright (C) 2005-2008 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "contact-channel.h"
-
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "connection.h"
-
-static void
-channel_iface_init (gpointer g_iface, gpointer iface_data);
-
-G_DEFINE_TYPE_WITH_CODE(SalutContactChannel, salut_contact_channel,
-  G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
-      tp_dbus_properties_mixin_iface_init);
-  G_IMPLEMENT_INTERFACE (TP_TYPE_CHANNEL_IFACE, NULL);
-  G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL, channel_iface_init);
-  G_IMPLEMENT_INTERFACE (TP_TYPE_EXPORTABLE_CHANNEL, NULL);
-  G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP,
-      tp_group_mixin_iface_init);
-  G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_LIST, NULL);
-)
-
-static const gchar *salut_contact_channel_interfaces[] = {
-    TP_IFACE_CHANNEL_INTERFACE_GROUP,
-    NULL
-};
-
-/* properties */
-enum
-{
-  PROP_OBJECT_PATH = 1,
-  PROP_CHANNEL_TYPE,
-  PROP_HANDLE_TYPE,
-  PROP_HANDLE,
-  PROP_CONNECTION,
-  PROP_INTERFACES,
-  PROP_TARGET_ID,
-  PROP_CHANNEL_PROPERTIES,
-  PROP_CHANNEL_DESTROYED,
-  PROP_INITIATOR_HANDLE,
-  PROP_INITIATOR_ID,
-  PROP_REQUESTED,
-  LAST_PROPERTY
-};
-
-/* private structure */
-typedef struct _SalutContactChannelPrivate SalutContactChannelPrivate;
-
-struct _SalutContactChannelPrivate
-{
-  SalutConnection *conn;
-  gchar *object_path;
-  TpHandle handle;
-  gboolean requested;
-  gboolean dispose_has_run;
-};
-
-#define SALUT_CONTACT_CHANNEL_GET_PRIVATE(o)     (G_TYPE_INSTANCE_GET_PRIVATE ((o), SALUT_TYPE_CONTACT_CHANNEL, SalutContactChannelPrivate))
-
-static void
-salut_contact_channel_init (SalutContactChannel *obj)
-{
-  SalutContactChannelPrivate *priv = SALUT_CONTACT_CHANNEL_GET_PRIVATE (obj);
-
-  /* allocate any data required by the object here */
-  priv->object_path = NULL;
-}
-
-static GObject *
-salut_contact_channel_constructor (GType type, guint n_props,
-                                   GObjectConstructParam *props)
-{
-  GObject *obj;
-  TpDBusDaemon *bus;
-  SalutContactChannelPrivate *priv;
-  TpHandleRepoIface *handle_repo;
-  TpHandleRepoIface *contact_repo;
-  TpBaseConnection *base_conn;
-
-  /* Parent constructor chain */
-  obj = G_OBJECT_CLASS(salut_contact_channel_parent_class)->
-        constructor (type, n_props, props);
-
-  priv = SALUT_CONTACT_CHANNEL_GET_PRIVATE (SALUT_CONTACT_CHANNEL (obj));
-
-  /* Connect to the bus */
-  base_conn = TP_BASE_CONNECTION (priv->conn);
-  bus = tp_base_connection_get_dbus_daemon (base_conn);
-  tp_dbus_daemon_register_object (bus, priv->object_path, obj);
-
-  /* Ref our handle */
-  handle_repo = tp_base_connection_get_handles (base_conn,
-      TP_HANDLE_TYPE_LIST);
-  contact_repo = tp_base_connection_get_handles (base_conn,
-      TP_HANDLE_TYPE_CONTACT);
-
-  tp_handle_ref (handle_repo, priv->handle);
-
-  /* Impossible to add/remove/rescind on any of our lists */
-  tp_group_mixin_init (obj,
-      G_STRUCT_OFFSET (SalutContactChannel, group),
-      contact_repo, base_conn->self_handle);
-
-  tp_group_mixin_change_flags (obj, TP_CHANNEL_GROUP_FLAG_PROPERTIES, 0);
-  return obj;
-}
-
-static void salut_contact_channel_dispose (GObject *object);
-static void salut_contact_channel_finalize (GObject *object);
-
-static void
-salut_contact_channel_get_property (GObject    *object,
-                                    guint       property_id,
-                                    GValue     *value,
-                                    GParamSpec *pspec)
-{
-  SalutContactChannel *chan = SALUT_CONTACT_CHANNEL (object);
-  SalutContactChannelPrivate *priv = SALUT_CONTACT_CHANNEL_GET_PRIVATE (chan);
-
-  switch (property_id) {
-    case PROP_OBJECT_PATH:
-      g_value_set_string (value, priv->object_path);
-      break;
-    case PROP_CHANNEL_TYPE:
-      g_value_set_static_string (value, TP_IFACE_CHANNEL_TYPE_CONTACT_LIST);
-      break;
-    case PROP_HANDLE_TYPE:
-      g_value_set_uint (value, TP_HANDLE_TYPE_LIST);
-      break;
-    case PROP_HANDLE:
-      g_value_set_uint (value, priv->handle);
-      break;
-    case PROP_CONNECTION:
-      g_value_set_object (value, priv->conn);
-      break;
-      case PROP_INTERFACES:
-        g_value_set_static_boxed (value, salut_contact_channel_interfaces);
-        break;
-    case PROP_TARGET_ID:
-      {
-         TpHandleRepoIface *repo = tp_base_connection_get_handles (
-           (TpBaseConnection *) priv->conn, TP_HANDLE_TYPE_LIST);
-
-         g_value_set_string (value, tp_handle_inspect (repo, priv->handle));
-      }
-      break;
-    case PROP_CHANNEL_PROPERTIES:
-      g_value_take_boxed (value,
-          tp_dbus_properties_mixin_make_properties_hash (object,
-              TP_IFACE_CHANNEL, "TargetHandle",
-              TP_IFACE_CHANNEL, "TargetHandleType",
-              TP_IFACE_CHANNEL, "ChannelType",
-              TP_IFACE_CHANNEL, "TargetID",
-              TP_IFACE_CHANNEL, "InitiatorHandle",
-              TP_IFACE_CHANNEL, "InitiatorID",
-              TP_IFACE_CHANNEL, "Requested",
-              TP_IFACE_CHANNEL, "Interfaces",
-              NULL));
-      break;
-    case PROP_CHANNEL_DESTROYED:
-      g_value_set_boolean (value, TRUE);
-      break;
-    case PROP_INITIATOR_HANDLE:
-      g_value_set_uint (value, 0);
-      break;
-    case PROP_INITIATOR_ID:
-      g_value_set_static_string (value, "");
-      break;
-    case PROP_REQUESTED:
-      g_value_set_boolean (value, priv->requested);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-  }
-}
-
-
-static void
-salut_contact_channel_set_property (GObject     *object,
-                                    guint        property_id,
-                                    const GValue *value,
-                                    GParamSpec   *pspec)
-{
-  SalutContactChannel *chan = SALUT_CONTACT_CHANNEL (object);
-  SalutContactChannelPrivate *priv = SALUT_CONTACT_CHANNEL_GET_PRIVATE (chan);
-  const gchar *tmp;
-
-  switch (property_id) {
-    case PROP_OBJECT_PATH:
-      g_free (priv->object_path);
-      priv->object_path = g_value_dup_string (value);
-      break;
-    case PROP_HANDLE:
-      priv->handle = g_value_get_uint (value);
-      break;
-    case PROP_CONNECTION:
-      priv->conn = g_value_get_object (value);
-      break;
-    case PROP_HANDLE_TYPE:
-      g_assert (g_value_get_uint (value) == 0
-               || g_value_get_uint (value) == TP_HANDLE_TYPE_LIST);
-      break;
-    case PROP_CHANNEL_TYPE:
-      tmp = g_value_get_string (value);
-      g_assert (tmp == NULL
-               || !tp_strdiff (g_value_get_string (value),
-                       TP_IFACE_CHANNEL_TYPE_CONTACT_LIST));
-      break;
-    case PROP_REQUESTED:
-      priv->requested = g_value_get_boolean (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-  }
-}
-
-static void
-salut_contact_channel_class_init (SalutContactChannelClass *salut_contact_channel_class)
-{
-  static TpDBusPropertiesMixinPropImpl channel_props[] = {
-      { "TargetHandleType", "handle-type", NULL },
-      { "TargetHandle", "handle", NULL },
-      { "TargetID", "target-id", NULL },
-      { "ChannelType", "channel-type", NULL },
-      { "Interfaces", "interfaces", NULL },
-      { "Requested", "requested", NULL },
-      { "InitiatorHandle", "initiator-handle", NULL },
-      { "InitiatorID", "initiator-id", NULL },
-      { NULL }
-  };
-  static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
-      { TP_IFACE_CHANNEL,
-        tp_dbus_properties_mixin_getter_gobject_properties,
-        NULL,
-        channel_props,
-      },
-      { NULL }
-  };
-  GObjectClass *object_class = G_OBJECT_CLASS (salut_contact_channel_class);
-  GParamSpec *param_spec;
-
-  g_type_class_add_private (salut_contact_channel_class, sizeof (SalutContactChannelPrivate));
-
-  object_class->constructor = salut_contact_channel_constructor;
-
-  object_class->get_property = salut_contact_channel_get_property;
-  object_class->set_property = salut_contact_channel_set_property;
-
-  object_class->dispose = salut_contact_channel_dispose;
-  object_class->finalize = salut_contact_channel_finalize;
-
-  param_spec = g_param_spec_object ("connection", "SalutConnection object",
-                                    "Salut connection object that owns this "
-                                    "Roster channel object.",
-                                    SALUT_TYPE_CONNECTION,
-                                    G_PARAM_CONSTRUCT_ONLY |
-                                    G_PARAM_READWRITE |
-                                    G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_CONNECTION, param_spec);
-
-  param_spec = g_param_spec_boxed ("interfaces", "Extra D-Bus interfaces",
-      "Additional Channel.Interface.* interfaces",
-      G_TYPE_STRV,
-      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_INTERFACES, param_spec);
-
-  g_object_class_override_property (object_class, PROP_OBJECT_PATH,
-      "object-path");
-  g_object_class_override_property (object_class, PROP_CHANNEL_TYPE,
-      "channel-type");
-  g_object_class_override_property (object_class, PROP_HANDLE_TYPE,
-      "handle-type");
-  g_object_class_override_property (object_class, PROP_HANDLE, "handle");
-
-  g_object_class_override_property (object_class, PROP_CHANNEL_PROPERTIES,
-      "channel-properties");
-  g_object_class_override_property (object_class, PROP_CHANNEL_DESTROYED,
-      "channel-destroyed");
-
-  param_spec = g_param_spec_string ("target-id", "Target JID",
-      "The string obtained by inspecting this channel's handle",
-      NULL,
-      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_TARGET_ID, param_spec);
-
-  param_spec = g_param_spec_boolean ("requested", "Requested?",
-      "True if this channel was requested by the local user",
-      FALSE,
-      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_REQUESTED, param_spec);
-
-  param_spec = g_param_spec_uint ("initiator-handle", "Initiator's handle",
-      "Always 0 on contact list channels",
-      0, G_MAXUINT32, 0,
-      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_INITIATOR_HANDLE,
-      param_spec);
-
-  param_spec = g_param_spec_string ("initiator-id", "Initiator JID",
-      "Always the empty string on contact list channels",
-      NULL,
-      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_INITIATOR_ID,
-      param_spec);
-
-  salut_contact_channel_class->dbus_props_class.interfaces = prop_interfaces;
-  tp_dbus_properties_mixin_class_init (object_class,
-      G_STRUCT_OFFSET (SalutContactChannelClass, dbus_props_class));
-
-  tp_group_mixin_class_init (object_class,
-      G_STRUCT_OFFSET (SalutContactChannelClass, group_class),
-      NULL, NULL);
-  tp_group_mixin_init_dbus_properties (object_class);
-}
-
-void
-salut_contact_channel_dispose (GObject *object)
-{
-  SalutContactChannel *self = SALUT_CONTACT_CHANNEL (object);
-  SalutContactChannelPrivate *priv = SALUT_CONTACT_CHANNEL_GET_PRIVATE (self);
-  TpBaseConnection *base_conn = TP_BASE_CONNECTION(priv->conn);
-  TpHandleRepoIface *handle_repo = tp_base_connection_get_handles (base_conn,
-        TP_HANDLE_TYPE_LIST);
-
-  if (priv->dispose_has_run)
-    return;
-
-  priv->dispose_has_run = TRUE;
-
-  tp_svc_channel_emit_closed (TP_SVC_CHANNEL (object));
-
-  tp_handle_unref (handle_repo, priv->handle);
-
-
-  /* release any references held by the object here */
-
-  if (G_OBJECT_CLASS (salut_contact_channel_parent_class)->dispose)
-    G_OBJECT_CLASS (salut_contact_channel_parent_class)->dispose (object);
-}
-
-void
-salut_contact_channel_finalize (GObject *object)
-{
-  SalutContactChannel *self = SALUT_CONTACT_CHANNEL (object);
-  SalutContactChannelPrivate *priv = SALUT_CONTACT_CHANNEL_GET_PRIVATE (self);
-
-  /* free any data held directly by the object here */
-  g_free (priv->object_path);
-
-  tp_group_mixin_finalize (object);
-
-  G_OBJECT_CLASS (salut_contact_channel_parent_class)->finalize (object);
-}
-
-/**
- * salut_contact_channel_get_channel_type
- *
- * Implements DBus method GetChannelType
- * on interface org.freedesktop.Telepathy.Channel
- */
-static void
-salut_contact_channel_get_channel_type (TpSvcChannel *iface,
-    DBusGMethodInvocation *context)
-{
-  tp_svc_channel_return_from_get_channel_type (context,
-      TP_IFACE_CHANNEL_TYPE_CONTACT_LIST);
-}
-
-
-/**
- * salut_contact_channel_get_handle
- *
- * Implements DBus method GetHandle
- * on interface org.freedesktop.Telepathy.Channel
- */
-static void
-salut_contact_channel_get_handle (TpSvcChannel *iface,
-                                  DBusGMethodInvocation *context)
-{
-  SalutContactChannel *self = SALUT_CONTACT_CHANNEL(iface);
-  SalutContactChannelPrivate *priv = SALUT_CONTACT_CHANNEL_GET_PRIVATE(self);
-
-  tp_svc_channel_return_from_get_handle (context, TP_HANDLE_TYPE_LIST,
-                                         priv->handle);
-}
-
-
-/**
- * salut_contact_channel_get_interfaces
- *
- * Implements DBus method GetInterfaces
- * on interface org.freedesktop.Telepathy.Channel
- */
-static void
-salut_contact_channel_get_interfaces (TpSvcChannel *iface,
-                                      DBusGMethodInvocation *context)
-{
-  tp_svc_channel_return_from_get_interfaces (context,
-      salut_contact_channel_interfaces);
-}
-
-
-static void
-channel_iface_init (gpointer g_iface, gpointer iface_data)
-{
-  TpSvcChannelClass *klass = (TpSvcChannelClass *) g_iface;
-
-#define IMPLEMENT(x) tp_svc_channel_implement_##x (\
-    klass, salut_contact_channel_##x)
-  IMPLEMENT (get_channel_type);
-  IMPLEMENT (get_handle);
-  IMPLEMENT (get_interfaces);
-#undef IMPLEMENT
-}
diff -Nru telepathy-salut-0.5.0/src/contact-channel.h telepathy-salut-0.7.0/src/contact-channel.h
--- telepathy-salut-0.5.0/src/contact-channel.h	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/contact-channel.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/*
- * contact-channel.h - Header for SalutContactChannel
- * Copyright (C) 2005 Collabora Ltd.
- * Copyright (C) 2005 Nokia Corporation
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef __SALUT_CONTACT_CHANNEL_H__
-#define __SALUT_CONTACT_CHANNEL_H__
-
-#include 
-#include 
-
-G_BEGIN_DECLS
-
-typedef struct _SalutContactChannel SalutContactChannel;
-typedef struct _SalutContactChannelClass SalutContactChannelClass;
-
-struct _SalutContactChannelClass {
-    GObjectClass parent_class;
-
-    TpGroupMixinClass group_class;
-    TpDBusPropertiesMixinClass dbus_props_class;
-};
-
-struct _SalutContactChannel {
-    GObject parent;
-    TpGroupMixin group;
-};
-
-GType salut_contact_channel_get_type (void);
-
-/* TYPE MACROS */
-#define SALUT_TYPE_CONTACT_CHANNEL \
-  (salut_contact_channel_get_type ())
-#define SALUT_CONTACT_CHANNEL(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), SALUT_TYPE_CONTACT_CHANNEL, SalutContactChannel))
-#define SALUT_CONTACT_CHANNEL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), SALUT_TYPE_CONTACT_CHANNEL, SalutContactChannelClass))
-#define SALUT_IS_CONTACT_CHANNEL(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), SALUT_TYPE_CONTACT_CHANNEL))
-#define SALUT_IS_CONTACT_CHANNEL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), SALUT_TYPE_CONTACT_CHANNEL))
-#define SALUT_CONTACT_CHANNEL_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), SALUT_TYPE_CONTACT_CHANNEL, SalutContactChannelClass))
-
-G_END_DECLS
-
-#endif /* #ifndef __SALUT_CONTACT_CHANNEL_H__*/
diff -Nru telepathy-salut-0.5.0/src/contact.h telepathy-salut-0.7.0/src/contact.h
--- telepathy-salut-0.5.0/src/contact.h	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/contact.h	2011-09-07 14:05:38.000000000 +0000
@@ -36,14 +36,19 @@
 
 G_BEGIN_DECLS
 
-#define  SALUT_CONTACT_ALIAS_CHANGED  0x1
-#define  SALUT_CONTACT_STATUS_CHANGED 0x2
-#define  SALUT_CONTACT_AVATAR_CHANGED 0x4
+enum {
+  SALUT_CONTACT_ALIAS_CHANGED  = 0x1,
+  SALUT_CONTACT_STATUS_CHANGED = 0x2,
+  SALUT_CONTACT_AVATAR_CHANGED = 0x4,
 #ifdef ENABLE_OLPC
-#define  SALUT_CONTACT_OLPC_PROPERTIES 0x8
-#define  SALUT_CONTACT_OLPC_CURRENT_ACTIVITY 0x10
-#define  SALUT_CONTACT_OLPC_ACTIVITIES 0x20
+  SALUT_CONTACT_OLPC_PROPERTIES = 0x8,
+  SALUT_CONTACT_OLPC_CURRENT_ACTIVITY = 0x10,
+  SALUT_CONTACT_OLPC_ACTIVITIES = 0x20,
 #endif /* ENABLE_OLPC */
+  SALUT_CONTACT_JID_CHANGED = 0x40,
+  SALUT_CONTACT_EMAIL_CHANGED = 0x80,
+  SALUT_CONTACT_REAL_NAME_CHANGED = 0x100,
+};
 
 typedef struct _SalutContact SalutContact;
 typedef struct _SalutContactClass SalutContactClass;
@@ -67,6 +72,11 @@
     SalutPresenceId status;
     gchar *avatar_token;
     gchar *status_message;
+    gchar *first;
+    gchar *last;
+    /* synthesized from first and last */
+    gchar *full_name;
+    gchar *email;
     gchar *jid;
 
     /* XEP-0115 Capabilities */
@@ -147,12 +157,15 @@
 #endif
 
 /* restricted methods */
+void salut_contact_change_real_name (SalutContact *self, const gchar *first,
+    const gchar *last);
 void salut_contact_change_alias (SalutContact *self, const gchar *alias);
 void salut_contact_change_status (SalutContact *self, SalutPresenceId);
 void salut_contact_change_status_message (SalutContact *self,
   const gchar *message);
 void salut_contact_change_avatar_token (SalutContact *self,
   const gchar *avatar_token);
+void salut_contact_change_email (SalutContact *self, gchar *email);
 void salut_contact_change_jid (SalutContact *self, gchar *jid);
 void salut_contact_change_capabilities (SalutContact *self,
   const gchar *hash, const gchar *node, const gchar *ver);
diff -Nru telepathy-salut-0.5.0/src/contact-manager.c telepathy-salut-0.7.0/src/contact-manager.c
--- telepathy-salut-0.5.0/src/contact-manager.c	2011-05-03 10:58:19.000000000 +0000
+++ telepathy-salut-0.7.0/src/contact-manager.c	2011-10-27 12:57:12.000000000 +0000
@@ -26,7 +26,6 @@
 #include 
 
 #include "connection.h"
-#include "contact-channel.h"
 #include "contact-manager.h"
 #include "signals-marshal.h"
 #include "contact.h"
@@ -38,34 +37,20 @@
 #define DEBUG_FLAG DEBUG_CONTACTS
 #include "debug.h"
 
-static void salut_contact_manager_manager_iface_init (gpointer g_iface,
-    gpointer iface_data);
-
-static SalutContactChannel *salut_contact_manager_get_channel
-    (SalutContactManager *mgr, TpHandle handle, gpointer request_token,
-    gboolean *created);
-
 static void salut_contact_manager_close_all (SalutContactManager *mgr);
 
 static void
 _contact_finalized_cb (gpointer data, GObject *old_object);
 
 G_DEFINE_TYPE_WITH_CODE(SalutContactManager, salut_contact_manager,
-    G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (TP_TYPE_CHANNEL_MANAGER,
-      salut_contact_manager_manager_iface_init);
-    G_IMPLEMENT_INTERFACE (GABBLE_TYPE_CAPS_CHANNEL_MANAGER, NULL))
-
-enum
-{
-  PROP_CONNECTION = 1,
-  LAST_PROP
-};
+    TP_TYPE_BASE_CONTACT_LIST,
+     G_IMPLEMENT_INTERFACE (GABBLE_TYPE_CAPS_CHANNEL_MANAGER, NULL))
 
 /* signal enum */
 enum
 {
   CONTACT_CHANGE,
+  ALL_FOR_NOW,
   LAST_SIGNAL
 };
 
@@ -76,64 +61,62 @@
 
 struct _SalutContactManagerPrivate
 {
-  GHashTable *channels;
+  TpHandleSet *handles;
   gulong status_changed_id;
   gboolean dispose_has_run;
 };
 
 #define SALUT_CONTACT_MANAGER_GET_PRIVATE(o)     (G_TYPE_INSTANCE_GET_PRIVATE ((o), SALUT_TYPE_CONTACT_MANAGER, SalutContactManagerPrivate))
 
-static void
-salut_contact_manager_get_property (GObject *object,
-                                    guint property_id,
-                                    GValue *value,
-                                    GParamSpec *pspec)
+static TpHandleSet *
+contact_manager_dup_contacts (TpBaseContactList *base)
 {
-  SalutContactManager *self = SALUT_CONTACT_MANAGER (object);
+  SalutContactManagerPrivate *priv = SALUT_CONTACT_MANAGER_GET_PRIVATE (base);
 
-  switch (property_id)
-    {
-      case PROP_CONNECTION:
-        g_value_set_object (value, self->connection);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-        break;
-    }
+  return tp_handle_set_copy (priv->handles);
 }
 
 static void
-salut_contact_manager_set_property (GObject *object,
-                                    guint property_id,
-                                    const GValue *value,
-                                    GParamSpec *pspec)
+contact_manager_dup_states (TpBaseContactList *base,
+    TpHandle contact,
+    TpSubscriptionState *subscribe,
+    TpSubscriptionState *publish,
+    gchar **publish_request)
 {
-  SalutContactManager *self = SALUT_CONTACT_MANAGER (object);
+  SalutContactManagerPrivate *priv = SALUT_CONTACT_MANAGER_GET_PRIVATE (base);
 
-  switch (property_id)
+  if (tp_handle_set_is_member (priv->handles, contact))
     {
-      case PROP_CONNECTION:
-        self->connection = g_value_get_object (value);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-        break;
+      if (subscribe != NULL)
+        *subscribe = TP_SUBSCRIPTION_STATE_YES;
+
+      if (publish != NULL)
+        *publish = TP_SUBSCRIPTION_STATE_YES;
+
+      if (publish_request != NULL)
+        *publish_request = NULL;
+    }
+  else
+    {
+      if (subscribe != NULL)
+        *subscribe = TP_SUBSCRIPTION_STATE_NO;
+
+      if (publish != NULL)
+        *publish = TP_SUBSCRIPTION_STATE_NO;
+
+      if (publish_request != NULL)
+        *publish_request = NULL;
     }
 }
 
 static void
 salut_contact_manager_init (SalutContactManager *obj)
 {
-  SalutContactManagerPrivate *priv = SALUT_CONTACT_MANAGER_GET_PRIVATE (obj);
-
   /* allocate any data required by the object here */
-  priv->channels = g_hash_table_new_full (g_direct_hash, g_direct_equal,
-      NULL, g_object_unref);
   obj->contacts = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
 }
 
-static GObject *salut_contact_manager_constructor (GType type,
-    guint n_props, GObjectConstructParam *props);
+static void salut_contact_manager_constructed (GObject *obj);
 static void salut_contact_manager_dispose (GObject *object);
 static void salut_contact_manager_finalize (GObject *object);
 
@@ -141,26 +124,17 @@
 salut_contact_manager_class_init (SalutContactManagerClass *salut_contact_manager_class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (salut_contact_manager_class);
-  GParamSpec *param_spec;
+  TpBaseContactListClass *base_class = (TpBaseContactListClass *) object_class;
 
   g_type_class_add_private (salut_contact_manager_class, sizeof (SalutContactManagerPrivate));
 
-  object_class->get_property = salut_contact_manager_get_property;
-  object_class->set_property = salut_contact_manager_set_property;
-
-  object_class->constructor = salut_contact_manager_constructor;
+  object_class->constructed = salut_contact_manager_constructed;
   object_class->dispose = salut_contact_manager_dispose;
   object_class->finalize = salut_contact_manager_finalize;
 
-  param_spec = g_param_spec_object (
-      "connection",
-      "SalutConnection object",
-      "The Salut Connection associated with this contact manager",
-      SALUT_TYPE_CONNECTION,
-      G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_CONNECTION,
-      param_spec);
+  base_class->dup_states = contact_manager_dup_states;
+  base_class->dup_contacts = contact_manager_dup_contacts;
+  base_class->get_contact_list_persists = tp_base_contact_list_false_func;
 
   signals[CONTACT_CHANGE] = g_signal_new ("contact-change",
       G_OBJECT_CLASS_TYPE(salut_contact_manager_class),
@@ -171,6 +145,14 @@
       G_TYPE_NONE, 2,
       SALUT_TYPE_CONTACT,
       G_TYPE_INT);
+
+  signals[ALL_FOR_NOW] = g_signal_new ("all-for-now",
+      G_OBJECT_CLASS_TYPE(salut_contact_manager_class),
+      G_SIGNAL_RUN_LAST,
+      0,
+      NULL, NULL,
+      g_cclosure_marshal_VOID__VOID,
+      G_TYPE_NONE, 0);
 }
 
 static void
@@ -185,25 +167,27 @@
     }
 }
 
-static GObject *
-salut_contact_manager_constructor (GType type,
-    guint n_props,
-    GObjectConstructParam *props)
-{
-  GObject *obj;
-  SalutContactManager *self;
-  SalutContactManagerPrivate *priv;
-
-  obj = G_OBJECT_CLASS (salut_contact_manager_parent_class)->
-           constructor (type, n_props, props);
+static void
+salut_contact_manager_constructed (GObject *obj)
+{
+  SalutContactManager *self = (SalutContactManager *) obj;
+  SalutContactManagerPrivate *priv = SALUT_CONTACT_MANAGER_GET_PRIVATE (self);
+  TpHandleRepoIface *contact_repo;
+  TpBaseConnection *base_connection;
 
-  self = SALUT_CONTACT_MANAGER (obj);
-  priv = SALUT_CONTACT_MANAGER_GET_PRIVATE (self);
+  base_connection = tp_base_contact_list_get_connection (
+      (TpBaseContactList *) self, NULL);
+  self->connection = g_object_ref (base_connection);
+
+  contact_repo = tp_base_connection_get_handles (base_connection,
+      TP_HANDLE_TYPE_CONTACT);
+  priv->handles = tp_handle_set_new (contact_repo);
 
   priv->status_changed_id = g_signal_connect (self->connection,
       "status-changed", (GCallback) connection_status_changed_cb, self);
 
-  return obj;
+  if (G_OBJECT_CLASS (salut_contact_manager_parent_class)->constructed)
+    G_OBJECT_CLASS (salut_contact_manager_parent_class)->constructed (obj);
 }
 
 static gboolean
@@ -252,33 +236,14 @@
 }
 
 static void
-change_all_groups (SalutContactManager *mgr, TpIntSet *add, TpIntSet *rem)
-{
-  TpHandle i;
-  SalutContactChannel *c;
-  TpIntSet *empty = tp_intset_new ();
-
-  for (i = LIST_HANDLE_FIRST; i <= LIST_HANDLE_LAST; i++)
-    {
-      c = salut_contact_manager_get_channel (mgr, i, NULL, NULL);
-      tp_group_mixin_change_members (G_OBJECT(c),
-                                     "", add, rem,
-                                     empty, empty, 0, 0);
-    }
-  tp_intset_destroy (empty);
-}
-
-static void
 contact_found_cb (SalutContact *contact, gpointer userdata)
 {
-  SalutContactManager *mgr = SALUT_CONTACT_MANAGER (userdata);
-  TpIntSet *to_add = tp_intset_new ();
-  TpIntSet *to_rem = tp_intset_new ();
+  SalutContactManager *self = userdata;
+  SalutContactManagerPrivate *priv = SALUT_CONTACT_MANAGER_GET_PRIVATE (self);
 
-  tp_intset_add (to_add, contact->handle);
-  change_all_groups (mgr, to_add, to_rem);
-  tp_intset_destroy (to_add);
-  tp_intset_destroy (to_rem);
+  tp_handle_set_add (priv->handles, contact->handle);
+  tp_base_contact_list_one_contact_changed ((TpBaseContactList *) self,
+      contact->handle);
 }
 
 static void
@@ -294,18 +259,12 @@
 static void
 contact_lost_cb (SalutContact *contact, gpointer userdata)
 {
-  SalutContactManager *mgr = SALUT_CONTACT_MANAGER (userdata);
-
-  TpIntSet *to_add = tp_intset_new ();
-  TpIntSet *to_rem = tp_intset_new ();
-
-  DEBUG("Removing %s from contacts", contact->name);
-
-  tp_intset_add (to_rem, contact->handle);
-  change_all_groups (mgr, to_add, to_rem);
+  SalutContactManager *self = userdata;
+  SalutContactManagerPrivate *priv = SALUT_CONTACT_MANAGER_GET_PRIVATE (self);
 
-  tp_intset_destroy (to_add);
-  tp_intset_destroy (to_rem);
+  tp_handle_set_remove (priv->handles, contact->handle);
+  tp_base_contact_list_one_contact_removed ((TpBaseContactList *) self,
+      contact->handle);
 }
 
 static gboolean
@@ -372,11 +331,7 @@
 
   SALUT_CONTACT_MANAGER_GET_CLASS (mgr)->close_all (mgr);
 
-  if (priv->channels)
-    {
-      g_hash_table_destroy (priv->channels);
-      priv->channels = NULL;
-    }
+  tp_clear_pointer (&priv->handles, tp_handle_set_destroy);
 
   if (mgr->contacts)
     {
@@ -390,259 +345,53 @@
       g_signal_handler_disconnect (mgr->connection, priv->status_changed_id);
       priv->status_changed_id = 0;
     }
+  tp_clear_object (&mgr->connection);
 }
 
-/* TpChannelManager implementation */
-struct foreach_channel_data {
-  TpExportableChannelFunc func;
-  gpointer data;
-};
-
 static void
-salut_contact_manager_foreach_one (gpointer key,
-    gpointer value,
-    gpointer data)
+salut_contact_manager_all_for_now_cb (SalutContactManager *self)
 {
-  TpExportableChannel *chan = TP_EXPORTABLE_CHANNEL (value);
-  struct foreach_channel_data *f = data;
+  TpBaseContactList *base = (TpBaseContactList *) self;
 
-  f->func (chan, f->data);
-}
+  DEBUG ("Contact list received");
 
-static void
-salut_contact_manager_foreach_channel (TpChannelManager *iface,
-    TpExportableChannelFunc func,
-    gpointer data)
-{
-  SalutContactManager *mgr = SALUT_CONTACT_MANAGER (iface);
-  SalutContactManagerPrivate *priv = SALUT_CONTACT_MANAGER_GET_PRIVATE (mgr);
-  struct foreach_channel_data f;
-  f.func = func;
-  f.data = data;
+  g_assert (tp_base_contact_list_get_state (base, NULL) ==
+      TP_CONTACT_LIST_STATE_WAITING);
 
-  g_hash_table_foreach (priv->channels,
-                        salut_contact_manager_foreach_one, &f);
+  tp_base_contact_list_set_list_received (base);
 }
 
-static const gchar * const list_channel_fixed_properties[] = {
-    TP_IFACE_CHANNEL ".ChannelType",
-    TP_IFACE_CHANNEL ".TargetHandleType",
-    NULL
-};
-
-static const gchar * const list_channel_allowed_properties[] = {
-    TP_IFACE_CHANNEL ".TargetHandle",
-    TP_IFACE_CHANNEL ".TargetID",
-    NULL
-};
-
-static void
-salut_contact_manager_type_foreach_channel_class (GType type,
-    TpChannelManagerTypeChannelClassFunc func,
-    gpointer user_data)
-{
-  GHashTable *table = g_hash_table_new_full (g_str_hash, g_str_equal,
-      NULL, (GDestroyNotify) tp_g_value_slice_free);
-  GValue *value, *handle_type_value;
-
-  value = tp_g_value_slice_new (G_TYPE_STRING);
-  g_value_set_static_string (value, TP_IFACE_CHANNEL_TYPE_CONTACT_LIST);
-  g_hash_table_insert (table, TP_IFACE_CHANNEL ".ChannelType", value);
-
-  handle_type_value = tp_g_value_slice_new (G_TYPE_UINT);
-  g_value_set_uint (handle_type_value, TP_HANDLE_TYPE_LIST);
-  g_hash_table_insert (table, TP_IFACE_CHANNEL ".TargetHandleType",
-      handle_type_value);
-
-  func (type, table, list_channel_allowed_properties, user_data);
-
-  g_hash_table_destroy (table);
-}
-
-static gboolean
-salut_contact_manager_request (SalutContactManager *self,
-    gpointer request_token,
-    GHashTable *request_properties,
-    gboolean require_new)
-{
-  TpHandleRepoIface *handle_repo = tp_base_connection_get_handles (
-      TP_BASE_CONNECTION (self->connection), TP_HANDLE_TYPE_LIST);
-  TpHandleType handle_type;
-  TpHandle handle;
-  SalutContactChannel *channel;
-  gboolean created;
-  GError *error = NULL;
-
-  if (tp_strdiff (tp_asv_get_string (request_properties,
-          TP_IFACE_CHANNEL ".ChannelType"),
-        TP_IFACE_CHANNEL_TYPE_CONTACT_LIST))
-    return FALSE;
-
-  handle_type = tp_asv_get_uint32 (request_properties,
-      TP_IFACE_CHANNEL ".TargetHandleType", NULL);
-
-  if (handle_type != TP_HANDLE_TYPE_LIST)
-    return FALSE;
-
-  handle = tp_asv_get_uint32 (request_properties,
-      TP_IFACE_CHANNEL ".TargetHandle", NULL);
-  g_assert (tp_handle_is_valid (handle_repo, handle, NULL));
-
-  /* Check if there are any other properties that we don't understand */
-  if (tp_channel_manager_asv_has_unknown_properties (request_properties,
-          list_channel_fixed_properties, list_channel_allowed_properties,
-          &error))
-    {
-      goto error;
-    }
-
-  channel = salut_contact_manager_get_channel (self, handle, request_token,
-      &created);
-
-  if (created)
-    {
-      /* Do nothing; salut_contact_manager_new_channel emits the new-channel
-       * signal
-       */
-    }
-  else
-    {
-      if (require_new)
-        {
-          g_set_error (&error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE,
-            "Contact list channel #%u already exists", handle);
-          goto error;
-        }
-      else
-        {
-          tp_channel_manager_emit_request_already_satisfied (self,
-              request_token, TP_EXPORTABLE_CHANNEL (channel));
-        }
-    }
-  return TRUE;
-
-error:
-  tp_channel_manager_emit_request_failed (self, request_token,
-      error->domain, error->code, error->message);
-  g_error_free (error);
-  return TRUE;
-}
-
-static gboolean
-salut_contact_manager_request_channel (TpChannelManager *manager,
-    gpointer request_token,
-    GHashTable *request_properties)
-{
-  SalutContactManager *self = SALUT_CONTACT_MANAGER (manager);
-
-  return salut_contact_manager_request (self, request_token,
-      request_properties, FALSE);
-}
-
-static gboolean
-salut_contact_manager_create_channel (TpChannelManager *manager,
-    gpointer request_token,
-    GHashTable *request_properties)
-{
-  SalutContactManager *self = SALUT_CONTACT_MANAGER (manager);
-
-  return salut_contact_manager_request (self, request_token,
-      request_properties, TRUE);
-}
-
-static gboolean
-salut_contact_manager_ensure_channel (TpChannelManager *manager,
-    gpointer request_token,
-    GHashTable *request_properties)
-{
-  SalutContactManager *self = SALUT_CONTACT_MANAGER (manager);
-
-  return salut_contact_manager_request (self, request_token,
-      request_properties, FALSE);
-}
-
-static void
-salut_contact_manager_manager_iface_init (gpointer g_iface,
-    gpointer iface_data)
-{
-  TpChannelManagerIface *iface = g_iface;
-
-  iface->foreach_channel = salut_contact_manager_foreach_channel;
-  iface->type_foreach_channel_class =
-    salut_contact_manager_type_foreach_channel_class;
-  iface->request_channel = salut_contact_manager_request_channel;
-  iface->create_channel = salut_contact_manager_create_channel;
-  iface->ensure_channel = salut_contact_manager_ensure_channel;
-}
-
-/* private functions */
-static SalutContactChannel *
-salut_contact_manager_new_channel (SalutContactManager *mgr,
-    gpointer request_token,
-    TpHandle handle)
+/* public functions */
+gboolean
+salut_contact_manager_start (SalutContactManager *self,
+    GError **error)
 {
-  SalutContactManagerPrivate *priv = SALUT_CONTACT_MANAGER_GET_PRIVATE (mgr);
-  TpBaseConnection *base_conn = (TpBaseConnection *) (mgr->connection);
-  TpHandleRepoIface *handle_repo = tp_base_connection_get_handles (base_conn,
-       TP_HANDLE_TYPE_LIST);
-  SalutContactChannel *chan;
-  const gchar *name;
-  gchar *path;
-  GSList *requests = NULL;
-
-  g_assert (g_hash_table_lookup (priv->channels, GUINT_TO_POINTER (handle))
-             == NULL);
+  TpBaseContactList *base = (TpBaseContactList *) self;
+  gboolean success;
+  GError *err = NULL;
 
-  name = tp_handle_inspect (handle_repo, handle);
-  path = g_strdup_printf ("%s/ContactChannel/%s", base_conn->object_path,
-      name);
+  g_assert (tp_base_contact_list_get_state (base, NULL) ==
+      TP_CONTACT_LIST_STATE_NONE);
 
-  chan = g_object_new (SALUT_TYPE_CONTACT_CHANNEL,
-      "connection", mgr->connection,
-      "object-path", path,
-      "handle", handle,
-      "requested", (request_token != NULL),
-      NULL);
-  g_free (path);
-  g_hash_table_insert (priv->channels, GUINT_TO_POINTER (handle), chan);
+  g_signal_connect (self, "all-for-now",
+      G_CALLBACK (salut_contact_manager_all_for_now_cb), NULL);
 
-  if (request_token != NULL)
-    requests = g_slist_prepend (requests, request_token);
-
-  tp_channel_manager_emit_new_channel (mgr, TP_EXPORTABLE_CHANNEL (chan),
-      requests);
-
-  g_slist_free (requests);
-
-  return chan;
-}
-
-static SalutContactChannel *
-salut_contact_manager_get_channel (SalutContactManager *mgr,
-    TpHandle handle, gpointer request_token, gboolean *created)
-{
-  SalutContactManagerPrivate *priv = SALUT_CONTACT_MANAGER_GET_PRIVATE (mgr);
-  SalutContactChannel *chan;
-
-  chan = g_hash_table_lookup (priv->channels, GUINT_TO_POINTER (handle));
-  if (created != NULL)
+  success = SALUT_CONTACT_MANAGER_GET_CLASS (self)->start (self, &err);
+  if (success)
     {
-      *created = (chan == NULL);
+      /* Wait for all-for-now */
+      tp_base_contact_list_set_list_pending (base);
     }
-  if (chan == NULL)
+  else
     {
-      chan = salut_contact_manager_new_channel (mgr, request_token, handle);
+      tp_base_contact_list_set_list_failed (base, err->domain, err->code,
+          err->message);
     }
 
-  return chan;
-}
+  if (err != NULL)
+    g_propagate_error (error, err);
 
-/* public functions */
-gboolean
-salut_contact_manager_start (SalutContactManager *self,
-    GError **error)
-{
-  return SALUT_CONTACT_MANAGER_GET_CLASS (self)->start (self, error);
+  return success;
 }
 
 SalutContact *
diff -Nru telepathy-salut-0.5.0/src/contact-manager.h telepathy-salut-0.7.0/src/contact-manager.h
--- telepathy-salut-0.5.0/src/contact-manager.h	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/contact-manager.h	2011-10-27 12:43:29.000000000 +0000
@@ -23,6 +23,8 @@
 
 #include 
 
+#include 
+
 #include "connection.h"
 #include "contact.h"
 
@@ -32,7 +34,7 @@
 typedef struct _SalutContactManagerClass SalutContactManagerClass;
 
 struct _SalutContactManagerClass {
-    GObjectClass parent_class;
+    TpBaseContactListClass parent_class;
 
     /* public abstract methods */
     gboolean (*start) (SalutContactManager *self, GError **error);
@@ -46,7 +48,7 @@
 };
 
 struct _SalutContactManager {
-    GObject parent;
+    TpBaseContactList parent;
 
     /* private */
     SalutConnection *connection;
diff -Nru telepathy-salut-0.5.0/src/debug.c telepathy-salut-0.7.0/src/debug.c
--- telepathy-salut-0.5.0/src/debug.c	2011-04-22 08:08:27.000000000 +0000
+++ telepathy-salut-0.7.0/src/debug.c	2011-09-07 14:05:38.000000000 +0000
@@ -39,7 +39,6 @@
   { "olpc-activity",      DEBUG_OLPC_ACTIVITY },
   { "ft",             DEBUG_FT },
   { "plugin",         DEBUG_PLUGIN },
-  { "all",            ~0 },
   { 0, },
 };
 
diff -Nru telepathy-salut-0.5.0/src/debug.h telepathy-salut-0.7.0/src/debug.h
--- telepathy-salut-0.5.0/src/debug.h	2011-04-22 08:08:27.000000000 +0000
+++ telepathy-salut-0.7.0/src/debug.h	2011-08-23 15:54:55.000000000 +0000
@@ -56,14 +56,15 @@
 
 #ifdef DEBUG_FLAG
 
-#define DEBUG(format, ...) \
-  G_STMT_START { } G_STMT_END
+static inline void
+DEBUG (
+    const gchar *format,
+    ...)
+{
+}
 
 #define DEBUGGING 0
 
-#define NODE_DEBUG(n, s) \
-  G_STMT_START { } G_STMT_END
-
 #endif /* DEBUG_FLAG */
 
 #define debug_free() G_STMT_START { } G_STMT_END
diff -Nru telepathy-salut-0.5.0/src/disco.c telepathy-salut-0.7.0/src/disco.c
--- telepathy-salut-0.5.0/src/disco.c	2011-05-03 11:19:13.000000000 +0000
+++ telepathy-salut-0.7.0/src/disco.c	2011-10-28 17:01:20.000000000 +0000
@@ -29,7 +29,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -107,9 +107,9 @@
 {
   switch (type) {
     case SALUT_DISCO_TYPE_INFO:
-      return NS_DISCO_INFO;
+      return WOCKY_NS_DISCO_INFO;
     case SALUT_DISCO_TYPE_ITEMS:
-      return NS_DISCO_ITEMS;
+      return WOCKY_NS_DISCO_ITEMS;
     default:
       g_assert_not_reached ();
   }
@@ -240,12 +240,12 @@
    * anyway. */
   result = wocky_stanza_build_iq_error (iq,
       '(', "query",
-        ':', NS_DISCO_INFO,
+        ':', WOCKY_NS_DISCO_INFO,
         '@', "node", node,
         '(', "error",
           '@', "type", "cancel",
           '(', "item-not-found",
-            ':', GIBBER_XMPP_NS_STANZAS,
+            ':', WOCKY_XMPP_NS_STANZAS,
           ')',
         ')',
       ')',
@@ -294,7 +294,7 @@
   const GPtrArray *data_forms;
 
   iq = wocky_stanza_get_top_node (stanza);
-  query = wocky_node_get_child_ns (iq, "query", NS_DISCO_INFO);
+  query = wocky_node_get_child_ns (iq, "query", WOCKY_NS_DISCO_INFO);
   g_assert (query != NULL);
 
   node = wocky_node_get_attribute (query, "node");
@@ -304,14 +304,14 @@
       return TRUE;
     }
 
-  if (!g_str_has_prefix (node, GIBBER_TELEPATHY_NS_CAPS "#"))
+  if (!g_str_has_prefix (node, WOCKY_TELEPATHY_NS_CAPS "#"))
     {
       send_item_not_found (porter, stanza, node);
       return TRUE;
     }
   else
     {
-      suffix = node + strlen (GIBBER_TELEPATHY_NS_CAPS) + 1;
+      suffix = node + strlen (WOCKY_TELEPATHY_NS_CAPS) + 1;
     }
 
   DEBUG ("got disco request for node %s", node);
@@ -334,7 +334,7 @@
    * caps_hash_compute_from_self_presence(). */
   result = wocky_stanza_build_iq_result (stanza,
       '(', "query",
-        ':', NS_DISCO_INFO,
+        ':', WOCKY_NS_DISCO_INFO,
         '@', "node", node,
         '(', "identity",
           '@', "category", "client",
@@ -385,7 +385,7 @@
       WOCKY_PORTER_HANDLER_PRIORITY_NORMAL,
       caps_req_stanza_callback, obj,
       '(', "query",
-        ':', NS_DISCO_INFO,
+        ':', WOCKY_NS_DISCO_INFO,
       ')', NULL);
 
   /* Salut used to send disco requests with  so we
@@ -396,7 +396,7 @@
         WOCKY_PORTER_HANDLER_PRIORITY_NORMAL,
         caps_req_stanza_callback, obj,
         '(', "query",
-          ':', NS_DISCO_INFO,
+          ':', WOCKY_NS_DISCO_INFO,
         ')', NULL);
 }
 
diff -Nru telepathy-salut-0.5.0/src/file-transfer-channel.c telepathy-salut-0.7.0/src/file-transfer-channel.c
--- telepathy-salut-0.5.0/src/file-transfer-channel.c	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/file-transfer-channel.c	2011-11-16 08:53:50.000000000 +0000
@@ -40,17 +40,20 @@
 #include "connection.h"
 #include "im-manager.h"
 #include "contact.h"
+#include "namespaces.h"
 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 static void
 channel_iface_init (gpointer g_iface, gpointer iface_data);
@@ -66,6 +69,8 @@
     G_IMPLEMENT_INTERFACE (TP_TYPE_CHANNEL_IFACE, NULL);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_FILE_TRANSFER,
                            file_transfer_iface_init);
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA,
+                           NULL);
 );
 
 #define CHECK_STR_EMPTY(x) ((x) == NULL || (x)[0] == '\0')
@@ -106,6 +111,10 @@
   PROP_INITIAL_OFFSET,
   PROP_URI,
 
+  /* Chan.I.FileTransfer.Metadata */
+  PROP_SERVICE_NAME,
+  PROP_METADATA,
+
   PROP_CONTACT,
   PROP_CONNECTION,
   LAST_PROPERTY
@@ -140,6 +149,8 @@
   guint64 initial_offset;
   guint64 date;
   gchar *uri;
+  gchar *service_name;
+  GHashTable *metadata;
 };
 
 static void
@@ -284,7 +295,26 @@
         g_value_set_string (value,
             self->priv->uri != NULL ? self->priv->uri : "");
         break;
-     case PROP_CHANNEL_DESTROYED:
+      case PROP_SERVICE_NAME:
+        g_value_set_string (value,
+            self->priv->service_name != NULL ? self->priv->service_name : "");
+        break;
+      case PROP_METADATA:
+        {
+          /* We're fine with priv->metadata being NULL but dbus-glib
+           * doesn't like iterating NULL as if it was a hash table. */
+          if (self->priv->metadata == NULL)
+            {
+              g_value_take_boxed (value,
+                  g_hash_table_new (g_str_hash, g_str_equal));
+            }
+          else
+            {
+              g_value_set_boxed (value, self->priv->metadata);
+            }
+        }
+        break;
+      case PROP_CHANNEL_DESTROYED:
         g_value_set_boolean (value, self->priv->closed);
         break;
       case PROP_CHANNEL_PROPERTIES:
@@ -311,6 +341,8 @@
               TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "AvailableSocketTypes",
               TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "TransferredBytes",
               TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "InitialOffset",
+              TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA, "ServiceName",
+              TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA, "Metadata",
               NULL);
 
           /* URI is immutable only for outgoing transfers */
@@ -355,8 +387,11 @@
         self->priv->connection = g_value_get_object (value);
         break;
       case PROP_HANDLE_TYPE:
+        /* 0 is the old tp-glib value of unset, TP_UNKNOWN_HANDLE_TYPE is the
+         * new version */
         g_assert (g_value_get_uint (value) == 0
-                  || g_value_get_uint (value) == TP_HANDLE_TYPE_CONTACT);
+                  || g_value_get_uint (value) == TP_HANDLE_TYPE_CONTACT
+                  || g_value_get_uint (value) == TP_UNKNOWN_HANDLE_TYPE);
         break;
       case PROP_CHANNEL_TYPE:
         /* these properties are writable in the interface, but not actually
@@ -404,6 +439,13 @@
         g_assert (self->priv->uri == NULL); /* construct only */
         self->priv->uri = g_value_dup_string (value);
         break;
+      case PROP_SERVICE_NAME:
+        g_assert (self->priv->service_name == NULL); /* construct only */
+        self->priv->service_name = g_value_dup_string (value);
+        break;
+      case PROP_METADATA:
+        self->priv->metadata = g_value_dup_boxed (value);
+        break;
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
         break;
@@ -570,6 +612,12 @@
     { NULL }
   };
 
+  static TpDBusPropertiesMixinPropImpl file_metadata_props[] = {
+    { "ServiceName", "service-name", NULL },
+    { "Metadata", "metadata", NULL },
+    { NULL }
+  };
+
   static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
     { TP_IFACE_CHANNEL,
       tp_dbus_properties_mixin_getter_gobject_properties,
@@ -581,7 +629,11 @@
       file_transfer_channel_properties_setter,
       file_props
     },
-    { NULL }
+    { TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA,
+      tp_dbus_properties_mixin_getter_gobject_properties,
+      NULL,
+      file_metadata_props
+    },    { NULL }
   };
 
   g_type_class_add_private (salut_file_transfer_channel_class,
@@ -810,6 +862,22 @@
   g_object_class_install_property (object_class, PROP_URI,
       param_spec);
 
+  param_spec = g_param_spec_string ("service-name",
+      "ServiceName",
+      "The Metadata.ServiceName property of this channel",
+      "",
+      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_SERVICE_NAME,
+      param_spec);
+
+  param_spec = g_param_spec_boxed ("metadata",
+      "Metadata",
+      "The Metadata.Metadata property of this channel",
+      TP_HASH_TYPE_METADATA,
+      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (object_class, PROP_METADATA,
+      param_spec);
+
   salut_file_transfer_channel_class->dbus_props_class.interfaces = \
       prop_interfaces;
   tp_dbus_properties_mixin_class_init (object_class,
@@ -874,6 +942,9 @@
   g_free (self->priv->description);
   g_hash_table_destroy (self->priv->available_socket_types);
   g_free (self->priv->uri);
+  g_free (self->priv->service_name);
+  if (self->priv->metadata != NULL)
+    g_hash_table_unref (self->priv->metadata);
 
   if (self->priv->path != NULL)
     {
@@ -1062,6 +1133,105 @@
 static void ft_transferred_chunk_cb (GibberFileTransfer *ft, guint64 count,
     SalutFileTransferChannel *self);
 
+static GList *
+add_metadata_forms (SalutFileTransferChannel *self,
+    GibberFileTransfer *ft)
+{
+  GError *error = NULL;
+  GQueue queue = G_QUEUE_INIT;
+
+  if (!tp_str_empty (self->priv->service_name))
+    {
+      WockyStanza *tmp = wocky_stanza_build (WOCKY_STANZA_TYPE_IQ,
+          WOCKY_STANZA_SUB_TYPE_RESULT, NULL, NULL,
+          '(', "x",
+            ':', WOCKY_XMPP_NS_DATA,
+            '@', "type", "result",
+            '(', "field",
+              '@', "var", "FORM_TYPE",
+              '@', "type", "hidden",
+              '(', "value",
+                '$', NS_TP_FT_METADATA_SERVICE,
+              ')',
+            ')',
+            '(', "field",
+              '@', "var", "ServiceName",
+              '(', "value",
+                '$', self->priv->service_name,
+              ')',
+            ')',
+          ')',
+          NULL);
+      WockyNode *x = wocky_node_get_first_child (wocky_stanza_get_top_node (tmp));
+      WockyDataForm *form = wocky_data_form_new_from_node (x, &error);
+
+      if (form == NULL)
+        {
+          DEBUG ("Failed to parse form (wat): %s", error->message);
+          g_clear_error (&error);
+        }
+      else
+        {
+          g_queue_push_tail (&queue, form);
+        }
+
+      g_object_unref (tmp);
+    }
+
+  if (self->priv->metadata != NULL
+      && g_hash_table_size (self->priv->metadata) > 0)
+    {
+      WockyStanza *tmp = wocky_stanza_build (WOCKY_STANZA_TYPE_IQ,
+          WOCKY_STANZA_SUB_TYPE_RESULT, NULL, NULL,
+          '(', "x",
+            ':', WOCKY_XMPP_NS_DATA,
+            '@', "type", "result",
+            '(', "field",
+              '@', "var", "FORM_TYPE",
+              '@', "type", "hidden",
+              '(', "value",
+                '$', NS_TP_FT_METADATA,
+              ')',
+            ')',
+          ')',
+          NULL);
+      WockyNode *x = wocky_node_get_first_child (wocky_stanza_get_top_node (tmp));
+      WockyDataForm *form;
+      GHashTableIter iter;
+      gpointer key, val;
+
+      g_hash_table_iter_init (&iter, self->priv->metadata);
+      while (g_hash_table_iter_next (&iter, &key, &val))
+        {
+          const gchar * const *values = val;
+
+          WockyNode *field = wocky_node_add_child (x, "field");
+          wocky_node_set_attribute (field, "var", key);
+
+          for (; values != NULL && *values != NULL; values++)
+            {
+              wocky_node_add_child_with_content (field, "value", *values);
+            }
+        }
+
+      form = wocky_data_form_new_from_node (x, &error);
+
+      if (form == NULL)
+        {
+          DEBUG ("Failed to parse form (wat): %s", error->message);
+          g_clear_error (&error);
+        }
+      else
+        {
+          g_queue_push_tail (&queue, form);
+        }
+
+      g_object_unref (tmp);
+    }
+
+  return queue.head;
+}
+
 static void
 send_file_offer (SalutFileTransferChannel *self)
 {
@@ -1089,6 +1259,9 @@
 
   gibber_file_transfer_set_size (ft, self->priv->size);
 
+  g_assert (ft->dataforms == NULL);
+  ft->dataforms = add_metadata_forms (self, ft);
+
   gibber_file_transfer_offer (ft);
 }
 
@@ -1541,6 +1714,96 @@
   return TRUE;
 }
 
+static WockyDataForm *
+find_data_form (GibberFileTransfer *ft,
+    const gchar *form_type)
+{
+  GList *l;
+
+  for (l = ft->dataforms; l != NULL; l = l->next)
+    {
+      WockyDataForm *form = l->data;
+      WockyDataFormField *field;
+
+      field = g_hash_table_lookup (form->fields, "FORM_TYPE");
+
+      if (field == NULL)
+        {
+          DEBUG ("Data form doesn't have FORM_TYPE field!");
+          continue;
+        }
+
+      /* found it! */
+      if (!tp_strdiff (field->raw_value_contents[0], form_type))
+        return form;
+    }
+
+  return NULL;
+}
+
+static gchar *
+extract_service_name (GibberFileTransfer *ft)
+{
+  WockyDataForm *form = find_data_form (ft, NS_TP_FT_METADATA_SERVICE);
+  WockyDataFormField *field;
+  gchar *service_name = NULL;
+
+  if (form == NULL)
+    return NULL;
+
+  field = g_hash_table_lookup (form->fields, "ServiceName");
+
+  if (field == NULL)
+    {
+      DEBUG ("ServiceName propery not present in data form; odd...");
+      goto out;
+    }
+
+  if (field->raw_value_contents == NULL
+      || field->raw_value_contents[0] == NULL)
+    {
+      DEBUG ("ServiceName property doesn't have a real value; odd...");
+    }
+  else
+    {
+      service_name = g_strdup (field->raw_value_contents[0]);
+    }
+
+out:
+  return service_name;
+}
+
+static GHashTable *
+extract_metadata (GibberFileTransfer *ft)
+{
+  WockyDataForm *form = find_data_form (ft, NS_TP_FT_METADATA);
+  GHashTable *metadata;
+  GHashTableIter iter;
+  gpointer key, value;
+
+  if (form == NULL)
+    return NULL;
+
+  metadata = g_hash_table_new_full (g_str_hash, g_str_equal,
+      g_free, (GDestroyNotify) g_strfreev);
+
+  g_hash_table_iter_init (&iter, form->fields);
+  while (g_hash_table_iter_next (&iter, &key, &value))
+    {
+      const gchar *var = key;
+      WockyDataFormField *field = value;
+
+      if (!tp_strdiff (var, "FORM_TYPE"))
+        continue;
+
+      g_hash_table_insert (metadata,
+          g_strdup (var),
+          g_strdupv (field->raw_value_contents));
+    }
+
+  return metadata;
+}
+
 SalutFileTransferChannel *
 salut_file_transfer_channel_new (SalutConnection *conn,
                                  SalutContact *contact,
@@ -1555,7 +1818,9 @@
                                  const gchar *description,
                                  guint64 date,
                                  guint64 initial_offset,
-                                 const gchar *file_uri)
+                                 const gchar *file_uri,
+                                 const gchar *service_name,
+                                 const GHashTable *metadata)
 {
   return g_object_new (SALUT_TYPE_FILE_TRANSFER_CHANNEL,
       "connection", conn,
@@ -1572,6 +1837,8 @@
       "date", date,
       "initial-offset", initial_offset,
       "uri", file_uri,
+      "service-name", service_name,
+      "metadata", metadata,
       NULL);
 }
 
@@ -1585,6 +1852,8 @@
   GError *error = NULL;
   GibberFileTransfer *ft;
   SalutFileTransferChannel *chan;
+  gchar *service_name;
+  GHashTable *metadata;
 
   ft = gibber_file_transfer_new_from_stanza_with_from (stanza, connection->porter,
       WOCKY_CONTACT (contact), contact->name, &error);
@@ -1607,6 +1876,10 @@
       return NULL;
     }
 
+  /* Metadata */
+  service_name = extract_service_name (ft);
+  metadata = extract_metadata (ft);
+
   DEBUG ("Received file offer with id '%s'", ft->id);
 
   chan = g_object_new (SALUT_TYPE_FILE_TRANSFER_CHANNEL,
@@ -1619,8 +1892,14 @@
       "size", gibber_file_transfer_get_size (ft),
       "description", ft->description,
       "content-type", ft->content_type,
+      "service-name", service_name,
+      "metadata", metadata,
       NULL);
 
+  g_free (service_name);
+  if (metadata != NULL)
+    g_hash_table_unref (metadata);
+
   chan->priv->ft = ft;
 
   g_signal_connect (ft, "error", G_CALLBACK (error_cb), chan);
diff -Nru telepathy-salut-0.5.0/src/file-transfer-channel.h telepathy-salut-0.7.0/src/file-transfer-channel.h
--- telepathy-salut-0.5.0/src/file-transfer-channel.h	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/file-transfer-channel.h	2011-11-16 08:53:50.000000000 +0000
@@ -79,7 +79,8 @@
     TpFileTransferState state, const gchar *content_type,
     const gchar *filename, guint64 size, TpFileHashType hash_type,
     const gchar *content_hash, const gchar *description, guint64 date,
-    guint64 initial_offset, const gchar *file_uri);
+    guint64 initial_offset, const gchar *file_uri,
+    const gchar *service_name, const GHashTable *metadata);
 
 SalutFileTransferChannel * salut_file_transfer_channel_new_from_stanza (
     SalutConnection *connection, SalutContact *contact,
diff -Nru telepathy-salut-0.5.0/src/ft-manager.c telepathy-salut-0.7.0/src/ft-manager.c
--- telepathy-salut-0.5.0/src/ft-manager.c	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/ft-manager.c	2011-11-16 08:53:50.000000000 +0000
@@ -24,8 +24,9 @@
 #include 
 #include 
 
+#include 
+
 #include 
-#include 
 
 #include "ft-manager.h"
 #include "signals-marshal.h"
@@ -35,6 +36,7 @@
 #include "file-transfer-channel.h"
 #include "contact-manager.h"
 #include "presence-cache.h"
+#include "namespaces.h"
 
 #include 
 #include 
@@ -290,7 +292,8 @@
   TpHandle handle;
   const gchar *content_type, *filename, *content_hash, *description;
   guint64 size, date, initial_offset;
-  const gchar *file_uri;
+  const gchar *file_uri, *service_name;
+  const GHashTable *metadata;
   TpFileHashType content_hash_type;
   GError *error = NULL;
   gboolean valid;
@@ -397,6 +400,20 @@
   file_uri = tp_asv_get_string (request_properties,
       TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_URI);
 
+  service_name = tp_asv_get_string (request_properties,
+      TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME);
+
+  metadata = tp_asv_get_boxed (request_properties,
+      TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_METADATA,
+      TP_HASH_TYPE_METADATA);
+
+  if (metadata != NULL && g_hash_table_lookup ((GHashTable *) metadata, "FORM_TYPE"))
+    {
+      g_set_error (&error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+          "Metadata cannot contain an item with key 'FORM_TYPE'");
+      goto error;
+    }
+
   contact = salut_contact_manager_get_contact (priv->contact_manager, handle);
   if (contact == NULL)
     {
@@ -408,6 +425,19 @@
       goto error;
     }
 
+  if (service_name != NULL || metadata != NULL)
+    {
+      if (!gabble_capability_set_has (contact->caps, NS_TP_FT_METADATA))
+        {
+          g_set_error (&error, TP_ERRORS, TP_ERROR_NOT_CAPABLE,
+              "The specified contact does not support the "
+              "Metadata extension; you should ensure both ServiceName and "
+              "Metadata properties are not present in the channel "
+              "request");
+          goto error;
+        }
+    }
+
   DEBUG ("Requested outgoing channel with contact: %s",
       tp_handle_inspect (contact_repo, handle));
 
@@ -415,7 +445,7 @@
       handle, base_connection->self_handle,
       TP_FILE_TRANSFER_STATE_PENDING, content_type, filename, size,
       content_hash_type, content_hash, description, date, initial_offset,
-      file_uri);
+      file_uri, service_name, metadata);
 
   g_object_unref (contact);
 
@@ -446,21 +476,39 @@
     NULL
 };
 
-static const gchar * const file_transfer_channel_allowed_properties[] =
-{
   /* ContentHashType has to be first so we can easily skip it if needed (we
    * currently don't as Salut doesn't support any hash mechanism) */
-  TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_HASH_TYPE,
-  TP_PROP_CHANNEL_TARGET_HANDLE,
-  TP_PROP_CHANNEL_TARGET_ID,
-  TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_TYPE,
-  TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME,
-  TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE,
-  TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_HASH,
-  TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION,
-  TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DATE,
-  TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET,
-  TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_URI,
+#define STANDARD_PROPERTIES \
+  TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_HASH_TYPE, \
+  TP_PROP_CHANNEL_TARGET_HANDLE, \
+  TP_PROP_CHANNEL_TARGET_ID, \
+  TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_TYPE, \
+  TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME, \
+  TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE, \
+  TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_HASH, \
+  TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION, \
+  TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DATE, \
+  TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET, \
+  TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_URI
+
+static const gchar * const file_transfer_channel_allowed_properties[] =
+{
+  STANDARD_PROPERTIES,
+  NULL
+};
+
+static const gchar * const file_transfer_channel_allowed_properties_with_metadata_prop[] =
+{
+  STANDARD_PROPERTIES,
+  TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_METADATA,
+  NULL
+};
+
+static const gchar * const file_transfer_channel_allowed_properties_with_both_metadata_props[] =
+{
+  STANDARD_PROPERTIES,
+  TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME,
+  TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_METADATA,
   NULL
 };
 
@@ -483,7 +531,7 @@
   g_value_set_uint (value, TP_HANDLE_TYPE_CONTACT);
   g_hash_table_insert (table, TP_IFACE_CHANNEL ".TargetHandleType", value);
 
-  func (type, table, file_transfer_channel_allowed_properties,
+  func (type, table, file_transfer_channel_allowed_properties_with_both_metadata_props,
       user_data);
 
   g_hash_table_destroy (table);
@@ -531,12 +579,16 @@
 }
 
 static void
-add_file_transfer_channel_class (GPtrArray *arr)
+add_file_transfer_channel_class (GPtrArray *arr,
+    gboolean include_metadata_properties,
+    const gchar *service_name_str)
 {
   GValue monster = {0, };
   GHashTable *fixed_properties;
   GValue *channel_type_value;
   GValue *target_handle_type_value;
+  GValue *service_name_value;
+  const gchar * const *allowed_properties;
 
   g_value_init (&monster, TP_STRUCT_TYPE_REQUESTABLE_CHANNEL_CLASS);
   g_value_take_boxed (&monster,
@@ -546,20 +598,39 @@
   fixed_properties = g_hash_table_new_full (g_str_hash, g_str_equal, NULL,
       (GDestroyNotify) tp_g_value_slice_free);
 
-  channel_type_value = tp_g_value_slice_new (G_TYPE_STRING);
-  g_value_set_static_string (channel_type_value,
+  channel_type_value = tp_g_value_slice_new_static_string (
       TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER);
   g_hash_table_insert (fixed_properties, TP_IFACE_CHANNEL ".ChannelType",
       channel_type_value);
 
-  target_handle_type_value = tp_g_value_slice_new (G_TYPE_UINT);
-  g_value_set_uint (target_handle_type_value, TP_HANDLE_TYPE_CONTACT);
+  target_handle_type_value = tp_g_value_slice_new_uint (
+      TP_HANDLE_TYPE_CONTACT);
   g_hash_table_insert (fixed_properties, TP_IFACE_CHANNEL ".TargetHandleType",
       target_handle_type_value);
 
+  if (service_name_str != NULL)
+    {
+      service_name_value = tp_g_value_slice_new_string (service_name_str);
+      g_hash_table_insert (fixed_properties,
+          TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME,
+          service_name_value);
+    }
+
+  if (include_metadata_properties)
+    {
+      if (service_name_str == NULL)
+        allowed_properties = file_transfer_channel_allowed_properties_with_both_metadata_props;
+      else
+        allowed_properties = file_transfer_channel_allowed_properties_with_metadata_prop;
+    }
+  else
+    {
+      allowed_properties = file_transfer_channel_allowed_properties;
+    }
+
   dbus_g_type_struct_set (&monster,
       0, fixed_properties,
-      1, file_transfer_channel_allowed_properties,
+      1, allowed_properties,
       G_MAXUINT);
 
   g_hash_table_destroy (fixed_properties);
@@ -568,29 +639,37 @@
 }
 
 static void
+get_contact_caps_foreach (gpointer data,
+    gpointer user_data)
+{
+  const gchar *ns = data;
+  GPtrArray *arr = user_data;
+
+  if (!g_str_has_prefix (ns, NS_TP_FT_METADATA "#"))
+    return;
+
+  add_file_transfer_channel_class (arr, TRUE,
+      ns + strlen (NS_TP_FT_METADATA "#"));
+}
+
+static void
 salut_ft_manager_get_contact_caps_from_set (
     GabbleCapsChannelManager *iface,
     TpHandle handle,
     const GabbleCapabilitySet *caps,
     GPtrArray *arr)
 {
-  SalutFtManager *self = SALUT_FT_MANAGER (iface);
-  SalutFtManagerPrivate *priv = SALUT_FT_MANAGER_GET_PRIVATE (self);
-  TpBaseConnection *base = TP_BASE_CONNECTION (priv->connection);
-
-  if (handle == base->self_handle)
-    {
-      /* we currently always advertise FT ourselves */
-      add_file_transfer_channel_class (arr);
-      return;
-    }
-
   /* If we don't receive any capabilities info (QUIRK_NOT_XEP_CAPABILITIES)
    * we assume FT is supported to ensure interoperability with other clients */
-  if (gabble_capability_set_has (caps, GIBBER_XMPP_NS_IQ_OOB) ||
-      gabble_capability_set_has (caps, GIBBER_XMPP_NS_X_OOB) ||
+  if (gabble_capability_set_has (caps, WOCKY_XMPP_NS_IQ_OOB) ||
+      gabble_capability_set_has (caps, WOCKY_XMPP_NS_X_OOB) ||
       gabble_capability_set_has (caps, QUIRK_NOT_XEP_CAPABILITIES))
-    add_file_transfer_channel_class (arr);
+    {
+      add_file_transfer_channel_class (arr,
+          gabble_capability_set_has (caps, NS_TP_FT_METADATA), NULL);
+    }
+
+  gabble_capability_set_foreach (caps, get_contact_caps_foreach, arr);
 }
 
 static void
@@ -607,6 +686,8 @@
   for (i = 0; i < filters->len; i++)
     {
       GHashTable *channel_class = g_ptr_array_index (filters, i);
+      const gchar *service_name;
+      gchar *ns;
 
       if (tp_strdiff (tp_asv_get_string (channel_class,
               TP_IFACE_CHANNEL ".ChannelType"),
@@ -619,11 +700,30 @@
         continue;
 
       DEBUG ("client %s supports file transfer", client_name);
-      gabble_capability_set_add (cap_set, GIBBER_XMPP_NS_IQ_OOB);
-      gabble_capability_set_add (cap_set, GIBBER_XMPP_NS_X_OOB);
-      /* there's no point in looking at the subsequent filters if we've
-       * already added the FT capability */
-      break;
+      gabble_capability_set_add (cap_set, WOCKY_XMPP_NS_IQ_OOB);
+      gabble_capability_set_add (cap_set, WOCKY_XMPP_NS_X_OOB);
+      gabble_capability_set_add (cap_set, NS_TP_FT_METADATA);
+
+      /* now look at service names */
+
+      /* capabilities mean being able to RECEIVE said kinds of
+       * FTs. hence, skip Requested=true (locally initiated) channel
+       * classes */
+      if (tp_asv_get_boolean (channel_class,
+              TP_PROP_CHANNEL_REQUESTED, FALSE))
+        continue;
+
+      service_name = tp_asv_get_string (channel_class,
+          TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME);
+
+      if (service_name == NULL)
+        continue;
+
+      ns = g_strconcat (NS_TP_FT_METADATA "#", service_name, NULL);
+
+      DEBUG ("%s: adding capability %s", client_name, ns);
+      gabble_capability_set_add (cap_set, ns);
+      g_free (ns);
     }
 }
 
diff -Nru telepathy-salut-0.5.0/src/im-channel.c telepathy-salut-0.7.0/src/im-channel.c
--- telepathy-salut-0.5.0/src/im-channel.c	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/im-channel.c	2011-07-07 12:29:42.000000000 +0000
@@ -35,7 +35,7 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -250,8 +250,11 @@
         priv->connection = g_value_get_object (value);
         break;
       case PROP_HANDLE_TYPE:
-        g_assert (g_value_get_uint (value) == 0 ||
-            g_value_get_uint (value) == TP_HANDLE_TYPE_CONTACT);
+        /* 0 is the old tp-glib value of unset, TP_UNKNOWN_HANDLE_TYPE is the
+         * new version */
+        g_assert (g_value_get_uint (value) == 0
+            || g_value_get_uint (value) == TP_HANDLE_TYPE_CONTACT
+            || g_value_get_uint (value) == TP_UNKNOWN_HANDLE_TYPE);
         break;
       case PROP_CHANNEL_TYPE:
         tmp = g_value_get_string (value);
@@ -534,7 +537,7 @@
   SalutImChannel *self = SALUT_IM_CHANNEL (user_data);
 
   if (wocky_node_get_child_ns (wocky_stanza_get_top_node (stanza), "invite",
-        GIBBER_TELEPATHY_NS_CLIQUE) != NULL)
+        WOCKY_TELEPATHY_NS_CLIQUE) != NULL)
     /* we don't handle Clique MUC invites here, so pass it on to the
      * next handler */
     return FALSE;
diff -Nru telepathy-salut-0.5.0/src/im-manager.c telepathy-salut-0.7.0/src/im-manager.c
--- telepathy-salut-0.5.0/src/im-manager.c	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/im-manager.c	2011-05-09 12:46:34.000000000 +0000
@@ -30,7 +30,7 @@
 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
diff -Nru telepathy-salut-0.5.0/src/Makefile.am telepathy-salut-0.7.0/src/Makefile.am
--- telepathy-salut-0.5.0/src/Makefile.am	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/Makefile.am	2011-10-27 12:43:29.000000000 +0000
@@ -56,13 +56,11 @@
     contact.c                                     \
     self.h                                        \
     self.c                                        \
-    contact-channel.c                             \
-    contact-channel.h                             \
     connection.c                                  \
     connection.h                                  \
+    connection-contact-info.c                     \
+    connection-contact-info.h                     \
     presence.h                                    \
-    contact-channel.h                             \
-    contact-channel.c                             \
     si-bytestream-manager.h                       \
     si-bytestream-manager.c                       \
     text-helper.c                                 \
diff -Nru telepathy-salut-0.5.0/src/Makefile.in telepathy-salut-0.7.0/src/Makefile.in
--- telepathy-salut-0.5.0/src/Makefile.in	2011-05-03 13:29:17.000000000 +0000
+++ telepathy-salut-0.7.0/src/Makefile.in	2011-11-16 10:27:30.000000000 +0000
@@ -84,30 +84,31 @@
 	roomlist-manager.h muc-channel.c ft-manager.c ft-manager.h \
 	file-transfer-channel.c file-transfer-channel.h muc-channel.h \
 	presence-cache.c presence-cache.h tubes-manager.c \
-	tubes-manager.h contact.h contact.c self.h self.c \
-	contact-channel.c contact-channel.h connection.c connection.h \
-	presence.h si-bytestream-manager.h si-bytestream-manager.c \
-	text-helper.c text-helper.h roomlist-channel.h \
-	roomlist-channel.c discovery-client.h discovery-client.c \
-	tube-dbus.h tube-dbus.c tube-iface.h tube-iface.c \
-	tube-stream.h tube-stream.c tubes-channel.h tubes-channel.c \
-	util.h util.c $(top_srcdir)/salut/util.h debug.c debug.h \
-	protocol.c $(top_srcdir)/salut/protocol.h plugin-loader.c \
-	plugin-loader.h $(top_srcdir)/salut/plugin.h plugin.c \
-	$(top_srcdir)/salut/connection.h $(top_srcdir)/salut/sidecar.h \
-	sidecar.c olpc-activity.h olpc-activity.c \
-	olpc-activity-manager.h olpc-activity-manager.c \
-	signals-marshal.list signals-marshal.h signals-marshal.c \
-	enumtypes.h enumtypes.c sha1/sha1-util.h sha1/sha1-util.c \
-	avahi-discovery-client.h avahi-discovery-client.c \
-	avahi-muc-manager.h avahi-muc-manager.c \
-	avahi-roomlist-manager.h avahi-roomlist-manager.c \
-	avahi-muc-channel.h avahi-muc-channel.c \
-	avahi-contact-manager.h avahi-contact-manager.c \
-	avahi-contact.h avahi-contact.c avahi-self.h avahi-self.c \
-	avahi-olpc-activity-manager.h avahi-olpc-activity-manager.c \
-	avahi-olpc-activity.h avahi-olpc-activity.c \
-	dummy-discovery-client.h dummy-discovery-client.c
+	tubes-manager.h contact.h contact.c self.h self.c connection.c \
+	connection.h connection-contact-info.c \
+	connection-contact-info.h presence.h si-bytestream-manager.h \
+	si-bytestream-manager.c text-helper.c text-helper.h \
+	roomlist-channel.h roomlist-channel.c discovery-client.h \
+	discovery-client.c tube-dbus.h tube-dbus.c tube-iface.h \
+	tube-iface.c tube-stream.h tube-stream.c tubes-channel.h \
+	tubes-channel.c util.h util.c $(top_srcdir)/salut/util.h \
+	debug.c debug.h protocol.c $(top_srcdir)/salut/protocol.h \
+	plugin-loader.c plugin-loader.h $(top_srcdir)/salut/plugin.h \
+	plugin.c $(top_srcdir)/salut/connection.h \
+	$(top_srcdir)/salut/sidecar.h sidecar.c olpc-activity.h \
+	olpc-activity.c olpc-activity-manager.h \
+	olpc-activity-manager.c signals-marshal.list signals-marshal.h \
+	signals-marshal.c enumtypes.h enumtypes.c sha1/sha1-util.h \
+	sha1/sha1-util.c avahi-discovery-client.h \
+	avahi-discovery-client.c avahi-muc-manager.h \
+	avahi-muc-manager.c avahi-roomlist-manager.h \
+	avahi-roomlist-manager.c avahi-muc-channel.h \
+	avahi-muc-channel.c avahi-contact-manager.h \
+	avahi-contact-manager.c avahi-contact.h avahi-contact.c \
+	avahi-self.h avahi-self.c avahi-olpc-activity-manager.h \
+	avahi-olpc-activity-manager.c avahi-olpc-activity.h \
+	avahi-olpc-activity.c dummy-discovery-client.h \
+	dummy-discovery-client.c
 @ENABLE_OLPC_TRUE@am__objects_1 = olpc-activity.lo \
 @ENABLE_OLPC_TRUE@	olpc-activity-manager.lo
 am__objects_2 = symbol-hacks.lo capability-set.lo \
@@ -116,7 +117,7 @@
 	im-manager.lo im-channel.lo muc-manager.lo roomlist-manager.lo \
 	muc-channel.lo ft-manager.lo file-transfer-channel.lo \
 	presence-cache.lo tubes-manager.lo contact.lo self.lo \
-	contact-channel.lo connection.lo contact-channel.lo \
+	connection.lo connection-contact-info.lo \
 	si-bytestream-manager.lo text-helper.lo roomlist-channel.lo \
 	discovery-client.lo tube-dbus.lo tube-iface.lo tube-stream.lo \
 	tubes-channel.lo util.lo debug.lo protocol.lo plugin-loader.lo \
@@ -210,6 +211,7 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -233,6 +235,8 @@
 GMODULE_LIBS = @GMODULE_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HTML_DIR = @HTML_DIR@
@@ -255,6 +259,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
 NM = @NM@
@@ -295,12 +300,12 @@
 VERSION = @VERSION@
 WOCKY_CFLAGS = @WOCKY_CFLAGS@
 WOCKY_LIBS = @WOCKY_LIBS@
-XMLDIFF = @XMLDIFF@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -375,19 +380,18 @@
 	roomlist-manager.h muc-channel.c ft-manager.c ft-manager.h \
 	file-transfer-channel.c file-transfer-channel.h muc-channel.h \
 	presence-cache.c presence-cache.h tubes-manager.c \
-	tubes-manager.h contact.h contact.c self.h self.c \
-	contact-channel.c contact-channel.h connection.c connection.h \
-	presence.h contact-channel.h contact-channel.c \
-	si-bytestream-manager.h si-bytestream-manager.c text-helper.c \
-	text-helper.h roomlist-channel.h roomlist-channel.c \
-	discovery-client.h discovery-client.c tube-dbus.h tube-dbus.c \
-	tube-iface.h tube-iface.c tube-stream.h tube-stream.c \
-	tubes-channel.h tubes-channel.c util.h util.c \
-	$(top_srcdir)/salut/util.h debug.c debug.h protocol.c \
-	$(top_srcdir)/salut/protocol.h plugin-loader.c plugin-loader.h \
-	$(top_srcdir)/salut/plugin.h plugin.c \
-	$(top_srcdir)/salut/connection.h $(top_srcdir)/salut/sidecar.h \
-	sidecar.c $(am__append_1)
+	tubes-manager.h contact.h contact.c self.h self.c connection.c \
+	connection.h connection-contact-info.c \
+	connection-contact-info.h presence.h si-bytestream-manager.h \
+	si-bytestream-manager.c text-helper.c text-helper.h \
+	roomlist-channel.h roomlist-channel.c discovery-client.h \
+	discovery-client.c tube-dbus.h tube-dbus.c tube-iface.h \
+	tube-iface.c tube-stream.h tube-stream.c tubes-channel.h \
+	tubes-channel.c util.h util.c $(top_srcdir)/salut/util.h \
+	debug.c debug.h protocol.c $(top_srcdir)/salut/protocol.h \
+	plugin-loader.c plugin-loader.h $(top_srcdir)/salut/plugin.h \
+	plugin.c $(top_srcdir)/salut/connection.h \
+	$(top_srcdir)/salut/sidecar.h sidecar.c $(am__append_1)
 AVAHI_BACKEND_SOURCES = avahi-discovery-client.h \
 	avahi-discovery-client.c avahi-muc-manager.h \
 	avahi-muc-manager.c avahi-roomlist-manager.h \
@@ -592,9 +596,9 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/capability-set.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/caps-channel-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/caps-hash.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connection-contact-info.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connection-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connection.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/contact-channel.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/contact-manager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/contact.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Plo@am__quote@
@@ -890,12 +894,12 @@
 	if test -n "$(check_misc_sources)"; then \
 		tools_dir=$(top_srcdir)/tools \
 		sh $(top_srcdir)/tools/check-misc.sh \
-			$(check_misc_sources) || fail=1; \
+			$(addprefix $(srcdir)/,$(check_misc_sources)) || fail=1; \
 	fi; \
 	if test -n "$(check_c_sources)"; then \
 		tools_dir=$(top_srcdir)/tools \
 		sh $(top_srcdir)/tools/check-c-style.sh \
-			$(check_c_sources) || fail=1; \
+			$(addprefix $(srcdir)/,$(check_c_sources)) || fail=1; \
 	fi;\
 	if test yes = "$(ENABLE_CODING_STYLE_CHECKS)"; then \
 		exit "$$fail";\
diff -Nru telepathy-salut-0.5.0/src/muc-channel.c telepathy-salut-0.7.0/src/muc-channel.c
--- telepathy-salut-0.5.0/src/muc-channel.c	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/muc-channel.c	2011-08-23 15:54:55.000000000 +0000
@@ -33,8 +33,7 @@
 
 #include "muc-channel.h"
 
-#include 
-#include 
+#include 
 
 #include 
 #include 
@@ -44,6 +43,7 @@
 #include 
 
 #include 
+#include 
 
 #include "connection.h"
 #include "contact-manager.h"
@@ -268,8 +268,11 @@
       priv->muc_connection = g_value_get_object (value);
       break;
     case PROP_HANDLE_TYPE:
+        /* 0 is the old tp-glib value of unset, TP_UNKNOWN_HANDLE_TYPE is the
+         * new version */
       g_assert (g_value_get_uint (value) == 0
-               || g_value_get_uint (value) == TP_HANDLE_TYPE_ROOM);
+               || g_value_get_uint (value) == TP_HANDLE_TYPE_ROOM
+               || g_value_get_uint (value) == TP_UNKNOWN_HANDLE_TYPE);
       break;
     case PROP_CHANNEL_TYPE:
       tmp = g_value_get_string (value);
@@ -484,7 +487,7 @@
       ')',
       '(', "invite",
         '*', &invite_node,
-        ':', GIBBER_TELEPATHY_NS_CLIQUE,
+        ':', WOCKY_TELEPATHY_NS_CLIQUE,
         '(', "roomname",
           '$', tp_handle_inspect (room_repo, priv->handle),
         ')',
@@ -612,9 +615,7 @@
                               GError **error)
 {
   SalutMucChannel *self = SALUT_MUC_CHANNEL(iface);
-#ifdef ENABLE_DEBUG
   SalutMucChannelPrivate *priv = SALUT_MUC_CHANNEL_GET_PRIVATE (self);
-#endif
   TpBaseConnection *base_connection = TP_BASE_CONNECTION (self->connection);
   TpIntSet *empty, *remote_pending;
 
@@ -660,7 +661,7 @@
 
   /* Adding a contact, let's invite him */
 
-  DEBUG ("Trying to add handle %u to %s", handle ,priv->object_path);
+  DEBUG ("Trying to add handle %u to %s", handle, priv->object_path);
 
   if (!salut_muc_channel_send_invitation (self, handle, message, error))
     return FALSE;
@@ -944,13 +945,11 @@
                           const gchar *stanza, GError **error)
 {
   TpBaseConnection *base_connection = TP_BASE_CONNECTION (self->connection);
-#ifdef ENABLE_DEBUG
   SalutMucChannelPrivate *priv = SALUT_MUC_CHANNEL_GET_PRIVATE (self);
   TpHandleRepoIface *contact_repo =
       tp_base_connection_get_handles (base_connection, TP_HANDLE_TYPE_CONTACT);
   TpHandleRepoIface *room_repo =
       tp_base_connection_get_handles (base_connection, TP_HANDLE_TYPE_ROOM);
-#endif
   gboolean ret = TRUE;
 
   /* Got invited to this muc channel */
@@ -1135,7 +1134,7 @@
 #endif
 
   tubes_node = wocky_node_get_child_ns (node, "tubes",
-      GIBBER_TELEPATHY_NS_TUBES);
+      WOCKY_TELEPATHY_NS_TUBES);
   if (tubes_node != NULL)
     {
       SalutTubesChannel *tubes_chan;
diff -Nru telepathy-salut-0.5.0/src/muc-manager.c telepathy-salut-0.7.0/src/muc-manager.c
--- telepathy-salut-0.5.0/src/muc-manager.c	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/muc-manager.c	2011-05-09 12:46:34.000000000 +0000
@@ -25,9 +25,10 @@
 
 #include "muc-manager.h"
 
+#include 
+#include 
+
 #include 
-#include 
-#include 
 
 #include 
 
@@ -209,7 +210,7 @@
       WOCKY_PORTER_HANDLER_PRIORITY_NORMAL + 1, /* so we get called before the IM manager */
       invite_stanza_callback, obj,
       '(', "invite",
-        ':', GIBBER_TELEPATHY_NS_CLIQUE,
+        ':', WOCKY_TELEPATHY_NS_CLIQUE,
       ')', NULL);
 
   priv->status_changed_id = g_signal_connect (priv->connection,
@@ -1026,7 +1027,7 @@
   SalutContact *contact = SALUT_CONTACT (wocky_stanza_get_from_contact (stanza));
 
   invite = wocky_node_get_child_ns (wocky_stanza_get_top_node (stanza),
-        "invite", GIBBER_TELEPATHY_NS_CLIQUE);
+        "invite", WOCKY_TELEPATHY_NS_CLIQUE);
   g_assert (invite != NULL);
 
   DEBUG("Got an invitation");
@@ -1047,7 +1048,7 @@
     reason = "";
 
   params = gibber_muc_connection_get_required_parameters (
-      GIBBER_TELEPATHY_NS_CLIQUE);
+      WOCKY_TELEPATHY_NS_CLIQUE);
   if (params == NULL)
     {
       DEBUG ("Invalid invitation, (unknown protocol) discarding");
@@ -1084,7 +1085,7 @@
 
   if (chan == NULL)
     {
-      connection = _get_connection (self, GIBBER_TELEPATHY_NS_CLIQUE,
+      connection = _get_connection (self, WOCKY_TELEPATHY_NS_CLIQUE,
           params_hash, NULL);
       if (connection == NULL)
         {
@@ -1163,7 +1164,7 @@
       GUINT_TO_POINTER (room_handle));
   if (chan == NULL)
     {
-      GError e = { GIBBER_XMPP_ERROR, XMPP_ERROR_BAD_REQUEST,
+      GError e = { WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_BAD_REQUEST,
           "No tubes channel available for this MUC" };
 
       DEBUG ("tubes channel doesn't exist for muc %d", room_handle);
diff -Nru telepathy-salut-0.5.0/src/namespaces.h telepathy-salut-0.7.0/src/namespaces.h
--- telepathy-salut-0.5.0/src/namespaces.h	2011-04-22 08:08:27.000000000 +0000
+++ telepathy-salut-0.7.0/src/namespaces.h	2011-11-16 08:53:50.000000000 +0000
@@ -115,4 +115,9 @@
 #define NS_TEMPPRES "urn:xmpp:temppres:0"
 #define NS_GOOGLE_SHARED_STATUS "google:shared-status"
 
+#define NS_OLPC_ACTIVITY_PROPS  "http://laptop.org/xmpp/activity-properties"
+
+#define NS_TP_FT_METADATA_SERVICE "http://telepathy.freedesktop.org/xmpp/file-transfer-service"
+#define NS_TP_FT_METADATA       "http://telepathy.freedesktop.org/xmpp/file-transfer-metadata"
+
 #endif /* __GABBLE_NAMESPACES__H__ */
diff -Nru telepathy-salut-0.5.0/src/olpc-activity.c telepathy-salut-0.7.0/src/olpc-activity.c
--- telepathy-salut-0.5.0/src/olpc-activity.c	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/olpc-activity.c	2011-08-12 10:58:26.000000000 +0000
@@ -22,13 +22,14 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 
 #include "contact-manager.h"
 #include "olpc-activity.h"
 #include "muc-manager.h"
 #include "util.h"
+#include "namespaces.h"
 
 #include "signals-marshal.h"
 
@@ -316,12 +317,12 @@
       WOCKY_STANZA_SUB_TYPE_GROUPCHAT,
       self->connection->name, muc_name,
       WOCKY_NODE_START, "properties",
-        WOCKY_NODE_XMLNS, GIBBER_TELEPATHY_NS_OLPC_ACTIVITY_PROPS,
+        WOCKY_NODE_XMLNS, NS_OLPC_ACTIVITY_PROPS,
       WOCKY_NODE_END, NULL);
   top_node = wocky_stanza_get_top_node (stanza);
 
   properties_node = wocky_node_get_child_ns (top_node, "properties",
-      GIBBER_TELEPATHY_NS_OLPC_ACTIVITY_PROPS);
+      NS_OLPC_ACTIVITY_PROPS);
 
   salut_wocky_node_add_children_from_properties (properties_node,
       properties, "property");
@@ -620,7 +621,7 @@
       WOCKY_STANZA_SUB_TYPE_NONE,
       self->connection->name, NULL,
       WOCKY_NODE_START, "uninvite",
-        WOCKY_NODE_XMLNS, GIBBER_TELEPATHY_NS_OLPC_ACTIVITY_PROPS,
+        WOCKY_NODE_XMLNS, NS_OLPC_ACTIVITY_PROPS,
         WOCKY_NODE_ATTRIBUTE, "room", tp_handle_inspect (room_repo,
           self->room),
         WOCKY_NODE_ATTRIBUTE, "id", self->id,
@@ -673,7 +674,7 @@
   properties = salut_olpc_activity_create_properties_table (self);
 
   properties_node = wocky_node_add_child_ns (invite_node, "properties",
-      GIBBER_TELEPATHY_NS_OLPC_ACTIVITY_PROPS);
+      NS_OLPC_ACTIVITY_PROPS);
 
   /* add the activity id */
   activity_id_val = g_slice_new0 (GValue);
diff -Nru telepathy-salut-0.5.0/src/presence-cache.c telepathy-salut-0.7.0/src/presence-cache.c
--- telepathy-salut-0.5.0/src/presence-cache.c	2011-05-03 11:19:13.000000000 +0000
+++ telepathy-salut-0.7.0/src/presence-cache.c	2011-05-09 12:46:34.000000000 +0000
@@ -27,11 +27,10 @@
 
 #include 
 #include 
+#include 
 
-#include 
 #include 
 #include 
-#include 
 #include 
 
 #define DEBUG_FLAG DEBUG_PRESENCE
diff -Nru telepathy-salut-0.5.0/src/roomlist-channel.c telepathy-salut-0.7.0/src/roomlist-channel.c
--- telepathy-salut-0.5.0/src/roomlist-channel.c	2011-05-03 11:19:13.000000000 +0000
+++ telepathy-salut-0.7.0/src/roomlist-channel.c	2011-07-07 12:29:42.000000000 +0000
@@ -227,8 +227,10 @@
       break;
     case PROP_HANDLE_TYPE:
       /* this property is writable in the interface, but not actually
-       * meaningfully changable on this channel, so we do nothing */
-      g_assert (g_value_get_uint (value) == TP_HANDLE_TYPE_NONE);
+       * meaningfully changable on this channel, so we do nothing.
+       *   */
+      g_assert (g_value_get_uint (value) == TP_HANDLE_TYPE_NONE
+        || g_value_get_uint (value) == TP_UNKNOWN_HANDLE_TYPE);
       break;
     case PROP_CONNECTION:
       priv->connection = g_value_get_object (value);
diff -Nru telepathy-salut-0.5.0/src/roomlist-manager.c telepathy-salut-0.7.0/src/roomlist-manager.c
--- telepathy-salut-0.5.0/src/roomlist-manager.c	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/roomlist-manager.c	2011-05-09 12:46:34.000000000 +0000
@@ -25,9 +25,9 @@
 
 #include "roomlist-manager.h"
 
+#include 
+
 #include 
-#include 
-#include 
 
 #include 
 
diff -Nru telepathy-salut-0.5.0/src/self.c telepathy-salut-0.7.0/src/self.c
--- telepathy-salut-0.5.0/src/self.c	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/self.c	2011-05-09 12:46:34.000000000 +0000
@@ -29,12 +29,14 @@
 
 #include "self.h"
 
+#include 
+#include 
+
 #include 
-#include 
 #include 
+
 #include 
 #include 
-#include 
 
 #include "capabilities.h"
 #include "contact-manager.h"
diff -Nru telepathy-salut-0.5.0/src/si-bytestream-manager.c telepathy-salut-0.7.0/src/si-bytestream-manager.c
--- telepathy-salut-0.5.0/src/si-bytestream-manager.c	2011-05-03 11:19:13.000000000 +0000
+++ telepathy-salut-0.7.0/src/si-bytestream-manager.c	2011-05-09 12:46:34.000000000 +0000
@@ -23,13 +23,12 @@
 #include 
 #include 
 
-#include 
 #include 
+
 #include 
 #include 
 #include 
-#include 
-#include 
+#include 
 
 #include "im-manager.h"
 #include "muc-manager.h"
@@ -92,7 +91,8 @@
 
   iq = wocky_stanza_get_top_node (stanza);
 
-  *stream_init_id = wocky_node_get_attribute (iq, "id");
+  if (stream_init_id != NULL)
+    *stream_init_id = wocky_node_get_attribute (iq, "id");
 
   *from = wocky_node_get_attribute (iq, "from");
   if (*from == NULL)
@@ -102,7 +102,7 @@
     }
 
   /* Parse  */
-  si = wocky_node_get_child_ns (iq, "si", GIBBER_XMPP_NS_SI);
+  si = wocky_node_get_child_ns (iq, "si", WOCKY_XMPP_NS_SI);
   if (si == NULL)
     return FALSE;
 
@@ -126,14 +126,14 @@
 
   /* Parse  */
   feature = wocky_node_get_child_ns (si, "feature",
-      GIBBER_XMPP_NS_FEATURENEG);
+      WOCKY_XMPP_NS_FEATURENEG);
   if (feature == NULL)
     {
       DEBUG ("got a SI request without a feature field");
       return FALSE;
     }
 
-  x = wocky_node_get_child_ns (feature, "x", GIBBER_XMPP_NS_DATA);
+  x = wocky_node_get_child_ns (feature, "x", WOCKY_XMPP_NS_DATA);
   if (x == NULL)
     {
       DEBUG ("got a SI request without a X data field");
@@ -222,7 +222,7 @@
                           WockyPorter *porter,
                           SalutContact *contact,
                           const gchar *stream_id,
-                          const gchar *stream_init_id)
+                          WockyStanza *stream_init_iq)
 {
   SalutSiBytestreamManagerPrivate *priv =
     SALUT_SI_BYTESTREAM_MANAGER_GET_PRIVATE (self);
@@ -234,7 +234,7 @@
   /* check OOB */
   for (l = stream_methods; l != NULL; l = l->next)
     {
-      if (!tp_strdiff (l->data, GIBBER_XMPP_NS_IQ_OOB))
+      if (!tp_strdiff (l->data, WOCKY_XMPP_NS_IQ_OOB))
         {
           DEBUG ("choose OOB in methods list");
           return g_object_new (GIBBER_TYPE_BYTESTREAM_OOB,
@@ -244,25 +244,7 @@
               "self-id", priv->connection->name,
               "peer-id", contact->name,
               "contact", contact,
-              "stream-init-id", stream_init_id,
-              NULL);
-        }
-    }
-
-  /* check IBB */
-  for (l = stream_methods; l != NULL; l = l->next)
-    {
-      if (!tp_strdiff (l->data, GIBBER_XMPP_NS_IBB))
-        {
-          DEBUG ("choose IBB in methods list");
-          return g_object_new (GIBBER_TYPE_BYTESTREAM_IBB,
-              "porter", porter,
-              "stream-id", stream_id,
-              "state", GIBBER_BYTESTREAM_STATE_LOCAL_PENDING,
-              "self-id", priv->connection->name,
-              "peer-id", contact->name,
-              "contact", contact,
-              "stream-init-id", stream_init_id,
+              "stream-init-iq", stream_init_iq,
               NULL);
         }
     }
@@ -286,7 +268,7 @@
   GibberBytestreamIface *bytestream = NULL;
   WockyNode *top_node = wocky_stanza_get_top_node (stanza);
   WockyNode *si, *node;
-  const gchar *profile, *from, *stream_id, *stream_init_id, *mime_type;
+  const gchar *profile, *from, *stream_id, *mime_type;
   GSList *stream_methods = NULL;
   WockyContact *contact = wocky_stanza_get_from_contact (stanza);
 
@@ -294,7 +276,7 @@
    * it or send an error reply */
 
   if (!streaminit_parse_request (stanza, &profile, &from, &stream_id,
-        &stream_init_id, &mime_type, &stream_methods))
+        NULL, &mime_type, &stream_methods))
     {
       GError err = { WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_BAD_REQUEST,
                       "failed to parse SI request" };
@@ -309,7 +291,7 @@
       return TRUE;
     }
 
-  si = wocky_node_get_child_ns (top_node, "si", GIBBER_XMPP_NS_SI);
+  si = wocky_node_get_child_ns (top_node, "si", WOCKY_XMPP_NS_SI);
   g_assert (si != NULL);
 
   DEBUG ("received a SI request");
@@ -322,7 +304,7 @@
 
   /* check stream method */
   bytestream = choose_bytestream_method (self, stream_methods, porter,
-      SALUT_CONTACT (contact), stream_id, stream_init_id);
+      SALUT_CONTACT (contact), stream_id, stanza);
 
   if (bytestream == NULL)
     {
@@ -353,9 +335,9 @@
      G_CALLBACK (bytestream_state_changed), contact);
 
   /* We inform the right manager we received a SI request */
-  if (tp_strdiff (profile, GIBBER_TELEPATHY_NS_TUBES))
+  if (tp_strdiff (profile, WOCKY_TELEPATHY_NS_TUBES))
     {
-      GError e = { GIBBER_XMPP_ERROR, XMPP_ERROR_SI_BAD_PROFILE, "" };
+      GError e = { WOCKY_SI_ERROR, WOCKY_SI_ERROR_BAD_PROFILE, "" };
       DEBUG ("SI profile unsupported: %s", profile);
 
       gibber_bytestream_iface_close (bytestream, &e);
@@ -367,7 +349,7 @@
    */
 
   if ((node = wocky_node_get_child_ns (si, "muc-stream",
-          GIBBER_TELEPATHY_NS_TUBES)))
+          WOCKY_TELEPATHY_NS_TUBES)))
     {
       const gchar *muc;
       TpHandle room_handle;
@@ -398,7 +380,7 @@
     }
   else
     {
-      GError e = { GIBBER_XMPP_ERROR, XMPP_ERROR_BAD_REQUEST,
+      GError e = { WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_BAD_REQUEST,
           "Invalid tube SI request: expected ,  or "
           "" };
 
@@ -623,13 +605,7 @@
 
               '(', "option",
                 '(', "value",
-                  '$', GIBBER_XMPP_NS_IQ_OOB,
-                ')',
-              ')',
-
-              '(', "option",
-                '(', "value",
-                  '$', GIBBER_XMPP_NS_IBB,
+                  '$', WOCKY_XMPP_NS_IQ_OOB,
                 ')',
               ')',
 
@@ -756,7 +732,7 @@
     }
 
   si = wocky_node_get_child_ns (node, "si",
-      GIBBER_XMPP_NS_SI);
+      WOCKY_XMPP_NS_SI);
   if (si == NULL)
     {
       DEBUG ("got a SI reply without a si field");
@@ -764,14 +740,14 @@
     }
 
   feature = wocky_node_get_child_ns (si, "feature",
-      GIBBER_XMPP_NS_FEATURENEG);
+      WOCKY_XMPP_NS_FEATURENEG);
   if (feature == NULL)
     {
       DEBUG ("got a SI reply without a feature field");
       goto END;
     }
 
-  x = wocky_node_get_child_ns (feature, "x", GIBBER_XMPP_NS_DATA);
+  x = wocky_node_get_child_ns (feature, "x", WOCKY_XMPP_NS_DATA);
   if (x == NULL)
     {
       DEBUG ("got a SI reply without a x field");
@@ -798,7 +774,7 @@
 
       stream_method = value->content;
 
-      if (!tp_strdiff (stream_method, GIBBER_XMPP_NS_IQ_OOB))
+      if (!tp_strdiff (stream_method, WOCKY_XMPP_NS_IQ_OOB))
       {
         /* Remote user have accepted the stream */
         DEBUG ("remote user chose a OOB bytestream");
@@ -809,27 +785,13 @@
               "self-id", priv->connection->name,
               "peer-id", from,
               "contact", wocky_stanza_get_from_contact (stanza),
-              "stream-init-id", NULL,
+              "stream-init-iq", NULL,
               "host", priv->host_name_fqdn,
               NULL);
         gibber_bytestream_oob_set_check_addr_func (
             GIBBER_BYTESTREAM_OOB (bytestream), check_bytestream_oob_peer_addr,
             data->self);
       }
-    else if (!tp_strdiff (stream_method, GIBBER_XMPP_NS_IBB))
-      {
-        /* Remote user have accepted the stream */
-        DEBUG ("remote user chose a IBB bytestream");
-        bytestream = g_object_new (GIBBER_TYPE_BYTESTREAM_IBB,
-              "porter", porter,
-              "stream-id", data->stream_id,
-              "state", GIBBER_BYTESTREAM_STATE_INITIATING,
-              "self-id", priv->connection->name,
-              "peer-id", from,
-              "contact", wocky_stanza_get_from_contact (stanza),
-              "stream-init-id", NULL,
-              NULL);
-      }
     else
       {
         DEBUG ("Remote user chose an unsupported stream method");
diff -Nru telepathy-salut-0.5.0/src/text-helper.c telepathy-salut-0.7.0/src/text-helper.c
--- telepathy-salut-0.5.0/src/text-helper.c	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/text-helper.c	2011-05-09 12:46:34.000000000 +0000
@@ -30,12 +30,12 @@
 #include 
 #include 
 
-#include 
+#include 
+#include 
 
 #include 
 #include 
 #include 
-#include 
 
 #define DEBUG_FLAG DEBUG_IM
 #include "debug.h"
@@ -54,9 +54,9 @@
 
   /* Add plain xhtml-im node */
   htmlnode = wocky_node_add_child_ns (node, "html",
-      GIBBER_XMPP_NS_XHTML_IM);
+      WOCKY_XMPP_NS_XHTML_IM);
   wocky_node_add_child_with_content_ns (htmlnode, "body", text,
-      GIBBER_W3C_NS_XHTML);
+      WOCKY_W3C_NS_XHTML);
 }
 
 static WockyStanza *
@@ -182,7 +182,7 @@
   type = wocky_node_get_attribute (top_node, "type");
   /* Work around iChats strange way of doing typing notification */
   event = wocky_node_get_child_ns (top_node, "x",
-    GIBBER_XMPP_NS_EVENT);
+    WOCKY_XMPP_NS_EVENT);
 
   if (event != NULL)
     {
diff -Nru telepathy-salut-0.5.0/src/tube-dbus.c telepathy-salut-0.7.0/src/tube-dbus.c
--- telepathy-salut-0.5.0/src/tube-dbus.c	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/tube-dbus.c	2011-05-09 12:46:34.000000000 +0000
@@ -38,7 +38,6 @@
 #include 
 #include 
 
-#include 
 #include 
 #include 
 
@@ -1360,7 +1359,7 @@
   sender = tp_handle_lookup (contact_repo, from, NULL, NULL);
   if (sender == 0)
     {
-      DEBUG ("unkown sender: %s", from);
+      DEBUG ("unknown sender: %s", from);
       return;
     }
 
diff -Nru telepathy-salut-0.5.0/src/tubes-channel.c telepathy-salut-0.7.0/src/tubes-channel.c
--- telepathy-salut-0.5.0/src/tubes-channel.c	2011-05-03 11:19:13.000000000 +0000
+++ telepathy-salut-0.7.0/src/tubes-channel.c	2011-05-09 12:46:34.000000000 +0000
@@ -36,11 +36,12 @@
 #include 
 #include 
 
+#include 
+#include 
+#include 
+
 #include 
 #include 
-#include 
-#include 
-#include 
 
 #define DEBUG_FLAG DEBUG_TUBES
 #include "debug.h"
@@ -641,7 +642,7 @@
     return result;
 
   tubes_node = wocky_node_get_child_ns (top_node, "tubes",
-      GIBBER_TELEPATHY_NS_TUBES);
+      WOCKY_TELEPATHY_NS_TUBES);
   g_assert (tubes_node != NULL);
 
   /* Fill old_dbus_tubes with D-BUS tubes previoulsy announced by
@@ -1426,12 +1427,12 @@
       WOCKY_STANZA_SUB_TYPE_GROUPCHAT,
       priv->conn->name, jid,
       WOCKY_NODE_START, "tubes",
-        WOCKY_NODE_XMLNS, GIBBER_TELEPATHY_NS_TUBES,
+        WOCKY_NODE_XMLNS, WOCKY_TELEPATHY_NS_TUBES,
       WOCKY_NODE_END, NULL);
   msg_node = wocky_stanza_get_top_node (msg);
 
   node = wocky_node_get_child_ns (msg_node, "tubes",
-      GIBBER_TELEPATHY_NS_TUBES);
+      WOCKY_TELEPATHY_NS_TUBES);
 
   data.self = self;
   data.tubes_node = node;
@@ -1875,7 +1876,7 @@
           WOCKY_STANZA_SUB_TYPE_SET,
           jid_from, WOCKY_CONTACT (priv->contact),
           WOCKY_NODE_START, "tube",
-            WOCKY_NODE_XMLNS, GIBBER_TELEPATHY_NS_TUBES,
+            WOCKY_NODE_XMLNS, WOCKY_TELEPATHY_NS_TUBES,
             WOCKY_NODE_ATTRIBUTE, "type", tube_type_str,
             WOCKY_NODE_ATTRIBUTE, "service", service,
             WOCKY_NODE_ATTRIBUTE, "id", tube_id_str,
@@ -2514,15 +2515,15 @@
   g_return_if_fail (sub_type == WOCKY_STANZA_SUB_TYPE_SET);
 
   si_node = wocky_node_get_child_ns (node, "si",
-      GIBBER_XMPP_NS_SI);
+      WOCKY_XMPP_NS_SI);
   g_return_if_fail (si_node != NULL);
 
   if (priv->handle_type == TP_HANDLE_TYPE_CONTACT)
     stream_node = wocky_node_get_child_ns (si_node,
-        "stream", GIBBER_TELEPATHY_NS_TUBES);
+        "stream", WOCKY_TELEPATHY_NS_TUBES);
   else
     stream_node = wocky_node_get_child_ns (si_node,
-        "muc-stream", GIBBER_TELEPATHY_NS_TUBES);
+        "muc-stream", WOCKY_TELEPATHY_NS_TUBES);
   g_return_if_fail (stream_node != NULL);
 
   stream_id = wocky_node_get_attribute (si_node, "id");
@@ -2531,7 +2532,7 @@
   tmp = wocky_node_get_attribute (stream_node, "tube");
   if (tmp == NULL)
     {
-      GError e = { GIBBER_XMPP_ERROR, XMPP_ERROR_BAD_REQUEST,
+      GError e = { WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_BAD_REQUEST,
           " or  has no tube attribute" };
 
       DEBUG ("%s", e.message);
@@ -2541,7 +2542,7 @@
   tube_id_tmp = strtoul (tmp, &endptr, 10);
   if (!endptr || *endptr || tube_id_tmp > G_MAXUINT32)
     {
-      GError e = { GIBBER_XMPP_ERROR, XMPP_ERROR_BAD_REQUEST,
+      GError e = { WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_BAD_REQUEST,
           " or  tube attribute not numeric or > 2**32" };
 
       DEBUG ("tube id is not numeric or > 2**32: %s", tmp);
@@ -2553,7 +2554,7 @@
   tube = g_hash_table_lookup (priv->tubes, GUINT_TO_POINTER (tube_id));
   if (tube == NULL)
     {
-      GError e = { GIBBER_XMPP_ERROR, XMPP_ERROR_BAD_REQUEST,
+      GError e = { WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_BAD_REQUEST,
           " or  tube attribute points to a nonexistent "
           "tube" };
 
diff -Nru telepathy-salut-0.5.0/src/tubes-manager.c telepathy-salut-0.7.0/src/tubes-manager.c
--- telepathy-salut-0.5.0/src/tubes-manager.c	2011-05-03 11:19:13.000000000 +0000
+++ telepathy-salut-0.7.0/src/tubes-manager.c	2011-05-09 12:46:34.000000000 +0000
@@ -28,7 +28,8 @@
 #include 
 #include 
 
-#include 
+#include 
+
 #include 
 #include 
 #include 
@@ -153,9 +154,9 @@
     }
 
   tube_node = wocky_node_get_child_ns (iq, "tube",
-      GIBBER_TELEPATHY_NS_TUBES);
+      WOCKY_TELEPATHY_NS_TUBES);
   close_node = wocky_node_get_child_ns (iq, "close",
-      GIBBER_TELEPATHY_NS_TUBES);
+      WOCKY_TELEPATHY_NS_TUBES);
 
   if (tube_node == NULL && close_node == NULL)
     {
@@ -1150,8 +1151,8 @@
 #endif
 }
 
-#define STREAM_CAP_PREFIX (GIBBER_TELEPATHY_NS_TUBES "/stream#")
-#define DBUS_CAP_PREFIX (GIBBER_TELEPATHY_NS_TUBES "/dbus#")
+#define STREAM_CAP_PREFIX (WOCKY_TELEPATHY_NS_TUBES "/stream#")
+#define DBUS_CAP_PREFIX (WOCKY_TELEPATHY_NS_TUBES "/dbus#")
 
 typedef struct {
     gboolean supports_tubes;
@@ -1166,7 +1167,7 @@
   const gchar *ns = data;
   GetContactCapsClosure *closure = user_data;
 
-  if (!g_str_has_prefix (ns, GIBBER_TELEPATHY_NS_TUBES))
+  if (!g_str_has_prefix (ns, WOCKY_TELEPATHY_NS_TUBES))
     return;
 
   closure->supports_tubes = TRUE;
diff -Nru telepathy-salut-0.5.0/src/tube-stream.c telepathy-salut-0.7.0/src/tube-stream.c
--- telepathy-salut-0.5.0/src/tube-stream.c	2011-05-03 11:19:13.000000000 +0000
+++ telepathy-salut-0.7.0/src/tube-stream.c	2011-05-09 12:46:34.000000000 +0000
@@ -43,17 +43,18 @@
 #include 
 
 #include 
-#include 
+#include 
+#include 
+#include 
+
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
-#include 
 
 #define DEBUG_FLAG DEBUG_TUBES
 
@@ -535,10 +536,10 @@
   stream_id = generate_stream_id (self);
 
   msg = salut_si_bytestream_manager_make_stream_init_iq (priv->conn->name, jid,
-      stream_id, GIBBER_TELEPATHY_NS_TUBES);
+      stream_id, WOCKY_TELEPATHY_NS_TUBES);
   msg_node = wocky_stanza_get_top_node (msg);
 
-  si_node = wocky_node_get_child_ns (msg_node, "si", GIBBER_XMPP_NS_SI);
+  si_node = wocky_node_get_child_ns (msg_node, "si", WOCKY_XMPP_NS_SI);
   g_assert (si_node != NULL);
 
   id_str = g_strdup_printf ("%u", priv->id);
@@ -547,7 +548,7 @@
 
   /* FIXME: this needs standardizing */
   node = wocky_node_add_child_ns (si_node, "muc-stream",
-      GIBBER_TELEPATHY_NS_TUBES);
+      WOCKY_TELEPATHY_NS_TUBES);
   wocky_node_set_attribute (node, "muc", tp_handle_inspect (
         room_repo, priv->handle));
 
@@ -1918,7 +1919,7 @@
           WOCKY_STANZA_SUB_TYPE_SET,
           jid_from, WOCKY_CONTACT (contact),
           '(', "close",
-            ':', GIBBER_TELEPATHY_NS_TUBES,
+            ':', WOCKY_TELEPATHY_NS_TUBES,
             '@', "id", tube_id_str,
           ')', NULL);
 
@@ -1951,7 +1952,7 @@
 augment_si_accept_iq (WockyNode *si,
                       gpointer user_data)
 {
-  wocky_node_add_child_ns (si, "tube", GIBBER_TELEPATHY_NS_TUBES);
+  wocky_node_add_child_ns (si, "tube", WOCKY_TELEPATHY_NS_TUBES);
 }
 
 /**
diff -Nru telepathy-salut-0.5.0/src/util.c telepathy-salut-0.7.0/src/util.c
--- telepathy-salut-0.5.0/src/util.c	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/src/util.c	2011-09-07 15:07:50.000000000 +0000
@@ -344,6 +344,7 @@
   WockyLLContact *self_contact;
   GList *contacts, *l;
   WockyNode *message, *event, *items;
+  const gchar *pep_node;
   gchar *node;
 
   g_return_if_fail (WOCKY_IS_SESSION (session));
@@ -353,10 +354,12 @@
   event = wocky_node_get_first_child (message);
   items = wocky_node_get_first_child (event);
 
-  if (wocky_node_get_ns (items) == NULL)
+  pep_node = wocky_node_get_attribute (items, "node");
+
+  if (pep_node == NULL)
     return;
 
-  node = g_strdup_printf ("%s+notify", wocky_node_get_ns (items));
+  node = g_strdup_printf ("%s+notify", pep_node);
 
   contact_factory = wocky_session_get_contact_factory (session);
   porter = wocky_session_get_porter (session);
diff -Nru telepathy-salut-0.5.0/tests/Makefile.in telepathy-salut-0.7.0/tests/Makefile.in
--- telepathy-salut-0.5.0/tests/Makefile.in	2011-05-03 13:29:18.000000000 +0000
+++ telepathy-salut-0.7.0/tests/Makefile.in	2011-11-16 10:27:30.000000000 +0000
@@ -167,6 +167,7 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -190,6 +191,8 @@
 GMODULE_LIBS = @GMODULE_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HTML_DIR = @HTML_DIR@
@@ -212,6 +215,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
 NM = @NM@
@@ -252,12 +256,12 @@
 VERSION = @VERSION@
 WOCKY_CFLAGS = @WOCKY_CFLAGS@
 WOCKY_LIBS = @WOCKY_LIBS@
-XMLDIFF = @XMLDIFF@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -897,12 +901,12 @@
 	if test -n "$(check_misc_sources)"; then \
 		tools_dir=$(top_srcdir)/tools \
 		sh $(top_srcdir)/tools/check-misc.sh \
-			$(check_misc_sources) || fail=1; \
+			$(addprefix $(srcdir)/,$(check_misc_sources)) || fail=1; \
 	fi; \
 	if test -n "$(check_c_sources)"; then \
 		tools_dir=$(top_srcdir)/tools \
 		sh $(top_srcdir)/tools/check-c-style.sh \
-			$(check_c_sources) || fail=1; \
+			$(addprefix $(srcdir)/,$(check_c_sources)) || fail=1; \
 	fi;\
 	if test yes = "$(ENABLE_CODING_STYLE_CHECKS)"; then \
 		exit "$$fail";\
diff -Nru telepathy-salut-0.5.0/tests/twisted/avahi/aliases.py telepathy-salut-0.7.0/tests/twisted/avahi/aliases.py
--- telepathy-salut-0.5.0/tests/twisted/avahi/aliases.py	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/avahi/aliases.py	2011-09-07 14:05:38.000000000 +0000
@@ -1,23 +1,94 @@
+"""
+Test that aliases are built as expected from contacts' TXT records, and that
+the details show up correctly in ContactInfo.
+"""
+
+from servicetest import assertContains, assertEquals, assertLength, call_async
 from saluttest import exec_test, wait_for_contact_in_publish
 from avahitest import AvahiAnnouncer
 from avahitest import get_host_name
+import constants as cs
 
 import time
 
-HT_CONTACT = 1
-HT_CONTACT_LIST = 3
-
 def wait_for_aliases_changed(q, handle):
-    while True:
-        e = q.expect('dbus-signal', signal='AliasesChanged')
-        for x in e.args:
-            (h, a) = x[0]
-            if h == handle:
-                return a
+    e = q.expect('dbus-signal', signal='AliasesChanged',
+            predicate=lambda e: e.args[0][0][0] == handle)
+    _, alias = e.args[0][0]
+    return alias
+
+def wait_for_contact_info_changed(q, handle):
+    e = q.expect('dbus-signal', signal='ContactInfoChanged',
+            predicate=lambda e: e.args[0] == handle)
+    _, info = e.args
+    return info
+
+def assertOmitsField(field_name, fields):
+    def matches(field):
+        return field[0] == field_name
+
+    assertLength(0, filter(matches, fields))
+
+def check_contact_info(info, txt):
+    first = txt.get('1st', '')
+    last = txt.get('last', '')
+
+    if first != '' or last != '':
+        values = [last, first, '', '', '']
+        assertContains(('n', [], values), info)
+
+        fn = ' '.join([ x for x in [first, last] if x != ''])
+        assertContains(('fn', [], [fn]), info)
+    else:
+        assertOmitsField('n', info)
+        assertOmitsField('fn', info)
+
+    email = txt.get('email', '')
+    if email != '':
+        assertContains(('email', ['type=internet'], [email]), info)
+    else:
+        assertOmitsField('email', info)
+
+    jid = txt.get('jid', '')
+    if jid != '':
+        assertContains(('x-jabber', [], [jid]), info)
+    else:
+        assertOmitsField('x-jabber', info)
+
+def check_all_contact_info_methods(conn, handle, keys):
+    attrs = conn.Contacts.GetContactAttributes([handle],
+        [cs.CONN_IFACE_CONTACT_INFO], True)[handle]
+    info = attrs[cs.CONN_IFACE_CONTACT_INFO + "/info"]
+    check_contact_info(info, keys)
+
+    info = conn.ContactInfo.GetContactInfo([handle])[handle]
+    check_contact_info(info, keys)
+
+    info = conn.ContactInfo.RequestContactInfo(handle)
+    check_contact_info(info, keys)
 
 def test(q, bus, conn):
     conn.Connect()
-    q.expect('dbus-signal', signal='StatusChanged', args=[0L, 0L])
+    q.expect('dbus-signal', signal='StatusChanged',
+        args=[cs.CONN_STATUS_CONNECTED, cs.CSR_NONE_SPECIFIED])
+
+    assertContains(cs.CONN_IFACE_CONTACT_INFO,
+        conn.Properties.Get(cs.CONN, "Interfaces"))
+    ci_props = conn.Properties.GetAll(cs.CONN_IFACE_CONTACT_INFO)
+    assertEquals(cs.CONTACT_INFO_FLAG_PUSH, ci_props['ContactInfoFlags'])
+    assertEquals(
+        [ ('n', [], cs.CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT, 1),
+          ('fn', [], cs.CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT, 1),
+          ('email', ['type=internet'],
+           cs.CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT, 1),
+          ('x-jabber', [], cs.CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT, 1),
+
+        ],
+        ci_props['SupportedFields'])
+
+    # Just to verify that RCI does approximately nothing and doesn't crash.
+    conn.ContactInfo.RefreshContactInfo([21,42,88])
+
     basic_txt = { "txtvers": "1", "status": "avail" }
 
     contact_name = "aliastest@" + get_host_name()
@@ -25,14 +96,27 @@
 
     handle = wait_for_contact_in_publish(q, bus, conn, contact_name)
     alias = wait_for_aliases_changed(q, handle)
-    assert alias == contact_name, alias
+    assertEquals(contact_name, alias)
 
-    for (alias, dict) in [
-      ("last", { "last": "last" }),
-      ("1st", { "1st": "1st"}),
-      ("1st last", { "1st": "1st", "last": "last" }),
-      ("nickname", { "1st": "1st", "last": "last", "nick": "nickname" }),
-      (contact_name, { }) ]:
+    for (alias, dict, expect_contact_info_changed) in [
+      # Contact publishes just one of 1st and last
+      ("last", { "last": "last" }, True),
+      ("1st", { "1st": "1st"}, True),
+      # Contact publishes a meaningful value for one of 1st and last, and an
+      # empty value for the other one and for "nick". Empty values should be
+      # treated as if missing.
+      ("last", { "last": "last", "1st": "", "nick": "" }, True),
+      ("1st", { "1st": "1st", "last": "", "nick": "" }, True),
+      # When a contact publishes both 1st and last, we have to join them
+      # together in a stupid anglo-centric way, like iChat does.
+      ("1st last", { "1st": "1st", "last": "last" }, True),
+      # Nickname should be preferred as the alias to 1st or last. Since we
+      # don't report nicknames in ContactInfo, and nothing else has changed
+      # from the last update, no ContactInfo changes should be announced.
+      ("nickname", { "1st": "1st", "last": "last", "nick": "nickname" }, False),
+      # If the contact stops publishing any of this stuff, we should fall back
+      # to their JID as their alias.
+      (contact_name, {}, True) ]:
         txt = basic_txt.copy()
         txt.update(dict)
 
@@ -41,5 +125,46 @@
         a = wait_for_aliases_changed (q, handle)
         assert a == alias, (a, alias, txt)
 
+        if expect_contact_info_changed:
+            info = wait_for_contact_info_changed(q, handle)
+            check_contact_info(info, dict)
+
+        attrs = conn.Contacts.GetContactAttributes([handle],
+            [cs.CONN_IFACE_ALIASING], True)[handle]
+        assertEquals(alias, attrs[cs.CONN_IFACE_ALIASING + "/alias"])
+
+        check_all_contact_info_methods(conn, handle, dict)
+
+    for keys in [ # Check a few neat transitions, with no empty fields
+                  { "email": "foo@bar.com" },
+                  { "jid": "nyan@gmail.com", "email": "foo@bar.com" },
+                  { "jid": "orly@example.com" },
+                  # Check that empty fields are treated as if omitted
+                  { "email": "foo@bar.com", "jid": "" },
+                  { "jid": "orly@example.com", "email": "" },
+                ]:
+        txt = basic_txt.copy()
+        txt.update(keys)
+
+        announcer.set(txt)
+        info = wait_for_contact_info_changed(q, handle)
+        check_contact_info(info, keys)
+
+        check_all_contact_info_methods(conn, handle, keys)
+
+    # Try an invalid handle. Both Get and Request should return InvalidHandle.
+    # (Technically so should RefreshContactInfo but I am lazy.)
+    call_async(q, conn.ContactInfo, 'GetContactInfo', [42])
+    q.expect('dbus-error', method='GetContactInfo', name=cs.INVALID_HANDLE)
+    call_async(q, conn.ContactInfo, 'RequestContactInfo', 42)
+    q.expect('dbus-error', method='RequestContactInfo', name=cs.INVALID_HANDLE)
+
+    # Try a valid handle for whom we have no data from the network. Get should
+    # just omit them; Request should fail.
+    h = conn.RequestHandles(cs.HT_CONTACT, ['rthrtha@octopus'])[0]
+    assertEquals({}, conn.ContactInfo.GetContactInfo([h]))
+    call_async(q, conn.ContactInfo, 'RequestContactInfo', h)
+    q.expect('dbus-error', method='RequestContactInfo', name=cs.NOT_AVAILABLE)
+
 if __name__ == '__main__':
     exec_test(test)
diff -Nru telepathy-salut-0.5.0/tests/twisted/avahi/caps-file-transfer.py telepathy-salut-0.7.0/tests/twisted/avahi/caps-file-transfer.py
--- telepathy-salut-0.5.0/tests/twisted/avahi/caps-file-transfer.py	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/avahi/caps-file-transfer.py	2011-11-16 08:53:50.000000000 +0000
@@ -23,15 +23,19 @@
 
 from twisted.words.xish import xpath
 
-from servicetest import EventPattern
+from servicetest import EventPattern, assertContains, assertDoesNotContain
 from saluttest import exec_test, make_result_iq
 from xmppstream import setup_stream_listener
 import ns
 from constants import *
 
-from caps_helper import compute_caps_hash
+from caps_helper import compute_caps_hash, ft_fixed_properties, \
+    ft_allowed_properties, ft_allowed_properties_with_metadata
 from config import PACKAGE_STRING
 
+ft_caps = (ft_fixed_properties, ft_allowed_properties)
+ft_metadata_caps = (ft_fixed_properties, ft_allowed_properties_with_metadata)
+
 # last value of the "ver" key we resolved. We use it to be sure that the
 # modified caps has already be announced.
 old_ver = ''
@@ -133,11 +137,7 @@
     e = q.expect('dbus-signal', signal='ContactCapabilitiesChanged',
             predicate=lambda e: contact_handle in e.args[0])
     caps = e.args[0][contact_handle]
-    assert ({CHANNEL_TYPE: CHANNEL_TYPE_FILE_TRANSFER,
-             TARGET_HANDLE_TYPE: HT_CONTACT},
-            [FT_CONTENT_HASH_TYPE, TARGET_HANDLE, TARGET_ID, FT_CONTENT_TYPE, FT_FILENAME,
-                FT_SIZE, FT_CONTENT_HASH, FT_DESCRIPTION,
-                FT_DATE, FT_INITIAL_OFFSET, FT_URI]) in caps
+    assertContains(ft_caps, caps)
 
     caps_get = conn_caps_iface.GetContactCapabilities([contact_handle])[contact_handle]
     assert caps == caps_get
@@ -194,11 +194,7 @@
     # the FT capability is not announced
     e = q.expect('dbus-signal', signal='ContactCapabilitiesChanged')
     caps = e.args[0][contact_handle]
-    assert ({CHANNEL_TYPE: CHANNEL_TYPE_FILE_TRANSFER,
-             TARGET_HANDLE_TYPE: HT_CONTACT},
-            [FT_CONTENT_HASH_TYPE, TARGET_HANDLE, TARGET_ID, FT_CONTENT_TYPE, FT_FILENAME, FT_SIZE,
-                FT_CONTENT_HASH, FT_DESCRIPTION,
-                FT_DATE, FT_INITIAL_OFFSET, FT_URI]) not in caps
+    assertDoesNotContain(ft_caps, caps)
 
     caps_get = conn_caps_iface.GetContactCapabilities([contact_handle])[contact_handle]
     assert caps == caps_get
@@ -217,11 +213,7 @@
             predicate=lambda e: contact_handle in e.args[0].keys())
 
     caps = e.args[0][contact_handle]
-    assert ({CHANNEL_TYPE: CHANNEL_TYPE_FILE_TRANSFER,
-             TARGET_HANDLE_TYPE: HT_CONTACT},
-            [FT_CONTENT_HASH_TYPE, TARGET_HANDLE, TARGET_ID, FT_CONTENT_TYPE, FT_FILENAME,
-                FT_SIZE, FT_CONTENT_HASH, FT_DESCRIPTION,
-                FT_DATE, FT_INITIAL_OFFSET, FT_URI]) in caps
+    assertContains(ft_caps, caps)
 
     caps_get = conn_caps_iface.GetContactCapabilities([contact_handle])[contact_handle]
     assert caps == caps_get
@@ -238,11 +230,7 @@
     self_handle = conn.GetSelfHandle()
     conn_caps_iface = dbus.Interface(conn, CONN_IFACE_CONTACT_CAPS)
     caps = conn_caps_iface.GetContactCapabilities([self_handle])[self_handle]
-    assert ({CHANNEL_TYPE: CHANNEL_TYPE_FILE_TRANSFER,
-             TARGET_HANDLE_TYPE: HT_CONTACT},
-            [FT_CONTENT_HASH_TYPE, TARGET_HANDLE, TARGET_ID, FT_CONTENT_TYPE, FT_FILENAME,
-                FT_SIZE, FT_CONTENT_HASH, FT_DESCRIPTION,
-                FT_DATE, FT_INITIAL_OFFSET, FT_URI]) in caps
+    assertContains(ft_metadata_caps, caps)
 
     client = 'http://telepathy.freedesktop.org/fake-client'
     test_ft_caps_from_contact(q, bus, conn, client)
diff -Nru telepathy-salut-0.5.0/tests/twisted/avahi/caps_helper.py telepathy-salut-0.7.0/tests/twisted/avahi/caps_helper.py
--- telepathy-salut-0.5.0/tests/twisted/avahi/caps_helper.py	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/avahi/caps_helper.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,351 +0,0 @@
-# vim: set fileencoding=utf-8 :
-import hashlib
-import base64
-import dbus
-
-from avahitest import txt_get_key
-from twisted.words.xish import domish, xpath
-from saluttest import make_result_iq, make_presence, elem_iq, elem
-from servicetest import (
-    EventPattern,
-    assertEquals, assertContains, assertDoesNotContain, assertLength,
-    )
-
-import config
-import ns
-import constants as cs
-
-# The caps we always have, regardless of any clients' caps
-FIXED_CAPS = [
-    ns.JINGLE,
-    ns.JINGLE_015,
-    ns.GOOGLE_FEAT_SESSION,
-    ns.JINGLE_TRANSPORT_RAWUDP,
-    ns.NICK,
-    ns.NICK + '+notify',
-    ns.CHAT_STATES,
-    ns.SI,
-    ns.IBB,
-    ns.BYTESTREAMS,
-    ]
-
-JINGLE_CAPS = [
-    # Additional Jingle transports
-    ns.JINGLE_TRANSPORT_ICEUDP,
-    ns.GOOGLE_P2P,
-    # Jingle content types
-    ns.GOOGLE_FEAT_VOICE,
-    ns.GOOGLE_FEAT_VIDEO,
-    ns.JINGLE_015_AUDIO,
-    ns.JINGLE_015_VIDEO,
-    ns.JINGLE_RTP,
-    ns.JINGLE_RTP_AUDIO,
-    ns.JINGLE_RTP_VIDEO,
-    ]
-
-VARIABLE_CAPS = (
-    JINGLE_CAPS +
-    [
-    ns.FILE_TRANSFER,
-
-    # FIXME: currently we always advertise these, but in future we should
-    # only advertise them if >= 1 client supports them:
-    # ns.TUBES,
-
-    # there is an unlimited set of these; only the ones actually relevant to
-    # the tests so far are shown here
-    ns.TUBES + '/stream#x-abiword',
-    ns.TUBES + '/stream#daap',
-    ns.TUBES + '/stream#http',
-    ns.TUBES + '/dbus#com.example.Go',
-    ns.TUBES + '/dbus#com.example.Xiangqi',
-    ])
-
-def check_caps(namespaces, desired):
-    """Assert that all the FIXED_CAPS are supported, and of the VARIABLE_CAPS,
-    every capability in desired is supported, and every other capability is
-    not.
-    """
-    for c in FIXED_CAPS:
-        assertContains(c, namespaces)
-
-    for c in VARIABLE_CAPS:
-        if c in desired:
-            assertContains(c, namespaces)
-        else:
-            assertDoesNotContain(c, namespaces)
-
-# taken from salut's old caps_helper.py
-def check_caps_txt(txt, ver):
-    for (key, val) in { "1st": "test",
-                        "last": "suite",
-                        "status": "avail",
-                        "txtvers": "1" }.iteritems():
-        v =  txt_get_key(txt, key)
-        assert v == val, (key, val, v)
-
-    assert txt_get_key(txt, "hash") == "sha-1"
-    assert txt_get_key(txt, "node") == ns.GABBLE_CAPS
-
-    v = txt_get_key(txt, "ver")
-    assert v == ver, (v, ver)
-
-text_fixed_properties = dbus.Dictionary({
-    cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
-    cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_TEXT
-    })
-text_allowed_properties = dbus.Array([cs.TARGET_HANDLE])
-
-stream_tube_fixed_properties = dbus.Dictionary({
-    cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
-    cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_STREAM_TUBE
-    })
-stream_tube_allowed_properties = dbus.Array([cs.TARGET_HANDLE,
-    cs.TARGET_ID, cs.STREAM_TUBE_SERVICE])
-
-dbus_tube_fixed_properties = dbus.Dictionary({
-    cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
-    cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_DBUS_TUBE
-    })
-dbus_tube_allowed_properties = dbus.Array([cs.TARGET_HANDLE,
-    cs.TARGET_ID, cs.DBUS_TUBE_SERVICE_NAME])
-
-ft_fixed_properties = dbus.Dictionary({
-    cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
-    cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_FILE_TRANSFER,
-    })
-ft_allowed_properties = dbus.Array([
-    cs.CHANNEL_TYPE_FILE_TRANSFER + '.ContentHashType',
-    cs.TARGET_HANDLE,
-    cs.TARGET_ID,
-    cs.CHANNEL_TYPE_FILE_TRANSFER + '.ContentType',
-    cs.CHANNEL_TYPE_FILE_TRANSFER + '.Filename',
-    cs.CHANNEL_TYPE_FILE_TRANSFER + '.Size',
-    cs.CHANNEL_TYPE_FILE_TRANSFER + '.ContentHash',
-    cs.CHANNEL_TYPE_FILE_TRANSFER + '.Description',
-    cs.CHANNEL_TYPE_FILE_TRANSFER + '.Date',
-    cs.FT_URI])
-
-fake_client_dataforms = {
-    'urn:xmpp:dataforms:softwareinfo':
-    {'software': ['A Fake Client with Twisted'],
-        'software_version': ['5.11.2-svn-20080512'],
-        'os': ['Debian GNU/Linux unstable (sid) unstable sid'],
-        'os_version': ['2.6.24-1-amd64'],
-    },
-}
-
-def compute_caps_hash(identities, features, dataforms):
-    """
-    Accepts a list of slash-separated identities, a list of feature namespaces,
-    and a map from FORM_TYPE to (map from field name to values), returns the
-    verification string as defined by
-    .
-    """
-    components = []
-
-    for identity in sorted(identities):
-        if len(identity.split('/')) != 4:
-            raise ValueError(
-                "expecting identities of the form " +
-                "'category/type/lang/client': got " + repr(identity))
-
-        components.append(identity)
-
-    for feature in sorted(features):
-        components.append(feature)
-
-    for form_type in sorted(dataforms.keys()):
-        components.append(form_type)
-
-        for var in sorted(dataforms[form_type].keys()):
-            components.append(var)
-
-            for value in sorted(dataforms[form_type][var]):
-                components.append(value)
-
-    components.append('')
-
-    m = hashlib.sha1()
-    S = u'<'.join(components)
-    m.update(S.encode('utf-8'))
-    return base64.b64encode(m.digest())
-
-def make_caps_disco_reply(stream, req, identities, features, dataforms={}):
-    iq = make_result_iq(stream, req)
-    query = iq.firstChildElement()
-
-    for identity in identities:
-        category, type_, lang, name = identity.split('/')
-        el = query.addElement('identity')
-        el['category'] = category
-        el['type'] = type_
-        el['name'] = name
-
-    for f in features:
-        el = domish.Element((None, 'feature'))
-        el['var'] = f
-        query.addChild(el)
-
-    for type, fields in dataforms.iteritems():
-        x = query.addElement((ns.X_DATA, 'x'))
-        x['type'] = 'result'
-
-        field = x.addElement('field')
-        field['var'] = 'FORM_TYPE'
-        field['type'] = 'hidden'
-        field.addElement('value', content=type)
-
-        for var, values in fields.iteritems():
-            field = x.addElement('field')
-            field['var'] = var
-
-            for value in values:
-                field.addElement('value', content=value)
-
-    return iq
-
-def receive_presence_and_ask_caps(q, stream, expect_dbus=True):
-    # receive presence stanza
-    if expect_dbus:
-        presence, event_dbus = q.expect_many(
-                EventPattern('stream-presence'),
-                EventPattern('dbus-signal', signal='ContactCapabilitiesChanged')
-            )
-        assertLength(1, event_dbus.args)
-        signaled_caps = event_dbus.args[0]
-    else:
-        presence = q.expect('stream-presence')
-        signaled_caps = None
-
-    return disco_caps(q, stream, presence) + (signaled_caps,)
-
-def disco_caps(q, stream, presence):
-    c_nodes = xpath.queryForNodes('/presence/c', presence.stanza)
-    assert c_nodes is not None
-    assertLength(1, c_nodes)
-    hash = c_nodes[0].attributes['hash']
-    ver = c_nodes[0].attributes['ver']
-    node = c_nodes[0].attributes['node']
-    assertEquals('sha-1', hash)
-
-    # ask caps
-    request = \
-        elem_iq(stream, 'get', from_='fake_contact@jabber.org/resource')(
-          elem(ns.DISCO_INFO, 'query', node=(node + '#' + ver))
-        )
-    stream.send(request)
-
-    # receive caps
-    event = q.expect('stream-iq', query_ns=ns.DISCO_INFO, iq_id=request['id'])
-
-    # Check that Gabble's announcing the identity we think it should be.
-    identity_nodes = xpath.queryForNodes('/iq/query/identity', event.stanza)
-    assertLength(1, identity_nodes)
-    identity_node = identity_nodes[0]
-
-    assertEquals('client', identity_node['category'])
-    assertEquals(config.CLIENT_TYPE, identity_node['type'])
-    assertEquals(config.PACKAGE_STRING, identity_node['name'])
-    assertDoesNotContain('xml:lang', identity_node.attributes)
-
-    identity = 'client/%s//%s' % (config.CLIENT_TYPE, config.PACKAGE_STRING)
-
-    features = []
-    for feature in xpath.queryForNodes('/iq/query/feature', event.stanza):
-        features.append(feature['var'])
-
-    # Check if the hash matches the announced capabilities
-    assertEquals(compute_caps_hash([identity], features, {}), ver)
-
-    return (event, features)
-
-def caps_contain(event, cap):
-    node = xpath.queryForNodes('/iq/query/feature[@var="%s"]'
-            % cap,
-            event.stanza)
-    if node is None:
-        return False
-    if len(node) != 1:
-        return False
-    var = node[0].attributes['var']
-    if var is None:
-        return False
-    return var == cap
-
-def presence_and_disco(q, conn, stream, contact, disco,
-                       client, caps,
-                       features, identities=[], dataforms={},
-                       initial=True, show=None):
-    h = send_presence(q, conn, stream, contact, caps, initial=initial,
-        show=show)
-
-    if disco:
-        stanza = expect_disco(q, contact, client, caps)
-        send_disco_reply(stream, stanza, identities, features, dataforms)
-
-    return h
-
-def send_presence(q, conn, stream, contact, caps, initial=True, show=None):
-    h = conn.RequestHandles(cs.HT_CONTACT, [contact])[0]
-
-    if initial:
-        stream.send(make_presence(contact, status='hello'))
-
-        q.expect_many(
-            EventPattern('dbus-signal', signal='PresenceUpdate',
-                args=[{h:
-                   (0L, {u'available': {'message': 'hello'}})}]),
-            EventPattern('dbus-signal', signal='PresencesChanged',
-                args=[{h:
-                   (2, u'available', 'hello')}]))
-
-        # no special capabilities
-        assertEquals([(h, cs.CHANNEL_TYPE_TEXT, 3, 0)],
-            conn.Capabilities.GetCapabilities([h]))
-
-    # send updated presence with caps info
-    stream.send(make_presence(contact, show=show, status='hello', caps=caps))
-
-    return h
-
-def expect_disco(q, contact, client, caps):
-    # Gabble looks up our capabilities
-    event = q.expect('stream-iq', to=contact, query_ns=ns.DISCO_INFO)
-    assertEquals(client + '#' + caps['ver'], event.query['node'])
-
-    return event.stanza
-
-def send_disco_reply(stream, stanza, identities, features, dataforms={}):
-    stream.send(
-        make_caps_disco_reply(stream, stanza, identities, features, dataforms))
-
-if __name__ == '__main__':
-    # example from XEP-0115
-    assertEquals('QgayPKawpkPSDYmwT/WM94uAlu0=',
-        compute_caps_hash(['client/pc//Exodus 0.9.1'],
-            ["http://jabber.org/protocol/disco#info",
-             "http://jabber.org/protocol/disco#items",
-             "http://jabber.org/protocol/muc",
-             "http://jabber.org/protocol/caps"],
-            {}))
-
-    # another example from XEP-0115
-    identities = [u'client/pc/en/Psi 0.11', u'client/pc/el/Ψ 0.11']
-    features = [
-        u'http://jabber.org/protocol/caps',
-        u'http://jabber.org/protocol/disco#info',
-        u'http://jabber.org/protocol/disco#items',
-        u'http://jabber.org/protocol/muc',
-        ]
-    dataforms = {
-        u'urn:xmpp:dataforms:softwareinfo':
-            { u'ip_version': [u'ipv4', u'ipv6'],
-              u'os': [u'Mac'],
-              u'os_version': [u'10.5.1'],
-              u'software': [u'Psi'],
-              u'software_version': [u'0.11'],
-            },
-        }
-    assertEquals('q07IKJEyjvHSyhy//CH0CxmKi8w=',
-        compute_caps_hash(identities, features, dataforms))
diff -Nru telepathy-salut-0.5.0/tests/twisted/avahi/file-transfer/file_transfer_helper.py telepathy-salut-0.7.0/tests/twisted/avahi/file-transfer/file_transfer_helper.py
--- telepathy-salut-0.5.0/tests/twisted/avahi/file-transfer/file_transfer_helper.py	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/avahi/file-transfer/file_transfer_helper.py	2011-11-16 08:57:31.000000000 +0000
@@ -12,9 +12,13 @@
 from avahitest import AvahiAnnouncer, AvahiListener, get_host_name
 from saluttest import wait_for_contact_in_publish
 
+from caps_helper import extract_data_forms, add_dataforms, compute_caps_hash, \
+    send_disco_reply
+
 from xmppstream import setup_stream_listener, connect_to_stream
-from servicetest import make_channel_proxy, EventPattern, assertEquals, call_async
+from servicetest import make_channel_proxy, EventPattern, assertEquals, call_async, sync_dbus
 import constants as cs
+import ns
 
 from twisted.words.xish import domish, xpath
 
@@ -50,8 +54,13 @@
 class FileTransferTest(object):
     CONTACT_NAME = 'test-ft'
 
+    service_name = 'wacky.service.name'
+    metadata = {'loads': ['of', 'blahblah', 'stuff'],
+                'mental': ['data', 'sidf']}
+
     def __init__(self):
         self.file = File()
+        self.contact_service = None
 
     def connect(self):
         self.conn.Connect()
@@ -60,8 +69,16 @@
         self.self_handle = self.conn.GetSelfHandle()
         self.self_handle_name =  self.conn.InspectHandles(cs.HT_CONTACT, [self.self_handle])[0]
 
-    def announce_contact(self, name=CONTACT_NAME):
-        basic_txt = { "txtvers": "1", "status": "avail" }
+    def announce_contact(self, name=CONTACT_NAME, metadata=True):
+        client = 'http://telepathy.freedesktop.org/fake-client'
+        features = [ns.IQ_OOB]
+
+        if metadata:
+            features += [ns.TP_FT_METADATA]
+
+        ver = compute_caps_hash([], features, {})
+        txt_record = { "txtvers": "1", "status": "avail",
+                       "node": client, "ver": ver, "hash": "sha-1"}
 
         suffix = '@%s' % get_host_name()
         name += ('-' + os.path.splitext(os.path.basename(sys.argv[0]))[0])
@@ -74,12 +91,34 @@
         self.listener, port = setup_stream_listener(self.q, self.contact_name)
 
         self.contact_service = AvahiAnnouncer(self.contact_name, "_presence._tcp",
-                port, basic_txt)
+                port, txt_record)
 
-    def wait_for_contact(self):
         self.handle = wait_for_contact_in_publish(self.q, self.bus, self.conn,
                 self.contact_name)
 
+        # expect salut to disco our caps
+        e = self.q.expect('incoming-connection', listener=self.listener)
+        stream = e.connection
+
+        e = self.q.expect('stream-iq', to=self.contact_name, query_ns=ns.DISCO_INFO,
+                     connection=stream)
+        assertEquals(client + '#' + ver, e.query['node'])
+        send_disco_reply(stream, e.stanza, [], features)
+
+        # lose the connection here to ensure connections are created
+        # where necessary; I just wanted salut to know my caps.
+        stream.send('')
+        # spend a bit of time in the main loop to ensure the last two
+        # stanzas are actually received by salut before closing the
+        # connection.
+        sync_dbus(self.bus, self.q, self.conn)
+        stream.transport.loseConnection()
+
+    def wait_for_contact(self):
+        if not hasattr(self, 'handle'):
+            self.handle = wait_for_contact_in_publish(self.q, self.bus, self.conn,
+                    self.contact_name)
+
     def create_ft_channel(self):
         self.channel = make_channel_proxy(self.conn, self.ft_path, 'Channel')
         self.ft_channel = make_channel_proxy(self.conn, self.ft_path, 'Channel.Type.FileTransfer')
@@ -100,6 +139,10 @@
             if fct():
                 break
 
+        # if we announced the service, let's be sure to get rid of it
+        if self.contact_service:
+            self.contact_service.stop()
+
 class ReceiveFileTest(FileTransferTest):
     def __init__(self):
         FileTransferTest.__init__(self)
@@ -164,6 +207,16 @@
         url_node['size'] = str(self.file.size)
         url_node['mimeType'] = self.file.content_type
         query.addElement('desc', content=self.file.description)
+
+        # Metadata
+        if self.service_name:
+            service_form = {ns.TP_FT_METADATA_SERVICE: {'ServiceName': [self.service_name]}}
+            add_dataforms(query, service_form)
+
+        if self.metadata:
+            metadata_form = {ns.TP_FT_METADATA: self.metadata}
+            add_dataforms(query, metadata_form)
+
         self.outbound.send(iq)
 
     def check_new_channel(self):
@@ -202,6 +255,9 @@
         assert props[cs.FT_TRANSFERRED_BYTES] == 0
         assert props[cs.FT_INITIAL_OFFSET] == 0
 
+        assertEquals(self.service_name, props[cs.FT_SERVICE_NAME])
+        assertEquals(self.metadata, props[cs.FT_METADATA])
+
         self.ft_path = path
 
     def set_uri(self):
@@ -305,13 +361,13 @@
                  cs.FT_DESCRIPTION,
                  cs.FT_DATE,
                  cs.FT_INITIAL_OFFSET,
-                 cs.FT_URI],
+                 cs.FT_URI,
+                 cs.FT_SERVICE_NAME,
+                 cs.FT_METADATA],
              ) in properties.get('RequestableChannelClasses', []),\
                      properties.get('RequestableChannelClasses')
 
     def request_ft_channel(self, uri=True):
-        requests_iface = dbus.Interface(self.conn, cs.CONN_IFACE_REQUESTS)
-
         request = { cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_FILE_TRANSFER,
             cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
             cs.TARGET_HANDLE: self.handle,
@@ -325,10 +381,15 @@
             cs.FT_DATE: self.file.date,
             cs.FT_INITIAL_OFFSET: 0 }
 
+        if self.service_name:
+            request[cs.FT_SERVICE_NAME] = self.service_name
+        if self.metadata:
+            request[cs.FT_METADATA] = dbus.Dictionary(self.metadata, signature='sas')
+
         if uri:
             request[cs.FT_URI] = self.file.uri
 
-        self.ft_path, props = requests_iface.CreateChannel(request)
+        self.ft_path, props = self.conn.Requests.CreateChannel(request)
 
         # org.freedesktop.Telepathy.Channel D-Bus properties
         assert props[cs.CHANNEL_TYPE] == cs.CHANNEL_TYPE_FILE_TRANSFER
@@ -357,6 +418,8 @@
             assertEquals(self.file.uri, props[cs.FT_URI])
         else:
             assertEquals('', props[cs.FT_URI])
+        assertEquals(self.service_name, props[cs.FT_SERVICE_NAME])
+        assertEquals(self.metadata, props[cs.FT_METADATA])
 
     def got_send_iq(self):
         conn_event, iq_event = self.q.expect_many(
@@ -385,6 +448,20 @@
         self.desc = desc_node.children[0]
         assert self.desc == self.file.description
 
+        # Metadata forms
+        forms = extract_data_forms(xpath.queryForNodes('/iq/query/x', self.iq))
+
+        if self.service_name:
+            assertEquals({'ServiceName': [self.service_name]},
+                         forms[ns.TP_FT_METADATA_SERVICE])
+        else:
+            assert ns.TP_FT_METADATA_SERVICE not in forms
+
+        if self.metadata:
+            assertEquals(self.metadata, forms[ns.TP_FT_METADATA])
+        else:
+            assert ns.TP_FT_METADATA not in forms
+
     def provide_file(self):
         self.address = self.ft_channel.ProvideFile(cs.SOCKET_ADDRESS_TYPE_UNIX,
                 cs.SOCKET_ACCESS_CONTROL_LOCALHOST, "", byte_arrays=True)
diff -Nru telepathy-salut-0.5.0/tests/twisted/avahi/file-transfer/ft-client-caps.py telepathy-salut-0.7.0/tests/twisted/avahi/file-transfer/ft-client-caps.py
--- telepathy-salut-0.5.0/tests/twisted/avahi/file-transfer/ft-client-caps.py	1970-01-01 00:00:00.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/avahi/file-transfer/ft-client-caps.py	2011-11-16 08:53:50.000000000 +0000
@@ -0,0 +1,423 @@
+
+"""
+Test FT capabilities with Connection.Interface.ContactCapabilities
+
+1. Receive presence and caps from contacts and check that
+GetContactCapabilities works correctly and that ContactCapabilitiesChanged is
+correctly received. Also check that GetContactAttributes gives the same
+results.
+
+- no FT cap at all
+- FT caps without metadata extension
+- FT caps with metadata extension
+- 1 FT cap with a service name
+- 2 FT caps with service names
+- 1 FT cap again, to test whether the caps cache works with FT services
+
+2. Test UpdateCapabilities and test that a presence stanza is sent to the
+contacts, test that the D-Bus signal ContactCapabilitiesChanged is fired for
+the self handle, ask Salut for its caps with an iq request, check the reply
+is correct, and ask Salut for its caps using D-Bus method
+GetContactCapabilities. Also check that GetContactAttributes gives the same
+results.
+
+Ensure that just a Requested=True channel class in a client filter doesn't
+make a FT service advertised as a cap.
+
+- no FT cap at all
+- 1 FT cap with no service name
+- 1 Requested=True FT cap with service name
+- 1 FT cap with service name
+- 1 FT cap with service name + 1 FT cap with no service name
+- 2 FT caps with service names
+- 1 FT cap with service name again, just for fun
+
+"""
+
+import dbus
+
+from avahitest import AvahiAnnouncer, AvahiListener
+from avahitest import get_host_name
+from avahitest import txt_get_key
+import avahi
+
+from xmppstream import connect_to_stream, setup_stream_listener
+
+from twisted.words.xish import xpath
+
+from servicetest import assertEquals, assertLength, assertContains,\
+        assertDoesNotContain, sync_dbus, EventPattern
+from saluttest import exec_test, make_result_iq, sync_stream, make_presence, \
+    fixed_features
+import constants as cs
+
+from caps_helper import check_caps, compute_caps_hash, text_fixed_properties, \
+    text_allowed_properties, caps_contain, disco_caps, \
+    ft_fixed_properties, ft_allowed_properties, ft_allowed_properties_with_metadata
+import ns
+from config import PACKAGE_STRING
+
+def dict_union(a, b):
+    return dbus.Dictionary(a.items() + b.items(), signature='sv')
+
+no_service_fixed_properties = {
+    cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
+    cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_FILE_TRANSFER,
+    }
+bidir_daap_fixed_properties = dict_union(no_service_fixed_properties, {
+        cs.FT_SERVICE_NAME: 'daap'
+        })
+outgoing_daap_fixed_properties = dict_union(bidir_daap_fixed_properties, {
+        cs.REQUESTED : True,
+        })
+incoming_daap_fixed_properties = dict_union(bidir_daap_fixed_properties, {
+        cs.REQUESTED : False,
+        })
+http_fixed_properties = dict_union(no_service_fixed_properties, {
+        cs.FT_SERVICE_NAME: 'http',
+        })
+xiangqi_fixed_properties = dict_union(no_service_fixed_properties, {
+        cs.FT_SERVICE_NAME: 'com.example.Xiangqi',
+        })
+go_fixed_properties = dict_union(no_service_fixed_properties, {
+        cs.FT_SERVICE_NAME: 'com.example.Go',
+        })
+
+client = 'http://telepathy.freedesktop.org/fake-client'
+
+def assertSameElements(a, b):
+    assertEquals(sorted(a), sorted(b))
+
+def receive_caps(q, bus, conn, service, contact, contact_handle, features,
+                 expected_caps, expect_disco=True, expect_ccc=True):
+
+    ver = compute_caps_hash([], features, {})
+    txt_record = { "txtvers": "1", "status": "avail",
+                   "node": client, "ver": ver, "hash": "sha-1"}
+
+    listener, port = setup_stream_listener(q, contact)
+    AvahiAnnouncer(contact, "_presence._tcp", port, txt_record)
+
+    if expect_disco:
+        # Salut looks up our capabilities
+        e = q.expect('incoming-connection', listener=listener)
+        stream = e.connection
+
+        event = q.expect('stream-iq', to=contact, query_ns=ns.DISCO_INFO,
+                         connection=stream)
+        query_node = xpath.queryForNodes('/iq/query', event.stanza)[0]
+        assert query_node.attributes['node'] == \
+            client + '#' + ver
+
+        # send good reply
+        result = make_result_iq(event.stanza)
+        query = result.firstChildElement()
+        query['node'] = client + '#' + ver
+
+        for f in features:
+            feature = query.addElement('feature')
+            feature['var'] = f
+
+        stream.send(result)
+
+    if expect_ccc:
+        event = q.expect('dbus-signal', signal='ContactCapabilitiesChanged')
+        announced_ccs, = event.args
+        assertSameElements(expected_caps, announced_ccs[contact_handle])
+    else:
+        if expect_disco:
+            # Make sure Salut's got the caps
+            sync_stream(q, stream)
+
+    caps = conn.ContactCapabilities.GetContactCapabilities([contact_handle])
+    assertSameElements(expected_caps, caps[contact_handle])
+
+    # test again, to check GetContactCapabilities does not have side effect
+    caps = conn.ContactCapabilities.GetContactCapabilities([contact_handle])
+    assertSameElements(expected_caps, caps[contact_handle])
+
+    # check the Contacts interface give the same caps
+    caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
+            [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [contact_handle][cs.ATTR_CONTACT_CAPABILITIES]
+    assertSameElements(caps[contact_handle], caps_via_contacts_iface)
+
+    # close the connection and expect a new one to be opened by Salut
+    # the next time we need some discoing doing
+    if expect_disco:
+        stream.send('')
+        stream.transport.loseConnection()
+        # pass some time so Salut knows the connection is lost and
+        # won't try and send stuff down a closed connection on the
+        # next test.
+        sync_dbus(bus, q, conn)
+
+def test_ft_caps_from_contact(q, bus, conn, service, contact):
+    contact_handle = conn.RequestHandles(cs.HT_CONTACT, [contact])[0]
+
+    # Check that we don't crash if we haven't seen any caps/presence for this
+    # contact yet.
+    caps = conn.ContactCapabilities.GetContactCapabilities([contact_handle])
+
+    basic_caps = [(text_fixed_properties, text_allowed_properties)]
+
+    # Since we don't know their caps, they should be omitted from the dict,
+    # rather than present with no caps, but all contacts have text chat caps.
+    assertEquals([], caps[contact_handle])
+
+    # send presence with no FT cap
+    # We don't expect ContactCapabilitiesChanged to be emitted here: we always
+    # assume people can do text channels.
+    receive_caps(q, bus, conn, service, contact, contact_handle, [], basic_caps,
+        expect_ccc=False)
+
+    # send presence with no mention of metadata
+    no_metadata_ft_caps = [
+        (text_fixed_properties, text_allowed_properties),
+        (ft_fixed_properties, ft_allowed_properties)
+        ]
+    receive_caps(q, bus, conn, service, contact, contact_handle,
+        [ns.IQ_OOB], no_metadata_ft_caps)
+
+    # send presence with generic FT caps including metadata from now on
+    generic_ft_caps = [
+        (text_fixed_properties, text_allowed_properties),
+        (ft_fixed_properties, ft_allowed_properties_with_metadata)
+        ]
+    generic_ft_features = [ns.IQ_OOB, ns.TP_FT_METADATA]
+    receive_caps(q, bus, conn, service, contact, contact_handle,
+        generic_ft_features, generic_ft_caps)
+
+    # send presence with 1 FT cap with a service
+    daap_caps = generic_ft_caps + [
+        (bidir_daap_fixed_properties, ft_allowed_properties + [cs.FT_METADATA])]
+    receive_caps(q, bus, conn, service, contact, contact_handle,
+        generic_ft_features + [ns.TP_FT_METADATA + '#daap'], daap_caps)
+
+    # send presence with 2 FT caps
+    daap_xiangqi_caps = daap_caps + [
+        (xiangqi_fixed_properties, ft_allowed_properties + [cs.FT_METADATA])]
+    receive_caps(q, bus, conn, service, contact, contact_handle,
+        generic_ft_features + [ns.TP_FT_METADATA + '#com.example.Xiangqi',
+         ns.TP_FT_METADATA + '#daap',
+        ], daap_xiangqi_caps)
+
+    # send presence with 1 FT cap again
+    # Salut does not look up our capabilities because of the cache
+    receive_caps(q, bus, conn, service, contact, contact_handle,
+        generic_ft_features + [ns.TP_FT_METADATA + '#daap'], daap_caps,
+        expect_disco=False)
+
+def advertise_caps(q, bus, conn, service, filters, expected_features, unexpected_features,
+                   expected_caps):
+    # make sure nothing from a previous update is still running
+    sync_dbus(bus, q, conn)
+
+    self_handle = conn.GetSelfHandle()
+    self_handle_name =  conn.InspectHandles(1, [self_handle])[0]
+    ret_caps = conn.ContactCapabilities.UpdateCapabilities(
+            [(cs.CLIENT + '.Foo', filters, [])])
+
+    presence, event_dbus = q.expect_many(
+        EventPattern('service-resolved', service=service),
+        EventPattern('dbus-signal', signal='ContactCapabilitiesChanged')
+        )
+    assertLength(1, event_dbus.args)
+    signaled_caps = event_dbus.args[0]
+
+    outbound = connect_to_stream(q, 'test@foobar',
+        self_handle_name, str(presence.pt), presence.port)
+
+    e = q.expect('connection-result')
+    assert e.succeeded, e.reason
+
+    e = q.expect('stream-opened', connection=outbound)
+
+    # Expect Salut to reply with the correct caps
+    event, namespaces = disco_caps(q, outbound, presence.txt)
+
+    assertSameElements(expected_caps, signaled_caps[self_handle])
+
+    assertContains(ns.TP_FT_METADATA, namespaces)
+
+    for var in expected_features:
+        assertContains(var, namespaces)
+
+    for var in unexpected_features:
+        assertDoesNotContain(var, namespaces)
+
+    # Check our own caps
+    caps = conn.ContactCapabilities.GetContactCapabilities([self_handle])
+    assertSameElements(expected_caps, caps[self_handle])
+
+    # check the Contacts interface give the same caps
+    caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
+            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [self_handle][cs.ATTR_CONTACT_CAPABILITIES]
+    assertSameElements(caps[self_handle], caps_via_contacts_iface)
+
+    # close things...
+    outbound.send('')
+    sync_dbus(bus, q, conn)
+    outbound.transport.loseConnection()
+
+def test_ft_caps_to_contact(q, bus, conn, service):
+    self_handle = conn.GetSelfHandle()
+
+    basic_caps = [
+        (text_fixed_properties, text_allowed_properties),
+        (ft_fixed_properties, ft_allowed_properties_with_metadata),
+        ]
+    daap_caps = basic_caps + [
+        (bidir_daap_fixed_properties, ft_allowed_properties + [cs.FT_METADATA]),
+        ]
+    xiangqi_caps = basic_caps + [
+        (xiangqi_fixed_properties, ft_allowed_properties + [cs.FT_METADATA]),
+        ]
+    xiangqi_go_caps = xiangqi_caps + [
+        (go_fixed_properties, ft_allowed_properties + [cs.FT_METADATA]),
+        ]
+    go_caps = basic_caps + [
+        (go_fixed_properties, ft_allowed_properties + [cs.FT_METADATA]),
+        ]
+
+    #
+    # Check our own caps
+    #
+    caps = conn.ContactCapabilities.GetContactCapabilities([self_handle])
+    assertEquals(basic_caps, caps[self_handle])
+
+    # check the Contacts interface give the same caps
+    caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
+            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [self_handle][cs.ATTR_CONTACT_CAPABILITIES]
+    assertEquals(caps[self_handle], caps_via_contacts_iface)
+
+    #
+    # Advertise nothing
+    #
+    conn.ContactCapabilities.UpdateCapabilities(
+            [(cs.CLIENT + '.Foo', {}, [])])
+
+    # Check our own caps
+    caps = conn.ContactCapabilities.GetContactCapabilities([self_handle])
+    assertLength(1, caps)
+    assertEquals(basic_caps, caps[self_handle])
+
+    # check the Contacts interface give the same caps
+    caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
+            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [self_handle][cs.ATTR_CONTACT_CAPABILITIES]
+    assertEquals(caps[self_handle], caps_via_contacts_iface)
+
+    sync_dbus(bus, q, conn)
+
+    #
+    # Advertise FT but with no service name
+    #
+    conn.ContactCapabilities.UpdateCapabilities(
+            [(cs.CLIENT + '.Foo', [no_service_fixed_properties], [])])
+
+    # Check our own caps
+    caps = conn.ContactCapabilities.GetContactCapabilities([self_handle])
+    assertLength(1, caps)
+    assertEquals(basic_caps, caps[self_handle])
+
+    # check the Contacts interface give the same caps
+    caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
+            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [self_handle][cs.ATTR_CONTACT_CAPABILITIES]
+    assertEquals(caps[self_handle], caps_via_contacts_iface)
+
+    sync_dbus(bus, q, conn)
+
+    #
+    # Advertise a Requested=True FT cap
+    #
+    conn.ContactCapabilities.UpdateCapabilities(
+            [(cs.CLIENT + '.Foo', [outgoing_daap_fixed_properties], [])])
+
+    # Check our own caps
+    caps = conn.ContactCapabilities.GetContactCapabilities([self_handle])
+    assertLength(1, caps)
+    assertEquals(basic_caps, caps[self_handle])
+
+    # check the Contacts interface give the same caps
+    caps_via_contacts_iface = conn.Contacts.GetContactAttributes(
+            [self_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+            [self_handle][cs.ATTR_CONTACT_CAPABILITIES]
+    assertEquals(caps[self_handle], caps_via_contacts_iface)
+
+    advertise_caps(q, bus, conn, service,
+        [bidir_daap_fixed_properties],
+        [ns.TP_FT_METADATA + '#daap'],
+        [ns.TP_FT_METADATA + '#http',
+         ns.TP_FT_METADATA + '#com.example.Go',
+         ns.TP_FT_METADATA + '#com.example.Xiangqi',
+        ],
+        daap_caps)
+
+    advertise_caps(q, bus, conn, service,
+        [xiangqi_fixed_properties, no_service_fixed_properties],
+        [ns.TP_FT_METADATA + '#com.example.Xiangqi'],
+        [ns.TP_FT_METADATA + '#daap',
+         ns.TP_FT_METADATA + '#http',
+         ns.TP_FT_METADATA + '#com.example.Go',
+        ],
+        xiangqi_caps)
+
+    advertise_caps(q, bus, conn, service,
+        [xiangqi_fixed_properties, go_fixed_properties],
+        [ns.TP_FT_METADATA + '#com.example.Xiangqi',
+         ns.TP_FT_METADATA + '#com.example.Go',
+        ],
+        [ns.TP_FT_METADATA + '#http',
+         ns.TP_FT_METADATA + '#daap',
+        ],
+        xiangqi_go_caps)
+
+    advertise_caps(q, bus, conn, service,
+        [go_fixed_properties],
+        [ns.TP_FT_METADATA + '#com.example.Go',
+        ],
+        [ns.TP_FT_METADATA + '#http',
+         ns.TP_FT_METADATA + '#daap',
+         ns.TP_FT_METADATA + '#com.example.Xiangqi',
+        ],
+        go_caps)
+
+def test(q, bus, conn):
+    # last value of the "ver" key we resolved. We use it to be sure that the
+    # modified caps has already be announced.
+    old_ver = None
+
+    conn.Connect()
+    q.expect('dbus-signal', signal='StatusChanged', args=[0, 0])
+
+    self_handle = conn.GetSelfHandle()
+    self_handle_name =  conn.InspectHandles(1, [self_handle])[0]
+
+    AvahiListener(q).listen_for_service("_presence._tcp")
+    e = q.expect('service-added', name = self_handle_name,
+        protocol = avahi.PROTO_INET)
+    service = e.service
+    service.resolve()
+
+    e = q.expect('service-resolved', service = service)
+    ver = txt_get_key(e.txt, "ver")
+    while ver == old_ver:
+        # be sure that the announced caps actually changes
+        e = q.expect('service-resolved', service=service)
+        ver = txt_get_key(e.txt, "ver")
+    old_ver = ver
+
+    caps = compute_caps_hash(['client/pc//%s' % PACKAGE_STRING],
+        fixed_features, {})
+    assertEquals(caps, ver)
+
+    test_ft_caps_from_contact(q, bus, conn, service, 'yo@momma')
+
+    test_ft_caps_to_contact(q, bus, conn, service)
+
+if __name__ == '__main__':
+    exec_test(test)
diff -Nru telepathy-salut-0.5.0/tests/twisted/avahi/file-transfer/ichat-receive-file.py telepathy-salut-0.7.0/tests/twisted/avahi/file-transfer/ichat-receive-file.py
--- telepathy-salut-0.5.0/tests/twisted/avahi/file-transfer/ichat-receive-file.py	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/avahi/file-transfer/ichat-receive-file.py	2011-11-16 08:53:50.000000000 +0000
@@ -7,6 +7,9 @@
 from file_transfer_helper import ReceiveFileTest
 
 class IChatReceiveFile(ReceiveFileTest):
+    service_name = ''
+    metadata = {}
+
     def connect_to_salut(self):
         host, port = self._resolve_salut_presence()
 
diff -Nru telepathy-salut-0.5.0/tests/twisted/avahi/file-transfer/ichat-send-file-declined.py telepathy-salut-0.7.0/tests/twisted/avahi/file-transfer/ichat-send-file-declined.py
--- telepathy-salut-0.5.0/tests/twisted/avahi/file-transfer/ichat-send-file-declined.py	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/avahi/file-transfer/ichat-send-file-declined.py	2011-11-16 08:53:50.000000000 +0000
@@ -9,6 +9,11 @@
 class IChatSendFileDeclined(SendFileTest):
     CONTACT_NAME = 'test-ft'
 
+    # we need to unset these so we won't try and send them and then
+    # because we don't have the right caps, salut complains
+    service_name = ''
+    metadata = {}
+
     def announce_contact(self, name=CONTACT_NAME):
         basic_txt = { "txtvers": "1", "status": "avail" }
 
diff -Nru telepathy-salut-0.5.0/tests/twisted/avahi/file-transfer/ichat-send-file.py telepathy-salut-0.7.0/tests/twisted/avahi/file-transfer/ichat-send-file.py
--- telepathy-salut-0.5.0/tests/twisted/avahi/file-transfer/ichat-send-file.py	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/avahi/file-transfer/ichat-send-file.py	2011-11-16 08:53:50.000000000 +0000
@@ -10,6 +10,11 @@
 class IChatSendFileDeclined(SendFileTest):
     CONTACT_NAME = 'test-ft'
 
+    # we need to unset these so we won't try and send them and then
+    # because we don't have the right caps, salut complains
+    service_name = ''
+    metadata = {}
+
     def announce_contact(self, name=CONTACT_NAME):
         basic_txt = { "txtvers": "1", "status": "avail" }
 
diff -Nru telepathy-salut-0.5.0/tests/twisted/avahi/file-transfer/metadata.py telepathy-salut-0.7.0/tests/twisted/avahi/file-transfer/metadata.py
--- telepathy-salut-0.5.0/tests/twisted/avahi/file-transfer/metadata.py	1970-01-01 00:00:00.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/avahi/file-transfer/metadata.py	2011-11-16 08:53:50.000000000 +0000
@@ -0,0 +1,83 @@
+# The 'normal' cases are tested with test-receive-file.py and test-send-file-provide-immediately.py
+# This file tests some corner cases
+import dbus
+
+from saluttest import exec_test
+from file_transfer_helper import ReceiveFileTest, SendFileTest
+from servicetest import call_async
+
+import constants as cs
+
+class SendFileNoMetadata(SendFileTest):
+    # this is basically the equivalent of calling CreateChannel
+    # without these two properties
+    service_name = ''
+    metadata = {}
+
+class ReceiveFileNoMetadata(ReceiveFileTest):
+    service_name = ''
+    metadata = {}
+
+class SendFileBadProps(SendFileTest):
+    metadata = {'FORM_TYPE': 'this shouldnt be allowed'}
+
+    def request_ft_channel(self):
+        request = { cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_FILE_TRANSFER,
+            cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
+            cs.TARGET_HANDLE: self.handle,
+            cs.FT_CONTENT_TYPE: self.file.content_type,
+            cs.FT_FILENAME: self.file.name,
+            cs.FT_SIZE: self.file.size,
+            cs.FT_CONTENT_HASH_TYPE: self.file.hash_type,
+            cs.FT_CONTENT_HASH: self.file.hash,
+            cs.FT_DESCRIPTION: self.file.description,
+            cs.FT_DATE:  self.file.date,
+            cs.FT_INITIAL_OFFSET: 0,
+            cs.FT_SERVICE_NAME: self.service_name,
+            cs.FT_METADATA: dbus.Dictionary(self.metadata, signature='sas')}
+
+        call_async(self.q, self.conn.Requests, 'CreateChannel', request)
+
+        # FORM_TYPE is not allowed, soz
+        self.q.expect('dbus-error', method='CreateChannel', name=cs.INVALID_ARGUMENT)
+
+        return True
+
+class SendFileBadContact(SendFileTest):
+    def announce_contact(self):
+        SendFileTest.announce_contact(self, metadata=False)
+
+    def request_ft_channel(self):
+        request = { cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_FILE_TRANSFER,
+            cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
+            cs.TARGET_HANDLE: self.handle,
+            cs.FT_CONTENT_TYPE: self.file.content_type,
+            cs.FT_FILENAME: self.file.name,
+            cs.FT_SIZE: self.file.size,
+            cs.FT_CONTENT_HASH_TYPE: self.file.hash_type,
+            cs.FT_CONTENT_HASH: self.file.hash,
+            cs.FT_DESCRIPTION: self.file.description,
+            cs.FT_DATE:  self.file.date,
+            cs.FT_INITIAL_OFFSET: 0,
+            cs.FT_SERVICE_NAME: self.service_name,
+            cs.FT_METADATA: dbus.Dictionary(self.metadata, signature='sas')}
+
+        call_async(self.q, self.conn.Requests, 'CreateChannel', request)
+
+        # no support for metadata, soz
+        self.q.expect('dbus-error', method='CreateChannel', name=cs.NOT_CAPABLE)
+
+        return True
+
+if __name__ == '__main__':
+    test = SendFileNoMetadata()
+    exec_test(test.test)
+
+    test = ReceiveFileNoMetadata()
+    exec_test(test.test)
+
+    test = SendFileBadProps()
+    exec_test(test.test)
+
+    test = SendFileBadContact()
+    exec_test(test.test)
diff -Nru telepathy-salut-0.5.0/tests/twisted/avahi/file-transfer/receive-file-ipv6.py telepathy-salut-0.7.0/tests/twisted/avahi/file-transfer/receive-file-ipv6.py
--- telepathy-salut-0.5.0/tests/twisted/avahi/file-transfer/receive-file-ipv6.py	2011-05-02 15:31:52.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/avahi/file-transfer/receive-file-ipv6.py	2011-11-16 08:53:50.000000000 +0000
@@ -16,6 +16,9 @@
 class TestReceiveFileIPv6(ReceiveFileTest):
     CONTACT_NAME = 'test-ft'
 
+    service_name = ''
+    metadata = {}
+
     def announce_contact(self, name=CONTACT_NAME):
         basic_txt = { "txtvers": "1", "status": "avail" }
 
diff -Nru telepathy-salut-0.5.0/tests/twisted/avahimock.py telepathy-salut-0.7.0/tests/twisted/avahimock.py
--- telepathy-salut-0.5.0/tests/twisted/avahimock.py	2011-05-03 11:19:13.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/avahimock.py	2011-10-27 13:10:11.000000000 +0000
@@ -395,6 +395,12 @@
         self.client = client
         self.type = type_
 
+        def send_all_for_now():
+            emit_signal(self.object_path,
+                        AVAHI_IFACE_SERVICE_BROWSER, 'AllForNow',
+                        client, '')
+        gobject.idle_add(send_all_for_now)
+
     @dbus.service.method(dbus_interface=AVAHI_IFACE_SERVICE_BROWSER,
                          in_signature='', out_signature='')
     def Free(self):
diff -Nru telepathy-salut-0.5.0/tests/twisted/caps_helper.py telepathy-salut-0.7.0/tests/twisted/caps_helper.py
--- telepathy-salut-0.5.0/tests/twisted/caps_helper.py	1970-01-01 00:00:00.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/caps_helper.py	2011-11-16 08:53:50.000000000 +0000
@@ -0,0 +1,377 @@
+# vim: set fileencoding=utf-8 :
+import hashlib
+import base64
+import dbus
+
+from avahitest import txt_get_key
+from twisted.words.xish import domish, xpath
+from saluttest import make_result_iq, make_presence, elem_iq, elem
+from servicetest import (
+    EventPattern,
+    assertEquals, assertContains, assertDoesNotContain, assertLength,
+    )
+
+import config
+import ns
+import constants as cs
+
+# The caps we always have, regardless of any clients' caps
+FIXED_CAPS = [
+    ns.JINGLE,
+    ns.JINGLE_015,
+    ns.GOOGLE_FEAT_SESSION,
+    ns.JINGLE_TRANSPORT_RAWUDP,
+    ns.NICK,
+    ns.NICK + '+notify',
+    ns.CHAT_STATES,
+    ns.SI,
+    ns.IBB,
+    ns.BYTESTREAMS,
+    ]
+
+JINGLE_CAPS = [
+    # Additional Jingle transports
+    ns.JINGLE_TRANSPORT_ICEUDP,
+    ns.GOOGLE_P2P,
+    # Jingle content types
+    ns.GOOGLE_FEAT_VOICE,
+    ns.GOOGLE_FEAT_VIDEO,
+    ns.JINGLE_015_AUDIO,
+    ns.JINGLE_015_VIDEO,
+    ns.JINGLE_RTP,
+    ns.JINGLE_RTP_AUDIO,
+    ns.JINGLE_RTP_VIDEO,
+    ]
+
+VARIABLE_CAPS = (
+    JINGLE_CAPS +
+    [
+    ns.FILE_TRANSFER,
+
+    # FIXME: currently we always advertise these, but in future we should
+    # only advertise them if >= 1 client supports them:
+    # ns.TUBES,
+
+    # there is an unlimited set of these; only the ones actually relevant to
+    # the tests so far are shown here
+    ns.TUBES + '/stream#x-abiword',
+    ns.TUBES + '/stream#daap',
+    ns.TUBES + '/stream#http',
+    ns.TUBES + '/dbus#com.example.Go',
+    ns.TUBES + '/dbus#com.example.Xiangqi',
+    ])
+
+def check_caps(namespaces, desired):
+    """Assert that all the FIXED_CAPS are supported, and of the VARIABLE_CAPS,
+    every capability in desired is supported, and every other capability is
+    not.
+    """
+    for c in FIXED_CAPS:
+        assertContains(c, namespaces)
+
+    for c in VARIABLE_CAPS:
+        if c in desired:
+            assertContains(c, namespaces)
+        else:
+            assertDoesNotContain(c, namespaces)
+
+# taken from salut's old caps_helper.py
+def check_caps_txt(txt, ver):
+    for (key, val) in { "1st": "test",
+                        "last": "suite",
+                        "status": "avail",
+                        "txtvers": "1" }.iteritems():
+        v =  txt_get_key(txt, key)
+        assert v == val, (key, val, v)
+
+    assert txt_get_key(txt, "hash") == "sha-1"
+    assert txt_get_key(txt, "node") == ns.GABBLE_CAPS
+
+    v = txt_get_key(txt, "ver")
+    assert v == ver, (v, ver)
+
+text_fixed_properties = dbus.Dictionary({
+    cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
+    cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_TEXT
+    })
+text_allowed_properties = dbus.Array([cs.TARGET_HANDLE])
+
+stream_tube_fixed_properties = dbus.Dictionary({
+    cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
+    cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_STREAM_TUBE
+    })
+stream_tube_allowed_properties = dbus.Array([cs.TARGET_HANDLE,
+    cs.TARGET_ID, cs.STREAM_TUBE_SERVICE])
+
+dbus_tube_fixed_properties = dbus.Dictionary({
+    cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
+    cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_DBUS_TUBE
+    })
+dbus_tube_allowed_properties = dbus.Array([cs.TARGET_HANDLE,
+    cs.TARGET_ID, cs.DBUS_TUBE_SERVICE_NAME])
+
+ft_fixed_properties = dbus.Dictionary({
+    cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
+    cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_FILE_TRANSFER,
+    })
+ft_allowed_properties = dbus.Array([
+    cs.CHANNEL_TYPE_FILE_TRANSFER + '.ContentHashType',
+    cs.TARGET_HANDLE,
+    cs.TARGET_ID,
+    cs.CHANNEL_TYPE_FILE_TRANSFER + '.ContentType',
+    cs.CHANNEL_TYPE_FILE_TRANSFER + '.Filename',
+    cs.CHANNEL_TYPE_FILE_TRANSFER + '.Size',
+    cs.CHANNEL_TYPE_FILE_TRANSFER + '.ContentHash',
+    cs.CHANNEL_TYPE_FILE_TRANSFER + '.Description',
+    cs.CHANNEL_TYPE_FILE_TRANSFER + '.Date',
+    cs.CHANNEL_TYPE_FILE_TRANSFER + '.InitialOffset',
+    cs.FT_URI])
+ft_allowed_properties_with_metadata = ft_allowed_properties + [
+    cs.FT_SERVICE_NAME,
+    cs.FT_METADATA]
+
+fake_client_dataforms = {
+    'urn:xmpp:dataforms:softwareinfo':
+    {'software': ['A Fake Client with Twisted'],
+        'software_version': ['5.11.2-svn-20080512'],
+        'os': ['Debian GNU/Linux unstable (sid) unstable sid'],
+        'os_version': ['2.6.24-1-amd64'],
+    },
+}
+
+def compute_caps_hash(identities, features, dataforms):
+    """
+    Accepts a list of slash-separated identities, a list of feature namespaces,
+    and a map from FORM_TYPE to (map from field name to values), returns the
+    verification string as defined by
+    .
+    """
+    components = []
+
+    for identity in sorted(identities):
+        if len(identity.split('/')) != 4:
+            raise ValueError(
+                "expecting identities of the form " +
+                "'category/type/lang/client': got " + repr(identity))
+
+        components.append(identity)
+
+    for feature in sorted(features):
+        components.append(feature)
+
+    for form_type in sorted(dataforms.keys()):
+        components.append(form_type)
+
+        for var in sorted(dataforms[form_type].keys()):
+            components.append(var)
+
+            for value in sorted(dataforms[form_type][var]):
+                components.append(value)
+
+    components.append('')
+
+    m = hashlib.sha1()
+    S = u'<'.join(components)
+    m.update(S.encode('utf-8'))
+    return base64.b64encode(m.digest())
+
+def make_caps_disco_reply(stream, req, identities, features, dataforms={}):
+    iq = make_result_iq(req)
+    query = iq.firstChildElement()
+
+    for identity in identities:
+        category, type_, lang, name = identity.split('/')
+        el = query.addElement('identity')
+        el['category'] = category
+        el['type'] = type_
+        el['name'] = name
+
+    for f in features:
+        el = domish.Element((None, 'feature'))
+        el['var'] = f
+        query.addChild(el)
+
+    add_dataforms(query, dataforms)
+
+    return iq
+
+def add_dataforms(query, dataforms):
+    for type, fields in dataforms.iteritems():
+        x = query.addElement((ns.X_DATA, 'x'))
+        x['type'] = 'result'
+
+        field = x.addElement('field')
+        field['var'] = 'FORM_TYPE'
+        field['type'] = 'hidden'
+        field.addElement('value', content=type)
+
+        for var, values in fields.iteritems():
+            field = x.addElement('field')
+            field['var'] = var
+
+            for value in values:
+                field.addElement('value', content=value)
+
+def receive_presence_and_ask_caps(q, stream, expect_dbus=True):
+    # receive presence stanza
+    if expect_dbus:
+        presence, event_dbus = q.expect_many(
+                EventPattern('stream-presence'),
+                EventPattern('dbus-signal', signal='ContactCapabilitiesChanged')
+            )
+        assertLength(1, event_dbus.args)
+        signaled_caps = event_dbus.args[0]
+    else:
+        presence = q.expect('stream-presence')
+        signaled_caps = None
+
+    return disco_caps(q, stream, presence) + (signaled_caps,)
+
+def extract_data_forms(x_nodes):
+    dataforms = {}
+
+    if not x_nodes:
+        return dataforms
+
+    for form in x_nodes:
+        name = None
+        fields = {}
+        for field in xpath.queryForNodes('/x/field', form):
+            if field['var'] == 'FORM_TYPE':
+                name = str(field.firstChildElement())
+            else:
+                values = [str(x) for x in xpath.queryForNodes('/field/value', field)]
+
+                fields[field['var']] = values
+
+        if name is not None:
+            dataforms[name] = fields
+
+    return dataforms
+
+def disco_caps(q, stream, txt):
+    hash = txt_get_key(txt, 'hash')
+    ver = txt_get_key(txt, 'ver')
+    node = txt_get_key(txt, 'node')
+    assertEquals('sha-1', hash)
+
+    # ask caps
+    request = \
+        elem_iq(stream, 'get', from_='fake_contact@nearby')(
+          elem(ns.DISCO_INFO, 'query', node=(node + '#' + ver))
+        )
+    stream.send(request)
+
+    # receive caps
+    event = q.expect('stream-iq', query_ns=ns.DISCO_INFO, iq_id=request['id'])
+
+    # Check that Gabble's announcing the identity we think it should be.
+    identity_nodes = xpath.queryForNodes('/iq/query/identity', event.stanza)
+    assertLength(1, identity_nodes)
+    identity_node = identity_nodes[0]
+
+    assertEquals('client', identity_node['category'])
+    assertEquals('pc', identity_node['type'])
+    assertEquals(config.PACKAGE_STRING, identity_node['name'])
+    assertDoesNotContain('xml:lang', identity_node.attributes)
+
+    identity = 'client/%s//%s' % ('pc', config.PACKAGE_STRING)
+
+    features = []
+    for feature in xpath.queryForNodes('/iq/query/feature', event.stanza):
+        features.append(feature['var'])
+
+    # Check if the hash matches the announced capabilities
+    assertEquals(compute_caps_hash([identity], features, {}), ver)
+
+    return (event, features)
+
+def caps_contain(event, cap):
+    node = xpath.queryForNodes('/iq/query/feature[@var="%s"]'
+            % cap,
+            event.stanza)
+    if node is None:
+        return False
+    if len(node) != 1:
+        return False
+    var = node[0].attributes['var']
+    if var is None:
+        return False
+    return var == cap
+
+def presence_and_disco(q, conn, stream, contact, disco,
+                       client, caps,
+                       features, identities=[], dataforms={},
+                       initial=True, show=None):
+    h = send_presence(q, conn, stream, contact, caps, initial=initial,
+        show=show)
+
+    if disco:
+        stanza = expect_disco(q, contact, client, caps)
+        send_disco_reply(stream, stanza, identities, features, dataforms)
+
+    return h
+
+def send_presence(q, conn, stream, contact, caps, initial=True, show=None):
+    h = conn.RequestHandles(cs.HT_CONTACT, [contact])[0]
+
+    if initial:
+        stream.send(make_presence(contact, status='hello'))
+
+        q.expect_many(
+            EventPattern('dbus-signal', signal='PresenceUpdate',
+                args=[{h:
+                   (0L, {u'available': {'message': 'hello'}})}]),
+            EventPattern('dbus-signal', signal='PresencesChanged',
+                args=[{h:
+                   (2, u'available', 'hello')}]))
+
+        # no special capabilities
+        assertEquals([(h, cs.CHANNEL_TYPE_TEXT, 3, 0)],
+            conn.Capabilities.GetCapabilities([h]))
+
+    # send updated presence with caps info
+    stream.send(make_presence(contact, show=show, status='hello', caps=caps))
+
+    return h
+
+def expect_disco(q, contact, client, caps):
+    # Gabble looks up our capabilities
+    event = q.expect('stream-iq', to=contact, query_ns=ns.DISCO_INFO)
+    assertEquals(client + '#' + caps['ver'], event.query['node'])
+
+    return event.stanza
+
+def send_disco_reply(stream, stanza, identities, features, dataforms={}):
+    stream.send(
+        make_caps_disco_reply(stream, stanza, identities, features, dataforms))
+
+if __name__ == '__main__':
+    # example from XEP-0115
+    assertEquals('QgayPKawpkPSDYmwT/WM94uAlu0=',
+        compute_caps_hash(['client/pc//Exodus 0.9.1'],
+            ["http://jabber.org/protocol/disco#info",
+             "http://jabber.org/protocol/disco#items",
+             "http://jabber.org/protocol/muc",
+             "http://jabber.org/protocol/caps"],
+            {}))
+
+    # another example from XEP-0115
+    identities = [u'client/pc/en/Psi 0.11', u'client/pc/el/Ψ 0.11']
+    features = [
+        u'http://jabber.org/protocol/caps',
+        u'http://jabber.org/protocol/disco#info',
+        u'http://jabber.org/protocol/disco#items',
+        u'http://jabber.org/protocol/muc',
+        ]
+    dataforms = {
+        u'urn:xmpp:dataforms:softwareinfo':
+            { u'ip_version': [u'ipv4', u'ipv6'],
+              u'os': [u'Mac'],
+              u'os_version': [u'10.5.1'],
+              u'software': [u'Psi'],
+              u'software_version': [u'0.11'],
+            },
+        }
+    assertEquals('q07IKJEyjvHSyhy//CH0CxmKi8w=',
+        compute_caps_hash(identities, features, dataforms))
diff -Nru telepathy-salut-0.5.0/tests/twisted/config.py telepathy-salut-0.7.0/tests/twisted/config.py
--- telepathy-salut-0.5.0/tests/twisted/config.py	2011-05-03 13:29:45.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/config.py	2011-11-16 10:27:50.000000000 +0000
@@ -1,2 +1,2 @@
-PACKAGE_STRING = "Telepathy Salut 0.5.0"
+PACKAGE_STRING = "Telepathy Salut 0.7.0"
 PLUGINS_ENABLED = True
diff -Nru telepathy-salut-0.5.0/tests/twisted/constants.py telepathy-salut-0.7.0/tests/twisted/constants.py
--- telepathy-salut-0.5.0/tests/twisted/constants.py	2011-04-22 08:08:27.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/constants.py	2011-11-16 08:53:50.000000000 +0000
@@ -26,6 +26,7 @@
 CHANNEL_IFACE_TUBE = CHANNEL + ".Interface.Tube"
 CHANNEL_IFACE_SASL_AUTH = CHANNEL + ".Interface.SASLAuthentication"
 CHANNEL_IFACE_CONFERENCE = CHANNEL + '.Interface.Conference'
+CHANNEL_IFACE_FILE_TRANSFER_METADATA = CHANNEL + '.Interface.FileTransfer.Metadata'
 
 CHANNEL_TYPE_CALL = CHANNEL + ".Type.Call.DRAFT"
 CHANNEL_TYPE_CONTACT_LIST = CHANNEL + ".Type.ContactList"
@@ -264,6 +265,8 @@
 FT_INITIAL_OFFSET = CHANNEL_TYPE_FILE_TRANSFER + '.InitialOffset'
 FT_FILE_COLLECTION = CHANNEL_TYPE_FILE_TRANSFER + '.FUTURE.FileCollection'
 FT_URI = CHANNEL_TYPE_FILE_TRANSFER + '.URI'
+FT_SERVICE_NAME = CHANNEL_IFACE_FILE_TRANSFER_METADATA + '.ServiceName'
+FT_METADATA = CHANNEL_IFACE_FILE_TRANSFER_METADATA + '.Metadata'
 
 GF_CAN_ADD = 1
 GF_CAN_REMOVE = 2
@@ -355,7 +358,8 @@
 
 CONTACT_INFO_FLAG_CAN_SET = 1
 CONTACT_INFO_FLAG_PUSH = 2
-CONTACT_INFO_FIELD_FLAG_PARAMETERS_MANDATORY = 1
+CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT = 1
+CONTACT_INFO_FIELD_FLAG_OVERWRITTEN_BY_NICKNAME = 2
 
 # Channel_Interface_SaslAuthentication
 SASL_STATUS_NOT_STARTED = 0
diff -Nru telepathy-salut-0.5.0/tests/twisted/ipv6.py telepathy-salut-0.7.0/tests/twisted/ipv6.py
--- telepathy-salut-0.5.0/tests/twisted/ipv6.py	1970-01-01 00:00:00.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/ipv6.py	2011-04-25 13:46:40.000000000 +0000
@@ -0,0 +1,181 @@
+import socket
+from twisted.internet import tcp
+
+class Ipv6Server(tcp.Server):
+    def getHost(self):
+        return IPv6Address('TCP', *(self.socket.getsockname()))
+
+    def getPeer(self):
+        return IPv6Address('TCP', *(self.client))
+
+class Ipv6Port(tcp.Port):
+    addressFamily = socket.AF_INET6
+
+    transport = Ipv6Server
+
+    def _buildAddr(self, (host, port, flowinfo, scopeid)):
+        """
+        Build and return an IPv6Address from the passed sockaddr-in6 tuple.
+        """
+        return IPv6Address('TCP', host, port, flowinfo, scopeid)
+
+    def getHost(self):
+        return IPv6Address('TCP', *(self.socket.getsockname()))
+
+def listenTCP6(port, factory, backlog=5, interface='::', reactor=None):
+    if reactor is None:
+        from twisted.internet import reactor
+    p = Ipv6Port(port, factory, backlog, interface, reactor=reactor)
+    p.startListening()
+    return p
+
+# stolen from http://twistedmatrix.com/trac/attachment/ticket/3014/ipv6.2.patch
+from zope.interface import implements
+from twisted.internet.interfaces import IAddress
+from twisted.internet import base, address, error
+from twisted.internet.tcp import Client
+from twisted.python.util import unsignedID
+import types
+
+class IPv6Address(object):
+    """
+    Object representing an IPv6 socket endpoint.
+
+    @ivar type: A string describing the type of transport, either 'TCP' or 'UDP'.
+    @ivar host: A string containing the coloned-oct IP address.
+    @ivar port: An integer representing the port number.
+    @ivar flowinfo: An integer representing the sockaddr-in6 flowinfo
+    @ivar scopeid: An integer representing the sockaddr-in6 scopeid
+    """
+
+    implements(IAddress)
+
+    def __init__(self, type, host, port, flowinfo=0, scopeid=0):
+        if type not in ('TCP', 'UDP'):
+            raise ValueError, "illegal transport type"
+        self.type = type
+        self.host = host
+        self.port = port
+        self.flowinfo = flowinfo
+        self.scopeid = scopeid
+
+    def __eq__(self, other):
+        if isinstance(other, tuple):
+            return tuple(self) == other
+        elif isinstance(other, IPv6Address):
+            a = (self.type, self.host, self.port, self.flowinfo, self.scopeid)
+            b = (other.type, other.host, other.port, other.flowinfo, other.scopeid)
+            return a == b
+        return False
+
+    def __str__(self):
+        return 'IPv6Address(%s, %r, %d, %s, %s, %s)' % (self.type, self.host,
+          self.port, self.flowinfo, self.scopeid)
+
+class Client6(Client):
+    """
+    A TCP6 client.
+    """
+    addressFamily = socket.AF_INET6
+
+    def __init__(self, host, port, bindAddress, connector, reactor=None,
+                 flowinfo=0, scopeid=0):
+        Client.__init__(self, host, port, bindAddress, connector, reactor)
+        self.addr = (host, port, flowinfo, scopeid)
+
+    def resolveAddress(self):
+        """
+        Lookup the IPv6 address for self.addr[0] if necessary, then set
+        self.realAddress to that IPv6 address.
+        """
+        if isIPv6Address(self.addr[0]):
+            self._setRealAddress(self.addr[0])
+        else:
+            d = self.reactor.resolve(self.addr[0])
+            d.addCallbacks(self._setRealAddress, self.failIfNotConnected)
+
+    def _setRealAddress(self, address):
+        """
+        Set self.realAddress[0] to address.  Set the remaining parts of 
+        self.realAddress to the corresponding parts of self.addr.
+        """
+        self.realAddress = (address, self.addr[1], self.addr[2], self.addr[3])
+        self.doConnect()
+
+    def getHost(self):
+        """
+        Returns an IPv6Address.
+
+        This indicates the address from which I am connecting.
+        """
+        return address.IPv6Address('TCP', *(self.socket.getsockname()))
+
+    def getPeer(self):
+        """
+        Returns an IPv6Address.
+
+        This indicates the address that I am connected to.
+        """
+        return IPv6Address('TCP', *(self.addr))
+
+    def __repr__(self):
+        s = '<%s to %s at %x>' % (self.__class__, self.addr, unsignedID(self))
+        return s
+
+class Connector6(base.BaseConnector):
+    """
+    IPv6 implementation of connector
+
+    @ivar flowinfo An integer representing the sockaddr-in6 flowinfo
+    @ivar scopeid An integer representing the sockaddr-in6 scopeid
+    """
+
+    def __init__(self, host, port, factory, timeout, bindAddress,
+                 reactor=None, flowinfo=0, scopeid=0):
+        self.host = host
+        if isinstance(port, types.StringTypes):
+            try:
+                port = socket.getservbyname(port, 'tcp')
+            except socket.error, e:
+                raise error.ServiceNameUnknownError(string="%s (%r)" % (e, port))
+        self.port = port
+        self.bindAddress = bindAddress
+        self.flowinfo = flowinfo
+        self.scopeid = scopeid
+        base.BaseConnector.__init__(self, factory, timeout, reactor)
+
+    def _makeTransport(self):
+        """
+        Build and return a TCP6 client for the connector's transport.
+        """
+        return Client6(self.host, self.port, self.bindAddress, self,
+                      self.reactor, self.flowinfo, self.scopeid)
+
+    def getDestination(self):
+        """
+        @see twisted.internet.interfaces.IConnector.getDestination
+        """
+        return address.IPv6Address('TCP', self.host, self.port, self.flowinfo,
+                                   self.scopeid)
+
+def connectTCP6(reactor, host, port, factory, timeout=30, bindAddress=None,
+        flowinfo=0, scopeid=0):
+        """
+        @see: twisted.internet.interfaces.IReactorTCP.connectTCP6
+        """
+        c = Connector6(host, port, factory, timeout, bindAddress, reactor,
+                           flowinfo, scopeid)
+        c.connect()
+        return c
+
+def isIPv6Address(ip):
+    """
+    Return True iff ip is a valid bare IPv6 address.
+
+    Return False for 'enhanced' IPv6 addresses like '::1%lo' and '::1/128'
+    """
+    try:
+        socket.inet_pton(socket.AF_INET6, ip)
+    except (ValueError, socket.error):
+        return False
+    return True
diff -Nru telepathy-salut-0.5.0/tests/twisted/Makefile.am telepathy-salut-0.7.0/tests/twisted/Makefile.am
--- telepathy-salut-0.5.0/tests/twisted/Makefile.am	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/Makefile.am	2011-11-16 10:27:05.000000000 +0000
@@ -6,7 +6,7 @@
 	$(NULL)
 
 TWISTED_AVAHI_TESTS = \
-	avahi/caps_helper.py \
+	caps_helper.py \
 	avahi/register.py \
 	avahi/aliases.py \
 	avahi/request-im.py \
@@ -32,6 +32,8 @@
 	avahi/file-transfer/receive-file-decline.py \
 	avahi/file-transfer/receive-file-ipv6.py \
 	avahi/file-transfer/receive-file-not-found.py \
+	avahi/file-transfer/metadata.py \
+	avahi/file-transfer/ft-client-caps.py \
 	avahi/caps-self.py \
 	avahi/caps-tubes.py \
 	avahi/text-channel.py \
@@ -106,6 +108,7 @@
 
 EXTRA_DIST = \
 	$(TWISTED_AVAHI_TESTS) \
+	$(TWISTED_AVAHI_OLPC_TESTS) \
 	$(TWISTED_BASIC_TESTS) \
 	constants.py \
 	saluttest.py \
@@ -116,7 +119,9 @@
         config.py \
 	ns.py \
 	avahi/file-transfer/file_transfer_helper.py \
-	avahi/tubes/tubetestutil.py
+	avahi/tubes/tubetestutil.py \
+	xmppstream.py \
+	ipv6.py
 
 CLEANFILES = salut-[1-9]*.log *.pyc */*.pyc config.py
 
diff -Nru telepathy-salut-0.5.0/tests/twisted/Makefile.in telepathy-salut-0.7.0/tests/twisted/Makefile.in
--- telepathy-salut-0.5.0/tests/twisted/Makefile.in	2011-05-03 13:29:18.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/Makefile.in	2011-11-16 10:27:30.000000000 +0000
@@ -132,6 +132,7 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -155,6 +156,8 @@
 GMODULE_LIBS = @GMODULE_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HTML_DIR = @HTML_DIR@
@@ -177,6 +180,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
 NM = @NM@
@@ -217,12 +221,12 @@
 VERSION = @VERSION@
 WOCKY_CFLAGS = @WOCKY_CFLAGS@
 WOCKY_LIBS = @WOCKY_LIBS@
-XMLDIFF = @XMLDIFF@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -281,7 +285,7 @@
 	sidecars.py \
 	$(NULL)
 
-TWISTED_AVAHI_TESTS = avahi/caps_helper.py avahi/register.py \
+TWISTED_AVAHI_TESTS = caps_helper.py avahi/register.py \
 	avahi/aliases.py avahi/request-im.py avahi/muc-invite.py \
 	avahi/caps-file-transfer.py avahi/close-local-pending-room.py \
 	avahi/tubes/disabled-1-1-tubes.py \
@@ -303,7 +307,9 @@
 	avahi/file-transfer/receive-file-decline.py \
 	avahi/file-transfer/receive-file-ipv6.py \
 	avahi/file-transfer/receive-file-not-found.py \
-	avahi/caps-self.py avahi/caps-tubes.py avahi/text-channel.py \
+	avahi/file-transfer/metadata.py \
+	avahi/file-transfer/ft-client-caps.py avahi/caps-self.py \
+	avahi/caps-tubes.py avahi/text-channel.py \
 	avahi/ichat-composing.py avahi/ichat-incoming-msg.py \
 	avahi/file-transfer/ichat-receive-directory.py \
 	avahi/file-transfer/ichat-receive-file.py \
@@ -328,6 +334,7 @@
 BUILT_SOURCES = config.py
 EXTRA_DIST = \
 	$(TWISTED_AVAHI_TESTS) \
+	$(TWISTED_AVAHI_OLPC_TESTS) \
 	$(TWISTED_BASIC_TESTS) \
 	constants.py \
 	saluttest.py \
@@ -338,7 +345,9 @@
         config.py \
 	ns.py \
 	avahi/file-transfer/file_transfer_helper.py \
-	avahi/tubes/tubetestutil.py
+	avahi/tubes/tubetestutil.py \
+	xmppstream.py \
+	ipv6.py
 
 CLEANFILES = salut-[1-9]*.log *.pyc */*.pyc config.py
 check_misc_sources = $(TESTS)
@@ -817,12 +826,12 @@
 	if test -n "$(check_misc_sources)"; then \
 		tools_dir=$(top_srcdir)/tools \
 		sh $(top_srcdir)/tools/check-misc.sh \
-			$(check_misc_sources) || fail=1; \
+			$(addprefix $(srcdir)/,$(check_misc_sources)) || fail=1; \
 	fi; \
 	if test -n "$(check_c_sources)"; then \
 		tools_dir=$(top_srcdir)/tools \
 		sh $(top_srcdir)/tools/check-c-style.sh \
-			$(check_c_sources) || fail=1; \
+			$(addprefix $(srcdir)/,$(check_c_sources)) || fail=1; \
 	fi;\
 	if test yes = "$(ENABLE_CODING_STYLE_CHECKS)"; then \
 		exit "$$fail";\
diff -Nru telepathy-salut-0.5.0/tests/twisted/ns.py telepathy-salut-0.7.0/tests/twisted/ns.py
--- telepathy-salut-0.5.0/tests/twisted/ns.py	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/ns.py	2011-11-16 08:53:50.000000000 +0000
@@ -76,3 +76,5 @@
 INVISIBLE = 'urn:xmpp:invisible:0'
 GOOGLE_SHARED_STATUS = 'google:shared-status'
 VERSION = 'jabber:iq:version'
+TP_FT_METADATA_SERVICE = 'http://telepathy.freedesktop.org/xmpp/file-transfer-service'
+TP_FT_METADATA = 'http://telepathy.freedesktop.org/xmpp/file-transfer-metadata'
diff -Nru telepathy-salut-0.5.0/tests/twisted/saluttest.py telepathy-salut-0.7.0/tests/twisted/saluttest.py
--- telepathy-salut-0.5.0/tests/twisted/saluttest.py	2011-04-29 08:55:14.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/saluttest.py	2011-11-16 08:53:50.000000000 +0000
@@ -21,7 +21,7 @@
 import glib
 
 # keep sync with src/capabilities.c:self_advertised_features
-fixed_features = [ns.SI, ns.IBB, ns.TUBES, ns.IQ_OOB, ns.X_OOB]
+fixed_features = [ns.SI, ns.TUBES, ns.IQ_OOB, ns.X_OOB, ns.TP_FT_METADATA]
 
 def make_result_iq(iq):
     result = IQ(None, "result")
@@ -203,12 +203,6 @@
         cs.TARGET_HANDLE_TYPE: cs.HT_LIST,
         cs.TARGET_ID: 'subscribe'})
     q.expect('dbus-signal', signal='NewChannel')
-    # known
-    requestotron.EnsureChannel({
-        cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_CONTACT_LIST,
-        cs.TARGET_HANDLE_TYPE: cs.HT_LIST,
-        cs.TARGET_ID: 'known'})
-    q.expect('dbus-signal', signal='NewChannel')
 
 def wait_for_contact_in_publish(q, bus, conn, contact_name):
     publish_handle = conn.RequestHandles(cs.HT_LIST, ["publish"])[0]
@@ -220,8 +214,15 @@
     while handle == 0:
         e = q.expect('dbus-signal', signal='MembersChangedDetailed',
                 path=publish)
+        # Versions of telepathy-glib prior to 0.14.6 incorrectly used the name
+        # 'member-ids'.
+        try:
+            ids = e.args[4]['contact-ids']
+        except KeyError:
+            ids = e.args[4]['member-ids']
+
         for h in e.args[0]:
-            name = e.args[4]['member-ids'][h]
+            name = ids[h]
             if name == contact_name:
                 handle = h
 
diff -Nru telepathy-salut-0.5.0/tests/twisted/tools/Makefile.in telepathy-salut-0.7.0/tests/twisted/tools/Makefile.in
--- telepathy-salut-0.5.0/tests/twisted/tools/Makefile.in	2011-05-03 13:29:18.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/tools/Makefile.in	2011-11-16 10:27:30.000000000 +0000
@@ -85,6 +85,7 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -108,6 +109,8 @@
 GMODULE_LIBS = @GMODULE_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HTML_DIR = @HTML_DIR@
@@ -130,6 +133,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
 NM = @NM@
@@ -170,12 +174,12 @@
 VERSION = @VERSION@
 WOCKY_CFLAGS = @WOCKY_CFLAGS@
 WOCKY_LIBS = @WOCKY_LIBS@
-XMLDIFF = @XMLDIFF@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
diff -Nru telepathy-salut-0.5.0/tests/twisted/tools/with-session-bus.sh telepathy-salut-0.7.0/tests/twisted/tools/with-session-bus.sh
--- telepathy-salut-0.5.0/tests/twisted/tools/with-session-bus.sh	2011-04-25 13:46:40.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/tools/with-session-bus.sh	2011-09-20 14:52:52.000000000 +0000
@@ -90,7 +90,7 @@
 fi
 
 if [ -n "$WITH_SESSION_BUS_FORK_DBUS_MONITOR" ] ; then
-  echo -n "Forking dbus-monitor $WITH_SESSION_BUS_FORK_DBUS_MONITOR_OPT" >&2
+  echo "Forking dbus-monitor $WITH_SESSION_BUS_FORK_DBUS_MONITOR_OPT" >&2
   dbus-monitor $WITH_SESSION_BUS_FORK_DBUS_MONITOR_OPT \
         > $me-$$.dbus-monitor-logs 2>&1 &
 fi
diff -Nru telepathy-salut-0.5.0/tests/twisted/xmppstream.py telepathy-salut-0.7.0/tests/twisted/xmppstream.py
--- telepathy-salut-0.5.0/tests/twisted/xmppstream.py	1970-01-01 00:00:00.000000000 +0000
+++ telepathy-salut-0.7.0/tests/twisted/xmppstream.py	2011-04-25 13:46:40.000000000 +0000
@@ -0,0 +1,257 @@
+
+"""
+Infrastructure code for testing. Implements incoming and outgoing xml/xmpp
+streams
+"""
+
+import servicetest
+from servicetest import Event, EventPattern
+import twisted
+from twisted.words.xish import domish, xpath, xmlstream
+from twisted.internet.protocol import Factory, ClientFactory
+from twisted.internet import reactor
+
+from ipv6 import listenTCP6, connectTCP6
+
+NS_STREAMS = 'http://etherx.jabber.org/streams'
+
+def make_stream_event(type, stanza):
+    event = servicetest.Event(type, stanza=stanza)
+    if stanza.hasAttribute("to"):
+        event.to = stanza.getAttribute("to")
+    else:
+        event.to = None
+
+    if stanza.hasAttribute("from"):
+        event.from_ = stanza.getAttribute("from")
+    else:
+        event.from_ = None
+
+    event.name = event.to
+    event.remote_name = event.from_
+
+    return event
+
+def make_iq_event(iq):
+    event = make_stream_event('stream-iq', iq)
+    event.iq_type = iq.getAttribute("type")
+    event.iq_id = iq.getAttribute("id")
+    query = iq.firstChildElement()
+
+    if query:
+        event.query = query
+        event.query_ns = query.uri
+        event.query_name = query.name
+
+        if query.getAttribute("node"):
+            event.query_node = query.getAttribute("node")
+    else:
+        event.query = None
+
+    return event
+
+def make_presence_event(stanza):
+    event = make_stream_event('stream-presence', stanza)
+    event.presence_type = stanza.getAttribute('type')
+
+    statuses = xpath.queryForNodes('/presence/status', stanza)
+
+    if statuses:
+        event.presence_status = str(statuses[0])
+
+    return event
+
+def make_message_event(stanza):
+    event = make_stream_event('stream-message', stanza)
+    event.message_type = stanza.getAttribute('type')
+    return event
+
+class BaseXmlStream(xmlstream.XmlStream):
+    prefixes = { NS_STREAMS: 'stream' }
+    version = "1.0"
+    namespace = 'jabber:client'
+
+    def __init__(self, event_function, name = None, remote_name = None):
+        xmlstream.XmlStream.__init__(self)
+
+        self.name = name
+        self.remote_name = remote_name
+        self.event_func = event_function
+
+        self.event_function = event_function
+        self.addObserver(xmlstream.STREAM_START_EVENT,
+            lambda *args: self.event(Event('stream-opened')))
+        self.addObserver('//features', lambda x: self.event(
+            make_stream_event('stream-features', x)))
+        self.addObserver('//iq', lambda x: self.event(
+            make_iq_event(x)))
+        self.addObserver('//message', lambda x: self.event(
+            make_message_event(x)))
+        self.addObserver('//presence', lambda x: self.event(
+            make_presence_event(x)))
+
+    def send_header(self):
+        root = domish.Element((NS_STREAMS, 'stream'), 'jabber:client')
+        if self.name is not None:
+            root['from'] = self.name
+        if self.remote_name is not None:
+            root['to'] = self.remote_name
+        root['version'] = self.version
+        self.send(root.toXml(closeElement = 0, prefixes=self.prefixes))
+
+    def event(self, e):
+        e.connection = self
+        self.event_function(e)
+
+    def send(self, obj):
+        if domish.IElement.providedBy(obj):
+            if self.name != None:
+                obj["from"] = self.name
+            if self.remote_name != None:
+                obj["to"] = self.remote_name
+            obj = obj.toXml(prefixes=self.prefixes)
+
+        xmlstream.XmlStream.send(self, obj)
+
+
+class IncomingXmppStream(BaseXmlStream):
+    def __init__(self, event_func, name):
+        BaseXmlStream.__init__(self, event_func, name, None)
+
+    def onDocumentStart(self, rootElement):
+        # Use the fact that it's always salut that connects, so it sends a
+        # proper opening
+        assert rootElement.name == "stream"
+        assert rootElement.uri == NS_STREAMS
+
+        assert rootElement.hasAttribute("from")
+        assert rootElement.hasAttribute("to")
+        if self.name is not None:
+            assert rootElement["to"] == self.name, self.name
+
+        assert rootElement.hasAttribute("version")
+        assert rootElement["version"] == "1.0"
+
+        self.remote_name = rootElement["from"]
+        self.send_header()
+        self.send_features()
+        BaseXmlStream.onDocumentStart(self, rootElement)
+
+    def send_features(self):
+        features = domish.Element((NS_STREAMS, 'features'))
+        self.send(features)
+
+class IncomingXmppFactory(Factory):
+    def buildProtocol(self, addr):
+        p = self.protocol()
+        p.factory = self
+        e = Event('incoming-connection', listener = self)
+        p.event(e)
+        return p
+
+def setup_stream_listener(queue, name, port = 0, protocol = None):
+    if protocol == None:
+        protocol = IncomingXmppStream
+
+    factory = IncomingXmppFactory()
+    factory.protocol = lambda *args: protocol(queue.append, name)
+    port = reactor.listenTCP(port, factory)
+
+    return (factory, port.getHost().port)
+
+def setup_stream_listener6(queue, name, port = 0, protocol = None):
+    if protocol == None:
+        protocol = IncomingXmppStream
+
+    factory = IncomingXmppFactory()
+    factory.protocol = lambda *args: protocol(queue.append, name)
+    port = listenTCP6(port, factory)
+
+    return (factory, port.getHost().port)
+
+class OutgoingXmppStream(BaseXmlStream):
+    def __init__(self, event_function, name, remote_name):
+        BaseXmlStream.__init__(self, event_function, name, remote_name)
+        self.addObserver(xmlstream.STREAM_CONNECTED_EVENT, self.connected)
+
+    def connected (self, stream):
+        e = Event('connection-result', succeeded = True)
+        self.event(e)
+
+        self.send_header()
+
+class OutgoingXmppiChatStream(OutgoingXmppStream):
+    def __init__(self, event_function, name, remote_name):
+        # set name and remote_name as None as iChat doesn't send 'to' and
+        # 'from' attributes.
+        OutgoingXmppStream.__init__(self, event_function, None, None)
+
+class IncomingXmppiChatStream(IncomingXmppStream):
+    def __init__(self, event_func, name):
+        # set name to None as iChat doesn't send 'from' attribute.
+        IncomingXmppStream.__init__(self, event_func, None)
+
+class OutgoingXmppFactory(ClientFactory):
+    def __init__(self, event_function):
+        self.event_func = event_function
+
+    def clientConnectionFailed(self, connector, reason):
+        ClientFactory.clientConnectionFailed(self, connector, reason)
+        e = Event('connection-result', succeeded = False, reason = reason)
+        self.event_func(e)
+
+def connect_to_stream(queue, name, remote_name, host, port, protocol = None):
+    if protocol == None:
+        protocol = OutgoingXmppStream
+
+    p = protocol(queue.append, name, remote_name)
+
+    factory = OutgoingXmppFactory(queue.append)
+    factory.protocol = lambda *args: p
+    reactor.connectTCP(host, port, factory)
+
+    return p
+
+def connect_to_stream6(queue, name, remote_name, host, port, protocol = None):
+    if protocol == None:
+        protocol = OutgoingXmppStream
+
+    p = protocol(queue.append, name, remote_name)
+
+    factory = OutgoingXmppFactory(queue.append)
+    factory.protocol = lambda *args: p
+    connectTCP6(reactor, host, port, factory)
+
+    return p
+
+if __name__ == '__main__':
+    def run_test():
+        q = servicetest.IteratingEventQueue()
+        # Set verboseness if needed for debugging
+        #q.verbose = True
+
+        (listener, port) = setup_stream_listener(q, "incoming")
+        outbound = connect_to_stream(q, "outgoing",
+            "incoming", "localhost", port)
+
+        inbound = q.expect('incoming-connection',
+            listener = listener).connection
+
+        # inbound stream is opened first, then outbounds stream is opened and
+        # receive features
+        q.expect('stream-opened', connection = inbound)
+        q.expect('stream-opened', connection = outbound)
+        q.expect('stream-features', connection = outbound)
+
+
+        message = domish.Element(('','message'))
+        message.addElement('body', content="test123")
+        outbound.send(message)
+
+        e = q.expect('stream-message', connection=inbound)
+
+        # twisting twisted
+        reactor.stop()
+
+    reactor.callLater(0.1, run_test)
+    reactor.run()
diff -Nru telepathy-salut-0.5.0/tools/check-coding-style.mk telepathy-salut-0.7.0/tools/check-coding-style.mk
--- telepathy-salut-0.5.0/tools/check-coding-style.mk	2008-10-15 13:18:22.000000000 +0000
+++ telepathy-salut-0.7.0/tools/check-coding-style.mk	2011-07-25 13:18:17.000000000 +0000
@@ -3,12 +3,12 @@
 	if test -n "$(check_misc_sources)"; then \
 		tools_dir=$(top_srcdir)/tools \
 		sh $(top_srcdir)/tools/check-misc.sh \
-			$(check_misc_sources) || fail=1; \
+			$(addprefix $(srcdir)/,$(check_misc_sources)) || fail=1; \
 	fi; \
 	if test -n "$(check_c_sources)"; then \
 		tools_dir=$(top_srcdir)/tools \
 		sh $(top_srcdir)/tools/check-c-style.sh \
-			$(check_c_sources) || fail=1; \
+			$(addprefix $(srcdir)/,$(check_c_sources)) || fail=1; \
 	fi;\
 	if test yes = "$(ENABLE_CODING_STYLE_CHECKS)"; then \
 		exit "$$fail";\
diff -Nru telepathy-salut-0.5.0/tools/Makefile.am telepathy-salut-0.7.0/tools/Makefile.am
--- telepathy-salut-0.5.0/tools/Makefile.am	2010-08-06 04:40:36.000000000 +0000
+++ telepathy-salut-0.7.0/tools/Makefile.am	2011-07-25 13:18:17.000000000 +0000
@@ -16,6 +16,8 @@
     glib-signals-marshal-gen.py \
     identity.xsl \
     libglibcodegen.py \
+    make-release-mail.py \
+    telepathy.am \
     xep.xsl
 
 glib-client-marshaller-gen.py: libglibcodegen.py
diff -Nru telepathy-salut-0.5.0/tools/Makefile.in telepathy-salut-0.7.0/tools/Makefile.in
--- telepathy-salut-0.5.0/tools/Makefile.in	2011-05-03 13:29:18.000000000 +0000
+++ telepathy-salut-0.7.0/tools/Makefile.in	2011-11-16 10:27:30.000000000 +0000
@@ -85,6 +85,7 @@
 DBUS_LIBS = @DBUS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -108,6 +109,8 @@
 GMODULE_LIBS = @GMODULE_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HTML_DIR = @HTML_DIR@
@@ -130,6 +133,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
 NM = @NM@
@@ -170,12 +174,12 @@
 VERSION = @VERSION@
 WOCKY_CFLAGS = @WOCKY_CFLAGS@
 WOCKY_LIBS = @WOCKY_LIBS@
-XMLDIFF = @XMLDIFF@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -246,6 +250,8 @@
     glib-signals-marshal-gen.py \
     identity.xsl \
     libglibcodegen.py \
+    make-release-mail.py \
+    telepathy.am \
     xep.xsl
 
 TELEPATHY_GLIB_SRCDIR = $(top_srcdir)/../telepathy-glib
diff -Nru telepathy-salut-0.5.0/tools/make-release-mail.py telepathy-salut-0.7.0/tools/make-release-mail.py
--- telepathy-salut-0.5.0/tools/make-release-mail.py	1970-01-01 00:00:00.000000000 +0000
+++ telepathy-salut-0.7.0/tools/make-release-mail.py	2011-07-25 13:18:17.000000000 +0000
@@ -0,0 +1,79 @@
+#!/usr/bin/env python
+# vim: set fileencoding=utf-8 :
+#
+# Hello. This is make-release-mail.py from the Telepathy project. It's
+# designed to turn an item from a NEWS file into a mail suitable for sending
+# to . I hope that you enjoy your stay.
+
+import sys
+
+def extract_description(package, version, news_path):
+    release_name = []
+    details = []
+
+    with open(news_path) as f:
+        lines = (line for line in f.readlines())
+        for line in lines:
+            # Find the 'telepathy-foo 0.1.2' header
+            if line.startswith("%s %s" % (package, version)):
+                break
+
+        # Skip the ====== line, and the first blank line
+        lines.next()
+        lines.next()
+
+        got_release_name = False
+
+        for line in lines:
+            line = line.rstrip()
+            # If we hit the next version header, we're done
+            if line.startswith(package):
+                break
+            # Else, if we hit a blank line and we're still reading the release
+            # name, we're done with the release name.
+            elif not got_release_name and line == '':
+                got_release_name = True
+            # Otherwise, append this to the relevant list
+            elif not got_release_name:
+                release_name.append(line)
+            else:
+                details.append(line)
+
+        assert got_release_name, (release_name, details)
+
+    # We rstrip details because it picks up a trailing blank line
+    return ('\n'.join(release_name), '\n'.join(details).rstrip())
+
+BASE_URL = 'http://telepathy.freedesktop.org/releases'
+GIT_URL = 'http://cgit.freedesktop.org/telepathy'
+
+def main(package, version, news_path):
+    release_name, details = extract_description(package, version, news_path)
+
+    print """
+%(release_name)s
+
+tarball: %(base_url)s/%(package)s/%(package)s-%(version)s.tar.gz
+signature: %(base_url)s/%(package)s/%(package)s-%(version)s.tar.gz.asc
+git: %(git_url)s/%(package)s
+
+%(details)s""".strip().rstrip() % {
+        'base_url': BASE_URL,
+        'git_url': GIT_URL,
+        'package': package,
+        'version': version,
+        'release_name': release_name,
+        'details': details,
+    }
+
+if __name__ == '__main__':
+    try:
+        package, version, news_path = sys.argv[1:]
+
+        main(package, version, news_path)
+    except ValueError, e:
+        sys.stderr.write(
+            'Usage: %s package-name package.version.number path/to/NEWS\n' %
+            sys.argv[0])
+        sys.stderr.flush()
+        sys.exit(1)
diff -Nru telepathy-salut-0.5.0/tools/telepathy.am telepathy-salut-0.7.0/tools/telepathy.am
--- telepathy-salut-0.5.0/tools/telepathy.am	1970-01-01 00:00:00.000000000 +0000
+++ telepathy-salut-0.7.0/tools/telepathy.am	2011-07-25 13:18:17.000000000 +0000
@@ -0,0 +1,74 @@
+## Useful top-level Makefile.am snippets for Telepathy projects.
+
+dist-hook:
+	chmod u+w ${distdir}/ChangeLog
+	if test -d ${top_srcdir}/.git; then \
+		git log --date=iso $(CHANGELOG_RANGE) > ${distdir}/ChangeLog; \
+	fi
+
+distcheck-hook:
+	@test "z$(CHECK_FOR_UNRELEASED)" = z || \
+	case @VERSION@ in \
+		*.*.*.*|*+) ;; \
+		*) \
+			if grep -r UNRELEASED $(CHECK_FOR_UNRELEASED); \
+			then \
+				echo "^^^ This is meant to be a release, but some files say UNRELEASED" >&2; \
+				exit 2; \
+			fi \
+			;; \
+	esac
+
+_is-release-check:
+	@case @VERSION@ in \
+		(*.*.*.*|*+) \
+			echo "Hey! @VERSION@ is not a release!" >&2; \
+			exit 2; \
+			;; \
+	esac
+	@if ! git diff --no-ext-diff --quiet --exit-code; then \
+		echo "Hey! Your tree is dirty! No release for you." >&2; \
+		exit 2; \
+	fi
+	@if ! git diff --cached --no-ext-diff --quiet --exit-code; then \
+		echo "Hey! You have changes staged! No release for you." >&2; \
+		exit 2; \
+	fi
+if ENABLE_GTK_DOC
+else
+	@echo "Hey! You need to pass --enable-gtk-doc to configure!"
+	@exit 2;
+endif
+
+%.tar.gz.asc: %.tar.gz
+	$(AM_V_GEN)gpg --detach-sign --armor $@
+
+@PACKAGE@-@VERSION@.tar.gz: _is-release-check check distcheck
+
+maintainer-prepare-release: _is-release-check all distcheck release-mail
+	git tag -s @PACKAGE@-@VERSION@ -m @PACKAGE@' '@VERSION@
+	gpg --detach-sign --armor @PACKAGE@-@VERSION@.tar.gz
+
+release-mail: NEWS
+	$(AM_V_GEN)(python $(top_srcdir)/tools/make-release-mail.py \
+		@PACKAGE@ @VERSION@ $(top_srcdir)/NEWS > $@.tmp && \
+		mv $@.tmp $@)
+
+maintainer-upload-release: _maintainer-upload-release
+
+_maintainer-upload-release-check: _is-release-check
+	test -f @PACKAGE@-@VERSION@.tar.gz
+	test -f @PACKAGE@-@VERSION@.tar.gz.asc
+	gpg --verify @PACKAGE@-@VERSION@.tar.gz.asc
+
+_maintainer-upload-release: _maintainer-upload-release-check
+	rsync -vzP @PACKAGE@-@VERSION@.tar.gz telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz
+	rsync -vzP @PACKAGE@-@VERSION@.tar.gz.asc telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz.asc
+
+maintainer-make-release: maintainer-prepare-release maintainer-upload-release
+	@echo "Now:"
+	@echo " • bump the nano-version;"
+	@echo " • push the branch and tags upstream; and"
+	@echo " • send release-mail to ."
+
+## vim:set ft=automake: