[Telepathy-commits] merge: telepathy-salut-0.2

[Merge Monkey]

Merge to:

  telepathy-salut-0.2

From:

  /home/sjoerd/telepathy-salut-0.2-sjoerd

Changes:

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    GibberRMulticastSender: Set the pending removal state before checking the queue length as the lenght partially depends on the state

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    GibberRMulticastSender: Fix repairing when the node has moved to pending_removal

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    If we're resetting because the join failed, return JOIN_FAILED immediately

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    GibberRMulticastTransport: Ensure we wait for nodes to finish their failure process before completeling the JOIN

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    GibberRMulticastTransport: reset the timeout to zero when the gathering phase has stopped, not strictly necessary, but nice anyway

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Better debugging of sender garbage collection

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    GibberRMulticastSenderGroup: Fixed a silly bug where the condition in the forloop woud still true forever

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    GibberRMulticastSenderGroup: WHOIS_REQUEST senders should be looked up by whois_request.sender_id in the packet

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    GibberRMulticastSender: Don't assume that all packets between ->first_packet, and ->next_output_paxket exist

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    GibberRMulticast: Don't keep pending removals in the main hash, but put them in a seperate array. So we can start a new gathering session including them, while still being able to react on repair requests

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Fix some small coding style issues

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    GibberRMulticast: Add more clear debugging information