#include <config.h>, and fix includes.

1999-12-02  Federico Mena Quintero  <federico@redhat.com>

	* src/testpixbuf.c: #include <config.h>, and fix includes.

	* src/testpixbuf-drawable.c: #include <config.h>, and fix includes.

	* src/io-xpm.c: Fix includes.

	* src/io-tiff.c: Fix includes.

	* src/io-ras.c: Fix includes, and do not include more stuff than needed.

	* src/io-pnm.c: Fix inlcudes, and do not include more stuff than needed.

	* src/io-png.c: Fix includes.

	* src/io-ico.c: Fix includes, and do not include more stuff than needed.

	* src/io-gif.c: Fix includes, and do not include more stuff than needed.

	* src/io-bmp.c: Fix includes, and do not include more stuff than needed.

	* src/gnome-canvas-pixbuf.c: Fix includes.

	* src/gdk-pixbuf.c: Fix includes.

	* src/gdk-pixbuf-util.c: Fix includes.

	* src/gdk-pixbuf-render.c: Fix includes.

	* src/gdk-pixbuf-io.h: Fix includes.

	* src/gdk-pixbuf-drawable.c: Fix includes.

	* src/gdk-pixbuf-drawable.h: Use angle brackets for the gdk-pixbuf
	include files.

	* src/gdk-pixbuf-data.c: Fix includes.

	* src/gdk-pixbuf-loader.c: #include <config.h>

	* src/gdk-pixbuf-loader.h: Use angle brackets for the gdk-pixbuf
	include files.

	* src/Makefile.am: Commented out the gdk-pixbuf-drawable stuff,
	since it is not finished.

26 files changed, 96 insertions, 72 deletions

diff --git a/demos/testpixbuf-drawable.c b/demos/testpixbuf-drawable.c
index fa87674f04..58d0ee6829 100644
--- a/demos/testpixbuf-drawable.c
+++ b/demos/testpixbuf-drawable.c
@@ -1,7 +1,8 @@
+#include <config.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
-#include "gdk-pixbuf/gdk-pixbuf-drawable.h"
+#include "gdk-pixbuf.h"
+#include "gdk-pixbuf-drawable.h"
 
 void close_app(GtkWidget *widget, gpointer data)
 {
diff --git a/demos/testpixbuf.c b/demos/testpixbuf.c
index 5d36b7a0b8..a5bc78774b 100644
--- a/demos/testpixbuf.c
+++ b/demos/testpixbuf.c
@@ -18,14 +18,14 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-
 #include <gtk/gtk.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
-#include "gdk-pixbuf/gdk-pixbuf-io.h"
-#include "gdk-pixbuf/gdk-pixbuf-loader.h"
+#include "gdk-pixbuf.h"
+#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf-loader.h"
 
 typedef struct {
 	FILE             *imagefile;
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 935d7bb2c4..301139ce0b 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,5 +1,50 @@
 1999-12-02  Federico Mena Quintero  <federico@redhat.com>
 
+	* src/testpixbuf.c: #include <config.h>, and fix includes.
+
+	* src/testpixbuf-drawable.c: #include <config.h>, and fix includes.
+
+	* src/io-xpm.c: Fix includes.
+
+	* src/io-tiff.c: Fix includes.
+
+	* src/io-ras.c: Fix includes, and do not include more stuff than needed.
+
+	* src/io-pnm.c: Fix inlcudes, and do not include more stuff than needed.
+
+	* src/io-png.c: Fix includes.
+
+	* src/io-ico.c: Fix includes, and do not include more stuff than needed.
+
+	* src/io-gif.c: Fix includes, and do not include more stuff than needed.
+
+	* src/io-bmp.c: Fix includes, and do not include more stuff than needed.
+
+	* src/gnome-canvas-pixbuf.c: Fix includes.
+
+	* src/gdk-pixbuf.c: Fix includes.
+
+	* src/gdk-pixbuf-util.c: Fix includes.
+
+	* src/gdk-pixbuf-render.c: Fix includes.
+
+	* src/gdk-pixbuf-io.h: Fix includes.
+
+	* src/gdk-pixbuf-drawable.c: Fix includes.
+
+	* src/gdk-pixbuf-drawable.h: Use angle brackets for the gdk-pixbuf
+	include files.
+
+	* src/gdk-pixbuf-data.c: Fix includes.
+
+	* src/gdk-pixbuf-loader.c: #include <config.h>
+
+	* src/gdk-pixbuf-loader.h: Use angle brackets for the gdk-pixbuf
+	include files.
+
+	* src/Makefile.am: Commented out the gdk-pixbuf-drawable stuff,
+	since it is not finished.
+
 	* src/gdk-pixbuf.h: Removed unused transformation prototypes.
 
 	* src/gdk-pixbuf-util.c: New file with utility and convenience
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index b56731b854..7627615edc 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -38,7 +38,8 @@ libexec_LTLIBRARIES =		\
 	$(PNM_LIB)	\
 	$(BMP_LIB)
 
-noinst_PROGRAMS = testpixbuf testpixbuf-drawable
+#noinst_PROGRAMS = testpixbuf testpixbuf-drawable
+noinst_PROGRAMS = testpixbuf
 
 
 DEPS = libgdk_pixbuf.la
@@ -50,7 +51,7 @@ LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
 testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) $(GNOME_LIBS) \
 	-lgmodule
 
-testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS)
+#testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS)
 
 GDK_PIXBUF_LIBS = $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
 
