diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/build/win32/vs10/test-conformance-cogl.vcxproj cogl2-1.99.1+git20130221.53803433/build/win32/vs10/test-conformance-cogl.vcxproj
--- cogl2-1.99.1+git20130204.6d2f3bc4/build/win32/vs10/test-conformance-cogl.vcxproj	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/build/win32/vs10/test-conformance-cogl.vcxproj	2013-02-22 10:21:53.000000000 +0000
@@ -335,6 +335,7 @@
     <ClCompile Include="..\..\..\tests\conform\test-texture-get-set-data.c" />
     <ClCompile Include="..\..\..\tests\conform\test-texture-mipmap-get-set.c" />
     <ClCompile Include="..\..\..\tests\conform\test-framebuffer-get-bits.c" />
+    <ClCompile Include="..\..\..\tests\conform\test-primitive-and-journal.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="cogl.vcxproj">
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/build/win32/vs10/test-conformance-cogl.vcxproj.filters cogl2-1.99.1+git20130221.53803433/build/win32/vs10/test-conformance-cogl.vcxproj.filters
--- cogl2-1.99.1+git20130204.6d2f3bc4/build/win32/vs10/test-conformance-cogl.vcxproj.filters	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/build/win32/vs10/test-conformance-cogl.vcxproj.filters	2013-02-22 10:21:53.000000000 +0000
@@ -45,5 +45,6 @@
     <ClCompile Include="..\..\..\tests\conform\test-texture-get-set-data.c"><Filter>Sources</Filter></ClCompile>
     <ClCompile Include="..\..\..\tests\conform\test-texture-mipmap-get-set.c"><Filter>Sources</Filter></ClCompile>
     <ClCompile Include="..\..\..\tests\conform\test-framebuffer-get-bits.c"><Filter>Sources</Filter></ClCompile>
+    <ClCompile Include="..\..\..\tests\conform\test-primitive-and-journal.c"><Filter>Sources</Filter></ClCompile>
   </ItemGroup>
 </Project>
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/build/win32/vs9/test-conformance-cogl.vcproj cogl2-1.99.1+git20130221.53803433/build/win32/vs9/test-conformance-cogl.vcproj
--- cogl2-1.99.1+git20130204.6d2f3bc4/build/win32/vs9/test-conformance-cogl.vcproj	2013-02-08 12:16:07.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/build/win32/vs9/test-conformance-cogl.vcproj	2013-02-22 10:21:53.000000000 +0000
@@ -320,6 +320,7 @@
    <File RelativePath="..\..\..\tests\conform\test-texture-get-set-data.c" />
    <File RelativePath="..\..\..\tests\conform\test-texture-mipmap-get-set.c" />
    <File RelativePath="..\..\..\tests\conform\test-framebuffer-get-bits.c" />
+   <File RelativePath="..\..\..\tests\conform\test-primitive-and-journal.c" />
   </Filter>
  </Files>
  <Globals>
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/cogl/cogl-context-private.h cogl2-1.99.1+git20130221.53803433/cogl/cogl-context-private.h
--- cogl2-1.99.1+git20130204.6d2f3bc4/cogl/cogl-context-private.h	2013-02-06 06:50:33.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/cogl/cogl-context-private.h	2013-02-22 10:20:11.000000000 +0000
@@ -173,9 +173,6 @@
   gboolean have_last_offscreen_allocate_flags;
   CoglOffscreenAllocateFlags last_offscreen_allocate_flags;
 
-  GHashTable *swap_callback_closures;
-  int next_swap_callback_id;
-
   CoglOnscreenEventList onscreen_events_queue;
 
   CoglGLES2Context *current_gles2_context;
@@ -214,10 +211,6 @@
   CoglBool current_gl_dither_enabled;
   CoglColorMask current_gl_color_mask;
 
-  /* List of types that will be considered a subclass of CoglTexture in
-     cogl_is_texture */
-  GSList           *texture_types;
-
   /* Clipping */
   /* TRUE if we have a valid clipping stack flushed. In that case
      current_clip_stack will describe what the current state is. If
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/cogl/cogl-context.c cogl2-1.99.1+git20130221.53803433/cogl/cogl-context.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/cogl/cogl-context.c	2013-02-06 06:50:33.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/cogl/cogl-context.c	2013-02-22 10:20:11.000000000 +0000
@@ -167,8 +167,6 @@
   memset (context->features, 0, sizeof (context->features));
   context->private_feature_flags = 0;
 
-  context->texture_types = NULL;
-
   context->rectangle_state = COGL_WINSYS_RECTANGLE_STATE_UNKNOWN;
 
   memset (context->winsys_features, 0, sizeof (context->winsys_features));
@@ -289,9 +287,6 @@
   context->current_draw_buffer_state_flushed = 0;
   context->current_draw_buffer_changes = COGL_FRAMEBUFFER_STATE_ALL;
 
-  context->swap_callback_closures =
-    g_hash_table_new (g_direct_hash, g_direct_equal);
-
   COGL_TAILQ_INIT (&context->onscreen_events_queue);
 
   g_queue_init (&context->gles2_context_stack);
@@ -453,9 +448,6 @@
   if (context->blit_texture_pipeline)
     cogl_object_unref (context->blit_texture_pipeline);
 
-  if (context->swap_callback_closures)
-    g_hash_table_destroy (context->swap_callback_closures);
-
   g_warn_if_fail (context->gles2_context_stack.length == 0);
 
   if (context->journal_flush_attributes_array)
@@ -492,8 +484,6 @@
   _cogl_bitmask_destroy (&context->enable_custom_attributes_tmp);
   _cogl_bitmask_destroy (&context->changed_bits_tmp);
 
-  g_slist_free (context->texture_types);
-
   if (context->current_modelview_entry)
     cogl_matrix_entry_unref (context->current_modelview_entry);
   if (context->current_projection_entry)
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/cogl/cogl-context.h cogl2-1.99.1+git20130221.53803433/cogl/cogl-context.h
--- cogl2-1.99.1+git20130204.6d2f3bc4/cogl/cogl-context.h	2013-02-06 06:50:33.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/cogl/cogl-context.h	2013-02-22 10:20:11.000000000 +0000
@@ -196,9 +196,6 @@
  *     supported with CoglBufferAccess including write support.
  * @COGL_FEATURE_ID_MIRRORED_REPEAT: Whether
  *    %COGL_PIPELINE_WRAP_MODE_MIRRORED_REPEAT is supported.
- * @COGL_FEATURE_ID_SWAP_BUFFERS_EVENT:
- *     Available if the window system supports reporting an event
- *     for swap buffer completions.
  * @COGL_FEATURE_ID_GLES2_CONTEXT: Whether creating new GLES2 contexts is
  *    suported.
  * @COGL_FEATURE_ID_DEPTH_TEXTURE: Whether #CoglFramebuffer support rendering
@@ -230,7 +227,6 @@
   COGL_FEATURE_ID_MAP_BUFFER_FOR_READ,
   COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE,
   COGL_FEATURE_ID_MIRRORED_REPEAT,
-  COGL_FEATURE_ID_SWAP_BUFFERS_EVENT,
   COGL_FEATURE_ID_GLES2_CONTEXT,
   COGL_FEATURE_ID_DEPTH_TEXTURE,
   COGL_FEATURE_ID_PRESENTATION_TIME,
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/cogl/cogl-journal.c cogl2-1.99.1+git20130221.53803433/cogl/cogl-journal.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/cogl/cogl-journal.c	2013-01-04 18:11:43.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/cogl/cogl-journal.c	2013-02-22 10:20:11.000000000 +0000
@@ -1306,6 +1306,10 @@
                                  ~(COGL_FRAMEBUFFER_STATE_MODELVIEW |
                                    COGL_FRAMEBUFFER_STATE_CLIP));
 
+  /* We need to mark the current modelview state of the framebuffer as
+   * dirty because we are going to manually replace it */
+  ctx->current_draw_buffer_changes |= COGL_FRAMEBUFFER_STATE_MODELVIEW;
+
   state.ctx = ctx;
   state.journal = journal;
 
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/cogl/cogl-onscreen.c cogl2-1.99.1+git20130221.53803433/cogl/cogl-onscreen.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/cogl/cogl-onscreen.c	2013-02-06 06:50:33.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/cogl/cogl-onscreen.c	2013-02-22 10:20:11.000000000 +0000
@@ -352,78 +352,6 @@
   g_slice_free (CoglFrameClosure, closure);
 }
 
-typedef struct _SwapBufferCallbackState
-{
-  CoglSwapBuffersNotify callback;
-  void *user_data;
-} SwapBufferCallbackState;
-
-static void
-destroy_swap_buffers_callback_state (void *user_data)
-{
-  g_slice_free (SwapBufferCallbackState, user_data);
-}
-
-static void
-shim_swap_buffers_callback (CoglOnscreen *onscreen,
-                            CoglFrameEvent event,
-                            CoglFrameInfo *info,
-                            void *user_data)
-{
-  SwapBufferCallbackState *state = user_data;
-
-  /* XXX: Note that technically it is a change in semantics for this
-   * interface to forward _SYNC events here and also makes the api
-   * name somewhat missleading.
-   *
-   * In practice though this interface is currently used by
-   * applications for throttling, not because they are strictly
-   * interested in knowing when a frame has been presented and so
-   * forwarding _SYNC events should serve them better.
-   */
-  if (event == COGL_FRAME_EVENT_SYNC)
-    state->callback (COGL_FRAMEBUFFER (onscreen), state->user_data);
-}
-
-unsigned int
-cogl_onscreen_add_swap_buffers_callback (CoglOnscreen *onscreen,
-                                         CoglSwapBuffersNotify callback,
-                                         void *user_data)
-{
-  CoglContext *ctx = COGL_FRAMEBUFFER (onscreen)->context;
-  SwapBufferCallbackState *state = g_slice_new (SwapBufferCallbackState);
-  CoglFrameClosure *closure;
-  unsigned int id = ctx->next_swap_callback_id++;
-
-  state->callback = callback;
-  state->user_data = user_data;
-
-  closure =
-    cogl_onscreen_add_frame_callback (onscreen,
-                                      shim_swap_buffers_callback,
-                                      state,
-                                      destroy_swap_buffers_callback_state);
-
-  g_hash_table_insert (ctx->swap_callback_closures,
-                       GINT_TO_POINTER (id),
-                       closure);
-
-  return id;
-}
-
-void
-cogl_onscreen_remove_swap_buffers_callback (CoglOnscreen *onscreen,
-                                            unsigned int id)
-{
-  CoglContext *ctx = COGL_FRAMEBUFFER (onscreen)->context;
-  CoglFrameClosure *closure = g_hash_table_lookup (ctx->swap_callback_closures,
-                                                   GINT_TO_POINTER (id));
-
-  _COGL_RETURN_IF_FAIL (closure);
-
-  cogl_onscreen_remove_frame_callback (onscreen, closure);
-}
-
 void
 cogl_onscreen_set_swap_throttled (CoglOnscreen *onscreen,
                                   CoglBool throttled)
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/cogl/cogl-onscreen.h cogl2-1.99.1+git20130221.53803433/cogl/cogl-onscreen.h
--- cogl2-1.99.1+git20130204.6d2f3bc4/cogl/cogl-onscreen.h	2013-02-06 06:50:33.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/cogl/cogl-onscreen.h	2013-02-22 10:20:11.000000000 +0000
@@ -543,55 +543,6 @@
 cogl_onscreen_remove_frame_callback (CoglOnscreen *onscreen,
                                      CoglFrameClosure *closure);
 
-typedef void (*CoglSwapBuffersNotify) (CoglFramebuffer *framebuffer,
-                                       void *user_data);
-
-/**
- * cogl_onscreen_add_swap_buffers_callback:
- * @onscreen: A #CoglOnscreen framebuffer
- * @callback: A callback function to call when a swap has completed
- * @user_data: A private pointer to be passed to @callback
- *
- * Installs a @callback function that should be called whenever a swap buffers
- * request (made using cogl_onscreen_swap_buffers()) for the given
- * @onscreen completes.
- *
- * <note>Applications should check for the %COGL_FEATURE_ID_SWAP_BUFFERS_EVENT
- * feature before using this API. It's currently undefined when and if
- * registered callbacks will be called if this feature is not supported.</note>
- *
- * We recommend using this mechanism when available to manually throttle your
- * applications (in conjunction with  cogl_onscreen_set_swap_throttled()) so
- * your application will be able to avoid long blocks in the driver caused by
- * throttling when you request to swap buffers too quickly.
- *
- * Return value: a unique identifier that can be used to remove to remove
- *               the callback later.
- * Since: 1.10
- * Stability: unstable
- * Deprecated: 1.14: Use cogl_onscreen_add_swap_complete_callback
- */
-unsigned int
-cogl_onscreen_add_swap_buffers_callback (CoglOnscreen *onscreen,
-                                         CoglSwapBuffersNotify callback,
-                                         void *user_data);
-
-/**
- * cogl_onscreen_remove_swap_buffers_callback:
- * @onscreen: A #CoglOnscreen framebuffer
- * @id: An identifier returned from cogl_onscreen_add_swap_buffers_callback()
- *
- * Removes a callback that was previously registered
- * using cogl_onscreen_add_swap_buffers_callback().
- *
- * Since: 1.10
- * Stability: unstable
- * Deprecated: 1.14: Use cogl_onscreen_remove_swap_complete_callback
- */
-void
-cogl_onscreen_remove_swap_buffers_callback (CoglOnscreen *onscreen,
-                                            unsigned int id);
-
 /**
  * cogl_onscreen_set_resizable:
  * @onscreen: A #CoglOnscreen framebuffer
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/cogl/cogl-texture.c cogl2-1.99.1+git20130221.53803433/cogl/cogl-texture.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/cogl/cogl-texture.c	2013-02-06 06:50:33.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/cogl/cogl-texture.c	2013-02-22 10:20:11.000000000 +0000
@@ -76,12 +76,12 @@
  * abstract class manually.
  */
 
+static GSList *_cogl_texture_types;
+
 void
 _cogl_texture_register_texture_type (const CoglObjectClass *klass)
 {
-  _COGL_GET_CONTEXT (ctxt, NO_RETVAL);
-
-  ctxt->texture_types = g_slist_prepend (ctxt->texture_types, (void *) klass);
+  _cogl_texture_types = g_slist_prepend (_cogl_texture_types, (void *) klass);
 }
 
 CoglBool
@@ -90,12 +90,10 @@
   CoglObject *obj = (CoglObject *)object;
   GSList *l;
 
-  _COGL_GET_CONTEXT (ctxt, FALSE);
-
   if (object == NULL)
     return FALSE;
 
-  for (l = ctxt->texture_types; l; l = l->next)
+  for (l = _cogl_texture_types; l; l = l->next)
     if (l->data == obj->klass)
       return TRUE;
 
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/cogl/cogl-types.h cogl2-1.99.1+git20130221.53803433/cogl/cogl-types.h
--- cogl2-1.99.1+git20130204.6d2f3bc4/cogl/cogl-types.h	2013-02-06 06:50:33.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/cogl/cogl-types.h	2013-02-22 10:20:11.000000000 +0000
@@ -639,10 +639,6 @@
    * pixmaps to textures. */
   COGL_WINSYS_FEATURE_TEXTURE_FROM_PIXMAP,
 
-  /* Available if the window system supports reporting an event
-   * for swap buffer completions. */
-  COGL_WINSYS_FEATURE_SWAP_BUFFERS_EVENT,
-
   /* Available if it's possible to swap a list of sub rectangles
    * from the back buffer to the front buffer */
   COGL_WINSYS_FEATURE_SWAP_REGION,
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/cogl/driver/gl/cogl-buffer-gl.c cogl2-1.99.1+git20130221.53803433/cogl/driver/gl/cogl-buffer-gl.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/cogl/driver/gl/cogl-buffer-gl.c	2012-12-05 20:06:12.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/cogl/driver/gl/cogl-buffer-gl.c	2013-02-22 10:20:11.000000000 +0000
@@ -3,7 +3,7 @@
  *
  * An object oriented GL/GLES Abstraction/Utility Layer
  *
- * Copyright (C) 2010,2011,2012 Intel Corporation.
+ * Copyright (C) 2010,2011,2012,2013 Intel Corporation.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -228,6 +228,10 @@
 
   gl_target = convert_bind_target_to_gl_target (target);
 
