--- a/libpurple/protocols/jabber/jingle/jingle.c Mon Jun 12 01:00:04 2017 +0000 +++ b/libpurple/protocols/jabber/jingle/jingle.c Mon Jun 12 17:48:37 2017 -0300 @@ -47,26 +47,26 @@ if (type == NULL) return G_TYPE_NONE; - if (!strcmp(type, JINGLE_TRANSPORT_RAWUDP)) + if (purple_strequal(type, JINGLE_TRANSPORT_RAWUDP)) return JINGLE_TYPE_RAWUDP; - else if (!strcmp(type, JINGLE_TRANSPORT_ICEUDP)) + else if (purple_strequal(type, JINGLE_TRANSPORT_ICEUDP)) return JINGLE_TYPE_ICEUDP; #if 0 - else if (!strcmp(type, JINGLE_TRANSPORT_SOCKS)) + else if (purple_strequal(type, JINGLE_TRANSPORT_SOCKS)) return JINGLE_TYPE_SOCKS; - else if (!strcmp(type, JINGLE_TRANSPORT_IBB)) + else if (purple_strequal(type, JINGLE_TRANSPORT_IBB)) return JINGLE_TYPE_IBB; #endif #ifdef USE_VV - else if (!strcmp(type, JINGLE_APP_RTP)) + else if (purple_strequal(type, JINGLE_APP_RTP)) return JINGLE_TYPE_RTP; else if (!strcmp(type, NS_GOOGLE_TRANSPORT_P2P)) return JINGLE_TYPE_GOOGLE_P2P; #endif #if 0 - else if (!strcmp(type, JINGLE_APP_FT)) + else if (purple_strequal(type, JINGLE_APP_FT)) return JINGLE_TYPE_FT; - else if (!strcmp(type, JINGLE_APP_XML)) + else if (purple_strequal(type, JINGLE_APP_XML)) return JINGLE_TYPE_XML; #endif else @@ -373,7 +373,7 @@ /* Start at 1 to skip the unknown-action type */ int i = 1; for (; i < num_actions; ++i) { - if (!strcmp(action, jingle_actions[i].name)) + if (purple_strequal(action, jingle_actions[i].name)) return i; } return JINGLE_UNKNOWN_TYPE; @@ -409,7 +409,7 @@ } if (!(session = jingle_session_find_by_sid(js, sid)) - && strcmp(action, "session-initiate")) { + && !purple_strequal(action, "session-initiate")) { purple_debug_error("jingle", "jabber_jingle_session_parse couldn't find session\n"); /* send iq error here */ return;