rev 13599 - branches/kde4.2/packages/kdepim/debian/patches

[Sune Vuorela]

Author: pusling-guest
Date: 2009-01-27 01:32:13 +0000 (Tue, 27 Jan 2009)
New Revision: 13599

Added:
   branches/kde4.2/packages/kdepim/debian/patches/01_915830_915907_kpilot_branch_fixes.diff
Removed:
   branches/kde4.2/packages/kdepim/debian/patches/01_r915831_branch_kpilot.diff
   branches/kde4.2/packages/kdepim/debian/patches/01_r915837_branch_kpilot.diff
   branches/kde4.2/packages/kdepim/debian/patches/01_r915907_branch_kpilot.diff
Modified:
   branches/kde4.2/packages/kdepim/debian/patches/series
Log:
better patches

Added: branches/kde4.2/packages/kdepim/debian/patches/01_915830_915907_kpilot_branch_fixes.diff
===================================================================
--- branches/kde4.2/packages/kdepim/debian/patches/01_915830_915907_kpilot_branch_fixes.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdepim/debian/patches/01_915830_915907_kpilot_branch_fixes.diff	2009-01-27 01:32:13 UTC (rev 13599)
@@ -0,0 +1,38 @@
+--- a/kpilot/conduits/akonadibase/akonadirecord.cc
++++ b/kpilot/conduits/akonadibase/akonadirecord.cc
+@@ -47,8 +47,13 @@
+ 	d->fItem = item;
+ 	d->fLastSyncDateTime = lastSync.toUTC(); // Item times are saved in UTC time.
+ 	d->fDeleted = false;
++	d->fDummy = false;
+ }
+ 
++/**
++ * This ctor is _only_ used for dummy records which are temporarily used to delete
++ * data.
++ */
+ AkonadiRecord::AkonadiRecord( const QString& id ) : d( new AkonadiRecordPrivate )
+ {
+ 	d->fTempId = id;
+@@ -122,6 +127,11 @@
+ 	d->fItem = item;
+ 	// Make sure that we return the right id after updating the itemobject.
+ 	setId( QString::number( item.id() ) );
++	/**
++	 * Assuming we're being passed a valid item to use, make sure fDummy
++	 * is not still false after this.
++	 */
++	setDummy( false );
+ }
+ 
+ void AkonadiRecord::synced()
+--- a/kpilot/conduits/todo/todoconduit.cc
++++ b/kpilot/conduits/todo/todoconduit.cc
+@@ -68,6 +68,7 @@
+ 	
+ 	TodoSettings::self()->readConfig();
+ 	d->fCollectionId = TodoSettings::akonadiCollection();
++	d->fPrevCollectionId = TodoSettings::prevAkonadiCollection();
+ }
+ 
+ bool TodoConduit::initDataProxies()

Deleted: branches/kde4.2/packages/kdepim/debian/patches/01_r915831_branch_kpilot.diff

Deleted: branches/kde4.2/packages/kdepim/debian/patches/01_r915837_branch_kpilot.diff

Deleted: branches/kde4.2/packages/kdepim/debian/patches/01_r915907_branch_kpilot.diff

Modified: branches/kde4.2/packages/kdepim/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdepim/debian/patches/series	2009-01-27 01:08:07 UTC (rev 13598)
+++ branches/kde4.2/packages/kdepim/debian/patches/series	2009-01-27 01:32:13 UTC (rev 13599)
@@ -1,4 +1,2 @@
-01_r915831_branch_kpilot.diff
-01_r915837_branch_kpilot.diff
-01_r915907_branch_kpilot.diff
+01_915830_915907_kpilot_branch_fixes.diff
 30_debianize_akregator_default.diff