[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv-trivia

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Move _gabble_connection_get_cached_alias to conn-aliasing.c

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    _gabble_connection_get_cached_alias: don't rely on having access to priv

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Inline gabble_conn_aliasing_get_cached_pep_alias into its only caller, which is now in the same file

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Move connection_nickname_update_cb to conn-aliasing.c