core/handlers/messagehandler.cpp

@@ -431,7 +431,7 @@ QMap<QString, QVariant> Core::MessageHandler::getChanges(Shared::Message& data,
 }
 
 QXmppMessage Core::MessageHandler::createPacket(const Shared::Message& data, const QDateTime& time, const QString& originalId) const {
-    QXmppMessage msg(QString(), data.getTo(), data.getBody(), data.getThread());
+    QXmppMessage msg(acc->getFullJid(), data.getTo(), data.getBody(), data.getThread());
     QString id(data.getId());
 
     if (originalId.size() > 0)

core/squawk.cpp

@@ -33,10 +33,10 @@ Core::Squawk::Squawk(QObject* parent):
     state(Shared::Availability::offline),
     network(),
     isInitialized(false),
+    clientCache(),
 #ifdef WITH_KWALLET
-    kwallet(),
+    kwallet()
 #endif
-    clientCache()
 {
     connect(&network, &NetworkAccess::loadFileProgress, this, &Squawk::fileProgress);
     connect(&network, &NetworkAccess::loadFileError, this, &Squawk::fileError);

core/squawk.h

@@ -137,13 +137,12 @@ private:
     Shared::Availability state;
     NetworkAccess network;
     bool isInitialized;
+    ClientCache clientCache;
 
 #ifdef WITH_KWALLET
     PSE::KWallet kwallet;
 #endif
     
-    ClientCache clientCache;
-    
 private slots:
     void addAccount(
         const QString& login, 

shared/defines.h

@@ -16,6 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#pragma once
+#ifndef SHARED_DEFINES_H
+#define SHARED_DEFINES_H
 
 #define SHARED_UNUSED(x) (void)(x)
+
+#endif

shared/global.cpp

@@ -19,7 +19,6 @@
 #include "global.h"
 #include <QFontDatabase>
 
-#include "defines.h"
 #include "enums.h"
 #include "ui/models/roster.h"
 
@@ -362,32 +361,27 @@ void Shared::Global::highlightInFileManager(const QString& path)
 }
 
 QIcon Shared::Global::createThemePreview(const QString& path) {
-#ifdef WITH_KCONFIG
     if (supported("colorSchemeTools")) {
         QIcon* icon = createPreview(path);
         QIcon localIcon = *icon;
         deletePreview(icon);
         return localIcon;
-    }
-#endif
-
+    } else {
         return QIcon();
     }
+}
 
 QString Shared::Global::getColorSchemeName(const QString& path) {
-#ifdef WITH_KCONFIG
     if (supported("colorSchemeTools")) {
         QString res;
         colorSchemeName(path, res);
         return res;
-    }
-#endif
-
+    } else {
         return "";
     }
+}
 
 void Shared::Global::setTheme(const QString& path) {
-#ifdef WITH_KCONFIG
     if (supported("colorSchemeTools")) {
         if (path.toLower() == "system") {
             QApplication::setPalette(getInstance()->defaultSystemPalette);
@@ -397,10 +391,6 @@ void Shared::Global::setTheme(const QString& path) {
             QApplication::setPalette(pallete);
         }
     }
-#else
-    SHARED_UNUSED(path);
-    qDebug("setTheme() was called, but this version of squawk was compiled without KConfig support, ignoring");
-#endif
 }
 
 void Shared::Global::setStyle(const QString& style) {