[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv-trivia

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't segfault on <activities> replies with no @from

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble-muc-channel: re-order #includes

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    If we get OLPC activity properties containing unknown types, err on the side of emitting unnecessary rather than insufficient signals

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-factory: fix text_needed_for_tubes leak

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Trivial: no need for strlen() to check for zero length

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    conn-olpc: give ActivityInfo a conn member, enabling it to be self-freeing

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add telepathy-gabble.8 man page

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Use tp_strdiff for clarity

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Use ustar (POSIX 1998) tarballs to allow >99 character filenames

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Merge two patches both called "muc-factory: fix text_needed_for_tubes leak"