summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivek Dasmohapatra <vivek@collabora.co.uk>2011-05-06 17:22:25 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2011-05-20 11:51:14 +0100
commit615aae42cf533e02feb08eeabcad2f6ae16ea6ac (patch)
tree5b1d78362867d1068ac03521ca8c881bfde8d15a
parente6cd84b0d147f24fc7e2dbcec99e6b494af3c032 (diff)
downloadtelepathy-mission-control-615aae42cf533e02feb08eeabcad2f6ae16ea6ac.tar.gz
We need to propagate nickname changes that occurred "behind our back" too
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
-rw-r--r--src/mcd-account.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mcd-account.c b/src/mcd-account.c
index 5fad2452..70a80d8a 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -1286,7 +1286,10 @@ set_nickname (TpSvcDBusProperties *self, const gchar *name,
DEBUG ("called for %s", priv->unique_name);
ret = mcd_account_set_string_val (account, name, value, error);
- if (ret == SET_RESULT_CHANGED && priv->connection != NULL)
+ /* we need to call _mcd_connection_set_nickname for side effects, *
+ * as that is how the CM is informed of the current nickname, even *
+ * if the nickname hasn't changed from our POV */
+ if (priv->connection != NULL)
{
/* this is a no-op if the connection doesn't support it */
_mcd_connection_set_nickname (priv->connection,