[gtk+/client-side-decorations: 17/17] Merge branch 'master' into client-side-decorations

[Cody Russell <bratsche src gnome org>]

commit 02edc3c948e5d7255e8a9042b1be87335bd83195
Merge: 0692938... 690af10...
Author: Cody Russell <bratsche gnome org>
Date:   Thu Jul 9 16:34:11 2009 +0100

    Merge branch 'master' into client-side-decorations

 demos/gtk-demo/Makefile.am                  |    1 +
 demos/gtk-demo/entry_buffer.c               |   65 +
 docs/reference/gtk/gtk-docs.sgml            |    1 +
 docs/reference/gtk/gtk-sections.txt         |   31 +
 docs/reference/gtk/gtk.types                |    1 +
 docs/reference/gtk/tmpl/gtk-unused.sgml     |   19 +
 docs/reference/gtk/tmpl/gtkentry.sgml       |   32 +
 docs/reference/gtk/tmpl/gtkentrybuffer.sgml |  168 ++
 gdk/gdkwindow.c                             |    4 +-
 gdk/testgdk.c                               |   14 +-
 gdk/x11/gdktestutils-x11.c                  |   14 +
 gtk/Makefile.am                             |    2 +
 gtk/gtk.h                                   |    1 +
 gtk/gtkbbox.c                               |    4 +-
 gtk/gtkcellview.c                           |   40 +-
 gtk/gtkentry.c                              |  980 ++++----
 gtk/gtkentry.h                              |   15 +-
 gtk/gtkentrybuffer.c                        |  741 ++++++
 gtk/gtkentrybuffer.h                        |  133 +
 gtk/gtkhbbox.c                              |   26 +-
 gtk/gtkhbbox.h                              |    3 +
 gtk/gtkmarshalers.list                      |    2 +
 gtk/gtktreeviewcolumn.c                     |   33 +-
 gtk/gtkvbbox.c                              |   19 +-
 gtk/gtkvbbox.h                              |    2 +
 gtk/tests/defaultvalue.c                    |    3 +
 po-properties/es.po                         | 3429 +++++++++++++-------------
 po-properties/nl.po                         | 3641 +++++++++++++--------------
 po-properties/uk.po                         | 3463 +++++++++++++-------------
 po/nl.po                                    | 2199 ++++++++--------
 po/uk.po                                    | 2204 ++++++++--------
 31 files changed, 9353 insertions(+), 7937 deletions(-)
---