[Gnash-commit] gnash/plugin plugin.cpp

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/21 14:44:18

Modified files:
        plugin         : plugin.cpp 

Log message:
        Sets correct window size.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.68&r2=1.69

Patches:
Index: plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- plugin.cpp  21 Oct 2006 14:26:04 -0000      1.68
+++ plugin.cpp  21 Oct 2006 14:44:18 -0000      1.69
@@ -35,7 +35,7 @@
 // 
 //
 
-/* $Id: plugin.cpp,v 1.68 2006/10/21 14:26:04 nihilus Exp $ */
+/* $Id: plugin.cpp,v 1.69 2006/10/21 14:44:18 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -134,10 +134,10 @@
                                (void *)&supportsXEmbed);
 
     if (err != NPERR_NO_ERROR || !supportsXEmbed) {
-       cout << "No xEmbed support in this Mozilla version!" << endl;
+       cout << endl << "No xEmbed support in this Mozilla version!" << endl;
         return NPERR_INCOMPATIBLE_VERSION_ERROR;
     } else {
-       cout << "xEmbed supported in this Mozilla version" << endl;
+       cout << endl << "xEmbed supported in this Mozilla version" << endl;
     }
 
     err = CallNPN_GetValueProc(NPNFuncs.getvalue, NULL,
@@ -185,7 +185,6 @@
 NS_PluginGetValue(NPPVariable aVariable, void *aValue)
 {
     NPError err = NPERR_NO_ERROR;
-    NPNToolkitType toolkit;
 
     switch (aVariable) {
       case NPPVpluginNameString:
@@ -199,9 +198,7 @@
           break;
 
       case NPPVpluginNeedsXEmbed:
-       if(toolkit == NPNVGtk2) //GTK >=2
                *static_cast<PRBool *>(aValue) = PR_TRUE;
-       else    *static_cast<PRBool *>(aValue) = PR_FALSE;
          break;
       case NPPVpluginTimerInterval:
       case NPPVpluginKeepLibraryInMemory:
@@ -344,11 +341,15 @@
     }
 
        NPNToolkitType toolkit;
-       if(toolkit == NPNVGtk2){ //GTK >=2
+       
        _width = aWindow->width;
        _height = aWindow->height;
+       if(toolkit == NPNVGtk2){ //GTK >=2
        _window = reinterpret_cast<Window> (aWindow->window);
-
+       return NPERR_NO_ERROR;
+       }
+       else if(toolkit == NPNVGtk12){ //GTK >=1.2
+       _window = (Window)(aWindow->window);
        return NPERR_NO_ERROR;
        }
     else return NPERR_INCOMPATIBLE_VERSION_ERROR;