[gtk+/gtk-2-24-quartz: 25/26] Merge branch 'gtk-2-24' into gtk-2-24-quartz

[John Ralls <jralls src gnome org>]

commit c81ac4d261ff8fc36cdce24057157b41582cf477
Merge: de82a1d 882db1c
Author: John Ralls <jralls ceridwen us>
Date:   Mon Jan 3 11:46:58 2011 -0800

    Merge branch 'gtk-2-24' into gtk-2-24-quartz

 docs/reference/gtk/migrating-GtkBuilder.sgml |    7 +------
 gdk/gdk.h                                    |    5 +----
 gdk/gdkdisplay.c                             |    4 ++++
 gdk/gdkdisplay.h                             |    2 ++
 gdk/gdkdrawable.h                            |    4 ++--
 gdk/gdkfont.h                                |    2 +-
 gdk/gdkwindow.h                              |   10 +++++-----
 gtk/Makefile.am                              |    1 -
 gtk/gtkprintunixdialog.c                     |    4 ++--
 tests/flicker.c                              |    1 -
 10 files changed, 18 insertions(+), 22 deletions(-)
---