correct dialog and stanza when removing a not in roster contact. Fixes #4303
This commit is contained in:
parent
a01c992eaa
commit
7982dac728
|
@ -3091,7 +3091,8 @@ class RosterWindow:
|
||||||
if contact.sub != 'to' and is_checked:
|
if contact.sub != 'to' and is_checked:
|
||||||
remove_auth = False
|
remove_auth = False
|
||||||
for (contact, account) in list_:
|
for (contact, account) in list_:
|
||||||
gajim.connections[account].unsubscribe(contact.jid, remove_auth)
|
if _('Not in Roster') not in contact.get_shown_groups():
|
||||||
|
gajim.connections[account].unsubscribe(contact.jid, remove_auth)
|
||||||
self.remove_contact(contact.jid, account, backend=True)
|
self.remove_contact(contact.jid, account, backend=True)
|
||||||
if not remove_auth and contact.sub == 'both':
|
if not remove_auth and contact.sub == 'both':
|
||||||
contact.name = ''
|
contact.name = ''
|
||||||
|
@ -3114,6 +3115,10 @@ class RosterWindow:
|
||||||
_('By removing this contact you also remove authorization '
|
_('By removing this contact you also remove authorization '
|
||||||
'resulting in him or her always seeing you as offline.'),
|
'resulting in him or her always seeing you as offline.'),
|
||||||
on_response_ok = (on_ok2, list_))
|
on_response_ok = (on_ok2, list_))
|
||||||
|
elif _('Not in Roster') in contact.get_shown_groups():
|
||||||
|
# Contact is not in roster
|
||||||
|
dialogs.ConfirmationDialog(pritext, _('Do you want to continue?'),
|
||||||
|
on_response_ok = (on_ok2, list_))
|
||||||
else:
|
else:
|
||||||
dialogs.ConfirmationDialogCheck(pritext,
|
dialogs.ConfirmationDialogCheck(pritext,
|
||||||
_('By removing this contact you also by default remove '
|
_('By removing this contact you also by default remove '
|
||||||
|
|
Loading…
Reference in New Issue