[gimp/meson: 133/135] Merge branch 'master' into meson
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/meson: 133/135] Merge branch 'master' into meson
- Date: Wed, 11 Apr 2018 14:32:28 +0000 (UTC)
commit 09b9eab695ab425f6d94b16b8fae94147381294d
Merge: 8094acf 421c9fc
Author: Salamandar <felix piedallu me>
Date: Wed Apr 11 15:13:29 2018 +0200
Merge branch 'master' into meson
NEWS | 62 +-
acinclude.m4 | 1 +
app-tools/Makefile.am | 12 +-
app/Makefile.am | 20 +-
app/actions/dashboard-actions.c | 2 +
app/actions/debug-actions.c | 16 +-
app/actions/debug-commands.c | 7 +-
app/actions/debug-commands.h | 10 -
app/actions/gimpgeglprocedure.c | 15 +-
app/actions/select-commands.c | 14 +-
app/app.c | 6 +-
app/app.h | 1 +
app/config/gimpconfig-dump.c | 67 +-
app/config/gimpcoreconfig.c | 17 +-
app/config/gimpguiconfig.c | 14 +
app/config/gimpguiconfig.h | 3 +-
app/config/gimprc-blurbs.h | 3 +
app/core/Makefile.am | 16 +-
app/core/gimp-parallel.cc | 355 +++
app/core/gimp-parallel.h | 112 +
app/core/gimp-templates.c | 2 +-
app/core/gimp-user-install.c | 28 +
app/core/gimp.c | 2 +
app/core/gimp.h | 2 +
app/core/gimpboundary.c | 4 +-
app/core/gimpboundary.h | 3 +-
...impbrush-transform.c => gimpbrush-transform.cc} | 728 +++---
app/core/gimpbrush.c | 4 +-
app/core/gimpchannel.c | 42 +-
app/core/gimpchannel.h | 4 +-
app/core/gimpdrawable-filters.c | 1 +
app/core/gimpdrawable-preview.h | 2 +-
app/core/gimpdrawable-private.h | 5 +
app/core/gimpdrawable-shadow.c | 1 +
app/core/gimpdrawable.c | 177 ++-
app/core/gimpdrawable.h | 5 +
app/core/gimpdrawablefilter.c | 2 +-
app/core/gimpdynamicsoutput.c | 2 +-
app/core/gimpimage-convert-indexed.c | 2 +-
app/core/gimpimage-guides.h | 2 +-
app/core/gimpimage-preview.h | 2 +-
app/core/gimpimage-quick-mask.c | 6 +-
app/core/gimpimage-sample-points.h | 2 +-
app/core/gimpimage.c | 13 +-
app/core/gimpimageundo.c | 2 +-
app/core/gimpitem-preview.h | 2 +-
app/core/gimplayer-floating-selection.c | 2 +-
app/core/gimppickable-contiguous-region.c | 2 +-
app/core/gimpprojection.c | 16 +
app/core/gimpselection.c | 53 -
app/core/gimpselection.h | 4 -
app/core/gimpsymmetry-mirror.c | 52 +-
app/core/gimpsymmetry-tiling.c | 117 +-
app/core/gimpsymmetry.c | 97 +-
app/core/gimpsymmetry.h | 6 +
app/core/gimptag.c | 2 +-
app/core/gimpviewable.c | 4 +-
app/dialogs/action-search-dialog.c | 5 +-
app/dialogs/dialogs.c | 2 +-
app/dialogs/file-open-location-dialog.c | 40 +-
app/dialogs/preferences-dialog.c | 22 +-
app/display/Makefile.am | 14 +-
app/display/gimpcursorview.c | 2 +
app/display/gimpdisplay.c | 13 +-
app/display/gimpdisplayshell-callbacks.c | 14 +
app/display/gimpdisplayshell-callbacks.h | 2 +
app/display/gimpdisplayshell.c | 5 +-
app/display/gimpdisplayxfer.c | 9 +-
app/display/gimpimagewindow.c | 3 +-
app/display/gimpmotionbuffer.c | 2 +-
app/display/gimpmotionbuffer.h | 2 +-
app/display/gimpstatusbar.c | 71 +-
app/display/gimpstatusbar.h | 1 +
app/display/gimptoolgyroscope.c | 868 ++++++
app/display/gimptoolgyroscope.h | 58 +
app/display/gimptoolrectangle.c | 8 +-
app/errors.c | 3 +-
app/gegl/Makefile.am | 2 +-
app/gegl/gimp-babl.c | 2 +-
app/gegl/gimp-gegl-loops.c | 823 ------
app/gegl/gimp-gegl-loops.cc | 919 +++++++
app/gegl/gimp-gegl-mask-combine.c | 31 +-
app/gegl/gimp-gegl.c | 11 +
app/gegl/gimp-gegl.h | 1 +
app/gegl/gimptilehandlervalidate.c | 31 +-
app/gegl/gimptilehandlervalidate.h | 1 -
app/gui/Makefile.am | 12 +-
app/gui/gui-message.c | 2 +-
app/gui/gui-unique.c | 2 +-
app/gui/gui.c | 2 +-
app/gui/themes.c | 83 +-
app/main.c | 8 +
app/menus/menus.c | 4 +-
app/operations/gimpoperationborder.c | 2 +-
app/operations/gimpoperationgrow.c | 2 +-
app/paint/Makefile.am | 4 +-
app/paint/gimpbrushcore-loops.cc | 429 +++
app/paint/gimpbrushcore-loops.h | 37 +
app/paint/gimpbrushcore.c | 367 +---
app/paint/gimpink.c | 2 +
app/paint/gimpmybrushcore.c | 2 +
app/paint/gimpmybrushsurface.c | 2 +-
app/paint/gimppaintcore-loops.c | 440 ---
app/paint/gimppaintcore-loops.cc | 471 ++++
app/paint/gimppaintcore-loops.h | 7 +
app/paint/gimppaintcore.c | 6 +-
app/paint/gimpsmudge.c | 24 +
app/pdb/plug-in-compat-cmds.c | 2 +-
app/pdb/selection-cmds.c | 13 +-
app/plug-in/gimppluginmanager-file-procedure.c | 2 +-
app/plug-in/gimppluginmanager.c | 2 +-
app/propgui/Makefile.am | 2 +
app/propgui/gimppropgui-panorama-projection.c | 144 +
app/propgui/gimppropgui-panorama-projection.h | 35 +
app/propgui/gimppropgui.c | 3 +
app/propgui/propgui-types.h | 10 +-
app/sanity.c | 4 +-
app/tests.c | 4 +-
app/tests/test-ui.c | 2 +-
app/text/gimptextlayer-xcf.c | 1 +
app/tools/Makefile.am | 2 +
app/tools/gimpcagetool.h | 2 +-
app/tools/gimpfiltertool-widgets.c | 91 +
app/tools/gimpfiltertool.c | 18 +-
app/tools/gimpfliptool.c | 4 +-
app/tools/gimpforegroundselecttool.c | 9 +
app/tools/gimpiscissorstool.c | 2 +-
app/tools/gimpoperationtool.c | 2 +-
app/tools/gimppainttool-paint.c | 510 ++++
app/tools/gimppainttool-paint.h | 37 +
app/tools/gimppainttool.c | 162 +-
app/tools/gimppainttool.h | 31 +-
app/tools/gimpregionselecttool.c | 2 +-
app/tools/gimpseamlessclonetool.c | 6 +-
app/tools/gimptransformtool.c | 2 +-
app/tools/gimpwarptool.c | 2 +-
app/tools/tool_manager.c | 68 +-
app/vectors/gimpbezierstroke.c | 2 +-
app/vectors/gimpvectors-preview.h | 2 +-
app/widgets/Makefile.am | 12 +-
app/widgets/gimpaction-history.c | 7 +-
app/widgets/gimpcairo-wilber.c | 384 +++-
app/widgets/gimpcairo-wilber.h | 27 +-
app/widgets/gimpcolorframe.c | 41 +-
app/widgets/gimpcolorframe.h | 5 +
app/widgets/gimpcursor.c | 2 +
app/widgets/gimpdashboard.c | 234 ++-
app/widgets/gimpdashboard.h | 3 +
app/widgets/gimpdnd.c | 2 +-
app/widgets/gimpdock.c | 2 +-
app/widgets/gimpdockbook.c | 2 +-
app/widgets/gimphelp-ids.h | 1 +
app/widgets/gimphistogramview.c | 2 +-
app/widgets/gimppaletteview.c | 2 +-
app/widgets/gimppanedbox.c | 4 +-
app/widgets/gimpsearchpopup.c | 2 +-
app/widgets/gimpselectiondata.c | 2 +-
app/widgets/widgets-enums.h | 2 +
app/xcf/xcf-load.c | 51 +-
app/xcf/xcf-save.c | 33 +-
build/flatpak/flathub | 2 +-
build/flatpak/org.gimp.GIMP-dev.json | 39 +-
build/flatpak/org.gimp.GIMP-nightly.json | 36 +-
configure.ac | 84 +-
cursors/Makefile.am | 2 +
cursors/gimp-tool-cursors.xcf | Bin 77065 -> 78346 bytes
cursors/modifier-rotate.png | Bin 0 -> 183 bytes
cursors/modifier-zoom.png | Bin 0 -> 173 bytes
desktop/.gitignore | 1 +
desktop/Makefile.am | 11 +-
desktop/org.gimp.GIMP.appdata.xml.in.in | 53 +-
devel-docs/contexts.txt | 2 +-
devel-docs/debugging-tips.txt | 3 +
docs/gimprc.5.in | 6 +-
etc/.gitignore | 1 +
etc/Makefile.am | 9 +-
etc/{gimprc => gimprc.in} | 6 +-
etc/templaterc | 14 +-
libgimp/Makefile.am | 18 +-
libgimp/gimp.c | 195 ++-
libgimp/gimpui.c | 113 +-
libgimpbase/Makefile.am | 15 +-
libgimpbase/gimpmetadata.c | 11 +
libgimpbase/gimputils.c | 68 +-
libgimpthumb/Makefile.am | 15 +-
libgimpwidgets/Makefile.am | 15 +-
m4macros/Makefile.am | 1 +
m4macros/ax_cxx_compile_stdcxx.m4 | 980 +++++++
menus/dashboard-menu.xml | 7 +-
menus/image-menu.xml.in | 2 +-
menus/menus.xsl | 6 -
pdb/groups/plug_in_compat.pdb | 2 +-
pdb/groups/selection.pdb | 13 +-
plug-ins/common/file-png.c | 4 +-
plug-ins/script-fu/Makefile.am | 22 +-
po-libgimp/fr.po | 95 +-
po-libgimp/pl.po | 55 +-
po-plug-ins/fr.po | 297 ++-
po-plug-ins/pl.po | 8 +-
po-plug-ins/sv.po | 84 +-
po-script-fu/fr.po | 1202 ++-------
po-windows-installer/fr.po | 114 +-
po/POTFILES.in | 2 +
po/ca.po | 852 ++++---
po/eu.po | 2 +-
po/fr.po | 2847 ++++++++++++--------
po/pl.po | 1700 +++++++-----
po/ru.po | 2234 ++++++++-------
themes/Dark/Makefile.am | 4 +-
themes/Dark/gtkrc | 266 ++-
themes/Dark/ui/arrow-right.png | Bin 226 -> 4994 bytes
themes/Dark/ui/button-default.png | Bin 517 -> 1134 bytes
themes/Dark/ui/button-prelight.png | Bin 369 -> 1835 bytes
themes/Dark/ui/button-pressed.png | Bin 377 -> 1653 bytes
themes/Dark/ui/check1.png | Bin 247 -> 1758 bytes
themes/Dark/ui/check2.png | Bin 7436 -> 4223 bytes
themes/Dark/ui/check3.png | Bin 5978 -> 6348 bytes
themes/Dark/ui/combo-entry-border-active-bg.png | Bin 191 -> 4930 bytes
.../Dark/ui/combo-entry-border-active-notebook.png | Bin 185 -> 4929 bytes
.../ui/combo-entry-border-active-rtl-notebook.png | Bin 185 -> 4932 bytes
themes/Dark/ui/combo-entry-border-bg.png | Bin 191 -> 4926 bytes
themes/Dark/ui/combo-entry-border-disabled-bg.png | Bin 191 -> 4928 bytes
.../ui/combo-entry-border-disabled-notebook.png | Bin 185 -> 4928 bytes
.../Dark/ui/combo-entry-border-disabled-rtl-bg.png | Bin 191 -> 4933 bytes
.../combo-entry-border-disabled-rtl-notebook.png | Bin 185 -> 4931 bytes
themes/Dark/ui/combo-entry-border-notebook.png | Bin 185 -> 942 bytes
themes/Dark/ui/combo-entry-border-rtl-bg.png | Bin 191 -> 4931 bytes
themes/Dark/ui/combo-entry-border-rtl-notebook.png | Bin 185 -> 4932 bytes
themes/Dark/ui/combo-entry-button-active-rtl.png | Bin 175 -> 4934 bytes
themes/Dark/ui/combo-entry-button-active.png | Bin 175 -> 4935 bytes
themes/Dark/ui/combo-entry-button-disabled-rtl.png | Bin 191 -> 4962 bytes
themes/Dark/ui/combo-entry-button-disabled.png | Bin 191 -> 4937 bytes
themes/Dark/ui/combo-entry-button-rtl.png | Bin 191 -> 4939 bytes
themes/Dark/ui/combo-entry-button.png | Bin 191 -> 972 bytes
themes/Dark/ui/entry-border-active-bg.png | Bin 197 -> 4939 bytes
themes/Dark/ui/entry-border-active-notebook.png | Bin 168 -> 4940 bytes
themes/Dark/ui/entry-border-disabled-bg.png | Bin 150 -> 4941 bytes
themes/Dark/ui/entry-border-disabled-notebook.png | Bin 150 -> 4939 bytes
themes/Dark/ui/entry-border-fill-active.png | Bin 125 -> 4896 bytes
themes/Dark/ui/entry-border-fill.png | Bin 125 -> 4891 bytes
themes/Dark/ui/entry-border-notebook.png | Bin 172 -> 4924 bytes
themes/Dark/ui/ext-bottom.png | Bin 148 -> 5205 bytes
themes/Dark/ui/ext-left.png | Bin 149 -> 5355 bytes
themes/Dark/ui/extension-bottom.png | Bin 3911 -> 5284 bytes
themes/Dark/ui/frame-gap-end.png | Bin 124 -> 4892 bytes
themes/Dark/ui/frame-gap-start.png | Bin 124 -> 4892 bytes
themes/Dark/ui/frame.png | Bin 168 -> 5166 bytes
themes/Dark/ui/gimp-button-default.png | Bin 517 -> 1149 bytes
themes/Dark/ui/gimp-button-insensitive.png | Bin 4068 -> 1392 bytes
themes/Dark/ui/gimp-button-normal.png | Bin 4066 -> 5419 bytes
themes/Dark/ui/gimp-button-prelight.png | Bin 4141 -> 1308 bytes
themes/Dark/ui/gimp-button-pressed.png | Bin 4523 -> 1216 bytes
themes/Dark/ui/gimp-line-h.png | Bin 141 -> 4888 bytes
themes/Dark/ui/gimp-line-v.png | Bin 140 -> 4887 bytes
themes/Dark/ui/gimp-menu-line-h.png | Bin 139 -> 4908 bytes
themes/Dark/ui/list_header-pressed.png | Bin 159 -> 5249 bytes
themes/Dark/ui/list_header.png | Bin 170 -> 5248 bytes
themes/Dark/ui/menu-arrow.png | Bin 188 -> 5173 bytes
themes/Dark/ui/menuitem.png | Bin 167 -> 862 bytes
themes/Dark/ui/minus.png | Bin 6041 -> 5578 bytes
themes/Dark/ui/option1.png | Bin 333 -> 5017 bytes
themes/Dark/ui/option2.png | Bin 8204 -> 6701 bytes
themes/Dark/ui/option3.png | Bin 7622 -> 6087 bytes
themes/Dark/ui/plus.png | Bin 6384 -> 6023 bytes
themes/Dark/ui/shadow-in-alt.png | Bin 161 -> 2407 bytes
themes/Dark/ui/slider-h.png | Bin 212 -> 897 bytes
themes/Dark/ui/slider-v.png | Bin 181 -> 900 bytes
themes/Dark/ui/spin-insensitive.png | Bin 180 -> 1405 bytes
themes/Dark/ui/spin.png | Bin 201 -> 1188 bytes
themes/Darker/.gitignore | 2 -
themes/Darker/Makefile.am | 131 -
themes/Darker/gtkrc | 2512 -----------------
themes/Darker/ui/arrow-down-insens.png | Bin 228 -> 0 bytes
themes/Darker/ui/arrow-down-prelight.png | Bin 223 -> 0 bytes
themes/Darker/ui/arrow-down-small-insens.png | Bin 224 -> 0 bytes
themes/Darker/ui/arrow-down-small-prelight.png | Bin 212 -> 0 bytes
themes/Darker/ui/arrow-down-small.png | Bin 212 -> 0 bytes
themes/Darker/ui/arrow-down.png | Bin 223 -> 0 bytes
themes/Darker/ui/arrow-left-insens.png | Bin 226 -> 0 bytes
themes/Darker/ui/arrow-left-prelight.png | Bin 226 -> 0 bytes
themes/Darker/ui/arrow-left.png | Bin 226 -> 0 bytes
themes/Darker/ui/arrow-right-insens.png | Bin 226 -> 0 bytes
themes/Darker/ui/arrow-right-prelight.png | Bin 226 -> 0 bytes
themes/Darker/ui/arrow-right.png | Bin 226 -> 0 bytes
themes/Darker/ui/arrow-up-insens.png | Bin 224 -> 0 bytes
themes/Darker/ui/arrow-up-prelight.png | Bin 219 -> 0 bytes
themes/Darker/ui/arrow-up-small-insens.png | Bin 202 -> 0 bytes
themes/Darker/ui/arrow-up-small-prelight.png | Bin 198 -> 0 bytes
themes/Darker/ui/arrow-up-small.png | Bin 198 -> 0 bytes
themes/Darker/ui/arrow-up.png | Bin 219 -> 0 bytes
themes/Darker/ui/bar-h.png | Bin 161 -> 0 bytes
themes/Darker/ui/bar-v.png | Bin 165 -> 0 bytes
themes/Darker/ui/button-default.png | Bin 517 -> 0 bytes
themes/Darker/ui/button-insensitive.png | Bin 334 -> 0 bytes
themes/Darker/ui/button-normal.png | Bin 375 -> 0 bytes
themes/Darker/ui/button-prelight.png | Bin 369 -> 0 bytes
themes/Darker/ui/button-pressed.png | Bin 377 -> 0 bytes
themes/Darker/ui/check1.png | Bin 247 -> 0 bytes
themes/Darker/ui/check2.png | Bin 7436 -> 0 bytes
themes/Darker/ui/check3.png | Bin 5978 -> 0 bytes
themes/Darker/ui/combo-entry-border-active-bg.png | Bin 191 -> 0 bytes
.../ui/combo-entry-border-active-notebook.png | Bin 185 -> 0 bytes
.../ui/combo-entry-border-active-rtl-notebook.png | Bin 185 -> 0 bytes
themes/Darker/ui/combo-entry-border-bg.png | Bin 191 -> 0 bytes
.../Darker/ui/combo-entry-border-disabled-bg.png | Bin 191 -> 0 bytes
.../ui/combo-entry-border-disabled-notebook.png | Bin 185 -> 0 bytes
.../ui/combo-entry-border-disabled-rtl-bg.png | Bin 191 -> 0 bytes
.../combo-entry-border-disabled-rtl-notebook.png | Bin 185 -> 0 bytes
themes/Darker/ui/combo-entry-border-notebook.png | Bin 185 -> 0 bytes
themes/Darker/ui/combo-entry-border-rtl-bg.png | Bin 191 -> 0 bytes
.../Darker/ui/combo-entry-border-rtl-notebook.png | Bin 185 -> 0 bytes
themes/Darker/ui/combo-entry-button-active-rtl.png | Bin 175 -> 0 bytes
themes/Darker/ui/combo-entry-button-active.png | Bin 175 -> 0 bytes
.../Darker/ui/combo-entry-button-disabled-rtl.png | Bin 191 -> 0 bytes
themes/Darker/ui/combo-entry-button-disabled.png | Bin 191 -> 0 bytes
themes/Darker/ui/combo-entry-button-rtl.png | Bin 191 -> 0 bytes
themes/Darker/ui/combo-entry-button.png | Bin 191 -> 0 bytes
themes/Darker/ui/entry-border-active-bg.png | Bin 197 -> 0 bytes
themes/Darker/ui/entry-border-active-notebook.png | Bin 168 -> 0 bytes
themes/Darker/ui/entry-border-disabled-bg.png | Bin 150 -> 0 bytes
.../Darker/ui/entry-border-disabled-notebook.png | Bin 150 -> 0 bytes
themes/Darker/ui/entry-border-fill-active.png | Bin 125 -> 0 bytes
themes/Darker/ui/entry-border-fill.png | Bin 125 -> 0 bytes
themes/Darker/ui/entry-border-notebook-null.png | Bin 4013 -> 0 bytes
themes/Darker/ui/entry-border-notebook.png | Bin 172 -> 0 bytes
themes/Darker/ui/ext-bottom.png | Bin 148 -> 0 bytes
themes/Darker/ui/ext-left.png | Bin 149 -> 0 bytes
themes/Darker/ui/ext-right.png | Bin 148 -> 0 bytes
themes/Darker/ui/ext-top.png | Bin 148 -> 0 bytes
themes/Darker/ui/extension-bottom.png | Bin 148 -> 0 bytes
themes/Darker/ui/extension-left.png | Bin 149 -> 0 bytes
themes/Darker/ui/extension-right.png | Bin 148 -> 0 bytes
themes/Darker/ui/extension-top.png | Bin 148 -> 0 bytes
themes/Darker/ui/frame-gap-end.png | Bin 124 -> 0 bytes
themes/Darker/ui/frame-gap-start.png | Bin 124 -> 0 bytes
themes/Darker/ui/frame.png | Bin 168 -> 0 bytes
themes/Darker/ui/gap_bottom.png | Bin 142 -> 0 bytes
themes/Darker/ui/gap_left.png | Bin 144 -> 0 bytes
themes/Darker/ui/gap_right.png | Bin 141 -> 0 bytes
themes/Darker/ui/gap_top.png | Bin 143 -> 0 bytes
themes/Darker/ui/gimp-arrow-down-insensitive.png | Bin 185 -> 0 bytes
themes/Darker/ui/gimp-arrow-down-insenstive.png | Bin 185 -> 0 bytes
themes/Darker/ui/gimp-arrow-down.png | Bin 170 -> 0 bytes
themes/Darker/ui/gimp-arrow-left.png | Bin 166 -> 0 bytes
themes/Darker/ui/gimp-arrow-right-dark.png | Bin 173 -> 0 bytes
themes/Darker/ui/gimp-arrow-right.png | Bin 160 -> 0 bytes
themes/Darker/ui/gimp-arrow-up.png | Bin 171 -> 0 bytes
themes/Darker/ui/gimp-button-default.png | Bin 517 -> 0 bytes
themes/Darker/ui/gimp-button-insensitive.png | Bin 4068 -> 0 bytes
themes/Darker/ui/gimp-button-normal.png | Bin 4066 -> 0 bytes
themes/Darker/ui/gimp-button-prelight.png | Bin 4154 -> 0 bytes
themes/Darker/ui/gimp-button-pressed.png | Bin 4523 -> 0 bytes
themes/Darker/ui/gimp-handle-h.png | Bin 4927 -> 0 bytes
themes/Darker/ui/gimp-handle-v.png | Bin 4911 -> 0 bytes
themes/Darker/ui/gimp-line-h.png | Bin 141 -> 0 bytes
themes/Darker/ui/gimp-line-v.png | Bin 140 -> 0 bytes
themes/Darker/ui/gimp-menu-line-h.png | Bin 139 -> 0 bytes
themes/Darker/ui/gimp-tooltip-bg.png | Bin 393 -> 0 bytes
themes/Darker/ui/list_header-pressed.png | Bin 159 -> 0 bytes
themes/Darker/ui/list_header.png | Bin 170 -> 0 bytes
themes/Darker/ui/menu-arrow-prelight.png | Bin 179 -> 0 bytes
themes/Darker/ui/menu-arrow.png | Bin 188 -> 0 bytes
themes/Darker/ui/menu.png | Bin 141 -> 0 bytes
themes/Darker/ui/menubar.png | Bin 141 -> 0 bytes
themes/Darker/ui/menuitem-prelight.png | Bin 125 -> 0 bytes
themes/Darker/ui/menuitem.png | Bin 167 -> 0 bytes
themes/Darker/ui/minus.png | Bin 6041 -> 0 bytes
themes/Darker/ui/notebook.png | Bin 3675 -> 0 bytes
themes/Darker/ui/null.png | Bin 3398 -> 0 bytes
themes/Darker/ui/option1.png | Bin 333 -> 0 bytes
themes/Darker/ui/option2.png | Bin 8204 -> 0 bytes
themes/Darker/ui/option3.png | Bin 7622 -> 0 bytes
themes/Darker/ui/plus.png | Bin 6384 -> 0 bytes
themes/Darker/ui/progressbar-trough.png | Bin 130 -> 0 bytes
themes/Darker/ui/progressbar.png | Bin 145 -> 0 bytes
themes/Darker/ui/shadow-in-alt.png | Bin 161 -> 0 bytes
themes/Darker/ui/shadow-in.png | Bin 159 -> 0 bytes
themes/Darker/ui/shadow-null.png | Bin 146 -> 0 bytes
themes/Darker/ui/shadow-out.png | Bin 182 -> 0 bytes
themes/Darker/ui/slider-h.png | Bin 212 -> 0 bytes
themes/Darker/ui/slider-v.png | Bin 181 -> 0 bytes
themes/Darker/ui/spin-down-insensitive.png | Bin 151 -> 0 bytes
themes/Darker/ui/spin-down-normal.png | Bin 148 -> 0 bytes
themes/Darker/ui/spin-down-pressed.png | Bin 148 -> 0 bytes
themes/Darker/ui/spin-insensitive.png | Bin 180 -> 0 bytes
themes/Darker/ui/spin-up-insensitive.png | Bin 151 -> 0 bytes
themes/Darker/ui/spin-up-normal.png | Bin 151 -> 0 bytes
themes/Darker/ui/spin-up-pressed.png | Bin 151 -> 0 bytes
themes/Darker/ui/spin.png | Bin 201 -> 0 bytes
themes/Darker/ui/toolbar.png | Bin 326 -> 0 bytes
themes/Darker/ui/transparent.png | Bin 122 -> 0 bytes
themes/Gray/Makefile.am | 4 +-
themes/{Darker => Gray}/ui/down-pre.png | Bin 159 -> 159 bytes
themes/{Darker => Gray}/ui/down.png | Bin 160 -> 160 bytes
themes/{Lighter => Gray}/ui/spin-fill-bg.png | Bin 3397 -> 3397 bytes
themes/Light/Makefile.am | 4 +-
themes/Lighter/.gitignore | 2 -
themes/Lighter/Makefile.am | 131 -
themes/Lighter/gtkrc | 2529 -----------------
themes/Lighter/ui/arrow-down-insens.png | Bin 232 -> 0 bytes
themes/Lighter/ui/arrow-down-prelight.png | Bin 221 -> 0 bytes
themes/Lighter/ui/arrow-down-small-insens.png | Bin 231 -> 0 bytes
themes/Lighter/ui/arrow-down-small-prelight.png | Bin 207 -> 0 bytes
themes/Lighter/ui/arrow-down-small.png | Bin 207 -> 0 bytes
themes/Lighter/ui/arrow-down.png | Bin 221 -> 0 bytes
themes/Lighter/ui/arrow-left-insens.png | Bin 228 -> 0 bytes
themes/Lighter/ui/arrow-left-prelight.png | Bin 227 -> 0 bytes
themes/Lighter/ui/arrow-left.png | Bin 227 -> 0 bytes
themes/Lighter/ui/arrow-right-insens.png | Bin 236 -> 0 bytes
themes/Lighter/ui/arrow-right-prelight.png | Bin 225 -> 0 bytes
themes/Lighter/ui/arrow-right.png | Bin 225 -> 0 bytes
themes/Lighter/ui/arrow-up-insens.png | Bin 231 -> 0 bytes
themes/Lighter/ui/arrow-up-prelight.png | Bin 221 -> 0 bytes
themes/Lighter/ui/arrow-up-small-insens.png | Bin 208 -> 0 bytes
themes/Lighter/ui/arrow-up-small-prelight.png | Bin 199 -> 0 bytes
themes/Lighter/ui/arrow-up-small.png | Bin 199 -> 0 bytes
themes/Lighter/ui/arrow-up.png | Bin 221 -> 0 bytes
themes/Lighter/ui/bar-h.png | Bin 175 -> 0 bytes
themes/Lighter/ui/bar-v.png | Bin 181 -> 0 bytes
themes/Lighter/ui/button-default.png | Bin 515 -> 0 bytes
themes/Lighter/ui/button-insensitive.png | Bin 380 -> 0 bytes
themes/Lighter/ui/button-normal.png | Bin 422 -> 0 bytes
themes/Lighter/ui/button-prelight.png | Bin 414 -> 0 bytes
themes/Lighter/ui/button-pressed.png | Bin 419 -> 0 bytes
themes/Lighter/ui/check1.png | Bin 288 -> 0 bytes
themes/Lighter/ui/check2.png | Bin 290 -> 0 bytes
themes/Lighter/ui/check3.png | Bin 272 -> 0 bytes
themes/Lighter/ui/combo-entry-border-active-bg.png | Bin 153 -> 0 bytes
.../ui/combo-entry-border-active-notebook.png | Bin 153 -> 0 bytes
.../ui/combo-entry-border-active-rtl-notebook.png | Bin 152 -> 0 bytes
themes/Lighter/ui/combo-entry-border-bg.png | Bin 3446 -> 0 bytes
.../Lighter/ui/combo-entry-border-disabled-bg.png | Bin 153 -> 0 bytes
.../ui/combo-entry-border-disabled-notebook.png | Bin 153 -> 0 bytes
.../ui/combo-entry-border-disabled-rtl-bg.png | Bin 152 -> 0 bytes
.../combo-entry-border-disabled-rtl-notebook.png | Bin 152 -> 0 bytes
themes/Lighter/ui/combo-entry-border-notebook.png | Bin 153 -> 0 bytes
themes/Lighter/ui/combo-entry-border-rtl-bg.png | Bin 152 -> 0 bytes
.../Lighter/ui/combo-entry-border-rtl-notebook.png | Bin 152 -> 0 bytes
.../Lighter/ui/combo-entry-button-active-rtl.png | Bin 147 -> 0 bytes
themes/Lighter/ui/combo-entry-button-active.png | Bin 148 -> 0 bytes
.../Lighter/ui/combo-entry-button-disabled-rtl.png | Bin 153 -> 0 bytes
themes/Lighter/ui/combo-entry-button-disabled.png | Bin 152 -> 0 bytes
themes/Lighter/ui/combo-entry-button-rtl.png | Bin 153 -> 0 bytes
themes/Lighter/ui/combo-entry-button.png | Bin 3485 -> 0 bytes
themes/Lighter/ui/entry-border-active-bg.png | Bin 154 -> 0 bytes
themes/Lighter/ui/entry-border-active-notebook.png | Bin 154 -> 0 bytes
themes/Lighter/ui/entry-border-disabled-bg.png | Bin 171 -> 0 bytes
.../Lighter/ui/entry-border-disabled-notebook.png | Bin 171 -> 0 bytes
.../Lighter/ui/entry-border-fill-active-item.png | Bin 125 -> 0 bytes
themes/Lighter/ui/entry-border-fill-active.png | Bin 141 -> 0 bytes
themes/Lighter/ui/entry-border-fill.png | Bin 141 -> 0 bytes
themes/Lighter/ui/entry-border-notebook-null.png | Bin 4013 -> 0 bytes
themes/Lighter/ui/entry-border-notebook.png | Bin 193 -> 0 bytes
themes/Lighter/ui/ext-bottom.png | Bin 166 -> 0 bytes
themes/Lighter/ui/ext-left.png | Bin 166 -> 0 bytes
themes/Lighter/ui/ext-right.png | Bin 164 -> 0 bytes
themes/Lighter/ui/ext-top.png | Bin 166 -> 0 bytes
themes/Lighter/ui/extension-bottom.png | Bin 166 -> 0 bytes
themes/Lighter/ui/extension-left.png | Bin 166 -> 0 bytes
themes/Lighter/ui/extension-right.png | Bin 164 -> 0 bytes
themes/Lighter/ui/extension-top.png | Bin 166 -> 0 bytes
themes/Lighter/ui/frame-gap-end.png | Bin 168 -> 0 bytes
themes/Lighter/ui/frame-gap-start.png | Bin 168 -> 0 bytes
themes/Lighter/ui/frame.png | Bin 212 -> 0 bytes
themes/Lighter/ui/gap_bottom.png | Bin 186 -> 0 bytes
themes/Lighter/ui/gap_left.png | Bin 189 -> 0 bytes
themes/Lighter/ui/gap_right.png | Bin 186 -> 0 bytes
themes/Lighter/ui/gap_top.png | Bin 187 -> 0 bytes
themes/Lighter/ui/gimp-arrow-down-insensitive.png | Bin 236 -> 0 bytes
themes/Lighter/ui/gimp-arrow-down-insenstive.png | Bin 236 -> 0 bytes
themes/Lighter/ui/gimp-arrow-down.png | Bin 218 -> 0 bytes
themes/Lighter/ui/gimp-arrow-left.png | Bin 220 -> 0 bytes
themes/Lighter/ui/gimp-arrow-right-dark.png | Bin 232 -> 0 bytes
themes/Lighter/ui/gimp-arrow-right-prelight.png | Bin 179 -> 0 bytes
themes/Lighter/ui/gimp-arrow-right.png | Bin 221 -> 0 bytes
themes/Lighter/ui/gimp-arrow-up.png | Bin 216 -> 0 bytes
themes/Lighter/ui/gimp-button-default.png | Bin 5763 -> 0 bytes
themes/Lighter/ui/gimp-button-insensitive.png | Bin 4124 -> 0 bytes
themes/Lighter/ui/gimp-button-normal.png | Bin 4205 -> 0 bytes
themes/Lighter/ui/gimp-button-prelight.png | Bin 4513 -> 0 bytes
themes/Lighter/ui/gimp-button-pressed.png | Bin 4092 -> 0 bytes
themes/Lighter/ui/gimp-handle-h.png | Bin 5112 -> 0 bytes
themes/Lighter/ui/gimp-handle-v.png | Bin 5062 -> 0 bytes
themes/Lighter/ui/gimp-line-h.png | Bin 185 -> 0 bytes
themes/Lighter/ui/gimp-line-v.png | Bin 184 -> 0 bytes
themes/Lighter/ui/gimp-menu-line-h.png | Bin 183 -> 0 bytes
themes/Lighter/ui/gimp-tooltip-bg.png | Bin 438 -> 0 bytes
themes/Lighter/ui/list_header-pressed.png | Bin 203 -> 0 bytes
themes/Lighter/ui/list_header.png | Bin 214 -> 0 bytes
themes/Lighter/ui/menu-arrow-prelight.png | Bin 3548 -> 0 bytes
themes/Lighter/ui/menu-arrow.png | Bin 3626 -> 0 bytes
themes/Lighter/ui/menu.png | Bin 3399 -> 0 bytes
themes/Lighter/ui/menubar.png | Bin 3402 -> 0 bytes
themes/Lighter/ui/menuitem.png | Bin 3412 -> 0 bytes
themes/Lighter/ui/minus.png | Bin 264 -> 0 bytes
themes/Lighter/ui/notebook.png | Bin 3657 -> 0 bytes
themes/Lighter/ui/null.png | Bin 173 -> 0 bytes
themes/Lighter/ui/option1.png | Bin 371 -> 0 bytes
themes/Lighter/ui/option2.png | Bin 367 -> 0 bytes
themes/Lighter/ui/option3.png | Bin 360 -> 0 bytes
themes/Lighter/ui/plus.png | Bin 269 -> 0 bytes
themes/Lighter/ui/progressbar-trough.png | Bin 164 -> 0 bytes
themes/Lighter/ui/progressbar.png | Bin 161 -> 0 bytes
themes/Lighter/ui/shadow-in-alt.png | Bin 206 -> 0 bytes
themes/Lighter/ui/shadow-in.png | Bin 219 -> 0 bytes
themes/Lighter/ui/shadow-null.png | Bin 146 -> 0 bytes
themes/Lighter/ui/shadow-out.png | Bin 228 -> 0 bytes
themes/Lighter/ui/slider-h.png | Bin 203 -> 0 bytes
themes/Lighter/ui/slider-v.png | Bin 190 -> 0 bytes
themes/Lighter/ui/spin-down-insensitive.png | Bin 213 -> 0 bytes
themes/Lighter/ui/spin-down-normal.png | Bin 200 -> 0 bytes
themes/Lighter/ui/spin-down-pressed.png | Bin 204 -> 0 bytes
themes/Lighter/ui/spin-insensitive.png | Bin 224 -> 0 bytes
themes/Lighter/ui/spin-up-insensitive.png | Bin 194 -> 0 bytes
themes/Lighter/ui/spin-up-normal.png | Bin 202 -> 0 bytes
themes/Lighter/ui/spin-up-pressed.png | Bin 194 -> 0 bytes
themes/Lighter/ui/spin.png | Bin 244 -> 0 bytes
themes/Lighter/ui/toolbar.png | Bin 326 -> 0 bytes
themes/Lighter/ui/transparent.png | Bin 179 -> 0 bytes
themes/Makefile.am | 2 +-
tools/Makefile.am | 12 +-
521 files changed, 13200 insertions(+), 12671 deletions(-)
---
diff --cc libgimpbase/gimputils.c
index d6a6020,eb2c5ad..0fe204d
--- a/libgimpbase/gimputils.c
+++ b/libgimpbase/gimputils.c
@@@ -38,16 -38,30 +38,22 @@@
#include <glib/gprintf.h>
#if defined(G_OS_WIN32)
-
-/* This is a hack for Windows known directory support.
- * DATADIR (autotools-generated constant) is a type defined in objidl.h
- * so we must #undef it before including shlobj.h in order to avoid a
- * name clash. */
-#undef DATADIR
-#include <windows.h>
-#include <shlobj.h>
-
+# include <windows.h>
+# include <shlobj.h>
#else /* G_OS_WIN32 */
-
-/* For waitpid() */
-#include <sys/wait.h>
-#include <unistd.h>
-#include <errno.h>
+ /* For waitpid() */
+# include <sys/wait.h>
+# include <unistd.h>
+# include <errno.h>
+
+ /* For thread IDs. */
-#include <sys/types.h>
-#include <sys/syscall.h>
++# include <sys/types.h>
++# include <sys/syscall.h>
+
-#ifdef HAVE_SYS_PRCTL_H
-#include <sys/prctl.h>
-#endif
+# ifdef HAVE_SYS_PRCTL_H
+# include <sys/prctl.h>
+# endif
+
#endif /* G_OS_WIN32 */
#include "gimpbasetypes.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
