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

[John Ralls <jralls src gnome org>]

commit 990390339a7ab526a5835db87656d5ccc20929eb
Merge: 3544cf1 64c79c1
Author: John Ralls <jralls ceridwen us>
Date:   Mon Jan 17 23:21:10 2011 -0800

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/Makefile.am             |    4 +-
 docs/reference/gtk/gtk-builder-convert.xml |   72 ---
 docs/reference/gtk/gtk-docs.sgml           |    1 -
 docs/reference/gtk/tmpl/.gitignore         |    3 +
 docs/reference/gtk/tmpl/gtkfilefilter.sgml |  170 ------
 docs/reference/gtk/tmpl/gtkfixed.sgml      |  133 -----
 docs/reference/gtk/tmpl/gtkmenu.sgml       |  494 -----------------
 gtk/Makefile.am                            |    8 +-
 gtk/gtk-builder-convert                    |  799 ----------------------------
 gtk/gtkfilechooserbutton.c                 |    2 +-
 gtk/gtkfilefilter.c                        |   24 +
 gtk/gtkfilefilter.h                        |   35 ++
 gtk/gtkfixed.c                             |   74 +++
 gtk/gtkicontheme.c                         |    6 +-
 gtk/gtkiconview.c                          |    6 +-
 gtk/gtkmenu.c                              |  174 ++++++-
 gtk/gtkmenu.h                              |   39 ++-
 gtk/gtktreemenu.c                          |    6 +-
 gtk/gtkwindow.c                            |    2 +
 19 files changed, 362 insertions(+), 1690 deletions(-)
---