[gimp/soc-2009-dynamics: 238/238] Merging master to current state



commit d2143b8886681491e74d8a8565fc0bf815b55918
Merge: db8aa6c... b929a7a...
Author: Alexia Death <alexiadeath gmail com>
Date:   Fri Aug 21 19:26:05 2009 +0300

    Merging master to current state

 AUTHORS                                            |    2 +
 ChangeLog.pre-2-6                                  |    2 +-
 ChangeLog.pre-git                                  |    6 +-
 Makefile.am                                        |    2 +-
 NEWS                                               |   32 +-
 app/actions/actions-types.h                        |    2 +-
 app/actions/channels-actions.c                     |    6 +-
 app/actions/channels-commands.c                    |   17 +-
 app/actions/debug-commands.c                       |    2 +-
 app/actions/dockable-commands.c                    |    3 +
 app/actions/drawable-actions.c                     |   54 +-
 app/actions/drawable-commands.c                    |   35 +
 app/actions/drawable-commands.h                    |    2 +
 app/actions/edit-actions.c                         |   24 +-
 app/actions/edit-commands.c                        |    7 +-
 app/actions/file-actions.c                         |   37 +-
 app/actions/layers-actions.c                       |   70 +-
 app/actions/layers-commands.c                      |   61 +-
 app/actions/layers-commands.h                      |    3 +
 app/actions/select-actions.c                       |   12 +-
 app/actions/vectors-actions.c                      |   33 +-
 app/actions/vectors-commands.c                     |   55 +-
 app/actions/vectors-commands.h                     |    2 +
 app/base/temp-buf.c                                |   29 +
 app/base/temp-buf.h                                |    2 +
 app/config/gimpconfig-dump.c                       |    7 +-
 app/config/gimpcoreconfig.c                        |    2 +-
 app/config/gimpguiconfig.c                         |   22 +-
 app/config/gimprc-blurbs.h                         |    9 +-
 app/core/Makefile.am                               |    4 +
 app/core/core-enums.c                              |   12 +-
 app/core/core-enums.h                              |    6 +-
 app/core/core-types.h                              |    2 +
 app/core/gimp-edit.c                               |    4 +-
 app/core/gimp-gradients.c                          |   36 +-
 app/core/gimpchannel.c                             |   16 +
 app/core/gimpchannelpropundo.c                     |   23 +-
 app/core/gimpchannelpropundo.h                     |    1 +
 app/core/gimpchannelundo.c                         |   29 +-
 app/core/gimpchannelundo.h                         |    1 +
 app/core/gimpcontext.c                             |    2 +-
 app/core/gimpdatafactory.c                         |   35 +-
 app/core/gimpdatafactory.h                         |    2 +
 app/core/gimpgrouplayer.c                          |  174 +
 app/core/gimpgrouplayer.h                          |   56 +
 app/core/gimpimage-convert.c                       |   15 +-
 app/core/gimpimage-crop.c                          |   27 +-
 app/core/gimpimage-duplicate.c                     |   93 +-
 app/core/gimpimage-flip.c                          |   37 +-
 app/core/gimpimage-item-list.c                     |   25 +-
 app/core/gimpimage-merge.c                         |   12 +-
 app/core/gimpimage-quick-mask.c                    |    2 +-
 app/core/gimpimage-resize.c                        |   55 +-
 app/core/gimpimage-rotate.c                        |   29 +-
 app/core/gimpimage-scale.c                         |   61 +-
 app/core/gimpimage-undo-push.c                     |   36 +-
 app/core/gimpimage-undo-push.h                     |   11 +-
 app/core/gimpimage.c                               | 1012 +-
 app/core/gimpimage.h                               |   47 +-
 app/core/gimpimagefile.c                           |    2 +-
 app/core/gimpitem.c                                |  179 +-
 app/core/gimpitem.h                                |  400 +-
 app/core/gimpitemstack.c                           |  138 +-
 app/core/gimpitemstack.h                           |    7 +
 app/core/gimplayer-floating-sel.c                  |    2 +-
 app/core/gimplayer.c                               |   32 +-
 app/core/gimplayer.h                               |    4 +-
 app/core/gimplayermask.c                           |   23 +-
 app/core/gimplayerpropundo.c                       |   23 +-
 app/core/gimplayerpropundo.h                       |   11 +-
 app/core/gimplayerundo.c                           |   23 +-
 app/core/gimplayerundo.h                           |    1 +
 app/core/gimpprojection-construct.c                |    6 +
 app/core/gimpselection.c                           |   12 +-
 app/core/gimptemplate.c                            |    2 +-
 app/core/gimptreehandler.c                         |  240 +
 app/core/gimptreehandler.h                         |   64 +
 app/core/gimpviewable.c                            |   55 +
 app/core/gimpviewable.h                            |  228 +-
 app/dialogs/about-dialog.c                         |   27 -
 app/dialogs/file-open-dialog.c                     |    3 +-
 app/dialogs/layer-add-mask-dialog.c                |    9 +-
 app/dialogs/preferences-dialog.c                   |   31 +-
 app/display/gimpdisplayshell-callbacks.c           |   29 +-
 app/display/gimpdisplayshell-dnd.c                 |   41 +-
 app/display/gimpdisplayshell-draw.c                |    9 +-
 app/display/gimpdisplayshell-handlers.c            |   33 +-
 app/display/gimpdisplayshell-layer-select.c        |   17 +-
 app/display/gimpdisplayshell-title.c               |    4 +-
 app/display/gimpdisplayshell.h                     |    6 +-
 app/display/gimpstatusbar.c                        |    2 +-
 app/gegl/gimpoperationpointlayermode.c             |  130 +-
 app/pdb/color-cmds.c                               |   32 +-
 app/pdb/drawable-cmds.c                            |   18 +-
 app/pdb/drawable-transform-cmds.c                  |   32 +-
 app/pdb/edit-cmds.c                                |   28 +-
 app/pdb/floating-sel-cmds.c                        |    2 +-
 app/pdb/gimppdb-utils.c                            |   53 +-
 app/pdb/gimppdb-utils.h                            |    5 +
 app/pdb/image-cmds.c                               |   20 +-
 app/pdb/layer-cmds.c                               |   20 +-
 app/pdb/paint-tools-cmds.c                         |   34 +-
 app/pdb/paths-cmds.c                               |    7 +-
 app/pdb/selection-cmds.c                           |    2 +-
 app/pdb/text-tool-cmds.c                           |    4 +-
 app/pdb/transform-tools-cmds.c                     |   12 +-
 app/pdb/vectors-cmds.c                             |    8 +-
 app/text/gimptext-compat.c                         |    2 +-
 app/tools/gimpaligntool.c                          |   71 +-
 app/tools/gimpblendtool.c                          |    7 +
 app/tools/gimpbrightnesscontrasttool.c             |    4 +-
 app/tools/gimpbucketfilltool.c                     |   27 +
 app/tools/gimpcolorbalancetool.c                   |    4 +-
 app/tools/gimpcolorizetool.c                       |    5 +-
 app/tools/gimpcroptool.c                           |   26 +-
 app/tools/gimpcurvestool.c                         |    5 +-
 app/tools/gimpdesaturatetool.c                     |    5 +-
 app/tools/gimpdrawtool.c                           |   11 +-
 app/tools/gimpgegltool.c                           |    4 +-
 app/tools/gimphuesaturationtool.c                  |    4 +-
 app/tools/gimpimagemaptool.c                       |   12 +-
 app/tools/gimplevelstool.c                         |    5 +-
 app/tools/gimppainttool.c                          |   12 +-
 app/tools/gimpperspectiveclonetool.c               |    5 +
 app/tools/gimpposterizetool.c                      |    5 +-
 app/tools/gimptextoptions.c                        |   25 +-
 app/tools/gimptexttool.c                           |   10 +-
 app/tools/gimpthresholdtool.c                      |    5 +-
 app/tools/gimptransformtool.c                      |   52 +-
 app/tools/gimpvectortool.c                         |    3 +-
 app/vectors/gimpvectors-import.c                   |   41 +-
 app/vectors/gimpvectors-import.h                   |    2 +
 app/vectors/gimpvectors.c                          |  120 +-
 app/vectors/gimpvectorspropundo.c                  |   23 +-
 app/vectors/gimpvectorspropundo.h                  |    1 +
 app/vectors/gimpvectorsundo.c                      |   23 +-
 app/vectors/gimpvectorsundo.h                      |    1 +
 app/widgets/gimpchanneltreeview.c                  |   59 +-
 app/widgets/gimpcontainercombobox.c                |    2 +
 app/widgets/gimpcontainerentry.c                   |    2 +
 app/widgets/gimpcontainergridview.c                |    2 +
 app/widgets/gimpcontainertreeview-dnd.c            |   84 +-
 app/widgets/gimpcontainertreeview.c                |   53 +-
 app/widgets/gimpcontainerview.c                    |  420 +-
 app/widgets/gimpcontainerview.h                    |    2 +
 app/widgets/gimpcontrollereditor.c                 |    3 +-
 app/widgets/gimpdrawabletreeview.c                 |    8 +-
 app/widgets/gimpeditor.c                           |    9 +-
 app/widgets/gimphelp-ids.h                         |    1 +
 app/widgets/gimpimagepropview.c                    |    6 +-
 app/widgets/gimpitemtreeview.c                     |  422 +-
 app/widgets/gimpitemtreeview.h                     |   18 +
 app/widgets/gimplanguageentry.c                    |   90 +-
 app/widgets/gimplanguageentry.h                    |   13 +-
 app/widgets/gimplanguagestore.c                    |   50 +
 app/widgets/gimplanguagestore.h                    |    3 +
 app/widgets/gimplayertreeview.c                    |  232 +-
 app/widgets/gimppropwidgets.c                      |  122 +-
 app/widgets/gimppropwidgets.h                      |    5 +
 app/widgets/gimptexteditor.c                       |   29 -
 app/widgets/gimptoolbox-dnd.c                      |    6 +-
 app/widgets/gimptoolbox.c                          |    6 +-
 app/widgets/gimptooleditor.c                       |  116 +-
 app/widgets/gimptooleditor.h                       |   14 +-
 app/widgets/gimpvectorstreeview.c                  |   53 +-
 app/xcf/xcf-load.c                                 |   13 +-
 authors.xml                                        |    2 +
 autogen.sh                                         |    9 +
 configure.ac                                       |    2 +-
 data/brushes/Calligraphic.vbr                      |    8 +
 data/brushes/Diagonal-Star.vbr                     |   10 +
 data/brushes/Makefile.am                           |   35 +-
 data/brushes/Round-Fuzzy.vbr                       |    8 +
 data/brushes/Round.vbr                             |    8 +
 data/gradients/Makefile.am                         |   19 +-
 data/tags/gimp-tags-default.xml.in                 |  761 +--
 devel-docs/Makefile.am                             |    1 +
 devel-docs/libgimp/libgimp-docs.sgml               |    3 +
 devel-docs/libgimp/libgimp-sections.txt            |    6 +
 devel-docs/libgimp/tmpl/gimpexport.sgml            |   20 +
 devel-docs/libgimp/tmpl/gimpimage.sgml             |    9 +
 devel-docs/libgimp/tmpl/gimptextlayer.sgml         |   30 +
 devel-docs/libgimpbase/libgimpbase-sections.txt    |    2 +
 devel-docs/libgimpbase/tmpl/gimpbasetypes.sgml     |   18 +
 devel-docs/libgimpcolor/libgimpcolor-sections.txt  |    1 +
 devel-docs/libgimpcolor/tmpl/gimphsv.sgml          |   11 +
 .../libgimpmodule/libgimpmodule-sections.txt       |    1 +
 devel-docs/libgimpmodule/tmpl/gimpmodule.sgml      |    8 +
 .../libgimpwidgets/libgimpwidgets-sections.txt     |    1 +
 devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml    |    7 +
 devel-docs/release-howto.txt                       |   29 +-
 devel-docs/submitting-patches.txt                  |    1 +
 docs/gimprc.5.in                                   |   24 +-
 etc/gimprc                                         |   22 +-
 gimp.doap                                          |    4 +-
 libgimpwidgets/gimpcolorscale.c                    |    4 +-
 libgimpwidgets/gimppropwidgets.c                   |   18 +
 libgimpwidgets/gimpruler.c                         |    8 +-
 menus/image-menu.xml.in                            |    2 +
 plug-ins/common/Makefile.am                        |    4 +
 plug-ins/common/file-jp2-load.c                    |   56 +-
 plug-ins/common/mail.c                             |   25 +-
 plug-ins/common/web-browser.c                      |  135 +-
 plug-ins/file-jpeg/jpeg.c                          |    2 +-
 plug-ins/metadata/Makefile.am                      |    6 +
 plug-ins/metadata/exif-decode.c                    |    2 +-
 plug-ins/metadata/interface.c                      |    3 +-
 plug-ins/metadata/interface.h                      |    1 -
 plug-ins/metadata/metadata.c                       |    4 +
 plug-ins/metadata/xmp-encode.c                     |    2 +-
 plug-ins/metadata/xmp-encode.h                     |    1 +
 plug-ins/metadata/xmp-model.c                      |  280 +-
 plug-ins/metadata/xmp-model.h                      |   79 +-
 plug-ins/metadata/xmp-schemas.c                    |    5 +-
 plug-ins/metadata/xmpdump.c                        |   34 +-
 plug-ins/print/print-settings.c                    |    6 +
 plug-ins/pygimp/Makefile.am                        |   11 +-
 plug-ins/script-fu/scheme-wrapper.c                |   50 +-
 plug-ins/script-fu/scripts/Makefile.am             |    1 +
 plug-ins/script-fu/scripts/palette-export.scm      |  432 +
 plug-ins/script-fu/tinyscheme/Manual.txt           |    2 +-
 plug-ins/script-fu/tinyscheme/init.scm             |  221 +-
 plug-ins/script-fu/tinyscheme/opdefines.h          |    4 +-
 plug-ins/script-fu/tinyscheme/scheme-private.h     |   38 +-
 plug-ins/script-fu/tinyscheme/scheme.c             |  700 +-
 plug-ins/script-fu/tinyscheme/scheme.h             |   32 +-
 po-libgimp/LINGUAS                                 |    1 +
 po-libgimp/br.po                                   | 2036 +++
 po-libgimp/es.po                                   | 1511 ++-
 po-libgimp/it.po                                   |  340 +-
 po-plug-ins/LINGUAS                                |    1 +
 po-plug-ins/br.po                                  |12911 ++++++++++++++++++
 po-plug-ins/es.po                                  | 2906 +++--
 po-plug-ins/it.po                                  | 2667 ++--
 po-plug-ins/ja.po                                  | 1815 ++--
 po-plug-ins/ru.po                                  | 1091 +-
 po-python/es.po                                    |  203 +-
 po-script-fu/LINGUAS                               |    1 +
 po-script-fu/br.po                                 | 2673 ++++
 po-tags/.gitignore                                 |    3 +
 po-tags/LINGUAS                                    |    1 +
 po-tags/br.po                                      |   28 +
 po-tips/LINGUAS                                    |    1 +
 po-tips/br.po                                      |  263 +
 po/LINGUAS                                         |    1 +
 po/POTFILES.in                                     |    2 +
 po/br.po                                           |14361 ++++++++++++++++++++
 po/da.po                                           | 3089 +++---
 po/es.po                                           | 3872 ++----
 po/hu.po                                           |   11 +-
 po/it.po                                           | 1935 ++--
 po/pl.po                                           | 2257 ++--
 po/ru.po                                           |  944 +-
 tools/pdbgen/pdb/color.pdb                         |   32 +-
 tools/pdbgen/pdb/drawable.pdb                      |   18 +-
 tools/pdbgen/pdb/drawable_transform.pdb            |   12 +-
 tools/pdbgen/pdb/edit.pdb                          |   28 +-
 tools/pdbgen/pdb/floating_sel.pdb                  |    2 +-
 tools/pdbgen/pdb/image.pdb                         |   20 +-
 tools/pdbgen/pdb/layer.pdb                         |   20 +-
 tools/pdbgen/pdb/paint_tools.pdb                   |   36 +-
 tools/pdbgen/pdb/paths.pdb                         |    7 +-
 tools/pdbgen/pdb/selection.pdb                     |    2 +-
 tools/pdbgen/pdb/text_tool.pdb                     |    4 +-
 tools/pdbgen/pdb/transform_tools.pdb               |   12 +-
 tools/pdbgen/pdb/vectors.pdb                       |    8 +-
 266 files changed, 50231 insertions(+), 14960 deletions(-)
---
diff --cc NEWS
index 846ba00,7c41729..9fa8a4a
--- a/NEWS
+++ b/NEWS
@@@ -68,12 -89,14 +89,13 @@@ Core
   - Drop support for the obsolete GnomeVFS file-uri backend
   - Allow to dump keyboard shortucts ith File->Debug->Dump Keyboard
     Shortcuts
- 
- 
- PDB:
- 
-  - Add procedures to manipulate size of text box
+  - Prepare data structures for layer groups
+  - Remove gimprc setting "menu-mnemonics",
+    "GtkSettings:gtk-enable-mnemonics" shall be used instead
+  - Remove "transient-docks" gimprc setting, the 'Utility window' hint
+    and a sane window manager does a better job
+  - Remove "web-browser" gimprc setting and use gtk_show_uri() instead
  
 -
  General:
  
   - Changed licence to (L)GPLv3+



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