[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-set-props-before-connect

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Allow OLPC Buddy.SetProperties() to be called before we go CONNECTED, in which case it will always succeed, saving the properties for later.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabbletest: give the fake server PEP support so we can test OLPC properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    util: add gabble_g_value_slice_dup, gabble_g_hash_table_update

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabbletest, servicetest: Allow a custom callback to be run before starting the reactor, instead of hard-coding Connect(), so we can test pre-Connect things too

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Resolve conflict in gabbletest: addition of start= vs addition of authenticator=, protocol=

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add a test for calling SetProperties before we go CONNECTED