Commit 8fe4f97c authored by Andreas Holzammer's avatar Andreas Holzammer
Browse files

- fix mailtransport initialization

- link serializer plugin static into the maildispatcher

svn path=/trunk/KDE/kdepim/runtime/; revision=1189716
parent 9955374b
......@@ -18,8 +18,16 @@ qt4_add_dbus_adaptor( maildispatcheragent_SRCS
org.freedesktop.Akonadi.MailDispatcherAgent.xml maildispatcheragent.h MailDispatcherAgent
)
if (RUNTIME_PLUGINS_STATIC)
add_definitions(-DMAIL_SERIALIZER_PLUGIN_STATIC)
endif (RUNTIME_PLUGINS_STATIC)
kdepim_add_agent(akonadi_maildispatcher_agent ${maildispatcheragent_SRCS})
if (RUNTIME_PLUGINS_STATIC)
target_link_libraries(akonadi_maildispatcher_agent akonadi_serializer_mail)
endif (RUNTIME_PLUGINS_STATIC)
if (Q_WS_MAC)
set_target_properties(akonadi_maildispatcher_agent PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
set_target_properties(akonadi_maildispatcher_agent PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.maildispatcher")
......
......@@ -42,6 +42,16 @@
#include <Akonadi/ItemFetchScope>
#include <KMime/Message>
#ifdef KDEPIM_STATIC_LIBS
extern bool ___MailTransport____INIT();
#endif
#ifdef MAIL_SERIALIZER_PLUGIN_STATIC
#include <QtPlugin>
Q_IMPORT_PLUGIN(akonadi_serializer_mail)
#endif
using namespace Akonadi;
class MailDispatcherAgent::Private
......@@ -163,6 +173,10 @@ MailDispatcherAgent::MailDispatcherAgent( const QString &id )
d( new Private( this ) )
{
kDebug() << "maildispatcheragent: At your service, sir!";
#ifdef KDEPIM_STATIC_LIBS
___MailTransport____INIT();
#endif
new SettingsAdaptor( Settings::self() );
new MailDispatcherAgentAdaptor( this );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment