From 33e0b6e428e6377658965def2f09eae17594af84 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Tue, 26 Jun 2001 20:57:27 +0000 Subject: [PATCH] use gdk_pixbuf_new_from_stream(). fixed up item factory so inlined pixbufs Tue Jun 26 10:04:30 2001 Tim Janik * gtk/gtkiconfactory.c: * gtk/gtkitemfactory.c: use gdk_pixbuf_new_from_stream(). fixed up item factory so inlined pixbufs actually work. --- gtk/stock-icons/Makefile.am | 4 ++-- tests/testgtk.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am index 22f1234cc9..3ea1084ce6 100644 --- a/gtk/stock-icons/Makefile.am +++ b/gtk/stock-icons/Makefile.am @@ -154,8 +154,8 @@ CLEANFILES += $(noinst_DATA) pixbuf_dir = $(top_builddir)/gdk-pixbuf -gtkstockpixbufs.h: $(pixbuf_dir)/make-inline-pixbuf $(IMAGES) +gtkstockpixbufs.h: $(pixbuf_dir)/gdk-pixbuf-csource $(IMAGES) GDK_PIXBUF_MODULEDIR=$(pixbuf_dir)/.libs \ - $(pixbuf_dir)/make-inline-pixbuf $(srcdir)/gtkstockpixbufs.h $(VARIABLES) + $(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES) >$(srcdir)/gtkstockpixbufs.h EXTRA_DIST = $(IMAGES) diff --git a/tests/testgtk.c b/tests/testgtk.c index 00aacddafe..91678f469a 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -3101,7 +3101,7 @@ static GtkItemFactoryEntry menu_items[] = { "/_Preferences/Shape/_Oval", NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Rectangle" }, { "/_Preferences/Shape/_Rectangle", NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Square" }, { "/_Preferences/Shape/_Oval", NULL, gtk_ifactory_cb, 0, "/Preferences/Shape/Rectangle" }, - { "/_Preferences/Shape/_Image", NULL, gtk_ifactory_cb, 0, "", (gchar**) apple, sizeof(apple) }, + { "/_Preferences/Shape/_Image", NULL, gtk_ifactory_cb, 0, "", apple }, /* For testing deletion of menus */ { "/_Preferences/Should_NotAppear", NULL, 0, 0, "" },