Bug 289983. Move nsIGdkPixbufImage to widget/src/gtk2 because 1) GTK1 doesn't need it and 2) cairo-gtk2 builds do need it.

gfx/src/gtk/Makefile.in

@@ -143,10 +143,6 @@ endif
 endif
 
 ifdef MOZ_ENABLE_GTK2
-EXPORTS = \
-		nsIGdkPixbufImage.h \
-		$(NULL)
-
 CPPSRCS		+= \
 		nsRegionGTK2.cpp \
 		$(NULL)

gfx/src/gtk/nsImageGTK.cpp

@@ -47,8 +47,6 @@
 
 #include "nspr.h"
 
-#include "nsIGdkPixbufImage.h"
-
 #define IsFlagSet(a,b) ((a) & (b))
 
 #define NS_GET_BIT(rowptr, x) (rowptr[(x)>>3] &  (1<<(7-(x)&0x7)))

gfx/src/gtk/nsImageGTK.h

@@ -44,7 +44,9 @@
 #include <X11/Xutil.h>
 #include <gdk/gdk.h>
 #include "nsRegion.h"
+#ifdef MOZ_WIDGET_GTK2
 #include "nsIGdkPixbufImage.h"
+#endif
 
 class nsDrawingSurfaceGTK;
 

widget/src/gtk2/Makefile.in

@@ -102,6 +102,7 @@ EXTRA_DSO_LDOPTS += \
 		$(MOZ_GTK2_LIBS)
 
 EXPORTS		= \
+                nsIGdkPixbufImage.h \
 		mozdrawingarea.h \
 		mozcontainer.h \
 		$(NULL)