Commit 04d4d3f7 authored by Volker Krause's avatar Volker Krause
Browse files

Make contact resource run in the agent server.

svn path=/trunk/KDE/kdepim/runtime/; revision=1200612
parent d52d3392
...@@ -14,6 +14,7 @@ target_link_libraries(akonadi_agent_server ...@@ -14,6 +14,7 @@ target_link_libraries(akonadi_agent_server
akonadi_vcard_resource akonadi_vcard_resource
akonadi_maildir_resource akonadi_maildir_resource
akonadi_akonotes_resource akonadi_akonotes_resource
akonadi_contacts_resource
akonadi_serializer_mail akonadi_serializer_mail
akonadi_serializer_kcalcore akonadi_serializer_kcalcore
......
...@@ -23,6 +23,7 @@ Q_IMPORT_PLUGIN(akonadi_ical_resource) ...@@ -23,6 +23,7 @@ Q_IMPORT_PLUGIN(akonadi_ical_resource)
Q_IMPORT_PLUGIN(akonadi_vcard_resource) Q_IMPORT_PLUGIN(akonadi_vcard_resource)
Q_IMPORT_PLUGIN(akonadi_maildir_resource) Q_IMPORT_PLUGIN(akonadi_maildir_resource)
Q_IMPORT_PLUGIN(akonadi_akonotes_resource) Q_IMPORT_PLUGIN(akonadi_akonotes_resource)
Q_IMPORT_PLUGIN(akonadi_contacts_resource)
Q_IMPORT_PLUGIN(akonadi_serializer_mail) Q_IMPORT_PLUGIN(akonadi_serializer_mail)
Q_IMPORT_PLUGIN(akonadi_serializer_addressee) Q_IMPORT_PLUGIN(akonadi_serializer_addressee)
......
...@@ -22,7 +22,12 @@ qt4_add_dbus_adaptor(contactsresource_SRCS ...@@ -22,7 +22,12 @@ qt4_add_dbus_adaptor(contactsresource_SRCS
install( FILES contactsresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" ) install( FILES contactsresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" )
kde4_add_executable(akonadi_contacts_resource ${contactsresource_SRCS}) if (NOT WINCE)
kde4_add_plugin(akonadi_contacts_resource ${contactsresource_SRCS})
else(NOT WINCE)
kde4_add_plugin(akonadi_contacts_resource STATIC ${contactsresource_SRCS})
endif(NOT WINCE)
target_link_libraries(akonadi_contacts_resource target_link_libraries(akonadi_contacts_resource
${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_AKONADI_LIBS}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
...@@ -31,10 +36,4 @@ target_link_libraries(akonadi_contacts_resource ...@@ -31,10 +36,4 @@ target_link_libraries(akonadi_contacts_resource
${KDE4_KIO_LIBS} ${KDE4_KIO_LIBS}
) )
if (Q_WS_MAC) install(TARGETS akonadi_contacts_resource DESTINATION ${PLUGIN_INSTALL_DIR})
set_target_properties(akonadi_contacts_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
set_target_properties(akonadi_contacts_resource PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.Contacts")
set_target_properties(akonadi_contacts_resource PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Contacts Resource")
endif (Q_WS_MAC)
install(TARGETS akonadi_contacts_resource ${INSTALL_TARGETS_DEFAULT_ARGS})
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <akonadi/entitydisplayattribute.h> #include <akonadi/entitydisplayattribute.h>
#include <akonadi/itemfetchscope.h> #include <akonadi/itemfetchscope.h>
#include <akonadi/dbusconnectionpool.h> #include <akonadi/dbusconnectionpool.h>
#include <akonadi/agentfactory.h>
using namespace Akonadi; using namespace Akonadi;
...@@ -521,6 +522,6 @@ QString ContactsResource::directoryForCollection( const Collection& collection ) ...@@ -521,6 +522,6 @@ QString ContactsResource::directoryForCollection( const Collection& collection )
return directory; return directory;
} }
AKONADI_RESOURCE_MAIN( ContactsResource ) AKONADI_AGENT_FACTORY( ContactsResource, akonadi_contacts_resource )
#include "contactsresource.moc" #include "contactsresource.moc"
...@@ -76,3 +76,4 @@ Icon=text-directory ...@@ -76,3 +76,4 @@ Icon=text-directory
X-Akonadi-MimeTypes=text/directory,application/x-vnd.kde.contactgroup X-Akonadi-MimeTypes=text/directory,application/x-vnd.kde.contactgroup
X-Akonadi-Capabilities=Resource X-Akonadi-Capabilities=Resource
X-Akonadi-Identifier=akonadi_contacts_resource X-Akonadi-Identifier=akonadi_contacts_resource
X-Akonadi-LaunchMethod=AgentServer
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