summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/kaddressbook/germantranslation.txt4
-rw-r--r--kabc/plugins/file/resourcefile.cpp2
-rw-r--r--kaddressbook/kabcore.cpp17
3 files changed, 19 insertions, 4 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index 7879194..e54e140 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -751,6 +751,10 @@
751{ "Shrink searchfield in portrait view","Verkleinere Suchfeld im Portraitmodus" }, 751{ "Shrink searchfield in portrait view","Verkleinere Suchfeld im Portraitmodus" },
752{ "Edit new contact","Bearbeite neuen Kontakt" }, 752{ "Edit new contact","Bearbeite neuen Kontakt" },
753{ "Edit ","Bearbeite " }, 753{ "Edit ","Bearbeite " },
754{ "No contact changed!","Kein Kontakt verändert" },
755{ "%1 contacts changed!","%1 Kontakte geändert!" },
756{ "","" },
757{ "","" },
754{ "","" }, 758{ "","" },
755{ "","" }, 759{ "","" },
756{ "","" }, 760{ "","" },
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index af76558..2bd9e71 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -201,7 +201,7 @@ bool ResourceFile::doOpen()
201 if ( !file.open( IO_ReadWrite ) ) 201 if ( !file.open( IO_ReadWrite ) )
202 return false; 202 return false;
203 203
204 if ( file.size() == 0 ) { 204 if ( file.size() < 10 ) {
205 file.close(); 205 file.close();
206 return true; 206 return true;
207 } 207 }
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 20b107e..fa9f130 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2439,8 +2439,12 @@ void KABCore::setFormattedName()
2439 dlg.tagSelected(); 2439 dlg.tagSelected();
2440 int count = 0; 2440 int count = 0;
2441 KABC::AddressBook::Iterator it; 2441 KABC::AddressBook::Iterator it;
2442 bool modified = false;
2442 for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 2443 for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
2443 if ( (*it).tagged() ) { 2444 if ( (*it).tagged() ) {
2445 if ( (*it).uid().left( 2 ) == "la" )
2446 if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") )
2447 continue;
2444 ++count; 2448 ++count;
2445 if ( count %10 == 0 ) 2449 if ( count %10 == 0 )
2446 message(i18n("Changing contact #%1").arg( count ) ); 2450 message(i18n("Changing contact #%1").arg( count ) );
@@ -2458,14 +2462,21 @@ void KABCore::setFormattedName()
2458 if ( fName.isEmpty() || fName =="," ) 2462 if ( fName.isEmpty() || fName =="," )
2459 fName = (*it).organization(); 2463 fName = (*it).organization();
2460 (*it).setFormattedName( fName ); 2464 (*it).setFormattedName( fName );
2465 (*it).setChanged( true );
2466 modified = true;
2467 (*it).setRevision( QDateTime::currentDateTime() );
2461 } 2468 }
2462 } 2469 }
2463 message(i18n("Refreshing view...") ); 2470 message(i18n("Refreshing view...") );
2464 qApp->processEvents(); 2471 qApp->processEvents();
2465 mViewManager->refreshView( "" ); 2472 if ( modified )
2473 setModified( true );
2466 Addressee add; 2474 Addressee add;
2467 mDetails->setAddressee( add ); 2475 mDetails->setAddressee( add );
2468 message(i18n("Setting formatted name completed!") ); 2476 if ( count == 0 )
2477 message(i18n("No contact changed!") );
2478 else
2479 message(i18n("%1 contacts changed!").arg( count ) );
2469} 2480}
2470 2481
2471void KABCore::clipboardDataChanged() 2482void KABCore::clipboardDataChanged()