diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2004-08-25 16:21:15 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-08-25 16:21:15 +0000 |
| commit | 17cf070553a025e0dac3206d7019ff52a9a2e8fb (patch) | |
| tree | 53e8390aee31df5b72b831fe28126e9fb9b4b48e /gdk-pixbuf | |
| parent | f1d9c777fab3688a9f832669a6cdfb3c443d3573 (diff) | |
| download | gtk+-17cf070553a025e0dac3206d7019ff52a9a2e8fb.tar.gz | |
2.5.2GTK_2_5_2
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 14 | ||||
| -rw-r--r-- | gdk-pixbuf/Makefile.am | 6 | ||||
| -rwxr-xr-x | gdk-pixbuf/abicheck.sh | 4 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-loader.c | 8 |
4 files changed, 23 insertions, 9 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 1f7c230885..7725c302c3 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,17 @@ +2004-08-25 Matthias Clasen <mclasen@redhat.com> + + * === Released 2.5.2 === + + * abicheck.sh: Make work in make distcheck. + +2004-08-25 Matthias Clasen <mclasen@redhat.com> + + * Makefile.am: Use the same prefix when creating + gdk-pixbuf-marshal.c and gdk-pixbuf-marshal.h + + * gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init): _-prefix + the marshalers. + 2004-08-24 Matthias Clasen <mclasen@redhat.com> * gdk-pixbuf-loader.c (gdk_pixbuf_loader_new_with_mime_type): Use diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 9c370f6328..0ad415ebbe 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -40,10 +40,10 @@ uninstall-ms-lib: endif gdk_pixbuf.def: gdk-pixbuf.symbols - (echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES gdk-pixbuf.symbols | sed -e '/^$$/d' -e 's/^/\t/') > gdk_pixbuf.def + (echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES $(srcdir)/gdk-pixbuf.symbols | sed -e '/^$$/d' -e 's/^/\t/') > gdk_pixbuf.def gdk-pixbuf-alias.h: gdk-pixbuf.symbols - ./makegdkpixbufalias.pl < gdk-pixbuf.symbols > gdk-pixbuf-alias.h + ./makegdkpixbufalias.pl < $(srcdir)/gdk-pixbuf.symbols > gdk-pixbuf-alias.h if OS_UNIX TESTS = abicheck.sh @@ -404,7 +404,7 @@ MAINTAINERCLEANFILES += stamp-gdk-pixbuf-marshal.h # gdk-pixbuf-marshal.c # $(srcdir)/gdk-pixbuf-marshal.c: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list - (echo -e "#include \"gdk-pixbuf-alias.h\"" | $(GLIB_GENMARSHAL) --prefix=gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --body ) >> xgen-gmc \ + (echo -e "#include \"gdk-pixbuf-alias.h\"" | $(GLIB_GENMARSHAL) --prefix=_gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --body ) >> xgen-gmc \ && cp xgen-gmc gdk-pixbuf-marshal.c \ && rm -f xgen-gmc xgen-gmc~ diff --git a/gdk-pixbuf/abicheck.sh b/gdk-pixbuf/abicheck.sh index 041677276f..5932bb84bc 100755 --- a/gdk-pixbuf/abicheck.sh +++ b/gdk-pixbuf/abicheck.sh @@ -1,5 +1,5 @@ #! /bin/sh -cpp -P gdk-pixbuf.symbols | sed -e '/^$/d' | sort > expected-abi +cpp -P ${srcdir:-.}/gdk-pixbuf.symbols | sed -e '/^$/d' | sort > expected-abi nm -D .libs/libgdk_pixbuf-2.0.so | grep " T " | cut -c12- | sort > actual-abi -diff -u expected-abi actual-abi +diff -u expected-abi actual-abi && rm expected-abi actual-abi diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c index 024c2be2b1..b5c53d6035 100644 --- a/gdk-pixbuf/gdk-pixbuf-loader.c +++ b/gdk-pixbuf/gdk-pixbuf-loader.c @@ -135,7 +135,7 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GdkPixbufLoaderClass, size_prepared), NULL, NULL, - gdk_pixbuf_marshal_VOID__INT_INT, + _gdk_pixbuf_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); @@ -155,7 +155,7 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GdkPixbufLoaderClass, area_prepared), NULL, NULL, - gdk_pixbuf_marshal_VOID__VOID, + _gdk_pixbuf_marshal_VOID__VOID, G_TYPE_NONE, 0); /** @@ -178,7 +178,7 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GdkPixbufLoaderClass, area_updated), NULL, NULL, - gdk_pixbuf_marshal_VOID__INT_INT_INT_INT, + _gdk_pixbuf_marshal_VOID__INT_INT_INT_INT, G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_INT, @@ -200,7 +200,7 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GdkPixbufLoaderClass, closed), NULL, NULL, - gdk_pixbuf_marshal_VOID__VOID, + _gdk_pixbuf_marshal_VOID__VOID, G_TYPE_NONE, 0); } |