[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS: gnokii/common gsm-sms.c,1.45,1.46
From: |
Markus Plail <address@hidden> |
Subject: |
CVS: gnokii/common gsm-sms.c,1.45,1.46 |
Date: |
Tue, 02 Apr 2002 09:16:17 -0500 |
Update of /cvsroot/gnokii/gnokii/common
In directory subversions:/tmp/cvs-serv25049
Modified Files:
gsm-sms.c
Log Message:
Fixed remote number being read twice
Index: gsm-sms.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/common/gsm-sms.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** gsm-sms.c 31 Mar 2002 22:59:32 -0000 1.45
--- gsm-sms.c 2 Apr 2002 14:16:15 -0000 1.46
***************
*** 1161,1182 ****
}
- /* Remote number */
- if (llayout.RemoteNumber > -1) {
- if (llayout.IsRemoteNumberCoded) {
- if (message[llayout.RemoteNumber] == 0x00)
llayout.MessageCenter -= 4;
- /* FIXME Is this an ugly hack or correct? */
- /* at least it works with 6210, 6510 and 6110
with the message I tested */
- message[llayout.RemoteNumber] =
(message[llayout.RemoteNumber] + 1) / 2 + 1;
- strcpy(SMS->RemoteNumber.number, GetBCDNumber(message +
llayout.RemoteNumber));
- dprintf("\tRemote number (recipient or sender): %s\n",
SMS->RemoteNumber.number);
- } else {
- /* SMS struct should be zeroed for now, so there's no
- * need to add an extra '\0' at the end of the string */
- strncpy(SMS->RemoteNumber.number,
- message + 1 + llayout.RemoteNumber,
- message[llayout.RemoteNumber] <
GSM_MAX_SMS_CENTER_LENGTH ? message[llayout.RemoteNumber] :
GSM_MAX_SMS_CENTER_LENGTH);
- }
- }
-
/* Short Message Center */
if (llayout.MessageCenter > -1) {
--- 1161,1164 ----
***************
*** 1245,1248 ****
--- 1227,1231 ----
/* Indicate that it is Multipart Message. Remove it if not
needed */
if ((message[llayout.UserData] == 0x48) &&
(message[llayout.UserData + 1] == 0x1c)) {
+ dprintf("First picture then text!\n");
SMS->UDH_No = 1;
SMS->UDH[0].Type = SMS_MultipartMessage;
***************
*** 1251,1254 ****
--- 1234,1238 ----
GSM_ReadSMSBitmap(SMS_Picture, message +
llayout.UserData, NULL, &SMS->UserData[0].u.Bitmap);
GSM_PrintBitmap(&SMS->UserData[0].u.Bitmap);
+
size = MessageLength - llayout.UserData - 4 -
SMS->UserData[0].u.Bitmap.size;
SMS->Length = message[llayout.UserData + 4 +
SMS->UserData[0].u.Bitmap.size];
***************
*** 1260,1263 ****
--- 1244,1248 ----
SMS->UserData[1].u.Text[SMS->Length] = 0;
} else {
+ dprintf("First text then picture!\n");
/* First part is a text */
SMS->UDH_No = 1;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- CVS: gnokii/common gsm-sms.c,1.45,1.46,
Markus Plail <address@hidden> <=