summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2010-10-13 14:37:44 +0200
committerJan Holesovsky <kendy@suse.cz>2010-10-13 14:37:44 +0200
commit012d739644019aca331bf0906750038137bb8cad (patch)
tree87f8f748ed29bbe1f84566efb49adba1175ba2ee
parent9d8c45d9a82e1ec53b5a7a989756415fe3d593a8 (diff)
parent7a0832bca75cbb877c9e3592193a06a259c4b8f2 (diff)
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/components
-rw-r--r--extensions/source/abpilot/abspilot.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index eb9a89f94134..13ddcf175909 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -116,13 +116,12 @@ namespace abp
m_pCancel->SetClickHdl( LINK( this, OAddessBookSourcePilot, OnCancelClicked) );
// some initial settings
+#ifdef UNX
#ifdef MACOSX
m_aSettings.eType = AST_MACAB;
-#elif WITH_MOZILLA
-#ifdef UNX
- m_aSettings.eType = AST_MORK;
#else
- m_aSettings.eType = AST_OE;
+// FIXME: if KDE use KAB instead
+ m_aSettings.eType = AST_EVOLUTION;
#endif
#else
m_aSettings.eType = AST_OTHER;