--- smsdaemon/plugins/ShellExecPlugin.cpp	2008/06/19 14:47:52	107
+++ smsdaemon/plugins/ShellExecPlugin.cpp	2008/12/18 06:53:29	196
@@ -1,24 +1,24 @@
 #include "ShellExecPlugin.h"
-#include "IGsmModem.h"
+#include "ISmsTransceiver.h"
 #include "Sms.h"
 
-#include "util.h"
+#include "Util.h"
 
 ShellExecPlugin::ShellExecPlugin(std::string pluginCommand, std::string exeCommand, bool allowParameters, bool returnOutput)
-  : Plugin(pluginCommand, std::string("ShellExec: ")+exeCommand ),
-  _exeCommand(exeCommand),
-  _allowParameters(allowParameters),
-  _returnOutput(returnOutput)
+		: Plugin(pluginCommand, std::string("ShellExec: ")+exeCommand ),
+		_exeCommand(exeCommand),
+		_allowParameters(allowParameters),
+		_returnOutput(returnOutput)
 {
 }
 
-void ShellExecPlugin::Execute(IGsmModem& modem, SMS& sms)
+void ShellExecPlugin::Execute(ISmsTransceiver& modem, SMS& sms)
 {
 	std::string command = _exeCommand;
 
 	if (_allowParameters)
 	{
-		std::string parameters = GetSmsData(sms);
+		std::string parameters = sms.ExtractParameters();
 
 		parameters = Util::str_replace(parameters, "||");
 		parameters = Util::str_replace(parameters, "&&");
@@ -47,6 +47,6 @@
 		else
 			message = "OK";
 	}
-	
-	modem.SendSms(sms.sender, message, false );
+
+	modem.SendSms(sms.GetSender(), message, false );
 }