Attachment 52288 Details for Bug 41743 – I don't know how best to describe this patch.

[patch] I don't know how best to describe this patch.

I-dont-know-how-best-to-describe-this-patch.patch (text/plain), 3.66 KB, created by Will Thompson on 2011-10-13 03:36:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Will Thompson

Created: 2011-10-13 03:36:12 UTC

Size: 3.66 KB

patch

obsolete

>From 4a7bf6ca56656a684f2138002a79cc4c7f867cd9 Mon Sep 17 00:00:00 2001
>From: Will Thompson <will.thompson@collabora.co.uk>
>Date: Thu, 13 Oct 2011 11:33:08 +0100
>Subject: [PATCH] I don't know how best to describe this patch.
>
>Fixes: <https://bugs.freedesktop.org/show_bug.cgi?id=41743>
>---
> src/roster.c                                       |   24 +++++++++++++++++--
> tests/twisted/presence/initial-contact-presence.py |   12 +++++++++-
> 2 files changed, 32 insertions(+), 4 deletions(-)
>
>diff --git a/src/roster.c b/src/roster.c
>index 8d8c3b7..d7c0527 100644
>--- a/src/roster.c
>+++ b/src/roster.c
>@@ -1398,11 +1398,29 @@ got_roster_iq (GabbleRoster *roster,
>         {
>           GabbleRosterItem *item = v;
>           TpHandle contact = GPOINTER_TO_UINT (k);
>+          GabblePresence *presence = gabble_presence_cache_get (
>+              priv->conn->presence_cache, contact);
> 
>           if (item->subscribe == TP_SUBSCRIPTION_STATE_YES &&
>-              gabble_presence_cache_get (roster->priv->conn->presence_cache,
>-                  contact) == NULL)
>-            g_array_append_val (members, contact);
>+              (presence == NULL || presence->status == GABBLE_PRESENCE_UNKNOWN))
>+            {
>+              /* The contact might be in the presence cache with UNKNOWN
>+               * presence if we've received a message from them before the
>+               * roster arrived: an item is forcibly added to stash the
>+               * nickname which might have been included in the <message/> in
>+               * the presence cache. (This seems like a rather illogical place
>+               * to stash such nicknamesâif anything, they should live in
>+               * GabbleImFactoryâbut there we go.)
>+               *
>+               * So if this is the case, we flip their status to OFFLINE. We
>+               * don't use gabble_presence_update() because we want to signal
>+               * all the unknownâoffline transitions together.
>+               */
>+              if (presence != NULL)
>+                presence->status = GABBLE_PRESENCE_OFFLINE;
>+
>+              g_array_append_val (members, contact);
>+            }
> 
>           if (item->unsent_edits != NULL)
>             edited_items = g_slist_prepend (edited_items, item);
>diff --git a/tests/twisted/presence/initial-contact-presence.py b/tests/twisted/presence/initial-contact-presence.py
>index ab52881..881316c 100644
>--- a/tests/twisted/presence/initial-contact-presence.py
>+++ b/tests/twisted/presence/initial-contact-presence.py
>@@ -8,7 +8,7 @@ This serves as a regression test for
> <https://bugs.freedesktop.org/show_bug.cgi?id=38603>, among other bugs.
> """
> 
>-from gabbletest import exec_test, make_presence, sync_stream
>+from gabbletest import exec_test, make_presence, sync_stream, elem
> from servicetest import assertEquals, EventPattern, sync_dbus
> 
> import constants as cs
>@@ -58,6 +58,16 @@ def test(q, bus, conn, stream):
>     stream.send(make_presence('eve@foo.com'))
>     q.expect('dbus-signal', signal='PresencesChanged', args=[{eve: AVAILABLE}])
> 
>+    # We also get a message from a contact before we get the roster (presumably
>+    # they sent this while we were offline?). This shouldn't affect the contact
>+    # being reported as offline when we finally do get the roster, but it used
>+    # to: <https://bugs.freedesktop.org/show_bug.cgi?id=41743>.
>+    stream.send(
>+        elem('message', from_='amy@foo.com', type='chat')(
>+          elem('body')(u'why are you never online?')
>+        ))
>+    q.expect('dbus-signal', signal='MessageReceived')
>+
>     event.stanza['type'] = 'result'
>     event.query.addChild(make_roster_item('amy@foo.com', 'both'))
>     event.query.addChild(make_roster_item('bob@foo.com', 'from'))
>-- 
>1.7.7

Actions: View | Splinter Review

Attachments on bug 41743: 52288 | 52341 | 52342 | 52535 | 52537

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.