@@ -73,18 +74,20 @@ libgdk_pixbuf_la_SOURCES = 	\
 	gdk-pixbuf-io.c		\
 	gdk-pixbuf-loader.c	\
 	gdk-pixbuf-render.c	\
-	gdk-pixbuf-drawable.c	\
 	gdk-pixbuf-util.c	\
 	$(CANVAS_SOURCEFILES)
 
+#	gdk-pixbuf-drawable.c	\
+
 libgdk_pixbuf_la_LDFLAGS = -version-info 1:0:0
 
 libgdk_pixbufinclude_HEADERS =	\
 	gdk-pixbuf.h		\
-	gdk-pixbuf-drawable.h	\
 	gdk-pixbuf-loader.h	\
 	$(CANVAS_HEADERFILES)
 
+#	gdk-pixbuf-drawable.h	\
+
 noinst_HEADERS = \
 	gdk-pixbuf-io.h
 
diff --git a/gdk-pixbuf/gdk-pixbuf-cache.h b/gdk-pixbuf/gdk-pixbuf-cache.h
deleted file mode 100644
index 00669e7c16..0000000000
--- a/gdk-pixbuf/gdk-pixbuf-cache.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _GDK_PIXBUF_CACHE_H_
-#define _GDK_PIXBUF_CACHE_H_
-
-/* The optional cache interface */
-typedef struct {
-	int dummy;
-} GdkPixbufCache;
-
-GdkPixbufCache  *gdk_pixbuf_cache_new        (long image_cache_limit,
-				              long pixmap_bitmap_cache_limit);
-void             gdk_pixbuf_cache_destroy    (GdkPixbufCache *cache);
-
-GdkPixbuf       *gdk_pixbuf_cache_load_image (GdkPixbufCache *cache,
-					      const char *file);
-#endif
diff --git a/gdk-pixbuf/gdk-pixbuf-data.c b/gdk-pixbuf/gdk-pixbuf-data.c
index 26c1cff9f6..4c3bd36106 100644
--- a/gdk-pixbuf/gdk-pixbuf-data.c
+++ b/gdk-pixbuf/gdk-pixbuf-data.c
@@ -21,7 +21,7 @@
  */
 
 #include <config.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf.h"
 
 
 
diff --git a/gdk-pixbuf/gdk-pixbuf-drawable.h b/gdk-pixbuf/gdk-pixbuf-drawable.h
index f312b03c6a..580c29cea9 100644
--- a/gdk-pixbuf/gdk-pixbuf-drawable.h
+++ b/gdk-pixbuf/gdk-pixbuf-drawable.h
@@ -2,7 +2,7 @@
 #define _GDK_PIXBUF_DRAWABLE_H_
 
 #include <gdk/gdk.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 GdkPixbuf *gdk_pixbuf_rgb_from_drawable (GdkWindow *window, gint x, gint y, gint width, gint height);
 GdkPixbuf *gdk_pixbuf_rgba_from_drawable (GdkWindow *window, gint x, gint y, gint width, gint height);
diff --git a/gdk-pixbuf/gdk-pixbuf-io.h b/gdk-pixbuf/gdk-pixbuf-io.h
index b1de4accb2..9ffbc1ec29 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.h
+++ b/gdk-pixbuf/gdk-pixbuf-io.h
@@ -29,7 +29,7 @@
 
 #include <gmodule.h>
 #include <stdio.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c
