HGKeeper

876661dc1375

Fix a bunch of stuff that was somehow broke in the last wave of pull requests

+1 -1

+1 -1

+1 -1

~~--- a/libpurple/buddylist.c Thu Jun 15 04:00:41 2017 +0000~~

+++ b/libpurple/buddylist.c Wed Jun 14 23:13:00 2017 -0500

@@ -1638,7 +1638,7 @@

name = PURPLE_BLIST_DEFAULT_GROUP_NAME;

if (purple_strequal(name, "Buddies"))

name = PURPLE_BLIST_DEFAULT_GROUP_NAME;

~~- if (purple_strqual(name, localized_default_group_name))~~

+ if (purple_strequal(name, localized_default_group_name))

name = PURPLE_BLIST_DEFAULT_GROUP_NAME;

key = purple_blist_fold_name(name);

~~--- a/libpurple/protocols/jabber/disco.c Thu Jun 15 04:00:41 2017 +0000~~

+++ b/libpurple/protocols/jabber/disco.c Wed Jun 14 23:13:00 2017 -0500

@@ -483,7 +483,7 @@

for (child = purple_xmlnode_get_child(query, "identity"); child;

child = purple_xmlnode_get_next_twin(child)) {

~~- const char *category, *type, *name;~~

+ const char *category, *type, *name, *stun_ip;

category = purple_xmlnode_get_attrib(child, "category");

type = purple_xmlnode_get_attrib(child, "type");

if(purple_strequal(category, "pubsub") && purple_strequal(type, "pep")) {

~~--- a/libpurple/protocols/jabber/jingle/iceudp.c Thu Jun 15 04:00:41 2017 +0000~~

+++ b/libpurple/protocols/jabber/jingle/iceudp.c Wed Jun 14 23:13:00 2017 -0500

@@ -308,7 +308,7 @@

PURPLE_MEDIA_CANDIDATE_TYPE_HOST :

purple_strequal(candidate->type, "srflx") ?

PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX :

~~- purple_strqual(candidate->type, "prflx") ?~~

+ purple_strequal(candidate->type, "prflx") ?

PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX :

purple_strequal(candidate->type, "relay") ?

PURPLE_MEDIA_CANDIDATE_TYPE_RELAY : 0,