Mercurial > hg > release > icedtea-web-1.0
changeset 69:3f36c58d7b30
fix info shown in about:plugins in firefox
2010-12-07 Omair Majid <omajid@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.
| author | Omair Majid <omajid@redhat.com> |
|---|---|
| date | Tue, 07 Dec 2010 11:03:42 -0500 |
| parents | 338c7d55380b |
| children | 692d7e5b3103 |
| files | ChangeLog Makefile.am configure.ac plugin/icedteanp/IcedTeaNPPlugin.cc |
| diffstat | 4 files changed, 20 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Dec 06 15:34:01 2010 -0500 +++ b/ChangeLog Tue Dec 07 11:03:42 2010 -0500 @@ -1,3 +1,16 @@ +2010-12-07 Omair Majid <omajid@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. + 2010-12-06 Deepak Bhole <dbhole@redhat.com> Fixed indentation and spacing for all .java files
--- a/Makefile.am Mon Dec 06 15:34:01 2010 -0500 +++ b/Makefile.am Tue Dec 07 11:03: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) \
--- a/configure.ac Mon Dec 06 15:34:01 2010 -0500 +++ b/configure.ac Tue Dec 07 11:03:42 2010 -0500 @@ -1,4 +1,4 @@ -AC_INIT([icedtea-web],[1.0pre],[distro-pkg-dev@openjdk.java.net]) +AC_INIT([icedtea-web],[1.0pre],[distro-pkg-dev@openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile])
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Dec 06 15:34:01 2010 -0500 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Tue Dec 07 11:03: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: