# HG changeset patch
# User Joshua Sumali <jsumali@redhat.com>
# Date 1210093879 14400
# Node ID 506ca3ba05598c6d9f7ac38a3466970880e4ca47
# Parent  dce24bd816913bd6f3614635fa2c6fcd6c8c22c5
2008-05-06  Joshua Sumali  <jsumali@redhat.com>

        * rt/net/sourceforge/jnlp/security/CertWarningPane.java: Get publisher
        name from certificate instead of vendor field in jnlp file.

diff -r dce24bd81691 -r 506ca3ba0559 ChangeLog
--- a/ChangeLog	Mon May 05 10:06:01 2008 -0400
+++ b/ChangeLog	Tue May 06 13:11:19 2008 -0400
@@ -1,3 +1,8 @@
+2008-05-06  Joshua Sumali  <jsumali@redhat.com>
+
+	* rt/net/sourceforge/jnlp/security/CertWarningPane.java: Get publisher
+	name from certificate instead of vendor field in jnlp file.
+
 2008-05-05  Lillian Angel  <langel@redhat.com>
 
 	* jconsole.desktop: Fixed typo.
diff -r dce24bd81691 -r 506ca3ba0559 rt/net/sourceforge/jnlp/security/CertWarningPane.java
--- a/rt/net/sourceforge/jnlp/security/CertWarningPane.java	Mon May 05 10:06:01 2008 -0400
+++ b/rt/net/sourceforge/jnlp/security/CertWarningPane.java	Tue May 06 13:11:19 2008 -0400
@@ -91,17 +91,12 @@
 		}
 
 		try {
-			//Really ugly way of getting the publisher...
-			if (file instanceof PluginBridge) {
-				Certificate c = ((SecurityWarningDialog)optionPane)
-					.getJarSigner().getPublisher();
-				if (c instanceof X509Certificate) {
-					publisher = getCN(((X509Certificate)c)
-						.getSubjectX500Principal().getName());
-				}
+			Certificate c = ((SecurityWarningDialog)optionPane)
+				.getJarSigner().getPublisher();
+			if (c instanceof X509Certificate) {
+				publisher = getCN(((X509Certificate)c)
+					.getSubjectX500Principal().getName());
 			}
-			else
-				publisher = file.getInformation().getVendor();
 		} catch (Exception e) {
 		}