diff options
Diffstat (limited to 'src/ui/chatwin.c')
| -rw-r--r-- | src/ui/chatwin.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c index a89e4626..ec7f3f7a 100644 --- a/src/ui/chatwin.c +++ b/src/ui/chatwin.c @@ -66,11 +66,8 @@ chatwin_new(const char* const barejid) ProfWin* window = wins_new_chat(barejid); ProfChatWin* chatwin = (ProfChatWin*)window; - if (!prefs_get_boolean(PREF_MAM) || (prefs_get_boolean(PREF_CHLOG) && prefs_get_boolean(PREF_HISTORY))) { - if (0) { - + if (!prefs_get_boolean(PREF_MAM) && (prefs_get_boolean(PREF_CHLOG) && prefs_get_boolean(PREF_HISTORY))) { _chatwin_history(chatwin, barejid); - } } // if the contact is offline, show a message @@ -311,7 +308,7 @@ chatwin_incoming_msg(ProfChatWin* chatwin, ProfMessage* message, gboolean win_cr // MUCPMs also get printed here. In their case we don't save any logs (because nick owners can change) and thus we shouldn't read logs // (and if we do we need to check the resourcepart) if (!prefs_get_boolean(PREF_MAM) && prefs_get_boolean(PREF_CHLOG) && prefs_get_boolean(PREF_HISTORY) && message->type == PROF_MSG_TYPE_CHAT) { - /* _chatwin_history(chatwin, chatwin->barejid); */ + _chatwin_history(chatwin, chatwin->barejid); } // show users status first, when receiving message via delayed delivery |