Changeset 9961

Timestamp:

07/19/08 20:31:45 (5 months ago)

Author:

bct

Message:

update status in resource-specific chat windows

Location:

trunk/src

Files:

• chat_control.py (modified) (1 diff)
• roster_window.py (modified) (2 diffs)

trunk/src/chat_control.py

@@ -2381 +2381 @@
                         self.contact = contact
                 self.draw_banner()
+
+        def update_status_display(self, name, uf_show, status):
+                '''print the contact's status and update the status/GPG image'''
+                self.update_ui()
+                self.parent_win.redraw_tab(self)
+
+                self.print_conversation(_('%s is now %s') % (name, uf_show),
+                        'status')
+
+                if status:
+                        ctrl.print_conversation(' (', 'status', simple=True)
+                        ctrl.print_conversation('%s' % (status), 'status', simple=True)
+                        ctrl.print_conversation(')', 'status', simple=True)

trunk/src/roster_window.py

@@ -1804 +1804 @@
                 # name is to show in conversation window
                 name = contact.get_shown_name()
-                
+
                 # The contact has several resources
                 if len(contact_instances) > 1:
@@ -1829 +1829 @@
                         self.remove_contact(contact.jid, account, backend=True)
 
+                uf_show = helpers.get_uf_show(show)
+
                 # print status in chat window and update status/GPG image
-                if gajim.interface.msg_win_mgr.has_window(contact.jid, account):
-                        win = gajim.interface.msg_win_mgr.get_window(contact.jid, account)
-                        uf_show = helpers.get_uf_show(show)
-
-                        ctrl = win.get_control(contact.jid, account)
+                ctrl = gajim.interface.msg_win_mgr.get_control(contact.jid, account)
+                if ctrl:
+                        ctrl.contact = gajim.contacts.get_contact_with_highest_priority(
+                                account, contact.jid)
+                        ctrl.update_status_display(name, uf_show, status)
+
+                if contact.resource != '':
+                        fjid = contact.jid + '/' + contact.resource
+
+                        ctrl = gajim.interface.msg_win_mgr.get_control(fjid, account)
                         if ctrl:
-                                ctrl.contact = gajim.contacts.get_contact_with_highest_priority(
-                                        account, contact.jid)
-                                ctrl.update_ui()
-                                win.redraw_tab(ctrl)
-
-                                ctrl.print_conversation(_('%s is now %s') % (name, uf_show),
-                                        'status')
-                                if status:
-                                        ctrl.print_conversation(' (', 'status', simple=True)
-                                        ctrl.print_conversation('%s' % (status), 'status', simple=True)
-                                        ctrl.print_conversation(')', 'status', simple=True)
+                                ctrl.update_status_display(name, uf_show, status)
 
                 # unset custom status