Changeset 58

Show
Ignore:
Timestamp:
03/11/02 08:43:51 (7 years ago)
Author:
lking
Message:

Bugfixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/RBJabber/RBJabber/PresenceMap.py

    r56 r58  
    2121        presence = UpdateDict.get('presence', None) 
    2222        FromJID = JIDsplit(presence.from_) 
    23         self.ByJID[JIDjoin(FromJID)] = presence 
    24         self.ByResource.setdefault(JIDjoin(FromJID[:2]),{})[FromJID[-1]] = presence 
    25         self.UpdateObservers(PresenceFrom=FromJID) 
     23        if FromJID: 
     24            self.ByJID[JIDjoin(FromJID)] = presence 
     25            self.ByResource.setdefault(JIDjoin(FromJID[:2]),{})[FromJID[-1]] = presence 
     26            self.UpdateObservers(PresenceFrom=FromJID) 
    2627 
    2728    def __getitem__(self, *args, **kw): 

  • trunk/RBPrivate/Prototypes/ChatClient/MainframeBuddyList.py

    r56 r58  
    2929        Roster = self.JC().Roster.ByJID 
    3030        for each in Roster.itervalues(): 
    31             winList.InsertStringItem(idx, '   %s' % each.name) 
     31            winList.InsertStringItem(idx, '   %s' % getattr(each, 'name', each.jid)) 
    3232            if each.jid in PresenceMap: 
    3333                lstTypes = [x.type for x in PresenceMap[each.jid].itervalues() if x.type != "unavailable"]