OL import fixes

4 files changed, 56 insertions, 7 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 980e436..1074a62 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -317,34 +317,36 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
 #ifndef DESKTOP_VERSION
   infrared  = 0;
 #endif
   toggleBeamReceive( );
 }
 
 KABCore::~KABCore()
 {
     //  save();
     //saveSettings();
     //KABPrefs::instance()->writeConfig();
     delete AddresseeConfig::instance();
     mAddressBook = 0;
     KABC::StdAddressBook::close();
     
     delete syncManager;
+#ifndef DESKTOP_VERSION
     if ( infrared )
         delete infrared;
+#endif
 }
 void KABCore::receive( 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;
         recieve( fileName );
         return;
     }
 }
 void KABCore::toggleBeamReceive( )
 {
     if ( mBRdisabled  )
         return;
@@ -354,43 +356,45 @@ void KABCore::toggleBeamReceive( )
         delete infrared;
         infrared = 0;
         mActionBR->setChecked(false);
         return;
     } 
     qDebug("AB enable BeamReceive ");
     mActionBR->setChecked(true);
 
     infrared = new QCopChannel("QPE/Application/addressbook",this, "channelAB" ) ;   
     QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(receive(  const QCString&, const QByteArray& )));
 #endif
 }
 
 
 void KABCore::disableBR(bool b)
 {
+#ifndef DESKTOP_VERSION
     if ( b ) {
         if ( infrared ) {
             toggleBeamReceive( );
-            mBRdisabled = true;
         }
+        mBRdisabled = true;
     } else {
         if ( mBRdisabled ) {
             mBRdisabled = false;
-            toggleBeamReceive( );
+            //toggleBeamReceive( );
         }
     }
+#endif
 
 }
 void KABCore::recieve( QString fn  )
 {
     //qDebug("KABCore::recieve ");
     int count = mAddressBook->importFromFile( fn, true );
     mViewManager->refreshView();
     message(i18n("%1 contact(s) received!").arg( count ));
     topLevelWidget()->showMaximized();
     topLevelWidget()->raise();
 }
 void KABCore::restoreSettings()
 {
   mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce;
 
   bool state;
diff --git a/kaddressbook/kaimportoldialog.cpp b/kaddressbook/kaimportoldialog.cpp
index 10e3c76..848d8af 100644
--- a/kaddressbook/kaimportoldialog.cpp
+++ b/kaddressbook/kaimportoldialog.cpp
@@ -16,32 +16,33 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qtooltip.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qlayout.h>
 #include <qprogressbar.h>
 #include <qwidgetstack.h>
 #include <qdatetime.h>
 #include <qdir.h>
+#include <qregexp.h>
 #include <qapplication.h>
 #include <qhbox.h>
 #include <qheader.h>
 #include <qdatetime.h>
 #include <qlistview.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kfiledialog.h>
 
 #include <libkdepim/categoryselectdialog.h>
 #include <libkdepim/kinputdialog.h>
 
 #include <libkcal/calendarlocal.h>
@@ -254,76 +255,77 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   addressee.setFamilyName( QString::fromUcs2(aItem->GetLastName().GetBuffer()) );
   addressee.setGivenName( QString::fromUcs2(aItem->GetFirstName().GetBuffer()) );
   addressee.setAdditionalName( QString::fromUcs2(aItem->GetMiddleName().GetBuffer()) );
   addressee.setPrefix(QString::fromUcs2(aItem->GetTitle().GetBuffer()) );
   addressee.setSuffix( QString::fromUcs2(aItem->GetSuffix().GetBuffer()) );
   addressee.setNickName( QString::fromUcs2(aItem->GetNickName().GetBuffer()) );
   QDateTime dtb = mDdate2Qdtr(aItem->GetBirthday());
   if ( dtb.isValid() )
     addressee.setBirthday( mDdate2Qdtr(aItem->GetBirthday()));
 
   //QString::fromUcs2(aItem->.GetBuffer())
   //addressee.setMailer( const QString &mailer );
   //addressee.setTimeZone( const TimeZone &timeZone );
   //addressee.setGeo( const Geo &geo );
   //addressee.setTitle( QString::fromUcs2(aItem->GetJobTitle().GetBuffer()) );// titel is the prefix
   addressee.setRole( QString::fromUcs2(aItem->GetJobTitle().GetBuffer()) );
-  addressee.setOrganization( QString::fromUcs2(aItem->GetCompanyName().GetBuffer()) );
+  addressee.setOrganization( QString::fromUcs2(aItem->GetCompanyName().GetBuffer()).replace( QRegExp("\\r"), "") );
   QString notesStr = QString::fromUcs2(aItem->GetBody().GetBuffer());
+  notesStr.replace( QRegExp("\\r"), "");
    
   addressee.setProductId( QString::fromUcs2(aItem->GetCustomerID().GetBuffer()) );
   //addressee.setRevision( const QDateTime &revision );
   // addressee.setSortString( const QString &sortString );
   addressee.setUrl( QString::fromUcs2(aItem->GetWebPage().GetBuffer()) );
 
   QString tempS;
   tempS = QString::fromUcs2(aItem->GetNetMeetingAlias().GetBuffer())+" AT SERVER: " +QString::fromUcs2(aItem->GetNetMeetingServer().GetBuffer());
   if ( tempS.length() > 12 )
     addressee.insertCustom( "KADDRESSBOOK", "X-IMAddress", tempS );
   tempS = QString::fromUcs2(aItem->GetSpouse().GetBuffer());
   if ( !tempS.isEmpty() )
     addressee.insertCustom( "KADDRESSBOOK", "X-SpousesName", tempS );
   tempS = QString::fromUcs2(aItem->GetManagerName().GetBuffer());
   if ( !tempS.isEmpty() )
     addressee.insertCustom( "KADDRESSBOOK", "X-ManagersName", tempS );
   tempS = QString::fromUcs2(aItem->GetAssistantName().GetBuffer());
   if ( !tempS.isEmpty() )
     addressee.insertCustom( "KADDRESSBOOK", "X-AssistantsName", tempS );
   tempS = QString::fromUcs2(aItem->GetDepartment().GetBuffer());
   if ( !tempS.isEmpty() )
     addressee.insertCustom( "KADDRESSBOOK", "X-Department", tempS );
-  tempS = QString::fromUcs2(aItem->GetOfficeLocation().GetBuffer());
+  tempS = QString::fromUcs2(aItem->GetOfficeLocation().GetBuffer()).replace( QRegExp("\\r"), "");
   if ( !tempS.isEmpty() )
     addressee.insertCustom( "KADDRESSBOOK", "X-Office",tempS );
   tempS = QString::fromUcs2(aItem->GetProfession().GetBuffer());
   if ( !tempS.isEmpty() )
     addressee.insertCustom( "KADDRESSBOOK", "X-Profession", tempS );
   dtb =  mDdate2Qdtr(aItem->GetAnniversary());
   if (dtb.isValid() ) {
     QString dt = KGlobal::locale()->formatDate( dtb.date() , true, KLocale::ISODate);
     addressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt);
   }
   int sec =   aItem->GetSensitivity() ;
   if ( sec > 1 )// mapping pers -> private
     --sec;
   addressee.setSecrecy( sec );
   //addressee.setLogo( const Picture &logo );
   //addressee.setPhoto( const Picture &photo );
   //addressee.setSound( const Sound &sound );
   //addressee.setAgent( const Agent &agent );
