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

[Hartmut Kuhse <hartmutkuhse src gnome org>]

commit 2bbd3f45670e02abe1f3946e43600cb1787babdb
Merge: 705643d 1243e1f
Author: Hartmut Kuhse <hk_priv gmx de>
Date:   Sun Sep 13 18:05:22 2015 +0200

    Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
    
    Conflicts:
        plug-ins/common/file-tiff-load.c

 app/core/core-enums.c                        |   20 +-
 app/core/core-enums.h                        |   89 +-
 app/core/gimp-user-install.c                 |   46 +-
 app/core/gimpchannel.c                       |    2 +-
 app/core/gimpcontext.c                       |   26 +-
 app/core/gimpdrawable-preview.c              |   11 +-
 app/core/gimpimage-color-profile.c           |    7 +-
 app/core/gimpimage.c                         |   38 +-
 app/core/gimpimagemap.c                      |    2 +-
 app/core/gimplayer.c                         |    2 +-
 app/core/gimpstrokeoptions.c                 |   22 +-
 app/core/gimptoolpreset.c                    |   46 +-
 app/dialogs/action-search-dialog.c           |  605 +---
 app/dialogs/authors.xsl                      |    4 +-
 app/dialogs/file-open-dialog.c               |   75 +-
 app/dialogs/file-save-dialog.c               |   99 +-
 app/display/gimpdisplayshell-profile.c       |    8 +-
 app/display/gimptoolgui.c                    |   12 +-
 app/file/file-open.c                         |   23 +-
 app/gegl/gimpapplicator.c                    |    2 +-
 app/operations/gimpcurvesconfig.c            |    2 +-
 app/operations/gimpoperationmaskcomponents.c |   12 +-
 app/paint/gimpmybrush.c                      |    2 +-
 app/paint/gimppaintcore-loops.c              |   10 +-
 app/paint/gimppaintcore.c                    |    2 +-
 app/paint/gimppaintoptions.h                 |   14 +-
 app/pdb/gimppdbcontext.c                     |    2 +-
 app/pdb/paint-tools-cmds.c                   |    2 +-
 app/tools/gimp-tools.c                       |    8 +-
 app/tools/gimpairbrushtool.c                 |    2 +-
 app/tools/gimpblendtool.c                    |   10 +-
 app/tools/gimpbucketfilltool.c               |   10 +-
 app/tools/gimpclonetool.c                    |    2 +-
 app/tools/gimpcolorpickertool.c              |   32 +-
 app/tools/gimpfliptool.c                     |    2 +-
 app/tools/gimpforegroundselecttool.c         |    3 +-
 app/tools/gimphandletransformtool.c          |    2 +-
 app/tools/gimpinktool.c                      |    8 +-
 app/tools/gimpmybrushtool.c                  |    8 +-
 app/tools/gimpoperationtool.c                |    4 +-
 app/tools/gimppaintbrushtool.c               |    2 +-
 app/tools/gimppenciltool.c                   |    2 +-
 app/tools/gimpperspectiveclonetool.c         |    2 +-
 app/tools/gimpperspectivetool.c              |    2 +-
 app/tools/gimprotatetool.c                   |    2 +-
 app/tools/gimpscaletool.c                    |    2 +-
 app/tools/gimptexttool.c                     |    6 +-
 app/tools/gimpunifiedtransformtool.c         |    2 +-
 app/tools/gimpvectortool.c                   |    4 +-
 app/tools/tool_manager.c                     |   16 +-
 app/widgets/Makefile.am                      |    2 +
 app/widgets/gimpcontrollerkeyboard.c         |  153 +-
 app/widgets/gimpcontrollerwheel.c            |  133 +-
 app/widgets/gimpdeviceinfo.h                 |   16 +-
 app/widgets/gimpdnd.c                        |   23 +-
 app/widgets/gimpdockwindow.c                 |   10 +-
 app/widgets/gimpexportdialog.c               |   63 +-
 app/widgets/gimpfiledialog.c                 |  237 +-
 app/widgets/gimpfiledialog.h                 |   40 +-
 app/widgets/gimpopendialog.c                 |    6 +-
 app/widgets/gimpoverlaydialog.c              |    2 +-
 app/widgets/gimppopup.c                      |   19 +-
 app/widgets/gimpsavedialog.c                 |  147 +-
 app/widgets/gimpsearchpopup.c                |  774 ++++
 app/widgets/gimpsearchpopup.h                |   74 +
 app/widgets/gimptoolpreseteditor.c           |   21 +-
 configure.ac                                 |   10 +
 etc/controllerrc                             |   20 +-
 libgimpcolor/gimpcolorprofile.c              |  165 +-
 libgimpwidgets/gimpruler.c                   |  178 +-
 plug-ins/common/file-tiff-load.c             |  111 +-
 plug-ins/file-psd/psd-layer-res-load.c       |   43 +-
 plug-ins/file-psd/psd-save.c                 |   29 +-
 po-libgimp/el.po                             |  152 +-
 po-libgimp/sl.po                             |  288 +-
 po-plug-ins/sl.po                            | 3369 +++++-------------
 po-script-fu/sl.po                           | 2208 +-----------
 po/POTFILES.in                               |    1 +
 po/el.po                                     |  811 +++--
 po/it.po                                     | 1753 +++++----
 po/sl.po                                     | 5029 +++++++++++++++-----------
 tools/pdbgen/pdb/paint_tools.pdb             |    2 +-
 82 files changed, 7685 insertions(+), 9520 deletions(-)
---
diff --cc plug-ins/common/file-tiff-load.c
index ef52b4d,2632722..10e01e1
--- a/plug-ins/common/file-tiff-load.c
+++ b/plug-ins/common/file-tiff-load.c
@@@ -1123,7 -1127,14 +1130,16 @@@ load_image (const gchar        *filenam
            g_free (name);
          }
  
 +      *layer_ID         = layer;
++
+       if (! base_format && image_type == GIMP_INDEXED)
+         {
+           /* can't create the palette format here, need to get it from
+            * an existing layer
+            */
+           base_format = gimp_drawable_get_format (layer);
+         }
+ 
        channel[0].ID     = layer;
        channel[0].buffer = gimp_drawable_get_buffer (layer);
        channel[0].format = base_format;