From e5a153df955bd51c2fa2bf78d6f64db0494ea2b0 Mon Sep 17 00:00:00 2001 From: Richard Kinder Date: Mon, 24 Mar 2003 02:31:30 +0000 Subject: [PATCH] Fix for #108788 - GError set to FALSE rather than NULL. --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ demos/testpixbuf.c | 6 +++--- 6 files changed, 23 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e85e1a15dc..8009117c00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-03-20 Richard Kinder + * demos/testpixbuf.c (update_timeout): set error to NULL, not FALSE. + Fixes bug #108778. + 2003-03-20 Guntupalli Karunakar * configure.in: Added "ml" in ALL_LINGUAS diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e85e1a15dc..8009117c00 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2003-03-20 Richard Kinder + * demos/testpixbuf.c (update_timeout): set error to NULL, not FALSE. + Fixes bug #108778. + 2003-03-20 Guntupalli Karunakar * configure.in: Added "ml" in ALL_LINGUAS diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e85e1a15dc..8009117c00 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +2003-03-20 Richard Kinder + * demos/testpixbuf.c (update_timeout): set error to NULL, not FALSE. + Fixes bug #108778. + 2003-03-20 Guntupalli Karunakar * configure.in: Added "ml" in ALL_LINGUAS diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e85e1a15dc..8009117c00 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2003-03-20 Richard Kinder + * demos/testpixbuf.c (update_timeout): set error to NULL, not FALSE. + Fixes bug #108778. + 2003-03-20 Guntupalli Karunakar * configure.in: Added "ml" in ALL_LINGUAS diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e85e1a15dc..8009117c00 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2003-03-20 Richard Kinder + * demos/testpixbuf.c (update_timeout): set error to NULL, not FALSE. + Fixes bug #108778. + 2003-03-20 Guntupalli Karunakar * configure.in: Added "ml" in ALL_LINGUAS diff --git a/demos/testpixbuf.c b/demos/testpixbuf.c index a40d3b202d..4088e344f3 100644 --- a/demos/testpixbuf.c +++ b/demos/testpixbuf.c @@ -439,7 +439,8 @@ update_timeout (gpointer data) GError *error; done = FALSE; - error = FALSE; + error = NULL; + if (!feof (status->imagefile)) { gint nbytes; @@ -447,7 +448,6 @@ update_timeout (gpointer data) status->imagefile); - error = NULL; if (!gdk_pixbuf_loader_write (GDK_PIXBUF_LOADER (status->loader), status->buf, nbytes, &error)) { g_warning ("Error writing to loader: %s", error->message); @@ -458,7 +458,7 @@ update_timeout (gpointer data) } else - done = TRUE; + done = TRUE; if (done) { /* ignoring errors, we should not do that. */