[gimp/soc-2009-dynamics: 45/45] Merge commit 'origin/master' into soc-2009-dynamics

[Alexia Death <alexiade src gnome org>]

commit e75d44c77cd2bc7df5b977885139374f53b74035
Merge: bb18654... c39b875...
Author: Alexia Death <alexiadeath gmail com>
Date:   Mon Sep 28 20:30:17 2009 +0300

    Merge commit 'origin/master' into soc-2009-dynamics

 app/actions/context-commands.c          |    8 +-
 app/actions/dock-actions.c              |   35 ++--
 app/actions/dock-commands.c             |   51 +++--
 app/actions/layers-actions.c            |   11 +-
 app/actions/layers-commands.c           |   12 +
 app/actions/layers-commands.h           |    2 +
 app/actions/windows-actions.c           |  148 ++++++++-----
 app/actions/windows-actions.h           |    8 +-
 app/actions/windows-commands.c          |   26 ++-
 app/actions/windows-commands.h          |   21 +-
 app/config/gimpguiconfig.c              |   12 +
 app/config/gimpguiconfig.h              |    1 +
 app/config/gimprc-blurbs.h              |    3 +
 app/core/gimpgrouplayer.c               |   13 +-
 app/core/gimpimage-merge.c              |  117 +++++++----
 app/core/gimpimage-merge.h              |    4 +
 app/dialogs/dialogs-constructors.c      |   37 +++-
 app/dialogs/dialogs-constructors.h      |    7 +
 app/dialogs/dialogs.c                   |   19 ++-
 app/dialogs/resize-dialog.c             |    6 +-
 app/display/gimpdisplayshell-cursor.c   |    8 +-
 app/display/gimpdisplayshell.c          |    4 +-
 app/gui/gui-message.c                   |    4 +-
 app/gui/gui.c                           |    4 +-
 app/gui/session.c                       |   32 ++-
 app/menus/windows-menu.c                |   92 ++++----
 app/tests/test-window-management.c      |   25 ++-
 app/tools/gimpcolortool.c               |    8 +-
 app/widgets/Makefile.am                 |    3 +
 app/widgets/gimpdialogfactory.c         |  313 +++++++++++++++-----------
 app/widgets/gimpdialogfactory.h         |   24 ++-
 app/widgets/gimpdock.c                  |   38 +++-
 app/widgets/gimpdock.h                  |   10 +-
 app/widgets/gimpdockable.c              |   12 +-
 app/widgets/gimpdockcolumns.c           |   54 +++++
 app/widgets/gimpdockcolumns.h           |   56 +++++
 app/widgets/gimpdockwindow.c            |  125 ++++++++---
 app/widgets/gimpdockwindow.h            |    5 +-
 app/widgets/gimphelp-ids.h              |    2 +
 app/widgets/gimplayertreeview.c         |    3 +-
 app/widgets/gimpmenudock.c              |    4 -
 app/widgets/gimpsessioninfo-aux.c       |    9 +-
 app/widgets/gimpsessioninfo-aux.h       |    4 +
 app/widgets/gimpsessioninfo-book.h      |    4 +
 app/widgets/gimpsessioninfo-dock.c      |   19 +-
 app/widgets/gimpsessioninfo-dockable.h  |    3 +
 app/widgets/gimpsessioninfo-private.h   |   53 +++++
 app/widgets/gimpsessioninfo.c           |  375 ++++++++++++++++++++++---------
 app/widgets/gimpsessioninfo.h           |   69 +++---
 app/widgets/gimptoolbox.c               |   35 ++--
 app/widgets/gimptoolbox.h               |    3 +-
 app/widgets/gimpviewrendererimagefile.c |   20 ++-
 app/widgets/widgets-types.h             |    1 +
 devel-docs/app/app-sections.txt         |    4 +
 libgimpconfig/gimpconfig.def            |    2 +
 menus/image-menu.xml.in                 |    4 +
 menus/layers-menu.xml                   |    1 +
 po-plug-ins/vi.po                       |    4 +-
 58 files changed, 1365 insertions(+), 612 deletions(-)
---