Replace !strcmp() with purple_strequal()

Didn't touch finch/libgnt files

100 files changed, 565 insertions, 562 deletions

diff --git a/finch/gntlog.c b/finch/gntlog.c
index c946c285c6..102bf0cfff 100644
--- a/finch/gntlog.c
+++ b/finch/gntlog.c
@@ -92,7 +92,7 @@ static gboolean log_viewer_equal(gconstpointer y, gconstpointer z)
 	if (a->username && b->username) {
 		normal = g_strdup(purple_normalize(a->account, a->username));
 		ret = (a->account == b->account) &&
-			!strcmp(normal, purple_normalize(b->account, b->username));
+			purple_strequal(normal, purple_normalize(b->account, b->username));
 		g_free(normal);
 	} else {
 		ret = (a == b);
@@ -123,7 +123,7 @@ static void search_cb(GntWidget *button, FinchLogViewer *lv)
 		return;
 	}
 
-	if (lv->search != NULL && !strcmp(lv->search, search_term)) {
+	if (lv->search != NULL && purple_strequal(lv->search, search_term)) {
 		return;
 	}
 
diff --git a/finch/gntplugin.h b/finch/gntplugin.h
index b97b54d74c..eafd6f13e4 100644
--- a/finch/gntplugin.h
+++ b/finch/gntplugin.h
@@ -50,7 +50,7 @@ typedef GntWidget* (*FinchPluginFrame) (void);
  */
 #define PURPLE_IS_GNT_PLUGIN(plugin) \
 	((plugin)->info != NULL && (plugin)->info->ui_info != NULL && \
-	 !strcmp((plugin)->info->ui_requirement, FINCH_PLUGIN_TYPE))
+	 purple_strequal((plugin)->info->ui_requirement, FINCH_PLUGIN_TYPE))
 
 /**
  * Get the ui-info from GNT-plugins.
diff --git a/finch/gntrequest.c b/finch/gntrequest.c
index 23c6014a08..7ec4177883 100644
--- a/finch/gntrequest.c
+++ b/finch/gntrequest.c
@@ -455,7 +455,7 @@ create_string_field(PurpleRequestField *field, GntWidget **username)
 		gnt_entry_set_always_suggest(GNT_ENTRY(entry), TRUE);
 		if (username)
 			*username = entry;
-	} else if (hint && !strcmp(hint, "group")) {
+	} else if (hint && purple_strequal(hint, "group")) {
 		PurpleBlistNode *node;
 		for (node = purple_blist_get_root(); node;
 				node = purple_blist_node_get_sibling_next(node)) {
diff --git a/finch/gntsound.c b/finch/gntsound.c
index 718b240c00..beec42d394 100644
--- a/finch/gntsound.c
+++ b/finch/gntsound.c
@@ -479,9 +479,9 @@ finch_sound_play_file(const char *filename)
 
 	method = purple_prefs_get_string(make_pref("/method"));
 
-	if (!strcmp(method, "nosound")) {
+	if (purple_strequal(method, "nosound")) {
 		return;
-	} else if (!strcmp(method, "beep")) {
+	} else if (purple_strequal(method, "beep")) {
 		beep();
 		return;
 	}
@@ -492,7 +492,7 @@ finch_sound_play_file(const char *filename)
 	}
 
 #ifndef _WIN32
-	if (!strcmp(method, "custom")) {
+	if (purple_strequal(method, "custom")) {
 		const char *sound_cmd;
 		char *command;
 		char *esc_filename;
@@ -527,7 +527,7 @@ finch_sound_play_file(const char *filename)
 	if (gst_init_failed)  /* Perhaps do beep instead? */
 		return;
 	volume = (float)(CLAMP(purple_prefs_get_int(make_pref("/volume")), 0, 100)) / 50;