index 346074f367..9628944ea7 100644
--- a/gdk-pixbuf/gdk-pixbuf-loader.c
+++ b/gdk-pixbuf/gdk-pixbuf-loader.c
@@ -25,9 +25,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+#include <gtk/gtksignal.h>
 #include "gdk-pixbuf-loader.h"
 #include "gdk-pixbuf-io.h"
-#include <gtk/gtksignal.h>
 
 
 
diff --git a/gdk-pixbuf/gdk-pixbuf-loader.h b/gdk-pixbuf/gdk-pixbuf-loader.h
index 1e67a17fd5..6d93b2f8ea 100644
--- a/gdk-pixbuf/gdk-pixbuf-loader.h
+++ b/gdk-pixbuf/gdk-pixbuf-loader.h
@@ -28,7 +28,7 @@
 
 #include <unistd.h>
 #include <gtk/gtkobject.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/gdk-pixbuf/gdk-pixbuf-util.c b/gdk-pixbuf/gdk-pixbuf-util.c
index c274c30f56..b507d25070 100644
--- a/gdk-pixbuf/gdk-pixbuf-util.c
+++ b/gdk-pixbuf/gdk-pixbuf-util.c
@@ -21,7 +21,7 @@
  */
 
 #include <config.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf.h"
 
 
 
diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c
index 83bd0d30e4..6c9b2730eb 100644
--- a/gdk-pixbuf/gdk-pixbuf.c
+++ b/gdk-pixbuf/gdk-pixbuf.c
@@ -29,7 +29,7 @@
 #include <libart_lgpl/art_pixbuf.h>
 #include <libart_lgpl/art_rgb_pixbuf_affine.h>
 #include <libart_lgpl/art_alphagamma.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf.h"
 
 
 
diff --git a/gdk-pixbuf/gnome-canvas-pixbuf.c b/gdk-pixbuf/gnome-canvas-pixbuf.c
index eef8eb12f6..070079ddcd 100644
--- a/gdk-pixbuf/gnome-canvas-pixbuf.c
+++ b/gdk-pixbuf/gnome-canvas-pixbuf.c
@@ -24,9 +24,9 @@
 #include <math.h>
 #include <libgnomeui/gnome-canvas.h>
 #include <libgnomeui/gnome-canvas-util.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
-#include "gdk-pixbuf/gnome-canvas-pixbuf.h"
-#include "libart_lgpl/art_rgb_pixbuf_affine.h"
+#include "gdk-pixbuf.h"
+#include <libart_lgpl/art_rgb_pixbuf_affine.h>
+#include "gnome-canvas-pixbuf.h"
 
 
 
diff --git a/gdk-pixbuf/io-bmp.c b/gdk-pixbuf/io-bmp.c
index dc94b40dca..469288c4b0 100644
--- a/gdk-pixbuf/io-bmp.c
+++ b/gdk-pixbuf/io-bmp.c
@@ -34,12 +34,9 @@ Known bugs:
 #include <config.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <sys/mman.h>
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
-#include "gdk-pixbuf/gdk-pixbuf-io.h"
+#include "gdk-pixbuf.h"
+#include "gdk-pixbuf-io.h"
+
 
 
 
diff --git a/gdk-pixbuf/io-gif.c b/gdk-pixbuf/io-gif.c
index ed194b8813..b74a69a134 100644
--- a/gdk-pixbuf/io-gif.c
+++ b/gdk-pixbuf/io-gif.c
@@ -60,10 +60,9 @@
 
 #include <config.h>
 #include <stdio.h>
-#include <glib.h>
 #include <string.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
-#include "gdk-pixbuf/gdk-pixbuf-io.h"
+#include "gdk-pixbuf.h"
+#include "gdk-pixbuf-io.h"
 
 
 
diff --git a/gdk-pixbuf/io-ico.c b/gdk-pixbuf/io-ico.c
index a7ce85b043..002f3310e6 100644
--- a/gdk-pixbuf/io-ico.c
+++ b/gdk-pixbuf/io-ico.c
@@ -35,12 +35,8 @@ Known bugs:
 #include <config.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <sys/mman.h>
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
-#include "gdk-pixbuf/gdk-pixbuf-io.h"
+#include "gdk-pixbuf.h"
+#include "gdk-pixbuf-io.h"
 
 
 
diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c
index 8ec726f0c1..68660d4c74 100644
--- a/gdk-pixbuf/io-jpeg.c
+++ b/gdk-pixbuf/io-jpeg.c
@@ -47,8 +47,8 @@
 #include <string.h>
 #include <setjmp.h>
 #include <jpeglib.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
