Attachment 68126 Details for Bug 55668 – McdAccount: store the self-contact

[patch] McdAccount: store the self-contact

0001-McdAccount-store-the-self-contact.patch (text/plain), 2.76 KB, created by Simon McVittie on 2012-10-05 15:25:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-10-05 15:25:35 UTC

Size: 2.76 KB

patch

obsolete

>From b7dc17dbab5027617f06d63f45117b2e0e42b5a4 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Fri, 5 Oct 2012 14:38:26 +0100
>Subject: [PATCH 1/8] McdAccount: store the self-contact
>
>---
> src/mcd-account.c |   11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
>diff --git a/src/mcd-account.c b/src/mcd-account.c
>index 3e3e232..60d5c7a 100644
>--- a/src/mcd-account.c
>+++ b/src/mcd-account.c
>@@ -122,6 +122,7 @@ struct _McdAccountPrivate
>     gchar *protocol_name;
> 
>     TpConnection *tp_connection;
>+    TpContact *self_contact;
>     McdConnection *connection;
>     McdManager *manager;
> 
>@@ -3285,6 +3286,7 @@ _mcd_account_dispose (GObject *object)
>     tp_clear_object (&priv->storage_plugin);
>     tp_clear_object (&priv->storage);
>     tp_clear_object (&priv->dbus_daemon);
>+    tp_clear_object (&priv->self_contact);
> 
>     _mcd_account_set_connection_context (self, NULL);
>     _mcd_account_set_connection (self, NULL);
>@@ -4201,6 +4203,7 @@ _mcd_account_set_connection_status (McdAccount *account,
>         || (tp_conn != NULL && status == TP_CONNECTION_STATUS_DISCONNECTED))
>     {
>         tp_clear_object (&priv->tp_connection);
>+        tp_clear_object (&priv->self_contact);
> 
>         if (tp_conn != NULL && status != TP_CONNECTION_STATUS_DISCONNECTED)
>             priv->tp_connection = g_object_ref (tp_conn);
>@@ -4488,7 +4491,6 @@ mcd_account_connection_ready_cb (McdAccount *account,
>     McdAccountPrivate *priv = account->priv;
>     gchar *nickname;
>     TpConnection *tp_connection;
>-    TpContact *self_contact;
>     TpConnectionStatus status;
>     TpConnectionStatusReason reason;
>     const gchar *dbus_error = NULL;
>@@ -4503,16 +4505,17 @@ mcd_account_connection_ready_cb (McdAccount *account,
>                       tp_connection == priv->tp_connection);
>     g_assert (tp_proxy_is_prepared (tp_connection,
>                                     TP_CONNECTION_FEATURE_CONNECTED));
>+    priv->self_contact = tp_connection_get_self_contact (priv->tp_connection);
>+    g_assert (priv->self_contact != NULL);
>+    g_object_ref (priv->self_contact);
> 
>     status = tp_connection_get_status (tp_connection, &reason);
>     dbus_error = tp_connection_get_detailed_error (tp_connection, &details);
>     _mcd_account_set_connection_status (account, status, reason,
>                                         tp_connection, dbus_error, details);
> 
>-    self_contact = tp_connection_get_self_contact (tp_connection);
>-    g_assert (self_contact != NULL);
>     _mcd_account_set_normalized_name (account, tp_contact_get_identifier (
>-            self_contact));
>+            priv->self_contact));
> 
>     /* FIXME: ideally, on protocols with server-stored nicknames, this should
>      * only be done if the local Nickname has been changed since last time we
>-- 
>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.