Fixing build without omemo, release preparation, unnecessary inheritance removed, info widget fix

core/account.h

@@ -60,11 +60,13 @@
 #include "handlers/vcardhandler.h"
 #include "handlers/discoveryhandler.h"
 
-#ifdef WITH_OMEMO
-#include <QXmppOmemoManager.h>
-#include <QXmppTrustManager.h>
-#include "handlers/trusthandler.h"
-#include "handlers/omemohandler.h"
+#if (QXMPP_VERSION) >= QT_VERSION_CHECK(1, 5, 0)
+    #include <QXmppTrustManager.h>
+    #ifdef WITH_OMEMO
+        #include <QXmppOmemoManager.h>
+        #include "handlers/omemohandler.h"
+    #endif
+    #include "handlers/trusthandler.h"
 #endif
 
 namespace Core {

core/delayManager/info.cpp

@@ -45,7 +45,10 @@ void Core::DelayManager::Info::receivedVCard(const Shared::VCard& card) {
         throw 245;
 
     info = new Shared::VCard(card);
+
+#ifdef WITH_OMEMO
     stage = Stage::waitingForBundles;
+#endif
 }
 
 Shared::VCard * Core::DelayManager::Info::claim() {

core/delayManager/manager.cpp

@@ -242,7 +242,9 @@ void Core::DelayManager::Manager::jobIsCanceled(Job* job, bool wasRunning) {
                     emit gotVCard(jb->jid, Shared::VCard());
                     break;
                 case InfoForUser::Stage::waitingForBundles:
+#ifdef WITH_OMEMO
                     requestedBundles.erase(jb->jid);
+#endif
                     break;
                 default:
                     break;
@@ -356,6 +358,7 @@ void Core::DelayManager::Manager::receivedOwnVCard(const Shared::VCard& card) {
     }
 }
 
+#ifdef WITH_OMEMO
 void Core::DelayManager::Manager::receivedBundles(const QString& jid, const std::list<Shared::KeyInfo>& keys) {
     std::map<QString, Job::Id>::const_iterator itr = requestedBundles.find(jid);
     if (itr == requestedBundles.end()) {
@@ -397,6 +400,7 @@ void Core::DelayManager::Manager::receivedOwnBundles(const std::list<Shared::Key
     emit gotOwnInfo(info);
     jobIsDone(jobId);
 }
+#endif
 
 void Core::DelayManager::Manager::setOwnJid(const QString& jid) {
     ownJid = jid;

core/delayManager/manager.h

@@ -56,8 +56,11 @@ public slots:
 signals:
     void requestVCard(const QString& jid);
     void requestOwnVCard();
+
+#ifdef WITH_OMEMO
     void requestBundles(const QString& jid);
     void requestOwnBundles();
+#endif
 
     void gotVCard(const QString& jid, const Shared::VCard& info);
     void gotOwnVCard(const Shared::VCard& info);
@@ -68,8 +71,11 @@ public slots:
     void disconnected();
     void receivedOwnVCard(const Shared::VCard& card);
     void receivedVCard(const QString& jid, const Shared::VCard& card);
+
+#ifdef WITH_OMEMO
     void receivedBundles(const QString& jid, const std::list<Shared::KeyInfo>& keys);
     void receivedOwnBundles(const std::list<Shared::KeyInfo>& keys);
+#endif
 
 private:
     void preScheduleJob(Job* job);

core/handlers/CMakeLists.txt

@@ -3,7 +3,6 @@ set(SOURCE_FILES
   rosterhandler.cpp
   vcardhandler.cpp
   discoveryhandler.cpp
-  omemohandler.cpp
   trusthandler.cpp
 )
 
@@ -12,11 +11,12 @@ set(HEADER_FILES
   rosterhandler.h
   vcardhandler.h
   discoveryhandler.h
-  omemohandler.h
   trusthandler.h
 )
 
-target_sources(squawk PRIVATE
-    ${SOURCE_FILES}
-    ${HEADER_FILES}
-)
+if(WITH_OMEMO)
+  list(APPEND SOURCE_FILES omemohandler.cpp)
+  list(APPEND HEADER_FILES omemohandler.h)
+endif()
+
+target_sources(squawk PRIVATE ${SOURCE_FILES})