5 files changed, 28 insertions, 17 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 9b059d3..3a542ba 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -320,16 +320,22 @@ KABCore::~KABCore()
     delete AddresseeConfig::instance();
     mAddressBook = 0;
     KABC::StdAddressBook::close();
     
     delete syncManager;
 
 }
 
+void KABCore::recieve( QString fn  )
+{
+    qDebug("KABCore::recieve ");
+    mAddressBook->importFromFile( fn, true );
+    topLevelWidget()->raise();
+}
 void KABCore::restoreSettings()
 {
   mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce;
 
   bool state;
 
   if (mMultipleViewsAtOnce)
     state = KABPrefs::instance()->mDetailsPageVisible;
@@ -2081,30 +2087,18 @@ void KABCore::showLicence()
 }
 void KABCore::removeVoice()
 {
     if ( KMessageBox::questionYesNo( this, i18n("After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as \"other\".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?") ) == KMessageBox::No )
         return;
     KABC::Addressee::List list = mViewManager->selectedAddressees();
     KABC::Addressee::List::Iterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
-        PhoneNumber::List phoneNumbers = (*it).phoneNumbers();
-        PhoneNumber::List::Iterator phoneIt;
-        bool found = false;
-        for ( phoneIt = phoneNumbers.begin(); phoneIt != phoneNumbers.end(); ++phoneIt ) {
-            if ( (*phoneIt).type() & PhoneNumber::Voice) { // voice found
-                if ((*phoneIt).type() - PhoneNumber::Voice ) {
-                    (*phoneIt).setType((*phoneIt).type() - PhoneNumber::Voice );
-                    (*it).insertPhoneNumber( (*phoneIt) );
-                    found = true;
-                }
-            }
-
-        }
-        if ( found )
+        
+        if ( (*it).removeVoice() )
             contactModified((*it) );
     }
 }
 
 
 
 void KABCore::clipboardDataChanged()
 {
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index c628399..43c5f99 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -337,16 +337,17 @@ class KABCore : public QWidget, public KSyncInterface
    void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid);
    void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid);
 
 
   signals:
     void contactSelected( const QString &name );
     void contactSelected( const QPixmap &pixmap );
   public slots:
+    void recieve(QString cmsg );
     void getFile( bool success );
     void syncFileRequest();
     void setDetailsVisible( bool visible );
     void setDetailsToState();
     //    void slotSyncMenu( int );
   private slots:
     void setJumpButtonBarVisible( bool visible );
     void setCaptionBack();
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index f48f214..8c4ca09 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -87,17 +87,27 @@ KAddressBookMain::KAddressBookMain() : DCOPObject( "KAddressBookIface" ), KMainW
   qApp->processEvents();
   mCore->restoreSettings();
 }
 
 KAddressBookMain::~KAddressBookMain()
 {
     // mCore->saveSettings();
 }
-
+void KAddressBookMain::recieve( const QCString& cmsg, const QByteArray& data )
+{
+    qDebug("KA: QCOP message received: %s ", cmsg.data()  );
+    if ( cmsg == "setDocument(QString)" ) {
+        QDataStream stream( data, IO_ReadOnly );
+        QString fileName;
+        stream >> fileName;
+        mCore->recieve( fileName );
+        return;
+    }
+}
 void KAddressBookMain::showMinimized () 
 {
     QWidget::showMinimized () ;
 }
 void KAddressBookMain::addEmail( QString addr )
 {
   mCore->addEmail( addr );
 }
diff --git a/kaddressbook/kaddressbookmain.h b/kaddressbook/kaddressbookmain.h
index cf6f899..40d2bdd 100644
--- a/kaddressbook/kaddressbookmain.h
+++ b/kaddressbook/kaddressbookmain.h
@@ -76,17 +76,17 @@ class KAddressBookMain : public KMainWindow, virtual public KAddressBookIface
 //MOC_SKIP_BEGIN
     virtual ASYNC showContactEditor( QString uid );
 //MOC_SKIP_END
 #endif //KAB_EMBEDDED
     virtual void newContact();
     virtual QString getNameByPhone( QString phone );
     virtual void save();
     virtual void exit();
-    
+    void recieve( const QCString& cmsg, const QByteArray& data );
   protected:
     void initActions();
 #ifdef KAB_EMBEDDED
     //US new method to setup menues and toolbars on embedded systems
     void createGUI();
 #endif //KAB_EMBEDDED
     
     /**
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index 965fb06..6dd97b8 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -1,10 +1,11 @@
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
+#include <qcopchannel_qws.h> 
 #include <stdlib.h>
 #else
 #include <qapplication.h>
 #include <qwindowsstyle.h>
 #include <qplatinumstyle.h>
 #include <qmainwindow.h>
 #endif
 
@@ -72,23 +73,28 @@ int main( int argc, char **argv )
        KAddressBookMain m ;
 //US      MainWindow m;
       QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
 
       {
           KPimGlobalPrefs::instance()->setGlobalConfig();
       }
 #ifndef DESKTOP_VERSION
-       a.showMainWidget( &m );
+       a.showMainWidget( &m ); 
+       QCopChannel* c1 = new QCopChannel("QPE/Application/addressbook",&m, "channelAB" ) ;   
+      QObject::connect( c1, SIGNAL (received ( const QCString &, const QByteArray & )),&m, SLOT(recieve(  const QCString&, const QByteArray& )));
 #else
       a.setMainWidget( &m );
       m.resize (640, 480 );
       m.show();
 #endif
       a.exec();
+#ifndef DESKTOP_VERSION
+      delete c1;
+#endif
 
   }
   qDebug("KA: Bye! ");
 }
 
 /*
 #include <stdlib.h>