Changeset 3fbce97 for protocols/jabber/jabber_util.c

Timestamp:

2016-09-24T20:14:34Z (8 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

ba52ac5

Parents:

63cad66 (diff), 82cb190 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into parson

File:

• protocols/jabber/jabber_util.c (modified) (1 diff)

protocols/jabber/jabber_util.c

@@ -514 +514 @@
                 } else if (bud->resource && (flags & GET_BUDDY_EXACT)) {
                         /* We want an exact match, so in thise case there shouldn't be a /resource. */
-                        return NULL;
+                        if (head != bud && head->resource == NULL) {
+                                return head;
+                        } else {
+                                return NULL;
+                        }
                 } else if (bud->resource == NULL || bud->next == NULL) {
                         /* No need for selection if there's only one option. */