rpms/kdepim/devel kdepim-4.2.0-kpilot.patch,1.2,1.3

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25235

Modified Files:
	kdepim-4.2.0-kpilot.patch 
Log Message:
upstream patch, fix data corruption problems in KPilot


kdepim-4.2.0-kpilot.patch:

Index: kdepim-4.2.0-kpilot.patch
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim-4.2.0-kpilot.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdepim-4.2.0-kpilot.patch	27 Jan 2009 15:04:23 -0000	1.2
+++ kdepim-4.2.0-kpilot.patch	27 Jan 2009 23:13:51 -0000	1.3
@@ -1,6 +1,17 @@
-diff -up kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc.orig kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc
---- kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc.orig	2009-01-27 15:47:05.000000000 +0100
-+++ kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc	2009-01-27 15:58:11.000000000 +0100
+diff -up kdepim-4.2.0/kpilot/conduits/akonadibase/akonadidataproxy.cc.kpilot kdepim-4.2.0/kpilot/conduits/akonadibase/akonadidataproxy.cc
+--- kdepim-4.2.0/kpilot/conduits/akonadibase/akonadidataproxy.cc.kpilot	2009-01-28 00:04:07.000000000 +0100
++++ kdepim-4.2.0/kpilot/conduits/akonadibase/akonadidataproxy.cc	2009-01-28 00:04:33.000000000 +0100
+@@ -136,6 +136,7 @@ void AkonadiDataProxy::loadAllRecords()
+ 				// Well the record with id mPcId doesn't seem to be in the akonadi
+ 				// resource any more so it is deleted.
+ 				AkonadiRecord* ar = createDeletedAkonadiRecord( mPcId );
++				ar->setDummy();
+ 				Q_ASSERT( ar->isDeleted() );
+ 				Q_ASSERT( ar->isModified() );
+ 				Q_ASSERT( ar->id() == mPcId );
+diff -up kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc.kpilot kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc
+--- kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc.kpilot	2009-01-21 11:28:32.000000000 +0100
++++ kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.cc	2009-01-27 16:56:39.000000000 +0100
 @@ -47,6 +47,7 @@ AkonadiRecord::AkonadiRecord( const Akon
  	d->fItem = item;
  	d->fLastSyncDateTime = lastSync.toUTC(); // Item times are saved in UTC time.
@@ -39,9 +50,25 @@
 +	DEBUGKPILOT << "valid: " << valid;
  	return valid;
  }
-diff -up kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc.orig kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc
---- kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc.orig	2009-01-27 16:02:28.000000000 +0100
-+++ kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc	2009-01-27 16:02:43.000000000 +0100
+diff -up kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.h.kpilot kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.h
+--- kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.h.kpilot	2009-01-28 00:05:26.000000000 +0100
++++ kdepim-4.2.0/kpilot/conduits/akonadibase/akonadirecord.h	2009-01-28 00:07:20.000000000 +0100
+@@ -103,6 +103,12 @@ public:
+ 	 */
+ 	/* virtual */ bool isValid() const;
+ 
++	/**
++	  * Explicit set of whether this is a dummy (intended only for delete)
++	  * record.
++	  */
++	void setDummy( bool dummy = true );
++
+ private:
+ 	QSharedDataPointer<AkonadiRecordPrivate> d;
+ };
+diff -up kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc.kpilot kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc
+--- kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc.kpilot	2009-01-21 11:28:32.000000000 +0100
++++ kdepim-4.2.0/kpilot/conduits/todo/todoconduit.cc	2009-01-27 16:56:39.000000000 +0100
 @@ -68,6 +68,7 @@ void TodoConduit::loadSettings()
  	
  	TodoSettings::self()->readConfig();