diff options
| author | Yann Leboulanger <asterix@lagaule.org> | 2008-12-12 00:15:52 +0300 |
|---|---|---|
| committer | Yann Leboulanger <asterix@lagaule.org> | 2008-12-12 00:15:52 +0300 |
| commit | 2633b5bf162878e8ce0c506e2f83d7939dacfc60 (patch) | |
| tree | 5bf25c513beb8fe7190e00cacd3bd4ca0a7d2ab7 | |
| parent | 49c4c4ee797435f79c8e434a8ec5dd711ea1b7ed (diff) | |
don't require to still be in the room to read pm. Fixes #4570
| -rw-r--r-- | src/chat_control.py | 7 | ||||
| -rw-r--r-- | src/groupchat_control.py | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/chat_control.py b/src/chat_control.py index bb312ebc2..0542628aa 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -991,9 +991,10 @@ class ChatControlBase(MessageControl): room_jid) if contact: gajim.interface.roster.draw_contact(room_jid, self.account) - groupchat_control.draw_contact(nick) - if groupchat_control.parent_win: - groupchat_control.parent_win.redraw_tab(groupchat_control) + if groupchat_control: + groupchat_control.draw_contact(nick) + if groupchat_control.parent_win: + groupchat_control.parent_win.redraw_tab(groupchat_control) else: gajim.interface.roster.draw_contact(jid, self.account) gajim.interface.roster.show_title() diff --git a/src/groupchat_control.py b/src/groupchat_control.py index d6adecb9b..d9f431369 100644 --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -121,7 +121,10 @@ class PrivateChatControl(ChatControl): room_ctrl = gajim.interface.msg_win_mgr.get_gc_control(room_jid, account) if room_jid in gajim.interface.minimized_controls[account]: room_ctrl = gajim.interface.minimized_controls[account][room_jid] - self.room_name = room_ctrl.name + if room_ctrl: + self.room_name = room_ctrl.name + else: + self.room_name = room_jid self.gc_contact = gc_contact ChatControl.__init__(self, parent_win, contact, account, session) self.TYPE_ID = 'pm' |