From kde-commits  Wed Aug 31 22:08:41 2005
From: Reinhold Kainhofer <reinhold () kainhofer ! com>
Date: Wed, 31 Aug 2005 22:08:41 +0000
To: kde-commits
Subject: branches/KDE/3.5/kdepim/korganizer
Message-Id: <1125526121.030678.18123.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=112552613808930

SVN commit 455586 by kainhofe:

Fix the problem that when moving and dissociating a single item of a recurring sequence, it it shown duplicated until the view is refreshed.

BUG: 96237


 M  +3 -3      koagenda.cpp  
 M  +2 -1      koagendaview.cpp  


--- branches/KDE/3.5/kdepim/korganizer/koagenda.cpp #455585:455586
@@ -1075,11 +1075,11 @@
             if ( newInc ) {
               // don't recreate items, they already have the correct position
               emit enableAgendaUpdate( false );
-              mChanger->changeIncidence( oldIncSaved, oldInc );
+              mActionItem->dissociateFromMultiItem();
               mActionItem->setIncidence( newInc );
-              mActionItem->dissociateFromMultiItem();
               mChanger->addIncidence( newInc );
               emit enableAgendaUpdate( true );
+              mChanger->changeIncidence( oldIncSaved, oldInc );
             } else {
               KMessageBox::sorry( this, i18n("Unable to add the exception item to the "
                   "calendar. No change will be done."), i18n("Error Occurred") );
@@ -1552,7 +1552,7 @@
                                     int YTop, int YBottom )
 {
 #if 0
-  kdDebug(5850) << "KOAgenda::insertItem:" << event->summary() << "-"
+  kdDebug(5850) << "KOAgenda::insertItem:" << incidence->summary() << "-"
                 << qd.toString() << " ;top, bottom:" << YTop << "," << YBottom
                 << endl;
 #endif
--- branches/KDE/3.5/kdepim/korganizer/koagendaview.cpp #455585:455586
@@ -1353,7 +1353,8 @@
         // recreating everything even causes troubles: dropping to the day matrix
         // recreates the agenda items, but the evaluation is still in an agendaItems' code,
         // which was deleted in the mean time. Thus KOrg crashes...
-      changeIncidenceDisplayAdded( incidence );
+      if ( mAllowAgendaUpdate )
+        changeIncidenceDisplayAdded( incidence );
       break;
     }
     case KOGlobals::INCIDENCEEDITED: {