[gimp/soc-2009-dynamics: 16/16] Merge fixes

[Alexia Death <alexiade src gnome org>]

commit 2eab9f2ca498e662e8f1d3ae69f904d3fffb0ec7
Merge: ac111be... 2395543...
Author: Alexia Death <alexiadeath gmail com>
Date:   Fri Oct 9 20:38:43 2009 +0300

    Merge fixes

 app/actions/config-commands.c             |    3 +-
 app/display/gimpdisplay-handlers.c        |   56 +++++++--------------
 app/display/gimpdisplay-handlers.h        |    3 +-
 app/display/gimpdisplay.c                 |   53 +++++++++++++++-----
 app/display/gimpdisplayshell-appearance.c |    2 +-
 app/display/gimpdisplayshell-callbacks.c  |    8 ++-
 app/display/gimpdisplayshell-handlers.c   |    4 +-
 app/display/gimpdisplayshell-icon.c       |   79 +++++++++++++---------------
 app/display/gimpdisplayshell-icon.h       |    3 +-
 app/display/gimpdisplayshell-scale.c      |   24 ++++++---
 app/display/gimpdisplayshell-scroll.c     |   52 ++++++++++---------
 app/display/gimpdisplayshell-selection.c  |    2 +-
 app/display/gimpdisplayshell-selection.h  |    2 +-
 app/display/gimpdisplayshell.c            |    2 -
 app/display/gimpnavigationeditor.c        |    9 ++-
 app/tools/gimpaligntool.c                 |   23 ++++----
 app/tools/gimpblendtool.c                 |   10 ++--
 app/tools/gimpbucketfilltool.c            |   15 +++--
 app/tools/gimpcolortool.c                 |   28 ++++++----
 app/tools/gimpforegroundselecttool.c      |    7 ++-
 app/tools/gimpfreeselecttool.c            |   12 +++--
 app/tools/gimpiscissorstool.c             |   62 ++++++++++------------
 app/tools/gimpmeasuretool.c               |   23 ++++----
 app/tools/gimpmovetool.c                  |   69 ++++++++++++-------------
 app/tools/gimppainttool.c                 |   49 ++++++++---------
 app/tools/gimprectangletool.c             |   60 ++++++++++++++--------
 app/tools/gimpregionselecttool.c          |   24 ++++-----
 app/tools/gimptransformtool.c             |   48 +++++++++--------
 devel-docs/app/app-sections.txt           |    2 -
 tools/gimptool.c                          |    2 +-
 30 files changed, 384 insertions(+), 352 deletions(-)
---