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

[John Ralls <jralls src gnome org>]

commit 992126ea3365f51ed1b0c4935415a6cf0c796785
Merge: 9903903 80e1340
Author: John Ralls <jralls ceridwen us>
Date:   Tue Jan 18 23:21:25 2011 -0800

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/Makefile.am                 |    2 +
 docs/reference/gtk/getting_started.xml         |  261 +-
 docs/reference/gtk/images/drawing.png          |  Bin 0 -> 3686 bytes
 docs/reference/gtk/images/grid-packing.png     |  Bin 0 -> 4612 bytes
 docs/reference/gtk/tmpl/gtkprintoperation.sgml |    9 +-
 examples/Makefile.am                           |    7 +-
 examples/drawing.c                             |  200 +
 examples/grid-packing.c                        |   73 +
 gdk/gdk.c                                      |    2 +-
 gdk/gdkcursor.c                                |    2 +-
 gdk/gdkevents.h                                |    2 +-
 gdk/gdkkeys.c                                  |    2 +-
 gdk/tests/Makefile.am                          |    8 +-
 gdk/tests/display.c                            |   74 +
 gdk/x11/gdkdisplaymanager-x11.c                |    2 +-
 gtk/gtkaccelgroup.c                            |    7 +-
 gtk/gtkaccelgroup.h                            |    2 +-
 gtk/gtkaccelmap.c                              |    6 +-
 gtk/gtkaction.c                                |    7 +-
 gtk/gtkassistant.h                             |    2 +-
 gtk/gtkbutton.c                                |    2 +-
 gtk/gtkcalendar.c                              |    6 +-
 gtk/gtkcellarea.h                              |    4 +-
 gtk/gtkcontainer.h                             |    2 +-
 gtk/gtkcssprovider.c                           |   27 +-
 gtk/gtkdialog.c                                |    3 +-
 gtk/gtkeditable.h                              |    8 +-
 gtk/gtkfilechooser.c                           |   47 +-
 gtk/gtkfilefilter.h                            |    2 +-
 gtk/gtkiconfactory.c                           |    6 +-
 gtk/gtkicontheme.c                             |   31 +-
 gtk/gtkiconview.c                              |   24 +-
 gtk/gtkimage.c                                 |   48 +-
 gtk/gtkimcontextsimple.c                       |    2 +-
 gtk/gtkmenu.c                                  |    6 +-
 gtk/gtkpagesetup.c                             |    6 +-
 gtk/gtkprinter.h                               |    2 +-
 gtk/gtkprintjob.c                              |    2 +-
 gtk/gtkprintoperation.c                        |    2 +-
 gtk/gtkprintoperation.h                        |   11 +
 gtk/gtkprintsettings.c                         |    6 +-
 gtk/gtkradioaction.c                           |    7 +-
 gtk/gtkradiobutton.c                           |    2 +-
 gtk/gtkrange.c                                 |    1 +
 gtk/gtkrc.c                                    |   23 +-
 gtk/gtkrecentaction.c                          |   14 +-
 gtk/gtkscale.c                                 |    4 +-
 gtk/gtkstatusicon.c                            |   20 +-
 gtk/gtkstylecontext.c                          |   24 +
 gtk/gtkstylecontext.h                          |    2 +
 gtk/gtktextbuffer.h                            |   16 +-
 gtk/gtkthemingengine.c                         |    9 -
 gtk/gtktoggleaction.c                          |    7 +-
 gtk/gtktreemenu.c                              |    2 +-
 gtk/gtktreemodelfilter.h                       |    4 +-
 gtk/gtktreeselection.h                         |    4 +-
 gtk/gtktreeview.h                              |    6 +-
 gtk/gtktreeviewcolumn.c                        |    2 +-
 gtk/gtkuimanager.c                             |    2 +-
 gtk/gtkwidgetpath.c                            |    4 +
 gtk/gtkwindow.c                                |   12 +-
 m4macros/gtk-3.0.m4                            |    2 +-
 po-properties/he.po                            |  643 +-
 po/he.po                                       |  227 +-
 po/pa.po                                       |12422 +++++++++++++++---------
 65 files changed, 8934 insertions(+), 5440 deletions(-)
---