From 5cf3c1bce58a6487af166e637e54571e98156fd0 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Wed, 20 Oct 2004 12:05:18 +0000
Subject: OL import fixes

---
(limited to 'korganizer')

diff --git a/korganizer/koimportoldialog.cpp b/korganizer/koimportoldialog.cpp
index 0a3c2d5..c0bde0d 100644
--- a/korganizer/koimportoldialog.cpp
+++ b/korganizer/koimportoldialog.cpp
@@ -31,6 +31,7 @@
 #include <qdir.h>
 #include <qapplication.h>
 #include <qhbox.h>
+#include <qregexp.h>
 #include <qheader.h>
 #include <qdatetime.h>
 #include <qlistview.h>
@@ -250,7 +251,7 @@ void KOImportOLdialog::ol2kopiCalendar( _AppointmentItem * aItem, bool computeRe
   }
   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() ) {
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 9e215b9..63484d6 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -288,25 +288,31 @@ 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()
--
cgit v0.9.0.2