[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv-maemo

Changes:

  Senko Rasic <senko.rasic at collabora.co.uk>
    _got_self_avatar_for_get_known_avatar_tokens: in the corner case of us starting disconnect right after GetKnownAvatarTokens call but before our own token is known, don't report bogus handle 0 to the user

  Senko Rasic <senko.rasic at collabora.co.uk>
    don't try to gracefully avoid a bug if it's there; assert what can't happen, and fix the bug if and when it happens

  Senko Rasic <senko.rasic at collabora.co.uk>
    when blocking gtalk contacts, discard their presence

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Turn off tar-ustar in configure.ac - it's not supported by automake 1.8, as used on Maemo

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Merge with upstream

  Senko Rasic <senko.rasic at collabora.co.uk>
    fix function comment

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tar-ustar turns out to be an Automake 1.9 feature, so require Automake 1.9

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Patch from Jussi Laako to turn off whitespace keepalives (on Maemo, libloudmouth has been patched to use TCP_KEEPALIVE)