This commit is contained in:
Blue 2020-07-29 23:26:56 +03:00
parent 480c78cf61
commit a543eb1aef
7 changed files with 12 additions and 11 deletions

View File

@ -1,6 +1,6 @@
# Changelog # Changelog
## Squawk 0.1.5 (UNRELEASED) ## Squawk 0.1.5 (Jul 29, 2020)
### Bug fixes ### Bug fixes
- error with sending attached files to the conference - error with sending attached files to the conference
- error with building on lower versions of QXmpp - error with building on lower versions of QXmpp
@ -8,6 +8,7 @@
- quit now actually quits the app - quit now actually quits the app
- history in MUC now works properly and requests messages from server - history in MUC now works properly and requests messages from server
- error with handling non lower cased JIDs - error with handling non lower cased JIDs
- some workaround upon reconnection
## Squawk 0.1.4 (Apr 14, 2020) ## Squawk 0.1.4 (Apr 14, 2020)

View File

@ -334,7 +334,7 @@ void Core::NetworkAccess::startDownload(const QString& messageId, const QString&
QNetworkRequest req(url); QNetworkRequest req(url);
dwn->reply = manager->get(req); dwn->reply = manager->get(req);
connect(dwn->reply, &QNetworkReply::downloadProgress, this, &NetworkAccess::onDownloadProgress); connect(dwn->reply, &QNetworkReply::downloadProgress, this, &NetworkAccess::onDownloadProgress);
connect(dwn->reply, qOverload<QNetworkReply::NetworkError>(&QNetworkReply::error), this, &NetworkAccess::onDownloadError); connect(dwn->reply, qOverload<QNetworkReply::NetworkError>(&QNetworkReply::errorOccurred), this, &NetworkAccess::onDownloadError);
connect(dwn->reply, &QNetworkReply::finished, this, &NetworkAccess::onDownloadFinished); connect(dwn->reply, &QNetworkReply::finished, this, &NetworkAccess::onDownloadFinished);
downloads.insert(std::make_pair(url, dwn)); downloads.insert(std::make_pair(url, dwn));
emit downloadFileProgress(messageId, 0); emit downloadFileProgress(messageId, 0);
@ -414,7 +414,7 @@ void Core::NetworkAccess::startUpload(const QString& messageId, const QString& u
upl->reply = manager->put(req, file); upl->reply = manager->put(req, file);
connect(upl->reply, &QNetworkReply::uploadProgress, this, &NetworkAccess::onUploadProgress); connect(upl->reply, &QNetworkReply::uploadProgress, this, &NetworkAccess::onUploadProgress);
connect(upl->reply, qOverload<QNetworkReply::NetworkError>(&QNetworkReply::error), this, &NetworkAccess::onUploadError); connect(upl->reply, qOverload<QNetworkReply::NetworkError>(&QNetworkReply::errorOccurred), this, &NetworkAccess::onUploadError);
connect(upl->reply, &QNetworkReply::finished, this, &NetworkAccess::onUploadFinished); connect(upl->reply, &QNetworkReply::finished, this, &NetworkAccess::onUploadFinished);
uploads.insert(std::make_pair(url, upl)); uploads.insert(std::make_pair(url, upl));
emit downloadFileProgress(messageId, 0); emit downloadFileProgress(messageId, 0);
@ -490,7 +490,7 @@ void Core::NetworkAccess::uploadFile(const QString& messageId, const QString& pa
upl->reply = manager->put(req, file); upl->reply = manager->put(req, file);
connect(upl->reply, &QNetworkReply::uploadProgress, this, &NetworkAccess::onUploadProgress); connect(upl->reply, &QNetworkReply::uploadProgress, this, &NetworkAccess::onUploadProgress);
connect(upl->reply, qOverload<QNetworkReply::NetworkError>(&QNetworkReply::error), this, &NetworkAccess::onUploadError); connect(upl->reply, qOverload<QNetworkReply::NetworkError>(&QNetworkReply::errorOccurred), this, &NetworkAccess::onUploadError);
connect(upl->reply, &QNetworkReply::finished, this, &NetworkAccess::onUploadFinished); connect(upl->reply, &QNetworkReply::finished, this, &NetworkAccess::onUploadFinished);
uploads.insert(std::make_pair(put.toString(), upl)); uploads.insert(std::make_pair(put.toString(), upl));
emit downloadFileProgress(messageId, 0); emit downloadFileProgress(messageId, 0);

View File

@ -42,7 +42,7 @@ int main(int argc, char *argv[])
QApplication::setApplicationName("squawk"); QApplication::setApplicationName("squawk");
QApplication::setApplicationDisplayName("Squawk"); QApplication::setApplicationDisplayName("Squawk");
QApplication::setApplicationVersion("0.1.4"); QApplication::setApplicationVersion("0.1.5");
QTranslator qtTranslator; QTranslator qtTranslator;
qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));

View File

@ -1,6 +1,6 @@
# Maintainer: Yury Gubich <blue@macaw.me> # Maintainer: Yury Gubich <blue@macaw.me>
pkgname=squawk pkgname=squawk
pkgver=0.1.4 pkgver=0.1.5
pkgrel=1 pkgrel=1
pkgdesc="An XMPP desktop messenger, written on pure c++ (qt)" pkgdesc="An XMPP desktop messenger, written on pure c++ (qt)"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
@ -11,7 +11,7 @@ makedepends=('cmake>=3.3' 'imagemagick' 'qt5-tools')
optdepends=('kwallet: secure password storage (requires rebuild)') optdepends=('kwallet: secure password storage (requires rebuild)')
source=("$pkgname-$pkgver.tar.gz") source=("$pkgname-$pkgver.tar.gz")
sha256sums=('3b290381eaf15a35d24a58a36c29eee375a4ea77b606124982a063d7ecf98870') sha256sums=('e1a4c88be9f0481d2aa21078faf42fd0e9d66b490b6d8af82827d441cb58df25')
build() { build() {
cd "$srcdir/squawk" cd "$srcdir/squawk"
cmake . -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release cmake . -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release

View File

@ -48,7 +48,7 @@ void SignalCatcher::handleSigInt()
{ {
snInt->setEnabled(false); snInt->setEnabled(false);
char tmp; char tmp;
::read(sigintFd[1], &tmp, sizeof(tmp)); ssize_t s = ::read(sigintFd[1], &tmp, sizeof(tmp));
app->quit(); app->quit();
@ -58,7 +58,7 @@ void SignalCatcher::handleSigInt()
void SignalCatcher::intSignalHandler(int unused) void SignalCatcher::intSignalHandler(int unused)
{ {
char a = 1; char a = 1;
::write(sigintFd[0], &a, sizeof(a)); ssize_t s = ::write(sigintFd[0], &a, sizeof(a));
} }
int SignalCatcher::setup_unix_signal_handlers() int SignalCatcher::setup_unix_signal_handlers()

View File

@ -308,7 +308,7 @@ void Models::Roster::updateAccount(const QString& account, const QString& field,
Qt::ItemFlags Models::Roster::flags(const QModelIndex& index) const Qt::ItemFlags Models::Roster::flags(const QModelIndex& index) const
{ {
if (!index.isValid()) { if (!index.isValid()) {
return 0; return Qt::ItemFlags();
} }
return QAbstractItemModel::flags(index); return QAbstractItemModel::flags(index);

View File

@ -84,7 +84,7 @@ QLayoutItem *FlowLayout::takeAt(int index)
Qt::Orientations FlowLayout::expandingDirections() const Qt::Orientations FlowLayout::expandingDirections() const
{ {
return 0; return Qt::Orientations();
} }
bool FlowLayout::hasHeightForWidth() const bool FlowLayout::hasHeightForWidth() const