summaryrefslogtreecommitdiffstats
path: root/remoting/jingle_glue/xmpp_signal_strategy.cc
diff options
context:
space:
mode:
Diffstat (limited to 'remoting/jingle_glue/xmpp_signal_strategy.cc')
-rw-r--r--remoting/jingle_glue/xmpp_signal_strategy.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/remoting/jingle_glue/xmpp_signal_strategy.cc b/remoting/jingle_glue/xmpp_signal_strategy.cc
index 88fc9f3..51bbade 100644
--- a/remoting/jingle_glue/xmpp_signal_strategy.cc
+++ b/remoting/jingle_glue/xmpp_signal_strategy.cc
@@ -91,10 +91,9 @@ void XmppSignalStrategy::Connect() {
task_runner_.reset(new jingle_glue::TaskPump());
xmpp_client_ = new buzz::XmppClient(task_runner_.get());
- xmpp_client_->Connect(
- settings, std::string(), socket, CreatePreXmppAuth(settings));
- xmpp_client_->SignalStateChange
- .connect(this, &XmppSignalStrategy::OnConnectionStateChanged);
+ xmpp_client_->Connect(settings, "", socket, CreatePreXmppAuth(settings));
+ xmpp_client_->SignalStateChange.connect(
+ this, &XmppSignalStrategy::OnConnectionStateChanged);
xmpp_client_->engine()->AddStanzaHandler(this, buzz::XmppEngine::HL_TYPE);
xmpp_client_->Start();
@@ -157,7 +156,7 @@ std::string XmppSignalStrategy::GetNextId() {
if (!xmpp_client_) {
// If the connection has been terminated then it doesn't matter
// what Id we return.
- return std::string();
+ return "";
}
return xmpp_client_->NextId();
}