[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-10-20 21:01:13
Message-ID: 20041020210113.4459516BE0 () office ! kde ! org
[Download RAW message or body]

CVS commit by tilladam: 

Hook in the conflict resolution. 

Matt, go! : )


  M +0 -4      resourcekolab.cpp   1.8


--- kdepim/kresources/kolab/kcal/resourcekolab.cpp  #1.7:1.8
@@ -45,7 +45,5 @@
 #include <kabc/locknull.h>
 #include <klocale.h>
-#if 0
 #include <libkdepim/kincidencechooser.h>
-#endif
 
 using namespace KCal;
@@ -233,5 +231,4 @@ void ResourceKolab::incidenceUpdated( KC
 void ResourceKolab::resolveConflict( KCal::Incidence* inc, const QString& subresource, Q_UINT32 sernum )
 {
-#if 0
     if ( ! inc )
         return;
@@ -278,5 +275,4 @@ void ResourceKolab::resolveConflict( KCa
       mSilent = silent;
   }
-#endif
 }
 void ResourceKolab::addIncidence( const char* mimetype, const QString& xml,


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