[clutter/clutter-1.22: 255/255] Merge branch 'master' into clutter-1.22
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.22: 255/255] Merge branch 'master' into clutter-1.22
- Date: Mon, 23 Mar 2015 13:26:13 +0000 (UTC)
commit b292bec8a58331ac210183edd8f890b5c993c928
Merge: ef7aa43 d362e37
Author: Emmanuele Bassi <ebassi gnome org>
Date: Mon Mar 23 13:25:37 2015 +0000
Merge branch 'master' into clutter-1.22
Not the best solution, but the least intrusive.
Conflicts:
clutter/mir/clutter-backend-mir.c
.gitignore | 2 +
NEWS | 146 +
README.in | 20 +-
README.md | 4 -
build/win32/vs10/Makefile.am | 2 +-
build/win32/vs10/clutter-build-defines.props | 2 +
build/win32/vs10/clutter-install.props | 153 +-
.../{install.vcxproj => clutter-install.vcxproj} | 2 +-
build/win32/vs10/clutter.sln | 2 +-
build/win32/vs10/clutter.vcxproj.filtersin | 3 +-
build/win32/vs10/clutter.vcxprojin | 16 +-
build/win32/vs9/Makefile.am | 2 +-
build/win32/vs9/clutter-build-defines.vsprops | 1 +
.../vs9/{install.vcproj => clutter-install.vcproj} | 4 +-
build/win32/vs9/clutter-install.vsprops | 6 +-
build/win32/vs9/clutter.sln | 2 +-
build/win32/vs9/clutter.vcprojin | 8 +-
clutter/Makefile.am | 28 +-
clutter/cally/cally-actor.c | 81 +-
clutter/clutter-actor-private.h | 3 -
clutter/clutter-actor.c | 78 +-
clutter/clutter-actor.h | 5 +
clutter/clutter-backend.c | 12 +-
clutter/clutter-canvas.c | 2 -
clutter/clutter-clone.c | 5 +-
clutter/clutter-color.c | 15 +-
clutter/clutter-device-manager-private.h | 3 +
clutter/clutter-enums.h | 27 +-
clutter/clutter-feature.c | 4 +-
clutter/clutter-group.h | 4 +-
clutter/clutter-input-device.c | 105 +
clutter/clutter-input-device.h | 5 +
clutter/clutter-keyframe-transition.h | 6 +-
clutter/clutter-main.c | 139 +-
clutter/clutter-master-clock-default.c | 685 +++++
clutter/clutter-master-clock-default.h | 48 +
clutter/clutter-master-clock.c | 666 +-----
clutter/clutter-master-clock.h | 25 +-
clutter/clutter-offscreen-effect.c | 6 +-
clutter/clutter-paint-node.c | 7 +-
clutter/clutter-paint-nodes.c | 10 +-
clutter/clutter-profile.c | 283 --
clutter/clutter-profile.h | 74 -
clutter/clutter-script.c | 7 +-
clutter/clutter-settings.c | 2 +-
clutter/clutter-stage.c | 134 +-
clutter/clutter-stage.h | 4 +-
clutter/clutter-test-utils.c | 18 +-
clutter/clutter-text.c | 28 -
clutter/clutter-texture.h | 4 +-
clutter/cogl/clutter-stage-cogl.c | 191 +-
clutter/cogl/clutter-stage-cogl.h | 5 +-
clutter/deprecated/clutter-alpha.c | 38 +-
clutter/deprecated/clutter-animation.c | 32 +-
clutter/deprecated/clutter-animator.c | 4 +-
clutter/deprecated/clutter-behaviour.c | 13 +-
clutter/deprecated/clutter-box.c | 24 +-
clutter/deprecated/clutter-fixed.h | 3 +-
clutter/deprecated/clutter-frame-source.c | 8 +-
clutter/deprecated/clutter-group.c | 7 +-
clutter/deprecated/clutter-media.c | 3 +-
clutter/deprecated/clutter-rectangle.c | 146 +-
clutter/deprecated/clutter-rectangle.h | 4 +-
clutter/deprecated/clutter-shader.c | 2 +-
clutter/deprecated/clutter-state.c | 5 +-
clutter/deprecated/clutter-table-layout.c | 46 +-
clutter/deprecated/clutter-texture.c | 99 +-
clutter/deprecated/clutter-texture.h | 18 +-
clutter/deprecated/clutter-timeout-pool.c | 6 +-
clutter/evdev/clutter-device-manager-evdev.c | 98 +-
clutter/evdev/clutter-evdev.h | 4 +-
clutter/evdev/clutter-input-device-evdev.c | 7 +
clutter/gdk/clutter-backend-gdk.c | 26 +-
clutter/gdk/clutter-event-gdk.c | 4 +-
clutter/gdk/clutter-master-clock-gdk.c | 540 ++++
clutter/gdk/clutter-master-clock-gdk.h | 48 +
clutter/gdk/clutter-stage-gdk.c | 78 +
clutter/mir/clutter-backend-mir.c | 2 +-
clutter/x11/clutter-backend-x11.c | 178 +-
clutter/x11/clutter-device-manager-xi2.c | 45 +-
clutter/x11/clutter-x11.h | 5 +
configure.ac | 74 +-
doc/cookbook/examples/Makefile.am | 2 +-
doc/reference/clutter/Makefile.am | 24 +-
doc/reference/clutter/clutter-docs.xml.in | 2 +
doc/reference/clutter/clutter-sections.txt | 16 +
examples/Makefile.am | 8 +-
examples/layout-manager.c | 31 +-
examples/rounded-rectangle.c | 3 +-
po/an.po | 1149 ++++----
po/bs.po | 2836 ++++++++++++++++++++
po/cs.po | 995 ++++----
po/da.po | 891 ++++---
po/el.po | 683 +++---
po/es.po | 1005 ++++----
po/eu.po | 589 +++--
po/fr.po | 869 +++---
po/gl.po | 973 ++++----
po/he.po | 415 ++--
po/hu.po | 1009 ++++----
po/id.po | 890 +++---
po/it.po | 1120 ++++----
po/kk.po | 2806 +++++++++++++++++++
po/lt.po | 1009 ++++----
po/lv.po | 1077 ++++----
po/pl.po | 1013 ++++----
po/pt_BR.po | 1005 ++++----
po/ru.po | 878 +++---
po/sk.po | 1546 ++++++------
po/sl.po | 581 ++--
po/sr.po | 1009 ++++----
po/sr latin po | 1009 ++++----
po/tr.po | 2616 ++++++++++++-------
po/uk.po | 1120 ++++----
po/zh_TW.po | 873 +++---
tests/conform/Makefile.am | 5 +-
tests/interactive/Makefile.am | 2 +-
tests/micro-bench/Makefile.am | 2 +-
tests/performance/Makefile.am | 2 +-
119 files changed, 20972 insertions(+), 13752 deletions(-)
---
diff --cc clutter/clutter-backend.c
index f365794,eab3bce..80b3ca0
--- a/clutter/clutter-backend.c
+++ b/clutter/clutter-backend.c
@@@ -512,16 -516,11 +516,16 @@@ _clutter_create_backend (void
retval = g_object_new (CLUTTER_TYPE_BACKEND_EGL_NATIVE, NULL);
else
#endif
- #ifdef CLUTTER_WINDOWING_GDK
- if (backend == NULL || backend == I_(CLUTTER_WINDOWING_GDK))
- retval = g_object_new (CLUTTER_TYPE_BACKEND_GDK, NULL);
+ #ifdef CLUTTER_WINDOWING_MIR
+ if (backend == NULL || backend == I_(CLUTTER_WINDOWING_MIR))
+ retval = g_object_new (CLUTTER_TYPE_BACKEND_MIR, NULL);
else
#endif
+#ifdef CLUTTER_WINDOWING_MIR
+ if (backend == NULL || backend == I_(CLUTTER_WINDOWING_MIR))
+ retval = g_object_new (CLUTTER_TYPE_BACKEND_MIR, NULL);
+ else
+#endif
if (backend == NULL)
g_error ("No default Clutter backend found.");
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
