1 files changed, 9 insertions, 48 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 2e408b7..11eeabc 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -703,17 +703,17 @@ void KABCore::export2phone()
         return;
     
     message(i18n("Exporting to phone..."));
     QTimer::singleShot( 1, this , SLOT ( writeToPhone()));
 
 }
 QString KABCore::getPhoneFile()
 {
-#ifdef _WIN32_
+#ifdef DESKTOP_VERSION
     return  locateLocal("tmp", "phonefile.vcf");
 #else
     return "/tmp/phonefile.vcf";
 #endif
 
 }
 void KABCore::writeToPhone( )
 {
@@ -727,65 +727,26 @@ void KABCore::beamVCard()
   QStringList uids = mViewManager->selectedUids();
   if ( !uids.isEmpty() )
     beamVCard( uids );
 }
 
 
 void KABCore::beamVCard(const QStringList& uids)
 {
-/*US
-        QString beamFilename;
-        Opie::OPimContact c;
-        if ( actionPersonal->isOn() ) {
-                beamFilename = addressbookPersonalVCardName();
-                if ( !QFile::exists( beamFilename ) )
-                        return; // can't beam a non-existent file
-                Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
-                                                                                        beamFilename );
-                Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
-                Opie::OPimContactAccess::List allList = access->allRecords();
-                Opie::OPimContactAccess::List::Iterator it = allList.begin();  // Just take first
-                c = *it;
-
-                delete access;
-        } else {
-                unlink( beamfile ); // delete if exists
-                mkdir("/tmp/obex/", 0755);
-                c = m_abView -> currentEntry();
-                Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
-                                                                                        beamfile );
-                Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
-                access->add( c );
-                access->save();
-                delete access;
-
-                beamFilename = beamfile;
-        }
-
-        owarn << "Beaming: " << beamFilename << oendl;
-*/
-
-#if 0
-  QString tmpdir = locateLocal("tmp", KGlobal::getAppName());
-
-  QString dirName = tmpdir + "/" + KApplication::randomString( 8 );
-
-  QString name = "contact.vcf";
 
-  QString fileName = dirName + "/" + name;
-#endif
-  // LR: we should use the /tmp dir, because: /tmp = RAM, (HOME)/kdepim = flash memory
-  //
+    // LR: we should use the /tmp dir on the Zaurus,
+    //  because: /tmp = RAM, (HOME)/kdepim = flash memory
+   
+#ifdef DESKTOP_VERSION
+  QString fileName = locateLocal("tmp", "kapibeamfile.vcf");
+#else
   QString fileName = "/tmp/kapibeamfile.vcf";
+#endif
 
-
-  //QDir().mkdir( dirName, true );
-
- 
   KABC::VCardConverter converter;
   QString description;
   QString datastream;
   for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
       KABC::Addressee a = mAddressBook->findByUid( *it );
 
       if ( a.isEmpty() )
           continue;
@@ -2857,17 +2818,17 @@ void KABCore::getFile( bool success )
     mViewManager->refreshView();
 }
 void KABCore::syncFileRequest()
 {
     mAddressBook->export2File( sentSyncFile() );
 }
 QString KABCore::sentSyncFile()
 {
-#ifdef _WIN32_
+#ifdef DESKTOP_VERSION
     return  locateLocal( "tmp", "copysyncab.vcf" );
 #else
     return QString( "/tmp/copysyncab.vcf" );
 #endif 
 }
 
 void KABCore::setCaptionBack()
 {