Changeset 7829 for branches/gajim_0.11/src/roster_window.py

Timestamp:

01/13/07 23:35:41 (23 months ago)

Author:

asterix

Message:

merge diff from trunc to 0.11 branch

Files:

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

branches/gajim_0.11/src/roster_window.py

@@ -1185 +1185 @@
                         if len(contact_instances) > 1:
                                 # if multiple resources
+                                jid_with_resource = contact.jid + '/' + contact.resource
+                                if gajim.interface.msg_win_mgr.has_window(jid_with_resource,
+                                account):
+                                        win = gajim.interface.msg_win_mgr.get_window(jid_with_resource,
+                                                account)
+                                        ctrl = win.get_control(jid_with_resource, account)
+                                        ctrl.update_ui()
+                                        win.redraw_tab(ctrl)
                                 gajim.contacts.remove_contact(account, contact)
                 self.remove_contact(contact, account)
@@ -1190 +1198 @@
                 # print status in chat window and update status/GPG image
                 jid_list = [contact.jid]
-                if contact.get_full_jid() != contact.jid:
-                        jid_list.append(contact.get_full_jid())
                 for jid in jid_list:
                         if gajim.interface.msg_win_mgr.has_window(jid, account):
@@ -1215 +1221 @@
                                         ctrl.print_conversation(_('%s is now %s') % (name, uf_show),
                                                 'status')
-                                if contact == gajim.contacts.get_contact_with_highest_priority(
-                                account, contact.jid):
-                                        ctrl.draw_banner()
 
                 if not contact.groups:
@@ -1321 +1324 @@
                                 account_name = account
                                 if gajim.account_is_connected(account):
-                                        account_name += '(%s/%s)' % (repr(nbr_on), repr(nbr_total))
+                                        account_name += ' (%s/%s)' % (repr(nbr_on), repr(nbr_total))
                                 contact = gajim.contacts.create_contact(jid = jid,
                                         name = account_name, show = connection.get_status(), sub = '',
@@ -1549 +1552 @@
                         if contact.jid in keys:
                                 del keys[contact.jid]
+                        for u in gajim.contacts.get_contact(account, contact.jid):
+                                u.keyID = ''
                 else:
                         keys[contact.jid] = keyID[0]
                         for u in gajim.contacts.get_contact(account, contact.jid):
                                 u.keyID = keyID[0]
-                        if gajim.interface.msg_win_mgr.has_window(contact.jid, account):
-                                ctrl = gajim.interface.msg_win_mgr.get_control(contact.jid, account)
-                                ctrl.update_ui()
+                if gajim.interface.msg_win_mgr.has_window(contact.jid, account):
+                        ctrl = gajim.interface.msg_win_mgr.get_control(contact.jid, account)
+                        ctrl.update_ui()
                 keys_str = ''
                 for jid in keys: