Changeset 7984 for branches/gajim_0.11/src/groupchat_control.py

Timestamp:

02/15/07 19:05:38 (22 months ago)

Author:

asterix

Message:

mrege diff from trunk

Files:

• branches/gajim_0.11/src/groupchat_control.py (modified) (8 diffs)

branches/gajim_0.11/src/groupchat_control.py

@@ -104 +104 @@
                 ChatControl.__init__(self, parent_win, contact, acct)
                 self.TYPE_ID = 'pm'
-                self.display_names = (_('Private Chat'), _('Private Chats'))
 
         def send_message(self, message):
@@ -139 +138 @@
 class GroupchatControl(ChatControlBase):
         TYPE_ID = message_control.TYPE_GC
+        # alphanum sorted
+        MUC_CMDS = ['ban', 'chat', 'query', 'clear', 'close', 'compact',
+                'help', 'invite', 'join', 'kick', 'leave', 'me', 'msg', 'nick',
+                'part', 'names', 'say', 'topic']
 
         def __init__(self, parent_win, contact, acct):
                 ChatControlBase.__init__(self, self.TYPE_ID, parent_win,
-                                        'muc_child_vbox', (_('Group Chat'), _('Group Chats')),
-                                        contact, acct);
+                                        'muc_child_vbox', contact, acct);
 
                 widget = self.xml.get_widget('muc_window_actions_button')
@@ -190 +192 @@
 
                 self._last_selected_contact = None # None or holds jid, account tuple
-                # alphanum sorted
-                self.muc_cmds = ['ban', 'chat', 'query', 'clear', 'close', 'compact',
-                        'help', 'invite', 'join', 'kick', 'leave', 'me', 'msg', 'nick',
-                        'part', 'names', 'say', 'topic']
+
                 # muc attention flag (when we are mentioned in a muc)
                 # if True, the room has mentioned us
                 self.attention_flag = False
-                self.room_creation = time.time()
+                self.room_creation = int(time.time()) # Use int to reduce mem usage
                 self.nick_hits = []
                 self.cmd_hits = []
@@ -1050 +1049 @@
                                 nick = message_array[0]
                                 nick = helpers.parse_resource(nick)
-                                gajim.connections[self.account].change_gc_nick(self.room_jid, nick)
+                                gajim.connections[self.account].join_gc(nick, self.room_jid, None)
                                 self.clear(self.msg_textview)
                         else:
@@ -1258 +1257 @@
         def get_command_help(self, command):
                 if command == 'help':
-                        self.print_conversation(_('Commands: %s') % self.muc_cmds, 'info')
+                        self.print_conversation(_('Commands: %s') % GroupchatControl.MUC_CMDS,
+                                'info')
                 elif command == 'ban':
                         s = _('Usage: /%s <nickname|JID> [reason], bans the JID from the group chat.'
@@ -1330 +1330 @@
                         nick = instance.input_entry.get_text().decode('utf-8')
                         nick = helpers.parse_resource(nick)
-                        gajim.connections[self.account].change_gc_nick(self.room_jid, nick)
+                        gajim.connections[self.account].join_gc(nick, self.room_jid, None)
                         self.nick = nick
                 instance = dialogs.InputDialog(title, prompt, proposed_nick,
@@ -1506 +1506 @@
                                 text = splitted_text[0]
                                 if len(text) == 1: # user wants to cycle all commands
-                                        self.cmd_hits = self.muc_cmds
+                                        self.cmd_hits = GroupchatControl.MUC_CMDS
                                 else:
                                         # cycle possible commands depending on what the user typed
@@ -1515 +1515 @@
                                         else: # find possible commands
                                                 self.cmd_hits = []
-                                                for cmd in self.muc_cmds:
+                                                for cmd in GroupchatControl.MUC_CMDS:
                                                         if cmd.startswith(text.lstrip('/')):
                                                                 self.cmd_hits.append(cmd)