rpms/kdepim/F-11 kdepim-4.3.2-imapMove.patch, NONE, 1.1 kdepim.spec, 1.223, 1.224

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16137/F-11

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.2-imapMove.patch 
Log Message:
fix KMail issues losing messages when renaming folder with disconnected IMAP


kdepim-4.3.2-imapMove.patch:
 cachedimapjob.cpp      |    2 +-
 kmfoldercachedimap.cpp |   10 ++++++++++
 kmfoldercachedimap.h   |   17 +++++++++++++++--
 3 files changed, 26 insertions(+), 3 deletions(-)

--- NEW FILE kdepim-4.3.2-imapMove.patch ---
Index: branches/KDE/4.3/kdepim/kmail/cachedimapjob.cpp
===================================================================
--- branches/KDE/4.3/kdepim/kmail/cachedimapjob.cpp	(revision 1022962)
+++ branches/KDE/4.3/kdepim/kmail/cachedimapjob.cpp	(revision 1022963)
@@ -510,7 +510,7 @@
         bool b = kmkernel->iCalIface().isResourceQuiet();
         kmkernel->iCalIface().setResourceQuiet( true );
 
-        mFolder->take( i );
+        mFolder->takeTemporarily( i );
         mFolder->addMsgKeepUID( mMsg );
         mMsg->setTransferInProgress( false );
 
Index: branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp
===================================================================
--- branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022962)
+++ branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022963)
@@ -527,6 +527,11 @@
   return KMFolderMaildir::take( idx );
 }
 
+void KMFolderCachedImap::takeTemporarily( int idx )
+{
+  KMFolderMaildir::take( idx );
+}
+
 int KMFolderCachedImap::addMsgInternal( KMMessage *msg, bool newMail, int *index_return )
 {
   // Possible optimization: Only dirty if not filtered below
Index: branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.h
===================================================================
--- branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.h	(revision 1022962)
+++ branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.h	(revision 1022963)
@@ -228,10 +228,23 @@
     /** Reimplemented from KMFolder. Moving is not supported, so aParent must be 0. */
     virtual int rename( const QString &aName, KMFolderDir *aParent = 0 );
 
-    /** Reimplemented from KMFolderMaildir */
-    virtual KMMessage *take( int idx );
     bool canDeleteMessages() const;
 
+    /**
+     * Reimplemented from KMFolderMaildir
+     * This deletes the message permanently, also from the server. For this,
+     * rememberDeletion() is called, so that the message can be deleted from
+     * the server on the next sync.
+     */
+    virtual KMMessage* take( int idx );
+
+    /**
+     * Like take(), only that the deletion is not remembered, i.e. the
+     * message will not be deleted from the server. Calling this can cause
+     * inconsistencies, so make sure you re-add the message later!
+     */
+    void takeTemporarily( int idx );
+
     /** Reimplemented from KMFolderMaildir */
     virtual int addMsg( KMMessage *msg, int *index_return = 0 );
 
Index: branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp
===================================================================
--- branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022963)
+++ branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022964)
@@ -1678,6 +1678,11 @@
     job->start();
     return true;
   } else {
+
+    // Nothing to delete on the server, make sure the map is clear again.
+    // Normally this wouldn't be necessary, but there can be stale maps because of
+    // https://issues.kolab.org/issue3833.
+    mDeletedUIDsSinceLastSync.clear();
     return false;
   }
 }


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/F-11/kdepim.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -p -r1.223 -r1.224
--- kdepim.spec	1 Sep 2009 18:10:08 -0000	1.223
+++ kdepim.spec	14 Sep 2009 13:45:24 -0000	1.224
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -15,7 +15,10 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=496988
 Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
-# 4.3.1 upstream 
+# 4.3.1 upstream
+# http://websvn.kde.org/?view=rev&revision=1022963
+# http://websvn.kde.org/?view=rev&revision=1022964
+Patch100: kdepim-4.3.2-imapMove.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -95,6 +98,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
+%patch100 -p4 -b .imapMove
 
 
 %build
@@ -213,6 +217,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 14 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.1-3
+- fix KMail issues losing messages when renaming folder with disconnected IMAP
+
+* Tue Sep 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- rebuild (gnokii)
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1