Index: mozilla/modules/plugin/samples/default/unix/npshell.c
===================================================================
RCS file: /cvsroot/mozilla/modules/plugin/samples/default/unix/npshell.c,v
retrieving revision 1.19
diff -pU20 -r1.19 mozilla/modules/plugin/samples/default/unix/npshell.c
--- mozilla/modules/plugin/samples/default/unix/npshell.c
+++ mozilla/modules/plugin/samples/default/unix/npshell.c
@@ -208,44 +208,42 @@ NPP_SetWindow(NPP instance, NPWindow* wi
     if (instance == NULL)
         return NPERR_INVALID_INSTANCE_ERROR;
 
     This = (PluginInstance*) instance->pdata;
 
     if (This == NULL)
         return NPERR_INVALID_INSTANCE_ERROR;
 
     ws_info = (NPSetWindowCallbackStruct *)window->ws_info;
 
 #ifdef MOZ_X11
     if (This->window == (Window) window->window) {
         /* The page with the plugin is being resized.
            Save any UI information because the next time
            around expect a SetWindow with a new window
            id.
         */
 #ifdef DEBUG
         fprintf(stderr, "Nullplugin: plugin received window resize.\n");
         fprintf(stderr, "Window=(%i)\n", (int)window);
-        if (window) {
-           fprintf(stderr, "W=(%i) H=(%i)\n",
-               (int)window->width, (int)window->height);
-        }
+        fprintf(stderr, "W=(%i) H=(%i)\n",
+            (int)window->width, (int)window->height);
 #endif
         return NPERR_NO_ERROR;
     } else {
 
       This->window = (Window) window->window;
       This->x = window->x;
       This->y = window->y;
       This->width = window->width;
       This->height = window->height;
       This->display = ws_info->display;
       This->visual = ws_info->visual;
       This->depth = ws_info->depth;
       This->colormap = ws_info->colormap;
       makePixmap(This);
       makeWidget(This);
     }
 #endif  /* #ifdef MOZ_X11 */
     
     return NPERR_NO_ERROR;
 }