summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-04-16 16:27:43 +0200
committerMontel Laurent <[email protected]>2017-04-16 16:27:43 +0200
commit50a7b3bff98cf7029705be927f85bf08a373f653 (patch)
tree52894e0ad1ea3f426a7e70ee638974d3f8451bbb
parent84cebc90cbb553219b6182b73c0045261dac1de3 (diff)
Activate more plugin
-rw-r--r--src/CMakeLists.txt6
-rw-r--r--src/autodetect/CMakeLists.txt1
-rw-r--r--src/autodetect/balsa/CMakeLists.txt21
-rw-r--r--src/autodetect/balsa/balsaaddressbook.cpp4
-rw-r--r--src/autodetect/balsa/balsaimportdata.cpp2
-rw-r--r--src/autodetect/balsa/balsasettings.cpp4
-rw-r--r--src/autodetect/importwizardutil.h3
-rw-r--r--src/importwizard.cpp8
8 files changed, 36 insertions, 13 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 07f925a..88fb536 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -56,9 +56,9 @@ set(libimportwizard_autodetect_SRCS
autodetect/pmail/pmailimportdata.cpp
autodetect/pmail/pmailsettings.cpp
autodetect/thebat/thebatimportdata.cpp
- autodetect/balsa/balsaimportdata.cpp
- autodetect/balsa/balsasettings.cpp
- autodetect/balsa/balsaaddressbook.cpp
+# autodetect/balsa/balsaimportdata.cpp
+# autodetect/balsa/balsasettings.cpp
+# autodetect/balsa/balsaaddressbook.cpp
autodetect/claws-mail/clawsmailimportdata.cpp
autodetect/claws-mail/clawsmailsettings.cpp
autodetect/claws-mail/clawsmailaddressbook.cpp
diff --git a/src/autodetect/CMakeLists.txt b/src/autodetect/CMakeLists.txt
index 9a3d50a..a9b7d24 100644
--- a/src/autodetect/CMakeLists.txt
+++ b/src/autodetect/CMakeLists.txt
@@ -3,3 +3,4 @@ add_subdirectory(trojita)
add_subdirectory(opera)
add_subdirectory(mailapp)
add_subdirectory(pmail)
+add_subdirectory(balsa)
diff --git a/src/autodetect/balsa/CMakeLists.txt b/src/autodetect/balsa/CMakeLists.txt
new file mode 100644
index 0000000..04339e0
--- /dev/null
+++ b/src/autodetect/balsa/CMakeLists.txt
@@ -0,0 +1,21 @@
+set(balsaimporter_SRCS
+ balsaaddressbook.cpp
+ balsaimportdata.cpp
+ balsasettings.cpp
+)
+
+kcoreaddons_add_plugin(balsaimporterplugin JSON balsaimporter.json SOURCES
+ ${balsaimporter_SRCS} INSTALL_NAMESPACE importwizard)
+
+
+target_link_libraries(balsaimporterplugin
+ libimportwizard
+ KF5::XmlGui
+ KF5::I18n
+ KF5::Contacts
+ KF5::MailImporterAkonadi
+ KF5::MailTransport
+ KF5::MailCommon
+ KF5::IdentityManagement
+ KF5::MessageViewer
+)
diff --git a/src/autodetect/balsa/balsaaddressbook.cpp b/src/autodetect/balsa/balsaaddressbook.cpp
index a28cc6f..6bebd1b 100644
--- a/src/autodetect/balsa/balsaaddressbook.cpp
+++ b/src/autodetect/balsa/balsaaddressbook.cpp
@@ -79,7 +79,7 @@ void BalsaAddressBook::readAddressBook(const KConfigGroup &grp)
ImportWizardUtil::mergeLdap(ldap);
addAddressBookImportInfo(i18n("Ldap created"));
} else if (type == QLatin1String("LibBalsaAddressBookGpe")) {
- qCDebug(IMPORTWIZARD_LOG) << " Import it !";
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " Import it !";
} else if (type == QLatin1String("LibBalsaAddressBookLdif")) {
const QString path = grp.readEntry(QStringLiteral("Path"));
if (!path.isEmpty()) {
@@ -110,6 +110,6 @@ void BalsaAddressBook::readAddressBook(const KConfigGroup &grp)
addAddressBookImportInfo(i18n("New addressbook created: %1", createResource(QStringLiteral("akonadi_vcard_resource"), name, settings)));
}
} else {
- qCDebug(IMPORTWIZARD_LOG) << " unknown addressbook type :" << type;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " unknown addressbook type :" << type;
}
}
diff --git a/src/autodetect/balsa/balsaimportdata.cpp b/src/autodetect/balsa/balsaimportdata.cpp
index 7755ef3..9bdb4c6 100644
--- a/src/autodetect/balsa/balsaimportdata.cpp
+++ b/src/autodetect/balsa/balsaimportdata.cpp
@@ -30,7 +30,7 @@
#include <kpluginfactory.h>
#include <QDir>
-//K_PLUGIN_FACTORY_WITH_JSON(BalsaImporterFactory, "balsaimporter.json", registerPlugin<BalsaImportData>();)
+K_PLUGIN_FACTORY_WITH_JSON(BalsaImporterFactory, "balsaimporter.json", registerPlugin<BalsaImportData>();)
BalsaImportData::BalsaImportData(QObject *parent, const QList<QVariant> &)
: AbstractImporter(parent)
diff --git a/src/autodetect/balsa/balsasettings.cpp b/src/autodetect/balsa/balsasettings.cpp
index 7b78953..600bcc9 100644
--- a/src/autodetect/balsa/balsasettings.cpp
+++ b/src/autodetect/balsa/balsasettings.cpp
@@ -96,7 +96,7 @@ void BalsaSettings::readAccount(const KConfigGroup &grp, bool autoCheck, int aut
addCheckMailOnStartup(agentIdentifyName, autoCheck);
addToManualCheck(agentIdentifyName, check);
} else {
- qCDebug(IMPORTWIZARD_LOG) << " unknown account type :" << type;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " unknown account type :" << type;
}
}
@@ -164,7 +164,7 @@ void BalsaSettings::readTransport(const KConfigGroup &grp)
} else if (ssl == QLatin1String("false")) {
mt->setEncryption(MailTransport::Transport::EnumEncryption::None);
} else {
- qCDebug(IMPORTWIZARD_LOG) << " unknown ssl value :" << ssl;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " unknown ssl value :" << ssl;
}
//TODO const QString anonymous = grp.readEntry(QStringLiteral("Anonymous"));
diff --git a/src/autodetect/importwizardutil.h b/src/autodetect/importwizardutil.h
index fc4586f..e4c3f66 100644
--- a/src/autodetect/importwizardutil.h
+++ b/src/autodetect/importwizardutil.h
@@ -23,6 +23,7 @@
#include <QList>
#include <QColor>
#include <QString>
+#include "libimportwizard_export.h"
struct ldapStruct {
ldapStruct()
@@ -64,7 +65,7 @@ enum ResourceType {
Ldap
};
-void mergeLdap(const ldapStruct &ldap);
+LIBIMPORTWIZARD_EXPORT void mergeLdap(const ldapStruct &ldap);
void addAkonadiTag(const QVector<tagStruct> &tagList);
void storeInKWallet(const QString &name, ImportWizardUtil::ResourceType type, const QString &password);
}
diff --git a/src/importwizard.cpp b/src/importwizard.cpp
index 351e87c..55ff033 100644
--- a/src/importwizard.cpp
+++ b/src/importwizard.cpp
@@ -35,7 +35,7 @@
#include "autodetect/icedove/icedoveimportdata.h"
#include "autodetect/oe/oeimportdata.h"
#include "autodetect/thebat/thebatimportdata.h"
-#include "autodetect/balsa/balsaimportdata.h"
+//#include "autodetect/balsa/balsaimportdata.h"
#include "autodetect/claws-mail/clawsmailimportdata.h"
#include "manual/manualimportmailpage.h"
@@ -262,9 +262,9 @@ void ImportWizard::initializeImportModule()
addImportModule(importer);
#endif
- importer = new BalsaImportData(this);
- importer->setImportWizard(this);
- addImportModule(importer);
+// importer = new BalsaImportData(this);
+// importer->setImportWizard(this);
+// addImportModule(importer);
importer = new ClawsMailImportData(this);
importer->setImportWizard(this);