commit 82888aaa4b1e65ae23ec0ee591ebed4685df55e8
Author: Michael Natterer <mitch@gimp.org>
Date:   Fri Jun 21 23:22:49 2013 +0200

    Bump version to 2.8.6 and commit regenerated files

 NEWS             | 2 +-
 configure.ac     | 4 ++--
 docs/gimprc.5.in | 2 +-
 etc/gimprc       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

commit 20e4a9c2c35f9bac011f9eb55318719759231267
Author: Téo Mazars <teo.mazars@ensimag.fr>
Date:   Fri Jun 21 22:27:47 2013 +0200

    NEWS: add api introduction and fix typo

 NEWS | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit f7cbd9de654cd4e94d0b83315482dab2c67b1b82
Author: Téo Mazars <teo.mazars@ensimag.fr>
Date:   Fri Jun 21 20:09:18 2013 +0200

    Bug 701410 - Small artifacts appear when performing a selection

    Do not allow negative radius.
    (cherry picked from commit 7a0f8ad78ef26fa004359eb155385960baef14cf)

 app/display/gimpcanvasarc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 32c9903a58f67e1eed3cd392e59999826cbd03e2
Author: Michael Natterer <mitch@gimp.org>
Date:   Fri Jun 21 12:44:38 2013 +0200

    NEWS: updates

 NEWS | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

commit dd9f57f8de34397bf1dddd9f7e274e5af3150053
Author: Michael Natterer <mitch@gimp.org>
Date:   Fri Jun 21 12:43:29 2013 +0200

    Bug 701335 - Gimp crashing on creating huge clipboard brush

    Change the maximum size of clipboard patterns and brushes to
    1024x1024.

 app/core/gimpbrushclipboard.c   | 4 ++--
 app/core/gimppatternclipboard.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit ef649f48275dcb1850c2d0c0a60e33b244a8eb42
Author: Michael Natterer <mitch@gimp.org>
Date:   Tue Jun 18 19:05:54 2013 +0200

    Bug 701803 - Cage Transform raises segmentation fault...

    ...if layer bounds are changed.

    Call gimp_tool_control_set_preserve (tool->control, FALSE) so it is
    stopped when the drawable changes.

    (cherry picked from commit 2e8ef97c137239727e7e4f04c5020bd9c5e0d37d)

 app/tools/gimpcagetool.c | 1 +
 1 file changed, 1 insertion(+)

commit 731ee3218cbdd3e25303df0ae7e855035f64619b
Author: Marco Ciampa <ciampix@libero.it>
Date:   Fri Jun 7 22:28:27 2013 +0200

    Updated italian translation

 po-plug-ins/it.po | 470
 ++++++++++++++++++++++++++++--------------------------
 po/it.po          | 219 +++++++++++++------------
 2 files changed, 357 insertions(+), 332 deletions(-)

commit bb5f7d6525358a494870888ff7047ecf48e96a5b
Author: Stanislav Petrek <stanislav.petrek@gmail.com>
Date:   Wed Jun 5 21:27:40 2013 +0200

    Updated slovak translation

 po-tags/LINGUAS |  2 ++
 po-tags/sk.po   | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

commit 8b7ad24892309ad8dac1c48f7b876ba0a3755cbf
Author: Dimitris Spingos <dmtrs32@gmail.com>
Date:   Wed Jun 5 15:15:39 2013 +0300

    Updated Greek translation

 po/el.po | 72
 ++++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 38 insertions(+), 34 deletions(-)

commit 4b957cf404e0b9f636befd8cba4726d341852be2
Author: Michael Natterer <mitch@gimp.org>
Date:   Tue Jun 4 16:48:41 2013 +0200

    Bug 701594 - gimp-image-select-item does not recognize path
    transformations

    pdb: Need to gimp_vectors_freeze()/thaw() around stroke modifications
    so the vector's preview and the cached GimpBezierDesc are invalidated.
    (cherry picked from commit 64887fe06cb8558d24c92c218b759dce1183afaa)

 app/pdb/vectors-cmds.c       | 18 ++++++++++++++++++
 tools/pdbgen/pdb/vectors.pdb | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)

commit bc411d97c926e0824c5a77ef96416cb6365f1684
Author: Massimo Valentini <mvalentini@src.gnome.org>
Date:   Sat Jun 1 17:30:43 2013 +0200

    Bug 701120: Opening fuzzed .pnm-file causes stack buffer overflow

    increase BUFLEN to avoid appending the nul terminator '\0'
    past the end of 'buf'
    (cherry picked from commit ac98dd47511c422e170bc2aac934dd47ae4d1d3f)

 plug-ins/common/file-pnm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ba98aedcb1f03b7307e22b20487d5cc9e7665f54
