--- a/vpnengine/vpnmanager/src/vpnmanagersession.cpp Thu Jan 07 13:26:15 2010 +0200
+++ b/vpnengine/vpnmanager/src/vpnmanagersession.cpp Mon Jan 18 21:14:04 2010 +0200
@@ -20,29 +20,29 @@
#include "vpnmanagerserver.h"
#include "vpnmanagerserverdefs.h"
#include "vpnmanagersession.h"
-#include "requestdispatcher.h"
+#include "vpnapiservant.h"
#include <e32svr.h>
CVpnManagerSession* CVpnManagerSession::NewL(CVpnManagerServer& aServer,
- CRequestDispatcher& aRequestDispatcher)
+ CVpnApiServant& aVpnApiServant)
{
- CVpnManagerSession* self = CVpnManagerSession::NewLC(aServer, aRequestDispatcher);
+ CVpnManagerSession* self = CVpnManagerSession::NewLC(aServer, aVpnApiServant);
CleanupStack::Pop(self);
return self;
}
CVpnManagerSession* CVpnManagerSession::NewLC(CVpnManagerServer& aServer,
- CRequestDispatcher& aRequestDispatcher)
+ CVpnApiServant& aVpnApiServant)
{
- CVpnManagerSession* self = new (ELeave) CVpnManagerSession(aServer, aRequestDispatcher);
+ CVpnManagerSession* self = new (ELeave) CVpnManagerSession(aServer, aVpnApiServant);
CleanupStack::PushL(self) ;
self->ConstructL() ;
return self ;
}
CVpnManagerSession::CVpnManagerSession(CVpnManagerServer& aServer,
- CRequestDispatcher& aRequestDispatcher)
- : iServer(aServer), iRequestDispatcher(aRequestDispatcher)
+ CVpnApiServant& aVpnApiServant)
+ : iServer(aServer), iVpnApiServant(aVpnApiServant)
{
}
@@ -58,5 +58,5 @@
void CVpnManagerSession::ServiceL(const RMessage2& aMessage)
{
- iRequestDispatcher.ServiceL(aMessage, this);
+ iVpnApiServant.ServiceL(aMessage);
}