summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2012-10-31 23:04:22 +0000
committerWill Thompson <will.thompson@collabora.co.uk>2012-12-06 18:28:32 +0000
commit4af3fe1066bfd36894fb10f80148269ed94d6c11 (patch)
treed34892f7c7b80a35c0285aea56eacd414edb1f3e
parent6077e9b79db0b7a36bc581f4dd049030289cdf72 (diff)
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.
-rw-r--r--src/roster.c3
1 files changed, 3 insertions, 0 deletions
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);
}