[gtk+/quartz-integration: 2393/2394] Merge branch 'master' into quartz-integration



commit 286eac0f89c02d690ebe45059dcb2bf55ecce716
Merge: 888abb4 8ede747
Author: John Ralls <jralls ceridwen us>
Date:   Sun Apr 22 14:42:36 2012 -0700

    Merge branch 'master' into quartz-integration

 COPYING                                            |   19 +-
 INSTALL.in                                         |    4 +
 Makefile.am                                        |    6 -
 Makefile.decl                                      |    4 +-
 NEWS                                               |  540 ++
 README.in                                          |   83 +-
 build/win32/vs10/gailutil.vcxproj                  |    8 +-
 build/win32/vs10/gdk-win32.vcxproj                 |    1 +
 build/win32/vs10/gdk-win32.vcxproj.filters         |    3 +
 build/win32/vs10/gtk+.props                        |  113 +-
 build/win32/vs10/gtk.vcxprojin                     |    8 +-
 build/win32/vs10/gtk3-demo.vcxproj                 |    2 +
 build/win32/vs10/gtk3-demo.vcxproj.filters         |    6 +
 build/win32/vs9/gailutil.vcproj                    |    8 +-
 build/win32/vs9/gdk-win32.vcproj                   |    1 +
 build/win32/vs9/gtk+.vsprops                       |   66 +-
 build/win32/vs9/gtk.vcprojin                       |    8 +-
 build/win32/vs9/gtk3-demo.vcproj                   |    2 +
 config.h.win32.in                                  |   70 +-
 configure.ac                                       |  205 +-
 debian/README.debian                               |   18 -
 debian/build                                       |   62 -
 debian/changelog                                   |   10 -
 debian/control                                     |   81 -
 debian/copyright                                   |    8 -
 debian/libgtk-cvs-dev.files                        |    9 -
 debian/libgtk-cvs-dev.postinst                     |    5 -
 debian/libgtk-cvs-dev.prerm                        |    6 -
 debian/libgtk-cvs-doc.files                        |    8 -
 debian/libgtk-cvs-doc.postinst                     |   11 -
 debian/libgtk-cvs-doc.prerm                        |    7 -
 debian/postinst                                    |    7 -
 debian/rules                                       |  160 -
 demos/Makefile.am                                  |    2 +-
 demos/gtk-demo/Makefile.am                         |   34 +-
 demos/gtk-demo/application-standalone.c            |    3 +
 demos/gtk-demo/application.c                       |  485 ++
 demos/gtk-demo/application.gresource.xml           |   11 +
 demos/gtk-demo/application.ui                      |  104 +
 demos/gtk-demo/appwindow.c                         |   18 +-
 demos/gtk-demo/assistant.c                         |    4 +-
 demos/gtk-demo/changedisplay.c                     |   15 +-
 demos/gtk-demo/clipboard.c                         |    2 +-
 demos/gtk-demo/colorsel.c                          |   43 +-
 demos/gtk-demo/drawingarea.c                       |    2 +-
 demos/gtk-demo/editable_cells.c                    |   10 +-
 demos/gtk-demo/geninclude.pl.in                    |    2 +-
 demos/gtk-demo/gtk-logo-24.png                     |  Bin 0 -> 674 bytes
 demos/gtk-demo/gtk-logo-48.png                     |  Bin 0 -> 2405 bytes
 demos/gtk-demo/hypertext.c                         |   27 +-
 demos/gtk-demo/infobar.c                           |    9 +-
 demos/gtk-demo/links.c                             |    8 +-
 demos/gtk-demo/list_store.c                        |    4 +-
 demos/gtk-demo/main.c                              |    8 +-
 demos/gtk-demo/menus.ui                            |  107 +
 demos/gtk-demo/org.gtk.Demo.gschema.xml            |   17 +
 demos/gtk-demo/pixbufs.c                           |    2 +-
 demos/gtk-demo/search_entry.c                      |    3 +-
 demos/gtk-demo/textscroll.c                        |    4 +-
 demos/gtk-demo/toolpalette.c                       |    2 +-
 demos/gtk-demo/transparent.c                       |  248 +
 demos/pixbuf-demo/pixbuf-demo.c                    |    4 +-
 demos/widget-factory/Makefile.am                   |   31 +
 demos/widget-factory/gtk-logo-256.png              |  Bin 0 -> 10688 bytes
 demos/widget-factory/widget-factory.c              |  100 +
 demos/widget-factory/widget-factory.gresource.xml  |    9 +
 {tests => demos/widget-factory}/widget-factory.ui  |   74 +-
 docs/reference/gdk/Makefile.am                     |    3 +-
 docs/reference/gdk/gdk-docs.sgml                   |    4 +-
 docs/reference/gdk/gdk3-sections.txt               |  116 +-
 docs/reference/gtk/Makefile.am                     |   17 +-
 docs/reference/gtk/broadway.xml                    |   40 +
 docs/reference/gtk/compiling.sgml                  |   25 +-
 docs/reference/gtk/gtk-docs.sgml                   |   25 +-
 docs/reference/gtk/gtk3-sections.txt               |  147 +-
 docs/reference/gtk/gtk3.types                      |    5 +
 docs/reference/gtk/images/aboutdialog.png          |  Bin 24772 -> 17771 bytes
 docs/reference/gtk/images/accel-label.png          |  Bin 2258 -> 2459 bytes
 docs/reference/gtk/images/appchooserbutton.png     |  Bin 5115 -> 4370 bytes
 docs/reference/gtk/images/appchooserdialog.png     |  Bin 52118 -> 21259 bytes
 docs/reference/gtk/images/assistant.png            |  Bin 11542 -> 8101 bytes
 docs/reference/gtk/images/bloatpad-gnome.png       |  Bin 0 -> 42936 bytes
 docs/reference/gtk/images/bloatpad-osx.png         |  Bin 0 -> 25036 bytes
 docs/reference/gtk/images/bloatpad-xfce.png        |  Bin 0 -> 53775 bytes
 docs/reference/gtk/images/button.png               |  Bin 1982 -> 2124 bytes
 docs/reference/gtk/images/check-button.png         |  Bin 2429 -> 2800 bytes
 docs/reference/gtk/images/color-button.png         |  Bin 2237 -> 2338 bytes
 docs/reference/gtk/images/colorchooser.png         |  Bin 0 -> 13972 bytes
 docs/reference/gtk/images/colorsel.png             |  Bin 36114 -> 32621 bytes
 docs/reference/gtk/images/combo-box-entry.png      |  Bin 2848 -> 2943 bytes
 docs/reference/gtk/images/combo-box.png            |  Bin 2584 -> 2699 bytes
 docs/reference/gtk/images/entry.png                |  Bin 1717 -> 1837 bytes
 docs/reference/gtk/images/file-button.png          |  Bin 7962 -> 9334 bytes
 docs/reference/gtk/images/filechooser.png          |  Bin 64476 -> 68828 bytes
 docs/reference/gtk/images/font-button.png          |  Bin 3123 -> 3515 bytes
 docs/reference/gtk/images/fontchooser.png          |  Bin 0 -> 67493 bytes
 docs/reference/gtk/images/fontsel.png              |  Bin 30452 -> 24842 bytes
 docs/reference/gtk/images/frame.png                |  Bin 2097 -> 1860 bytes
 docs/reference/gtk/images/icon-view.png            |  Bin 5944 -> 3249 bytes
 docs/reference/gtk/images/image.png                |  Bin 2846 -> 3261 bytes
 docs/reference/gtk/images/label.png                |  Bin 1347 -> 1482 bytes
 docs/reference/gtk/images/link-button.png          |  Bin 1535 -> 1840 bytes
 docs/reference/gtk/images/list-and-tree.png        |  Bin 3731 -> 3760 bytes
 docs/reference/gtk/images/lock-button.png          |  Bin 0 -> 2260 bytes
 docs/reference/gtk/images/menubar.png              |  Bin 2562 -> 2803 bytes
 docs/reference/gtk/images/messagedialog.png        |  Bin 9767 -> 7974 bytes
 docs/reference/gtk/images/multiline-text.png       |  Bin 2219 -> 2472 bytes
 docs/reference/gtk/images/notebook.png             |  Bin 4653 -> 4996 bytes
 docs/reference/gtk/images/pagesetupdialog.png      |  Bin 23544 -> 21137 bytes
 docs/reference/gtk/images/panes.png                |  Bin 3474 -> 3343 bytes
 docs/reference/gtk/images/printdialog.png          |  Bin 27952 -> 25940 bytes
 docs/reference/gtk/images/progressbar.png          |  Bin 2697 -> 2912 bytes
 docs/reference/gtk/images/radio-group.png          |  Bin 4580 -> 4475 bytes
 docs/reference/gtk/images/recentchooserdialog.png  |  Bin 33647 -> 17261 bytes
 docs/reference/gtk/images/scales.png               |  Bin 4215 -> 4893 bytes
 docs/reference/gtk/images/scrolledwindow.png       |  Bin 4321 -> 2914 bytes
 docs/reference/gtk/images/separator.png            |  Bin 3288 -> 3598 bytes
 docs/reference/gtk/images/spinbutton.png           |  Bin 2667 -> 2705 bytes
 docs/reference/gtk/images/spinner.png              |  Bin 3531 -> 2677 bytes
 docs/reference/gtk/images/statusbar.png            |  Bin 2338 -> 2484 bytes
 docs/reference/gtk/images/switch.png               |  Bin 1875 -> 2944 bytes
 docs/reference/gtk/images/toggle-button.png        |  Bin 2435 -> 2712 bytes
 docs/reference/gtk/images/toolbar.png              |  Bin 4014 -> 3917 bytes
 docs/reference/gtk/images/toolpalette.png          |  Bin 10010 -> 9338 bytes
 docs/reference/gtk/images/volumebutton.png         |  Bin 1453 -> 1773 bytes
 docs/reference/gtk/images/window.png               |  Bin 3884 -> 2955 bytes
 docs/reference/gtk/migrating-2to3.xml              |    6 +-
 docs/reference/gtk/migrating-checklist.sgml        |    7 +-
 .../gtk/migrating-smclient-GtkApplication.xml      |   48 +
 ...ion.xml => migrating-unique-GtkApplication.xml} |   12 +-
 docs/reference/gtk/osx.sgml                        |    4 +-
 docs/reference/gtk/other_software.sgml             |    4 +-
 docs/reference/gtk/question_index.sgml             |   10 +-
 docs/reference/gtk/running.sgml                    |   15 +-
 docs/reference/gtk/visual_index.xml                |    6 +
 docs/reference/gtk/wayland.xml                     |   40 +
 docs/reference/gtk/windows.sgml                    |   11 +-
 docs/reference/gtk/x11.sgml                        |    2 +-
 .../libgail-util/gail-libgail-util-docs.sgml       |    2 +-
 docs/tools/widgets.c                               |   32 +
 examples/Makefile.am                               |    5 +-
 examples/bloatpad.c                                |  287 +-
 examples/drawing.c                                 |   26 +-
 examples/plugman.c                                 |  468 ++
 gail-3.0-uninstalled.pc.in                         |   11 -
 gdk-3.0.pc.in                                      |    1 +
 gdk/COPYING                                        |   22 +-
 gdk/Makefile.am                                    |    8 +-
 gdk/broadway/broadway.c                            |  189 +-
 gdk/broadway/broadway.h                            |   13 +-
 gdk/broadway/broadway.js                           |   19 +-
 gdk/broadway/gdkbroadway.h                         |    4 +-
 gdk/broadway/gdkbroadwaycursor.h                   |    4 +-
 gdk/broadway/gdkbroadwaydisplaymanager.h           |    4 +-
 gdk/broadway/gdkbroadwayvisual.h                   |    4 +-
 gdk/broadway/gdkbroadwaywindow.h                   |    4 +-
 gdk/broadway/gdkcursor-broadway.c                  |    4 +-
 gdk/broadway/gdkdevice-broadway.c                  |    4 +-
 gdk/broadway/gdkdevice-broadway.h                  |    4 +-
 gdk/broadway/gdkdevicemanager-broadway.c           |    4 +-
 gdk/broadway/gdkdevicemanager-broadway.h           |    4 +-
 gdk/broadway/gdkdisplay-broadway.c                 |  337 +-
 gdk/broadway/gdkdisplay-broadway.h                 |    4 +-
 gdk/broadway/gdkdisplaymanager-broadway.c          |    4 +-
 gdk/broadway/gdkdnd-broadway.c                     |    4 +-
 gdk/broadway/gdkeventsource.c                      |    4 +-
 gdk/broadway/gdkeventsource.h                      |    4 +-
 gdk/broadway/gdkglobals-broadway.c                 |    4 +-
 gdk/broadway/gdkim-broadway.c                      |    4 +-
 gdk/broadway/gdkkeys-broadway.c                    |    4 +-
 gdk/broadway/gdkmain-broadway.c                    |    4 +-
 gdk/broadway/gdkprivate-broadway.h                 |    4 +-
 gdk/broadway/gdkproperty-broadway.c                |    4 +-
 gdk/broadway/gdkscreen-broadway.c                  |   52 +-
 gdk/broadway/gdkscreen-broadway.h                  |    4 +-
 gdk/broadway/gdkselection-broadway.c               |    4 +-
 gdk/broadway/gdktestutils-broadway.c               |    4 +-
 gdk/broadway/gdkvisual-broadway.c                  |    4 +-
 gdk/broadway/gdkwindow-broadway.c                  |    4 +-
 gdk/broadway/gdkwindow-broadway.h                  |    4 +-
 gdk/gdk.c                                          |   53 +-
 gdk/gdk.h                                          |    5 +-
 gdk/gdk.symbols                                    |   10 +-
 gdk/gdkapplaunchcontext.c                          |    6 +-
 gdk/gdkapplaunchcontext.h                          |   11 +-
 gdk/gdkapplaunchcontextprivate.h                   |    4 +-
 gdk/gdkcairo.c                                     |   10 +-
 gdk/gdkcairo.h                                     |   11 +-
 gdk/gdkcolor.c                                     |    4 +-
 gdk/gdkcolor.h                                     |    6 +-
 gdk/gdkconfig.h.win32                              |   13 +
 gdk/gdkcursor.c                                    |    4 +-
 gdk/gdkcursor.h                                    |   11 +-
 gdk/gdkcursorprivate.h                             |    4 +-
 gdk/gdkdeprecated.c                                |    4 +-
 gdk/gdkdevice.c                                    |   47 +-
 gdk/gdkdevice.h                                    |   29 +-
 gdk/gdkdevicemanager.c                             |    4 +-
 gdk/gdkdevicemanager.h                             |    4 +-
 gdk/gdkdevicemanagerprivate.h                      |    4 +-
 gdk/gdkdeviceprivate.h                             |   15 +-
 gdk/gdkdisplay.c                                   |  154 +-
 gdk/gdkdisplay.h                                   |   25 +-
 gdk/gdkdisplaymanager.c                            |   14 +-
 gdk/gdkdisplaymanager.h                            |    4 +-
 gdk/gdkdisplaymanagerprivate.h                     |    4 +-
 gdk/gdkdisplayprivate.h                            |   36 +-
 gdk/gdkdnd.c                                       |    4 +-
 gdk/gdkdnd.h                                       |    4 +-
 gdk/gdkdndprivate.h                                |    4 +-
 gdk/gdkevents.c                                    |  216 +-
 gdk/gdkevents.h                                    |  161 +-
 gdk/gdkglobals.c                                   |    4 +-
 gdk/gdkinternals.h                                 |   37 +-
 gdk/gdkintl.h                                      |    4 +-
 gdk/gdkkeynames.c                                  |    4 +-
 gdk/gdkkeys.c                                      |   33 +-
 gdk/gdkkeys.h                                      |    8 +-
 gdk/gdkkeysprivate.h                               |    5 +-
 gdk/gdkkeysyms-compat.h                            |    4 +-
 gdk/gdkkeysyms-update.pl                           |    4 +-
 gdk/gdkkeysyms.h                                   |    4 +-
 gdk/gdkkeyuni.c                                    |    4 +-
 gdk/gdkmain.h                                      |   19 +-
 gdk/gdkoffscreenwindow.c                           |   13 +-
 gdk/gdkpango.c                                     |    4 +-
 gdk/gdkpango.h                                     |    4 +-
 gdk/gdkpixbuf-drawable.c                           |    4 +-
 gdk/gdkpixbuf.h                                    |    4 +-
 gdk/gdkprivate.h                                   |    4 +-
 gdk/gdkproperty.h                                  |    4 +-
 gdk/gdkrectangle.c                                 |    4 +-
 gdk/gdkrectangle.h                                 |    4 +-
 gdk/gdkrgba.c                                      |   58 +-
 gdk/gdkrgba.h                                      |    4 +-
 gdk/gdkscreen.c                                    |  135 +-
 gdk/gdkscreen.h                                    |   20 +-
 gdk/gdkscreenprivate.h                             |    7 +-
 gdk/gdkselection.c                                 |    4 +-
 gdk/gdkselection.h                                 |    4 +-
 gdk/gdktestutils.h                                 |    4 +-
 gdk/gdkthreads.h                                   |    4 +-
 gdk/gdktypes.h                                     |   22 +-
 gdk/gdkversionmacros.h.in                          |  220 +
 gdk/gdkvisual.c                                    |    4 +-
 gdk/gdkvisual.h                                    |    4 +-
 gdk/gdkvisualprivate.h                             |    4 +-
 gdk/gdkwindow.c                                    | 1256 +++--
 gdk/gdkwindow.h                                    |   16 +-
 gdk/gdkwindowimpl.c                                |    4 +-
 gdk/gdkwindowimpl.h                                |    4 +-
 gdk/gdkx.h                                         |    4 +-
 gdk/keyname-table.h                                |    1 +
 gdk/quartz/GdkQuartzNSWindow.c                     |   14 +-
 gdk/quartz/GdkQuartzNSWindow.h                     |    5 +-
 gdk/quartz/GdkQuartzView.c                         |    4 +-
 gdk/quartz/GdkQuartzView.h                         |    4 +-
 gdk/quartz/gdkcursor-quartz.c                      |    8 +-
 gdk/quartz/gdkdevice-core-quartz.c                 |   26 +-
 gdk/quartz/gdkdevicemanager-core-quartz.c          |    4 +-
 gdk/quartz/gdkdevicemanager-core-quartz.h          |    4 +-
 gdk/quartz/gdkdisplay-quartz.c                     |    7 +-
 gdk/quartz/gdkdisplaymanager-quartz.c              |    4 +-
 gdk/quartz/gdkdnd-quartz.c                         |    4 +-
 gdk/quartz/gdkdnd-quartz.h                         |    4 +-
 gdk/quartz/gdkeventloop-quartz.c                   |    9 +-
 gdk/quartz/gdkevents-quartz.c                      |  208 +-
 gdk/quartz/gdkglobals-quartz.c                     |    4 +-
 gdk/quartz/gdkkeys-quartz.c                        |   92 +-
 gdk/quartz/gdkprivate-quartz.h                     |    5 +-
 gdk/quartz/gdkproperty-quartz.c                    |    4 +-
 gdk/quartz/gdkquartz.h                             |    4 +-
 gdk/quartz/gdkquartzcursor.h                       |    4 +-
 gdk/quartz/gdkquartzdevice-core.h                  |    4 +-
 gdk/quartz/gdkquartzdevicemanager-core.h           |    4 +-
 gdk/quartz/gdkquartzdisplay.h                      |    4 +-
 gdk/quartz/gdkquartzdisplaymanager.h               |    4 +-
 gdk/quartz/gdkquartzdnd.h                          |    4 +-
 gdk/quartz/gdkquartzkeys.h                         |    4 +-
 gdk/quartz/gdkquartzscreen.h                       |    4 +-
 gdk/quartz/gdkquartzutils.h                        |    4 +-
 gdk/quartz/gdkquartzvisual.h                       |    4 +-
 gdk/quartz/gdkquartzwindow.h                       |    4 +-
 gdk/quartz/gdkscreen-quartz.c                      |   32 +-
 gdk/quartz/gdkscreen-quartz.h                      |    4 +-
 gdk/quartz/gdkselection-quartz.c                   |    4 +-
 gdk/quartz/gdktestutils-quartz.c                   |    4 +-
 gdk/quartz/gdkutils-quartz.c                       |    4 +-
 gdk/quartz/gdkvisual-quartz.c                      |    4 +-
 gdk/quartz/gdkwindow-quartz.c                      |   17 +-
 gdk/quartz/gdkwindow-quartz.h                      |    4 +-
 gdk/tests/Makefile.am                              |    6 +-
 gdk/tests/gdk-color.c                              |  102 -
 gdk/tests/rgba.c                                   |  164 +
 gdk/wayland/gdkapplaunchcontext-wayland.c          |    4 +-
 gdk/wayland/gdkcursor-wayland.c                    |   80 +-
 gdk/wayland/gdkdevice-wayland.c                    |  653 ++-
 gdk/wayland/gdkdisplay-wayland.c                   |  162 +-
 gdk/wayland/gdkdisplay-wayland.h                   |   44 +-
 gdk/wayland/gdkdisplaymanager-wayland.c            |   95 +-
 gdk/wayland/gdkdnd-wayland.c                       |    4 +-
 gdk/wayland/gdkeventsource.c                       |   20 +-
 gdk/wayland/gdkkeys-wayland.c                      |   12 +-
 gdk/wayland/gdkprivate-wayland.h                   |   14 +-
 gdk/wayland/gdkscreen-wayland.c                    |  159 +-
 gdk/wayland/gdkselection-wayland.c                 |    4 +-
 gdk/wayland/gdkwayland.h                           |   44 +-
 gdk/wayland/gdkwindow-wayland.c                    |  511 ++-
 gdk/win32/Makefile.am                              |    2 +
 gdk/win32/bdfcursor.c                              |    4 +-
 gdk/win32/gdkcursor-win32.c                        |    4 +-
 gdk/win32/gdkdevice-virtual.c                      |  429 ++
 gdk/win32/gdkdevice-virtual.h                      |   54 +
 gdk/win32/gdkdevice-win32.c                        |  206 +-
 gdk/win32/gdkdevice-win32.h                        |    4 +-
 gdk/win32/gdkdevice-wintab.c                       |  245 +-
 gdk/win32/gdkdevice-wintab.h                       |   12 +-
 gdk/win32/gdkdevicemanager-win32.c                 |  276 +-
 gdk/win32/gdkdevicemanager-win32.h                 |    8 +-
 gdk/win32/gdkdisplay-win32.c                       |  207 +-
 gdk/win32/gdkdisplaymanager-win32.c                |    4 +-
 gdk/win32/gdkdnd-win32.c                           |  337 +-
 gdk/win32/gdkevents-win32.c                        | 1057 ++--
 gdk/win32/gdkgeometry-win32.c                      |   19 +-
 gdk/win32/gdkglobals-win32.c                       |    5 +-
 gdk/win32/gdkinput.c                               |   52 +-
 gdk/win32/gdkkeys-win32.c                          |    4 +-
 gdk/win32/gdkmain-win32.c                          |    4 +-
 gdk/win32/gdkprivate-win32.h                       |   16 +-
 gdk/win32/gdkproperty-win32.c                      |    4 +-
 gdk/win32/gdkscreen-win32.c                        |   36 +-
 gdk/win32/gdkselection-win32.c                     |   23 +-
 gdk/win32/gdktestutils-win32.c                     |    4 +-
 gdk/win32/gdkvisual-win32.c                        |    4 +-
 gdk/win32/gdkwin32.h                               |    5 +-
 gdk/win32/gdkwin32cursor.h                         |    4 +-
 gdk/win32/gdkwin32display.h                        |    4 +-
 gdk/win32/gdkwin32displaymanager.h                 |    4 +-
 gdk/win32/gdkwin32dnd.h                            |    4 +-
 gdk/win32/gdkwin32id.c                             |    4 +-
 gdk/win32/gdkwin32keys.h                           |    4 +-
 gdk/win32/gdkwin32screen.h                         |    4 +-
 gdk/win32/gdkwin32window.h                         |    4 +-
 gdk/win32/gdkwindow-win32.c                        |  500 ++-
 gdk/win32/gdkwindow-win32.h                        |   13 +-
 gdk/x11/Makefile.am                                |    5 -
 gdk/x11/MwmUtil.h                                  |    4 +-
 gdk/x11/checksettings.c                            |    4 +-
 gdk/x11/gdkapplaunchcontext-x11.c                  |    6 +-
 gdk/x11/gdkasync.c                                 |    8 +-
 gdk/x11/gdkasync.h                                 |    4 +-
 gdk/x11/gdkcursor-x11.c                            |    4 +-
 gdk/x11/gdkdevice-core-x11.c                       |   46 +-
 gdk/x11/gdkdevice-xi.c                             |  662 ---
 gdk/x11/gdkdevice-xi2.c                            |  223 +-
 gdk/x11/gdkdevicemanager-core-x11.c                |  249 +-
 gdk/x11/gdkdevicemanager-x11.c                     |   32 +-
 gdk/x11/gdkdevicemanager-xi.c                      |  687 ---
 gdk/x11/gdkdevicemanager-xi2.c                     |  643 ++-
 gdk/x11/gdkdevicemanagerprivate-core.h             |   14 +-
 gdk/x11/gdkdeviceprivate-xi.h                      |   61 -
 gdk/x11/gdkdisplay-x11.c                           |  110 +-
 gdk/x11/gdkdisplay-x11.h                           |    6 +-
 gdk/x11/gdkdisplaymanager-x11.c                    |    6 +-
 gdk/x11/gdkdnd-x11.c                               |   89 +-
 gdk/x11/gdkeventsource.c                           |    4 +-
 gdk/x11/gdkeventsource.h                           |    4 +-
 gdk/x11/gdkeventtranslator.c                       |    4 +-
 gdk/x11/gdkeventtranslator.h                       |    4 +-
 gdk/x11/gdkgeometry-x11.c                          |    4 +-
 gdk/x11/gdkkeys-x11.c                              |  140 +-
 gdk/x11/gdkmain-x11.c                              |   11 +-
 gdk/x11/gdkprivate-x11.h                           |   39 +-
 gdk/x11/gdkproperty-x11.c                          |   16 +-
 gdk/x11/gdkscreen-x11.c                            |  297 +-
 gdk/x11/gdkscreen-x11.h                            |    4 +-
 gdk/x11/gdkselection-x11.c                         |    4 +-
 gdk/x11/gdksettings.c                              |   12 +-
 gdk/x11/gdktestutils-x11.c                         |    4 +-
 gdk/x11/gdkvisual-x11.c                            |    4 +-
 gdk/x11/gdkwindow-x11.c                            |  333 +-
 gdk/x11/gdkwindow-x11.h                            |    9 +-
 gdk/x11/gdkx.h                                     |    6 +-
 gdk/x11/gdkx11applaunchcontext.h                   |    4 +-
 gdk/x11/gdkx11cursor.h                             |    4 +-
 gdk/x11/gdkx11device-core.h                        |    4 +-
 gdk/x11/gdkx11device-xi.h                          |   42 -
 gdk/x11/gdkx11device-xi2.h                         |    4 +-
 gdk/x11/gdkx11device.h                             |    5 +-
 gdk/x11/gdkx11devicemanager-core.h                 |    4 +-
 gdk/x11/gdkx11devicemanager-xi.h                   |    4 +-
 gdk/x11/gdkx11devicemanager-xi2.h                  |    4 +-
 gdk/x11/gdkx11devicemanager.h                      |    5 +-
 gdk/x11/gdkx11display.h                            |    4 +-
 gdk/x11/gdkx11displaymanager.h                     |    4 +-
 gdk/x11/gdkx11dnd.h                                |    4 +-
 gdk/x11/gdkx11keys.h                               |    4 +-
 gdk/x11/gdkx11property.h                           |    4 +-
 gdk/x11/gdkx11screen.h                             |    4 +-
 gdk/x11/gdkx11selection.h                          |    4 +-
 gdk/x11/gdkx11utils.h                              |    4 +-
 gdk/x11/gdkx11visual.h                             |    4 +-
 gdk/x11/gdkx11window.h                             |   11 +-
 gdk/x11/gdkxftdefaults.c                           |    4 +-
 gdk/x11/gdkxid.c                                   |    4 +-
 gdk/x11/xsettings-client.c                         |    9 +-
 gtk+-3.0-uninstalled.pc.in                         |   10 -
 gtk+-3.0.pc.in                                     |    3 +-
 gtk/Makefile.am                                    |  265 +-
 gtk/a11y/Makefile.am                               |    4 +
 gtk/a11y/gail.c                                    |    4 +-
 gtk/a11y/gailmisc.c                                |    4 +-
 gtk/a11y/gailmisc.h                                |    4 +-
 gtk/a11y/gailutil.c                                |   21 +-
 gtk/a11y/gailutil.h                                |    7 +-
 gtk/a11y/gtkarrowaccessible.c                      |    4 +-
 gtk/a11y/gtkarrowaccessible.h                      |    4 +-
 gtk/a11y/gtkbooleancellaccessible.c                |  131 +-
 gtk/a11y/gtkbooleancellaccessible.h                |    5 +-
 gtk/a11y/gtkboxaccessible.c                        |    4 +-
 gtk/a11y/gtkboxaccessible.h                        |    4 +-
 gtk/a11y/gtkbuttonaccessible.c                     |    4 +-
 gtk/a11y/gtkbuttonaccessible.h                     |    4 +-
 gtk/a11y/gtkcellaccessible.c                       |  381 +-
 gtk/a11y/gtkcellaccessible.h                       |   40 +-
 gtk/a11y/gtkcellaccessibleparent.c                 |   82 +-
 gtk/a11y/gtkcellaccessibleparent.h                 |   27 +-
 gtk/a11y/gtkcheckmenuitemaccessible.c              |    4 +-
 gtk/a11y/gtkcheckmenuitemaccessible.h              |    4 +-
 gtk/a11y/gtkcolorswatchaccessible.c                |  102 +
 gtk/a11y/gtkcolorswatchaccessible.h                |   49 +
 gtk/a11y/gtkcomboboxaccessible.c                   |    6 +-
 gtk/a11y/gtkcomboboxaccessible.h                   |    4 +-
 gtk/a11y/gtkcontaineraccessible.c                  |    4 +-
 gtk/a11y/gtkcontaineraccessible.h                  |    5 +-
 gtk/a11y/gtkcontainercellaccessible.c              |   83 +-
 gtk/a11y/gtkcontainercellaccessible.h              |    4 +-
 gtk/a11y/gtkentryaccessible.c                      |   60 +-
 gtk/a11y/gtkentryaccessible.h                      |    8 +-
 gtk/a11y/gtkexpanderaccessible.c                   |    4 +-
 gtk/a11y/gtkexpanderaccessible.h                   |    4 +-
 gtk/a11y/gtkframeaccessible.c                      |    4 +-
 gtk/a11y/gtkframeaccessible.h                      |    4 +-
 gtk/a11y/gtkiconviewaccessible.c                   | 1548 +++++
 gtk/a11y/gtkiconviewaccessible.h                   |   55 +
 gtk/a11y/gtkimageaccessible.c                      |    4 +-
 gtk/a11y/gtkimageaccessible.h                      |    4 +-
 gtk/a11y/gtkimagecellaccessible.c                  |   42 +-
 gtk/a11y/gtkimagecellaccessible.h                  |    5 +-
 gtk/a11y/gtklabelaccessible.c                      |    4 +-
 gtk/a11y/gtklabelaccessible.h                      |    4 +-
 gtk/a11y/gtklinkbuttonaccessible.c                 |    4 +-
 gtk/a11y/gtklinkbuttonaccessible.h                 |    4 +-
 gtk/a11y/gtkmenuaccessible.c                       |    5 +-
 gtk/a11y/gtkmenuaccessible.h                       |    5 +-
 gtk/a11y/gtkmenuitemaccessible.c                   |    4 +-
 gtk/a11y/gtkmenuitemaccessible.h                   |    4 +-
 gtk/a11y/gtkmenushellaccessible.c                  |    4 +-
 gtk/a11y/gtkmenushellaccessible.h                  |    4 +-
 gtk/a11y/gtknotebookaccessible.c                   |   19 +-
 gtk/a11y/gtknotebookaccessible.h                   |    4 +-
 gtk/a11y/gtknotebookpageaccessible.c               |    4 +-
 gtk/a11y/gtknotebookpageaccessible.h               |    4 +-
 gtk/a11y/gtkpanedaccessible.c                      |    4 +-
 gtk/a11y/gtkpanedaccessible.h                      |    4 +-
 gtk/a11y/gtkprogressbaraccessible.c                |    4 +-
 gtk/a11y/gtkprogressbaraccessible.h                |    4 +-
 gtk/a11y/gtkradiobuttonaccessible.c                |    4 +-
 gtk/a11y/gtkradiobuttonaccessible.h                |    4 +-
 gtk/a11y/gtkradiomenuitemaccessible.c              |    4 +-
 gtk/a11y/gtkradiomenuitemaccessible.h              |    4 +-
 gtk/a11y/gtkrangeaccessible.c                      |    4 +-
 gtk/a11y/gtkrangeaccessible.h                      |    4 +-
 gtk/a11y/gtkrenderercellaccessible.c               |   88 +-
 gtk/a11y/gtkrenderercellaccessible.h               |   11 +-
 gtk/a11y/gtkscaleaccessible.c                      |    4 +-
 gtk/a11y/gtkscaleaccessible.h                      |    4 +-
 gtk/a11y/gtkscalebuttonaccessible.c                |    4 +-
 gtk/a11y/gtkscalebuttonaccessible.h                |    5 +-
 gtk/a11y/gtkscrollbaraccessible.c                  |    4 +-
 gtk/a11y/gtkscrollbaraccessible.h                  |    4 +-
 gtk/a11y/gtkscrolledwindowaccessible.c             |    4 +-
 gtk/a11y/gtkscrolledwindowaccessible.h             |    4 +-
 gtk/a11y/gtkspinbuttonaccessible.c                 |    4 +-
 gtk/a11y/gtkspinbuttonaccessible.h                 |    4 +-
 gtk/a11y/gtkspinneraccessible.c                    |    4 +-
 gtk/a11y/gtkspinneraccessible.h                    |    4 +-
 gtk/a11y/gtkstatusbaraccessible.c                  |    4 +-
 gtk/a11y/gtkstatusbaraccessible.h                  |    4 +-
 gtk/a11y/gtkswitchaccessible.c                     |    4 +-
 gtk/a11y/gtkswitchaccessible.h                     |    4 +-
 gtk/a11y/gtktextcellaccessible.c                   |  115 +-
 gtk/a11y/gtktextcellaccessible.h                   |    5 +-
 gtk/a11y/gtktextviewaccessible.c                   |  186 +-
 gtk/a11y/gtktextviewaccessible.h                   |   10 +-
 gtk/a11y/gtktogglebuttonaccessible.c               |    4 +-
 gtk/a11y/gtktogglebuttonaccessible.h               |    4 +-
 gtk/a11y/gtktoplevelaccessible.c                   |    4 +-
 gtk/a11y/gtktoplevelaccessible.h                   |    4 +-
 gtk/a11y/gtktreeviewaccessible.c                   | 3608 +++---------
 gtk/a11y/gtktreeviewaccessible.h                   |   59 +-
 gtk/a11y/gtkwidgetaccessible.c                     |   48 +-
 gtk/a11y/gtkwidgetaccessible.h                     |    7 +-
 gtk/a11y/gtkwindowaccessible.c                     |    4 +-
 gtk/a11y/gtkwindowaccessible.h                     |    4 +-
 gtk/compose-parse.py                               |    4 +-
 gtk/cursor_dnd_ask.png                             |  Bin 0 -> 201 bytes
 gtk/cursor_dnd_copy.png                            |  Bin 0 -> 183 bytes
 gtk/cursor_dnd_link.png                            |  Bin 0 -> 216 bytes
 gtk/cursor_dnd_move.png                            |  Bin 0 -> 197 bytes
 gtk/cursor_dnd_none.png                            |  Bin 0 -> 144 bytes
 gtk/{ => deprecated}/gtkcolorsel.c                 |   77 +-
 gtk/{ => deprecated}/gtkcolorsel.h                 |   42 +-
 gtk/{ => deprecated}/gtkcolorseldialog.c           |   10 +-
 gtk/{ => deprecated}/gtkcolorseldialog.h           |    8 +-
 gtk/deprecated/gtkfontsel.c                        |    6 +-
 gtk/deprecated/gtkfontsel.h                        |   46 +-
 gtk/deprecated/gtkhandlebox.c                      |    6 +-
 gtk/deprecated/gtkhandlebox.h                      |   20 +-
 gtk/deprecated/gtkhbbox.c                          |    4 +-
 gtk/deprecated/gtkhbbox.h                          |    6 +-
 gtk/deprecated/gtkhbox.c                           |    8 +-
 gtk/deprecated/gtkhbox.h                           |    6 +-
 gtk/deprecated/gtkhpaned.c                         |    4 +-
 gtk/deprecated/gtkhpaned.h                         |    6 +-
 gtk/deprecated/gtkhscale.c                         |    6 +-
 gtk/deprecated/gtkhscale.h                         |    8 +-
 gtk/deprecated/gtkhscrollbar.c                     |   11 +-
 gtk/deprecated/gtkhscrollbar.h                     |    6 +-
 gtk/deprecated/gtkhseparator.c                     |    4 +-
 gtk/deprecated/gtkhseparator.h                     |    6 +-
 gtk/{ => deprecated}/gtkhsv.c                      |  177 +-
 gtk/{ => deprecated}/gtkhsv.h                      |   24 +-
 gtk/deprecated/gtkrc.c                             |    5 +-
 gtk/deprecated/gtkrc.h                             |   50 +-
 gtk/deprecated/gtkstyle.c                          |    5 +-
 gtk/deprecated/gtkstyle.h                          |   70 +-
 gtk/deprecated/gtktable.c                          |    4 +-
 gtk/deprecated/gtktable.h                          |   34 +-
 gtk/deprecated/gtktearoffmenuitem.c                |    5 +-
 gtk/deprecated/gtktearoffmenuitem.h                |    5 +-
 gtk/deprecated/gtkvbbox.c                          |    4 +-
 gtk/deprecated/gtkvbbox.h                          |    5 +-
 gtk/deprecated/gtkvbox.c                           |    8 +-
 gtk/deprecated/gtkvbox.h                           |    6 +-
 gtk/deprecated/gtkvpaned.c                         |    4 +-
 gtk/deprecated/gtkvpaned.h                         |    5 +-
 gtk/deprecated/gtkvscale.c                         |    6 +-
 gtk/deprecated/gtkvscale.h                         |    6 +-
 gtk/deprecated/gtkvscrollbar.c                     |   11 +-
 gtk/deprecated/gtkvscrollbar.h                     |    5 +-
 gtk/deprecated/gtkvseparator.c                     |    4 +-
 gtk/deprecated/gtkvseparator.h                     |    5 +-
 gtk/fallback-c89.c                                 |    4 +-
 gtk/fnmatch.c                                      |    4 +-
 gtk/gactionmuxer.c                                 |  505 ++
 gtk/gactionmuxer.h                                 |   51 +
 gtk/gactionobservable.c                            |   78 +
 gtk/gactionobservable.h                            |   62 +
 gtk/gactionobserver.c                              |  159 +
 gtk/gactionobserver.h                              |   88 +
 gtk/gen-paper-names.c                              |    4 +-
 gtk/gsimpleactionobserver.c                        |  286 +
 gtk/gsimpleactionobserver.h                        |   51 +
 gtk/gtk-default.css                                |  358 ++
 gtk/gtk-keys.css.emacs                             |    4 +-
 gtk/gtk-win32-base.css                             |  836 +++
 gtk/gtk-win32-classic.css                          |    4 +
 gtk/gtk-win32-xp.css                               |   72 +
 gtk/gtk-win32.css                                  |   84 +
 gtk/gtk.css.raleigh                                |    3 -
 gtk/gtk.gresource.xml                              |   15 +
 gtk/gtk.h                                          |   20 +-
 gtk/gtk.symbols                                    |   58 +
 gtk/gtkaboutdialog.c                               |   82 +-
 gtk/gtkaboutdialog.h                               |    8 +-
 gtk/gtkaccelgroup.c                                |   30 +-
 gtk/gtkaccelgroup.h                                |    7 +-
 gtk/gtkaccelgroupprivate.h                         |    4 +-
 gtk/gtkaccellabel.c                                |    5 +-
 gtk/gtkaccellabel.h                                |    4 +-
 gtk/gtkaccelmap.c                                  |   28 +-
 gtk/gtkaccelmap.h                                  |   14 +-
 gtk/gtkaccelmapprivate.h                           |   43 +
 gtk/gtkaccessible.c                                |  138 +-
 gtk/gtkaccessible.h                                |   10 +-
 gtk/gtkaction.c                                    |    7 +-
 gtk/gtkaction.h                                    |    4 +-
 gtk/gtkactionable.c                                |  259 +
 gtk/gtkactionable.h                                |   77 +
 gtk/gtkactiongroup.c                               |    7 +-
 gtk/gtkactiongroup.h                               |    4 +-
 gtk/gtkactivatable.c                               |    8 +-
 gtk/gtkactivatable.h                               |    8 +-
 gtk/gtkadjustment.c                                |    4 +-
 gtk/gtkadjustment.h                                |    8 +-
 gtk/gtkalignment.c                                 |    4 +-
 gtk/gtkalignment.h                                 |    4 +-
 gtk/gtkallocatedbitmask.c                          |  343 ++
 gtk/gtkallocatedbitmaskprivate.h                   |   72 +
 gtk/gtkanimationdescription.c                      |  177 -
 gtk/gtkanimationdescription.h                      |   51 -
 gtk/gtkappchooser.c                                |    4 +-
 gtk/gtkappchooser.h                                |    4 +-
 gtk/gtkappchooserbutton.c                          |   10 +-
 gtk/gtkappchooserbutton.h                          |    6 +-
 gtk/gtkappchooserdialog.c                          |   42 +-
 gtk/gtkappchooserdialog.h                          |    4 +-
 gtk/gtkappchoosermodule.c                          |    4 +-
 gtk/gtkappchoosermodule.h                          |    4 +-
 gtk/gtkappchooseronline.c                          |    4 +-
 gtk/gtkappchooseronline.h                          |    4 +-
 gtk/gtkappchooseronlinepk.c                        |    5 +-
 gtk/gtkappchooseronlinepk.h                        |    4 +-
 gtk/gtkappchooserprivate.h                         |    4 +-
 gtk/gtkappchooserwidget.c                          |   12 +-
 gtk/gtkappchooserwidget.h                          |    4 +-
 gtk/gtkapplication.c                               | 1308 +++++-
 gtk/gtkapplication.h                               |   74 +-
 gtk/gtkapplicationprivate.h                        |   53 +
 gtk/gtkapplicationwindow.c                         | 1088 ++++
 gtk/gtkapplicationwindow.h                         |   72 +
 gtk/gtkarrow.c                                     |   44 +-
 gtk/gtkarrow.h                                     |    4 +-
 gtk/gtkaspectframe.c                               |    4 +-
 gtk/gtkaspectframe.h                               |    4 +-
 gtk/gtkassistant.c                                 |   59 +-
 gtk/gtkassistant.h                                 |   15 +-
 gtk/gtkbbox.c                                      |   10 +-
 gtk/gtkbbox.h                                      |    8 +-
 gtk/gtkbin.c                                       |    4 +-
 gtk/gtkbin.h                                       |    4 +-
 gtk/gtkbindings.c                                  |    5 +-
 gtk/gtkbindings.h                                  |    8 +-
 gtk/gtkbindingsprivate.h                           |    4 +-
 gtk/gtkbitmaskprivate.h                            |   69 +
 gtk/gtkbitmaskprivateimpl.h                        |  167 +
 gtk/gtkborder.c                                    |    4 +-
 gtk/gtkborder.h                                    |    4 +-
 gtk/gtkborderimage.c                               |  315 +-
 gtk/gtkborderimageprivate.h                        |   36 +-
 gtk/gtkbox.c                                       |   28 +-
 gtk/gtkbox.h                                       |    4 +-
 gtk/gtkbuildable.c                                 |    4 +-
 gtk/gtkbuildable.h                                 |    4 +-
 gtk/gtkbuilder-menus.c                             |  393 ++
 gtk/gtkbuilder.c                                   |  289 +-
 gtk/gtkbuilder.h                                   |   11 +-
 gtk/gtkbuilder.rnc                                 |   86 +
 gtk/gtkbuilder.rng                                 |  305 +
 gtk/gtkbuilderparser.c                             |   34 +-
 gtk/gtkbuilderprivate.h                            |   23 +-
 gtk/gtkbutton.c                                    |  344 +-
 gtk/gtkbutton.h                                    |    6 +-
 gtk/gtkbuttonprivate.h                             |   10 +-
 gtk/gtkcalendar.c                                  |   85 +-
 gtk/gtkcalendar.h                                  |    3 +-
 gtk/gtkcellarea.c                                  |   10 +-
 gtk/gtkcellarea.h                                  |    4 +-
 gtk/gtkcellareabox.c                               |    4 +-
 gtk/gtkcellareabox.h                               |    4 +-
 gtk/gtkcellareaboxcontext.c                        |    4 +-
 gtk/gtkcellareaboxcontextprivate.h                 |    4 +-
 gtk/gtkcellareacontext.c                           |    4 +-
 gtk/gtkcellareacontext.h                           |    4 +-
 gtk/gtkcelleditable.c                              |    4 +-
 gtk/gtkcelleditable.h                              |    4 +-
 gtk/gtkcelllayout.c                                |    4 +-
 gtk/gtkcelllayout.h                                |    5 +-
 gtk/gtkcellrenderer.c                              |  104 +-
 gtk/gtkcellrenderer.h                              |   24 +-
 gtk/gtkcellrendereraccel.c                         |  113 +-
 gtk/gtkcellrendereraccel.h                         |    4 +-
 gtk/gtkcellrenderercombo.c                         |    4 +-
 gtk/gtkcellrenderercombo.h                         |    4 +-
 gtk/gtkcellrendererpixbuf.c                        |  467 +--
 gtk/gtkcellrendererpixbuf.h                        |    4 +-
 gtk/gtkcellrendererprogress.c                      |    4 +-
 gtk/gtkcellrendererprogress.h                      |    4 +-
 gtk/gtkcellrendererspin.c                          |    5 +-
 gtk/gtkcellrendererspin.h                          |    4 +-
 gtk/gtkcellrendererspinner.c                       |   15 +-
 gtk/gtkcellrendererspinner.h                       |    4 +-
 gtk/gtkcellrenderertext.c                          |   55 +-
 gtk/gtkcellrenderertext.h                          |    4 +-
 gtk/gtkcellrenderertoggle.c                        |   15 +-
 gtk/gtkcellrenderertoggle.h                        |    4 +-
 gtk/gtkcellview.c                                  |   59 +-
 gtk/gtkcellview.h                                  |   13 +-
 gtk/gtkcheckbutton.c                               |   18 +-
 gtk/gtkcheckbutton.h                               |    4 +-
 gtk/gtkcheckmenuitem.c                             |    9 +-
 gtk/gtkcheckmenuitem.h                             |    4 +-
 gtk/gtkclipboard-quartz.c                          |    4 +-
 gtk/gtkclipboard-wayland.c                         |  875 +++
 gtk/gtkclipboard.c                                 |   12 +-
 gtk/gtkclipboard.h                                 |    4 +-
 gtk/gtkcolorbutton.c                               |  528 +-
 gtk/gtkcolorbutton.h                               |   51 +-
 gtk/gtkcolorchooser.c                              |  262 +
 gtk/gtkcolorchooser.h                              |   87 +
 gtk/gtkcolorchooserdialog.c                        |  327 ++
 gtk/gtkcolorchooserdialog.h                        |   68 +
 gtk/gtkcolorchooserprivate.h                       |   32 +
 gtk/gtkcolorchooserwidget.c                        |  812 +++
 gtk/gtkcolorchooserwidget.h                        |   71 +
 gtk/gtkcoloreditor.c                               |  654 +++
 gtk/gtkcoloreditorprivate.h                        |   68 +
 gtk/gtkcolorplane.c                                |  497 ++
 gtk/gtkcolorplaneprivate.h                         |   71 +
 gtk/gtkcolorscale.c                                |  409 ++
 gtk/gtkcolorscaleprivate.h                         |   78 +
 gtk/gtkcolorswatch.c                               |  905 +++
 gtk/gtkcolorswatchprivate.h                        |   99 +
 gtk/gtkcolorutils.c                                |  258 +
 gtk/gtkcolorutils.h                                |   48 +
 gtk/gtkcombobox.c                                  |  272 +-
 gtk/gtkcombobox.h                                  |    4 +-
 gtk/gtkcomboboxtext.c                              |   26 +-
 gtk/gtkcontainer.c                                 |  202 +-
 gtk/gtkcontainer.h                                 |    6 +-
 gtk/gtkcontainerprivate.h                          |    6 +-
 gtk/gtkcssanimatedvalues.c                         |  307 +
 gtk/gtkcssanimatedvaluesprivate.h                  |   64 +
 gtk/gtkcssarrayvalue.c                             |  206 +
 gtk/gtkcssarrayvalueprivate.h                      |   46 +
 gtk/gtkcssbgsizevalue.c                            |  258 +
 gtk/gtkcssbgsizevalueprivate.h                     |   45 +
 gtk/gtkcssbordervalue.c                            |  235 +
 gtk/gtkcssbordervalueprivate.h                     |   49 +
 gtk/gtkcsscomputedvalues.c                         |  255 +
 gtk/gtkcsscomputedvaluesprivate.h                  |   79 +
 gtk/gtkcsscornervalue.c                            |  170 +
 gtk/gtkcsscornervalueprivate.h                     |   42 +
 gtk/gtkcsscustomproperty.c                         |  342 ++
 gtk/gtkcsscustompropertyprivate.h                  |   55 +
 gtk/gtkcsseasevalue.c                              |  370 ++
 gtk/gtkcsseasevalueprivate.h                       |   41 +
 gtk/gtkcssenginevalue.c                            |  127 +
 gtk/gtkcssenginevalueprivate.h                     |   37 +
 gtk/gtkcssenumvalue.c                              |  323 ++
 gtk/gtkcssenumvalueprivate.h                       |   52 +
 gtk/gtkcssimage.c                                  |  388 ++
 gtk/gtkcssimagecrossfade.c                         |  269 +
 gtk/gtkcssimagecrossfadeprivate.h                  |   59 +
 gtk/gtkcssimagegradient.c                          |  319 ++
 gtk/gtkcssimagegradientprivate.h                   |   59 +
 gtk/gtkcssimagelinear.c                            |  502 ++
 gtk/gtkcssimagelinearprivate.h                     |   62 +
 gtk/gtkcssimageprivate.h                           |  110 +
 gtk/gtkcssimageurl.c                               |  190 +
 gtk/gtkcssimageurlprivate.h                        |   53 +
 gtk/gtkcssimagevalue.c                             |   96 +
 gtk/gtkcssimagevalueprivate.h                      |   35 +
 gtk/gtkcssimagewin32.c                             |  235 +
 gtk/gtkcssimagewin32private.h                      |   64 +
 gtk/gtkcssinheritvalue.c                           |   76 +
 gtk/gtkcssinheritvalueprivate.h                    |   33 +
 gtk/gtkcssinitialvalue.c                           |   76 +
 gtk/gtkcssinitialvalueprivate.h                    |   33 +
 gtk/gtkcsslookup.c                                 |  178 +
 gtk/gtkcsslookupprivate.h                          |   53 +
 gtk/gtkcssmatcher.c                                |  418 ++
 gtk/gtkcssmatcherprivate.h                         |  152 +
 gtk/gtkcssnumbervalue.c                            |  211 +
 gtk/gtkcssnumbervalueprivate.h                     |   54 +
 gtk/gtkcssparser.c                                 |  489 +-
 gtk/gtkcssparserprivate.h                          |   28 +-
 gtk/gtkcsspositionvalue.c                          |  286 +
 gtk/gtkcsspositionvalueprivate.h                   |   42 +
 gtk/gtkcssprovider.c                               | 1383 ++---
 gtk/gtkcssprovider.h                               |    5 +-
 gtk/gtkcssproviderprivate.h                        |    4 +-
 gtk/gtkcssrepeatvalue.c                            |  299 +
 gtk/gtkcssrepeatvalueprivate.h                     |   50 +
 gtk/gtkcssrgbavalue.c                              |  133 +
 gtk/gtkcssrgbavalueprivate.h                       |   42 +
 gtk/gtkcsssection.c                                |   14 +-
 gtk/gtkcsssection.h                                |   17 +-
 gtk/gtkcsssectionprivate.h                         |    4 +-
 gtk/gtkcssselector.c                               | 1303 ++++-
 gtk/gtkcssselectorprivate.h                        |   27 +-
 gtk/gtkcssshadowsvalue.c                           |  272 +
 gtk/gtkcssshadowsvalueprivate.h                    |   56 +
 gtk/gtkcssshadowvalue.c                            |  387 ++
 gtk/gtkcssshadowvalueprivate.h                     |   57 +
 gtk/gtkcssshorthandproperty.c                      |  192 +
 gtk/gtkcssshorthandpropertyimpl.c                  | 1027 ++++
 gtk/gtkcssshorthandpropertyprivate.h               |   81 +
 gtk/gtkcssstringvalue.c                            |  224 +
 gtk/gtkcssstringvalueprivate.h                     |   44 +
 gtk/gtkcssstylefuncs.c                             | 1133 ++++
 gtk/gtkcssstylefuncsprivate.h                      |   38 +
 gtk/gtkcssstyleproperty.c                          |  424 ++
 gtk/gtkcssstylepropertyimpl.c                      | 1512 +++++
 gtk/gtkcssstylepropertyprivate.h                   |   98 +
 gtk/gtkcsstransition.c                             |  131 +
 gtk/gtkcsstransitionprivate.h                      |   67 +
 gtk/gtkcsstypedvalue.c                             |  120 +
 gtk/gtkcsstypedvalueprivate.h                      |   38 +
 gtk/gtkcsstypes.c                                  |   80 +-
 gtk/gtkcsstypesprivate.h                           |  166 +-
 gtk/gtkcssvalue.c                                  |  125 +
 gtk/gtkcssvalueprivate.h                           |   76 +
 gtk/gtkcustompaperunixdialog.c                     |    4 +-
 gtk/gtkcustompaperunixdialog.h                     |    4 +-
 gtk/gtkdebug.h                                     |    4 +-
 gtk/gtkdialog.c                                    |    5 +-
 gtk/gtkdialog.h                                    |    4 +-
 gtk/gtkdnd-quartz.c                                |   86 +-
 gtk/gtkdnd.c                                       |  353 +-
 gtk/gtkdnd.h                                       |    6 +-
 gtk/gtkdndcursors.h                                |  347 --
 gtk/gtkdrawingarea.c                               |    5 +-
 gtk/gtkdrawingarea.h                               |    4 +-
 gtk/gtkeditable.c                                  |    8 +-
 gtk/gtkeditable.h                                  |    4 +-
 gtk/gtkentry.c                                     |  895 ++--
 gtk/gtkentry.h                                     |   10 +-
 gtk/gtkentrybuffer.c                               |    4 +-
 gtk/gtkentrybuffer.h                               |    4 +-
 gtk/gtkentrycompletion.c                           |   64 +-
 gtk/gtkentrycompletion.h                           |    7 +-
 gtk/gtkentryprivate.h                              |   10 +-
 gtk/gtkenums.h                                     |   30 +-
 gtk/gtkeventbox.c                                  |    7 +-
 gtk/gtkeventbox.h                                  |    4 +-
 gtk/gtkexpander.c                                  |   39 +-
 gtk/gtkexpander.h                                  |    7 +-
 gtk/gtkfilechooser.c                               |   14 +-
 gtk/gtkfilechooser.h                               |    4 +-
 gtk/gtkfilechooserbutton.c                         |    5 +-
 gtk/gtkfilechooserbutton.h                         |    4 +-
 gtk/gtkfilechooserdefault.c                        |   52 +-
 gtk/gtkfilechooserdefault.h                        |    4 +-
 gtk/gtkfilechooserdialog.c                         |    4 +-
 gtk/gtkfilechooserdialog.h                         |    4 +-
 gtk/gtkfilechooserembed.c                          |    4 +-
 gtk/gtkfilechooserembed.h                          |    4 +-
 gtk/gtkfilechooserentry.c                          | 1805 ++-----
 gtk/gtkfilechooserentry.h                          |   10 +-
 gtk/gtkfilechooserprivate.h                        |    4 +-
 gtk/gtkfilechooserutils.c                          |    4 +-
 gtk/gtkfilechooserutils.h                          |    4 +-
 gtk/gtkfilechooserwidget.c                         |    4 +-
 gtk/gtkfilechooserwidget.h                         |    4 +-
 gtk/gtkfilefilter.c                                |    7 +-
 gtk/gtkfilefilter.h                                |    6 +-
 gtk/gtkfilesystem.c                                |  640 +---
 gtk/gtkfilesystem.h                                |   61 +-
 gtk/gtkfilesystemmodel.c                           |   55 +-
 gtk/gtkfilesystemmodel.h                           |    6 +-
 gtk/gtkfixed.c                                     |    4 +-
 gtk/gtkfixed.h                                     |    4 +-
 gtk/gtkfontbutton.c                                |    3 +-
 gtk/gtkfontbutton.h                                |    3 +-
 gtk/gtkfontchooser.c                               |    4 +-
 gtk/gtkfontchooser.h                               |   19 +-
 gtk/gtkfontchooserdialog.c                         |   13 +-
 gtk/gtkfontchooserdialog.h                         |    8 +-
 gtk/gtkfontchooserprivate.h                        |    4 +-
 gtk/gtkfontchooserutils.c                          |    4 +-
 gtk/gtkfontchooserutils.h                          |    4 +-
 gtk/gtkfontchooserwidget.c                         |   36 +-
 gtk/gtkfontchooserwidget.h                         |    6 +-
 gtk/gtkframe.c                                     |  109 +-
 gtk/gtkframe.h                                     |    4 +-
 gtk/gtkgradient.c                                  |   43 +-
 gtk/gtkgradient.h                                  |    9 +-
 gtk/gtkgrid.c                                      |   78 +-
 gtk/gtkgrid.h                                      |    8 +-
 gtk/gtkiconcache.c                                 |    7 +-
 gtk/gtkiconcache.h                                 |    4 +-
 gtk/gtkiconcachevalidator.c                        |    4 +-
 gtk/gtkiconcachevalidator.h                        |    4 +-
 gtk/gtkiconfactory.c                               |   13 +-
 gtk/gtkiconfactory.h                               |   20 +-
 gtk/gtkiconhelper.c                                |  565 ++
 gtk/gtkiconhelperprivate.h                         |  129 +
 gtk/gtkicontheme.c                                 |   25 +-
 gtk/gtkicontheme.h                                 |    8 +-
 gtk/gtkiconview.c                                  | 2001 +------
 gtk/gtkiconview.h                                  |    4 +-
 gtk/gtkiconviewprivate.h                           |  155 +
 gtk/gtkimage.c                                     |  996 +---
 gtk/gtkimage.h                                     |    7 +-
 gtk/gtkimagemenuitem.c                             |    4 +-
 gtk/gtkimagemenuitem.h                             |    4 +-
 gtk/gtkimageprivate.h                              |    4 +-
 gtk/gtkimcontext.c                                 |    4 +-
 gtk/gtkimcontext.h                                 |    4 +-
 gtk/gtkimcontextinfo.h                             |   44 +
 gtk/gtkimcontextsimple.c                           |   96 +-
 gtk/gtkimcontextsimple.h                           |    4 +-
 gtk/gtkimcontextsimpleseqs.h                       |    4 +-
 gtk/gtkimmodule.c                                  |   13 +-
 gtk/gtkimmodule.h                                  |   26 +-
 gtk/gtkimmoduleprivate.h                           |   34 +
 gtk/gtkimmulticontext.c                            |   13 +-
 gtk/gtkimmulticontext.h                            |    4 +-
 gtk/gtkinfobar.c                                   |   43 +-
 gtk/gtkinfobar.h                                   |    4 +-
 gtk/gtkinvisible.c                                 |    4 +-
 gtk/gtkinvisible.h                                 |    4 +-
 gtk/gtkkeyhash.c                                   |   41 +-
 gtk/gtkkeyhash.h                                   |    4 +-
 gtk/gtklabel.c                                     |  529 +--
 gtk/gtklabel.h                                     |    3 +-
 gtk/gtklayout.c                                    |   79 +-
 gtk/gtklayout.h                                    |   15 +-
 gtk/gtklinkbutton.c                                |   15 +-
 gtk/gtklinkbutton.h                                |    3 +-
 gtk/gtkliststore.c                                 |   13 +-
 gtk/gtkliststore.h                                 |    4 +-
 gtk/gtklockbutton.c                                |    6 +-
 gtk/gtklockbutton.h                                |    8 +-
 gtk/gtkmain.c                                      |  282 +-
 gtk/gtkmain.h                                      |    6 +-
 gtk/gtkmenu.c                                      |  671 +--
 gtk/gtkmenu.h                                      |    6 +-
 gtk/gtkmenubar.c                                   |    8 +-
 gtk/gtkmenubar.h                                   |    6 +-
 gtk/gtkmenuitem.c                                  |  303 +-
 gtk/gtkmenuitem.h                                  |   10 +-
 gtk/gtkmenuitemprivate.h                           |    4 +-
 gtk/gtkmenuprivate.h                               |    8 +-
 gtk/gtkmenushell.c                                 |   45 +-
 gtk/gtkmenushell.h                                 |    4 +-
 gtk/gtkmenushellprivate.h                          |    4 +-
 gtk/gtkmenutoolbutton.c                            |    8 +-
 gtk/gtkmenutoolbutton.h                            |    4 +-
 gtk/gtkmessagedialog.c                             |   45 +-
 gtk/gtkmessagedialog.h                             |    4 +-
 gtk/gtkmisc.c                                      |   38 +-
 gtk/gtkmisc.h                                      |    6 +-
 gtk/gtkmnemonichash.c                              |    4 +-
 gtk/gtkmnemonichash.h                              |    4 +-
 gtk/gtkmodelmenu.c                                 |  390 ++
 gtk/gtkmodelmenu.h                                 |   38 +
 gtk/gtkmodelmenuitem.c                             |  307 +
 gtk/gtkmodelmenuitem.h                             |   43 +
 gtk/gtkmodifierstyle.c                             |   89 +-
 gtk/gtkmodifierstyle.h                             |    7 +-
 gtk/gtkmodules.c                                   |    4 +-
 gtk/gtkmodules.h                                   |    4 +-
 gtk/gtkmodulesprivate.h                            |    4 +-
 gtk/gtkmountoperation-stub.c                       |    4 +-
 gtk/gtkmountoperation-x11.c                        |    4 +-
 gtk/gtkmountoperation.c                            |    4 +-
 gtk/gtkmountoperation.h                            |    4 +-
 gtk/gtkmountoperationprivate.h                     |    4 +-
 gtk/gtknotebook.c                                  |  242 +-
 gtk/gtknotebook.h                                  |    4 +-
 gtk/gtknumerableicon.c                             |    5 +-
 gtk/gtknumerableicon.h                             |    4 +-
 gtk/gtknumerableiconprivate.h                      |    4 +-
 gtk/gtkoffscreenwindow.c                           |    9 +-
 gtk/gtkoffscreenwindow.h                           |    4 +-
 gtk/gtkorientable.c                                |    4 +-
 gtk/gtkorientable.h                                |    4 +-
 gtk/gtkorientableprivate.h                         |    4 +-
 gtk/gtkoverlay.c                                   |  253 +-
 gtk/gtkoverlay.h                                   |    8 +-
 gtk/gtkpagesetup.c                                 |    4 +-
 gtk/gtkpagesetup.h                                 |    4 +-
 gtk/gtkpagesetupunixdialog.c                       |    4 +-
 gtk/gtkpagesetupunixdialog.h                       |    4 +-
 gtk/gtkpaned.c                                     |   48 +-
 gtk/gtkpaned.h                                     |    4 +-
 gtk/gtkpango.c                                     |   11 +-
 gtk/gtkpango.h                                     |    4 +-
 gtk/gtkpapersize.c                                 |    7 +-
 gtk/gtkpapersize.h                                 |    4 +-
 gtk/gtkpathbar.c                                   |   66 +-
 gtk/gtkpathbar.h                                   |    9 +-
 gtk/gtkplug.c                                      |    6 +-
 gtk/gtkplug.h                                      |    3 +-
 gtk/gtkpressandhold.c                              |  226 +
 gtk/gtkpressandholdprivate.h                       |   68 +
 gtk/gtkprint-win32.c                               |    4 +-
 gtk/gtkprint-win32.h                               |    4 +-
 gtk/gtkprintbackend.c                              |    4 +-
 gtk/gtkprintbackend.h                              |    4 +-
 gtk/gtkprintcontext.c                              |    4 +-
 gtk/gtkprintcontext.h                              |    4 +-
 gtk/gtkprinter-private.h                           |    4 +-
 gtk/gtkprinter.c                                   |   30 +-
 gtk/gtkprinter.h                                   |    4 +-
 gtk/gtkprinteroption.c                             |    4 +-
 gtk/gtkprinteroption.h                             |    4 +-
 gtk/gtkprinteroptionset.c                          |    4 +-
 gtk/gtkprinteroptionset.h                          |    4 +-
 gtk/gtkprinteroptionwidget.c                       |  103 +-
 gtk/gtkprinteroptionwidget.h                       |    4 +-
 gtk/gtkprintjob.c                                  |    4 +-
 gtk/gtkprintjob.h                                  |    4 +-
 gtk/gtkprintoperation-private.h                    |    4 +-
 gtk/gtkprintoperation-unix.c                       |    6 +-
 gtk/gtkprintoperation-win32.c                      |    6 +-
 gtk/gtkprintoperation.c                            |   10 +-
 gtk/gtkprintoperation.h                            |    4 +-
 gtk/gtkprintoperationpreview.c                     |    4 +-
 gtk/gtkprintoperationpreview.h                     |    4 +-
 gtk/gtkprintsettings.c                             |   11 +-
 gtk/gtkprintsettings.h                             |    4 +-
 gtk/gtkprintunixdialog.c                           |   19 +-
 gtk/gtkprintunixdialog.h                           |    4 +-
 gtk/gtkprintutils.c                                |    4 +-
 gtk/gtkprintutils.h                                |    4 +-
 gtk/gtkprivate.c                                   |   53 +-
 gtk/gtkprivate.h                                   |   20 +-
 gtk/gtkprivatetypebuiltins.c.template              |   36 +
 gtk/gtkprivatetypebuiltins.h.template              |   28 +
 gtk/gtkprogressbar.c                               |   58 +-
 gtk/gtkprogressbar.h                               |    4 +-
 gtk/gtkquartz-menu.c                               |  629 ++
 gtk/gtkquartz-menu.h                               |   28 +
 gtk/gtkquartz.c                                    |    6 +-
 gtk/gtkquartz.h                                    |    4 +-
 gtk/gtkquery.c                                     |    6 +-
 gtk/gtkquery.h                                     |    3 +-
 gtk/gtkradioaction.c                               |    4 +-
 gtk/gtkradioaction.h                               |    4 +-
 gtk/gtkradiobutton.c                               |   14 +-
 gtk/gtkradiobutton.h                               |    4 +-
 gtk/gtkradiomenuitem.c                             |    4 +-
 gtk/gtkradiomenuitem.h                             |    4 +-
 gtk/gtkradiotoolbutton.c                           |    4 +-
 gtk/gtkradiotoolbutton.h                           |    4 +-
 gtk/gtkrange.c                                     |  414 +-
 gtk/gtkrange.h                                     |   13 +-
 gtk/gtkrbtree.c                                    |  937 ++--
 gtk/gtkrbtree.h                                    |   39 +-
 gtk/gtkrc.key.emacs                                |    4 +-
 gtk/gtkrecentaction.c                              |    4 +-
 gtk/gtkrecentaction.h                              |    4 +-
 gtk/gtkrecentchooser.c                             |   13 +-
 gtk/gtkrecentchooser.h                             |    4 +-
 gtk/gtkrecentchooserdefault.c                      |   21 +-
 gtk/gtkrecentchooserdefault.h                      |    4 +-
 gtk/gtkrecentchooserdialog.c                       |   34 +-
 gtk/gtkrecentchooserdialog.h                       |    4 +-
 gtk/gtkrecentchoosermenu.c                         |    9 +-
 gtk/gtkrecentchoosermenu.h                         |    4 +-
 gtk/gtkrecentchooserprivate.h                      |    4 +-
 gtk/gtkrecentchooserutils.c                        |    7 +-
 gtk/gtkrecentchooserutils.h                        |    4 +-
 gtk/gtkrecentchooserwidget.c                       |    4 +-
 gtk/gtkrecentchooserwidget.h                       |    4 +-
 gtk/gtkrecentfilter.c                              |    4 +-
 gtk/gtkrecentfilter.h                              |    4 +-
 gtk/gtkrecentmanager.c                             |   30 +-
 gtk/gtkrecentmanager.h                             |    3 +-
 gtk/gtkroundedbox.c                                |  401 +-
 gtk/gtkroundedboxprivate.h                         |   27 +-
 gtk/gtkscale.c                                     |  200 +-
 gtk/gtkscale.h                                     |    9 +-
 gtk/gtkscalebutton.c                               |   12 +-
 gtk/gtkscalebutton.h                               |    4 +-
 gtk/gtkscaleprivate.h                              |    4 +-
 gtk/gtkscrollable.c                                |    6 +-
 gtk/gtkscrollable.h                                |    6 +-
 gtk/gtkscrollbar.c                                 |    6 +-
 gtk/gtkscrollbar.h                                 |    4 +-
 gtk/gtkscrolledwindow.c                            | 1326 ++++-
 gtk/gtkscrolledwindow.h                            |   15 +-
 gtk/gtksearchengine.c                              |   17 +-
 gtk/gtksearchengine.h                              |    3 +-
 gtk/gtksearchenginebeagle.c                        |  412 --
 gtk/gtksearchenginebeagle.h                        |   59 -
 gtk/gtksearchenginequartz.c                        |    3 +-
 gtk/gtksearchenginequartz.h                        |    3 +-
 gtk/gtksearchenginesimple.c                        |    6 +-
 gtk/gtksearchenginesimple.h                        |    3 +-
 gtk/gtksearchenginetracker.c                       |    3 +-
 gtk/gtksearchenginetracker.h                       |    3 +-
 gtk/gtkselection.c                                 |    4 +-
 gtk/gtkselection.h                                 |    4 +-
 gtk/gtkseparator.c                                 |    9 +-
 gtk/gtkseparator.h                                 |    4 +-
 gtk/gtkseparatormenuitem.c                         |    7 +-
 gtk/gtkseparatormenuitem.h                         |    4 +-
 gtk/gtkseparatortoolitem.c                         |    4 +-
 gtk/gtkseparatortoolitem.h                         |    4 +-
 gtk/gtksettings.c                                  |  162 +-
 gtk/gtksettings.h                                  |   10 +-
 gtk/gtksettingsprivate.h                           |    3 +-
 gtk/gtkshadow.c                                    |  368 --
 gtk/gtkshadowprivate.h                             |   77 -
 gtk/gtkshow.c                                      |    4 +-
 gtk/gtkshow.h                                      |    4 +-
 gtk/gtksizegroup-private.h                         |    4 +-
 gtk/gtksizegroup.c                                 |    4 +-
 gtk/gtksizegroup.h                                 |    4 +-
 gtk/gtksizerequest.c                               |    4 +-
 gtk/gtksizerequest.h                               |    4 +-
 gtk/gtksocket.c                                    |   11 +-
 gtk/gtksocket.h                                    |    3 +-
 gtk/gtksocketprivate.h                             |    3 +-
 gtk/gtkspinbutton.c                                |  853 ++--
 gtk/gtkspinbutton.h                                |    9 +-
 gtk/gtkspinner.c                                   |   14 +-
 gtk/gtkspinner.h                                   |    4 +-
 gtk/gtkstatusbar.c                                 |   11 +-
 gtk/gtkstatusbar.h                                 |    4 +-
 gtk/gtkstatusicon-quartz.c                         |    4 +-
 gtk/gtkstatusicon.c                                |  454 +--
 gtk/gtkstatusicon.h                                |    4 +-
 gtk/gtkstock.c                                     |    4 +-
 gtk/gtkstock.h                                     |    4 +-
 gtk/gtkstyleanimation.c                            |   82 +
 gtk/gtkstyleanimationprivate.h                     |   67 +
 gtk/gtkstylecascade.c                              |  391 ++
 gtk/gtkstylecascadeprivate.h                       |   66 +
 gtk/gtkstylecontext.c                              | 2373 ++++----
 gtk/gtkstylecontext.h                              |   82 +-
 gtk/gtkstylecontextprivate.h                       |   30 +-
 gtk/gtkstyleproperties.c                           |  424 +-
 gtk/gtkstyleproperties.h                           |    9 +-
 gtk/gtkstylepropertiesprivate.h                    |   20 +-
 gtk/gtkstyleproperty.c                             | 3131 +----------
 gtk/gtkstylepropertyprivate.h                      |  113 +-
 gtk/gtkstyleprovider.c                             |   10 +-
 gtk/gtkstyleprovider.h                             |   10 +-
 gtk/gtkstyleproviderprivate.c                      |  106 +
 gtk/gtkstyleproviderprivate.h                      |   68 +
 gtk/gtkswitch.c                                    |  208 +-
 gtk/gtkswitch.h                                    |    4 +-
 gtk/gtksymboliccolor.c                             |  637 ++-
 gtk/gtksymboliccolor.h                             |    6 +-
 gtk/gtksymboliccolorprivate.h                      |   53 +
 gtk/gtktestutils.c                                 |   18 +-
 gtk/gtktestutils.h                                 |    4 +-
 gtk/gtktextbtree.c                                 |    8 +-
 gtk/gtktextbtree.h                                 |    4 +-
 gtk/gtktextbuffer.c                                |    6 +-
 gtk/gtktextbuffer.h                                |    4 +-
 gtk/gtktextbufferrichtext.c                        |    7 +-
 gtk/gtktextbufferrichtext.h                        |    4 +-
 gtk/gtktextbufferserialize.c                       |   10 +-
 gtk/gtktextbufferserialize.h                       |    4 +-
 gtk/gtktextchild.h                                 |    4 +-
 gtk/gtktextdisplay.c                               |   84 +-
 gtk/gtktextdisplay.h                               |    3 +-
 gtk/gtktextiter.c                                  |    6 +-
 gtk/gtktextiter.h                                  |    5 +-
 gtk/gtktextiterprivate.h                           |    4 +-
 gtk/gtktextlayout.c                                |  208 +-
 gtk/gtktextlayout.h                                |   14 +-
 gtk/gtktextmarkprivate.h                           |    4 +-
 gtk/gtktextsegment.h                               |    4 +-
 gtk/gtktexttag.c                                   |   22 +-
 gtk/gtktexttagprivate.h                            |    4 +-
 gtk/gtktexttagtable.c                              |    4 +-
 gtk/gtktexttagtable.h                              |    4 +-
 gtk/gtktexttypes.c                                 |    4 +-
 gtk/gtktexttypes.h                                 |    4 +-
 gtk/gtktextutil.c                                  |    4 +-
 gtk/gtktextutil.h                                  |    4 +-
 gtk/gtktextview.c                                  |  100 +-
 gtk/gtktextview.h                                  |    8 +-
 gtk/gtkthemingbackground.c                         |  359 ++
 gtk/gtkthemingbackgroundprivate.h                  |   75 +
 gtk/gtkthemingengine.c                             | 1033 ++--
 gtk/gtkthemingengine.h                             |   15 +-
 gtk/gtkthemingengineprivate.h                      |   23 +-
 gtk/gtktimeline.c                                  |  737 ---
 gtk/gtktimeline.h                                  |  117 -
 gtk/gtktoggleaction.c                              |    4 +-
 gtk/gtktoggleaction.h                              |    4 +-
 gtk/gtktogglebutton.c                              |   43 +-
 gtk/gtktogglebutton.h                              |    4 +-
 gtk/gtktoggletoolbutton.c                          |    4 +-
 gtk/gtktoggletoolbutton.h                          |    4 +-
 gtk/gtktoolbar.c                                   |   25 +-
 gtk/gtktoolbar.h                                   |    4 +-
 gtk/gtktoolbutton.c                                |   84 +-
 gtk/gtktoolbutton.h                                |    4 +-
 gtk/gtktoolitem.c                                  |    6 +-
 gtk/gtktoolitem.h                                  |    4 +-
 gtk/gtktoolitemgroup.c                             |   23 +-
 gtk/gtktoolitemgroup.h                             |    3 +-
 gtk/gtktoolpalette.c                               |    3 +-
 gtk/gtktoolpalette.h                               |    8 +-
 gtk/gtktoolpaletteprivate.h                        |    3 +-
 gtk/gtktoolshell.c                                 |    9 +-
 gtk/gtktoolshell.h                                 |    4 +-
 gtk/gtktooltip.c                                   |   30 +-
 gtk/gtktooltip.h                                   |    4 +-
 gtk/gtktrayicon-x11.c                              |   27 +-
 gtk/gtktrayicon.h                                  |    4 +-
 gtk/gtktreedatalist.c                              |    4 +-
 gtk/gtktreedatalist.h                              |    4 +-
 gtk/gtktreednd.c                                   |    4 +-
 gtk/gtktreednd.h                                   |    4 +-
 gtk/gtktreemenu.c                                  |    4 +-
 gtk/gtktreemenu.h                                  |    4 +-
 gtk/gtktreemodel.c                                 |    4 +-
 gtk/gtktreemodel.h                                 |    4 +-
 gtk/gtktreemodelfilter.c                           |    6 +-
 gtk/gtktreemodelfilter.h                           |    4 +-
 gtk/gtktreemodelsort.c                             |    4 +-
 gtk/gtktreemodelsort.h                             |    4 +-
 gtk/gtktreeprivate.h                               |   11 +-
 gtk/gtktreeselection.c                             |   45 +-
 gtk/gtktreeselection.h                             |    4 +-
 gtk/gtktreesortable.c                              |    4 +-
 gtk/gtktreesortable.h                              |    4 +-
 gtk/gtktreestore.c                                 |    8 +-
 gtk/gtktreestore.h                                 |    4 +-
 gtk/gtktreeview.c                                  | 1219 ++--
 gtk/gtktreeview.h                                  |   15 +-
 gtk/gtktreeviewcolumn.c                            |   17 +-
 gtk/gtktreeviewcolumn.h                            |    5 +-
 gtk/gtktypes.h                                     |   56 +
 gtk/gtkuimanager.c                                 |   67 +-
 gtk/gtkuimanager.h                                 |   14 +-
 gtk/gtkunixprint.h                                 |    4 +-
 gtk/gtkversion.h.in                                |    4 +-
 gtk/gtkviewport.c                                  |   84 +-
 gtk/gtkviewport.h                                  |   17 +-
 gtk/gtkvolumebutton.c                              |   11 +-
 gtk/gtkvolumebutton.h                              |    4 +-
 gtk/gtkwidget.c                                    |  750 ++-
 gtk/gtkwidget.h                                    |   39 +-
 gtk/gtkwidgetpath.c                                |    6 +-
 gtk/gtkwidgetpath.h                                |   17 +-
 gtk/gtkwidgetprivate.h                             |   29 +-
 gtk/gtkwin32.c                                     |    7 +-
 gtk/gtkwin32embed.c                                |    4 +-
 gtk/gtkwin32embed.h                                |    4 +-
 gtk/gtkwin32embedwidget.c                          |    3 +-
 gtk/gtkwin32embedwidget.h                          |    3 +-
 gtk/gtkwin32theme.c                                |  462 ++
 gtk/gtkwin32themeprivate.h                         |   62 +
 gtk/gtkwindow.c                                    |  364 +-
 gtk/gtkwindow.h                                    |   16 +-
 gtk/gtkwindowprivate.h                             |    7 +-
 gtk/gtkx.h                                         |    3 +-
 gtk/gtkxembed.c                                    |    4 +-
 gtk/gtkxembed.h                                    |    4 +-
 gtk/org.gtk.Settings.ColorChooser.gschema.xml      |   13 +
 gtk/org.gtk.Settings.FileChooser.gschema.xml       |    9 +-
 gtk/queryimmodules.c                               |   12 +-
 gtk/tests/Makefile.am                              |   25 +-
 gtk/tests/accel.c                                  |   66 +-
 gtk/tests/action.c                                 |    4 +-
 gtk/tests/bitmask.c                                |  338 ++
 gtk/tests/builder.c                                |   89 +-
 gtk/tests/cellarea.c                               |    4 +-
 gtk/tests/crossingevents.c                         |    4 +-
 gtk/tests/defaultvalue.c                           |    4 +-
 gtk/tests/entry.c                                  |    4 +-
 gtk/tests/expander.c                               |    4 +-
 gtk/tests/filechooser.c                            |    6 +-
 gtk/tests/filtermodel.c                            |    4 +-
 gtk/tests/floating.c                               |    4 +-
 gtk/tests/grid.c                                   |    4 +-
 gtk/tests/gtktreemodelrefcount.c                   |   35 +-
 gtk/tests/gtktreemodelrefcount.h                   |    4 +-
 gtk/tests/liststore.c                              |    4 +-
 gtk/tests/modelrefcount.c                          |    4 +-
 gtk/tests/object.c                                 |    4 +-
 gtk/tests/papersize.c                              |    4 +-
 gtk/tests/rbtree.c                                 |  525 ++
 gtk/tests/recentmanager.c                          |    4 +-
 gtk/tests/regression-tests.c                       |   68 +
 gtk/tests/sortmodel.c                              |    4 +-
 gtk/tests/testing.c                                |    8 +-
 gtk/tests/textbuffer.c                             |    4 +-
 gtk/tests/textiter.c                               |    4 +-
 gtk/tests/treemodel.c                              |    4 +-
 gtk/tests/treemodel.h                              |    4 +-
 gtk/tests/treepath.c                               |    4 +-
 gtk/tests/treestore.c                              |    4 +-
 gtk/tests/treeview-scrolling.c                     |  102 +-
 gtk/tests/treeview.c                               |    4 +-
 gtk/updateiconcache.c                              |    7 +-
 libgail-util/gailmisc.c                            |    4 +-
 libgail-util/gailmisc.h                            |    4 +-
 libgail-util/gailtextutil.c                        |    4 +-
 libgail-util/gailtextutil.h                        |    4 +-
 makecopyright                                      |   16 +-
 modules/engines/Makefile.am                        |    8 +-
 modules/engines/ms-windows/ChangeLog.old           |  426 --
 modules/engines/ms-windows/Makefile.am             |   39 -
 modules/engines/ms-windows/Makefile.msc            |   69 -
 modules/engines/ms-windows/Makefile.msc.config     |   11 -
 modules/engines/ms-windows/Theme/Makefile.am       |    5 -
 .../engines/ms-windows/Theme/gtk-3.0/Makefile.am   |    8 -
 modules/engines/ms-windows/Theme/gtk-3.0/gtkrc     |   66 -
 modules/engines/ms-windows/msw_rc_style.c          |   76 -
 modules/engines/ms-windows/msw_rc_style.h          |   54 -
 modules/engines/ms-windows/msw_style.c             | 3355 -----------
 modules/engines/ms-windows/msw_style.h             |   55 -
 modules/engines/ms-windows/msw_theme_main.c        |  146 -
 modules/engines/ms-windows/xp_theme.c              | 1164 ----
 modules/engines/ms-windows/xp_theme.h              |  151 -
 modules/engines/ms-windows/xp_theme_defs.h         |  765 ---
 modules/engines/pixbuf/pixbuf-draw.c               |    4 +-
 modules/engines/pixbuf/pixbuf-main.c               |    4 +-
 modules/engines/pixbuf/pixbuf-rc-style.c           |    7 +-
 modules/engines/pixbuf/pixbuf-rc-style.h           |    4 +-
 modules/engines/pixbuf/pixbuf-render.c             |    4 +-
 modules/engines/pixbuf/pixbuf-style.h              |    4 +-
 modules/engines/pixbuf/pixbuf.h                    |    4 +-
 modules/input/Makefile.am                          |    2 +-
 modules/input/gtkimcontextime.c                    |    4 +-
 modules/input/gtkimcontextime.h                    |    4 +-
 modules/input/gtkimcontextmultipress.c             |    6 +-
 modules/input/gtkimcontextmultipress.h             |    4 +-
 modules/input/gtkimcontextthai.c                   |    4 +-
 modules/input/gtkimcontextthai.h                   |    4 +-
 modules/input/gtkimcontextxim.c                    |    6 +-
 modules/input/gtkimcontextxim.h                    |    4 +-
 modules/input/imam-et.c                            |    4 +-
 modules/input/imcedilla.c                          |    4 +-
 modules/input/imcyrillic-translit.c                |    4 +-
 modules/input/imime.c                              |    4 +-
 modules/input/iminuktitut.c                        |    4 +-
 modules/input/imipa.c                              |    4 +-
 modules/input/imm-extra.h                          |    4 +-
 modules/input/immultipress.c                       |    4 +-
 modules/input/imthai.c                             |    4 +-
 modules/input/imti-er.c                            |    4 +-
 modules/input/imti-et.c                            |    4 +-
 modules/input/imviqr.c                             |    4 +-
 modules/input/imxim.c                              |    4 +-
 modules/input/thai-charprop.h                      |    4 +-
 modules/printbackends/cups/gtkcupsutils.c          |   41 +-
 modules/printbackends/cups/gtkcupsutils.h          |    6 +-
 modules/printbackends/cups/gtkprintbackendcups.c   |  224 +-
 modules/printbackends/cups/gtkprintbackendcups.h   |    4 +-
 modules/printbackends/cups/gtkprintercups.c        |   27 +-
 modules/printbackends/cups/gtkprintercups.h        |    6 +-
 modules/printbackends/file/gtkprintbackendfile.c   |    4 +-
 modules/printbackends/file/gtkprintbackendfile.h   |    4 +-
 modules/printbackends/lpr/gtkprintbackendlpr.c     |    4 +-
 modules/printbackends/lpr/gtkprintbackendlpr.h     |    4 +-
 modules/printbackends/papi/gtkprintbackendpapi.c   |    8 +-
 modules/printbackends/papi/gtkprintbackendpapi.h   |    4 +-
 modules/printbackends/papi/gtkprinterpapi.c        |    4 +-
 modules/printbackends/papi/gtkprinterpapi.h        |    4 +-
 modules/printbackends/test/gtkprintbackendtest.c   |   10 +-
 modules/printbackends/test/gtkprintbackendtest.h   |    4 +-
 po-properties/POTFILES.in                          |   27 +-
 po-properties/POTFILES.skip                        |   27 +-
 po-properties/as.po                                | 4530 ++++++++-------
 po-properties/bg.po                                | 4315 ++++++++-------
 po-properties/ca.po                                | 4384 ++++++++-------
 po-properties/ca valencia po                       | 4343 ++++++++-------
 po-properties/crh.po                               | 5256 ++++++++---------
 po-properties/cs.po                                | 4478 ++++++++-------
 po-properties/da.po                                | 4323 ++++++++-------
 po-properties/de.po                                | 4310 ++++++++-------
 po-properties/en_GB.po                             | 4318 ++++++++-------
 po-properties/eo.po                                | 4572 ++++++++-------
 po-properties/es.po                                | 4392 ++++++++-------
 po-properties/eu.po                                | 4327 ++++++++-------
 po-properties/fi.po                                | 5208 ++++++++++-------
 po-properties/fr.po                                | 4403 ++++++++-------
 po-properties/gl.po                                | 4532 ++++++++-------
 po-properties/gu.po                                | 4457 ++++++++-------
 po-properties/he.po                                | 5476 +++++++++---------
 po-properties/hi.po                                | 5488 ++++++++++--------
 po-properties/hu.po                                | 4315 ++++++++-------
 po-properties/ja.po                                | 5439 +++++++++++-------
 po-properties/kn.po                                | 5898 ++++++++++++--------
 po-properties/ko.po                                | 4208 +++++++-------
 po-properties/lt.po                                | 4868 +++++++++--------
 po-properties/lv.po                                | 4374 ++++++++-------
 po-properties/mr.po                                | 5965 ++++++++++++--------
 po-properties/nb.po                                | 3659 +++++++------
 po-properties/or.po                                | 4484 ++++++++-------
 po-properties/pa.po                                | 4312 ++++++++-------
 po-properties/pl.po                                | 4321 ++++++++-------
 po-properties/po2tbl.sed.in                        |    3 +-
 po-properties/pt.po                                | 4320 ++++++++-------
 po-properties/pt_BR.po                             | 4316 ++++++++-------
 po-properties/ru.po                                | 4861 +++++++++--------
 po-properties/sl.po                                | 4908 +++++++++--------
 po-properties/sr.po                                | 4471 ++++++++-------
 po-properties/sr latin po                          | 4463 ++++++++-------
 po-properties/sv.po                                | 5747 +++++++++----------
 po-properties/te.po                                | 6012 ++++++++++++--------
 po-properties/uk.po                                | 4498 ++++++++-------
 po-properties/zh_CN.po                             | 4297 ++++++++-------
 po-properties/zh_HK.po                             | 4841 ++++++++---------
 po-properties/zh_TW.po                             | 4819 ++++++++---------
 po/POTFILES.in                                     |   27 +-
 po/POTFILES.skip                                   |   27 +-
 po/ar.po                                           | 2623 +++++----
 po/as.po                                           | 2009 ++++---
 po/be.po                                           | 1410 +++--
 po/bg.po                                           | 1387 +++--
 po/br.po                                           | 2466 +++++----
 po/ca.po                                           | 2167 ++++----
 po/ca valencia po                                  | 2145 ++++---
 po/crh.po                                          | 3108 ++++++----
 po/cs.po                                           | 2286 ++++----
 po/da.po                                           | 1411 +++--
 po/de.po                                           | 2115 ++++---
 po/en_GB.po                                        | 2006 ++++---
 po/eo.po                                           | 2133 ++++---
 po/es.po                                           | 2176 ++++----
 po/et.po                                           |  782 ++-
 po/eu.po                                           | 1777 ++++---
 po/fa.po                                           | 1524 +++--
 po/fi.po                                           | 2468 +++++----
 po/fr.po                                           | 2143 ++++----
 po/gl.po                                           | 2189 ++++----
 po/gu.po                                           | 3069 ++++++----
 po/he.po                                           | 1589 +++---
 po/hi.po                                           | 2522 +++++----
 po/hu.po                                           | 1524 +++--
 po/it.po                                           | 1437 +++--
 po/ja.po                                           | 2093 ++++---
 po/kk.po                                           | 2125 +++++---
 po/ko.po                                           | 1769 ++++---
 po/lt.po                                           | 3171 +++--------
 po/lv.po                                           | 1865 +++++--
 po/mr.po                                           | 3062 ++++++----
 po/nb.po                                           | 2126 ++++---
 po/or.po                                           | 3074 ++++++----
 po/pa.po                                           | 1434 +++--
 po/pl.po                                           | 1947 ++++---
 po/po2tbl.sed.in                                   |    3 +-
 po/pt.po                                           | 2195 ++++----
 po/pt_BR.po                                        | 1787 ++++---
 po/ru.po                                           | 2323 +++++----
 po/sk.po                                           | 2674 +++++----
 po/sl.po                                           | 1856 ++++---
 po/sr.po                                           | 1444 +++--
 po/sr latin po                                     | 1444 +++--
 po/sv.po                                           | 2143 +++++---
 po/te.po                                           | 2125 ++++---
 po/uk.po                                           | 2003 ++++---
 po/vi.po                                           | 1818 ++++---
 po/zh_CN.po                                        | 2207 ++++----
 po/zh_HK.po                                        | 3781 ++++---------
 po/zh_TW.po                                        | 3759 ++++---------
 tests/Makefile.am                                  |  134 +-
 tests/a11y/Makefile.am                             |   11 +-
 tests/a11y/about.txt                               |    9 +-
 tests/a11y/accessibility-dump.c                    |   46 +-
 tests/a11y/appchooser.txt                          |  407 --
 tests/a11y/appchooser.ui                           |    6 -
 tests/a11y/children.c                              |    6 +-
 tests/a11y/combos.txt                              |  227 +
 tests/a11y/combos.ui                               |   42 +
 tests/a11y/entries.txt                             |   88 +-
 tests/a11y/entries.ui                              |   16 +
 tests/a11y/focus.c                                 |    4 +-
 tests/a11y/infobar.txt                             |    3 +-
 tests/a11y/testfocus.c                             |    2 +-
 tests/a11y/text.c                                  |  554 ++-
 tests/a11y/tree-performance.c                      |   14 +-
 tests/a11y/tree-relationships.c                    |  382 ++
 tests/a11y/tree.txt                                |  408 --
 tests/a11y/tree.ui                                 |   50 -
 tests/a11y/util.c                                  |    4 +-
 tests/autotestfilesystem.c                         |    4 +-
 tests/cellareascaffold.c                           |    4 +-
 tests/cellareascaffold.h                           |    4 +-
 tests/css/api.c                                    |    4 +-
 tests/css/parser/Makefile.am                       |   34 +-
 tests/css/parser/at-invalid-02.errors              |    1 +
 tests/css/parser/background-position.css           |  167 +
 tests/css/parser/background-position.errors        |   14 +
 tests/css/parser/background-position.ref.css       |  111 +
 tests/css/parser/background-repeat.css             |   87 +
 tests/css/parser/background-repeat.ref.css         |   87 +
 tests/css/parser/background-shorthand.css          | 1300 +++++
 tests/css/parser/background-shorthand.ref.css      | 2599 +++++++++
 tests/css/parser/background-size.css               |   51 +
 tests/css/parser/background-size.ref.css           |   51 +
 tests/css/parser/border-color-currentcolor.css     |    3 +
 tests/css/parser/border-color-currentcolor.ref.css |    6 +
 tests/css/parser/border-radius.css                 |   56 +-
 tests/css/parser/border-radius.errors              |    2 +-
 tests/css/parser/border-radius.ref.css             |  117 +-
 tests/css/parser/border-shorthand.css              |  345 ++
 tests/css/parser/border-shorthand.ref.css          |  771 +++
 tests/css/parser/border.css                        |    4 -
 tests/css/parser/border.ref.css                    |    4 -
 tests/css/parser/currentcolor-everywhere.css       |   21 +
 tests/css/parser/declarations-valid-04.ref.css     |    4 +-
 tests/css/parser/declarations-valid-10.css         |    2 +-
 tests/css/parser/declarations-valid-10.ref.css     |    8 +-
 tests/css/parser/declarations-valid-11.css         |    2 +-
 tests/css/parser/declarations-valid-11.ref.css     |    8 +-
 tests/css/parser/declarations-valid-12.css         |    2 +-
 tests/css/parser/declarations-valid-12.ref.css     |    8 +-
 tests/css/parser/declarations-valid-13.css         |    2 +-
 tests/css/parser/declarations-valid-13.ref.css     |    8 +-
 tests/css/parser/declarations-valid-14.css         |    2 +-
 tests/css/parser/declarations-valid-14.ref.css     |    8 +-
 tests/css/parser/declarations-valid-15.css         |    2 +-
 tests/css/parser/declarations-valid-15.ref.css     |    8 +-
 tests/css/parser/declarations-valid-16.css         |    2 +-
 tests/css/parser/declarations-valid-16.ref.css     |   16 +-
 tests/css/parser/declarations-valid-22.ref.css     |    2 +-
 tests/css/parser/declarations-valid-23.ref.css     |    2 +-
 tests/css/parser/doubled.css                       |   12 +
 tests/css/parser/doubled.ref.css                   |   31 +
 tests/css/parser/font-family.ref.css               |    2 +-
 tests/css/parser/linear-gradient.css               |  104 +
 tests/css/parser/linear-gradient.ref.css           |  104 +
 tests/css/parser/nth-child.css                     |  292 +
 tests/css/parser/nth-child.ref.css                 |  663 +++
 tests/css/parser/pseudo-classes-unknown.errors     |   12 +-
 tests/css/parser/selector.css                      |  200 +
 tests/css/parser/selector.errors                   |    1 -
 tests/css/parser/selector.ref.css                  |  214 +-
 tests/css/parser/shadow.css                        |  400 ++
 tests/css/parser/shadow.ref.css                    |  399 ++
 tests/css/parser/shorthand.css                     |    2 +-
 tests/css/parser/shorthand.ref.css                 |    8 +-
 tests/css/parser/test-css-parser.c                 |   19 +-
 tests/css/parser/transition.css                    | 2704 +++++++++
 tests/css/parser/transition.ref.css                | 4731 +++++++++++++++
 tests/css/parser/value-inherit-shorthand.css       |    9 +
 tests/css/parser/value-inherit-shorthand.ref.css   |   31 +
 tests/css/parser/value-inherit.css                 |   45 +
 tests/css/parser/value-initial-shorthand.css       |    9 +
 tests/css/parser/value-initial-shorthand.ref.css   |   31 +
 tests/css/parser/value-initial.css                 |   45 +
 tests/css/parser/value-none.css                    |   45 +
 tests/css/parser/value-none.errors                 |   32 +
 tests/css/parser/value-none.ref.css                |   13 +
 tests/prop-editor.c                                |   76 +-
 tests/prop-editor.h                                |    4 +-
 tests/reftests/Makefile.am                         |   57 +-
 tests/reftests/background-area.css                 |   46 +-
 tests/reftests/background-area.ref.ui              |   54 +-
 tests/reftests/background-area.ui                  |   44 +-
 tests/reftests/background-origin.css               |   58 +
 tests/reftests/background-origin.ref.ui            |   19 +
 tests/reftests/background-origin.ui                |  116 +
 tests/reftests/background-position.css             |   52 +
 tests/reftests/background-position.ref.ui          |  161 +
 tests/reftests/background-position.ui              |  178 +
 .../background-positioning-area-empty.ref.ui       |   17 +
 .../reftests/background-positioning-area-empty.ui  |   17 +
 tests/reftests/background-repeat.css               |   30 +
 tests/reftests/background-repeat.ref.ui            |   84 +
 tests/reftests/background-repeat.ui                |   70 +
 tests/reftests/background-size-keywords.css        |  112 +
 tests/reftests/background-size-keywords.ref.ui     |  243 +
 tests/reftests/background-size-keywords.ui         |  242 +
 tests/reftests/background-size.css                 |   61 +
 tests/reftests/background-size.ref.ui              |  243 +
 tests/reftests/background-size.ui                  |  242 +
 tests/reftests/background-window-transparent.css   |    5 +
 .../reftests/background-window-transparent.ref.ui  |   15 +
 tests/reftests/background-window-transparent.ui    |   14 +
 tests/reftests/border-color-default.css            |    2 +-
 tests/reftests/border-image-excess-size.css        |    2 +-
 tests/reftests/border-image-gradient.css           |   16 +-
 tests/reftests/border-image-repeat.css             |   17 +-
 tests/reftests/border-image-url.css                |   12 +-
 tests/reftests/border-radius-clamp.css             |    4 +-
 tests/reftests/border-style-none.css               |   19 +
 tests/reftests/border-style-none.ref.ui            |   19 +
 tests/reftests/border-style-none.ui                |   18 +
 tests/reftests/border-style.css                    |   27 +
 tests/reftests/border-style.ref.ui                 |   33 +
 tests/reftests/border-style.ui                     |   90 +
 tests/reftests/box-shadow-spec-inset.css           |   16 +-
 tests/reftests/css-match-class.css                 |    2 +
 tests/reftests/css-match-exact.css                 |    8 +-
 tests/reftests/css-match-import-import.css         |    7 +
 tests/reftests/css-match-import.css                |    9 +
 tests/reftests/css-match-import.ref.ui             |   16 +
 tests/reftests/css-match-import.ui                 |   15 +
 .../reftests/css-match-inherit-different-state.css |   12 +
 .../css-match-inherit-different-state.ref.ui       |   26 +
 .../reftests/css-match-inherit-different-state.ui  |   25 +
 tests/reftests/css-match-inherit.css               |    1 +
 tests/reftests/css-match-name.css                  |    2 +
 tests/reftests/css-match-region-matches-star.css   |    2 +
 tests/reftests/css-match-regions.css               |    7 +-
 tests/reftests/css-match-regions.ref.ui            |    8 +-
 tests/reftests/css-match-regions.ui                |    4 +-
 tests/reftests/css-match-siblings.css              |   19 +
 tests/reftests/css-match-siblings.ref.ui           |   79 +
 tests/reftests/css-match-siblings.ui               |   75 +
 tests/reftests/css-match-style-property-order.css  |    2 +-
 tests/reftests/css-match-subtype.css               |    2 +
 tests/reftests/css-match-type.css                  |    2 +
 tests/reftests/css-multi-state.css                 |    9 +
 tests/reftests/css-multi-state.ref.ui              |   27 +
 tests/reftests/css-multi-state.ui                  |   26 +
 tests/reftests/entry-progress-coloring.css         |    6 +-
 tests/reftests/grid-empty-with-spacing.ref.ui      |   16 +
 tests/reftests/grid-empty-with-spacing.ui          |   28 +
 tests/reftests/gtk-reftest.c                       |   12 +-
 tests/reftests/info-bar-message-types.css          |   54 +
 tests/reftests/info-bar-message-types.ref.ui       |   84 +
 tests/reftests/info-bar-message-types.ui           |  229 +
 tests/reftests/inherit-and-initial.css             |   85 +
 .../inherit-and-initial.ref.ui}                    |  166 +
 .../inherit-and-initial.ui}                        |    9 +
 tests/reftests/label-attribute-preference.css      |    4 +
 tests/reftests/label-attribute-preference.ref.ui   |   24 +
 tests/reftests/label-attribute-preference.ui       |   20 +
 tests/reftests/label-shadows.css                   |    2 +-
 tests/reftests/label-sizing.css                    |    3 +-
 tests/reftests/linear-gradient.css                 |   35 +
 tests/reftests/linear-gradient.ref.ui              |   67 +
 tests/reftests/linear-gradient.ui                  |   66 +
 tests/reftests/misc-alignment.css                  |    3 +-
 tests/reftests/no-colors.css                       |    8 +-
 tests/reftests/nth-child.css                       |  148 +
 tests/reftests/nth-child.ref.ui                    |  289 +
 tests/reftests/nth-child.ui                        |  314 +
 tests/reftests/quit-mnemonic.css                   |    3 +
 tests/reftests/reference-background-origin.png     |  Bin 0 -> 2024 bytes
 tests/reftests/reset-to-defaults.css               |   59 +
 tests/reftests/shorthand-entry-border.css          |   10 +-
 tests/reftests/unresolvable.css                    |    6 +-
 tests/simple.c                                     |    4 +-
 tests/stresstest-toolbar.c                         |    4 +-
 tests/styleexamples.c                              |    6 -
 tests/testaccel.c                                  |    4 +-
 tests/testactions.c                                |    4 +-
 tests/testadjustsize.c                             |    4 +-
 tests/testanimation.c                              |    4 +-
 tests/testappchooser.c                             |    4 +-
 tests/testappchooserbutton.c                       |    4 +-
 tests/testassistant.c                              |    4 +-
 tests/testbbox.c                                   |    4 +-
 tests/testboxcss.c                                 |    4 +-
 tests/testbuttons.c                                |    4 +-
 tests/testcairo.c                                  |    4 +-
 tests/testcalendar.c                               |   15 +-
 tests/testcellrenderertext.c                       |    4 +-
 tests/testclipboard.c                              |    4 +-
 tests/testcolorchooser.c                           |  103 +
 tests/testcombo.c                                  |   13 +-
 tests/testcombochange.c                            |    4 +-
 tests/testdnd.c                                    |    4 +-
 tests/testellipsise.c                              |    3 +-
 tests/testentrycompletion.c                        |    4 +-
 tests/testerrors.c                                 |    4 +-
 tests/testexpand.c                                 |    4 +-
 tests/testfilechooser.c                            |    4 +-
 tests/testfilechooserbutton.c                      |    4 +-
 tests/testfontchooser.c                            |    4 +-
 tests/testfontchooserdialog.c                      |    4 +-
 tests/testfontselection.c                          |    4 +-
 tests/testfontselectiondialog.c                    |    4 +-
 tests/testframe.c                                  |    4 +-
 tests/testgeometry.c                               |    4 +-
 tests/testgiconpixbuf.c                            |    4 +-
 tests/testgmenu.c                                  | 1040 ++++
 tests/testgrid.c                                   |   26 +
 tests/testgtk.c                                    |  140 +-
 tests/testheightforwidth.c                         |    4 +-
 tests/testicontheme.c                              |    4 +-
 tests/testiconview-keynav.c                        |    4 +-
 tests/testiconview.c                               |   10 +-
 tests/testimage.c                                  |    6 +-
 tests/testinput.c                                  |   11 +-
 tests/testkineticscrolling.c                       |  148 +
 tests/testlockbutton.c                             |    4 +-
 tests/testlogout.c                                 |  156 +
 tests/testmenubars.c                               |    4 +-
 tests/testmerge.c                                  |   12 +-
 tests/testmountoperation.c                         |    4 +-
 tests/testmultidisplay.c                           |    4 +-
 tests/testmultiscreen.c                            |    4 +-
 tests/testnoscreen.c                               |    4 +-
 tests/testnotebookdnd.c                            |    4 +-
 tests/testnouiprint.c                              |   15 +-
 tests/testnumerableicon.c                          |    4 +-
 tests/testoffscreen.c                              |    5 +-
 tests/testorientable.c                             |    4 +-
 tests/testoverlaystyleclass.c                      |  154 +
 tests/testprint.c                                  |    4 +-
 tests/testrc.c                                     |    4 +-
 tests/testrecentchooser.c                          |    4 +-
 tests/testrecentchoosermenu.c                      |    4 +-
 tests/testrichtext.c                               |    4 +-
 tests/testscale.c                                  |  221 +-
 tests/testscrolledwindow.c                         |   17 +
 tests/testselection.c                              |    4 +-
 tests/testsocket.c                                 |    4 +-
 tests/testsocket_child.c                           |    4 +-
 tests/testsocket_common.c                          |    4 +-
 tests/testspinbutton.c                             |    4 +-
 tests/teststatusicon.c                             |    4 +-
 tests/testthreads.c                                |    4 +-
 tests/testtoolbar.c                                |    4 +-
 tests/testtoplevelembed.c                          |    2 +-
 tests/testtreechanging.c                           |  520 ++
 tests/testtreecolumns.c                            |    4 +-
 tests/testtreeedit.c                               |    4 +-
 tests/testtreeflow.c                               |    4 +-
 tests/testtreefocus.c                              |    4 +-
 tests/testtreemodel.c                              |    4 +-
 tests/testtreesort.c                               |    4 +-
 tests/testtreeview.c                               |    7 +-
 tests/testverticalcells.c                          |    4 +-
 tests/testvolumebutton.c                           |    6 +-
 tests/testwindows.c                                |   96 +-
 tests/testxinerama.c                               |    4 +-
 tests/treestoretest.c                              |    4 +-
 tests/visuals/Makefile.am                          |   28 +
 tests/visuals/inline-toolbar.ui                    |  120 +
 tests/visuals/primary-toolbar.ui                   |  211 +
 tests/visuals/visuals.c                            |   84 +
 tests/widget-factory.c                             |   67 -
 1713 files changed, 249567 insertions(+), 178389 deletions(-)
