[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/cassidy/public_html/darcs/telepathy-salut-cassidy

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add jid key support to BuddyInfo.SetProperties implementation

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-contact: add jid public variable

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add support for SALUT_LOGFILE env variable to log output to a file

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    BuddyInfo interface: add jid key support to GetProperties and PropertiesChanged

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    move jid from _SalutSelfPrivate to _SalutSelf as the OLPC BuddyInfo interface will need it

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    few coding style tweaks

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    move void debug_set_log_file_from_env declaration to avoid double G_BEGIN_DECLS