[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/runtime/resources
From:       Andreas Holzammer <andy () kdab ! com>
Date:       2010-11-25 9:31:15
Message-ID: 20101125093115.4AA83AC8A2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1200514 by aholzammer:

- add maildir to agentserver

 M  +6 -0      agentserver/CMakeLists.txt  
 M  +6 -0      agentserver/dummy_main.cpp  
 M  +6 -16     maildir/CMakeLists.txt  
 M  +1 -0      maildir/maildirresource.desktop  
 M  +3 -5      maildir/main.cpp  


--- trunk/KDE/kdepim/runtime/resources/agentserver/CMakeLists.txt #1200513:1200514
@@ -12,6 +12,12 @@
   ${AKONADI_COMMON_LIBRARIES}
   akonadi_ical_resource
   akonadi_vcard_resource
+  akonadi_maildir_resource
+
+  akonadi_serializer_mail
+  akonadi_serializer_kcalcore
+  akonadi_serializer_contactgroup
+  akonadi_serializer_addressee
 )
 
 install(TARGETS akonadi_agent_server
--- trunk/KDE/kdepim/runtime/resources/agentserver/dummy_main.cpp #1200513:1200514
@@ -21,7 +21,13 @@
 
 Q_IMPORT_PLUGIN(akonadi_ical_resource)
 Q_IMPORT_PLUGIN(akonadi_vcard_resource)
+Q_IMPORT_PLUGIN(akonadi_maildir_resource)
 
+Q_IMPORT_PLUGIN(akonadi_serializer_mail)
+Q_IMPORT_PLUGIN(akonadi_serializer_addressee)
+Q_IMPORT_PLUGIN(akonadi_serializer_contactgroup)
+Q_IMPORT_PLUGIN(akonadi_serializer_kcalcore)
+
 extern int cemain( int argc, char ** argv );
 
 int main( int argc, char ** argv )
--- trunk/KDE/kdepim/runtime/resources/maildir/CMakeLists.txt #1200513:1200514
@@ -34,24 +34,14 @@
   ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Maildir.Settings.xml settings.h \
Settings  )
 
-if (RUNTIME_PLUGINS_STATIC)
-    add_definitions(-DMAIL_SERIALIZER_PLUGIN_STATIC)
-endif (RUNTIME_PLUGINS_STATIC)
+if (NOT WINCE)
+  kde4_add_plugin(akonadi_maildir_resource ${maildirresource_SRCS})
+else(NOT WINCE)
+kde4_add_plugin(akonadi_maildir_resource STATIC ${maildirresource_SRCS})
+endif(NOT WINCE)
 
-kde4_add_executable(akonadi_maildir_resource ${maildirresource_SRCS})
-
-if (Q_WS_MAC)
-  set_target_properties(akonadi_maildir_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST \
                ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
-  set_target_properties(akonadi_maildir_resource PROPERTIES \
                MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.Maildir")
-  set_target_properties(akonadi_maildir_resource PROPERTIES \
                MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Maildir Resource")
-endif (Q_WS_MAC)
-
 target_link_libraries(akonadi_maildir_resource ${KDEPIMLIBS_AKONADI_LIBS} \
${KDEPIMLIBS_AKONADI_KMIME_LIBS} maildir ${QT_QTDBUS_LIBRARY} ${KDE4_KIO_LIBS} \
${KDEPIMLIBS_KMIME_LIBS})  
-if (RUNTIME_PLUGINS_STATIC)
-  target_link_libraries(akonadi_maildir_resource akonadi_serializer_mail)
-endif (RUNTIME_PLUGINS_STATIC)
-
-install(TARGETS akonadi_maildir_resource ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS akonadi_maildir_resource DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.Akonadi.Maildir.Settings.xml
         DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
--- trunk/KDE/kdepim/runtime/resources/maildir/maildirresource.desktop \
#1200513:1200514 @@ -88,3 +88,4 @@
 X-Akonadi-MimeTypes=message/rfc822
 X-Akonadi-Capabilities=Resource
 X-Akonadi-Identifier=akonadi_maildir_resource
+X-Akonadi-LaunchMethod=AgentServer
--- trunk/KDE/kdepim/runtime/resources/maildir/main.cpp #1200513:1200514
@@ -19,10 +19,8 @@
 
 #include "maildirresource.h"
 
-#ifdef MAIL_SERIALIZER_PLUGIN_STATIC
-#include <QtPlugin>
+#include <akonadi/agentfactory.h>
 
-Q_IMPORT_PLUGIN(akonadi_serializer_mail)
-#endif
+#include <QtCore/QtPlugin>
 
-AKONADI_RESOURCE_MAIN( MaildirResource )
+AKONADI_AGENT_FACTORY( MaildirResource, akonadi_maildir_resource );


[prev in list] [next in list] [prev in thread] [next in thread]