Gnokii - AT-phones encoding

[Helge Deller]

Hi Pawel,

I'm running gnokii from today's CVS, and with a siemens A60 phone connected via 
AT command set I get the following encoding problem:

address@hidden:~> gnokii --identify
GNOKII Version 0.6.4
IMEI         : 3539XXXXXXXXXX
Manufacturer : SIEMENS
Model        : A60
Revision     : 16

address@hidden:~> gnokii --getphonebook ME 1 1
GNOKII Version 0.6.4
1. Name: Helge Handy¿                   <- HERE HERE HERE HERE
Number: +49100011116666
Group id: 0

The string "Helge Handy" gets a strange additional character at it's end.
Below is a patch (I'm not sure if this was the final one!) which fixed a 
similiar problem for my nokia 6310 phone.
I think the source code for the AT-phones need a similiar patch.
Could you please check this problem ?

Thanks,
Helge

OLD Patch follows:
--- common/phones/nk6510.c~     2004-05-31 23:08:02.000000000 +0200
+++ common/phones/nk6510.c      2004-05-31 23:14:31.000000000 +0200
@@ -1750,11 +1750,9 @@
        block = 1;
        if (!entry->empty) {
                /* Name */
-               j = strlen(entry->name);
-               char_unicode_encode((string + 1), entry->name, j);
-               /* Length ot the string + length field + terminating 0 */
-               string[0] = j * 2;
-               count += PackBlock(0x07, j * 2 + 1, block++, string, req + 
count, GN_PHONEBOOK_ENTRY_MAX_LENGTH - count);
+               j = char_unicode_encode((string + 1), entry->name, 
strlen(entry->name));
+               string[0] = j;
+               count += PackBlock(0x07, j + 1, block++, string, req + count, 
GN_PHONEBOOK_ENTRY_MAX_LENGTH - count);

                /* Group */
                string[0] = entry->caller_group + 1;