diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-10-04 15:28:33 +0100 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-10-04 15:28:33 +0100 |
| commit | b78d26c3319809e391a6bcda2d2cb7f454084b90 (patch) | |
| tree | eec1281acb81cb529f27a65903e3338e5fecb4c7 | |
| parent | 25799ee8f5b02a8893d7bc5c8007e58b9d444bdd (diff) | |
| parent | 33f85c6ed8818cef4db8e9b1caffe53ad4811456 (diff) | |
Merge branch 'telepathy-mission-control-5.8+'
| -rw-r--r-- | NEWS | 9 | ||||
| -rw-r--r-- | src/client-registry.c | 2 | ||||
| -rw-r--r-- | src/mcd-client.c | 1 |
3 files changed, 11 insertions, 1 deletions
@@ -1,6 +1,15 @@ telepathy-mission-control 5.9.3 (UNRELEASED) ============================================ +The “HELLO / YES, THIS IS DOG” release. + +Fixes: + +• The regression tests now work with D-Bus ≥ 1.5.6. (fd.o#41090, smcv) + +• An obscure assertion failure in the client bus name monitoring code is + fixed, we hope! (fd.o#39767, wjt) + telepathy-mission-control 5.9.2 (2011-08-31) diff --git a/src/client-registry.c b/src/client-registry.c index 7bd18883..8b96bce5 100644 --- a/src/client-registry.c +++ b/src/client-registry.c @@ -142,7 +142,7 @@ _mcd_client_registry_found_name (McdClientRegistry *self, * it is activatable */ _mcd_client_proxy_set_activatable (client); } - else + else if (unique_name_if_known != NULL) { /* We already knew that it was activatable, but now we also know * that it is active */ diff --git a/src/mcd-client.c b/src/mcd-client.c index 8f680c08..8ab492d9 100644 --- a/src/mcd-client.c +++ b/src/mcd-client.c @@ -1322,6 +1322,7 @@ _mcd_client_proxy_set_active (McdClientProxy *self, const gchar *unique_name) { g_return_if_fail (MCD_IS_CLIENT_PROXY (self)); + g_return_if_fail (unique_name != NULL); g_free (self->priv->unique_name); self->priv->unique_name = g_strdup (unique_name); |