-#include "gdk-pixbuf/gdk-pixbuf-io.h"
+#include "gdk-pixbuf.h"
+#include "gdk-pixbuf-io.h"
 
 
 
diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
index 7509d04a7f..75e456144a 100644
--- a/gdk-pixbuf/io-png.c
+++ b/gdk-pixbuf/io-png.c
@@ -25,8 +25,8 @@
 #include <config.h>
 #include <stdio.h>
 #include <png.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
-#include "gdk-pixbuf/gdk-pixbuf-io.h"
+#include "gdk-pixbuf.h"
+#include "gdk-pixbuf-io.h"
 
 
 
diff --git a/gdk-pixbuf/io-pnm.c b/gdk-pixbuf/io-pnm.c
index 10681aaebd..e1cdd5f5d6 100644
--- a/gdk-pixbuf/io-pnm.c
+++ b/gdk-pixbuf/io-pnm.c
@@ -26,9 +26,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <setjmp.h>
-#include <jpeglib.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
-#include "gdk-pixbuf/gdk-pixbuf-io.h"
+#include "gdk-pixbuf.h"
+#include "gdk-pixbuf-io.h"
 
 
 
diff --git a/gdk-pixbuf/io-ras.c b/gdk-pixbuf/io-ras.c
index 47726b81bd..de602b473c 100644
--- a/gdk-pixbuf/io-ras.c
+++ b/gdk-pixbuf/io-ras.c
@@ -33,12 +33,9 @@ Known bugs:
 #include <config.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <sys/mman.h>
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
-#include "gdk-pixbuf/gdk-pixbuf-io.h"
+#include "gdk-pixbuf.h"
+#include "gdk-pixbuf-io.h"
+
 
 
 
diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c
index c61494be23..208a1b724b 100644
--- a/gdk-pixbuf/io-tiff.c
+++ b/gdk-pixbuf/io-tiff.c
@@ -27,10 +27,10 @@
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>
-#include <tiffio.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
-#include "gdk-pixbuf/gdk-pixbuf-io.h"
 #include <unistd.h>
+#include <tiffio.h>
+#include "gdk-pixbuf.h"
+#include "gdk-pixbuf-io.h"
 
 
 
diff --git a/gdk-pixbuf/io-xpm.c b/gdk-pixbuf/io-xpm.c
index 97229e60aa..b2f0715c62 100644
--- a/gdk-pixbuf/io-xpm.c
+++ b/gdk-pixbuf/io-xpm.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <glib.h>
 #include <gdk/gdk.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf.h"
 
 
 
diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index f635af5d26..b2af116aef 100644
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -14,8 +14,8 @@
 #include <string.h>
 #include <glib.h>
 #include <gmodule.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
-#include "gdk-pixbuf/gdk-pixbuf-drawable.h"
+#include "gdk-pixbuf.h"
+#include "gdk-pixbuf-drawable.h"
 
 
 #if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
diff --git a/gdk/gdkpixbuf-render.c b/gdk/gdkpixbuf-render.c
index c85a367160..d08f255477 100644
--- a/gdk/gdkpixbuf-render.c
+++ b/gdk/gdkpixbuf-render.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #include <gdk/gdk.h>
 #include <libart_lgpl/art_rect.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
+#include "gdk-pixbuf.h"
 
 
 
diff --git a/gtk/gdk-pixbuf-loader.c b/gtk/gdk-pixbuf-loader.c
index 346074f367..9628944ea7 100644
--- a/gtk/gdk-pixbuf-loader.c
+++ b/gtk/gdk-pixbuf-loader.c
@@ -25,9 +25,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+#include <gtk/gtksignal.h>
 #include "gdk-pixbuf-loader.h"
 #include "gdk-pixbuf-io.h"
-#include <gtk/gtksignal.h>
 
 
 
diff --git a/gtk/gdk-pixbuf-loader.h b/gtk/gdk-pixbuf-loader.h
index 1e67a17fd5..6d93b2f8ea 100644
--- a/gtk/gdk-pixbuf-loader.h
+++ b/gtk/gdk-pixbuf-loader.h
@@ -28,7 +28,7 @@
 
 #include <unistd.h>
 #include <gtk/gtkobject.h>
-#include "gdk-pixbuf/gdk-pixbuf.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #ifdef __cplusplus
 extern "C" {