[Gnash-commit] gnash/plugin plugin.cpp

[Markus Gothe]

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

Modified files:
        plugin         : plugin.cpp 

Log message:
        Clean up... Removed #ifdef HAVE_GTK2.

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

Patches:
Index: plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- plugin.cpp  21 Oct 2006 01:19:03 -0000      1.66
+++ plugin.cpp  21 Oct 2006 14:16:28 -0000      1.67
@@ -35,7 +35,7 @@
 // 
 //
 
-/* $Id: plugin.cpp,v 1.66 2006/10/21 01:19:03 nihilus Exp $ */
+/* $Id: plugin.cpp,v 1.67 2006/10/21 14:16:28 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -185,6 +185,7 @@
 NS_PluginGetValue(NPPVariable aVariable, void *aValue)
 {
     NPError err = NPERR_NO_ERROR;
+    NPNToolkitType toolkit;
 
     switch (aVariable) {
       case NPPVpluginNameString:
@@ -198,11 +199,9 @@
           break;
 
       case NPPVpluginNeedsXEmbed:
-#ifdef HAVE_GTK2
+       if(toolkit == NPNVGtk2) //GTK >=2
          *static_cast<PRBool *>(aValue) = PR_TRUE;
-#else
-         *static_cast<PRBool *>(aValue) = PR_FALSE;
-#endif
+       else    *static_cast<PRBool *>(aValue) = PR_FALSE;
          break;
       case NPPVpluginTimerInterval:
       case NPPVpluginKeepLibraryInMemory: