libpurple/protocols/silc/buddy.c

changeset 38358
30ba44276e74
parent 38298
f0a8f63f9312
parent 38258
9a6551eba09c
child 39481
4db28449567d
--- a/libpurple/protocols/silc/buddy.c	Mon Jun 12 01:00:04 2017 +0000
+++ b/libpurple/protocols/silc/buddy.c	Mon Jun 12 17:48:37 2017 -0300
@@ -902,13 +902,13 @@
 		unsigned char *verifyd;
 		SilcUInt32 verify_len;
 
-		if (!strcmp(serverpk.type, "silc-rsa"))
+		if (purple_strequal(serverpk.type, "silc-rsa"))
 		  type = SILC_PKCS_SILC;
-		else if (!strcmp(serverpk.type, "ssh-rsa"))
+		else if (purple_strequal(serverpk.type, "ssh-rsa"))
 		  type = SILC_PKCS_SSH2;
-		else if (!strcmp(serverpk.type, "x509v3-sign-rsa"))
+		else if (purple_strequal(serverpk.type, "x509v3-sign-rsa"))
 		  type = SILC_PKCS_X509V3;
-		else if (!strcmp(serverpk.type, "pgp-sign-rsa"))
+		else if (purple_strequal(serverpk.type, "pgp-sign-rsa"))
 		  type = SILC_PKCS_OPENPGP;
 
 		if (silc_pkcs_public_key_alloc(type, serverpk.data,
@@ -988,10 +988,10 @@
 		if (usericon) {
 			const char *type = silc_mime_get_field(usericon, "Content-Type");
 			if (type &&
-			    (!strcmp(type, "image/jpeg") ||
-			     !strcmp(type, "image/gif") ||
-			     !strcmp(type, "image/bmp") ||
-			     !strcmp(type, "image/png"))) {
+			    (purple_strequal(type, "image/jpeg") ||
+			     purple_strequal(type, "image/gif") ||
+			     purple_strequal(type, "image/bmp") ||
+			     purple_strequal(type, "image/png"))) {
 				const unsigned char *data;
 				SilcUInt32 data_len;
 				data = silc_mime_get_data(usericon, &data_len);
@@ -1741,7 +1741,7 @@
 	type = purple_image_get_mimetype(img);
 	if (type == NULL)
 		return;
-	if (g_strcmp0(purple_image_get_extension(img), "ico") == 0)
+	if (purple_strequal(purple_image_get_extension(img), "ico"))
 		return;
 
 	/* Add */

mercurial