Sync with latest version of libweave
Pull the latest changes of libweave and update weaved correspondingly
Change-Id: I0a24a948c9296d4f8a12d1f26f808cb7b78fe572
diff --git a/buffet/shill_client.cc b/buffet/shill_client.cc
index 64f7de3..ed80af2 100644
--- a/buffet/shill_client.cc
+++ b/buffet/shill_client.cc
@@ -88,10 +88,12 @@
} // namespace
ShillClient::ShillClient(const scoped_refptr<dbus::Bus>& bus,
- const set<string>& device_whitelist)
+ const set<string>& device_whitelist,
+ bool disable_xmpp)
: bus_{bus},
manager_proxy_{bus_},
device_whitelist_{device_whitelist},
+ disable_xmpp_{disable_xmpp},
ap_manager_client_{new ApManagerClient(bus)} {
manager_proxy_.RegisterPropertyChangedSignalHandler(
base::Bind(&ShillClient::OnManagerPropertyChange,
@@ -561,6 +563,8 @@
const base::Callback<void(std::unique_ptr<weave::Stream>)>&
success_callback,
const base::Callback<void(const weave::Error*)>& error_callback) {
+ if (disable_xmpp_)
+ return;
std::unique_ptr<weave::Stream> raw_stream{
SocketStream::ConnectBlocking(host, port)};
if (!raw_stream) {