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

[John Ralls <jralls src gnome org>]

commit bed32a2726f658aba25ca7b3f19b5ebc2354c988
Merge: 457d84e 18c8fe5
Author: John Ralls <jralls ceridwen us>
Date:   Tue Jun 7 23:21:20 2011 -0700

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/gtk-docs.sgml                 |    2 +-
 docs/reference/gtk/migrating-GtkStyleContext.xml |    4 +-
 gtk/gtkaboutdialog.c                             |    9 +-
 gtk/gtkcolorsel.c                                |   12 +-
 gtk/gtkcolorsel.h                                |    6 +-
 gtk/gtkcolorseldialog.c                          |    1 -
 gtk/gtkcombobox.c                                |    2 +-
 gtk/gtkcontainer.c                               |   10 +-
 gtk/gtkcontainer.h                               |    2 +-
 gtk/gtkdialog.c                                  |    2 +-
 gtk/gtkentry.c                                   |    1 -
 gtk/gtkfilechooserbutton.c                       |    5 +-
 gtk/gtkfilechooserbutton.h                       |    6 +-
 gtk/gtkfilechooserdefault.c                      |   29 +-
 gtk/gtkfilechooserentry.c                        |   54 +--
 gtk/gtkfilechooserprivate.h                      |    4 +-
 gtk/gtkfilechooserwidget.c                       |    5 +-
 gtk/gtkfilechooserwidget.h                       |    6 +-
 gtk/gtkfontbutton.c                              |    3 +-
 gtk/gtkfontsel.c                                 |    9 +-
 gtk/gtkfontsel.h                                 |    6 +-
 gtk/gtkgrid.c                                    |   14 +-
 gtk/gtkhbbox.c                                   |    5 +
 gtk/gtkhbbox.h                                   |    3 +
 gtk/gtkhbox.c                                    |    5 +
 gtk/gtkhbox.h                                    |    4 +
 gtk/gtkhpaned.c                                  |    5 +
 gtk/gtkhpaned.h                                  |    4 +
 gtk/gtkhscale.c                                  |    7 +
 gtk/gtkhscale.h                                  |    3 +
 gtk/gtkhscrollbar.c                              |    6 +
 gtk/gtkhscrollbar.h                              |    2 +
 gtk/gtkhseparator.c                              |    5 +
 gtk/gtkhseparator.h                              |    2 +
 gtk/gtkinfobar.c                                 |    5 +-
 gtk/gtkinfobar.h                                 |    6 +-
 gtk/gtkmountoperation.c                          |   18 +-
 gtk/gtkpagesetupunixdialog.c                     |    5 -
 gtk/gtkpathbar.c                                 |   22 +-
 gtk/gtkprinteroptionwidget.c                     |    6 +-
 gtk/gtkprinteroptionwidget.h                     |    6 +-
 gtk/gtkprintunixdialog.c                         |    1 -
 gtk/gtkrecentchooserdefault.c                    |   24 +-
 gtk/gtkrecentchooserwidget.c                     |    8 +-
 gtk/gtkrecentchooserwidget.h                     |    6 +-
 gtk/gtkscrolledwindow.c                          |    1 +
 gtk/gtkscrolledwindow.h                          |    2 -
 gtk/gtkstatusbar.c                               |    3 +-
 gtk/gtkstatusbar.h                               |    6 +-
 gtk/gtktestutils.c                               |    4 +-
 gtk/gtktooltip.c                                 |   98 ++---
 gtk/gtktreedatalist.h                            |    3 +-
 gtk/gtktreestore.c                               |    1 +
 gtk/gtktreeview.c                                |    1 -
 gtk/gtkvbbox.c                                   |    5 +
 gtk/gtkvbbox.h                                   |    3 +
 gtk/gtkvbox.c                                    |    5 +
 gtk/gtkvbox.h                                    |    4 +
 gtk/gtkvpaned.c                                  |    5 +
 gtk/gtkvpaned.h                                  |    4 +
 gtk/gtkvscale.c                                  |    7 +
 gtk/gtkvscale.h                                  |    2 +
 gtk/gtkvscrollbar.c                              |    6 +
 gtk/gtkvscrollbar.h                              |    2 +
 gtk/gtkvseparator.c                              |    5 +
 gtk/gtkvseparator.h                              |    5 +-
 gtk/tests/builder.c                              |    4 +-
 modules/other/gail/gailarrow.c                   |    4 +-
 modules/other/gail/gailbutton.c                  |   26 +-
 modules/other/gail/gailcell.c                    |   12 +-
 modules/other/gail/gailcombobox.c                |   18 +-
 modules/other/gail/gailentry.c                   |   16 +-
 modules/other/gail/gailexpander.c                |   26 +-
 modules/other/gail/gailframe.c                   |    6 +-
 modules/other/gail/gailimage.c                   |    8 +-
 modules/other/gail/gailimagecell.c               |    4 +-
 modules/other/gail/gaillabel.c                   |    6 +-
 modules/other/gail/gailmenuitem.c                |   12 +-
 modules/other/gail/gailnotebookpage.c            |    4 +-
 modules/other/gail/gailrange.c                   |   22 +-
 modules/other/gail/gailscalebutton.c             |   12 +-
 modules/other/gail/gailstatusbar.c               |    6 +-
 modules/other/gail/gailtextcell.c                |   16 +-
 modules/other/gail/gailtextview.c                |    4 +-
 modules/other/gail/gailtreeview.c                |    8 +-
 modules/other/gail/gailutil.c                    |    8 +-
 modules/other/gail/gailwidget.c                  |    4 +-
 modules/other/gail/gailwindow.c                  |    6 +-
 modules/other/gail/libgail-util/gailmisc.c       |   22 +-
 modules/other/gail/tests/ferret.c                |   48 +-
 modules/other/gail/tests/testaction.c            |   10 +-
 modules/other/gail/tests/testbutton.c            |    6 +-
 modules/other/gail/tests/testcombo.c             |    2 +-
 modules/other/gail/tests/testimage.c             |    6 +-
 modules/other/gail/tests/testlib.c               |    8 +-
 modules/other/gail/tests/testmenuitem.c          |    8 +-
 modules/other/gail/tests/testnotebook.c          |    6 +-
 modules/other/gail/tests/testobject.c            |    8 +-
 modules/other/gail/tests/testpaned.c             |    4 +-
 modules/other/gail/tests/testprops.c             |    4 +-
 modules/other/gail/tests/testselection.c         |    4 +-
 modules/other/gail/tests/teststatusbar.c         |    6 +-
 modules/other/gail/tests/testtable.c             |   10 +-
 modules/other/gail/tests/testtext.c              |    2 +-
 modules/other/gail/tests/testtreetable.c         |    4 +-
 modules/other/gail/tests/testvalues.c            |    2 +-
 po/nb.po                                         |  605 +++++++++++----------
 tests/reftests/Makefile.am                       |    2 +
 tests/reftests/grid-wfh.ref.ui                   |   40 ++
 tests/reftests/grid-wfh.ui                       |   41 ++
 tests/testgtk.c                                  |    9 +-
 tests/testmultidisplay.c                         |    3 +-
 tests/testmultiscreen.c                          |    2 +-
 tests/testtreesort.c                             |    2 -
 114 files changed, 899 insertions(+), 719 deletions(-)
---