[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add an ABI-breaking FIXME: TpProperty could contain a GValue rather than a GValue*

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add some missing Nokia copyrights, and update some Collabora and Nokia copyrights to 2007

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add docs and private pointers to TpChannel, TpConnection in preparation for making them public later

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add convenience constructors for TpMediaStreamHandler and TpMediaSessionHandler

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Reserve space in TpConnection for self_handle. We don't implement it yet, because it should support Renaming.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix copyright headers on examples: include our URL, also credit Nokia

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add a rule to tools/Makefile.am to update the tools from ../telepathy-spec when run manually

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