[Knode-devel] kdepim/knode

[Volker Krause]

CVS commit by vkrause: 

Switch back to the composer if the user cancels the GPG signing instead of silently sending the article without signing.

CCMAIL: 50099-done at bugs.kde.org


  M +4 -0      knarticlefactory.cpp   1.76
  M +2 -2      kncomposer.cpp   1.198


--- kdepim/knode/knarticlefactory.cpp  #1.75:1.76
@@ -1013,4 +1013,6 @@ void KNArticleFactory::slotComposerDone(
         if ( com->applyChanges() )
           sendArticles(&lst, true);
+        else
+          delCom = false;
       }
     break;
@@ -1021,4 +1023,6 @@ void KNArticleFactory::slotComposerDone(
         if ( com->applyChanges() )
           sendArticles(&lst, false);
+        else
+          delCom = false;
       }
     break;

--- kdepim/knode/kncomposer.cpp  #1.197:1.198
@@ -58,5 +58,4 @@ using KRecentAddress::RecentAddresses;
 #include "knaccountmanager.h"
 #include "knnntpaccount.h"
-#include <kpgp.h>
 #include "knarticlefactory.h"
 #include <kstatusbar.h>
@@ -64,5 +63,4 @@ using KRecentAddress::RecentAddresses;
 #include <qpopupmenu.h>
 #include <spellingfilter.h>
-#include <qcursor.h>
 #include <kstdguiitem.h>
 
@@ -844,4 +842,6 @@ bool KNComposer::applyChanges()
               QCString result = block.text();
               tmp = codec->toUnicode(result.data(), result.length() );
+          } else {
+              return false;
           }
       }