[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut_contact_manager_get_channel: reformat to Collabora coding style, use GUINT_TO_POINTER for handles

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-muc-manager: tubes_channel_closed_cb: TpHandle is unsigned, treat it accordingly. Replace FIXME comment with the chosen resolution

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut_muc_manager_factory_iface_request: reformat, treat TpHandle as unsigned

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut_muc_manager_new_muc_channel: reformat, treat TpHandleType as unsigned

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-muc-manager: _get_connection_parameters: make static, reformat

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-connection: use GUINT_TO_POINTER for handles

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-muc-manager: _get_connection: make static, reformat

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-muc-manager: muc_channel_closed_cb: reformat to Collabora style. Correct for unsignedness of TpHandle.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut_contact_manager_new_channel: use Collabora coding style, use GUINT_TO_POINTER for handles

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut_muc_manager_request_new_muc_channel: reformat

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Rename salut_*_get_olpc_activity_properties to ..._merge_...

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-muc-manager: new_tubes_channel: reformat, treat TpHandle as unsigned

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    salut-connection: emit_presence_update: whitespace