openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File r894576.diff of Package kdepim4

Subject: kmail: attachments check fix
From: wstephenson@suse.de
Bug: 
Patch-upstream: 894576
--- kmail/kmcomposewin.cpp	(revision 894575)
+++ kmail/kmcomposewin.cpp	(revision 894576)
@@ -1928,6 +1928,9 @@ bool KMComposeWin::userForgotAttachment(
   }
 
   QStringList attachWordsList = GlobalSettings::self()->attachmentKeywords();
+  if ( attachWordsList.isEmpty() ) {
+    return false;
+  }
 
   if ( attachWordsList.isEmpty() ) {
     // default value (FIXME: this is duplicated in configuredialog.cpp)
@@ -1949,8 +1952,7 @@ bool KMComposeWin::userForgotAttachment(
   // check whether the subject contains one of the attachment key words
   // unless the message is a reply or a forwarded message
   QString subj = subject();
-  gotMatch = ( KMMessage::stripOffPrefixes( subj ) == subj )
-    && ( rx.indexIn( subj ) >= 0 );
+  gotMatch = ( KMMessage::stripOffPrefixes( subj ) == subj ) && ( rx.indexIn( subj ) >= 0 );
 
   if ( !gotMatch ) {
     // check whether the non-quoted text contains one of the attachment key
Index: kmail/kmcomposewin.cpp
===================================================================

Places

File r894576.diff of Package kdepim4

Places