pidgin.vv: f158cbc4: Fix receiving voice calls from Gmail.

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: f158cbc4845b963b1e384f942f971470d387093e
Ancestor: 6faf61aec679983453ac9426dbde07240e87030a
Author: maiku at soc.pidgin.im
Date: 2009-01-07T02:46:41
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/f158cbc4845b963b1e384f942f971470d387093e

Modified files:
        libpurple/protocols/jabber/google.c

ChangeLog: 

Fix receiving voice calls from Gmail.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/google.c	ac320ae4dc80a65dd504361af435b860108a9db2
+++ libpurple/protocols/jabber/google.c	bdc57d76033e630c00771956741f4d152cdc1472
@@ -187,11 +187,18 @@ google_session_candidates_prepared (Purp
 		xmlnode_set_attrib(candidate, "port", port);
 		xmlnode_set_attrib(candidate, "name", "rtp");
 		xmlnode_set_attrib(candidate, "username", transport->username);
-		xmlnode_set_attrib(candidate, "password", transport->password);
+		/*
+		 * As of this writing, Farsight 2 in Google compatibility
+		 * mode doesn't provide a password. The Gmail client
+		 * requires this to be set.
+		 */
+		xmlnode_set_attrib(candidate, "password",
+				transport->password != NULL ?
+				transport->password : "");
 		xmlnode_set_attrib(candidate, "preference", pref);
 		xmlnode_set_attrib(candidate, "protocol", transport->proto == FS_NETWORK_PROTOCOL_UDP ? "udp" : "tcp");
 		xmlnode_set_attrib(candidate, "type", transport->type == FS_CANDIDATE_TYPE_HOST ? "local" :
-						      transport->type == FS_CANDIDATE_TYPE_PRFLX ? "stun" :
+						      transport->type == FS_CANDIDATE_TYPE_SRFLX ? "stun" :
 					       	      transport->type == FS_CANDIDATE_TYPE_RELAY ? "relay" : NULL);
 		xmlnode_set_attrib(candidate, "generation", "0");
 		xmlnode_set_attrib(candidate, "network", "0");