Author: Massimo Valentini <mvalentini@src.gnome.org>
Date:   Sat Jun 1 17:07:24 2013 +0200

    Bug 680290: -90 degree rotation distortion of layer

    The previous code did not consider that a transformation
    described by a matrix with non integer values in the 3rd
    column or by a non affine matrix requires interpolation

    and make floating point arithmetic rounding errors
    consistent with INTERPOLATION_NONE

 app/core/gimp-transform-region.c |  9 +++++++--
 libgimpmath/gimpmatrix.c         | 38
 ++++++++++++++++++++++----------------
 2 files changed, 29 insertions(+), 18 deletions(-)

commit dd8aeeec92a64390a8ece059c62368821a172bfe
Author: Michael Natterer <mitch@gimp.org>
Date:   Wed May 29 22:23:38 2013 +0200

    Bug 700215 - Gradient name changes do not persist across sessions...

    if the gradient itself isn't changed.

    GimpData: implement GimpObject::name_changed() and set the "dirty"
    flag to TRUE. Don't set dirty in GimpData::dirty()'s default impl
    because that calls gimp_object_name_changed() anyway.
    (cherry picked from commit 5280a02ed836c496b9ece026776e5e9866a75f0e)

 app/core/gimpdata.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

commit 27dd1c167bb3c71d9b8a338f26cc78fa96e2c442
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Mon May 27 16:46:41 2013 +0200

    Updated Spanish translation

 po/es.po | 165
 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 82 insertions(+), 83 deletions(-)

commit 45644a44bad32c4294d57cc33a41ab68d9b005bf
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Sat May 25 18:29:47 2013 +0200

    Updated Polish translation

 po/pl.po | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

commit aa16efe4c96d6e39be8fea4ee6443067b90cae9b
Author: Michael Natterer <mitch@gimp.org>
Date:   Sat May 25 16:11:15 2013 +0200

    Bug 578695 - gimptool-2.0 does not respect $DESTDIR

    Don't mention DESTDIR in the gimptool manual page.
    (cherry picked from commit 1a107722eaeb5586c017389a853f152506e784c0)

 docs/gimptool.1.in | 3 ---
 1 file changed, 3 deletions(-)

