cpw.malu.xmpp.google_relay: 04e7c546: Always use Google jingle when the other ...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 04e7c54608e551322192b750ca2921f5b39b993c
Ancestor: 7e11dae4b92b8ef950ff2a1ab3ed673b56d4f772
Author: malu at pidgin.im
Date: 2009-09-21T20:58:03
Branch: im.pidgin.cpw.malu.xmpp.google_relay
URL: http://d.pidgin.im/viewmtn/revision/info/04e7c54608e551322192b750ca2921f5b39b993c

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

ChangeLog: 

Always use Google jingle when the other end supports, will have to do this
to take advantage of the relays (since it needs Google compat. ICE params).
The relay address fetching is still unfinished, so calling with this code is
currently broken...

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	100d27cd587fc6689bd67c828a9e8a2cf858d9a3
+++ libpurple/protocols/jabber/jabber.c	764de311d26cdd21d380138c7fd0bc077e614e4f
@@ -3033,12 +3033,9 @@ jabber_initiate_media(PurpleAccount *acc
 		jbr = jabber_buddy_find_resource(jb, resource);
 		g_free(resource);
 
-		/*
-		return jabber_google_session_initiate(js, who, type);
-		*/
+		/* if we are on a Google Talk connection and the remote supports
+		 Google Jingle, we will go with that */
 		if (type & PURPLE_MEDIA_AUDIO &&
-				!jabber_resource_has_capability(jbr,
-				JINGLE_APP_RTP_SUPPORT_AUDIO) &&
 				jabber_resource_has_capability(jbr,
 				GOOGLE_VOICE_CAP))
 			return jabber_google_session_initiate(js, who, type);