/hg/release/icedtea-web-1.4: 3 new changesets

[jvanek at icedtea.classpath.org]

changeset 7417aafce17f in /hg/release/icedtea-web-1.4
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=7417aafce17f
author: Jiri Vanek <jvanek at redhat.com>
date: Fri May 03 21:17:01 2013 +0200

	Reverted "Remove only occurence of LEGACY_XULRUNNERAPI" patch


changeset 35aa1ba34610 in /hg/release/icedtea-web-1.4
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=35aa1ba34610
author: Jiri Vanek <jvanek at redhat.com>
date: Fri May 03 21:19:42 2013 +0200

	Removed tag icedtea-web-1.4


changeset ee842a825870 in /hg/release/icedtea-web-1.4
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=ee842a825870
author: Jiri Vanek <jvanek at redhat.com>
date: Fri May 03 21:19:44 2013 +0200

	Added tag icedtea-web-1.4 for changeset 7417aafce17f


diffstat:

 .hgtags                             |  4 ++++
 ChangeLog                           |  8 ++++++++
 plugin/icedteanp/IcedTeaNPPlugin.cc |  6 +++++-
 3 files changed, 17 insertions(+), 1 deletions(-)

diffs (42 lines):

diff -r a2b168188cbe -r ee842a825870 .hgtags
--- a/.hgtags	Thu May 02 19:53:33 2013 +0200
+++ b/.hgtags	Fri May 03 21:19:44 2013 +0200
@@ -3,3 +3,7 @@
 41f03d932cdf040a89d09c5683fcc7dac6fd2003 icedtea-web-1.2-branchpoint
 0d6213db4fc7ec58ad8165278f672ed5cc201822 icedtea-web-1.4-branch
 65b9cfc864d47fa29aeea90c5abbca71c869e05b icedtea-web-1.4
+65b9cfc864d47fa29aeea90c5abbca71c869e05b icedtea-web-1.4
+0000000000000000000000000000000000000000 icedtea-web-1.4
+0000000000000000000000000000000000000000 icedtea-web-1.4
+7417aafce17fc2d1d11895b190a8f9a09abf228d icedtea-web-1.4
diff -r a2b168188cbe -r ee842a825870 ChangeLog
--- a/ChangeLog	Thu May 02 19:53:33 2013 +0200
+++ b/ChangeLog	Fri May 03 21:19:44 2013 +0200
@@ -1,3 +1,11 @@
+2013-05-03  Jiri Vanek  <jvanek at redhat.com>
+
+	Reverted "Remove only occurence of LEGACY_XULRUNNERAPI" patch
+	* plugin/icedteanp/IcedTeaNPPlugin.cc: (NP_GetMIMEDescription) 
+	return type set-up by dependency on defined LEGACY_XULRUNNERAPI.
+	This one is set by IT_CHECK_XULRUNNER_API_VERSION during configure.
+	if defined, then old char* is used. New const char* is used otherwise.
+
 2013-05-02  Jana Fabrikova  <jfabriko at redhat.com>
 
 	* tests/reproducers/simple/JavawsAWTRobotUsageSample/resources/AppletAWTRobotUsageSample.html:
diff -r a2b168188cbe -r ee842a825870 plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Thu May 02 19:53:33 2013 +0200
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Fri May 03 21:19:44 2013 +0200
@@ -1995,7 +1995,11 @@
 // Returns a string describing the MIME type that this plugin
 // handles.
 __attribute__ ((visibility ("default")))
-const char*
+#ifdef LEGACY_XULRUNNERAPI
+  char* 
+#else
+  const char* 
+#endif
 NP_GetMIMEDescription ()
 {
   PLUGIN_DEBUG ("NP_GetMIMEDescription\n");