diff options
| author | Havoc Pennington <hp@redhat.com> | 2001-01-22 23:09:48 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-01-22 23:09:48 +0000 |
| commit | e0fee22e7885f465370c184c7e02d542ec16b177 (patch) | |
| tree | aeb869be43858272ae128529c043bf33abfee41b /gdk-pixbuf/gdk-pixbuf.c | |
| parent | a081fe7d541c670d9017f60f3b9dd1b93affe9f5 (diff) | |
| download | gdk-pixbuf-e0fee22e7885f465370c184c7e02d542ec16b177.tar.gz | |
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
Diffstat (limited to 'gdk-pixbuf/gdk-pixbuf.c')
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c index b2e3f5396..56d364cf4 100644 --- a/gdk-pixbuf/gdk-pixbuf.c +++ b/gdk-pixbuf/gdk-pixbuf.c @@ -54,6 +54,8 @@ gdk_pixbuf_get_type (void) (GInstanceInitFunc) NULL, }; + g_type_init (); + object_type = g_type_register_static (G_TYPE_OBJECT, "GdkPixbuf", &object_info, 0); @@ -398,24 +400,6 @@ const guint gdk_pixbuf_micro_version = GDK_PIXBUF_MICRO; const char *gdk_pixbuf_version = GDK_PIXBUF_VERSION; -void -gdk_pixbuf_preinit (gpointer app, gpointer modinfo) -{ - g_type_init (); -} - -void -gdk_pixbuf_postinit (gpointer app, gpointer modinfo) -{ -} - -void -gdk_pixbuf_init (void) -{ - gdk_pixbuf_preinit (NULL, NULL); - gdk_pixbuf_postinit (NULL, NULL); -} - /* Error quark */ GQuark gdk_pixbuf_error_quark (void) @@ -426,3 +410,7 @@ gdk_pixbuf_error_quark (void) return q; } + +/* Include the marshallers */ +#include <gobject/gvaluetypes.h> +#include "gdk-pixbuf-marshal.c" |