Add built marshaller files to support GdkPixbufLoader signals

2001-01-22  Havoc Pennington  <hp@redhat.com>

	* Makefile.am: Add built marshaller files to support
	GdkPixbufLoader signals

	* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
	GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
	module location, rather than acting as a fallback, because we are
	using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.

	* gdk-pixbuf.h: include gdk-pixbuf-loader.h

        * gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
	from gtk, and add error to close(), because stop_load may do
	parsing of the image.

	* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file

        * io-*.c: make individual operations static, and add fill_vtable
	functions which are exported. Fix the collection of type warnings
	that surfaced, including a number of functions that didn't
	properly take a GError and some that weren't
	const-correct. Involved adding error handling for a few loaders.

	* gdk-pixbuf-io.h: Add error reporting to stop_load function

	* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
	a function that fills in the GdkPixbufModule vtable, instead of
	looking up all the image functions individually; this means we
	can get type safety within modules for the loader functions.
	Also it means you don't have to keep the statically compiled and
	GModule versions in sync.

	* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()

	* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()

	* gdk-pixbuf.h: nuke gdk_pixbuf_init()

	* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
	() here

	* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here

	* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
	g_type_init() here


2001-01-22  Havoc Pennington  <hp@redhat.com>

	* demos/testanimation.c: fix to reflect gdk-pixbuf changes

	* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes

	* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
	Remove, move back to gdk-pixbuf

	* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
	to all the word functions

	* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
	before doing anything on NULL layout or if we don't have the focus

	* gtk/testtext.c (fill_example_buffer): "justification"

	* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
	to be called "justification" not "justify"

	* demos/gtk-demo/textview.c (create_tags): "justification"

	* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping

1 files changed, 27 insertions, 10 deletions

diff --git a/gdk-pixbuf/io-gif.c b/gdk-pixbuf/io-gif.c
index e61f41fb87..5be68023fc 100644
--- a/gdk-pixbuf/io-gif.c
+++ b/gdk-pixbuf/io-gif.c
@@ -135,7 +135,7 @@ struct _GifContext
 	ModuleFrameDoneNotifyFunc frame_done_func;
 	ModuleAnimationDoneNotifyFunc anim_done_func;
 	gpointer user_data;
-	guchar *buf;
+        guchar *buf;
 	guint ptr;
 	guint size;
 	guint amount_needed;
@@ -1125,7 +1125,7 @@ new_context (void)
 	return context;
 }
 /* Shared library entry point */
-GdkPixbuf *
+static GdkPixbuf *
 gdk_pixbuf__gif_image_load (FILE *file, GError **error)
 {
 	GifContext *context;
@@ -1145,7 +1145,7 @@ gdk_pixbuf__gif_image_load (FILE *file, GError **error)
 	return pixbuf;
 }
 
-gpointer
+static gpointer
 gdk_pixbuf__gif_image_begin_load (ModulePreparedNotifyFunc prepare_func,
 				  ModuleUpdatedNotifyFunc update_func,
 				  ModuleFrameDoneNotifyFunc frame_done_func,
@@ -1169,23 +1169,30 @@ gdk_pixbuf__gif_image_begin_load (ModulePreparedNotifyFunc prepare_func,
 	return (gpointer) context;
 }
 
-void
-gdk_pixbuf__gif_image_stop_load (gpointer data)
+static gboolean
+gdk_pixbuf__gif_image_stop_load (gpointer data, GError **error)
 {
 	GifContext *context = (GifContext *) data;
 
 	/* FIXME: free the animation data */
-
+        
+        /* FIXME this thing needs to report errors if
+         * we have unused image data
+         */
+        
 	if (context->pixbuf)
 		gdk_pixbuf_unref (context->pixbuf);
 	if (context->animation)
 		gdk_pixbuf_animation_unref (context->animation);
 /*  	g_free (context->buf);*/
 	g_free (context);
+
+        return TRUE;
 }
 
-gboolean
-gdk_pixbuf__gif_image_load_increment (gpointer data, guchar *buf, guint size,
+static gboolean
+gdk_pixbuf__gif_image_load_increment (gpointer data,
+                                      const guchar *buf, guint size,
                                       GError **error)
 {
 	gint retval;
@@ -1197,7 +1204,7 @@ gdk_pixbuf__gif_image_load_increment (gpointer data, guchar *buf, guint size,
 		/* we aren't looking for some bytes. */
 		/* we can use buf now, but we don't want to keep it around at all.
 		 * it will be gone by the end of the call. */
-		context->buf = buf;
+		context->buf = (guchar*) buf; /* very dubious const cast */
 		context->ptr = 0;
 		context->size = size;
 	} else {
@@ -1245,7 +1252,7 @@ gdk_pixbuf__gif_image_load_increment (gpointer data, guchar *buf, guint size,
 	return TRUE;
 }
 
-GdkPixbufAnimation *
+static GdkPixbufAnimation *
 gdk_pixbuf__gif_image_load_animation (FILE *file,
                                       GError **error)
 {
@@ -1272,3 +1279,13 @@ gdk_pixbuf__gif_image_load_animation (FILE *file,
 	g_free (context);
 	return animation;
 }
+
+void
+gdk_pixbuf__gif_fill_vtable (GdkPixbufModule *module)
+{
+  module->load = gdk_pixbuf__gif_image_load;
+  module->begin_load = gdk_pixbuf__gif_image_begin_load;
+  module->stop_load = gdk_pixbuf__gif_image_stop_load;
+  module->load_increment = gdk_pixbuf__gif_image_load_increment;
+  module->load_animation = gdk_pixbuf__gif_image_load_animation;
+}