Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/google/google_session.c @ 30919:54461ce5f7e0
jabber: priority is called preference in Google mode
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sat, 04 Sep 2010 17:47:46 +0000 |
parents | e97788414900 |
children | 75045bed7704 |
comparison
equal
deleted
inserted
replaced
30918:e97788414900 | 30919:54461ce5f7e0 |
---|---|
541 const gchar *cname = xmlnode_get_attrib(cand, "name"); | 541 const gchar *cname = xmlnode_get_attrib(cand, "name"); |
542 const gchar *type = xmlnode_get_attrib(cand, "type"); | 542 const gchar *type = xmlnode_get_attrib(cand, "type"); |
543 const gchar *protocol = xmlnode_get_attrib(cand, "protocol"); | 543 const gchar *protocol = xmlnode_get_attrib(cand, "protocol"); |
544 const gchar *address = xmlnode_get_attrib(cand, "address"); | 544 const gchar *address = xmlnode_get_attrib(cand, "address"); |
545 const gchar *port = xmlnode_get_attrib(cand, "port"); | 545 const gchar *port = xmlnode_get_attrib(cand, "port"); |
546 const gchar *priority = xmlnode_get_attrib(cand, "priority"); | 546 const gchar *preference = xmlnode_get_attrib(cand, "preference"); |
547 guint component_id; | 547 guint component_id; |
548 | 548 |
549 if (cname && type && address && port) { | 549 if (cname && type && address && port) { |
550 PurpleMediaCandidateType candidate_type; | 550 PurpleMediaCandidateType candidate_type; |
551 guint prio = priority ? atof(priority) * 1000 : 0; | 551 guint prio = preference ? atof(preference) * 1000 : 0; |
552 | 552 |
553 g_snprintf(n, sizeof(n), "S%d", name++); | 553 g_snprintf(n, sizeof(n), "S%d", name++); |
554 | 554 |
555 if (g_str_equal(type, "local")) | 555 if (g_str_equal(type, "local")) |
556 candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_HOST; | 556 candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_HOST; |