|
 |
7dedb02 |
Index: kpilot/conduits/todo/todoconduit.cc
|
|
|
7dedb02 |
===================================================================
|
|
|
7dedb02 |
--- kpilot/conduits/todo/todoconduit.cc (Revision 915906)
|
|
|
7dedb02 |
+++ kpilot/conduits/todo/todoconduit.cc (Revision 915907)
|
|
|
7dedb02 |
@@ -68,6 +68,7 @@
|
|
|
7dedb02 |
|
|
|
7dedb02 |
TodoSettings::self()->readConfig();
|
|
|
7dedb02 |
d->fCollectionId = TodoSettings::akonadiCollection();
|
|
|
7dedb02 |
+ d->fPrevCollectionId = TodoSettings::prevAkonadiCollection();
|
|
|
7dedb02 |
}
|
|
|
7dedb02 |
|
|
|
7dedb02 |
bool TodoConduit::initDataProxies()
|
|
|
7dedb02 |
Index: kpilot/conduits/akonadibase/akonadirecord.cc
|
|
|
7dedb02 |
===================================================================
|
|
|
7dedb02 |
--- kpilot/conduits/akonadibase/akonadirecord.cc (Revision 915830)
|
|
|
7dedb02 |
+++ kpilot/conduits/akonadibase/akonadirecord.cc (Revision 915831)
|
|
|
7dedb02 |
@@ -47,12 +47,14 @@
|
|
|
7dedb02 |
d->fItem = item;
|
|
|
7dedb02 |
d->fLastSyncDateTime = lastSync.toUTC(); // Item times are saved in UTC time.
|
|
|
7dedb02 |
d->fDeleted = false;
|
|
|
7dedb02 |
+ d->fDummy = false;
|
|
|
7dedb02 |
}
|
|
|
7dedb02 |
|
|
|
7dedb02 |
AkonadiRecord::AkonadiRecord( const QString& id ) : d( new AkonadiRecordPrivate )
|
|
|
7dedb02 |
{
|
|
|
7dedb02 |
d->fTempId = id;
|
|
|
7dedb02 |
d->fDeleted = true;
|
|
|
7dedb02 |
+ d->fDummy = false;
|
|
|
7dedb02 |
}
|
|
|
7dedb02 |
|
|
|
7dedb02 |
AkonadiRecord::~AkonadiRecord()
|
|
|
7dedb02 |
Index: kpilot/conduits/akonadibase/akonadirecord.cc
|
|
|
7dedb02 |
===================================================================
|
|
|
7dedb02 |
--- kpilot/conduits/akonadibase/akonadirecord.cc (Revision 915836)
|
|
|
7dedb02 |
+++ kpilot/conduits/akonadibase/akonadirecord.cc (Revision 915837)
|
|
|
7dedb02 |
@@ -50,11 +50,15 @@
|
|
|
7dedb02 |
d->fDummy = false;
|
|
|
7dedb02 |
}
|
|
|
7dedb02 |
|
|
|
7dedb02 |
+/**
|
|
|
7dedb02 |
+ * This ctor is _only_ used for dummy records which are temporarily used to delete
|
|
|
7dedb02 |
+ * data.
|
|
|
7dedb02 |
+ */
|
|
|
7dedb02 |
AkonadiRecord::AkonadiRecord( const QString& id ) : d( new AkonadiRecordPrivate )
|
|
|
7dedb02 |
{
|
|
|
7dedb02 |
d->fTempId = id;
|
|
|
7dedb02 |
d->fDeleted = true;
|
|
|
7dedb02 |
- d->fDummy = false;
|
|
|
7dedb02 |
+ d->fDummy = true;
|
|
|
7dedb02 |
}
|
|
|
7dedb02 |
|
|
|
7dedb02 |
AkonadiRecord::~AkonadiRecord()
|
|
|
7dedb02 |
@@ -123,6 +127,11 @@
|
|
|
7dedb02 |
d->fItem = item;
|
|
|
7dedb02 |
// Make sure that we return the right id after updating the itemobject.
|
|
|
7dedb02 |
setId( QString::number( item.id() ) );
|
|
|
7dedb02 |
+ /**
|
|
|
7dedb02 |
+ * Assuming we're being passed a valid item to use, make sure fDummy
|
|
|
7dedb02 |
+ * is not still false after this.
|
|
|
7dedb02 |
+ */
|
|
|
7dedb02 |
+ setDummy( false );
|
|
|
7dedb02 |
}
|
|
|
7dedb02 |
|
|
|
7dedb02 |
void AkonadiRecord::synced()
|