[gtk+/composite-widget-templates: 13/13] Merge branch 'master' into composite-widget-templates

[Tristan Van Berkom <tvb src gnome org>]

commit 1441fc5fb074e3522a15a1e21e9fae57159ab804
Merge: 6731078 0d2366d
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Mon Jun 7 14:54:08 2010 -0400

    Merge branch 'master' into composite-widget-templates

 docs/faq/gtk-faq.sgml                      |    2 +-
 docs/reference/gdk/gdk3-sections.txt       |   12 -
 docs/reference/gdk/tmpl/colors.sgml        |  106 +-
 docs/reference/gdk/tmpl/x_interaction.sgml |    8 -
 gdk/Makefile.am                            |   23 +-
 gdk/abicheck.sh                            |    2 +-
 gdk/directfb/gdkcolor-directfb.c           |   77 -
 gdk/gdk.symbols                            |   32 +-
 gdk/gdkcolor.c                             |  152 +-
 gdk/gdkcolor.h                             |   43 -
 gdk/makegdkalias.pl                        |    2 +-
 gdk/quartz/gdkcolor-quartz.c               |   44 -
 gdk/testgdk.c                              |    2 -
 gdk/win32/gdkcolor-win32.c                 |  107 +-
 gdk/x11/gdkcolor-x11.c                     |  226 +--
 gdk/x11/gdkdevicemanager-xi.c              |   11 +
 gdk/x11/gdkdevicemanager-xi.h              |    1 -
 gdk/x11/gdkdevicemanager-xi2.h             |    2 +-
 gdk/x11/gdkx.h                             |    5 -
 gtk/gtkclipboard.c                         |    5 +-
 gtk/gtkprintjob.h                          |    6 +-
 gtk/gtkprintoperation-unix.c               |   42 +-
 gtk/gtkprintoperation.c                    |   48 +-
 gtk/gtkstyle.c                             |   44 -
 gtk/gtkstyle.h                             |    9 -
 gtk/gtktestutils.c                         |    1 -
 gtk/gtktypebuiltins.c.template             |    1 -
 gtk/tests/defaultvalue.c                   |    2 -
 gtk/tests/filechooser.c                    |    2 -
 gtk/tests/floating.c                       |    3 +-
 modules/engines/pixbuf/pixbuf-draw.c       |   39 -
 modules/other/gail/gail.c                  |    2 -
 modules/other/gail/gailitem.c              |    2 -
 modules/other/gail/gaillabel.c             |    2 -
 modules/other/gail/gailmenu.c              |    2 -
 modules/other/gail/gailtoplevel.c          |    2 -
 modules/other/gail/gailwidget.c            |    2 -
 modules/other/gail/gailwindow.c            |    2 -
 modules/other/gail/tests/ferret.c          |    2 -
 modules/other/gail/tests/testcombo.c       |    2 -
 po-properties/eo.po                        | 4455 ++++++++++++++--------------
 po/eo.po                                   | 4260 ++++++++++++---------------
 tests/testgtk.c                            |    1 -
 tests/testoffscreen.c                      |    2 -
 tests/testselection.c                      |    2 -
 tests/testtext.c                           |    2 -
 46 files changed, 4305 insertions(+), 5494 deletions(-)
---