rev 4357 - trunk/packages/kdepim/debian/patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-08-19 13:50:33 +0000 (Sat, 19 Aug 2006)
New Revision: 4357

Modified:
   trunk/packages/kdepim/debian/patches/15_kdepim_debug.diff
Log:
Sync patch with latest upstream version (from a few days ago, IIRC).


Modified: trunk/packages/kdepim/debian/patches/15_kdepim_debug.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/15_kdepim_debug.diff	2006-08-19 13:41:14 UTC (rev 4356)
+++ trunk/packages/kdepim/debian/patches/15_kdepim_debug.diff	2006-08-19 13:50:33 UTC (rev 4357)
@@ -1,6 +1,5 @@
-diff -Nur kdepim-3.5.4/kmail/kmfoldercachedimap.cpp kdepim-3.5.4.new/kmail/kmfoldercachedimap.cpp
---- kdepim-3.5.4/kmail/kmfoldercachedimap.cpp	2006-08-18 16:00:56.000000000 +0200
-+++ kdepim-3.5.4.new/kmail/kmfoldercachedimap.cpp	2006-08-18 16:35:10.000000000 +0200
+--- kde.orig/kmail/kmfoldercachedimap.cpp
++++ kde.patched/kmail/kmfoldercachedimap.cpp
 @@ -75,6 +75,7 @@
  #include <globalsettings.h>
  
@@ -99,7 +98,7 @@
             highes uid seen thus far. */
          slotUpdateLastUid();
 -        if( mLastUid == 0 && uidWriteTimer == -1 )
-+	if( mLastUid == 0 && uidWriteTimer == -1 ) {
++        if( mLastUid == 0 && uidWriteTimer == -1 ) {
            // This is probably a new and empty folder. Write the UID cache
 -          writeUidCache();
 +          if ( writeUidCache() == -1 ) {
@@ -127,7 +126,7 @@
      }
    }
  }
-@@ -1288,14 +1323,23 @@
+@@ -1288,15 +1323,24 @@
    // them one by one because the index list can get resized under
    // us. So use msg pointers instead
  
@@ -143,15 +142,17 @@
    }
  
    if( !msgsForDeletion.isEmpty() ) {
+-    removeMsg( msgsForDeletion );
 +#ifdef MAIL_LOSS_DEBUGGING
-+    if ( KMessageBox::warningYesNo(
-+      0, i18n( "<qt><p>Mails on the server in folder <b>%1</b> were deleted. "
-+      "Do you want to delete them locally?<br>UIDs: %2</p></qt>" )
-+      .arg( folder()->prettyURL() ).arg( uids.join(",") ) ) == KMessageBox::Yes )
++      if ( KMessageBox::warningYesNo(
++             0, i18n( "<qt><p>Mails on the server in folder <b>%1</b> were deleted. "
++                 "Do you want to delete them locally?<br>UIDs: %2</p></qt>" )
++             .arg( folder()->prettyURL() ).arg( uids.join(",") ) ) == KMessageBox::Yes )
 +#endif
-     removeMsg( msgsForDeletion );
++        removeMsg( msgsForDeletion );
    }
  
+   /* Delete messages from the server that we dont have anymore */
 @@ -1370,6 +1414,8 @@
    uidsForDeletionOnServer.clear();
    mMsgsForDownload.clear();
@@ -183,18 +184,17 @@
  {
    mProgress += 10;
 +  if ( !job->error() && !mFoundAnIMAPDigest ) {
-+    kdWarning(5006) << "######## Folderlisting did not complete, but there was no error! "
-+    "Aborting sync of folder: " << folder()->prettyURL() << endl;
++      kdWarning(5006) << "######## Folderlisting did not complete, but there was no error! "
++          "Aborting sync of folder: " << folder()->prettyURL() << endl;
 +#ifdef MAIL_LOSS_DEBUGGING
-+    kmkernel->emergencyExit( i18n("Folder listing failed in interesting ways." ) );
++      kmkernel->emergencyExit( i18n("Folder listing failed in interesting ways." ) );
 +#endif
 +  }
    if( job->error() ) { // error listing messages but the user chose to continue
      mContentState = imapNoInformation;
      mSyncState = SYNC_STATE_HANDLE_INBOX; // be sure not to continue in this folder
-diff -Nur kdepim-3.5.4/kmail/kmfoldercachedimap.h kdepim-3.5.4.new/kmail/kmfoldercachedimap.h
---- kdepim-3.5.4/kmail/kmfoldercachedimap.h	2005-10-10 17:02:11.000000000 +0200
-+++ kdepim-3.5.4.new/kmail/kmfoldercachedimap.h	2006-08-18 16:36:12.000000000 +0200
+--- kde.orig/kmail/kmfoldercachedimap.h
++++ kde.patched/kmail/kmfoldercachedimap.h
 @@ -445,6 +445,11 @@
        mLastUid. See above for details. */
    ulong mTentativeHighestUid;