Changeset 357 for trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc

Timestamp:

Apr 26, 2012, 10:51:16 PM (13 years ago)

Author:

dmik

Message:

icedtea-web: Port plugin to OS/2.

File:

• trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc (modified) (8 diffs)

trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc

@@ -37 +37 @@
 exception statement from your version. */
 
+#ifdef __OS2__
+// OS/2 includes.
+#define INCL_PM
+#include <os2.h>
+#endif
+
 // System includes.
 #include <dlfcn.h>
@@ -51 +57 @@
 #include "IcedTeaScriptablePluginObject.h"
 #include "IcedTeaNPPlugin.h"
+
+#include "OS.h"
 
 #if MOZILLA_VERSION_COLLAPSED < 1090100
@@ -1079 +1087 @@
 plugin_display_failure_dialog ()
 {
+#ifdef __OS2__
+  gchar *msg = NULL;
+
+  PLUGIN_DEBUG ("plugin_display_failure_dialog\n");
+
+  msg = g_strdup_printf (FAILURE_MESSAGE, appletviewer_executable);
+  WinMessageBox (HWND_DESKTOP, HWND_DESKTOP,
+                 msg, "Error", 0, MB_ERROR | MB_OK);
+  g_free(msg);
+#else
   GtkWidget* dialog = NULL;
 
@@ -1092 +1110 @@
   gtk_dialog_run (GTK_DIALOG (dialog));
   gtk_widget_destroy (dialog);
+#endif
 
   PLUGIN_DEBUG ("plugin_display_failure_dialog return\n");
@@ -1534 +1553 @@
       command_line = (gchar**) malloc(sizeof(gchar*)*11);
       command_line[cmd_num++] = g_strdup(appletviewer_executable);
-      command_line[cmd_num++] = g_strdup(PLUGIN_BOOTCLASSPATH);
+      command_line[cmd_num++] = g_strdup_printf(PLUGIN_BOOTCLASSPATH);
       // set the classpath to avoid using the default (cwd).
       command_line[cmd_num++] = g_strdup("-classpath");
@@ -1555 +1574 @@
       command_line = (gchar**) malloc(sizeof(gchar*)*8);
       command_line[cmd_num++] = g_strdup(appletviewer_executable);
-      command_line[cmd_num++] = g_strdup(PLUGIN_BOOTCLASSPATH);
+      command_line[cmd_num++] = g_strdup_printf(PLUGIN_BOOTCLASSPATH);
       command_line[cmd_num++] = g_strdup("-classpath");
       command_line[cmd_num++] = g_strdup_printf("%s/lib/rt.jar", ICEDTEA_WEB_JRE);
@@ -2263 +2282 @@
 // Returns a string describing the MIME type that this plugin
 // handles.
-char*
+const char*
 NP_GetMIMEDescription ()
 {
@@ -2270 +2289 @@
   PLUGIN_DEBUG ("NP_GetMIMEDescription return\n");
 
-  return (char*) PLUGIN_MIME_DESC;
+  return PLUGIN_MIME_DESC;
 }