diff options
| author | Marcus Lundblad <malu@pidgin.im> | 2009-11-29 19:04:27 +0000 |
|---|---|---|
| committer | Marcus Lundblad <malu@pidgin.im> | 2009-11-29 19:04:27 +0000 |
| commit | 5e46afce403501ad2bf2576a21e4796e80d83fcc (patch) | |
| tree | 5e94711ecf49fdaa7ecc4dee9c25be80416f88e4 | |
| parent | 1d4009979f0dc5d2dcb0d21496741795884ac842 (diff) | |
| download | pidgin-5e46afce403501ad2bf2576a21e4796e80d83fcc.tar.gz | |
Fixup namespaces stuff after merge
| -rw-r--r-- | libpurple/protocols/jabber/google.c | 4 | ||||
| -rw-r--r-- | libpurple/protocols/jabber/jabber.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libpurple/protocols/jabber/google.c b/libpurple/protocols/jabber/google.c index 49e9830864..d1b164220a 100644 --- a/libpurple/protocols/jabber/google.c +++ b/libpurple/protocols/jabber/google.c @@ -666,9 +666,9 @@ google_session_handle_initiate(JabberStream *js, GoogleSession *session, xmlnode 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 " diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c index 54ed5e20b7..cd99af13c6 100644 --- a/libpurple/protocols/jabber/jabber.c +++ b/libpurple/protocols/jabber/jabber.c @@ -3039,9 +3039,9 @@ jabber_initiate_media(PurpleAccount *account, const char *who, 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); |