commit b54f3a4d84316ec8559aff227ff106ccd8670f86
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-10-18 10:25:08 +0100

    Version 0.6.0

commit b3cce5dc40fc744d01b9844cfe0b91b6e42112f7
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-10-18 10:24:46 +0100

    NEWS for 0.6.0

commit 47acb3d179f8d4a36364daadae8b00bfadda2590
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   2011-09-29 10:29:48 +0200

    Use TpBaseContactList to implement the immutable roster

commit 9341fc8f346787caa3be2c5e5e20a03102162924
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   2011-09-29 09:22:58 +0200

    Use GObjectClass::constructed instead of GObjectClass::constructor

commit 81eec12622706003f46e9be9e92e96e1b164a5de
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-10-05 12:06:42 +0100

    start on version 0.5.3
    
    Great things will happen.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 0d025106a50a75904ae13b65e4c8f8220faa1104
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-10-05 11:39:52 +0100

    version 0.5.2
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit e7d04988d6cc2934a2e77b1a73e92bf29795177b
Author: Derek Foreman <derek.foreman@collabora.co.uk>
Date:   2011-05-16 14:35:41 -0400

    remove duplicates from source file list
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 254284476b7f8d2a9f6c92963c9c752058288b03
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-09-15 16:05:35 +0100

    with-session-bus: import echo fix from Gabble
    
    Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 166546dc5e4e920727f6e6146fe862d4cc935cac
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-09-07 15:06:17 +0100

    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 <jonny.lamb@collabora.co.uk>

commit 7188bde6e6e1c81617c89db6a1fd7be727653e4a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-09-07 15:06:07 +0100

    update wocky snapshot
    
    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 <jonny.lamb@collabora.co.uk>

commit b81086c2a76b2e5ca3ca421deebc51122fb26069
Merge: e97a10a 79c310d
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-24 15:21:32 +0100

    Merge branch 'contact-info'
    
    https://bugs.freedesktop.org/show_bug.cgi?id=40035
    
    Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
    Branch-quality: impeccable

commit 79c310dfcae1ee9de84448b0c0ee0dbc48431f5e
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-16 11:45:23 +0100

    ContactInfo: note why supporting self is complicated

commit 4296af242825c610a57224c082922299001e15e8
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-16 11:01:00 +0100

    ContactInfo: ignore empty name, jid and email fields.
    
    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.

commit a5d63dcf86593359ddfa739a0f02d519255c991c
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-16 10:50:56 +0100

    ContactInfo: test empty 1st, last and nick fields are ignored

commit 55a1ee445c98ca0f1c9b1bc52b210eb983df077e
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-16 10:42:56 +0100

    ContactInfo: expose fake FN field

commit 7b616f381e4c1ef705b03195215b3b230b455b07
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-16 10:42:39 +0100

    Contact: track shoddily-computed full name

commit 41bb4ec0a5fdd056e47568729a3e8bdd589c59e0
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-16 10:40:38 +0100

    ContactInfo: refactor out add_singleton_field
    
    Possibly squash into a7fe74f609f0f7a21716ef90dde7d67480a7df64 ?

commit 3eb7f8fe5d80fb34b9b2ea29e729bf0b1b60479a
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-15 17:38:23 +0100

    ContactInfo: test invalid and invisible handles

commit d05399590a69be5b856498c7bb3e0638bf48e614
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-15 17:28:26 +0100

    ContactInfo: implement RequestContactInfo

commit 930e744331bb058d009f150b54a791a52dd1f7d2
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-15 17:07:46 +0100

    ContactInfo: implement GetContactInfo

commit 4c46b78a768409dc56561d1556ff9cab13a2b572
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-15 16:50:09 +0100

    ContactInfo: expose email and JID
    
    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 <will.thompson@collabora.co.uk>
Date:   2011-08-15 16:40:01 +0100

    ContactInfo: implement change notification

commit 246f3bc72ba494c640f3db1fd8dacd92fd24e42e
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-15 16:00:58 +0100

    Debug: remove 'all' special-case
    
    This is done in GLib these days

commit d7bfc06d26fdd0f29e0de5de339dbea40c9dc60d
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-15 15:57:26 +0100

    ContactInfo: implement 'n' for contacts
    
    This is only implemented for GetContactAttributes, and there is no
    change notification.

commit e2077215e1be24c4f806a08670c7ef5231d6de94
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-15 15:14:03 +0100

    ContactInfo: list plausible supported fields

commit 71e40e50edc95b74e57bb43456da96adcb1d1720
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-15 14:24:24 +0100

    Add a stub implementation of ContactInfo
    
    This is all the stuff that's completely trivial to implement.

commit 92e70e7c0bce0e7e3938812042b2f0a31a9fb049
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-15 14:20:11 +0100

    avahi/aliases.py: modernize a little

commit a5601ee7c1de3683acbc6a0fe7e630e8d63ba4f7
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-12 16:49:55 +0200

    Connection: include capabilities.h once

commit c862984280c7096f4e1232b931846fbeb6157872
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-12 15:43:00 +0200

    Connection: use TP_STRUCT_TYPE_ALIAS_PAIR

commit 19bfc985571cfe4586b71cb7005863f8598b971b
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-12 15:39:27 +0200

    Contact: track real names

commit 9117c3da3f8341d48bfe790e5e5a9e00d52b1839
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-12 15:08:06 +0200

    Contact: track email address

commit 67fe59719ea3fa6777b1446a8773de6b2b241941
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-12 15:04:23 +0200

    Contact: signal JID changes

commit a073bd17c10cda7a32c19c64d322c6491618ead6
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-12 14:19:28 +0200

    Track contacts' JIDs even without --enable-olpc

commit 253e93508d78b524b5c94e7ecf5893aaacfc8b58
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-12 14:13:24 +0200

    Contact: Replace #defines with an enum

commit 6f490c06af966758f3601ce36c23e342f356c6b9
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-08-12 11:51:45 +0200

    AvahiContact: use tp_str_empty

commit e97a10ac5c84088967b3740c593372ccdbca4731
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-07-08 15:24:53 +0100

    Update Wocky for corresponding --disable-debug fixes

commit 9ec80fc9a1961faa9befcc2097b9c12260fa7594
Author: Will Thompson <will.thompson@collabora.co.uk>
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 <stefw@collabora.co.uk>
Date:   2011-08-13 14:46:50 +0200

    Merge branch 'test-cleanup'

commit 942d12cf39fb8c134b795d4627d325a2ed5de44c
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-08-11 12:31:52 +0200

    gibber: Ignore files built during tests.

commit cb82f2205683fe2a532f3ed9d91be3c24c1f2b4a
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-08-11 12:23:23 +0200

    gibber: Remove broken tests and dependency on xmldiff
    
    * These tests don't run successfully anyway.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=40001

commit 19f06ba9e81b1356506746242772c710c23b3b74
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-07-25 14:46:15 +0100

    tests: ensure OLPC tests are included in releases
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 8075e04490d656b3da9bc651497338cfb7adc94b
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-07-25 14:44:24 +0100

    namespaces: add …/activity-properties constant
    
    This lets the thing build with --enable-olpc.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit bfcb1a34dcd0c7b2b2e43e4610c6ddebf26a747a
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-07-07 16:24:56 +0100

    Update coding style and release mail scripts
    
    I grabbed the latter from an old branch by mistake when I added it.

commit df52a7dc52147f70c2e180c09b58de052e3eed10
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-07-07 16:03:10 +0100

    Bump the nyanoversion to 0.5.1.1

commit 34473911a31f7b7620dfe86fc5ae1ccdf7e170ca
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-07-07 14:35:33 +0100

    Version 0.5.1

commit 97c6fb746bf64591e88d50006fbb1edc26c70a2a
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-07-07 14:35:14 +0100

    News for 0.5.1

commit a0490633f7652cc89d1e9c4b67ea89868f98e7b8
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-07-07 15:32:04 +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.

commit 10287449e56eb7acb54572948b4ce9aaa0a0cd52
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-07-07 14:33:50 +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.

commit 2cb08f95c385adaf10b5a4a9cfe127cfbfdf1ddc
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-07-07 13:25:54 +0100

    tests: look for 'contact-ids' in MembersChangedDetailed
    
    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.
    
    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 <jonny.lamb@collabora.co.uk>

