[Gnash-commit] gnash ChangeLog plugin/plugin.cpp

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/21 00:28:49

Modified files:
        .              : ChangeLog 
        plugin         : plugin.cpp 

Log message:
             * plugin/plugin.cpp: Experimental code to support Firefox compiled
                  with xEmbed and GTK-1.2. (PoC from mplayerplug-in).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1329&r2=1.1330
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.64&r2=1.65

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1329
retrieving revision 1.1330
diff -u -b -r1.1329 -r1.1330
--- ChangeLog   21 Oct 2006 00:02:37 -0000      1.1329
+++ ChangeLog   21 Oct 2006 00:28:49 -0000      1.1330
@@ -1,3 +1,8 @@
+2006-10-21 Markus Gothe <address@hidden>
+
+       * plugin/plugin.cpp: Experimental code to support Firefox compiled
+         with xEmbed and GTK-1.2. (PoC from mplayerplug-in).
+
 2006-10-20  Rob Savoye  <address@hidden>
 
        * macros/boost.m4: Don't let the boost lib get added to LIBS, we

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- plugin/plugin.cpp   11 Oct 2006 21:30:21 -0000      1.64
+++ plugin/plugin.cpp   21 Oct 2006 00:28:49 -0000      1.65
@@ -35,7 +35,7 @@
 // 
 //
 
-/* $Id: plugin.cpp,v 1.64 2006/10/11 21:30:21 strk Exp $ */
+/* $Id: plugin.cpp,v 1.65 2006/10/21 00:28:49 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -144,12 +144,12 @@
                                NPNVToolkit,
                                (void *)&toolkit);
 
-    if (err != NPERR_NO_ERROR || toolkit != NPNVGtk2) {
-       cout << "No GTK2 support in this Mozilla version! Have "
-            << (int)toolkit << endl;
+    if (err != NPERR_NO_ERROR || (toolkit != NPNVGtk2 && toolkit != 
NPNVGtk12)) {
+       cout << "No GTK1.2+ support in this Mozilla version! Have got version "
+            << (int)toolkit << "." << endl;
         return NPERR_INCOMPATIBLE_VERSION_ERROR;
     } else {
-       cout << "Gtk2+ supported in this Mozilla version" << endl;
+       cout << "Gtk1.2+ supported in this Mozilla version" << endl;
     }
 
     plugInitialized = TRUE;
@@ -199,9 +199,9 @@
 
       case NPPVpluginNeedsXEmbed:
 #ifdef HAVE_GTK2
-         *static_cast<PRBool *>(aValue) = PR_TRUE;
-#else
          *static_cast<PRBool *>(aValue) = PR_FALSE;
+#else
+         *static_cast<PRBool *>(aValue) = PR_TRUE;
 #endif
          break;
       case NPPVpluginTimerInterval: