Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/jabber/roster.c	Mon Jun 12 01:00:04 2017 +0000
+++ b/libpurple/protocols/jabber/roster.c	Mon Jun 12 17:48:37 2017 -0300
@@ -232,17 +232,17 @@
 			continue;
 
 		if(subscription) {
-			if (g_str_equal(subscription, "remove"))
+			if (purple_strequal(subscription, "remove"))
 				jb->subscription = JABBER_SUB_REMOVE;
 			else if (jb == js->user_jb)
 				jb->subscription = JABBER_SUB_BOTH;
-			else if (g_str_equal(subscription, "none"))
+			else if (purple_strequal(subscription, "none"))
 				jb->subscription = JABBER_SUB_NONE;
-			else if (g_str_equal(subscription, "to"))
+			else if (purple_strequal(subscription, "to"))
 				jb->subscription = JABBER_SUB_TO;
-			else if (g_str_equal(subscription, "from"))
+			else if (purple_strequal(subscription, "from"))
 				jb->subscription = JABBER_SUB_FROM;
-			else if (g_str_equal(subscription, "both"))
+			else if (purple_strequal(subscription, "both"))
 				jb->subscription = JABBER_SUB_BOTH;
 		}
 
@@ -454,7 +454,7 @@
 	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_blist_find_buddies(purple_connection_get_account(gc), name);
@@ -531,9 +531,9 @@
 
 	if (name == NULL)
 		name = JABBER_ROSTER_DEFAULT_GROUP;
-	else if (g_strcmp0(name, PURPLE_BLIST_DEFAULT_GROUP_NAME) == 0)
+	else if (purple_strequal(name, PURPLE_BLIST_DEFAULT_GROUP_NAME))
 		name = JABBER_ROSTER_DEFAULT_GROUP;
-	else if (g_strcmp0(name, _purple_blist_get_localized_default_group_name()) == 0)
+	else if (purple_strequal(name, _purple_blist_get_localized_default_group_name()))
 		name = JABBER_ROSTER_DEFAULT_GROUP;
 
 	return name;