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

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdepim/libkcal
From:       Till Adam <adam () kde ! org>
Date:       2004-09-13 21:35:26
Message-ID: 20040913213526.555109426 () office ! kde ! org
[Download RAW message or body]

CVS commit by tilladam: 

setRelatedTo() should not call updated() itself, since it is also used
internally without changing the incidence, so if it notices that its parent
changed, it uses setRelatedToUid() which does call updated() so the 
resource notices the change.


  M +5 -3      incidence.cpp   1.49.2.4


--- kdepim/libkcal/incidence.cpp  #1.49.2.3:1.49.2.4
@@ -265,5 +265,5 @@ QString Incidence::categoriesStr() const
 void Incidence::setRelatedToUid(const QString &relatedToUid)
 {
-  if (mReadOnly) return;
+  if ( mReadOnly || mRelatedToUid == relatedToUid ) return;
   mRelatedToUid = relatedToUid;
   updated();
@@ -281,7 +281,9 @@ void Incidence::setRelatedTo(Incidence *
     mRelatedTo->removeRelation(this);
   mRelatedTo = relatedTo;
-  if (mRelatedTo)
+  if (mRelatedTo) {
     mRelatedTo->addRelation(this);
-  updated();
+    if ( mRelatedTo->uid() != mRelatedToUid )
+      setRelatedToUid( mRelatedTo->uid() );
+  }
 }
 


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