From 0bb2e5c1d076a8dfe8293e50a12ecebb92a9ee6d Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Mon, 28 Nov 2005 21:22:48 +0000 Subject: [PATCH] be sure to print restored conversation BEFORE we print new messages --- src/tabbed_chat_window.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py index bd3deecc5..437daffe9 100644 --- a/src/tabbed_chat_window.py +++ b/src/tabbed_chat_window.py @@ -444,13 +444,6 @@ class TabbedChatWindow(chat.Chat): chat.Chat.remove_tab(self, jid, 'chats') 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): '''when new tab is created''' self.names[contact.jid] = contact.name @@ -483,7 +476,12 @@ class TabbedChatWindow(chat.Chat): self.redraw_tab(contact.jid) 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() # chatstates