[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/ptlo/public_html/telepathy-gabble/gabble-vcard-swamp-to-desert

Changes:

  Senko Rasic <senko.rasic at collabora.co.uk>
    GabbleVCardManager: specify number of vcard items in edit calls, instead of NULL-terminating the list

  Senko Rasic <senko.rasic at collabora.co.uk>
    first step in rewriting vcard setting code

  Senko Rasic <senko.rasic at collabora.co.uk>
    more vcard tests

  Senko Rasic <senko.rasic at collabora.co.uk>
    GabbleVCardManager: hide newly-patched vcard until server confirmes we replaced the old one

  Senko Rasic <senko.rasic at collabora.co.uk>
    GabbleVCardManager: remove unused error param to the request function

  Senko Rasic <senko.rasic at collabora.co.uk>
    GabbleVCardManager: dont register negative alias update if previous nickname wasn't set; observe newly patched vcard when server confirms it's properly updated

  Senko Rasic <senko.rasic at collabora.co.uk>
    vcard-manager.c: indentation cosmetics

  Senko Rasic <senko.rasic at collabora.co.uk>
    fixed merge conflicts

  Senko Rasic <senko.rasic at collabora.co.uk>
    use the new vcard editing interface in conn-avatars

  Senko Rasic <senko.rasic at collabora.co.uk>
    GabbleVCardManager: get rid of redundant 'message' attribute in vcard cache entry

  Senko Rasic <senko.rasic at collabora.co.uk>
    vcard-manager.c: removed extra space

  Senko Rasic <senko.rasic at collabora.co.uk>
    gabbletest.py now properly stores set vCard; removed extra space in tests

  Senko Rasic <senko.rasic at collabora.co.uk>
    GabbleVCardManager: simplify edit_requests traversal, assert that we don't request vcards we already have cached, and fix for crash due to usage of invalidated cache entry

  Senko Rasic <senko.rasic at collabora.co.uk>
    GabbleRequestPipeline: make timeout/cancelled requests zombies instead of destroying them, so that eventual connection replies can be properly handled

  Senko Rasic <senko.rasic at collabora.co.uk>
    GabbleVCardManager: deep-copy original vCard before patching

  Senko Rasic <senko.rasic at collabora.co.uk>
    added new vcard test

  Senko Rasic <senko.rasic at collabora.co.uk>
    vcard-manager.c: improved comments