[Gnash-commit] /srv/bzr/gnash/trunk r12090: plugin.cpp: Print a warning when the plugin is attempted to be used with

[Bastiaan Jacques]

------------------------------------------------------------
revno: 12090
committer: Bastiaan Jacques <address@hidden>
branch nick: trunk
timestamp: Sun 2010-03-21 03:56:34 +0100
message:
  plugin.cpp: Print a warning when the plugin is attempted to be used with
  a non-GTK browser.
  Moveclip.cpp, LoadableObject.cpp: Add missing includes.
modified:
  libcore/MovieClip.cpp
  libcore/asobj/LoadableObject.cpp
  plugin/npapi/plugin.cpp

=== modified file 'libcore/MovieClip.cpp'
--- a/libcore/MovieClip.cpp     2010-03-11 01:47:08 +0000
+++ b/libcore/MovieClip.cpp     2010-03-21 02:56:34 +0000
@@ -60,6 +60,7 @@
 #include "DisplayObjectContainer.h"
 #include "Global_as.h"
 #include "RunResources.h"
+#include "GnashImage.h"
 
 #include <vector>
 #include <string>

=== modified file 'libcore/asobj/LoadableObject.cpp'
--- a/libcore/asobj/LoadableObject.cpp  2010-03-11 01:47:08 +0000
+++ b/libcore/asobj/LoadableObject.cpp  2010-03-21 02:56:34 +0000
@@ -34,6 +34,7 @@
 #include "fn_call.h"
 #include "GnashAlgorithm.h"
 #include "Global_as.h"
+#include "IOChannel.h"
 
 #include <sstream>
 #include <map>

=== modified file 'plugin/npapi/plugin.cpp'
--- a/plugin/npapi/plugin.cpp   2010-03-20 21:28:31 +0000
+++ b/plugin/npapi/plugin.cpp   2010-03-21 02:56:34 +0000
@@ -168,29 +168,19 @@
         logDebug("xEmbed supported in this browser");
     }
 
-#if 0 // Gtk is no longer required in the browser
+    // GTK is not strictly required, but we do use the Glib main event loop,
+    // so lack of GTK means reduced functionality.
     NPNToolkitType toolkit;
-    err = CallNPN_GetValueProc(NPNFuncs.getvalue, NULL,
-                NPNVToolkit,
-                (void *)&toolkit);
+    err = CallNPN_GetValueProc(NPNFuncs.getvalue, NULL, NPNVToolkit, &toolkit);
 
-    /*
-    GTK2 support is currently also necessary. Fail if not
-    present.
-    */
     if (err != NPERR_NO_ERROR || toolkit != NPNVGtk2) {
 #ifdef GNASH_PLUGIN_DEBUG
         std::cout << "NPAPI ERROR: No GTK2 support in this browser!"
             " Have version " << (int)toolkit << std::endl;
 #endif
-
-        return NPERR_INCOMPATIBLE_VERSION_ERROR;
     } else {
-#if GNASH_PLUGIN_DEBUG > 1
-        std::cout << "GTK2 supported in this browser" << std::endl;
-#endif
+        logDebug("GTK2 supported in this browser");
     }
-#endif
 
     /*
     Check for environment variables.