commit d4e598d57aed714a599444a7eab5e8fdde52a950
author buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jul 29 17:36:52 2014 +0000
committer buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jul 29 17:36:52 2014 +0000
tree 67b1dcdcff833ff9e790a23ae35f5f1edeea0c28
parent fc8b0871d9142bb2ca66d4e6ebb278083141e9d3

(Auto)update libjingle 72097588-> 72159069

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

talk/examples/call/presencepushtask.cc

diff --git a/talk/examples/call/presencepushtask.cc b/talk/examples/call/presencepushtask.cc
index af02b1f..31ccc32 100644
--- a/talk/examples/call/presencepushtask.cc
+++ b/talk/examples/call/presencepushtask.cc
@@ -27,7 +27,7 @@
 
 #include "talk/examples/call/presencepushtask.h"
 
-#include "talk/base/stringencode.h"
+#include "webrtc/base/stringencode.h"
 #include "talk/examples/call/muc.h"
 #include "talk/xmpp/constants.h"
 
@@ -153,7 +153,7 @@
     const XmlElement * priority = stanza->FirstNamed(QN_PRIORITY);
     if (priority != NULL) {
       int pri;
-      if (talk_base::FromString(priority->BodyText(), &pri)) {
+      if (rtc::FromString(priority->BodyText(), &pri)) {
         s->set_priority(pri);
       }
     }