summaryrefslogtreecommitdiffstats
path: root/kmail/kmmsgdict.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /kmail/kmmsgdict.cpp
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* 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
Diffstat (limited to 'kmail/kmmsgdict.cpp')
-rw-r--r--kmail/kmmsgdict.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/kmail/kmmsgdict.cpp b/kmail/kmmsgdict.cpp
index bedc3bb44..8f9a9551c 100644
--- a/kmail/kmmsgdict.cpp
+++ b/kmail/kmmsgdict.cpp
@@ -458,8 +458,15 @@ int KMMsgDict::readFolderIds( FolderStorage& storage )
return -1;
}
- //if (!msn)
- //kdDebug(5006) << "Dict found zero serial number in folder " << folder->label() << endl;
+ // We found a serial number that is zero. This is not allowed, and would
+ // later cause problems like in bug 149715.
+ // Therefore, use a fresh serial number instead
+ if ( msn == 0 ) {
+ kdWarning(5006) << "readFolderIds(): Found serial number zero at index " << index
+ << " in folder " << filename << endl;
+ msn = getNextMsgSerNum();
+ Q_ASSERT( msn != 0 );
+ }
// Insert into the dict. Don't use dict->replace() as we _know_
// there is no entry with the same msn, we just made sure.
@@ -556,6 +563,10 @@ int KMMsgDict::writeFolderIds( const FolderStorage &storage )
Q_UINT32 msn = rentry->getMsn(index);
if (!fwrite(&msn, sizeof(msn), 1, fp))
return -1;
+ if ( msn == 0 ) {
+ kdWarning(5006) << "writeFolderIds(): Serial number of message at index "
+ << index << " is zero in folder " << storage.label() << endl;
+ }
}
rentry->sync();