Hello community, here is the log from the commit of package clutter for openSUSE:Factory checked in at Wed Mar 31 19:53:12 CEST 2010. -------- --- GNOME/clutter/clutter.changes 2010-03-15 23:13:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/clutter/clutter.changes 2010-03-22 23:56:40.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Mar 22 23:22:44 CET 2010 - dimstar@opensuse.org + +- Update to version 1.2.4: + + Add more error reporting in case the GLX context creation + failed + + Fix cogl_texture_get_data() returning garbage + + Fix the computation of the stage bounding rectangle when + submitting clipped redraw requests + + Switch texture units before setting the Cogl texture filters + + Make sure that GLX_SGI_swap_control is set up correctly + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- clutter-1.2.2.tar.bz2 New: ---- clutter-1.2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clutter.spec ++++++ --- /var/tmp/diff_new_pack.jGcLDm/_old 2010-03-31 19:52:59.000000000 +0200 +++ /var/tmp/diff_new_pack.jGcLDm/_new 2010-03-31 19:52:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package clutter (Version 1.2.2) +# spec file for package clutter (Version 1.2.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Summary: The clutter library Name: clutter -Version: 1.2.2 +Version: 1.2.4 Release: 1 License: LGPLv2.1+ Group: System/Libraries ++++++ clutter-1.2.2.tar.bz2 -> clutter-1.2.4.tar.bz2 ++++++ ++++ 2263 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/ChangeLog new/clutter-1.2.4/ChangeLog --- old/clutter-1.2.2/ChangeLog 2010-03-15 17:32:29.000000000 +0100 +++ new/clutter-1.2.4/ChangeLog 2010-03-22 12:49:08.000000000 +0100 @@ -1,5 +1,246 @@ # Generated by configure. Do not edit. +commit cebd6e39ca9f37615f20fb9f36b19b92333b2fbb +Author: Emmanuele Bassi <ebassi@linux.intel.com> +Date: Mon Mar 22 11:48:35 2010 +0000 + + Release Clutter 1.2.4 + + NEWS | 23 +++++++++++++++++++++++ + configure.ac | 4 ++-- + 2 files changed, 25 insertions(+), 2 deletions(-) + +commit b14495ec0d2b55449c71b3871e676d60be842970 +Author: Adel Gadllah <adel.gadllah@gmail.com> +Date: Sun Mar 21 13:12:58 2010 +0100 + + Make sure GLX_SGI_swap_control is set up correctly + + glXSwapIntervalSGI only affects buffer swaps to the + current GLX drawable. + + That means that calling it once in clutter_backend_glx_get_features + isn't sufficent, so set it up in clutter_backend_glx_ensure_context to + make sure it affects buffer swaps for the current drawable. + + http://bugzilla.openedhand.com/show_bug.cgi?id=2044 + + Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com> + (cherry picked from commit 5de85051c324449b813adc43186f249f75289858) + + clutter/glx/clutter-backend-glx.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +commit f0cf7a96d84b241213f1272c51405a205ed05787 +Author: Owen W. Taylor <otaylor@fishsoup.net> +Date: Fri Mar 19 18:18:17 2010 +0000 + + glx: Clean up the clip area conditions + + Move the size check after the NULL check, add the clip height into the + check logic and fix up the comment. + + http://bugzilla.openedhand.com/show_bug.cgi?id=2040 + + Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com> + (cherry picked from commit 2fc8ecdb92e80e16510048c56bb07e5b87427f26) + + clutter/glx/clutter-stage-glx.c | 11 ++++++----- + 1 files changed, 6 insertions(+), 5 deletions(-) + +commit 5210f83bb979d020d114850ccb2b367ddb26aaa7 +Author: Emmanuele Bassi <ebassi@linux.intel.com> +Date: Fri Mar 19 11:39:23 2010 +0000 + + glx: Do not access stage_clip without checking it + + The stage_clip parameter for add_redraw_clip() can be NULL, so we need + to check before accessing its members. + (cherry picked from commit a39cef41b85ca6f38f3e9c95fbd18de990f73b7f) + + Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com> + + clutter/glx/clutter-stage-glx.c | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) + +commit 222443484fdbcc48646b1f8522e86eebb80acaaa +Author: Owen W. Taylor <otaylor@fishsoup.net> +Date: Tue Mar 16 20:38:53 2010 -0400 + + Switch texture units before calling _cogl_texture_set_filters() + + When setting up the state for a layer, we need to switch texture + units before we do anything that might bind the texture, or + we'll bind the wrong texture to the previous unit. + + http://bugzilla.openedhand.com/show_bug.cgi?id=2033 + + Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com> + (cherry picked from commit 913c187f4e611aac71360863ca67640e4cfd1d41) + + clutter/cogl/cogl/cogl-material.c | 9 ++++++--- + 1 files changed, 6 insertions(+), 3 deletions(-) + +commit 293a4d884a6b81051b7485bbc57f41e6d6981fcc +Author: Emmanuele Bassi <ebassi@linux.intel.com> +Date: Fri Mar 19 11:20:46 2010 +0000 + + Fix errors in keeping track of the stage bounding rectangle + + (This commit has been slightly modified, since we cannot add new API to + the 1.2 branch) + + * Add new private _clutter_geometry_union(), because writing union + intersection is harder than it looks. Fixes two problems with the + inline code in clutter_stage_glx_add_redraw_clip(). + + 1) The ->x and ->y of were reassigned to before using them to + compute the new width and height. + 2) since ClutterGeometry has unsigned width, x + width is unsigned, + and comparison goes wrong if either rectangle has a negative + x + width. (We fixed width for GdkRectangle to be signed for GTK+-2.0, + this is a potent source of bugs.) + + * Use in clutter_stage_glx_add_redraw_clip() + + * Account for the case where the incoming rectangle is empty, and don't + end up with the stage being entirely redrawn. + + * Account for the case where the stage already has a degenerate + width and don't end up with redrawing only the new rectangle and not + the rest of the stage. + + The better fix here for the second two problems is to stop using a 0 + width to mean the entire stage, but this should work for now. + + http://bugzilla.openedhand.com/show_bug.cgi?id=2040 + + Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com> + + (cherry picked from commit d21b7522f825d913317a8e62b86314a7737c7e43) + + clutter/clutter-actor.c | 29 +++++++++++++++++++++++++++++ + clutter/clutter-private.h | 5 +++++ + clutter/glx/clutter-stage-glx.c | 26 +++++++------------------- + 3 files changed, 41 insertions(+), 19 deletions(-) + +commit 1d49ea118d17cb392e4ffd25892a81fcac566228 +Author: Owen W. Taylor <otaylor@fishsoup.net> +Date: Wed Mar 17 15:39:55 2010 -0400 + + Set pixel store parameters before calling glGetTexImage + + We need to set up the rowstride and alignment properly in + CoglTexture2D before reading texture data. + + http://bugzilla.openedhand.com/show_bug.cgi?id=2036 + + Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com> + (cherry picked from commit bfd2b19290dc021862ee542c80ddd4e21a20cfef) + + clutter/cogl/cogl/cogl-texture-2d.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit 08c96148034415f9467fe7b88e6c7fe13cc0a36a +Author: Emmanuele Bassi <ebassi@linux.intel.com> +Date: Wed Mar 17 17:28:20 2010 +0000 + + Add error reporting for create_context() failures + + We kind of assume that stuff will break well before during the + ClutterBackend::create_context() implementation if we fail to create a + GL context. We do, however, have error reporting in place inside the + Backend API to catch those cases. Unfortunately, since we switched to + lazy initialization of the Stage, there can be a case of GL context + creation failure that still leads to a successful initialization - and a + segmentation fault later on. This is clearly Not Good™. + + Let's try to catch a failure in all the places calling create_context() + and report back to the user the error in a meaningful way, before + crashing and burning. + (cherry picked from commit bf7e6ae587adaf3321ed56ec407ed2d432805f57) + + Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com> + + clutter/clutter-backend.c | 20 +++++++++++++++++++- + clutter/clutter-feature.c | 11 +++++++---- + clutter/clutter-main.c | 3 ++- + clutter/clutter-private.h | 2 +- + 4 files changed, 29 insertions(+), 7 deletions(-) + +commit e08f16eaab94a4c286a007bcf1ee6bebf6273cb4 +Author: Emmanuele Bassi <ebassi@linux.intel.com> +Date: Wed Mar 17 17:14:08 2010 +0000 + + model: Let get_n_columns() return a sane value + + If you call get_n_columns() during the instance initialization phase but + before set_name()/set_types() have been called, you'll get a (guint) -1. + This is less than ideal. + + If columns haven't been initialized we should just return 0, which was + the intent of the API since the beginning. + + Based on a patch by: Bastian Winkler <buz@netbuz.org> + + Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com> + (cherry picked from commit d735ac4807b556e3444ed9611691e44b00ddd915) + + clutter/clutter-model.c | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) + +commit 7da603a8ca883114ebaaf182b4fb16b875cdbd82 +Author: Emmanuele Bassi <ebassi@linux.intel.com> +Date: Tue Mar 16 18:57:28 2010 +0000 + + model: Add a comment on the n_columns field type + + To avoid another bug report like: + + http://bugzilla.openedhand.com/show_bug.cgi?id=2017 + + with a patch that gets applied without a proper review, resulting in a + bug like: + + http://bugzilla.openedhand.com/show_bug.cgi?id=2032 + + I should probably add a comment on why on earth we're using an integer + as the n_columns member of the ClutterModelPrivate structure, and why it + is important that it is initialized as -1. + (cherry picked from commit 0a6497a3b6c4219e6a6a9310849159b00c864671) + + Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com> + + clutter/clutter-model.c | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +commit 0b80f22b04cf69b80fdab7f7f417ef88dccbbc7e +Author: Emmanuele Bassi <ebassi@linux.intel.com> +Date: Tue Mar 16 18:53:24 2010 +0000 + + Revert "model: Use guint for the n_columns field" + + The int storage, and the initial value of -1, is used as a guard when + subclassing ClutterListModel to allow the sub-class to call + clutter_model_set_names() and clutter_model_set_types(). + + This reverts commit c274118a8f7ed18e5bc703e614a9ea0a7cdb553c. + (cherry picked from commit de4abfac955641de9218d272e6aea1a8c618a577) + + Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com> + + clutter/clutter-model.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 4e946f538ca2871346a0fa3e918de439ac74ecc0 +Author: Emmanuele Bassi <ebassi@linux.intel.com> +Date: Mon Mar 15 16:40:50 2010 +0000 + + Post-release version bump to 1.2.3 + + configure.ac | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + commit 7b5692f8b362d8c39a165d7457fe4e88a67db9df Author: Emmanuele Bassi <ebassi@linux.intel.com> Date: Mon Mar 15 16:25:46 2010 +0000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/NEWS new/clutter-1.2.4/NEWS --- old/clutter-1.2.2/NEWS 2010-03-15 17:22:20.000000000 +0100 +++ new/clutter-1.2.4/NEWS 2010-03-22 12:42:38.000000000 +0100 @@ -1,3 +1,26 @@ +Clutter 1.2.4 (22/03/2010) +=============================================================================== + + • List of changes since Clutter 1.2.2 + + » Revert patch for bug 2017 which broke subclassing ClutterListModel + + » Add more error reporting in case the GLX context creation failed + + » Fix cogl_texture_get_data() returning garbage + + » Fix the computation of the stage bounding rectangle when submitting + clipped redraw requests + + » Switch texture units before setting the Cogl texture filters + + » Make sure that GLX_SGI_swap_control is set up correctly + +Many thanks to: + + Owen W. Taylor + Adel Gadllah + Clutter 1.2.2 (15/03/2010) =============================================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/clutter/clutter-actor.c new/clutter-1.2.4/clutter/clutter-actor.c --- old/clutter-1.2.2/clutter/clutter-actor.c 2010-03-07 22:06:28.000000000 +0100 +++ new/clutter-1.2.4/clutter/clutter-actor.c 2010-03-22 12:24:15.000000000 +0100 @@ -8292,6 +8292,35 @@ return our_type; } +/* <private> + * clutter_geometry_union: + * @geometry_a: a #ClutterGeometry + * @geometry_b: another #ClutterGeometry + * @result: (out): location to store the result + * + * Find the union of two rectangles represented as #ClutterGeometry. + * + * Since: 1.4 + */ +void +_clutter_geometry_union (const ClutterGeometry *geometry_a, + const ClutterGeometry *geometry_b, + ClutterGeometry *result) +{ + /* We don't try to handle rectangles that can't be represented + * as a signed integer box */ + gint x1 = MIN (geometry_a->x, geometry_b->x); + gint y1 = MIN (geometry_a->y, geometry_b->y); + gint x2 = MAX (geometry_a->x + (gint)geometry_a->width, + geometry_b->x + (gint)geometry_b->width); + gint y2 = MAX (geometry_a->y + (gint)geometry_a->height, + geometry_b->y + (gint)geometry_b->height); + result->x = x1; + result->y = y1; + result->width = x2 - x1; + result->height = y2 - y1; +} + /* * ClutterVertices */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/clutter/clutter-backend.c new/clutter-1.2.4/clutter/clutter-backend.c --- old/clutter-1.2.2/clutter/clutter-backend.c 2010-03-02 12:50:03.000000000 +0100 +++ new/clutter-1.2.4/clutter/clutter-backend.c 2010-03-17 18:43:20.000000000 +0100 @@ -424,6 +424,7 @@ _clutter_backend_get_features (ClutterBackend *backend) { ClutterBackendClass *klass; + GError *error; g_return_val_if_fail (CLUTTER_IS_BACKEND (backend), 0); @@ -433,8 +434,25 @@ * GL context first and the ask for features. if the * context already exists this should be a no-op */ + error = NULL; if (klass->create_context) - klass->create_context (backend, NULL); + { + gboolean res; + + res = klass->create_context (backend, &error); + if (!res) + { + if (error) + { + g_critical ("Unable to create a context: %s", error->message); + g_error_free (error); + } + else + g_critical ("Unable to create a context: unknown error"); + + return 0; + } + } if (klass->get_features) return klass->get_features (backend); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/clutter/clutter-feature.c new/clutter-1.2.4/clutter/clutter-feature.c --- old/clutter-1.2.2/clutter/clutter-feature.c 2010-03-02 12:50:03.000000000 +0100 +++ new/clutter-1.2.4/clutter/clutter-feature.c 2010-03-22 12:24:15.000000000 +0100 @@ -83,8 +83,8 @@ return clutter_flags; } -void -_clutter_feature_init (void) +gboolean +_clutter_feature_init (GError **error) { ClutterMainContext *context; @@ -98,12 +98,13 @@ } if (__features->features_set) - return; + return TRUE; context = _clutter_context_get_default (); /* makes sure we have a GL context; if we have, this is a no-op */ - _clutter_backend_create_context (context->backend, NULL); + if (!_clutter_backend_create_context (context->backend, error)) + return FALSE; __features->flags = (_clutter_features_from_cogl (cogl_get_features ()) | _clutter_backend_get_features (context->backend)); @@ -111,6 +112,8 @@ __features->features_set = TRUE; CLUTTER_NOTE (MISC, "features checked"); + + return TRUE; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/clutter/clutter-main.c new/clutter-1.2.4/clutter/clutter-main.c --- old/clutter-1.2.2/clutter/clutter-main.c 2010-03-02 18:49:15.000000000 +0100 +++ new/clutter-1.2.4/clutter/clutter-main.c 2010-03-17 18:43:20.000000000 +0100 @@ -1534,7 +1534,8 @@ /* this will take care of initializing Cogl's state and * query the GL machinery for features */ - _clutter_feature_init (); + if (!_clutter_feature_init (error)) + return CLUTTER_INIT_ERROR_BACKEND; #ifdef CLUTTER_ENABLE_PROFILE { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/clutter/clutter-model.c new/clutter-1.2.4/clutter/clutter-model.c --- old/clutter-1.2.2/clutter/clutter-model.c 2010-03-15 17:22:20.000000000 +0100 +++ new/clutter-1.2.4/clutter/clutter-model.c 2010-03-17 18:18:16.000000000 +0100 @@ -193,7 +193,16 @@ { GType *column_types; gchar **column_names; - guint n_columns; + + /* we use an integer here because we want to be able to use -1 as a + * guard value, to allow calling set_names() and set_types() from + * sub-classes of ClutterModel. see bug: + * + * http://bugzilla.openedhand.com/show_bug.cgi?id=2032 + * + * for a reference. + */ + gint n_columns; ClutterModelFilterFunc filter_func; gpointer filter_data; @@ -235,7 +244,12 @@ static guint clutter_model_real_get_n_columns (ClutterModel *model) { - return model->priv->n_columns; + ClutterModelPrivate *priv = model->priv; + + if (priv->n_columns < 0) + return 0; + + return priv->n_columns; } static void @@ -419,7 +433,7 @@ self->priv = priv = CLUTTER_MODEL_GET_PRIVATE (self); - priv->n_columns = 0; + priv->n_columns = -1; priv->column_types = NULL; priv->column_names = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/clutter/clutter-private.h new/clutter-1.2.4/clutter/clutter-private.h --- old/clutter-1.2.2/clutter/clutter-private.h 2010-03-02 18:49:15.000000000 +0100 +++ new/clutter-1.2.4/clutter/clutter-private.h 2010-03-22 12:24:15.000000000 +0100 @@ -270,7 +270,7 @@ gfloat _clutter_backend_get_units_per_em (ClutterBackend *backend, PangoFontDescription *font_desc); -void _clutter_feature_init (void); +gboolean _clutter_feature_init (GError **error); /* Reinjecting queued events for processing */ void _clutter_process_event (ClutterEvent *event); @@ -331,6 +331,11 @@ gint32 _clutter_backend_get_units_serial (ClutterBackend *backend); +/* XXX - this is going to be a public function in Clutter 1.4 */ +void _clutter_geometry_union (const ClutterGeometry *geometry_a, + const ClutterGeometry *geometry_b, + ClutterGeometry *result); + G_END_DECLS #endif /* _HAVE_CLUTTER_PRIVATE_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/clutter/clutter-version.h new/clutter-1.2.4/clutter/clutter-version.h --- old/clutter-1.2.2/clutter/clutter-version.h 2010-03-15 17:26:27.000000000 +0100 +++ new/clutter-1.2.4/clutter/clutter-version.h 2010-03-22 12:43:32.000000000 +0100 @@ -57,14 +57,14 @@ * * The micro version of the Clutter library (3, if %CLUTTER_VERSION is 1.2.3) */ -#define CLUTTER_MICRO_VERSION (2) +#define CLUTTER_MICRO_VERSION (4) /** * CLUTTER_VERSION: * * The full version of the Clutter library, like 1.2.3 */ -#define CLUTTER_VERSION 1.2.2 +#define CLUTTER_VERSION 1.2.4 /** * CLUTTER_VERSION_S: @@ -72,7 +72,7 @@ * The full version of the Clutter library, in string form (suited for * string concatenation) */ -#define CLUTTER_VERSION_S "1.2.2" +#define CLUTTER_VERSION_S "1.2.4" /** * CLUTTER_VERSION_HEX: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/clutter/cogl/cogl/cogl-material.c new/clutter-1.2.4/clutter/cogl/cogl/cogl-material.c --- old/clutter-1.2.2/clutter/cogl/cogl/cogl-material.c 2010-03-02 12:50:04.000000000 +0100 +++ new/clutter-1.2.4/clutter/cogl/cogl/cogl-material.c 2010-03-19 12:26:34.000000000 +0100 @@ -1402,6 +1402,12 @@ GLenum gl_target; CoglTextureUnit *unit; + /* Switch units first so we don't disturb the previous unit if + * something needs to bind the texture temporarily */ + GE (glActiveTexture (GL_TEXTURE0 + i)); + + unit = _cogl_get_texture_unit (i); + _cogl_material_layer_ensure_mipmaps (layer_handle); new_gl_layer_info.layer0_overridden = @@ -1447,9 +1453,6 @@ cogl_texture_get_gl_texture (tex_handle, &gl_texture, NULL); } - GE (glActiveTexture (GL_TEXTURE0 + i)); - unit = _cogl_get_texture_unit (i); - /* FIXME: We could be more clever here and only bind the texture if it is different from gl_layer_info->gl_texture to avoid redundant GL calls. However a few other places in Cogl and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/clutter/cogl/cogl/cogl-texture-2d.c new/clutter-1.2.4/clutter/cogl/cogl/cogl-texture-2d.c --- old/clutter-1.2.2/clutter/cogl/cogl/cogl-texture-2d.c 2010-03-15 17:22:20.000000000 +0100 +++ new/clutter-1.2.4/clutter/cogl/cogl/cogl-texture-2d.c 2010-03-19 12:14:09.000000000 +0100 @@ -558,6 +558,9 @@ target_bmp.data = g_malloc (target_bmp.height * target_bmp.rowstride); } + _cogl_texture_driver_prep_gl_for_pixels_download (target_bmp.rowstride, + closest_bpp); + GE( glBindTexture (GL_TEXTURE_2D, tex_2d->gl_texture) ); if (!_cogl_texture_driver_gl_get_tex_image (GL_TEXTURE_2D, closest_gl_format, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/clutter/glx/clutter-backend-glx.c new/clutter-1.2.4/clutter/glx/clutter-backend-glx.c --- old/clutter-1.2.2/clutter/glx/clutter-backend-glx.c 2010-03-10 01:13:28.000000000 +0100 +++ new/clutter-1.2.4/clutter/glx/clutter-backend-glx.c 2010-03-22 12:24:33.000000000 +0100 @@ -692,6 +692,12 @@ drawable, drawable, backend_glx->gl_context); + /* + * In case we are using GLX_SGI_swap_control for vblank syncing we need call + * glXSwapIntervalSGI here to make sure that it affects the current drawable. + */ + if (backend_glx->vblank_type == CLUTTER_VBLANK_GLX_SWAP && backend_glx->swap_interval != NULL) + backend_glx->swap_interval (1); } if (clutter_x11_untrap_x_errors ()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/clutter/glx/clutter-stage-glx.c new/clutter-1.2.4/clutter/glx/clutter-stage-glx.c --- old/clutter-1.2.2/clutter/glx/clutter-stage-glx.c 2010-03-02 18:49:15.000000000 +0100 +++ new/clutter-1.2.4/clutter/glx/clutter-stage-glx.c 2010-03-22 12:24:15.000000000 +0100 @@ -391,12 +391,18 @@ /* A NULL stage clip means a full stage redraw has been queued and * we keep track of this by setting a degenerate * stage_glx->bounding_redraw_clip */ - if (!stage_clip) + if (stage_clip == NULL) { stage_glx->bounding_redraw_clip.width = 0; return; } + /* Do nothing on an empty clip to avoid confusing with out magic-flag + * degenerate clip + */ + if (stage_clip->width == 0 || stage_clip->height == 0) + return; + if (!stage_glx->initialized_redraw_clip) { stage_glx->bounding_redraw_clip.x = stage_clip->x; @@ -404,26 +410,10 @@ stage_glx->bounding_redraw_clip.width = stage_clip->width; stage_glx->bounding_redraw_clip.height = stage_clip->height; } - else + else if (stage_glx->bounding_redraw_clip.width > 0) { - int x2, y2; - - stage_glx->bounding_redraw_clip.x = - MIN (stage_clip->x, stage_glx->bounding_redraw_clip.x); - stage_glx->bounding_redraw_clip.y = - MIN (stage_clip->y, stage_glx->bounding_redraw_clip.y); - - x2 = MAX (stage_clip->x + stage_clip->width, - stage_glx->bounding_redraw_clip.x + - stage_glx->bounding_redraw_clip.width); - y2 = MAX (stage_clip->y + stage_clip->height, - stage_glx->bounding_redraw_clip.y + - stage_glx->bounding_redraw_clip.height); - - stage_glx->bounding_redraw_clip.width = - x2 - stage_glx->bounding_redraw_clip.x; - stage_glx->bounding_redraw_clip.height = - y2 - stage_glx->bounding_redraw_clip.y; + _clutter_geometry_union (&stage_glx->bounding_redraw_clip, stage_clip, + &stage_glx->bounding_redraw_clip); } /* FIXME: This threshold was plucked out of thin air! */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/configure.ac new/clutter-1.2.4/configure.ac --- old/clutter-1.2.2/configure.ac 2010-03-15 17:22:55.000000000 +0100 +++ new/clutter-1.2.4/configure.ac 2010-03-22 12:43:03.000000000 +0100 @@ -12,7 +12,7 @@ # - increase clutter_interface_version to the next odd number m4_define([clutter_major_version], [1]) m4_define([clutter_minor_version], [2]) -m4_define([clutter_micro_version], [2]) +m4_define([clutter_micro_version], [4]) m4_define([clutter_release_status], [m4_if(m4_eval(clutter_micro_version % 2), [1], [git], @@ -42,7 +42,7 @@ # clutter 1.2.10 -> 100 * 2 + 10 = 210, interface age = 4 -> 206 # ... # -m4_define([clutter_interface_age], [2]) +m4_define([clutter_interface_age], [4]) m4_define([clutter_binary_age], [m4_eval(100 * clutter_minor_version + clutter_micro_version)]) AC_PREREQ([2.59]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/clutter-docs.xml new/clutter-1.2.4/doc/reference/clutter/clutter-docs.xml --- old/clutter-1.2.2/doc/reference/clutter/clutter-docs.xml 2010-03-15 17:26:28.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/clutter-docs.xml 2010-03-22 12:43:33.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ -<!ENTITY version "1.2.2"> +<!ENTITY version "1.2.4"> ]> <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/ch01.html new/clutter-1.2.4/doc/reference/clutter/html/ch01.html --- old/clutter-1.2.2/doc/reference/clutter/html/ch01.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/ch01.html 2010-03-22 12:49:02.000000000 +0100 @@ -61,7 +61,7 @@ </tr></table> <div class="chapter" title="Abstract classes and interfaces"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2864628"></a>Abstract classes and interfaces</h2></div></div></div> +<a name="id2814247"></a>Abstract classes and interfaces</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="ClutterActor.html">ClutterActor</a></span><span class="refpurpose"> — Base abstract class for all visual stage actors.</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/ch02.html new/clutter-1.2.4/doc/reference/clutter/html/ch02.html --- old/clutter-1.2.2/doc/reference/clutter/html/ch02.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/ch02.html 2010-03-22 12:49:02.000000000 +0100 @@ -61,7 +61,7 @@ </tr></table> <div class="chapter" title="Base actors"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2864659"></a>Base actors</h2></div></div></div> +<a name="id2814278"></a>Base actors</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="ClutterRectangle.html">ClutterRectangle</a></span><span class="refpurpose"> — An actor that displays a simple rectangle.</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/ch03.html new/clutter-1.2.4/doc/reference/clutter/html/ch03.html --- old/clutter-1.2.2/doc/reference/clutter/html/ch03.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/ch03.html 2010-03-22 12:49:02.000000000 +0100 @@ -61,7 +61,7 @@ </tr></table> <div class="chapter" title="Container actors"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2825309"></a>Container actors</h2></div></div></div> +<a name="id2774928"></a>Container actors</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="ClutterGroup.html">ClutterGroup</a></span><span class="refpurpose"> — A fixed layout container</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/ch04.html new/clutter-1.2.4/doc/reference/clutter/html/ch04.html --- old/clutter-1.2.2/doc/reference/clutter/html/ch04.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/ch04.html 2010-03-22 12:49:02.000000000 +0100 @@ -61,7 +61,7 @@ </tr></table> <div class="chapter" title="Layout managers"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2825329"></a>Layout managers</h2></div></div></div> +<a name="id2774948"></a>Layout managers</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="ClutterFixedLayout.html">ClutterFixedLayout</a></span><span class="refpurpose"> — A fixed layout manager</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/ch05.html new/clutter-1.2.4/doc/reference/clutter/html/ch05.html --- old/clutter-1.2.2/doc/reference/clutter/html/ch05.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/ch05.html 2010-03-22 12:49:02.000000000 +0100 @@ -61,7 +61,7 @@ </tr></table> <div class="chapter" title="Base classes"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2825371"></a>Base classes</h2></div></div></div> +<a name="id2774991"></a>Base classes</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="ClutterTimeline.html">ClutterTimeline</a></span><span class="refpurpose"> — A class for time-based events</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/ch06.html new/clutter-1.2.4/doc/reference/clutter/html/ch06.html --- old/clutter-1.2.2/doc/reference/clutter/html/ch06.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/ch06.html 2010-03-22 12:49:02.000000000 +0100 @@ -61,7 +61,7 @@ </tr></table> <div class="chapter" title="Behaviours"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2825394"></a>Behaviours</h2></div></div></div> +<a name="id2775014"></a>Behaviours</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="ClutterBehaviourDepth.html">ClutterBehaviourDepth</a></span><span class="refpurpose"> — A behaviour controlling the Z position</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/ch07.html new/clutter-1.2.4/doc/reference/clutter/html/ch07.html --- old/clutter-1.2.2/doc/reference/clutter/html/ch07.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/ch07.html 2010-03-22 12:49:02.000000000 +0100 @@ -61,7 +61,7 @@ </tr></table> <div class="chapter" title="High Level API"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2825431"></a>High Level API</h2></div></div></div> +<a name="id2775050"></a>High Level API</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="clutter-Value-intervals.html">Value intervals</a></span><span class="refpurpose"> — An object holding an interval of two values</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/ch08.html new/clutter-1.2.4/doc/reference/clutter/html/ch08.html --- old/clutter-1.2.2/doc/reference/clutter/html/ch08.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/ch08.html 2010-03-22 12:49:02.000000000 +0100 @@ -61,7 +61,7 @@ </tr></table> <div class="chapter" title="General purpose API"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2825464"></a>General purpose API</h2></div></div></div> +<a name="id2775084"></a>General purpose API</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="clutter-Colors.html">Colors</a></span><span class="refpurpose"> — Color management and manipulation.</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/ch09.html new/clutter-1.2.4/doc/reference/clutter/html/ch09.html --- old/clutter-1.2.2/doc/reference/clutter/html/ch09.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/ch09.html 2010-03-22 12:49:02.000000000 +0100 @@ -61,7 +61,7 @@ </tr></table> <div class="chapter" title="User interface definition"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2825523"></a>User interface definition</h2></div></div></div> +<a name="id2775143"></a>User interface definition</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="ClutterScript.html">ClutterScript</a></span><span class="refpurpose"> — Loads a scene from UI definition data</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/ch10.html new/clutter-1.2.4/doc/reference/clutter/html/ch10.html --- old/clutter-1.2.2/doc/reference/clutter/html/ch10.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/ch10.html 2010-03-22 12:49:02.000000000 +0100 @@ -61,7 +61,7 @@ </tr></table> <div class="chapter" title="Generic list model"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2825538"></a>Generic list model</h2></div></div></div> +<a name="id2775157"></a>Generic list model</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="ClutterModel.html">ClutterModel</a></span><span class="refpurpose"> — A generic model implementation</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/clutter-Versioning-Macros.html new/clutter-1.2.4/doc/reference/clutter/html/clutter-Versioning-Macros.html --- old/clutter-1.2.2/doc/reference/clutter/html/clutter-Versioning-Macros.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/clutter-Versioning-Macros.html 2010-03-22 12:49:02.000000000 +0100 @@ -124,7 +124,7 @@ <hr> <div class="refsect2" title="CLUTTER_MICRO_VERSION"> <a name="CLUTTER-MICRO-VERSION:CAPS"></a><h3>CLUTTER_MICRO_VERSION</h3> -<pre class="programlisting">#define CLUTTER_MICRO_VERSION (2) +<pre class="programlisting">#define CLUTTER_MICRO_VERSION (4) </pre> <p> The micro version of the Clutter library (3, if <a class="link" href="clutter-Versioning-Macros.html#CLUTTER-VERSION:CAPS" title="CLUTTER_VERSION"><code class="literal">CLUTTER_VERSION</code></a> is 1.2.3)</p> @@ -132,7 +132,7 @@ <hr> <div class="refsect2" title="CLUTTER_VERSION"> <a name="CLUTTER-VERSION:CAPS"></a><h3>CLUTTER_VERSION</h3> -<pre class="programlisting">#define CLUTTER_VERSION 1.2.2 +<pre class="programlisting">#define CLUTTER_VERSION 1.2.4 </pre> <p> The full version of the Clutter library, like 1.2.3</p> @@ -140,7 +140,7 @@ <hr> <div class="refsect2" title="CLUTTER_VERSION_S"> <a name="CLUTTER-VERSION-S:CAPS"></a><h3>CLUTTER_VERSION_S</h3> -<pre class="programlisting">#define CLUTTER_VERSION_S "1.2.2" +<pre class="programlisting">#define CLUTTER_VERSION_S "1.2.4" </pre> <p> The full version of the Clutter library, in string form (suited for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/go01.html new/clutter-1.2.4/doc/reference/clutter/html/go01.html --- old/clutter-1.2.2/doc/reference/clutter/html/go01.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/go01.html 2010-03-22 12:49:02.000000000 +0100 @@ -61,7 +61,7 @@ </tr></table> <div class="glossary" title="Glossary"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2913200"></a>Glossary</h2></div></div></div> +<a name="id2862819"></a>Glossary</h2></div></div></div> <dl> <dt> <a name="actor"></a>actor</dt> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/index.html new/clutter-1.2.4/doc/reference/clutter/html/index.html --- old/clutter-1.2.2/doc/reference/clutter/html/index.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/index.html 2010-03-22 12:49:02.000000000 +0100 @@ -54,11 +54,11 @@ <div class="titlepage"> <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Clutter Reference Manual</p></th></tr></table></div> -<div><p class="releaseinfo">for Clutter 1.2.2</p></div> +<div><p class="releaseinfo">for Clutter 1.2.4</p></div> <div><p class="copyright">Copyright © 2006, 2007, 2008 OpenedHand LTD</p></div> <div><p class="copyright">Copyright © 2009, 2010 Intel Corporation</p></div> <div><div class="legalnotice" title="Legal Notice"> -<a name="id2864589"></a><p> +<a name="id2814208"></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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/ix01.html new/clutter-1.2.4/doc/reference/clutter/html/ix01.html --- old/clutter-1.2.2/doc/reference/clutter/html/ix01.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/ix01.html 2010-03-22 12:49:02.000000000 +0100 @@ -104,7 +104,7 @@ </table> <div class="index" title="Index of all symbols"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2830122"></a>Index of all symbols</h2></div></div></div> +<a name="id2779742"></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="ClutterActor.html#ClutterActor-struct" title="ClutterActor">ClutterActor</a></dt> <dd></dd> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/ix02.html new/clutter-1.2.4/doc/reference/clutter/html/ix02.html --- old/clutter-1.2.2/doc/reference/clutter/html/ix02.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/ix02.html 2010-03-22 12:49:03.000000000 +0100 @@ -70,7 +70,7 @@ </table> <div class="index" title="Index of deprecated symbols"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2830134"></a>Index of deprecated symbols</h2></div></div></div> +<a name="id2779753"></a>Index of deprecated symbols</h2></div></div></div> <a name="idx"></a><a name="idxS"></a><h3 class="title">S</h3> <dt><a class="link" href="ClutterStage.html#CLUTTER-STAGE-HEIGHT:CAPS" title="CLUTTER_STAGE_HEIGHT()">CLUTTER_STAGE_HEIGHT</a></dt> <dd></dd> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/ix03.html new/clutter-1.2.4/doc/reference/clutter/html/ix03.html --- old/clutter-1.2.2/doc/reference/clutter/html/ix03.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/ix03.html 2010-03-22 12:49:02.000000000 +0100 @@ -86,7 +86,7 @@ </table> <div class="index" title="Index of new symbols in 0.2"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2830149"></a>Index of new symbols in 0.2</h2></div></div></div> +<a name="id2779768"></a>Index of new symbols in 0.2</h2></div></div></div> <a name="idx"></a><a name="idxA"></a><h3 class="title">A</h3> <dt><a class="link" href="ClutterActor.html#ClutterActor-destroy" title='The "destroy" signal'>ClutterActor::destroy</a></dt> <dd></dd> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/ix04.html new/clutter-1.2.4/doc/reference/clutter/html/ix04.html --- old/clutter-1.2.2/doc/reference/clutter/html/ix04.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/ix04.html 2010-03-22 12:49:02.000000000 +0100 @@ -92,7 +92,7 @@ </table> <div class="index" title="Index of new symbols in 0.4"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2830163"></a>Index of new symbols in 0.4</h2></div></div></div> +<a name="id2779782"></a>Index of new symbols in 0.4</h2></div></div></div> <a name="idx"></a><a name="idxA"></a><h3 class="title">A</h3> <dt><a class="link" href="ClutterActor.html#clutter-actor-apply-transform-to-point" title="clutter_actor_apply_transform_to_point ()">clutter_actor_apply_transform_to_point</a></dt> <dd></dd> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/ix05.html new/clutter-1.2.4/doc/reference/clutter/html/ix05.html --- old/clutter-1.2.2/doc/reference/clutter/html/ix05.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/ix05.html 2010-03-22 12:49:02.000000000 +0100 @@ -88,7 +88,7 @@ </table> <div class="index" title="Index of new symbols in 0.6"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2830176"></a>Index of new symbols in 0.6</h2></div></div></div> +<a name="id2779795"></a>Index of new symbols in 0.6</h2></div></div></div> <a name="idx"></a><a name="idxA"></a><h3 class="title">A</h3> <dt><a class="link" href="ClutterActor.html#ClutterActor-button-press-event" title='The "button-press-event" signal'>ClutterActor::button-press-event</a></dt> <dd></dd> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/ix06.html new/clutter-1.2.4/doc/reference/clutter/html/ix06.html --- old/clutter-1.2.2/doc/reference/clutter/html/ix06.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/ix06.html 2010-03-22 12:49:02.000000000 +0100 @@ -94,7 +94,7 @@ </table> <div class="index" title="Index of new symbols in 0.8"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2830190"></a>Index of new symbols in 0.8</h2></div></div></div> +<a name="id2779809"></a>Index of new symbols in 0.8</h2></div></div></div> <a name="idx"></a><a name="idxA"></a><h3 class="title">A</h3> <dt><a class="link" href="ClutterActor.html#ClutterActor-paint" title='The "paint" signal'>ClutterActor::paint</a></dt> <dd></dd> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/ix07.html new/clutter-1.2.4/doc/reference/clutter/html/ix07.html --- old/clutter-1.2.2/doc/reference/clutter/html/ix07.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/ix07.html 2010-03-22 12:49:02.000000000 +0100 @@ -94,7 +94,7 @@ </table> <div class="index" title="Index of new symbols in 1.0"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2830204"></a>Index of new symbols in 1.0</h2></div></div></div> +<a name="id2779823"></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="ClutterActor.html#ClutterActor-allocation-changed" title='The "allocation-changed" signal'>ClutterActor::allocation-changed</a></dt> <dd></dd> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/ix08.html new/clutter-1.2.4/doc/reference/clutter/html/ix08.html --- old/clutter-1.2.2/doc/reference/clutter/html/ix08.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/ix08.html 2010-03-22 12:49:02.000000000 +0100 @@ -90,7 +90,7 @@ </table> <div class="index" title="Index of new symbols in 1.2"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2830218"></a>Index of new symbols in 1.2</h2></div></div></div> +<a name="id2779837"></a>Index of new symbols in 1.2</h2></div></div></div> <a name="idx"></a><a name="idxA"></a><h3 class="title">A</h3> <dt><a class="link" href="ClutterActor.html#ClutterActor-queue-relayout" title='The "queue-relayout" signal'>ClutterActor::queue-relayout</a></dt> <dd></dd> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/clutter/html/pt10.html new/clutter-1.2.4/doc/reference/clutter/html/pt10.html --- old/clutter-1.2.2/doc/reference/clutter/html/pt10.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/clutter/html/pt10.html 2010-03-22 12:49:02.000000000 +0100 @@ -5,7 +5,7 @@ <title>Part I. </title> <meta name="generator" content="DocBook XSL Stylesheets V1.75.2"> <link rel="home" href="index.html" title="Clutter Reference Manual"> -<link rel="up" href="migration.html#id2830042" title="Migrating from previous version of Clutter"> +<link rel="up" href="migration.html#id2779662" title="Migrating from previous version of Clutter"> <link rel="prev" href="migration.html" title="Part IX. Migrating from previous version of Clutter"> <link rel="next" href="migrating-ClutterEffect.html" title="Migrating from ClutterEffect"> <meta name="generator" content="GTK-Doc V1.13 (XML mode)"> @@ -54,14 +54,14 @@ <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"> <td><a accesskey="p" href="migration.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td> -<td><a accesskey="u" href="migration.html#id2830042"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td> +<td><a accesskey="u" href="migration.html#id2779662"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></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">Clutter Reference Manual</th> <td><a accesskey="n" href="migrating-ClutterEffect.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr></table> <div class="part" title="Part I. "> <div class="titlepage"><div><div><h1 class="title"> -<a name="id2830044"></a>Part I. </h1></div></div></div>This section describes the changes that need to be +<a name="id2779664"></a>Part I. </h1></div></div></div>This section describes the changes that need to be done in applications using Clutter to use new features or to migrate from old, deprecated API to the new ones.</div> <div class="footer"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/cogl/cogl-docs.xml new/clutter-1.2.4/doc/reference/cogl/cogl-docs.xml --- old/clutter-1.2.2/doc/reference/cogl/cogl-docs.xml 2010-03-15 17:26:28.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/cogl/cogl-docs.xml 2010-03-22 12:43:33.000000000 +0100 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ -<!ENTITY version "1.2.2"> +<!ENTITY version "1.2.4"> ]> <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/cogl/html/ch01.html new/clutter-1.2.4/doc/reference/cogl/html/ch01.html --- old/clutter-1.2.2/doc/reference/cogl/html/ch01.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/cogl/html/ch01.html 2010-03-22 12:49:02.000000000 +0100 @@ -29,7 +29,7 @@ </tr></table> <div class="chapter" title="COGL - GL Abstraction API"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2899159"></a>COGL - GL Abstraction API</h2></div></div></div> +<a name="id2762285"></a>COGL - GL Abstraction 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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/cogl/html/ch02.html new/clutter-1.2.4/doc/reference/cogl/html/ch02.html --- old/clutter-1.2.2/doc/reference/cogl/html/ch02.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/cogl/html/ch02.html 2010-03-22 12:49:02.000000000 +0100 @@ -29,7 +29,7 @@ </tr></table> <div class="chapter" title="COGL experimental API"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2893703"></a>COGL experimental API</h2></div></div></div> +<a name="id2756828"></a>COGL experimental API</h2></div></div></div> <div class="toc"><dl> <dt><span class="section"><a href="ch02.html#cogl-experimental">About the experimental API</a></span></dt> <dt> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/cogl/html/cogl-Blend-Strings.html new/clutter-1.2.4/doc/reference/cogl/html/cogl-Blend-Strings.html --- old/clutter-1.2.2/doc/reference/cogl/html/cogl-Blend-Strings.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/cogl/html/cogl-Blend-Strings.html 2010-03-22 12:49:02.000000000 +0100 @@ -52,7 +52,7 @@ </p> <div class="section" title="Some examples"> <div class="titlepage"><div><div><h4 class="title"> -<a name="id2966125"></a>Some examples</h4></div></div></div> +<a name="id2829250"></a>Some examples</h4></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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/cogl/html/index.html new/clutter-1.2.4/doc/reference/cogl/html/index.html --- old/clutter-1.2.2/doc/reference/cogl/html/index.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/cogl/html/index.html 2010-03-22 12:49:02.000000000 +0100 @@ -22,11 +22,11 @@ <div class="titlepage"> <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">COGL Reference Manual</p></th></tr></table></div> -<div><p class="releaseinfo">for COGL 1.2.2</p></div> +<div><p class="releaseinfo">for COGL 1.2.4</p></div> <div><p class="copyright">Copyright © 2008 OpenedHand LTD</p></div> <div><p class="copyright">Copyright © 2009, 2010 Intel Corporation</p></div> <div><div class="legalnotice" title="Legal Notice"> -<a name="id2932985"></a><p> +<a name="id2796111"></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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/cogl/html/ix01.html new/clutter-1.2.4/doc/reference/cogl/html/ix01.html --- old/clutter-1.2.2/doc/reference/cogl/html/ix01.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/cogl/html/ix01.html 2010-03-22 12:49:02.000000000 +0100 @@ -64,7 +64,7 @@ </table> <div class="index" title="Index of all symbols"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2893755"></a>Index of all symbols</h2></div></div></div> +<a name="id2756880"></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="cogl-Fixed-Point-API.html#CoglAngle" title="CoglAngle">CoglAngle</a></dt> <dd></dd> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/cogl/html/ix02.html new/clutter-1.2.4/doc/reference/cogl/html/ix02.html --- old/clutter-1.2.2/doc/reference/cogl/html/ix02.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/cogl/html/ix02.html 2010-03-22 12:49:02.000000000 +0100 @@ -46,7 +46,7 @@ </table> <div class="index" title="Index of deprecated symbols"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2893767"></a>Index of deprecated symbols</h2></div></div></div> +<a name="id2756892"></a>Index of deprecated symbols</h2></div></div></div> <a name="idx"></a><a name="idxC"></a><h3 class="title">C</h3> <dt><a class="link" href="cogl-General-API.html#cogl-check-extension" title="cogl_check_extension ()">cogl_check_extension</a></dt> <dd></dd> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/cogl/html/ix03.html new/clutter-1.2.4/doc/reference/cogl/html/ix03.html --- old/clutter-1.2.2/doc/reference/cogl/html/ix03.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/cogl/html/ix03.html 2010-03-22 12:49:02.000000000 +0100 @@ -42,7 +42,7 @@ </table> <div class="index" title="Index of new symbols in 0.8"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2893781"></a>Index of new symbols in 0.8</h2></div></div></div> +<a name="id2756906"></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="cogl-General-API.html#CoglBufferTarget" title="enum CoglBufferTarget">CoglBufferTarget</a></dt> <dd></dd> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/cogl/html/ix04.html new/clutter-1.2.4/doc/reference/cogl/html/ix04.html --- old/clutter-1.2.2/doc/reference/cogl/html/ix04.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/cogl/html/ix04.html 2010-03-22 12:49:02.000000000 +0100 @@ -60,7 +60,7 @@ </table> <div class="index" title="Index of new symbols in 1.0"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2893795"></a>Index of new symbols in 1.0</h2></div></div></div> +<a name="id2756920"></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="cogl-Fixed-Point-API.html#CoglAngle" title="CoglAngle">CoglAngle</a></dt> <dd></dd> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/clutter-1.2.2/doc/reference/cogl/html/ix05.html new/clutter-1.2.4/doc/reference/cogl/html/ix05.html --- old/clutter-1.2.2/doc/reference/cogl/html/ix05.html 2010-03-15 17:32:24.000000000 +0100 +++ new/clutter-1.2.4/doc/reference/cogl/html/ix05.html 2010-03-22 12:49:02.000000000 +0100 @@ -46,7 +46,7 @@ </table> <div class="index" title="Index of new symbols in 1.2"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2893809"></a>Index of new symbols in 1.2</h2></div></div></div> +<a name="id2756934"></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="cogl-Buffers.html#CoglBufferAccess" title="enum CoglBufferAccess">CoglBufferAccess</a></dt> <dd></dd> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org