Changeset 2734

Show
Ignore:
Timestamp:
11/04/07 16:17:08 (1 year ago)
Author:
abaumann
Message:

apply (forward-ported) patch from ticket #555 for V3i support

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/moto-sync/motosync.py

    r2733 r2734  
    17591759        """grab stuff out of the list of values from the phone""" 
    17601760        PhoneContact.__init__(self) 
    1761         assert(type(data) == list and len(data) >= 24) 
     1761        assert(type(data) == list and len(data) >= 20) 
    17621762        self.name = data[3] 
    17631763        self.categorynum = data[9] 
    …… 
    17661766        assert(data[14] == 0) # unknown? 
    17671767        assert(data[15] == 0) # unknown? 
    1768         self.nickname = data[22] 
    1769         if data[23] == '': 
     1768        if len(data) >= 21: 
     1769            self.nickname = data[22] 
     1770        else: 
     1771            self.nickname = None 
     1772        if len(data) < 22 or data[23] == '': 
    17701773            self.birthday = None 
    17711774        else: 
    …… 
    19921995    """Phone contact child object for children created from phone data.""" 
    19931996    def __init__(self, parent, data): 
    1994         assert(type(data) == list and len(data) >= 24) 
    1995         adr = (data[17], data[16], data[18], data[19], data[20], data[21]) 
     1997        assert(type(data) == list and len(data) >= 14) 
     1998        if len(data) >= 22: 
     1999            adr = (data[17], data[16], data[18], data[19], data[20], data[21]) 
     2000        else: 
     2001            adr = (None, None, None, None, None, None) 
    19962002        PhoneContactChild.__init__(self, parent, data[1], data[4], data[8], adr) 
    19972003        self.pos = data[0]