3 files changed, 6 insertions, 3 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
@@ -520,25 +520,25 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
     } else if ( msg == "addContact(QString,QString)" ) {
         QDataStream stream(data,IO_ReadOnly);
         QString name, email;
         stream >> name >> email;
 
   Contact cnt;
   QString fn, mn, ln;
   parseName( name, &fn, &mn, &ln );
   //  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 ) {
       abEditor = new ContactEditor( cnt, &orderedFields, &slOrderedFields,
              this, "editor" );
       bAbEditFirstTime = FALSE;
   } else {
       abEditor->setEntry( cnt );
   }
   abView()->init( cnt );
   editEntry( NewEntry );
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
@@ -1408,25 +1408,25 @@ void ContactEditor::setEntry( const Contact &entry ) {
                         *itV = ent.businessFax();
 
                 if ( *it == tr("Business Mobile") || *it == tr("work Mobile" ))
                         *itV = ent.businessMobile();
 /*
                 if ( *it == "Company Phone" )
                         *itV = ent.companyPhone();
 */
                 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();
 /*
                 if ( *it == "Home 2 Phone" )
                         *itV = ent.home2Phone();
 */
                 if ( *it == tr("Home Fax" ))
                         *itV = ent.homeFax();
 
                 if ( *it == tr("Home Mobile" ))
                         *itV = ent.homeMobile();
@@ -1609,25 +1609,25 @@ void ContactEditor::saveEntry() {
 /*
                 if ( *it == "Company Phone" )
                         ent.setCompanyPhone( *itV );
 */
                 //if ( *it == "Default Email" )
                         //ent.setDefaultEmail( *itV );
 
                 if ( *it == tr("Emails" )) {
                         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 );
 /*
                 if ( *it == "Home 2 Phone" )
                         ent.setHome2Phone( *itV );
 */
                 if ( *it == tr("Home Fax" ))
                         ent.setHomeFax( *itV );
 
                 if ( *it == tr("Home Mobile" ))
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
@@ -183,24 +183,27 @@ private:
     QTimer *menuTimer;
     QDate mDay;
     QTimer *mDayTimer; // see if the day changed
     bool enablePainting;
     Categories mCat;
     int currFindRow;
     bool showDeadl:1;
 };
 
 
 inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row )
 {
+    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 );
     cmb->setText( QString::number( todo->priority() ) );
     QString sum = todo->summary();
     QTableItem *ti = new TodoTextItem( this, sum.isEmpty() ? todo->description().left(40).simplifyWhiteSpace() : sum );
     ti->setReplaceable( false );
 
     DueTextItem *due = new DueTextItem(this, todo );