don't save undelivered messages in the gui

src/net/java/sip/communicator/impl/gui/main/MainFrame.java

@@ -74,8 +74,6 @@ public class MainFrame
 
     private MetaContactListService contactList;
 
-    private Hashtable waitToBeDeliveredMsgs = new Hashtable();
-
     private LoginManager loginManager;
 
     private ChatWindowManager chatWindowManager;
@@ -550,11 +548,6 @@ public void providerStatusMessageChanged(PropertyChangeEvent evt) {
         }
     }
 
-    public Hashtable getWaitToBeDeliveredMsgs()
-    {
-        return waitToBeDeliveredMsgs;
-    }
-
     /**
      * Returns the list of all groups.
      * @return The list of all groups.

src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java

@@ -262,16 +262,24 @@ public void messageReceived(MessageReceivedEvent evt)
      */
     public void messageDelivered(MessageDeliveredEvent evt)
     {
+        Contact contact = evt.getDestinationContact();
+        
+        MetaContact metaContact = mainFrame.getContactList()
+            .findMetaContactByContact(contact);
+                
         logger.trace("MESSAGE DELIVERED to contact: "
             + evt.getDestinationContact().getAddress());
         
-        Message msg = evt.getSourceMessage();
-        Hashtable waitToBeDelivered = this.mainFrame.getWaitToBeDeliveredMsgs();
-        String msgUID = msg.getMessageUID();
-
-        if (waitToBeDelivered.containsKey(msgUID)) {
-            ChatPanel chatPanel = (ChatPanel) waitToBeDelivered.get(msgUID);
-
+        Message msg = evt.getSourceMessage();        
+        
+        ChatWindowManager chatWindowManager = mainFrame.getChatWindowManager();
+        ChatPanel chatPanel = null;
+        
+        if(chatWindowManager.isChatOpenedForContact(metaContact))
+            chatPanel = chatWindowManager.getContactChat(metaContact);
+            
+        if (chatPanel != null)
+        {   
             ProtocolProviderService protocolProvider = evt
                     .getDestinationContact().getProtocolProvider();
 

src/net/java/sip/communicator/impl/gui/main/message/ChatSendPanel.java

@@ -105,11 +105,7 @@ public void actionPerformed(ActionEvent e)
 
             String body = chatPanel.getTextFromWriteArea();
             Message msg = im.createMessage(body);
-
-            this.chatPanel.getChatWindow().getMainFrame()
-                .getWaitToBeDeliveredMsgs().put(msg.getMessageUID(),
-                    this.chatPanel);
-
+            
             if (tn != null)
             {
                 // Send TYPING STOPPED event before sending the message