# HG changeset patch
# User Mike Ruprecht <maiku@soc.pidgin.im>
# Date 1237626620 0
# Node ID d06236d07c9ebab9655a4b35ab6b161e70013ddf
# Parent  6f0200f1e49750d9074d56cbe3396d7a2f2bdf9d
Move and rename GTALK_CAP to GOOGLE_VOICE_CAP.

diff -r 6f0200f1e497 -r d06236d07c9e libpurple/protocols/jabber/google.h
--- a/libpurple/protocols/jabber/google.h	Sat Mar 21 09:07:06 2009 +0000
+++ b/libpurple/protocols/jabber/google.h	Sat Mar 21 09:10:20 2009 +0000
@@ -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);
diff -r 6f0200f1e497 -r d06236d07c9e libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Sat Mar 21 09:07:06 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat Mar 21 09:10:20 2009 +0000
@@ -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 @@
 	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 @@
 			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;