From bcdfc9dd78d056998df3673726b38d8e2e6ba26f Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 24 Jul 2014 16:16:39 -0700
Subject: [PATCH] fix HAVE_QXMPP wrappings in XmppClient

---
 interface/src/XmppClient.cpp | 14 ++++++++++++++
 interface/src/XmppClient.h   |  6 ++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/interface/src/XmppClient.cpp b/interface/src/XmppClient.cpp
index ef9db55620..6b2c9b4495 100644
--- a/interface/src/XmppClient.cpp
+++ b/interface/src/XmppClient.cpp
@@ -18,6 +18,7 @@
 const QString DEFAULT_XMPP_SERVER = "chat.highfidelity.io";
 const QString DEFAULT_CHAT_ROOM = "public@public-chat.highfidelity.io";
 
+#ifdef HAVE_QXMPP
 XmppClient::XmppClient() :
     _xmppClient(),
     _xmppMUCManager()
@@ -26,6 +27,11 @@ XmppClient::XmppClient() :
     connect(&accountManager, SIGNAL(profileChanged()), this, SLOT(connectToServer()));
     connect(&accountManager, SIGNAL(logoutComplete()), this, SLOT(disconnectFromServer()));
 }
+#else
+XmppClient::XmppClient() {
+    
+}
+#endif
 
 XmppClient& XmppClient::getInstance() {
     static XmppClient sharedInstance;
@@ -33,18 +39,23 @@ XmppClient& XmppClient::getInstance() {
 }
 
 void XmppClient::xmppConnected() {
+#ifdef HAVE_QXMPP
     _publicChatRoom = _xmppMUCManager.addRoom(DEFAULT_CHAT_ROOM);
     _publicChatRoom->setNickName(AccountManager::getInstance().getAccountInfo().getUsername());
     _publicChatRoom->join();
     emit joinedPublicChatRoom();
+#endif
 }
 
 void XmppClient::xmppError(QXmppClient::Error error) {
+#ifdef HAVE_QXMPP
     qDebug() << "Error connnecting to XMPP for user "
         << AccountManager::getInstance().getAccountInfo().getUsername() << ": " << error;
+#endif
 }
 
 void XmppClient::connectToServer() {
+#ifdef HAVE_QXMPP
     disconnectFromServer();
 
     if (_xmppClient.addExtension(&_xmppMUCManager)) {
@@ -55,12 +66,15 @@ void XmppClient::connectToServer() {
     QString user = accountManager.getAccountInfo().getUsername();
     const QString& password = accountManager.getAccountInfo().getXMPPPassword();
     _xmppClient.connectToServer(user + "@" + DEFAULT_XMPP_SERVER, password);
+#endif
 }
 
 void XmppClient::disconnectFromServer() {
+#ifdef HAVE_QXMPP
     if (_xmppClient.isConnected()) {
         _xmppClient.disconnectFromServer();
     }
+#endif
 }
 
 XmppClient::XmppClient(const XmppClient& other) {
diff --git a/interface/src/XmppClient.h b/interface/src/XmppClient.h
index 9d848e2727..840fc7140a 100644
--- a/interface/src/XmppClient.h
+++ b/interface/src/XmppClient.h
@@ -22,13 +22,14 @@
 /// Generalized threaded processor for handling received inbound packets. 
 class XmppClient : public QObject {
     Q_OBJECT
-#ifdef HAVE_QXMPP
 public:
     static XmppClient& getInstance();
 
+#ifdef HAVE_QXMPP
     QXmppClient& getXMPPClient() { return _xmppClient; }
     const QXmppMucRoom* getPublicChatRoom() const { return _publicChatRoom; }
-
+#endif
+    
 signals:
     void joinedPublicChatRoom();
 
@@ -44,6 +45,7 @@ private:
     XmppClient(XmppClient const& other); // not implemented
     void operator=(XmppClient const& other); // not implemented
 
+#ifdef HAVE_QXMPP
     QXmppClient _xmppClient;
     QXmppMucManager _xmppMUCManager;
     QXmppMucRoom* _publicChatRoom;