[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/kresources/kolab/kcal
From:       Till Adam <adam () kde ! org>
Date:       2004-12-16 8:51:15
Message-ID: 20041216085115.6DC141BED2 () office ! kde ! org
[Download RAW message or body]

CVS commit by tilladam: 

Make sure the KOrganizer end is also updated when re-adding incidences
after conflict resolution.


  M +8 -6      resourcekolab.cpp   1.22


--- kdepim/kresources/kolab/kcal/resourcekolab.cpp  #1.21:1.22
@@ -341,10 +341,12 @@ void ResourceKolab::resolveConflict( KCa
       deleteIncidence( local ); // remove local from kmail
       kmailDeleteIncidence( subresource, sernum );// remove new from kmail
-      mSilent = true;
-      deleteIncidence( local ); // remove local from calendar and from the uid map
-      mSilent = false; // now we can add the new ones
-      if ( localIncidence ) addIncidence( localIncidence, subresource, 0  );
-      if ( addedIncidence  ) addIncidence( addedIncidence, subresource, 0  );
-
+      if ( localIncidence ) { 
+        addIncidence( localIncidence, subresource, 0  );
+        mUidsPendingAdding.remove( localIncidence->uid() ); // we do want to inform KOrg also
+      }
+      if ( addedIncidence  ) {
+        addIncidence( addedIncidence, subresource, 0  );
+        mUidsPendingAdding.remove( addedIncidence->uid() ); // we do want to inform KOrg also
+      }
       mSilent = silent;
   }


[prev in list] [next in list] [prev in thread] [next in thread]