commit 967bfff54d00f176a554bf9f955f14dde99f7bb9
author wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Sep 19 05:49:50 2013 +0000
committer wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Sep 19 05:49:50 2013 +0000
tree a69aeab3d5e2b9e852c8bd6cd9681697fd00335a
parent 532f3dc5487ee1cedaef5719fe71bf71614d7ee7

Update talk to 52534915.

R=sergeyu@chromium.org

Review URL: https://webrtc-codereview.appspot.com/2251004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4786 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/xmpp/rostermoduleimpl.cc

diff --git a/talk/xmpp/rostermoduleimpl.cc b/talk/xmpp/rostermoduleimpl.cc
index 2422880..31b3abd 100644
--- a/talk/xmpp/rostermoduleimpl.cc
+++ b/talk/xmpp/rostermoduleimpl.cc
@@ -300,6 +300,8 @@
       return XMPP_CONNECTION_STATUS_CONNECTING;
     else if (status == STR_PSTN_CONFERENCE_STATUS_CONNECTED)
       return XMPP_CONNECTION_STATUS_CONNECTED;
+    else if (status == STR_PSTN_CONFERENCE_STATUS_JOINING)
+            return XMPP_CONNECTION_STATUS_JOINING;
     else if (status == STR_PSTN_CONFERENCE_STATUS_HANGUP)
         return XMPP_CONNECTION_STATUS_HANGUP;
   }
@@ -349,8 +351,11 @@
       xml->Name() != QN_PRESENCE)
     return XMPP_RETURN_BADARGUMENT;
 
-  raw_xml_.reset(new XmlElement(*xml));
+  const std::string& type = xml->Attr(QN_TYPE);
+  if (type != STR_EMPTY && type != "unavailable")
+    return XMPP_RETURN_BADARGUMENT;
 
+  raw_xml_.reset(new XmlElement(*xml));
   return XMPP_RETURN_OK;
 }