3 files changed, 14 insertions, 11 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index e11cf4c..3255269 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -528,9 +528,9 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
   //  qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() );
   cnt.setFirstName( fn );
   cnt.setMiddleName( mn );
   cnt.setLastName( ln );
-  cnt.setEmails( email );
+  cnt.insertEmails( email );
   cnt.setDefaultEmail( email );
   cnt.setFileAs();
 
   if ( bAbEditFirstTime ) {
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 39bd63c..ae86ed0 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -110,9 +110,9 @@ void ContactEditor::init() {
                                 slChooserValues.append("" );
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
-                        
+
                         if ( (*it) == tr( "Home Fax" ) ) {
                                 slChooserNames.append( *it );
                                 slChooserValues.append("" );
                                 //slDynamicEntries->remove( it );
@@ -190,9 +190,9 @@ void ContactEditor::init() {
                                 slChooserValues.append( "" );
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
-                        
+
                         if ( *it == "Name Title" || *it == "First Name" || *it == "Middle Name" || *it == "Last Name" || *it == "File As" || *it == "Default Email" || *it == "Emails" || *it == "Groups" )
                                 continue;
 
                         if ( *it == tr( "Name Title" ) ) {
@@ -269,9 +269,9 @@ void ContactEditor::init() {
                         if ( (*it).right( 8 ) == tr( "Street 2" ) ) {
                                 hasStreet2 = TRUE;
                                 //slDynamicEntries->remove( it );
                                 continue;
-                        } 
+                        }
 
                         if ( (*it).right( 8 ) == tr( "P.O. Box" ) ) {
                                 hasPOBox = TRUE;
                                 //slDynamicEntries->remove( it );
@@ -1033,9 +1033,9 @@ void ContactEditor::slotName() {
                 txtSuffix->setText( parseName(txtFullName->text(), NAME_S) );
         }
         dlgName->showMaximized();
         if ( dlgName->exec() ) {
-                
+
                 tmpName = txtFirstName->text() + " " + txtMiddleName->text() + " " + txtLastName->text() + " " + txtSuffix->text();
                 txtFullName->setText( tmpName.simplifyWhiteSpace() );
                 slotFullNameChange( txtFullName->text() );
                 useFullName = FALSE;
@@ -1416,9 +1416,9 @@ void ContactEditor::setEntry( const Contact &entry ) {
                 if ( *it == tr("Default Email" ))
                         *itV = ent.defaultEmail();
 
                 if ( *it == tr("Emails" ))
-                        *itV = ent.emails();
+                        *itV = ent.emailList().join(";");
 
                 if ( *it == tr("Home Phone" ))
                         *itV = ent.homePhone();
 /*
@@ -1617,9 +1617,9 @@ void ContactEditor::saveEntry() {
                         QString allemail;
                         QString defaultmail;
                         parseEmailFrom( *itV, defaultmail, allemail );
                         ent.setDefaultEmail(  defaultmail );
-                        ent.setEmails( *itV );
+                        ent.insertEmails( *itV );
                 }
 
                 if ( *it == tr("Home Phone" ))
                         ent.setHomePhone( *itV );
diff --git a/core/pim/todo/todotable.h b/core/pim/todo/todotable.h
index 39e00d1..7539df1 100644
--- a/core/pim/todo/todotable.h
+++ b/core/pim/todo/todotable.h
@@ -70,9 +70,9 @@ private:
 
 class TodoTextItem : public QTableItem
 {
 public:
-    TodoTextItem( QTable *t, const QString & str ) 
+    TodoTextItem( QTable *t, const QString & str )
         :QTableItem( t, QTableItem::Never, str ) {}
 
     QString key () const { return Qtopia::buildSortKey( text() ); }
 };
@@ -191,10 +191,13 @@ private:
 
 
 inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row )
 {
-    QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A') 
-                              + todo->priority() ) 
+    int rows = numRows();
+    ++rows;
+    setNumRows( rows );
+    QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A')
+                              + todo->priority() )
                       + Qtopia::buildSortKey( todo->description() );
     CheckItem *chk = new CheckItem( this, sortKey );
     chk->setChecked( todo->isCompleted() );
     ComboItem *cmb = new ComboItem( this, QTableItem::WhenCurrent );
@@ -204,9 +207,9 @@ inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row )
     ti->setReplaceable( false );
 
     DueTextItem *due = new DueTextItem(this, todo );
     setItem( row, 3, due);
-    
+
     setItem( row, 0, chk );
     setItem( row, 1, cmb );
     setItem( row, 2, ti );