[gimp/gimp-attributes-wip: 376/377] merge to master to be up to date



commit a652f633210a090b41e1c408951ab3d73ef88d52
Merge: 15a838a a13460b
Author: Hartmut Kuhse <hk_priv gmx de>
Date:   Wed Nov 2 17:39:35 2016 +0100

    merge to master to be up to date
    
    # Conflicts:
    #   libgimp/gimp.def
    #   libgimp/gimpitem_pdb.h

 INSTALL.in                                         |    1 -
 app/actions/Makefile.am                            |    6 +
 app/actions/channels-actions.c                     |  102 +
 app/actions/channels-commands.c                    |  381 +-
 app/actions/channels-commands.h                    |   13 +
 app/actions/context-actions.c                      |    6 +-
 app/actions/cursor-info-commands.c                 |    9 -
 app/actions/data-commands.c                        |   11 +-
 app/actions/dialogs-actions.c                      |    4 +-
 app/actions/dock-commands.c                        |    2 +
 app/actions/dockable-commands.c                    |    3 +
 app/actions/drawable-commands.c                    |   42 +-
 app/actions/edit-actions.c                         |   14 +-
 app/actions/edit-commands.c                        |   11 -
 app/actions/error-console-commands.c               |   72 +-
 app/actions/file-actions.c                         |   10 +-
 app/actions/file-commands.c                        |    3 -
 app/actions/fonts-commands.c                       |    4 -
 app/actions/gradients-commands.c                   |   87 +-
 app/actions/image-commands.c                       |  786 +-
 app/actions/items-actions.c                        |  142 +
 app/actions/items-actions.h                        |   29 +
 app/actions/items-commands.c                       |  423 +
 app/actions/items-commands.h                       |   68 +
 app/actions/layers-actions.c                       |  113 +-
 app/actions/layers-commands.c                      |  748 +-
 app/actions/layers-commands.h                      |   12 +
 app/actions/palettes-actions.c                     |   15 +-
 app/actions/palettes-commands.c                    |  103 +-
 app/actions/plug-in-commands.c                     |   49 +-
 app/actions/quick-mask-commands.c                  |  120 +-
 app/actions/sample-points-commands.c               |    7 -
 app/actions/select-commands.c                      |  157 +-
 app/actions/templates-commands.c                   |  133 +-
 app/actions/text-editor-commands.c                 |   59 +-
 app/actions/text-tool-commands.c                   |   76 +-
 app/actions/tool-preset-editor-actions.c           |   22 +-
 app/actions/tool-preset-editor-commands.c          |   88 +
 app/actions/tool-preset-editor-commands.h          |   28 +
 app/actions/tool-presets-actions.c                 |    8 +
 app/actions/tool-presets-commands.c                |   44 +-
 app/actions/tool-presets-commands.h                |    2 +
 app/actions/vectors-actions.c                      |  127 +-
 app/actions/vectors-commands.c                     |  724 +-
 app/actions/vectors-commands.h                     |    4 +
 app/actions/view-actions.c                         |    7 +
 app/actions/view-commands.c                        |  156 +-
 app/actions/view-commands.h                        |    2 +
 app/actions/windows-commands.c                     |   38 +-
 app/config/gimpdialogconfig.c                      |  408 +
 app/config/gimpdialogconfig.h                      |   69 +-
 app/config/gimpguiconfig.c                         |   14 +
 app/config/gimpguiconfig.h                         |    1 +
 app/config/gimppluginconfig.c                      |    1 +
 app/config/gimprc-blurbs.h                         |   82 +
 app/config/gimprc-serialize.c                      |    1 +
 app/config/gimprc.c                                |    1 +
 app/core/core-enums.c                              |    2 +
 app/core/core-enums.h                              |    1 +
 app/core/gimp-edit.c                               |  106 +-
 app/core/gimp-utils.c                              |    4 +
 app/core/gimp.c                                    |    9 +-
 app/core/gimpbrush.c                               |    3 +-
 app/core/gimpbrushgenerated.c                      |   65 +-
 app/core/gimpchannel.c                             |   30 +-
 app/core/gimpcontext.c                             |   28 +-
 app/core/gimpdrawable-fill.c                       |   73 +-
 app/core/gimpdrawable-fill.h                       |   10 +-
 app/core/gimpdrawable.c                            |   49 +-
 app/core/gimpdrawable.h                            |    3 +-
 app/core/gimpfilloptions.c                         |   46 +-
 app/core/gimpgrouplayer.c                          |   41 +-
 app/core/gimpgrouplayerundo.c                      |    8 +-
 app/core/gimpgrouplayerundo.h                      |    1 +
 app/core/gimpimage-convert-indexed.c               |   92 +-
 app/core/gimpimage-convert-indexed.h               |   10 +-
 app/core/gimpimage-convert-precision.c             |    1 +
 app/core/gimpimage-convert-type.c                  |    4 +-
 app/core/gimpimage-crop.c                          |   27 +-
 app/core/gimpimage-crop.h                          |   15 +-
 app/core/gimpimage-resize.c                        |   12 +-
 app/core/gimpimage-resize.h                        |    1 +
 app/core/gimpimage-undo-push.c                     |   16 +
 app/core/gimpimage-undo-push.h                     |    3 +
 app/core/gimpitem.c                                |  107 +-
 app/core/gimpitem.h                                |    8 +
 app/core/gimpitempropundo.c                        |   16 +-
 app/core/gimpitempropundo.h                        |    1 +
 app/core/gimplayer.c                               |   47 +-
 app/core/gimplayer.h                               |    3 +-
 app/core/gimplayermask.c                           |    9 +-
 app/core/gimppickable-auto-shrink.c                |   54 +-
 app/core/gimppickable-auto-shrink.h                |   16 +-
 app/core/gimpselection.c                           |   26 +-
 app/core/gimptaggedcontainer.c                     |   13 +-
 app/core/gimptemplate.c                            |    6 +
 app/dialogs/Makefile.am                            |    2 +
 app/dialogs/channel-options-dialog.c               |  279 +-
 app/dialogs/channel-options-dialog.h               |   65 +-
 app/dialogs/color-profile-dialog.c                 |  490 +-
 app/dialogs/color-profile-dialog.h                 |   27 +-
 app/dialogs/convert-indexed-dialog.c               |  298 +-
 app/dialogs/convert-indexed-dialog.h               |   28 +-
 app/dialogs/convert-precision-dialog.c             |  221 +-
 app/dialogs/convert-precision-dialog.h             |   23 +-
 app/dialogs/data-delete-dialog.c                   |   32 +-
 app/dialogs/dialogs-constructors.c                 |   26 +
 app/dialogs/dialogs-constructors.h                 |    8 +
 app/dialogs/dialogs.c                              |   31 +-
 app/dialogs/dialogs.h                              |    2 +
 app/dialogs/fade-dialog.c                          |   25 +-
 app/dialogs/fill-dialog.c                          |  139 +-
 app/dialogs/fill-dialog.h                          |   24 +-
 app/dialogs/grid-dialog.c                          |   84 +-
 app/dialogs/image-merge-layers-dialog.c            |  158 +-
 app/dialogs/image-merge-layers-dialog.h            |   38 +-
 app/dialogs/image-new-dialog.c                     |  204 +-
 app/dialogs/image-new-dialog.h                     |    2 +-
 app/dialogs/image-scale-dialog.c                   |  182 +-
 app/dialogs/item-options-dialog.c                  |  491 +
 app/dialogs/item-options-dialog.h                  |   74 +
 app/dialogs/layer-add-mask-dialog.c                |  142 +-
 app/dialogs/layer-add-mask-dialog.h                |   33 +-
 app/dialogs/layer-options-dialog.c                 |  476 +-
 app/dialogs/layer-options-dialog.h                 |   69 +-
 app/dialogs/module-dialog.c                        |  220 +-
 app/dialogs/offset-dialog.c                        |  273 +-
 app/dialogs/offset-dialog.h                        |   17 +-
 app/dialogs/palette-import-dialog.c                |  497 +-
 app/dialogs/palette-import-dialog.h                |    6 +-
 app/dialogs/preferences-dialog-utils.c             |   21 +
 app/dialogs/preferences-dialog-utils.h             |    8 +
 app/dialogs/preferences-dialog.c                   |  163 +-
 app/dialogs/print-size-dialog.c                    |   63 +-
 app/dialogs/quit-dialog.c                          |  374 +-
 app/dialogs/resize-dialog.c                        |  191 +-
 app/dialogs/resize-dialog.h                        |    5 +
 app/dialogs/scale-dialog.c                         |   52 +-
 app/dialogs/stroke-dialog.c                        |  165 +-
 app/dialogs/stroke-dialog.h                        |   24 +-
 app/dialogs/template-options-dialog.c              |  108 +-
 app/dialogs/template-options-dialog.h              |   37 +-
 app/dialogs/vectors-export-dialog.c                |  139 +-
 app/dialogs/vectors-export-dialog.h                |   28 +-
 app/dialogs/vectors-import-dialog.c                |  150 +-
 app/dialogs/vectors-import-dialog.h                |   32 +-
 app/dialogs/vectors-options-dialog.c               |  182 +-
 app/dialogs/vectors-options-dialog.h               |   52 +-
 app/display/gimpcursorview.c                       |   24 +-
 app/display/gimpcursorview.h                       |    2 +-
 app/display/gimpdisplayshell-callbacks.c           |   11 +-
 app/display/gimpdisplayshell-handlers.c            |    1 +
 app/display/gimpdisplayshell-profile.c             |    2 +
 app/display/gimpdisplayshell-tool-events.c         |   17 +-
 app/display/gimpdisplayshell.c                     |    6 -
 app/display/gimpdisplayshell.h                     |    2 -
 app/display/gimpmotionbuffer.c                     |    2 -
 app/display/gimpstatusbar.c                        |   12 +-
 app/gegl/gimp-gegl-apply-operation.c               |   12 +-
 app/language.c                                     |    2 +-
 app/paint/gimppaintoptions.c                       |  131 +-
 app/paint/gimppaintoptions.h                       |    9 +-
 app/pdb/image-convert-cmds.c                       |    6 +-
 app/pdb/image-transform-cmds.c                     |    2 +-
 app/pdb/internal-procs.c                           |    2 +-
 app/pdb/item-cmds.c                                |  113 +
 app/pdb/layer-cmds.c                               |    4 +-
 app/pdb/plug-in-compat-cmds.c                      |  119 +-
 app/plug-in/plug-in-rc.c                           |   20 +-
 app/text/gimptextlayer.c                           |   10 +-
 app/text/gimptextundo.c                            |    1 +
 app/tools/gimp-tools.c                             |    9 +-
 app/tools/gimpcolorpickertool.c                    |    4 +
 app/tools/gimpcropoptions.c                        |   36 +-
 app/tools/gimpcropoptions.h                        |    2 +
 app/tools/gimpcroptool.c                           |    9 +-
 app/tools/gimpeditselectiontool.c                  |  269 +-
 app/tools/gimpfreeselecttool.c                     |  303 +-
 app/tools/gimpfreeselecttool.h                     |    3 -
 app/tools/gimpguidetool.c                          |   40 +-
 app/tools/gimpguidetool.h                          |    4 +-
 app/tools/gimpiscissorstool.c                      |  437 +-
 app/tools/gimpiscissorstool.h                      |    1 -
 app/tools/gimppaintoptions-gui.c                   |   94 +-
 app/tools/gimprectangletool.c                      |   26 +-
 app/tools/gimpsamplepointtool.c                    |   62 +-
 app/tools/gimpsamplepointtool.h                    |    2 +
 app/tools/gimptilehandleriscissors.c               |   33 +-
 app/tools/gimptilehandleriscissors.h               |    4 +-
 app/tools/gimpvectortool.c                         |   62 +-
 app/tools/gimpwarptool.c                           |    1 +
 app/tools/tool_manager.c                           |   20 +-
 app/unique.c                                       |    3 +-
 app/vectors/gimpvectors.c                          |   16 +-
 app/widgets/Makefile.am                            |    2 +
 app/widgets/gimpaction.c                           |    6 +
 app/widgets/gimpactiongroup.c                      |   33 +
 app/widgets/gimpactiongroup.h                      |    3 +
 app/widgets/gimpcellrendererbutton.c               |  142 +
 app/widgets/gimpcellrendererbutton.h               |   59 +
 app/widgets/gimpchanneltreeview.c                  |    1 -
 app/widgets/gimpcolorframe.c                       |  180 +-
 app/widgets/gimpcolorframe.h                       |   10 +-
 app/widgets/gimpcontainertreeview.c                |   38 +-
 app/widgets/gimpdataeditor.c                       |   38 +-
 app/widgets/gimpdataeditor.h                       |    3 -
 app/widgets/gimpdevicemanager.c                    |   54 +-
 app/widgets/gimpdevices.c                          |   16 +-
 app/widgets/gimpdevicestatus.c                     |   33 +-
 app/widgets/gimpdockbook.c                         |    4 +-
 app/widgets/gimphelp-ids.h                         |    7 +
 app/widgets/gimpitemtreeview.c                     |   83 +-
 app/widgets/gimpitemtreeview.h                     |    2 -
 app/widgets/gimplayertreeview.c                    |   14 +-
 app/widgets/gimpoverlaychild.c                     |    3 +-
 app/widgets/gimppropwidgets.c                      |   25 +-
 app/widgets/gimpsamplepointeditor.c                |   31 +-
 app/widgets/gimpsamplepointeditor.h                |    2 +-
 app/widgets/gimptagentry.c                         |    2 +-
 app/widgets/gimptemplateeditor.c                   |   11 +-
 app/widgets/gimptoolpreseteditor.c                 |    8 +
 app/widgets/gimptoolpresetfactoryview.c            |    7 +-
 app/widgets/gimpuimanager.c                        |   19 +
 app/widgets/gimpuimanager.h                        |    4 +
 app/widgets/gimpvectorstreeview.c                  |    4 -
 app/widgets/gimpviewablebox.c                      |   10 +-
 app/widgets/gimpwidgets-constructors.c             |   24 +-
 app/widgets/gimpwidgets-utils.c                    |   43 +-
 app/widgets/gimpwidgets-utils.h                    |    4 +
 app/widgets/widgets-types.h                        |    1 +
 build/windows/installer/.gitignore                 |    4 +
 build/windows/installer/32on64.isi                 |   60 +
 build/windows/installer/32on64.list                |    9 +
 build/windows/installer/MessageWithURL.isi         |  505 +
 build/windows/installer/associations.isi           |  318 +
 build/windows/installer/compile.bat                |   36 +
 build/windows/installer/configoverride.isi         |   35 +
 build/windows/installer/directories.isi            |   45 +
 build/windows/installer/files.isi                  |   23 +
 build/windows/installer/gimp3264.iss               | 1632 ++
 build/windows/installer/gpl+python.rtf             |  179 +
 build/windows/installer/installsplash.bmp          |  Bin 0 -> 770874 bytes
 build/windows/installer/installsplash_small.bmp    |  Bin 0 -> 537174 bytes
 build/windows/installer/lang/ca.setup.isl          |    2 +-
 build/windows/installer/lang/da.setup.isl          |  113 +
 build/windows/installer/lang/de.setup.isl          |  113 +
 build/windows/installer/lang/en.setup.isl          |  112 +
 build/windows/installer/lang/es.setup.isl          |  113 +
 build/windows/installer/lang/fr.setup.isl          |  113 +
 build/windows/installer/lang/hu.setup.isl          |  113 +
 build/windows/installer/lang/it.setup.isl          |  113 +
 build/windows/installer/lang/nl.setup.isl          |  113 +
 build/windows/installer/lang/pl.setup.isl          |    2 +-
 build/windows/installer/lang/pt_BR.setup.isl       |    8 +-
 build/windows/installer/lang/ru.setup.isl          |  113 +
 build/windows/installer/lang/sl.setup.isl          |  105 +
 build/windows/installer/rebootcontinue.isi         |  131 +
 build/windows/installer/setup.ini                  |   29 +
 build/windows/installer/uninst.isi                 |  269 +
 build/windows/installer/utils.isi                  |  148 +
 build/windows/installer/version.isi                |   25 +
 build/windows/installer/wilber.bmp                 |  Bin 0 -> 4158 bytes
 .../installer/windows-installer-intro-big.bmp      |  Bin 0 -> 221814 bytes
 .../installer/windows-installer-intro-small.bmp    |  Bin 0 -> 154542 bytes
 configure.ac                                       |   45 +-
 devel-docs/release-howto.txt                       |  133 +-
 icons/Color/128/folder.png                         |  Bin 0 -> 3895 bytes
 icons/Color/16/gimp-path-delete.png                |  Bin 668 -> 0 bytes
 icons/Color/16/gimp-path-down.png                  |  Bin 695 -> 0 bytes
 icons/Color/16/gimp-path-new.png                   |  Bin 631 -> 0 bytes
 icons/Color/16/gimp-path-up.png                    |  Bin 694 -> 0 bytes
 icons/Color/256/folder.png                         |  Bin 0 -> 7999 bytes
 icons/Color/Makefile.am                            |    1 +
 icons/Color/scalable/gimp-path-delete.svg          |  127 -
 icons/Color/scalable/gimp-path-down.svg            |  131 -
 icons/Color/scalable/gimp-path-new.svg             |  130 -
 icons/Color/scalable/gimp-path-up.svg              |  132 -
 icons/Symbolic/128/folder.png                      |  Bin 0 -> 1024 bytes
 icons/Symbolic/16/gimp-path-delete.png             |  Bin 538 -> 0 bytes
 icons/Symbolic/16/gimp-path-down.png               |  Bin 502 -> 0 bytes
 icons/Symbolic/16/gimp-path-new.png                |  Bin 423 -> 0 bytes
 icons/Symbolic/16/gimp-path-up.png                 |  Bin 498 -> 0 bytes
 icons/Symbolic/24/gimp-hchain-broken.png           |  Bin 629 -> 597 bytes
 icons/Symbolic/24/gimp-vchain-broken.png           |  Bin 643 -> 699 bytes
 icons/Symbolic/256/folder.png                      |  Bin 0 -> 1992 bytes
 icons/Symbolic/Makefile.am                         |    1 +
 icons/Symbolic/scalable/gimp-hchain-broken.svg     |  124 +-
 icons/Symbolic/scalable/gimp-path-delete.svg       |  178 -
 icons/Symbolic/scalable/gimp-path-down.svg         |  184 -
 icons/Symbolic/scalable/gimp-path-new.svg          |  186 -
 icons/Symbolic/scalable/gimp-path-up.svg           |  185 -
 icons/Symbolic/scalable/gimp-vchain-broken.svg     |  126 +-
 icons/Symbolic/symbolic-scalable.svg               |   73 +-
 icons/icon-list.mk                                 |   18 +-
 libgimp/gimp.def                                   |    2 +
 libgimp/gimpdrawablepreview.c                      |    3 +
 libgimp/gimpenums.c.tail                           |    2 +
 libgimp/gimpitem_pdb.c                             |   66 +
 libgimp/gimpitem_pdb.h                             |    3 +
 libgimp/gimpzoompreview.c                          |    3 +
 libgimpbase/gimpbase.def                           |    1 +
 libgimpbase/gimpbaseenums.c                        |   52 +-
 libgimpbase/gimpbaseenums.h                        |   26 +-
 libgimpconfig/gimpcolorconfig.c                    |  247 +-
 libgimpconfig/gimpconfig-deserialize.c             |   21 +-
 libgimpconfig/gimpconfig-iface.c                   |    2 +-
 libgimpconfig/gimpconfig-path.c                    |   79 +
 libgimpconfig/gimpconfig-path.h                    |    5 +
 libgimpconfig/gimpconfig-serialize.c               |   28 +-
 libgimpconfig/gimpconfig.def                       |    2 +
 libgimpconfig/gimpscanner.c                        |   11 +
 libgimpmath/gimpvector.c                           |    4 +
 libgimpwidgets/gimpcellrenderertoggle.c            |   48 +-
 libgimpwidgets/gimpcolorprofilestore.c             |   26 +-
 libgimpwidgets/gimpcolorscale.c                    |   39 +
 libgimpwidgets/gimpfileentry.c                     |   11 +-
 libgimpwidgets/gimpframe.c                         |    3 +-
 libgimpwidgets/gimpicons.c                         |    4 -
 libgimpwidgets/gimpicons.h                         |    4 -
 libgimpwidgets/gimppatheditor.c                    |   25 +-
 libgimpwidgets/gimppropwidgets.c                   |   58 +-
 menus/channels-menu.xml                            |   11 +
 menus/image-menu.xml.in                            |    1 +
 menus/layers-menu.xml                              |   11 +
 menus/selection-menu.xml                           |    2 +
 menus/tool-preset-editor-menu.xml                  |    3 +
 menus/tool-presets-menu.xml                        |    1 +
 menus/vectors-menu.xml                             |   13 +
 modules/display-filter-color-blind.c               |   46 +-
 modules/display-filter-proof.c                     |   22 +-
 plug-ins/common/Makefile.am                        |    3 +-
 plug-ins/common/file-dicom.c                       |    2 +-
 plug-ins/common/file-mng.c                         |    6 +-
 plug-ins/common/file-psp.c                         |    5 +-
 plug-ins/common/file-sunras.c                      |    4 +-
 plug-ins/common/plugin-defs.pl                     |    2 +-
 plug-ins/file-psd/psd-load.c                       |   11 +-
 plug-ins/file-webp/file-webp-save.c                |    7 +-
 plug-ins/imagemap/imap_preview.c                   |    5 +-
 plug-ins/imagemap/imap_table.c                     |    3 +-
 plug-ins/lighting/lighting-ui.c                    |  167 +-
 plug-ins/map-object/map-object-ui.c                |  208 +-
 po-libgimp/ca.po                                   |    4 +-
 po-libgimp/da.po                                   |   42 +-
 po-libgimp/el.po                                   |  251 +-
 po-libgimp/hu.po                                   |  239 +-
 po-libgimp/it.po                                   |  433 +-
 po-libgimp/oc.po                                   |  714 +-
 po-libgimp/pl.po                                   |  421 +-
 po-libgimp/pt.po                                   |  266 +-
 po-libgimp/ru.po                                   |  461 +-
 po-plug-ins/da.po                                  | 9460 ++++-------
 po-plug-ins/fr.po                                  | 8079 ++++------
 po-plug-ins/it.po                                  | 1504 ++-
 po-plug-ins/oc.po                                  |  948 +-
 po-plug-ins/ru.po                                  |  348 +-
 po-python/oc.po                                    |   49 +-
 po-python/sv.po                                    |  258 +-
 po-script-fu/oc.po                                 | 3681 +++--
 po-tags/LINGUAS                                    |    1 +
 po-tags/da.po                                      |   11 +-
 po-tags/fi.po                                      |   29 +
 po-tags/oc.po                                      |   14 +-
 po-tips/da.po                                      |  450 +-
 po-tips/oc.po                                      |  188 +-
 po/Makefile.in.in                                  |    9 +
 po/POTFILES.in                                     |    5 +-
 po/ca.po                                           | 4726 ++++---
 po/de.po                                           | 2311 ++--
 po/el.po                                           | 3100 +++--
 po/fr.po                                           |13879 +++++++++++------
 po/gd.po                                           | 6771 +++++---
 po/hu.po                                           | 2773 ++--
 po/it.po                                           | 3884 +++--
 po/oc.po                                           |16756 +++++++++-----------
 po/pl.po                                           | 4360 +++--
 po/pt.po                                           | 3098 +++--
 po/ru.po                                           | 4696 ++++---
 tools/pdbgen/enums.pl                              |   18 +
 tools/pdbgen/pdb/image_convert.pdb                 |    6 +-
 tools/pdbgen/pdb/image_transform.pdb               |    2 +-
 tools/pdbgen/pdb/item.pdb                          |   50 +
 tools/pdbgen/pdb/layer.pdb                         |    4 +-
 tools/pdbgen/pdb/plug_in_compat.pdb                |  135 +-
 384 files changed, 66249 insertions(+), 51818 deletions(-)
