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

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

commit 4034bce16148a952211024008a4c828a5af5e156
Merge: 5856ee8 d3c96f9
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Nov 28 19:08:24 2014 +0800

    Merge branch 'master' into master.fcw

 gdk/mir/gdkmirdisplay.c                          |    5 +-
 gdk/x11/gdkdisplay-x11.c                         |   19 +-
 gdk/x11/gdkwindow-x11.c                          |    2 -
 gtk/a11y/gtkbuttonaccessible.c                   |   22 -
 gtk/deprecated/gtkstyle.c                        |   57 +-
 gtk/gtkcellarea.c                                |    4 +-
 gtk/gtkcssprovider.h                             |    7 +-
 gtk/gtkcssselector.c                             |  555 ++++++------
 gtk/gtkentry.c                                   |   46 +-
 gtk/gtkfilesystemmodel.c                         |   81 +-
 gtk/gtklabel.c                                   |    5 +
 gtk/gtknotebook.c                                |    6 +-
 gtk/gtkpopover.c                                 |   17 +-
 gtk/gtkprintoperation.c                          |   18 +-
 gtk/gtkrange.c                                   |  374 ++++----
 gtk/gtkrange.h                                   |    4 +-
 gtk/gtkscale.c                                   |   14 +-
 gtk/gtkspinbutton.c                              |    4 +-
 gtk/gtkstack.c                                   |    4 +-
 gtk/gtkstackswitcher.c                           |    2 -
 gtk/gtkstylecontext.c                            |   11 +-
 gtk/gtktextbtree.c                               |    2 +-
 gtk/gtktextdisplay.c                             |    6 +-
 gtk/gtkwidget.c                                  |    9 +-
 gtk/gtkwindow.c                                  |   38 +-
 gtk/inspector/prop-editor.c                      |    5 +-
 gtk/inspector/prop-list.c                        |    3 +-
 gtk/inspector/prop-list.ui                       |    2 +
 gtk/inspector/style-prop-list.ui                 |    1 +
 modules/printbackends/cups/gtkcupssecretsutils.c |    5 +-
 modules/printbackends/cups/gtkprintbackendcups.c |   19 +
 po-properties/sv.po                              | 1032 +++++++++++++---------
 testsuite/css/parser/Makefile.am                 |    2 +
 testsuite/css/parser/not.css                     |   80 ++
 testsuite/css/parser/not.ref.css                 |   80 ++
 testsuite/gtk/window.c                           |   73 ++
 36 files changed, 1552 insertions(+), 1062 deletions(-)
---