For bug 180147 [gtk2] need to port over the null plugin

patched by blizzard, robin.lu r=blizzard, robin.lu sr=bryner
Not in default build

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

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

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 */