--- smsdaemon/plugins/SpamPlugin.cpp	2008/06/12 12:43:29	63
+++ smsdaemon/plugins/SpamPlugin.cpp	2008/12/07 15:51:02	142
@@ -1,9 +1,11 @@
 #include "SpamPlugin.h"
-#include "GsmModem.h"
+#include "IGsmModem.h"
+#include "Sms.h"
 
 #include "util.h"
 #include "common.h"
 #include <sstream>
+#include <stdlib.h>
 
 
 using namespace std;
@@ -18,12 +20,12 @@
 
 void SpamPlugin::Execute(IGsmModem& modem, SMS& sms)
 {
-	string cmd = GetSmsData(sms);
+	string cmd = sms.ExtractParameters();
 
 
 	if (cmd == "")
 	{
-		modem.SendSms(sms.sender, USAGE, false);
+		modem.SendSms(sms.GetSender(), USAGE, false);
 		return;
 	}
 	
@@ -32,7 +34,7 @@
 
 	if (parts.size() < 2 )
 	{
-		modem.SendSms(sms.sender, USAGE, false);
+		modem.SendSms(sms.GetSender(), USAGE, false);
 		return;
 	}