changeset d30b92fc3fc5 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=d30b92fc3fc5 description: remove subscription dialog when another resource has accepted it. Fixes #6762

diffstat:

src/gui_interface.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r 1aece07e41a9 -r d30b92fc3fc5 src/gui_interface.py --- a/src/gui_interface.py Mon May 23 22:35:19 2011 +0200 +++ b/src/gui_interface.py Tue May 24 18:12:48 2011 +0200 @@ -754,7 +754,7 @@ 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 @@ 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}, {}])