Philipp Hörist pushed to branch master at gajim / gajim

Commits:

2 changed files:

Changes:

  • gajim/common/jingle_session.py
    ... ... @@ -439,8 +439,8 @@ def __on_transport_replace(self, stanza, jingle, error, action):
    439 439
     
    
    440 440
         def __on_session_info(self, stanza, jingle, error, action):
    
    441 441
             # TODO: active, (un)hold, (un)mute
    
    442
    -        payload = jingle.getPayload()
    
    443
    -        if payload[0].getName() == 'ringing':
    
    442
    +        ringing = jingle.getTag('ringing')
    
    443
    +        if ringing is not None:
    
    444 444
                 # ignore ringing
    
    445 445
                 raise nbxmpp.NodeProcessed
    
    446 446
             if self.state != JingleStates.ACTIVE:
    

  • gajim/common/modules/search.py
    ... ... @@ -87,7 +87,7 @@ def _received_result(self, _nbxmpp_client, stanza):
    87 87
                     for item in tag.getTags('item'):
    
    88 88
                         # We also show attributes. jid is there
    
    89 89
                         field = item.attrs
    
    90
    -                    for i in item.getPayload():
    
    90
    +                    for i in item.getChildren():
    
    91 91
                             field[i.getName()] = i.getData()
    
    92 92
                         data.append(field)
    
    93 93
             else: