Fwd: KPilot Data Corruption Fixes in 4.2 (was Fwd: branches/KDE/4.2/kdepim/kpilot/conduits/akonadibase)

[Allen Winter]

Dirk,

Sorry about this.

---------- Forwarded message ----------
From: Jason 'vanRijn' Kasper <vr at movingparts.net>
Date: Sat, Jan 24, 2009 at 10:48 PM
Subject: Fwd: branches/KDE/4.2/kdepim/kpilot/conduits/akonadibase
To: KDE release coordination <release-team at kde.org>


My apologies if I'm wrong in sending this to release-team, but I've fixed a
few data corruption bugs in KPilot in the last few days and was really
hoping we could get them included in the KDE 4.2.0 release, if possible.
I've e-mailed Dirk already, but haven't heard back from him just yet, being
the weekend and all.

Specifically, commits 915907, 915831, and 915837 fix data corruption
problems in KPilot.

Thank you! =:)


---------- Forwarded message ----------
From: Jason 'vanRijn' Kasper <vr at movingparts.net>
Date: Sat, Jan 24, 2009 at 12:21 AM
Subject: Re: branches/KDE/4.2/kdepim/kpilot/conduits/akonadibase
To: Dirk Mueller <mueller at kde.org>


Meh. I'm sure I'm pushing my luck now, but in the off chance that you can
still sneak some more data corruption bug fixes into the KDE 4.2
tag/release, I just committed this to branches/KDE/4.2/kdepim/kpilot:

SVN commit 915907 by vanrijn:

Fix for another data problem (Thank you Doug!!!). This one was slightly less
irksome in that we refused to let you delete things, no matter how hard you
try,
rather than deleting things you wouldn't have wanted us to, but still, data
is
data.

BUG:181711


On Fri, Jan 23, 2009 at 6:04 PM, Jason 'vanRijn' Kasper
<vr at movingparts.net>wrote:

> Hi Dirk,
>
> I asked in #kde-devel and they said I should e-mail you about this. We just
> found and fixed a data corruption bug in KPilot. Is there any way we can get
> this into KDE 4.2's tag?  I checked it into branches/KDE/4.2/kdepim/kpilot.
>
> Sorry for the trouble. =:(
>
> ---------- Forwarded message ----------
> From: Jason vanRijn Kasper <vR at movingparts.net>
> Date: Fri, Jan 23, 2009 at 5:50 PM
> Subject: branches/KDE/4.2/kdepim/kpilot/conduits/akonadibase
> To: kde-commits at kde.org
>
>
> SVN commit 915831 by vanrijn:
>
> Fixes stupid data corruption bug.
> BUG:181493
>
>
>  M  +2 -0      akonadirecord.cc
>
>
> --- branches/KDE/4.2/kdepim/
> kpilot/conduits/akonadibase/akonadirecord.cc #915830: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()
>
> ---------
>
> SVN commit 915837 by vanrijn:
>
> Make sure fDummy is correct in case we're later passed in a valid item
> (conflict resolution).
> CCBUG:181493
>
>
>
>  M  +10 -1     akonadirecord.cc
>
>
> --- branches/KDE/4.2/kdepim/kpilot/conduits/akonadibase/akonadirecord.cc
> #915836: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()
>
>
>
> --
> -[ Jason 'vanRijn' Kasper    //  http://movingparts.net ]-
> -[ KDE PIM Developer         //  http://www.kde.org  ]-
> -[ bash fun -> :(){ :|:&};:  //  Numbers 6:22-26 ]-
>



-- 
-[ Jason 'vanRijn' Kasper    //  http://movingparts.net ]-
-[ KDE PIM Developer         //  http://www.kde.org  ]-
-[ bash fun -> :(){ :|:&};:  //  Numbers 6:22-26 ]-

-------------------------------------------------------