[gtk+/gtkbuilder-gbinding: 144/145] Merge branch 'master' into gtkbuilder-gbinding
- From: Denis Washington <denisw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtkbuilder-gbinding: 144/145] Merge branch 'master' into gtkbuilder-gbinding
- Date: Sat, 23 Jul 2011 09:08:35 +0000 (UTC)
commit 65a846b64c079a5a671dd29a1ced23a80fddaa02
Merge: e24b186 1171696
Author: Denis Washington <denisw online de>
Date: Sat Jul 23 10:55:38 2011 +0200
Merge branch 'master' into gtkbuilder-gbinding
NEWS | 49 +++++++++
configure.ac | 2 +-
docs/reference/Makefile.am | 2 +-
docs/reference/gtk/gtk3-sections.txt | 6 +-
docs/reference/libgail-util/Makefile.am | 8 +-
gdk/x11/gdkkeys-x11.c | 2 +-
gtk/gtkcssprovider.c | 4 +-
gtk/gtkfilechooserdefault.c | 2 +-
gtk/gtkfilechooserdialog.c | 55 ++++-------
gtk/gtkprogressbar.c | 22 ++++-
gtk/gtkroundedbox.c | 28 +++++
gtk/gtkstyleproperty.c | 87 +++++++++++++++-
gtk/gtktestutils.c | 11 +-
gtk/gtktextiter.c | 2 +-
gtk/gtkthemingengine.c | 5 +-
gtk/gtkthemingengine.h | 3 +-
gtk/tests/Makefile.am | 2 +-
gtk/tests/stylecontext.c | 107 +-------------------
gtk/tests/test.png | Bin 3569 -> 0 bytes
perf/Makefile.am | 18 ----
perf/gtkwidgetprofiler.c | 5 +-
perf/marshalers.list | 2 -
tests/css/parser/Makefile.am | 75 ++++++++++++++
tests/css/parser/declarations-invalid-01.css | 1 +
tests/css/parser/declarations-invalid-01.errors | 1 +
.../css/parser/declarations-invalid-01.ref.css | 0
tests/css/parser/declarations-invalid-02.css | 1 +
tests/css/parser/declarations-invalid-02.errors | 1 +
tests/css/parser/declarations-invalid-02.ref.css | 3 +
tests/css/parser/declarations-invalid-03.css | 1 +
tests/css/parser/declarations-invalid-03.errors | 1 +
tests/css/parser/declarations-invalid-03.ref.css | 3 +
tests/css/parser/declarations-invalid-04.css | 1 +
tests/css/parser/declarations-invalid-04.errors | 1 +
tests/css/parser/declarations-invalid-04.ref.css | 3 +
tests/css/parser/declarations-invalid-05.css | 1 +
tests/css/parser/declarations-invalid-05.errors | 1 +
tests/css/parser/declarations-invalid-05.ref.css | 3 +
tests/css/parser/declarations-invalid-06.css | 1 +
tests/css/parser/declarations-invalid-06.errors | 1 +
tests/css/parser/declarations-invalid-06.ref.css | 3 +
tests/css/parser/declarations-invalid-07.css | 1 +
tests/css/parser/declarations-invalid-07.errors | 1 +
tests/css/parser/declarations-invalid-07.ref.css | 3 +
tests/css/parser/declarations-invalid-08.css | 1 +
tests/css/parser/declarations-invalid-08.errors | 3 +
.../css/parser/declarations-invalid-08.ref.css | 0
tests/css/parser/declarations-valid-01.css | 1 +
.../css/parser/declarations-valid-01.ref.css | 0
tests/css/parser/declarations-valid-02.css | 1 +
tests/css/parser/declarations-valid-02.ref.css | 7 ++
tests/css/parser/declarations-valid-03.css | 1 +
tests/css/parser/declarations-valid-03.ref.css | 7 ++
tests/css/parser/declarations-valid-04.css | 1 +
tests/css/parser/declarations-valid-04.ref.css | 7 ++
tests/css/parser/declarations-valid-05.css | 1 +
tests/css/parser/declarations-valid-05.ref.css | 3 +
tests/css/parser/declarations-valid-06.css | 1 +
.../css/parser/declarations-valid-06.ref.css | 0
tests/css/parser/declarations-valid-07.css | 3 +
.../css/parser/declarations-valid-07.ref.css | 0
tests/css/parser/declarations-valid-08.css | 1 +
tests/css/parser/declarations-valid-08.ref.css | 7 ++
tests/css/parser/declarations-valid-09.css | 1 +
tests/css/parser/declarations-valid-09.ref.css | 4 +
tests/css/parser/declarations-valid-10.css | 1 +
tests/css/parser/declarations-valid-10.ref.css | 6 +
tests/css/parser/declarations-valid-11.css | 1 +
tests/css/parser/declarations-valid-11.ref.css | 6 +
tests/css/parser/declarations-valid-12.css | 1 +
tests/css/parser/declarations-valid-12.ref.css | 6 +
tests/css/parser/declarations-valid-13.css | 1 +
tests/css/parser/declarations-valid-13.ref.css | 6 +
tests/css/parser/declarations-valid-14.css | 1 +
tests/css/parser/declarations-valid-14.ref.css | 6 +
tests/css/parser/declarations-valid-15.css | 1 +
tests/css/parser/declarations-valid-15.ref.css | 6 +
tests/css/parser/declarations-valid-16.css | 1 +
tests/css/parser/declarations-valid-16.ref.css | 10 ++
tests/css/parser/declarations-valid-17.css | 1 +
tests/css/parser/declarations-valid-17.ref.css | 6 +
tests/css/parser/declarations-valid-18.css | 1 +
tests/css/parser/declarations-valid-18.errors | 1 +
.../css/parser/declarations-valid-18.ref.css | 0
tests/css/parser/declarations-valid-19.css | 3 +
tests/css/parser/declarations-valid-19.ref.css | 3 +
tests/css/parser/declarations-valid-20.css | 5 +
tests/css/parser/declarations-valid-20.ref.css | 3 +
tests/css/parser/declarations-valid-21.css | 6 +
tests/css/parser/declarations-valid-21.ref.css | 3 +
tests/css/parser/declarations-valid-22.css | 1 +
tests/css/parser/declarations-valid-22.ref.css | 6 +
tests/css/parser/declarations-valid-23.css | 1 +
tests/css/parser/declarations-valid-23.ref.css | 6 +
tests/css/parser/declarations-valid-24.css | 1 +
tests/css/parser/declarations-valid-24.ref.css | 3 +
tests/css/parser/declarations-valid-25.css | 1 +
tests/css/parser/declarations-valid-25.ref.css | 3 +
tests/css/parser/test.png | Bin 0 -> 148 bytes
tests/reftests/Makefile.am | 3 +
tests/reftests/border-radius-clamp.css | 9 ++
tests/reftests/border-radius-clamp.ref.ui | 18 ++++
tests/reftests/border-radius-clamp.ui | 17 +++
103 files changed, 536 insertions(+), 197 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]