9 files changed, 9 insertions, 84 deletions
diff --git a/modules/engines/pixbuf/Makefile.am b/modules/engines/pixbuf/Makefile.am
index 27ebd8e37b..0dc2a730af 100644
--- a/modules/engines/pixbuf/Makefile.am
+++ b/modules/engines/pixbuf/Makefile.am
@@ -2,9 +2,16 @@ if OS_WIN32
 no_undefined = -no-undefined
 endif
 
-INCLUDES = $(GTK_CFLAGS)
+INCLUDES = \
+	-I$(top_srcdir) 				\
+	-I$(top_srcdir)/gdk				\
+	-I$(top_builddir)/gdk				\
+	-DG_DISABLE_DEPRECATED	 			\
+	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
+	-DGDK_DISABLE_DEPRECATED			\
+	$(GTK_DEP_CFLAGS)
 
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+enginedir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/engines
 
 engine_LTLIBRARIES = libpixmap.la
 
@@ -20,6 +27,3 @@ libpixmap_la_SOURCES = 		\
 libpixmap_la_LDFLAGS =  -avoid-version -module $(no_undefined)
 libpixmap_la_LIBADD = $(GTK_LIBS)
 
-dist-hook:
-	cp -pr examples $(distdir);					\
-        find $(distdir)/examples -name 'CVS' -print | xargs rm -rf 
diff --git a/modules/engines/pixbuf/examples/bubble/README b/modules/engines/pixbuf/examples/bubble/README
deleted file mode 100644
index 46cade49d1..0000000000
--- a/modules/engines/pixbuf/examples/bubble/README
+++ /dev/null
@@ -1,14 +0,0 @@
-gtk-2.0/triangle-background.png is copyright Owen Taylor, 1997
-and may be used without restriction as long as this attribution
-is reproduced.
-
-images/bc.pnm images/bc-dark.pnm images/bc-light.png are
-from the BrushedMetalClean theme; I believe Tuomas Kuosmanen
-and Carsten Haitzler had something to do with the original
-BrushedMetal artwork.
-
-This theme is truly hideous for a reason ... to demonstrate
-that alpha-compositing is going on.
-
-Owen Taylor
-19 Jan 2002x
-\ No newline at end of file
diff --git a/modules/engines/pixbuf/examples/bubble/gtk-2.0/bc-dark.png b/modules/engines/pixbuf/examples/bubble/gtk-2.0/bc-dark.png
deleted file mode 100644
index ab87858cea..0000000000
--- a/modules/engines/pixbuf/examples/bubble/gtk-2.0/bc-dark.png
+++ /dev/null
diff --git a/modules/engines/pixbuf/examples/bubble/gtk-2.0/bc-light.png b/modules/engines/pixbuf/examples/bubble/gtk-2.0/bc-light.png
deleted file mode 100644
index 0c7ecd5d83..0000000000
--- a/modules/engines/pixbuf/examples/bubble/gtk-2.0/bc-light.png
+++ /dev/null
diff --git a/modules/engines/pixbuf/examples/bubble/gtk-2.0/bc.png b/modules/engines/pixbuf/examples/bubble/gtk-2.0/bc.png
deleted file mode 100644
index 7b7c1da47f..0000000000
--- a/modules/engines/pixbuf/examples/bubble/gtk-2.0/bc.png
+++ /dev/null
diff --git a/modules/engines/pixbuf/examples/bubble/gtk-2.0/bubble-blue.png b/modules/engines/pixbuf/examples/bubble/gtk-2.0/bubble-blue.png
deleted file mode 100644
index bea78c350f..0000000000
--- a/modules/engines/pixbuf/examples/bubble/gtk-2.0/bubble-blue.png
+++ /dev/null
diff --git a/modules/engines/pixbuf/examples/bubble/gtk-2.0/bubble-parts.xcf b/modules/engines/pixbuf/examples/bubble/gtk-2.0/bubble-parts.xcf
deleted file mode 100644
index 184d75069e..0000000000
--- a/modules/engines/pixbuf/examples/bubble/gtk-2.0/bubble-parts.xcf
+++ /dev/null
diff --git a/modules/engines/pixbuf/examples/bubble/gtk-2.0/gtkrc b/modules/engines/pixbuf/examples/bubble/gtk-2.0/gtkrc
deleted file mode 100644
index 2d621e0d67..0000000000
--- a/modules/engines/pixbuf/examples/bubble/gtk-2.0/gtkrc
+++ /dev/null
@@ -1,65 +0,0 @@
-style "default"
-{
-  fg[NORMAL] = "#ffffff"
-  fg[PRELIGHT] = "#ffffff"
-  bg_pixmap[NORMAL]      = "triangle_background.png"
-#  bg_pixmap[NORMAL]    = "bc.png"
-  bg_pixmap[PRELIGHT]    = "bc-light.png"
-  bg_pixmap[ACTIVE]      = "bc-dark.png"  bg_pixmap[INSENSITIVE] = "bc.png"
-}
-
-class "GtkWidget" style "default"
-
-style "bubble-button"
-{
-  engine "pixmap" 
-    {
-    image 
-      {
-        function        = BOX
-	file            = "bubble-blue.png"
-	border          = { 8, 8, 8, 8 }
-	stretch         = TRUE
-      }
-    }
-}
-
-# common default
-class "GtkButton" style "bubble-button"
-
-style "bubble-range"
-{
-  GtkRange::slider_width = 16
-  GtkRange::stepper_size = 16
-
-  engine "pixmap" 
-    {
-    image 
-      {
-        function        = BOX
-	file            = "bubble-blue.png"
-	border          = { 8, 8, 8, 8 }
-	stretch         = TRUE
-      }
-    }
-}
-
-# common default
-class "GtkRange" style "bubble-range"
-
-style "bubble-menuitem"
-{
-  engine "pixmap" 
-    {
-    image 
-      {
-        function        = BOX
-	file            = "bubble-blue.png"
-	border          = { 8, 8, 8, 8 }
-	stretch         = TRUE
-      }
-    }
-}
-
-# common default
-class "GtkMenuItem" style "bubble-menuitem"
diff --git a/modules/engines/pixbuf/examples/bubble/gtk-2.0/triangle_background.png b/modules/engines/pixbuf/examples/bubble/gtk-2.0/triangle_background.png
deleted file mode 100644
index a4a612d7ba..0000000000
--- a/modules/engines/pixbuf/examples/bubble/gtk-2.0/triangle_background.png
+++ /dev/null