Mercurial > pidgin.yaz
changeset 30947:ef2c74d0ef19
Fixup namespaces stuff after merge
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sun, 29 Nov 2009 19:04:27 +0000 |
| parents | cb8b53a6f238 |
| children | 7f1da2fbe7fc |
| files | libpurple/protocols/jabber/google.c libpurple/protocols/jabber/jabber.c |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/google.c Sun Nov 29 18:53:11 2009 +0000 +++ b/libpurple/protocols/jabber/google.c Sun Nov 29 19:04:27 2009 +0000 @@ -666,9 +666,9 @@ 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 "
--- a/libpurple/protocols/jabber/jabber.c Sun Nov 29 18:53:11 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.c Sun Nov 29 19:04:27 2009 +0000 @@ -3039,9 +3039,9 @@ 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);