From 14c78d292ca8c1a228e0c3359532e0f369f8dbf6 Mon Sep 17 00:00:00 2001
From: Ingo Bauersachs <ingo@jitsi.org>
Date: Sun, 7 Apr 2013 12:27:36 +0000
Subject: [PATCH] Avoid duplicate FileTransfer-panel when the chat history is
 enabled

---
 .../communicator/impl/gui/main/chat/ChatPanel.java    | 11 +++++++----
 .../notificationwiring/NotificationManager.java       |  2 +-
 2 files changed, 8 insertions(+), 5 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 a18c21867..be8938b18 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
@@ -722,10 +722,13 @@ else if (o instanceof FileRecord)
             {
                 FileRecord fileRecord = (FileRecord) o;
 
-                FileHistoryConversationComponent component
-                    = new FileHistoryConversationComponent(fileRecord);
-
-                conversationPanel.addComponent(component);
+                if (!fileRecord.getID().equals(escapedMessageID))
+                {
+                    FileHistoryConversationComponent component
+                        = new FileHistoryConversationComponent(fileRecord);
+    
+                    conversationPanel.addComponent(component);
+                }
             }
 
             if (historyString != null)
diff --git a/src/net/java/sip/communicator/plugin/notificationwiring/NotificationManager.java b/src/net/java/sip/communicator/plugin/notificationwiring/NotificationManager.java
index fc4942ca6..5320bbd31 100644
--- a/src/net/java/sip/communicator/plugin/notificationwiring/NotificationManager.java
+++ b/src/net/java/sip/communicator/plugin/notificationwiring/NotificationManager.java
@@ -739,7 +739,7 @@ public void fileTransferRequestReceived(FileTransferRequestEvent event)
                     INCOMING_FILE,
                     title,
                     request.getFileName(),
-                    null);
+                    request.getID());
         }
         catch(Throwable t)
         {