commit ee7c997300d26960e5cb662542815763cf3a03ca
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-07-07 13:30:37 +0100

    update wocky snapshot
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit d1e2397dc684b609ac5f9b78fd4d5b1e2b24c452
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
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 58a742936ea0a71da0df61043236c65ba485be8d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-06-24 10:10:32 +0100

    contact-channel: treat TP_UNKNOWN_HANDLE_TYPE has unset handle type
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 90d82631b78341a86c040b82dc3438478dc12cdd
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-09 14:06:52 +0100

    update wocky snapshot
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 2782c58b5869babfcca9b699ff75360c4b7f57a4
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-09 09:31:45 +0100

    gibber ibb bytestream: remove
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit b1de837ebae853467aff11fb5096a934dfb865a5
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-04 14:27:04 +0100

    gibber-xmpp-error: remove
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 01a4df8810bf41ecbb8c44eb3ce10d0a360dd379
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-04 14:26:07 +0100

    stop using GibberXmppError
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 484325b8891af7d0ba92d796fa8804481b9e846a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-04 09:11:59 +0100

    gibber: remove gibber-namespaces.h
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 27e730bbd087abbc79452eb071fa51c5ed07c863
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-04 09:11:29 +0100

    stop using gibber-namespaces.h
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 3342b364c9678d063e9287a411f6b46336a9f988
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-03 17:14:21 +0100

    gibber-xmpp-writer: removed
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 026439608057f8c8ba8d1cc8bbcafb4acd172e58
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-03 17:13:38 +0100

    muc-connection: use WockyXmppWriter
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 48cab0984fee58b5f85f352da29d5094858f27c6
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-03 17:08:14 +0100

    gibber-xmpp-reader: removed
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 16d61ed42ff441cbcb37c595419537b0c77613ff
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-03 17:05:02 +0100

    muc-connection: use WockyXmppReader
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 8c395bffcc0dc5774fbaf8563dc6956058e5a581
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-03 16:38:43 +0100

    configure.ac: set AC_LANG
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 948708e4a443e1af27eea7c5db45a0be88dec950
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-03 15:28:32 +0100

    tube-dbus: fix typo
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 11b952142ff9b1c39642240581ab8c483e8588c8
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-03 14:57:00 +0100

    nano release
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 6c47bda9644d4e2b3ccb785a5d1f713be4495f55
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-03 14:28:58 +0100

    version 0.5.0
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit bc49af5ea64f124731837f402d00e12fb75b7c17
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-03 14:00:45 +0100

    update wocky snapshot
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 9da53bf4cf7bc5da9752cc94789f07fea0e14b2a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-03 12:13:33 +0100

    avahi-olpc-activity-manager: ignore browser-found callbacks if disconnected
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit ebc29012b9e85fab2c5786ae87c3f9eb21e309dd
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-03 12:13:23 +0100

    contact: fix typo
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 4b134ed8009b9465c961db2f45fcf1f9a3b59d0d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-03 12:12:23 +0100

    avahimock: use an actually unique index for new objects on the bus
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit b636c3a48bbb1a47d67a812c6af5ffebf55c50ac
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-03 10:17:01 +0100

    remove all set but unused variables
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit c9bea14a3f70862173c32aba43d92d0e77835465
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-02 16:41:16 +0100

    avahitest: catch a specific exception
    
    It can break the KeyboardException case.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 4064258595701503a26f3b93eef01512263b3d68
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-02 16:24:15 +0100

    avahimock: don't emit Found on ipv6 addresses if ipv6 is not available
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 3fffd2d46ef898a8d5c0049d0fad5f82d56b7e87
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-05-02 16:22:55 +0100

    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.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit ee2533ead63db9d1f08347b7c82719a4921622e0
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-28 16:52:19 +0100

    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.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 5a2318c2a4ea6fe3c532ab2ca5f96ebcf85c3965
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-28 16:29:47 +0100

    twisted tests: get rid of annoying test- prefix
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 46c042e05f7b7fce80a640e4cda59404ca642139
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-28 16:07:32 +0100

    update wocky snapshot
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 4c8fe6b52797328d579a4410b60f667592735919
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-28 16:06:51 +0100

    tests: fix linking problems
    
    I don't really understand why this was breaking and why this patch
    fixes it...
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 75c17ef51654a0d23255e04ff508c1bece6c4cd5
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-28 16:06:32 +0100

    twisted tests: include avahitest and avahimock in EXTRA_DIST
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 4a87d73aa1941979c5d9843deba28ec383607f89
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-28 16:05:58 +0100

    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 <jonny.lamb@collabora.co.uk>

commit 87d71aa0f844276f1d0e717c9081dee4f90ce0dd
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-28 14:06:39 +0100

    capabilities: fix includes
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 243c0b73d7ed3db43d13e37828bd28cb10c16cd6
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-28 14:05:57 +0100

    src: remove annoying salut- prefix
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit c1790e71e42d774923b7c8273ea617a22b69acdb
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-28 13:50:47 +0100

    capabilities-set: rename to capability-set
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit a4e984f3452880335ded6cad6c5c4fb0f6739c60
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-28 13:49:02 +0100

    capabilities: rename to capabilites-set
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 0cc6c406211450c7d97542b838023fa8e6f86f99
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-28 13:12:11 +0100

    servicetest: update to newest version from gabble
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 3c489579a8efecb4fc35b0ac57b971632c1f9113
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-28 13:04:41 +0100

    twisted tests: update caps_helper and ns from gabble
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 7066fd189689905a76a1f8ef2fd6f97b50f97826
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-28 12:49:34 +0100

    saluttest: add elem* and related functions from gabbletest
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 60190192661bb53d24c002ffa4d2ff5bbf773e74
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-28 12:48:14 +0100

    saluttest: remove the NOC signal handler when finished with
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit d60e070a47af84e0ee7d427c5d814ce27327ea17
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-28 12:47:32 +0100

    saluttest: use reactor.crash instead of .stop
    
    I'm not happy about this but this is what gabble does.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit a3fb5a74a59ded97b36a952bfef56b65ac018593
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-28 12:45:30 +0100

    NEWS: updated
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 0fd17a82d334948bc133ae27b65e15d0b36e8fd7
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-27 11:56:16 +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.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 87450c745491c7d671642cc473aa18b3560d2c2a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-26 16:45:25 +0100

    connection: pass even empty clients through to channel managers
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 2bf6e0678fbe891b1bf14f9c5c2d5872cfbb2cc8
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-25 11:26:07 +0100

    connection, presence-cache: add comments for the "data forms equal" functions
    
    They differ. This is why.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 34a662ecb815d9aec4578f333f7b0bff7e055ce7
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-25 11:25:43 +0100

    contact: no need to keep an old pointer array around when it's being replaced
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit dc1f9e468f5121c4a5bdadaa115b4ada270f6153
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-25 11:14:20 +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.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 7c05d71d522b09273c88753009d3ba2b7b5e200c
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-25 10:43:00 +0100

    presence-cache: learn self caps if they've been announced
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit c24ccc5af95ae5bd2d7a7b4f63a179c924e1b34a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-25 10:42:39 +0100

    connection: fix typo in update capabilities code
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit b1587d322b5e3c71230335b138405c27f3a2495b
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-25 10:42:17 +0100

    caps-hash: calculate self hash using data forms too
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 90214e17469e3e059781ba1649085932fbd632e2
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-25 10:41:24 +0100

    connection: let clients represent themselves with data forms
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit b7f4a89e383f5a35de82f0c34f2572cefe4855de
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-25 10:39:26 +0100

    disco: reply from disco requests with data forms
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit db3d002508ed28bceb9621b33c48c0c609052dd8
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-25 10:31:00 +0100

    presence-cache: remember data forms
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit ce0aa7668f5d258087baf3b46adb45a7d0c2938a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-25 10:29:00 +0100

    contact, self: implement WockyXep0115Capabilities iface
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 30bb4bda54e3a3da7e59e289f55c5c76bb0292b1
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-22 12:24:51 +0100

    caps-channel-manager: add data form argument to represent_client
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit fdb5c005d67481ff18b7f943b8959d1176087692
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-22 12:21:14 +0100

    update wocky snapshot
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 263a21c3d21d9a56d30b0c9d17be8cf683011571
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-22 09:41:29 +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.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 880ea0007c66d856853b5d6e34546781b8ea582d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-22 09:40:34 +0100

    contact: remove config.h include from header
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit d0e53bd470a2638835324575aa2a4bf0b67ad8e8
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-22 09:39:45 +0100

    src: include uuid directory and link to libuuid
    
    No idea how this worked before...
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit b779af034320e2402bce4c011cda1b0b10157625
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-22 09:31:36 +0100

    util: extract copying and sending a stanza from send_ll_pep_event() to another function
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 916945dcf7cbfd98a7a13de65864136019cf7532
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-07 12:53:21 +0100

    pep: make salut_send_ll_pep_event part of public API
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 431b8494eb86a456353fdf14c49d1695f7145980
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-11 11:06:02 +0000

    util: add salut_send_ll_event function
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 067627e64a19c64de4eb6549ff9a4ec11aef17ef
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-22 09:13:10 +0100

    update wocky snapshot
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 456667da199ede4d4000577d67b915e4e3437063
Merge: 62ebf96 395324b
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-22 09:12:49 +0100

    Merge branch 'caps'
    
    Conflicts:
    	configure.ac
    	lib/ext/wocky
    	src/salut-caps-hash.c
    	src/salut-caps-hash.h
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 62ebf96742349fe72411ef8cb03ddb511e80cd94
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-18 10:50:52 +0100

    src/Makefile: only build enumtypes files for salut files
    
    Like in gabble.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit ae1b3ea0785850fd2e08b069a5d28ddaaa7ccad6
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-18 10:29:08 +0100

    symbol-hacks: add some hacks to enable all wocky symbols be visible for plugins
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 8d54b22a1df8aedb8ccbe87df07ba114d207a759
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-12 10:21:07 +0100

    connection: add get_name() function
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit b034ef99f9afab5b2513cef6a7104f3f6ab3c8ef
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-12 09:50:02 +0100

    connection: add get_session() function
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 91b885466102af636f787fc524b386e2b2c16087
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-08 10:47:46 +0100

    exec-with-log.sh.in: set G_SLICE=debug-blocks
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit e1ae931b405822f9887c743cfeb1e0c7af5c8d34
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-08 10:39:36 +0100

    exec-with-log.sh.in: just append to salut-testing.log
    
    Don't clobber it completely.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 9388ac55d3d7bccb9d042c2a3ecba11d0c4bfa71
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-08 10:30:37 +0100

    exec-with-log.sh.in: copy SALUT_TEST_BACKTRACE from gabble
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit c3032ebbd2079312d13be1fefb68376177a27934
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-07 11:18:48 +0100

    update wocky snapshot
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit eca1ade70e2a05e5f08ad21d6aafaba58a7aba65
Merge: 194ca9b 6856d76
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-07 10:20:37 +0100

    Merge branch 'mock-avahi'

