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

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepimlibs
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-05-13 13:54:45
Message-ID: 1242222885.333241.5855.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 967505 by tmcguire:

Merged revisions 966698 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.2/kdepimlibs

........
  r966698 | smartins | 2009-05-11 21:04:27 +0200 (Mon, 11 May 2009) | 7 lines
  
  Backport r966325 by smartins from trunk to the 4.2 branch:
  
  Don't do setRelatedTo() when dissociating recurring to-dos, otherwise the new to-do \
will appear as a child.  
  From what I was told, it was originaly planned to set a relation with reltype \
SIBLING when dissociating to-dos, but currently kcal  only supports reltype PARENT.
........


 _M            . (directory)  
 M  +1 -1      kcal/calendar.cpp  


** branches/kdepim/enterprise4/kdepimlibs #property svnmerge-integrated
   - /branches/KDE/4.2/kdepimlibs:0-906699,908595,908778,909375,909480-909481,913686,9 \
14463,916781,917250,917474,917890,918215,920496,921344,921567,921657,925739,926581,926 \
658,926671,928173,929204,929982,930782-930954,931305,932900,932969,932982,933037,93303 \
9,933042,933082,933951,935076,939240,939625-939627,939629-939630,940569,941695,944611, \
944613-944614,944619,944621,944882,953497,954584,957769,960523,960542,960992,963977,965556 \
/branches/KDE/4.1/kdepimlibs:1-834831,835273,835640-835906,835908-836398,836400-837899 \
,838884,839404,839801,841029,841539,841636,842671,843335,844834,844837,845949,846411,8 \
47482,848343-848345,850102,851238-851239,851691,853473,854917,856768,859481,859713,859 \
717,863249,865199,865203,868165,873590,875281,879229,879951,880893,880897,880908,88602 \
0,886341,887083,890863,892407,892930,893121,893737,893938,893947,893950,893953,893956, \
894620,894622,894875,894879-894881,894903,894905,894985,895056,895515,895906,895909-895910,895918,895924,896487,896770,898353
  ,899979,899982,904282,905120,905542,905607
   + /branches/KDE/4.2/kdepimlibs:0-906699,908595,908778,909375,909480-909481,913686,9 \
14463,916781,917250,917474,917890,918215,920496,921344,921567,921657,925739,926581,926 \
658,926671,928173,929204,929982,930782-930954,931305,932900,932969,932982,933037,93303 \
9,933042,933082,933951,935076,939240,939625-939627,939629-939630,940569,941695,944611, \
944613-944614,944619,944621,944882,953497,954584,957769,960523,960542,960992,963977,965556,966698 \
/branches/KDE/4.1/kdepimlibs:1-834831,835273,835640-835906,835908-836398,836400-837899 \
,838884,839404,839801,841029,841539,841636,842671,843335,844834,844837,845949,846411,8 \
47482,848343-848345,850102,851238-851239,851691,853473,854917,856768,859481,859713,859 \
717,863249,865199,865203,868165,873590,875281,879229,879951,880893,880897,880908,88602 \
0,886341,887083,890863,892407,892930,893121,893737,893938,893947,893950,893953,893956, \
894620,894622,894875,894879-894881,894903,894905,894985,895056,895515,895906,895909-895910,895918,895924,896487,896770
  ,898353,899979,899982,904282,905120,905542,905607
--- branches/kdepim/enterprise4/kdepimlibs/kcal/calendar.cpp #967504:967505
@@ -445,7 +445,7 @@
 
   Incidence *newInc = incidence->clone();
   newInc->recreate();
-  newInc->setRelatedTo( incidence );
+  //newInc->setRelatedTo( incidence );
   Recurrence *recur = newInc->recurrence();
   if ( single ) {
     recur->clear();


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