[gtk+/master.fcw: 530/648] Merge branch 'master' into master.fcw
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/master.fcw: 530/648] Merge branch 'master' into master.fcw
- Date: Wed, 4 Feb 2015 05:08:10 +0000 (UTC)
commit a8c8dfee23ada104068c1d62739ad566ec593d48
Merge: 8edfc14 610f7e8
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Jan 21 16:42:24 2015 +0800
Merge branch 'master' into master.fcw
HACKING | 2 +-
NEWS | 111 +
README.win32 | 2 +-
build/win32/vs10/README.txt | 2 +-
build/win32/vs9/README.txt | 2 +-
configure.ac | 7 +-
demos/gtk-demo/editable_cells.c | 13 +-
demos/widget-factory/widget-factory.c | 39 +-
demos/widget-factory/widget-factory.ui | 4 +-
docs/reference/gdk/gdk3-sections.txt | 2 +
docs/reference/gtk/building.sgml | 2 +-
docs/reference/gtk/osx.sgml | 2 +-
docs/reference/gtk/windows.sgml | 2 +-
gdk/broadway/broadwayd.c | 7 +-
gdk/broadway/gdkbroadway-server.c | 11 +-
gdk/gdkdevice.c | 114 +-
gdk/gdkdevice.h | 5 +
gdk/gdkdeviceprivate.h | 3 +
gdk/gdkdisplaymanager.c | 6 +-
gdk/gdkwindow.c | 22 +-
gdk/mir/Makefile.am | 1 +
gdk/quartz/gdkwindow-quartz.c | 2 +-
gdk/wayland/gdkdnd-wayland.c | 2 +-
gdk/wayland/gdkeventsource.c | 4 +-
gdk/x11/gdkasync.c | 2 +-
gdk/x11/gdkdevicemanager-xi2.c | 43 +
gdk/x11/gdkglcontext-x11.c | 25 +-
gtk/Makefile.am | 18 +-
gtk/a11y/gtkcontainercellaccessible.c | 2 +-
gtk/deprecated/gtkgradient.c | 10 +-
gtk/deprecated/gtkgradientprivate.h | 4 +-
gtk/deprecated/gtkimagemenuitem.c | 69 +-
gtk/deprecated/gtkstatusicon.c | 4 +-
gtk/deprecated/gtkstock.h | 6 +-
gtk/deprecated/gtkstyleproperties.c | 1 -
gtk/gtkaboutdialog.c | 64 +-
gtk/gtkappchooserbutton.c | 81 +-
gtk/gtkapplicationwindow.c | 6 +-
gtk/gtkborderimage.c | 321 -
gtk/gtkborderimageprivate.h | 54 -
gtk/gtkbuilder.c | 2 +-
gtk/gtkcalendar.c | 150 +-
gtk/gtkcellrenderer.c | 2 +-
gtk/gtkcellrendererpixbuf.c | 5 +
gtk/gtkcellrenderertext.c | 4 +-
gtk/gtkcolorbutton.c | 2 +-
gtk/gtkcolorchooserwidget.c | 2 +-
gtk/gtkcssanimatedstyle.c | 486 ++
gtk/gtkcssanimatedstyleprivate.h | 76 +
gtk/gtkcssanimation.c | 6 +-
gtk/gtkcssarrayvalue.c | 4 +-
gtk/gtkcssbgsizevalue.c | 4 +-
gtk/gtkcssbordervalue.c | 4 +-
gtk/gtkcsscolorvalue.c | 12 +-
gtk/gtkcsscomputedvalues.c | 657 --
gtk/gtkcsscomputedvaluesprivate.h | 106 -
gtk/gtkcsscornervalue.c | 4 +-
gtk/gtkcsscustomproperty.c | 2 +-
gtk/gtkcsseasevalue.c | 4 +-
gtk/gtkcssenginevalue.c | 4 +-
gtk/gtkcssenumvalue.c | 14 +-
gtk/gtkcssimage.c | 14 +-
gtk/gtkcssimagebuiltin.c | 920 +++-
gtk/gtkcssimagebuiltinprivate.h | 46 +-
gtk/gtkcssimagegradient.c | 4 +-
gtk/gtkcssimageicontheme.c | 6 +-
gtk/gtkcssimagelinear.c | 47 +-
gtk/gtkcssimageprivate.h | 8 +-
gtk/gtkcssimagescaled.c | 4 +-
gtk/gtkcssimageurl.c | 4 +-
gtk/gtkcssimagevalue.c | 4 +-
gtk/gtkcssinheritvalue.c | 6 +-
gtk/gtkcssinitialvalue.c | 4 +-
gtk/gtkcsskeyframes.c | 12 +-
gtk/gtkcsskeyframesprivate.h | 4 +-
gtk/gtkcsslookup.c | 26 +-
gtk/gtkcsslookupprivate.h | 6 +-
gtk/gtkcssnodedeclaration.c | 52 +-
gtk/gtkcssnodedeclarationprivate.h | 6 +
gtk/gtkcssnumbervalue.c | 12 +-
gtk/gtkcsspositionvalue.c | 4 +-
gtk/gtkcssprovider.c | 4 +-
gtk/gtkcssrepeatvalue.c | 4 +-
gtk/gtkcssrgbavalue.c | 4 +-
gtk/gtkcssselector.c | 20 +-
gtk/gtkcssshadowsvalue.c | 20 +-
gtk/gtkcssshadowsvalueprivate.h | 4 -
gtk/gtkcssshadowvalue.c | 27 +-
gtk/gtkcssshadowvalueprivate.h | 4 -
gtk/gtkcssstaticstyle.c | 367 +
gtk/gtkcssstaticstyleprivate.h | 84 +
gtk/gtkcssstringvalue.c | 4 +-
gtk/gtkcssstyle.c | 136 +
gtk/gtkcssstylefuncs.c | 46 +-
gtk/gtkcssstylefuncsprivate.h | 10 +-
gtk/gtkcssstyleprivate.h | 74 +
gtk/gtkcssstylepropertyimpl.c | 76 +-
gtk/gtkcsstransformvalue.c | 8 +-
gtk/gtkcsstransition.c | 10 +-
gtk/gtkcsstypedvalue.c | 8 +-
gtk/gtkcsstypesprivate.h | 10 +-
gtk/gtkcssunsetvalue.c | 4 +-
gtk/gtkcssvalue.c | 10 +-
gtk/gtkcssvalueprivate.h | 8 +-
gtk/gtkdnd.c | 123 +-
gtk/gtkeventcontroller.c | 2 +
gtk/gtkfilechooserwidget.c | 128 +-
gtk/gtkimage.c | 13 +-
gtk/gtklabel.c | 5 +
gtk/gtklistbox.c | 1 +
gtk/gtkmenutracker.c | 2 +-
gtk/gtkpathbar.c | 4 +
gtk/gtkplacessidebar.c | 20 +-
gtk/gtkpopover.c | 31 +-
gtk/gtkrecentmanager.c | 723 +-
gtk/gtkrender.c | 1551 +----
...tkthemingbackground.c => gtkrenderbackground.c} | 66 +-
...roundprivate.h => gtkrenderbackgroundprivate.h} | 23 +-
gtk/gtkrenderborder.c | 784 ++
gtk/gtkrenderborderprivate.h | 48 +
gtk/gtkrendericon.c | 142 +
gtk/gtkrendericonprivate.h | 48 +
gtk/gtkrenderprivate.h | 3 -
gtk/gtkroundedbox.c | 40 +-
gtk/gtkroundedboxprivate.h | 10 +-
gtk/gtkscrolledwindow.c | 550 +-
gtk/gtkstack.c | 1 -
gtk/gtkstyleanimation.c | 8 +-
gtk/gtkstyleanimationprivate.h | 7 +-
gtk/gtkstylecontext.c | 812 ++-
gtk/gtkstylecontextprivate.h | 5 +
gtk/gtktextview.c | 20 +-
gtk/gtkwidget.c | 24 +-
gtk/gtkwindow.c | 26 +-
gtk/inspector/general.c | 48 +-
gtk/inspector/general.ui | 123 +
gtk/inspector/general.ui.h | 3 +
gtk/inspector/magnifier.ui | 62 +
gtk/inspector/misc-info.c | 10 +-
gtk/inspector/misc-info.ui | 38 +
gtk/inspector/misc-info.ui.h | 1 +
gtk/inspector/resource-list.c | 16 +-
gtk/inspector/style-prop-list.c | 134 +-
gtk/inspector/visual.c | 104 +-
gtk/inspector/visual.ui | 3 -
gtk/theme/Adwaita/_common.scss | 121 +-
gtk/theme/Adwaita/_drawing.scss | 1 +
gtk/theme/Adwaita/gtk-contained-dark.css | 320 +-
gtk/theme/Adwaita/gtk-contained.css | 320 +-
gtk/theme/HighContrast/_common.scss | 11 +-
gtk/theme/HighContrast/gtk.css | 18 +-
gtk/ui/gtkfilechooserwidget.ui | 131 +-
gtk/ui/gtkfilechooserwidget.ui.h | 6 +-
modules/input/gtkimcontextthai.c | 2 +-
modules/input/imquartz.c | 3 -
po-properties/POTFILES.skip | 2 +
po-properties/el.po | 1628 +++--
po-properties/en_GB.po | 4763 +++++++------
po-properties/es.po | 393 +-
po-properties/eu.po | 3181 +++++----
po-properties/hu.po | 2511 ++++---
po-properties/vi.po | 7511 ++++++++++++--------
po/POTFILES.skip | 2 +
po/cs.po | 9 +-
po/de.po | 2513 ++++---
po/el.po | 932 ++--
po/en_GB.po | 2549 ++++---
po/es.po | 326 +-
po/eu.po | 2799 +++++---
po/gl.po | 1526 +++--
po/hu.po | 2083 ++++---
po/is.po | 6694 +++++++++++-------
po/lt.po | 2294 ++++---
po/ru.po | 2054 +++---
po/vi.po | 258 +-
tests/testcalendar.c | 14 +-
testsuite/reftests/Makefile.am | 3 +
testsuite/reftests/border-style-none.css | 3 +-
.../reftests/style-context-save-inheritance.css | 18 +
.../reftests/style-context-save-inheritance.ref.ui | 19 +
.../reftests/style-context-save-inheritance.ui | 18 +
181 files changed, 32370 insertions(+), 23186 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
