diff -r a6d55a2e75be -r 782e3408c2ab contentstorage/cahandler/app/src/caapphandlerplugin.cpp
--- a/contentstorage/cahandler/app/src/caapphandlerplugin.cpp	Fri Mar 26 13:00:55 2010 +0200
+++ b/contentstorage/cahandler/app/src/caapphandlerplugin.cpp	Fri Apr 16 14:45:49 2010 +0300
@@ -19,11 +19,11 @@
 #include <qserviceinterfacedescriptor.h>
 #include <qabstractsecuritysession.h>
 #include <qservicecontext.h>
+
 #include "cahandlerloader.h"
-
 #include "caapphandler.h"
 #include "caapphandlerplugin.h"
-#include "cas60handleradapter.h"
+#include "cas60apphandleradapter.h"
 
 /*!
     \class CaAppHandlerPlugin
@@ -47,13 +47,12 @@
 
     if (descriptor.interfaceName() ==
             "com.nokia.homescreen.ICommandHandler") {
-        return new CaS60HandlerAdapter<CCaAppHandler>;
+        return new CaS60AppHandlerAdapter();
     } else {
         return 0;
     }
 }
-// TODO: uncomment when it will be used in plugin
-//Q_EXPORT_PLUGIN2(caapphandlerplugin, CaAppHandlerPlugin)
+Q_EXPORT_PLUGIN2(caapphandlerplugin, CaAppHandlerPlugin)
 
 
 /*!
@@ -81,7 +80,7 @@
 */
 
 /*!
-    \fn int CaS60HandlerAdapter<typename Plugin>::execute(const CaEntry &entry, const QString &commandName) 
+    \fn int CaS60HandlerAdapter<typename Plugin>::execute(const CaEntry &entry, const QString &commandName)
     \param entry Subject of the command.
     \param commandName The name of the command to execute.
     \return 0 on success, error code otherwise.