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

Commits:

2 changed files:

Changes:

  • gajim/common/modules/bytestream.py
    ... ... @@ -548,7 +548,7 @@ class Bytestream(BaseModule):
    548 548
             iq.setID(auth_id)
    
    549 549
             self._con.connection.send(iq)
    
    550 550
     
    
    551
    -    def _on_bytestream_error(self, _con, iq_obj):
    
    551
    +    def _on_bytestream_error(self, _con, iq_obj, _properties):
    
    552 552
             id_ = iq_obj.getAttr('id')
    
    553 553
             frm = helpers.get_full_jid_from_iq(iq_obj)
    
    554 554
             query = iq_obj.getTag('query')
    
    ... ... @@ -567,7 +567,7 @@ class Bytestream(BaseModule):
    567 567
                              error_msg=''))
    
    568 568
             raise nbxmpp.NodeProcessed
    
    569 569
     
    
    570
    -    def _on_bytestream_set(self, con, iq_obj):
    
    570
    +    def _on_bytestream_set(self, con, iq_obj, _properties):
    
    571 571
             target = iq_obj.getAttr('to')
    
    572 572
             id_ = iq_obj.getAttr('id')
    
    573 573
             query = iq_obj.getTag('query')
    
    ... ... @@ -625,7 +625,7 @@ class Bytestream(BaseModule):
    625 625
                     _connection_error)
    
    626 626
             raise nbxmpp.NodeProcessed
    
    627 627
     
    
    628
    -    def _on_result(self, _con, iq_obj):
    
    628
    +    def _on_result(self, _con, iq_obj, _properties):
    
    629 629
             # if we want to respect xep-0065 we have to check for proxy
    
    630 630
             # activation result in any result iq
    
    631 631
             real_id = iq_obj.getAttr('id')
    
    ... ... @@ -643,7 +643,7 @@ class Bytestream(BaseModule):
    643 643
                         app.socks5queue.activate_proxy(host['idx'])
    
    644 644
                         raise nbxmpp.NodeProcessed
    
    645 645
     
    
    646
    -    def _on_bytestream_result(self, con, iq_obj):
    
    646
    +    def _on_bytestream_result(self, con, iq_obj, _properties):
    
    647 647
             frm = self._ft_get_from(iq_obj)
    
    648 648
             real_id = iq_obj.getAttr('id')
    
    649 649
             query = iq_obj.getTag('query')
    

  • gajim/common/modules/mam.py
    ... ... @@ -402,7 +402,8 @@ class MAM(BaseModule):
    402 402
                                                'start_date': start_date,
    
    403 403
                                                'groupchat': groupchat})
    
    404 404
     
    
    405
    -    def _result_finished(self, _nbxmpp_client, stanza, query_id, start_date, groupchat):
    
    405
    +    def _result_finished(self, _nbxmpp_client, stanza, query_id,
    
    406
    +                         start_date, groupchat):
    
    406 407
             try:
    
    407 408
                 fin, set_ = self._parse_iq(stanza)
    
    408 409
             except InvalidMamIQ: