1 files changed, 8 insertions, 4 deletions

diff --git a/gammu/emb/common/phone/nokia/dct3/dct3func.c b/gammu/emb/common/phone/nokia/dct3/dct3func.c
index beef33c..17cd0a4 100644
--- a/gammu/emb/common/phone/nokia/dct3/dct3func.c
+++ b/gammu/emb/common/phone/nokia/dct3/dct3func.c
@@ -1,5 +1,8 @@
 /* (c) 2001-2004 by Marcin Wiacek */
-/* based on some work from Markus Plail, Pavel Janik, others and Gnokii */
 /* resetting DCT4 phones settings (c) by Walek */
+/* based on some Markus Plail, Pavel Janik & others work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 
 #include <string.h> /* memcpy only */
@@ -395,4 +398,5 @@ GSM_Error DCT3_ReplyGetSMSC(GSM_Protocol_Message msg, GSM_StateMachine *s)
                         Data->SMSC->Validity.Format = SMS_Validity_RelativeFormat;
                         Data->SMSC->Validity.Relative= msg.Buffer[8];
+                if (msg.Buffer[8] == 0x00) Data->SMSC->Validity.Relative = SMS_VALID_Max_Time;
         
                 i=33;
@@ -460,6 +464,6 @@ GSM_Error DCT3_ReplyGetNetworkInfo(GSM_Protocol_Message msg, GSM_StateMachine *s
                 smprintf(s, "LAC                    : %s\n", NetInfo.LAC);
 
-                smprintf(s, "Network code           : %s\n", NetInfo.NetworkCode);
                 NOKIA_DecodeNetworkCode(msg.Buffer+14,NetInfo.NetworkCode);
+                smprintf(s, "Network code           : %s\n", NetInfo.NetworkCode);
                 smprintf(s, "Network name for Gammu : %s ",
                                 DecodeUnicodeString(GSM_GetNetworkName(NetInfo.NetworkCode)));
@@ -1209,9 +1213,9 @@ GSM_Error DCT3_ReplySendSMSMessage(GSM_Protocol_Message msg, GSM_StateMachine *s
         case 0x02:
                 smprintf(s, "SMS sent OK\n");
-                if (s->User.SendSMSStatus!=NULL) s->User.SendSMSStatus(s->CurrentConfig->Device,0,0);
+                if (s->User.SendSMSStatus!=NULL) s->User.SendSMSStatus(s->CurrentConfig->Device,0,msg.Buffer[5]);
                 return ERR_NONE;
         case 0x03:
                 smprintf(s, "Error %i\n",msg.Buffer[6]);
-                if (s->User.SendSMSStatus!=NULL) s->User.SendSMSStatus(s->CurrentConfig->Device,msg.Buffer[6],0);
+                if (s->User.SendSMSStatus!=NULL) s->User.SendSMSStatus(s->CurrentConfig->Device,msg.Buffer[6],-1);
                 return ERR_NONE;
         }