Commit 6a6c635b authored by Sergio Luis Martins's avatar Sergio Luis Martins
Browse files

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

CCBUG: 254742

svn path=/trunk/KDE/kdepim/runtime/; revision=1198720
parent 5a649ae5
...@@ -267,6 +267,7 @@ KIncidenceChooser::~KIncidenceChooser() ...@@ -267,6 +267,7 @@ KIncidenceChooser::~KIncidenceChooser()
void KIncidenceChooser::setIncidence( const Incidence::Ptr &local, void KIncidenceChooser::setIncidence( const Incidence::Ptr &local,
const Incidence::Ptr &remote ) const Incidence::Ptr &remote )
{ {
mInc1 = local; mInc1 = local;
mInc2 = remote; mInc2 = remote;
setLabels(); setLabels();
......
...@@ -63,6 +63,12 @@ Akonadi::Item::List IncidenceHandler::translateItems(const Akonadi::Item::List & ...@@ -63,6 +63,12 @@ Akonadi::Item::List IncidenceHandler::translateItems(const Akonadi::Item::List &
if (inc) { if (inc) {
KCalCore::Incidence::Ptr incidencePtr(inc); KCalCore::Incidence::Ptr incidencePtr(inc);
if (m_uidMap.contains(incidencePtr->uid())) { 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); ConflictResolution res = resolveConflict(incidencePtr);
kDebug() << "ConflictResolution " << res; kDebug() << "ConflictResolution " << res;
if (res == Local) { if (res == Local) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment