[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  /home/smcv/public_html/darcs/tp-glib-smcv-cm

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpConnectionManagerClass: make public, with a private-data gpointer just in case it becomes necessary

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Make the contents of the TpConnectionManager struct public

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    list-managers: expect a constant array of CMs, and don't free it

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpBaseConnectionManager: always reject attempts to connect with an invalid protocol name

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpConnectionManager: Move emission of got-info into _read_file for consistency

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpBaseConnection: if protocol name is valid, just escape "-" to "_" rather than using tp_escape_as_identifier

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpConnectionManager: add 'name' member

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    If we don't know the CM's name yet when we want to look for the .manager filename, defer it until we're told

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpConnectionManager: start introspection in an idle callback. This has two effects:
1) avoids duplicate got-info signals
2) consistently always read the .manager file first, then decide whether we
   actually need to introspect, rather than racing with dbus-daemon

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpConnectionManager: When always-introspect is set to TRUE from FALSE, consider starting introspection

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add tp_connection_manager_check_valid_protocol_name

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Improve TpConnectionManager documentation

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tp_list_connection_managers: change API so the callback isn't responsible for freeing the list of CMs and unreffing the CMs

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Drastically simplify setting self->name on TpConnectionManager