commit e60e74e46fb46b11758ef341352baed240f56ae9 Author: Emmanuele Bassi Date: Mon May 28 16:45:05 2012 +0100 Release Clutter 1.10.6 (stable) NEWS | 35 +++++++++++++++++++++++++++++++++++ configure.ac | 4 ++-- 2 files changed, 37 insertions(+), 2 deletions(-) commit f6ce2a93881f7faf00e6eeb27bbce50904714ffa Author: Emmanuele Bassi Date: Mon May 28 14:07:04 2012 +0100 paint-volume: Use the correct coordinate for axis alignment The z coordinate of the origin should be checked against the same coordinate of the vertex behind it. Given that most actors are flat surfaces, this check should always succeed. https://bugzilla.gnome.org/show_bug.cgi?id=675396 clutter/clutter-paint-volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit df18b3cd45baf216c79aaf28c648fb4a0eaa89ca Author: Bastian Winkler Date: Tue May 15 01:44:51 2012 +0200 text: Add missing introspection annotations Add allow-none annotations where appropriate clutter/clutter-text.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit d3fcd6e371a7dbf2213ba809a4f4e407a2533131 Author: Tristan Van Berkom Date: Thu May 17 18:08:57 2012 -0400 ClutterDropAction: Avoid accessing priv->stage is not yet resolved. This fixes drop_action_unregister() to not call g_object_get_data() on priv->stage if not yet resolved. This can happen if the action's actor was destroyed before ever being mapped. clutter/clutter-drop-action.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 95f17f28af89cfcb7eabab7e384f23828e5b5c19 Author: Dominique Bureau Date: Fri May 11 13:26:50 2012 -0400 ClutterText: Cannot pass NULL string to clutter_text_set_text() Passing a NULL buffer to clutter_text_set_text() does not behave the same way as passing an empty string "" (as specified in the documentation). This was working as expected previously, but somehow the behaviour changed at some point and created 2 new issues: - Passing a NULL pointer will not reset the string - If the ClutterText is editable, it will segfault in strcmp Validations have been added to prevent this. https://bugzilla.gnome.org/show_bug.cgi?id=675890 clutter/clutter-text.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit eb811210e25a2bcc7b9fa8b2ac8b113230e014e9 Author: Mike Ruprecht Date: Tue May 22 14:25:19 2012 +0100 flow-layout: Check for all positive values When creating a FlowLayout container, setting a specific size on it, and adding a child to it, as per the attached testcase, it crashes. The line on the backtrace doesn't really make sense, but from looking over it, it appears that it's probably because priv->line_natural is NULL. The attached patch makes it so in this case, priv->line_natural is allocated. https://bugzilla.gnome.org/show_bug.cgi?id=676068 Signed-off-by: Emmanuele Bassi clutter/clutter-flow-layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 8e149787b10363da6686c9245b3ec25a9f9d6a1c Author: Chun-wei Fan Date: Thu May 24 23:38:33 2012 +0800 Visual C++ projects updates -Fix up faulty Visual C++ 2010 Release_GDK configs -Copy clutter-gdk.h as well when Clutter is also built with the GDK backend build/win32/vs10/clutter.props | 10 +- build/win32/vs10/clutter.sln | 346 ++++++++++++++++++------------------ build/win32/vs10/clutter.vcxprojin | 6 +- build/win32/vs10/install.vcxproj | 76 ++++++++ build/win32/vs9/clutter.sln | 16 +- build/win32/vs9/clutter.vsprops | 8 + build/win32/vs9/install.vcproj | 52 ++++++ 7 files changed, 329 insertions(+), 185 deletions(-) commit 6edb17c586b1b0f185efefdedacc26bcff991f77 Author: Chun-wei Fan Date: Wed May 16 17:36:38 2012 +0800 Bug 676150 GDK: Fix build on Windows -Don't include unistd.h and stdint.h unconditionally as not all Windows compilers have them around. -Only include cogl/cogl-xlib.h when it is really supported by Cogl and GDK. -sys/ioctl.h is not available on Windows (MinGW/MSVC). -Correct the call to cogl_renderer_set_winsys_id: (backend_cogl->cogl_renderer, COGL_WINSYS_ID_WGL) -> (renderer, COGL_WINSYS_ID_WGL) clutter/gdk/clutter-backend-gdk.c | 11 +++++++++-- clutter/gdk/clutter-device-manager-gdk.c | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) commit a4f04cf17798b1cc0b6d97c924c5fa5fb66a90f0 Author: Chun-wei Fan Date: Tue May 22 01:41:13 2012 +0800 vs9/clutter.sln: Fix missing build item build/win32/vs9/clutter.sln | 1 + 1 file changed, 1 insertion(+) commit cc37001b4e4ad971a88a71d3c529f295ff47d447 Author: Chun-wei Fan Date: Mon May 14 16:18:13 2012 +0800 Visual C++ support: Add support to build GDK backend -Add configuration in Clutter projects to add option to build Clutter with the GDK3 backend in addition to the Win32 backend -Add another preconfigured clutter-config.h.win32_GDK which contains backend configs for both GDK3 and Win32 windowing and input. (Cherry-picked from commit 37e9215521a26e51c87fcafdc183633ee3227b60) (Cherry-picked from commit ee72d9b4af62d91dc16f853ff8165bba20169f52) build/win32/vs10/clutter.props | 47 +++++- build/win32/vs10/clutter.sln | 174 +++++++++++++++++++++- build/win32/vs10/clutter.vcxproj.filtersin | 6 + build/win32/vs10/clutter.vcxprojin | 222 +++++++++++++++++++++++++++- build/win32/vs9/clutter.sln | 173 +++++++++++++++++++++- build/win32/vs9/clutter.vcprojin | 206 +++++++++++++++++++++++++- build/win32/vs9/clutter.vsprops | 33 ++++- clutter/Makefile.am | 1 + clutter/clutter-config.h.win32_GDK | 20 +++ 9 files changed, 858 insertions(+), 24 deletions(-) commit 226fa5b02be373ae2d8c89bcd8f2b23b446fb8ab Author: Chun-wei Fan Date: Tue May 22 01:26:50 2012 +0800 Revert "clutter.sln: Add config for building GDK backend." This reverts commit b13a54ab0fd9571572ae2aae1c7a3fa49e6d23ab. build/win32/vs10/clutter.sln | 174 +----------------------------------------- build/win32/vs9/clutter.sln | 172 ----------------------------------------- 2 files changed, 1 insertion(+), 345 deletions(-) commit b13a54ab0fd9571572ae2aae1c7a3fa49e6d23ab Author: Chun-wei Fan Date: Tue May 22 00:55:23 2012 +0800 clutter.sln: Add config for building GDK backend. This is split from the commit for the update to the other project files as GIT does not like a patch that deals with files with different EOLs. build/win32/vs10/clutter.sln | 174 +++++++++++++++++++++++++++++++++++++++++- build/win32/vs9/clutter.sln | 172 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 345 insertions(+), 1 deletion(-) commit 0bcf726e1e65f28470126903a373d2cbf62465d6 Author: Chun-wei Fan Date: Wed May 16 18:57:12 2012 +0800 VS Property sheets: Correct "install" process Fix the location where clutter-win32.h is "installed" build/win32/vs10/clutter.props | 4 ++-- build/win32/vs9/clutter.vsprops | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit 9ad3717f03062a339208c7140f114b66809f1383 Author: Chun-wei Fan Date: Wed May 16 18:39:44 2012 +0800 Visual C++ support: Fix clutter.def generation Some Windows-specific APIs were not exported during the build due to use of a wrong macro. Fix that. build/win32/vs10/clutter.props | 2 +- build/win32/vs9/clutter.vsprops | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 3f2cc6dac21ba5603857ad7c5b8e3d79b3f3f4cf Author: Sasi Bhushan Date: Mon May 14 13:19:13 2012 +0530 Updated Telugu Translations po/te.po | 978 ++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 532 insertions(+), 446 deletions(-) commit 305632783e7b236323e6c3c713a3a86461795e86 Author: Bastien Nocera Date: Thu May 3 18:58:12 2012 +0200 x11/device-manager-xi2: Fix assertions with touch When getting touch events, the device manager would try to pass an invalid device to translate_axes(). clutter_event_set_device() will only update event->touch.device for touch events, not event->motion.device, as used. Fixes Totem crashing on mouse motion/button press when using a touchpad. https://bugzilla.gnome.org/show_bug.cgi?id=675371 clutter/x11/clutter-device-manager-xi2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 2420165dd170724aa0814ae0eb16b8c8dd699d8b Author: Bastien Nocera Date: Thu May 3 18:56:45 2012 +0200 event: Fix copying touch events We were trying to copy motion axes instead of touch ones. https://bugzilla.gnome.org/show_bug.cgi?id=675371 clutter/clutter-event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7ee3c9a7c3a1ad2a831e5e20dd9da8e5644b8419 Author: Neil Roberts Date: Fri Mar 23 17:12:26 2012 +0000 Don't use any GL types or defines in Clutter Some of the Clutter code was using GL types for the primitive types such as GLint and GLubyte and then passing these to Cogl. This doesn't make much sense because the Cogl functions directly take native C types. This patch just replaces them with either a native C type or a glib type. Some of the cogl conformance tests are trying to directly call GL for example to test creating a foreign texture. These tests have been changed to manually define the GL enum values instead of relying on a GL header to define them. This is necessary because Cogl may soon stop including a GL header from its public headers. Reviewed-by: Emmanuele Bassi (cherry picked from commit c9a81f035e0ec2d5726497b986ab7469f4de7a74) clutter/clutter-shader-effect.c | 16 +++--- clutter/clutter-shader-types.c | 8 +-- clutter/clutter-stage.c | 2 +- clutter/deprecated/clutter-shader.c | 8 +-- tests/conform/test-cogl-materials.c | 24 +++++++-- tests/conform/test-cogl-premult.c | 2 +- tests/conform/test-cogl-texture-rectangle.c | 53 ++++++++++++++------ tests/conform/test-cogl-vertex-buffer-contiguous.c | 24 ++++----- tests/conform/test-cogl-vertex-buffer-interleved.c | 19 +++---- tests/conform/test-cogl-vertex-buffer-mutability.c | 24 ++++----- tests/conform/test-conform-common.h | 26 +++++----- tests/interactive/test-cogl-tex-foreign.c | 53 ++++++++++++++------ tests/interactive/test-cogl-vertex-buffer.c | 18 +++---- 13 files changed, 167 insertions(+), 110 deletions(-) commit 42c885cfa36141abe4f25ebc16623f28972b619b Author: Emmanuele Bassi Date: Tue May 1 13:52:38 2012 +0100 Post-release version bump to 1.10.5 configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)