commit 6856d768ec168a2e25b55fb4eec62731befc0dc2
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-07 10:20:20 +0100

    update wocky snapshot
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 80118b801297e3d645cf2495cf9e9017bf8b325a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-06 14:40:11 +0100

    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 <jonny.lamb@collabora.co.uk>

commit 51fe8aa4bdd5730d5262389e00a3eeae2df03745
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-06 13:08:33 +0100

    tests: only run the test suite on real avahi if SALUT_TEST_REAL_AVAHI=1
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit b92a619720285dbd5720ff8257acf290f072f276
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-06 13:07:16 +0100

    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 <jonny.lamb@collabora.co.uk>

commit 236cea2a171ef1402bc55f236f57b491068b4b34
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-06 10:59:36 +0100

    avahimock: don't use magic numbers for AvahiServerState enum
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 3909b2b81de06119e577a2d3caad43b047ac6f12
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-06 10:56:25 +0100

    avahimock: hard-code GetHostName and GetHostNameFqdn return values
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 7270ff8b1571ee6869799cfb82903286c41be4fb
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-06 10:56:11 +0100

    avahimock: use a constant for the domain name
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit c26f3aa03e438c5cbb2d01e33798b528f043c177
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-06 10:53:14 +0100

    avahimock: use a little better error string
    
    Only a little.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit eb6bb90cdcc1fa1180431577794b856b36f3ae6e
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-06 10:53:03 +0100

    avahimock: return a hard-coded domain name
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 45775a33e8cb70168c610d6f96b462c5f2b4b6e2
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-06 10:52:51 +0100

    tests: remove Avahi service file
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 4addd90afa20fd9dd7fbbedb6280d36907b7b529
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-06 10:45:52 +0100

    saluttest: use the whole test path like in gabble
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 6e2eca6716c0d955df2dad02db83b42623cfbd7f
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-06 10:45:22 +0100

    contact-manager: don't look up a contact in a NULL hash table
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 194ca9bd5fc1ff70845937cd03f49bb74b91a1e1
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-05 14:47:15 +0100

    configure: re-word description of --enable-avahi-tests
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit b8c26c0d6ac59c88fede90542e65e877fa6f68da
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-05 14:36:42 +0100

    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 <jonny.lamb@collabora.co.uk>

commit 89c9098ed080a9e3c83191ba6fb0d5a08e1b957b
Merge: 758dba3 c41a25e
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-05 13:57:09 +0100

    Merge branch 'ohhai'

commit c41a25ef7f8b9a221ba1e2b5e7f8d21c203c7e02
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-05 13:52:49 +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.
    
    gcc pointed this out as:
    
        gibber-oob-file-transfer.c:526:14: error: comparison between
        ‘GSocketFamily’ and ‘enum <anonymous>’
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 94d9944e2d38a764d4edbce9cab57ccdece247fc
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-05 11:59:35 +0100

    connection: don't crash if we try and get self caps before connecting
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 381972fb479a62e1ec994335b75bf7cf01b851be
Merge: 758dba3 ff4a897
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-05 11:52:48 +0100

    Merge remote branch 'smcv/mock-avahi'

commit 758dba3714c8c586c21478e8759800acaeb9dc34
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-05 11:52:12 +0100

    update wocky snapshot
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit b9c31893d6c4508efc3e49b07cd82f07ae8f242c
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-05 11:21:54 +0100

    connection: give the WockySession to create_sidecar_async
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 197b891390ee4dd5a1f5b46bc20629e665e94275
Merge: 871abd7 f7687c7
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-05 11:17:23 +0100

    Merge remote branch 'smcv/im-on-a-train'

commit 871abd7cb3f8d7c44f55542a4d757a34f7ca3a1f
Merge: 165dfad cfdad47
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-05 09:50:44 +0100

    Merge branch 'meta-porter'
    
    Conflicts:
    	.gitignore
    	src/salut-connection.c
    	src/salut-disco.c
    	src/salut-self.c
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit cfdad47a9ef766fbcee6d47476110cd92c6a2dc2
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-05 09:47:04 +0100

    update wocky snapshot
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 95d10244be9f3f4c49fbf499714a9ee89f370d87
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-05 09:45:04 +0100

    disco: use _extract_errors instead of extracting sub types manually
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 1a9adddd5ba9d12b53ccca45822f744850838083
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-05 09:35:57 +0100

    disco: fix indentation
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 06a7012fd69e2cc6884dd71d6b202e74822c1495
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-05 09:34:25 +0100

    muc-manager: don't pass on bad clique invites to other channel managers
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit e7c0c381f9316d60dfec3d15f0eaba5f0456d4ee
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-04 11:09:00 +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.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 8248ff7760017918c7361c5fc07cd9532ad5c1cf
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-04 09:07:00 +0100

    Revert "muc-manager: don't assert on no invite node"
    
    This reverts commit c836c6a9c3c70dd3259e316dc5e9eb1a3e78b821.

commit 7b1a6014d3b982a8c15e3204d77f3f872d473ef9
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-04 09:04:36 +0100

    tests: stop using re.sub when messing with argv[0]
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 6fac150759b9c58cf44ffd29dfa9fec7f8e02e48
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-04 08:44:50 +0100

    connection: fix "force_called" variable usage
    
    Previously it meant exactly the opposite.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 3ea1ca10bb3524b6d15c8b689277ff558584701b
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-04 08:41:35 +0100

    connection: use g_clear_error as it's NULL-safe
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit bc8d85dd7ab42234559c798d5467fa35ab734d28
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-04 08:40:01 +0100

    muc-manager: register a higher priority handler than the IM manager
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 8ee26255a58818a4cf46238a178812445712565e
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-01 15:51:04 +0100

    file-transfer-channel: delete ft sockets when finalizing the channel
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 62e9935711e9914933bf95ad1e6ebb58c5cc605d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-01 15:39:06 +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.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 201df796f0a887ceeed9d4c4a9dd937ce99a8f25
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-01 15:16:56 +0100

    tests: fix tab/space problem
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 240e4b1274ad7ffbe16db384dd76f8b72da5b9a2
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-01 15:16:17 +0100

    twisted tests: make disabled messages conform
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit cbb040479b508ec7fb459d32da2bfe3543b8df6a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-01 15:15:02 +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.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 53c099075e201b8f85565f6d19c3c05cc9ab3e0b
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-01 15:14:21 +0100

    file_transfer_helper.py: fix assertion message
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 9ce433140e03c710fdbf7e5a305f56ba42d10b1a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-01 15:14:05 +0100

    file-transfer tests: make HTTP server less verbose
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 74b4e5edf4e91be3c943d607e8ec3ec658d045ff
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-01 15:13:05 +0100

    ipv6.py: stop using reactor.listenWith
    
    It's deprecated. This is a bit of a hack though.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit f837a11220b51efa62e44384b3196988e7d34d2d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-01 15:12:39 +0100

    tube-stream: set the WockyContact on a stanza to send
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 189021e7203015023c9887cd68950797761c395a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-01 15:12:20 +0100

    si-bytestream-manager: set the :contact property on new bytestreams
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit c630cdf3ff2a3f8c5621b6dc7616e8de352cb66a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-01 14:52:29 +0100

    si-bytestream-manager: free a newly allocated stanza
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 6f43b3aa51fe97d1d0c475d5394362e685b3bdee
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-04-01 14:51:45 +0100

    si-bytestream-manager: fix s/get/set/ typo
    
    Introduced in 923da48ffc4735.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 1f230673c5581384f89bf7ccedf091f9a39b0642
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-31 14:27:41 +0100

    with-session-bus.sh: steal latest from gabble
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 197e5ae81b2595a0a16f4cd4c19c549023095da1
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-31 12:57:59 +0100

    saluttest: set nickname to the test name for log prettiness
    
    cf. gabble.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 0ceb8919443b0af641ff42b705192134a8781a46
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-31 10:58:00 +0100

    xmppstream: set default namespace to jabber:client in stream open
    
    Woo!
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 7898353910dae2ab720fa9d7ec85e8c86a0a7d70
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-31 09:48:28 +0100

    all: chain up to parent constructed if there is one
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 3512aee218b2f157b0595ec82de0104602987eb8
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-31 09:19:38 +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.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit c836c6a9c3c70dd3259e316dc5e9eb1a3e78b821
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-31 09:07:15 +0100

    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 <jonny.lamb@collabora.co.uk>

