Attachment 68344 Details for Bug 55668 – mcd_account_process_initial_avatar_token: don't take self_contact argument

[patch] mcd_account_process_initial_avatar_token: don't take self_contact argument

0006-mcd_account_process_initial_avatar_token-don-t-take-.patch (text/plain), 2.04 KB, created by Simon McVittie on 2012-10-09 14:35:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-10-09 14:35:37 UTC

Size: 2.04 KB

patch

obsolete

>From d4eec9aa5baa63fdfc0cf354561044786dfa23b5 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 9 Oct 2012 11:29:39 +0100
>Subject: [PATCH 6/7] mcd_account_process_initial_avatar_token: don't take
> self_contact argument
>
>It can be retrieved from the McdAccount.
>---
> src/mcd-account.c |   16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
>diff --git a/src/mcd-account.c b/src/mcd-account.c
>index 39db9fa..ef613fa 100644
>--- a/src/mcd-account.c
>+++ b/src/mcd-account.c
>@@ -4676,11 +4676,15 @@ _mcd_account_get_old_avatar_filename (McdAccount *account,
> }
> 
> static void
>-mcd_account_process_initial_avatar_token (McdAccount *self,
>-    TpContact *self_contact)
>+mcd_account_process_initial_avatar_token (McdAccount *self)
> {
>-  gchar *prev_token = _mcd_account_get_avatar_token (self);
>-  const gchar *token = tp_contact_get_avatar_token (self_contact);
>+  gchar *prev_token;
>+  const gchar *token;
>+
>+  g_assert (self->priv->self_contact != NULL);
>+
>+  prev_token = _mcd_account_get_avatar_token (self);
>+  token = tp_contact_get_avatar_token (self->priv->self_contact);
> 
>   /* If we have a stored avatar but no avatar token, we must have
>    * changed it locally; set it.
>@@ -4718,7 +4722,7 @@ mcd_account_process_initial_avatar_token (McdAccount *self,
>    * mid-session - i.e. download it and use it as our new avatar. */
>   if (tp_strdiff (token, prev_token))
>     {
>-      GFile *file = tp_contact_get_avatar_file (self_contact);
>+      GFile *file = tp_contact_get_avatar_file (self->priv->self_contact);
> 
>       DEBUG ("The server's avatar does not match ours");
> 
>@@ -4770,7 +4774,7 @@ mcd_account_self_contact_upgraded_cb (GObject *source_object,
>           tp_g_signal_connect_object (self_contact, "notify::avatar-file",
>               G_CALLBACK (mcd_account_self_contact_notify_avatar_file_cb),
>               self, G_CONNECT_SWAPPED);
>-          mcd_account_process_initial_avatar_token (self, self_contact);
>+          mcd_account_process_initial_avatar_token (self);
>         }
>       else
>         {
>-- 
>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.