[gtk+/master.fcw: 607/648] Merge branch 'master' into master.fcw

[Chun-wei Fan <fanchunwei src gnome org>]

commit 7fee087b7db65a0cf6b0e226b93fbf5f9c00503f
Merge: f02e919 0367f78
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Jan 30 13:38:12 2015 +0800

    Merge branch 'master' into master.fcw

 demos/gtk-demo/search_entry2.c                     |   51 +
 docs/reference/gtk/getting_started.xml             |   30 +
 docs/reference/gtk/gtk3-sections.txt               |    2 +
 examples/window-default.c                          |   29 +-
 gdk/gdkgl.c                                        |   16 +-
 gdk/gdkglcontext.c                                 |    2 +-
 gdk/gdkwindow.c                                    |    9 +-
 gdk/wayland/gdkdisplay-wayland.c                   |    2 +-
 gdk/wayland/gdkscreen-wayland.c                    |    1 +
 gdk/win32/gdkdevicemanager-win32.c                 |    9 +-
 gdk/x11/gdkdisplay-x11.c                           |    5 +-
 gdk/x11/gdkglcontext-x11.c                         |    2 +
 gtk/Makefile.am                                    |   14 +-
 gtk/a11y/gtkcontainercellaccessible.c              |    2 +-
 gtk/gtkaboutdialog.c                               |    2 +-
 gtk/gtkclipboard.c                                 |   20 +
 gtk/gtkclipboard.h                                 |    3 +
 gtk/gtkcssiconthemevalue.c                         |  135 +
 gtk/gtkcssiconthemevalueprivate.h                  |   32 +
 gtk/gtkcssnumbervalue.c                            |   34 +
 gtk/gtkcssstyleproperty.c                          |  179 +-
 gtk/gtkcssstylepropertyimpl.c                      |   22 +-
 gtk/gtkcssstylepropertyprivate.h                   |   10 +-
 gtk/gtkcsstypesprivate.h                           |    3 +-
 gtk/gtkdnd.c                                       |    9 +-
 gtk/gtkfilechooserbutton.c                         |    6 +-
 gtk/gtkfilechooserdialog.c                         |   42 +-
 gtk/gtkfilechooserwidget.c                         |  134 +-
 gtk/gtkglarea.c                                    |    2 -
 gtk/gtkheaderbar.c                                 |    2 +
 gtk/gtkimage.c                                     |   10 +-
 gtk/gtkplacessidebar.c                             |    4 +-
 gtk/gtkrenderborder.c                              |    4 +-
 gtk/gtksearchbar.c                                 |  152 +-
 gtk/gtksearchentry.c                               |  218 ++-
 gtk/gtksearchentry.h                               |   12 +-
 gtk/gtksearchentryprivate.h                        |   36 +
 gtk/gtktextview.c                                  |    7 +-
 gtk/gtktreednd.c                                   |    4 +-
 gtk/gtktreemodel.c                                 |    2 +-
 gtk/gtktreeview.c                                  |   11 +-
 gtk/gtkwidget.c                                    |   59 +-
 gtk/gtkwindow.c                                    |    5 +-
 gtk/inspector/general.c                            |    1 +
 gtk/inspector/object-tree.c                        |    9 +
 gtk/inspector/object-tree.ui                       |    3 +
 gtk/inspector/prop-list.c                          |  103 +-
 gtk/inspector/prop-list.ui                         |    1 +
 gtk/inspector/style-prop-list.c                    |  106 +-
 gtk/inspector/style-prop-list.ui                   |    2 +
 gtk/theme/Adwaita/_common.scss                     |   23 +-
 gtk/theme/Adwaita/_drawing.scss                    |   42 +-
 gtk/theme/Adwaita/gtk-contained-dark.css           |  240 ++-
 gtk/theme/Adwaita/gtk-contained.css                |  242 ++-
 gtk/ui/gtkfilechooserwidget.ui                     |   79 +-
 gtk/ui/gtkfilechooserwidget.ui.h                   |    3 -
 po-properties/POTFILES.skip                        |    2 +
 po-properties/he.po                                |  904 +++---
 po/POTFILES.skip                                   |    2 +
 po/he.po                                           |  326 ++-
 po/is.po                                           | 3033 ++++++++------------
 testsuite/reftests/Makefile.am                     |    3 +
 .../border-corner-zero-width-rendering.css         |   33 +
 .../border-corner-zero-width-rendering.ref.ui      |  207 ++
 .../reftests/border-corner-zero-width-rendering.ui |  269 ++
 65 files changed, 3703 insertions(+), 3263 deletions(-)
---