-	if (!strcmp(method, "automatic")) {
+	if (purple_strequal(method, "automatic")) {
 		if (purple_running_gnome()) {
 			sink = gst_element_factory_make("gconfaudiosink", "sink");
 		}
@@ -537,13 +537,13 @@ finch_sound_play_file(const char *filename)
 			purple_debug_error("sound", "Unable to create GStreamer audiosink.\n");
 			return;
 		}
-	} else if (!strcmp(method, "esd")) {
+	} else if (purple_strequal(method, "esd")) {
 		sink = gst_element_factory_make("esdsink", "sink");
 		if (!sink) {
 			purple_debug_error("sound", "Unable to create GStreamer audiosink.\n");
 			return;
 		}
-	} else if (!strcmp(method, "alsa")) {
+	} else if (purple_strequal(method, "alsa")) {
 		sink = gst_element_factory_make("alsasink", "sink");
 		if (!sink) {
 			purple_debug_error("sound", "Unable to create GStreamer audiosink.\n");
@@ -839,7 +839,7 @@ load_pref_window(const char * profile)
 static void
 reload_pref_window(const char *profile)
 {
-	if (!strcmp(profile, finch_sound_get_active_profile()))
+	if (purple_strequal(profile, finch_sound_get_active_profile()))
 		return;
 	load_pref_window(profile);
 }
@@ -850,19 +850,19 @@ prof_del_cb(GntWidget *button, gpointer null)
 	const char * profile = gnt_entry_get_text(GNT_ENTRY(pref_dialog->new_profile));
 	gchar * pref;
 
-	if (!strcmp(profile, DEFAULT_PROFILE))
+	if (purple_strequal(profile, DEFAULT_PROFILE))
 		return;
 
 	pref = g_strdup_printf(FINCH_PREFS_ROOT "/sound/profiles/%s", profile);
 	purple_prefs_remove(pref);
 	g_free(pref);
 
-	if (!strcmp(pref_dialog->original_profile, profile)) {
+	if (purple_strequal(pref_dialog->original_profile, profile)) {
 		g_free(pref_dialog->original_profile);
 		pref_dialog->original_profile = g_strdup(DEFAULT_PROFILE);
 	}
 
-	if(!strcmp(profile, finch_sound_get_active_profile()))
+	if(purple_strequal(profile, finch_sound_get_active_profile()))
 		reload_pref_window(DEFAULT_PROFILE);
 
 	gnt_tree_remove(GNT_TREE(pref_dialog->profiles), (gchar *) profile);
diff --git a/libpurple/blist.c b/libpurple/blist.c
index 0604ed518d..83c702b106 100644
--- a/libpurple/blist.c
+++ b/libpurple/blist.c
@@ -2571,7 +2571,7 @@ purple_blist_find_chat(PurpleAccount *account, const char *name)
 				g_list_free(parts);
 
 				if (chat->account == account && chat_name != NULL &&
-					normname != NULL && !strcmp(purple_normalize(account, chat_name), normname)) {
+					normname != NULL && purple_strequal(purple_normalize(account, chat_name), normname)) {
 					g_free(normname);
 					return chat;
 				}
diff --git a/libpurple/ciphers/sha256.c b/libpurple/ciphers/sha256.c
index 213a9cd3cf..dbf7b735cf 100644
--- a/libpurple/ciphers/sha256.c
+++ b/libpurple/ciphers/sha256.c
@@ -110,11 +110,11 @@ sha256_set_opt(PurpleCipherContext *context, const gchar *name, void *value) {
 
 	ctx = purple_cipher_context_get_data(context);
 
-	if(!strcmp(name, "sizeHi")) {
+	if(purple_strequal(name, "sizeHi")) {
 		ctx->sizeHi = GPOINTER_TO_INT(value);
-	} else if(!strcmp(name, "sizeLo")) {
+	} else if(purple_strequal(name, "sizeLo")) {
 		ctx->sizeLo = GPOINTER_TO_INT(value);
-	} else if(!strcmp(name, "lenW")) {
+	} else if(purple_strequal(name, "lenW")) {
 		ctx->lenW = GPOINTER_TO_INT(value);
 	}
 }
@@ -125,11 +125,11 @@ sha256_get_opt(PurpleCipherContext *context, const gchar *name) {
 
 	ctx = purple_cipher_context_get_data(context);
 
-	if(!strcmp(name, "sizeHi")) {
+	if(purple_strequal(name, "sizeHi")) {
 		return GINT_TO_POINTER(ctx->sizeHi);
-	} else if(!strcmp(name, "sizeLo")) {
+	} else if(purple_strequal(name, "sizeLo")) {
 		return GINT_TO_POINTER(ctx->sizeLo);
-	} else if(!strcmp(name, "lenW")) {
+	} else if(purple_strequal(name, "lenW")) {
 		return GINT_TO_POINTER(ctx->lenW);
 	}
 
diff --git a/libpurple/dbus-server.c b/libpurple/dbus-server.c
index 86b8f5e122..530be7a9d5 100644
--- a/libpurple/dbus-server.c
+++ b/libpurple/dbus-server.c
@@ -448,7 +448,7 @@ purple_dbus_dispatch_cb(DBusConnection *connection,
 		return FALSE;
 
 	for (i = 0; bindings[i].name; i++)
-		if (!strcmp(name, bindings[i].name))
+		if (purple_strequal(name, bindings[i].name))
 		{
 			DBusMessage *reply;
 			DBusError error;
@@ -788,7 +788,7 @@ purple_dbus_signal_emit_purple(const char *name, int num_values,
 	 * flag for each signal that states whether this signal is to be
 	 * dbus-propagated or not.
 	 */
-	if (!strcmp(name, "dbus-method-called"))
+	if (purple_strequal(name, "dbus-method-called"))
 		return;
 
 	newname = purple_dbus_convert_signal_name(name);
diff --git a/libpurple/media.c b/libpurple/media.c
index e0e1b339a6..e4de10012c 100644
--- a/libpurple/media.c
+++ b/libpurple/media.c
@@ -482,8 +482,8 @@ purple_media_get_stream(PurpleMedia *media, const gchar *session, const gchar *p
 
 	for (; streams; streams = g_list_next(streams)) {
 		PurpleMediaStream *stream = streams->data;
-		if (!strcmp(stream->session->id, session) &&
-				!strcmp(stream->participant, participant))
+		if (purple_strequal(stream->session->id, session) &&
+				purple_strequal(stream->participant, participant))
 			return stream;
 	}
 
@@ -504,9 +504,9 @@ purple_media_get_streams(PurpleMedia *media, const gchar *session,
 	for (; streams; streams = g_list_next(streams)) {
 		PurpleMediaStream *stream = streams->data;
 		if ((session == NULL ||
-				!strcmp(stream->session->id, session)) &&
+				purple_strequal(stream->session->id, session)) &&
 				(participant == NULL ||
-				!strcmp(stream->participant, participant)))
+				purple_strequal(stream->participant, participant)))
 			ret = g_list_append(ret, stream);
 	}
 
@@ -957,7 +957,7 @@ purple_media_param_is_supported(PurpleMedia *media, const gchar *param)
 
 	params = purple_media_backend_get_available_params(media->priv->backend);
 	for (; *params != NULL; ++params)
-		if (!strcmp(*params, param))
+		if (purple_strequal(*params, param))
 			return TRUE;
 #endif
 	return FALSE;
diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c
index dbb0818e1b..967e40b15e 100644
--- a/libpurple/media/backend-fs2.c
+++ b/libpurple/media/backend-fs2.c
@@ -886,8 +886,8 @@ get_stream(PurpleMediaBackendFs2 *self,
 
 	for (; streams; streams = g_list_next(streams)) {
 		PurpleMediaBackendFs2Stream *stream = streams->data;
-		if (!strcmp(stream->session->id, sess_id) &&
-				!strcmp(stream->participant, name))
+		if (purple_strequal(stream->session->id, sess_id) &&
+				purple_strequal(stream->participant, name))
 			return stream;
 	}
 
@@ -1818,7 +1818,7 @@ create_session(PurpleMediaBackendFs2 *self, const gchar *sess_id,
 	GError *err = NULL;
 	GList *codec_conf = NULL, *iter = NULL;
 	gchar *filename = NULL;
-	gboolean is_nice = !strcmp(transmitter, "nice");
+	gboolean is_nice = purple_strequal(transmitter, "nice");
 
 	session = g_new0(PurpleMediaBackendFs2Session, 1);
 
@@ -1892,14 +1892,14 @@ create_session(PurpleMediaBackendFs2 *self, const gchar *sess_id,
 	 * receiving the src-pad-added signal.
 	 * Only works for non-multicast FsRtpSessions.
 	 */
-	if (!!strcmp(transmitter, "multicast"))
+	if (!purple_strequal(transmitter, "multicast"))
 		g_object_set(G_OBJECT(session->session),
 				"no-rtcp-timeout", 0, NULL);
 
 	/*
 	 * Hack to make x264 work with Gmail video.
 	 */
-	if (is_nice && !strcmp(sess_id, "google-video")) {
+	if (is_nice && purple_strequal(sess_id, "google-video")) {
 		FsElementAddedNotifier *notifier =
 				fs_element_added_notifier_new();
 		g_signal_connect(G_OBJECT(notifier), "element-added",
@@ -2203,7 +2203,7 @@ create_stream(PurpleMediaBackendFs2 *self,
 		++_num_params;
 	}
 
-	if (turn_ip && !strcmp("nice", transmitter) && !got_turn_from_prpl) {
+	if (turn_ip && purple_strequal("nice", transmitter) && !got_turn_from_prpl) {
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 		GValueArray *relay_info = g_value_array_new(0);
 G_GNUC_END_IGNORE_DEPRECATIONS
@@ -2219,7 +2219,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 			relay_info = append_relay_info(relay_info, turn_ip, port, username,
 				password, "udp");
 		}
-		
+
 		/* TCP */
 		port = purple_prefs_get_int("/purple/network/turn_port_tcp");
 		if (port > 0) {
@@ -2278,7 +2278,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 	stream->session = session;
 	stream->stream = fsstream;
 #ifndef HAVE_FARSIGHT
-	stream->supports_add = !strcmp(transmitter, "nice");
+	stream->supports_add = purple_strequal(transmitter, "nice");
 #endif
 
 	priv->streams =	g_list_append(priv->streams, stream);
@@ -2437,7 +2437,7 @@ purple_media_backend_fs2_codecs_ready(PurpleMediaBackend *self,
 				PURPLE_MEDIA_SEND_VIDEO)) {
 #ifdef HAVE_FARSIGHT
 			g_object_get(session->session,
-					"codecs-ready", &ret, NULL);	
+					"codecs-ready", &ret, NULL);
 #else
 			GList *codecs = NULL;
 
@@ -2702,7 +2702,7 @@ param_to_sdes_type(const gchar *param)
 	guint i;
 
 	for (i = 0; supported[i] != NULL; ++i) {
-		if (!strcmp(param, supported[i])) {
+		if (purple_strequal(param, supported[i])) {
 			return sdes_types[i];
 		}
 	}
diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c
index 9ff6704498..3bfbadf680 100644
--- a/libpurple/mediamanager.c
+++ b/libpurple/mediamanager.c
@@ -1269,7 +1269,7 @@ purple_media_manager_get_element_info(PurpleMediaManager *manager,
 	for (; iter; iter = g_list_next(iter)) {
 		gchar *element_id =
 				purple_media_element_info_get_id(iter->data);
-		if (!strcmp(element_id, id)) {
+		if (purple_strequal(element_id, id)) {
 			g_free(element_id);
 			g_object_ref(iter->data);
 			return iter->data;
@@ -1478,9 +1478,9 @@ purple_media_manager_create_output_window(PurpleMediaManager *manager,
 		if (ow->sink == NULL && ow->media == media &&
 				((participant != NULL &&
 				ow->participant != NULL &&
-				!strcmp(participant, ow->participant)) ||
+				purple_strequal(participant, ow->participant)) ||
 				(participant == ow->participant)) &&
-				!strcmp(session_id, ow->session_id)) {
+				purple_strequal(session_id, ow->session_id)) {
 			GstBus *bus;
 			GstElement *queue, *convert, *scale;
 			GstElement *tee = purple_media_get_tee(media,
@@ -1673,10 +1673,10 @@ purple_media_manager_remove_output_windows(PurpleMediaManager *manager,
 
 	if (media == ow->media &&
 			((session_id != NULL && ow->session_id != NULL &&
-			!strcmp(session_id, ow->session_id)) ||
+			purple_strequal(session_id, ow->session_id)) ||
 			(session_id == ow->session_id)) &&
 			((participant != NULL && ow->participant != NULL &&
-			!strcmp(participant, ow->participant)) ||
+			purple_strequal(participant, ow->participant)) ||
 			(participant == ow->participant)))
 		purple_media_manager_remove_output_window(
 				manager, ow->id);
diff --git a/libpurple/plugins/joinpart.c b/libpurple/plugins/joinpart.c
index 1e55b05228..cca3ccafd0 100644
--- a/libpurple/plugins/joinpart.c
+++ b/libpurple/plugins/joinpart.c
@@ -65,7 +65,7 @@ static gboolean joinpart_key_equal(const struct joinpart_key *a, const struct jo
 	else if (b == NULL)
 		return FALSE;
 
-	return (a->conv == b->conv) && !strcmp(a->user, b->user);
+	return (a->conv == b->conv) && purple_strequal(a->user, b->user);
 }
 
 static void joinpart_key_destroy(struct joinpart_key *key)
diff --git a/libpurple/plugins/log_reader.c b/libpurple/plugins/log_reader.c
index 51b5542ec1..492d9dd944 100644
--- a/libpurple/plugins/log_reader.c
+++ b/libpurple/plugins/log_reader.c
@@ -783,7 +783,7 @@ static GList *msn_logger_list(PurpleLogType type, const char *sn, PurpleAccount
 				}
 
 				path = g_build_filename(path, name, NULL);
-				if (!strcmp(c, ".xml") &&
+				if (purple_strequal(c, ".xml") &&
 				    g_file_test(path, G_FILE_TEST_EXISTS)) {
 					found = TRUE;
 					g_free(logfile);
diff --git a/libpurple/plugins/perl/perl-common.c b/libpurple/plugins/perl/perl-common.c
index 49288bff58..86bd0a7132 100644
--- a/libpurple/plugins/perl/perl-common.c
+++ b/libpurple/plugins/perl/perl-common.c
@@ -304,7 +304,7 @@ purple_perl_value_from_sv(PurpleValue *value, SV *sv)
 			break;
 
 		case PURPLE_TYPE_BOXED:
-			if (!strcmp(purple_value_get_specific_type(value), "SV"))
+			if (purple_strequal(purple_value_get_specific_type(value), "SV"))
 				purple_value_set_boxed(value, (sv == &PL_sv_undef ? NULL : sv));
 			else
 				purple_value_set_boxed(value, sv);
@@ -359,7 +359,7 @@ purple_perl_sv_from_value(const PurpleValue *value, va_list list)
 			break;
 
 		case PURPLE_TYPE_BOXED:
-			if (!strcmp(purple_value_get_specific_type(value), "SV"))
+			if (purple_strequal(purple_value_get_specific_type(value), "SV"))
 			{
 				SV *sv = (SV *)purple_perl_get_boxed(value);
 
diff --git a/libpurple/plugins/perl/perl-handlers.c b/libpurple/plugins/perl/perl-handlers.c
index 384869458c..7891f43d42 100644
--- a/libpurple/plugins/perl/perl-handlers.c
+++ b/libpurple/plugins/perl/perl-handlers.c
@@ -419,7 +419,7 @@ find_signal_handler(PurplePlugin *plugin, void *instance, const char *signal)
 
 		if (handler->plugin == plugin &&
 			handler->instance == instance &&
-			!strcmp(handler->signal, signal)) {
+			purple_strequal(handler->signal, signal)) {
 			return handler;
 		}
 	}
diff --git a/libpurple/plugins/tcl/tcl_cmds.c b/libpurple/plugins/tcl/tcl_cmds.c
index c7a0b3fe0e..c9fbace428 100644
--- a/libpurple/plugins/tcl/tcl_cmds.c
+++ b/libpurple/plugins/tcl/tcl_cmds.c
@@ -400,9 +400,9 @@ static PurpleBlistNode *tcl_list_to_buddy(Tcl_Interp *interp, int count, Tcl_Obj
 	if ((account = tcl_validate_account(elems[2], interp)) == NULL)
 		return NULL;
 
-	if (!strcmp(type, "buddy")) {
+	if (purple_strequal(type, "buddy")) {
 		node = PURPLE_BLIST_NODE(purple_find_buddy(account, name));
-	} else if (!strcmp(type, "group")) {
+	} else if (purple_strequal(type, "group")) {
 		node = PURPLE_BLIST_NODE(purple_blist_find_chat(account, name));
 	}
 
@@ -485,7 +485,7 @@ int tcl_cmd_buddy(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONS
 		break;
 	case CMD_BUDDY_LIST:
 		if (objc == 3) {
-			if (!strcmp("-all", Tcl_GetString(objv[2]))) {
+			if (purple_strequal("-all", Tcl_GetString(objv[2]))) {
 				all = 1;
 			} else {
 				result = Tcl_NewStringObj("",-1);
diff --git a/libpurple/plugins/tcl/tcl_signals.c b/libpurple/plugins/tcl/tcl_signals.c
index c0895905f6..684b2feefc 100644
--- a/libpurple/plugins/tcl/tcl_signals.c
+++ b/libpurple/plugins/tcl/tcl_signals.c
@@ -118,7 +118,7 @@ void tcl_signal_disconnect(void *instance, const char *signal, Tcl_Interp *inter
 	for (cur = tcl_callbacks; cur != NULL; cur = g_list_next(cur)) {
 		handler = cur->data;
 		if (handler->interp == interp && handler->instance == instance
-		    && !strcmp(signal, Tcl_GetString(handler->signal))) {
+		    && purple_strequal(signal, Tcl_GetString(handler->signal))) {
 			purple_signal_disconnect(instance, signal, handler->interp,
 					       PURPLE_CALLBACK(tcl_signal_callback));
 			cmd = g_string_sized_new(64);
diff --git a/libpurple/protocols/bonjour/bonjour_ft.c b/libpurple/protocols/bonjour/bonjour_ft.c
index b3beb0ba52..7d4b138db0 100644
--- a/libpurple/protocols/bonjour/bonjour_ft.c
+++ b/libpurple/protocols/bonjour/bonjour_ft.c
@@ -67,14 +67,14 @@ xep_ft_si_reject(BonjourData *bd, const char *id, const char *to, const char *er
 	xmlnode_set_attrib(error_node, "type", error_type);
 
 	/* TODO: Make this better */
-	if (!strcmp(error_code, "403")) {
+	if (purple_strequal(error_code, "403")) {
 		xmlnode *tmp_node = xmlnode_new_child(error_node, "forbidden");
 		xmlnode_set_namespace(tmp_node, "urn:ietf:params:xml:ns:xmpp-stanzas");
 
 		tmp_node = xmlnode_new_child(error_node, "text");
 		xmlnode_set_namespace(tmp_node, "urn:ietf:params:xml:ns:xmpp-stanzas");
 		xmlnode_insert_data(tmp_node, "Offer Declined", -1);
-	} else if (!strcmp(error_code, "404")) {
+	} else if (purple_strequal(error_code, "404")) {
 		xmlnode *tmp_node = xmlnode_new_child(error_node, "item-not-found");
 		xmlnode_set_namespace(tmp_node, "urn:ietf:params:xml:ns:xmpp-stanzas");
 	}
@@ -165,8 +165,8 @@ bonjour_si_xfer_find(BonjourData *bd, const char *sid, const char *from)
 		xf = xfer->data;
 		if(xf == NULL)
 			break;
-		if(xf->sid && xfer->who && !strcmp(xf->sid, sid) &&
-				!strcmp(xfer->who, from))
+		if(xf->sid && xfer->who && purple_strequal(xf->sid, sid) &&
+				purple_strequal(xfer->who, from))
 			return xfer;
 	}
 
@@ -451,7 +451,7 @@ xep_si_parse(PurpleConnection *pc, xmlnode *packet, PurpleBuddy *pb)
 	if(!type)
 		return;
 
-	if(!strcmp(type, "set")) {
+	if(purple_strequal(type, "set")) {
 		const char *profile;
 		xmlnode *si;
 		gboolean parsed_receive = FALSE;
@@ -460,7 +460,7 @@ xep_si_parse(PurpleConnection *pc, xmlnode *packet, PurpleBuddy *pb)
 
 		purple_debug_info("bonjour", "si offer Message type - SET.\n");
 		if (si && (profile = xmlnode_get_attrib(si, "profile"))
-				&& !strcmp(profile, "http://jabber.org/protocol/si/profile/file-transfer")) {
+				&& purple_strequal(profile, "http://jabber.org/protocol/si/profile/file-transfer")) {
 			const char *filename = NULL, *filesize_str = NULL;
 			goffset filesize = 0;
 			xmlnode *file;
@@ -489,7 +489,7 @@ xep_si_parse(PurpleConnection *pc, xmlnode *packet, PurpleBuddy *pb)
 			xep_ft_si_reject(bd, id, name, "403", "cancel");
 			/*TODO: Send Cancel (501) */
 		}
-	} else if(!strcmp(type, "result")) {
+	} else if(purple_strequal(type, "result")) {
 		purple_debug_info("bonjour", "si offer Message type - RESULT.\n");
 
 		xfer = bonjour_si_xfer_find(bd, id, name);
@@ -501,7 +501,7 @@ xep_si_parse(PurpleConnection *pc, xmlnode *packet, PurpleBuddy *pb)
 		} else
 			bonjour_bytestreams_init(xfer);
 
-	} else if(!strcmp(type, "error")) {
+	} else if(purple_strequal(type, "error")) {
 		purple_debug_info("bonjour", "si offer Message type - ERROR.\n");
 
 		xfer = bonjour_si_xfer_find(bd, id, name);
@@ -517,7 +517,7 @@ xep_si_parse(PurpleConnection *pc, xmlnode *packet, PurpleBuddy *pb)
 /**
  * Will compare a host with a buddy_ip.
  *
- * Additionally to a common '!strcmp(host, buddy_ip)', it will also return TRUE
+ * Additionally to a common 'purple_strequal(host, buddy_ip)', it will also return TRUE
  * if 'host' is a link local IPv6 address without an appended interface
  * identifier and 'buddy_ip' string is "host" + "%iface".
  *
@@ -565,7 +565,7 @@ xep_cmp_addr(const char *host, const char *buddy_ip)
 
 out:
 #endif
-	return !strcmp(host, buddy_ip);
+	return purple_strequal(host, buddy_ip);
 }
 
 static inline gint
diff --git a/libpurple/protocols/bonjour/buddy.c b/libpurple/protocols/bonjour/buddy.c
index 890a7e1b09..df7033c058 100644
--- a/libpurple/protocols/bonjour/buddy.c
+++ b/libpurple/protocols/bonjour/buddy.c
@@ -67,31 +67,31 @@ set_bonjour_buddy_value(BonjourBuddy* buddy, const char *record_key, const char
 
 	g_return_if_fail(record_key != NULL);
 
-	if (!strcmp(record_key, "1st"))
+	if (purple_strequal(record_key, "1st"))
 		fld = &buddy->first;
-	else if(!strcmp(record_key, "email"))
+	else if(purple_strequal(record_key, "email"))
 		fld = &buddy->email;
-	else if(!strcmp(record_key, "ext"))
+	else if(purple_strequal(record_key, "ext"))
 		fld = &buddy->ext;
-	else if(!strcmp(record_key, "jid"))
+	else if(purple_strequal(record_key, "jid"))
 		fld = &buddy->jid;
-	else if(!strcmp(record_key, "last"))
+	else if(purple_strequal(record_key, "last"))
 		fld = &buddy->last;
-	else if(!strcmp(record_key, "msg"))
+	else if(purple_strequal(record_key, "msg"))
 		fld = &buddy->msg;
-	else if(!strcmp(record_key, "nick"))
+	else if(purple_strequal(record_key, "nick"))
 		fld = &buddy->nick;
-	else if(!strcmp(record_key, "node"))
+	else if(purple_strequal(record_key, "node"))
 		fld = &buddy->node;
-	else if(!strcmp(record_key, "phsh"))
+	else if(purple_strequal(record_key, "phsh"))
 		fld = &buddy->phsh;
-	else if(!strcmp(record_key, "status"))
+	else if(purple_strequal(record_key, "status"))
 		fld = &buddy->status;
-	else if(!strcmp(record_key, "vc"))
+	else if(purple_strequal(record_key, "vc"))
 		fld = &buddy->vc;
-	else if(!strcmp(record_key, "ver"))
+	else if(purple_strequal(record_key, "ver"))
 		fld = &buddy->ver;
-	else if(!strcmp(record_key, "AIM"))
+	else if(purple_strequal(record_key, "AIM"))
 		fld = &buddy->AIM;
 
 	if(fld == NULL)
diff --git a/libpurple/protocols/bonjour/mdns_avahi.c b/libpurple/protocols/bonjour/mdns_avahi.c
index 5f28a70a43..c713ecd92e 100644
--- a/libpurple/protocols/bonjour/mdns_avahi.c
+++ b/libpurple/protocols/bonjour/mdns_avahi.c
@@ -71,9 +71,9 @@ _find_resolver_data(gconstpointer a, gconstpointer b) {
 
 	if(rd_a->interface == rd_b->interface
 			&& rd_a->protocol == rd_b->protocol
-			&& !strcmp(rd_a->name, rd_b->name)
-			&& !strcmp(rd_a->type, rd_b->type)
-			&& !strcmp(rd_a->domain, rd_b->domain)) {
+			&& purple_strequal(rd_a->name, rd_b->name)
+			&& purple_strequal(rd_a->type, rd_b->type)
+			&& purple_strequal(rd_a->domain, rd_b->domain)) {
 		ret = 0;
 	}
 
diff --git a/libpurple/protocols/bonjour/mdns_dns_sd.c b/libpurple/protocols/bonjour/mdns_dns_sd.c
index 318c784e73..2713ef0ebe 100644
--- a/libpurple/protocols/bonjour/mdns_dns_sd.c
+++ b/libpurple/protocols/bonjour/mdns_dns_sd.c
@@ -79,9 +79,9 @@ _find_resolver_data(gconstpointer a, gconstpointer b) {
 	gint ret = 1;
 
 	if(rd_a->if_idx == rd_b->if_idx
-			&& !strcmp(rd_a->name, rd_b->name)
-			&& !strcmp(rd_a->type, rd_b->type)
-			&& !strcmp(rd_a->domain, rd_b->domain)) {
+			&& purple_strequal(rd_a->name, rd_b->name)
+			&& purple_strequal(rd_a->type, rd_b->type)
+			&& purple_strequal(rd_a->domain, rd_b->domain)) {
 		ret = 0;
 	}
 
@@ -357,7 +357,7 @@ _mdns_service_browse_callback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32
 				else {
 					while (tmp) {
 						BonjourBuddy *bb_tmp = tmp->data;
-						if (!strcmp(bb_tmp->name, serviceName)) {
+						if (purple_strequal(bb_tmp->name, serviceName)) {
 							bb = bb_tmp;
 							break;
 						}
diff --git a/libpurple/protocols/gg/lib/common.c b/libpurple/protocols/gg/lib/common.c
index 12fa9eee52..20afc0ba3b 100644
--- a/libpurple/protocols/gg/lib/common.c
+++ b/libpurple/protocols/gg/lib/common.c
@@ -161,7 +161,7 @@ char *gg_get_line(char **ptr)
 {
 	char *foo, *res;
 
-	if (!ptr || !*ptr || !strcmp(*ptr, ""))
+	if (!ptr || !*ptr || purple_strequal(*ptr, ""))
 		return NULL;
 
 	res = *ptr;
diff --git a/libpurple/protocols/irc/cmds.c b/libpurple/protocols/irc/cmds.c
index 9b8de7e96a..99c417a635 100644
--- a/libpurple/protocols/irc/cmds.c
+++ b/libpurple/protocols/irc/cmds.c
@@ -279,7 +279,7 @@ int irc_cmd_mode(struct irc_conn *irc, const char *cmd, const char *target, cons
 	if (!args)
 		return 0;
 
-	if (!strcmp(cmd, "mode")) {
+	if (purple_strequal(cmd, "mode")) {
 		if (!args[0] && irc_ischannel(target))
 			buf = irc_format(irc, "vc", "MODE", target);
 		else if (args[0] && (*args[0] == '+' || *args[0] == '-'))
@@ -288,7 +288,7 @@ int irc_cmd_mode(struct irc_conn *irc, const char *cmd, const char *target, cons
 			buf = irc_format(irc, "vn", "MODE", args[0]);
 		else
 			return 0;
-	} else if (!strcmp(cmd, "umode")) {
+	} else if (purple_strequal(cmd, "umode")) {
 		if (!args[0])
 			return 0;
 		gc = purple_account_get_connection(irc->account);
@@ -342,16 +342,16 @@ int irc_cmd_op(struct irc_conn *irc, const char *cmd, const char *target, const
 	if (!args || !args[0] || !*args[0])
 		return 0;
 
-	if (!strcmp(cmd, "op")) {
+	if (purple_strequal(cmd, "op")) {
 		sign = "+";
 		mode = "o";
-	} else if (!strcmp(cmd, "deop")) {
+	} else if (purple_strequal(cmd, "deop")) {
 		sign = "-";
 		mode = "o";
-	} else if (!strcmp(cmd, "voice")) {
+	} else if (purple_strequal(cmd, "voice")) {
 		sign = "+";
 		mode = "v";
-	} else if (!strcmp(cmd, "devoice")) {
+	} else if (purple_strequal(cmd, "devoice")) {
 		sign = "-";
 		mode = "v";
 	} else {
@@ -449,7 +449,7 @@ int irc_cmd_privmsg(struct irc_conn *irc, const char *cmd, const char *target, c
 
 		msg = g_strndup(cur, end - cur);
 
-		if(!strcmp(cmd, "notice"))
+		if(purple_strequal(cmd, "notice"))
 			buf = irc_format(irc, "vt:", "NOTICE", args[0], msg);
 		else
 			buf = irc_format(irc, "vt:", "PRIVMSG", args[0], msg);
@@ -619,9 +619,9 @@ int irc_cmd_wallops(struct irc_conn *irc, const char *cmd, const char *target, c
 	if (!args || !args[0])
 		return 0;
 
-	if (!strcmp(cmd, "wallops"))
+	if (purple_strequal(cmd, "wallops"))
 		buf = irc_format(irc, "v:", "WALLOPS", args[0]);
-	else if (!strcmp(cmd, "operwall"))
+	else if (purple_strequal(cmd, "operwall"))
 		buf = irc_format(irc, "v:", "OPERWALL", args[0]);
 	else
 		return 0;
diff --git a/libpurple/protocols/irc/irc.c b/libpurple/protocols/irc/irc.c
index f101cbe6af..dab299f46f 100644
--- a/libpurple/protocols/irc/irc.c
+++ b/libpurple/protocols/irc/irc.c
@@ -157,7 +157,7 @@ int irc_send_len(struct irc_conn *irc, const char *buf, int buflen)
  	char *tosend= g_strdup(buf);
 
 	purple_signal_emit(_irc_plugin, "irc-sending-text", purple_account_get_connection(irc->account), &tosend);
-	
+
 	if (tosend == NULL)
 		return 0;
 
@@ -591,12 +591,12 @@ static void irc_set_status(PurpleAccount *account, PurpleStatus *status)
 
 	args[0] = NULL;
 
-	if (!strcmp(status_id, "away")) {
+	if (purple_strequal(status_id, "away")) {
 		args[0] = purple_status_get_attr_string(status, "message");
 		if ((args[0] == NULL) || (*args[0] == '\0'))
 			args[0] = _("Away");
 		irc_cmd_away(irc, "away", NULL, args);
-	} else if (!strcmp(status_id, "available")) {
+	} else if (purple_strequal(status_id, "available")) {
 		irc_cmd_away(irc, "back", NULL, args);
 	}
 }
diff --git a/libpurple/protocols/irc/msgs.c b/libpurple/protocols/irc/msgs.c
index 99baf4ca2e..4cf172d572 100644
--- a/libpurple/protocols/irc/msgs.c
+++ b/libpurple/protocols/irc/msgs.c
@@ -223,13 +223,13 @@ void irc_msg_features(struct irc_conn *irc, const char *name, const char *from,
 
 void irc_msg_luser(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
-	if (!strcmp(name, "251")) {
+	if (purple_strequal(name, "251")) {
 		/* 251 is required, so we pluck our nick from here and
 		 * finalize connection */
 		irc_connected(irc, args[0]);
 		/* Some IRC servers seem to not send a 255 numeric, so
 		 * I guess we can't require it; 251 will do. */
-	/* } else if (!strcmp(name, "255")) { */
+	/* } else if (purple_strequal(name, "255")) { */
 	}
 }
 
@@ -268,7 +268,7 @@ void irc_msg_ban(struct irc_conn *irc, const char *name, const char *from, char
 	convo = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT,
 						      args[1], irc->account);
 
-	if (!strcmp(name, "367")) {
+	if (purple_strequal(name, "367")) {
 		char *msg = NULL;
 		/* Ban list entry */
 		if (args[3] && args[4]) {
@@ -290,7 +290,7 @@ void irc_msg_ban(struct irc_conn *irc, const char *name, const char *from, char
 			purple_debug_info("irc", "%s\n", msg);
 		}
 		g_free(msg);
-	} else if (!strcmp(name, "368")) {
+	} else if (purple_strequal(name, "368")) {
 		if (!convo)
 			return;
 		/* End of ban list */
@@ -352,44 +352,44 @@ void irc_msg_chanmode(struct irc_conn *irc, const char *name, const char *from,
 void irc_msg_whois(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
 	if (!irc->whois.nick) {
-		purple_debug(PURPLE_DEBUG_WARNING, "irc", "Unexpected %s reply for %s\n", !strcmp(name, "314") ? "WHOWAS" : "WHOIS"
+		purple_debug(PURPLE_DEBUG_WARNING, "irc", "Unexpected %s reply for %s\n", purple_strequal(name, "314") ? "WHOWAS" : "WHOIS"
 											   , args[1]);
 		return;
 	}
 
 	if (purple_utf8_strcasecmp(irc->whois.nick, args[1])) {
-		purple_debug(PURPLE_DEBUG_WARNING, "irc", "Got %s reply for %s while waiting for %s\n", !strcmp(name, "314") ? "WHOWAS" : "WHOIS"
+		purple_debug(PURPLE_DEBUG_WARNING, "irc", "Got %s reply for %s while waiting for %s\n", purple_strequal(name, "314") ? "WHOWAS" : "WHOIS"
 												      , args[1], irc->whois.nick);
 		return;
 	}
 
-	if (!strcmp(name, "301")) {
+	if (purple_strequal(name, "301")) {
 		irc->whois.away = g_strdup(args[2]);
-	} else if (!strcmp(name, "311") || !strcmp(name, "314")) {
+	} else if (purple_strequal(name, "311") || purple_strequal(name, "314")) {
 		irc->whois.ident = g_strdup(args[2]);
 		irc->whois.host = g_strdup(args[3]);
 		irc->whois.real = g_strdup(args[5]);
-	} else if (!strcmp(name, "312")) {
+	} else if (purple_strequal(name, "312")) {
 		irc->whois.server = g_strdup(args[2]);
 		irc->whois.serverinfo = g_strdup(args[3]);
-	} else if (!strcmp(name, "313")) {
+	} else if (purple_strequal(name, "313")) {
 		irc->whois.ircop = 1;
-	} else if (!strcmp(name, "317")) {
+	} else if (purple_strequal(name, "317")) {
 		irc->whois.idle = atoi(args[2]);
 		if (args[3])
 			irc->whois.signon = (time_t)atoi(args[3]);
-	} else if (!strcmp(name, "319")) {
+	} else if (purple_strequal(name, "319")) {
 		if (irc->whois.channels == NULL) {
 			irc->whois.channels = g_string_new(args[2]);
 		} else {
 			irc->whois.channels = g_string_append(irc->whois.channels, args[2]);
 		}
-	} else if (!strcmp(name, "320")) {
+	} else if (purple_strequal(name, "320")) {
 		irc->whois.identified = 1;
-	} else if (!strcmp(name, "330")) {
+	} else if (purple_strequal(name, "330")) {
 		purple_debug(PURPLE_DEBUG_INFO, "irc", "330 %s: 1=[%s] 2=[%s] 3=[%s]",
 				name, args[1], args[2], args[3]);
-		if (!strcmp(args[3], "is logged in as"))
+		if (purple_strequal(args[3], "is logged in as"))
 			irc->whois.login = g_strdup(args[2]);
 	}
 }
@@ -401,12 +401,12 @@ void irc_msg_endwhois(struct irc_conn *irc, const char *name, const char *from,
 	PurpleNotifyUserInfo *user_info;
 
 	if (!irc->whois.nick) {
-		purple_debug(PURPLE_DEBUG_WARNING, "irc", "Unexpected End of %s for %s\n", !strcmp(name, "369") ? "WHOWAS" : "WHOIS"
+		purple_debug(PURPLE_DEBUG_WARNING, "irc", "Unexpected End of %s for %s\n", purple_strequal(name, "369") ? "WHOWAS" : "WHOIS"
 											     , args[1]);
 		return;
 	}
 	if (purple_utf8_strcasecmp(irc->whois.nick, args[1])) {
-		purple_debug(PURPLE_DEBUG_WARNING, "irc", "Received end of %s for %s, expecting %s\n", !strcmp(name, "369") ? "WHOWAS" : "WHOIS"
+		purple_debug(PURPLE_DEBUG_WARNING, "irc", "Received end of %s for %s, expecting %s\n", purple_strequal(name, "369") ? "WHOWAS" : "WHOIS"
 													 , args[1], irc->whois.nick);
 		return;
 	}
@@ -461,7 +461,7 @@ void irc_msg_endwhois(struct irc_conn *irc, const char *name, const char *from,
 		purple_notify_user_info_add_pair(user_info,
 														_("Online since"), purple_date_format_full(localtime(&irc->whois.signon)));
 	}
-	if (!strcmp(irc->whois.nick, "Paco-Paco")) {
+	if (purple_strequal(irc->whois.nick, "Paco-Paco")) {
 		purple_notify_user_info_add_pair(user_info,
 																   _("<b>Defining adjective:</b>"), _("Glorious"));
 	}
@@ -477,13 +477,13 @@ void irc_msg_endwhois(struct irc_conn *irc, const char *name, const char *from,
 
 void irc_msg_who(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
-	if (!strcmp(name, "352")) {
+	if (purple_strequal(name, "352")) {
 		PurpleConversation *conv;
 		PurpleConvChat *chat;
 		PurpleConvChatBuddy *cb;
-		
+
 		char *cur, *userhost, *realname;
-		
+
 		PurpleConvChatBuddyFlags flags;
 		GList *keys = NULL, *values = NULL;
 
@@ -500,7 +500,7 @@ void irc_msg_who(struct irc_conn *irc, const char *name, const char *from, char
 		}
 
 		chat = PURPLE_CONV_CHAT(conv);
-		
+
 		userhost = g_strdup_printf("%s@%s", args[2], args[3]);
 
 		/* The final argument is a :-argument, but annoyingly
@@ -512,21 +512,21 @@ void irc_msg_who(struct irc_conn *irc, const char *name, const char *from, char
 			}
 		}
 		realname = g_strdup(cur);
-		
+
 		keys = g_list_prepend(keys, "userhost");
 		values = g_list_prepend(values, userhost);
-		
+
 		keys = g_list_prepend(keys, "realname");
 		values = g_list_prepend(values, realname);
-		
+
 		purple_conv_chat_cb_set_attributes(chat, cb, keys, values);
-		
+
 		g_list_free(keys);
 		g_list_free(values);
-		
+
 		g_free(userhost);
 		g_free(realname);
-		
+
 		flags = cb->flags;
 
 		/* FIXME: I'm not sure this is really a good idea, now
@@ -546,19 +546,19 @@ void irc_msg_list(struct irc_conn *irc, const char *name, const char *from, char
 	if (!irc->roomlist)
 		return;
 
-	if (!strcmp(name, "321")) {
+	if (purple_strequal(name, "321")) {
 		purple_roomlist_set_in_progress(irc->roomlist, TRUE);
 		return;
 	}
 
-	if (!strcmp(name, "323")) {
+	if (purple_strequal(name, "323")) {
 		purple_roomlist_set_in_progress(irc->roomlist, FALSE);
 		purple_roomlist_unref(irc->roomlist);
 		irc->roomlist = NULL;
 		return;
 	}
 
-	if (!strcmp(name, "322")) {
+	if (purple_strequal(name, "322")) {
 		PurpleRoomlistRoom *room;
 		char *topic;
 
@@ -582,7 +582,7 @@ void irc_msg_topic(struct irc_conn *irc, const char *name, const char *from, cha
 	char *chan, *topic, *msg, *nick, *tmp, *tmp2;
 	PurpleConversation *convo;
 
-	if (!strcmp(name, "topic")) {
+	if (purple_strequal(name, "topic")) {
 		chan = args[0];
 		topic = irc_mirc2txt (args[1]);
 	} else {
@@ -601,7 +601,7 @@ void irc_msg_topic(struct irc_conn *irc, const char *name, const char *from, cha
 	tmp = g_markup_escape_text(topic, -1);
 	tmp2 = purple_markup_linkify(tmp);
 	g_free(tmp);
-	if (!strcmp(name, "topic")) {
+	if (purple_strequal(name, "topic")) {
 		const char *current_topic = purple_conv_chat_get_topic(PURPLE_CONV_CHAT(convo));
 		if (!(current_topic != NULL && strcmp(tmp2, current_topic) == 0))
 		{
@@ -676,7 +676,7 @@ void irc_msg_names(struct irc_conn *irc, const char *name, const char *from, cha
 	char *names, *cur, *end, *tmp, *msg;
 	PurpleConversation *convo;
 
-	if (!strcmp(name, "366")) {
+	if (purple_strequal(name, "366")) {
 		convo = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, args[1], irc->account);
 		if (!convo) {
 			purple_debug(PURPLE_DEBUG_ERROR, "irc", "Got a NAMES list for %s, which doesn't exist\n", args[1]);
@@ -756,17 +756,17 @@ void irc_msg_motd(struct irc_conn *irc, const char *name, const char *from, char
 {
 	char *escaped;
 
-	if (!strcmp(name, "375")) {
+	if (purple_strequal(name, "375")) {
 		if (irc->motd)
 			g_string_free(irc->motd, TRUE);
 		irc->motd = g_string_new("");
 		return;
-	} else if (!strcmp(name, "376")) {
+	} else if (purple_strequal(name, "376")) {
 		/* dircproxy 1.0.5 does not send 251 on reconnection, so
 		 * finalize the connection here if it is not already done. */
 		irc_connected(irc, args[0]);
 		return;
-	} else if (!strcmp(name, "422")) {
+	} else if (purple_strequal(name, "422")) {
 		/* in case there is no 251, and no MOTD set, finalize the connection.
 		 * (and clear the motd for good measure). */
 
@@ -970,12 +970,12 @@ void irc_msg_join(struct irc_conn *irc, const char *name, const char *from, char
 		}
 		purple_conversation_set_data(convo, IRC_NAMES_FLAG,
 					   GINT_TO_POINTER(FALSE));
-		
+
 		// Get the real name and user host for all participants.
 		buf = irc_format(irc, "vc", "WHO", args[0]);
 		irc_send(irc, buf);
 		g_free(buf);
-		
+
 		/* Until purple_conversation_present does something that
 		 * one would expect in Pidgin, this call produces buggy
 		 * behavior both for the /join and auto-join cases. */
@@ -992,15 +992,15 @@ void irc_msg_join(struct irc_conn *irc, const char *name, const char *from, char
 
 	userhost = irc_mask_userhost(from);
 	chat = PURPLE_CONV_CHAT(convo);
-	
+
 	purple_conv_chat_add_user(chat, nick, userhost, PURPLE_CBFLAGS_NONE, TRUE);
-	
+
 	cb = purple_conv_chat_cb_find(chat, nick);
-	
+
 	if (cb) {
-		purple_conv_chat_cb_set_attribute(chat, cb, "userhost", userhost);		
+		purple_conv_chat_cb_set_attribute(chat, cb, "userhost", userhost);
 	}
-	
+
 	if ((ib = g_hash_table_lookup(irc->buddies, nick)) != NULL) {
 		ib->new_online_status = TRUE;
 		irc_buddy_status(nick, ib, irc);
diff --git a/libpurple/protocols/jabber/adhoccommands.c b/libpurple/protocols/jabber/adhoccommands.c
index 214f5dfdef..cda6a58bee 100644
--- a/libpurple/protocols/jabber/adhoccommands.c
+++ b/libpurple/protocols/jabber/adhoccommands.c
@@ -169,7 +169,7 @@ jabber_adhoc_parse(JabberStream *js, const char *from,
 	if(!status)
 		return;
 
-	if(!strcmp(status,"completed")) {
+	if(purple_strequal(status,"completed")) {
 		/* display result */
 		xmlnode *note = xmlnode_get_child(command,"note");
 
@@ -183,7 +183,7 @@ jabber_adhoc_parse(JabberStream *js, const char *from,
 			jabber_x_data_request(js, xdata, (jabber_x_data_cb)do_adhoc_ignoreme, NULL);
 		return;
 	}
-	if(!strcmp(status,"executing")) {
+	if(purple_strequal(status,"executing")) {
 		/* this command needs more steps */
 		xmlnode *actions, *action;
 		int actionindex = 0;
@@ -207,7 +207,7 @@ jabber_adhoc_parse(JabberStream *js, const char *from,
 					newaction->name = g_strdup(_(action->name));
 					newaction->handle = g_strdup(action->name);
 					actionslist = g_list_append(actionslist, newaction);
-					if(defaultactionhandle && !strcmp(defaultactionhandle, action->name))
+					if(defaultactionhandle && purple_strequal(defaultactionhandle, action->name))
 						actionindex = index;
 				}
 			}
diff --git a/libpurple/protocols/jabber/bosh.c b/libpurple/protocols/jabber/bosh.c
index 8c6e170665..9341f5f6e3 100644
--- a/libpurple/protocols/jabber/bosh.c
+++ b/libpurple/protocols/jabber/bosh.c
@@ -432,7 +432,7 @@ static gboolean jabber_bosh_connection_error_check(PurpleBOSHConnection *conn, x
 
 	type = xmlnode_get_attrib(node, "type");
 
-	if (type != NULL && !strcmp(type, "terminate")) {
+	if (type != NULL && purple_strequal(type, "terminate")) {
 		conn->state = BOSH_CONN_OFFLINE;
 		purple_connection_error_reason(conn->js->gc,
 			PURPLE_CONNECTION_ERROR_OTHER_ERROR,
diff --git a/libpurple/protocols/jabber/buddy.c b/libpurple/protocols/jabber/buddy.c
index f87ddfa9e6..dc141bfa38 100644
--- a/libpurple/protocols/jabber/buddy.c
+++ b/libpurple/protocols/jabber/buddy.c
@@ -875,7 +875,7 @@ static void jabber_buddy_info_remove_id(JabberBuddyInfo *jbi, const char *id)
 
 	while(l) {
 		comp_id = l->data;
-		if(!strcmp(id, comp_id)) {
+		if(purple_strequal(id, comp_id)) {
 			jbi->ids = g_slist_remove(jbi->ids, comp_id);
 			g_free(comp_id);
 			return;
@@ -1017,12 +1017,12 @@ static void jabber_vcard_parse(JabberStream *js, const char *from,
 				continue;
 
 			text = xmlnode_get_data(child);
-			if(text && !strcmp(child->name, "FN")) {
+			if(text && purple_strequal(child->name, "FN")) {
 				if (!serverside_alias)
 					serverside_alias = g_strdup(text);
 
 				purple_notify_user_info_add_pair_plaintext(user_info, _("Full Name"), text);
-			} else if(!strcmp(child->name, "N")) {
+			} else if(purple_strequal(child->name, "N")) {
 				for(child2 = child->child; child2; child2 = child2->next)
 				{
 					char *text2;
@@ -1031,16 +1031,16 @@ static void jabber_vcard_parse(JabberStream *js, const char *from,
 						continue;
 
 					text2 = xmlnode_get_data(child2);
-					if(text2 && !strcmp(child2->name, "FAMILY")) {
+					if(text2 && purple_strequal(child2->name, "FAMILY")) {
 						purple_notify_user_info_add_pair_plaintext(user_info, _("Family Name"), text2);
-					} else if(text2 && !strcmp(child2->name, "GIVEN")) {
+					} else if(text2 && purple_strequal(child2->name, "GIVEN")) {
 						purple_notify_user_info_add_pair_plaintext(user_info, _("Given Name"), text2);
-					} else if(text2 && !strcmp(child2->name, "MIDDLE")) {
+					} else if(text2 && purple_strequal(child2->name, "MIDDLE")) {
 						purple_notify_user_info_add_pair_plaintext(user_info, _("Middle Name"), text2);
 					}
 					g_free(text2);
 				}
-			} else if(text && !strcmp(child->name, "NICKNAME")) {
+			} else if(text && purple_strequal(child->name, "NICKNAME")) {
 				/* Prefer the Nickcname to the Full Name as the serverside alias if it's not just part of the jid.
 				 * Ignore it if it's part of the jid. */
 				if (strstr(bare_jid, text) == NULL) {
@@ -1049,9 +1049,9 @@ static void jabber_vcard_parse(JabberStream *js, const char *from,
 
 					purple_notify_user_info_add_pair_plaintext(user_info, _("Nickname"), text);
 				}
-			} else if(text && !strcmp(child->name, "BDAY")) {
+			} else if(text && purple_strequal(child->name, "BDAY")) {
 				purple_notify_user_info_add_pair_plaintext(user_info, _("Birthday"), text);
-			} else if(!strcmp(child->name, "ADR")) {
+			} else if(purple_strequal(child->name, "ADR")) {
 				gboolean address_line_added = FALSE;
 
 				for(child2 = child->child; child2; child2 = child2->next)
@@ -1073,7 +1073,7 @@ static void jabber_vcard_parse(JabberStream *js, const char *from,
 						address_line_added = TRUE;
 					}
 
-					if(!strcmp(child2->name, "POBOX")) {
+					if(purple_strequal(child2->name, "POBOX")) {
 						purple_notify_user_info_add_pair_plaintext(user_info, _("P.O. Box"), text2);
 					} else if (purple_strequal(child2->name, "EXTADD") || purple_strequal(child2->name, "EXTADR")) {
 						/*
@@ -1082,16 +1082,16 @@ static void jabber_vcard_parse(JabberStream *js, const char *from,
 						 * EXTADR.
 						 */
 						purple_notify_user_info_add_pair_plaintext(user_info, _("Extended Address"), text2);
-					} else if(!strcmp(child2->name, "STREET")) {
+					} else if(purple_strequal(child2->name, "STREET")) {
 						purple_notify_user_info_add_pair_plaintext(user_info, _("Street Address"), text2);
-					} else if(!strcmp(child2->name, "LOCALITY")) {
+					} else if(purple_strequal(child2->name, "LOCALITY")) {
 						purple_notify_user_info_add_pair_plaintext(user_info, _("Locality"), text2);
-					} else if(!strcmp(child2->name, "REGION")) {
+					} else if(purple_strequal(child2->name, "REGION")) {
 						purple_notify_user_info_add_pair_plaintext(user_info, _("Region"), text2);
-					} else if(!strcmp(child2->name, "PCODE")) {
+					} else if(purple_strequal(child2->name, "PCODE")) {
 						purple_notify_user_info_add_pair_plaintext(user_info, _("Postal Code"), text2);
-					} else if(!strcmp(child2->name, "CTRY")
-								|| !strcmp(child2->name, "COUNTRY")) {
+					} else if(purple_strequal(child2->name, "CTRY")
+								|| purple_strequal(child2->name, "COUNTRY")) {
 						purple_notify_user_info_add_pair_plaintext(user_info, _("Country"), text2);
 					}
 					g_free(text2);
@@ -1100,7 +1100,7 @@ static void jabber_vcard_parse(JabberStream *js, const char *from,
 				if (address_line_added)
 					purple_notify_user_info_add_section_break(user_info);
 
-			} else if(!strcmp(child->name, "TEL")) {
+			} else if(purple_strequal(child->name, "TEL")) {
 				char *number;
 				if((child2 = xmlnode_get_child(child, "NUMBER"))) {
 					/* show what kind of number it is */
@@ -1115,7 +1115,7 @@ static void jabber_vcard_parse(JabberStream *js, const char *from,
 					purple_notify_user_info_add_pair_plaintext(user_info, _("Telephone"), number);
 					g_free(number);
 				}
-			} else if(!strcmp(child->name, "EMAIL")) {
+			} else if(purple_strequal(child->name, "EMAIL")) {
 				char *userid, *escaped;
 				if((child2 = xmlnode_get_child(child, "USERID"))) {
 					/* show what kind of email it is */
@@ -1143,7 +1143,7 @@ static void jabber_vcard_parse(JabberStream *js, const char *from,
 					g_free(escaped);
 					g_free(userid);
 				}
-			} else if(!strcmp(child->name, "ORG")) {
+			} else if(purple_strequal(child->name, "ORG")) {
 				for(child2 = child->child; child2; child2 = child2->next)
 				{
 					char *text2;
@@ -1152,21 +1152,21 @@ static void jabber_vcard_parse(JabberStream *js, const char *from,
 						continue;
 
 					text2 = xmlnode_get_data(child2);
-					if(text2 && !strcmp(child2->name, "ORGNAME")) {
+					if(text2 && purple_strequal(child2->name, "ORGNAME")) {
 						purple_notify_user_info_add_pair_plaintext(user_info, _("Organization Name"), text2);
-					} else if(text2 && !strcmp(child2->name, "ORGUNIT")) {
+					} else if(text2 && purple_strequal(child2->name, "ORGUNIT")) {
 						purple_notify_user_info_add_pair_plaintext(user_info, _("Organization Unit"), text2);
 					}
 					g_free(text2);
 				}
-			} else if(text && !strcmp(child->name, "TITLE")) {
+			} else if(text && purple_strequal(child->name, "TITLE")) {
 				purple_notify_user_info_add_pair_plaintext(user_info, _("Job Title"), text);
-			} else if(text && !strcmp(child->name, "ROLE")) {
+			} else if(text && purple_strequal(child->name, "ROLE")) {
 				purple_notify_user_info_add_pair_plaintext(user_info, _("Role"), text);
-			} else if(text && !strcmp(child->name, "DESC")) {
+			} else if(text && purple_strequal(child->name, "DESC")) {
 				purple_notify_user_info_add_pair_plaintext(user_info, _("Description"), text);
-			} else if(!strcmp(child->name, "PHOTO") ||
-					!strcmp(child->name, "LOGO")) {
+			} else if(purple_strequal(child->name, "PHOTO") ||
+					purple_strequal(child->name, "LOGO")) {
 				char *bintext = NULL;
 				xmlnode *binval;
 
@@ -1481,12 +1481,12 @@ static gboolean _client_is_blacklisted(JabberBuddyResource *jbr, const char *ns)
 	if(!jbr->client.name)
 		return FALSE;
 
-	if(!strcmp(ns, NS_LAST_ACTIVITY)) {
-		if(!strcmp(jbr->client.name, "Trillian")) {
+	if(purple_strequal(ns, NS_LAST_ACTIVITY)) {
+		if(purple_strequal(jbr->client.name, "Trillian")) {
 			/* verified by nwalp 2007/05/09 */
-			if(!strcmp(jbr->client.version, "3.1.0.121") ||
+			if(purple_strequal(jbr->client.version, "3.1.0.121") ||
 					/* verified by nwalp 2007/09/19 */
-					!strcmp(jbr->client.version, "3.1.7.0")) {
+					purple_strequal(jbr->client.version, "3.1.7.0")) {
 				return TRUE;
 			}
 		}
@@ -1974,7 +1974,7 @@ static void user_search_result_cb(JabberStream *js, const char *from,
 						field = xmlnode_get_next_twin(field))
 				{
 					if ((var = xmlnode_get_attrib(field, "var")) &&
-							!strcmp(var, l->data) &&
+							purple_strequal(var, l->data) &&
 							(valuenode = xmlnode_get_child(field, "value")))
 					{
 						char *value = xmlnode_get_data(valuenode);
@@ -2045,7 +2045,7 @@ static void user_search_x_data_cb(JabberStream *js, xmlnode *result, gpointer da
 	 * just going to get an error if we send
 	 * a cancel, so skip it */
 	type = xmlnode_get_attrib(result, "type");
-	if(type && !strcmp(type, "cancel")) {
+	if(type && purple_strequal(type, "cancel")) {
 		g_free(dir_server);
 		return;
 	}
@@ -2089,7 +2089,7 @@ static void user_search_cb(struct user_search_info *usi, PurpleRequestFields *fi
 			const char *id = purple_request_field_get_id(field);
 			const char *value = purple_request_field_string_get_value(field);
 
-			if(value && (!strcmp(id, "first") || !strcmp(id, "last") || !strcmp(id, "nick") || !strcmp(id, "email"))) {
+			if(value && (purple_strequal(id, "first") || purple_strequal(id, "last") || purple_strequal(id, "nick") || purple_strequal(id, "email"))) {
 				xmlnode *y = xmlnode_new_child(query, id);
 				xmlnode_insert_data(y, value, -1);
 			}
@@ -2232,7 +2232,7 @@ void jabber_user_search(JabberStream *js, const char *directory)
 	/* If the value provided isn't the disco#info default, persist it.  Otherwise,
 	   make sure we aren't persisting an old value */
 	if(js->user_directories && js->user_directories->data &&
-	   !strcmp(directory, js->user_directories->data)) {
+	   purple_strequal(directory, js->user_directories->data)) {
 		purple_account_set_string(js->gc->account, "user_directory", "");
 	}
 	else {
diff --git a/libpurple/protocols/jabber/chat.c b/libpurple/protocols/jabber/chat.c
index b7cb226181..cde4d4b386 100644
--- a/libpurple/protocols/jabber/chat.c
+++ b/libpurple/protocols/jabber/chat.c
@@ -526,7 +526,7 @@ static void jabber_chat_room_configure_cb(JabberStream *js, const char *from,
 			if(!(xmlns = xmlnode_get_namespace(x)))
 				continue;
 
-			if(!strcmp(xmlns, "jabber:x:data")) {
+			if(purple_strequal(xmlns, "jabber:x:data")) {
 				chat->config_dialog_type = PURPLE_REQUEST_FIELDS;
 				chat->config_dialog_handle = jabber_x_data_request(js, x, jabber_chat_room_configure_x_data_cb, chat);
 				return;
@@ -671,7 +671,7 @@ static void jabber_chat_register_cb(JabberStream *js, const char *from,
 			if(!(xmlns = xmlnode_get_namespace(x)))
 				continue;
 
-			if(!strcmp(xmlns, "jabber:x:data")) {
+			if(purple_strequal(xmlns, "jabber:x:data")) {
 				jabber_x_data_request(js, x, jabber_chat_register_x_data_cb, chat);
 				return;
 			}
@@ -1226,7 +1226,7 @@ static void jabber_chat_disco_traffic_cb(JabberStream *js, const char *from,
 	for(x = xmlnode_get_child(query, "feature"); x; x = xmlnode_get_next_twin(x)) {
 		const char *var = xmlnode_get_attrib(x, "var");
 
-		if(var && !strcmp(var, NS_XHTML_IM)) {
+		if(var && purple_strequal(var, NS_XHTML_IM)) {
 			chat->xhtml = TRUE;
 		}
 	}
diff --git a/libpurple/protocols/jabber/disco.c b/libpurple/protocols/jabber/disco.c
index b28641eb69..ff224e1316 100644
--- a/libpurple/protocols/jabber/disco.c
+++ b/libpurple/protocols/jabber/disco.c
@@ -65,7 +65,7 @@ jabber_disco_bytestream_server_cb(JabberStream *js, const char *from,
 	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 @@ static void jabber_disco_info_cb(JabberStream *js, const char *from,
 			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 @@ static void jabber_disco_info_cb(JabberStream *js, const char *from,
 					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 @@ jabber_disco_server_info_result_cb(JabberStream *js, const char *from,
 		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 @@ jabber_disco_server_info_result_cb(JabberStream *js, const char *from,
 
 		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 @@ jabber_disco_server_info_result_cb(JabberStream *js, const char *from,
 		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;
 		}
 	}
diff --git a/libpurple/protocols/jabber/google/gmail.c b/libpurple/protocols/jabber/google/gmail.c
index 5f86b8efac..3d3f5bf971 100644
--- a/libpurple/protocols/jabber/google/gmail.c
+++ b/libpurple/protocols/jabber/google/gmail.c
@@ -95,7 +95,7 @@ jabber_gmail_parse(JabberStream *js, const char *from,
 		sender_node  = xmlnode_get_child(sender_node, "sender");
 
 		while (sender_node && (!xmlnode_get_attrib(sender_node, "unread") ||
-		       !strcmp(xmlnode_get_attrib(sender_node, "unread"),"0")))
+		       purple_strequal(xmlnode_get_attrib(sender_node, "unread"),"0")))
 			sender_node = xmlnode_get_next_twin(sender_node);
 
 		if (!sender_node) {
diff --git a/libpurple/protocols/jabber/google/google_roster.c b/libpurple/protocols/jabber/google/google_roster.c
index d0de12cc4a..d011d45cb7 100644
--- a/libpurple/protocols/jabber/google/google_roster.c
+++ b/libpurple/protocols/jabber/google/google_roster.c
@@ -34,7 +34,7 @@ void jabber_google_roster_outgoing(JabberStream *js, xmlnode *query, xmlnode *it
 	char *jid_norm = (char *)jabber_normalize(account, jid);
 
 	while (list) {
-		if (!strcmp(jid_norm, (char*)list->data)) {
+		if (purple_strequal(jid_norm, (char*)list->data)) {
 			xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
 			xmlnode_set_attrib(query, "gr:ext", "2");
 			xmlnode_set_attrib(item, "gr:t", "B");
@@ -56,7 +56,7 @@ gboolean jabber_google_roster_incoming(JabberStream *js, xmlnode *item)
 	const char *subscription = xmlnode_get_attrib(item, "subscription");
 	const char *ask = xmlnode_get_attrib(item, "ask");
 
-	if ((!subscription || !strcmp(subscription, "none")) && !ask) {
+	if ((!subscription || purple_strequal(subscription, "none")) && !ask) {
 		/* The Google Talk servers will automatically add people from your Gmail address book
 		 * with subscription=none. If we see someone with subscription=none, ignore them.
 		 */
diff --git a/libpurple/protocols/jabber/google/google_session.c b/libpurple/protocols/jabber/google/google_session.c
index a278a1b5cb..3e43a8fc51 100644
--- a/libpurple/protocols/jabber/google/google_session.c
+++ b/libpurple/protocols/jabber/google/google_session.c
@@ -42,7 +42,7 @@ google_session_id_equal(gconstpointer a, gconstpointer b)
 	GoogleSessionId *c = (GoogleSessionId*)a;
 	GoogleSessionId *d = (GoogleSessionId*)b;
 
-	return !strcmp(c->id, d->id) && !strcmp(c->initiator, d->initiator);
+	return purple_strequal(c->id, d->id) && purple_strequal(c->initiator, d->initiator);
 }
 
 static void
@@ -91,7 +91,7 @@ google_session_send_candidates(PurpleMedia *media, gchar *session_id,
 	PurpleMediaCandidate *transport;
 	gboolean video = FALSE;
 
-	if (!strcmp(session_id, "google-video"))
+	if (purple_strequal(session_id, "google-video"))
 		video = TRUE;
 
 	for (iter = candidates; iter; iter = iter->next) {
@@ -179,7 +179,7 @@ google_session_ready(GoogleSession *session)
 		JabberIq *iq;
 		xmlnode *sess, *desc, *payload;
 		GList *codecs, *iter;
-		gboolean is_initiator = !strcmp(session->id.initiator, me);
+		gboolean is_initiator = purple_strequal(session->id.initiator, me);
 
 		if (!is_initiator &&
 				!purple_media_accepted(media, NULL, NULL)) {
@@ -512,7 +512,7 @@ jabber_google_relay_response_session_handle_initiate_cb(GoogleSession *session,
 		id = xmlnode_get_attrib(codec_element, "id");
 
 		if (!session_data->video ||
-				(xmlns && !strcmp(xmlns, NS_GOOGLE_SESSION_PHONE))) {
+				(xmlns && purple_strequal(xmlns, NS_GOOGLE_SESSION_PHONE))) {
 			clock_rate = xmlnode_get_attrib(
 					codec_element, "clockrate");
 			video = FALSE;
@@ -709,7 +709,7 @@ google_session_handle_accept(JabberStream *js, GoogleSession *session, xmlnode *
 	GList *codecs = NULL, *video_codecs = NULL;
 	JabberIq *result = NULL;
 	const gchar *xmlns = xmlnode_get_namespace(desc_element);
-	gboolean video = (xmlns && !strcmp(xmlns, NS_GOOGLE_SESSION_VIDEO));
+	gboolean video = (xmlns && purple_strequal(xmlns, NS_GOOGLE_SESSION_VIDEO));
 	GoogleAVSessionData *session_data =
 		(GoogleAVSessionData *) session->session_data;
 
@@ -788,15 +788,15 @@ google_session_parse_iq(JabberStream *js, GoogleSession *session, xmlnode *sess,
 {
 	const char *type = xmlnode_get_attrib(sess, "type");
 
-	if (!strcmp(type, "initiate")) {
+	if (purple_strequal(type, "initiate")) {
 		google_session_handle_initiate(js, session, sess, iq_id);
-	} else if (!strcmp(type, "accept")) {
+	} else if (purple_strequal(type, "accept")) {
 		google_session_handle_accept(js, session, sess, iq_id);
-	} else if (!strcmp(type, "reject")) {
+	} else if (purple_strequal(type, "reject")) {
 		google_session_handle_reject(js, session, sess);
-	} else if (!strcmp(type, "terminate")) {
+	} else if (purple_strequal(type, "terminate")) {
 		google_session_handle_terminate(js, session, sess);
-	} else if (!strcmp(type, "candidates")) {
+	} else if (purple_strequal(type, "candidates")) {
 		google_session_handle_candidates(js, session, sess, iq_id);
 	}
 }
diff --git a/libpurple/protocols/jabber/iq.c b/libpurple/protocols/jabber/iq.c
index 0292c32dfd..0c312d37a1 100644
--- a/libpurple/protocols/jabber/iq.c
+++ b/libpurple/protocols/jabber/iq.c
@@ -374,13 +374,13 @@ void jabber_iq_parse(JabberStream *js, xmlnode *packet)
 	}
 
 	if (iq_type) {
-		if (!strcmp(iq_type, "get"))
+		if (purple_strequal(iq_type, "get"))
 			type = JABBER_IQ_GET;
-		else if (!strcmp(iq_type, "set"))
+		else if (purple_strequal(iq_type, "set"))
 			type = JABBER_IQ_SET;
-		else if (!strcmp(iq_type, "result"))
+		else if (purple_strequal(iq_type, "result"))
 			type = JABBER_IQ_RESULT;
-		else if (!strcmp(iq_type, "error"))
+		else if (purple_strequal(iq_type, "error"))
 			type = JABBER_IQ_ERROR;
 	}
 
diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c
index 092099f7ad..6f6a808523 100644
--- a/libpurple/protocols/jabber/jabber.c
+++ b/libpurple/protocols/jabber/jabber.c
@@ -341,11 +341,11 @@ void jabber_process_packet(JabberStream *js, xmlnode **packet)
 	name = (*packet)->name;
 	xmlns = xmlnode_get_namespace(*packet);
 
-	if(!strcmp((*packet)->name, "iq")) {
+	if(purple_strequal((*packet)->name, "iq")) {
 		jabber_iq_parse(js, *packet);
-	} else if(!strcmp((*packet)->name, "presence")) {
+	} else if(purple_strequal((*packet)->name, "presence")) {
 		jabber_presence_parse(js, *packet);
-	} else if(!strcmp((*packet)->name, "message")) {
+	} else if(purple_strequal((*packet)->name, "message")) {
 		jabber_message_parse(js, *packet);
 	} else if (purple_strequal(xmlns, NS_XMPP_STREAMS)) {
 		if (purple_strequal(name, "features"))
@@ -772,7 +772,7 @@ txt_resolved_cb(GList *responses, gpointer data)
 		PurpleTxtResponse *resp = responses->data;
 		gchar **token;
 		token = g_strsplit(purple_txt_response_get_content(resp), "=", 2);
-		if (!strcmp(token[0], "_xmpp-client-xbosh")) {
+		if (purple_strequal(token[0], "_xmpp-client-xbosh")) {
 			purple_debug_info("jabber","Found alternative connection method using %s at %s.\n", token[0], token[1]);
 			js->bosh = jabber_bosh_connection_init(js, token[1]);
 			g_strfreev(token);
@@ -1228,7 +1228,7 @@ jabber_register_cb(JabberRegisterCBData *cbdata, PurpleRequestFields *fields)
 				flds; flds = flds->next) {
 			PurpleRequestField *field = flds->data;
 			const char *id = purple_request_field_get_id(field);
-			if(!strcmp(id,"unregister")) {
+			if(purple_strequal(id,"unregister")) {
 				gboolean value = purple_request_field_bool_get_value(field);
 				if(value) {
 					/* unregister from service. this doesn't include any of the fields, so remove them from the stanza by recreating it
@@ -1253,7 +1253,7 @@ jabber_register_cb(JabberRegisterCBData *cbdata, PurpleRequestFields *fields)
 				const char *value = purple_request_field_string_get_value(field);
 				int i;
 				for (i = 0; ids[i]; i++) {
-					if (!strcmp(id, ids[i]))
+					if (purple_strequal(id, ids[i]))
 						break;
 				}
 
@@ -1261,11 +1261,11 @@ jabber_register_cb(JabberRegisterCBData *cbdata, PurpleRequestFields *fields)
 					continue;
 				y = xmlnode_new_child(query, ids[i]);
 				xmlnode_insert_data(y, value, -1);
-				if(cbdata->js->registration && !strcmp(id, "username")) {
+				if(cbdata->js->registration && purple_strequal(id, "username")) {
 					g_free(cbdata->js->user->node);
 					cbdata->js->user->node = g_strdup(value);
 				}
-				if(cbdata->js->registration && !strcmp(id, "password"))
+				if(cbdata->js->registration && purple_strequal(id, "password"))
 					purple_account_set_password(cbdata->js->gc->account, value);
 			}
 		}
@@ -1993,7 +1993,7 @@ void jabber_remove_feature(const char *namespace) {
 	GList *feature;
 	for(feature = jabber_features; feature; feature = feature->next) {
 		JabberFeature *feat = (JabberFeature*)feature->data;
-		if(!strcmp(feat->namespace, namespace)) {
+		if(purple_strequal(feat->namespace, namespace)) {
 			g_free(feat->namespace);
 			g_free(feature->data);
 			jabber_features = g_list_delete_link(jabber_features, feature);
@@ -2724,7 +2724,7 @@ char *jabber_parse_error(JabberStream *js,
 		} else if(xmlnode_get_child(error, "undefined-condition")) {
 			text = _("Unknown Error");
 		}
-	} else if(xmlns && !strcmp(xmlns, NS_XMPP_SASL)) {
+	} else if(xmlns && purple_strequal(xmlns, NS_XMPP_SASL)) {
 		/* Most common reason can be the default */
 		SET_REASON(PURPLE_CONNECTION_ERROR_NETWORK_ERROR);
 		if(xmlnode_get_child(packet, "aborted")) {
@@ -2750,9 +2750,9 @@ char *jabber_parse_error(JabberStream *js,
 			SET_REASON(PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED);
 			text = _("Authentication Failure");
 		}
-	} else if(!strcmp(packet->name, "stream:error") ||
-			 (!strcmp(packet->name, "error") && xmlns &&
-				!strcmp(xmlns, NS_XMPP_STREAMS))) {
+	} else if(purple_strequal(packet->name, "stream:error") ||
+			 (purple_strequal(packet->name, "error") && xmlns &&
+				purple_strequal(xmlns, NS_XMPP_STREAMS))) {
 		/* Most common reason as default: */
 		SET_REASON(PURPLE_CONNECTION_ERROR_NETWORK_ERROR);
 		if(xmlnode_get_child(packet, "bad-format")) {
diff --git a/libpurple/protocols/jabber/jingle/iceudp.c b/libpurple/protocols/jabber/jingle/iceudp.c
index 54c0d91d03..c40c3e31cc 100644
--- a/libpurple/protocols/jabber/jingle/iceudp.c
+++ b/libpurple/protocols/jabber/jingle/iceudp.c
@@ -253,7 +253,7 @@ jingle_iceudp_add_local_candidate(JingleIceUdp *iceudp, JingleIceUdpCandidate *c
 
 	for (; iter; iter = g_list_next(iter)) {
 		JingleIceUdpCandidate *c = iter->data;
-		if (!strcmp(c->id, candidate->id)) {
+		if (purple_strequal(c->id, candidate->id)) {
 			guint generation = c->generation + 1;
 
 			g_boxed_free(JINGLE_TYPE_ICEUDP_CANDIDATE, c);
@@ -285,7 +285,7 @@ jingle_iceudp_get_remote_candidate_by_id(JingleIceUdp *iceudp,
 	GList *iter = iceudp->priv->remote_candidates;
 	for (; iter; iter = g_list_next(iter)) {
 		JingleIceUdpCandidate *candidate = iter->data;
-		if (!strcmp(candidate->id, id)) {
+		if (purple_strequal(candidate->id, id)) {
 			return candidate;
 		}
 	}
diff --git a/libpurple/protocols/jabber/jingle/jingle.c b/libpurple/protocols/jabber/jingle/jingle.c
index eeaabf037e..8a15e0cd6b 100644
--- a/libpurple/protocols/jabber/jingle/jingle.c
+++ b/libpurple/protocols/jabber/jingle/jingle.c
@@ -45,24 +45,24 @@ jingle_get_type(const gchar *type)
 	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;
 #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
@@ -369,7 +369,7 @@ jingle_get_action_type(const gchar *action)
 	/* 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;
diff --git a/libpurple/protocols/jabber/jingle/rawudp.c b/libpurple/protocols/jabber/jingle/rawudp.c
index b50e5a79a4..2f4c1c92c2 100644
--- a/libpurple/protocols/jabber/jingle/rawudp.c
+++ b/libpurple/protocols/jabber/jingle/rawudp.c
@@ -225,7 +225,7 @@ jingle_rawudp_add_local_candidate(JingleRawUdp *rawudp, JingleRawUdpCandidate *c
 
 	for (; iter; iter = g_list_next(iter)) {
 		JingleRawUdpCandidate *c = iter->data;
-		if (!strcmp(c->id, candidate->id)) {
+		if (purple_strequal(c->id, candidate->id)) {
 			guint generation = c->generation + 1;
 
 			g_boxed_free(JINGLE_TYPE_RAWUDP_CANDIDATE, c);
@@ -256,7 +256,7 @@ jingle_rawudp_get_remote_candidate_by_id(JingleRawUdp *rawudp, gchar *id)
 	GList *iter = rawudp->priv->remote_candidates;
 	for (; iter; iter = g_list_next(iter)) {
 		JingleRawUdpCandidate *candidate = iter->data;
-		if (!strcmp(candidate->id, id)) {
+		if (purple_strequal(candidate->id, id)) {
 			return candidate;
 		}
 	}
diff --git a/libpurple/protocols/jabber/jingle/rtp.c b/libpurple/protocols/jabber/jingle/rtp.c
index 5b74850615..876b80fb36 100644
--- a/libpurple/protocols/jabber/jingle/rtp.c
+++ b/libpurple/protocols/jabber/jingle/rtp.c
@@ -311,7 +311,7 @@ jingle_rtp_transport_to_candidates(JingleTransport *transport)
 {
 	const gchar *type = jingle_transport_get_transport_type(transport);
 	GList *ret = NULL;
-	if (!strcmp(type, JINGLE_TRANSPORT_RAWUDP)) {
+	if (purple_strequal(type, JINGLE_TRANSPORT_RAWUDP)) {
 		GList *candidates = jingle_rawudp_get_remote_candidates(JINGLE_RAWUDP(transport));
 
 		for (; candidates; candidates = g_list_delete_link(candidates, candidates)) {
@@ -324,20 +324,20 @@ jingle_rtp_transport_to_candidates(JingleTransport *transport)
 		}
 
 		return ret;
-	} else if (!strcmp(type, JINGLE_TRANSPORT_ICEUDP)) {
+	} else if (purple_strequal(type, JINGLE_TRANSPORT_ICEUDP)) {
 		GList *candidates = jingle_iceudp_get_remote_candidates(JINGLE_ICEUDP(transport));
 
 		for (; candidates; candidates = g_list_delete_link(candidates, candidates)) {
 			JingleIceUdpCandidate *candidate = candidates->data;
 			PurpleMediaCandidate *new_candidate = purple_media_candidate_new(
 					candidate->foundation, candidate->component,
-					!strcmp(candidate->type, "host") ?
+					purple_strequal(candidate->type, "host") ?
 					PURPLE_MEDIA_CANDIDATE_TYPE_HOST :
-					!strcmp(candidate->type, "srflx") ?
+					purple_strequal(candidate->type, "srflx") ?
 					PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX :
-					!strcmp(candidate->type, "prflx") ?
+					purple_strequal(candidate->type, "prflx") ?
 					PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX :
-					!strcmp(candidate->type, "relay") ?
+					purple_strequal(candidate->type, "relay") ?
 					PURPLE_MEDIA_CANDIDATE_TYPE_RELAY : 0,
 					PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
 					candidate->ip, candidate->port);
diff --git a/libpurple/protocols/jabber/jingle/session.c b/libpurple/protocols/jabber/jingle/session.c
index 596efbad6c..cd52f5344f 100644
--- a/libpurple/protocols/jabber/jingle/session.c
+++ b/libpurple/protocols/jabber/jingle/session.c
@@ -520,7 +520,7 @@ jingle_session_find_content(JingleSession *session, const gchar *name, const gch
 
 		if (creator != NULL) {
 			gchar *ccreator = jingle_content_get_creator(content);
-			result = (result && !strcmp(creator, ccreator));
+			result = (result && purple_strequal(creator, ccreator));
 			g_free(ccreator);
 		}
 
@@ -547,7 +547,7 @@ jingle_session_find_pending_content(JingleSession *session, const gchar *name, c
 
 		if (creator != NULL) {
 			gchar *ccreator = jingle_content_get_creator(content);
-			result = (result && !strcmp(creator, ccreator));
+			result = (result && purple_strequal(creator, ccreator));
 			g_free(ccreator);
 		}
 
diff --git a/libpurple/protocols/jabber/libxmpp.c b/libpurple/protocols/jabber/libxmpp.c
index 3cd86c0a39..e17e7bd50d 100644
--- a/libpurple/protocols/jabber/libxmpp.c
+++ b/libpurple/protocols/jabber/libxmpp.c
@@ -197,7 +197,7 @@ static PurpleAccount *find_acct(const char *prpl, const char *acct_id)
 	} else { /* Otherwise find an active account for the protocol */
 		GList *l = purple_accounts_get_all();
 		while (l) {
-			if (!strcmp(prpl, purple_account_get_protocol_id(l->data))
+			if (purple_strequal(prpl, purple_account_get_protocol_id(l->data))
 					&& purple_account_is_connected(l->data)) {
 				acct = l->data;
 				break;
diff --git a/libpurple/protocols/jabber/message.c b/libpurple/protocols/jabber/message.c
index 61bf95d4b4..7d6d2b415d 100644
--- a/libpurple/protocols/jabber/message.c
+++ b/libpurple/protocols/jabber/message.c
@@ -182,7 +182,7 @@ static void handle_headline(JabberMessage *jm)
 	for(etc = jm->etc; etc; etc = etc->next) {
 		xmlnode *x = etc->data;
 		const char *xmlns = xmlnode_get_namespace(x);
-		if(xmlns && !strcmp(xmlns, NS_OOB_X_DATA)) {
+		if(xmlns && purple_strequal(xmlns, NS_OOB_X_DATA)) {
 			xmlnode *url, *desc;
 			char *urltxt, *desctxt;
 
@@ -196,7 +196,7 @@ static void handle_headline(JabberMessage *jm)
 			desctxt = xmlnode_get_data(desc);
 
 			/* I'm all about ugly hacks */
-			if(body->len && jm->body && !strcmp(body->str, jm->body))
+			if(body->len && jm->body && purple_strequal(body->str, jm->body))
 				g_string_printf(body, "<a href='%s'>%s</a>",
 						urltxt, desctxt);
 			else
@@ -521,15 +521,15 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 	jm->chat_state = JM_STATE_NONE;
 
 	if(type) {
-		if(!strcmp(type, "normal"))
+		if(purple_strequal(type, "normal"))
 			jm->type = JABBER_MESSAGE_NORMAL;
-		else if(!strcmp(type, "chat"))
+		else if(purple_strequal(type, "chat"))
 			jm->type = JABBER_MESSAGE_CHAT;
-		else if(!strcmp(type, "groupchat"))
+		else if(purple_strequal(type, "groupchat"))
 			jm->type = JABBER_MESSAGE_GROUPCHAT;
-		else if(!strcmp(type, "headline"))
+		else if(purple_strequal(type, "headline"))
 			jm->type = JABBER_MESSAGE_HEADLINE;
-		else if(!strcmp(type, "error"))
+		else if(purple_strequal(type, "error"))
 			jm->type = JABBER_MESSAGE_ERROR;
 		else
 			jm->type = JABBER_MESSAGE_OTHER;
@@ -546,7 +546,7 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 		if(child->type != XMLNODE_TYPE_TAG)
 			continue;
 
-		if(!strcmp(child->name, "error")) {
+		if(purple_strequal(child->name, "error")) {
 			const char *code = xmlnode_get_attrib(child, "code");
 			char *code_txt = NULL;
 			char *text = xmlnode_get_data(child);
@@ -571,20 +571,20 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 		} else if (xmlns == NULL) {
 			/* QuLogic: Not certain this is correct, but it would have happened
 			   with the previous code. */
-			if(!strcmp(child->name, "x"))
+			if(purple_strequal(child->name, "x"))
 				jm->etc = g_list_append(jm->etc, child);
 			/* The following tests expect xmlns != NULL */
 			continue;
-		} else if(!strcmp(child->name, "subject") && !strcmp(xmlns, NS_XMPP_CLIENT)) {
+		} else if(purple_strequal(child->name, "subject") && purple_strequal(xmlns, NS_XMPP_CLIENT)) {
 			if(!jm->subject) {
 				jm->subject = xmlnode_get_data(child);
 				if(!jm->subject)
 					jm->subject = g_strdup("");
 			}
-		} else if(!strcmp(child->name, "thread") && !strcmp(xmlns, NS_XMPP_CLIENT)) {
+		} else if(purple_strequal(child->name, "thread") && purple_strequal(xmlns, NS_XMPP_CLIENT)) {
 			if(!jm->thread_id)
 				jm->thread_id = xmlnode_get_data(child);
-		} else if(!strcmp(child->name, "body") && !strcmp(xmlns, NS_XMPP_CLIENT)) {
+		} else if(purple_strequal(child->name, "body") && purple_strequal(xmlns, NS_XMPP_CLIENT)) {
 			if(!jm->body) {
 				char *msg = xmlnode_get_data(child);
 				char *escaped = purple_markup_escape_text(msg, -1);
@@ -592,7 +592,7 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 				g_free(escaped);
 				g_free(msg);
 			}
-		} else if(!strcmp(child->name, "html") && !strcmp(xmlns, NS_XHTML_IM)) {
+		} else if(purple_strequal(child->name, "html") && purple_strequal(xmlns, NS_XHTML_IM)) {
 			if(!jm->xhtml && xmlnode_get_child(child, "body")) {
 				char *c;
 
@@ -691,35 +691,35 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 						*c = ' ';
 				}
 			}
-		} else if(!strcmp(child->name, "active") && !strcmp(xmlns,"http://jabber.org/protocol/chatstates")) {
+		} else if(purple_strequal(child->name, "active") && purple_strequal(xmlns,"http://jabber.org/protocol/chatstates")) {
 			jm->chat_state = JM_STATE_ACTIVE;
-		} else if(!strcmp(child->name, "composing") && !strcmp(xmlns,"http://jabber.org/protocol/chatstates")) {
+		} else if(purple_strequal(child->name, "composing") && purple_strequal(xmlns,"http://jabber.org/protocol/chatstates")) {
 			jm->chat_state = JM_STATE_COMPOSING;
-		} else if(!strcmp(child->name, "paused") && !strcmp(xmlns,"http://jabber.org/protocol/chatstates")) {
+		} else if(purple_strequal(child->name, "paused") && purple_strequal(xmlns,"http://jabber.org/protocol/chatstates")) {
 			jm->chat_state = JM_STATE_PAUSED;
-		} else if(!strcmp(child->name, "inactive") && !strcmp(xmlns,"http://jabber.org/protocol/chatstates")) {
+		} else if(purple_strequal(child->name, "inactive") && purple_strequal(xmlns,"http://jabber.org/protocol/chatstates")) {
 			jm->chat_state = JM_STATE_INACTIVE;
-		} else if(!strcmp(child->name, "gone") && !strcmp(xmlns,"http://jabber.org/protocol/chatstates")) {
+		} else if(purple_strequal(child->name, "gone") && purple_strequal(xmlns,"http://jabber.org/protocol/chatstates")) {
 			jm->chat_state = JM_STATE_GONE;
-		} else if(!strcmp(child->name, "event") && !strcmp(xmlns,"http://jabber.org/protocol/pubsub#event")) {
+		} else if(purple_strequal(child->name, "event") && purple_strequal(xmlns,"http://jabber.org/protocol/pubsub#event")) {
 			xmlnode *items;
 			jm->type = JABBER_MESSAGE_EVENT;
 			for(items = xmlnode_get_child(child,"items"); items; items = items->next)
 				jm->eventitems = g_list_append(jm->eventitems, items);
-		} else if(!strcmp(child->name, "attention") && !strcmp(xmlns, NS_ATTENTION)) {
+		} else if(purple_strequal(child->name, "attention") && purple_strequal(xmlns, NS_ATTENTION)) {
 			jm->hasBuzz = TRUE;
-		} else if(!strcmp(child->name, "delay") && !strcmp(xmlns, NS_DELAYED_DELIVERY)) {
+		} else if(purple_strequal(child->name, "delay") && purple_strequal(xmlns, NS_DELAYED_DELIVERY)) {
 			const char *timestamp = xmlnode_get_attrib(child, "stamp");
 			jm->delayed = TRUE;
 			if(timestamp)
 				jm->sent = purple_str_to_time(timestamp, TRUE, NULL, NULL, NULL);
-		} else if(!strcmp(child->name, "x")) {
-			if(!strcmp(xmlns, NS_DELAYED_DELIVERY_LEGACY)) {
+		} else if(purple_strequal(child->name, "x")) {
+			if(purple_strequal(xmlns, NS_DELAYED_DELIVERY_LEGACY)) {
 				const char *timestamp = xmlnode_get_attrib(child, "stamp");
 				jm->delayed = TRUE;
 				if(timestamp)
 					jm->sent = purple_str_to_time(timestamp, TRUE, NULL, NULL, NULL);
-			} else if(!strcmp(xmlns, "jabber:x:conference") &&
+			} else if(purple_strequal(xmlns, "jabber:x:conference") &&
 					jm->type != JABBER_MESSAGE_GROUPCHAT_INVITE &&
 					jm->type != JABBER_MESSAGE_ERROR) {
 				const char *jid = xmlnode_get_attrib(child, "jid");
@@ -741,7 +741,7 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 						jm->password = g_strdup(password);
 					}
 				}
-			} else if(!strcmp(xmlns, "http://jabber.org/protocol/muc#user") &&
+			} else if(purple_strequal(xmlns, "http://jabber.org/protocol/muc#user") &&
 					jm->type != JABBER_MESSAGE_ERROR) {
 				xmlnode *invite = xmlnode_get_child(child, "invite");
 				if(invite) {
diff --git a/libpurple/protocols/jabber/oob.c b/libpurple/protocols/jabber/oob.c
index 74f932f56f..6d4f1962bc 100644
--- a/libpurple/protocols/jabber/oob.c
+++ b/libpurple/protocols/jabber/oob.c
@@ -173,11 +173,11 @@ static void jabber_oob_xfer_recv_error(PurpleXfer *xfer, const char *code) {
 	jabber_iq_set_id(iq, jox->iq_id);
 	y = xmlnode_new_child(iq->node, "error");
 	xmlnode_set_attrib(y, "code", code);
-	if(!strcmp(code, "406")) {
+	if(purple_strequal(code, "406")) {
 		z = xmlnode_new_child(y, "not-acceptable");
 		xmlnode_set_attrib(y, "type", "modify");
 		xmlnode_set_namespace(z, NS_XMPP_STANZAS);
-	} else if(!strcmp(code, "404")) {
+	} else if(purple_strequal(code, "404")) {
 		z = xmlnode_new_child(y, "not-found");
 		xmlnode_set_attrib(y, "type", "cancel");
 		xmlnode_set_namespace(z, NS_XMPP_STANZAS);
diff --git a/libpurple/protocols/jabber/presence.c b/libpurple/protocols/jabber/presence.c
index 2acd6bd411..f19550cbd8 100644
--- a/libpurple/protocols/jabber/presence.c
+++ b/libpurple/protocols/jabber/presence.c
@@ -664,7 +664,7 @@ handle_presence_chat(JabberStream *js, JabberPresence *presence, xmlnode *packet
 		 */
 		if (!presence->jid_from->resource || !chat->conv || chat->left) {
 			if (chat->left &&
-					presence->jid_from->resource && chat->handle && !strcmp(presence->jid_from->resource, chat->handle))
+					presence->jid_from->resource && chat->handle && purple_strequal(presence->jid_from->resource, chat->handle))
 				jabber_chat_destroy(chat);
 			return FALSE;
 		}
diff --git a/libpurple/protocols/jabber/roster.c b/libpurple/protocols/jabber/roster.c
index ff8d76723d..2a46c9f215 100644
--- a/libpurple/protocols/jabber/roster.c
+++ b/libpurple/protocols/jabber/roster.c
@@ -453,7 +453,7 @@ void jabber_roster_group_change(PurpleConnection *gc, const char *name,
 	GSList *buddies, *groups = NULL;
 	PurpleBuddy *b;
 
-	if(!old_group || !new_group || !strcmp(old_group, new_group))
+	if(!old_group || !new_group || purple_strequal(old_group, new_group))
 		return;
 
 	buddies = purple_find_buddies(gc->account, name);
diff --git a/libpurple/protocols/jabber/si.c b/libpurple/protocols/jabber/si.c
index ba6c610252..f07eca08bd 100644
--- a/libpurple/protocols/jabber/si.c
+++ b/libpurple/protocols/jabber/si.c
@@ -89,7 +89,7 @@ jabber_si_xfer_find(JabberStream *js, const char *sid, const char *from)
 		PurpleXfer *xfer = xfers->data;
 		JabberSIXfer *jsx = xfer->data;
 		if(jsx->stream_id && xfer->who &&
-				!strcmp(jsx->stream_id, sid) && !strcmp(xfer->who, from))
+				purple_strequal(jsx->stream_id, sid) && purple_strequal(xfer->who, from))
 			return xfer;
 	}
 
@@ -775,7 +775,7 @@ jabber_si_connect_proxy_cb(JabberStream *js, const char *from,
 	{
 		gchar *my_jid = g_strdup_printf("%s@%s/%s", jsx->js->user->node,
 			jsx->js->user->domain, jsx->js->user->resource);
-		if (!strcmp(jid, my_jid)) {
+		if (purple_strequal(jid, my_jid)) {
 			purple_debug_info("jabber", "Got local SOCKS5 streamhost-used.\n");
 			purple_xfer_start(xfer, xfer->fd, NULL, -1);
 		} else {
@@ -1204,14 +1204,14 @@ static void jabber_si_xfer_send_method_cb(JabberStream *js, const char *from,
 		const char *var = xmlnode_get_attrib(field, "var");
 		JabberSIXfer *jsx = (JabberSIXfer *) xfer->data;
 
-		if(var && !strcmp(var, "stream-method")) {
+		if(var && purple_strequal(var, "stream-method")) {
 			if((value = xmlnode_get_child(field, "value"))) {
 				char *val = xmlnode_get_data(value);
-				if(val && !strcmp(val, NS_BYTESTREAMS)) {
+				if(val && purple_strequal(val, NS_BYTESTREAMS)) {
 					jabber_si_xfer_bytestreams_send_init(xfer);
 					jsx->stream_method |= STREAM_METHOD_BYTESTREAMS;
 					found_method = TRUE;
-				} else if (val && !strcmp(val, NS_IBB)) {
+				} else if (val && purple_strequal(val, NS_IBB)) {
 					jsx->stream_method |= STREAM_METHOD_IBB;
 					if (!found_method) {
 						/* we haven't tried to init a bytestream session, yet
@@ -1749,15 +1749,15 @@ void jabber_si_parse(JabberStream *js, const char *from, JabberIqType type,
 
 	for(field = xmlnode_get_child(x, "field"); field; field = xmlnode_get_next_twin(field)) {
 		const char *var = xmlnode_get_attrib(field, "var");
-		if(var && !strcmp(var, "stream-method")) {
+		if(var && purple_strequal(var, "stream-method")) {
 			for(option = xmlnode_get_child(field, "option"); option;
 					option = xmlnode_get_next_twin(option)) {
 				if((value = xmlnode_get_child(option, "value"))) {
 					char *val;
 					if((val = xmlnode_get_data(value))) {
-						if(!strcmp(val, NS_BYTESTREAMS)) {
+						if(purple_strequal(val, NS_BYTESTREAMS)) {
 							jsx->stream_method |= STREAM_METHOD_BYTESTREAMS;
-						} else if(!strcmp(val, NS_IBB)) {
+						} else if(purple_strequal(val, NS_IBB)) {
 							jsx->stream_method |= STREAM_METHOD_IBB;
 						}
 						g_free(val);
diff --git a/libpurple/protocols/jabber/useravatar.c b/libpurple/protocols/jabber/useravatar.c
index a629de4516..f62763e6d5 100644
--- a/libpurple/protocols/jabber/useravatar.c
+++ b/libpurple/protocols/jabber/useravatar.c
@@ -352,17 +352,17 @@ update_buddy_metadata(JabberStream *js, const char *from, xmlnode *items)
 		for(info = metadata->child; info; info = info->next) {
 			if(info->type == XMLNODE_TYPE_TAG)
 				has_children = TRUE;
-			if(info->type == XMLNODE_TYPE_TAG && !strcmp(info->name,"info")) {
+			if(info->type == XMLNODE_TYPE_TAG && purple_strequal(info->name,"info")) {
 				const char *type = xmlnode_get_attrib(info,"type");
 				const char *id = xmlnode_get_attrib(info,"id");
 
-				if(checksum && id && !strcmp(id, checksum)) {
+				if(checksum && id && purple_strequal(id, checksum)) {
 					/* we already have that avatar, so we don't have to do anything */
 					goodinfo = NULL;
 					break;
 				}
 				/* We'll only pick the png one for now. It's a very nice image format anyways. */
-				if(type && id && !goodinfo && !strcmp(type, "image/png"))
+				if(type && id && !goodinfo && purple_strequal(type, "image/png"))
 					goodinfo = info;
 			}
 		}
diff --git a/libpurple/protocols/jabber/usermood.c b/libpurple/protocols/jabber/usermood.c
index 6d9b30f6af..7b01f49b23 100644
--- a/libpurple/protocols/jabber/usermood.c
+++ b/libpurple/protocols/jabber/usermood.c
@@ -135,14 +135,14 @@ static void jabber_mood_cb(JabberStream *js, const char *from, xmlnode *items) {
 		return;
 	for (moodinfo = mood->child; moodinfo; moodinfo = moodinfo->next) {
 		if (moodinfo->type == XMLNODE_TYPE_TAG) {
-			if (!strcmp(moodinfo->name, "text")) {
+			if (purple_strequal(moodinfo->name, "text")) {
 				if (!moodtext) /* only pick the first one */
 					moodtext = xmlnode_get_data(moodinfo);
 			} else {
 				int i;
 				for (i = 0; moods[i].mood; ++i) {
 					/* verify that the mood is known (valid) */
-					if (!strcmp(moodinfo->name, moods[i].mood)) {
+					if (purple_strequal(moodinfo->name, moods[i].mood)) {
 						newmood = moods[i].mood;
 						break;
 					}
diff --git a/libpurple/protocols/jabber/usertune.c b/libpurple/protocols/jabber/usertune.c
index 03e485ef1b..75a524268e 100644
--- a/libpurple/protocols/jabber/usertune.c
+++ b/libpurple/protocols/jabber/usertune.c
@@ -58,11 +58,11 @@ static void jabber_tune_cb(JabberStream *js, const char *from, xmlnode *items) {
 		return; /* huh? */
 	for (tuneinfo = tune->child; tuneinfo; tuneinfo = tuneinfo->next) {
 		if (tuneinfo->type == XMLNODE_TYPE_TAG) {
-			if (!strcmp(tuneinfo->name, "artist")) {
+			if (purple_strequal(tuneinfo->name, "artist")) {
 				if (tuneinfodata.artist == NULL) /* only pick the first one */
 					tuneinfodata.artist = xmlnode_get_data(tuneinfo);
 				valid = TRUE;
-			} else if (!strcmp(tuneinfo->name, "length")) {
+			} else if (purple_strequal(tuneinfo->name, "length")) {
 				if (tuneinfodata.time == -1) {
 					char *length = xmlnode_get_data(tuneinfo);
 					if (length)
@@ -71,19 +71,19 @@ static void jabber_tune_cb(JabberStream *js, const char *from, xmlnode *items) {
 					if (tuneinfodata.time > 0)
 						valid = TRUE;
 				}
-			} else if (!strcmp(tuneinfo->name, "source")) {
+			} else if (purple_strequal(tuneinfo->name, "source")) {
 				if (tuneinfodata.album == NULL) /* only pick the first one */
 					tuneinfodata.album = xmlnode_get_data(tuneinfo);
 				valid = TRUE;
-			} else if (!strcmp(tuneinfo->name, "title")) {
+			} else if (purple_strequal(tuneinfo->name, "title")) {
 				if (tuneinfodata.title == NULL) /* only pick the first one */
 					tuneinfodata.title = xmlnode_get_data(tuneinfo);
 				valid = TRUE;
-			} else if (!strcmp(tuneinfo->name, "track")) {
+			} else if (purple_strequal(tuneinfo->name, "track")) {
 				if (tuneinfodata.track == NULL) /* only pick the first one */
 					tuneinfodata.track = xmlnode_get_data(tuneinfo);
 				valid = TRUE;
-			} else if (!strcmp(tuneinfo->name, "uri")) {
+			} else if (purple_strequal(tuneinfo->name, "uri")) {
 				if (tuneinfodata.url == NULL) /* only pick the first one */
 					tuneinfodata.url = xmlnode_get_data(tuneinfo);
 				valid = TRUE;
diff --git a/libpurple/protocols/jabber/xdata.c b/libpurple/protocols/jabber/xdata.c
index e681694396..84c1687b6c 100644
--- a/libpurple/protocols/jabber/xdata.c
+++ b/libpurple/protocols/jabber/xdata.c
@@ -235,7 +235,7 @@ void *jabber_x_data_request_with_actions(JabberStream *js, xmlnode *packet, GLis
 		if(!label)
 			label = var;
 
-		if(!strcmp(type, "text-private")) {
+		if(purple_strequal(type, "text-private")) {
 			if((valuenode = xmlnode_get_child(fn, "value")))
 				value = xmlnode_get_data(valuenode);
 
@@ -247,7 +247,7 @@ void *jabber_x_data_request_with_actions(JabberStream *js, xmlnode *packet, GLis
 			g_hash_table_replace(data->fields, g_strdup(var), GINT_TO_POINTER(JABBER_X_DATA_TEXT_SINGLE));
 
 			g_free(value);
-		} else if(!strcmp(type, "text-multi") || !strcmp(type, "jid-multi")) {
+		} else if(purple_strequal(type, "text-multi") || purple_strequal(type, "jid-multi")) {
 			GString *str = g_string_new("");
 
 			for(valuenode = xmlnode_get_child(fn, "value"); valuenode;
@@ -267,13 +267,13 @@ void *jabber_x_data_request_with_actions(JabberStream *js, xmlnode *packet, GLis
 			g_hash_table_replace(data->fields, g_strdup(var), GINT_TO_POINTER(JABBER_X_DATA_TEXT_MULTI));
 
 			g_string_free(str, TRUE);
-		} else if(!strcmp(type, "list-single") || !strcmp(type, "list-multi")) {
+		} else if(purple_strequal(type, "list-single") || purple_strequal(type, "list-multi")) {
 			xmlnode *optnode;
 			GList *selected = NULL;
 
 			field = purple_request_field_list_new(var, label);
 
-			if(!strcmp(type, "list-multi")) {
+			if(purple_strequal(type, "list-multi")) {
 				purple_request_field_list_set_multi_select(field, TRUE);
 				g_hash_table_replace(data->fields, g_strdup(var),
 						GINT_TO_POINTER(JABBER_X_DATA_LIST_MULTI));
@@ -316,7 +316,7 @@ void *jabber_x_data_request_with_actions(JabberStream *js, xmlnode *packet, GLis
 				selected = g_list_delete_link(selected, selected);
 			}
 
-		} else if(!strcmp(type, "boolean")) {
+		} else if(purple_strequal(type, "boolean")) {
 			gboolean def = FALSE;
 
 			if((valuenode = xmlnode_get_child(fn, "value")))
@@ -332,7 +332,7 @@ void *jabber_x_data_request_with_actions(JabberStream *js, xmlnode *packet, GLis
 			g_hash_table_replace(data->fields, g_strdup(var), GINT_TO_POINTER(JABBER_X_DATA_BOOLEAN));
 
 			g_free(value);
-		} else if(!strcmp(type, "fixed")) {
+		} else if(purple_strequal(type, "fixed")) {
 			if((valuenode = xmlnode_get_child(fn, "value")))
 				value = xmlnode_get_data(valuenode);
 
@@ -342,7 +342,7 @@ void *jabber_x_data_request_with_actions(JabberStream *js, xmlnode *packet, GLis
 
 				g_free(value);
 			}
-		} else if(!strcmp(type, "hidden")) {
+		} else if(purple_strequal(type, "hidden")) {
 			if((valuenode = xmlnode_get_child(fn, "value")))
 				value = xmlnode_get_data(valuenode);
 
@@ -362,7 +362,7 @@ void *jabber_x_data_request_with_actions(JabberStream *js, xmlnode *packet, GLis
 					value ? value : "", FALSE);
 			purple_request_field_group_add_field(group, field);
 
-			if(!strcmp(type, "jid-single")) {
+			if(purple_strequal(type, "jid-single")) {
 				purple_request_field_set_type_hint(field, "screenname");
 				g_hash_table_replace(data->fields, g_strdup(var), GINT_TO_POINTER(JABBER_X_DATA_JID_SINGLE));
 			} else {
diff --git a/libpurple/protocols/novell/novell.c b/libpurple/protocols/novell/novell.c
index 817974f7db..c0acc5ea70 100644
--- a/libpurple/protocols/novell/novell.c
+++ b/libpurple/protocols/novell/novell.c
@@ -2882,7 +2882,7 @@ novell_set_idle(PurpleConnection * gc, int time)
 	id = purple_status_get_id(status);
 
 	/* Only go idle if active status is available  */
-	if (!strcmp(id, NOVELL_STATUS_TYPE_AVAILABLE)) {
+	if (purple_strequal(id, NOVELL_STATUS_TYPE_AVAILABLE)) {
 		if (time > 0) {
 			rc = nm_send_set_status(user, NM_STATUS_AWAY_IDLE, NULL, NULL, NULL, NULL);
 		} else {
diff --git a/libpurple/protocols/null/nullprpl.c b/libpurple/protocols/null/nullprpl.c
index 1fdb0e4fb1..5688476666 100644
--- a/libpurple/protocols/null/nullprpl.c
+++ b/libpurple/protocols/null/nullprpl.c
@@ -113,7 +113,7 @@ static void call_if_nullprpl(gpointer data, gpointer userdata) {
   PurpleConnection *gc = (PurpleConnection *)(data);
   GcFuncData *gcfdata = (GcFuncData *)userdata;
 
-  if (!strcmp(gc->account->protocol_id, NULLPRPL_ID))
+  if (purple_strequal(gc->account->protocol_id, NULLPRPL_ID))
     gcfdata->fn(gcfdata->from, gc, gcfdata->userdata);
 }
 
@@ -168,9 +168,9 @@ static void discover_status(PurpleConnection *from, PurpleConnection *to,
     const char *status_id = purple_status_get_id(status);
     const char *message = purple_status_get_attr_string(status, "message");
 
-    if (!strcmp(status_id, NULL_STATUS_ONLINE) ||
-        !strcmp(status_id, NULL_STATUS_AWAY) ||
-        !strcmp(status_id, NULL_STATUS_OFFLINE)) {
+    if (purple_strequal(status_id, NULL_STATUS_ONLINE) ||
+        purple_strequal(status_id, NULL_STATUS_AWAY) ||
+        purple_strequal(status_id, NULL_STATUS_OFFLINE)) {
       purple_debug_info("nullprpl", "%s sees that %s is %s: %s\n",
                         from_username, to_username, status_id, message);
       purple_prpl_got_user_status(from->account, to_username, status_id,
@@ -952,7 +952,7 @@ static void nullprpl_set_chat_topic(PurpleConnection *gc, int id,
 
   last_topic = purple_conv_chat_get_topic(chat);
   if ((!topic && !last_topic) ||
-      (topic && last_topic && !strcmp(topic, last_topic)))
+      (topic && last_topic && purple_strequal(topic, last_topic)))
     return;  /* topic is unchanged, this is a noop */
 
   foreach_gc_in_chat(set_chat_topic_fn, gc, id, (gpointer)topic);
diff --git a/libpurple/protocols/oscar/family_icbm.c b/libpurple/protocols/oscar/family_icbm.c
index 55800e05a1..8f95cce7a1 100644
--- a/libpurple/protocols/oscar/family_icbm.c
+++ b/libpurple/protocols/oscar/family_icbm.c
@@ -2037,7 +2037,7 @@ int icq_relay_xstatus(OscarData *od, const char *sn, const guchar *cookie)
 	if (!account)
 		return -EINVAL;
 
-	/* if (!strcmp(account->username, sn))
+	/* if (purple_strequal(account->username, sn))
 		icq_im_xstatus_request(od, sn); */
 
 	status = purple_presence_get_active_status(account->presence);
diff --git a/libpurple/protocols/oscar/family_locate.c b/libpurple/protocols/oscar/family_locate.c
index 00bde7ac70..66b1cb7364 100644
--- a/libpurple/protocols/oscar/family_locate.c
+++ b/libpurple/protocols/oscar/family_locate.c
@@ -1081,7 +1081,7 @@ aim_info_extract(OscarData *od, ByteStream *bs, aim_userinfo_t *outinfo)
 						 * with no mood icon. */
 						if (*icqmood) {
 							for (i = 0; icqmoods[i].icqmood; i++) {
-								if (!strcmp(icqmood, icqmoods[i].icqmood)) {
+								if (purple_strequal(icqmood, icqmoods[i].icqmood)) {
 									mood = icqmoods[i].mood;
 									break; /* should only match once... */
 								}
@@ -1522,7 +1522,7 @@ icq_get_custom_icon_description(const char *mood)
 		/* We check that description is not NULL to exclude
 		 * duplicates, like the typing duplicate. */
 		if (icq_purple_moods[i].description &&
-		    !strcmp(mood, icq_custom_icons[i].mood)) {
+		    purple_strequal(mood, icq_custom_icons[i].mood)) {
 			return icq_purple_moods[i].description;
 		}
 	}
@@ -1542,7 +1542,7 @@ icq_get_custom_icon_data(const char *mood)
 		/* We check that description is not NULL to exclude
 		 * duplicates, like the typing duplicate. */
 		if (icq_purple_moods[i].description &&
-		    !strcmp(mood, icq_custom_icons[i].mood)) {
+		    purple_strequal(mood, icq_custom_icons[i].mood)) {
 			return (guint8 *)icq_custom_icons[i].data;
 		}
 	}
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
index f556b4ec03..06d8425d95 100644
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -2129,7 +2129,7 @@ incomingim_chan4(OscarData *od, FlapConnection *conn, aim_userinfo_t *userinfo,
 			smsmsg = byte_stream_getstr(&qbs, smslen);
 
 			/* Check if this is an SMS being sent from server */
-			if ((smstype == 0) && (!strcmp(tagstr, "ICQSMS")) && (smsmsg != NULL))
+			if ((smstype == 0) && (purple_strequal(tagstr, "ICQSMS")) && (smsmsg != NULL))
 			{
 				xmlroot = xmlnode_from_str(smsmsg, -1);
 				if (xmlroot != NULL)
@@ -3511,31 +3511,31 @@ oscar_get_extended_status(PurpleConnection *gc)
 	if (purple_account_get_bool(account, "web_aware", OSCAR_DEFAULT_WEB_AWARE))
 		data |= AIM_ICQ_STATE_WEBAWARE;
 
-	if (!strcmp(status_id, OSCAR_STATUS_ID_AVAILABLE))
+	if (purple_strequal(status_id, OSCAR_STATUS_ID_AVAILABLE))
 		data |= AIM_ICQ_STATE_NORMAL;
-	else if (!strcmp(status_id, OSCAR_STATUS_ID_AWAY))
+	else if (purple_strequal(status_id, OSCAR_STATUS_ID_AWAY))
 		data |= AIM_ICQ_STATE_AWAY;
-	else if (!strcmp(status_id, OSCAR_STATUS_ID_DND))
+	else if (purple_strequal(status_id, OSCAR_STATUS_ID_DND))
 		data |= AIM_ICQ_STATE_AWAY | AIM_ICQ_STATE_DND | AIM_ICQ_STATE_BUSY;
-	else if (!strcmp(status_id, OSCAR_STATUS_ID_NA))
+	else if (purple_strequal(status_id, OSCAR_STATUS_ID_NA))
 		data |= AIM_ICQ_STATE_OUT | AIM_ICQ_STATE_AWAY;
-	else if (!strcmp(status_id, OSCAR_STATUS_ID_OCCUPIED))
+	else if (purple_strequal(status_id, OSCAR_STATUS_ID_OCCUPIED))
 		data |= AIM_ICQ_STATE_AWAY | AIM_ICQ_STATE_BUSY;
-	else if (!strcmp(status_id, OSCAR_STATUS_ID_FREE4CHAT))
+	else if (purple_strequal(status_id, OSCAR_STATUS_ID_FREE4CHAT))
 		data |= AIM_ICQ_STATE_CHAT;
-	else if (!strcmp(status_id, OSCAR_STATUS_ID_INVISIBLE))
+	else if (purple_strequal(status_id, OSCAR_STATUS_ID_INVISIBLE))
 		data |= AIM_ICQ_STATE_INVISIBLE;
-	else if (!strcmp(status_id, OSCAR_STATUS_ID_EVIL))
+	else if (purple_strequal(status_id, OSCAR_STATUS_ID_EVIL))
 		data |= AIM_ICQ_STATE_EVIL;
-	else if (!strcmp(status_id, OSCAR_STATUS_ID_DEPRESSION))
+	else if (purple_strequal(status_id, OSCAR_STATUS_ID_DEPRESSION))
 		data |= AIM_ICQ_STATE_DEPRESSION;
-	else if (!strcmp(status_id, OSCAR_STATUS_ID_ATWORK))
+	else if (purple_strequal(status_id, OSCAR_STATUS_ID_ATWORK))
 		data |= AIM_ICQ_STATE_ATWORK;
-	else if (!strcmp(status_id, OSCAR_STATUS_ID_ATHOME))
+	else if (purple_strequal(status_id, OSCAR_STATUS_ID_ATHOME))
 		data |= AIM_ICQ_STATE_ATHOME;
-	else if (!strcmp(status_id, OSCAR_STATUS_ID_LUNCH))
+	else if (purple_strequal(status_id, OSCAR_STATUS_ID_LUNCH))
 		data |= AIM_ICQ_STATE_LUNCH;
-	else if (!strcmp(status_id, OSCAR_STATUS_ID_CUSTOM))
+	else if (purple_strequal(status_id, OSCAR_STATUS_ID_CUSTOM))
 		data |= AIM_ICQ_STATE_OUT | AIM_ICQ_STATE_AWAY;
 
 	return data;
@@ -5686,7 +5686,7 @@ static PurpleAccount *find_acct(const char *prpl, const char *acct_id)
 	} else { /* Otherwise find an active account for the protocol */
 		GList *l = purple_accounts_get_all();
 		while (l) {
-			if (!strcmp(prpl, purple_account_get_protocol_id(l->data))
+			if (purple_strequal(prpl, purple_account_get_protocol_id(l->data))
 					&& purple_account_is_connected(l->data)) {
 				acct = l->data;
 				break;
diff --git a/libpurple/protocols/oscar/userinfo.c b/libpurple/protocols/oscar/userinfo.c
index fad89dd763..8659861fd0 100644
--- a/libpurple/protocols/oscar/userinfo.c
+++ b/libpurple/protocols/oscar/userinfo.c
@@ -252,7 +252,7 @@ oscar_user_info_append_status(PurpleConnection *gc, PurpleNotifyUserInfo *user_i
 				/* Append the status name for online ICQ statuses, away AIM statuses, and for all buddies with no message.
 				 * If the status name and the message are the same, only show one. */
 				const char *status_name = purple_status_get_name(status);
-				if (status_name && message && !strcmp(status_name, message))
+				if (status_name && message && purple_strequal(status_name, message))
 					status_name = NULL;
 
 				tmp = g_strdup_printf("%s%s%s",
@@ -433,7 +433,7 @@ oscar_user_info_display_icq(OscarData *od, struct aim_icq_info *info)
 		tm->tm_mon  = (int)info->birthmonth - 1;
 		tm->tm_year = (int)info->birthyear - 1900;
 
-		/* Ignore dst setting of today to avoid timezone shift between 
+		/* Ignore dst setting of today to avoid timezone shift between
 		 * dates in summer and winter time. */
 		tm->tm_isdst = -1;
 
diff --git a/libpurple/protocols/sametime/sametime.c b/libpurple/protocols/sametime/sametime.c
index aa252d89ff..9d47ad3156 100644
--- a/libpurple/protocols/sametime/sametime.c
+++ b/libpurple/protocols/sametime/sametime.c
@@ -945,8 +945,8 @@ static PurpleGroup *group_ensure(PurpleConnection *gc,
 
     DEBUG_INFO("found group named %s, owned by %s\n", NSTR(n), NSTR(o));
 
-    if(n && !strcmp(n, name)) {
-      if(!o || !strcmp(o, owner)) {
+    if(n && purple_strequal(n, name)) {
+      if(!o || purple_strequal(o, owner)) {
 	DEBUG_INFO("that'll work\n");
 	group = (PurpleGroup *) gn;
 	break;
@@ -1177,7 +1177,7 @@ static void blist_sync(PurpleConnection *gc, struct mwSametimeList *stlist) {
 
     /* dynamic group belonging to this account. don't prune contents */
     owner = purple_blist_node_get_string(gn, GROUP_KEY_OWNER);
-    if(owner && !strcmp(owner, acct_n))
+    if(owner && purple_strequal(owner, acct_n))
        continue;
 
     /* we actually are synching by this key as opposed to the group
@@ -1361,7 +1361,7 @@ static void blist_node_menu_cb(PurpleBlistNode *node,
 
   /* check if it's a NAB group for this account */
   owner = purple_blist_node_get_string(node, GROUP_KEY_OWNER);
-  if(owner && !strcmp(owner, purple_account_get_username(acct))) {
+  if(owner && purple_strequal(owner, purple_account_get_username(acct))) {
     act = purple_menu_action_new(_("Get Notes Address Book Info"),
                                PURPLE_CALLBACK(blist_menu_nab), pd, NULL);
     *menu = g_list_append(*menu, act);
diff --git a/libpurple/protocols/silc/buddy.c b/libpurple/protocols/silc/buddy.c
index 687cd3f6cd..dee50ebddb 100644
--- a/libpurple/protocols/silc/buddy.c
+++ b/libpurple/protocols/silc/buddy.c
@@ -890,13 +890,13 @@ silcpurple_add_buddy_save(SilcBool success, void *context)
 		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 @@ silcpurple_add_buddy_save(SilcBool success, void *context)
 		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 @@ void silcpurple_buddy_set_icon(PurpleConnection *gc, PurpleStoredImage *img)
 		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);
diff --git a/libpurple/protocols/silc/ops.c b/libpurple/protocols/silc/ops.c
index 2e018eafea..d08eb8c6e0 100644
--- a/libpurple/protocols/silc/ops.c
+++ b/libpurple/protocols/silc/ops.c
@@ -65,7 +65,7 @@ void silc_say(SilcClient client, SilcClientConnection conn,
 
 	purple_debug_error("silc", "silc_say error: %s\n", tmp);
 
-	if (!strcmp(tmp, "Authentication failed"))
+	if (purple_strequal(tmp, "Authentication failed"))
 		reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
 
 	if (client != NULL)
@@ -122,7 +122,7 @@ silcpurple_mime_message(SilcClient client, SilcClientConnection conn,
 		const char *mtype;
 		SilcDList parts = silc_mime_get_multiparts(mime, &mtype);
 
-		if (!strcmp(mtype, "mixed")) {
+		if (purple_strequal(mtype, "mixed")) {
 			/* Contains multiple messages */
 			silc_dlist_start(parts);
 			while ((p = silc_dlist_get(parts)) != SILC_LIST_END) {
@@ -132,7 +132,7 @@ silcpurple_mime_message(SilcClient client, SilcClientConnection conn,
 			}
 		}
 
-		if (!strcmp(mtype, "alternative")) {
+		if (purple_strequal(mtype, "alternative")) {
 			/* Same message in alternative formats.  Kopete sends
 			   these.  Go in order from last to first. */
 			silc_dlist_end(parts);
@@ -593,7 +593,7 @@ silc_notify(SilcClient client, SilcClientConnection conn,
 		tmp = va_arg(va, char *);      /* Old nick */
 		name = va_arg(va, char *);     /* New nick */
 
-		if (!strcmp(tmp, name))
+		if (purple_strequal(tmp, name))
 			break;
 
 		/* Change nick on all channels */
@@ -955,7 +955,7 @@ silc_command(SilcClient client, SilcClientConnection conn,
 	switch (command) {
 
 	case SILC_COMMAND_CMODE:
-		if (argc == 3 && !strcmp((char *)argv[2], "+C"))
+		if (argc == 3 && purple_strequal((char *)argv[2], "+C"))
 			sg->chpk = TRUE;
 		else
 			sg->chpk = FALSE;
diff --git a/libpurple/protocols/silc/silc.c b/libpurple/protocols/silc/silc.c
index 3084d278aa..7e8d0f2501 100644
--- a/libpurple/protocols/silc/silc.c
+++ b/libpurple/protocols/silc/silc.c
@@ -98,15 +98,15 @@ silcpurple_set_status(PurpleAccount *account, PurpleStatus *status)
 		  SILC_UMODE_INDISPOSED |
 		  SILC_UMODE_PAGE);
 
-	if (!strcmp(state, "hyper"))
+	if (purple_strequal(state, "hyper"))
 		mode |= SILC_UMODE_HYPER;
-	else if (!strcmp(state, "away"))
+	else if (purple_strequal(state, "away"))
 		mode |= SILC_UMODE_GONE;
-	else if (!strcmp(state, "busy"))
+	else if (purple_strequal(state, "busy"))
 		mode |= SILC_UMODE_BUSY;
-	else if (!strcmp(state, "indisposed"))
+	else if (purple_strequal(state, "indisposed"))
 		mode |= SILC_UMODE_INDISPOSED;
-	else if (!strcmp(state, "page"))
+	else if (purple_strequal(state, "page"))
 		mode |= SILC_UMODE_PAGE;
 
 	/* Send UMODE */
@@ -595,13 +595,13 @@ silcpurple_login(PurpleAccount *account)
 	cipher = purple_account_get_string(account, "cipher",
 					   SILC_DEFAULT_CIPHER);
 	for (i = 0; silc_default_ciphers[i].name; i++)
-		if (!strcmp(silc_default_ciphers[i].name, cipher)) {
+		if (purple_strequal(silc_default_ciphers[i].name, cipher)) {
 			silc_cipher_register(&(silc_default_ciphers[i]));
 			break;
 		}
 	hmac = purple_account_get_string(account, "hmac", SILC_DEFAULT_HMAC);
 	for (i = 0; silc_default_hmacs[i].name; i++)
-		if (!strcmp(silc_default_hmacs[i].name, hmac)) {
+		if (purple_strequal(silc_default_hmacs[i].name, hmac)) {
 			silc_hmac_register(&(silc_default_hmacs[i]));
 			break;
 		}
diff --git a/libpurple/protocols/silc10/buddy.c b/libpurple/protocols/silc10/buddy.c
index aaedee6088..2e269aa2de 100644
--- a/libpurple/protocols/silc10/buddy.c
+++ b/libpurple/protocols/silc10/buddy.c
@@ -891,7 +891,7 @@ silcpurple_add_buddy_save(bool success, void *context)
 		silc_free(verifyd);
 	}
 
-	if (serversign.data && !strcmp(serverpk.type, "silc-rsa")) {
+	if (serversign.data && purple_strequal(serverpk.type, "silc-rsa")) {
 		SilcPublicKey public_key;
 		SilcPKCS pkcs;
 		unsigned char *verifyd;
@@ -983,10 +983,10 @@ silcpurple_add_buddy_save(bool success, void *context)
 						      usericon.mime_len);
 			if (m) {
 				const char *type = silc_mime_get_field(m, "Content-Type");
-				if (!strcmp(type, "image/jpeg") ||
-				    !strcmp(type, "image/gif") ||
-				    !strcmp(type, "image/bmp") ||
-				    !strcmp(type, "image/png")) {
+				if (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(m, &data_len);
@@ -1727,11 +1727,11 @@ void silcpurple_buddy_set_icon(PurpleConnection *gc, PurpleStoredImage *img)
 		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);
diff --git a/libpurple/protocols/silc10/ops.c b/libpurple/protocols/silc10/ops.c
index 6095c49b18..5ac6085905 100644
--- a/libpurple/protocols/silc10/ops.c
+++ b/libpurple/protocols/silc10/ops.c
@@ -265,8 +265,8 @@ silc_channel_message(SilcClient client, SilcClientConnection conn,
 		    &data_len))
 			return;
 
-		if (!strcmp(type, "application/x-wb") &&
-		    !strcmp(enc, "binary") &&
+		if (purple_strequal(type, "application/x-wb") &&
+		    purple_strequal(enc, "binary") &&
 		    !purple_account_get_bool(sg->account, "block-wb", FALSE))
 			silcpurple_wb_receive_ch(client, conn, sender, channel,
 					       payload, flags, data, data_len);
@@ -368,8 +368,8 @@ silc_private_message(SilcClient client, SilcClientConnection conn,
 		    &data_len))
 			return;
 
-		if (!strcmp(type, "application/x-wb") &&
-		    !strcmp(enc, "binary") &&
+		if (purple_strequal(type, "application/x-wb") &&
+		    purple_strequal(enc, "binary") &&
 		    !purple_account_get_bool(sg->account, "block-wb", FALSE))
 			silcpurple_wb_receive(client, conn, sender, payload,
 					    flags, data, data_len);
@@ -588,7 +588,7 @@ silc_notify(SilcClient client, SilcClientConnection conn,
 		client_entry = va_arg(va, SilcClientEntry);
 		client_entry2 = va_arg(va, SilcClientEntry);
 
-		if (!strcmp(client_entry->nickname, client_entry2->nickname))
+		if (purple_strequal(client_entry->nickname, client_entry2->nickname))
 			break;
 
 		/* Change nick on all channels */
@@ -890,7 +890,7 @@ silc_notify(SilcClient client, SilcClientConnection conn,
 							if (b->account != gc->account)
 								continue;
 							f = purple_blist_node_get_string(bnode, "public-key");
-							if (f && !strcmp(f, buf))
+							if (f && purple_strequal(f, buf))
 								goto cont;
 							b = NULL;
 						}
@@ -976,7 +976,7 @@ silc_command(SilcClient client, SilcClientConnection conn,
 
 	case SILC_COMMAND_CMODE:
 		if (cmd_context->argc == 3 &&
-		    !strcmp((char *)cmd_context->argv[2], "+C"))
+		    purple_strequal((char *)cmd_context->argv[2], "+C"))
 			sg->chpk = TRUE;
 		else
 			sg->chpk = FALSE;
diff --git a/libpurple/protocols/silc10/silc.c b/libpurple/protocols/silc10/silc.c
index e29c22ea45..340e28433b 100644
--- a/libpurple/protocols/silc10/silc.c
+++ b/libpurple/protocols/silc10/silc.c
@@ -88,15 +88,15 @@ silcpurple_set_status(PurpleAccount *account, PurpleStatus *status)
 		  SILC_UMODE_INDISPOSED |
 		  SILC_UMODE_PAGE);
 
-	if (!strcmp(state, "hyper"))
+	if (purple_strequal(state, "hyper"))
 		mode |= SILC_UMODE_HYPER;
-	else if (!strcmp(state, "away"))
+	else if (purple_strequal(state, "away"))
 		mode |= SILC_UMODE_GONE;
-	else if (!strcmp(state, "busy"))
+	else if (purple_strequal(state, "busy"))
 		mode |= SILC_UMODE_BUSY;
-	else if (!strcmp(state, "indisposed"))
+	else if (purple_strequal(state, "indisposed"))
 		mode |= SILC_UMODE_INDISPOSED;
-	else if (!strcmp(state, "page"))
+	else if (purple_strequal(state, "page"))
 		mode |= SILC_UMODE_PAGE;
 
 	/* Send UMODE */
@@ -301,13 +301,13 @@ silcpurple_login(PurpleAccount *account)
 	/* Register requested cipher and HMAC */
 	cipher = purple_account_get_string(account, "cipher", SILC_DEFAULT_CIPHER);
 	for (i = 0; silc_default_ciphers[i].name; i++)
-		if (!strcmp(silc_default_ciphers[i].name, cipher)) {
+		if (purple_strequal(silc_default_ciphers[i].name, cipher)) {
 			silc_cipher_register(&(silc_default_ciphers[i]));
 			break;
 		}
 	hmac = purple_account_get_string(account, "hmac", SILC_DEFAULT_HMAC);
 	for (i = 0; silc_default_hmacs[i].name; i++)
-		if (!strcmp(silc_default_hmacs[i].name, hmac)) {
+		if (purple_strequal(silc_default_hmacs[i].name, hmac)) {
 			silc_hmac_register(&(silc_default_hmacs[i]));
 			break;
 		}
diff --git a/libpurple/protocols/simple/simple.c b/libpurple/protocols/simple/simple.c
index 516679d6d5..070dcdfeb3 100644
--- a/libpurple/protocols/simple/simple.c
+++ b/libpurple/protocols/simple/simple.c
@@ -143,7 +143,7 @@ static struct simple_watcher *watcher_find(struct simple_account_data *sip,
 	GSList *entry = sip->watcher;
 	while(entry) {
 		watcher = entry->data;
-		if(!strcmp(name, watcher->name)) return watcher;
+		if(purple_strequal(name, watcher->name)) return watcher;
 		entry = entry->next;
 	}
 	return NULL;
@@ -619,7 +619,7 @@ static struct transaction *transactions_find(struct simple_account_data *sip, st
 	if (cseq) {
 		while(transactions) {
 			trans = transactions->data;
-			if(!strcmp(trans->cseq, cseq)) {
+			if(purple_strequal(trans->cseq, cseq)) {
 				return trans;
 			}
 			transactions = transactions->next;
@@ -642,7 +642,7 @@ static void send_sip_request(PurpleConnection *gc, const gchar *method,
 	gchar *tag = NULL;
 	char *buf;
 
-	if(!strcmp(method, "REGISTER")) {
+	if(purple_strequal(method, "REGISTER")) {
 		if(sip->regcallid) {
 			g_free(callid);
 			callid = g_strdup(sip->regcallid);
@@ -651,7 +651,7 @@ static void send_sip_request(PurpleConnection *gc, const gchar *method,
 	}
 
 	if(addheaders) addh = addheaders;
-	if(sip->registrar.type && !strcmp(method, "REGISTER")) {
+	if(sip->registrar.type && purple_strequal(method, "REGISTER")) {
 		buf = auth_header(sip, &sip->registrar, method, url);
 		auth = g_strdup_printf("Authorization: %s\r\n", buf);
 		g_free(buf);
@@ -1174,9 +1174,9 @@ static gboolean dialog_match(struct sip_dialog *dialog, struct sipmsg *msg)
 	theirtag = find_tag(fromhdr);
 
 	if (ourtag && theirtag &&
-			!strcmp(dialog->callid, callid) &&
-			!strcmp(dialog->ourtag, ourtag) &&
-			!strcmp(dialog->theirtag, theirtag))
+			purple_strequal(dialog->callid, callid) &&
+			purple_strequal(dialog->ourtag, ourtag) &&
+			purple_strequal(dialog->theirtag, theirtag))
 		match = TRUE;
 
 	g_free(ourtag);
@@ -1508,13 +1508,13 @@ privend:
 static void process_input_message(struct simple_account_data *sip, struct sipmsg *msg) {
 	gboolean found = FALSE;
 	if(msg->response == 0) { /* request */
-		if(!strcmp(msg->method, "MESSAGE")) {
+		if(purple_strequal(msg->method, "MESSAGE")) {
 			process_incoming_message(sip, msg);
 			found = TRUE;
-		} else if(!strcmp(msg->method, "NOTIFY")) {
+		} else if(purple_strequal(msg->method, "NOTIFY")) {
 			process_incoming_notify(sip, msg);
 			found = TRUE;
-		} else if(!strcmp(msg->method, "SUBSCRIBE")) {
+		} else if(purple_strequal(msg->method, "SUBSCRIBE")) {
 			process_incoming_subscribe(sip, msg);
 			found = TRUE;
 		} else {
@@ -1548,7 +1548,7 @@ static void process_input_message(struct simple_account_data *sip, struct sipmsg
 					purple_debug_info("simple", "got trying response\n");
 				} else {
 					sip->proxy.retries = 0;
-					if(!strcmp(trans->msg->method, "REGISTER")) {
+					if(purple_strequal(trans->msg->method, "REGISTER")) {
 
 						/* This is encountered when a REGISTER request was ...
 						 */
diff --git a/libpurple/protocols/zephyr/ZAsyncLocate.c b/libpurple/protocols/zephyr/ZAsyncLocate.c
index d46fd6666b..65d451a152 100644
--- a/libpurple/protocols/zephyr/ZAsyncLocate.c
+++ b/libpurple/protocols/zephyr/ZAsyncLocate.c
@@ -9,6 +9,7 @@
  */
 
 #include "internal.h"
+#include "util.h"
 
 Code_t ZRequestLocations(user, zald, kind, auth)
      const char *user;
@@ -77,7 +78,7 @@ Code_t ZParseLocations(notice,zald,nlocs,user)
 
     /* flag ACKs as special */
     if (notice->z_kind == SERVACK &&
-	!strcmp(notice->z_opcode, LOCATE_LOCATE)) {
+	purple_strequal(notice->z_opcode, LOCATE_LOCATE)) {
 	*nlocs = -1;
 	return(ZERR_NONE);
     }
@@ -133,7 +134,7 @@ Code_t ZParseLocations(notice,zald,nlocs,user)
     __locate_next = 0;
     *nlocs = __locate_num;
     if (user) {
-	size_t len;    
+	size_t len;
 	if (zald) {
 	    len = strlen(zald->user) + 1;
 	    if ((*user = (char *) malloc(len)) == NULL)
diff --git a/libpurple/protocols/zephyr/ZLocations.c b/libpurple/protocols/zephyr/ZLocations.c
index a61e63864a..21e7f7bed3 100644
--- a/libpurple/protocols/zephyr/ZLocations.c
+++ b/libpurple/protocols/zephyr/ZLocations.c
@@ -10,6 +10,7 @@
  */
 
 #include "internal.h"
+#include "util.h"
 
 #ifndef WIN32
 #include <pwd.h>
@@ -127,11 +128,11 @@ Code_t Z_SendLocation(class, opcode, auth, format)
 	    ZFreeNotice(&retnotice);
 	    return (ZERR_SERVNAK);
 	}
-	if (!strcmp(retnotice.z_message, ZSRVACK_NOTSENT)) {
+	if (purple_strequal(retnotice.z_message, ZSRVACK_NOTSENT)) {
 	    ZFreeNotice(&retnotice);
 	    return (ZERR_AUTHFAIL);
 	}
-	if (!strcmp(retnotice.z_message, ZSRVACK_FAIL)) {
+	if (purple_strequal(retnotice.z_message, ZSRVACK_FAIL)) {
 	    ZFreeNotice(&retnotice);
 	    return (ZERR_LOGINFAIL);
 	}
diff --git a/libpurple/protocols/zephyr/ZRetSubs.c b/libpurple/protocols/zephyr/ZRetSubs.c
index 3a1e9addd0..94a3ab462e 100644
--- a/libpurple/protocols/zephyr/ZRetSubs.c
+++ b/libpurple/protocols/zephyr/ZRetSubs.c
@@ -10,6 +10,7 @@
  */
 
 #include "internal.h"
+#include "util.h"
 
 static Code_t Z_RetSubs(ZNotice_t *notice, int *nsubs, Z_AuthProc auth_routine);
 
@@ -110,7 +111,7 @@ static Code_t Z_RetSubs(notice, nsubs, auth_routine)
 			return(ZERR_VERS);
 		}
 		if (retnotice.z_kind == SERVACK &&
-		    !strcmp(retnotice.z_opcode,notice->z_opcode)) {
+		    purple_strequal(retnotice.z_opcode,notice->z_opcode)) {
 			ZFreeNotice(&retnotice);
 			gimmeack = 1;
 			continue;
diff --git a/libpurple/status.c b/libpurple/status.c
index 9f7f80f151..1161913333 100644
--- a/libpurple/status.c
+++ b/libpurple/status.c
@@ -833,7 +833,7 @@ purple_status_set_active_with_attrs_list(PurpleStatus *status, gboolean active,
 				const char *def = purple_value_get_string(default_value);
 				if ((cur == NULL && def == NULL)
 				    || (cur != NULL && def != NULL
-					&& !strcmp(cur, def))) {
+					&& purple_strequal(cur, def))) {
 					continue;
 				}
 
diff --git a/pidgin/gtkaccount.c b/pidgin/gtkaccount.c
index 94b9a43ea3..5f1ae87766 100644
--- a/pidgin/gtkaccount.c
+++ b/pidgin/gtkaccount.c
@@ -277,7 +277,7 @@ username_focus_cb(GtkWidget *widget, GdkEventFocus *event, AccountPrefsDialog *d
 	table = dialog->prpl_info->get_account_text_table(NULL);
 	label = g_hash_table_lookup(table, "login_label");
 
-	if(!strcmp(gtk_entry_get_text(GTK_ENTRY(widget)), label)) {
+	if(purple_strequal(gtk_entry_get_text(GTK_ENTRY(widget)), label)) {
 		gtk_entry_set_text(GTK_ENTRY(widget), "");
 		gtk_widget_modify_text(widget, GTK_STATE_NORMAL,NULL);
 	}
@@ -574,7 +574,7 @@ add_login_options(AccountPrefsDialog *dialog, GtkWidget *parent)
 		menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu));
 		item = gtk_menu_get_active(GTK_MENU(menu));
 		if (value == NULL && g_object_get_data(G_OBJECT(item), "fakegoogle") &&
-			!strcmp(purple_account_user_split_get_text(split), _("Domain")))
+			purple_strequal(purple_account_user_split_get_text(split), _("Domain")))
 			value = "gmail.com";
 
 		if (value != NULL)
@@ -2519,7 +2519,7 @@ get_user_info_cb(GtkWidget   *label,
                  gpointer     data)
 {
 	struct auth_request *ar = data;
-	if (!strcmp(uri, "viewinfo")) {
+	if (purple_strequal(uri, "viewinfo")) {
 		pidgin_retrieve_user_info(purple_account_get_connection(ar->account), ar->username);
 		return TRUE;
 	}
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
index 627624fcab..67447a85db 100644
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -2080,7 +2080,7 @@ pidgin_blist_sound_method_pref_cb(const char *name, PurplePrefType type,
 {
 	gboolean sensitive = TRUE;
 
-	if(!strcmp(value, "none"))
+	if(purple_strequal(value, "none"))
 		sensitive = FALSE;
 
 	gtk_widget_set_sensitive(gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Mute Sounds")), sensitive);
@@ -2102,7 +2102,7 @@ add_buddies_from_vcard(const char *prpl_id, PurpleGroup *group, GList *list,
 		gc = (PurpleConnection *)l->data;
 		account = purple_connection_get_account(gc);
 
-		if (!strcmp(purple_account_get_protocol_id(account), prpl_id))
+		if (purple_strequal(purple_account_get_protocol_id(account), prpl_id))
 			break;
 
 		account = NULL;
@@ -2166,21 +2166,21 @@ parse_vcard(const char *vcard, PurpleGroup *group)
 		if (*s == '\n') *s++ = '\0';
 
 		/* We only want to worry about a few fields here. */
-		if (!strcmp(field, "FN"))
+		if (purple_strequal(field, "FN"))
 			alias = g_strdup(value);
-		else if (!strcmp(field, "X-AIM") || !strcmp(field, "X-ICQ") ||
-				 !strcmp(field, "X-JABBER"))
+		else if (purple_strequal(field, "X-AIM") || purple_strequal(field, "X-ICQ") ||
+				 purple_strequal(field, "X-JABBER"))
 		{
 			char **values = g_strsplit(value, ":", 0);
 			char **im;
 
 			for (im = values; *im != NULL; im++)
 			{
-				if (!strcmp(field, "X-AIM"))
+				if (purple_strequal(field, "X-AIM"))
 					aims = g_list_append(aims, g_strdup(*im));
-				else if (!strcmp(field, "X-ICQ"))
+				else if (purple_strequal(field, "X-ICQ"))
 					icqs = g_list_append(icqs, g_strdup(*im));
-				else if (!strcmp(field, "X-JABBER"))
+				else if (purple_strequal(field, "X-JABBER"))
 					jabbers = g_list_append(jabbers, g_strdup(*im));
 			}
 
@@ -3323,10 +3323,10 @@ static char *get_mood_icon_path(const char *mood)
 {
 	char *path;
 
-	if (!strcmp(mood, "busy")) {
+	if (purple_strequal(mood, "busy")) {
 		path = g_build_filename(DATADIR, "pixmaps", "pidgin",
 		                        "status", "16", "busy.png", NULL);
-	} else if (!strcmp(mood, "hiptop")) {
+	} else if (purple_strequal(mood, "hiptop")) {
 		path = g_build_filename(DATADIR, "pixmaps", "pidgin",
 		                        "emblems", "16", "hiptop.png", NULL);
 	} else {
@@ -3552,7 +3552,7 @@ set_mood_cb(GtkWidget *widget, PurpleAccount *account)
 				path, (gpointer)mood->mood);
 		g_free(path);
 
-		if (current_mood && !strcmp(current_mood, mood->mood))
+		if (current_mood && purple_strequal(current_mood, mood->mood))
 			purple_request_field_list_add_selected(f, _(mood->description));
 	}
 	purple_request_field_group_add_field(g, f);
@@ -4852,7 +4852,7 @@ static void _prefs_change_redo_list(const char *name, PurplePrefType type,
 static void _prefs_change_sort_method(const char *pref_name, PurplePrefType type,
 									  gconstpointer val, gpointer data)
 {
-	if(!strcmp(pref_name, PIDGIN_PREFS_ROOT "/blist/sort_type"))
+	if(purple_strequal(pref_name, PIDGIN_PREFS_ROOT "/blist/sort_type"))
 		pidgin_blist_sort_method_set(val);
 }
 
@@ -5955,8 +5955,8 @@ static void pidgin_blist_show(PurpleBuddyList *list)
 	gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(gtkblist->treeview),
 			pidgin_blist_search_equal_func, NULL, NULL);
 
-	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), 
-		pidgin_make_scrollable(gtkblist->treeview, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC, GTK_SHADOW_NONE, -1, -1), 
+	gtk_box_pack_start(GTK_BOX(gtkblist->vbox),
+		pidgin_make_scrollable(gtkblist->treeview, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC, GTK_SHADOW_NONE, -1, -1),
 		TRUE, TRUE, 0);
 
 	sep = gtk_hseparator_new();
@@ -6006,7 +6006,7 @@ static void pidgin_blist_show(PurpleBuddyList *list)
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show/Protocol Icons"))),
 			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons"));
 
-	if(!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"), "none"))
+	if(purple_strequal(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"), "none"))
 		gtk_widget_set_sensitive(gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Mute Sounds")), FALSE);
 
 	/* Update some dynamic things */
@@ -7634,7 +7634,7 @@ void pidgin_blist_sort_method_unreg(const char *id)
 
 	while(l) {
 		struct pidgin_blist_sort_method *method = l->data;
-		if(!strcmp(method->id, id)) {
+		if(purple_strequal(method->id, id)) {
 			pidgin_blist_sort_methods = g_list_delete_link(pidgin_blist_sort_methods, l);
 			g_free(method->id);
 			g_free(method->name);
@@ -7661,7 +7661,7 @@ void pidgin_blist_sort_method_set(const char *id){
 		pidgin_blist_sort_method_set("none");
 		return;
 	}
-	if (!strcmp(id, "none")) {
+	if (purple_strequal(id, "none")) {
 		redo_buddy_list(purple_get_blist(), TRUE, FALSE);
 	} else {
 		redo_buddy_list(purple_get_blist(), FALSE, FALSE);
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
index 79e3140951..191d331de7 100644
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -1609,7 +1609,7 @@ create_chat_menu(PurpleConversation *conv, const char *who, PurpleConnection *gc
 	if (menu)
 		gtk_widget_destroy(menu);
 
-	if (!strcmp(chat->nick, purple_normalize(conv->account, who)))
+	if (purple_strequal(chat->nick, purple_normalize(conv->account, who)))
 		is_me = TRUE;
 
 	menu = gtk_menu_new();
@@ -3157,7 +3157,7 @@ sound_method_pref_changed_cb(const char *name, PurplePrefType type,
 	PidginWindow *win = data;
 	const char *method = value;
 
-	if (!strcmp(method, "none"))
+	if (purple_strequal(method, "none"))
 	{
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.sounds),
 		                               FALSE);
@@ -3540,7 +3540,7 @@ setup_menubar(PidginWindow *win)
 		gtk_item_factory_get_widget(win->menu.item_factory,
 		                            N_("/Options/Enable Sounds"));
 	method = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method");
-	if (method != NULL && !strcmp(method, "none"))
+	if (method != NULL && purple_strequal(method, "none"))
 	{
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.sounds),
 		                               FALSE);
@@ -4019,7 +4019,7 @@ add_chat_buddy_common(PurpleConversation *conv, PurpleConvChatBuddy *cb, const c
 
 	stock = get_chat_buddy_status_icon(chat, name, flags);
 
-	if (!strcmp(chat->nick, purple_normalize(conv->account, old_name != NULL ? old_name : name)))
+	if (purple_strequal(chat->nick, purple_normalize(conv->account, old_name != NULL ? old_name : name)))
 		is_me = TRUE;
 
 	is_buddy = cb->buddy;
@@ -4414,7 +4414,7 @@ update_chat_alias(PurpleBuddy *buddy, PurpleConversation *conv, PurpleConnection
 
 		gtk_tree_model_get(model, &iter, CHAT_USERS_NAME_COLUMN, &name, -1);
 
-		if (!strcmp(normalized_name, purple_normalize(conv->account, name))) {
+		if (purple_strequal(normalized_name, purple_normalize(conv->account, name))) {
 			const char *alias = name;
 			char *tmp;
 			char *alias_key = NULL;
@@ -4517,7 +4517,7 @@ buddy_cb_common(PurpleBuddy *buddy, PurpleConversation *conv, gboolean is_buddy)
 
 		gtk_tree_model_get(model, &iter, CHAT_USERS_NAME_COLUMN, &name, -1);
 
-		if (!strcmp(normalized_name, purple_normalize(conv->account, name))) {
+		if (purple_strequal(normalized_name, purple_normalize(conv->account, name))) {
 			gtk_list_store_set(GTK_LIST_STORE(model), &iter,
 			                   CHAT_USERS_WEIGHT_COLUMN, is_buddy ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL, -1);
 			g_free(name);
@@ -4820,7 +4820,7 @@ setup_chat_userlist(PidginConversation *gtkconv, GtkWidget *hpaned)
 
 	gtkchat->list = list;
 
-	gtk_box_pack_start(GTK_BOX(lbox), 
+	gtk_box_pack_start(GTK_BOX(lbox),
 		pidgin_make_scrollable(list, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC, GTK_SHADOW_IN, -1, -1),
 		TRUE, TRUE, 0);
 }
@@ -6404,7 +6404,7 @@ pidgin_conv_custom_smiley_add(PurpleConversation *conv, const char *smile, gbool
 	gtkconv = PIDGIN_CONVERSATION(conv);
 
 	for (list = (struct smiley_list *)current_smiley_theme->list; list; list = list->next) {
-		if (!strcmp(list->sml, conv_sml)) {
+		if (purple_strequal(list->sml, conv_sml)) {
 			sml = list->sml;
 			break;
 		}
@@ -10055,7 +10055,7 @@ get_conv_placement_data(const char *id)
 
 	for (n = conv_placement_fncs; n; n = n->next) {
 		data = n->data;
-		if (!strcmp(data->id, id))
+		if (purple_strequal(data->id, id))
 			return data;
 	}
 
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
index 3d1dc18535..407e20a6f9 100644
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -946,31 +946,31 @@ pidgin_dialogs_ee(const char *ee)
 	gchar *norm = purple_strreplace(ee, "rocksmyworld", "");
 
 	label = gtk_label_new(NULL);
-	if (!strcmp(norm, "zilding"))
+	if (purple_strequal(norm, "zilding"))
 		gtk_label_set_markup(GTK_LABEL(label),
 				     "<span weight=\"bold\" size=\"large\" foreground=\"purple\">Amazing!  Simply Amazing!</span>");
-	else if (!strcmp(norm, "robflynn"))
+	else if (purple_strequal(norm, "robflynn"))
 		gtk_label_set_markup(GTK_LABEL(label),
 				     "<span weight=\"bold\" size=\"large\" foreground=\"#1f6bad\">Pimpin\' Penguin Style! *Waddle Waddle*</span>");
-	else if (!strcmp(norm, "flynorange"))
+	else if (purple_strequal(norm, "flynorange"))
 		gtk_label_set_markup(GTK_LABEL(label),
 				      "<span weight=\"bold\" size=\"large\" foreground=\"blue\">You should be me.  I'm so cute!</span>");
-	else if (!strcmp(norm, "ewarmenhoven"))
+	else if (purple_strequal(norm, "ewarmenhoven"))
 		gtk_label_set_markup(GTK_LABEL(label),
 				     "<span weight=\"bold\" size=\"large\" foreground=\"orange\">Now that's what I like!</span>");
-	else if (!strcmp(norm, "markster97"))
+	else if (purple_strequal(norm, "markster97"))
 		gtk_label_set_markup(GTK_LABEL(label),
 				     "<span weight=\"bold\" size=\"large\" foreground=\"brown\">Ahh, and excellent choice!</span>");
-	else if (!strcmp(norm, "seanegn"))
+	else if (purple_strequal(norm, "seanegn"))
 		gtk_label_set_markup(GTK_LABEL(label),
 				     "<span weight=\"bold\" size=\"large\" foreground=\"#009900\">Everytime you click my name, an angel gets its wings.</span>");
-	else if (!strcmp(norm, "chipx86"))
+	else if (purple_strequal(norm, "chipx86"))
 		gtk_label_set_markup(GTK_LABEL(label),
 				     "<span weight=\"bold\" size=\"large\" foreground=\"red\">This sunflower seed taste like pizza.</span>");
-	else if (!strcmp(norm, "markdoliner"))
+	else if (purple_strequal(norm, "markdoliner"))
 		gtk_label_set_markup(GTK_LABEL(label),
 				     "<span weight=\"bold\" size=\"large\" foreground=\"#6364B1\">Hey!  I was in that tumbleweed!</span>");
-	else if (!strcmp(norm, "lschiere"))
+	else if (purple_strequal(norm, "lschiere"))
 		gtk_label_set_markup(GTK_LABEL(label),
 				     "<span weight=\"bold\" size=\"large\" foreground=\"gray\">I'm not anything.</span>");
 	g_free(norm);
diff --git a/pidgin/gtkdocklet.c b/pidgin/gtkdocklet.c
index bbf997bc63..ef11fdf36b 100644
--- a/pidgin/gtkdocklet.c
+++ b/pidgin/gtkdocklet.c
@@ -125,7 +125,7 @@ docklet_update_status(void)
 	/* determine if any ims have unseen messages */
 	convs = get_pending_list(DOCKLET_TOOLTIP_LINE_LIMIT);
 
-	if (!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/docklet/show"), "pending")) {
+	if (purple_strequal(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/docklet/show"), "pending")) {
 		if (convs && ui_ops->create && !visible) {
 			g_list_free(convs);
 			ui_ops->create();
@@ -285,7 +285,7 @@ docklet_show_pref_changed_cb(const char *name, PurplePrefType type,
 			     gconstpointer value, gpointer data)
 {
 	const char *val = value;
-	if (!strcmp(val, "always")) {
+	if (purple_strequal(val, "always")) {
 		if (ui_ops->create) {
 			if (!visible)
 				ui_ops->create();
@@ -294,7 +294,7 @@ docklet_show_pref_changed_cb(const char *name, PurplePrefType type,
 				visibility_manager = TRUE;
 			}
 		}
-	} else if (!strcmp(val, "never")) {
+	} else if (purple_strequal(val, "never")) {
 		if (visible && ui_ops->destroy)
 			ui_ops->destroy();
 	} else {
@@ -426,7 +426,7 @@ activate_status_account_cb(GtkMenuItem *menuitem, gpointer user_data)
 				if (sub) {
 					const PurpleStatusType *sub_type = purple_savedstatus_substatus_get_type(sub);
 					const char *subtype_status_id = purple_status_type_get_id(sub_type);
-					if (subtype_status_id && !strcmp(subtype_status_id,
+					if (subtype_status_id && purple_strequal(subtype_status_id,
 							purple_status_type_get_id(status_type)))
 						found = TRUE;
 				}
@@ -727,7 +727,7 @@ docklet_menu(void)
 
 	menuitem = gtk_check_menu_item_new_with_mnemonic(_("Mute _Sounds"));
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/sound/mute"));
-	if (!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"), "none"))
+	if (purple_strequal(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"), "none"))
 		gtk_widget_set_sensitive(GTK_WIDGET(menuitem), FALSE);
 	g_signal_connect(G_OBJECT(menuitem), "toggled", G_CALLBACK(docklet_toggle_mute), NULL);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -844,7 +844,7 @@ pidgin_docklet_init()
 				    docklet_show_pref_changed_cb, NULL);
 
 	docklet_ui_init();
-	if (!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/docklet/show"), "always") && ui_ops && ui_ops->create)
+	if (purple_strequal(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/docklet/show"), "always") && ui_ops && ui_ops->create)
 		ui_ops->create();
 
 	purple_signal_connect(conn_handle, "signed-on",
diff --git a/pidgin/gtkimhtml.c b/pidgin/gtkimhtml.c
index b26386dc88..f2f5818606 100644
--- a/pidgin/gtkimhtml.c
+++ b/pidgin/gtkimhtml.c
@@ -1382,9 +1382,9 @@ imhtml_paste_cb(GtkIMHtml *imhtml, const char *str)
 	if (!gtk_text_view_get_editable(GTK_TEXT_VIEW(imhtml)))
 		return;
 
-	if (!str || !*str || !strcmp(str, "html"))
+	if (!str || !*str || purple_strequal(str, "html"))
 		g_signal_emit_by_name(imhtml, "paste_clipboard");
-	else if (!strcmp(str, "text"))
+	else if (purple_strequal(str, "text"))
 		paste_unformatted_cb(NULL, imhtml);
 }
 
@@ -4054,7 +4054,7 @@ gboolean gtk_imhtml_search_find(GtkIMHtml *imhtml, const gchar *text)
 
 	start_mark = gtk_text_buffer_get_mark(imhtml->text_buffer, "search");
 
-	if (start_mark && imhtml->search_string && !strcmp(text, imhtml->search_string))
+	if (start_mark && imhtml->search_string && purple_strequal(text, imhtml->search_string))
 		new_search = FALSE;
 
 	if (new_search) {
diff --git a/pidgin/gtkimhtmltoolbar.c b/pidgin/gtkimhtmltoolbar.c
index e6d6f7652b..a192e766ff 100644
--- a/pidgin/gtkimhtmltoolbar.c
+++ b/pidgin/gtkimhtmltoolbar.c
@@ -704,7 +704,7 @@ smiley_is_unique(GSList *list, GtkIMHtmlSmiley *smiley)
 {
 	while (list) {
 		GtkIMHtmlSmiley *cur = (GtkIMHtmlSmiley *) list->data;
-		if (!strcmp(cur->file, smiley->file))
+		if (purple_strequal(cur->file, smiley->file))
 			return FALSE;
 		list = list->next;
 	}
diff --git a/pidgin/gtklog.c b/pidgin/gtklog.c
index 03eafea121..cf30e4462f 100644
--- a/pidgin/gtklog.c
+++ b/pidgin/gtklog.c
@@ -82,7 +82,7 @@ static gboolean log_viewer_equal(gconstpointer y, gconstpointer z)
 
 	normal = g_strdup(purple_normalize(a->account, a->buddyname));
 	ret = (a->account == b->account) &&
-		!strcmp(normal, purple_normalize(b->account, b->buddyname));
+		purple_strequal(normal, purple_normalize(b->account, b->buddyname));
 	g_free(normal);
 
 	return ret;
@@ -135,7 +135,7 @@ static void search_cb(GtkWidget *button, PidginLogViewer *lv)
 		return;
 	}
 
-	if (lv->search != NULL && !strcmp(lv->search, search_term))
+	if (lv->search != NULL && purple_strequal(lv->search, search_term))
 	{
 		/* Searching for the same term acts as "Find Next" */
 		gtk_imhtml_search_find(GTK_IMHTML(lv->imhtml), lv->search);
@@ -620,7 +620,7 @@ static PidginLogViewer *display_log_viewer(struct log_viewer_hash_t *ht, GList *
 	col = gtk_tree_view_column_new_with_attributes ("time", rend, "markup", 0, NULL);
 	gtk_tree_view_append_column (GTK_TREE_VIEW(lv->treeview), col);
 	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (lv->treeview), FALSE);
-	gtk_paned_add1(GTK_PANED(pane), 
+	gtk_paned_add1(GTK_PANED(pane),
 		pidgin_make_scrollable(lv->treeview, GTK_POLICY_NEVER, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, -1, -1));
 
 	populate_log_tree(lv);
diff --git a/pidgin/gtknotify.c b/pidgin/gtknotify.c
index 2bf9b907dd..f1e1bae736 100644
--- a/pidgin/gtknotify.c
+++ b/pidgin/gtknotify.c
@@ -1308,8 +1308,8 @@ pidgin_notify_uri(const char *uri)
 	} else if (purple_running_osx() == TRUE) {
 		argv = g_slist_append(argv, "open");
 		argv = g_slist_append(argv, uri_escaped);
-	} else if (!strcmp(web_browser, "epiphany") ||
-		!strcmp(web_browser, "galeon"))
+	} else if (purple_strequal(web_browser, "epiphany") ||
+		purple_strequal(web_browser, "galeon"))
 	{
 		argv = g_slist_append(argv, (gpointer)web_browser);
 
@@ -1319,13 +1319,13 @@ pidgin_notify_uri(const char *uri)
 			argv = g_slist_append(argv, "-n");
 
 		argv = g_slist_append(argv, uri_escaped);
-	} else if (!strcmp(web_browser, "xdg-open")) {
+	} else if (purple_strequal(web_browser, "xdg-open")) {
 		argv = g_slist_append(argv, "xdg-open");
 		argv = g_slist_append(argv, uri_escaped);
-	} else if (!strcmp(web_browser, "gnome-open")) {
+	} else if (purple_strequal(web_browser, "gnome-open")) {
 		argv = g_slist_append(argv, "gnome-open");
 		argv = g_slist_append(argv, uri_escaped);
-	} else if (!strcmp(web_browser, "kfmclient")) {
+	} else if (purple_strequal(web_browser, "kfmclient")) {
 		argv = g_slist_append(argv, "kfmclient");
 		argv = g_slist_append(argv, "openURL");
 		argv = g_slist_append(argv, uri_escaped);
@@ -1333,10 +1333,10 @@ pidgin_notify_uri(const char *uri)
 		 * Does Konqueror have options to open in new tab
 		 * and/or current window?
 		 */
-	} else if (!strcmp(web_browser, "mozilla") ||
-		!strcmp(web_browser, "mozilla-firebird") ||
-		!strcmp(web_browser, "firefox") ||
-		!strcmp(web_browser, "seamonkey"))
+	} else if (purple_strequal(web_browser, "mozilla") ||
+		purple_strequal(web_browser, "mozilla-firebird") ||
+		purple_strequal(web_browser, "firefox") ||
+		purple_strequal(web_browser, "seamonkey"))
 	{
 		argv = g_slist_append(argv, (gpointer)web_browser);
 		argv = g_slist_append(argv, uri_escaped);
@@ -1365,7 +1365,7 @@ pidgin_notify_uri(const char *uri)
 			 * should probably be split apart from mozilla-firebird
 			 * and mozilla... but this is good for now.
 			 */
-			if (!strcmp(web_browser, "firefox")) {
+			if (purple_strequal(web_browser, "firefox")) {
 				argv_remote = g_slist_append(argv_remote, "-a");
 				argv_remote = g_slist_append(argv_remote,
 					"firefox");
@@ -1374,7 +1374,7 @@ pidgin_notify_uri(const char *uri)
 			argv_remote = g_slist_append(argv_remote, "-remote");
 			argv_remote = g_slist_append(argv_remote, uri_custom);
 		}
-	} else if (!strcmp(web_browser, "netscape")) {
+	} else if (purple_strequal(web_browser, "netscape")) {
 		argv = g_slist_append(argv, "netscape");
 		argv = g_slist_append(argv, uri_escaped);
 
@@ -1391,7 +1391,7 @@ pidgin_notify_uri(const char *uri)
 			argv_remote = g_slist_append(argv_remote, "-remote");
 			argv_remote = g_slist_append(argv_remote, uri_custom);
 		}
-	} else if (!strcmp(web_browser, "opera")) {
+	} else if (purple_strequal(web_browser, "opera")) {
 		argv = g_slist_append(argv, "opera");
 
 		if (place == PIDGIN_BROWSER_NEW_WINDOW)
@@ -1405,28 +1405,28 @@ pidgin_notify_uri(const char *uri)
 		 */
 
 		argv = g_slist_append(argv, uri_escaped);
-	} else if (!strcmp(web_browser, "google-chrome")) {
+	} else if (purple_strequal(web_browser, "google-chrome")) {
 		/* Google Chrome doesn't have command-line arguments that
 		 * control the opening of links from external calls. This is
 		 * controlled solely from a preference within Google Chrome.
 		 */
 		argv = g_slist_append(argv, "google-chrome");
 		argv = g_slist_append(argv, uri_escaped);
-	} else if (!strcmp(web_browser, "chrome")) {
+	} else if (purple_strequal(web_browser, "chrome")) {
 		/* Chromium doesn't have command-line arguments that control
 		 * the opening of links from external calls. This is controlled
 		 * solely from a preference within Chromium.
 		 */
 		argv = g_slist_append(argv, "chrome");
 		argv = g_slist_append(argv, uri_escaped);
-	} else if (!strcmp(web_browser, "chromium-browser")) {
+	} else if (purple_strequal(web_browser, "chromium-browser")) {
 		/* Chromium doesn't have command-line arguments that control the
 		 * opening of links from external calls. This is controlled
 		 * solely from a preference within Chromium.
 		 */
 		argv = g_slist_append(argv, "chromium-browser");
 		argv = g_slist_append(argv, uri_escaped);
-	} else if (!strcmp(web_browser, "custom")) {
+	} else if (purple_strequal(web_browser, "custom")) {
 		GError *error = NULL;
 		const char *usercmd_command;
 		gint usercmd_argc, i;
@@ -1712,7 +1712,7 @@ pidgin_create_notification_dialog(PidginNotifyType type)
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), 
+	gtk_box_pack_start(GTK_BOX(vbox),
 		pidgin_make_scrollable(spec_dialog->treeview, GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, -1, -1),
 		TRUE, TRUE, 2);
 
diff --git a/pidgin/gtkplugin.h b/pidgin/gtkplugin.h
index 8b07be4f12..ba4f350216 100644
--- a/pidgin/gtkplugin.h
+++ b/pidgin/gtkplugin.h
@@ -51,7 +51,7 @@ struct _PidginPluginUiInfo
 
 #define PIDGIN_IS_PIDGIN_PLUGIN(plugin) \
 	((plugin)->info != NULL && (plugin)->info->ui_info != NULL && \
-	 !strcmp((plugin)->info->ui_requirement, PIDGIN_PLUGIN_TYPE))
+	 purple_strequal((plugin)->info->ui_requirement, PIDGIN_PLUGIN_TYPE))
 
 #define PIDGIN_PLUGIN_UI_INFO(plugin) \
 	((PidginPluginUiInfo *)(plugin)->info->ui_info)
diff --git a/pidgin/gtkpounce.c b/pidgin/gtkpounce.c
index 99a1b5e623..baecaec4bb 100644
--- a/pidgin/gtkpounce.c
+++ b/pidgin/gtkpounce.c
@@ -315,7 +315,7 @@ save_pounce_cb(GtkWidget *w, PidginPounceDialog *dialog)
 		message = NULL;
 	}
 	if (*command == '\0') command = NULL;
-	if (*sound   == '\0' || !strcmp(sound, _("(default)"))) sound   = NULL;
+	if (*sound   == '\0' || purple_strequal(sound, _("(default)"))) sound   = NULL;
 
 	/* If the pounce has already been triggered, let's pretend it is a new one */
 	if (dialog->pounce != NULL
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
index 68117deffe..0db0ce80a1 100644
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -262,7 +262,7 @@ pidgin_prefs_dropdown_from_list(GtkWidget *box, const gchar *title,
 
 		if ((type == PURPLE_PREF_INT && stored_int == int_value) ||
 			(type == PURPLE_PREF_STRING && stored_str != NULL &&
-			 !strcmp(stored_str, str_value)) ||
+			 purple_strequal(stored_str, str_value)) ||
 			(type == PURPLE_PREF_BOOLEAN &&
 			 (purple_prefs_get_bool(key) == GPOINTER_TO_INT(menuitems->data)))) {
 
@@ -1890,11 +1890,11 @@ get_available_browsers(void)
 			browsers = g_list_prepend(browsers,
 									  possible_browsers[i].command);
 			browsers = g_list_prepend(browsers, (gpointer)_(possible_browsers[i].name));
-			if(browser_setting && !strcmp(possible_browsers[i].command, browser_setting))
+			if(browser_setting && purple_strequal(possible_browsers[i].command, browser_setting))
 				browser_setting = NULL;
 			/* If xdg-open is valid, prefer it over gnome-open and skip forward */
-			if(!strcmp(possible_browsers[i].command, "xdg-open")) {
-				if (browser_setting && !strcmp("gnome-open", browser_setting)) {
+			if(purple_strequal(possible_browsers[i].command, "xdg-open")) {
+				if (browser_setting && purple_strequal("gnome-open", browser_setting)) {
 					purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/browser", possible_browsers[i].command);
 					browser_setting = NULL;
 				}
@@ -1926,7 +1926,7 @@ browser_changed2_cb(const char *name, PurplePrefType type,
 	GtkWidget *hbox = data;
 	const char *browser = value;
 
-	gtk_widget_set_sensitive(hbox, !strcmp(browser, "custom"));
+	gtk_widget_set_sensitive(hbox, purple_strequal(browser, "custom"));
 }
 
 static GtkWidget *
@@ -1999,7 +1999,7 @@ browser_page(void)
 			gtk_size_group_add_widget(sg, label);
 			gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
-			if (!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/browser"), "custom"))
+			if (purple_strequal(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/browser"), "custom"))
 				gtk_widget_set_sensitive(hbox, FALSE);
 			purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/browsers/browser",
 										browser_changed1_cb, hbox);
@@ -2236,7 +2236,7 @@ sound_changed1_cb(const char *name, PurplePrefType type,
 	GtkWidget *hbox = data;
 	const char *method = value;
 
-	gtk_widget_set_sensitive(hbox, !strcmp(method, "custom"));
+	gtk_widget_set_sensitive(hbox, purple_strequal(method, "custom"));
 }
 
 static void
@@ -2259,9 +2259,9 @@ sound_changed3_cb(const char *name, PurplePrefType type,
 	const char *method = value;
 
 	gtk_widget_set_sensitive(hbox,
-			!strcmp(method, "automatic") ||
-			!strcmp(method, "alsa") ||
-			!strcmp(method, "esd"));
+			purple_strequal(method, "automatic") ||
+			purple_strequal(method, "alsa") ||
+			purple_strequal(method, "esd"));
 }
 #endif /* USE_GSTREAMER */
 
@@ -2440,7 +2440,7 @@ mute_changed_cb(const char *pref_name,
 	GtkToggleButton *button = data;
 	gboolean muted = GPOINTER_TO_INT(val);
 
-	g_return_if_fail(!strcmp (pref_name, PIDGIN_PREFS_ROOT "/sound/mute"));
+	g_return_if_fail(purple_strequal (pref_name, PIDGIN_PREFS_ROOT "/sound/mute"));
 
 	/* Block the handler that re-sets the preference. */
 	g_signal_handlers_block_matched(button, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, (gpointer)pref_name);
@@ -2509,7 +2509,7 @@ sound_page(void)
 	purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/sound/method",
 								sound_changed1_cb, hbox);
 	gtk_widget_set_sensitive(hbox,
-			!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"),
+			purple_strequal(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"),
 					"custom"));
 #endif /* _WIN32 */
 
diff --git a/pidgin/gtkrequest.c b/pidgin/gtkrequest.c
index f9309d9f3f..b87a394349 100644
--- a/pidgin/gtkrequest.c
+++ b/pidgin/gtkrequest.c
@@ -133,7 +133,7 @@ input_response_cb(GtkDialog *dialog, gint id, PidginRequestData *data)
 		gtk_text_buffer_get_start_iter(buffer, &start_iter);
 		gtk_text_buffer_get_end_iter(buffer, &end_iter);
 
-		if ((data->u.input.hint != NULL) && (!strcmp(data->u.input.hint, "html")))
+		if ((data->u.input.hint != NULL) && (purple_strequal(data->u.input.hint, "html")))
 			multiline_value = gtk_imhtml_get_markup(GTK_IMHTML(data->u.input.entry));
 		else
 			multiline_value = gtk_text_buffer_get_text(buffer, &start_iter, &end_iter,
@@ -289,7 +289,7 @@ destroy_multifield_cb(GtkWidget *dialog, GdkEvent *event,
 
 
 #define STOCK_ITEMIZE(r, l) \
-	if (!strcmp((r), text)) \
+	if (purple_strequal((r), text)) \
 		return (l);
 
 static const char *
@@ -403,7 +403,7 @@ pidgin_request_input(const char *title, const char *primary,
 
 	gtk_widget_show_all(hbox);
 
-	if ((data->u.input.hint != NULL) && (!strcmp(data->u.input.hint, "html"))) {
+	if ((data->u.input.hint != NULL) && (purple_strequal(data->u.input.hint, "html"))) {
 		GtkWidget *frame;
 
 		/* imhtml */
@@ -435,7 +435,7 @@ pidgin_request_input(const char *title, const char *primary,
 			if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/spellcheck"))
 				pidgin_setup_gtkspell(GTK_TEXT_VIEW(entry));
 
-			gtk_box_pack_start(GTK_BOX(vbox), 
+			gtk_box_pack_start(GTK_BOX(vbox),
 				pidgin_make_scrollable(entry, GTK_POLICY_NEVER, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, 320, 130),
 				TRUE, TRUE, 0);
 		}
@@ -820,7 +820,7 @@ setup_entry_field(GtkWidget *entry, PurpleRequestField *field)
 					}
 				}
 			}
-			pidgin_setup_screenname_autocomplete_with_filter(entry, optmenu, pidgin_screenname_autocomplete_default_filter, GINT_TO_POINTER(!strcmp(type_hint, "screenname-all")));
+			pidgin_setup_screenname_autocomplete_with_filter(entry, optmenu, pidgin_screenname_autocomplete_default_filter, GINT_TO_POINTER(purple_strequal(type_hint, "screenname-all")));
 		}
 	}
 }
@@ -1260,8 +1260,8 @@ pidgin_request_fields(const char *title, const char *primary,
 		GtkWidget *hbox_for_spacing, *vbox_for_spacing;
 
 		hbox_for_spacing = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
-		gtk_box_pack_start(GTK_BOX(vbox), 
-			pidgin_make_scrollable(hbox_for_spacing, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC, GTK_SHADOW_NONE, -1, 200), 
+		gtk_box_pack_start(GTK_BOX(vbox),
+			pidgin_make_scrollable(hbox_for_spacing, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC, GTK_SHADOW_NONE, -1, 200),
 			TRUE, TRUE, 0);
 		gtk_widget_show(hbox_for_spacing);
 
diff --git a/pidgin/gtksavedstatuses.c b/pidgin/gtksavedstatuses.c
index 923d42188e..d8310ade9f 100644
--- a/pidgin/gtksavedstatuses.c
+++ b/pidgin/gtksavedstatuses.c
@@ -156,7 +156,7 @@ status_window_find_savedstatus(GtkTreeIter *iter, const char *title)
 
 	do {
 		gtk_tree_model_get(model, iter, STATUS_WINDOW_COLUMN_TITLE, &cur, -1);
-		if (!strcmp(title, cur))
+		if (purple_strequal(title, cur))
 		{
 			g_free(cur);
 			return TRUE;
@@ -1185,7 +1185,7 @@ pidgin_status_editor_show(gboolean edit, PurpleSavedStatus *saved_status)
 	dialog->treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(dialog->model));
 	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(dialog->treeview), TRUE);
 	gtk_widget_set_size_request(dialog->treeview, -1, 150);
-	gtk_box_pack_start(GTK_BOX(dbox), 
+	gtk_box_pack_start(GTK_BOX(dbox),
 		pidgin_make_scrollable(dialog->treeview, GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, -1, -1),
 		TRUE, TRUE, 0);
 
@@ -1531,7 +1531,7 @@ edit_substatus(StatusEditor *status_editor, PurpleAccount *account)
 						   STATUS_COLUMN_STATUS_ID, id,
 						   STATUS_COLUMN_STATUS_NAME, name,
 						   -1);
-		if ((status_id != NULL) && !strcmp(status_id, id))
+		if ((status_id != NULL) && purple_strequal(status_id, id))
 		{
 			gtk_combo_box_set_active_iter(GTK_COMBO_BOX(combo), &iter);
 			select = TRUE;
diff --git a/pidgin/gtksound.c b/pidgin/gtksound.c
index 6bd228213b..135b4c8ff4 100644
--- a/pidgin/gtksound.c
+++ b/pidgin/gtksound.c
@@ -445,9 +445,9 @@ pidgin_sound_play_file(const char *filename)
 
 	method = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method");
 
-	if (!strcmp(method, "none")) {
+	if (purple_strequal(method, "none")) {
 		return;
-	} else if (!strcmp(method, "beep")) {
+	} else if (purple_strequal(method, "beep")) {
 		gdk_beep();
 		return;
 	}
@@ -458,7 +458,7 @@ pidgin_sound_play_file(const char *filename)
 	}
 
 #ifndef _WIN32
-	if (!strcmp(method, "custom")) {
+	if (purple_strequal(method, "custom")) {
 		const char *sound_cmd;
 		char *command;
 		char *esc_filename;
@@ -511,13 +511,13 @@ pidgin_sound_play_file(const char *filename)
 	if (gst_init_failed)  /* Perhaps do gdk_beep instead? */
 		return;
 	volume = (float)(CLAMP(purple_prefs_get_int(PIDGIN_PREFS_ROOT "/sound/volume"),0,100)) / 50;
-	if (!strcmp(method, "automatic")) {
+	if (purple_strequal(method, "automatic")) {
 		sink = gst_element_factory_make("gconfaudiosink", "sink");
 	}
 #ifndef _WIN32
-	else if (!strcmp(method, "esd")) {
+	else if (purple_strequal(method, "esd")) {
 		sink = gst_element_factory_make("esdsink", "sink");
-	} else if (!strcmp(method, "alsa")) {
+	} else if (purple_strequal(method, "alsa")) {
 		sink = gst_element_factory_make("alsasink", "sink");
 	}
 #endif
diff --git a/pidgin/gtkstatusbox.c b/pidgin/gtkstatusbox.c
index 58c9ef0a60..58da98ded5 100644
--- a/pidgin/gtkstatusbox.c
+++ b/pidgin/gtkstatusbox.c
@@ -883,7 +883,7 @@ status_menu_refresh_iter(PidginStatusBox *status_box, gboolean status_changed)
 							TEXT_COLUMN, &name, -1);
 
 					if (!purple_savedstatus_has_substatuses(saved_status)
-						|| !strcmp(name, acct_status_name))
+						|| purple_strequal(name, acct_status_name))
 					{
 						/* Found! */
 						path = gtk_tree_model_get_path(GTK_TREE_MODEL(status_box->dropdown_store), &iter);
diff --git a/pidgin/gtkthemes.c b/pidgin/gtkthemes.c
index d15040406a..3a95d563b8 100644
--- a/pidgin/gtkthemes.c
+++ b/pidgin/gtkthemes.c
@@ -99,7 +99,7 @@ void pidgin_themes_remove_smiley_theme(const char *file)
 		/* Find theme in themes list and remove it */
 		for (iter = smiley_themes ; iter ; iter = iter->next) {
 			theme = ((struct smiley_theme *)(iter->data));
-			if (!strcmp(theme->path, file))
+			if (purple_strequal(theme->path, file))
 				break ;
 		}
 		if (iter) {
@@ -129,7 +129,7 @@ static void _pidgin_themes_smiley_themeize(GtkWidget *imhtml, gboolean custom)
 	gtk_imhtml_remove_smileys(GTK_IMHTML(imhtml));
 	list = current_smiley_theme->list;
 	while (list) {
-		char *sml = !strcmp(list->sml, "default") ? NULL : list->sml;
+		char *sml = purple_strequal(list->sml, "default") ? NULL : list->sml;
 		GSList *icons = list->smileys;
 		while (icons) {
 			gtk_imhtml_associate_smiley(GTK_IMHTML(imhtml), sml, icons->data);
@@ -236,7 +236,7 @@ void pidgin_themes_load_smiley_theme(const char *file, gboolean load)
 
 	while (lst) {
 		struct smiley_theme *thm = lst->data;
-		if (!strcmp(thm->path, file)) {
+		if (purple_strequal(thm->path, file)) {
 			theme = thm;
 			break;
 		}
@@ -440,9 +440,9 @@ GSList *pidgin_themes_get_proto_smileys(const char *id) {
 	proto = purple_find_prpl(id);
 
 	while (list) {
-		if (!strcmp(list->sml, "default"))
+		if (purple_strequal(list->sml, "default"))
 			def = list;
-		else if (proto && !strcmp(proto->info->name, list->sml))
+		else if (proto && purple_strequal(proto->info->name, list->sml))
 			break;
 
 		list = list->next;
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
index 18cf6b4fb1..33f18562d0 100644
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -727,7 +727,7 @@ create_protocols_menu(const char *default_proto_id)
 		if (pixbuf)
 			g_object_unref(pixbuf);
 
-		if (default_proto_id != NULL && !strcmp(plugin->info->id, default_proto_id))
+		if (default_proto_id != NULL && purple_strequal(plugin->info->id, default_proto_id))
 			aop_menu->default_item = i;
 	}
 
@@ -1136,15 +1136,15 @@ pidgin_parse_x_im_contact(const char *msg, gboolean all_accounts,
 
 				protoname = prpl_info->list_icon(account, NULL);
 
-				if (!strcmp(protoname, protocol))
+				if (purple_strequal(protoname, protocol))
 					break;
 
 				account = NULL;
 			}
 
 			/* Special case for AIM and ICQ */
-			if (account == NULL && (!strcmp(protocol, "aim") ||
-									!strcmp(protocol, "icq")))
+			if (account == NULL && (purple_strequal(protocol, "aim") ||
+									purple_strequal(protocol, "icq")))
 			{
 				for (l = list; l != NULL; l = l->next)
 				{
@@ -1178,7 +1178,7 @@ pidgin_parse_x_im_contact(const char *msg, gboolean all_accounts,
 
 					protoname = prpl_info->list_icon(account, NULL);
 
-					if (!strcmp(protoname, "aim") || !strcmp(protoname, "icq"))
+					if (purple_strequal(protoname, "aim") || purple_strequal(protoname, "icq"))
 						break;
 
 					account = NULL;
@@ -3531,7 +3531,7 @@ register_gnome_url_handlers(void)
 				{
 					g_free(err);
 					err = NULL;
-					if (!strcmp(tmp2, "false\n"))
+					if (purple_strequal(tmp2, "false\n"))
 					{
 						g_free(tmp2);
 						g_free(cmd);
diff --git a/pidgin/pidginstock.c b/pidgin/pidginstock.c
index bd50db6717..d8189b4f07 100644
--- a/pidgin/pidginstock.c
+++ b/pidgin/pidginstock.c
@@ -257,7 +257,7 @@ find_file(const char *dir, const char *base)
 	if (base == NULL)
 		return NULL;
 
-	if (!strcmp(dir, "pidgin"))
+	if (purple_strequal(dir, "pidgin"))
 		filename = g_build_filename("pixmaps", "pidgin", base, NULL);
 	else
 		filename = g_build_filename("pixmaps", "pidgin", dir, base, NULL);
diff --git a/pidgin/plugins/cap/cap.c b/pidgin/plugins/cap/cap.c
index d5faffa23b..5b80972505 100644
--- a/pidgin/plugins/cap/cap.c
+++ b/pidgin/plugins/cap/cap.c
@@ -96,7 +96,7 @@ static double generate_prediction_for(PurpleBuddy *buddy) {
 
 	sta_id = purple_status_get_id(get_status_for(buddy));
 
-	if(sta_id && !strcmp(sta_id, "offline")) {
+	if(sta_id && purple_strequal(sta_id, "offline")) {
 		/* This is kind of stupid, change it. */
 		if(prediction == 1.0f)
 			prediction = 0.0f;
diff --git a/pidgin/plugins/crazychat/cc_features.c b/pidgin/plugins/crazychat/cc_features.c
index 0b8a800ca6..27781b7348 100644
--- a/pidgin/plugins/crazychat/cc_features.c
+++ b/pidgin/plugins/crazychat/cc_features.c
@@ -347,9 +347,9 @@ static gboolean mydraw(GtkWidget *widget, GdkEventExpose *event,
 	struct cc_features *features = &instance->face;
 
 	char *string = gtk_entry_get_text(GTK_COMBO(instance->model)->entry);
-	if (!strcmp(string, "Dog")) {
+	if (purple_strequal(string, "Dog")) {
 		features->kind = 0;
-	} else if (!strcmp(string, "Shark")) {
+	} else if (purple_strequal(string, "Shark")) {
 		features->kind = 1;
 	}
 
@@ -488,17 +488,17 @@ static void destroy_cb(GtkWidget *widget, struct crazychat *cc)
 static void material_set(GtkWidget *entry, guint8 *material)
 {
 	char *string = gtk_entry_get_text(GTK_ENTRY(entry));
-	if (!strcmp(string, "Red")) {
+	if (purple_strequal(string, "Red")) {
 		*material = 0;
-	} else if (!strcmp(string, "Dark Brown")) {
+	} else if (purple_strequal(string, "Dark Brown")) {
 		*material = 1;
-	} else if (!strcmp(string, "Light Brown")) {
+	} else if (purple_strequal(string, "Light Brown")) {
 		*material = 2;
-	} else if (!strcmp(string, "White")) {
+	} else if (purple_strequal(string, "White")) {
 		*material = 3;
-	} else if (!strcmp(string, "Green")) {
+	} else if (purple_strequal(string, "Green")) {
 		*material = 4;
-	} else if (!strcmp(string, "Black")) {
+	} else if (purple_strequal(string, "Black")) {
 		*material = 5;
 	}
 }
diff --git a/pidgin/plugins/crazychat/glm.c b/pidgin/plugins/crazychat/glm.c
index 28c117ce47..ffcc94df60 100644
--- a/pidgin/plugins/crazychat/glm.c
+++ b/pidgin/plugins/crazychat/glm.c
@@ -160,7 +160,7 @@ glmFindGroup(GLMmodel* model, char* name)
 
   group = model->groups;
   while(group) {
-    if (!strcmp(name, group->name))
+    if (purple_strequal(name, group->name))
       break;
     group = group->next;
   }
@@ -200,7 +200,7 @@ glmFindMaterial(GLMmodel* model, char* name)
   /* XXX doing a linear search on a string key'd list is pretty lame,
      but it works and is fast enough for now. */
   for (i = 0; i < model->nummaterials; i++) {
-    if (!strcmp(model->materials[i].name, name))
+    if (purple_strequal(model->materials[i].name, name))
       goto found;
   }
 
diff --git a/pidgin/plugins/gevolution/add_buddy_dialog.c b/pidgin/plugins/gevolution/add_buddy_dialog.c
index 1404f94657..e2c20f2959 100644
--- a/pidgin/plugins/gevolution/add_buddy_dialog.c
+++ b/pidgin/plugins/gevolution/add_buddy_dialog.c
@@ -174,7 +174,7 @@ add_ims(GevoAddBuddyDialog *dialog, EContact *contact, const char *name,
 
 		account = purple_connection_get_account(gc);
 
-		if (!strcmp(purple_account_get_protocol_id(account), id))
+		if (purple_strequal(purple_account_get_protocol_id(account), id))
 			break;
 
 		account = NULL;
@@ -204,10 +204,10 @@ add_ims(GevoAddBuddyDialog *dialog, EContact *contact, const char *name,
 						   COLUMN_DATA, contact,
 						   -1);
 
-		if (!strcmp(purple_account_get_protocol_id(account),
+		if (purple_strequal(purple_account_get_protocol_id(account),
 					purple_account_get_protocol_id(dialog->account)) &&
 			dialog->username != NULL &&
-			!strcmp(account_name, dialog->username))
+			purple_strequal(account_name, dialog->username))
 		{
 			GtkTreeSelection *selection;
 
@@ -508,8 +508,8 @@ gevo_add_buddy_dialog_show(PurpleAccount *account, const char *username,
 	dialog->treeview =
 		gtk_tree_view_new_with_model(GTK_TREE_MODEL(dialog->model));
 	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(dialog->treeview), TRUE);
-	gtk_box_pack_start(GTK_BOX(vbox), 
-		pidgin_make_scrollable(dialog->treeview, GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, -1, -1), 
+	gtk_box_pack_start(GTK_BOX(vbox),
+		pidgin_make_scrollable(dialog->treeview, GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, -1, -1),
 		TRUE, TRUE, 0);
 	gtk_widget_show(dialog->treeview);
 
diff --git a/pidgin/plugins/gevolution/assoc-buddy.c b/pidgin/plugins/gevolution/assoc-buddy.c
index cbe5f908f8..349a7ae9ea 100644
--- a/pidgin/plugins/gevolution/assoc-buddy.c
+++ b/pidgin/plugins/gevolution/assoc-buddy.c
@@ -218,7 +218,7 @@ populate_treeview(GevoAssociateBuddyDialog *dialog, const gchar *uri)
 
 			for (l = ims; l != NULL; l = l->next)
 			{
-				if (!strcmp(l->data, dialog->buddy->name))
+				if (purple_strequal(l->data, dialog->buddy->name))
 				{
 					GtkTreeSelection *selection;
 
@@ -430,7 +430,7 @@ gevo_associate_buddy_dialog_new(PurpleBuddy *buddy)
 
 	/* Textview */
 	dialog->imhtml = gtk_imhtml_new(NULL, NULL);
-	gtk_container_add(GTK_CONTAINER(expander), 
+	gtk_container_add(GTK_CONTAINER(expander),
 		pidgin_make_scrollable(dialog->imhtml, GTK_POLICY_NEVER, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, -1, -1));
 	gtk_widget_show(dialog->imhtml);
 
diff --git a/pidgin/plugins/gevolution/gevo-util.c b/pidgin/plugins/gevolution/gevo-util.c
index 914f79e1d8..c122392889 100644
--- a/pidgin/plugins/gevolution/gevo-util.c
+++ b/pidgin/plugins/gevolution/gevo-util.c
@@ -99,15 +99,15 @@ gevo_prpl_get_field(PurpleAccount *account, PurpleBuddy *buddy)
 
 	protocol_id = purple_account_get_protocol_id(account);
 
-	if (!strcmp(protocol_id, "prpl-aim"))
+	if (purple_strequal(protocol_id, "prpl-aim"))
 		protocol_field = E_CONTACT_IM_AIM;
-	else if (!strcmp(protocol_id, "prpl-icq"))
+	else if (purple_strequal(protocol_id, "prpl-icq"))
 		protocol_field = E_CONTACT_IM_ICQ;
-	else if (!strcmp(protocol_id, "prpl-jabber"))
+	else if (purple_strequal(protocol_id, "prpl-jabber"))
 		protocol_field = E_CONTACT_IM_JABBER;
-	else if (!strcmp(protocol_id, "prpl-novell"))
+	else if (purple_strequal(protocol_id, "prpl-novell"))
 		protocol_field = E_CONTACT_IM_GROUPWISE;
-	else if (!strcmp(protocol_id, "prpl-gg"))
+	else if (purple_strequal(protocol_id, "prpl-gg"))
 		protocol_field = E_CONTACT_IM_GADUGADU;
 
 	return protocol_field;
diff --git a/pidgin/plugins/gevolution/gevolution.c b/pidgin/plugins/gevolution/gevolution.c
index 439ef3c4c1..5cb12f8e09 100644
--- a/pidgin/plugins/gevolution/gevolution.c
+++ b/pidgin/plugins/gevolution/gevolution.c
@@ -100,7 +100,7 @@ update_ims_from_contact(EContact *contact, const char *name,
 		for (l2 = ims; l2 != NULL; l2 = l2->next)
 		{
 			if (purple_find_buddy(account, l2->data) != NULL ||
-				!strcmp(me, purple_normalize(account, l2->data)))
+				purple_strequal(me, purple_normalize(account, l2->data)))
 				continue;
 
 			gevo_add_buddy(account, _("Buddies"), l2->data, name);
diff --git a/pidgin/plugins/gevolution/new_person_dialog.c b/pidgin/plugins/gevolution/new_person_dialog.c
index 9d82771592..a24dae2a89 100644
--- a/pidgin/plugins/gevolution/new_person_dialog.c
+++ b/pidgin/plugins/gevolution/new_person_dialog.c
@@ -141,15 +141,15 @@ add_cb(GtkWidget *w, GevoNewPersonDialog *dialog)
 		if (*email)
 			e_contact_set(contact, E_CONTACT_EMAIL_1, (gpointer)email);
 
-		if (!strcmp(im_service, "prpl-aim"))
+		if (purple_strequal(im_service, "prpl-aim"))
 			field = E_CONTACT_IM_AIM;
-		else if (!strcmp(im_service, "prpl-icq"))
+		else if (purple_strequal(im_service, "prpl-icq"))
 			field = E_CONTACT_IM_ICQ;
-		else if (!strcmp(im_service, "prpl-jabber"))
+		else if (purple_strequal(im_service, "prpl-jabber"))
 			field = E_CONTACT_IM_JABBER;
-		else if (!strcmp(im_service, "prpl-novell"))
+		else if (purple_strequal(im_service, "prpl-novell"))
 			field = E_CONTACT_IM_GROUPWISE;
-		else if (!strcmp(im_service, "prpl-gg"))
+		else if (purple_strequal(im_service, "prpl-gg"))
 			field = E_CONTACT_IM_GADUGADU;
 
 		if (field > 0)
diff --git a/pidgin/plugins/notify.c b/pidgin/plugins/notify.c
index 1556f5a3b3..cd8554c23a 100644
--- a/pidgin/plugins/notify.c
+++ b/pidgin/plugins/notify.c
@@ -619,7 +619,7 @@ method_toggle_cb(GtkWidget *widget, gpointer data)
 
 	purple_prefs_set_bool(pref, on);
 
-	if (!strcmp(data, "method_string")) {
+	if (purple_strequal(data, "method_string")) {
 		GtkWidget *entry = g_object_get_data(G_OBJECT(widget), "title-entry");
 		gtk_widget_set_sensitive(entry, on);
 
@@ -650,7 +650,7 @@ options_entry_cb(GtkWidget *widget, GdkEventFocus *evt, gpointer data)
 	if (data == NULL)
 		return FALSE;
 
-	if (!strcmp(data, "method_string")) {
+	if (purple_strequal(data, "method_string")) {
 		purple_prefs_set_string("/plugins/gtk/X11/notify/title_string",
 		                      gtk_entry_get_text(GTK_ENTRY(widget)));
 	}
diff --git a/pidgin/plugins/pidgininc.c b/pidgin/plugins/pidgininc.c
index 7e03243371..7340e1df5c 100644
--- a/pidgin/plugins/pidgininc.c
+++ b/pidgin/plugins/pidgininc.c
@@ -34,7 +34,7 @@ reverse(PurpleAccount *account, char **who, char **message,
 
 	l = strlen(*message);
 
-	if (!strcmp(*who, purple_account_get_username(account)))
+	if (purple_strequal(*who, purple_account_get_username(account)))
 		return FALSE;
 
 	for (i = 0; i < l/2; i++) {
diff --git a/pidgin/plugins/spellchk.c b/pidgin/plugins/spellchk.c
index 00b4c20f80..57bb893407 100644
--- a/pidgin/plugins/spellchk.c
+++ b/pidgin/plugins/spellchk.c
@@ -237,10 +237,10 @@ substitute_word(gchar *word)
 			gtk_tree_model_get_value(GTK_TREE_MODEL(model), &iter, BAD_COLUMN, &val1);
 			bad = g_value_get_string(&val1);
 
-			if ((case_sensitive && !strcmp(bad, word)) ||
-			    (!case_sensitive && (!strcmp(bad, lowerword) ||
+			if ((case_sensitive && purple_strequal(bad, word)) ||
+			    (!case_sensitive && (purple_strequal(bad, lowerword) ||
 			                        (!is_word_lowercase(bad) &&
-			                         !strcmp((tmpbad = g_utf8_casefold(bad, -1)), foldedword)))))
+			                         purple_strequal((tmpbad = g_utf8_casefold(bad, -1)), foldedword)))))
 			{
 				GValue val2;
 				const char *good;
@@ -1947,12 +1947,12 @@ static void list_add_new(void)
 				 * Otherwise, they overlap. */
 				if (g_value_get_boolean(&case_sensitive_val))
 				{
-					match = !strcmp(g_value_get_string(&bad_val), word);
+					match = purple_strequal(g_value_get_string(&bad_val), word);
 				}
 				else
 				{
 					char *bad = g_utf8_casefold(g_value_get_string(&bad_val), -1);
-					match = !strcmp(bad, tmpword);
+					match = purple_strequal(bad, tmpword);
 					g_free(bad);
 				}
 				g_value_unset(&case_sensitive_val);
@@ -1960,7 +1960,7 @@ static void list_add_new(void)
 			else
 			{
 				char *bad = g_utf8_casefold(g_value_get_string(&bad_val), -1);
-				match = !strcmp(bad, tmpword);
+				match = purple_strequal(bad, tmpword);
 				g_free(bad);
 			}
 
@@ -2231,8 +2231,8 @@ get_config_frame(PurplePlugin *plugin)
 
 	gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(tree)),
 		 GTK_SELECTION_MULTIPLE);
-	gtk_box_pack_start(GTK_BOX(vbox), 
-		pidgin_make_scrollable(tree, GTK_POLICY_NEVER, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, -1, -1), 
+	gtk_box_pack_start(GTK_BOX(vbox),
+		pidgin_make_scrollable(tree, GTK_POLICY_NEVER, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, -1, -1),
 		TRUE, TRUE, 0);
 	gtk_widget_show(tree);
 
diff --git a/pidgin/plugins/timestamp_format.c b/pidgin/plugins/timestamp_format.c
index 66270dfc60..e2251fbaa6 100644
--- a/pidgin/plugins/timestamp_format.c
+++ b/pidgin/plugins/timestamp_format.c
@@ -84,8 +84,8 @@ static char *timestamp_cb_common(PurpleConversation *conv,
 	tm = localtime(&t);
 
 	if (show_date ||
-	    !strcmp(dates, "always") ||
-	    (conv != NULL && purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT && !strcmp(dates, "chats")))
+	    purple_strequal(dates, "always") ||
+	    (conv != NULL && purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT && purple_strequal(dates, "chats")))
 	{
 		if (purple_strequal(force, "force24"))
 			return g_strdup_printf("%s%s%s", parens ? "(" : "", purple_utf8_strftime("%Y-%m-%d %H:%M:%S", tm), parens ? ")" : "");
diff --git a/pidgin/plugins/vvconfig.c b/pidgin/plugins/vvconfig.c
index d20e3cf2ee..10cea48cbf 100644
--- a/pidgin/plugins/vvconfig.c
+++ b/pidgin/plugins/vvconfig.c
@@ -93,7 +93,7 @@ get_element_devices(const gchar *element_name)
 	ret = g_list_prepend(ret, (gpointer)_("Default"));
 	ret = g_list_prepend(ret, "");
 
-	if (!strcmp(element_name, "<custom>") || (*element_name == '\0')) {
+	if (purple_strequal(element_name, "<custom>") || (*element_name == '\0')) {
 		return g_list_reverse(ret);
 	}
 
@@ -210,7 +210,7 @@ device_changed_cb(const gchar *name, PurplePrefType type,
 	for (; widgets; widgets = g_slist_next(widgets)) {
 		const gchar *widget_name =
 				gtk_widget_get_name(GTK_WIDGET(widgets->data));
-		if (!strcmp(widget_name, name)) {
+		if (purple_strequal(widget_name, name)) {
 			gchar *temp_str;
 			gchar delimiters[3] = {0, 0, 0};
 			const gchar *text;
@@ -366,7 +366,7 @@ create_video_src(PurpleMedia *media,
 	ret = gst_element_factory_make(plugin, "vvconfig-videosrc");
 	if (device[0] != '\0')
 		g_object_set(G_OBJECT(ret), "device", device, NULL);
-	if (!strcmp(plugin, "videotestsrc"))
+	if (purple_strequal(plugin, "videotestsrc"))
 		g_object_set(G_OBJECT(ret), "is-live", 1, NULL);
 	return ret;
 }
@@ -464,7 +464,7 @@ set_element_info_cond(PurpleMediaElementInfo *old_info,
 		PurpleMediaElementInfo *new_info, const gchar *id)
 {
 	gchar *element_id = purple_media_element_info_get_id(old_info);
-	if (!strcmp(element_id, id))
+	if (purple_strequal(element_id, id))
 		purple_media_manager_set_active_element(
 				purple_media_manager_get(), new_info);
 	g_free(element_id);
@@ -659,7 +659,7 @@ gst_bus_cb(GstBus *bus, GstMessage *msg, BusCbCtx *ctx)
 		GstElement *src = GST_ELEMENT(GST_MESSAGE_SRC(msg));
 		gchar *name = gst_element_get_name(src);
 
-		if (!strcmp(name, "level")) {
+		if (purple_strequal(name, "level")) {
 			gdouble percent;
 			gdouble threshold;
 			GstElement *valve;
diff --git a/pidgin/plugins/xmppconsole.c b/pidgin/plugins/xmppconsole.c
index 6fcd66ac91..87c8c408e0 100644
--- a/pidgin/plugins/xmppconsole.c
+++ b/pidgin/plugins/xmppconsole.c
@@ -451,14 +451,14 @@ static void presence_clicked_cb(GtkWidget *w, gpointer nul)
 
 	to = gtk_entry_get_text(GTK_ENTRY(to_entry));
 	type = gtk_combo_box_get_active_text(GTK_COMBO_BOX(type_combo));
-	if (!strcmp(type, "default"))
+	if (purple_strequal(type, "default"))
 		type = "";
 	show = gtk_combo_box_get_active_text(GTK_COMBO_BOX(show_combo));
-	if (!strcmp(show, "default"))
+	if (purple_strequal(show, "default"))
 		show = "";
 	status = gtk_entry_get_text(GTK_ENTRY(status_entry));
 	priority = gtk_entry_get_text(GTK_ENTRY(priority_entry));
-	if (!strcmp(priority, "0"))
+	if (purple_strequal(priority, "0"))
 		priority = "";
 
 	stanza = g_strdup_printf("<presence %s%s%s id='console%x' %s%s%s>"
@@ -770,7 +770,7 @@ create_console(PurplePluginAction *action)
 	console->dropdown = gtk_combo_box_new_text();
 	for (connections = purple_connections_get_all(); connections; connections = connections->next) {
 		PurpleConnection *gc = connections->data;
-		if (!strcmp(purple_account_get_protocol_id(purple_connection_get_account(gc)), "prpl-jabber")) {
+		if (purple_strequal(purple_account_get_protocol_id(purple_connection_get_account(gc)), "prpl-jabber")) {
 			console->count++;
 			console->accounts = g_list_append(console->accounts, gc);
 			gtk_combo_box_append_text(GTK_COMBO_BOX(console->dropdown),
@@ -787,7 +787,7 @@ create_console(PurplePluginAction *action)
 	if (console->count == 0)
 		gtk_imhtml_append_text(GTK_IMHTML(console->imhtml),
 				       _("<font color='#777777'>Not connected to XMPP</font>"), 0);
-	gtk_box_pack_start(GTK_BOX(vbox), 
+	gtk_box_pack_start(GTK_BOX(vbox),
 		pidgin_make_scrollable(console->imhtml, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC, GTK_SHADOW_ETCHED_IN, -1, -1),
 		TRUE, TRUE, 0);