From b25420b286984a991bf116271e7ae2a289d8f7df Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Wed, 16 Nov 2016 22:20:12 +0100 Subject: [PATCH 1/3] UI strings: fix spelling and structure --- ktnef/src/ui/attachpropertywidgetbase.ui | 2 +- src/kmreaderwin.cpp | 2 +- src/ui/securitypagegeneraltab.ui | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ktnef/src/ui/attachpropertywidgetbase.ui b/ktnef/src/ui/attachpropertywidgetbase.ui index 7b2a2dc26..6e0c054ca 100644 --- a/ktnef/src/ui/attachpropertywidgetbase.ui +++ b/ktnef/src/ui/attachpropertywidgetbase.ui @@ -196,7 +196,7 @@ - Mime type: + MIME type: false diff --git a/src/kmreaderwin.cpp b/src/kmreaderwin.cpp index edf39697c..e8f1d25e3 100644 --- a/src/kmreaderwin.cpp +++ b/src/kmreaderwin.cpp @@ -288,7 +288,7 @@ static const char *const kmailNewFeatures[] = { I18N_NOOP("Less GUI freezes, mail checks happen in the background"), I18N_NOOP("Plugins support"), I18N_NOOP("New HTML renderer (QtWebEngine)"), - I18N_NOOP("Check Phishing Url added"), + I18N_NOOP("Added Check for Phishing URL"), }; static const int numKMailNewFeatures = sizeof kmailNewFeatures / sizeof * kmailNewFeatures; diff --git a/src/ui/securitypagegeneraltab.ui b/src/ui/securitypagegeneraltab.ui index 0f7dc85d6..5b8595983 100644 --- a/src/ui/securitypagegeneraltab.ui +++ b/src/ui/securitypagegeneraltab.ui @@ -157,7 +157,7 @@ - Check Url With Phishing Google System + Check URL With Phishing Google System From 792f18bff1413b491bfc340bf834eb6d8720bf30 Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Thu, 17 Nov 2016 16:34:13 +0100 Subject: [PATCH 2/3] Don't crash when gnupg is not installed QGpgME::openpgp() returns NULL if gnupg is not installed or broken. --- src/editor/kmcomposerwin.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp index 55c2808fe..97bb71fe6 100644 --- a/src/editor/kmcomposerwin.cpp +++ b/src/editor/kmcomposerwin.cpp @@ -3317,6 +3317,12 @@ void KMComposerWin::slotRecipientAdded(MessageComposer::RecipientLineNG *line) return; } + const auto protocol = QGpgME::openpgp(); + // If we don't have gnupg we can't look for keys + if (!protocol) { + return; + } + auto recipient = line->data().dynamicCast(); // check if is an already running key lookup job and if so, cancel it // this is to prevent a slower job overwriting results of the job that we @@ -3328,7 +3334,6 @@ void KMComposerWin::slotRecipientAdded(MessageComposer::RecipientLineNG *line) line->setProperty("keyLookupJob", QVariant()); } - const auto protocol = QGpgME::openpgp(); QGpgME::KeyForMailboxJob *job = protocol->keyForMailboxJob(); if (!job) { line->setProperty("keyStatus", NoKey); From c223fb2edeaa374b2f7de6ab1c962e1817900f6b Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Thu, 17 Nov 2016 22:51:24 +0100 Subject: [PATCH 3/3] Fix Bug 354055 - system freeze when trying to send email via ctrl + return with "spellcheck before send" activated FIXED-IN: 5.4.0 BUG: 354055 --- src/editor/kmcomposerwin.cpp | 7 ++++++- src/editor/kmcomposerwin.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp index 97bb71fe6..a8fd45f79 100644 --- a/src/editor/kmcomposerwin.cpp +++ b/src/editor/kmcomposerwin.cpp @@ -394,7 +394,7 @@ KMComposerWin::KMComposerWin(const KMime::Message::Ptr &aMsg, bool lastSignState connect(editor, &KMComposerEditorNg::languageChanged, this, &KMComposerWin::slotDictionaryLanguageChanged); connect(editor, &KMComposerEditorNg::spellCheckStatus, this, &KMComposerWin::slotSpellCheckingStatus); connect(editor, &KMComposerEditorNg::insertModeChanged, this, &KMComposerWin::slotOverwriteModeChanged); - connect(editor, &KMComposerEditorNg::spellCheckingFinished, this, &KMComposerWin::slotCheckSendNow); + connect(editor, &KMComposerEditorNg::spellCheckingFinished, this, &KMComposerWin::slotDelayedCheckSendNow); mSnippetWidget = new SnippetWidget(editor, actionCollection(), mSnippetSplitter); mSnippetWidget->setVisible(KMailSettings::self()->showSnippetManager()); mSnippetSplitter->addWidget(mSnippetWidget); @@ -2725,6 +2725,11 @@ void KMComposerWin::slotCheckSendNowStep2() } } +void KMComposerWin::slotDelayedCheckSendNow() +{ + QTimer::singleShot(0, this, &KMComposerWin::slotCheckSendNow); +} + void KMComposerWin::slotCheckSendNow() { PotentialPhishingEmailJob *job = new PotentialPhishingEmailJob(this); diff --git a/src/editor/kmcomposerwin.h b/src/editor/kmcomposerwin.h index 516beee97..44c279aac 100644 --- a/src/editor/kmcomposerwin.h +++ b/src/editor/kmcomposerwin.h @@ -419,6 +419,7 @@ private Q_SLOTS: void slotRecipientFocusLost(MessageComposer::RecipientLineNG *line); void slotKeyForMailBoxResult(const GpgME::KeyListResult &result, const GpgME::Key &key, const GpgME::UserID &userID); + void slotDelayedCheckSendNow(); public: // kmcommand void addAttach(KMime::Content *msgPart) Q_DECL_OVERRIDE;