gnokii/common/phones nk6510.c,1.121,1.122

[BORBELY Zoltan <address@hidden>]

Update of /cvsroot/gnokii/gnokii/common/phones
In directory subversions:/tmp/cvs-serv16254/common/phones

Modified Files:
        nk6510.c 
Log Message:
The blocklength field was hardcoded in the GetSMSFolders reply message


Index: nk6510.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/common/phones/nk6510.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** nk6510.c    9 Oct 2003 22:07:39 -0000       1.121
--- nk6510.c    16 Oct 2003 23:33:05 -0000      1.122
***************
*** 835,848 ****
                dprintf("Message: %d SMS Folders received:\n", 
data->sms_folder_list->number);
  
                for (j = 0; j < data->sms_folder_list->number; j++) {
                        int len;
                        strcpy(data->sms_folder_list->folder[j].name, "         
      ");
  
!                       i = 10 + (j * 40);
!                       data->sms_folder_list->folder_id[j] = message[i - 2];
!                       dprintf("Folder(%i) name: ", message[i - 2]);
!                       len = message[i - 1] << 1;
!                       
char_unicode_decode(data->sms_folder_list->folder[j].name, message + i, len);
                        dprintf("%s\n", data->sms_folder_list->folder[j].name);
                }
                break;
--- 835,850 ----
                dprintf("Message: %d SMS Folders received:\n", 
data->sms_folder_list->number);
  
+               i = 6;
                for (j = 0; j < data->sms_folder_list->number; j++) {
                        int len;
                        strcpy(data->sms_folder_list->folder[j].name, "         
      ");
  
!                       if (message[i] != 0x01) return GN_ERR_UNHANDLEDFRAME;
!                       data->sms_folder_list->folder_id[j] = message[i + 2];
!                       dprintf("Folder(%i) name: ", message[i + 2]);
!                       len = message[i + 3] << 1;
!                       
char_unicode_decode(data->sms_folder_list->folder[j].name, message + i + 4, 
len);
                        dprintf("%s\n", data->sms_folder_list->folder[j].name);
+                       i += message[i + 1];
                }
                break;