Replace empty string comparison with null character comparison

More efficient way to identify an empty string

5 files changed, 14 insertions, 14 deletions

diff --git a/libpurple/protocols/gg/lib/common.c b/libpurple/protocols/gg/lib/common.c
index 20afc0ba3b..e4d2826f1f 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 || purple_strequal(*ptr, ""))
+	if (!ptr || !*ptr)
 		return NULL;
 
 	res = *ptr;
diff --git a/libpurple/protocols/jabber/disco.c b/libpurple/protocols/jabber/disco.c
index 4a8c004ebd..cbea98787f 100644
--- a/libpurple/protocols/jabber/disco.c
+++ b/libpurple/protocols/jabber/disco.c
@@ -519,6 +519,7 @@ jabber_disco_server_info_result_cb(JabberStream *js, const char *from,
 	for (child = xmlnode_get_child(query, "identity"); child;
 	     child = xmlnode_get_next_twin(child)) {
 		const char *category, *type, *name;
+		const char *stun_ip;
 		category = xmlnode_get_attrib(child, "category");
 		type = xmlnode_get_attrib(child, "type");
 		if(purple_strequal(category, "pubsub") && purple_strequal(type, "pep")) {
@@ -538,17 +539,16 @@ jabber_disco_server_info_result_cb(JabberStream *js, const char *from,
 
 		g_free(js->server_name);
 		js->server_name = g_strdup(name);
+		stun_ip = purple_network_get_stun_ip();
 		if (purple_strequal(name, "Google Talk")) {
 			purple_debug_info("jabber", "Google Talk!\n");
 			js->googletalk = TRUE;
 
 			/* autodiscover stun and relays */
-			if (purple_network_get_stun_ip() == NULL ||
-		    	purple_strequal(purple_network_get_stun_ip(), "")) {
+			if (stun_ip == NULL || stun_ip[0] == '\0') {
 				jabber_google_send_jingle_info(js);
 			}
-		} else if (purple_network_get_stun_ip() == NULL ||
-		    purple_strequal(purple_network_get_stun_ip(), "")) {
+		} else if (stun_ip == NULL || stun_ip[0] == '\0') {
 			js->srv_query_data =
 				purple_srv_resolve_account(
 					purple_connection_get_account(js->gc), "stun", "udp",
diff --git a/pidgin/gtkimhtml.c b/pidgin/gtkimhtml.c
index 2680ee2b25..69bd14e297 100644
--- a/pidgin/gtkimhtml.c
+++ b/pidgin/gtkimhtml.c
@@ -4793,7 +4793,7 @@ static gboolean gtk_imhtml_toggle_str_tag(GtkIMHtml *imhtml, const char *value,
 	g_free(*edit_field);
 	*edit_field = NULL;
 
-	if (value && !purple_strequal(value, ""))
+	if (value && value[0] != '\0')
 	{
 		*edit_field = g_strdup(value);
 
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
index ef0c14bd73..f3d0b287b2 100644
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -1016,7 +1016,7 @@ prefs_set_blist_theme_cb(GtkComboBox *combo_box, gpointer user_data)
 
 		gtk_tree_model_get(GTK_TREE_MODEL(prefs_blist_themes), &iter, 2, &name, -1);
 
-		if(!purple_strequal(name, ""))
+		if(!name || name[0] != '\0')
 			theme = PIDGIN_BLIST_THEME(purple_theme_manager_find_theme(name, "blist"));
 
 		g_free(name);
@@ -1037,7 +1037,7 @@ prefs_set_status_icon_theme_cb(GtkComboBox *combo_box, gpointer user_data)
 
 		gtk_tree_model_get(GTK_TREE_MODEL(prefs_status_icon_themes), &iter, 2, &name, -1);
 
-		if(!purple_strequal(name, ""))
+		if(!name || name[0] != '\0')
 			theme = PIDGIN_STATUS_ICON_THEME(purple_theme_manager_find_theme(name, "status-icon"));
 
 		g_free(name);
diff --git a/pidgin/plugins/pidginrc.c b/pidgin/plugins/pidginrc.c
index 8f13ec8c9e..8b24440e1b 100644
--- a/pidgin/plugins/pidginrc.c
+++ b/pidgin/plugins/pidginrc.c
@@ -113,7 +113,7 @@ make_gtkrc_string(void)
 	if (purple_prefs_get_bool("/plugins/gtk/purplerc/set/gtk-font-name")) {
 		const gchar *pref = purple_prefs_get_string("/plugins/gtk/purplerc/gtk-font-name");
 
-		if (pref != NULL && !purple_strequal(pref, "")) {
+		if (pref != NULL && pref[0] != '\0') {
 			g_string_append_printf(style_string,
 			                       "gtk-font-name = \"%s\"\n",
 			                       pref);
@@ -123,7 +123,7 @@ make_gtkrc_string(void)
 	if (purple_prefs_get_bool("/plugins/gtk/purplerc/set/gtk-key-theme-name")) {
 		const gchar *pref = purple_prefs_get_string("/plugins/gtk/purplerc/gtk-key-theme-name");
 
-		if (pref != NULL && !purple_strequal(pref, "")) {
+		if (pref != NULL && pref[0] != '\0') {
 			g_string_append_printf(style_string,
 			                       "gtk-key-theme-name = \"%s\"\n",
 			                       pref);
@@ -141,7 +141,7 @@ make_gtkrc_string(void)
 			const gchar *pref;
 
 			pref = purple_prefs_get_string(color_prefs[i]);
-			if (pref != NULL && !purple_strequal(pref, "")) {
+			if (pref != NULL && pref[0] != '\0') {
 				prefbase = g_path_get_basename(color_prefs[i]);
 				g_string_append_printf(style_string,
 				                       "\n\t%s = \"%s\"",
@@ -180,7 +180,7 @@ make_gtkrc_string(void)
 			const gchar *pref;
 
 			pref = purple_prefs_get_string(font_prefs[i]);
-			if (pref != NULL && !purple_strequal(pref, "")) {
+			if (pref != NULL && pref[0] != '\0') {
 				prefbase = g_path_get_basename(font_prefs[i]);
 				g_string_append_printf(style_string,
 				                       "style \"%s_style\"\n{\n"
@@ -276,7 +276,7 @@ purplerc_set_color(GtkWidget *widget, gpointer data)
 
 	pref = purple_prefs_get_string(color_prefs[subscript]);
 
-	if (pref != NULL && !purple_strequal(pref, "")) {
+	if (pref != NULL && pref[0] != '\0') {
 		if (gdk_color_parse(pref, &color)) {
 #if GTK_CHECK_VERSION(2,14,0)
 			gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(
@@ -337,7 +337,7 @@ purplerc_set_font(GtkWidget *widget, gpointer data)
 
 	pref = purple_prefs_get_string(prefpath);
 
-	if (pref != NULL && !purple_strequal(pref, "")) {
+	if (pref != NULL && pref[0] != '\0') {
 		gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(font_dialog), pref);
 	}