From 7a4c68938789206bfec3c6d15cc4bb922daf6443 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Wed, 18 Oct 2000 18:42:54 +0000 Subject: Some updates 2000-10-18 Havoc Pennington * gtk/gtk-sections.txt: Some updates * gdk/gdk-sections.txt: remove GdkPixbufAlphaMode * gdk-pixbuf/gdk-pixbuf-sections.txt: Add new API, remove GdkPixbufClass/GdkAnimationClass since those are private * gdk-pixbuf/Makefile.am (IGNORE_HFILES): ignore more headers 2000-10-18 Havoc Pennington * gtk/gtktextiter.c (gtk_text_iter_forward_to_newline): Fix a bug where any number of empty lines would get skipped * gtk/gtktextiter.h: Remove padding from GtkTextIter; live on the edge. * gtk/gtktextiter.c (gtk_text_iter_make_surreal): enhance the warning about invalid iterators (explain more thoroughly) (gtk_text_iter_in_region): rename gtk_text_iter_in_range * gtk/gtktextview.c (FOCUS_EDGE_WIDTH): Make focus rectangle less big * demos/*.c: Add error handling * gtk/gtktextbuffer.c: don't modify const iterators * gtk/gdk-pixbuf-loader.c: Add full error handling here * gtk/gtkimage.c (gtk_image_set_from_file): ignore errors on file load * gtk/gtkiconfactory.c: Update to reflect addition of error handling to gdk-pixbuf loaders 2000-10-16 Havoc Pennington * gdk-pixbuf-io.c (gdk_pixbuf_get_module) (gdk_pixbuf_get_named_module) (gdk_pixbuf_load_module): add error reporting here also * make-inline-pixbuf.c (main): use GError * io-xpm.c: include unistd.h * gdk-pixbuf-util.c: include string.h * io-*.c: add error reporting * gdk-pixbuf-animation.c (gdk_pixbuf_animation_new_from_file): add error reporting * gdk-pixbuf-io.c (gdk_pixbuf_new_from_file): Add error reporting * gdk-pixbuf-io.h: Add GError** to load_increment and load methods * gdk-pixbuf-io.c (gdk_pixbuf_save) (gdk_pixbuf_savev): return a G_FILE_ERROR if we fail to write or close the file. * gdk-pixbuf.h: remove GDK_PIXBUF_ERROR_IO, instead we'll use G_FILE_ERROR_*. Rename enum to GdkPixbufError, properly following the GError naming rules. Add GError** to load functions. --- demos/pixbuf-demo.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'demos/pixbuf-demo.c') diff --git a/demos/pixbuf-demo.c b/demos/pixbuf-demo.c index 528101d3e4..ae9a0998e2 100644 --- a/demos/pixbuf-demo.c +++ b/demos/pixbuf-demo.c @@ -65,7 +65,11 @@ load_pixbufs (void) { int i; - background = gdk_pixbuf_new_from_file (BACKGROUND_NAME); + /* We pass NULL for the error return location, we don't care + * about the error message. + */ + + background = gdk_pixbuf_new_from_file (BACKGROUND_NAME, NULL); if (!background) return FALSE; @@ -73,7 +77,7 @@ load_pixbufs (void) back_height = gdk_pixbuf_get_height (background); for (i = 0; i < N_IMAGES; i++) { - images[i] = gdk_pixbuf_new_from_file (image_names[i]); + images[i] = gdk_pixbuf_new_from_file (image_names[i], NULL); if (!images[i]) return FALSE; } -- cgit v1.2.1