[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/cassidy/public_html/darcs/telepathy-salut-list-rooms

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix conflict with HEAD

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    roomlist don't have to be a singleton

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    implement org.freedesktop.Telepathy.Channel.Type.RoomList

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    roomlist-channel: coding style tweaks

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    roomlist-channel: salut_roomlist_channel_set_property: assert handle and handle-type value

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut_roomlist_channel_close: emit the closed signal so we don't have to explicitely call g_object_run_dispose

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-manager: directly use g_object_unref instead of unref_foreach