This looks good to me:<div> </div><div>Reviewed-by: Robert Bragg <<a href="mailto:robert@linux.intel.com">robert@linux.intel.com</a>></div><div> </div><div>thanks,</div><div>- Robert</div><div class="gmail_extra"> <div class="gmail_quote">On Mon, Nov 19, 2012 at 8:14 PM, Neil Roberts <<a href="mailto:neil@linux.intel.com" target="_blank">neil@linux.intel.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> ‘Propagate’ was misspelled as ‘propogate’. --- 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 824a8db..e276425 100644 --- a/cogl/cogl-auto-texture.c +++ b/cogl/cogl-auto-texture.c @@ -148,7 +148,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; } @@ -169,7 +169,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 0af32b1..855c997 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 fa7f711..6ae27db 100644 --- a/cogl/cogl-bitmap.c +++ b/cogl/cogl-bitmap.c @@ -482,7 +482,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 8842c5d..31b2eab 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 78ad14c..4ef3681 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 3ba4b80..dfbabfb 100644 --- a/cogl/cogl-framebuffer.c +++ b/cogl/cogl-framebuffer.c @@ -1441,7 +1441,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 f73fde0..e8e4bea 100644 --- a/cogl/driver/gl/cogl-buffer-gl.c +++ b/cogl/driver/gl/cogl-buffer-gl.c @@ -347,7 +347,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 6855915..e69e80c 100644 --- a/cogl/driver/gl/gl/cogl-texture-driver-gl.c +++ b/cogl/driver/gl/gl/cogl-texture-driver-gl.c @@ -183,7 +183,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 4ea9ef0..363b9a5 100644 --- a/cogl/driver/gl/gles/cogl-texture-driver-gles.c +++ b/cogl/driver/gl/gles/cogl-texture-driver-gles.c @@ -245,7 +245,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; } -- 1.7.11.3.g3c3efa5 _______________________________________________ Cogl mailing list <a href="mailto:Cogl@lists.freedesktop.org">Cogl@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/cogl" target="_blank">http://lists.freedesktop.org/mailman/listinfo/cogl</a> </blockquote></div> </div>