summaryrefslogtreecommitdiffabout
path: root/kaddressbook/kabcore.cpp
Side-by-side diff
Diffstat (limited to 'kaddressbook/kabcore.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp11
1 files changed, 6 insertions, 5 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 );