* 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

1 files changed, 7 insertions, 1 deletions

diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index 2aeba830..a8a6bdb0 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -59,6 +59,10 @@ IncidenceBase::IncidenceBase(const IncidenceBase &i) :
   mSyncStatus = i.mSyncStatus;
   mComments = i.mComments;
 
+  // The copied object is a new one, so it isn't observed by the observer
+  // of the original object.
+  mObservers.clear();
+
   mAttendees.setAutoDelete( true );
 }
 
@@ -404,7 +408,9 @@ void IncidenceBase::updated()
   while( it.current() ) {
     Observer *o = it.current();
     ++it;
-    o->incidenceUpdated( this );
+    if ( o ) {
+      o->incidenceUpdated( this );
+    }
   }
 }