cpw.malu.xmpp.google_relay: ed593238: Fixup namespaces stuff after merge

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: ed59323895a1ea93985fe761fbd1749dd8af5638
Ancestor: 13260f58d13c033c07574aeb4c96dc889b83eab3
Author: malu at pidgin.im
Date: 2009-11-29T19:04:27
Branch: im.pidgin.cpw.malu.xmpp.google_relay
URL: http://d.pidgin.im/viewmtn/revision/info/ed59323895a1ea93985fe761fbd1749dd8af5638

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

ChangeLog: 

Fixup namespaces stuff after merge

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/google.c	626652014feccec74d0ca72b934082f5e7cc7adc
+++ libpurple/protocols/jabber/google.c	8deb5fd10f77e74f60d4f629a38023fe1c027792
@@ -666,9 +666,9 @@ google_session_handle_initiate(JabberStr
 	desc_element = xmlnode_get_child(sess, "description");
 	xmlns = xmlnode_get_namespace(desc_element);
 
-	if (purple_strequal(xmlns, NS_GOOGLE_PHONE))
+	if (purple_strequal(xmlns, NS_GOOGLE_SESSION_PHONE))
 		session->video = FALSE;
-	else if (purple_strequal(xmlns, NS_GOOGLE_VIDEO))
+	else if (purple_strequal(xmlns, NS_GOOGLE_SESSION_VIDEO))
 		session->video = TRUE;
 	else {
 		purple_debug_error("jabber", "Received initiate with "
============================================================
--- libpurple/protocols/jabber/jabber.c	b4191255ebc65d23992fdbe065b494194c1ce4fc
+++ libpurple/protocols/jabber/jabber.c	95c61f7b76489f01ed1442c8101aba5b4c5565b2
@@ -3039,9 +3039,9 @@ jabber_initiate_media(PurpleAccount *acc
 		if (((js->googletalk && js->google_relay_token) ||
 		     !jabber_resource_has_capability(jbr, JINGLE_APP_RTP_SUPPORT_AUDIO))
 		    && (((type & PURPLE_MEDIA_AUDIO) && 
-		    	jabber_resource_has_capability(jbr, GOOGLE_VOICE_CAP))
+		    	jabber_resource_has_capability(jbr, NS_GOOGLE_VOICE))
 		        || ((type & PURPLE_MEDIA_VIDEO) &&
-		    		jabber_resource_has_capability(jbr, GOOGLE_VIDEO_CAP))))
+		    		jabber_resource_has_capability(jbr, NS_GOOGLE_VIDEO))))
 			return jabber_google_session_initiate(js, who, type);
 		else
 			return jingle_rtp_initiate_media(js, who, type);