Changeset 8710 for branches/gajim_0.11.1/src

Timestamp:

09/04/07 20:38:33 (15 months ago)

Author:

asterix

Message:

Handle Multiple status code in MUC.

Location:

branches/gajim_0.11.1/src

Files:

• common/xmpp/protocol.py (modified) (1 diff)
• groupchat_control.py (modified) (7 diffs)

branches/gajim_0.11.1/src/common/xmpp/protocol.py

@@ -510 +510 @@
     def getStatusCode(self):
         """Returns the status code of the presence (for groupchat)"""
-        return self._muc_getItemAttr('status','code')
+        attrs = []
+        for xtag in self.getTags('x'):
+            for child in xtag.getTags('status'):
+                attrs.append(child.getAttr('code'))
+        return attrs
 
 class Iq(Protocol): 

branches/gajim_0.11.1/src/groupchat_control.py

@@ -838 +838 @@
                 fake_jid = self.room_jid + '/' + nick
                 newly_created = False
+                if '170' in statusCode:
+                        self.print_conversation(_('Room logging is enabled'), 'info')
                 if show in ('offline', 'error'):
-                        if statusCode == '307':
+                        if '307' in statusCode:
                                 if actor is None: # do not print 'kicked by None'
                                         s = _('%(nick)s has been kicked: %(reason)s') % {
@@ -850 +852 @@
                                                 'reason': reason }
                                 self.print_conversation(s, 'info')
-                        elif statusCode == '301':
+                        elif '301' in statusCode:
                                 if actor is None: # do not print 'banned by None'
                                         s = _('%(nick)s has been banned: %(reason)s') % {
@@ -861 +863 @@
                                                 'reason': reason }
                                 self.print_conversation(s, 'info')
-                        elif statusCode == '303': # Someone changed his or her nick
+                        elif '303' in statusCode: # Someone changed his or her nick
                                 if nick == self.nick: # We changed our nick
                                         self.nick = new_nick
@@ -903 +905 @@
                                 c.show = show
                                 c.status = status
-                        if nick == self.nick and statusCode != '303': # We became offline
+                        if nick == self.nick and '303' not in statusCode: # We became offline
                                 self.got_disconnected()
                                 self.parent_win.redraw_tab(self)
@@ -912 +914 @@
                                         status, jid)
                                 newly_created = True
-                                if statusCode == '201': # We just created the room
+                                if '201' in statusCode: # We just created the room
                                         gajim.connections[self.account].request_gc_config(self.room_jid)
                         else:
@@ -965 +967 @@
                 self.parent_win.redraw_tab(self)
                 if (time.time() - self.room_creation) > 30 and \
-                                nick != self.nick and statusCode != '303':
+                                nick != self.nick and '303' not in statusCode:
                         st = ''
                         print_status = None
@@ -980 +982 @@
                                 nick_jid += ' (%s)' % simple_jid
                         if show == 'offline' and print_status in ('all', 'in_and_out') and \
-                        statusCode != '307':
+                        '307' not in statusCode:
                                 st = _('%s has left') % nick_jid
                                 if reason: