be sure to print restored conversation BEFORE we print new messages

This commit is contained in:
Yann Leboulanger 2005-11-28 21:22:48 +00:00
parent 4fd5ed93ae
commit 0bb2e5c1d0
1 changed files with 6 additions and 8 deletions

View File

@ -444,13 +444,6 @@ class TabbedChatWindow(chat.Chat):
chat.Chat.remove_tab(self, jid, 'chats') chat.Chat.remove_tab(self, jid, 'chats')
del self.contacts[jid] del self.contacts[jid]
def init_conversation(self, contact):
# restore previous conversation
self.restore_conversation(contact.jid)
if gajim.awaiting_events[self.account].has_key(contact.jid):
self.read_queue(contact.jid)
def new_tab(self, contact): def new_tab(self, contact):
'''when new tab is created''' '''when new tab is created'''
self.names[contact.jid] = contact.name self.names[contact.jid] = contact.name
@ -483,7 +476,12 @@ class TabbedChatWindow(chat.Chat):
self.redraw_tab(contact.jid) self.redraw_tab(contact.jid)
self.draw_widgets(contact) self.draw_widgets(contact)
gobject.idle_add(self.init_conversation, contact) # restore previous conversation
self.restore_conversation(contact.jid)
if gajim.awaiting_events[self.account].has_key(contact.jid):
self.read_queue(contact.jid)
self.childs[contact.jid].show_all() self.childs[contact.jid].show_all()
# chatstates # chatstates