Merge remote-tracking branch 'origin/Applications/16.12'

ktnef/src/ui/attachpropertywidgetbase.ui

@@ -196,7 +196,7 @@
    <item row="3" column="0" colspan="2">
     <widget class="QLabel" name="mMimeLabel">
      <property name="text">
-      <string>Mime type:</string>
+      <string>MIME type:</string>
      </property>
      <property name="wordWrap">
       <bool>false</bool>

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);
@@ -3317,6 +3322,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<MessageComposer::Recipient>();
     // 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 +3339,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);

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;
 

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;

src/ui/securitypagegeneraltab.ui

@@ -157,7 +157,7 @@
       <item>
        <widget class="QCheckBox" name="mCheckUrl">
         <property name="text">
-         <string>Check Url With Phishing Google System</string>
+         <string>Check URL With Phishing Google System</string>
         </property>
        </widget>
       </item>