OL import fixes

2 files changed, 9 insertions, 2 deletions

diff --git a/korganizer/koimportoldialog.cpp b/korganizer/koimportoldialog.cpp
index 0a3c2d5..c0bde0d 100644
--- a/korganizer/koimportoldialog.cpp
+++ b/korganizer/koimportoldialog.cpp
@@ -33,2 +33,3 @@
 #include <qhbox.h>
+#include <qregexp.h>
 #include <qheader.h>
@@ -252,3 +253,3 @@ void KOImportOLdialog::ol2kopiCalendar( _AppointmentItem * aItem, bool computeRe
   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());
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 9e215b9..63484d6 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -290,4 +290,6 @@ MainWindow::~MainWindow()
     delete mSyncManager;
+#ifndef DESKTOP_VERSION
     if ( infrared )
         delete infrared;
+#endif
 
@@ -298,2 +300,3 @@ void MainWindow::disableBR(bool b)
 {
+#ifndef DESKTOP_VERSION
     if ( b ) {
@@ -303,2 +306,3 @@ void MainWindow::disableBR(bool b)
         }
+        mBRdisabled = true;
     } else {
@@ -306,5 +310,7 @@ void MainWindow::disableBR(bool b)
             mBRdisabled = false;
-            toggleBeamReceive();
+            //makes no sense,because other cal ap is probably running
+            // toggleBeamReceive(); 
         }
     }
+#endif