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

Commits: 43f210bb by Philipp Hörist at 2018-12-21T18:33:34Z Remove unused code

- - - - - 94479dd7 by Philipp Hörist at 2018-12-21T22:13:34Z Check if event was not consumed

Fixes #9096

- - - - -

2 changed files:

- gajim/common/connection_handlers.py - gajim/gui_interface.py

Changes:

===================================== gajim/common/connection_handlers.py ===================================== @@ -448,11 +448,6 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, agent=jid)) del self.awaiting_answers[id_]

- def _dispatch_gc_msg_with_captcha(self, stanza, msg_obj): - msg_obj.stanza = stanza - app.nec.push_incoming_event(GcMessageReceivedEvent(None, - conn=self, msg_obj=msg_obj)) - def _nec_agent_removed(self, obj): if obj.conn.name != self.name: return

===================================== gajim/gui_interface.py ===================================== @@ -1619,18 +1619,24 @@ class Interface: self.roster.open_event(account, fjid, event) elif type_ == 'gc-invitation': event = app.events.get_first_event(account, jid, type_) + if event is None: + return dialogs.InvitationReceivedDialog(account, event.room_jid, jid, event.password, event.reason, event.is_continued) app.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) elif type_ == 'subscription_request': event = app.events.get_first_event(account, jid, type_) + if event is None: + return dialogs.SubscriptionRequestWindow(jid, event.text, account, event.nick) app.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) elif type_ == 'unsubscribed': event = app.events.get_first_event(account, jid, type_) + if event is None: + return self.show_unsubscribed_dialog(account, event.contact) app.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account)

View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0e6011c0886ada7d46a467adc5fce39c40...