summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog15
-rw-r--r--ChangeLog.pre-2-015
-rw-r--r--ChangeLog.pre-2-1015
-rw-r--r--ChangeLog.pre-2-215
-rw-r--r--ChangeLog.pre-2-415
-rw-r--r--ChangeLog.pre-2-615
-rw-r--r--ChangeLog.pre-2-815
-rw-r--r--demos/Makefile.am2
-rw-r--r--demos/pixbuf-demo.c3
-rw-r--r--demos/testanimation.c3
-rw-r--r--demos/testpixbuf-drawable.c3
-rw-r--r--demos/testpixbuf-scale.c1
-rw-r--r--demos/testpixbuf.c3
13 files changed, 102 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 4cb6f44c6a..bd1ae85702 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2000-06-21 Raja R Harinath <harinath@cs.umn.edu>
+
+ Work with srcdir != builddir.
+ * demos/testanimation.c: Don't include "gdk-pixbuf.h". Use
+ <gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
+ * demos/testpixbuf.c: Likewise.
+ * demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
+ * demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h". Use
+ <gdk/x11/gdkx.h>.
+ * demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h". Don't include
+ "gdk-pixbuf.h".
+ * demos/Makefile.am (INCLUDES): Remove unneeded directories.
+
Wed Jun 21 19:45:02 2000 Owen Taylor <otaylor@redhat.com>
* TODO.xml: Change 1.4 version numbers to 2.0.
@@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000 Owen Taylor <otaylor@redhat.com>
Wed Jun 21 16:38:13 2000 Owen Taylor <otaylor@redhat.com>
- * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
+ * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
gdk-pixbuf.
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 4cb6f44c6a..bd1ae85702 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,16 @@
+2000-06-21 Raja R Harinath <harinath@cs.umn.edu>
+
+ Work with srcdir != builddir.
+ * demos/testanimation.c: Don't include "gdk-pixbuf.h". Use
+ <gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
+ * demos/testpixbuf.c: Likewise.
+ * demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
+ * demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h". Use
+ <gdk/x11/gdkx.h>.
+ * demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h". Don't include
+ "gdk-pixbuf.h".
+ * demos/Makefile.am (INCLUDES): Remove unneeded directories.
+
Wed Jun 21 19:45:02 2000 Owen Taylor <otaylor@redhat.com>
* TODO.xml: Change 1.4 version numbers to 2.0.
@@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000 Owen Taylor <otaylor@redhat.com>
Wed Jun 21 16:38:13 2000 Owen Taylor <otaylor@redhat.com>
- * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
+ * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
gdk-pixbuf.
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4cb6f44c6a..bd1ae85702 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,16 @@
+2000-06-21 Raja R Harinath <harinath@cs.umn.edu>
+
+ Work with srcdir != builddir.
+ * demos/testanimation.c: Don't include "gdk-pixbuf.h". Use
+ <gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
+ * demos/testpixbuf.c: Likewise.
+ * demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
+ * demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h". Use
+ <gdk/x11/gdkx.h>.
+ * demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h". Don't include
+ "gdk-pixbuf.h".
+ * demos/Makefile.am (INCLUDES): Remove unneeded directories.
+
Wed Jun 21 19:45:02 2000 Owen Taylor <otaylor@redhat.com>
* TODO.xml: Change 1.4 version numbers to 2.0.
@@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000 Owen Taylor <otaylor@redhat.com>
Wed Jun 21 16:38:13 2000 Owen Taylor <otaylor@redhat.com>
- * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
+ * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
gdk-pixbuf.
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 4cb6f44c6a..bd1ae85702 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,16 @@
+2000-06-21 Raja R Harinath <harinath@cs.umn.edu>
+
+ Work with srcdir != builddir.
+ * demos/testanimation.c: Don't include "gdk-pixbuf.h". Use
+ <gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
+ * demos/testpixbuf.c: Likewise.
+ * demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
+ * demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h". Use
+ <gdk/x11/gdkx.h>.
+ * demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h". Don't include
+ "gdk-pixbuf.h".
+ * demos/Makefile.am (INCLUDES): Remove unneeded directories.
+
Wed Jun 21 19:45:02 2000 Owen Taylor <otaylor@redhat.com>
* TODO.xml: Change 1.4 version numbers to 2.0.
@@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000 Owen Taylor <otaylor@redhat.com>
Wed Jun 21 16:38:13 2000 Owen Taylor <otaylor@redhat.com>
- * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
+ * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
gdk-pixbuf.
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4cb6f44c6a..bd1ae85702 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,16 @@
+2000-06-21 Raja R Harinath <harinath@cs.umn.edu>
+
+ Work with srcdir != builddir.
+ * demos/testanimation.c: Don't include "gdk-pixbuf.h". Use
+ <gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
+ * demos/testpixbuf.c: Likewise.
+ * demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
+ * demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h". Use
+ <gdk/x11/gdkx.h>.
+ * demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h". Don't include
+ "gdk-pixbuf.h".
+ * demos/Makefile.am (INCLUDES): Remove unneeded directories.
+
Wed Jun 21 19:45:02 2000 Owen Taylor <otaylor@redhat.com>
* TODO.xml: Change 1.4 version numbers to 2.0.
@@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000 Owen Taylor <otaylor@redhat.com>
Wed Jun 21 16:38:13 2000 Owen Taylor <otaylor@redhat.com>
- * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
+ * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
gdk-pixbuf.
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4cb6f44c6a..bd1ae85702 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,16 @@
+2000-06-21 Raja R Harinath <harinath@cs.umn.edu>
+
+ Work with srcdir != builddir.
+ * demos/testanimation.c: Don't include "gdk-pixbuf.h". Use
+ <gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
+ * demos/testpixbuf.c: Likewise.
+ * demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
+ * demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h". Use
+ <gdk/x11/gdkx.h>.
+ * demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h". Don't include
+ "gdk-pixbuf.h".
+ * demos/Makefile.am (INCLUDES): Remove unneeded directories.
+
Wed Jun 21 19:45:02 2000 Owen Taylor <otaylor@redhat.com>
* TODO.xml: Change 1.4 version numbers to 2.0.
@@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000 Owen Taylor <otaylor@redhat.com>
Wed Jun 21 16:38:13 2000 Owen Taylor <otaylor@redhat.com>
- * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
+ * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
gdk-pixbuf.
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4cb6f44c6a..bd1ae85702 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,16 @@
+2000-06-21 Raja R Harinath <harinath@cs.umn.edu>
+
+ Work with srcdir != builddir.
+ * demos/testanimation.c: Don't include "gdk-pixbuf.h". Use
+ <gtk/gdk-pixbuf-loader.h>, not "gtk-pixbuf/gdk-pixbuf-loader.h".
+ * demos/testpixbuf.c: Likewise.
+ * demos/testpixbuf-scale.c: Don't include "gdk-pixbuf.h".
+ * demos/testpixbuf-drawable.c: Don't include "gdk-pixbuf.h". Use
+ <gdk/x11/gdkx.h>.
+ * demos/pixbuf-demo.c: Use <gtk/gtk.h> not "gtk.h". Don't include
+ "gdk-pixbuf.h".
+ * demos/Makefile.am (INCLUDES): Remove unneeded directories.
+
Wed Jun 21 19:45:02 2000 Owen Taylor <otaylor@redhat.com>
* TODO.xml: Change 1.4 version numbers to 2.0.
@@ -9,7 +22,7 @@ Wed Jun 21 19:29:08 2000 Owen Taylor <otaylor@redhat.com>
Wed Jun 21 16:38:13 2000 Owen Taylor <otaylor@redhat.com>
- * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
+ * gdk-pixbuf/* docs/reference/gdk-pixbuf/*: Welcome aboard,
gdk-pixbuf.
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init):
diff --git a/demos/Makefile.am b/demos/Makefile.am
index a0fcc3d673..8d7ca2f756 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -2,9 +2,7 @@
INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \
- -I$(top_builddir)/gdk-pixbuf \
-I$(top_builddir)/gdk \
- -I$(top_builddir)/gtk \
-DGTK_DISABLE_COMPAT_H \
@GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \
diff --git a/demos/pixbuf-demo.c b/demos/pixbuf-demo.c
index 77e7c94058..a256c49416 100644
--- a/demos/pixbuf-demo.c
+++ b/demos/pixbuf-demo.c
@@ -22,8 +22,7 @@
#include <config.h>
#include <stdlib.h>
-#include "gtk.h"
-#include "gdk-pixbuf.h"
+#include <gtk/gtk.h>
#include <math.h>
diff --git a/demos/testanimation.c b/demos/testanimation.c
index d3aeb7f286..dd2701719d 100644
--- a/demos/testanimation.c
+++ b/demos/testanimation.c
@@ -24,8 +24,7 @@
#include <unistd.h>
#include <string.h>
#include <gtk/gtk.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-loader.h"
+#include <gtk/gdk-pixbuf-loader.h>
typedef struct {
FILE *imagefile;
diff --git a/demos/testpixbuf-drawable.c b/demos/testpixbuf-drawable.c
index e8cfeae0dc..550550bf49 100644
--- a/demos/testpixbuf-drawable.c
+++ b/demos/testpixbuf-drawable.c
@@ -1,7 +1,6 @@
#include <config.h>
#include <gtk/gtk.h>
-#include "x11/gdkx.h"
-#include "gdk-pixbuf.h"
+#include <gdk/x11/gdkx.h>
int close_app(GtkWidget *widget, gpointer data)
{
diff --git a/demos/testpixbuf-scale.c b/demos/testpixbuf-scale.c
index 863c076bab..932d13cf4b 100644
--- a/demos/testpixbuf-scale.c
+++ b/demos/testpixbuf-scale.c
@@ -1,5 +1,4 @@
#include <gtk/gtk.h>
-#include "gdk-pixbuf.h"
#include <stdio.h>
diff --git a/demos/testpixbuf.c b/demos/testpixbuf.c
index cb1092c1ae..f4966fcba7 100644
--- a/demos/testpixbuf.c
+++ b/demos/testpixbuf.c
@@ -23,8 +23,7 @@
#include <unistd.h>
#include <string.h>
#include <gtk/gtk.h>
-#include "gdk-pixbuf.h"
-#include "gdk-pixbuf-loader.h"
+#include <gtk/gdk-pixbuf-loader.h>
typedef struct {
FILE *imagefile;
View Lorry Controller Status