rpms/kdepim/devel kdepim-4.2.0-kpilot.patch, 1.1, 1.2 kdepim.spec, 1.205, 1.206

[Than Ngo]

Author: than

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

Modified Files:
	kdepim-4.2.0-kpilot.patch kdepim.spec 
Log Message:
upistream 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdepim-4.2.0-kpilot.patch	27 Jan 2009 14:12:27 -0000	1.1
+++ kdepim-4.2.0-kpilot.patch	27 Jan 2009 15:04:23 -0000	1.2
@@ -1,20 +1,7 @@
-Index: kpilot/conduits/todo/todoconduit.cc
-===================================================================
---- kpilot/conduits/todo/todoconduit.cc	(Revision 915906)
-+++ 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()
-Index: kpilot/conduits/akonadibase/akonadirecord.cc
-===================================================================
---- kpilot/conduits/akonadibase/akonadirecord.cc	(Revision 915830)
-+++ kpilot/conduits/akonadibase/akonadirecord.cc	(Revision 915831)
-@@ -47,12 +47,14 @@
+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
+@@ -47,6 +47,7 @@ AkonadiRecord::AkonadiRecord( const Akon
  	d->fItem = item;
  	d->fLastSyncDateTime = lastSync.toUTC(); // Item times are saved in UTC time.
  	d->fDeleted = false;
@@ -22,35 +9,7 @@
  }
  
  AkonadiRecord::AkonadiRecord( const QString& id ) : d( new AkonadiRecordPrivate )
- {
- 	d->fTempId = id;
- 	d->fDeleted = true;
-+	d->fDummy = false;
- }
- 
- AkonadiRecord::~AkonadiRecord()
-Index: kpilot/conduits/akonadibase/akonadirecord.cc
-===================================================================
---- kpilot/conduits/akonadibase/akonadirecord.cc	(Revision 915836)
-+++ 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 @@
+@@ -122,6 +123,11 @@ void AkonadiRecord::setItem( const Akona
  	d->fItem = item;
  	// Make sure that we return the right id after updating the itemobject.
  	setId( QString::number( item.id() ) );
@@ -62,3 +21,32 @@
  }
  
  void AkonadiRecord::synced()
+@@ -130,9 +136,17 @@ void AkonadiRecord::synced()
+ 	// Nothing to do here.
+ }
+ 
++void AkonadiRecord::setDummy(bool dummy)
++{
++	FUNCTIONSETUPL(5);
++	DEBUGKPILOT << "dummy: " << dummy;
++	d->fDummy = dummy;
++}
++
+ bool AkonadiRecord::isValid() const
+ {
+ 	FUNCTIONSETUPL(5);
+ 	bool valid = ! d->fDummy;
++	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
+@@ -68,6 +68,7 @@ void TodoConduit::loadSettings()
+ 	
+ 	TodoSettings::self()->readConfig();
+ 	d->fCollectionId = TodoSettings::akonadiCollection();
++	d->fPrevCollectionId = TodoSettings::prevAkonadiCollection();
+ }
+ 
+ bool TodoConduit::initDataProxies()


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- kdepim.spec	27 Jan 2009 14:12:27 -0000	1.205
+++ kdepim.spec	27 Jan 2009 15:04:23 -0000	1.206
@@ -93,7 +93,7 @@
 %patch0 -p1 -b .libqgpgme-link-fix
 
 # upstream patches
-%patch100 -p0 -b .kpilot
+%patch100 -p1 -b .kpilot
 
 %build
 mkdir -p %{_target_platform}