1 files changed, 5 insertions, 11 deletions

diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index df05ab3..c23978d 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -267,13 +267,10 @@ void ICalFormatImpl::writeIncidence(icalcomponent *parent,Incidence *incidence)
     incidence->setNonKDECustomProperty("X-PILOTID", QString::number(incidence->pilotId()));
     incidence->setNonKDECustomProperty("X-PILOTSTAT", QString::number(incidence->syncStatus()));
   }
-  if (incidence->zaurusId() >= 0) {
-      incidence->setNonKDECustomProperty("X-ZAURUSID", QString::number(incidence->zaurusId()));
+  if ( !incidence->IDStr().isEmpty()) {
+      incidence->setNonKDECustomProperty("X-KOPIEXTID",incidence->IDStr() );
   }
 
-  if (incidence->zaurusUid() > 0) {
-      incidence->setNonKDECustomProperty("X-ZAURUSUID", QString::number(incidence->zaurusUid()));
-  }
 
   writeIncidenceBase(parent,incidence);
   if (incidence->cancelled()) {
@@ -1280,14 +1277,11 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent,Incidence *incidence)
   if (!kp.isNull()) {
     incidence->setSyncStatus(kp.toInt());
   }
-  kp = incidence->nonKDECustomProperty("X-ZAURUSID");
-  if (!kp.isNull()) {
-    incidence->setZaurusId(kp.toInt());
-  }
 
-  kp = incidence->nonKDECustomProperty("X-ZAURUSUID");
+
+  kp = incidence->nonKDECustomProperty("X-KOPIEXTID");
   if (!kp.isNull()) {
-    incidence->setZaurusUid(kp.toInt());
+    incidence->setIDStr(kp);
   }
 
   // Cancel backwards compatibility mode for subsequent changes by the application