[gimp/gtk3-port-meson: 233/235] Merge branch 'gtk3-port' into gtk3-port-meson
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port-meson: 233/235] Merge branch 'gtk3-port' into gtk3-port-meson
- Date: Mon, 12 Feb 2018 16:17:08 +0000 (UTC)
commit c3b37eb8bb9ff7a5bab3dcc6df29e174260f26ce
Merge: 8e187ce 8b3a6bc
Author: Félix Piédallu <felix piedallu me>
Date: Mon Feb 12 15:46:14 2018 +0100
Merge branch 'gtk3-port' into gtk3-port-meson
.gitignore | 6 +-
Makefile.am | 2 +-
app/actions/view-actions.c | 11 +-
app/config/gimpconfig-dump.c | 12 +-
app/core/gimp-user-install.c | 5 +-
app/dialogs/about-dialog.c | 105 ++-
app/dialogs/palette-import-dialog.c | 47 +-
app/dialogs/stroke-dialog.c | 8 +-
app/dialogs/tips-dialog.c | 47 +-
app/display/gimpcanvas.c | 24 +-
app/display/gimpcursorview.c | 18 +-
app/display/gimpdisplayshell-appearance.c | 25 +-
app/display/gimpdisplayshell-callbacks.c | 16 +-
app/display/gimpdisplayshell-callbacks.h | 4 +-
app/display/gimpdisplayshell-expose.c | 19 +-
app/display/gimpdisplayshell-filter.c | 5 +-
app/display/gimpdisplayshell-grab.c | 172 +++-
app/display/gimpdisplayshell-rotate-dialog.c | 4 +-
app/display/gimpdisplayshell-scale-dialog.c | 13 +-
app/display/gimpdisplayshell-tool-events.c | 144 ++--
app/display/gimpdisplayshell.c | 32 +-
app/display/gimpdisplayshell.h | 12 +-
app/display/gimpimagewindow.c | 14 +-
app/display/gimpnavigationeditor.c | 18 +-
app/display/gimpscalecombobox.c | 50 +-
app/display/gimpscalecombobox.h | 14 +-
app/display/gimpstatusbar.c | 130 ++--
app/gui/gui.c | 25 +-
app/gui/splash.c | 45 +-
app/gui/themes.c | 192 ++---
app/tools/gimplevelstool.c | 4 +-
app/tools/gimprotatetool.c | 5 +-
app/tools/gimpsheartool.c | 6 +-
app/tools/gimptexttool-editor.c | 7 +-
app/widgets/Makefile.am | 8 +-
app/widgets/gimpblobeditor.c | 91 ++-
app/widgets/gimpblobeditor.h | 1 +
app/widgets/gimpbrusheditor.c | 18 +-
app/widgets/gimpcairo-wilber.c | 59 +-
app/widgets/gimpcellrendererdashes.c | 103 +--
app/widgets/gimpcellrendererviewable.c | 88 +--
app/widgets/gimpcircle.c | 66 +-
app/widgets/gimpcolorbar.c | 36 +-
app/widgets/gimpcolordialog.c | 9 +-
app/widgets/gimpcolordisplayeditor.c | 10 +-
app/widgets/gimpcoloreditor.c | 35 +-
app/widgets/gimpcolorframe.c | 57 +-
app/widgets/gimpcolormapeditor.c | 36 +-
app/widgets/gimpcombotagentry.c | 119 ++--
app/widgets/gimpcombotagentry.h | 4 +-
app/widgets/gimpcomponenteditor.c | 22 +-
app/widgets/gimpcontainerbox.c | 13 +-
app/widgets/gimpcontainereditor.c | 9 -
app/widgets/gimpcontainergridview.c | 6 +-
app/widgets/gimpcontainericonview.c | 17 +-
app/widgets/gimpcontainertreeview-dnd.c | 2 +-
app/widgets/gimpcontainertreeview.c | 65 +-
app/widgets/gimpcursor.c | 2 +-
app/widgets/gimpcurveview.c | 95 +--
app/widgets/gimpdasheditor.c | 128 ++-
app/widgets/gimpdataeditor.c | 20 +-
app/widgets/gimpdeviceinfo-coords.c | 60 ++-
app/widgets/gimpdeviceinfo.c | 85 +-
app/widgets/gimpdeviceinfo.h | 11 +-
app/widgets/gimpdevicemanager.c | 114 ++-
app/widgets/gimpdevices.c | 145 +++-
app/widgets/gimpdevices.h | 34 +-
app/widgets/gimpdevicestatus.c | 2 -
app/widgets/gimpdial.c | 53 +-
app/widgets/gimpdialogfactory.c | 4 +-
app/widgets/gimpdnd-xds.c | 10 +-
app/widgets/gimpdock.c | 54 +-
app/widgets/gimpdockable.c | 191 +++--
app/widgets/gimpdockbook.c | 65 +--
app/widgets/gimpdockwindow.c | 97 ++-
app/widgets/gimpeditor.c | 18 +-
app/widgets/gimpfgbgeditor.c | 99 ++--
app/widgets/gimpfgbgview.c | 71 +-
app/widgets/gimpfiledialog.c | 1 +
app/widgets/gimpgradienteditor.c | 139 ++--
app/widgets/gimphandlebar.c | 23 +-
app/widgets/gimphistogrambox.c | 12 +-
app/widgets/gimphistogrameditor.c | 10 +-
app/widgets/gimphistogramview.c | 241 ++++--
app/widgets/gimphistogramview.h | 2 +
app/widgets/gimpitemtreeview.c | 24 +-
app/widgets/gimpmenudock.c | 11 +-
app/widgets/gimpmessagebox.c | 182 +++--
app/widgets/gimpmeter.c | 76 +-
app/widgets/gimpnavigationview.c | 36 +-
app/widgets/gimpoverlaybox.c | 82 +-
app/widgets/gimpoverlaychild.c | 102 ++-
app/widgets/gimpoverlaychild.h | 62 +-
app/widgets/gimpoverlaydialog.c | 108 ++-
app/widgets/gimpoverlayframe.c | 110 ++-
app/widgets/gimppaletteeditor.c | 3 +-
app/widgets/gimppaletteview.c | 35 +-
app/widgets/gimppanedbox.c | 12 +-
app/widgets/gimppolar.c | 49 +-
app/widgets/gimppopup.c | 2 +-
app/widgets/gimpsamplepointeditor.c | 26 +-
app/widgets/gimpscalebutton.c | 55 +-
app/widgets/gimpspinscale.c | 482 ++++++-----
app/widgets/gimpstrokeeditor.c | 44 +-
app/widgets/gimptagentry.c | 71 +-
app/widgets/gimptagpopup.c | 254 +++---
app/widgets/gimptextbuffer.c | 13 +-
app/widgets/gimptexteditor.c | 4 +-
app/widgets/gimptexttag.c | 15 +-
app/widgets/gimpthumbbox.c | 50 +-
app/widgets/gimptoolbox.c | 113 +--
app/widgets/gimptooleditor.c | 18 +-
app/widgets/gimptoolpalette.c | 90 ++-
app/widgets/gimpuimanager.c | 27 +-
app/widgets/gimpview.c | 87 +-
app/widgets/gimpviewrenderervectors.c | 5 +-
app/widgets/gimpwidgets-utils.c | 183 ++---
app/widgets/gimpwidgets-utils.h | 7 +-
app/widgets/gtkhwrapbox.c | 607 -------------
app/widgets/gtkhwrapbox.h | 69 --
app/widgets/gtkwrapbox.c | 898 --------------------
app/widgets/gtkwrapbox.h | 134 ---
configure.ac | 83 +--
devel-docs/tools/shooter.c | 6 +-
devel-docs/tools/widgets.c | 25 +-
docs/.gitignore | 6 +-
docs/gimp.1.in | 10 +-
docs/gimprc.5.in | 8 +-
etc/Makefile.am | 2 +-
etc/gimp.css | 9 +
etc/gimprc | 4 +-
etc/gtkrc | 24 -
libgimp/gimpaspectpreview.c | 138 ++--
libgimp/gimpdrawablepreview.c | 45 +-
libgimp/gimpgradientselectbutton.c | 22 +-
libgimp/gimpprocbrowserdialog.c | 10 +-
libgimp/gimpui.c | 48 +-
libgimp/gimpzoompreview.c | 99 ++--
libgimpbase/gimpenv.c | 32 +-
libgimpwidgets/Makefile.am | 10 +-
libgimpwidgets/gimp3migration.c | 9 +
libgimpwidgets/gimp3migration.h | 4 +
libgimpwidgets/gimpbrowser.c | 220 ++++--
libgimpwidgets/gimpbrowser.h | 40 +-
libgimpwidgets/gimpbutton.c | 32 +-
libgimpwidgets/gimpbutton.h | 5 +-
libgimpwidgets/gimpcellrenderercolor.c | 155 ++--
libgimpwidgets/gimpcellrenderercolor.h | 7 +-
libgimpwidgets/gimpcellrenderertoggle.c | 287 +++----
libgimpwidgets/gimpcellrenderertoggle.h | 6 +-
libgimpwidgets/gimpchainbutton.c | 150 +++--
libgimpwidgets/gimpchainbutton.h | 14 +-
libgimpwidgets/gimpcolorarea.c | 368 +++++----
libgimpwidgets/gimpcolorarea.h | 13 +-
libgimpwidgets/gimpcolorbutton.c | 273 ++++---
libgimpwidgets/gimpcolorbutton.h | 12 +-
libgimpwidgets/gimpcolordisplay.c | 77 ++-
libgimpwidgets/gimpcolordisplay.h | 32 +-
libgimpwidgets/gimpcolordisplaystack.c | 110 ++-
libgimpwidgets/gimpcolordisplaystack.h | 48 +-
libgimpwidgets/gimpcolorhexentry.c | 57 +-
libgimpwidgets/gimpcolorhexentry.h | 4 +-
libgimpwidgets/gimpcolornotebook.c | 227 +++--
libgimpwidgets/gimpcolornotebook.h | 22 +-
libgimpwidgets/gimpcolorprofilecombobox.c | 69 +-
libgimpwidgets/gimpcolorprofilecombobox.h | 4 +-
libgimpwidgets/gimpcolorprofilestore.c | 48 +-
libgimpwidgets/gimpcolorprofilestore.h | 2 -
libgimpwidgets/gimpcolorscale.c | 477 +++++------
libgimpwidgets/gimpcolorscale.h | 16 +-
libgimpwidgets/gimpcolorselect.c | 46 +-
libgimpwidgets/gimpcolorselection.c | 326 +++++---
libgimpwidgets/gimpcolorselection.h | 20 +-
libgimpwidgets/gimpcolorselector.h | 33 +-
libgimpwidgets/gimpenumlabel.c | 44 +-
libgimpwidgets/gimpenumlabel.h | 11 +-
libgimpwidgets/gimpframe.c | 88 ++-
libgimpwidgets/gimphelpui.c | 2 +-
libgimpwidgets/gimpintcombobox.h | 15 +-
libgimpwidgets/gimpmemsizeentry.c | 155 +++--
libgimpwidgets/gimpmemsizeentry.h | 29 +-
libgimpwidgets/gimpnumberpairentry.c | 24 +-
libgimpwidgets/gimpoffsetarea.c | 245 +++---
libgimpwidgets/gimpoffsetarea.h | 15 +-
libgimpwidgets/gimpoldwidgets.c | 650 --------------
libgimpwidgets/gimpoldwidgets.h | 122 ---
libgimpwidgets/gimppickbutton-default.c | 22 +-
libgimpwidgets/gimppickbutton-private.h | 27 +
libgimpwidgets/gimppickbutton-quartz.c | 1 +
libgimpwidgets/gimppickbutton.c | 20 +-
libgimpwidgets/gimppickbutton.h | 9 +-
libgimpwidgets/gimppixmap.c | 179 ----
libgimpwidgets/gimppixmap.h | 78 --
libgimpwidgets/gimppreview.c | 6 +-
libgimpwidgets/gimppreviewarea.c | 17 +-
libgimpwidgets/gimppropwidgets.c | 163 +----
libgimpwidgets/gimppropwidgets.h | 8 +-
libgimpwidgets/gimpquerybox.c | 1 -
libgimpwidgets/gimpruler.c | 265 +++---
libgimpwidgets/gimpscaleentry.c | 75 +-
libgimpwidgets/gimpscaleentry.h | 78 +-
libgimpwidgets/gimpscrolledpreview.c | 53 +-
libgimpwidgets/gimpsizeentry.c | 16 +-
libgimpwidgets/gimpunitcombobox.c | 14 +-
libgimpwidgets/gimpunitmenu.c | 633 --------------
libgimpwidgets/gimpunitmenu.h | 105 ---
libgimpwidgets/gimpwidgets.c | 81 +--
libgimpwidgets/gimpwidgets.def | 20 -
libgimpwidgets/gimpwidgets.h | 6 +-
libgimpwidgets/gimpwidgetsutils.c | 10 +-
modules/color-selector-cmyk.c | 6 +-
modules/color-selector-water.c | 56 +-
modules/gimpcolorwheel.c | 273 +++----
plug-ins/Makefile.am | 6 +-
plug-ins/common/Makefile.am | 4 +-
plug-ins/common/align-layers.c | 12 +-
plug-ins/common/animation-play.c | 2 +-
plug-ins/common/blinds.c | 22 +-
plug-ins/common/cartoon.c | 12 +-
plug-ins/common/cml-explorer.c | 102 +--
plug-ins/common/colormap-remap.c | 4 +-
plug-ins/common/compose.c | 20 +-
plug-ins/common/contrast-retinex.c | 14 +-
plug-ins/common/curve-bend.c | 2 +-
plug-ins/common/depth-merge.c | 18 +-
plug-ins/common/despeckle.c | 16 +-
plug-ins/common/destripe.c | 14 +-
plug-ins/common/edge-neon.c | 12 +-
plug-ins/common/emboss.c | 18 +-
plug-ins/common/file-csource.c | 18 +-
plug-ins/common/file-gih.c | 27 +-
plug-ins/common/file-mng.c | 20 +-
plug-ins/common/file-pdf-load.c | 3 +-
plug-ins/common/file-png.c | 32 +-
plug-ins/common/file-raw-data.c | 24 +-
plug-ins/common/file-svg.c | 2 +-
plug-ins/common/file-wmf.c | 2 +-
plug-ins/common/file-xmc.c | 11 +-
plug-ins/common/file-xpm.c | 8 +-
plug-ins/common/film.c | 22 +-
plug-ins/common/filter-pack.c | 51 +-
plug-ins/common/fractal-trace.c | 16 +-
plug-ins/common/jigsaw.c | 20 +-
plug-ins/common/newsprint.c | 72 +-
plug-ins/common/nl-filter.c | 20 +-
plug-ins/common/oilify.c | 18 +-
plug-ins/common/photocopy.c | 12 +-
plug-ins/common/plugin-browser.c | 6 +-
plug-ins/common/ripple.c | 32 +-
plug-ins/common/sample-colorize.c | 22 +-
plug-ins/common/sharpen.c | 12 +-
plug-ins/common/softglow.c | 12 +-
plug-ins/common/sparkle.c | 20 +-
plug-ins/common/sphere-designer.c | 88 +--
plug-ins/common/tile-small.c | 40 +-
plug-ins/common/unit-editor.c | 8 +-
plug-ins/common/unsharp-mask.c | 12 +-
plug-ins/common/van-gogh-lic.c | 16 +-
plug-ins/common/warp.c | 28 +-
plug-ins/common/wavelet-decompose.c | 12 +-
plug-ins/common/web-page.c | 5 +-
plug-ins/file-jpeg/jpeg-save.c | 8 +-
plug-ins/file-webp/file-webp-dialog.c | 37 +-
plug-ins/flame/flame.c | 40 +-
.../fractal-explorer/fractal-explorer-dialogs.c | 22 +-
plug-ins/fractal-explorer/fractal-explorer.h | 40 +-
plug-ins/gfig/gfig-dialog.c | 30 +-
plug-ins/gimpressionist/color.c | 4 +-
plug-ins/gimpressionist/general.c | 20 +-
plug-ins/gimpressionist/orientation.c | 8 +-
plug-ins/gimpressionist/paper.c | 12 +-
plug-ins/gimpressionist/placement.c | 6 +-
plug-ins/gimpressionist/size.c | 8 +-
plug-ins/gimpressionist/sizemap.c | 14 +-
plug-ins/gradient-flare/gradient-flare.c | 94 +-
plug-ins/help-browser/dialog.c | 2 +-
plug-ins/ifs-compose/ifs-compose.c | 6 +-
plug-ins/imagemap/imap_preview.c | 2 +-
plug-ins/imagemap/imap_table.c | 2 +-
plug-ins/lighting/lighting-preview.c | 15 +-
plug-ins/lighting/lighting-preview.h | 4 +-
plug-ins/lighting/lighting-ui.c | 6 +-
plug-ins/map-object/map-object-preview.c | 13 +-
plug-ins/map-object/map-object-preview.h | 4 +-
plug-ins/map-object/map-object-ui.c | 6 +-
plug-ins/pagecurl/pagecurl.c | 18 +-
plug-ins/print/print-preview.c | 58 +-
.../selection-to-path/selection-to-path-dialog.c | 16 +-
po-libgimp/POTFILES.in | 1 -
themes/Small/gimp.css | 99 +++
themes/System/Makefile.am | 2 +-
themes/System/gimp.css | 103 +++
themes/System/gtkrc | 107 ---
tools/.gitignore | 6 +-
tools/Makefile.am | 41 +-
295 files changed, 7247 insertions(+), 10039 deletions(-)
---
diff --cc libgimpbase/gimpenv.c
index 200e69a,bf981ee..98a8e83
--- a/libgimpbase/gimpenv.c
+++ b/libgimpbase/gimpenv.c
@@@ -479,7 -485,7 +479,7 @@@ gimp_data_directory (void
GIMP_DATA_VERSION,
NULL);
- gimp_data_dir = gimp_env_get_dir ("GIMP2_DATADIR", GIMPDATADIR, tmp);
- gimp_data_dir = gimp_env_get_dir ("GIMP3_DATADIR", DATADIR, tmp);
++ gimp_data_dir = gimp_env_get_dir ("GIMP3_DATADIR", GIMPDATADIR, tmp);
g_free (tmp);
}
@@@ -557,7 -563,7 +557,7 @@@ gimp_sysconf_directory (void
GIMP_SYSCONF_VERSION,
NULL);
- gimp_sysconf_dir = gimp_env_get_dir ("GIMP2_SYSCONFDIR", GIMPSYSCONFDIR, tmp);
- gimp_sysconf_dir = gimp_env_get_dir ("GIMP3_SYSCONFDIR", SYSCONFDIR, tmp);
++ gimp_sysconf_dir = gimp_env_get_dir ("GIMP3_SYSCONFDIR", GIMPSYSCONFDIR, tmp);
g_free (tmp);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
