Show
Ignore:
Timestamp:
11/09/07 20:30:15 (13 months ago)
Author:
asterix
Message:

merge some fixes from trunk: [8864] [8866] [8881] [8884] [8887] [8894] [8895] [8902] [8903] [8904] [8905] [8906] [8910] [8918] [8919] [8921] [8923] [8924] [8938] [8942] [8952] [8953] [8954]

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • branches/gajim_0.11.2/src/common/xmpp/roster.py

    r3112 r8955  
    6565        """ Subscription tracker. Used internally for setting items state in 
    6666            internal roster representation. """ 
     67        sender = stanza.getAttr('from') 
     68        if not sender == None: and not sender.bareMatch( 
     69        self._owner.User + '@' + self._owner.Server): 
     70            return 
    6771        for item in stanza.getTag('query').getTags('item'): 
    6872            jid=item.getAttr('jid')