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.h b/buffet/shill_client.h
index 2e4dc2c..b4ce53e 100644
--- a/buffet/shill_client.h
+++ b/buffet/shill_client.h
@@ -28,7 +28,8 @@
public weave::provider::Wifi {
public:
ShillClient(const scoped_refptr<dbus::Bus>& bus,
- const std::set<std::string>& device_whitelist);
+ const std::set<std::string>& device_whitelist,
+ bool disable_xmpp);
~ShillClient();
void Init();
@@ -104,6 +105,7 @@
// There is logic that assumes we will never change this device list
// in OnManagerPropertyChange. Do not be tempted to remove this const.
const std::set<std::string> device_whitelist_;
+ bool disable_xmpp_{false};
std::vector<ConnectionChangedCallback> connectivity_listeners_;
// State for tracking where we are in our attempts to connect to a service.