[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

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

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-muc-properties.py: set password-required property so we test a boolean setting too

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-muc-properties.py: add a multi values setting in server reply. Exhibit a bug as Gabble currently doesn't properly handle them

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    conn-olpc: explicitely ignore echoed PEP notifications. Ejabberd doesn't send them but Openfire does

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-channel: remove useless string buffer crack to get val_str from a boolean

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-channel: handle multi values muc setting

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-channel: copy all the <value> nodes if we don't know about a setting

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-channel: remove useless test when copying muc settings

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-channel: move value_node declaration