commit 2afb63eb8aaeff4be8fa4bb8c812e0a95dc71f43
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-31 09:06:44 +0100

    disco: only delete the request if it hasn't been already done for us
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit d5b43d1beb459187ab918dcd0a02c7fbc5cd27e1
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-31 09:06:24 +0100

    disco: deal with the SalutSelf being NULL
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit e16a55113fa64f01176be789f688467f2bb07c70
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-31 09:05:12 +0100

    avahi-self: propogate error in announce
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit a546c1822cb7d5cc8288ebba139611553c1ecea9
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-31 09:03:54 +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.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 3c833d1715c4210cc92e04f5ac569b2d76f78356
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-31 09:03:17 +0100

    connection: add more debug messages when failing to connect
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 329a283e5818be2178ef3ec0f67c5decb7cdcf40
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-31 09:01:59 +0100

    saluttest: update exec_test_deferred from gabbletest
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 6d612aabb03cfb848fc3734423cd194dfd493278
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-31 09:00:30 +0100

    servicetest: update colourer from gabble's servicetest
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 82f78a2d798ad284395fbb1dbb1416a78a53d6a2
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-29 10:02:20 +0100

    im-manager: ignore clique MUC invites and leave for the MUC manager
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit e1bd15b54853fd7143247208d3664463a0587d0c
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-29 10:01:44 +0100

    disco: fix calling the callback if the cancellable was cancelled
    
    Oops!
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 1247394a708123bcebf28aae91861a2e99314c70
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-24 11:40:36 +0000

    avahi-contact: use stack-allocated GQueue instead of expensive or annoying GLists
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 42edf30b88986a29cbbc811efea10084efe2f2f7
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-24 11:34:20 +0000

    bytestream-oob: ensure we free the socket address in an error
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit f12c6f1b6f07544f614bb1815aaf78d5a6f0c610
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-24 11:23:37 +0000

    bytestream-oob: use the actual socket address when connecting to remote contact
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 1098480d797fb261eef5e8b9ce6c206acb63fd73
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-24 11:05:59 +0000

    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 <jonny.lamb@collabora.co.uk>

commit e3a81ac84abf6cedaea3aac4d638461e296346fd
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-24 10:45:13 +0000

    tube-stream: don't unref a NULL stanza
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 165dfad6d746110a90693cc366fc58556bdff42e
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-23 10:25:19 +0000

    gitmodules: update wocky's URL
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit c492cf03519d25a69ef7291bba69c963478922ec
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-23 10:23:23 +0000

    gibber-file-transfer: porter property cannot be NULL
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit a6e01c196e3dd611635fdeddc69616a913dca2fc
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-23 10:16:51 +0000

    im-channel: clarify comment regarding stanza handler callback returning FALSE
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 1a06f891b2ee5767a28c9539c200dc8eab70947e
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-23 10:15:42 +0000

    disco: don't call the callback if the object has been disposed
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit b900269fe36cd5852a62cfa1910dff51d55a05fe
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-23 09:28:23 +0000

    avahi-contact: use prepend then reverse, instead of append
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit c95d4e863585a94c8d454cd60ace9b2b800b18a5
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-23 09:19:52 +0000

    avahi-contact: remove confusing comment
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 9e28b4fadafad3a8a4900a64329712e41876a48c
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-23 09:19:01 +0000

    avahi-contact: don't get the AvahiIfIndex if it's not required
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit b76e690de7a13bcb91d9d02dc2685aa3dfade235
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-22 13:53:54 +0000

    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.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit bd725740a004bd38e55331494a7673f2766032ab
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-21 15:55:18 +0000

    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 <jonny.lamb@collabora.co.uk>

commit 54bb941c5faa92ce49f61e1af925c72345026537
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-21 14:57:14 +0000

    connection: save pre-connect UpdateCapabilities and set when creating the SalutSelf
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 801723046b8ba801711273ba44929c79097c463f
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-21 14:33:19 +0000

    Revert "connection: create SalutSelf earlier"
    
    This reverts commit 137833bf895865765abd0e719f5ca52a510bd253.

commit 02dfe0e60dafbda103c760dc8476a42d81ffeb20
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-21 13:51:32 +0000

    tests: stop referring to libsalut-backend-avahi
    
    This was removed in 3f2f6de25ce5a5d7d5.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit c83e98eccd192a7ef9f77cb317b6f0ec70d2bdb1
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-03-18 18:45:11 +0000

    configure: check for Python Avahi module
    
    Previously we'd try to run the tests even if the Avahi Python module
    wasn't available.

commit f915df4a1f24eb032d16198c19770c47bcb7a40c
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-03-18 18:44:46 +0000

    Correctly use im-local-xmpp as the icon name.
    
    6db2272 broke this.

commit d4a982ee82f105fa5e11d8ed3086482561af431c
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   2011-03-18 18:41:25 +0000

    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.

commit cde06ccf071f793a81e0f71627719d7753d9430d
Merge: 3c112f5 14e2d72
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-21 08:58:09 +0000

    Merge branch 'sidetzars'
    
    Conflicts:
    	extensions/all.xml
    	salut/Makefile.am
    	src/salut-connection.c
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 3c112f53e732306b95f1c01050972ac5fd6ecae2
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-18 13:20:12 +0000

    connection: only print "updated caps" if they've changed
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 91211a7c2b02c0773e77d33a95850be9a6e1b9cc
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-18 13:19:48 +0000

    capabilities: move to public API
    
    This lets plugins build again. :-)
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 06cee2b75b0ea04dc9b4b7a0af01847af05ae6d7
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-18 12:50:39 +0000

    salut: remove duplicate pkg-config file
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 42f10a68a6075ad711c46ca375b85429cc5a0a4c
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-18 09:32:44 +0000

    salut: make caps-channel-manager and capabilities-set public salut API
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 73a0c0372789fe13154fddb89eef2a9a010bdd4c
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-18 08:50:14 +0000

    connection: only try and announce self caps if they've changed
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 84e53c868e09a632e6cbd2e7299d8c3da12e1630
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-17 14:40:18 +0000

    extensions: remove ContactCapabilities draft
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 3eb861687d891bf851951e19d9c08836d48c9148
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-17 14:40:05 +0000

    connection: port to undrafted ContactCapabilities
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 137833bf895865765abd0e719f5ca52a510bd253
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-17 14:36:36 +0000

    connection: create SalutSelf earlier
    
    This is so we can reference it before we connect for, say,
    UpdateCapabilities.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 0018ac8a41cb3b59bac226446ac233337bb04306
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-17 12:58:43 +0000

    disco: use WockyNode instead of GibberXmppNode
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 79e42ba994fad7271e9e5e9eca6c45f643e9cdfd
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-17 12:58:21 +0000

    presence-cache: fix leak and used uninitialized warning
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 318dfd3cdcc3549e3fca8d0ddba7e00fca3d3e2f
Merge: 1400816 0eba2ff
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-17 12:51:40 +0000

    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
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 140081643caa1eda5763e52d616616408994b366
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-17 12:45:51 +0000

    {ft,tubes} managers: don't use G_GNUC_UNUSED on used arguments
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 14e2d72bbeae565a53fe8bd32f375c0cec3715c0
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-16 14:28:47 +0000

    sidecar: update copyright years
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit f89e2b1d8bb03138c11437148ef3c85a95aa4b2f
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-16 10:56:09 +0000

    gibber: update to meta porter API changes
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 67c4ee0d757d0165b9bc6f38202fe6bfee389b85
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-15 15:19:59 +0000

    sidecars test: added
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit e7fe1cceac51e7e4e9f72f74523962af4905c974
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-15 15:19:36 +0000

    connection: implement FUTURE interface
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 459624a34cb65c30ede5887166d038d900b2216e
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-15 14:39:22 +0000

    test plugin: add simple sidecar support
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 04c5ef4799db15e400bb407396c161e930ab2389
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-15 14:39:03 +0000

    plugins: add sidecar support to plugins
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 5262d495ae17c65b654d22bcb9f1699d4d866143
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-15 14:11:34 +0000

    salut: define SalutConnection so it can be referred to in plugins
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 0eba2ffb56ed5f612e6d2a9657fe38522a3bd2b1
Merge: c98fa2f 627a15e
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-15 13:44:34 +0000

    Merge branch 'plugin'
    
    Conflicts:
    	.gitignore
    	configure.ac
    	tests/Makefile.am
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit e623f4b62512508af7f9bd30965e1d8e17a6f74c
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-14 12:02:32 +0000

    all: use hold/unhold instead of ref/unref
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 68771fd034b1b2df3d286352479d687c32c199e0
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-14 09:44:36 +0000

    all: use specific to/from when referring to contacts in stanzas now
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit c98fa2f0585d1752db4c37af6ea9abcb13c31ff3
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-03-12 10:14:13 +0100

    Distribute *.pc.in files, and different text for uninstalled version.

