/hg/icedtea: Ported over NP plugin fixes from IcedTea 1.6 branch

[dbhole at icedtea.classpath.org]

changeset 6cd33d5c844d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6cd33d5c844d
author: Deepak Bhole <dbhole at redhat.com>
date: Wed Jan 06 18:04:10 2010 -0500

	Ported over NP plugin fixes from IcedTea 1.6 branch


diffstat:

4 files changed, 11 insertions(+), 4 deletions(-)
ChangeLog                                                |    9 +++++++++
configure.ac                                             |    2 +-
plugin/icedteanp/IcedTeaNPPlugin.h                       |    2 --
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java |    2 +-

diffs (52 lines):

diff -r 316dbf49f070 -r 6cd33d5c844d ChangeLog
--- a/ChangeLog	Thu Dec 24 14:05:23 2009 -0500
+++ b/ChangeLog	Wed Jan 06 18:04:10 2010 -0500
@@ -1,3 +1,12 @@ 2009-12-24  Deepak Bhole <dbhole at redhat.
+2010-01-06  Deepak Bhole <dbhole at redhat.com>
+
+	* configure.ac: Use libxul instead of libxul-unstable for the new NP
+	plugin.
+	* plugin/icedteanp/IcedTeaNPPlugin.h: Remove debug specific line from 
+	code.
+	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+	(handleMessage): Decode URL before setting documentbase.
+
 2009-12-24  Deepak Bhole <dbhole at redhat.com>
 
 	* plugin/icedeanp/*: Blanket merge with icedtea6 branch.
diff -r 316dbf49f070 -r 6cd33d5c844d configure.ac
--- a/configure.ac	Thu Dec 24 14:05:23 2009 -0500
+++ b/configure.ac	Wed Jan 06 18:04:10 2010 -0500
@@ -421,7 +421,7 @@ if test "x${enable_npplugin}" = "xyes"
 if test "x${enable_npplugin}" = "xyes"
 then
   PKG_CHECK_MODULES(MOZILLA, \
-    mozilla-plugin libxul-unstable)
+    mozilla-plugin libxul)
   PKG_CHECK_MODULES(GTK, gtk+-2.0)
   PKG_CHECK_MODULES(GLIB, glib-2.0)
 
diff -r 316dbf49f070 -r 6cd33d5c844d plugin/icedteanp/IcedTeaNPPlugin.h
--- a/plugin/icedteanp/IcedTeaNPPlugin.h	Thu Dec 24 14:05:23 2009 -0500
+++ b/plugin/icedteanp/IcedTeaNPPlugin.h	Wed Jan 06 18:04:10 2010 -0500
@@ -38,8 +38,6 @@ exception statement from your version. *
 
 #ifndef __ICEDTEANPPLUGIN_H__
 #define	__ICEDTEANPPLUGIN_H__
-
-#define MOZILLA_VERSION_COLLAPSED 1090105
 
 #if MOZILLA_VERSION_COLLAPSED < 1090100
 #include <nsThreadUtils.h>
diff -r 316dbf49f070 -r 6cd33d5c844d plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Thu Dec 24 14:05:23 2009 -0500
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Wed Jan 06 18:04:10 2010 -0500
@@ -424,7 +424,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
         			 }
         			 int index = message.indexOf(' ', "tag".length() + 1);
         			 request.documentbase =
-        				 message.substring("tag".length() + 1, index);
+        				 UrlUtil.decode(message.substring("tag".length() + 1, index));
         			 request.tag = message.substring(index + 1);
         			 PluginDebug.debug ("REQUEST TAG: " + request.tag + " " +
         					 Thread.currentThread());