author | zautrix <zautrix> | 2005-01-25 15:12:21 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-25 15:12:21 (UTC) |
commit | fe4e6e85abc2ec90cc80108fc7434899b6e13048 (patch) (unidiff) | |
tree | 9a3cf83ecf8796d0020076e4e8e275d193fb2584 /kaddressbook/kabcore.cpp | |
parent | 165d969ce6ac38c5e3d7b5c629af0b00d0fff017 (diff) | |
download | kdepimpi-fe4e6e85abc2ec90cc80108fc7434899b6e13048.zip kdepimpi-fe4e6e85abc2ec90cc80108fc7434899b6e13048.tar.gz kdepimpi-fe4e6e85abc2ec90cc80108fc7434899b6e13048.tar.bz2 |
small fixes
-rw-r--r-- | kaddressbook/kabcore.cpp | 11 |
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$ | |||
155 | #include <kcmultidialog.h> | 155 | #include <kcmultidialog.h> |
156 | 156 | ||
157 | #ifdef _WIN32_ | 157 | #ifdef _WIN32_ |
158 | 158 | #ifdef _OL_IMPORT_ | |
159 | #include "kaimportoldialog.h" | 159 | #include "kaimportoldialog.h" |
160 | #endif | ||
160 | #else | 161 | #else |
161 | #include <unistd.h> | 162 | #include <unistd.h> |
162 | #endif | 163 | #endif |
@@ -1291,7 +1292,7 @@ void KABCore::importVCard( const KURL &url, bool showPreview ) | |||
1291 | } | 1292 | } |
1292 | void KABCore::importFromOL() | 1293 | void KABCore::importFromOL() |
1293 | { | 1294 | { |
1294 | #ifdef _WIN32_ | 1295 | #ifdef _OL_IMPORT_ |
1295 | KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"), mAddressBook, this ); | 1296 | KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"), mAddressBook, this ); |
1296 | idgl->exec(); | 1297 | idgl->exec(); |
1297 | KABC::Addressee::List list = idgl->getAddressList(); | 1298 | KABC::Addressee::List list = idgl->getAddressList(); |
@@ -2166,7 +2167,7 @@ void KABCore::addActionsManually() | |||
2166 | #ifndef DESKTOP_VERSION | 2167 | #ifndef DESKTOP_VERSION |
2167 | if ( Ir::supported() ) fileMenu->insertItem( i18n("&Beam"), beamMenu ); | 2168 | if ( Ir::supported() ) fileMenu->insertItem( i18n("&Beam"), beamMenu ); |
2168 | #endif | 2169 | #endif |
2169 | #if 0 | 2170 | #if 0 |
2170 | // PENDING fix MailVCard | 2171 | // PENDING fix MailVCard |
2171 | fileMenu->insertSeparator(); | 2172 | fileMenu->insertSeparator(); |
2172 | mActionMailVCard->plug( fileMenu ); | 2173 | mActionMailVCard->plug( fileMenu ); |
@@ -2178,7 +2179,7 @@ void KABCore::addActionsManually() | |||
2178 | #endif | 2179 | #endif |
2179 | fileMenu->insertSeparator(); | 2180 | fileMenu->insertSeparator(); |
2180 | mActionQuit->plug( fileMenu ); | 2181 | mActionQuit->plug( fileMenu ); |
2181 | #ifdef _WIN32_ | 2182 | #ifdef _OL_IMPORT_ |
2182 | mActionImportOL->plug( ImportMenu ); | 2183 | mActionImportOL->plug( ImportMenu ); |
2183 | #endif | 2184 | #endif |
2184 | // edit menu | 2185 | // edit menu |
@@ -2221,8 +2222,8 @@ void KABCore::addActionsManually() | |||
2221 | settingsMenu->insertSeparator(); | 2222 | settingsMenu->insertSeparator(); |
2222 | #ifndef DESKTOP_VERSION | 2223 | #ifndef DESKTOP_VERSION |
2223 | if ( Ir::supported() ) mActionBR->plug(settingsMenu ); | 2224 | if ( Ir::supported() ) mActionBR->plug(settingsMenu ); |
2224 | #endif | ||
2225 | settingsMenu->insertSeparator(); | 2225 | settingsMenu->insertSeparator(); |
2226 | #endif | ||
2226 | 2227 | ||
2227 | mActionWhoAmI->plug( settingsMenu ); | 2228 | mActionWhoAmI->plug( settingsMenu ); |
2228 | mActionEditCategories->plug( settingsMenu ); | 2229 | mActionEditCategories->plug( settingsMenu ); |