Remove found redundant NULL checks

6 files changed, 13 insertions, 22 deletions

diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c
index 3bfbadf680..47cd808c97 100644
--- a/libpurple/mediamanager.c
+++ b/libpurple/mediamanager.c
@@ -1476,10 +1476,7 @@ purple_media_manager_create_output_window(PurpleMediaManager *manager,
 		PurpleMediaOutputWindow *ow = iter->data;
 
 		if (ow->sink == NULL && ow->media == media &&
-				((participant != NULL &&
-				ow->participant != NULL &&
-				purple_strequal(participant, ow->participant)) ||
-				(participant == ow->participant)) &&
+				purple_strequal(participant, ow->participant) &&
 				purple_strequal(session_id, ow->session_id)) {
 			GstBus *bus;
 			GstElement *queue, *convert, *scale;
@@ -1672,12 +1669,8 @@ purple_media_manager_remove_output_windows(PurpleMediaManager *manager,
 		iter = g_list_next(iter);
 
 	if (media == ow->media &&
-			((session_id != NULL && ow->session_id != NULL &&
-			purple_strequal(session_id, ow->session_id)) ||
-			(session_id == ow->session_id)) &&
-			((participant != NULL && ow->participant != NULL &&
-			purple_strequal(participant, ow->participant)) ||
-			(participant == ow->participant)))
+			purple_strequal(session_id, ow->session_id) &&
+			purple_strequal(participant, ow->participant))
 		purple_media_manager_remove_output_window(
 				manager, ow->id);
 	}
diff --git a/libpurple/protocols/bonjour/bonjour_ft.c b/libpurple/protocols/bonjour/bonjour_ft.c
index cd6bb9b872..f3d5d3542f 100644
--- a/libpurple/protocols/bonjour/bonjour_ft.c
+++ b/libpurple/protocols/bonjour/bonjour_ft.c
@@ -165,7 +165,7 @@ bonjour_si_xfer_find(BonjourData *bd, const char *sid, const char *from)
 		xf = xfer->data;
 		if(xf == NULL)
 			break;
-		if(xf->sid && xfer->who && purple_strequal(xf->sid, sid) &&
+		if(purple_strequal(xf->sid, sid) &&
 				purple_strequal(xfer->who, from))
 			return xfer;
 	}
diff --git a/libpurple/protocols/jabber/buddy.c b/libpurple/protocols/jabber/buddy.c
index 4208978137..6a21f02385 100644
--- a/libpurple/protocols/jabber/buddy.c
+++ b/libpurple/protocols/jabber/buddy.c
@@ -218,7 +218,7 @@ JabberBuddyResource *jabber_buddy_find_resource(JabberBuddy *jb,
 	for (l = jb->resources; l; l = l->next)
 	{
 		JabberBuddyResource *jbr = l->data;
-		if (jbr->name && purple_strequal(resource, jbr->name))
+		if (purple_strequal(resource, jbr->name))
 			return jbr;
 	}
 
diff --git a/libpurple/protocols/jabber/presence.c b/libpurple/protocols/jabber/presence.c
index 30bd0e242f..9a426beb47 100644
--- a/libpurple/protocols/jabber/presence.c
+++ b/libpurple/protocols/jabber/presence.c
@@ -212,12 +212,10 @@ void jabber_presence_send(JabberStream *js, gboolean force)
 		stripped = jabber_google_presence_outgoing(tune);
 	}
 
-#define CHANGED(a,b) ((!a && b) || (a && a[0] == '\0' && b && b[0] != '\0') || \
-					  (a && !b) || (a && a[0] != '\0' && b && b[0] == '\0') || (a && b && !purple_strequal(a,b)))
 	/* check if there are any differences to the <presence> and send them in that case */
 	if (force || allowBuzz != js->allowBuzz || js->old_state != state ||
-		CHANGED(js->old_msg, stripped) || js->old_priority != priority ||
-		CHANGED(js->old_avatarhash, js->avatar_hash) || js->old_idle != js->idle) {
+		!purple_strequal(js->old_msg, stripped) || js->old_priority != priority ||
+		!purple_strequal(js->old_avatarhash, js->avatar_hash) || js->old_idle != js->idle) {
 		/* Need to update allowBuzz before creating the presence (with caps) */
 		js->allowBuzz = allowBuzz;
 
@@ -268,8 +266,9 @@ void jabber_presence_send(JabberStream *js, gboolean force)
 				purple_status_get_attr_int(tune, PURPLE_TUNE_TIME);
 	}
 
-	if(CHANGED(artist, js->old_artist) || CHANGED(title, js->old_title) || CHANGED(source, js->old_source) ||
-	   CHANGED(uri, js->old_uri) || CHANGED(track, js->old_track) || (length != js->old_length)) {
+	if(!purple_strequal(artist, js->old_artist) || !purple_strequal(title, js->old_title) ||
+			!purple_strequal(source, js->old_source) || !purple_strequal(uri, js->old_uri) ||
+			!purple_strequal(track, js->old_track) || (length != js->old_length)) {
 		PurpleJabberTuneInfo tuneinfo = {
 			(char*)artist,
 			(char*)title,
diff --git a/libpurple/protocols/null/nullprpl.c b/libpurple/protocols/null/nullprpl.c
index 5688476666..e2d8662f80 100644
--- a/libpurple/protocols/null/nullprpl.c
+++ b/libpurple/protocols/null/nullprpl.c
@@ -951,8 +951,7 @@ static void nullprpl_set_chat_topic(PurpleConnection *gc, int id,
                     gc->account->username, conv->name, topic);
 
   last_topic = purple_conv_chat_get_topic(chat);
-  if ((!topic && !last_topic) ||
-      (topic && last_topic && purple_strequal(topic, last_topic)))
+  if (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/pidgin/gtkrequest.c b/pidgin/gtkrequest.c
index f9d93c44e7..397e09adfa 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) && (purple_strequal(data->u.input.hint, "html")))
+		if (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,
@@ -403,7 +403,7 @@ pidgin_request_input(const char *title, const char *primary,
 
 	gtk_widget_show_all(hbox);
 
-	if ((data->u.input.hint != NULL) && (purple_strequal(data->u.input.hint, "html"))) {
+	if (purple_strequal(data->u.input.hint, "html")) {
 		GtkWidget *frame;
 
 		/* imhtml */