diff --git a/modules/plugin/base/src/nsNPAPIPlugin.cpp b/modules/plugin/base/src/nsNPAPIPlugin.cpp
index c32fe5e71574..51a13d43759b 100644
--- a/modules/plugin/base/src/nsNPAPIPlugin.cpp
+++ b/modules/plugin/base/src/nsNPAPIPlugin.cpp
@@ -1897,7 +1897,7 @@ _getvalue(NPP npp, NPNVariable variable, void *result)
     // XtDisplay just call gtk_xtbin_new(w,0) once
     static GtkWidget *gtkXtBinHolder = 0;
     if (!gtkXtBinHolder) {
-      gtkXtBinHolder = gtk_xtbin_new((GdkWindow*)GDK_ROOT_WINDOW(),0);
+      gtkXtBinHolder = gtk_xtbin_new(gdk_get_default_root_window(),0);
       // it crashes on destroy, let it leak
       // gtk_widget_destroy(gtkXtBinHolder);
     }
diff --git a/widget/src/gtkxtbin/gtk2xtbin.c b/widget/src/gtkxtbin/gtk2xtbin.c
index d9016a473778..131740473092 100644
--- a/widget/src/gtkxtbin/gtk2xtbin.c
+++ b/widget/src/gtkxtbin/gtk2xtbin.c
@@ -241,7 +241,7 @@ gtk_xtbin_class_init (GtkXtBinClass *klass)
   GtkWidgetClass *widget_class;
   GtkObjectClass *object_class;
 
-  parent_class = g_type_class_ref (GTK_TYPE_SOCKET);
+  parent_class = g_type_class_peek_parent(klass);
 
   widget_class = GTK_WIDGET_CLASS (klass);
   widget_class->realize = gtk_xtbin_realize;
diff --git a/widget/src/gtkxtbin/gtk2xtbin.h b/widget/src/gtkxtbin/gtk2xtbin.h
index c5e82bcc4588..aa17a9198f4f 100644
--- a/widget/src/gtkxtbin/gtk2xtbin.h
+++ b/widget/src/gtkxtbin/gtk2xtbin.h
@@ -97,7 +97,7 @@ struct _GtkXtBin
   
 struct _GtkXtBinClass
 {
-  GtkSocketClass widget_class;
+  GtkSocketClass parent_class;
 };
 
 GTKXTBIN_API(GType)       gtk_xtbin_get_type (void);