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

Timestamp:

Jun 26, 2012, 2:04:16 AM (13 years ago)

Author:

dmik

Message:

icedtea-web: Use g_main_context_os2_start_pm_integration() on OS/2.

This is to make sure that GLib events are handled correctly when the main
PM message loop is run externally WRT the plugin code (e.g. by Firefox).

File:

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

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

@@ -2266 +2266 @@
 #endif
 
+#ifndef __OS2__
   // Make sure the plugin data directory exists, creating it if
   // necessary.
@@ -2274 +2275 @@
       return NPERR_OUT_OF_MEMORY_ERROR;
     }
-  gchar* filename = NULL;
 
   // If P_tmpdir does not exist, try /tmp directly
@@ -2281 +2281 @@
                     (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
     {
-      int file_error = 0;
-
       data_directory = g_strconcat ("/tmp", NULL);
         if (!data_directory)
@@ -2330 +2328 @@
 
     }
+#endif
 
   // Set appletviewer_executable.
-  filename = g_strdup(ICEDTEA_WEB_JRE);
+  gchar* filename = g_strdup(ICEDTEA_WEB_JRE);
   appletviewer_executable = g_strdup_printf ("%s/bin/java",
                                              filename);
@@ -2351 +2350 @@
   g_free (filename);
 
-  initialized = true;
-
   // Initialize threads (needed for mutexes).
   if (!g_thread_supported ())
     g_thread_init (NULL);
+
+#ifdef __OS2__
+  if (!g_main_context_os2_start_pm_integration (NULL))
+  {
+    PLUGIN_DEBUG ("Failed to integrate with PM");
+    np_error = NPERR_GENERIC_ERROR;
+    goto cleanup_appletviewer_executable;
+  }
+#endif
 
   plugin_instance_mutex = g_mutex_new ();
@@ -2391 +2397 @@
   pthread_mutexattr_destroy(&attribute);
 
+  initialized = true;
+
   PLUGIN_DEBUG ("NP_Initialize return\n");
 
@@ -2488 +2496 @@
 {
   PLUGIN_DEBUG ("NP_Shutdown\n");
+
+#ifdef __OS2__
+  g_main_context_os2_stop_pm_integration (NULL);
+#endif
 
   // Free mutex.