diff options
| author | Ingo Bauersachs <ingo@jitsi.org> | 2014-11-27 18:37:15 +0100 |
|---|---|---|
| committer | Ingo Bauersachs <ingo@jitsi.org> | 2014-11-27 18:37:15 +0100 |
| commit | ed4588fb9dc27cada3ffdead3b0532d517d51a2d (patch) | |
| tree | aa269e3ac60f531e9b91b04d80115a6cd1608754 /src/net/java/sip/communicator/impl/gui/main | |
| parent | 09b51b97b224273ad8e437417ac09bdbf12a123d (diff) | |
| download | jitsi-ed4588fb9dc27cada3ffdead3b0532d517d51a2d.zip jitsi-ed4588fb9dc27cada3ffdead3b0532d517d51a2d.tar.gz jitsi-ed4588fb9dc27cada3ffdead3b0532d517d51a2d.tar.bz2 | |
Show chat messages after enabling chat history preview (closes #727)
Diffstat (limited to 'src/net/java/sip/communicator/impl/gui/main')
| -rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java | 6 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java index 9c082b7..f3cd45e 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java @@ -1968,6 +1968,12 @@ public class ChatPanel */ public void loadHistory(final String escapedMessageID) { + if (!ConfigurationUtils.isHistoryShown()) + { + isHistoryLoaded = true; + return; + } + SwingWorker historyWorker = new SwingWorker() { private Collection<Object> historyList; diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java index d029cca..8307bd7 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java @@ -1212,8 +1212,7 @@ public class ChatWindowManager this.chatPanels.add(chatPanel); } - if (ConfigurationUtils.isHistoryShown()) - chatPanel.loadHistory(escapedMessageID); + chatPanel.loadHistory(escapedMessageID); fireChatCreated(chatPanel); return chatPanel; @@ -1314,8 +1313,7 @@ public class ChatWindowManager this.chatPanels.add(chatPanel); } - if (ConfigurationUtils.isHistoryShown()) - chatPanel.loadHistory(escapedMessageID); + chatPanel.loadHistory(escapedMessageID); fireChatCreated(chatPanel); return chatPanel; @@ -1347,8 +1345,7 @@ public class ChatWindowManager this.chatPanels.add(chatPanel); } - if (ConfigurationUtils.isHistoryShown()) - chatPanel.loadHistory(escapedMessageID); + chatPanel.loadHistory(escapedMessageID); fireChatCreated(chatPanel); return chatPanel; |