From 4af3fe1066bfd36894fb10f80148269ed94d6c11 Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Wed, 31 Oct 2012 23:04:22 +0000 Subject: roster: obey blocked-ness in gets_presence_from_us This should be irrelevant because blocked contacts shouldn't be able to send us anything which would cause us to send back a reply (eg. jabber:iq:last would be blocked by our server), but just to reassure the reader. --- src/roster.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/roster.c b/src/roster.c index 64360cea0..d2cc4dae8 100644 --- a/src/roster.c +++ b/src/roster.c @@ -3601,6 +3601,9 @@ gabble_roster_handle_gets_presence_from_us (GabbleRoster *self, if (item == NULL) return FALSE; + if (item->blocked) + return FALSE; + return (item->subscription == GABBLE_ROSTER_SUBSCRIPTION_FROM || item->subscription == GABBLE_ROSTER_SUBSCRIPTION_BOTH); } -- cgit v1.2.3