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

3 files changed, 30 insertions, 26 deletions

diff --git a/demos/gtk-demo/textview.c b/demos/gtk-demo/textview.c
index 6a925fd4c0..4ea37c3824 100644
--- a/demos/gtk-demo/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -119,10 +119,10 @@ create_tags (GtkTextBuffer *buffer)
   g_object_set (G_OBJECT (tag), "wrap_mode", GTK_WRAPMODE_NONE, NULL);
   
   tag = gtk_text_buffer_create_tag (buffer, "center");
-  g_object_set (G_OBJECT (tag), "justify", GTK_JUSTIFY_CENTER, NULL);
+  g_object_set (G_OBJECT (tag), "justification", GTK_JUSTIFY_CENTER, NULL);
 
   tag = gtk_text_buffer_create_tag (buffer, "right_justify");
-  g_object_set (G_OBJECT (tag), "justify", GTK_JUSTIFY_RIGHT, NULL);
+  g_object_set (G_OBJECT (tag), "justification", GTK_JUSTIFY_RIGHT, NULL);
 
   tag = gtk_text_buffer_create_tag (buffer, "wide_margins");
   g_object_set (G_OBJECT (tag),
diff --git a/demos/testanimation.c b/demos/testanimation.c
index fcfbde739f..0095ebfa0a 100644
--- a/demos/testanimation.c
+++ b/demos/testanimation.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <gtk/gtk.h>
-#include <gtk/gdk-pixbuf-loader.h>
+#include <gdk-pixbuf/gdk-pixbuf-loader.h>
 
 typedef struct {
 	FILE             *imagefile;
@@ -322,7 +322,7 @@ update_timeout(gpointer data)
 	if (done) {
                 gtk_widget_queue_draw(*status->rgbwin);
 		gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (status->loader));
-		gtk_object_destroy (GTK_OBJECT(status->loader));
+		g_object_destroy (G_OBJECT(status->loader));
 		fclose (status->imagefile);
 		g_free (status->buf);
 	}
@@ -330,7 +330,6 @@ update_timeout(gpointer data)
 	return !done;
 }
 
-
 static void
 progressive_prepared_callback(GdkPixbufLoader* loader, gpointer data)
 {
@@ -459,15 +458,17 @@ main (int argc, char **argv)
 			status.rgbwin = &rgb_window;
 
 			status.buf = g_malloc (readlen);
-                        gtk_signal_connect(GTK_OBJECT(pixbuf_loader),
-                                           "area_prepared",
-                                           GTK_SIGNAL_FUNC(progressive_prepared_callback),
-                                           &rgb_window);
-
-                        gtk_signal_connect(GTK_OBJECT(pixbuf_loader),
-                                           "area_updated",
-                                           GTK_SIGNAL_FUNC(progressive_updated_callback),
-                                           &rgb_window);
+                        g_signal_connect_data(G_OBJECT(pixbuf_loader),
+                                              "area_prepared",
+                                              GTK_SIGNAL_FUNC(progressive_prepared_callback),
+                                              &rgb_window,
+                                              NULL, FALSE, FALSE);
+
+                        g_signal_connect_data(G_OBJECT(pixbuf_loader),
+                                              "area_updated",
+                                              GTK_SIGNAL_FUNC(progressive_updated_callback),
+                                              &rgb_window,
+                                              NULL, FALSE, FALSE);
 
 			
                         status.imagefile = fopen (argv[1], "r");
diff --git a/demos/testpixbuf.c b/demos/testpixbuf.c
index fac01f6b87..8a5d8f2ddc 100644
--- a/demos/testpixbuf.c
+++ b/demos/testpixbuf.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <gtk/gtk.h>
-#include <gtk/gdk-pixbuf-loader.h>
+#include <gdk-pixbuf/gdk-pixbuf-loader.h>
 
 #include "test-inline-pixbufs.h"
 
@@ -459,8 +459,9 @@ update_timeout(gpointer data)
 
 	if (done) {
                 gtk_widget_queue_draw(*status->rgbwin);
-		gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (status->loader));
-		gtk_object_destroy (GTK_OBJECT(status->loader));
+                /* ignoring errors, we should not do that. */
+		gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (status->loader), NULL);
+		g_object_unref (G_OBJECT(status->loader));
 		fclose (status->imagefile);
 		g_free (status->buf);
 	}
@@ -596,15 +597,17 @@ main (int argc, char **argv)
 			status.rgbwin = &rgb_window;
 
 			status.buf = g_malloc (readlen);
-                        gtk_signal_connect(GTK_OBJECT(pixbuf_loader),
-                                           "area_prepared",
-                                           GTK_SIGNAL_FUNC(progressive_prepared_callback),
-                                           &rgb_window);
-
-                        gtk_signal_connect(GTK_OBJECT(pixbuf_loader),
-                                           "area_updated",
-                                           GTK_SIGNAL_FUNC(progressive_updated_callback),
-                                           &rgb_window);
+                        g_signal_connect_data (G_OBJECT(pixbuf_loader),
+                                               "area_prepared",
+                                               GTK_SIGNAL_FUNC(progressive_prepared_callback),
+                                               &rgb_window,
+                                               NULL, FALSE, FALSE);
+
+                        g_signal_connect_data (G_OBJECT(pixbuf_loader),
+                                               "area_updated",
+                                               GTK_SIGNAL_FUNC(progressive_updated_callback),
+                                               &rgb_window,
+                                               NULL, FALSE, FALSE);
 
 			
                         status.imagefile = fopen (argv[1], "r");