forked from blue/squawk
fix: omitting from attribute not to wreck the stream
fix: build without kwallet
This commit is contained in:
parent
9a44ae1fa5
commit
3cce057545
@ -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(acc->getFullJid(), data.getTo(), data.getBody(), data.getThread());
|
||||
QXmppMessage msg(QString(), data.getTo(), data.getBody(), data.getThread());
|
||||
QString id(data.getId());
|
||||
|
||||
if (originalId.size() > 0)
|
||||
|
@ -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);
|
||||
|
@ -137,12 +137,13 @@ 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,
|
||||
|
Loading…
Reference in New Issue
Block a user