Index: backend/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/gnash.cpp,v
retrieving revision 1.20
diff -p -u -r1.20 gnash.cpp
--- backend/gnash.cpp	31 Mar 2006 00:57:33 -0000	1.20
+++ backend/gnash.cpp	4 Apr 2006 19:24:16 -0000
@@ -453,13 +453,13 @@ main(int argc, char *argv[])
             SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 1);
         }
 #else
-//         if (windowid) {
-//             window = gtk_plug_new(windowid);
-//             dbglogfile << "Created GTK Plug window" << endl;
-//         } else {
+         if (windowid) {
+             window = gtk_plug_new(windowid);
+             dbglogfile << "Created GTK Plug window" << endl;
+         } else {
             window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
             dbglogfile << "Created top level window" << endl;
-//        }
+         }
 //         if (!glconfig) {
 //             static const int attrib_list[] = {
 //                 // GDK_GL_ALPHA_SIZE, 1,
Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.22
diff -p -u -r1.22 plugin.cpp
--- plugin/plugin.cpp	31 Mar 2006 00:57:33 -0000	1.22
+++ plugin/plugin.cpp	4 Apr 2006 19:24:17 -0000
@@ -598,20 +598,7 @@ nsPluginInstance::getVersion()
 NPError
 nsPluginInstance::GetValue(NPPVariable aVariable, void *aValue)
 {
-    log_trace("%s: enter for instance %p", __PRETTY_FUNCTION__, this);    
-    
-    NPError err = NPERR_NO_ERROR;
-    switch (aVariable) {
-      case NPPVpluginNameString:
-      case NPPVpluginDescriptionString:
-          return NS_PluginGetValue(aVariable, aValue) ;
-          break;
-      default:
-          err = NPERR_INVALID_PARAM;
-          break;
-    }
-    return err;
-
+    return NS_PluginGetValue(aVariable, aValue);
 }
 
 /// \brief Write a status message