[monkey-bubble: 490/753] change MAKE_INLINE_PIXBUF to GDK_PIXBUF_CSOURCE.



commit 3b4d07006326f868047ed987939c218df4e7bb58
Author: Anders Carlsson <andersca codefactory se>
Date:   Thu Jun 28 14:34:08 2001 +0000

    change MAKE_INLINE_PIXBUF to GDK_PIXBUF_CSOURCE.
    
    2001-06-28  Anders Carlsson  <andersca codefactory se>
    
    	* configure.in: change MAKE_INLINE_PIXBUF to
    	GDK_PIXBUF_CSOURCE.
    
    	* libgnomeui/gnome-stock-icons.c: (add_sized), (add_unsized): Change
    	gdk_pixbuf_new_from_inline to gdk_pixbuf_new_from_stream.
    	* libgnomeui/pixmaps/Makefile.am: change MAKE_INLINE_PIXBUF to GDK_PIXBUF_CSOURCE

 ChangeLog                      |    9 +++++++++
 configure.in                   |    6 +++---
 libgnomeui/gnome-stock-icons.c |    4 ++--
 libgnomeui/pixmaps/Makefile.am |    4 ++--
 4 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index abe4b0d..adf0455 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-06-28  Anders Carlsson  <andersca codefactory se>
+
+	* configure.in: change MAKE_INLINE_PIXBUF to 
+	GDK_PIXBUF_CSOURCE.
+	
+	* libgnomeui/gnome-stock-icons.c: (add_sized), (add_unsized): Change
+	gdk_pixbuf_new_from_inline to gdk_pixbuf_new_from_stream.
+	* libgnomeui/pixmaps/Makefile.am: change MAKE_INLINE_PIXBUF to GDK_PIXBUF_CSOURCE
+
 2001-06-26  Fatih Demir <kabalak gtranslator org>
 
 	* configure.in: Added ta to the languages list.
diff --git a/configure.in b/configure.in
index c9bf800..6b7190d 100644
--- a/configure.in
+++ b/configure.in
@@ -71,9 +71,9 @@ gnome-libs. You can download the latest version from ftp://people.redhat.com/sop
 AC_CHECK_HEADERS(dlfcn.h dl.h utmp.h locale.h mcheck.h unistd.h)
 
 dnl This is installed from GTK+ 2.0's gdk-pixbuf
-AC_PATH_PROG(MAKE_INLINE_PIXBUF, make-inline-pixbuf)
-test -z "$MAKE_INLINE_PIXBUF" && AC_MSG_ERROR([
-*** You need the make-inline-pixbuf tool which is installed
+AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource)
+test -z "$GDK_PIXBUF_CSOURCE" && AC_MSG_ERROR([
+*** You need the gdk-pixbuf-csource tool which is installed
 *** from GTK+ 2.0's gdk-pixbuf.
 ***
 *** Either the location where you installed your GTK+ 2.0 is
diff --git a/libgnomeui/gnome-stock-icons.c b/libgnomeui/gnome-stock-icons.c
index d85b6b3..9f1fac9 100644
--- a/libgnomeui/gnome-stock-icons.c
+++ b/libgnomeui/gnome-stock-icons.c
@@ -46,7 +46,7 @@ add_sized (GtkIconFactory *factory,
     GtkIconSource *source;
     GdkPixbuf *pixbuf;
 
-    pixbuf = gdk_pixbuf_new_from_inline (inline_data, FALSE, -1, NULL);
+    pixbuf = gdk_pixbuf_new_from_stream (-1, inline_data, FALSE, NULL);
 
     source = gtk_icon_source_new ();
     gtk_icon_source_set_pixbuf (source, pixbuf);
@@ -71,7 +71,7 @@ add_unsized (GtkIconFactory *factory,
     GtkIconSource *source;
     GdkPixbuf *pixbuf;
 
-    pixbuf = gdk_pixbuf_new_from_inline (inline_data, FALSE, -1, NULL);
+    pixbuf = gdk_pixbuf_new_from_stream (-1, inline_data, FALSE, NULL);
 
     source = gtk_icon_source_new ();
     gtk_icon_source_set_pixbuf (source, pixbuf);
diff --git a/libgnomeui/pixmaps/Makefile.am b/libgnomeui/pixmaps/Makefile.am
index 616409f..c723f86 100644
--- a/libgnomeui/pixmaps/Makefile.am
+++ b/libgnomeui/pixmaps/Makefile.am
@@ -100,7 +100,7 @@ BUILT_SOURCES = gnome-stock-pixbufs.h
 
 CLEANFILES = $(BUILT_SOURCES)
 
-gnome-stock-pixbufs.h: @MAKE_INLINE_PIXBUF@ $(stock_images)
+gnome-stock-pixbufs.h: @GDK_PIXBUF_CSOURCE@ $(stock_images)
 	-rm -f gnome-stock-pixbufs.h
-	vars=`echo "$(stock_images)" | sed -e 's,stock_\([^\.]*\)\.png,stock_\1 $(srcdir)/stock_\1.png,g'`; @MAKE_INLINE_PIXBUF@ pixbufs-tmp $$vars && cat $(srcdir)/copyright.txt pixbufs-tmp > gnome-stock-pixbufs.h
+	vars=`echo "$(stock_images)" | sed -e 's,stock_\([^\.]*\)\.png,stock_\1 $(srcdir)/stock_\1.png,g'`; @GDK_PIXBUF_CSOURCE@ --build-list $$vars > pixbufs-tmp && cat $(srcdir)/copyright.txt pixbufs-tmp > gnome-stock-pixbufs.h
 	-rm -f pixbufs-tmp
\ No newline at end of file



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]