summaryrefslogtreecommitdiff
path: root/gdk-pixbuf
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2001-03-15 19:02:23 +0000
committerHavoc Pennington <hp@src.gnome.org>2001-03-15 19:02:23 +0000
commit872efdd9a527e472e5f2724138344fdef3839df4 (patch)
tree6bc28e0f5ea0b1108b26a10a42b798e1e3451263 /gdk-pixbuf
parent549537e6de0601117aa323006d1a9264fad1503d (diff)
downloadgdk-pixbuf-872efdd9a527e472e5f2724138344fdef3839df4.tar.gz
Delete.
2001-03-14 Havoc Pennington <hp@redhat.com> * gtk/gtkdata.h, gtk/gtkdata.c: Delete. * gtk/gtk.h: remove gtkdata.h * gtk/Makefile.am: remove gtkdata * gtk/gtktext.c (gtk_text_set_adjustments): connect to "destroy" not "disconnect" on the adjustments. * gtk/gtktooltips.h, gtk/gtktooltips.c: derive from GtkObject not GtkData * gtk/gtkadjustment.h, gtk/gtkadjustment.c: derive from GtkObject not GtkData * configure.in: handle case where X render exists, but Pango lacks Xft support. 2001-03-14 Havoc Pennington <hp@redhat.com> * Makefile.am (gdk-pixbuf-marshal.c): Use different temporary file from gdk-pixbuf-marshal.h, fixes parallel makes. 2001-03-14 Havoc Pennington <hp@redhat.com> * gtk/gtk-docs.sgml: remove gtkdata, gtktreemodelsimple * gtk/gtk.types: remove gtk_data_get_type
Diffstat (limited to 'gdk-pixbuf')
-rw-r--r--gdk-pixbuf/ChangeLog5
-rw-r--r--gdk-pixbuf/Makefile.am6
2 files changed, 8 insertions, 3 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 7068bacf5..5cf930a81 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-14 Havoc Pennington <hp@redhat.com>
+
+ * Makefile.am (gdk-pixbuf-marshal.c): Use different temporary file
+ from gdk-pixbuf-marshal.h, fixes parallel makes.
+
Thu Mar 1 04:01:57 2001 Tim Janik <timj@gtk.org>
* test-gdk-pixbuf.c: fixed includes.
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index b6ff3143b..f7c9390e7 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -241,6 +241,6 @@ gdk-pixbuf-marshal.h: gdk-pixbuf-marshal.list
gdk-pixbuf-marshal.c: gdk-pixbuf-marshal.list
cd $(srcdir) \
- && glib-genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >> xgen-gmh \
- && (cmp -s xgen-gmh gdk-pixbuf-marshal.c || cp xgen-gmh gdk-pixbuf-marshal.c) \
- && rm -f xgen-gmh xgen-gmh~
+ && glib-genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >> xgen-gmc \
+ && (cmp -s xgen-gmc gdk-pixbuf-marshal.c || cp xgen-gmc gdk-pixbuf-marshal.c) \
+ && rm -f xgen-gmc xgen-gmc~