commit a57ad1a9971ec544c7f934513252a7bb921f47f4
Author: Michael Natterer <mitch@gimp.org>
Date:   Sat May 25 11:21:15 2013 +0200

    Bug 700707 - Missing time data in tool-options/*.settings files

    strftime() the time using %H:%M:%S which should work on
    all platforms, unlike %T.
    (cherry picked from commit 51181648f7aa48cb4de9b31b784654f3b057bab8)

 app/core/gimpimagemapconfig.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c947260d2db0d761668dd7b16f195f9ed3d458c6
Author: Jehan <jehan@girinstud.io>
Date:   Wed Dec 12 15:14:42 2012 +0900

    actions: dock-close had a default shortcut colliding with view-close.

    When the accelerator is NULL, gtk_action_group_add_action_with_accel()
    would use the default one for the stock icon used. And GTK_STOCK_CLOSE
    default accelerator is "<Primary>w" which we already use for
    view-close.
    We must use empty string when we want no default accelerator.
    (cherry picked from commit 28669b07d193515ee5fc4bc35b154909a9d35169)

 app/actions/dock-actions.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6cda75205a1c1d444efbe1e43ad85f68565f7912
Author: Michael Natterer <mitch@gimp.org>
Date:   Fri Dec 14 09:54:17 2012 +0100

    app: add the "view" action group to all docks

    so all image and view related shortcuts work globally now.
    (cherry picked from commit b234f5f879f1aeec704904f0c85562290b283b46)

 app/menus/menus.c | 2 ++
 1 file changed, 2 insertions(+)

commit ae8749a9a7cfcdf294873bada2c0e664ec0914b5
Author: Michael Natterer <mitch@gimp.org>
Date:   Wed Dec 12 23:26:46 2012 +0100

    app: can't call view_actions_setup() from file_actions_setup()

    This breaks Ctrl+W from docks to close the active display, we'll
    need another solution for this.
    (cherry picked from commit 0ff07fa385f401a7f9758d724a06304840f2f8c0)

 app/actions/file-actions.c | 4 ----
 1 file changed, 4 deletions(-)

commit 1380b0696cbae20cbe04742da6ab3926a67674cb
Author: Jehan <jehan@girinstud.io>
Date:   Wed Dec 12 16:05:39 2012 +0900

    actions: forgot an include which was triggering an "implicit
    declaration" warning.
    (cherry picked from commit 8a935f05a07a89279538f638d5d43f165d34a6e6)

 app/actions/file-actions.c | 1 +
 1 file changed, 1 insertion(+)

commit 22d4cd02fc6b56e342d4645921575b7f3f462a90
Author: Jehan <jehan@girinstud.io>
Date:   Mon Nov 26 00:18:00 2012 +0900

    Bug 685559 - view-close action modified to close only an image view.

    view-close was closing also toolbox docks if they had the focus. Now
    this action will close only the current active image view (if any),
    whatever the window which has actual focus.
    Additionally all other view actions are available on dock focus.
    (cherry picked from commit 2ad8634c06814219728bb10fbe59a63afc42fdea)

 app/actions/file-actions.c  |  3 +++
 app/actions/view-actions.c  |  6 +++---
 app/actions/view-commands.c | 20 ++++++++++++++++++++
 app/actions/view-commands.h |  2 ++
 4 files changed, 28 insertions(+), 3 deletions(-)

commit 5207a4fcd8fbc97287ba3292965d5e9c81718670
Author: Michael Natterer <mitch@gimp.org>
Date:   Fri May 24 09:23:52 2013 +0200

    Bug 700675 - Missing menu locations for registration and other menu...

    Remove the legacy <Toolbox>, <Load> and <Save> from the error message
    that states which plug-in menu paths are valid, and add the missing
    <Fonts> and <ToolPresets>. Also actually handle <ToolPresets>, this
    was apparently forgotten.
    (cherry picked from commit 564e6010fdf2d68746a7551cbf1084b19ec0177e)

 app/plug-in/gimppluginprocedure.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

commit b47f4eb777133a706ffb24b8b6726bffe5d9eeca
Author: Dov Grobgeld <dov.grobgeld@gmail.com>
Date:   Sun May 19 23:53:33 2013 +0300

    Updated dicom plugin to solve problems with import into external
    programs (e.g. OsiriX)

 plug-ins/common/file-dicom.c | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

commit 40726a341d00e4874b1ae24c842a7584a4a087ee
Author: Michael Natterer <mitch@gimp.org>
Date:   Sun May 19 21:42:50 2013 +0200

    Bug 700653 - Duplicate "(time ...)" values in
    gimp-curves-tool.settings

    and gimp-levels-tool.settings

    Serialize the channel properties manually (not using
    gimp_config_serialize_properties()), so the parent class' "time"
    property doesn't end up in the config file once per channel.
    (cherry picked from commit 6781439fdc058754a0477dd1fc7b1d654fb90bf7)

 app/gegl/gimpcurvesconfig.c |  9 ++++++++-
 app/gegl/gimplevelsconfig.c | 13 ++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

commit 7ee3235bd03e7109d9ae4f856efb0e1f2683ef6c
Author: Michael Natterer <mitch@gimp.org>
Date:   Fri May 17 14:41:11 2013 +0200

    Bug 688537 - Toolbox occasionally has spaces or tool names after
    the icons

    Explicitly set the toolbox' style to GTK_TOOLBAR_ICONS to protect it
    from user toolbar preferences.
    (cherry picked from commit e1bfc0a3623ea6c1a448d531f0ccab9201a9bd52)

 app/widgets/gimptoolpalette.c | 1 +
 1 file changed, 1 insertion(+)

commit 7b42013baef4a24a6242f9fa1be4f84daff0833b
Author: Michael Natterer <mitch@gimp.org>
Date:   Tue May 14 02:00:20 2013 +0200

    Bug 695687 - GimpSpinScale's label is unreadable on dark themes

    Draw the label like GtkEntry draws its text: with different colors
    inside and outside the progress bar.
    (cherry picked from commit ce8ae69440d17d091fac560a4c3ad8821b61fbef)

 app/widgets/gimpspinscale.c | 58
 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 56 insertions(+), 2 deletions(-)

commit ecb06953ef22e4532b9a449d9d0694452fc3bba9
Author: Michael Henning <drawoc@darkrefraction.com>
Date:   Sun May 12 19:36:27 2013 -0400

    tests: fix running make check with both parallel make and xvfb

    Before, the xvfbs would all try to be on DISPLAY=:99, which
    caused issues.
    (cherry picked from commit 2df4fa2d6f3c75b6e88589dc356f5682ca6f9624)

 app/tests/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit eb28d90866c8f1dd2955d4b3fd0c0815da1e7f96
Author: Michael Natterer <mitch@gimp.org>
Date:   Mon May 13 00:00:57 2013 +0200

    app: change serialization of the right docks width in SWM (again)

    Use "right-docks-width" and always a positive value instead of
    "right-docks-position" (as opponsed to "left-docks-width", that
    distinction is a GtkPaned implementation detail and does not belong
    into a config file). Parse all old values too. Also fix a glitch in
    the deserialization code which might fix bug #700147.
    (cherry picked from commit a078ca3f5fb2a43191dd2d4de22aefc493edf1ba)

 app/display/gimpimagewindow.c                      | 78
 +++++++++++++---------
 app/tests/gimpdir/sessionrc-2-8-single-window      |  2 +-
 app/tests/gimpdir/sessionrc-expected-single-window |  2 +-
 3 files changed, 47 insertions(+), 35 deletions(-)

commit a98b6581e6c2add3d6cb895d7b71d581c236b361
Author: Jehan <jehan@girinstud.io>
Date:   Mon Apr 29 07:03:20 2013 +0900

    Bug 699185 - when moving the pointer fast out of guide scope, do
    not keep it highlighted.

    When a drawing timeout happens too close from the previous drawing,
    we don't want to cancel
    the timeout function (FALSE), but simply retry later (TRUE).

    In our case in particular, if you move your pointer very fast over
    a guide, the highlighting
    drawing was happening less than MINIMUM_DRAW_INTERVAL before the
    un-highlighting drawing,
    hence canceling the later, which caused the drawing bug.
    (cherry picked from commit 3496e178ef63712275dcbbfe559d1a2f42a8141d)

 app/tools/gimpdrawtool.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 714c232eee4d966f782d8e882cb5645a8feed0f4
Author: Jehan <jehan@girinstud.io>
Date:   Sat May 11 09:04:33 2013 +0900

    Bug 664584: WM DELETE event in single window mode is synonym to
    file-quit.

    In multi-window mode, closing an image window is only meant to close
    the current image (unless this is the last empty window).
    In single window mode though, you are meaning to close the whole
    program.

    Thanks to Niels Martignène for the original patch.
    (cherry picked from commit 6008c2019bd2824a272455da59d6212fd3695533)

 app/display/gimpimagewindow.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

commit 7205a25112982ad361795006cccd9022b75e2d6a
Author: Michael Natterer <mitch@gimp.org>
Date:   Sat May 11 20:44:04 2013 +0200

    app: fix include in test-core, re-closes bug 622054

 app/tests/test-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9625dd92b413b15b146d294434a4d574fcac6b1e
Author: Sven Claussner <sclaussner@src.gnome.org>
Date:   Thu May 9 02:35:34 2013 +0200

    Bug 699886 - Missing <Dynamics> menu location for script/plugin

    Add the missing <Dynamics> menu location for script/plugin
    registration.
	modified:   app/plug-in/gimppluginprocedure.c

 app/plug-in/gimppluginprocedure.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 9937a0a99b2b721859b6c1d35fdad1d0230d965b
Author: Massimo Valentini <mvalentini@src.gnome.org>
Date:	Sat May 4 18:19:11 2013 +0200

    app: don't crash when adjusting quality during an export to jpeg

    with preview enabled
    (cherry picked from commit 8940b25c6dd6e9a280f93db4bad95e7447975b2c)

 app/display/gimpcanvaslayerboundary.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit a8aef360b9cb7ea0e32deed57d0bba01fe6fc0b2
Author: Michael Natterer <mitch@gimp.org>
Date:	Thu May 2 20:05:35 2013 +0200

    app: fix saving/loading of .xcf.gz and other compressed XCFs

    Make file_utils_uri_get_ext() public and use it instead of
    strrchr(uri, '.'). Also add "xz" to the list of matched special cases,
    and some cleanup.
    (partial cherry pick from commit
    e99c0045a2ad01d9712d588ea0aa1995791c67a7)

 app/file/file-procedure.c | 14 ++++++++------
 app/file/file-utils.c	   | 22 ++++++++++------------
 app/file/file-utils.h	   | 41 +++++++++++++++++++++--------------------
 3 files changed, 39 insertions(+), 38 deletions(-)

commit e083b6790d789b4081624ea2bf564e4c32716320
Author: Jehan <jehan@girinstud.io>
Date:	Mon Apr 29 22:17:18 2013 +0900

    Revert "app: GimpContainerEntry's text is red when not a valid item."

    Somehow breaks the completion popup.

    This reverts commit 202c8ed76283a8550dd0c1c15caae6049b1aa07a.

 app/widgets/gimpcontainerentry.c | 33 ++-------------------------------
 1 file changed, 2 insertions(+), 31 deletions(-)

commit 202c8ed76283a8550dd0c1c15caae6049b1aa07a
Author: Jehan <jehan@girinstud.io>
Date:	Sat Apr 27 11:26:04 2013 +0900

    app: GimpContainerEntry's text is red when not a valid item.

    If the selected item in a GimpContainerEntry is invalid, or else
    when the entry
    is being updated, the text shows in red.
    (cherry picked from commit 64fe3af1a913bb61953b6faf727f3cf9700167b7)

 app/widgets/gimpcontainerentry.c | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

commit e1645fe427cbe86522041ec31076392fca3436a0
Author: Michael Natterer <mitch@gimp.org>
Date:	Sun Apr 28 15:28:18 2013 +0200

    Bug 699100 - Move tool: space-bar inhibits function of Move tool

    Don't try to switch to the move tool if the move tool is already
    active.
    Also never bail out early from gimp_display_shell_space_pressed()
    so we
    don't end up in an inconsistent state.
    (cherry picked from commit 87584d2f82f3c43db687846fa89f59c862905918)

 app/display/gimpdisplayshell-tool-events.c | 62
 +++++++++++++++---------------
 1 file changed, 32 insertions(+), 30 deletions(-)

commit 4d56fbc16b0a1a748c05aa7cca2aa6b80b0a4b92
Author: Rafael Ferreira <rafael.f.f1@gmail.com>
Date:	Sun Apr 28 09:10:30 2013 -0300

    Updated Brazilian Portuguese translation

 po/pt_BR.po | 92
 +++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 50 insertions(+), 42 deletions(-)

commit 54b28a5b6015cc54793695035ff2a0112b76de5b
Author: Sven Claussner <scl.gplus@gmail.com>
Date:	Mon Apr 8 21:48:40 2013 +0200

    Bug 692956 - Bring back 'Color from gradient' option to Paint tools

    This patch adds a Dynamic for the 'Color From Gradient' option
    and three Paint tool presets (Airbrush, Paintbrush, Pencil), which
    use this preset.

	new file:   data/dynamics/Color-From-Gradient.gdyn
	new file:
	data/tool-presets/Paint/Airbrush-Color-From-Gradient.gtp
	new file:
	data/tool-presets/Paint/Paintbrush-Color-From-Gradient.gtp
	new file:   data/tool-presets/Paint/Pencil-Color-From-Gradient.gtp
	modified:   data/dynamics/Makefile.am
	modified:   data/tool-presets/Paint/Makefile.am
	modified:   AUTHORS
	modified:   authors.xml

 AUTHORS					    |  2 +
 authors.xml					    |  1 +
 data/dynamics/Color-From-Gradient.gdyn		    | 93
 ++++++++++++++++++++++
 data/dynamics/Makefile.am			    |  1 +
 .../Paint/Airbrush-Color-From-Gradient.gtp	    | 24 ++++++
 data/tool-presets/Paint/Makefile.am		    |  3 +
 .../Paint/Paintbrush-Color-From-Gradient.gtp	    | 24 ++++++
 .../Paint/Pencil-Color-From-Gradient.gtp	    | 23 ++++++
 8 files changed, 171 insertions(+)

commit 15c79a22ca5cca32c51cd07202bcf3876289ba71
Author: Enrico Nicoletto <liverig@gmail.com>
Date:	Wed Apr 24 00:40:30 2013 -0300

    Updated Brazilian Portuguese translation

 po-plug-ins/pt_BR.po | 359
 ++++++++++++++++++++++++++-------------------------
 1 file changed, 185 insertions(+), 174 deletions(-)

commit 9069bd8d79248b9fa778dcc5149d99aff1b914ad
Author: Michael Natterer <mitch@gimp.org>
Date:	Tue Apr 23 21:00:17 2013 +0200

    Bug 688348 - Layer tab and Images tab: not updated on dropping...

    ...one image onto another

    gimp_dock_window_display_changed(): make sure the "auto-follow-active"
    logic works both ways: when the active image or display is changed in
    a dockable, update the global context. Fixes multi-window mode.

    gimp_context_real_set_display(): make sure a context's display and
    image are always in a consistent state and never have a display that
    is not display->image: when display is the same as context->display,
    check that the context's image matches display->image, so that after a
    gimp_context_set_display(), the context is consistent in all
    cases. Fixes single-window mode.
    (cherry picked from commit bacc9c9635776c00ac5603d6d56387073e8a933d)

 app/core/gimpcontext.c       | 20 +++++++++++++++++++-
 app/widgets/gimpdockwindow.c | 18 ++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

commit 4cd97c8cf7fdd9b637edde64a535d4e646e2bc86
Author: Michael Natterer <mitch@gimp.org>
Date:	Tue Apr 23 10:26:23 2013 +0200

    app: make gimp_dock_window_constructed() more readable

    by adding a local "factory_context" variable instead of calling
    gimp_dialog_factory_get_context (dock_window->p->dialog_factory)
    multiple times.
    (cherry picked from commit 076f375e78886ed3bdf253fec43378e19f1a1c41)

    This is not a bugfix, just to seamlessly pick the next commit...

 app/widgets/gimpdockwindow.c | 40
 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

commit 900cc4108bfa0953bc0c5c2600ae154a0ab593b7
Author: Mikael Magnusson <mikachu@src.gnome.org>
Date:	Tue Apr 23 17:02:45 2013 +0200

    app: forgot to invert the matrix in corrective mode when transforming
    the selection.

 app/tools/gimptransformtool.c | 3 +++
 1 file changed, 3 insertions(+)

commit 380437e65e5a43ffc916706fd7711e09da5d4ee0
Author: Michael Natterer <mitch@gimp.org>
Date:	Mon Nov 5 19:56:40 2012 +0100

    app: make GimpContainerEntry robust against reordered parent class
    destruction

    So it will not warn on GTK+ 3.x. One less patch to do in gtk3-port.
    (cherry picked from commit e746fa51da1a750a6c8a346911f506082cc93e4a)

 app/widgets/gimpcontainerentry.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

commit 019eb591116740b0a4587f0cac4daf24c8b1cb58
Author: Michael Natterer <mitch@gimp.org>
Date:	Sun Apr 21 20:00:28 2013 +0200

    Bug 697530 - zoom during mouse-pan focuses on wrong location

    Block all key events while middle-mouse panning, to prevent
    accelerators from being invoked.
    (cherry picked from commit 3643551280887251cd20702275398f7b3169a309)

 app/display/gimpdisplayshell-tool-events.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ca520161166fd9f11465eb8c86c46ffb01ba8856
Author: Massimo Valentini <mvalentini@src.gnome.org>
Date:	Sun Apr 21 17:47:01 2013 +0200

    Bug 698426: ALL text disappears when changing font ...

    of selected text in on-canvas editor

    It is necessary to escape font names containing '&'

 app/widgets/gimptextbuffer-serialize.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 839734463a96392ad1e2ce26c9c29a8d2fdf1b6e
Author: Michael Natterer <mitch@gimp.org>
Date:	Sun Apr 21 17:51:08 2013 +0200

    Bug 694417 - GIMP Segmentation Faults (Segfault, Crash) after
    Changing Color...

    Don't pass a NULL pointer to gimp_text_buffer_get_font_tag() because
    it is dereferenced in a call to strcmp().

    gimp_context_get_font_name() returns NULL when the selected text
    includes spans with different fonts. Add the same special handling for
    spans with inconsistent sizes too, and add comments that we should
    have the same for the color.

    Original patch from Massimo Valentini.
    (cherry picked from commit 804313bbecf92e099952ef0b9e12824d57100ccd)

 app/widgets/gimptextstyleeditor.c | 50
 +++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 18 deletions(-)

commit 4055ccbe9cb3053c2c8bedabaa31df982fa1b752
Author: Michael Henning <drawoc@darkrefraction.com>
Date:	Sat Apr 20 22:13:05 2013 -0400

    app: fix broken build on windows due to not #including windows.h

    This was broken after 7392679be90eecb54cce6dfa151602a314a31e35
    The corresponding commit on master did not break the build because
    windows.h is already included there.

 app/core/gimp-utils.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 37757e4e8dff76715a99394380c8809c5c3f0970
Author: Nils Philippsen <nils@redhat.com>
Date:	Tue Apr 16 11:16:41 2013 +0200

    app: let the tag popup own its tag objects

    This should fix crashes in which tag objects got accessed after they
    were disposed, because they still were stored with the popup object.
    (cherry picked from commit b109e0580650b4b49b6f00b15fec4bcd330fb045)

 app/widgets/gimptagpopup.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit e768d4fa8d7de607ead79ed3390b7b884452bbcc
Author: Mukund Sivaraman <muks@banu.com>
Date:	Thu Apr 11 20:59:22 2013 +0530

    imagemap: Rebuild parsers (after .y update)

 plug-ins/imagemap/imap_cern_lex.c   |	63 ++-
 plug-ins/imagemap/imap_cern_parse.c | 608 +++++++++++++++-------------
 plug-ins/imagemap/imap_cern_parse.h |	39 +-
 plug-ins/imagemap/imap_csim_lex.c   |	63 ++-
 plug-ins/imagemap/imap_csim_parse.c | 777
 ++++++++++++++++++++----------------
 plug-ins/imagemap/imap_csim_parse.h |	41 +-
 plug-ins/imagemap/imap_ncsa_lex.c   |	63 ++-
 plug-ins/imagemap/imap_ncsa_parse.c | 611 +++++++++++++++-------------
 plug-ins/imagemap/imap_ncsa_parse.h |	39 +-
 9 files changed, 1246 insertions(+), 1058 deletions(-)

commit 03dfb95f13884137a3b9379c6f84c68cebda166e
Author: Mukund Sivaraman <muks@banu.com>
Date:	Thu Apr 11 14:11:00 2013 +0530

    imagemap: Don't use strcpy() in unescape_text() (#649172)

    strcpy() doesn't like overlapping strings and this causes other
    failures
    in this unescaping code.

    Also cleanup the code to follow our coding style.
    (cherry picked from commit db95e20b0bc09aa81e8c8c706a0a6ca8e4d38824)

 plug-ins/imagemap/imap_csim.y | 51
 ++++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 20 deletions(-)

commit 95a9172bd5aa96f9b3e07091156c38f7d0fb6617
Author: Martin Husemann <martin@NetBSD.ORG>
Date:	Thu Apr 11 14:09:50 2013 +0530

    imagemap: Unescape simple xml encodings when reading csim format
    image maps (GB#649172)
    (cherry picked from commit bc8a6123c7278a14ea2b6f40b8aa640adb790da0)

 plug-ins/imagemap/imap_csim.y | 50
 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 7 deletions(-)

commit 3aaa69642e218cb495a2cc6691368a901df26e18
Author: Michael Natterer <mitch@gimp.org>
Date:	Wed Apr 10 19:28:49 2013 +0200

    app: allow to pass NULL to gimp_window_set_primary_focus_widget()
    (cherry picked from commit 754e4eb91946ebb70ff1f6e81e8e7a694d81573d)

 app/widgets/gimpwindow.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 53d083c844f0ad81f88d6e64493160c319e519ef
Author: Michael Natterer <mitch@gimp.org>
Date:	Tue Apr 9 15:41:20 2013 +0200

    Bug 675549 - image region does not have focus unless clicked on

    We cannot simply randomy move the focus from e.g. a text entry back to
    the canvas. Instead introduce global handling of "Escape" and a
    "primary_focus_widget" that is always set the the image window's
    active canvas. When Escape is pressed, move the focus to that primary
    focus widget, or beep if it is already there. Text widgets still get
    the key events before that logic and can consume the Escape.
    (cherry picked from commit 5880685472d78cb07c0339b221e6b83e92179310)

 app/display/gimpimagewindow.c |  3 +++
 app/widgets/gimpwindow.c      | 60
 ++++++++++++++++++++++++++++++++++++++++---
 app/widgets/gimpwindow.h      | 10 ++++++--
 3 files changed, 68 insertions(+), 5 deletions(-)

commit 38d8312fdebee98a20b33807b09d8a832a4b97b7
Author: Téo Mazars <teo.mazars@ensimag.fr>
Date:	Sun Apr 7 22:29:56 2013 +0200

    Bug 695418 - Unsharp mask crashes for large radii

    Make sure we are working on the image range
    (cherry picked from commit 35cc644765c553b6feb24bd56133b6f9f74ed5e4)

 plug-ins/common/unsharp-mask.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 5f4449e956069c5e2de960a8c8597139d0e2f6cc
Author: Милош Поповић <gpopac@gmail.com>
Date:	Mon Apr 8 17:02:24 2013 +0200

    Updated Serbian Translation

 po-tips/sr.po	     |	354 +++---
 po-tips/sr@latin.po |	354 +++---
 po/sr.po	     | 3359
 ++++++++++++++++++++++++++++++---------------------
 po/sr@latin.po      | 3359
 ++++++++++++++++++++++++++++++---------------------
 4 files changed, 4336 insertions(+), 3090 deletions(-)

commit 6d4fd657ff26e562db346ed69495db9ee11499b1
Author: Dimitris Spingos <dmtrs32@gmail.com>
Date:	Mon Apr 8 10:32:33 2013 +0300

    Updated Greek translation

 po-plug-ins/el.po | 73
 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 39 insertions(+), 34 deletions(-)

commit 0c060b3296be6854446c48e56c8b5d950f13ddbc
Author: Martin Srebotnjak <miles@filmsi.net>
Date:	Thu Apr 4 21:04:03 2013 +0200

    Updated Slovenian translation

 po-plug-ins/sl.po | 227
 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 116 insertions(+), 111 deletions(-)

commit fb38e0a5f9e2881edad43a23769f87913e18d3f2
Author: Pedro Gimeno Fortea <pggit-2e67@personal.formauri.es>
Date:	Tue Apr 2 17:23:40 2013 +0200

    Bug 696958 - In-image preview in Transform tools is off by one
    screen pixel

    Simplify the loops without any significant loss in performance,
    separating
    the positive and negative X directions to treat each correctly. Fixes
    this
    bug. (cherry-picked from commit
    faf221781126fa82cbeecc99569e02233ffbaef1)

 app/display/gimpcanvastransformpreview.c | 73
 +++++++++-----------------------
 1 file changed, 19 insertions(+), 54 deletions(-)

commit e12243e94e8727d576dac386444bf3218789b1b4
Author: Pedro Gimeno Fortea <pggit-2e67@personal.formauri.es>
Date:	Tue Apr 2 16:55:09 2013 +0200

    app: Two mostly cosmetic changes

    Use a temporary that is less expensive to refer to. Don't loop more
    than necessary when comparing pairs. (Cherry-picked from master's
    commit c83e7790bf13d207e9cb0bba8b9de1fb6b950b0f)

 app/display/gimpcanvastransformpreview.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

commit bc1aad3c239e4c7cd860c36b030f8457cdf2b639
Author: Téo Mazars <teo.mazars@ensimag.fr>
Date:	Thu Feb 21 18:31:12 2013 +0100

    Bug 683713 - Align visible layers does not work when layers ...

    This is a complete rework of the plug-in, the behaviour remains
    unchanged.

    The implementation spreads all visible layers into one contiguous
    array, then applies a simplified rework of the legacy algorithm.
    (cherry picked from commit 65d34b7b27ccc92e49629c9b3f40528087296900)

 plug-ins/common/align-layers.c | 395
 ++++++++++++++++++++++++++++++++---------
 1 file changed, 311 insertions(+), 84 deletions(-)

commit 7392679be90eecb54cce6dfa151602a314a31e35
Author: Petr Kubiznak <kubiznak.petr@gmail.com>
Date:	Sun Mar 17 21:33:17 2013 +0100

    Bug 593167 - Support Windows in gimp_get_default_unit()

    Function gimp_get_default_unit ported for Windows using standard
    GetLocaleInfo() function (from windows.h).
    (cherry picked from commit 194ef70d7446a627c274135c54498d3092c9b356)

 app/core/gimp-utils.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

commit 234e269bc7cd7882ceddfa66b6caa05aac0d9c4a
Author: Michael Natterer <mitch@gimp.org>
Date:	Wed Mar 27 22:56:01 2013 +0100

    tools: increase buffer size in gimptool from 1000 to 4096
    (cherry picked from commit fd34fee7f5e0a1b0c56d70fd049707fe67ed65f9)

 tools/gimptool.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e3a524e435ba36693042e4054a03e8267b943025
Author: Michael Natterer <mitch@gimp.org>
Date:	Wed Mar 27 22:28:29 2013 +0100

    Bug 622054 - Levels Tool gray point picker causes lockup

    Bail out in gimp_levels_config_adjust_by_colors() if pure
    back or white was picked as gray (gamma).
    (cherry picked from commit c865d8f1416a6917f120f7aaaa99b9aed7b0f280)

 app/gegl/gimplevelsconfig.c | 23 +++++++++++++++++------
 app/tests/test-core.c	     | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 6 deletions(-)

commit 333b05be02a39ca3b15ab1318c049fd29fc9d3ef
Author: Téo Mazars <teo.mazars@ensimag.fr>
Date:	Sun Feb 24 16:48:33 2013 +0100

    Bug 656522 - Scaled Image Rounds Up To Nearest Pixel

    Prevent gimp_coordinates_callback () to be called recursively
    when x and y are chained.

    One call puts all values in a consistent state, a recusive call can
    cause side effects (calculations with rounded values)
    (cherry picked from commit 24a2113170fbc3c81590d873be40d6544ab95377)

 libgimpwidgets/gimpwidgets.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit c1502c6ff7c250f2af589127e7dcecf8279068ef
Author: Michael Natterer <mitch@gimp.org>
Date:	Tue Mar 26 23:55:40 2013 +0100

    Bug 692668 - Browse For Patterns

    Increase the max size of the clipboard brush and pattern to 2048x2048
    pixels. Still arbitrary but much better.
    (cherry picked from commit 8bc4f008e7469ba89440b663c5d2cca05a91028d)

 app/core/gimpbrushclipboard.c	 | 4 ++--
 app/core/gimppatternclipboard.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 9594668e86a61c116a17bfcf59dd8968df97e72d
Author: Michael Natterer <mitch@gimp.org>
Date:	Tue Mar 26 23:37:16 2013 +0100

    Bug 692939 - Zealous crop does nothing

    Treat completely transparent pixels as equal, ignoring the hidden
    color information.
    (cherry picked from commit 720d8fa77a8b71f513d1dc770cda9780b3bd231c)

 plug-ins/common/crop-zealous.c | 76
 +++++++++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 31 deletions(-)

commit b4ab8184b9fdf41a5d6679f969325b8940216225
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Mar 25 12:27:51 2013 +0100

    Updated Spanish translation

 po-plug-ins/es.po | 191
 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 98 insertions(+), 93 deletions(-)

commit 829113a34870b31a0b66c57223d37571fb497657
Author: Christian Kirbach <Christian.Kirbach@googlemail.com>
Date:	Mon Mar 25 11:03:32 2013 +0100

    Updated German translation

 po/de.po | 2342
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 1374 insertions(+), 968 deletions(-)

commit fc7bdc3dfcdf99cf3c356c0d28c7e40b53367eb8
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Sun Mar 24 20:46:51 2013 +0100

    Updated Polish translation

 po-plug-ins/pl.po | 243
 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 124 insertions(+), 119 deletions(-)

commit 1e9ef3ac4cde826a64a9bfe084b6b709b845ec67
Author: Michael Natterer <mitch@gimp.org>
Date:	Sun Mar 24 18:41:57 2013 +0100

    Bug 694585 - Export directly to remote ftp completes but reports
    failed

    Fix handling of save errors in file-uri in two ways:

    - don't try to check if saving to a directly mounted file succeeded,
      the mount (e.g. via FUSE) might allow writing, but not stat()ing.
      Instead, rely on the return value of gimp_file_save().

