summaryrefslogtreecommitdiffabout
path: root/kabc
Side-by-side diff
Diffstat (limited to 'kabc') (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/plugins/qtopia/qtopiaconverter.cpp2
-rw-r--r--kabc/plugins/sharpdtm/resourcesharpdtm.cpp39
2 files changed, 4 insertions, 37 deletions
diff --git a/kabc/plugins/qtopia/qtopiaconverter.cpp b/kabc/plugins/qtopia/qtopiaconverter.cpp
index 430c7b3..5eab1be 100644
--- a/kabc/plugins/qtopia/qtopiaconverter.cpp
+++ b/kabc/plugins/qtopia/qtopiaconverter.cpp
@@ -83,13 +83,13 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
int ente = exuid.find( "-0000");
if ( exuid.left(1) == "{" )
exuid = exuid.mid(1);
if ( ente > -1 )
exuid = exuid.left( ente-1 );
addr.setExternalUID( exuid );
- qDebug("QtopiaConverter:set %s uid %s ",addr.originalExternalUID().latin1(),addr.externalUID().latin1() );
+ // qDebug("QtopiaConverter:set %s uid %s ",addr.originalExternalUID().latin1(),addr.externalUID().latin1() );
// email
QStringList emails = contact.emailList();
for ( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
addr.insertEmail( *it, ((*it) == contact.defaultEmail()) );
}
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
index adc7256..c013f52 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
@@ -226,26 +226,13 @@ bool ResourceSharpDTM::save( Ticket *ticket )
if (res == true)
{
res = mAccess->finishEditCard(&id);
//(*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
//(*it).setExternalUID( QString::number( id ) );
//(*it).setOriginalExternalUID( QString::number( id ) );
- map.insert(id,(*it).uid());
-
-#if 0
- KABC::Addressee addressee;
- res = mConverter->sharpToAddressee( id, mAccess, addressee );
- addressee.setUid((*it).uid() );
- (it*).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
- res = mAccess->finishEditCard(&id);
- //qDebug("2NEW id is %d", id);
- addressee.setExternalUID( QString::number( id ) );
- addressee.setOriginalExternalUID( QString::number( id ) );
- changedAddressees.append( addressee );
-#endif
-
+ map.insert(id,(*it).uid());
if (res == false)
qDebug("Unable to append Contact: %s", addressee.formattedName().latin1());
}
else
{
@@ -253,39 +240,27 @@ bool ResourceSharpDTM::save( Ticket *ticket )
mAccess->cancelEditCard();
}
}
} else if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE ) {
res = mAccess->deleteCard(&id);
- if ( res )
- qDebug("delete success ");
- else
+ if ( !res )
qDebug("delete error ");
} else if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
//changed
- qDebug("changed ****");
res = mAccess->startEditCard(id);
if (res == true)
{
res = mConverter->addresseeToSharp( (*it), mAccess, id );
if (res == true)
{
res = mAccess->finishEditCard(&id);
//(*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM );
map.insert(id,(*it).uid());
-
-#if 0
- KABC::Addressee addressee;
- res = mConverter->sharpToAddressee( id, mAccess, addressee );
- addressee.setUid((*it).uid() );
- addressee.setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM );
- changedAddressees.append( addressee );
- res = mAccess->finishEditCard(&id);
-#endif
if (res == false)
qDebug("Unable to append Contact: %s", addressee.formattedName().latin1());
}
else
{
@@ -302,32 +277,24 @@ bool ResourceSharpDTM::save( Ticket *ticket )
{
id = mAccess->cardId();
int idint = id;
itam = map.find( idint );
if ( itam != map.end() ) {
KABC::Addressee addressee;
- qDebug("found change %d %s ", idint, itam.data().latin1());
res = mConverter->sharpToAddressee( id, mAccess, addressee );
if ( !addressee.isEmpty() && res )
{
addressee.setResource( this );
addressee.setUid( itam.data() );
addressee.setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
addressBook()->insertAddressee( addressee , false );
}
}
}
-#if 0
- KABC::Addressee::List::Iterator it2;
- for ( it2 = changedAddressees.begin(); it2 != changedAddressees.end(); ++it2 ) {
- (*it2).computeCsum( "Sharp_DTM" );
- qDebug("CSUM: %s ",(*it2).getCsum( "Sharp_DTM" ).latin1() );
- addressBook()->insertAddressee((*it2));
- }
-#endif
+
//US mAccess->save();
mDirWatch.startScan();
delete ticket;
unlock( fileName() );