[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  /home/alban/public_html/darcs/telepathy-glib-alban-bug16307

Changes:

  Alban Crequy <alban.crequy at collabora.co.uk>
    Remove trailing space

  Alban Crequy <alban.crequy at collabora.co.uk>
    Fix Bug 16307: run interface introspection only 1 time

  Alban Crequy <alban.crequy at collabora.co.uk>
    Remove debugging comment (commenting with C++ // was wrong btw)

  Alban Crequy <alban.crequy at collabora.co.uk>
    tests/dbus/connection-inject-bug16307.c: Remove invalidated_for_test: it was copy/pasted from the other test

  Alban Crequy <alban.crequy at collabora.co.uk>
    tests/lib/bug16307-conn.c: use good English in comments

  Alban Crequy <alban.crequy at collabora.co.uk>
    bug16307-conn.c: Remove aliasing_iface_init, it's safe to pass NULL to G_IMPLEMENT_INTERFACE

  Alban Crequy <alban.crequy at collabora.co.uk>
    tests/lib/bug16307-conn.c: Remove bug16307_connection_inject_connect_succeed: it was premature generalization

  Alban Crequy <alban.crequy at collabora.co.uk>
    tests/lib/bug16307-conn.c: Remove the "connect" property: it was premature generalization

  Alban Crequy <alban.crequy at collabora.co.uk>
    Remove debugging printfs

  Alban Crequy <alban.crequy at collabora.co.uk>
    Add a regression test for bug 16307