let the user [Cancel] from the "how do you want to forward inline messages..." dialog.

svn path=/trunk/KDE/kdepim/; revision=968037

kmcommands.cpp

@@ -1219,11 +1219,15 @@ KMCommand::Result KMForwardCommand::execute()
   if (msgList.count() >= 2) {
     // ask if they want a mime digest forward
 
-    if (KMessageBox::questionYesNo( parentWidget(),
-                                    i18n("Do you want to forward the selected messages as "
-                                         "attachments in one message (as a MIME digest) or as "
-                                         "individual messages?"), QString(), KGuiItem(i18n("Send As Digest")), KGuiItem(i18n("Send Individually")) )
-        == KMessageBox::Yes) {
+    int answer = KMessageBox::questionYesNoCancel(
+                   parentWidget(),
+                   i18n("Do you want to forward the selected messages as "
+                        "attachments in one message (as a MIME digest) or as "
+                        "individual messages?"), QString(),
+                   KGuiItem(i18n("Send As Digest")),
+                   KGuiItem(i18n("Send Individually")) );
+
+    if ( answer == KMessageBox::Yes ) {
       uint id = 0;
       KMMessage *fwdMsg = new KMMessage;
       KMMessagePart *msgPart = new KMMessagePart;
@@ -1288,7 +1292,7 @@ KMCommand::Result KMForwardCommand::execute()
       win->addAttach(msgPart);
       win->show();
       return OK;
-    } else {            // NO MIME DIGEST, Multiple forward
+    } else if ( answer == KMessageBox::No ) {// NO MIME DIGEST, Multiple forward
       uint id = 0;
       QList<KMMessage*> linklist;
       QList<KMMessage*>::const_iterator it;
@@ -1319,6 +1323,9 @@ KMCommand::Result KMForwardCommand::execute()
       win->setCharset("");
       win->show();
       return OK;
+    } else {
+      // user cancelled
+      return OK;
     }
   }