3 files changed, 17 insertions, 3 deletions

diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index ce35053..caee66d 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -45,41 +45,46 @@ $Id$
 #include "csvimportdialog.h"
 
 #include "csv_xxport.h"
 
 
 #ifndef KAB_EMBEDDED
 
 class CSVXXPortFactory : public XXPortFactory
 {
   public:
     XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name )
     {
       return new CSVXXPort( ab, parent, name );
     }
 };
 
+#endif //KAB_EMBEDDED
+
 
 extern "C"
 {
+#ifndef KAB_EMBEDDED
   void *init_libkaddrbk_csv_xxport()
+#else //KAB_EMBEDDED
+  void *init_kaddrbk_csv_xxport()
+#endif //KAB_EMBEDDED
   {
     return ( new CSVXXPortFactory() );
   }
 }
-#endif //KAB_EMBEDDED
 
 
 CSVXXPort::CSVXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
   : XXPortObject( ab, parent, name )
 {
   createImportAction( i18n( "Import CSV List..." ) );
   createExportAction( i18n( "Export CSV List..." ) );
 }
 
 bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString& )
 {
 #ifndef KAB_EMBEDDED
   KURL url = KFileDialog::getSaveURL( "addressbook.csv" );
   if ( url.isEmpty() )
       return true;
 
diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp
index d5fc075..3fdb36d 100644
--- a/kaddressbook/xxport/kde2_xxport.cpp
+++ b/kaddressbook/xxport/kde2_xxport.cpp
@@ -44,41 +44,46 @@ $Id$
 
 #include "xxportmanager.h"
 
 #include "kde2_xxport.h"
 
 #ifndef KAB_EMBEDDED
 
 class KDE2XXPortFactory : public XXPortFactory
 {
   public:
     XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name )
     {
       return new KDE2XXPort( ab, parent, name );
     }
 };
 
+#endif //KAB_EMBEDDED
+
 
 extern "C"
 {
+#ifndef KAB_EMBEDDED
   void *init_libkaddrbk_kde2_xxport()
+#else //KAB_EMBEDDED
+  void *init_kaddrbk_kde2_xxport()
+#endif //KAB_EMBEDDED
   {
     return ( new KDE2XXPortFactory() );
   }
 }
-#endif //KAB_EMBEDDED
 
 
 KDE2XXPort::KDE2XXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
   : XXPortObject( ab, parent, name )
 {
   createImportAction( i18n( "Import KDE 2 Addressbook..." ) );
 }
 
 KABC::AddresseeList KDE2XXPort::importContacts( const QString& ) const
 {
   QString fileName = locateLocal( "data", "kabc/std.vcf" );
   if ( !QFile::exists( fileName ) ) {
     KMessageBox::sorry( parentWidget(), i18n( "<qt>Couldn't find a KDE 2 address book <b>%1</b>.</qt>" ).arg( fileName ) );
     return KABC::AddresseeList();
   }
 
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index dd49a9c..c017f5b 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -43,42 +43,46 @@ $Id$
 #include <kurl.h>
 
 #include "xxportmanager.h"
 
 #include "vcard_xxport.h"
 
 #ifndef KAB_EMBEDDED
 
 class VCardXXPortFactory : public XXPortFactory
 {
   public:
     XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name )
     {
       return new VCardXXPort( ab, parent, name );
     }
 };
+#endif //KAB_EMBEDDED
 
 
 extern "C"
 {
+#ifndef KAB_EMBEDDED
   void *init_libkaddrbk_vcard_xxport()
+#else //KAB_EMBEDDED
+  void *init_kaddrbk_vcard_xxport()
+#endif //KAB_EMBEDDED
   {
     return ( new VCardXXPortFactory() );
   }
 }
-#endif //KAB_EMBEDDED
 
 
 VCardXXPort::VCardXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
   : XXPortObject( ab, parent, name )
 {
   createImportAction( i18n( "Import vCard..." ) );
   createExportAction( i18n( "Export vCard 2.1..." ), "v21" );
   createExportAction( i18n( "Export vCard 3.0..." ), "v30" );
 }
 
 bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString &data )
 {
   QString name;
 
   if ( list.count() == 1 )
     name = list[ 0 ].givenName() + "_" + list[ 0 ].familyName() + ".vcf";