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

Timestamp:

02/06/07 20:54:30 (22 months ago)

Author:

asterix

Message:

merge diff from trunk

Files:

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

branches/gajim_0.11/src/groupchat_control.py

@@ -736 +736 @@
                 nick_list = gajim.contacts.get_nick_list(self.account, self.room_jid)
                 for nick in nick_list:
+                        # Update pm chat window
+                        fjid = self.room_jid + '/' + nick
+                        ctrl = gajim.interface.msg_win_mgr.get_control(fjid, self.account)
                         gc_contact = gajim.contacts.get_gc_contact(self.account, self.room_jid,
                                 nick)
+                        if ctrl:
+                                gc_contact.show = 'offline'
+                                gc_contact.status = ''
+                                ctrl.update_ui()
+                                ctrl.parent_win.redraw_tab(ctrl)
                         gajim.contacts.remove_gc_contact(self.account, gc_contact)
                 gajim.gc_connected[self.account][self.room_jid] = False
@@ -1041 +1049 @@
                         if len(message_array) and message_array[0] != self.nick:
                                 nick = message_array[0]
+                                nick = helpers.parse_resource(nick)
                                 gajim.connections[self.account].change_gc_nick(self.room_jid, nick)
                                 self.clear(self.msg_textview)
@@ -1320 +1329 @@
                 def on_ok(widget):
                         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)
                         self.nick = nick
@@ -1328 +1338 @@
                 gajim.connections[self.account].send_gc_status(self.nick, self.room_jid,
                                                         show='offline', status=status)
+                nick_list = gajim.contacts.get_nick_list(self.account, self.room_jid)
+                for nick in nick_list:
+                        # Update pm chat window
+                        fjid = self.room_jid + '/' + nick
+                        ctrl = gajim.interface.msg_win_mgr.get_control(fjid, self.account)
+                        if ctrl:
+                                contact = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick)
+                                contact.show = 'offline'
+                                contact.status = ''
+                                ctrl.update_ui()
+                                ctrl.parent_win.redraw_tab(ctrl)
                 # They can already be removed by the destroy function
                 if self.room_jid in gajim.contacts.get_gc_list(self.account):
@@ -1471 +1492 @@
                         if text.startswith('/topic '):
                                 if len(splitted_text2) == 2 and \
-                                            self.subject.startswith(splitted_text2[1]) and\
-                                            len(self.subject) > len(splitted_text2[1]):
+                                self.subject.startswith(splitted_text2[1]) and\
+                                len(self.subject) > len(splitted_text2[1]):
                                         message_buffer.insert_at_cursor(
                                                 self.subject[len(splitted_text2[1]):])