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

[John Ralls <jralls src gnome org>]

commit 8eec4df12a0cd4826a0af2118938312b49988e7e
Merge: 0c5e651 cf86c7c
Author: John Ralls <jralls ceridwen us>
Date:   Wed May 25 23:21:07 2011 -0700

    Merge branch 'master' into quartz-integration

 demos/Makefile.am                                 |   55 +---
 demos/pixbuf-demo/Makefile.am                     |   41 +++
 demos/{ => pixbuf-demo}/apple-red.png             |  Bin 3545 -> 3545 bytes
 demos/{ => pixbuf-demo}/background.jpg            |  Bin 22219 -> 22219 bytes
 demos/{ => pixbuf-demo}/gnome-applets.png         |  Bin 3090 -> 3090 bytes
 demos/{ => pixbuf-demo}/gnome-calendar.png        |  Bin 2755 -> 2755 bytes
 demos/{ => pixbuf-demo}/gnome-foot.png            |  Bin 2916 -> 2916 bytes
 demos/{ => pixbuf-demo}/gnome-gimp.png            |  Bin 3410 -> 3410 bytes
 demos/{ => pixbuf-demo}/gnome-gmush.png           |  Bin 3244 -> 3244 bytes
 demos/{ => pixbuf-demo}/gnome-gsame.png           |  Bin 4263 -> 4263 bytes
 demos/{ => pixbuf-demo}/gnu-keys.png              |  Bin 3852 -> 3852 bytes
 demos/{ => pixbuf-demo}/pixbuf-demo.c             |    3 -
 demos/pixbuf-init.c                               |   20 -
 demos/testgtk/main.c                              |  392 ---------------------
 docs/reference/gtk/images/lockbutton-locked.png   |  Bin 1687 -> 1634 bytes
 docs/reference/gtk/images/lockbutton-sorry.png    |  Bin 1347 -> 1262 bytes
 docs/reference/gtk/images/lockbutton-unlocked.png |  Bin 1381 -> 1394 bytes
 docs/reference/gtk/images/lockbutton.png          |  Bin 2355 -> 2387 bytes
 gtk/gtklockbutton.c                               |  289 ++++-----------
 gtk/gtklockbutton.h                               |    6 +-
 tests/Makefile.am                                 |   24 ++-
 {demos => tests}/testanimation.c                  |    0
 {demos => tests}/testpixbuf-color.c               |    0
 {demos => tests}/testpixbuf-save.c                |    0
 {demos => tests}/testpixbuf-scale.c               |    4 -
 25 files changed, 142 insertions(+), 692 deletions(-)
---