[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/cassidy/public_html/darcs/telepathy-gabble-cassidy

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabble-media-session: pass NULL as reply_func to _send_with_reply instead of using our own ignore_reply_cb

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb: use _gabble_connection_send_with_reply when sending the IBB close IQ so connection_iq_unknown_cb is not called

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    conn-olpc: always use _gabble_connection_send_with_reply so connection_iq_unknown_cb is not called

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    conn-olpc: pass NULL as reply_func to _send_with_reply instead of using our own ignored_reply_cb

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-ibb: pass NULL as reply_func to _send_with_reply instead of using our own ignored_reply_cb

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabble-connection: allow reply_func to be NULL in _gabble_connection_send_with_reply