4 files changed, 37 insertions, 34 deletions

diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 8aa24ee..ea73fd0 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -95,6 +95,8 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   //setupGroupAutomationTab();
 
+#ifndef DESKTOP_VERSION
   if ( QApplication::desktop()->height() == 480  )
       hideButtons();
+#endif
 }
 
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index c2602b2..4d67dca 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -1,4 +1,4 @@
         TEMPLATE= app
-        CONFIG  = qt warn_on 
+        CONFIG  += qt warn_off
         TARGET  = kopi
 OBJECTS_DIR = _obj/
@@ -37,5 +37,4 @@ LIBS += ../libical/lib/ical.lib
 LIBS += ../libical/lib/icalss.lib
 #LIBS += atls.lib
-LIBS += mfc71u.lib
 QMAKE_LINK += /NODEFAULTLIB:LIBC
 #QMAKE_LINK += /NODEFAULTLIB:MSVCRT
@@ -43,4 +42,16 @@ QMAKE_LINK += /NODEFAULTLIB:LIBC
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
+#olimport section 
+#blabla: {
+LIBS += mfc71u.lib
+DEFINES +=  _OL_IMPORT_
+
+HEADERS += ../outport/msoutl9.h \
+ koimportoldialog.h 
+SOURCES += ../outport/msoutl9.cpp \
+ koimportoldialog.cpp
+#}
+#olimport section end
+
 }
 
@@ -51,5 +62,5 @@ INTERFACES = kofilterview_base.ui
 # kdateedit.h \
 
-HEADERS = \
+HEADERS += \
  filteredit_base.h \
  alarmclient.h \
@@ -114,5 +125,5 @@ HEADERS = \
 
 
-SOURCES = \ 
+SOURCES += \ 
 filteredit_base.cpp \
  calendarview.cpp \
@@ -179,15 +190,2 @@ INTERFACES += calprintdayconfig_base.ui \
 SOURCES += calprintbase.cpp calprinter.cpp calprintplugins.cpp cellitem.cpp
 
-
-
-win32: {
-HEADERS += ../outport/msoutl9.h \
- koimportoldialog.h 
-
-
-SOURCES += ../outport/msoutl9.cpp \
- koimportoldialog.cpp 
-
-
-}
-
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index 2481ca4..4b207d9 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -12,4 +12,5 @@
 #include <qplatinumstyle.h> 
 #include <qsgistyle.h> 
+#include <stdlib.h>
 #endif
 #include <qtextcodec.h> 
@@ -30,20 +31,20 @@ int main( int argc, char **argv )
   QApplication a( argc, argv ); 
   QApplication::setStyle( new QPlatinumStyle ());
-  QString hdir = QDir::homeDirPath();
-  // there is a bug when creating dirs for WIN 98
-  // it is difficult to fix, because we have no WIN 98 runnung
-  // such that we try it to create the dirs at startup here
-  if ( hdir == "C:\\" ) { // win 98 or ME
-       QDir app_dir;
-       if ( !app_dir.exists("C:\\kdepim") )
-           app_dir.mkdir ("C:\\kdepim");
-       if ( !app_dir.exists("C:\\kdepim\\apps") )
-           app_dir.mkdir ("C:\\kdepim\\apps");
-       if ( !app_dir.exists("C:\\kdepim\\config") )
-           app_dir.mkdir ("C:\\kdepim\\config");
-       if ( !app_dir.exists("C:\\kdepim\\apps\\korganizer") )
-           app_dir.mkdir ("C:\\kdepim\\apps\\korganizer");
+#ifdef _WIN32_
+  QString hdir ( getenv( "HOME") );
+  if ( hdir.isEmpty() ) {
+    QString hd ("C:/" );
+    //QMessageBox::information(0,"hh",QDir::homeDirPath()+" xx" +hd );
+    if ( QDir::homeDirPath().lower() == hd.lower() ) {
+      _putenv( "HOME=C:");
+      //QMessageBox::information(0,"hh",QString ( getenv( "HOME") ) );
+    }
+  } else {
+    QDir app_dir;
+    if ( !app_dir.exists(hdir) )
+      app_dir.mkdir (hdir);
   }
 #endif
+#endif
   bool exitHelp = false;
   if ( argc > 1 ) {
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 7b07a2e..26ea1e2 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -67,6 +67,8 @@ using namespace KCal;
 #include <unistd.h>
 #else
+#ifdef _OL_IMPORT_
 #include "koimportoldialog.h"
 #endif
+#endif
 #include "mainwindow.h"
 
@@ -779,5 +781,5 @@ void MainWindow::initActions()
     connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) );
 #else
-#ifdef _WIN32_
+#ifdef _OL_IMPORT_
     importMenu->insertSeparator();
     action = new QAction( "import_ol", i18n("Import from OL"), 0,
@@ -1368,6 +1370,6 @@ void MainWindow::enableIncidenceActions( bool enabled )
 
 void MainWindow::importOL()
-{
-#ifdef _WIN32_
+{ 
+#ifdef _OL_IMPORT_
       KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this );
       id->exec();