From af0dc3431df2311725c2943fcb454fefe3d67026 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Mon, 19 Nov 2012 20:14:55 +0000 Subject: [PATCH] Fix spelling of _cogl_propagate_error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ‘Propagate’ was misspelled as ‘propogate’. Reviewed-by: Robert Bragg (cherry picked from commit 5fb4a6178c3e64371c01510690d9de1e8a740bde) --- cogl/cogl-auto-texture.c | 4 ++-- cogl/cogl-bitmap-pixbuf.c | 2 +- cogl/cogl-bitmap.c | 2 +- cogl/cogl-error-private.h | 4 ++-- cogl/cogl-error.c | 6 +++--- cogl/cogl-framebuffer.c | 2 +- cogl/driver/gl/cogl-buffer-gl.c | 2 +- cogl/driver/gl/gl/cogl-texture-driver-gl.c | 2 +- cogl/driver/gl/gles/cogl-texture-driver-gles.c | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cogl/cogl-auto-texture.c b/cogl/cogl-auto-texture.c index bcb338665..bcbb1d0c0 100644 --- a/cogl/cogl-auto-texture.c +++ b/cogl/cogl-auto-texture.c @@ -173,7 +173,7 @@ _cogl_texture_new_from_bitmap (CoglBitmap *bitmap, COGL_SYSTEM_ERROR, COGL_SYSTEM_ERROR_NO_MEMORY)) { - _cogl_propogate_error (error, internal_error); + _cogl_propagate_error (error, internal_error); return NULL; } @@ -194,7 +194,7 @@ _cogl_texture_new_from_bitmap (CoglBitmap *bitmap, COGL_SYSTEM_ERROR, COGL_SYSTEM_ERROR_NO_MEMORY)) { - _cogl_propogate_error (error, internal_error); + _cogl_propagate_error (error, internal_error); return NULL; } diff --git a/cogl/cogl-bitmap-pixbuf.c b/cogl/cogl-bitmap-pixbuf.c index 0af32b11d..855c997f3 100644 --- a/cogl/cogl-bitmap-pixbuf.c +++ b/cogl/cogl-bitmap-pixbuf.c @@ -194,7 +194,7 @@ _cogl_bitmap_from_file (CoglContext *ctx, pixbuf = gdk_pixbuf_new_from_file (filename, &glib_error); if (pixbuf == NULL) { - _cogl_propogate_gerror (error, glib_error); + _cogl_propagate_gerror (error, glib_error); return FALSE; } diff --git a/cogl/cogl-bitmap.c b/cogl/cogl-bitmap.c index 6dd0ffdac..269b5edea 100644 --- a/cogl/cogl-bitmap.c +++ b/cogl/cogl-bitmap.c @@ -484,7 +484,7 @@ _cogl_bitmap_gl_bind (CoglBitmap *bitmap, * if an exception was thrown */ if (internal_error) { - _cogl_propogate_error (error, internal_error); + _cogl_propagate_error (error, internal_error); return NULL; } diff --git a/cogl/cogl-error-private.h b/cogl/cogl-error-private.h index 8842c5dfc..31b2eabd8 100644 --- a/cogl/cogl-error-private.h +++ b/cogl/cogl-error-private.h @@ -40,11 +40,11 @@ _cogl_set_error_literal (CoglError **error, const char *message); void -_cogl_propogate_error (CoglError **dest, +_cogl_propagate_error (CoglError **dest, CoglError *src); void -_cogl_propogate_gerror (CoglError **dest, +_cogl_propagate_gerror (CoglError **dest, GError *src); #define _cogl_clear_error(X) g_clear_error ((GError **)X) diff --git a/cogl/cogl-error.c b/cogl/cogl-error.c index 78ad14cd3..4ef368164 100644 --- a/cogl/cogl-error.c +++ b/cogl/cogl-error.c @@ -99,7 +99,7 @@ _cogl_set_error_literal (CoglError **error, } void -_cogl_propogate_error (CoglError **dest, +_cogl_propagate_error (CoglError **dest, CoglError *src) { _COGL_RETURN_IF_FAIL (src != NULL); @@ -109,8 +109,8 @@ _cogl_propogate_error (CoglError **dest, } void -_cogl_propogate_gerror (CoglError **dest, +_cogl_propagate_gerror (CoglError **dest, GError *src) { - _cogl_propogate_error (dest, (CoglError *)src); + _cogl_propagate_error (dest, (CoglError *)src); } diff --git a/cogl/cogl-framebuffer.c b/cogl/cogl-framebuffer.c index 712ce1dee..7474084b5 100644 --- a/cogl/cogl-framebuffer.c +++ b/cogl/cogl-framebuffer.c @@ -1692,7 +1692,7 @@ _cogl_framebuffer_read_pixels_into_bitmap (CoglFramebuffer *framebuffer, if (internal_error) { cogl_object_unref (shared_bmp); - _cogl_propogate_error (error, internal_error); + _cogl_propagate_error (error, internal_error); goto EXIT; } diff --git a/cogl/driver/gl/cogl-buffer-gl.c b/cogl/driver/gl/cogl-buffer-gl.c index e9554375a..be4ac8855 100644 --- a/cogl/driver/gl/cogl-buffer-gl.c +++ b/cogl/driver/gl/cogl-buffer-gl.c @@ -353,7 +353,7 @@ _cogl_buffer_gl_set_data (CoglBuffer *buffer, */ if (internal_error) { - _cogl_propogate_error (error, internal_error); + _cogl_propagate_error (error, internal_error); return FALSE; } diff --git a/cogl/driver/gl/gl/cogl-texture-driver-gl.c b/cogl/driver/gl/gl/cogl-texture-driver-gl.c index c3ea683a2..905f58a2c 100644 --- a/cogl/driver/gl/gl/cogl-texture-driver-gl.c +++ b/cogl/driver/gl/gl/cogl-texture-driver-gl.c @@ -198,7 +198,7 @@ _cogl_texture_driver_upload_subregion_to_gl (CoglContext *ctx, * problems... */ if (internal_error) { - _cogl_propogate_error (error, internal_error); + _cogl_propagate_error (error, internal_error); return FALSE; } diff --git a/cogl/driver/gl/gles/cogl-texture-driver-gles.c b/cogl/driver/gl/gles/cogl-texture-driver-gles.c index 1490e2c1a..94e5222cb 100644 --- a/cogl/driver/gl/gles/cogl-texture-driver-gles.c +++ b/cogl/driver/gl/gles/cogl-texture-driver-gles.c @@ -244,7 +244,7 @@ _cogl_texture_driver_upload_subregion_to_gl (CoglContext *ctx, * problems... */ if (internal_error) { - _cogl_propogate_error (error, internal_error); + _cogl_propagate_error (error, internal_error); cogl_object_unref (slice_bmp); return FALSE; }