[Telepathy-commits] merge: telepathy-gabble-0.4

[Merge Monkey]

Merge to:

  telepathy-gabble-0.4

From:

  /home/robot101/public_html/gabble-0.4-jingle-backport

Changes:

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    GabbleConnection: remove calls to jingle_info.c

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    GabbleMediaChannel: implement the properties mixin and export nat traversal, stun server/port and gtalk relay token properties

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    GabbleConnection: remove the properties mixin and extraneous relay properties, leaving only stun server and stun port as normal object properties

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    GabbleVcardManager: add missing #include "handles.h", must've been included via -connection.h's properties-mixin.h previously

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    GabbleMediaFactory: add jingle info retrieval code which sets the stun server/port and relay token on newly created channels, or propogates the connection's values if they're set

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    remove unused jingle-info.[ch]

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    hook up missing jingle_info_cb

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    move properties interface from the connection to the media channel and regenerate