[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/smcv/public_html/darcs/salut-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Correct key segmentation, this time for the initial TXT record

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Split OLPC keys into 200 byte segments to bypass the 255-character limit in TXT records

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Correct key segmentation

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Stop expecting an empty segment to terminate OLPC buddy keys

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    If we're asked to SetProperties (OLPC BuddyInfo interface) and we aren't yet connected, save the changes up for later

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Parse contacts' OLPC keys as byte array, not base64 string

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    SalutAvahiEntryGroup: make sure entries are NUL-terminated in case we later use them as strings

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Allow OLPC key, color to be set before we go CONNECTED, in principle. Simplify the code for key-splitting.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    If ENABLE_OLPC, don't leak contacts' OLPC key/color

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't crash on finalize if there is no OLPC key

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix various typos in base64 -> binary key port

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Deal with OLPC key correctly, avoiding having two copies

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    SalutSelf: if the OLPC key changes and is shortened, remove any stray segments from the old key

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Use correct free function for SalutConnectionPrivate::olpc_key

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Use GArray of binary data, rather than gchar*, for OLPC key. Put it in olpc-key-partN as binary rather than olpc-key-partN-b64 as base64. Be more const-correct.