2 files changed, 8 insertions, 7 deletions

diff --git a/noncore/net/mail/addresspicker.cpp b/noncore/net/mail/addresspicker.cpp
index c6dec35..f4f4cea 100644
--- a/noncore/net/mail/addresspicker.cpp
+++ b/noncore/net/mail/addresspicker.cpp
@@ -1,39 +1,40 @@
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qtextstream.h>
 #include <qlistbox.h>
 #include <qfile.h>
 
 #include <qpe/resource.h>
-#include <opie/ocontactaccess.h>
-#include <opie/ocontact.h>
+#include <opie2/ocontactaccess.h>
+#include <opie2/ocontact.h>
 
 
 #include <stdlib.h>
 
 #include "composemail.h"
 
 AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFlags flags ) 
     : AddressPickerUI( parent, name, modal, flags )
 {
     okButton->setIconSet( Resource::loadPixmap( "enter" ) );
     cancelButton->setIconSet( Resource::loadPixmap( "editdelete" ) );
 
     connect(okButton, SIGNAL(clicked()), SLOT(accept()));
     connect(cancelButton, SIGNAL(clicked()), SLOT(close()));
-    OContactAccess::List::Iterator it;
+    Opie::OContactAccess::List::Iterator it;
 
     QString lineEmail, lineName, contactLine;
     /* what name has to set here???? */
-    OContactAccess m_contactdb("opiemail");
+    Opie::OContactAccess m_contactdb("opiemail");
+    
     QStringList mails;
     QString pre,suf;
-    OContactAccess::List m_list = m_contactdb.sorted( true, 0, 0, 0 );
+    Opie::OContactAccess::List m_list = m_contactdb.sorted( true, 0, 0, 0 );
     for ( it = m_list.begin(); it != m_list.end(); ++it ) {
         if ((*it).defaultEmail().length()!=0) {
             mails = (*it).emailList();
             if ((*it).fileAs().length()>0) {
                 pre = "\""+(*it).firstName()+" "+(*it).lastName()+"\" <";
                 suf = ">";
             } else {
                 pre = "";
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index d3d2ab1..7e0de2b 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -46,16 +46,16 @@ INTERFACES     = editaccountsui.ui \
                newmaildirui.ui \
                selectstoreui.ui
         
 
 INCLUDEPATH += $(OPIEDIR)/include
 
 CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
 contains( CONFTEST, y ){
-    LIBS        += -lqpe -lopieui2 -lopiecore2 -lopie -lmailwrapper -liconv
+    LIBS        += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lopiedb2 -lmailwrapper -liconv
 }else{
-    LIBS        += -lqpe -lopieui2 -lopiecore2 -lopie -lmailwrapper
+    LIBS        += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lopiedb2 -lmailwrapper
 }
 
 TARGET       = opiemail
 
 include ( $(OPIEDIR)/include.pro )