Author: asterix Date: 2008-09-03 09:24:42 +0200 (Wed, 03 Sep 2008) New Revision: 10382
Modified: trunk/src/gajim.py trunk/src/roster_window.py Log: correctly remove contacts (force = True when we re-add them after)
Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-09-02 20:34:11 UTC (rev 10381) +++ trunk/src/gajim.py 2008-09-03 07:24:42 UTC (rev 10382) @@ -1476,7 +1476,7 @@ not name and not groups: # contact removes us. if contacts: - self.roster.remove_contact(jid, account, backend=True) + self.roster.remove_contact(jid, account, force=True, backend=True) return elif not contacts: if sub == 'remove': @@ -1496,7 +1496,7 @@ old_groups = contacts[0].get_shown_groups() if contacts[0].sub != sub or contacts[0].ask != ask\ or old_groups != groups: - self.roster.remove_contact(jid, account) + self.roster.remove_contact(jid, account, force=True) re_add = True for contact in contacts: if not name: @@ -2737,7 +2737,7 @@
if session: ctrl = session.control - else: + if not ctrl: win = self.msg_win_mgr.get_window(fjid, account)
if win:
Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-09-02 20:34:11 UTC (rev 10381) +++ trunk/src/roster_window.py 2008-09-03 07:24:42 UTC (rev 10382) @@ -1870,7 +1870,7 @@ _('If "%s" accepts this request you will know his or her status.' ) % jid) return - self.remove_contact(contact.jid, account) + self.remove_contact(contact.jid, account, force=True) contact.groups = groups if nickname: contact.name = nickname