small fixes

3 files changed, 34 insertions, 38 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 505cbf4..590cc82 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -155,8 +155,9 @@ $Id$
 #include <kcmultidialog.h>
 
 #ifdef _WIN32_
-
+#ifdef  _OL_IMPORT_
 #include "kaimportoldialog.h"
+#endif
 #else
 #include <unistd.h>
 #endif
@@ -1291,7 +1292,7 @@ void KABCore::importVCard( const KURL &url, bool showPreview )
 }
 void KABCore::importFromOL()
 {
-#ifdef _WIN32_
+#ifdef _OL_IMPORT_
   KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"),  mAddressBook, this );
   idgl->exec();
   KABC::Addressee::List list = idgl->getAddressList();
@@ -2166,7 +2167,7 @@ void KABCore::addActionsManually()
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() )  fileMenu->insertItem( i18n("&Beam"), beamMenu );
 #endif
-#if 0
+#if 0 
   // PENDING fix MailVCard
   fileMenu->insertSeparator();
   mActionMailVCard->plug( fileMenu );
@@ -2178,7 +2179,7 @@ void KABCore::addActionsManually()
 #endif
   fileMenu->insertSeparator();
   mActionQuit->plug( fileMenu );
-#ifdef _WIN32_
+#ifdef _OL_IMPORT_
   mActionImportOL->plug( ImportMenu  );
 #endif
   // edit menu
@@ -2221,8 +2222,8 @@ void KABCore::addActionsManually()
   settingsMenu->insertSeparator();
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() ) mActionBR->plug(settingsMenu );
-#endif
   settingsMenu->insertSeparator();
+#endif
 
   mActionWhoAmI->plug( settingsMenu );
   mActionEditCategories->plug( settingsMenu );
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index fbbc026..e73de06 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -28,21 +28,24 @@ LIBS += ../bin/microkabc.lib
 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 \
+ kaimportoldialog.h 
+SOURCES = ../outport/msoutl9.cpp \
+ kaimportoldialog.cpp 
+#}
+#olimport section end
 }
 
-
-
-
-
-
-
-
 INTERFACES = \
 # filteredit_base.ui \
 # kofilterview_base.ui \
 
-HEADERS = \
+HEADERS += \
 features/mergewidget.h \
 features/distributionlistwidget.h \
 kcmconfigs/addresseewidget.h \
@@ -108,7 +111,7 @@ xxport/sharpdtm_xxport.h \
 # customlistviewitem.h \
 # datenavigator.h
 
-SOURCES = \
+SOURCES += \
 addresseeeditordialog.cpp \
 addresseeeditorwidget.cpp \
 addresseditwidget.cpp \
@@ -172,13 +175,3 @@ xxport/sharpdtm_xxport.cpp \
 # calendarview.cpp \
 # timespanview.cpp
 
-
-
-win32: {
-HEADERS += ../outport/msoutl9.h \
- kaimportoldialog.h 
-
-SOURCES += ../outport/msoutl9.cpp \
- kaimportoldialog.cpp 
-}
-
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index 1e03dba..d9968f3 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -7,6 +7,8 @@
 #include <qwindowsstyle.h>
 #include <qplatinumstyle.h>
 #include <qmainwindow.h>
+#include <qmessagebox.h> 
+#include <stdlib.h>
 #endif
 
 #include <qtextcodec.h> 
@@ -28,22 +30,22 @@ int main( int argc, char **argv )
 #else
   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\\kaddressbook") )
-           app_dir.mkdir ("C:\\kdepim\\apps\\kaddressbook");
+#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 ) {