[Gnash-commit] gnash macros/gnashpkgtool.m4 plugin/plugin.cpp

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/21 22:20:02

Modified files:
        macros         : gnashpkgtool.m4 
        plugin         : plugin.cpp 

Log message:
        Clean up and w8 with GTK1-support since it needs Xt.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.74&r2=1.75

Patches:
Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- macros/gnashpkgtool.m4      14 Oct 2006 07:51:43 -0000      1.1
+++ macros/gnashpkgtool.m4      21 Oct 2006 22:20:02 -0000      1.2
@@ -35,4 +35,9 @@
 dnl  
 dnl 
 
-dnl $Id: gnashpkgtool.m4,v 1.1 2006/10/14 07:51:43 nihilus Exp $
+dnl $Id: gnashpkgtool.m4,v 1.2 2006/10/21 22:20:02 nihilus Exp $
+
+dnl Generic macros for finding and setting include-paths and library-path
+dnl for packages.
+
+

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- plugin/plugin.cpp   21 Oct 2006 17:37:00 -0000      1.74
+++ plugin/plugin.cpp   21 Oct 2006 22:20:02 -0000      1.75
@@ -35,7 +35,7 @@
 // 
 //
 
-/* $Id: plugin.cpp,v 1.74 2006/10/21 17:37:00 nihilus Exp $ */
+/* $Id: plugin.cpp,v 1.75 2006/10/21 22:20:02 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -185,6 +185,10 @@
 NS_PluginGetValue(NPPVariable aVariable, void *aValue)
 {
     NPError err = NPERR_NO_ERROR;
+       NPNToolkitType toolkit;
+       
+       CallNPN_GetValueProc(NPNFuncs.getvalue, NULL,
+       NPNVToolkit,(void *)&toolkit);
 
     switch (aVariable) {
       case NPPVpluginNameString:
@@ -198,7 +202,10 @@
           break;
 
       case NPPVpluginNeedsXEmbed:
+       if(toolkit == NPNVGtk2)
                *static_cast<PRBool *>(aValue) = PR_TRUE;
+       else
+               *static_cast<PRBool *>(aValue) = PR_FALSE;
          break;
       case NPPVpluginTimerInterval:
       case NPPVpluginKeepLibraryInMemory:
@@ -344,11 +351,19 @@
        << ", this = " << static_cast<void*>(this) << endl;
 #endif
     }
-
+       NPNToolkitType toolkit;
+       CallNPN_GetValueProc(NPNFuncs.getvalue, NULL,
+       NPNVToolkit,(void *)&toolkit);
+       if(toolkit == NPNVGtk2){
        _width = aWindow->width;
        _height = aWindow->height;
        _window = reinterpret_cast<Window> (aWindow->window);
+       
        return NPERR_NO_ERROR;
+       }
+       else 
+               return NPERR_INCOMPATIBLE_VERSION_ERROR; //FIXME: GTK-1.2
+                                                       //Support goes here.
 }