--- a/activityfw/activityserviceplugin/inc/afclient.h	Fri Jul 23 14:03:00 2010 +0300
+++ b/activityfw/activityserviceplugin/inc/afclient.h	Fri Aug 06 13:40:46 2010 +0300
@@ -20,16 +20,17 @@
 #include <QObject>
 #include <QVariant>
 #include <QString>
+#include <QSharedPointer>
 
-#include <afstorageclient.h>
+#include "afactivitystorage.h"
+#include "afactivation.h"
 
 class AfClient : public QObject
 {
-
     Q_OBJECT
 
 public:
-    AfClient(const QSharedPointer<AfStorageClient> &serviceProvider,QObject *parent = 0);
+    AfClient(const QSharedPointer<AfActivityStorage> &storage, const QSharedPointer<AfActivation> &activation, QObject *parent = 0);             
     ~AfClient();
 
 public slots:
@@ -41,14 +42,15 @@
     QVariantHash parseCommandLine(const QStringList &commandLineParams) const;
 
 private slots:
-    void bringToForeground();
+    void handleActivityRequest(Af::ActivationReason reason, const QString &name, const QVariantHash &parameters);
     
 signals:
     void activityRequested(const QString &activityId);
 
-private:
-    QSharedPointer<AfStorageClient> mServiceProvider;
-    bool mIsconnected;
+private:    
+    QSharedPointer<AfActivityStorage> mStorage;
+    QSharedPointer<AfActivation> mActivation;
+    
 };
 
 #endif // AFCLIENT_H