# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1283622474 0
# Node ID 75045bed77048d86dd284df1e03b04e5f208ec90
# Parent  e126e263be188a3dece37665c0c5c5ed921e7b6d# Parent  54461ce5f7e0091177525b61fead7b6dabe07fb7
propagate from branch 'im.pidgin.pidgin' (head 869046ae8047810bc7364fdf203146b14de21082)
            to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 35b9f4804bd076d22584061c5deb962182f0bd2c)

diff -r e126e263be18 -r 75045bed7704 libpurple/protocols/jabber/google/google_session.c
--- a/libpurple/protocols/jabber/google/google_session.c	Sat Sep 04 15:48:23 2010 +0000
+++ b/libpurple/protocols/jabber/google/google_session.c	Sat Sep 04 17:47:54 2010 +0000
@@ -745,12 +745,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++);