# HG changeset patch # User Marcus Lundblad # Date 1283622466 0 # Node ID 54461ce5f7e0091177525b61fead7b6dabe07fb7 # Parent e977884149007834666e3e93fadc9051ec96b9d6 jabber: priority is called preference in Google mode diff -r e97788414900 -r 54461ce5f7e0 libpurple/protocols/jabber/google/google_session.c --- a/libpurple/protocols/jabber/google/google_session.c Sat Sep 04 15:47:59 2010 +0000 +++ b/libpurple/protocols/jabber/google/google_session.c Sat Sep 04 17:47:46 2010 +0000 @@ -543,12 +543,12 @@ const gchar *protocol = xmlnode_get_attrib(cand, "protocol"); const gchar *address = xmlnode_get_attrib(cand, "address"); const gchar *port = xmlnode_get_attrib(cand, "port"); - const gchar *priority = xmlnode_get_attrib(cand, "priority"); + const gchar *preference = xmlnode_get_attrib(cand, "preference"); guint component_id; if (cname && type && address && port) { PurpleMediaCandidateType candidate_type; - guint prio = priority ? atof(priority) * 1000 : 0; + guint prio = preference ? atof(preference) * 1000 : 0; g_snprintf(n, sizeof(n), "S%d", name++);