diff --git a/mozilla/modules/plugin/Makefile.in b/mozilla/modules/plugin/Makefile.in
index 7f7b7f0f6bd..98c93ea0d43 100644
--- a/mozilla/modules/plugin/Makefile.in
+++ b/mozilla/modules/plugin/Makefile.in
@@ -40,6 +40,10 @@ endif
 
 endif
 
+ifdef MOZ_ENABLE_GTK2
+DIRS		+= samples/default/unix
+endif
+
 ifeq ($(OS_ARCH),WINNT)
 DIRS		+= samples/default/windows
 endif
diff --git a/mozilla/modules/plugin/samples/default/unix/Makefile.in b/mozilla/modules/plugin/samples/default/unix/Makefile.in
index 6a79c2e1c9c..88f91931756 100644
--- a/mozilla/modules/plugin/samples/default/unix/Makefile.in
+++ b/mozilla/modules/plugin/samples/default/unix/Makefile.in
@@ -55,6 +55,12 @@ CXXFLAGS	+= $(MOZ_GTK_CFLAGS)
 CFLAGS		+= $(MOZ_GTK_CFLAGS)
 endif
 
+ifdef MOZ_ENABLE_GTK2
+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIB ) $(XLDFLAGS)
+CXXFLAGS	+= $(MOZ_GTK2_CFLAGS)
+CFLAGS		+= $(MOZ_GTK2_CFLAGS)
+endif
+
 install-plugin: $(SHARED_LIBRARY)
 ifdef SHARED_LIBRARY
 	$(INSTALL) $(SHARED_LIBRARY) $(DIST)/bin/plugins
diff --git a/mozilla/modules/plugin/samples/default/unix/nullplugin.c b/mozilla/modules/plugin/samples/default/unix/nullplugin.c
index 37e4f071338..bb503673aed 100644
--- a/mozilla/modules/plugin/samples/default/unix/nullplugin.c
+++ b/mozilla/modules/plugin/samples/default/unix/nullplugin.c
@@ -376,7 +376,14 @@ createPixmap(PluginInstance *This)
        GdkWindow *gdk_window = getGdkWindow(This);
        if (gdk_window)
        {
+#ifdef MOZ_ENABLE_GTK
            style = gtk_widget_get_style((GtkWidget *)gdk_window->user_data);
+#endif
+#ifdef MOZ_ENABLE_GTK2
+	   gpoint user_data = nsnull;
+	   gdk_window_get_user_data( gdk_window, user_data);
+	   style = gtk_widget_get_style(GTK_WIDGET(user_data));
+#endif
            nullPluginGdkPixmap = gdk_pixmap_create_from_xpm_d(gdk_window , &mask,
                                              &style->bg[GTK_STATE_NORMAL], npnul320_xpm);
 	   /* Pixmap is created on original X session but used by new session */