From 19689f432bb65babbfe7c270e06ce5306bd4fc53 Mon Sep 17 00:00:00 2001
From: Yana Stamcheva <yana@jitsi.org>
Date: Thu, 18 Sep 2008 20:21:50 +0000
Subject: [PATCH] Remove the pack() from the parent customization window and
 leave all windows to choose their setSize method.

---
 resources/config/defaults.properties                     | 4 +++-
 .../impl/gui/customcontrols/SIPCommFrame.java            | 1 -
 .../sip/communicator/impl/gui/main/chat/ChatWindow.java  | 9 +++++++--
 .../impl/gui/main/login/SecurityAuthorityImpl.java       | 1 +
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/resources/config/defaults.properties b/resources/config/defaults.properties
index 7b9554691..075515091 100644
--- a/resources/config/defaults.properties
+++ b/resources/config/defaults.properties
@@ -21,7 +21,9 @@ defaultGroupName=
 preferredAccountWizard=
 tabOverlap=10
 mainWindowWidth=200
-mainWindowHeight=450
+mainWindowHeight=500
+chatWindowWidth=500
+chatWindowHeight=400
 logoBarWidth=0
 logoBarHeight=0
 mainToolbarButtonHeight=28
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommFrame.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommFrame.java
index b65c282d0..0d92c1ec7 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommFrame.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommFrame.java
@@ -350,7 +350,6 @@ public void setVisible(boolean isVisible)
     {
         if (isVisible)
         {
-            this.pack();
             this.setSizeAndLocation();
 
             this.ensureOnScreenLocationAndSize();
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
index d9a39e181..946607da3 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
@@ -124,8 +124,6 @@ public void stateChanged(ChangeEvent e)
             });
         }
 
-        this.setSizeAndLocation();
-
         JPanel northPanel = new JPanel(new BorderLayout());
 
         northPanel.add(new LogoBar(), BorderLayout.NORTH);
@@ -148,6 +146,13 @@ public void stateChanged(ChangeEvent e)
         this.addKeybindingAction("chat-close", new CloseAction());
 
         this.addWindowListener(new ChatWindowAdapter());
+
+        int width
+            = GuiActivator.getResources().getSettingsInt("chatWindowWidth");
+        int height
+            = GuiActivator.getResources().getSettingsInt("chatWindowHeight");
+
+        this.setSize(width, height);
     }
 
     /*
diff --git a/src/net/java/sip/communicator/impl/gui/main/login/SecurityAuthorityImpl.java b/src/net/java/sip/communicator/impl/gui/main/login/SecurityAuthorityImpl.java
index 97f497cef..f661c77c6 100644
--- a/src/net/java/sip/communicator/impl/gui/main/login/SecurityAuthorityImpl.java
+++ b/src/net/java/sip/communicator/impl/gui/main/login/SecurityAuthorityImpl.java
@@ -87,6 +87,7 @@ else if (reasonCode == WRONG_USERNAME)
                 isUserNameEditable,
                 errorMessage);
 
+        loginWindow.pack();
         loginWindow.setVisible(true);
 
         return userCredentials;