From 7fe1264c71a343b62d67aa37ae11cdb07dadef84 Mon Sep 17 00:00:00 2001
From: Yana Stamcheva <yana@jitsi.org>
Date: Fri, 26 Nov 2010 15:46:07 +0000
Subject: [PATCH] Sets the default icon of the authentication window to be the
 application logo.

---
 resources/images/images.properties               |   1 +
 resources/images/logo/sc_logo_64x64.png          | Bin 0 -> 3931 bytes
 .../updatechecker/UpdateCheckActivator.java      |   3 ++-
 .../util/swing/AuthenticationWindow.java         |  10 ++++++----
 4 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 resources/images/logo/sc_logo_64x64.png

diff --git a/resources/images/images.properties b/resources/images/images.properties
index 3ab12b898..e7bab093f 100644
--- a/resources/images/images.properties
+++ b/resources/images/images.properties
@@ -1,6 +1,7 @@
 # service gui
 service.gui.SIP_COMMUNICATOR_LOGO=resources/images/logo/sc_logo16x16.png
 service.gui.SIP_COMMUNICATOR_LOGO_45x45=resources/images/logo/sc_logo_45x45.png
+service.gui.SIP_COMMUNICATOR_LOGO_64x64=resources/images/logo/sc_logo_64x64.png
 service.gui.MAIN_WINDOW_BACKGROUND=
 service.gui.AUTH_WINDOW_BACKGROUND=resources/images/impl/gui/common/passWindowBackground.png
 service.gui.ABOUT_WINDOW_BACKGROUND=resources/images/impl/gui/common/aboutWindowBackground.png
diff --git a/resources/images/logo/sc_logo_64x64.png b/resources/images/logo/sc_logo_64x64.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b8818edf1aadcd5e50dc7dce3c3e000e6131b39
GIT binary patch
literal 3931
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

literal 0
HcmV?d00001

diff --git a/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java b/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java
index 2a893ebeb..83dfc047f 100644
--- a/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java
+++ b/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java
@@ -775,7 +775,8 @@ protected PasswordAuthentication getPasswordAuthentication()
                 else
                 {
                     AuthenticationWindow authWindow =
-                            new AuthenticationWindow("host", true, null);
+                            new AuthenticationWindow(
+                                getRequestingHost(), true, null);
 
                     userCredentials = new UserCredentials();
 
diff --git a/src/net/java/sip/communicator/util/swing/AuthenticationWindow.java b/src/net/java/sip/communicator/util/swing/AuthenticationWindow.java
index 4a1f932ce..a676cb210 100644
--- a/src/net/java/sip/communicator/util/swing/AuthenticationWindow.java
+++ b/src/net/java/sip/communicator/util/swing/AuthenticationWindow.java
@@ -102,10 +102,7 @@ public AuthenticationWindow(String server,
 
         this.server = server;
 
-        if(icon != null)
-        {
-            initIcon(icon);
-        }
+        initIcon(icon);
 
         if(!isUserNameEditable)
             this.uinValue = new JLabel();
@@ -200,6 +197,11 @@ else if (uinValue instanceof JTextField)
      */
     private void initIcon(ImageIcon icon)
     {
+        // If an icon isn't provided set the application logo icon by default.
+        if (icon == null)
+            icon = UtilActivator.getResources()
+                .getImage("service.gui.SIP_COMMUNICATOR_LOGO_64x64");
+
         JLabel iconLabel = new JLabel(icon);
 
         iconLabel.setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 20));