diff options
| author | Yann Leboulanger <asterix@lagaule.org> | 2011-05-24 20:12:48 +0400 |
|---|---|---|
| committer | Yann Leboulanger <asterix@lagaule.org> | 2011-05-24 20:12:48 +0400 |
| commit | 2a82a399a7290da6ea91fe959b940543c608b704 (patch) | |
| tree | a8f9cda72920df09751932b77bb35cd33fc6653f | |
| parent | be942a0270d7954b0b0e63035e0c5a4cada1ea8d (diff) | |
remove subscription dialog when another resource has accepted it. Fixes #6762
| -rw-r--r-- | src/gui_interface.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui_interface.py b/src/gui_interface.py index 2179a8b4d..7cffd16db 100644 --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -754,7 +754,7 @@ class Interface: if contacts[0].sub != obj.sub or contacts[0].ask != obj.ask\ or old_groups != obj.groups: # c.get_shown_groups() has changed. Reflect that in - # roster_winodow + # roster_window self.roster.remove_contact(obj.jid, account, force=True) for contact in contacts: contact.name = obj.nickname or '' @@ -766,6 +766,9 @@ class Interface: for group in old_groups: self.roster.draw_group(group, account) self.roster.draw_contact(obj.jid, account) + if obj.jid in self.instances[account]['sub_request'] and obj.sub in ( + 'from', 'both'): + self.instances[account]['sub_request'][obj.jid].window.destroy() def handle_event_bookmarks(self, obj): # ('BOOKMARKS', account, [{name,jid,autojoin,password,nick}, {}]) |