--- a/libpurple/protocols/silc/buddy.c Thu Mar 23 19:37:57 2017 +0300 +++ b/libpurple/protocols/silc/buddy.c Thu Mar 23 21:01:15 2017 +0300 @@ -890,13 +890,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, @@ -976,10 +976,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); @@ -1712,11 +1712,11 @@ return; t = purple_imgstore_get_extension(img); - if (!t || !strcmp(t, "icon")) { + if (!t || purple_strequal(t, "icon")) { silc_mime_free(mime); return; } - if (!strcmp(t, "jpg")) + if (purple_strequal(t, "jpg")) t = "jpeg"; g_snprintf(type, sizeof(type), "image/%s", t); silc_mime_add_field(mime, "Content-Type", type);