gnokii/common/phones nk6100.c,1.148,1.149

[BORBELY Zoltan <address@hidden>]

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

Modified Files:
        nk6100.c 
Log Message:
writephonebook fixes


Index: nk6100.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/common/phones/nk6100.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -d -r1.148 -r1.149
*** nk6100.c    2 Oct 2003 23:20:57 -0000       1.148
--- nk6100.c    17 Oct 2003 00:41:27 -0000      1.149
***************
*** 703,709 ****
--- 703,714 ----
        unsigned char req[] = {FBUS_FRAME_HEADER, 0x01, 0x00, 0x00, 0x00};
  
+       if (!data->phonebook_entry) return GN_ERR_INTERNALERROR;
+ 
        dprintf("Reading phonebook location (%d/%d)\n", 
data->phonebook_entry->memory_type, data->phonebook_entry->location);
        req[4] = get_memory_type(data->phonebook_entry->memory_type);
        req[5] = data->phonebook_entry->location;
+ 
+       data->phonebook_entry->empty = true;
+ 
        if (sm_message_send(7, 0x03, req, state)) return GN_ERR_NOTREADY;
        return sm_block(0x03, data, state);
***************
*** 735,739 ****
        }
        if ((pe->subentries_count == 1) && ((pe->subentries[0].entry_type != 
GN_PHONEBOOK_ENTRY_Number)
!               || (pe->subentries[0].number_type != 
GN_PHONEBOOK_NUMBER_General) || (pe->subentries[0].id != 2)
                || strcmp(pe->subentries[0].data.number, pe->number))) {
                dprintf("61xx doesn't support subentries\n");
--- 740,745 ----
        }
        if ((pe->subentries_count == 1) && ((pe->subentries[0].entry_type != 
GN_PHONEBOOK_ENTRY_Number)
!               || ((pe->subentries[0].number_type != 
GN_PHONEBOOK_NUMBER_General)
!                && (pe->subentries[0].number_type != 0)) || 
(pe->subentries[0].id != 2)
                || strcmp(pe->subentries[0].data.number, pe->number))) {
                dprintf("61xx doesn't support subentries\n");
***************
*** 824,828 ****
                        pe = data->phonebook_entry;
                        pos = message + 5;
-                       pe->empty = false;
                        n = *pos++;
                        /* It seems that older phones (at least Nokia 5110 and 
6130)
--- 830,833 ----
***************
*** 847,850 ****
--- 852,856 ----
                        pe->date.second = *pos++;
                        pe->subentries_count = 0;
+                       pe->empty = (pe->name[0] == '\0');
                }
                break;