1 files changed, 17 insertions, 17 deletions

diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 52ab0f2..e034b35 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -2,2 +2,3 @@
  * Copyright (c) 2002 Michael R. Crawford <mike@tuxnami.org>
+ * Copyright (C) 2002 by Stefan Eilers (eilers.stefan@epost.de)
  *
@@ -1110,16 +1111,2 @@ void ContactEditor::loadFields() {
 	}
-	// Set DatePicker
-	qWarning ("**Info: %s", ent.birthday().latin1() );
-	if ( !ent.birthday().isEmpty() ){
-		birthdayButton->setText( ent.birthday() );
-		birthdayPicker->setDate( TimeConversion::fromString ( ent.birthday() ) );
-	} else
-		birthdayButton->setText( tr ("Unknown") );
-		
-	qWarning ("**Info: %s", ent.anniversary().latin1() );
-	if ( !ent.anniversary().isEmpty() ){
-		anniversaryButton->setText( ent.anniversary() );
-		anniversaryPicker->setDate( TimeConversion::fromString ( ent.birthday() ) );
-	} else
-		anniversaryButton->setText( tr ("Unknown") );
 
@@ -1603,3 +1590,16 @@ void ContactEditor::setEntry( const OContact &entry ) {
 
-	loadFields();
+	// loadFields(); :SX
+
+	// Set DatePicker
+	if ( !ent.birthday().isNull() ){
+		birthdayButton->setText( TimeString::numberDateString( ent.birthday() ) );
+		birthdayPicker->setDate( ent.birthday() );
+	} else
+		birthdayButton->setText( tr ("Unknown") );
+		
+	if ( !ent.anniversary().isNull() ){
+		anniversaryButton->setText( TimeString::numberDateString( ent.anniversary() ) );
+		anniversaryPicker->setDate( ent.anniversary() );
+	} else
+		anniversaryButton->setText( tr ("Unknown") );
 
@@ -1893,3 +1893,3 @@ void ContactEditor::slotAnniversaryDateChanged( int year, int month, int day)
     anniversaryButton->setText( dateString );
-    ent.setAnniversary ( dateString );
+    ent.setAnniversary ( date );
 }
@@ -1902,3 +1902,3 @@ void ContactEditor::slotBirthdayDateChanged( int year, int month, int day)
     birthdayButton->setText( dateString );
-    ent.setBirthday ( dateString );
+    ent.setBirthday ( date );
 }