Mercurial > hg > release > icedtea-web-1.3
changeset 505:b619cda99360
PR1260: IcedTea-Web should not rely on GTK
author | Deepak Bhole <dbhole@redhat.com> |
---|---|
date | Wed, 16 Jan 2013 15:34:44 -0500 |
parents | b96993bf1061 |
children | c89c2bf6707b |
files | ChangeLog Makefile.am NEWS acinclude.m4 plugin/icedteanp/IcedTeaJavaRequestProcessor.h plugin/icedteanp/IcedTeaNPPlugin.cc plugin/icedteanp/IcedTeaNPPlugin.h |
diffstat | 7 files changed, 15 insertions(+), 73 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jan 07 11:47:42 2013 -0500 +++ b/ChangeLog Wed Jan 16 15:34:44 2013 -0500 @@ -1,3 +1,14 @@ +2013-01-16 Deepak Bhole <dbhole@redhat.com> + + PR1260: IcedTea-Web should not rely on GTK + * Makefile.am: Remove GTK includes and links + * acinclude.m4: Remove check for GTK libs + * plugin/icedteanp/IcedTeaJavaRequestProcessor.h: Removed gtk.h include + and added unistd include (for usleep) which gtk.h brought in before + * plugin/icedteanp/IcedTeaNPPlugin.cc: Remove GTK dialog shown when java + is not found + * plugin/icedteanp/IcedTeaNPPlugin.h: Removed gtk.h include + 2013-01-07 Deepak Bhole <dbhole@redhat.com> * netx/net/sourceforge/jnlp/resources/Messages.properties: Converted to
--- a/Makefile.am Mon Jan 07 11:47:42 2013 -0500 +++ b/Makefile.am Wed Jan 16 15:34:44 2013 -0500 @@ -270,7 +270,6 @@ -DICEDTEA_WEB_JRE="\"$(SYSTEM_JRE_DIR)\"" \ -DPLUGIN_BOOTCLASSPATH=$(PLUGIN_BOOTCLASSPATH) \ $(GLIB_CFLAGS) \ - $(GTK_CFLAGS) \ $(MOZILLA_CFLAGS) \ -fPIC -o $@ -c $< @@ -279,7 +278,6 @@ $(CXX) $(CXXFLAGS) \ $(PLUGIN_OBJECTS) \ $(GLIB_LIBS) \ - $(GTK_LIBS) \ $(MOZILLA_LIBS)\ -shared -o $@
--- a/NEWS Mon Jan 07 11:47:42 2013 -0500 +++ b/NEWS Wed Jan 16 15:34:44 2013 -0500 @@ -9,6 +9,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY New in release 1.3.2 (2012-XX-XX): +* Plugin + PR1260: IcedTea-Web should not rely on GTK New in release 1.3.1 (2012-11-07): * Security Updates
--- a/acinclude.m4 Mon Jan 07 11:47:42 2013 -0500 +++ b/acinclude.m4 Wed Jan 16 15:34:44 2013 -0500 @@ -359,56 +359,15 @@ AC_MSG_RESULT(${enable_plugin}) ]) -dnl ITW_GTK_CHECK_VERSION([gtk version]) -AC_DEFUN([ITW_GTK_CHECK_VERSION], -[ - AC_MSG_CHECKING([for GTK$1 version]) - GTK_VER=`$PKG_CONFIG --modversion gtk+-$1.0` - AC_MSG_RESULT([$GTK_VER]) -]) - -dnl ITW_GTK_CHECK([gtk version]) -AC_DEFUN([ITW_GTK_CHECK], -[ - case "$1" in - default) - PKG_CHECK_MODULES(GTK, gtk+-3.0, - [ITW_GTK_CHECK_VERSION([3])], - [PKG_CHECK_MODULES(GTK, gtk+-2.0, - [ITW_GTK_CHECK_VERSION([2])], - [AC_MSG_ERROR([GTK $1 not found])] - )] - ) - ;; - *) - PKG_CHECK_MODULES(GTK, gtk+-$1.0, - [ITW_GTK_CHECK_VERSION([$1])], - [AC_MSG_ERROR([GTK $1 not found])] - ) - ;; - esac -]) - AC_DEFUN_ONCE([IT_CHECK_PLUGIN_DEPENDENCIES], [ dnl Check for plugin support headers and libraries. dnl FIXME: use unstable AC_REQUIRE([IT_CHECK_PLUGIN]) if test "x${enable_plugin}" = "xyes" ; then - AC_ARG_WITH([gtk], - [AS_HELP_STRING([--with-gtk=[2|3|default]], - [the GTK+ version to use (default: 3)])], - [case "$with_gtk" in - 2|3|default) ;; - *) AC_MSG_ERROR([invalid GTK version specified]) ;; - esac], - [with_gtk=default]) - ITW_GTK_CHECK([$with_gtk]) PKG_CHECK_MODULES(GLIB, glib-2.0) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) PKG_CHECK_MODULES(MOZILLA, npapi-sdk, [ AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],[
--- a/plugin/icedteanp/IcedTeaJavaRequestProcessor.h Mon Jan 07 11:47:42 2013 -0500 +++ b/plugin/icedteanp/IcedTeaJavaRequestProcessor.h Wed Jan 16 15:34:44 2013 -0500 @@ -41,6 +41,7 @@ #include <errno.h> #include <stdlib.h> +#include <unistd.h> #include <vector> #include "IcedTeaNPPlugin.h"
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Jan 07 11:47:42 2013 -0500 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Jan 16 15:34:44 2013 -0500 @@ -218,8 +218,6 @@ static void plugin_data_new (ITNPPluginData** data); // Retrieve the current document's documentbase. static gchar* plugin_get_documentbase (NPP instance); -// Notify the user that the appletviewer is not installed correctly. -static void plugin_display_failure_dialog (); // Callback used to monitor input pipe status. static gboolean plugin_in_pipe_callback (GIOChannel* source, GIOCondition condition, @@ -1127,30 +1125,6 @@ } #endif -// This function displays an error message if the appletviewer has not -// been installed correctly. -static void -plugin_display_failure_dialog () -{ - GtkWidget* dialog = NULL; - - PLUGIN_DEBUG ("plugin_display_failure_dialog\n"); - - dialog = gtk_message_dialog_new (NULL, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - FAILURE_MESSAGE, - appletviewer_executable); - gtk_widget_show_all (dialog); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - - PLUGIN_DEBUG ("plugin_display_failure_dialog return\n"); -} - - - // plugin_in_pipe_callback is called when data is available on the // input pipe, or when the appletviewer crashes or is killed. It may // be called after data has been destroyed in which case it simply @@ -2297,7 +2271,7 @@ np_error = plugin_test_appletviewer (); if (np_error != NPERR_NO_ERROR) { - plugin_display_failure_dialog (); + fprintf(stderr, "Unable to find java executable %s\n", appletviewer_executable); goto cleanup_appletviewer_executable; } g_free (filename);
--- a/plugin/icedteanp/IcedTeaNPPlugin.h Mon Jan 07 11:47:42 2013 -0500 +++ b/plugin/icedteanp/IcedTeaNPPlugin.h Wed Jan 16 15:34:44 2013 -0500 @@ -51,9 +51,6 @@ #include <glib.h> #include <glib/gstdio.h> -// GTK includes. -#include <gtk/gtk.h> - #include "IcedTeaPluginUtils.h" #include "IcedTeaPluginRequestProcessor.h"