[icedtea-web] RFC: fix info shown in about:plugins in Firefox

[Deepak Bhole]

* Omair Majid <omajid at redhat.com> [2010-12-04 00:32]:
> Hi,
> 
> The attached patch updates information shown by the plugin in
> about:plugins in Firefox. I am not sure how to fill in the version
> string, but then none of the plugins I have installed display a
> version string either. With the patch applied, firefox shows this:
> 
> IcedTea-Web Plugin (using IcedTea-Web 1.0pre+rab266ebf1178)
>     File: IcedTeaPlugin.so
>     Version:
>     The IcedTea-Web Plugin executes Java applets.
> 
> Where "IcedTea-Web Plugin" in the description is a link to the
> IcedTea-Web wiki page. Without this patch, Firefox shows:
> 
> IcedTea NPR Web Browser Plugin (using IcedTea 1.0pre+rab266ebf1178)
> 
>     File: IcedTeaPlugin.so
>     Version:
>     The IcedTea NPR Web Browser Plugin (using IcedTea
> 1.0pre+rab266ebf1178) executes Java applets.
> 

Looks good to me! Okay for commit.

Cheers,
Deepak

> ChangeLog:
> 2010-01-04  Omair Majid  <omajid at redhat.com>
> 
>     * Makefile.am (PLUGIN_VERSION): Change to IcedTea-Web
>     ($(PLUGIN_DIR)/%.o): Define PLUGIN_NAME and PACKAGE_URL.
>     * configure.ac (AC_INTIT): Add url.
>     * plugin/icedteanp/IcedTeaNPPlugin.cc (PLUGIN_NAME): Removed.
>     (PLUGIN_FULL_NAME): New definition. (PLUGIN_DESC): Add link to
>     IcedTea-Web wiki page.
>     (NP_GetValue): Return PLUGIN_FULL_NAME instead of PLUGIN_NAME.
> 
> Thoughts? Comments?
> 
> Cheers,
> Omair

> diff -r ab266ebf1178 Makefile.am
> --- a/Makefile.am	Fri Dec 03 20:19:12 2010 +0000
> +++ b/Makefile.am	Fri Dec 03 23:55:42 2010 -0500
> @@ -82,7 +82,7 @@
>  	-Wl,-soname=lib.so  -L $(BOOT_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/jli -Wl,-z -Wl,origin \
>  	-Wl,--allow-shlib-undefined -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(INSTALL_ARCH_DIR)/jli -Wl,-rpath \
>  	-Wl,\$$ORIGIN/../jre/lib/$(INSTALL_ARCH_DIR)/jli $(X11_CFLAGS) $(X11_LIBS) -ljli  -ldl -lz
> -PLUGIN_VERSION = IcedTea $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
> +PLUGIN_VERSION = IcedTea-Web $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
>  
>  EXTRA_DIST = $(top_srcdir)/netx $(top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher \
>   itweb-settings.desktop.in
> @@ -167,7 +167,9 @@
>  	cd $(PLUGIN_DIR) && \
>  	$(CXX) $(CXXFLAGS) \
>  	  -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
> +	  -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \
>  	  -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
> +	  -DPACKAGE_URL="\"$(PACKAGE_URL)\"" \
>  	  -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
>  	  $(GLIB_CFLAGS) \
>  	  $(GTK_CFLAGS) \
> diff -r ab266ebf1178 configure.ac
> --- a/configure.ac	Fri Dec 03 20:19:12 2010 +0000
> +++ b/configure.ac	Fri Dec 03 23:55:42 2010 -0500
> @@ -1,4 +1,4 @@
> -AC_INIT([icedtea-web],[1.0pre],[distro-pkg-dev at openjdk.java.net])
> +AC_INIT([icedtea-web],[1.0pre],[distro-pkg-dev at openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web])
>  AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
>  AC_CONFIG_FILES([Makefile])
>  
> diff -r ab266ebf1178 plugin/icedteanp/IcedTeaNPPlugin.cc
> --- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Fri Dec 03 20:19:12 2010 +0000
> +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Fri Dec 03 23:55:42 2010 -0500
> @@ -87,8 +87,8 @@
>                __LINE__, g_thread_self (), first, second, third)
>  
>  // Plugin information passed to about:plugins.
> -#define PLUGIN_NAME "IcedTea NPR Web Browser Plugin (using " PLUGIN_VERSION ")"
> -#define PLUGIN_DESC "The " PLUGIN_NAME " executes Java applets."
> +#define PLUGIN_FULL_NAME PLUGIN_NAME " (using " PLUGIN_VERSION ")"
> +#define PLUGIN_DESC "The <a href=\"" PACKAGE_URL "\">" PLUGIN_NAME "</a> executes Java applets."
>  
>  #define PLUGIN_MIME_DESC                                               \
>    "application/x-java-vm:class,jar:IcedTea;"                           \
> @@ -2275,7 +2275,7 @@
>      {
>      case NPPVpluginNameString:
>        PLUGIN_DEBUG ("NP_GetValue: returning plugin name.\n");
> -      *char_value = g_strdup (PLUGIN_NAME);
> +      *char_value = g_strdup (PLUGIN_FULL_NAME);
>        break;
>  
>      case NPPVpluginDescriptionString: