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

Commits:

1 changed file:

Changes:

  • gajim/groupchat_control.py
    ... ... @@ -1830,7 +1830,14 @@ class GroupchatControl(ChatControlBase):
    1830 1830
     
    
    1831 1831
             if obj.show in ('offline', 'error'):
    
    1832 1832
                 if obj.status_code:
    
    1833
    -                if '307' in obj.status_code:
    
    1833
    +                if '333' in obj.status_code:
    
    1834
    +                    # Handle 333 before 307, some MUCs add both
    
    1835
    +                    if obj.nick == self.nick:
    
    1836
    +                        s = _('%s kicked us due to an error' % self.room_jid)
    
    1837
    +                    else:
    
    1838
    +                        s = _('%s has left due to an error' % nick)
    
    1839
    +                    self.print_conversation(s, 'info', graphics=False)
    
    1840
    +                elif '307' in obj.status_code:
    
    1834 1841
                         if obj.actor is None: # do not print 'kicked by None'
    
    1835 1842
                             s = _('%(nick)s has been kicked: %(reason)s') % {
    
    1836 1843
                                 'nick': nick, 'reason': obj.reason}