pidgin.vv: 057a26d2: Move and rename GTALK_CAP to GOOGLE_VOIC...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 057a26d2c4d930206165a33a881afd9f0117f466
Ancestor: a86fcbe0eae6c24d263a079855d1f1f0afeaa38b
Author: maiku at soc.pidgin.im
Date: 2009-03-21T09:10:20
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/057a26d2c4d930206165a33a881afd9f0117f466

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

ChangeLog: 

Move and rename GTALK_CAP to GOOGLE_VOICE_CAP.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/google.h	97e1d58285542849753713a8e138702613948bf9
+++ libpurple/protocols/jabber/google.h	cd75215e878c3223b9dec81966827c2c24d0b28e
@@ -27,6 +27,7 @@
 #include "jabber.h"
 #include "media.h"
 
+#define GOOGLE_VOICE_CAP "http://www.google.com/xmpp/protocol/voice/v1"
 #define GOOGLE_JINGLE_INFO_NAMESPACE "google:jingleinfo"
 
 void jabber_gmail_init(JabberStream *js);
============================================================
--- libpurple/protocols/jabber/jabber.c	b8767b9561f31518ad2debcf965a07497f0547d0
+++ libpurple/protocols/jabber/jabber.c	811b16bd2f8ed65cf646a10868ff2617282cbd8a
@@ -62,13 +62,6 @@
 #include "jingle/jingle.h"
 #include "jingle/rtp.h"
 
-#ifdef USE_VV
-#include <gst/farsight/fs-conference-iface.h>
-
-#define GTALK_CAP "http://www.google.com/xmpp/protocol/voice/v1"
-
-#endif
-
 #define JABBER_CONNECT_STEPS (js->gsc ? 9 : 5)
 
 static PurplePlugin *my_protocol = NULL;
@@ -2643,7 +2636,7 @@ jabber_initiate_media(PurpleConnection *
 	if (type & PURPLE_MEDIA_AUDIO &&
 			!jabber_buddy_has_capability(jb,
 			JINGLE_APP_RTP_SUPPORT_AUDIO) &&
-			jabber_buddy_has_capability(jb, GTALK_CAP))
+			jabber_buddy_has_capability(jb, GOOGLE_VOICE_CAP))
 		return jabber_google_session_initiate(gc->proto_data, who, type);
 	else
 		return jingle_rtp_initiate_media(gc->proto_data, who, type);
@@ -2691,7 +2684,7 @@ PurpleMediaCaps jabber_get_media_caps(Pu
 			caps |= PURPLE_MEDIA_CAPS_MODIFY_SESSION |
 					PURPLE_MEDIA_CAPS_CHANGE_DIRECTION;
 	}
-	if (jabber_buddy_has_capability(jb, GTALK_CAP))
+	if (jabber_buddy_has_capability(jb, GOOGLE_VOICE_CAP))
 		caps |= PURPLE_MEDIA_CAPS_AUDIO;
 
 	return caps;