+  if ((hints & COGL_BUFFER_MAP_HINT_DISCARD_RANGE) &&
+      offset == 0 && size >= buffer->size)
+    hints |= COGL_BUFFER_MAP_HINT_DISCARD;
+
   /* If the map buffer range extension is supported then we will
    * always use it even if we are mapping the full range because the
    * normal mapping function doesn't support passing the discard
@@ -235,6 +239,7 @@
   if (ctx->glMapBufferRange)
     {
       GLbitfield gl_access = 0;
+      CoglBool should_recreate_store = !buffer->store_created;
 
       if ((access & COGL_BUFFER_ACCESS_READ))
         gl_access |= GL_MAP_READ_BIT;
@@ -242,11 +247,25 @@
         gl_access |= GL_MAP_WRITE_BIT;
 
       if ((hints & COGL_BUFFER_MAP_HINT_DISCARD))
-        gl_access |= GL_MAP_INVALIDATE_BUFFER_BIT;
-      if ((hints & COGL_BUFFER_MAP_HINT_DISCARD_RANGE))
+        {
+          /* glMapBufferRange generates an error if you pass the
+           * discard hint along with asking for read access. However
+           * it can make sense to ask for both if write access is also
+           * requested so that the application can immediately read
+           * back what it just wrote. To work around the restriction
+           * in GL we just recreate the buffer storage in that case
+           * which is an alternative way to indicate that the buffer
+           * contents can be discarded. */
+          if ((access & COGL_BUFFER_ACCESS_READ))
+            should_recreate_store = TRUE;
+          else
+            gl_access |= GL_MAP_INVALIDATE_BUFFER_BIT;
+        }
+      else if ((hints & COGL_BUFFER_MAP_HINT_DISCARD_RANGE) &&
+               !(access & COGL_BUFFER_ACCESS_READ))
         gl_access |= GL_MAP_INVALIDATE_RANGE_BIT;
 
