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

List:       kde-commits
Subject:    KDE/kdepim/runtime
From:       Sergio Luis Martins <iamsergio () gmail ! com>
Date:       2010-11-19 13:03:04
Message-ID: 20101119130304.DEB7AAC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1198720 by smartins:

Print ids of conflicting items so i can easily find them in akonadiconsole.

CCBUG: 254742

 M  +1 -0      libkdepim-copy/kincidencechooser.cpp  
 M  +6 -0      resources/kolabproxy/incidencehandler.cpp  


--- trunk/KDE/kdepim/runtime/libkdepim-copy/kincidencechooser.cpp #1198719:1198720
@@ -267,6 +267,7 @@
 void KIncidenceChooser::setIncidence( const Incidence::Ptr &local,
                                       const Incidence::Ptr &remote )
 {
+
   mInc1 = local;
   mInc2 = remote;
   setLabels();
--- trunk/KDE/kdepim/runtime/resources/kolabproxy/incidencehandler.cpp #1198719:1198720
@@ -63,6 +63,12 @@
     if (inc) {
       KCalCore::Incidence::Ptr incidencePtr(inc);
       if (m_uidMap.contains(incidencePtr->uid())) {
+        StoredItem storedItem = m_uidMap[incidencePtr->uid()];
+        kDebug() << "Conflict detected for incidence uid  " << incidencePtr->uid()
+                 << " for imap item id = " << item.id()
+                 << " and the other imap item id is "
+                 << storedItem.id;
+
         ConflictResolution res = resolveConflict(incidencePtr);
         kDebug() << "ConflictResolution " << res;
         if (res == Local) {
[prev in list] [next in list] [prev in thread] [next in thread]