1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00

Merge branch 'master' into win-order

This commit is contained in:
James Booth 2016-09-25 22:58:04 +01:00
commit b8bec9fce6

View File

@ -310,8 +310,7 @@ caps_lookup(const char *const jid)
gboolean
caps_jid_has_feature(const char *const jid, const char *const feature)
{
char *ver = g_hash_table_lookup(jid_to_ver, jid);
EntityCapabilities *caps = ver ? _caps_by_ver(ver) : _caps_by_jid(jid);
EntityCapabilities *caps = caps_lookup(jid);
if (caps == NULL) {
return FALSE;