commit 84fab29e9bba4dc5b8f4e19e94a81dd4f262c49d
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-03-11 15:36:57 +0100

    Add a telepathy-salut.pc file which contains the executable path.
    
    For use in tests.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=35211

commit 627a15ea32138a4406dc2bd8c29e879b1a8f14e9
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 16:51:12 +0000

    plugin: clarify the ownership of the returned array
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit d63fd99f448a10cf34b881c478861b603ffd2c6d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 16:46:54 +0000

    connection: fix typo when freeing the actual pointer array
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 4fd95fb998e8bd4143504d8c99a564a34246cd49
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 16:43:39 +0000

    avahi-{contact,self}: fix typo in making contact/self jid
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 9190abbe5e9041444424a49b6a6d6c45b453170f
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 16:39:34 +0000

    plugin: use G_DEFINE_INTERFACE
    
    We need GLib 2.24 for this.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit edcba4c589ff2b6954d46de3bdeda4ff91455eb5
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 16:31:15 +0000

    connection: wocky_session_new now has a _ll suffix
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit a6bf9ee54e934988f59a3d3296e3cc476b1bb703
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 15:40:40 +0000

    ft-manager: only get the contact with an actual ft offer
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit e35953ceb721c30e7808edccf8a00ca9a185adc7
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 15:37:42 +0000

    gibber-xmpp-connection: removed
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 51bd65fd96c762fea7990507db13b144cee50abc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   2011-03-02 16:34:55 +0100

    add Messages properties to immutable properties

commit e4bd1f21c86cbd949f70a911f6dc8dfd795e1baa
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 15:34:16 +0000

    gibber-iq-helper: removed
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit dbd43829b8370a7fb2b5120594b3e30752452a55
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 15:32:16 +0000

    si-bytestream-manager: remove stray include of Gibber iq helper
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit f8bc814ca4f1343080f5e5b384143cc63ee81f08
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 15:30:06 +0000

    gibber-xmpp-connection-listener: removed
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 423253450d567702bd427448f52bb14992c4321e
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 15:20:55 +0000

    xcm: remove files
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 75c4a6d047cb5833afb410fcb7fc38b00d2e4804
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 15:20:37 +0000

    connection: stop creating an XCM
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit bc601fcaf79be77d8b87e33c3685f68204aa44b3
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 15:18:02 +0000

    presence-cache: stop using the XCM
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 437ecdf19f385a28d3a9ac4a92a3dfaa732b2695
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 15:17:20 +0000

    bytestream-oob: stop using GibberXmppConnections
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit e56b5d3319ce696568fd813361b7ec742c8704ee
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 14:00:48 +0000

    bytestream-ibb: stop using GibberXmppConnections
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 923da48ffc4735a139c950bcd2f1e911cc68f15d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 14:00:09 +0000

    si-bytestream-manager: stop using the XCM
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 0e37db997eecb5b8646a2f362da2fa53ec0c78a2
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 13:59:43 +0000

    tubes-channel: stop using the XCM
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 898b111ab4a296052fcc333b911d3626af990916
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 13:56:06 +0000

    tubes-manager: stop using the XCM
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit f6fa1694a73010ac0134a648cfcfea93cb9ccd76
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 13:54:14 +0000

    muc-manager: stop using the XCM
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 2857f6212a3e2e9136469f224f77b3e21472ac72
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 13:50:05 +0000

    connection: stop using the XCM for OLPC uninvite stanzas
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 5dfe4eafe41678ea7291825f3fe8128a59a651a7
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 13:48:49 +0000

    olpc-activity: stop using the XCM
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit aff3ae0fa99b1ecd7078505e1d8503e997ce0bd8
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 13:48:04 +0000

    roomlist-manager: stop using the XCM
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 900449dfacf9518f3fcc52972f8ef0a4850f75af
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 13:47:28 +0000

    file transfers: stop using the XCM
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 5b1e6d98e994e33d234db050fba28c533d41ac65
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 13:45:45 +0000

    presence-cache: handle errors when discoing contacts
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit b2c345adeb8f9df81b5eecd0d00583e8b90deefb
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 13:45:09 +0000

    im-channel: stop using the XCM
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 31e26a89bc3d052ef2d29a2afdb5bd297c8e15d5
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 13:44:05 +0000

    im-manager: stop using the XCM
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 408b0ccb7919cdaef808357c9d65355c261f5f4e
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 13:42:23 +0000

    disco: stop using the XCM
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 60fe494dd65dac6a46aa19fded9b2b9bef9f9822
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 13:35:53 +0000

    avahi-contact-manager: add contacts to Wocky's contact factory too when created
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit e4c52c08713c044949fd825986d832b4687c24c7
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 13:34:41 +0000

    avahi-contact: make a subclass of WockyLLContact
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 5cf592b7034bebfc0be623bc662b43897fd71b09
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 13:28:17 +0000

    connection: close all porters when disconnecting
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 97a6813723e5fa96109c82f3aa31e296ec8cfc2a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 12:16:58 +0000

    connection: create a WockySession
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit b79d0489bc6ef6b912af020d4014170a79827bb1
Merge: 7e4e2b4 8843f79
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-03-02 08:04:06 +0000

    Merge remote branch 'stef/test-using-gtest'

commit 7e4e2b44d35cc8e7321e4f62cc8dbb84a4f43f1e
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   2011-03-02 09:52:26 +1100

    message-sent and message-received are int64, not uint64 or uint32

commit 8843f79f35f40e517154d0b231681c220ddebce0
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-02-16 16:50:27 +0100

    Migrate from 'check' to glib tests.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=34341

commit 1b1060dc25d6a027b02a2c3a928fef0bff239dbc
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-02-13 16:08:51 +0100

    Cleanup comments that no longer match source.

commit aec9acb11cc830b199571cc675577a40669cc3cf
Author: Stef Walter <stefw@collabora.co.uk>
Date:   2011-02-13 16:00:57 +0100

    Remove unused member variable.
    
    SalutImManagerPrivate::pending_connections