---
diff --cc gtk/Makefile.am
index 4bfb85e,e31feb2..663a827
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@@ -777,7 -906,10 +906,11 @@@ gtk_use_win32_c_sources = 	
  	gtkmountoperation-stub.c
  gtk_use_quartz_c_sources = 	\
  	gtksearchenginequartz.c	\
- 	gtkmountoperation-stub.c
+ 	gtkmountoperation-stub.c \
 -  gtkquartz-menu.h \
 -  gtkquartz-menu.c \
++	gtkquartz-menu.h \
++	gtkquartz-menu.c \
+ 	gtkquartz.c
++
  gtk_use_stub_c_sources = 	\
  	gtkmountoperation-stub.c
  gtk_all_c_sources += $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_quartz_c_sources) $(gtk_use_stub_c_sources)
@@@ -809,15 -943,21 +944,25 @@@ endi
  if USE_QUARTZ
  gtk_clipboard_dnd_c_sources = 	\
  	gtkclipboard-quartz.c	\
 -	gtkdnd-quartz.c
 +	gtkdnd-quartz.c		\
 +	gtkquartz.c		\
 +	gtkselection-quartz.c
 +
 +gtk_clipboard_dnd_h_sources = gtkquartz.h
  else
+ if USE_WAYLAND
+ if !USE_X11
+ # No wayland gtkdnd-wayland.c yet
+ gtk_clipboard_dnd_c_sources = 	\
+ 	gtkclipboard-wayland.c \
+ 	gtkdnd.c
+ else
  gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c
  endif
- EXTRA_DIST += gtkquartz.h
+ else
+ gtk_clipboard_dnd_c_sources = gtkclipboard.c gtkdnd.c
+ endif
+ endif
  
  # we use our own built_sources variable rules to avoid automake's
  # BUILT_SOURCES oddities
diff --cc gtk/gtkfilechooserdefault.c
index 4c7b247,7559d2d..f182f0e
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@@ -4678,9 -4666,12 +4668,12 @@@ location_switch_to_filename_entry (GtkF
  
    /* Entry */
  
+   if (!impl->location_entry)
+     {
 -      location_entry_create (impl);
 -      gtk_box_pack_start (GTK_BOX (impl->location_entry_box), impl->location_entry, TRUE, TRUE, 0);
 -      gtk_label_set_mnemonic_widget (GTK_LABEL (impl->location_label), impl->location_entry);
 +  location_entry_create (impl);
 +  gtk_box_pack_start (GTK_BOX (impl->location_entry_box), impl->location_entry, TRUE, TRUE, 0);
 +  gtk_label_set_mnemonic_widget (GTK_LABEL (impl->location_label), impl->location_entry);
+     }
  
    /* Configure the entry */
  



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]