/hg/release/icedtea6-1.8: PR icedtea/491: pass java_{code,codeba...

[omajid at icedtea.classpath.org]

changeset 38c9e6307044 in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=38c9e6307044
author: Omair Majid <omajid at redhat.com>
date: Tue Jul 20 13:50:16 2010 -0400

	PR icedtea/491: pass java_{code,codebase,archive} paramters to java

	2010-07-20 Omair Majid <omajid at redhat.com>

	 PR icedtea/491
	       * plugin/icedteanp/IcedTeaNPPlugin.cc
	(plugin_create_applet_tag): Accept and pass on
	java_{code,codebase,archive} tags to the java side of the plugin.


diffstat:

2 files changed, 28 insertions(+)
ChangeLog                           |    7 +++++++
plugin/icedteanp/IcedTeaNPPlugin.cc |   21 +++++++++++++++++++++

diffs (58 lines):

diff -r 162af9c88f31 -r 38c9e6307044 ChangeLog
--- a/ChangeLog	Thu May 13 15:53:35 2010 +0100
+++ b/ChangeLog	Tue Jul 20 13:50:16 2010 -0400
@@ -1,3 +1,10 @@ 2010-07-19  Gary Benson  <gbenson at redhat
+2010-07-20  Omair Majid  <omajid at redhat.com>
+
+	PR icedtea/491
+	* plugin/icedteanp/IcedTeaNPPlugin.cc
+	(plugin_create_applet_tag): Accept and pass on
+	java_{code,codebase,archive} tags to the java side of the plugin.
+
 2010-07-19  Gary Benson  <gbenson at redhat.com>
 
 	PR icedtea/483
diff -r 162af9c88f31 -r 38c9e6307044 plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Thu May 13 15:53:35 2010 +0100
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Tue Jul 20 13:50:16 2010 -0400
@@ -1625,12 +1625,26 @@ plugin_create_applet_tag (int16_t argc, 
           g_free (code);
           code = NULL;
     }
+      else if (!g_ascii_strcasecmp (argn[i], "java_code"))
+    {
+          gchar* java_code = g_strdup_printf ("JAVA_CODE=\"%s\" ", argv[i]);
+          applet_tag = g_strconcat (applet_tag, java_code, NULL);
+          g_free (java_code);
+          java_code = NULL;
+    }
       else if (!g_ascii_strcasecmp (argn[i], "codebase"))
     {
           gchar* codebase = g_strdup_printf ("CODEBASE=\"%s\" ", argv[i]);
           applet_tag = g_strconcat (applet_tag, codebase, NULL);
           g_free (codebase);
           codebase = NULL;
+    }
+      else if (!g_ascii_strcasecmp (argn[i], "java_codebase"))
+    {
+          gchar* java_codebase = g_strdup_printf ("JAVA_CODEBASE=\"%s\" ", argv[i]);
+          applet_tag = g_strconcat (applet_tag, java_codebase, NULL);
+          g_free (java_codebase);
+          java_codebase = NULL;
     }
       else if (!g_ascii_strcasecmp (argn[i], "classid"))
     {
@@ -1645,6 +1659,13 @@ plugin_create_applet_tag (int16_t argc, 
           applet_tag = g_strconcat (applet_tag, archive, NULL);
           g_free (archive);
           archive = NULL;
+    }
+      else if (!g_ascii_strcasecmp (argn[i], "java_archive"))
+    {
+          gchar* java_archive = g_strdup_printf ("JAVA_ARCHIVE=\"%s\" ", argv[i]);
+          applet_tag = g_strconcat (applet_tag, java_archive, NULL);
+          g_free (java_archive);
+          java_archive = NULL;
     }
       else if (!g_ascii_strcasecmp (argn[i], "width"))
     {