Created attachment 85732 [details] [review]
1/2] tp_dbus_properties_mixin_dup_all: make public

There's no real reason not to - anything that implements D-Bus
properties is clearly going to have this method in some form.
Also, my next commit needs it.

Created attachment 85733 [details] [review]
2/2] cm test: test "drop name on get" on a modern CM

We were only testing this case on the archaic CM, but that's
undesirable when converting to Telepathy 1.0, since a CM with no
D-Bus properties will cease to be a valid CM.

The diff is a little confusing because I'm basically turning
test_dbus_fallback() and its fork test_dbus_ready() back into
the same function. The merged version does everything that
either of its precursors did.

Created attachment 85739 [details] [review]
[next] TpConnectionManager: retry introspection after CM exits, up  to once

Many connection managers automatically exit after 5 seconds of
inactivity. If the CM has no .manager file *and* exits in this way
while we are introspecting it, we would previously consider it to have
failed introspection - but with sufficiently unfortunate timing,
that can result in empathy-accounts not considering Haze to exist.

To avoid this, without going into an infinite loop if the CM fails to
introspect, retry once, but only once.

[This is a forward-port to Telepathy 1.0.]

---

This is commit 60120429 (Bug #67183) squashed into Attachment #85733 [details] and manually applied to next, to be applied on top of a cherry-pick of Attachment #85732 [details] (which is itself non-trivial because there is something else in the -internal.h on next).

It also contains a couple of irrelevant patch-bands:

* cope with the protocols coming out in reversed order
* reinstate the ACTIVATE_CM test

because they were in master, and I suspect they were previously mis-merged into next. Yay conflicts.

I'll put commit hash references in when I've committed the original.

Comment on attachment 85732 [details] [review]
1/2] tp_dbus_properties_mixin_dup_all: make public

Review of attachment 85732 [details] [review]:
-----------------------------------------------------------------

++

Comment on attachment 85733 [details] [review]
2/2] cm test: test "drop name on get" on a modern CM

Review of attachment 85733 [details] [review]:
-----------------------------------------------------------------

++

Comment on attachment 85739 [details] [review]
[next] TpConnectionManager: retry introspection after CM exits, up  to once

Review of attachment 85739 [details] [review]:
-----------------------------------------------------------------

++

Fixed, and 'next' is now up to date with master again.