From a8698cc94f934b3ecf0621fdab225eed7c61f5a9 Mon Sep 17 00:00:00 2001
From: blue <blue@macaw.me>
Date: Wed, 15 Apr 2020 20:27:38 +0300
Subject: [PATCH] minor bugfixes

---
 CHANGELOG.md              |  8 ++++++++
 core/account.cpp          |  2 +-
 translations/squawk.ru.ts | 12 ++++--------
 ui/squawk.cpp             |  2 +-
 ui/utils/messageline.cpp  | 18 +++++++-----------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c328fb5..d61aaf2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## Squawk 0.1.5 (UNRELEASED)
+### Bug fixes
+- error with sending attached files to the conference
+- error with building on lower versions of QXmpp
+- error on the first access to the conference database
+- quit now actually quits the app
+
+
 ## Squawk 0.1.4 (Apr 14, 2020)
 ### New features
 - message line now is in the same window with roster (new window dialog is still able to opened on context menu)
diff --git a/core/account.cpp b/core/account.cpp
index 4c251f7..9ef85ee 100644
--- a/core/account.cpp
+++ b/core/account.cpp
@@ -1141,7 +1141,7 @@ void Core::Account::onClientError(QXmppClient::Error err)
                 case QXmppStanza::Error::UnexpectedRequest:
                     errorText = "Unexpected request";
                     break;
-#if (QXMPP_VERSION) >= QT_VERSION_CHECK(1, 1, 0)
+#if (QXMPP_VERSION) >= QT_VERSION_CHECK(1, 3, 0)
                 case QXmppStanza::Error::PolicyViolation:
                     errorText = "Policy violation";
                     break;
diff --git a/translations/squawk.ru.ts b/translations/squawk.ru.ts
index c425d52..e3b4d52 100644
--- a/translations/squawk.ru.ts
+++ b/translations/squawk.ru.ts
@@ -383,10 +383,6 @@ p, li { white-space: pre-wrap; }
         <source>Download</source>
         <translation>Скачать</translation>
     </message>
-    <message>
-        <source>Push the button to daownload the file</source>
-        <translation>Нажмите на кнопку что бы загрузить файл</translation>
-    </message>
     <message>
         <source>Error uploading file: %1
 You can try again</source>
@@ -409,6 +405,10 @@ You can try again</source>
         <source>Uploading...</source>
         <translation>Загружается...</translation>
     </message>
+    <message>
+        <source>Push the button to download the file</source>
+        <translation>Нажмите на кнопку что бы загрузить файл</translation>
+    </message>
 </context>
 <context>
     <name>Models::Room</name>
@@ -548,10 +548,6 @@ You can try again</source>
         <source>Add conference</source>
         <translation>Присоединиться к беседе</translation>
     </message>
-    <message>
-        <source>Contact list</source>
-        <translation>Список контактов</translation>
-    </message>
     <message>
         <source>Disconnect</source>
         <translation>Отключить</translation>
diff --git a/ui/squawk.cpp b/ui/squawk.cpp
index a808dff..26d69e0 100644
--- a/ui/squawk.cpp
+++ b/ui/squawk.cpp
@@ -54,6 +54,7 @@ Squawk::Squawk(QWidget *parent) :
     connect(m_ui->actionAccounts, &QAction::triggered, this, &Squawk::onAccounts);
     connect(m_ui->actionAddContact, &QAction::triggered, this, &Squawk::onNewContact);
     connect(m_ui->actionAddConference, &QAction::triggered, this, &Squawk::onNewConference);
+    connect(m_ui->actionQuit, &QAction::triggered, this, &Squawk::close);
     connect(m_ui->comboBox, qOverload<int>(&QComboBox::activated), this, &Squawk::onComboboxActivated);
     //connect(m_ui->roster, &QTreeView::doubleClicked, this, &Squawk::onRosterItemDoubleClicked);
     connect(m_ui->roster, &QTreeView::customContextMenuRequested, this, &Squawk::onRosterContextMenu);
@@ -64,7 +65,6 @@ Squawk::Squawk(QWidget *parent) :
     connect(contextMenu, &QMenu::aboutToHide, this, &Squawk::onContextAboutToHide);
     //m_ui->mainToolBar->addWidget(m_ui->comboBox);
     
-    setWindowTitle(tr("Contact list"));
     if (testAttribute(Qt::WA_TranslucentBackground)) {
         m_ui->roster->viewport()->setAutoFillBackground(false);
     }
diff --git a/ui/utils/messageline.cpp b/ui/utils/messageline.cpp
index 0ef5f07..fec0037 100644
--- a/ui/utils/messageline.cpp
+++ b/ui/utils/messageline.cpp
@@ -369,16 +369,12 @@ void MessageLine::responseLocalFile(const QString& messageId, const QString& pat
                     if (muItr != uploadPaths.end()) {
                         uploadPaths.erase(muItr);
                     }
-                    if (room) {
-                        removeMessage(messageId);
-                    } else {
-                        Shared::Message msg = itr->second->getMessage();
-                        removeMessage(messageId);
-                        msg.setCurrentTime();
-                        message(msg);
-                        itr = messageIndex.find(messageId);
-                        itr->second->showFile(path);
-                    }
+                    Shared::Message msg = itr->second->getMessage();
+                    removeMessage(messageId);
+                    msg.setCurrentTime();
+                    message(msg);
+                    itr = messageIndex.find(messageId);
+                    itr->second->showFile(path);
                 } else {
                     itr->second->showFile(path); //then it is already cached file
                 }
@@ -387,7 +383,7 @@ void MessageLine::responseLocalFile(const QString& messageId, const QString& pat
             if (uItr == uploading.end()) {
                 const Shared::Message& msg = itr->second->getMessage();
                 itr->second->addButton(QIcon::fromTheme("download"), tr("Download"), "<a href=\"" + msg.getOutOfBandUrl() + "\">" + msg.getOutOfBandUrl() + "</a>");
-                itr->second->showComment(tr("Push the button to daownload the file"));
+                itr->second->showComment(tr("Push the button to download the file"));
             } else {
                 qDebug() << "An unhandled state for file uploading - empty path";
             }