commit 8ff71251a3e5dd85645b85fe16e161eb126bfe1e
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-09 12:41:43 +0000

    gibber: remove node and stanza tests
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit e36cc7e902fec88a1fb979e10cf1f2b86611464d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-09 12:37:59 +0000

    gibber: remove GibberXmppNode wrapper
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit c06e646052ad30573ee2404b841eda6352e036e7
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-09 12:37:46 +0000

    gibber: remove GibberXmppStanza wrapper
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit ebdffdf082dc15538815517970c5af10184b1115
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-08 14:42:20 +0000

    salut: include wocky as part of the salut plugin API
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit d09a602e12e25484dce07a22973fbbc111b7ae3d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-08 11:14:53 +0000

    plugin: fix up pkg-config files
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 95ed3ebfffdbbe6da7db659c06cb9aeb11d252db
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-08 10:26:31 +0000

    salut: move protocol.h to salut's public API
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit baf67f53e38d8ac0d4e7355f832d4065bd9c6553
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-08 10:17:19 +0000

    protocol: specify the DNSSD name and have a backend fallback
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 3f2f6de25ce5a5d7d5d335682548c1a95b72feb1
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-08 09:51:26 +0000

    src/: remove backend static libraries
    
    Just throw it all into the convenience library.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 8d8cbbdd95e420c34916da95bd2ce2b34e4f57b4
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-07 16:48:53 +0000

    avahi-{contact-manager,self,contact}: don't assume dnssd name is _presence._tcp
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 96da3972933b51037593c92a395a96e26f2c0f4f
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-07 16:48:03 +0000

    avahi-discovery-client: add a get_dnssd_name function
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 6db2272c47e4ba7cadf623940e2877d820359cf1
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-07 16:15:41 +0000

    protocol: allow the name, icon name and English to be set easier
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 0a4e239e80474e990475c987546adc80c4af6008
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-07 14:06:08 +0000

    test plugin: document how to add another protocol
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit e343336ffb798eccfae8b3e5f0fdb5ab6b294e6d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-07 13:48:42 +0000

    plugin: add initialize method to give access to the CM
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 5700f08ca7b05df559a0829c04d7874e3c4d86b9
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-07 13:28:30 +0000

    plugin: add padding and API version
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 16b379a0df1128cdc22c64fc06b2fb55001129d1
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-07 12:40:18 +0000

    plugin: clarify the return type of CreateChannelManagersImpl
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit c241268980bcbdc00e768343eb56d7ae27162020
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-07 12:37:32 +0000

    test plugin: implement create_channel_managers
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 9acaad58f52a2d337126968aa173b35a4fb14c2d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-07 12:37:11 +0000

    connection: add channel managers from plugins
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 091287566f168fd2a26900d4d8980973b889f144
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-07 12:36:45 +0000

    plugin-loader: add create_channel_managers method to iterate the plugins
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 60f4cffc76886b2cc16a5672ef540e6aa346058d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-07 12:35:16 +0000

    plugin: add a create_channel_managers plugin member
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit be34bffd864816dbd82a8097a955eec3ed4131fa
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-07 11:57:31 +0000

    plugin-loader: add plugin loader from gabble
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 6195e787e6fb2c92cebe85ebd815210f0952a2f0
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-07 11:49:59 +0000

    plugins: add a test plugin
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit aacd617f299de8836b41383634c452060f0dcf4f
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-07 11:44:15 +0000

    plugins: start defining SalutPlugin interface
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit fc8261c9098be490635c7f6eea3fa47d0a134263
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-07 11:37:46 +0000

    configure: add --enable-plugins option and link to gmodule
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit af380d713a0fe6a74b84e30d0ebd576ed2904f2c
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-07 11:34:08 +0000

    debug: add plugin debug categories
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 395324b1dab0e8b03b0ae44704a1347fefb3776b
Author: Jonny Lamb <jonny@debian.org>
Date:   2011-02-04 14:43:55 +0000

    caps-hash: use wocky_caps_hash_compute_from_lists
    
    Signed-off-by: Jonny Lamb <jonny@debian.org>

commit 56d7666e1bf58b3bed1301e039338765f181239a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   2011-02-03 09:58:55 +0100

    add mising space

commit 7be0c14026bc0d6c2b48cf63ef8078ada04b3fb4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   2011-02-03 09:58:26 +0100

    file_transfer_channel_allowed_properties: update comment regarding properties ordering

commit e5e96f1eb0f55daf657d696b7871e70ee22e9f4c
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-02 16:30:48 +0000

    caps-hash: remove caps hashing code
    
    This has moved to Wocky.
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 2ae55c56418a3eca478503b345a11505280b4341
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-02 16:30:26 +0000

    presence-cache: use wocky's caps hashing code
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 5232222c686297476efa5d0480b59380cdbb23d4
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-02 16:29:59 +0000

    configure: test for python-avahi
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 015fd9530cbbe4b010e8314dc2e7bfa7eb55c985
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-02 16:12:24 +0000

    configure: check for xmldiff
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit 4b6c7eae9d1f338ce9f7bc5a08b47175f23937be
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   2011-02-02 15:50:13 +0000

    update wocky snapshot
    
    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

commit a05c46e046b564c4a9f1a5a5f438ede6e33f0029
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   2011-02-02 16:45:31 +0100

    test URI property

