rev 13598 - in branches/kde4.2/packages/kdepim/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2009-01-27 01:08:07 +0000 (Tue, 27 Jan 2009)
New Revision: 13598

Added:
   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/changelog
   branches/kde4.2/packages/kdepim/debian/patches/series
Log:
Include late kpilot patches.

Modified: branches/kde4.2/packages/kdepim/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdepim/debian/changelog	2009-01-27 00:37:20 UTC (rev 13597)
+++ branches/kde4.2/packages/kdepim/debian/changelog	2009-01-27 01:08:07 UTC (rev 13598)
@@ -51,6 +51,7 @@
   +++ Changes by Sune Vuorela:
 
   * Copryright file update.
+  * Include late kpilot patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jan 2009 03:34:50 +0200
 

Added: branches/kde4.2/packages/kdepim/debian/patches/01_r915831_branch_kpilot.diff
===================================================================
--- branches/kde4.2/packages/kdepim/debian/patches/01_r915831_branch_kpilot.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdepim/debian/patches/01_r915831_branch_kpilot.diff	2009-01-27 01:08:07 UTC (rev 13598)
@@ -0,0 +1,19 @@
+Index: kdepim/kpilot/conduits/akonadibase/akonadirecord.cc
+===================================================================
+--- kdepim/kpilot/conduits/akonadibase/akonadirecord.cc	(revision 915830)
++++ kdepim/kpilot/conduits/akonadibase/akonadirecord.cc	(revision 915831)
+@@ -47,12 +47,14 @@
+ 	d->fItem = item;
+ 	d->fLastSyncDateTime = lastSync.toUTC(); // Item times are saved in UTC time.
+ 	d->fDeleted = false;
++	d->fDummy = false;
+ }
+ 
+ AkonadiRecord::AkonadiRecord( const QString& id ) : d( new AkonadiRecordPrivate )
+ {
+ 	d->fTempId = id;
+ 	d->fDeleted = true;
++	d->fDummy = false;
+ }
+ 
+ AkonadiRecord::~AkonadiRecord()

Added: branches/kde4.2/packages/kdepim/debian/patches/01_r915837_branch_kpilot.diff
===================================================================
--- branches/kde4.2/packages/kdepim/debian/patches/01_r915837_branch_kpilot.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdepim/debian/patches/01_r915837_branch_kpilot.diff	2009-01-27 01:08:07 UTC (rev 13598)
@@ -0,0 +1,33 @@
+Index: kdepim/kpilot/conduits/akonadibase/akonadirecord.cc
+===================================================================
+--- kdepim/kpilot/conduits/akonadibase/akonadirecord.cc	(revision 915836)
++++ kdepim/kpilot/conduits/akonadibase/akonadirecord.cc	(revision 915837)
+@@ -50,11 +50,15 @@
+ 	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;
+ 	d->fDeleted = true;
+-	d->fDummy = false;
++	d->fDummy = true;
+ }
+ 
+ AkonadiRecord::~AkonadiRecord()
+@@ -123,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()

Added: branches/kde4.2/packages/kdepim/debian/patches/01_r915907_branch_kpilot.diff
===================================================================
--- branches/kde4.2/packages/kdepim/debian/patches/01_r915907_branch_kpilot.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdepim/debian/patches/01_r915907_branch_kpilot.diff	2009-01-27 01:08:07 UTC (rev 13598)
@@ -0,0 +1,12 @@
+Index: kdepim/kpilot/conduits/todo/todoconduit.cc
+===================================================================
+--- kdepim/kpilot/conduits/todo/todoconduit.cc	(revision 915906)
++++ kdepim/kpilot/conduits/todo/todoconduit.cc	(revision 915907)
+@@ -68,6 +68,7 @@
+ 	
+ 	TodoSettings::self()->readConfig();
+ 	d->fCollectionId = TodoSettings::akonadiCollection();
++	d->fPrevCollectionId = TodoSettings::prevAkonadiCollection();
+ }
+ 
+ bool TodoConduit::initDataProxies()

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