* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 6 insertions, 0 deletions

diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp
index ade08b1d..0ce073d9 100644
--- a/kmail/sievejob.cpp
+++ b/kmail/sievejob.cpp
@@ -275,6 +275,12 @@ namespace KMail {
     return new SieveJob( url, TQString::null, commands );
   }
 
+  SieveJob * SieveJob::desactivate( const KURL & url ) {
+    TQValueStack<Command> commands;
+    commands.push( Deactivate );
+    return new SieveJob( url, TQString(), commands );
+  }
+
   SieveJob * SieveJob::activate( const KURL & url ) {
     TQValueStack<Command> commands;
     commands.push( Activate );