Attachment 68342 Details for Bug 55668 – Implement Set("Nickname", "") by using the normalized name instead

[patch] Implement Set("Nickname", "") by using the normalized name instead

0004-Implement-Set-Nickname-by-using-the-normalized-name-.patch (text/plain), 4.26 KB, created by Simon McVittie on 2012-10-09 14:34:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-10-09 14:34:51 UTC

Size: 4.26 KB

patch

obsolete

>From 90dd8c46e8457629140397d6e6afacfe9f2eea6b Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 9 Oct 2012 11:25:55 +0100
>Subject: [PATCH 4/7] Implement Set("Nickname", "") by using the normalized
> name instead
>
>This is consistent with what we do when we first connect, and ensures
>that we always have some sort of nickname.
>---
> src/mcd-account.c                         |   23 +++++++++++++++++++++++
> tests/twisted/account-manager/nickname.py |   28 +++++++++++++++++++++++-----
> 2 files changed, 46 insertions(+), 5 deletions(-)
>
>diff --git a/src/mcd-account.c b/src/mcd-account.c
>index 4cc34f2..6041ba6 100644
>--- a/src/mcd-account.c
>+++ b/src/mcd-account.c
>@@ -1324,8 +1324,28 @@ set_nickname (TpSvcDBusProperties *self, const gchar *name,
>     McdAccount *account = MCD_ACCOUNT (self);
>     McdAccountPrivate *priv = account->priv;
>     SetResult ret;
>+    GValue replacement = G_VALUE_INIT;
> 
>     DEBUG ("called for %s", priv->unique_name);
>+
>+    /* If we're asked to set Nickname = "", set it to our identifier
>+     * (NormalizedName) instead, so that we always have some sort of nickname.
>+     * This matches what we do when connecting an account.
>+     *
>+     * Exception: if we're not fully connected yet (and hence have no
>+     * self-contact), rely on the corresponding special-case
>+     * when we do become connected.
>+     */
>+    if (G_VALUE_HOLDS_STRING (value) &&
>+        tp_str_empty (g_value_get_string (value)) &&
>+        priv->self_contact != NULL)
>+    {
>+        g_value_init (&replacement, G_TYPE_STRING);
>+        g_value_set_string (&replacement,
>+            tp_contact_get_identifier (priv->self_contact));
>+        value = &replacement;
>+    }
>+
>     ret = mcd_account_set_string_val (account, name, value, error);
> 
>     if (ret != SET_RESULT_ERROR)
>@@ -1334,6 +1354,9 @@ set_nickname (TpSvcDBusProperties *self, const gchar *name,
>             g_value_get_string (value));
>     }
> 
>+    if (value == &replacement)
>+        g_value_unset (&replacement);
>+
>     return (ret != SET_RESULT_ERROR);
> }
> 
>diff --git a/tests/twisted/account-manager/nickname.py b/tests/twisted/account-manager/nickname.py
>index 5a1c465..f23f072 100644
>--- a/tests/twisted/account-manager/nickname.py
>+++ b/tests/twisted/account-manager/nickname.py
>@@ -139,8 +139,26 @@ def test(q, bus, mc, nickname):
>     assertEquals(nickname, account_props.Get(cs.ACCOUNT, 'Nickname'))
>     q.dbus_return(e.message, signature='')
> 
>-    # If we set an empty nickname while connected, MC currently does use it
>-    # (??? this is pretty weird)
>+    # Set the nickname back to something else
>+    nickname = 'wjt'
>+    call_async(q, account_props, 'Set', cs.ACCOUNT, 'Nickname', nickname)
>+    _, _, e = q.expect_many(
>+        EventPattern('dbus-signal',
>+            path=account.object_path,
>+            signal='AccountPropertyChanged',
>+            interface=cs.ACCOUNT,
>+            args=[{'Nickname': nickname}]),
>+        EventPattern('dbus-return', method='Set'),
>+        EventPattern('dbus-method-call',
>+            interface=cs.CONN_IFACE_ALIASING, method='SetAliases',
>+            args=[{ conn.self_handle: nickname }],
>+            handled=False)
>+        )
>+    assertEquals(nickname, account_props.Get(cs.ACCOUNT, 'Nickname'))
>+    q.dbus_return(e.message, signature='')
>+
>+    # If we set an empty nickname while connected, MC uses our normalized
>+    # name (identifier) instead.
>     call_async(q, account_props, 'Set', cs.ACCOUNT, 'Nickname',
>             '')
>     _, _, e = q.expect_many(
>@@ -148,14 +166,14 @@ def test(q, bus, mc, nickname):
>             path=account.object_path,
>             signal='AccountPropertyChanged',
>             interface=cs.ACCOUNT,
>-            args=[{'Nickname': ''}]),
>+            args=[{'Nickname': params['account']}]),
>         EventPattern('dbus-return', method='Set'),
>         EventPattern('dbus-method-call',
>             interface=cs.CONN_IFACE_ALIASING, method='SetAliases',
>-            args=[{ conn.self_handle: '' }],
>+            args=[{ conn.self_handle: params['account'] }],
>             handled=False)
>         )
>-    assertEquals('', account_props.Get(cs.ACCOUNT, 'Nickname'))
>+    assertEquals(params['account'], account_props.Get(cs.ACCOUNT, 'Nickname'))
>     q.dbus_return(e.message, signature='')
> 
> def test_both(q, bus, mc):
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 55668: 68126 | 68127 | 68128 | 68129 | 68130 | 68131 | 68132 | 68133 | 68136 | 68137 | 68339 | 68340 | 68341 | 68342 | 68343 | 68344 | 68345

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.