[gimp/gimp-attributes-wip: 42/42] Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip

[Hartmut Kuhse <hartmutkuhse src gnome org>]

commit 47af0fe62ebcf71a3854a74ef852e4d17479c750
Merge: b58b605 9dc1311
Author: Hartmut Kuhse <hk_priv gmx de>
Date:   Thu Oct 23 17:20:29 2014 +0200

    Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
    
    Conflicts:
        app/file/file-open.c
        app/pdb/internal-procs.c

 app/actions/file-commands.c                  |    5 +-
 app/actions/filters-actions.c                |    8 +-
 app/app.c                                    |    8 +-
 app/core/Makefile.am                         |    1 +
 app/core/gimp-tags.c                         |    3 +-
 app/core/gimp.c                              |   25 +-
 app/core/gimpbrush-load.c                    |   55 +-
 app/core/gimpbrush-private.h                 |   38 +
 app/core/gimpbrush-transform.c               |   38 +-
 app/core/gimpbrush.c                         |  203 ++--
 app/core/gimpbrush.h                         |   23 +-
 app/core/gimpbrushclipboard.c                |   40 +-
 app/core/gimpbrushgenerated-load.c           |    2 +-
 app/core/gimpbrushgenerated.c                |  150 ++-
 app/core/gimpbrushpipe-load.c                |   11 +-
 app/core/gimpbrushpipe.c                     |    5 +-
 app/core/gimpdata.c                          |    6 -
 app/core/gimpgradient-save.c                 |   10 +-
 app/core/gimpimage-private.h                 |    2 +
 app/core/gimpimage.c                         |   23 +-
 app/core/gimpimage.h                         |    4 +
 app/core/gimptagcache.c                      |    5 +-
 app/dialogs/file-save-dialog.c               |    8 +
 app/dialogs/file-save-dialog.h               |    1 +
 app/file/file-open.c                         |    4 +
 app/file/file-save.c                         |    4 +
 app/gui/themes.c                             |    4 +-
 app/operations/gimpoperationcolormode.c      |    9 +-
 app/operations/gimpoperationhuemode.c        |    9 +-
 app/operations/gimpoperationsaturationmode.c |    9 +-
 app/operations/gimpoperationvaluemode.c      |    9 +-
 app/paint/gimpbrushcore.c                    |   29 +-
 app/paint/gimpconvolve.c                     |    4 +-
 app/paint/gimppaintbrush.c                   |    2 +-
 app/pdb/brush-cmds.c                         |   36 +-
 app/pdb/brushes-cmds.c                       |   14 +-
 app/pdb/fileops-cmds.c                       |   59 +-
 app/pdb/internal-procs.c                     |    2 +-
 app/pdb/plug-in-compat-cmds.c                |  102 ++
 app/plug-in/gimpinterpreterdb.c              |    2 +
 app/sanity.c                                 |    1 +
 app/tools/gimpblendtool.c                    |  261 +++--
 app/tools/gimpblendtool.h                    |    6 +
 app/tools/gimpgegltool.c                     |    1 +
 app/tools/gimpimagemaptool-settings.c        |   10 +-
 app/tools/gimptexttool-editor.c              |   39 +
 app/tools/gimptexttool-editor.h              |    1 +
 app/tools/gimptexttool.c                     |    8 +-
 app/vectors/gimpvectors-export.c             |   11 +-
 app/widgets/gimpbrusheditor.c                |    2 +-
 app/widgets/gimpbrushselect.c                |    9 +-
 app/widgets/gimpfiledialog.c                 |   68 +-
 app/widgets/gimpfiledialog.h                 |    3 +
 app/widgets/gimpspinscale.c                  |    4 +-
 app/widgets/gimptextbuffer.c                 |   10 +-
 app/widgets/gimptooloptionseditor.c          |    7 -
 app/xcf/xcf-save.c                           |  272 ++---
 app/xcf/xcf-seek.c                           |   20 +-
 app/xcf/xcf-seek.h                           |    2 -
 app/xcf/xcf-write.c                          |   17 +
 app/xcf/xcf-write.h                          |   35 +-
 app/xcf/xcf.c                                |   32 +-
 devel-docs/compositing.txt                   |  274 ++++
 devel-docs/parasites.txt                     |   62 +-
 devel-docs/xcf.txt                           | 1868 +++++++++++++-------------
 libgimpconfig/gimpconfig-path.c              |    2 +
 libgimpconfig/gimpconfigwriter.c             |   27 +-
 libgimpmodule/gimpmoduledb.c                 |    9 +
 libgimpwidgets/gimpintstore.c                |   11 +-
 menus/image-menu.xml.in                      |    1 +
 modules/color-selector-cmyk.c                |   20 +-
 plug-ins/common/.gitignore                   |    2 -
 plug-ins/common/Makefile.am                  |   18 -
 plug-ins/common/edge-sobel.c                 |  481 -------
 plug-ins/common/file-csource.c               |    4 +-
 plug-ins/common/file-gbr.c                   |    4 +-
 plug-ins/common/file-gih.c                   |    4 +-
 plug-ins/common/file-header.c                |  234 +++-
 plug-ins/common/file-html-table.c            |  254 ++--
 plug-ins/common/file-pat.c                   |    4 +-
 plug-ins/common/file-pix.c                   |    4 +-
 plug-ins/common/file-pnm.c                   |    4 +-
 plug-ins/common/file-xbm.c                   |  185 ++-
 plug-ins/common/gimprc.common                |    1 -
 plug-ins/common/plugin-defs.pl               |    1 -
 plug-ins/file-bmp/bmp-write.c                |   28 +-
 plug-ins/file-fits/fits.c                    |   30 +-
 plug-ins/file-jpeg/jpeg.c                    |    8 +-
 po-plug-ins/POTFILES.in                      |    1 -
 tools/pdbgen/pdb/brush.pdb                   |   36 +-
 tools/pdbgen/pdb/brushes.pdb                 |   14 +-
 tools/pdbgen/pdb/fileops.pdb                 |   59 +-
 tools/pdbgen/pdb/plug_in_compat.pdb          |   61 +
 93 files changed, 3070 insertions(+), 2432 deletions(-)
---
diff --cc app/file/file-open.c
index 39c6d93,48c4d12..24e5c9f
--- a/app/file/file-open.c
+++ b/app/file/file-open.c
@@@ -139,9 -140,12 +140,12 @@@ file_open_image (Gimp                *g
                                                 G_FILE_ATTRIBUTE_ACCESS_CAN_READ))
          {
            g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
 -                               _("Premission denied"));
 +                               _("Permission denied"));
+           g_object_unref (info);
            return NULL;
          }
+ 
+       g_object_unref (info);
      }
  
    if (! g_file_is_native (file) &&