Changeset b8c336b for protocols/oscar/ssi.c

Timestamp:

2015-05-09T19:50:30Z (10 years ago)

Author:

dequis <dx@…>

Children:

ec8b369

Parents:

356e2dd (diff), 5014380 (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 'develop' into feat/hip-cat

Conflicts:

protocols/jabber/hipchat.c
protocols/jabber/iq.c
protocols/jabber/jabber.h

File:

• protocols/oscar/ssi.c (modified) (1 diff)

protocols/oscar/ssi.c

@@ -66 +66 @@
                                 newitem->gid += 0x0001;
                                 for (cur = *list, i = 0; ((cur) && (!i)); cur = cur->next) {
-                                        if ((cur->gid == newitem->gid) && (cur->gid == newitem->gid)) {
+                                        if ((cur->bid == newitem->bid) && (cur->gid == newitem->gid)) {
                                                 i = 1;
                                         }