[Telepathy] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/cassidy/public_html/darcs/telepathy-gabble-fix-resource

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    don't increment resource ptr if NULL

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    if (ptr != NULL) is better from a coding style Pov

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    strchr returns a pointer on the first '/' but we don't want it in the resource

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    resource should not start with '/'