commit 1cb100517f2e430ef31b310acbbd7cf35463021e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   2011-02-02 16:31:36 +0100

    Implement FileTransfer.FileURI (fdo #33833)

commit 4a2f0b9d5c36dd085a93d3e8a0fc3d87e7829f69
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   2011-02-02 15:21:20 +0100

    file transfer tests: use constants.py

commit 317ad67e47170acf2cdc3fe0c6ab045b3093f628
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   2011-02-02 14:29:28 +0100

    constants.py: sync with Gabble
    
    Remaining change: ContactCapabilities is still a DRAFT in Salut.

commit 8783513aa2c5fde5d408054d10d8c89f48e7ea92
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   2011-02-02 13:16:22 +0100

    file_transfer_channel_allowed_properties: use tp-glib constants
    
    Also re-order it to match Gabble's ordering.

commit 7dffc1e2c000a36d8cae2f69b43e8144e89d6b26
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   2011-02-02 13:10:52 +0100

    Depends on telepathy-glib 0.13.12
    
    We need it to implement FileTransfer.URI.

commit e8e06a9d1c688d7b56ccc1f8267ece7cb9a96d62
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   2011-02-02 13:25:19 +0100

    saluttest: silence the queue if we hit an error
    
    This a backport of the Gabble commit ee177cfb2a13a8374e2f1037e806b7bc58aa708b

commit f7687c7da88feccd4a225d17397ee83118018052
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-12-03 15:59:35 +0000

    test-close-local-pending-room.py: be more specific in our expectations
    
    When not on a LAN, the events don't come out in the order we'd assumed.

commit a15d92f646d661207f947c65554bc2421a42fe57
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-12-03 15:58:34 +0000

    test-close-local-pending-room.py: use constants.py

commit 5527c3226d98a1afd3b0df3c63b36712d9149f09
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-12-03 12:30:29 +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.

commit 8a26a635ad7249d650afede4201030e34c567cc5
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-12-03 12:29:55 +0000

    test-muc-invite.py: make better use of constants.py

commit ff4a8979d408daaebd19ff041b2d908aa3a3bc76
Merge: ee83ae0 cbe5cc6
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-12-03 12:18:21 +0000

    Merge branch 'master' into mock-avahi

commit cbe5cc6fdeb62706f03bf212f2fd747dae8bde15
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-11-17 17:48:01 +0000

    fd.o #31665: use TpDBusDaemon, not tp_get_bus()
    
    Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

commit ee83ae0811a5753316766ded2d85f8758f83ba43
Merge: 2cb3acc 279099c
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-11-05 14:03:04 +0100

    Merge branch 'mock-avahi-3' into mock-avahi-4

commit d68cc47ccbc09a02f997eb2e09d8e6977099cdeb
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 15:45:53 +0100

    Remove SalutCapsChannelManager

commit 4f5e6848885df1e4418a6ea525533399d2cf52bc
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-11-01 12:23:03 +0000

    SalutPresenceCache: don't store per_channel_manager_caps

commit a66e59e57fb9d5a0db5e7a783d918552c9b853f7
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 15:40:34 +0100

    SalutContact: don't store per_channel_manager_caps

commit ff8a9257edd2347d65c49c7a1e70b1fa685f535d
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 15:39:13 +0100

    SalutPresenceCache: don't emit the actual capabilities in capabilities-update

commit 2d79e55cae1bc970738bbea23f7f29bb609c2841
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 15:35:06 +0100

    Remove now-unused functionality from SalutCapsChannelManager

commit 5ab4bfc3d804e3d7f13c02f74204c33c5fcab02b
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 15:14:15 +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.

commit 85c6d6055dac41fb9426c7fd80c921996d1d3e0c
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 14:59:33 +0100

    salut_self_swap_per_channel_manager_caps: stop returning the old caps
    
    They're no longer needed.

commit 185f79efa3815df1f0d808a329ea8092ed773f15
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 14:57:19 +0100

    _emit_contact_capabilities_changed: no longer needs the old/new caps

commit 6780d912b70569152df058fb3087d1d12e7f468e
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 14:56:09 +0100

    _emit_contact_capabilities_changed: always emit the signal
    
    Both of its callers now check for a difference.

commit 94cb205fc725d6522f6c8072565140f0e3206c65
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 14:55:09 +0100

    salut_connection_set_self_capabilities: only call _emit_contact_capabilities_changed if caps have changed

commit 107e5f62fe1e1d3e459ecc6f0d459a68c6886b44
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 14:51:51 +0100

    connection_capabilities_update_cb: always call _emit_contact_capabilities_changed

commit af3395399d83d916035e2df1209f7fe959352568
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 14:51:15 +0100

    salut_presence_cache_change_caps: do nothing if contact's caps are unchanged

commit be3658ad0df3a4a81d66e255cecd559dcaa69ec3
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 14:47:36 +0100

    SalutCapsChannelManagerGetContactCapsFunc: remove, unused

commit 9e348a4b7be07c544bcae015e08b1f0c157e5959
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 13:19:42 +0100

    SalutConnection: use GabbleCapsChannelManager to read contacts' caps

commit 568c4516d414d3027ad1d707235a4e009a9beb42
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 13:17:50 +0100

    Implement a trivial GabbleCapsChannelManager on channel managers that have no caps

commit 96b3489f713a0c2cdb31f304aad8e0ca9a82ba95
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 13:10:15 +0100

    SalutImManager: implement new-style get_contact_caps

commit 739c94ced26cabe12bb5bc87760983c4e24d845e
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 12:59:46 +0100

    SalutSelf: limit per_channel_manager_caps editing to a "swap" operation

commit 824aa6b7b2143632186997facff1e6c545d2e9dd
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 12:53:41 +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

commit bc579b149883f032c124aece99e8098db69ffdb9
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 12:39:04 +0100

    Add simple accessors for SalutSelf's per_channel_manager_caps

commit 2e526e88acb15a9a2c45d523ee772ab1b582e154
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 12:17:15 +0100

    salut_self_get_features: make static

commit 492ff26eeea595bbf9bfcf36bee76ba87be59a6a
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 12:06:27 +0100

    Use salut_self_get_caps instead of salut_self_get_features

commit 83e66a0af3117bc559b31eab52d8e4d62b2ee292
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 12:06:08 +0100

    SalutSelf: add an accessor for a capabilities set

commit a13c8e58094b9524ada5c54edb7ca8c9c6a99518
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-06 19:08:22 +0100

    FT, Tubes channel managers: implement GabbleCapsChannelManager

commit dbae0daf521292779949dd1a20650be09295f9c6
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-06 18:58:14 +0100

    Add a quirk (pseudo-capability) to anyone without XEP-0115 caps

commit 3412b586ac693e2d1b73ec276cd36b1e5d25bc28
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-06 18:53:53 +0100

    SalutContact: have guaranteed non-NULL new-style capabilities

commit ec01a9a74666325d6cd3601aabb132b302bb3206
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-06 18:38:04 +0100

    SalutPresenceCache: remember a CapabilityInfo struct for those without caps

commit 14136a6e2d57fd0a6b7d0581f308405f978a49ab
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-11-01 12:22:20 +0000

    Give capability_info_get the semantics you'd expect
    
    In particular, this means the struct's members never need to be NULL.

commit 124e8bfca5dda0a74b55b36eb98656f3d1ebba88
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-06 17:54:24 +0100

    salut_presence_cache_change_caps: factor out

commit 764398884d19debfbefd380e4bf7aa477c867b5b
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-11-01 12:21:28 +0000

    SalutPresenceCache: store a GabbleCapabilitySet too

commit 6d9edc433b2ee0d94eacd638a073a410242a44eb
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-06 13:23:46 +0100

    SalutPresenceCache: imply caps_set by (per_channel_manager_caps != NULL)

commit ac7f670911cabd895f5af1240b2e3784d299b057
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-06 13:20:07 +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.

commit 21b30751bcf16356363db168ec33a1582822b198
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-06 13:09:37 +0100

    SalutPresenceCache: inline capability_info_recvd into its one caller

commit 4e7982bf4aed630addfd31d4d123d41e9da0620f
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-06 13:37:41 +0100

    SalutTubesManager: add_service_to_array: remove unused argument

commit ef65ffffd9b883dc5eae9fd0aac4cba5542a1ef5
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-06 12:57:33 +0100

    SalutFTManager: add_file_transfer_channel_class: remove unused argument

commit c26759d1cda55c8212c9f3c4700f62c646fdd837
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-11-01 13:16:32 +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

commit 2cb3acc20fcf252517a6b94f66f37f09756ba2b9
Merge: 93e1ace 401d722
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-11-05 12:28:03 +0000

    Merge branch 'reliability'
    
    Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

commit 279099cd64e7f337ce13f73bbb1f14b975a9c8ee
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-11-04 14:32:43 +0100

    Only emit ServiceResolver.Found signals that match the protocol

commit 0e0532968984ef1e49a61d463364202aeb9dc4a1
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-11-04 12:57:44 +0100

    Get the event for the expected protocol

commit 401d722e8adcc275e8c77416e57a2fcfc302bc8f
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-11-01 18:34:54 +0000

    Use wait_for_contact_in_publish more

commit c4537936793e9980f3c79b52851150ad5a365fd7
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-11-01 17:42:44 +0000

    test-caps-file-transfer: expect ContactCapabilitiesChanged in a non-racy way

commit 788dd4105660df6de1a7caee5cd8417f21488f79
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-11-01 17:31:22 +0000

    file-transfer/test-ichat-receive-file.py: re-enable if no other llXMPP is running

commit ad25a0c9081965c5ca1d8ff27bbcaf6f277eb9ed
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-11-01 17:30:59 +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...

commit 7b2aa8033044ef7c49303a4af4429b6a19b5421a
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-11-01 17:27:44 +0000

    gibber_file_transfer_new_from_stanza and friends: raise a GError

commit 1a44c03aa82541f38ca91e92f6f568c26a86fc56
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-11-01 16:04:40 +0000

    avahi/test-muc-invite.py: use wait_for_contact_in_publish()

commit 033bb4edc3aa0e150b8e7bc2488c7a2491e00170
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-11-01 16:04:22 +0000

    Tests: factor out wait_for_contact_in_publish()

commit 03688071f04208f2cf500512ac6c8247f7ffe6fd
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-11-01 15:53:56 +0000

    Only skip file-transfer/test-ichat-receive-directory.py if needed

commit ac6eef30becd54315ed8cd908f13e9eec112e4ef
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-11-01 15:53:21 +0000

    SalutFtManager: allow salut_file_transfer_channel_new_from_stanza to fail

commit 292c52e13cfef7aabe523cd145eede1bdede4133
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-11-01 15:53:07 +0000

    salut_file_transfer_channel_new_from_stanza: don't use FALSE as a null pointer

commit 90313495b1546a5134ddc77235f5ae327218e551
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-11-01 15:29:46 +0000

    avahi/test-ichat-incoming-msg.py: enable if we're not running another Salut

commit 93c7575637ed3b3663a2d17deccb5f2e97e67e6c
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-11-01 15:28:54 +0000

    avahitest: add a method to check whether another Salut is running
    
    Some of the tests can fail if there is one.

commit 2d24d3b662714f379592e35ce0ba26ed30631c2f
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-18 16:18:03 +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.

commit 243711910a0e2a1f2fb62c6f39a303704ed45cd6
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-18 15:59:41 +0100

    SalutDisco: echo @id in caps results

commit 54c4095ae197d0c840a1d1938c4d255aa9feb318
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-18 12:56:32 +0100

    Put Wocky debug information in test logs, now we use it

commit a4d42fb98e4049eee0bee2e9469a4191f58df662
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-18 12:56:13 +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

commit e81a81f343dc8488810710f6a58461fca42bc993
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-25 16:20:14 +0200

    Announce for both ipv4 and ipv6 those entries created with AVAHI_PROTO_UNSPEC

commit 47e13f5fdc1c342e925b400cdc823f97710513ad
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-25 14:10:00 +0200

    Resolve to ipv6 addresses

commit 83df5595eba196eab1418074f3dec0773798aed5
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-25 13:12:43 +0200

    Add a .service file for the mock avahi service
    
    as recent versions of avahi-client expects it to be there.

commit 93594c0f17ccfa9d5e62aad11da4d488721c17bf
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-22 18:30:33 +0200

    Allow multiple removals of the same entry

commit 8f507a22a32a2141abbe00baa2f81d9f5638c4f5
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-20 19:08:03 +0200

    Implement EntryGroup.AddRecord
    
    Use it to lookup multicast groups for clique

commit d5c3c7fccdc8db7a2453d4a9c6f9bed98ec365e0
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-20 17:50:16 +0200

    Remove superfluous timeout_add to speed up tests

commit e393717c71fb98170baa89a4ec5a026d7bcd4d20
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-20 17:31:28 +0200

    Remove ServiceBrowser and ServiceResolver when their client disappears

commit 84ac518af1149f11ed7f6b1fd1ae27bd4e7f71a5
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-20 17:22:48 +0200

    Free entry groups when its client disappears

commit e1890770b83d4c9538ade442d83adcfa14b79ea4
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-20 15:25:33 +0200

    Preserve original exception in test

commit c3af031143062b7431c747994eedd0b56b57e083
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-20 12:03:47 +0200

    Emit ServiceBrowser.ItemRemove when an EntryGroup is freed

commit 4cac324669d7744546741f6c78c6f2ce6e958b5d
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-20 11:54:58 +0200

    Remove unimplemented methods because of clutter

commit a6ded5eb4d586453142599c6d8b5aa9f7bf9e244
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-20 11:20:25 +0200

    Properly get the local hostname and domain
    
    and resolve it to a real address

commit facd128d30492156e659271352b5c2ece36d6471
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-20 11:00:17 +0200

    Don't overwrite host and port if they didn't change

commit 899351b0dda94455997ee5cb523077b0b36f8f4b
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-20 10:31:14 +0200

    When a ServiceBrowser is created, emit ItemNew for every entry
    
    that matches.

commit 06c7ae32288d16b282a3f6a10b502995db9c3f78
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-19 17:58:47 +0200

    Refactor the state and logic into avahimock.Model
    
    which is called by the dbus methods and emits the appropriate signals

commit eb6255d392d59f099024e7552a68bb5e013b7fbe
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-19 11:38:12 +0200

    Implement some o.f.Avahi.*.Free methods

commit 8b6cbd052584a52409351950b0374d82afb78105
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-19 10:48:17 +0200

    Also emit ServiceResolver.Found when a record is updated

commit 94733e1daa8874ab232c91d048e7f7215c8637bc
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-19 10:01:53 +0200

    Implement o.f.Avahi.Server.ServiceResolverNew and emit
    
    ServiceBrowser.ItemNew and ServiceResolver.Found.

commit 93e1acef5a3297a3f1d2609f7cb2bd4346fd0fb9
Merge: e637925 ed363eb
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-18 17:06:01 +0100

    Merge branch 'protocol'
    
    Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>

commit 44243b8c3b7bdf0f24367fa1c06df9f32d0b9aab
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-15 13:49:54 +0200

    Implement emitting StateChanged in terms of SignalMessage

commit e6379255daebc533d84f5e82fbc86dfbd412174c
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-15 10:28:06 +0200

    Preserve existing PYTHONPATH when running tests

commit 91963b4df2ff519fafb38c5832065e601dbdc856
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-15 12:06:05 +0200

    Implement o.f.Avahi.Server.ServiceBrowserNew

commit 2edd4d741a42cebd86fa2b0d342118538c0929f3
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-15 12:05:24 +0200

    Make entry group's object paths unique

commit d3624f3edcc833c8bbf0582df1cffc0a738f9e20
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-15 10:28:27 +0200

    Emit o.f.A.EntryGroup.StateChanged

commit 4b1779eb3b4a37cd428bc4463f9c00b3a5608e5d
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-15 10:28:06 +0200

    Preserve existing PYTHONPATH when running tests

commit ed363ebe811bd6adbfe03c95c4909bccd607c489
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-01 14:13:57 +0100

    Add a test for Protocol objects

commit a1e965e5c36c0a2e66d266c04d993de50404741c
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-01 11:42:50 +0100

    Add Protocol objects

commit bf32c4eb6b1ad30d33a42dcda666fb2b53f268ed
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-01 12:38:47 +0100

    All channel managers: implement type_foreach_channel_class

commit a6d8e7856005e86b829fb452e972c662360fadc3
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-09-23 16:52:04 +0100

    Depend on telepathy-glib 0.12 release candidate, for Protocol etc.

commit 9dbd9864fd9e0b3fb4badb638fb183d54047a45a
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-14 13:31:14 +0200

    Implement o.f.A.EntryGroup.GetState

commit 075914a2cf7afceb32fba2462328209df9c78ca6
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-14 12:47:23 +0200

    Return expected values in o.f.Avahi.Server.GetAPIVersion and GetState

commit a69372ddb701967d0faadbb8bfdfa874d9c8c801
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-14 12:46:30 +0200

    Set DBUS_SYSTEM_BUS_ADDRESS before launching the CM process

commit fbe4a4782ee22b373a322412bfbc7ef19c33e62c
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-13 16:52:26 +0200

    Implement o.f.Avahi.EntryGroup.AddService and Commit

commit 71a00c2cbf7a4a19ee19b57795e5d4e98c43210b
Merge: 54017f0 a9ef4a4
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-13 15:35:59 +0100

    Merge branch 'wocky'
    
    Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

commit a9ef4a4cef43ecf469d06ef5792359c0688ad7f4
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-13 15:04:36 +0100

    Enable gtk-doc in distcheck so Wocky can also distcheck

commit 789c6be33c7db6b8e1b4e0319f19a4e280cfd8be
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-13 14:52:13 +0100

    GibberXmppStanza: include wocky-stanza.h in a way that works out-of-tree

commit 74a80043531c0cca12a19d8e2d612f33fee7f8a2
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-13 13:39:45 +0200

    Implement o.f.Avahi.Server.GetHostNameFqdn and GetDomainName

commit ae31ed7c0ab1280285cfccbcae213a87163cf230
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-13 13:07:01 +0200

    Implement o.f.Avahi.Server.EntryGroupNew

commit 4559c4691e3f68cac18dba3990e367d16ba38d0f
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-13 13:06:22 +0200

    Implement o.f.Avahi.Server.GetHostName

commit f476cd509c630408f6fbb08abdc373c98877284c
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-11 14:01:50 +0200

    Add mock service implementing org.freedesktop.Avahi*

commit 087e05ca156bf1b133de1d21f738a8cee7ec2be4
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-11 13:57:31 +0200

    Make sure that the mock Avahi service is running
    
    ...before executing every test.

commit 0d500b026d044c615e4e3a8219ae5fd773deba2c
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-11 13:56:02 +0200

    Move call to Avahi from the class definition to the constructor
    
    so we don't depend on Avahi on module import

commit e214e31e95f68c7088950daaa6acc39f2eaa1173
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-08 15:24:34 +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.

commit 2dfe5319d5a3603a450717a271a59f8b575e0588
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-08 14:52:51 +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.

commit 0febecdd02df4f4b73f2825159a6f6aa36e7b506
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-08 14:46:20 +0100

    Replace GibberXmppWriter with WockyXmppWriter and some inlines

commit aa933d09fda320cdafa99e6a2816f5071078015c
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-08 15:26:40 +0200

    Use the temporary bus as the system bus in the avahi tests

commit 3aad39ef4ea2aaf37a210800ef72570dcc197fd4
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-08 14:25:57 +0100

    Fix a few remaining instances of stanza->node

commit 7cf0935a252015bb9fd08466e8cef8cca9a4cabd
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-08 14:25:43 +0100

    GibberXmppReader: cope with stanzas with no namespace
    
    Backported from WockyXmppReader.

commit 8418b6f5cde587b444c45a308e8a8698e39b383f
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-08 13:42:34 +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

commit e6efc9a197db675f84df2e84ebb38e283f90ed22
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-08 13:39:13 +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

commit 93e80f65abec276c7c2f3888665e23057b71152f
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-08 13:38:20 +0100

    init and deinit wocky in the Gibber tests

commit e73c51ad7414eb150dca9c7eb432a44edf469b2e
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-08 13:37:57 +0100

    yet another set of WOCKY_CFLAGS

commit 2f8d86cd0927d3f1f76bf62414357e117f4cb9bb
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-08 12:23:41 +0100

    GibberXMPPNode test: don't change nodes' namespace

commit 834d18332f3d585dcdba4abda430dcc2a59131ae
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-08 12:23:20 +0100

    SalutTubeStream: don't change the namespace of a node after creation

commit a880ca796c8fb9d3a761c6cd22f435617b3d6e68
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-08 11:48:27 +0100

    Remove gibber_xmpp_stanza_new

commit e55f92ff9b68b102f4b39895004ab4c5112eafac
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-08 11:38:48 +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.

commit ec55ac9cd25a418468de7db819cc5a44dfadcec3
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-08 11:34:50 +0100

    gibber_xmpp_stanza_new_ns: add

commit d8f2be17257d44cd50b0590937fa3e5fd9dfc7b3
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-08 11:36:35 +0100

    gibber_xmpp_node_new_ns: add

commit b175d097d4e574ea2c4fe272bdc982dd83fbf4f3
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-08 12:01:47 +0100

    Add Wocky CFLAGS to Gibber tests so we can use Wocky's constants

commit 8b5cf4ba620eccfdc63146f7fb7cb9524ccf4620
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-08 11:18:28 +0100

    Glue Wocky into the build system

commit 64a0d8635871b9f85e335d05c65765774c99c497
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-08 11:04:23 +0100

    Set up Wocky in autogen.sh

commit 7cc3f4a29e1c106eafd1146ae5c630a939d1eeed
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-08 11:03:52 +0100

    Add Wocky as a submodule

commit 54017f0527fb4487e1ae386f7762af46272f83e7
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 15:58:07 +0100

    Nano version for development branch

commit 931c49c5eefede516a80d6721f49c134d2a652d9
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 15:57:24 +0100

    Revert "Adjust configure.ac for stable branch"
    
    This reverts commit 9bd0a0719e394c42f8f95e29ce811360437a8016.

commit 9bd0a0719e394c42f8f95e29ce811360437a8016
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date:   2010-10-07 15:57:00 +0100

    Adjust configure.ac for stable branch

commit 5f2c842b817732d0a77759139ee562150e7863c0
Author: Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>
Date:   2010-10-06 19:00:23 +0200

    Bump nano version to 0.4.0.1
