--- smsdaemon/ModemTransceiver.cpp	2008/12/12 12:54:27	180
+++ smsdaemon/ModemTransceiver.cpp	2010/04/27 21:06:53	678
@@ -149,7 +149,7 @@
 
 	pdu.append("\032"); // \032 == Ctrl+Z
 	Command( pdu );
-	Util::Sleep( 50 );
+	Util::Sleep( 5000 );
 	Common::instance()->smsCounter.outgoing++;
 }
 
@@ -179,18 +179,6 @@
 	Command(cmd);
 }
 
-int  ModemTransceiver::DeleteAllSms()
-{
-	vector<SMS> sms = ReadSms(true);
-
-	for (unsigned int i= 0; i<sms.size(); ++i)
-	{
-		DeleteSms( sms[i].GetIndex() );
-	}
-	return sms.size();
-}
-
-
 
 void ModemTransceiver::WaitForSimcard()
 {
@@ -212,7 +200,7 @@
 
 void ModemTransceiver::HandlePincode()
 {
-	string pin = Common::instance()->GetConfigfile()->GetValue("gsmmodem","pin");
+	string pin = Common::instance()->GetConfigfile()->GetValue("gsmmodem","pin","");
 
 	string result = Command("AT+CPIN?");
 	result = Util::str_trim(result);
@@ -295,7 +283,7 @@
 	timestamp = Util::str_replace(timestamp, "\"");
 	sms.SetTimestamp(timestamp);
 
-	sms.SetMessage( body );
+	sms.SetMessage( Util::str_gsm2latin(body) );
 
 	return sms;
 }
@@ -314,6 +302,8 @@
 
 	sms.SetIndex(index);
 
+	sms.SetMessage( Util::str_gsm2latin(sms.GetMessage()) ) ;
+
 	return sms;
 }