From ac4377c0ba1114c4153a272c4b38ab11a2ed560c Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Mon, 7 Dec 2020 07:47:26 +0100
Subject: [PATCH] Fix conversion of newlines in gmail plugin.

---
 src/librssguard/gui/dialogs/formmain.cpp           | 13 +++++++++++++
 src/librssguard/gui/dialogs/formmain.h             | 14 ++++----------
 .../services/gmail/network/gmailnetworkfactory.cpp |  1 -
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/librssguard/gui/dialogs/formmain.cpp b/src/librssguard/gui/dialogs/formmain.cpp
index 6ec4e62d0..77f46faa4 100755
--- a/src/librssguard/gui/dialogs/formmain.cpp
+++ b/src/librssguard/gui/dialogs/formmain.cpp
@@ -379,6 +379,7 @@ void FormMain::updateAccountsMenu() {
 
 void FormMain::onFeedUpdatesFinished(const FeedDownloadResults& results) {
   Q_UNUSED(results)
+
   statusBar()->clearProgressFeeds();
   tabWidget()->feedMessageViewer()->messagesView()->reloadSelections();
 }
@@ -821,6 +822,18 @@ void FormMain::changeEvent(QEvent* event) {
   QMainWindow::changeEvent(event);
 }
 
+void FormMain::closeEvent(QCloseEvent* event) {
+  QMainWindow::closeEvent(event);
+
+  qDebugNN << LOGSEC_GUI << "Main window's close event";
+}
+
+void FormMain::hideEvent(QHideEvent* event) {
+  QMainWindow::hideEvent(event);
+
+  qDebugNN << LOGSEC_GUI << "Main window's hide event";
+}
+
 void FormMain::showDocs() {
   if (!qApp->web()->openUrlInExternalBrowser(APP_URL_DOCUMENTATION)) {
     qApp->showGuiMessage(tr("Cannot open external browser"),
diff --git a/src/librssguard/gui/dialogs/formmain.h b/src/librssguard/gui/dialogs/formmain.h
index 0bdeda6a5..3caadd3ea 100644
--- a/src/librssguard/gui/dialogs/formmain.h
+++ b/src/librssguard/gui/dialogs/formmain.h
@@ -17,8 +17,6 @@ class RSSGUARD_DLLSPEC FormMain : public QMainWindow {
   friend class FeedsView;
 
   public:
-
-    // Constructors and destructors.
     explicit FormMain(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowType::Widget);
     virtual ~FormMain();
 
@@ -73,18 +71,14 @@ class RSSGUARD_DLLSPEC FormMain : public QMainWindow {
     void reportABug();
     void donate();
 
-  private:
-
-    // Event handler reimplementations.
+  protected:
     virtual void changeEvent(QEvent* event);
+    virtual void closeEvent(QCloseEvent* event);
+    virtual void hideEvent(QHideEvent* event);
 
-    // Creates all needed menus and sets them up.
+  private:
     void prepareMenus();
-
-    // Creates needed connections for this window.
     void createConnections();
-
-    // Sets up proper icons for this widget.
     void setupIcons();
 
     QScopedPointer<Ui::FormMain> m_ui;
diff --git a/src/librssguard/services/gmail/network/gmailnetworkfactory.cpp b/src/librssguard/services/gmail/network/gmailnetworkfactory.cpp
index 994fec929..43accb3a0 100644
--- a/src/librssguard/services/gmail/network/gmailnetworkfactory.cpp
+++ b/src/librssguard/services/gmail/network/gmailnetworkfactory.cpp
@@ -432,7 +432,6 @@ bool GmailNetworkFactory::fillFullMessage(Message& msg, const QJsonObject& json,
     msg.m_contents = backup_contents;
   }
 
-  msg.m_contents.replace(QSL("\r\n"), QSL("\n")).replace(QL1C('\r'), QL1C('\n')).replace(QL1C('\n'), QSL("<br/>"));
   return true;
 }