Author: roidelapluie Date: 2007-07-19 15:12:11 +0200 (Thu, 19 Jul 2007) New Revision: 8412
Modified: trunk/src/gajim.py trunk/src/groupchat_control.py Log: Beter handling of status code in MUC. see #3270.
Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-07-19 11:54:15 UTC (rev 8411) +++ trunk/src/gajim.py 2007-07-19 13:12:11 UTC (rev 8412) @@ -1225,6 +1225,9 @@ return
changes = [] + if '100' in statusCode: + # Can be a presence (see chg_contact_status in groupchat_contol.py) + changes.append(_('Any occupant is allowed to see your full JID')) if '102' in statusCode: changes.append(_('Room now shows unavailable member')) if '103' in statusCode: @@ -1233,6 +1236,7 @@ changes.append(\ _('A non-privacy-related room configuration change has occurred')) if '170' in statusCode: + # Can be a presence (see chg_contact_status in groupchat_contol.py) changes.append(_('Room logging is now enabled')) if '171' in statusCode: changes.append(_('Room logging is now disabled'))
Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-07-19 11:54:15 UTC (rev 8411) +++ trunk/src/groupchat_control.py 2007-07-19 13:12:11 UTC (rev 8412) @@ -890,9 +890,11 @@ # statusCode # http://www.xmpp.org/extensions/xep-0045.html#registrar-statuscodes-init if '100' in statusCode: + # Can be a message (see handle_event_gc_config_change in gajim.py) self.print_conversation(\ _('Any occupant is allowed to see your full JID')) if '170' in statusCode: + # Can be a message (see handle_event_gc_config_change in gajim.py) self.print_conversation(_('Room logging is enabled')) if '201' in statusCode: self.print_conversation(_('A new room has been created')) @@ -959,6 +961,20 @@ os.remove(files[old_file]) os.rename(old_file, files[old_file]) self.print_conversation(s, 'info', tim) + elif '321' in statusCode: + s = _('%(nick)s has been removed from the room (%(reason)s)') % { + 'nick': nick, 'reason': _('affiliation changed') } + self.print_conversation(s, 'info', tim = tim) + elif '322' in statusCode: + s = _('%(nick)s has been removed from the room (%(reason)s)') % { + 'nick': nick, + 'reason': _('room configuration changed to members-only') } + self.print_conversation(s, 'info', tim = tim) + elif '332' in statusCode: + s = _('%(nick)s has been removed from the room (%(reason)s)') % { + 'nick': nick, + 'reason': _('system shutdown') } + self.print_conversation(s, 'info', tim = tim) elif 'destroyed' in statusCode: # Room has been destroyed self.print_conversation(reason, 'info', tim)