-  QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer());
+  QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer()).replace( QRegExp("\\r"), "");
   addressee.setCategories( QStringList::split( ";", cat ));
   
   QString phoneS;
 
   phoneS = QString::fromUcs2( aItem->GetAssistantTelephoneNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work + KABC::PhoneNumber::Voice ) );
   phoneS = QString::fromUcs2( aItem->GetBusinessTelephoneNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work ) );
   phoneS = QString::fromUcs2( aItem->GetBusiness2TelephoneNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work ) );
   phoneS = QString::fromUcs2( aItem->GetBusinessFaxNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work + KABC::PhoneNumber::Fax ) );
@@ -383,190 +385,217 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
   if ( ! phoneS.isEmpty()) {
     addressee.insertEmail(phoneS  , preferred );
     preferred = false;
   }
   phoneS = QString::fromUcs2( aItem->GetEmail3Address().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     addressee.insertEmail(phoneS  , preferred );
     preferred = false;
   }
   // is this the number of the preferred email?
   //	long GetSelectedMailingAddress();???
  
   KABC::Address addressHome;
   KABC::Address* addressAdd = &addressHome;
   bool insert = false;
   phoneS = QString::fromUcs2( aItem->GetHomeAddressCountry().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setCountry(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetHomeAddressState().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setRegion(phoneS   );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetHomeAddressCity().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setLocality(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetHomeAddressPostalCode().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostalCode(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetHomeAddressPostOfficeBox().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostOfficeBox(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetHomeAddressStreet().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setStreet(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetHomeAddress().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     // redundant !addressAdd->setExtended(phoneS  );
     // insert = true;
   }
   addressAdd->setType( KABC::Address::Home );
   if ( insert )
     addressee.insertAddress( *addressAdd );
   // ++++++++++++++++++++++ end of address
 
   KABC::Address addressWork;
   addressAdd = &addressWork;
   insert = false;
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressCountry().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setCountry(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressState().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setRegion(phoneS   );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressCity().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setLocality(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressPostalCode().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostalCode(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressPostOfficeBox().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostOfficeBox(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetBusinessAddressStreet().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setStreet(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetBusinessAddress().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     // redundant !addressAdd->setExtended(phoneS  );
     // insert = true;
   }
   addressAdd->setType( KABC::Address::Work );
   if ( insert )
     addressee.insertAddress( *addressAdd );
   // ++++++++++++++++++++++ end of address
 
  KABC::Address addressOther;
   addressAdd = &addressOther;
   insert = false;
   phoneS = QString::fromUcs2( aItem->GetOtherAddressCountry().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setCountry(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetOtherAddressState().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setRegion(phoneS   );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetOtherAddressCity().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setLocality(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetOtherAddressPostalCode().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostalCode(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetOtherAddressPostOfficeBox().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostOfficeBox(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetOtherAddressStreet().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setStreet(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetOtherAddress().GetBuffer());
   if ( ! phoneS.isEmpty()) {
     // redundant !addressAdd->setExtended(phoneS  );
     //insert = true;
   }
   //addressAdd->setId(  );
   if ( insert )
     addressee.insertAddress( *addressAdd );
   // ++++++++++++++++++++++ end of address
  KABC::Address addressMail;
   addressAdd = &addressMail;
   insert = false;
   phoneS = QString::fromUcs2( aItem->GetMailingAddressCountry().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setCountry(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetMailingAddressState().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setRegion(phoneS   );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetMailingAddressCity().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setLocality(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetMailingAddressPostalCode().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostalCode(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetMailingAddressPostOfficeBox().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setPostOfficeBox(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetMailingAddressStreet().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     addressAdd->setStreet(phoneS  );
     insert = true;
   }
   phoneS = QString::fromUcs2( aItem->GetMailingAddress().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! phoneS.isEmpty()) {
     // redundant ! addressAdd->setExtended(phoneS  );
     // insert = true;
   }
   addressAdd->setType( KABC::Address::Postal ); 
   if ( insert ) {
     addressee.insertAddress( *addressAdd );
   }
   // the following code is disabled
   // it does not seem to be useful
 #if 0
   if ( insert ) {
     addressAdd->setType( KABC::Address::Home );
     if ( addressMail == addressHome ) {
       addressHome.setType( KABC::Address::Postal+ KABC::Address::Home );
       addressee.insertAddress( addressHome );
@@ -578,87 +607,96 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
 
       } else {
 	addressAdd->setType( 0 );
 	if ( addressOther == addressMail ){
 	  addressOther.setType( KABC::Address::Postal );
 	  addressee.insertAddress( addressOther );
 	} else {
 	  addressee.insertAddress( *addressAdd );
 	}
       }
     }
   }
 #endif
   // ++++++++++++++++++++++ end of ALL addresses
   //GetUserProperties();
   tempS = QString::fromUcs2(aItem->GetInternetFreeBusyAddress().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( !tempS.isEmpty() )
     addressee.insertCustom( "KADDRESSBOOK", "X-FreeBusyUrl", tempS );
   tempS = QString::fromUcs2(aItem->GetChildren().GetBuffer());
   if ( !tempS.isEmpty() )
     addressee.insertCustom( "KADDRESSBOOK", "X-Children", tempS );
   int gen  = aItem->GetGender();
   if ( gen != 0  ) { // 0 undef - 1 female - 2 male 
     if ( gen == 1 )
       addressee.insertCustom( "KADDRESSBOOK", "X-Gender", "female" );
     else
       addressee.insertCustom( "KADDRESSBOOK", "X-Gender", "male" );
   }
   QString additionalInfo;
   QString tempAdd;
   tempAdd = QString::fromUcs2(aItem->GetLanguage().GetBuffer());
   if ( ! tempAdd.isEmpty() ) {
     additionalInfo += i18n("\nLanguage: ");
     additionalInfo += tempAdd;
   }
   tempAdd = QString::fromUcs2(aItem->GetHobby().GetBuffer()); 
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
     additionalInfo += i18n("\nHobby: ");
     additionalInfo += tempAdd;;
   }
   tempAdd =QString::fromUcs2(aItem->GetPersonalHomePage().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
     additionalInfo += i18n("\nHomepage: ");
     additionalInfo += tempAdd;;
   }
   tempAdd = QString::fromUcs2(aItem->GetBillingInformation().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
     additionalInfo += i18n("\nBilling information: ");
     additionalInfo += tempAdd;;
   }
   tempAdd = QString::fromUcs2(aItem->GetCustomerID().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
     additionalInfo += i18n("\nCustomer ID: ");
     additionalInfo += tempAdd;;
   }
   tempAdd = QString::fromUcs2(aItem->GetUser1().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
     additionalInfo += i18n("\nUser1: ");
     additionalInfo += tempAdd;;
   }
   tempAdd = QString::fromUcs2(aItem->GetUser2().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
     additionalInfo += i18n("\nUser2: ");
     additionalInfo += tempAdd;;
   }
   tempAdd = QString::fromUcs2(aItem->GetUser3().GetBuffer());
+  phoneS.replace( QRegExp("\\r"), "");
   if ( ! tempAdd.isEmpty() ) {
     additionalInfo += i18n("\nUser3: ");
     additionalInfo += tempAdd;;
   }
   tempAdd = QString::fromUcs2(aItem->GetUser4().GetBuffer()); 
+  phoneS.replace( QRegExp("\\r"), ""); 
   if ( ! tempAdd.isEmpty() ) {
     additionalInfo += i18n("\nUser4: ");
     additionalInfo += tempAdd;;
   }
   if (!additionalInfo.isEmpty() ) {
     tempAdd = notesStr;
     notesStr = "+++++++++++++++++++++++++++\n";
     notesStr += i18n("Additonal fields created\nby KA/Pi Outlook import:");
     notesStr += additionalInfo;
     notesStr += i18n("\nEnd additonal fields created\nby KA/Pi Outlook import!\n");
     notesStr += "+++++++++++++++++++++++++++\n";
     notesStr += tempAdd;
   }
   addressee.setNote( notesStr );
 #if 0  
   // pending
diff --git a/korganizer/koimportoldialog.cpp b/korganizer/koimportoldialog.cpp
index 0a3c2d5..c0bde0d 100644
--- a/korganizer/koimportoldialog.cpp
+++ b/korganizer/koimportoldialog.cpp
@@ -18,32 +18,33 @@
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qtooltip.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qlayout.h>
 #include <qprogressbar.h>
 #include <qwidgetstack.h>
 #include <qdatetime.h>
 #include <qdir.h>
 #include <qapplication.h>
 #include <qhbox.h>
+#include <qregexp.h>
 #include <qheader.h>
 #include <qdatetime.h>
 #include <qlistview.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kfiledialog.h>
 
 #include <libkdepim/categoryselectdialog.h>
 #include <libkdepim/kinputdialog.h>
 
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icalformat.h>
 #include <kabc/stdaddressbook.h>
@@ -237,33 +238,33 @@ void KOImportOLdialog::slotOk()
 }
 
 void KOImportOLdialog::ol2kopiCalendar( _AppointmentItem * aItem, bool computeRecurrence )
 {
   KCal::Event* event = new KCal::Event();
   if ( aItem->GetAllDayEvent() ){
     event->setDtStart( QDateTime( mDdate2Qdtr( aItem->GetStart()).date(),QTime(0,0,0 ) ));
     event->setDtEnd( QDateTime( mDdate2Qdtr( aItem->GetEnd()) .date(),QTime(0,0,0 )).addDays(-1));
     event->setFloats( true );
   } else {
     event->setDtStart( mDdate2Qdtr( aItem->GetStart()) );
     event->setDtEnd( mDdate2Qdtr( aItem->GetEnd()) );
     event->setFloats( false );
   }
   event->setSummary( QString::fromUcs2( aItem->GetSubject().GetBuffer()) );
   event->setLocation( QString::fromUcs2( aItem->GetLocation().GetBuffer()) );
-  event->setDescription( QString::fromUcs2( aItem->GetBody().GetBuffer())  );
+  event->setDescription( QString::fromUcs2( aItem->GetBody().GetBuffer()).replace( QRegExp("\\r"), "")  );
   QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer());
   event->setCategories( QStringList::split( ";", cat ));
   if ( aItem->GetReminderSet() ) {
     event->clearAlarms();
     Alarm* alarm = event->newAlarm();
     alarm->setStartOffset( -aItem->GetReminderMinutesBeforeStart()*60 );
     alarm->setEnabled( true );
     if ( aItem->GetReminderPlaySound() ) {
       alarm->setType( Alarm::Audio );
       alarm->setAudioFile( QString::fromUcs2( aItem->GetReminderSoundFile().GetBuffer()));
       }
     else
       alarm->setType( Alarm::Display );
     alarm->setRepeatCount( aItem->GetReplyTime() );
   }
   // OL :pub 0 - pers 1  -  priv 2 -  conf 3
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 9e215b9..63484d6 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -275,51 +275,57 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
 #ifndef DESKTOP_VERSION
   connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
 #endif
 #ifndef DESKTOP_VERSION
     infrared = 0;
 #endif
     
     mBRdisabled = false;
     toggleBeamReceive();
 }
 MainWindow::~MainWindow()
 {
     //qDebug("MainWindow::~MainWindow() ");
     //save toolbar location
     delete mCalendar;
     delete mSyncManager;
+#ifndef DESKTOP_VERSION
     if ( infrared )
         delete infrared;
+#endif
 
 
 }
 
 void MainWindow::disableBR(bool b)
 {
+#ifndef DESKTOP_VERSION
     if ( b ) {
         if ( infrared ) {
             toggleBeamReceive();
             mBRdisabled = true;
         }
+        mBRdisabled = true;
     } else {
         if ( mBRdisabled ) {
             mBRdisabled = false;
-            toggleBeamReceive();
+            //makes no sense,because other cal ap is probably running
+            // toggleBeamReceive(); 
         }
     }
+#endif
 
 }
 bool MainWindow::beamReceiveEnabled()
 {
 #ifndef DESKTOP_VERSION
     return ( infrared != 0 );
 #endif
     return false;
 }
 
 void MainWindow::toggleBeamReceive()
 {
     if ( mBRdisabled  )
         return;
 #ifndef DESKTOP_VERSION
     if ( infrared ) {