---
diff --cc app/pdb/internal-procs.c
index 5379699,5379699..ff75522
--- a/app/pdb/internal-procs.c
+++ b/app/pdb/internal-procs.c
@@@ -28,7 -28,7 +28,7 @@@
  #include "internal-procs.h"
  
  
--/* 802 procedures registered total */
++/* 804 procedures registered total */
  
  void
  internal_procs_init (GimpPDB *pdb)
diff --cc app/unique.c
index 8e0f477,8e0f477..1f58942
--- a/app/unique.c
+++ b/app/unique.c
@@@ -47,7 -47,7 +47,8 @@@ gimp_unique_open (const gchar **filenam
                    gboolean      as_new)
  {
  #ifdef G_OS_WIN32
--  return gimp_unique_win32_open (filenames, as_new);
++//  return gimp_unique_win32_open (filenames, as_new);
++  return gimp_unique_dbus_open (filenames, as_new);
  #else
    return gimp_unique_dbus_open (filenames, as_new);
  #endif
diff --cc libgimp/gimp.def
index 16fc115,ac54622..a9171e5
--- a/libgimp/gimp.def
+++ b/libgimp/gimp.def
@@@ -551,8 -551,8 +551,9 @@@ EXPORT
        gimp_item_attach_parasite
        gimp_item_delete
        gimp_item_detach_parasite
 +      gimp_item_get_attributes
        gimp_item_get_children
+       gimp_item_get_color_tag
        gimp_item_get_image
        gimp_item_get_linked
        gimp_item_get_lock_content
@@@ -572,7 -572,7 +573,8 @@@
        gimp_item_is_text_layer
        gimp_item_is_valid
        gimp_item_is_vectors
+       gimp_item_set_color_tag
 +      gimp_item_set_attributes
        gimp_item_set_linked
        gimp_item_set_lock_content
        gimp_item_set_lock_position
diff --cc libgimp/gimpitem_pdb.h
index 8508f43,6b81f04..0ee024b
--- a/libgimp/gimpitem_pdb.h
+++ b/libgimp/gimpitem_pdb.h
@@@ -32,49 -32,49 +32,52 @@@ G_BEGIN_DECL
  /* For information look into the C source or the html documentation */
  
  
 -gboolean      gimp_item_is_valid          (gint32              item_ID);
 -gint32        gimp_item_get_image         (gint32              item_ID);
 -gboolean      gimp_item_delete            (gint32              item_ID);
 -gboolean      gimp_item_is_drawable       (gint32              item_ID);
 -gboolean      gimp_item_is_layer          (gint32              item_ID);
 -gboolean      gimp_item_is_text_layer     (gint32              item_ID);
 -gboolean      gimp_item_is_channel        (gint32              item_ID);
 -gboolean      gimp_item_is_layer_mask     (gint32              item_ID);
 -gboolean      gimp_item_is_selection      (gint32              item_ID);
 -gboolean      gimp_item_is_vectors        (gint32              item_ID);
 -gboolean      gimp_item_is_group          (gint32              item_ID);
 -gint32        gimp_item_get_parent        (gint32              item_ID);
 -gint*         gimp_item_get_children      (gint32              item_ID,
 -                                           gint               *num_children);
 -gchar*        gimp_item_get_name          (gint32              item_ID);
 -gboolean      gimp_item_set_name          (gint32              item_ID,
 -                                           const gchar        *name);
 -gboolean      gimp_item_get_visible       (gint32              item_ID);
 -gboolean      gimp_item_set_visible       (gint32              item_ID,
 -                                           gboolean            visible);
 -gboolean      gimp_item_get_linked        (gint32              item_ID);
 -gboolean      gimp_item_set_linked        (gint32              item_ID,
 -                                           gboolean            linked);
 -gboolean      gimp_item_get_lock_content  (gint32              item_ID);
 -gboolean      gimp_item_set_lock_content  (gint32              item_ID,
 -                                           gboolean            lock_content);
 -gboolean      gimp_item_get_lock_position (gint32              item_ID);
 -gboolean      gimp_item_set_lock_position (gint32              item_ID,
 -                                           gboolean            lock_position);
 -GimpColorTag  gimp_item_get_color_tag     (gint32              item_ID);
 -gboolean      gimp_item_set_color_tag     (gint32              item_ID,
 -                                           GimpColorTag        color_tag);
 -gint          gimp_item_get_tattoo        (gint32              item_ID);
 -gboolean      gimp_item_set_tattoo        (gint32              item_ID,
 -                                           gint                tattoo);
 -gboolean      gimp_item_attach_parasite   (gint32              item_ID,
 -                                           const GimpParasite *parasite);
 -gboolean      gimp_item_detach_parasite   (gint32              item_ID,
 -                                           const gchar        *name);
 -GimpParasite* gimp_item_get_parasite      (gint32              item_ID,
 -                                           const gchar        *name);
 -gchar**       gimp_item_get_parasite_list (gint32              item_ID,
 -                                           gint               *num_parasites);
 +gboolean                 gimp_item_is_valid          (gint32              item_ID);
 +gint32                   gimp_item_get_image         (gint32              item_ID);
 +gboolean                 gimp_item_delete            (gint32              item_ID);
 +gboolean                 gimp_item_is_drawable       (gint32              item_ID);
 +gboolean                 gimp_item_is_layer          (gint32              item_ID);
 +gboolean                 gimp_item_is_text_layer     (gint32              item_ID);
 +gboolean                 gimp_item_is_channel        (gint32              item_ID);
 +gboolean                 gimp_item_is_layer_mask     (gint32              item_ID);
 +gboolean                 gimp_item_is_selection      (gint32              item_ID);
 +gboolean                 gimp_item_is_vectors        (gint32              item_ID);
 +gboolean                 gimp_item_is_group          (gint32              item_ID);
 +gint32                   gimp_item_get_parent        (gint32              item_ID);
 +gint*                    gimp_item_get_children      (gint32              item_ID,
 +                                                      gint               *num_children);
 +gchar*                   gimp_item_get_name          (gint32              item_ID);
 +gboolean                 gimp_item_set_name          (gint32              item_ID,
 +                                                      const gchar        *name);
 +gboolean                 gimp_item_get_visible       (gint32              item_ID);
 +gboolean                 gimp_item_set_visible       (gint32              item_ID,
 +                                                      gboolean            visible);
 +gboolean                 gimp_item_get_linked        (gint32              item_ID);
 +gboolean                 gimp_item_set_linked        (gint32              item_ID,
 +                                                      gboolean            linked);
 +gboolean                 gimp_item_get_lock_content  (gint32              item_ID);
 +gboolean                 gimp_item_set_lock_content  (gint32              item_ID,
 +                                                      gboolean            lock_content);
 +gboolean                 gimp_item_get_lock_position (gint32              item_ID);
 +gboolean                 gimp_item_set_lock_position (gint32              item_ID,
 +                                                      gboolean            lock_position);
++GimpColorTag             gimp_item_get_color_tag     (gint32              item_ID);
++gboolean                 gimp_item_set_color_tag     (gint32              item_ID,
++                                                      GimpColorTag        color_tag);
 +gint                     gimp_item_get_tattoo        (gint32              item_ID);
 +gboolean                 gimp_item_set_tattoo        (gint32              item_ID,
 +                                                      gint                tattoo);
 +G_GNUC_INTERNAL gchar*   _gimp_item_get_attributes   (gint32              item_ID);
 +G_GNUC_INTERNAL gboolean _gimp_item_set_attributes   (gint32              item_ID,
 +                                                      const gchar        *attributes_string);
 +gboolean                 gimp_item_attach_parasite   (gint32              item_ID,
 +                                                      const GimpParasite *parasite);
 +gboolean                 gimp_item_detach_parasite   (gint32              item_ID,
 +                                                      const gchar        *name);
 +GimpParasite*            gimp_item_get_parasite      (gint32              item_ID,
 +                                                      const gchar        *name);
 +gchar**                  gimp_item_get_parasite_list (gint32              item_ID,
 +                                                      gint               *num_parasites);
  
  
  G_END_DECLS
diff --cc tools/pdbgen/pdb/item.pdb
index c55a0f4,b6f5ff9..511ee38
--- a/tools/pdbgen/pdb/item.pdb
+++ b/tools/pdbgen/pdb/item.pdb
@@@ -930,11 -922,11 +979,12 @@@ COD
              item_get_linked item_set_linked
              item_get_lock_content item_set_lock_content
              item_get_lock_position item_set_lock_position
+             item_get_color_tag item_set_color_tag
              item_get_tattoo item_set_tattoo
 -          item_attach_parasite item_detach_parasite
 -          item_get_parasite
 -          item_get_parasite_list);
 +            item_get_attributes item_set_attributes
 +            item_attach_parasite item_detach_parasite
 +            item_get_parasite
 +            item_get_parasite_list);
  
  %exports = (app => [@procs], lib => [@procs]);
  


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]