summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/jingle/libjingle/talk/examples/login
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/jabber/jingle/libjingle/talk/examples/login')
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc6
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc2
-rw-r--r--kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc
index 66191f12..492559ae 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc
@@ -55,12 +55,12 @@ std::string XmppAuth::ChooseBestSaslMechanism(
std::vector<std::string>::const_iterator it;
// a token is the weakest auth - 15s, service-limited, so prefer it.
- it = std::find(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-TOKEN");
+ it = std::tqfind(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-TOKEN");
if (it != mechanisms.end())
return "X-GOOGLE-TOKEN";
// a cookie is the next weakest - 14 days
- it = std::find(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-COOKIE");
+ it = std::tqfind(mechanisms.begin(), mechanisms.end(), "X-GOOGLE-COOKIE");
if (it != mechanisms.end())
return "X-GOOGLE-COOKIE";
@@ -70,7 +70,7 @@ std::string XmppAuth::ChooseBestSaslMechanism(
// as a last resort, use plain authentication
if (jid_.domain() != "google.com") {
- it = std::find(mechanisms.begin(), mechanisms.end(), "PLAIN");
+ it = std::tqfind(mechanisms.begin(), mechanisms.end(), "PLAIN");
if (it != mechanisms.end())
return "PLAIN";
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc
index 7d966fb3..40e694e2 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc
@@ -68,6 +68,6 @@ void XmppPump::OnMessage(cricket::Message *pmsg) {
RunTasks();
}
-buzz::XmppReturnStatus XmppPump::SendStanza(const buzz::XmlElement *stanza) {
+buzz::XmppReturntqStatus XmppPump::SendStanza(const buzz::XmlElement *stanza) {
return client_->SendStanza(stanza);
}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h
index fd6f88bb..0314b2fd 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.h
@@ -62,7 +62,7 @@ public:
void OnMessage(cricket::Message *pmsg);
- buzz::XmppReturnStatus SendStanza(const buzz::XmlElement *stanza);
+ buzz::XmppReturntqStatus SendStanza(const buzz::XmlElement *stanza);
private:
buzz::XmppClient *client_;