Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/jabber/disco.c	Thu Mar 23 19:37:57 2017 +0300
+++ b/libpurple/protocols/jabber/disco.c	Thu Mar 23 21:01:15 2017 +0300
@@ -65,7 +65,7 @@
 	xmlnode *query = xmlnode_get_child_with_namespace(packet, "query",
 		NS_BYTESTREAMS);
 
-	if (from && !strcmp(from, sh->jid) && query != NULL) {
+	if (from && purple_strequal(from, sh->jid) && query != NULL) {
 		xmlnode *sh_node = xmlnode_get_child(query, "streamhost");
 		if (sh_node) {
 			const char *jid = xmlnode_get_attrib(sh_node, "jid");
@@ -245,20 +245,20 @@
 			if(child->type != XMLNODE_TYPE_TAG)
 				continue;
 
-			if(!strcmp(child->name, "identity")) {
+			if(purple_strequal(child->name, "identity")) {
 				const char *category = xmlnode_get_attrib(child, "category");
 				const char *type = xmlnode_get_attrib(child, "type");
 				if(!category || !type)
 					continue;
 
-				if(!strcmp(category, "conference") && !strcmp(type, "text")) {
+				if(purple_strequal(category, "conference") && purple_strequal(type, "text")) {
 					/* we found a groupchat or MUC server, add it to the list */
 					/* XXX: actually check for protocol/muc or gc-1.0 support */
 					js->chat_servers = g_list_prepend(js->chat_servers, g_strdup(from));
-				} else if(!strcmp(category, "directory") && !strcmp(type, "user")) {
+				} else if(purple_strequal(category, "directory") && purple_strequal(type, "user")) {
 					/* we found a JUD */
 					js->user_directories = g_list_prepend(js->user_directories, g_strdup(from));
-				} else if(!strcmp(category, "proxy") && !strcmp(type, "bytestreams")) {
+				} else if(purple_strequal(category, "proxy") && purple_strequal(type, "bytestreams")) {
 					/* This is a bytestream proxy */
 					JabberIq *iq;
 					JabberBytestreamsStreamhost *sh;
@@ -276,29 +276,29 @@
 					jabber_iq_send(iq);
 				}
 
-			} else if(!strcmp(child->name, "feature")) {
+			} else if(purple_strequal(child->name, "feature")) {
 				const char *var = xmlnode_get_attrib(child, "var");
 				if(!var)
 					continue;
 
-				if(!strcmp(var, "http://jabber.org/protocol/si"))
+				if(purple_strequal(var, "http://jabber.org/protocol/si"))
 					capabilities |= JABBER_CAP_SI;
-				else if(!strcmp(var, "http://jabber.org/protocol/si/profile/file-transfer"))
+				else if(purple_strequal(var, "http://jabber.org/protocol/si/profile/file-transfer"))
 					capabilities |= JABBER_CAP_SI_FILE_XFER;
-				else if(!strcmp(var, NS_BYTESTREAMS))
+				else if(purple_strequal(var, NS_BYTESTREAMS))
 					capabilities |= JABBER_CAP_BYTESTREAMS;
-				else if(!strcmp(var, "jabber:iq:search"))
+				else if(purple_strequal(var, "jabber:iq:search"))
 					capabilities |= JABBER_CAP_IQ_SEARCH;
-				else if(!strcmp(var, "jabber:iq:register"))
+				else if(purple_strequal(var, "jabber:iq:register"))
 					capabilities |= JABBER_CAP_IQ_REGISTER;
-				else if(!strcmp(var, NS_PING))
+				else if(purple_strequal(var, NS_PING))
 					capabilities |= JABBER_CAP_PING;
-				else if(!strcmp(var, NS_DISCO_ITEMS))
+				else if(purple_strequal(var, NS_DISCO_ITEMS))
 					capabilities |= JABBER_CAP_ITEMS;
-				else if(!strcmp(var, "http://jabber.org/protocol/commands")) {
+				else if(purple_strequal(var, "http://jabber.org/protocol/commands")) {
 					capabilities |= JABBER_CAP_ADHOC;
 				}
-				else if(!strcmp(var, NS_IBB)) {
+				else if(purple_strequal(var, NS_IBB)) {
 					purple_debug_info("jabber", "remote supports IBB\n");
 					capabilities |= JABBER_CAP_IBB;
 				}
@@ -521,7 +521,7 @@
 		const char *category, *type, *name;
 		category = xmlnode_get_attrib(child, "category");
 		type = xmlnode_get_attrib(child, "type");
-		if(category && type && !strcmp(category, "pubsub") && !strcmp(type,"pep")) {
+		if(category && type && purple_strequal(category, "pubsub") && purple_strequal(type,"pep")) {
 			PurpleConnection *gc = js->gc;
 			js->pep = TRUE;
 			gc->flags |= PURPLE_CONNECTION_SUPPORT_MOODS |
@@ -538,7 +538,7 @@
 
 		g_free(js->server_name);
 		js->server_name = g_strdup(name);
-		if (!strcmp(name, "Google Talk")) {
+		if (purple_strequal(name, "Google Talk")) {
 			purple_debug_info("jabber", "Google Talk!\n");
 			js->googletalk = TRUE;
 
@@ -565,14 +565,14 @@
 		if (!var)
 			continue;
 
-		if (!strcmp(NS_GOOGLE_MAIL_NOTIFY, var)) {
+		if (purple_strequal(NS_GOOGLE_MAIL_NOTIFY, var)) {
 			js->server_caps |= JABBER_CAP_GMAIL_NOTIFY;
 			jabber_gmail_init(js);
-		} else if (!strcmp(NS_GOOGLE_ROSTER, var)) {
+		} else if (purple_strequal(NS_GOOGLE_ROSTER, var)) {
 			js->server_caps |= JABBER_CAP_GOOGLE_ROSTER;
-		} else if (!strcmp("http://jabber.org/protocol/commands", var)) {
+		} else if (purple_strequal("http://jabber.org/protocol/commands", var)) {
 			js->server_caps |= JABBER_CAP_ADHOC;
-		} else if (!strcmp(NS_SIMPLE_BLOCKING, var)) {
+		} else if (purple_strequal(NS_SIMPLE_BLOCKING, var)) {
 			js->server_caps |= JABBER_CAP_BLOCKING;
 		}
 	}