[monkey-bubble: 491/753] remove gtk_rc_set_image_loader (libgnomeui_pixbuf_image_loader): kill. [

[Sven Herzberg <herzi src gnome org>]

commit 0a620c274e3a594d0e1252006aa778ed781a514a
Author: Michael Meeks <michael ximian com>
Date:   Thu Jun 28 14:47:35 2001 +0000

    remove gtk_rc_set_image_loader (libgnomeui_pixbuf_image_loader): kill. [
    
    2001-06-28  Michael Meeks  <michael ximian com>
    
    	* gnome-init.c (libgnomeui_post_args_parse): remove
    	gtk_rc_set_image_loader
    	(libgnomeui_pixbuf_image_loader): kill.
    	[ thanks to: Carlos Perelló Marín <carlos gnome-db org> ]
    	(libgnomeui_rc_parse): remove gtk_rc_init.
    
    	* pixmaps/Makefile.am (gnome-stock-pixbufs.h): update the stock
    	pixbuf building code.
    
    	* gnome-stock-icons.c (add_sized): use gdk_pixbuf_new_from_stream,
    	a randomly re-named and re-signatured method: great.
    	(add_unsized): ditto.

 libgnomeui/ChangeLog           |   15 ++++++++++++
 libgnomeui/gnome-stock-icons.h |    2 +-
 libgnomeui/gnome-ui-init.c     |   47 +++------------------------------------
 libgnomeui/pixmaps/Makefile.am |    6 +++-
 4 files changed, 24 insertions(+), 46 deletions(-)
---
diff --git a/libgnomeui/ChangeLog b/libgnomeui/ChangeLog
index 38620bb..9d1613b 100644
--- a/libgnomeui/ChangeLog
+++ b/libgnomeui/ChangeLog
@@ -1,3 +1,18 @@
+2001-06-28  Michael Meeks  <michael ximian com>
+
+	* gnome-init.c (libgnomeui_post_args_parse): remove
+	gtk_rc_set_image_loader
+	(libgnomeui_pixbuf_image_loader): kill.
+	[ thanks to: Carlos Perelló Marín <carlos gnome-db org> ]
+	(libgnomeui_rc_parse): remove gtk_rc_init.
+
+	* pixmaps/Makefile.am (gnome-stock-pixbufs.h): update the stock
+	pixbuf building code.
+
+	* gnome-stock-icons.c (add_sized): use gdk_pixbuf_new_from_stream,
+	a randomly re-named and re-signatured method: great.
+	(add_unsized): ditto.
+
 2001-06-21  Mark Murnane  <Mark Murnane Sun com>
 
 	* Changes made during 64-bit cleaning.
diff --git a/libgnomeui/gnome-stock-icons.h b/libgnomeui/gnome-stock-icons.h
index d33a79a..70a4732 100644
--- a/libgnomeui/gnome-stock-icons.h
+++ b/libgnomeui/gnome-stock-icons.h
@@ -26,7 +26,7 @@
 #ifndef __GNOME_STOCK_ICONS_H__
 #define __GNOME_STOCK_ICONS_H__
 
-#include <gmacros.h>
+#include <glib/gmacros.h>
 #include <gtk/gtkiconfactory.h>
 
 G_BEGIN_DECLS
diff --git a/libgnomeui/gnome-ui-init.c b/libgnomeui/gnome-ui-init.c
index a286c82..461d539 100644
--- a/libgnomeui/gnome-ui-init.c
+++ b/libgnomeui/gnome-ui-init.c
@@ -108,11 +108,6 @@ static void libgnomeui_instance_init(GnomeProgram *program, GnomeModuleInfo *mod
 static void libgnomeui_pre_args_parse(GnomeProgram *app, GnomeModuleInfo *mod_info);
 static void libgnomeui_post_args_parse(GnomeProgram *app, GnomeModuleInfo *mod_info);
 static void libgnomeui_rc_parse (gchar *command);
-static GdkPixmap *libgnomeui_pixbuf_image_loader(GdkWindow   *window,
-                                                 GdkColormap *colormap,
-                                                 GdkBitmap  **mask,
-                                                 GdkColor    *transparent_color,
-                                                 const char *filename);
 static void libgnomeui_segv_setup(gboolean post_arg_parse);
 
 static GnomeModuleRequirement libgnomeui_requirements[] = {
@@ -315,7 +310,7 @@ libgnomeui_post_args_parse(GnomeProgram *program, GnomeModuleInfo *mod_info)
         GnomeProgramPrivate_libgnomeui *priv = g_new0(GnomeProgramPrivate_libgnomeui, 1);
 
         gnome_type_init();
-        gtk_rc_set_image_loader(libgnomeui_pixbuf_image_loader);
+#warning FIXME: here... gtk_rc ...
         libgnomeui_rc_parse(program_invocation_name);
 
         libgnomeui_segv_setup(TRUE);
@@ -424,44 +419,10 @@ libgnomeui_rc_parse (gchar *command)
 		g_free (file);
 	}
 
+#warning gtk_rc_init removed, is this correct ?
+/*
 	gtk_rc_init ();
-}
-
-static GdkPixmap *
-libgnomeui_pixbuf_image_loader(GdkWindow   *window,
-                               GdkColormap *colormap,
-                               GdkBitmap  **maskp,
-                               GdkColor    *transparent_color,
-                               const char *filename)
-{
-	GdkPixmap *retval = NULL;
-        GdkBitmap *mask = NULL;
-        GdkPixbuf *pixbuf;
-        GError *error;
-
-        /* FIXME we are ignoring colormap and transparent color */
-        
-        error = NULL;
-        pixbuf = gdk_pixbuf_new_from_file(filename, &error);
-        if (error != NULL) {
-                g_warning (G_STRLOC ": cannot load %s: %s", filename,
-                           error->message);
-                g_error_free (error);
-        }
-
-        if (pixbuf == NULL)
-                return NULL;
-
-        gdk_pixbuf_render_pixmap_and_mask(pixbuf, &retval, &mask, 128);
-
-        gdk_pixbuf_unref(pixbuf);
-        
-        if (maskp)
-                *maskp = mask;
-        else
-                gdk_bitmap_unref(mask);
-
-        return retval;
+*/
 }
 
 /* crash handler */
diff --git a/libgnomeui/pixmaps/Makefile.am b/libgnomeui/pixmaps/Makefile.am
index c723f86..dd5767a 100644
--- a/libgnomeui/pixmaps/Makefile.am
+++ b/libgnomeui/pixmaps/Makefile.am
@@ -102,5 +102,7 @@ CLEANFILES = $(BUILT_SOURCES)
 
 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'`; @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
+	var=`echo "$(stock_images)" | sed -e 's,stock_\([^\.]*\)\.png,stock_\1 $(srcdir)/stock_\1.png,g'` ; \
+	   @MAKE_INLINE_PIXBUF@ --raw --build-list $$var > pixbufs-tmp && \
+	   cat $(srcdir)/copyright.txt pixbufs-tmp > gnome-stock-pixbufs.h
+	-rm -f pixbufs-tmp