--- smsdaemon/GsmModem.cpp	2008/06/17 17:47:37	105
+++ smsdaemon/GsmModem.cpp	2008/12/07 16:27:34	144
@@ -8,7 +8,7 @@
 #include <time.h>
 
 
-#include "SerialPort.h"
+#include "serialport/SerialPort.h"
 
 #include "GsmModem.h"
 
@@ -16,6 +16,7 @@
 #include "common.h"
 
 #include "SmsPdu.h"
+#include "SmsHelper.h"
 
 using namespace std;
 
@@ -109,7 +110,7 @@
 
 		
 		string sms_entry = result.substr(0,endpos);
-		retval.push_back( SMS::FromPduString(sms_entry) );;
+		retval.push_back( SmsHelper::FromPduString(sms_entry) );;
 
 		if (endpos == string::npos)
 			break;
@@ -148,7 +149,7 @@
 	if (to.at(0) == '+')
 		to.erase(0,0);
 
-	vector<PduInfo> pdu_vec = SmsPdu::CreateSmsPdu(to, message, allowMultipart);
+	vector<PduInfo> pdu_vec = SmsPdu::CreateSmsPdu(to, Util::str_latin2gsm(message), allowMultipart);
 
 	for (unsigned i=0; i<pdu_vec.size(); ++i)
 	{
@@ -156,6 +157,7 @@
 
 		SendSmsPdu(pdu.pdu, pdu.len);
 	}
+	Common::instance()->logMessage( "All PDU's send");
 
 }
 
@@ -172,7 +174,7 @@
 
 	for (unsigned int i= 0; i<sms.size(); ++i)
 	{
-		DeleteSms( sms[i].sms_index);
+		DeleteSms( sms[i].GetIndex() );
 	}
 	return sms.size();
 }
@@ -262,3 +264,8 @@
 	}
 }
 
+std::vector<SMS> DebugGsmModem::ReadSms(bool readAll)
+{
+	vector<SMS> result;
+	return result;
+}