-      if (!buffer->store_created)
+      if (should_recreate_store)
         {
           if (!recreate_store (buffer, error))
             {
@@ -278,9 +297,7 @@
        * lazily allows the user of the CoglBuffer to set a hint before the
        * store is created. */
       if (!buffer->store_created ||
-          (hints & COGL_BUFFER_MAP_HINT_DISCARD) ||
-          ((hints & COGL_BUFFER_MAP_HINT_DISCARD_RANGE) &&
-           offset == 0 && size >= buffer->size))
+          (hints & COGL_BUFFER_MAP_HINT_DISCARD))
         {
           if (!recreate_store (buffer, error))
             {
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/cogl/driver/gl/cogl-framebuffer-gl.c cogl2-1.99.1+git20130221.53803433/cogl/driver/gl/cogl-framebuffer-gl.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/cogl/driver/gl/cogl-framebuffer-gl.c	2013-01-18 19:42:55.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/cogl/driver/gl/cogl-framebuffer-gl.c	2013-02-22 10:20:29.000000000 +0000
@@ -33,6 +33,7 @@
 #include "cogl-buffer-gl-private.h"
 #include "cogl-error-private.h"
 #include "cogl-texture-gl-private.h"
+#include "cogl-texture-private.h"
 
 #include <glib.h>
 #include <string.h>
@@ -98,6 +99,17 @@
 #define GL_PACK_INVERT_MESA 0x8758
 #endif
 
+#ifndef GL_COLOR
+#define GL_COLOR 0x1800
+#endif
+#ifndef GL_DEPTH
+#define GL_DEPTH 0x1801
+#endif
+#ifndef GL_STENCIL
+#define GL_STENCIL 0x1802
+#endif
+
+
 static void
 _cogl_framebuffer_gl_flush_viewport_state (CoglFramebuffer *framebuffer)
 {
@@ -996,7 +1008,6 @@
 _cogl_framebuffer_gl_discard_buffers (CoglFramebuffer *framebuffer,
                                       unsigned long buffers)
 {
-#ifdef GL_EXT_discard_framebuffer
   CoglContext *ctx = framebuffer->context;
 
   if (ctx->glDiscardFramebuffer)
@@ -1007,11 +1018,11 @@
       if (framebuffer->type == COGL_FRAMEBUFFER_TYPE_ONSCREEN)
         {
           if (buffers & COGL_BUFFER_BIT_COLOR)
-            attachments[i++] = GL_COLOR_EXT;
+            attachments[i++] = GL_COLOR;
           if (buffers & COGL_BUFFER_BIT_DEPTH)
-            attachments[i++] = GL_DEPTH_EXT;
+            attachments[i++] = GL_DEPTH;
           if (buffers & COGL_BUFFER_BIT_STENCIL)
-            attachments[i++] = GL_STENCIL_EXT;
+            attachments[i++] = GL_STENCIL;
         }
       else
         {
@@ -1023,9 +1034,11 @@
             attachments[i++] = GL_STENCIL_ATTACHMENT;
         }
 
+      _cogl_framebuffer_flush_state (framebuffer,
+                                     framebuffer,
+                                     COGL_FRAMEBUFFER_STATE_BIND);
       GE (ctx, glDiscardFramebuffer (GL_FRAMEBUFFER, i, attachments));
     }
-#endif /* GL_EXT_discard_framebuffer */
 }
 
 void
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/cogl/driver/gl/cogl-pipeline-opengl.c cogl2-1.99.1+git20130221.53803433/cogl/driver/gl/cogl-pipeline-opengl.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/cogl/driver/gl/cogl-pipeline-opengl.c	2013-02-06 06:50:33.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/cogl/driver/gl/cogl-pipeline-opengl.c	2013-02-22 10:20:11.000000000 +0000
@@ -1173,8 +1173,8 @@
   if (n_layers)
     {
       CoglPipelineCompareLayersState state;
-      layer_differences = g_alloca (sizeof (unsigned long *) * n_layers);
-      memset (layer_differences, 0, sizeof (layer_differences));
+      layer_differences = g_alloca (sizeof (unsigned long) * n_layers);
+      memset (layer_differences, 0, sizeof (unsigned long) * n_layers);
       state.i = 0;
       state.layer_differences = layer_differences;
       _cogl_pipeline_foreach_layer_internal (pipeline,
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/cogl/tesselator/priorityq.c cogl2-1.99.1+git20130221.53803433/cogl/tesselator/priorityq.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/cogl/tesselator/priorityq.c	2011-07-02 14:07:52.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/cogl/tesselator/priorityq.c	2013-02-22 10:20:29.000000000 +0000
@@ -65,6 +65,7 @@
      return NULL;
   }
 
+  pq->order = NULL;
   pq->size = 0;
   pq->max = INIT_SIZE;
   pq->initialized = FALSE;
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/cogl/winsys/cogl-winsys-egl-kms.c cogl2-1.99.1+git20130221.53803433/cogl/winsys/cogl-winsys-egl-kms.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/cogl/winsys/cogl-winsys-egl-kms.c	2013-02-06 06:50:33.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/cogl/winsys/cogl-winsys-egl-kms.c	2013-02-22 10:20:11.000000000 +0000
@@ -752,12 +752,6 @@
 _cogl_winsys_egl_context_init (CoglContext *context,
                                CoglError **error)
 {
-  COGL_FLAGS_SET (context->features,
-                  COGL_FEATURE_ID_SWAP_BUFFERS_EVENT, TRUE);
-  /* TODO: remove this deprecated feature */
-  COGL_FLAGS_SET (context->winsys_features,
-                  COGL_WINSYS_FEATURE_SWAP_BUFFERS_EVENT,
-                  TRUE);
   COGL_FLAGS_SET (context->winsys_features,
                   COGL_WINSYS_FEATURE_SYNC_AND_COMPLETE_EVENT,
                   TRUE);
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/cogl/winsys/cogl-winsys-glx-feature-functions.h cogl2-1.99.1+git20130221.53803433/cogl/winsys/cogl-winsys-glx-feature-functions.h
--- cogl2-1.99.1+git20130204.6d2f3bc4/cogl/winsys/cogl-winsys-glx-feature-functions.h	2013-02-06 06:50:33.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/cogl/winsys/cogl-winsys-glx-feature-functions.h	2013-02-22 10:20:11.000000000 +0000
@@ -169,7 +169,6 @@
                            swap_event,
                            "INTEL\0",
                            "swap_event\0",
-                           COGL_WINSYS_FEATURE_SWAP_BUFFERS_EVENT |
                            COGL_WINSYS_FEATURE_SYNC_AND_COMPLETE_EVENT)
 COGL_WINSYS_FEATURE_END ()
 
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/cogl/winsys/cogl-winsys-glx.c cogl2-1.99.1+git20130221.53803433/cogl/winsys/cogl-winsys-glx.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/cogl/winsys/cogl-winsys-glx.c	2013-02-06 06:50:33.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/cogl/winsys/cogl-winsys-glx.c	2013-02-22 10:20:11.000000000 +0000
@@ -726,10 +726,6 @@
 
   if (_cogl_winsys_has_feature (COGL_WINSYS_FEATURE_SYNC_AND_COMPLETE_EVENT))
     {
-      /* TODO: remove this deprecated feature */
-      COGL_FLAGS_SET (context->features,
-                      COGL_FEATURE_ID_SWAP_BUFFERS_EVENT,
-                      TRUE);
       COGL_FLAGS_SET (context->features,
                       COGL_FEATURE_ID_PRESENTATION_TIME,
                       TRUE);
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/cogl/winsys/cogl-winsys-wgl.c cogl2-1.99.1+git20130221.53803433/cogl/winsys/cogl-winsys-wgl.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/cogl/winsys/cogl-winsys-wgl.c	2012-11-03 08:37:16.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/cogl/winsys/cogl-winsys-wgl.c	2013-02-22 10:20:29.000000000 +0000
@@ -45,6 +45,7 @@
 #include "cogl-feature-private.h"
 #include "cogl-win32-renderer.h"
 #include "cogl-winsys-wgl-private.h"
+#include "cogl-error-private.h"
 
 typedef struct _CoglRendererWgl
 {
@@ -416,8 +417,8 @@
   if (wgl_display->window_class == 0)
     {
       _cogl_set_error (error, COGL_WINSYS_ERROR,
-                   COGL_WINSYS_ERROR_CREATE_CONTEXT,
-                   "Unable to register window class");
+                       COGL_WINSYS_ERROR_CREATE_CONTEXT,
+                       "Unable to register window class");
       return FALSE;
     }
 
@@ -617,7 +618,8 @@
 
   if (wgl_extensions)
     {
-      char **split_extensions = g_strsplit (wgl_extensions);
+      char **split_extensions =
+        g_strsplit (wgl_extensions, " ", 0 /* max_tokens */);
 
       COGL_NOTE (WINSYS, "  WGL Extensions: %s", wgl_extensions);
 
@@ -644,9 +646,7 @@
 static CoglBool
 _cogl_winsys_context_init (CoglContext *context, CoglError **error)
 {
-  CoglContextWgl *wgl_context;
-
-  wgl_context = context->winsys = g_new0 (CoglContextWgl, 1);
+  context->winsys = g_new0 (CoglContextWgl, 1);
 
   cogl_win32_renderer_add_filter (context->display->renderer,
                                   win32_event_filter_cb,
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/cogl-pango/Makefile.am cogl2-1.99.1+git20130221.53803433/cogl-pango/Makefile.am
--- cogl2-1.99.1+git20130204.6d2f3bc4/cogl-pango/Makefile.am	2013-01-25 14:55:38.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/cogl-pango/Makefile.am	2013-02-22 10:20:29.000000000 +0000
@@ -32,7 +32,7 @@
 libcogl_pango2_la_LIBADD += $(COGL_DEP_LIBS) $(COGL_PANGO_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
 libcogl_pango2_la_LDFLAGS = \
 	-export-dynamic \
-	-export-symbols-regex "^cogl_pango_.*"
+	-export-symbols-regex "^cogl_pango_.*" \
 	-no-undefined \
 	-version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@
 
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/cogl-pango/Makefile.in cogl2-1.99.1+git20130221.53803433/cogl-pango/Makefile.in
--- cogl2-1.99.1+git20130204.6d2f3bc4/cogl-pango/Makefile.in	2013-02-08 12:15:03.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/cogl-pango/Makefile.in	2013-02-22 10:20:47.000000000 +0000
@@ -465,7 +465,9 @@
 	$(COGL_DEP_LIBS) $(COGL_PANGO_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
 libcogl_pango2_la_LDFLAGS = \
 	-export-dynamic \
-	-export-symbols-regex "^cogl_pango_.*"
+	-export-symbols-regex "^cogl_pango_.*" \
+	-no-undefined \
+	-version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@
 
 AM_CPPFLAGS = \
 	-DCOGL_COMPILATION		\
@@ -967,8 +969,6 @@
 	uninstall-girDATA uninstall-libLTLIBRARIES \
 	uninstall-pkgconfigDATA uninstall-typelibDATA
 
-	-no-undefined \
-	-version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@
 
 dist-hook: ../build/win32/vs9/cogl-pango.vcproj ../build/win32/vs10/cogl-pango.vcxproj ../build/win32/vs10/cogl-pango.vcxproj.filters
 
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/debian/changelog cogl2-1.99.1+git20130221.53803433/debian/changelog
--- cogl2-1.99.1+git20130204.6d2f3bc4/debian/changelog	2013-02-08 13:08:13.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/debian/changelog	2013-02-22 10:35:48.000000000 +0000
@@ -1,8 +1,8 @@
-cogl2 (1.99.1+git20130204.6d2f3bc4-0ubuntu1~13.04~ricotz1) raring; urgency=medium
+cogl2 (1.99.1+git20130221.53803433-0ubuntu1~13.04~ricotz0) raring; urgency=medium
 
-  * Update or fix packaging
+  * New git snapshot
 
- -- Rico Tzschichholz <ricotz@ubuntu.com>  Fri, 08 Feb 2013 14:08:13 +0100
+ -- Rico Tzschichholz <ricotz@ubuntu.com>  Fri, 22 Feb 2013 11:35:48 +0100
 
 cogl (1.10.0-1) UNRELEASED; urgency=low
 
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/debian/libcogl2-0.symbols cogl2-1.99.1+git20130221.53803433/debian/libcogl2-0.symbols
--- cogl2-1.99.1+git20130204.6d2f3bc4/debian/libcogl2-0.symbols	2013-02-08 13:08:12.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/debian/libcogl2-0.symbols	2013-02-22 10:35:47.000000000 +0000
@@ -326,7 +326,6 @@
  cogl_offscreen_new_to_texture@Base 1.99.1
  cogl_onscreen_add_frame_callback@Base 1.99.1
  cogl_onscreen_add_resize_handler@Base 1.99.1
- cogl_onscreen_add_swap_buffers_callback@Base 1.99.1
  cogl_onscreen_get_buffer_age@Base 1.99.1
  cogl_onscreen_get_frame_counter@Base 1.99.1
  cogl_onscreen_get_resizable@Base 1.99.1
@@ -334,7 +333,6 @@
  cogl_onscreen_new@Base 1.99.1
  cogl_onscreen_remove_frame_callback@Base 1.99.1
  cogl_onscreen_remove_resize_handler@Base 1.99.1
- cogl_onscreen_remove_swap_buffers_callback@Base 1.99.1
  cogl_onscreen_set_resizable@Base 1.99.1
  cogl_onscreen_set_swap_throttled@Base 1.99.1
  cogl_onscreen_show@Base 1.99.1
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/cogl2-sections.txt cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/cogl2-sections.txt
--- cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/cogl2-sections.txt	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/cogl2-sections.txt	2013-02-22 10:21:54.000000000 +0000
@@ -548,12 +548,15 @@
 cogl_onscreen_hide
 
 <SUBSECTION>
+CoglFrameCallback
+CoglFrameClosure
+cogl_onscreen_add_frame_callback
+cogl_onscreen_remove_frame_callback
+
+<SUBSECTION>
 cogl_onscreen_swap_buffers
 cogl_onscreen_swap_region
 cogl_onscreen_set_swap_throttled
-CoglSwapBuffersNotify
-cogl_onscreen_add_swap_buffers_callback
-cogl_onscreen_remove_swap_buffers_callback
 </SECTION>
 
 <SECTION>
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/ch01.html cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/ch01.html
--- cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/ch01.html	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/ch01.html	2013-02-22 10:21:54.000000000 +0000
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp65744"></a>Cogl - a modern 3D graphics API</h2></div></div></div>
+<a name="idp1484208"></a>Cogl - a modern 3D graphics API</h2></div></div></div>
 <div class="toc"><dl>
 <dt><span class="section"><a href="ch01.html#cogl-intro">About Cogl</a></span></dt>
 <dt><span class="section"><a href="cogl-general-apis.html">General API concepts</a></span></dt>
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/cogl-Blend-Strings.html cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/cogl-Blend-Strings.html
--- cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/cogl-Blend-Strings.html	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/cogl-Blend-Strings.html	2013-02-22 10:21:54.000000000 +0000
@@ -44,7 +44,7 @@
 </p>
 <div class="section">
 <div class="titlepage"><div><div><h5 class="title">
-<a name="idp6727360"></a>Some examples</h5></div></div></div>
+<a name="idp7123456"></a>Some examples</h5></div></div></div>
 <p>Here is an example used for blending:</p>
 <pre class="programlisting">
 "RGBA = ADD (SRC_COLOR * (SRC_COLOR[A]), DST_COLOR * (1-SRC_COLOR[A]))"
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html
--- cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html	2013-02-22 10:21:54.000000000 +0000
@@ -64,21 +64,24 @@
 <span class="returnvalue">void</span>                <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-show" title="cogl_onscreen_show ()">cogl_onscreen_show</a>                  (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-hide" title="cogl_onscreen_hide ()">cogl_onscreen_hide</a>                  (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>);
 
+<span class="returnvalue">void</span>                (<a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglFrameCallback" title="CoglFrameCallback ()">*CoglFrameCallback</a>)                (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>,
+                                                         <em class="parameter"><code><span class="type">CoglFrameEvent</span> event</code></em>,
+                                                         <em class="parameter"><code><span class="type">CoglFrameInfo</span> *info</code></em>,
+                                                         <em class="parameter"><code><span class="type">void</span> *user_data</code></em>);
+                    <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglFrameClosure" title="CoglFrameClosure">CoglFrameClosure</a>;
+<a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglFrameClosure" title="CoglFrameClosure"><span class="returnvalue">CoglFrameClosure</span></a> *  <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-add-frame-callback" title="cogl_onscreen_add_frame_callback ()">cogl_onscreen_add_frame_callback</a>    (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglFrameCallback" title="CoglFrameCallback ()"><span class="type">CoglFrameCallback</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><span class="type">void</span> *user_data</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="cogl2-The-Object-Interface.html#CoglUserDataDestroyCallback" title="CoglUserDataDestroyCallback ()"><span class="type">CoglUserDataDestroyCallback</span></a> destroy</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-remove-frame-callback" title="cogl_onscreen_remove_frame_callback ()">cogl_onscreen_remove_frame_callback</a> (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglFrameClosure" title="CoglFrameClosure"><span class="type">CoglFrameClosure</span></a> *closure</code></em>);
+
 <span class="returnvalue">void</span>                <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-swap-buffers" title="cogl_onscreen_swap_buffers ()">cogl_onscreen_swap_buffers</a>          (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-swap-region" title="cogl_onscreen_swap_region ()">cogl_onscreen_swap_region</a>           (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>,
                                                          <em class="parameter"><code>const <span class="type">int</span> *rectangles</code></em>,
                                                          <em class="parameter"><code><span class="type">int</span> n_rectangles</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-set-swap-throttled" title="cogl_onscreen_set_swap_throttled ()">cogl_onscreen_set_swap_throttled</a>    (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>,
                                                          <em class="parameter"><code><a class="link" href="cogl2-Common-Types.html#CoglBool" title="CoglBool"><span class="type">CoglBool</span></a> throttled</code></em>);
-<span class="returnvalue">void</span>                (<a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglSwapBuffersNotify" title="CoglSwapBuffersNotify ()">*CoglSwapBuffersNotify</a>)            (<em class="parameter"><code><a class="link" href="cogl2-CoglFramebuffer---The-Framebuffer-Interface.html#CoglFramebuffer" title="CoglFramebuffer"><span class="type">CoglFramebuffer</span></a> *framebuffer</code></em>,
-                                                         <em class="parameter"><code><span class="type">void</span> *user_data</code></em>);
-unsigned <span class="returnvalue">int</span>        <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-add-swap-buffers-callback" title="cogl_onscreen_add_swap_buffers_callback ()">cogl_onscreen_add_swap_buffers_callback</a>
-                                                        (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglSwapBuffersNotify" title="CoglSwapBuffersNotify ()"><span class="type">CoglSwapBuffersNotify</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><span class="type">void</span> *user_data</code></em>);
-<span class="returnvalue">void</span>                <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-remove-swap-buffers-callback" title="cogl_onscreen_remove_swap_buffers_callback ()">cogl_onscreen_remove_swap_buffers_callback</a>
-                                                        (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>,
-                                                         <em class="parameter"><code>unsigned <span class="type">int</span> id</code></em>);
 </pre>
 </div>
 <div class="refsect1">
@@ -395,45 +398,95 @@
 </div>
 <hr>
 <div class="refsect2">
-<a name="cogl-onscreen-swap-buffers"></a><h3>cogl_onscreen_swap_buffers ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                cogl_onscreen_swap_buffers          (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>);</pre>
+<a name="CoglFrameCallback"></a><h3>CoglFrameCallback ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*CoglFrameCallback)                (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>,
+                                                         <em class="parameter"><code><span class="type">CoglFrameEvent</span> event</code></em>,
+                                                         <em class="parameter"><code><span class="type">CoglFrameInfo</span> *info</code></em>,
+                                                         <em class="parameter"><code><span class="type">void</span> *user_data</code></em>);</pre>
 <p>
-Swaps the current back buffer being rendered too, to the front for display.
+Is a callback that can be registered via
+<a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-add-frame-callback" title="cogl_onscreen_add_frame_callback ()"><code class="function">cogl_onscreen_add_frame_callback()</code></a> to be called when a frame
+progresses in some notable way.
 </p>
 <p>
-This function also implicitly discards the contents of the color, depth and
-stencil buffers as if <a class="link" href="cogl2-CoglFramebuffer---The-Framebuffer-Interface.html#cogl-framebuffer-discard-buffers" title="cogl_framebuffer_discard_buffers ()"><code class="function">cogl_framebuffer_discard_buffers()</code></a> were used. The
-significance of the discard is that you should not expect to be able to
-start a new frame that incrementally builds on the contents of the previous
-frame.
+Please see the documentation for <span class="type">CoglFrameEvent</span> and
+<a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-add-frame-callback" title="cogl_onscreen_add_frame_callback ()"><code class="function">cogl_onscreen_add_frame_callback()</code></a> for more details about what
+events can be notified.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
-<tbody><tr>
+<tbody>
+<tr>
 <td><p><span class="term"><em class="parameter"><code>onscreen</code></em> :</span></p></td>
-<td>A <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> framebuffer</td>
-</tr></tbody>
+<td>The onscreen that the frame is associated with</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>event</code></em> :</span></p></td>
+<td>A <span class="type">CoglFrameEvent</span> notifying how the frame has progressed</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>info</code></em> :</span></p></td>
+<td>The meta information, such as timing information, about
+the frame that has progressed.</td>
+</tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>The user pointer passed to
+<a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-add-frame-callback" title="cogl_onscreen_add_frame_callback ()"><code class="function">cogl_onscreen_add_frame_callback()</code></a>
+</td>
+</tr>
+</tbody>
 </table></div>
-<p class="since">Since 1.10</p>
+<p class="since">Since 1.14</p>
 <p class="stability">Stability Level: Unstable</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="cogl-onscreen-swap-region"></a><h3>cogl_onscreen_swap_region ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                cogl_onscreen_swap_region           (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>,
-                                                         <em class="parameter"><code>const <span class="type">int</span> *rectangles</code></em>,
-                                                         <em class="parameter"><code><span class="type">int</span> n_rectangles</code></em>);</pre>
+<a name="CoglFrameClosure"></a><h3>CoglFrameClosure</h3>
+<pre class="programlisting">typedef struct _CoglFrameClosure CoglFrameClosure;</pre>
 <p>
-Swaps a region of the back buffer being rendered too, to the front for
-display.  <em class="parameter"><code>rectangles</code></em> represents the region as array of <em class="parameter"><code>n_rectangles</code></em> each
-defined by 4 sequential (x, y, width, height) integers.
+An opaque type that tracks a <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglFrameCallback" title="CoglFrameCallback ()"><span class="type">CoglFrameCallback</span></a> and associated user
+data. A <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglFrameClosure" title="CoglFrameClosure"><span class="type">CoglFrameClosure</span></a> pointer will be returned from
+<a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-add-frame-callback" title="cogl_onscreen_add_frame_callback ()"><code class="function">cogl_onscreen_add_frame_callback()</code></a> and it allows you to remove a
+callback later using <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-remove-frame-callback" title="cogl_onscreen_remove_frame_callback ()"><code class="function">cogl_onscreen_remove_frame_callback()</code></a>.
 </p>
+<p class="since">Since 1.14</p>
+<p class="stability">Stability Level: Unstable</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="cogl-onscreen-add-frame-callback"></a><h3>cogl_onscreen_add_frame_callback ()</h3>
+<pre class="programlisting"><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglFrameClosure" title="CoglFrameClosure"><span class="returnvalue">CoglFrameClosure</span></a> *  cogl_onscreen_add_frame_callback    (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglFrameCallback" title="CoglFrameCallback ()"><span class="type">CoglFrameCallback</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><span class="type">void</span> *user_data</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="cogl2-The-Object-Interface.html#CoglUserDataDestroyCallback" title="CoglUserDataDestroyCallback ()"><span class="type">CoglUserDataDestroyCallback</span></a> destroy</code></em>);</pre>
 <p>
-This function also implicitly discards the contents of the color, depth and
-stencil buffers as if <a class="link" href="cogl2-CoglFramebuffer---The-Framebuffer-Interface.html#cogl-framebuffer-discard-buffers" title="cogl_framebuffer_discard_buffers ()"><code class="function">cogl_framebuffer_discard_buffers()</code></a> were used. The
-significance of the discard is that you should not expect to be able to
-start a new frame that incrementally builds on the contents of the previous
-frame.
+Installs a <em class="parameter"><code>callback</code></em> function that will be called for significant
+events relating to the given <em class="parameter"><code>onscreen</code></em> framebuffer.
+</p>
+<p>
+The <em class="parameter"><code>callback</code></em> will be used to notify when the system compositor is
+ready for this application to render a new frame. In this case
+<code class="literal">COGL_FRAME_EVENT_SYNC</code> will be passed as the event argument to the
+given <em class="parameter"><code>callback</code></em> in addition to the <span class="type">CoglFrameInfo</span> corresponding to
+the frame beeing acknowledged by the compositor.
+</p>
+<p>
+The <em class="parameter"><code>callback</code></em> will also be called to notify when the frame has
+ended. In this case <code class="literal">COGL_FRAME_EVENT_COMPLETE</code> will be passed as
+the event argument to the given <em class="parameter"><code>callback</code></em> in addition to the
+<span class="type">CoglFrameInfo</span> corresponding to the newly presented frame.  The
+meaning of "ended" here simply means that no more timing
+information will be collected within the corresponding
+<span class="type">CoglFrameInfo</span> and so this is a good opportunity to analyse the
+given info. It does not necessarily mean that the GPU has finished
+rendering the corresponding frame.
+</p>
+<p>
+We highly recommend throttling your application according to
+<code class="literal">COGL_FRAME_EVENT_SYNC</code> events so that your application can avoid
+wasting resources, drawing more frames than your system compositor
+can display.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -443,82 +496,103 @@
 <td>A <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> framebuffer</td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>rectangles</code></em> :</span></p></td>
-<td>An array of integer 4-tuples representing rectangles as
-(x, y, width, height) tuples.</td>
+<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
+<td>A callback function to call for frame events</td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>n_rectangles</code></em> :</span></p></td>
-<td>The number of 4-tuples to be read from <em class="parameter"><code>rectangles</code></em>
+<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
+<td>A private pointer to be passed to <em class="parameter"><code>callback</code></em>
 </td>
 </tr>
+<tr>
+<td><p><span class="term"><em class="parameter"><code>destroy</code></em> :</span></p></td>
+<td>An optional callback to destroy <em class="parameter"><code>user_data</code></em> when the
+<em class="parameter"><code>callback</code></em> is removed or <em class="parameter"><code>onscreen</code></em> is freed.</td>
+</tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>a <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglFrameClosure" title="CoglFrameClosure"><span class="type">CoglFrameClosure</span></a> pointer that can be used to
+remove the callback and associated <em class="parameter"><code>user_data</code></em> later.</td>
+</tr>
 </tbody>
 </table></div>
-<p class="since">Since 1.10</p>
+<p class="since">Since 1.14</p>
 <p class="stability">Stability Level: Unstable</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="cogl-onscreen-set-swap-throttled"></a><h3>cogl_onscreen_set_swap_throttled ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                cogl_onscreen_set_swap_throttled    (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="cogl2-Common-Types.html#CoglBool" title="CoglBool"><span class="type">CoglBool</span></a> throttled</code></em>);</pre>
+<a name="cogl-onscreen-remove-frame-callback"></a><h3>cogl_onscreen_remove_frame_callback ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                cogl_onscreen_remove_frame_callback (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglFrameClosure" title="CoglFrameClosure"><span class="type">CoglFrameClosure</span></a> *closure</code></em>);</pre>
 <p>
-Requests that the given <em class="parameter"><code>onscreen</code></em> framebuffer should have swap buffer
-requests (made using <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-swap-buffers" title="cogl_onscreen_swap_buffers ()"><code class="function">cogl_onscreen_swap_buffers()</code></a>) throttled either by a
-displays vblank period or perhaps some other mechanism in a composited
-environment.
+Removes a callback and associated user data that were previously
+registered using <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-add-frame-callback" title="cogl_onscreen_add_frame_callback ()"><code class="function">cogl_onscreen_add_frame_callback()</code></a>.
+</p>
+<p>
+If a destroy callback was passed to
+<a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-add-frame-callback" title="cogl_onscreen_add_frame_callback ()"><code class="function">cogl_onscreen_add_frame_callback()</code></a> to destroy the user data then
+this will get called.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>onscreen</code></em> :</span></p></td>
-<td>A <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> framebuffer</td>
+<td>A <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a>
+</td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>throttled</code></em> :</span></p></td>
-<td>Whether swap throttling is wanted or not.</td>
+<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td>
+<td>A <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglFrameClosure" title="CoglFrameClosure"><span class="type">CoglFrameClosure</span></a> returned from
+<a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-add-frame-callback" title="cogl_onscreen_add_frame_callback ()"><code class="function">cogl_onscreen_add_frame_callback()</code></a>
+</td>
 </tr>
 </tbody>
 </table></div>
-<p class="since">Since 1.8</p>
+<p class="since">Since 1.14</p>
 <p class="stability">Stability Level: Unstable</p>
 </div>
 <hr>
 <div class="refsect2">
-<a name="CoglSwapBuffersNotify"></a><h3>CoglSwapBuffersNotify ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*CoglSwapBuffersNotify)            (<em class="parameter"><code><a class="link" href="cogl2-CoglFramebuffer---The-Framebuffer-Interface.html#CoglFramebuffer" title="CoglFramebuffer"><span class="type">CoglFramebuffer</span></a> *framebuffer</code></em>,
-                                                         <em class="parameter"><code><span class="type">void</span> *user_data</code></em>);</pre>
-</div>
-<hr>
-<div class="refsect2">
-<a name="cogl-onscreen-add-swap-buffers-callback"></a><h3>cogl_onscreen_add_swap_buffers_callback ()</h3>
-<pre class="programlisting">unsigned <span class="returnvalue">int</span>        cogl_onscreen_add_swap_buffers_callback
-                                                        (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglSwapBuffersNotify" title="CoglSwapBuffersNotify ()"><span class="type">CoglSwapBuffersNotify</span></a> callback</code></em>,
-                                                         <em class="parameter"><code><span class="type">void</span> *user_data</code></em>);</pre>
-<div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">cogl_onscreen_add_swap_buffers_callback</code> has been deprecated since version 1.14 and should not be used in newly-written code. Use cogl_onscreen_add_swap_complete_callback</p>
-</div>
+<a name="cogl-onscreen-swap-buffers"></a><h3>cogl_onscreen_swap_buffers ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                cogl_onscreen_swap_buffers          (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>);</pre>
 <p>
-Installs a <em class="parameter"><code>callback</code></em> function that should be called whenever a swap buffers
-request (made using <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-swap-buffers" title="cogl_onscreen_swap_buffers ()"><code class="function">cogl_onscreen_swap_buffers()</code></a>) for the given
-<em class="parameter"><code>onscreen</code></em> completes.
+Swaps the current back buffer being rendered too, to the front for display.
 </p>
 <p>
+This function also implicitly discards the contents of the color, depth and
+stencil buffers as if <a class="link" href="cogl2-CoglFramebuffer---The-Framebuffer-Interface.html#cogl-framebuffer-discard-buffers" title="cogl_framebuffer_discard_buffers ()"><code class="function">cogl_framebuffer_discard_buffers()</code></a> were used. The
+significance of the discard is that you should not expect to be able to
+start a new frame that incrementally builds on the contents of the previous
+frame.
 </p>
-<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Note</h3>Applications should check for the <a class="link" href="cogl2-The-Top-Level-Context.html#COGL-FEATURE-ID-SWAP-BUFFERS-EVENT:CAPS"><code class="literal">COGL_FEATURE_ID_SWAP_BUFFERS_EVENT</code></a>
-feature before using this API. It's currently undefined when and if
-registered callbacks will be called if this feature is not supported.</div>
+<div class="variablelist"><table border="0">
+<col align="left" valign="top">
+<tbody><tr>
+<td><p><span class="term"><em class="parameter"><code>onscreen</code></em> :</span></p></td>
+<td>A <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> framebuffer</td>
+</tr></tbody>
+</table></div>
+<p class="since">Since 1.10</p>
+<p class="stability">Stability Level: Unstable</p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="cogl-onscreen-swap-region"></a><h3>cogl_onscreen_swap_region ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                cogl_onscreen_swap_region           (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">int</span> *rectangles</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> n_rectangles</code></em>);</pre>
 <p>
+Swaps a region of the back buffer being rendered too, to the front for
+display.  <em class="parameter"><code>rectangles</code></em> represents the region as array of <em class="parameter"><code>n_rectangles</code></em> each
+defined by 4 sequential (x, y, width, height) integers.
 </p>
 <p>
-We recommend using this mechanism when available to manually throttle your
-applications (in conjunction with  <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-set-swap-throttled" title="cogl_onscreen_set_swap_throttled ()"><code class="function">cogl_onscreen_set_swap_throttled()</code></a>) so
-your application will be able to avoid long blocks in the driver caused by
-throttling when you request to swap buffers too quickly.
+This function also implicitly discards the contents of the color, depth and
+stencil buffers as if <a class="link" href="cogl2-CoglFramebuffer---The-Framebuffer-Interface.html#cogl-framebuffer-discard-buffers" title="cogl_framebuffer_discard_buffers ()"><code class="function">cogl_framebuffer_discard_buffers()</code></a> were used. The
+significance of the discard is that you should not expect to be able to
+start a new frame that incrementally builds on the contents of the previous
+frame.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -528,19 +602,15 @@
 <td>A <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> framebuffer</td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
-<td>A callback function to call when a swap has completed</td>
+<td><p><span class="term"><em class="parameter"><code>rectangles</code></em> :</span></p></td>
+<td>An array of integer 4-tuples representing rectangles as
+(x, y, width, height) tuples.</td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>A private pointer to be passed to <em class="parameter"><code>callback</code></em>
+<td><p><span class="term"><em class="parameter"><code>n_rectangles</code></em> :</span></p></td>
+<td>The number of 4-tuples to be read from <em class="parameter"><code>rectangles</code></em>
 </td>
 </tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td>a unique identifier that can be used to remove to remove
-the callback later.</td>
-</tr>
 </tbody>
 </table></div>
 <p class="since">Since 1.10</p>
@@ -548,17 +618,14 @@
 </div>
 <hr>
 <div class="refsect2">
-<a name="cogl-onscreen-remove-swap-buffers-callback"></a><h3>cogl_onscreen_remove_swap_buffers_callback ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                cogl_onscreen_remove_swap_buffers_callback
-                                                        (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>,
-                                                         <em class="parameter"><code>unsigned <span class="type">int</span> id</code></em>);</pre>
-<div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
-<h3 class="title">Warning</h3>
-<p><code class="literal">cogl_onscreen_remove_swap_buffers_callback</code> has been deprecated since version 1.14 and should not be used in newly-written code. Use cogl_onscreen_remove_swap_complete_callback</p>
-</div>
+<a name="cogl-onscreen-set-swap-throttled"></a><h3>cogl_onscreen_set_swap_throttled ()</h3>
+<pre class="programlisting"><span class="returnvalue">void</span>                cogl_onscreen_set_swap_throttled    (<em class="parameter"><code><a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> *onscreen</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="cogl2-Common-Types.html#CoglBool" title="CoglBool"><span class="type">CoglBool</span></a> throttled</code></em>);</pre>
 <p>
-Removes a callback that was previously registered
-using <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-add-swap-buffers-callback" title="cogl_onscreen_add_swap_buffers_callback ()"><code class="function">cogl_onscreen_add_swap_buffers_callback()</code></a>.
+Requests that the given <em class="parameter"><code>onscreen</code></em> framebuffer should have swap buffer
+requests (made using <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-swap-buffers" title="cogl_onscreen_swap_buffers ()"><code class="function">cogl_onscreen_swap_buffers()</code></a>) throttled either by a
+displays vblank period or perhaps some other mechanism in a composited
+environment.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -568,13 +635,12 @@
 <td>A <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglOnscreen" title="CoglOnscreen"><span class="type">CoglOnscreen</span></a> framebuffer</td>
 </tr>
 <tr>
-<td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td>
-<td>An identifier returned from <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-add-swap-buffers-callback" title="cogl_onscreen_add_swap_buffers_callback ()"><code class="function">cogl_onscreen_add_swap_buffers_callback()</code></a>
-</td>
+<td><p><span class="term"><em class="parameter"><code>throttled</code></em> :</span></p></td>
+<td>Whether swap throttling is wanted or not.</td>
 </tr>
 </tbody>
 </table></div>
-<p class="since">Since 1.10</p>
+<p class="since">Since 1.8</p>
 <p class="stability">Stability Level: Unstable</p>
 </div>
 </div>
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/cogl2-The-Top-Level-Context.html cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/cogl2-The-Top-Level-Context.html
--- cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/cogl2-The-Top-Level-Context.html	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/cogl2-The-Top-Level-Context.html	2013-02-22 10:21:54.000000000 +0000
@@ -219,7 +219,6 @@
   COGL_FEATURE_ID_MAP_BUFFER_FOR_READ,
   COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE,
   COGL_FEATURE_ID_MIRRORED_REPEAT,
-  COGL_FEATURE_ID_SWAP_BUFFERS_EVENT,
   COGL_FEATURE_ID_GLES2_CONTEXT,
   COGL_FEATURE_ID_DEPTH_TEXTURE,
   COGL_FEATURE_ID_PRESENTATION_TIME,
@@ -334,12 +333,6 @@
 </td>
 </tr>
 <tr>
-<td><p><a name="COGL-FEATURE-ID-SWAP-BUFFERS-EVENT:CAPS"></a><span class="term"><code class="literal">COGL_FEATURE_ID_SWAP_BUFFERS_EVENT</code></span></p></td>
-<td>    Available if the window system supports reporting an event
-    for swap buffer completions.
-</td>
-</tr>
-<tr>
 <td><p><a name="COGL-FEATURE-ID-GLES2-CONTEXT:CAPS"></a><span class="term"><code class="literal">COGL_FEATURE_ID_GLES2_CONTEXT</code></span></p></td>
 <td>Whether creating new GLES2 contexts is
    suported.
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/cogl2.devhelp2 cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/cogl2.devhelp2
--- cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/cogl2.devhelp2	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/cogl2.devhelp2	2013-02-22 10:21:54.000000000 +0000
@@ -456,12 +456,13 @@
     <keyword type="function" name="cogl_win32_onscreen_get_window ()" link="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-win32-onscreen-get-window" since="1.10" stability="Unstable"/>
     <keyword type="function" name="cogl_onscreen_show ()" link="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-show" since="2.0" stability="Unstable"/>
     <keyword type="function" name="cogl_onscreen_hide ()" link="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-hide" since="2.0" stability="Unstable"/>
+    <keyword type="function" name="CoglFrameCallback ()" link="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglFrameCallback" since="1.14" stability="Unstable"/>
+    <keyword type="struct" name="CoglFrameClosure" link="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglFrameClosure" since="1.14" stability="Unstable"/>
+    <keyword type="function" name="cogl_onscreen_add_frame_callback ()" link="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-add-frame-callback" since="1.14" stability="Unstable"/>
+    <keyword type="function" name="cogl_onscreen_remove_frame_callback ()" link="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-remove-frame-callback" since="1.14" stability="Unstable"/>
     <keyword type="function" name="cogl_onscreen_swap_buffers ()" link="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-swap-buffers" since="1.10" stability="Unstable"/>
     <keyword type="function" name="cogl_onscreen_swap_region ()" link="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-swap-region" since="1.10" stability="Unstable"/>
     <keyword type="function" name="cogl_onscreen_set_swap_throttled ()" link="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-set-swap-throttled" since="1.8" stability="Unstable"/>
-    <keyword type="function" name="CoglSwapBuffersNotify ()" link="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglSwapBuffersNotify"/>
-    <keyword type="function" name="cogl_onscreen_add_swap_buffers_callback ()" link="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-add-swap-buffers-callback" deprecated="1.14: Use cogl_onscreen_add_swap_complete_callback" since="1.10" stability="Unstable"/>
-    <keyword type="function" name="cogl_onscreen_remove_swap_buffers_callback ()" link="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-remove-swap-buffers-callback" deprecated="1.14: Use cogl_onscreen_remove_swap_complete_callback" since="1.10" stability="Unstable"/>
     <keyword type="struct" name="CoglOffscreen" link="cogl2-Offscreen-Framebuffers.html#CoglOffscreen"/>
     <keyword type="function" name="cogl_is_offscreen ()" link="cogl2-Offscreen-Framebuffers.html#cogl-is-offscreen"/>
     <keyword type="function" name="cogl_offscreen_new_to_texture ()" link="cogl2-Offscreen-Framebuffers.html#cogl-offscreen-new-to-texture"/>
@@ -719,7 +720,6 @@
     <keyword type="constant" name="COGL_FEATURE_ID_MAP_BUFFER_FOR_READ" link="cogl2-The-Top-Level-Context.html#COGL-FEATURE-ID-MAP-BUFFER-FOR-READ:CAPS"/>
     <keyword type="constant" name="COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE" link="cogl2-The-Top-Level-Context.html#COGL-FEATURE-ID-MAP-BUFFER-FOR-WRITE:CAPS"/>
     <keyword type="constant" name="COGL_FEATURE_ID_MIRRORED_REPEAT" link="cogl2-The-Top-Level-Context.html#COGL-FEATURE-ID-MIRRORED-REPEAT:CAPS"/>
-    <keyword type="constant" name="COGL_FEATURE_ID_SWAP_BUFFERS_EVENT" link="cogl2-The-Top-Level-Context.html#COGL-FEATURE-ID-SWAP-BUFFERS-EVENT:CAPS"/>
     <keyword type="constant" name="COGL_FEATURE_ID_GLES2_CONTEXT" link="cogl2-The-Top-Level-Context.html#COGL-FEATURE-ID-GLES2-CONTEXT:CAPS"/>
     <keyword type="constant" name="COGL_FEATURE_ID_DEPTH_TEXTURE" link="cogl2-The-Top-Level-Context.html#COGL-FEATURE-ID-DEPTH-TEXTURE:CAPS"/>
     <keyword type="constant" name="COGL_FEATURE_ID_PRESENTATION_TIME" link="cogl2-The-Top-Level-Context.html#COGL-FEATURE-ID-PRESENTATION-TIME:CAPS"/>
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/index.html cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/index.html
--- cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/index.html	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/index.html	2013-02-22 10:21:54.000000000 +0000
@@ -18,7 +18,7 @@
 <div><p class="copyright">Copyright © 2008 OpenedHand LTD</p></div>
 <div><p class="copyright">Copyright © 2009, 2010, 2011, 2012, 2013 Intel Corporation</p></div>
 <div><div class="legalnotice">
-<a name="idp161792"></a><p>
+<a name="idp3231312"></a><p>
         Permission is granted to copy, distribute and/or modify this
         document under the terms of the <em class="citetitle">GNU Free
         Documentation License</em>, Version 1.1 or any later
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/index.sgml cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/index.sgml
--- cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/index.sgml	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/index.sgml	2013-02-22 10:21:54.000000000 +0000
@@ -196,7 +196,6 @@
 <ANCHOR id="COGL-FEATURE-ID-MAP-BUFFER-FOR-READ:CAPS" href="cogl2/cogl2-The-Top-Level-Context.html#COGL-FEATURE-ID-MAP-BUFFER-FOR-READ:CAPS">
 <ANCHOR id="COGL-FEATURE-ID-MAP-BUFFER-FOR-WRITE:CAPS" href="cogl2/cogl2-The-Top-Level-Context.html#COGL-FEATURE-ID-MAP-BUFFER-FOR-WRITE:CAPS">
 <ANCHOR id="COGL-FEATURE-ID-MIRRORED-REPEAT:CAPS" href="cogl2/cogl2-The-Top-Level-Context.html#COGL-FEATURE-ID-MIRRORED-REPEAT:CAPS">
-<ANCHOR id="COGL-FEATURE-ID-SWAP-BUFFERS-EVENT:CAPS" href="cogl2/cogl2-The-Top-Level-Context.html#COGL-FEATURE-ID-SWAP-BUFFERS-EVENT:CAPS">
 <ANCHOR id="COGL-FEATURE-ID-GLES2-CONTEXT:CAPS" href="cogl2/cogl2-The-Top-Level-Context.html#COGL-FEATURE-ID-GLES2-CONTEXT:CAPS">
 <ANCHOR id="COGL-FEATURE-ID-DEPTH-TEXTURE:CAPS" href="cogl2/cogl2-The-Top-Level-Context.html#COGL-FEATURE-ID-DEPTH-TEXTURE:CAPS">
 <ANCHOR id="COGL-FEATURE-ID-PRESENTATION-TIME:CAPS" href="cogl2/cogl2-The-Top-Level-Context.html#COGL-FEATURE-ID-PRESENTATION-TIME:CAPS">
@@ -652,12 +651,13 @@
 <ANCHOR id="cogl-win32-onscreen-get-window" href="cogl2/cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-win32-onscreen-get-window">
 <ANCHOR id="cogl-onscreen-show" href="cogl2/cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-show">
 <ANCHOR id="cogl-onscreen-hide" href="cogl2/cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-hide">
+<ANCHOR id="CoglFrameCallback" href="cogl2/cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglFrameCallback">
+<ANCHOR id="CoglFrameClosure" href="cogl2/cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglFrameClosure">
+<ANCHOR id="cogl-onscreen-add-frame-callback" href="cogl2/cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-add-frame-callback">
+<ANCHOR id="cogl-onscreen-remove-frame-callback" href="cogl2/cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-remove-frame-callback">
 <ANCHOR id="cogl-onscreen-swap-buffers" href="cogl2/cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-swap-buffers">
 <ANCHOR id="cogl-onscreen-swap-region" href="cogl2/cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-swap-region">
 <ANCHOR id="cogl-onscreen-set-swap-throttled" href="cogl2/cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-set-swap-throttled">
-<ANCHOR id="CoglSwapBuffersNotify" href="cogl2/cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglSwapBuffersNotify">
-<ANCHOR id="cogl-onscreen-add-swap-buffers-callback" href="cogl2/cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-add-swap-buffers-callback">
-<ANCHOR id="cogl-onscreen-remove-swap-buffers-callback" href="cogl2/cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-remove-swap-buffers-callback">
 <ANCHOR id="cogl2-Offscreen-Framebuffers" href="cogl2/cogl2-Offscreen-Framebuffers.html">
 <ANCHOR id="cogl2-Offscreen-Framebuffers.synopsis" href="cogl2/cogl2-Offscreen-Framebuffers.html#cogl2-Offscreen-Framebuffers.synopsis">
 <ANCHOR id="cogl2-Offscreen-Framebuffers.description" href="cogl2/cogl2-Offscreen-Framebuffers.html#cogl2-Offscreen-Framebuffers.description">
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/ix01.html cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/ix01.html
--- cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/ix01.html	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/ix01.html	2013-02-22 10:21:54.000000000 +0000
@@ -64,7 +64,7 @@
 </table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp94256"></a>Index of all symbols</h2></div></div></div>
+<a name="idp4253792"></a>Index of all symbols</h2></div></div></div>
 <a name="idx"></a><a name="idxA"></a><h3 class="title">A</h3>
 <dt>
 <a class="link" href="cogl2-Vertex-Attributes.html#CoglAttribute" title="CoglAttribute">CoglAttribute</a>, struct in <a class="link" href="cogl2-Vertex-Attributes.html" title="Vertex Attributes">Vertex Attributes</a>
@@ -748,6 +748,14 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglFrameCallback" title="CoglFrameCallback ()">CoglFrameCallback</a>, user_function in <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html" title="CoglOnscreen: The Onscreen Framebuffer Interface">CoglOnscreen: The Onscreen Framebuffer Interface</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglFrameClosure" title="CoglFrameClosure">CoglFrameClosure</a>, struct in <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html" title="CoglOnscreen: The Onscreen Framebuffer Interface">CoglOnscreen: The Onscreen Framebuffer Interface</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="cogl2-Common-Types.html#CoglFuncPtr" title="CoglFuncPtr ()">CoglFuncPtr</a>, user_function in <a class="link" href="cogl2-Common-Types.html" title="Common Types">Common Types</a>
 </dt>
 <dd></dd>
@@ -1217,7 +1225,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-add-swap-buffers-callback" title="cogl_onscreen_add_swap_buffers_callback ()">cogl_onscreen_add_swap_buffers_callback</a>, function in <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html" title="CoglOnscreen: The Onscreen Framebuffer Interface">CoglOnscreen: The Onscreen Framebuffer Interface</a>
+<a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-add-frame-callback" title="cogl_onscreen_add_frame_callback ()">cogl_onscreen_add_frame_callback</a>, function in <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html" title="CoglOnscreen: The Onscreen Framebuffer Interface">CoglOnscreen: The Onscreen Framebuffer Interface</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1229,7 +1237,7 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-remove-swap-buffers-callback" title="cogl_onscreen_remove_swap_buffers_callback ()">cogl_onscreen_remove_swap_buffers_callback</a>, function in <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html" title="CoglOnscreen: The Onscreen Framebuffer Interface">CoglOnscreen: The Onscreen Framebuffer Interface</a>
+<a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-remove-frame-callback" title="cogl_onscreen_remove_frame_callback ()">cogl_onscreen_remove_frame_callback</a>, function in <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html" title="CoglOnscreen: The Onscreen Framebuffer Interface">CoglOnscreen: The Onscreen Framebuffer Interface</a>
 </dt>
 <dd></dd>
 <dt>
@@ -1873,10 +1881,6 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#CoglSwapBuffersNotify" title="CoglSwapBuffersNotify ()">CoglSwapBuffersNotify</a>, user_function in <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html" title="CoglOnscreen: The Onscreen Framebuffer Interface">CoglOnscreen: The Onscreen Framebuffer Interface</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="cogl2-CoglSwapChain---Describe-a-set-of-back-buffers-for-flipping-between.html#CoglSwapChain" title="CoglSwapChain">CoglSwapChain</a>, struct in <a class="link" href="cogl2-CoglSwapChain---Describe-a-set-of-back-buffers-for-flipping-between.html" title="CoglSwapChain: Describe a set of back buffers for flipping between">CoglSwapChain: Describe a set of back buffers for flipping between</a>
 </dt>
 <dd></dd>
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/ix02.html cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/ix02.html
--- cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/ix02.html	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/ix02.html	2013-02-22 10:21:54.000000000 +0000
@@ -12,28 +12,17 @@
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
-<tr valign="middle">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
 <td><a accesskey="p" href="ix01.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
 <td> </td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
 <th width="100%" align="center">Cogl 2.0 Reference Manual</th>
 <td><a accesskey="n" href="ix03.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr>
-<tr><td colspan="5" class="shortcuts"><a class="shortcut" href="#idxO">O</a></td></tr>
-</table>
+</tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp95712"></a>Index of deprecated symbols</h2></div></div></div>
-<a name="idx"></a><a name="idxO"></a><h3 class="title">O</h3>
-<dt>
-<a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-add-swap-buffers-callback" title="cogl_onscreen_add_swap_buffers_callback ()">cogl_onscreen_add_swap_buffers_callback</a>, function in <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html" title="CoglOnscreen: The Onscreen Framebuffer Interface">CoglOnscreen: The Onscreen Framebuffer Interface</a>
-</dt>
-<dd></dd>
-<dt>
-<a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html#cogl-onscreen-remove-swap-buffers-callback" title="cogl_onscreen_remove_swap_buffers_callback ()">cogl_onscreen_remove_swap_buffers_callback</a>, function in <a class="link" href="cogl2-CoglOnscreen---The-Onscreen-Framebuffer-Interface.html" title="CoglOnscreen: The Onscreen Framebuffer Interface">CoglOnscreen: The Onscreen Framebuffer Interface</a>
-</dt>
-<dd></dd>
+<a name="idp4255248"></a>Index of deprecated symbols</h2></div></div></div>
+<a name="idx"></a>
 </div>
 <div class="footer">
 <hr>
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/ix03.html cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/ix03.html
--- cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/ix03.html	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/ix03.html	2013-02-22 10:21:54.000000000 +0000
@@ -28,7 +28,7 @@
 </table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp97472"></a>Index of new symbols in 0.8</h2></div></div></div>
+<a name="idp4257008"></a>Index of new symbols in 0.8</h2></div></div></div>
 <a name="idx"></a><a name="idxB"></a><h3 class="title">B</h3>
 <dt>
 <a class="link" href="cogl2-Common-Types.html#CoglBufferTarget" title="enum CoglBufferTarget">CoglBufferTarget</a>, enum in <a class="link" href="cogl2-Common-Types.html" title="Common Types">Common Types</a>
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/ix04.html cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/ix04.html
--- cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/ix04.html	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/ix04.html	2013-02-22 10:21:54.000000000 +0000
@@ -40,7 +40,7 @@
 </table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp99184"></a>Index of new symbols in 1.0</h2></div></div></div>
+<a name="idp146928"></a>Index of new symbols in 1.0</h2></div></div></div>
 <a name="idx"></a><a name="idxA"></a><h3 class="title">A</h3>
 <dt>
 <a class="link" href="cogl2-Common-Types.html#CoglAttributeType" title="enum CoglAttributeType">CoglAttributeType</a>, enum in <a class="link" href="cogl2-Common-Types.html" title="Common Types">Common Types</a>
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/ix05.html cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/ix05.html
--- cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/ix05.html	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/ix05.html	2013-02-22 10:21:54.000000000 +0000
@@ -30,7 +30,7 @@
 </table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp100944"></a>Index of new symbols in 1.2</h2></div></div></div>
+<a name="idp148640"></a>Index of new symbols in 1.2</h2></div></div></div>
 <a name="idx"></a><a name="idxB"></a><h3 class="title">B</h3>
 <dt>
 <a class="link" href="cogl2-CoglBuffer---The-Buffer-Interface.html#CoglBufferAccess" title="enum CoglBufferAccess">CoglBufferAccess</a>, enum in <a class="link" href="cogl2-CoglBuffer---The-Buffer-Interface.html" title="CoglBuffer: The Buffer Interface">CoglBuffer: The Buffer Interface</a>
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/ix06.html cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/ix06.html
--- cogl2-1.99.1+git20130204.6d2f3bc4/doc/reference/cogl2/html/ix06.html	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/doc/reference/cogl2/html/ix06.html	2013-02-22 10:21:54.000000000 +0000
@@ -44,7 +44,7 @@
 </table>
 <div class="index">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp102704"></a>Index of new symbols in 1.4</h2></div></div></div>
+<a name="idp150352"></a>Index of new symbols in 1.4</h2></div></div></div>
 <a name="idx"></a><a name="idxA"></a><h3 class="title">A</h3>
 <dt>
 <a class="link" href="cogl2-CoglAttributeBuffer---Buffers-of-vertex-attributes.html#cogl-attribute-buffer-new" title="cogl_attribute_buffer_new ()">cogl_attribute_buffer_new</a>, function in <a class="link" href="cogl2-CoglAttributeBuffer---Buffers-of-vertex-attributes.html" title="CoglAttributeBuffer: Buffers of vertex attributes">CoglAttributeBuffer: Buffers of vertex attributes</a>
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/examples/cogl-gles2-context.c cogl2-1.99.1+git20130221.53803433/examples/cogl-gles2-context.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/examples/cogl-gles2-context.c	2013-01-04 18:11:43.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/examples/cogl-gles2-context.c	2013-02-22 10:20:11.000000000 +0000
@@ -50,20 +50,17 @@
 
     cogl_onscreen_swap_buffers (COGL_ONSCREEN (data->fb));
 
-    /* If the driver can deliver swap complete events then we can remove
-     * the idle paint callback until we next get a swap complete event
-     * otherwise we keep the idle paint callback installed and simply
-     * paint as fast as the driver will allow... */
-    if (cogl_has_feature (data->ctx, COGL_FEATURE_ID_SWAP_BUFFERS_EVENT))
-      return FALSE; /* remove the callback */
-    else
-      return TRUE;
+    return FALSE; /* remove the callback */
 }
 
 static void
-swap_complete_cb (CoglFramebuffer *framebuffer, void *user_data)
+frame_event_cb (CoglOnscreen *onscreen,
+                CoglFrameEvent event,
+                CoglFrameInfo *info,
+                void *user_data)
 {
-    g_idle_add (paint_cb, user_data);
+    if (event == COGL_FRAME_EVENT_SYNC)
+        paint_cb (user_data);
 }
 
 int
@@ -129,9 +126,10 @@
 
     g_source_attach (cogl_source, NULL);
 
-    if (cogl_has_feature (data.ctx, COGL_FEATURE_ID_SWAP_BUFFERS_EVENT))
-      cogl_onscreen_add_swap_buffers_callback (COGL_ONSCREEN (data.fb),
-                                               swap_complete_cb, &data);
+    cogl_onscreen_add_frame_callback (COGL_ONSCREEN (data.fb),
+                                      frame_event_cb,
+                                      &data,
+                                      NULL); /* destroy notify */
 
     g_idle_add (paint_cb, &data);
 
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/examples/cogl-gles2-gears.c cogl2-1.99.1+git20130221.53803433/examples/cogl-gles2-gears.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/examples/cogl-gles2-gears.c	2012-11-03 08:37:16.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/examples/cogl-gles2-gears.c	2013-02-22 10:20:11.000000000 +0000
@@ -595,20 +595,17 @@
     }else
       data->last_elapsed = elapsed;
 
-    /* If the driver can deliver swap complete events then we can remove
-     * the idle paint callback until we next get a swap complete event
-     * otherwise we keep the idle paint callback installed and simply
-     * paint as fast as the driver will allow... */
-    if (cogl_has_feature (data->ctx, COGL_FEATURE_ID_SWAP_BUFFERS_EVENT))
-      return FALSE; /* remove the callback */
-    else
-      return TRUE;
+    return FALSE; /* remove the callback */
 }
 
 static void
-swap_complete_cb (CoglFramebuffer *framebuffer, void *user_data)
+frame_event_cb (CoglOnscreen *onscreen,
+                CoglFrameEvent event,
+                CoglFrameInfo *info,
+                void *user_data)
 {
-    g_idle_add (paint_cb, user_data);
+    if (event == COGL_FRAME_EVENT_SYNC)
+        paint_cb (user_data);
 }
 
 /**
@@ -797,9 +794,10 @@
 
     g_source_attach (cogl_source, NULL);
 
-    if (cogl_has_feature (data.ctx, COGL_FEATURE_ID_SWAP_BUFFERS_EVENT))
-        cogl_onscreen_add_swap_buffers_callback (COGL_ONSCREEN (data.fb),
-                                                 swap_complete_cb, &data);
+    cogl_onscreen_add_frame_callback (COGL_ONSCREEN (data.fb),
+                                      frame_event_cb,
+                                      &data,
+                                      NULL); /* destroy notify */
 
     g_idle_add (paint_cb, &data);
 
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/examples/cogl-hello.c cogl2-1.99.1+git20130221.53803433/examples/cogl-hello.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/examples/cogl-hello.c	2013-02-06 06:50:33.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/examples/cogl-hello.c	2013-02-22 10:20:11.000000000 +0000
@@ -29,7 +29,7 @@
                 void *user_data)
 {
     if (event == COGL_FRAME_EVENT_SYNC)
-        g_idle_add (paint_cb, user_data);
+        paint_cb (user_data);
 }
 
 int
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/an.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/an.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/an.po cogl2-1.99.1+git20130221.53803433/po/an.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/an.po	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/an.po	2013-02-22 10:21:54.000000000 +0000
@@ -9,9 +9,9 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
-"PO-Revision-Date: 2011-09-24 11:25+0200\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
+"PO-Revision-Date: 2013-02-18 21:08+0100\n"
+"Last-Translator: Daniel Martinez <entaltoaragon@gmail.com>\n"
 "Language-Team: Aragonese <softaragones@googlegroups.com>\n"
 "Language: an\n"
 "MIME-Version: 1.0\n"
@@ -20,27 +20,28 @@
 
 #: cogl/cogl-debug.c:173
 msgid "Supported debug values:"
-msgstr ""
+msgstr "Valors de depuración suportaus:"
 
 #: cogl/cogl-debug.c:178
 msgid "Special debug values:"
-msgstr ""
+msgstr "Valors especials de depuración:"
 
 #: cogl/cogl-debug.c:180 cogl/cogl-debug.c:182
 msgid "Enables all non-behavioural debug options"
-msgstr ""
+msgstr "Activa todas as opcions de depuración sin comportamiento"
 
 #: cogl/cogl-debug.c:189
 msgid "Additional environment variables:"
-msgstr ""
+msgstr "Variables d'entorno adicionals:"
 
 #: cogl/cogl-debug.c:190
 msgid "Comma-separated list of GL extensions to pretend are disabled"
 msgstr ""
+"Lista d'as extensions de GL separadas por comas que se miran de desactivar"
 
 #: cogl/cogl-debug.c:192
 msgid "Override the GL version that Cogl will assume the driver supports"
-msgstr ""
+msgstr "Omitir a versión de GL que Cogl asumirá que suporta o driver"
 
 #: cogl/cogl-debug-options.h:25 cogl/cogl-debug-options.h:30
 #: cogl/cogl-debug-options.h:35 cogl/cogl-debug-options.h:40
@@ -51,107 +52,107 @@
 #: cogl/cogl-debug-options.h:168 cogl/cogl-debug-options.h:184
 #: cogl/cogl-debug-options.h:189
 msgid "Cogl Tracing"
-msgstr ""
+msgstr "Rastreo de Cogl"
 
 #: cogl/cogl-debug-options.h:27
 msgid "CoglObject references"
-msgstr ""
+msgstr "Referencias de CoglObject"
 
 #: cogl/cogl-debug-options.h:28
 msgid "Debug ref counting issues for CoglObjects"
-msgstr ""
+msgstr "Depurar problemas de conteo de referencias ta CoglObjects"
 
 #: cogl/cogl-debug-options.h:32
 msgid "Trace Texture Slicing"
-msgstr ""
+msgstr "Rastriar o troceau de texturas"
 
 #: cogl/cogl-debug-options.h:33
 msgid "debug the creation of texture slices"
-msgstr ""
+msgstr "depurar a creyación de troceau de texturas"
 
 #: cogl/cogl-debug-options.h:37
 msgid "Trace Atlas Textures"
-msgstr ""
+msgstr "Rastriar texturas atlas"
 
 #: cogl/cogl-debug-options.h:38
 msgid "Debug texture atlas management"
-msgstr ""
+msgstr "Chestión d'a depuración de texturas atlas"
 
 #: cogl/cogl-debug-options.h:42
 msgid "Trace Blend Strings"
-msgstr ""
+msgstr "Rastriar cadenas de mezclau"
 
 #: cogl/cogl-debug-options.h:43
 msgid "Debug CoglBlendString parsing"
-msgstr ""
+msgstr "Analís de depuración de CoglBlendString"
 
 #: cogl/cogl-debug-options.h:47
 msgid "Trace Journal"
-msgstr ""
+msgstr "Rastriar diario"
 
 #: cogl/cogl-debug-options.h:48
 msgid "View all the geometry passing through the journal"
-msgstr ""
+msgstr "Veyer toda a cheometría que pasa a traviés d'o diario"
 
 #: cogl/cogl-debug-options.h:52
 msgid "Trace Batching"
-msgstr ""
+msgstr "Rastriar procesau por lotes"
 
 #: cogl/cogl-debug-options.h:53
 msgid "Show how geometry is being batched in the journal"
-msgstr ""
+msgstr "Amostrar cómo se procesa por lotes a cheometría en o diario"
 
 #: cogl/cogl-debug-options.h:57
 msgid "Trace matrices"
-msgstr ""
+msgstr "Rastriar matrices"
 
 #: cogl/cogl-debug-options.h:58
 msgid "Trace all matrix manipulation"
-msgstr ""
+msgstr "Rastriar toda a manipulación de matrices"
 
 #: cogl/cogl-debug-options.h:63
 msgid "Trace Misc Drawing"
-msgstr ""
+msgstr "Rastriar dibuixau variau"
 
 #: cogl/cogl-debug-options.h:64
 msgid "Trace some misc drawing operations"
-msgstr ""
+msgstr "Rastriar qualques operacions de dibuixau variadas"
 
 #: cogl/cogl-debug-options.h:68
 msgid "Trace Pango Renderer"
-msgstr ""
+msgstr "Rastriar dibuixau Pango"
 
 #: cogl/cogl-debug-options.h:69
 msgid "Trace the Cogl Pango renderer"
-msgstr ""
+msgstr "Rastriar o dibuixau Pango de Cogl"
 
 #: cogl/cogl-debug-options.h:73
 msgid "Trace CoglTexturePixmap backend"
-msgstr ""
+msgstr "Rastriar o backend de CoglTexturePixmap"
 
 #: cogl/cogl-debug-options.h:74
 msgid "Trace the Cogl texture pixmap backend"
-msgstr ""
+msgstr "Rastriar o backend d'o mapa de pixels d'a textura de Cogl"
 
 #: cogl/cogl-debug-options.h:76 cogl/cogl-debug-options.h:81
 msgid "Visualize"
-msgstr ""
+msgstr "Visualizar"
 
 #: cogl/cogl-debug-options.h:78
 msgid "Outline rectangles"
-msgstr ""
+msgstr "Esbozar rectanglos"
 
 #: cogl/cogl-debug-options.h:79
 msgid "Add wire outlines for all rectangular geometry"
-msgstr ""
+msgstr "Adhibir trazos de linias ta toda a cheometría rectangular"
 
 #: cogl/cogl-debug-options.h:83
 msgid "Show wireframes"
-msgstr ""
+msgstr "Amostrar trazaus de linias (wireframes)"
 
 #: cogl/cogl-debug-options.h:84
 msgid "Add wire outlines for all geometry"
-msgstr ""
+msgstr "Adhibir trazos de linias ta toda a cheometría"
 
 #: cogl/cogl-debug-options.h:86 cogl/cogl-debug-options.h:91
 #: cogl/cogl-debug-options.h:96 cogl/cogl-debug-options.h:101
@@ -162,184 +163,191 @@
 #: cogl/cogl-debug-options.h:153 cogl/cogl-debug-options.h:173
 #: cogl/cogl-debug-options.h:178
 msgid "Root Cause"
-msgstr ""
+msgstr "Causa radiz"
 
 #: cogl/cogl-debug-options.h:88
 msgid "Disable Journal batching"
-msgstr ""
+msgstr "Desactivar o procesau por lotes en o diario"
 
 #: cogl/cogl-debug-options.h:89
 msgid "Disable batching of geometry in the Cogl Journal."
-msgstr ""
+msgstr "Desactivar o procesau por lotes d'a cheometría en o diario de Cogl."
 
 #: cogl/cogl-debug-options.h:93
 msgid "Disable GL Vertex Buffers"
-msgstr ""
+msgstr "Desactivar os búferes vertex de GL"
 
 #: cogl/cogl-debug-options.h:94
 msgid "Disable use of OpenGL vertex buffer objects"
-msgstr ""
+msgstr "Desactivar l'uso d'obchectos de búfer vertex d'OpenGL"
 
 #: cogl/cogl-debug-options.h:98
 msgid "Disable GL Pixel Buffers"
-msgstr ""
+msgstr "Desactivar os búferes de pixel GL"
 
 #: cogl/cogl-debug-options.h:99
 msgid "Disable use of OpenGL pixel buffer objects"
-msgstr ""
+msgstr "Desactivar l'uso d'obchectos de búfer de pixels d'OpenGL"
 
 #: cogl/cogl-debug-options.h:103
 msgid "Disable software rect transform"
-msgstr ""
+msgstr "Desactivar a transformación de rectas por software"
 
 #: cogl/cogl-debug-options.h:104
 msgid "Use the GPU to transform rectangular geometry"
-msgstr ""
+msgstr "Usar a GPU ta transformar cheometría rectangular"
 
 #: cogl/cogl-debug-options.h:106
 msgid "Cogl Specialist"
-msgstr ""
+msgstr "Especialista de Cogl"
 
 #: cogl/cogl-debug-options.h:108
 msgid "Dump atlas images"
-msgstr ""
+msgstr "Vulcar atlas d'imachens"
 
 #: cogl/cogl-debug-options.h:109
 msgid "Dump texture atlas changes to an image file"
-msgstr ""
+msgstr "Vulcar cambeos en a textura d'atlas a un fichero d'imachen"
 
 #: cogl/cogl-debug-options.h:113
 msgid "Disable texture atlasing"
-msgstr ""
+msgstr "Desactivar os atlas de texturas"
 
 #: cogl/cogl-debug-options.h:114
 msgid "Disable use of texture atlasing"
-msgstr ""
+msgstr "Desactivar l'uso d'atlas de texturas"
 
 #: cogl/cogl-debug-options.h:118
 msgid "Disable sharing the texture atlas between text and images"
-msgstr ""
+msgstr "Desactivar a compartición d'atlas de texturas entre texto y imachens"
 
 #: cogl/cogl-debug-options.h:119
 msgid ""
 "When this is set the glyph cache will always use a separate texture for its "
 "atlas. Otherwise it will try to share the atlas with images."
 msgstr ""
+"Quan isto ye establiu, a caché de glyph usará siempre una textura separada "
+"ta la suya atlas. D'unatro modo, intentará compartir l'atlas con as imachens."
 
 #: cogl/cogl-debug-options.h:124
 msgid "Disable texturing"
-msgstr ""
+msgstr "Desactivar texturizau"
 
 #: cogl/cogl-debug-options.h:125
 msgid "Disable texturing any primitives"
-msgstr ""
+msgstr "Desactivar o texturizau de qualsiquier primitiva"
 
 #: cogl/cogl-debug-options.h:129
 msgid "Disable arbfp"
-msgstr ""
+msgstr "Desactivar arbfp"
 
 #: cogl/cogl-debug-options.h:130
 msgid "Disable use of ARB fragment programs"
-msgstr ""
+msgstr "Desactivar l'uso de programas de fragmentos ARB"
 
 #: cogl/cogl-debug-options.h:134
 msgid "Disable fixed"
-msgstr ""
+msgstr "Desactivar a función fixa"
 
 #: cogl/cogl-debug-options.h:135
 msgid "Disable use of the fixed function pipeline backend"
-msgstr ""
+msgstr "Desactivar l'uso d'o backend d'a canyería d'a función fixa"
 
 #: cogl/cogl-debug-options.h:139
 msgid "Disable GLSL"
-msgstr ""
+msgstr "Desactivar GLSL"
 
 #: cogl/cogl-debug-options.h:140
 msgid "Disable use of GLSL"
-msgstr ""
+msgstr "Desactivar l'uso de GLSL"
 
 #: cogl/cogl-debug-options.h:144
 msgid "Disable blending"
-msgstr ""
+msgstr "Desactivar la mezcla"
 
 #: cogl/cogl-debug-options.h:145
 msgid "Disable use of blending"
-msgstr ""
+msgstr "Desactivar l'uso de la mezcla"
 
 #: cogl/cogl-debug-options.h:149
 msgid "Disable non-power-of-two textures"
-msgstr ""
+msgstr "Desactivar as texturas que no sían potencias de dos"
 
 #: cogl/cogl-debug-options.h:150
 msgid ""
 "Makes Cogl think that the GL driver doesn't support NPOT textures so that it "
 "will create sliced textures or textures with waste instead."
 msgstr ""
+"Fa que Cogl creya que o driver de GL no suporta texturas NPOT, por o que "
+"creyará texturas troceadas u texturas con residuos"
 
 #: cogl/cogl-debug-options.h:155
 msgid "Disable software clipping"
-msgstr ""
+msgstr "Desactivar rectorte software"
 
 #: cogl/cogl-debug-options.h:156
 msgid "Disables Cogl's attempts to clip some rectangles in software."
 msgstr ""
+"Desactiva os intentos de Cogl de retallar qualques rectanglos en software."
 
 #: cogl/cogl-debug-options.h:160
 msgid "Show source"
-msgstr ""
+msgstr "Amostrar fuent"
 
 #: cogl/cogl-debug-options.h:161
 msgid "Show generated ARBfp/GLSL source code"
-msgstr ""
+msgstr "Amostrar o codigo fuent ARBfp/GLSL chenerau"
 
 #: cogl/cogl-debug-options.h:165
 msgid "Trace some OpenGL"
-msgstr ""
+msgstr "Rastriar qualques OpenGL"
 
 #: cogl/cogl-debug-options.h:166
 msgid "Traces some select OpenGL calls"
-msgstr ""
+msgstr "Rastrea qualques gritadas OpenGL seleccionadas"
 
 #: cogl/cogl-debug-options.h:170
 msgid "Trace offscreen support"
-msgstr ""
+msgstr "Rastriar suporte ta difuera d'a pantalla"
 
 #: cogl/cogl-debug-options.h:171
 msgid "Debug offscreen support"
-msgstr ""
+msgstr "Depurar suporte ta difuera d'a pantalla"
 
 #: cogl/cogl-debug-options.h:175
 msgid "Disable program caches"
-msgstr ""
+msgstr "Desactivar as cachés d'os programas"
 
 #: cogl/cogl-debug-options.h:176
 msgid "Disable fallback caches for arbfp and glsl programs"
-msgstr ""
+msgstr "Desactivar as cachés alternativas ta programas arbfp y glsl"
 
 #: cogl/cogl-debug-options.h:180
 msgid "Disable read pixel optimization"
-msgstr ""
+msgstr "Desactivar optimización de lectura de pixel"
 
 #: cogl/cogl-debug-options.h:181
 msgid ""
 "Disable optimization for reading 1px for simple scenes of opaque rectangles"
 msgstr ""
+"Desactivar a optimización de lectura de 1px ta scenas simplas de rectanglos "
+"opacos"
 
 #: cogl/cogl-debug-options.h:186
 msgid "Trace clipping"
-msgstr ""
+msgstr "Rastriar retalles"
 
 #: cogl/cogl-debug-options.h:187
 msgid "Logs information about how Cogl is implementing clipping"
-msgstr ""
+msgstr "Información d'os rechistros sobre cómo implementa Cogl los retalles"
 
 #: cogl/cogl-debug-options.h:191
 msgid "Trace performance concerns"
-msgstr ""
+msgstr "Rastriar problemas de rendimiento"
 
 #: cogl/cogl-debug-options.h:192
 msgid "Tries to highlight sub-optimal Cogl usage."
-msgstr ""
+msgstr "Intenta resaltar l'uso no optimo de Cogl"
 
 #~ msgid "Cogl debugging flags to set"
 #~ msgstr "Opcions de depuracion de Colg que activar"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/ar.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/ar.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/ar.po cogl2-1.99.1+git20130221.53803433/po/ar.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/ar.po	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/ar.po	2013-02-22 10:21:54.000000000 +0000
@@ -7,7 +7,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2011-09-03 00:31+0300\n"
 "Last-Translator: Abdalrahim G. Fakhouri <abdilra7eem@yahoo.com>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/as.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/as.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/as.po cogl2-1.99.1+git20130221.53803433/po/as.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/as.po	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/as.po	2013-02-22 10:21:54.000000000 +0000
@@ -9,7 +9,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-08-08 13:28+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
 "Language-Team: as_IN <kde-i18n-doc@kde.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/ast.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/ast.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/ast.po cogl2-1.99.1+git20130221.53803433/po/ast.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/ast.po	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/ast.po	2013-02-22 10:21:54.000000000 +0000
@@ -7,7 +7,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2011-09-11 18:52+0200\n"
 "Last-Translator: Xandru Armesto <xandru@softastur.org>\n"
 "Language-Team: Softastur <alministradores@softastur.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/be.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/be.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/be.po cogl2-1.99.1+git20130221.53803433/po/be.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/be.po	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/be.po	2013-02-22 10:21:54.000000000 +0000
@@ -5,7 +5,7 @@
 "Project-Id-Version: cogl.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-09-09 14:28+0300\n"
 "Last-Translator: Kasia Bondarava <kasia.bondarava@gmail.com>\n"
 "Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/bg.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/bg.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/bg.po cogl2-1.99.1+git20130221.53803433/po/bg.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/bg.po	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/bg.po	2013-02-22 10:21:54.000000000 +0000
@@ -9,7 +9,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-09-19 21:11+0300\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/ca.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/ca.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/ca.po cogl2-1.99.1+git20130221.53803433/po/ca.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/ca.po	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/ca.po	2013-02-22 10:21:54.000000000 +0000
@@ -10,7 +10,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-08-30 01:07+0200\n"
 "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/ca@valencia.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/ca@valencia.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/ca@valencia.po cogl2-1.99.1+git20130221.53803433/po/ca@valencia.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/ca@valencia.po	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/ca@valencia.po	2013-02-22 10:21:54.000000000 +0000
@@ -10,7 +10,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-08-30 01:07+0200\n"
 "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/cogl.pot cogl2-1.99.1+git20130221.53803433/po/cogl.pot
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/cogl.pot	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/cogl.pot	2013-02-22 10:21:54.000000000 +0000
@@ -9,7 +9,7 @@
 "Project-Id-Version: cogl 1.99.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/cs.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/cs.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/cs.po cogl2-1.99.1+git20130221.53803433/po/cs.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/cs.po	2013-02-08 12:16:08.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/cs.po	2013-02-22 10:21:54.000000000 +0000
@@ -10,7 +10,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-10-01 20:21+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/da.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/da.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/da.po cogl2-1.99.1+git20130221.53803433/po/da.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/da.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/da.po	2013-02-22 10:21:54.000000000 +0000
@@ -10,7 +10,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-09-16 00:17+0200\n"
 "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/de.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/de.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/de.po cogl2-1.99.1+git20130221.53803433/po/de.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/de.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/de.po	2013-02-22 10:21:54.000000000 +0000
@@ -12,7 +12,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-09-23 14:16+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/el.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/el.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/el.po cogl2-1.99.1+git20130221.53803433/po/el.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/el.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/el.po	2013-02-22 10:21:54.000000000 +0000
@@ -12,7 +12,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-12-23 18:56+0300\n"
 "Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>\n"
 "Language-Team: team@gnome.gr\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/en_CA.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/en_CA.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/en_CA.po cogl2-1.99.1+git20130221.53803433/po/en_CA.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/en_CA.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/en_CA.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2011-09-16 19:12-0400\n"
 "Last-Translator: Tiffany Antopolski <tiffany.antopolski@gmail.com>\n"
 "Language-Team: Canadian English\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/en_GB.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/en_GB.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/en_GB.po cogl2-1.99.1+git20130221.53803433/po/en_GB.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/en_GB.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/en_GB.po	2013-02-22 10:21:55.000000000 +0000
@@ -7,7 +7,7 @@
 "Project-Id-Version: cogl\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-09-05 19:32+0100\n"
 "Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
 "Language-Team: British English <en@li.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/eo.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/eo.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/eo.po cogl2-1.99.1+git20130221.53803433/po/eo.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/eo.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/eo.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-06-07 21:23+0200\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
 "Language-Team: Esperanto <gnome-l10n-eo@lists.launchpad.net>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/es.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/es.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/es.po cogl2-1.99.1+git20130221.53803433/po/es.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/es.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/es.po	2013-02-22 10:21:55.000000000 +0000
@@ -9,7 +9,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-12-16 20:30+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/eu.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/eu.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/eu.po cogl2-1.99.1+git20130221.53803433/po/eu.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/eu.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/eu.po	2013-02-22 10:21:55.000000000 +0000
@@ -9,7 +9,7 @@
 "Project-Id-Version: cogl.po.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2011-09-16 16:44+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/fa.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/fa.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/fa.po cogl2-1.99.1+git20130221.53803433/po/fa.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/fa.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/fa.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2011-09-06 11:26+0330\n"
 "Last-Translator: Arash Mousavi <mousavi.arash@gmail.com>\n"
 "Language-Team: Persian\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/fr.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/fr.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/fr.po cogl2-1.99.1+git20130221.53803433/po/fr.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/fr.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/fr.po	2013-02-22 10:21:55.000000000 +0000
@@ -10,7 +10,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-09-06 17:14+0200\n"
 "Last-Translator: Pierre Henry <pierrehenry73@yahoo.fr>\n"
 "Language-Team: GNOME French team <gnomefr@traduc.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/gl.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/gl.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/gl.po cogl2-1.99.1+git20130221.53803433/po/gl.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/gl.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/gl.po	2013-02-22 10:21:55.000000000 +0000
@@ -12,7 +12,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-09-26 01:29+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: gnome-l10n-gl@gnome.org\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/he.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/he.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/he.po cogl2-1.99.1+git20130221.53803433/po/he.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/he.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/he.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: Cogl\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-12-28 13:28+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <sh.yaron@gmail.com>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/hi.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/hi.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/hi.po cogl2-1.99.1+git20130221.53803433/po/hi.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/hi.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/hi.po	2013-02-22 10:21:55.000000000 +0000
@@ -9,7 +9,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-09-19 17:46+0530\n"
 "Last-Translator: rajesh <rajeshkajha@yahoo.com>\n"
 "Language-Team: Hindi <kde-i18n-doc@kde.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/hu.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/hu.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/hu.po cogl2-1.99.1+git20130221.53803433/po/hu.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/hu.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/hu.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-09-05 00:49+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/id.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/id.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/id.po cogl2-1.99.1+git20130221.53803433/po/id.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/id.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/id.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-08-21 14:37+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <gnome@i15n.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/it.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/it.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/it.po cogl2-1.99.1+git20130221.53803433/po/it.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/it.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/it.po	2013-02-22 10:21:55.000000000 +0000
@@ -9,7 +9,7 @@
 "Project-Id-Version: cogl\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-09-29 18:01+0200\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/ja.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/ja.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/ja.po cogl2-1.99.1+git20130221.53803433/po/ja.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/ja.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/ja.po	2013-02-22 10:21:55.000000000 +0000
@@ -10,7 +10,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-09-22 07:50+0900\n"
 "Last-Translator: Nishio Futoshi <fut_nis@d3.dion.ne.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/km.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/km.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/km.po cogl2-1.99.1+git20130221.53803433/po/km.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/km.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/km.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: cogl.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-01-24 11:14+0700\n"
 "Last-Translator: Seng Sutha <sutha@khmeros.info>\n"
 "Language-Team: Khmer <supprot@khmeros.info>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/kn.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/kn.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/kn.po cogl2-1.99.1+git20130221.53803433/po/kn.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/kn.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/kn.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2011-09-05 13:03+0530\n"
 "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
 "Language-Team: Kannada <kn@li.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/ko.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/ko.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/ko.po cogl2-1.99.1+git20130221.53803433/po/ko.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/ko.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/ko.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2011-12-06 20:34+0900\n"
 "Last-Translator: Seong-ho, Cho <darkcircle.0426@gmail.com>\n"
 "Language-Team: Korean <gnome-kr@googlegroups.com>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/lt.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/lt.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/lt.po cogl2-1.99.1+git20130221.53803433/po/lt.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/lt.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/lt.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-08-28 21:59+0300\n"
 "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
 "Language-Team: Lithuanian <gnome-lt@lists.akl.lt>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/lv.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/lv.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/lv.po cogl2-1.99.1+git20130221.53803433/po/lv.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/lv.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/lv.po	2013-02-22 10:21:55.000000000 +0000
@@ -7,7 +7,7 @@
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-09-26 00:58+0300\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/ml.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/ml.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/ml.po cogl2-1.99.1+git20130221.53803433/po/ml.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/ml.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/ml.po	2013-02-22 10:21:55.000000000 +0000
@@ -7,7 +7,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-09-20 19:26+0530\n"
 "Last-Translator: Anish A <aneesh.nl@gmail.com>\n"
 "Language-Team: Swatantra Malayalam Computing\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/nb.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/nb.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/nb.po cogl2-1.99.1+git20130221.53803433/po/nb.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/nb.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/nb.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: cogl 1.11.x\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-07-10 13:30+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/nl.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/nl.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/nl.po cogl2-1.99.1+git20130221.53803433/po/nl.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/nl.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/nl.po	2013-02-22 10:21:55.000000000 +0000
@@ -9,7 +9,7 @@
 "Project-Id-Version: Cogl\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2011-09-06 00:51+0200\n"
 "Last-Translator: Wouter Bolsterlee <wbolster@gnome.org>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/or.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/or.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/or.po cogl2-1.99.1+git20130221.53803433/po/or.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/or.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/or.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2011-09-09 11:10+0530\n"
 "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
 "Language-Team: Oriya <or@li.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/pa.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/pa.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/pa.po cogl2-1.99.1+git20130221.53803433/po/pa.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/pa.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/pa.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-08-17 07:27+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/pl.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/pl.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/pl.po cogl2-1.99.1+git20130221.53803433/po/pl.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/pl.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/pl.po	2013-02-22 10:21:55.000000000 +0000
@@ -4,15 +4,15 @@
 # pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
 # gnomepl@aviary.pl
 # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Piotr Drąg <piotrdrag@gmail.com>, 2011-2012.
-# Aviary.pl <gnomepl@aviary.pl>, 2011-2012.
+# Piotr Drąg <piotrdrag@gmail.com>, 2011-2013.
+# Aviary.pl <gnomepl@aviary.pl>, 2011-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: cogl\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
-"PO-Revision-Date: 2012-12-16 03:45+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
+"PO-Revision-Date: 2013-02-16 21:20+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -286,7 +286,7 @@
 "will create sliced textures or textures with waste instead."
 msgstr ""
 "Sprawia, że biblioteka Cogl uważa, że sterownik GL nie obsługuje tekstur "
-"NPOT, więc zamiast tego tworzy podzielone tekstury lub tekstury ze stratą"
+"NPOT, więc zamiast tego tworzy podzielone tekstury lub tekstury ze stratą."
 
 #: cogl/cogl-debug-options.h:155
 msgid "Disable software clipping"
@@ -357,115 +357,3 @@
 #: cogl/cogl-debug-options.h:192
 msgid "Tries to highlight sub-optimal Cogl usage."
 msgstr "Próbuje wyróżnić nieoptymalne użycie biblioteki Cogl."
-
-#~ msgid "Could not allocate %lu bytes to read file \"%s\""
-#~ msgstr "Nie można przydzielić %lu bajtów do odczytu pliku \"%s\""
-
-#~ msgid "Error reading file '%s': %s"
-#~ msgstr "Błąd podczas odczytu pliku \"%s\": %s"
-
-#~ msgid "File \"%s\" is too large"
-#~ msgstr "Plik \"%s\" jest za duży"
-
-#~ msgid "Failed to read from file '%s': %s"
-#~ msgstr "Odczytanie z pliku \"%s\" się nie powiodło: %s"
-
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "Otwarcie pliku \"%s\" się nie powiodło: %s"
-
-#~ msgid "Failed to get attributes of file '%s': fstat() failed: %s"
-#~ msgstr ""
-#~ "Uzyskanie atrybutów pliku \"%s\" się nie powiodło: funkcja fstat() "
-#~ "zwróciła błąd: %s"
-
-#~ msgid "Failed to open file '%s': fdopen() failed: %s"
-#~ msgstr ""
-#~ "Otwarcie pliku \"%s\" się nie powiodło: funkcja fdopen() zwróciła błąd: %s"
-
-#~ msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s"
-#~ msgstr ""
-#~ "Zmiana nazwy pliku \"%s\" na \"%s\" się nie powiodła: funkcja g_rename() "
-#~ "zwróciła błąd: %s"
-
-#~ msgid "Failed to create file '%s': %s"
-#~ msgstr "Utworzenie pliku \"%s\" się nie powiodło: %s"
-
-#~ msgid "Failed to open file '%s' for writing: fdopen() failed: %s"
-#~ msgstr ""
-#~ "Otwarcie pliku \"%s\" do zapisu się nie powiodło: funkcja fdopen() "
-#~ "zwróciła błąd: %s"
-
-#~ msgid "Failed to write file '%s': fwrite() failed: %s"
-#~ msgstr ""
-#~ "Zapisanie pliku \"%s\" się nie powiodło: funkcja fwrite() zwróciła błąd: "
-#~ "%s"
-
-#~ msgid "Failed to write file '%s': fflush() failed: %s"
-#~ msgstr ""
-#~ "Zapisanie pliku \"%s\" się nie powiodło: funkcja fflush() zwróciła błąd: "
-#~ "%s"
-
-#~ msgid "Failed to write file '%s': fsync() failed: %s"
-#~ msgstr ""
-#~ "Zapisanie pliku \"%s\" się nie powiodło: funkcja fsync() zwróciła błąd: %s"
-
-#~ msgid "Failed to close file '%s': fclose() failed: %s"
-#~ msgstr ""
-#~ "Zamknięcie pliku \"%s\" się nie powiodło: funkcja fclose() zwróciła błąd: "
-#~ "%s"
-
-#~ msgid "Existing file '%s' could not be removed: g_unlink() failed: %s"
-#~ msgstr ""
-#~ "Nie można usunąć istniejącego pliku \"%s\": funkcja g_unlink() zwróciła "
-#~ "błąd: %s"
-
-#~ msgid "Template '%s' invalid, should not contain a '%s'"
-#~ msgstr "Szablon \"%s\" jest nieprawidłowy, nie powinien on zawierać \"%s\""
-
-#~ msgid "Template '%s' doesn't contain XXXXXX"
-#~ msgstr "Szablon \"%s\" nie zawiera XXXXXX"
-
-#~ msgid "%.1f KiB"
-#~ msgstr "%.1f KiB"
-
-#~ msgid "%.1f MiB"
-#~ msgstr "%.1f MiB"
-
-#~ msgid "%.1f GiB"
-#~ msgstr "%.1f GiB"
-
-#~ msgid "%.1f TiB"
-#~ msgstr "%.1f TiB"
-
-#~ msgid "%.1f PiB"
-#~ msgstr "%.1f PiB"
-
-#~ msgid "%.1f EiB"
-#~ msgstr "%.1f EiB"
-
-#~ msgid "%.1f kB"
-#~ msgstr "%.1f kB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid "%.1f GB"
-#~ msgstr "%.1f GB"
-
-#~ msgid "%.1f TB"
-#~ msgstr "%.1f TB"
-
-#~ msgid "%.1f PB"
-#~ msgstr "%.1f PB"
-
-#~ msgid "%.1f EB"
-#~ msgstr "%.1f EB"
-
-#~ msgid "%.1f KB"
-#~ msgstr "%.1f KB"
-
-#~ msgid "Failed to read the symbolic link '%s': %s"
-#~ msgstr "Odczytanie dowiązania symbolicznego \"%s\" się nie powiodło: %s"
-
-#~ msgid "Symbolic links not supported"
-#~ msgstr "Dowiązania symboliczne nie są obsługiwane"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/pt.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/pt.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/pt.po cogl2-1.99.1+git20130221.53803433/po/pt.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/pt.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/pt.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: 3.6\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-08-19 22:35+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/pt_BR.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/pt_BR.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/pt_BR.po cogl2-1.99.1+git20130221.53803433/po/pt_BR.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/pt_BR.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/pt_BR.po	2013-02-22 10:21:55.000000000 +0000
@@ -11,7 +11,7 @@
 "Project-Id-Version: cogl\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-09-12 17:13-0300\n"
 "Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Português do Brasil <gnome-pt_br-list@gnome.com>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/ru.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/ru.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/ru.po cogl2-1.99.1+git20130221.53803433/po/ru.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/ru.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/ru.po	2013-02-22 10:21:55.000000000 +0000
@@ -10,7 +10,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-09-23 20:09+0400\n"
 "Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
 "Language-Team: русский <gnome-cyr@gnome.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/sl.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/sl.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/sl.po cogl2-1.99.1+git20130221.53803433/po/sl.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/sl.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/sl.po	2013-02-22 10:21:55.000000000 +0000
@@ -11,7 +11,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-08-07 09:19+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/sr.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/sr.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/sr.po cogl2-1.99.1+git20130221.53803433/po/sr.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/sr.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/sr.po	2013-02-22 10:21:55.000000000 +0000
@@ -7,7 +7,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2013-01-17 09:34+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/sr@latin.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/sr@latin.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/sr@latin.po cogl2-1.99.1+git20130221.53803433/po/sr@latin.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/sr@latin.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/sr@latin.po	2013-02-22 10:21:55.000000000 +0000
@@ -7,7 +7,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2013-01-17 09:34+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/sv.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/sv.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/sv.po cogl2-1.99.1+git20130221.53803433/po/sv.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/sv.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/sv.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: cogl\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-04-01 20:24+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/ta.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/ta.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/ta.po cogl2-1.99.1+git20130221.53803433/po/ta.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/ta.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/ta.po	2013-02-22 10:21:55.000000000 +0000
@@ -10,7 +10,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-09-20 10:51+0530\n"
 "Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
 "Language-Team: Tamil <ta@li.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/te.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/te.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/te.po cogl2-1.99.1+git20130221.53803433/po/te.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/te.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/te.po	2013-02-22 10:21:55.000000000 +0000
@@ -9,7 +9,7 @@
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-08-14 12:37+0530\n"
 "Last-Translator: Krishnababu Krothapalli <kkrothap@redhat.com>\n"
 "Language-Team: Telugu <indlinux-telugu@lists.sourceforge.net>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/th.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/th.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/th.po cogl2-1.99.1+git20130221.53803433/po/th.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/th.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/th.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: cogl cogl-1.12\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-10-15 13:01+0700\n"
 "Last-Translator: Unticha Pramgoed <unticha@gmail.com>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/tr.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/tr.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/tr.po cogl2-1.99.1+git20130221.53803433/po/tr.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/tr.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/tr.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2011-11-16 11:01+0200\n"
 "Last-Translator: Muhammet Kara <muhammet.k@gmail.com>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/ug.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/ug.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/ug.po cogl2-1.99.1+git20130221.53803433/po/ug.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/ug.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/ug.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: cogl\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2013-01-30 19:07+0900\n"
 "Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/uk.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/uk.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/uk.po cogl2-1.99.1+git20130221.53803433/po/uk.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/uk.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/uk.po	2013-02-22 10:21:55.000000000 +0000
@@ -7,7 +7,7 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-02-26 15:43+0300\n"
 "Last-Translator: Korostil Daniel <ted.korostiled@gmail.com>\n"
 "Language-Team: translation@linux.org.ua\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/vi.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/vi.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/vi.po cogl2-1.99.1+git20130221.53803433/po/vi.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/vi.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/vi.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2011-10-02 11:02+1100\n"
 "Last-Translator: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/zh_CN.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/zh_CN.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/zh_CN.po cogl2-1.99.1+git20130221.53803433/po/zh_CN.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/zh_CN.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/zh_CN.po	2013-02-22 10:21:55.000000000 +0000
@@ -11,7 +11,7 @@
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-09-23 12:50+0800\n"
 "Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/zh_HK.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/zh_HK.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/zh_HK.po cogl2-1.99.1+git20130221.53803433/po/zh_HK.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/zh_HK.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/zh_HK.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: cogl 2.0.0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-08-07 13:19+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
Binary files /tmp/T4V1qGwwLN/cogl2-1.99.1+git20130204.6d2f3bc4/po/zh_TW.gmo and /tmp/ci03lMYPed/cogl2-1.99.1+git20130221.53803433/po/zh_TW.gmo differ
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/po/zh_TW.po cogl2-1.99.1+git20130221.53803433/po/zh_TW.po
--- cogl2-1.99.1+git20130204.6d2f3bc4/po/zh_TW.po	2013-02-08 12:16:09.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/po/zh_TW.po	2013-02-22 10:21:55.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: cogl 2.0.0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2013-02-08 13:16+0100\n"
+"POT-Creation-Date: 2013-02-22 11:21+0100\n"
 "PO-Revision-Date: 2012-08-02 19:02+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Taiwan) <chinese-l10n@googlegroups.com>\n"
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/tests/conform/Makefile.am cogl2-1.99.1+git20130221.53803433/tests/conform/Makefile.am
--- cogl2-1.99.1+git20130204.6d2f3bc4/tests/conform/Makefile.am	2013-01-25 14:55:38.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/tests/conform/Makefile.am	2013-02-22 10:20:11.000000000 +0000
@@ -62,6 +62,7 @@
 	test-texture-get-set-data.c \
 	test-texture-mipmap-get-set.c \
 	test-framebuffer-get-bits.c \
+	test-primitive-and-journal.c \
 	$(NULL)
 
 test_conformance_SOURCES = $(common_sources) $(test_sources)
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/tests/conform/Makefile.in cogl2-1.99.1+git20130221.53803433/tests/conform/Makefile.in
--- cogl2-1.99.1+git20130204.6d2f3bc4/tests/conform/Makefile.in	2013-02-08 12:15:04.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/tests/conform/Makefile.in	2013-02-22 10:20:49.000000000 +0000
@@ -128,6 +128,7 @@
 	test_conformance-test-texture-get-set-data.$(OBJEXT) \
 	test_conformance-test-texture-mipmap-get-set.$(OBJEXT) \
 	test_conformance-test-framebuffer-get-bits.$(OBJEXT) \
+	test_conformance-test-primitive-and-journal.$(OBJEXT) \
 	$(am__objects_1)
 am_test_conformance_OBJECTS = $(am__objects_2) $(am__objects_3)
 test_conformance_OBJECTS = $(am_test_conformance_OBJECTS)
@@ -490,6 +491,7 @@
 	test-texture-get-set-data.c \
 	test-texture-mipmap-get-set.c \
 	test-framebuffer-get-bits.c \
+	test-primitive-and-journal.c \
 	$(NULL)
 
 test_conformance_SOURCES = $(common_sources) $(test_sources)
@@ -606,6 +608,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-point-size.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-point-sprite.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-premult.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-primitive-and-journal.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-primitive.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-read-texture-formats.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-snippets.Po@am__quote@
@@ -1173,6 +1176,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_conformance_CFLAGS) $(CFLAGS) -c -o test_conformance-test-framebuffer-get-bits.obj `if test -f 'test-framebuffer-get-bits.c'; then $(CYGPATH_W) 'test-framebuffer-get-bits.c'; else $(CYGPATH_W) '$(srcdir)/test-framebuffer-get-bits.c'; fi`
 
+test_conformance-test-primitive-and-journal.o: test-primitive-and-journal.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_conformance_CFLAGS) $(CFLAGS) -MT test_conformance-test-primitive-and-journal.o -MD -MP -MF $(DEPDIR)/test_conformance-test-primitive-and-journal.Tpo -c -o test_conformance-test-primitive-and-journal.o `test -f 'test-primitive-and-journal.c' || echo '$(srcdir)/'`test-primitive-and-journal.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_conformance-test-primitive-and-journal.Tpo $(DEPDIR)/test_conformance-test-primitive-and-journal.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-primitive-and-journal.c' object='test_conformance-test-primitive-and-journal.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_conformance_CFLAGS) $(CFLAGS) -c -o test_conformance-test-primitive-and-journal.o `test -f 'test-primitive-and-journal.c' || echo '$(srcdir)/'`test-primitive-and-journal.c
+
+test_conformance-test-primitive-and-journal.obj: test-primitive-and-journal.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_conformance_CFLAGS) $(CFLAGS) -MT test_conformance-test-primitive-and-journal.obj -MD -MP -MF $(DEPDIR)/test_conformance-test-primitive-and-journal.Tpo -c -o test_conformance-test-primitive-and-journal.obj `if test -f 'test-primitive-and-journal.c'; then $(CYGPATH_W) 'test-primitive-and-journal.c'; else $(CYGPATH_W) '$(srcdir)/test-primitive-and-journal.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_conformance-test-primitive-and-journal.Tpo $(DEPDIR)/test_conformance-test-primitive-and-journal.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test-primitive-and-journal.c' object='test_conformance-test-primitive-and-journal.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_conformance_CFLAGS) $(CFLAGS) -c -o test_conformance-test-primitive-and-journal.obj `if test -f 'test-primitive-and-journal.c'; then $(CYGPATH_W) 'test-primitive-and-journal.c'; else $(CYGPATH_W) '$(srcdir)/test-primitive-and-journal.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/tests/conform/test-conform-main.c cogl2-1.99.1+git20130221.53803433/tests/conform/test-conform-main.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/tests/conform/test-conform-main.c	2013-02-06 06:50:33.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/tests/conform/test-conform-main.c	2013-02-22 10:20:11.000000000 +0000
@@ -118,6 +118,8 @@
 
   ADD_TEST (test_map_buffer_range, TEST_REQUIREMENT_MAP_WRITE, 0);
 
+  ADD_TEST (test_primitive_and_journal, 0, 0);
+
   UNPORTED_TEST (test_viewport);
 
   ADD_TEST (test_gles2_context, TEST_REQUIREMENT_GLES2_CONTEXT, 0);
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/tests/conform/test-gles2-context.c cogl2-1.99.1+git20130221.53803433/tests/conform/test-gles2-context.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/tests/conform/test-gles2-context.c	2013-01-04 18:11:43.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/tests/conform/test-gles2-context.c	2013-02-22 10:20:11.000000000 +0000
@@ -277,7 +277,7 @@
   CoglGLES2Context *gles2_ctx;
   const CoglGLES2Vtable *gles2;
   CoglError *error = NULL;
-  GLubyte pixel[3];
+  GLubyte pixel[4];
   GLuint fbo_handle;
 
   create_gles2_context (&offscreen_texture,
@@ -299,11 +299,9 @@
 
   gles2->glClearColor (1, 0, 0, 1);
   gles2->glClear (GL_COLOR_BUFFER_BIT);
-  gles2->glReadPixels (0, 0, 1, 1, GL_RGB, GL_UNSIGNED_BYTE, &pixel);
+  gles2->glReadPixels (0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel);
 
-  g_assert (pixel[0] == 0xff);
-  g_assert (pixel[1] == 0);
-  g_assert (pixel[2] == 0);
+  test_utils_compare_pixel (pixel, 0xff0000ff);
 
   fbo_handle = create_gles2_framebuffer (gles2, 256, 256);
 
@@ -311,21 +309,17 @@
 
   gles2->glClearColor (0, 1, 0, 1);
   gles2->glClear (GL_COLOR_BUFFER_BIT);
-  gles2->glReadPixels (0, 0, 1, 1, GL_RGB, GL_UNSIGNED_BYTE, &pixel);
+  gles2->glReadPixels (0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel);
 
-  g_assert (pixel[0] == 0);
-  g_assert (pixel[1] == 0xff);
-  g_assert (pixel[2] == 0);
+  test_utils_compare_pixel (pixel, 0x00ff00ff);
 
   gles2->glBindFramebuffer (GL_FRAMEBUFFER, 0);
 
   gles2->glClearColor (0, 1, 1, 1);
   gles2->glClear (GL_COLOR_BUFFER_BIT);
-  gles2->glReadPixels (0, 0, 1, 1, GL_RGB, GL_UNSIGNED_BYTE, &pixel);
+  gles2->glReadPixels (0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel);
 
-  g_assert (pixel[0] == 0);
-  g_assert (pixel[1] == 0xff);
-  g_assert (pixel[2] == 0xff);
+  test_utils_compare_pixel (pixel, 0x00ffffff);
 
   cogl_pop_gles2_context (test_ctx);
 
@@ -341,11 +335,9 @@
       g_error ("Failed to push gles2 context: %s\n", error->message);
     }
 
-  gles2->glReadPixels (0, 0, 1, 1, GL_RGB, GL_UNSIGNED_BYTE, &pixel);
+  gles2->glReadPixels (0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel);
 
-  g_assert (pixel[0] == 0);
-  g_assert (pixel[1] == 0xff);
-  g_assert (pixel[2] == 0xff);
+  test_utils_compare_pixel (pixel, 0x00ffffff);
 
   cogl_pop_gles2_context (test_ctx);
 
@@ -363,11 +355,9 @@
       g_error ("Failed to push gles2 context: %s\n", error->message);
     }
 
-  gles2->glReadPixels (0, 0, 1, 1, GL_RGB, GL_UNSIGNED_BYTE, &pixel);
+  gles2->glReadPixels (0, 0, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel);
 
-  g_assert (pixel[0] == 0xff);
-  g_assert (pixel[1] == 0xff);
-  g_assert (pixel[2] == 0xff);
+  test_utils_compare_pixel (pixel, 0xffffffff);
 
   cogl_pop_gles2_context (test_ctx);
 }
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/tests/conform/test-primitive-and-journal.c cogl2-1.99.1+git20130221.53803433/tests/conform/test-primitive-and-journal.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/tests/conform/test-primitive-and-journal.c	1970-01-01 00:00:00.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/tests/conform/test-primitive-and-journal.c	2013-02-22 10:20:11.000000000 +0000
@@ -0,0 +1,126 @@
+#include <cogl/cogl.h>
+
+#include "test-utils.h"
+
+typedef CoglVertexP2C4 Vertex;
+
+static void
+setup_orthographic_modelview (void)
+{
+  CoglMatrix matrix;
+  int fb_width = cogl_framebuffer_get_width (test_fb);
+  int fb_height = cogl_framebuffer_get_height (test_fb);
+
+  /* Set up a non-identity modelview matrix. When the journal is
+   * flushed it will usually flush the identity matrix. Using the
+   * non-default matrix ensures that we test that Cogl restores the
+   * matrix we asked for. The matrix sets up an orthographic transform
+   * in the modelview matrix */
+
+  cogl_matrix_init_identity (&matrix);
+  cogl_matrix_orthographic (&matrix,
+                            0.0f, 0.0f, /* x_1 y_1 */
+                            fb_width,
+                            fb_height,
+                            -1.0f, /* nearval */
+                            1.0f /* farval */);
+  cogl_framebuffer_set_modelview_matrix (test_fb, &matrix);
+}
+
+static void
+create_primitives (CoglPrimitive *primitives[2])
+{
+  static const Vertex vertex_data[8] =
+    {
+      /* triangle strip 1 */
+      {   0,   0, 255, 0, 0, 255 },
+      {   0, 100, 255, 0, 0, 255 },
+      { 100,   0, 255, 0, 0, 255 },
+      { 100, 100, 255, 0, 0, 255 },
+      /* triangle strip 2 */
+      { 200,   0, 0, 0, 255, 255 },
+      { 200, 100, 0, 0, 255, 255 },
+      { 300,   0, 0, 0, 255, 255 },
+      { 300, 100, 0, 0, 255, 255 },
+    };
+
+  primitives[0] = cogl_primitive_new_p2c4 (test_ctx,
+                                           COGL_VERTICES_MODE_TRIANGLE_STRIP,
+                                           G_N_ELEMENTS (vertex_data),
+                                           vertex_data);
+  cogl_primitive_set_n_vertices (primitives[0], 4);
+
+  primitives[1] = cogl_primitive_copy (primitives[0]);
+  cogl_primitive_set_first_vertex (primitives[1], 4);
+  cogl_primitive_set_n_vertices (primitives[1], 4);
+}
+
+static CoglPipeline *
+create_pipeline (void)
+{
+  CoglPipeline *pipeline = cogl_pipeline_new (test_ctx);
+
+  cogl_pipeline_set_color4ub (pipeline, 0, 255, 0, 255);
+
+  return pipeline;
+}
+
+void
+test_primitive_and_journal (void)
+{
+  CoglPrimitive *primitives[2];
+  CoglPipeline *pipeline;
+
+  setup_orthographic_modelview ();
+  create_primitives (primitives);
+  pipeline = create_pipeline ();
+
+  /* Set a clip to clip all three rectangles to just the bottom half.
+   * The journal flushes its own clip state so this verifies that the
+   * clip state is correctly restored for the second primitive. */
+  cogl_framebuffer_push_rectangle_clip (test_fb,
+                                        0, 50, 300, 100);
+
+  cogl_framebuffer_draw_primitive (test_fb,
+                                   pipeline,
+                                   primitives[0]);
+
+  /* Draw a rectangle using the journal in-between the two primitives.
+   * This should test that the journal gets flushed correctly and that
+   * the modelview matrix is restored. Half of the rectangle should be
+   * overriden by the second primitive */
+  cogl_framebuffer_draw_rectangle (test_fb,
+                                   pipeline,
+                                   100, 0, /* x1/y1 */
+                                   300, 100 /* x2/y2 */);
+
+  cogl_framebuffer_draw_primitive (test_fb,
+                                   pipeline,
+                                   primitives[1]);
+
+  /* Check the three rectangles */
+  test_utils_check_region (test_fb,
+                           1, 51,
+                           98, 48,
+                           0xff0000ff);
+  test_utils_check_region (test_fb,
+                           101, 51,
+                           98, 48,
+                           0x00ff00ff);
+  test_utils_check_region (test_fb,
+                           201, 51,
+                           98, 48,
+                           0x0000ffff);
+
+  /* Check that the top half of all of the rectangles was clipped */
+  test_utils_check_region (test_fb,
+                           1, 1,
+                           298, 48,
+                           0x000000ff);
+
+  cogl_framebuffer_pop_clip (test_fb);
+
+  if (cogl_test_verbose ())
+    g_print ("OK\n");
+}
+
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/tests/conform/test-utils.c cogl2-1.99.1+git20130221.53803433/tests/conform/test-utils.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/tests/conform/test-utils.c	2013-01-25 14:55:38.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/tests/conform/test-utils.c	2013-02-22 10:20:11.000000000 +0000
@@ -78,6 +78,33 @@
   return TRUE;
 }
 
+CoglBool
+is_boolean_env_set (const char *variable)
+{
+  char *val = getenv (variable);
+  CoglBool ret;
+
+  if (!val)
+    return FALSE;
+
+  if (g_ascii_strcasecmp (val, "1") == 0 ||
+      g_ascii_strcasecmp (val, "on") == 0 ||
+      g_ascii_strcasecmp (val, "true") == 0)
+    ret = TRUE;
+  else if (g_ascii_strcasecmp (val, "0") == 0 ||
+           g_ascii_strcasecmp (val, "off") == 0 ||
+           g_ascii_strcasecmp (val, "false") == 0)
+    ret = FALSE;
+  else
+    {
+      g_critical ("Spurious boolean environment variable value (%s=%s)",
+                  variable, val);
+      ret = TRUE;
+    }
+
+  return ret;
+}
+
 void
 test_utils_init (TestFlags requirement_flags,
                  TestFlags known_failure_flags)
@@ -99,7 +126,8 @@
                 "$ make test-report");
   counter++;
 
-  if (g_getenv ("COGL_TEST_VERBOSE") || g_getenv ("V"))
+  if (is_boolean_env_set ("COGL_TEST_VERBOSE") ||
+      is_boolean_env_set ("V"))
     cogl_test_is_verbose = TRUE;
 
   if (g_getenv ("G_DEBUG"))
@@ -123,7 +151,7 @@
   missing_requirement = !check_flags (requirement_flags, renderer);
   known_failure = !check_flags (known_failure_flags, renderer);
 
-  if (getenv  ("COGL_TEST_ONSCREEN"))
+  if (is_boolean_env_set ("COGL_TEST_ONSCREEN"))
     {
       onscreen = cogl_onscreen_new (test_ctx, 640, 480);
       test_fb = COGL_FRAMEBUFFER (onscreen);
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/tests/conform/test-wrap-rectangle-textures.c cogl2-1.99.1+git20130221.53803433/tests/conform/test-wrap-rectangle-textures.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/tests/conform/test-wrap-rectangle-textures.c	2013-01-18 19:42:55.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/tests/conform/test-wrap-rectangle-textures.c	2013-02-22 10:20:29.000000000 +0000
@@ -1,5 +1,4 @@
 #include <cogl/cogl.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include <string.h>
 
diff -Nru cogl2-1.99.1+git20130204.6d2f3bc4/tests/micro-perf/test-journal.c cogl2-1.99.1+git20130221.53803433/tests/micro-perf/test-journal.c
--- cogl2-1.99.1+git20130204.6d2f3bc4/tests/micro-perf/test-journal.c	2012-11-03 08:37:16.000000000 +0000
+++ cogl2-1.99.1+git20130221.53803433/tests/micro-perf/test-journal.c	2013-02-22 10:20:11.000000000 +0000
@@ -120,20 +120,17 @@
       data->frame = 0;
     }
 
-  /* If the driver can deliver swap complete events then we can remove
-   * the idle paint callback until we next get a swap complete event
-   * otherwise we keep the idle paint callback installed and simply
-   * paint as fast as the driver will allow... */
-  if (cogl_has_feature (data->ctx, COGL_FEATURE_ID_SWAP_BUFFERS_EVENT))
-    return FALSE; /* remove the callback */
-  else
-    return TRUE;
+  return FALSE; /* remove the callback */
 }
 
 static void
-swap_complete_cb (CoglFramebuffer *framebuffer, void *user_data)
+frame_event_cb (CoglOnscreen *onscreen,
+                CoglFrameEvent event,
+                CoglFrameInfo *info,
+                void *user_data)
 {
-  g_idle_add (paint_cb, user_data);
+  if (event == COGL_FRAME_EVENT_SYNC)
+    paint_cb (user_data);
 }
 
 int
@@ -172,9 +169,10 @@
 
   g_source_attach (cogl_source, NULL);
 
-  if (cogl_has_feature (data.ctx, COGL_FEATURE_ID_SWAP_BUFFERS_EVENT))
-    cogl_onscreen_add_swap_buffers_callback (COGL_ONSCREEN (data.fb),
-                                             swap_complete_cb, &data);
+  cogl_onscreen_add_frame_callback (COGL_ONSCREEN (data.fb),
+                                    frame_event_cb,
+                                    &data,
+                                    NULL); /* destroy notify */
 
   g_idle_add (paint_cb, &data);