Revert the purple_strequal changes in libgadu as it's not supposed to know about purple

5 files changed, 7 insertions, 7 deletions

diff --git a/libpurple/protocols/gg/lib/common.c b/libpurple/protocols/gg/lib/common.c
index e4d2826f1f..12fa9eee52 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)
+	if (!ptr || !*ptr || !strcmp(*ptr, ""))
 		return NULL;
 
 	res = *ptr;
diff --git a/libpurple/protocols/gg/lib/events.c b/libpurple/protocols/gg/lib/events.c
index 603f43ac27..af1a37620c 100644
--- a/libpurple/protocols/gg/lib/events.c
+++ b/libpurple/protocols/gg/lib/events.c
@@ -1087,7 +1087,7 @@ static gg_action_t gg_handle_reading_hub_proxy(struct gg_session *sess,
 		port = atoi(tmp + 1);
 	}
 
-	if (purple_strequal(host, "notoperating")) {
+	if (strcmp(host, "notoperating") == 0) {
 		gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() service unavailable\n");
 		e->event.failure = GG_FAILURE_UNAVAILABLE;
 		return GG_ACTION_FAIL;
diff --git a/libpurple/protocols/gg/lib/libgadu.c b/libpurple/protocols/gg/lib/libgadu.c
index bee283310f..fb3dd43e00 100644
--- a/libpurple/protocols/gg/lib/libgadu.c
+++ b/libpurple/protocols/gg/lib/libgadu.c
@@ -991,7 +991,7 @@ struct gg_session *gg_login(const struct gg_login_params *p)
 	} else
 		sess->protocol_version = p->protocol_version;
 
-	if (p->client_version && !purple_strequal(p->client_version, "-"))
+	if (p->client_version && strcmp(p->client_version, "-") != 0)
 		sess->client_version = strdup(p->client_version);
 	sess->last_sysmsg = p->last_sysmsg;
 	sess->image_size = p->image_size;
diff --git a/libpurple/protocols/gg/lib/protobuf-c.c b/libpurple/protocols/gg/lib/protobuf-c.c
index 4e16fe1c38..7b8d07bd44 100644
--- a/libpurple/protocols/gg/lib/protobuf-c.c
+++ b/libpurple/protocols/gg/lib/protobuf-c.c
@@ -3204,7 +3204,7 @@ protobuf_c_enum_descriptor_get_value_by_name(const ProtobufCEnumDescriptor *desc
 	}
 	if (count == 0)
 		return NULL;
-	if (purple_strequal(desc->values_by_name[start].name, name))
+	if (strcmp(desc->values_by_name[start].name, name) == 0)
 		return desc->values + desc->values_by_name[start].index;
 	return NULL;
 }
@@ -3243,7 +3243,7 @@ protobuf_c_message_descriptor_get_field_by_name(const ProtobufCMessageDescriptor
 	if (count == 0)
 		return NULL;
 	field = desc->fields + desc->fields_sorted_by_name[start];
-	if (purple_strequal(field->name, name))
+	if (strcmp(field->name, name) == 0)
 		return field;
 	return NULL;
 }
@@ -3282,7 +3282,7 @@ protobuf_c_service_descriptor_get_method_by_name(const ProtobufCServiceDescripto
 	}
 	if (count == 0)
 		return NULL;
-	if (purple_strequal(desc->methods[desc->method_indices_by_name[start]].name, name))
+	if (strcmp(desc->methods[desc->method_indices_by_name[start]].name, name) == 0)
 		return desc->methods + desc->method_indices_by_name[start];
 	return NULL;
 }
diff --git a/libpurple/protocols/gg/lib/pubdir50.c b/libpurple/protocols/gg/lib/pubdir50.c
index 4a43a3a4ba..9cef02082c 100644
--- a/libpurple/protocols/gg/lib/pubdir50.c
+++ b/libpurple/protocols/gg/lib/pubdir50.c
@@ -88,7 +88,7 @@ static int gg_pubdir50_add_n(gg_pubdir50_t req, int num, const char *field, cons
 	}
 
 	for (i = 0; i < req->entries_count; i++) {
-		if (req->entries[i].num != num || !purple_strequal(req->entries[i].field, field))
+		if (req->entries[i].num != num || strcmp(req->entries[i].field, field))
 			continue;
 
 		free(req->entries[i].value);