move the setIconImage to the SIPCommFrame class and remove it from MainFrame and ChatWindow - this way we have the SIP Communicator icon on all windows throught the gui

src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommFrame.java

@@ -28,6 +28,10 @@ public SIPCommFrame()
         this.setIconImage(
             ImageLoader.getImage(ImageLoader.SIP_COMMUNICATOR_LOGO));
         
+        // In order to have the same icon when using option panes
+        JOptionPane.getRootFrame().setIconImage(
+                ImageLoader.getImage(ImageLoader.SIP_COMMUNICATOR_LOGO));
+
         this.addWindowListener(new FrameWindowAdapter());
         
         amap = this.getRootPane().getActionMap();

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

@@ -104,13 +104,6 @@ public MainFrame()
 
         this.setTitle(Messages.getI18NString("sipCommunicator").getText());
 
-        this.setIconImage(
-            ImageLoader.getImage(ImageLoader.SIP_COMMUNICATOR_LOGO));
-        
-        // In order to have the same icon when using option panes
-        JOptionPane.getRootFrame().setIconImage(
-                ImageLoader.getImage(ImageLoader.SIP_COMMUNICATOR_LOGO));
-
         this.init();
     }
 

src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java

@@ -13,14 +13,12 @@
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.customcontrols.events.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.chat.menus.*;
 import net.java.sip.communicator.impl.gui.main.chat.toolBars.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
@@ -64,9 +62,6 @@ public ChatWindow(MainFrame mainFrame)
 
         this.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 
-        this.setIconImage(ImageLoader
-            .getImage(ImageLoader.SIP_COMMUNICATOR_LOGO));
-
         menusPanel = new MenusPanel(this);
 
         //If in mode TABBED_CHAT_WINDOW initialize the tabbed pane