Changeset 8603 for branches/gajim_0.11.1/src/roster_window.py

Timestamp:

08/29/07 23:10:41 (15 months ago)

Author:

roidelapluie

Message:

Print resource in chat window only if several resources. Fix #3175.

Files:

• branches/gajim_0.11.1/src/roster_window.py (modified) (2 diffs)

branches/gajim_0.11.1/src/roster_window.py

@@ -1180 +1180 @@
                 contact.show = show
                 contact.status = status
+                # name is to show in conversation window
+                name = contact.get_shown_name()
+
                 if show in ('offline', 'error') and \
                 len(gajim.events.get_events(account, contact.get_full_jid())) == 0:
                         if len(contact_instances) > 1:
                                 # if multiple resources
+                                if contact.resource != '':
+                                        name += '/' + contact.resource
                                 jid_with_resource = contact.jid + '/' + contact.resource
                                 if gajim.interface.msg_win_mgr.has_window(jid_with_resource,
@@ -1193 +1198 @@
                                         win.redraw_tab(ctrl)
                                 gajim.contacts.remove_contact(account, contact)
+                elif len(contact_instances) > 1 and contact.resource != '':
+                        name += '/' + contact.resource
                 self.remove_contact(contact, account)
                 self.add_contact_to_roster(contact.jid, account)
                 # print status in chat window and update status/GPG image
-                jid_list = [contact.jid]
-                for jid in jid_list:
-                        if gajim.interface.msg_win_mgr.has_window(jid, account):
-                                win = gajim.interface.msg_win_mgr.get_window(jid, account)
-                                ctrl = win.get_control(jid, account)
-                                ctrl.contact = gajim.contacts.get_contact_with_highest_priority(
-                                        account, contact.jid)
-                                ctrl.update_ui()
-                                win.redraw_tab(ctrl)
-
-                                name = contact.get_shown_name()
-
-                                # if multiple resources (or second one disconnecting)
-                                if (len(contact_instances) > 1 or (len(contact_instances) == 1 and \
-                                show in ('offline', 'error'))) and contact.resource != '':
-                                        name += '/' + contact.resource
-                                
-                                uf_show = helpers.get_uf_show(show)
-                                if status: 
-                                        ctrl.print_conversation(_('%s is now %s (%s)') % (name, uf_show,
-                                                status), 'status')
-                                else: # No status message
-                                        ctrl.print_conversation(_('%s is now %s') % (name, uf_show),
-                                                'status')
+                if gajim.interface.msg_win_mgr.has_window(contact.jid, account):
+                        win = gajim.interface.msg_win_mgr.get_window(contact.jid, account)
+                        ctrl = win.get_control(contact.jid, account)
+                        ctrl.contact = gajim.contacts.get_contact_with_highest_priority(
+                                account, contact.jid)
+                        ctrl.update_ui()
+                        win.redraw_tab(ctrl)
+ 
+                        uf_show = helpers.get_uf_show(show)
+                        if status:
+                                ctrl.print_conversation(_('%s is now %s (%s)') % (name, uf_show,
+                                        status), 'status')
+                        else: # No status message
+                                ctrl.print_conversation(_('%s is now %s') % (name, uf_show),
+                                        'status')
+
 
                 if not contact.groups: