[gimp/gimp-attributes-wip: 326/328] Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
- From: Hartmut Kuhse <hartmutkuhse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-attributes-wip: 326/328] Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
- Date: Sun, 21 Aug 2016 09:48:03 +0000 (UTC)
commit b870a67791d82ef00a5aaf16a46df214acc6ef29
Merge: 2e06258 73c664e
Author: Hartmut Kuhse <hk_priv gmx de>
Date: Sun Aug 21 08:47:46 2016 +0200
Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
Conflicts:
app/core/gimpimage.c
AUTHORS | 1 +
INSTALL.in | 1 +
NEWS | 79 +-
app/config/Makefile.am | 2 +
app/config/config-types.h | 1 +
app/config/gimpcoreconfig.c | 15 -
app/config/gimpcoreconfig.h | 1 -
app/config/gimpdialogconfig.c | 118 +
app/config/gimpdialogconfig.h | 52 +
app/config/gimpdisplayconfig.c | 7 +-
app/config/gimppluginconfig.c | 2 +-
app/config/gimppluginconfig.h | 4 +-
app/core/core-enums.h | 2 +-
app/core/gimp.c | 2 +
app/core/gimpdrawable-transform.c | 25 +-
app/core/gimpgradient.c | 2 +-
app/core/gimpimage-color-profile.c | 153 +-
app/core/gimpimage-color-profile.h | 1 +
app/core/gimpimage-private.h | 1 +
app/core/gimpimage.c | 15 +-
app/core/gimpsymmetry-mandala.c | 35 +-
app/core/gimpsymmetry-mirror.c | 141 +-
app/core/gimpsymmetry-mirror.h | 4 +-
app/core/gimpsymmetry-tiling.c | 71 +-
app/dialogs/preferences-dialog.c | 6 +-
app/display/gimpdisplayshell-close.c | 6 +-
app/display/gimpdisplayshell-rotate.c | 130 +-
app/display/gimpdisplayshell-rulers.c | 73 +-
app/display/gimpdisplayshell-scale.c | 276 +-
app/display/gimpdisplayshell-scale.h | 8 +
app/display/gimpdisplayshell-scroll.c | 102 +-
app/display/gimpdisplayshell-scrollbars.c | 66 +-
app/display/gimpdisplayshell-transform.c | 68 +-
app/display/gimpimagewindow.c | 16 +-
app/display/gimpnavigationeditor.c | 25 +-
app/file/file-open.c | 8 +-
app/gui/gui-unique.c | 286 +-
app/operations/gimpoperationcolorerasemode.c | 15 +-
app/paint/gimpmybrushcore.c | 289 +-
app/plug-in/gimpplugin-progress.c | 16 +-
app/tests/test-gimpidtable.c | 50 +-
app/tools/gimpbycolorselecttool.c | 22 +-
app/tools/gimpoperationtool.c | 14 +
app/tools/gimptexttool-editor.c | 37 +-
app/widgets/gimpdockcolumns.c | 41 +
app/widgets/gimpnavigationview.c | 149 +-
app/widgets/gimpnavigationview.h | 5 +-
app/widgets/gimppopup.c | 42 +-
app/widgets/gimppropgui-constructors.c | 73 +-
app/widgets/gimppropgui-constructors.h | 5 +
app/widgets/gimppropgui.c | 32 +-
app/widgets/gimppropgui.h | 3 +
app/widgets/gimpsearchpopup.c | 8 -
app/widgets/gimpsymmetryeditor.c | 7 +-
app/widgets/gimptoolpalette.c | 1 +
app/xcf/xcf.c | 4 +-
authors.xml | 1 +
configure.ac | 39 +-
devel-docs/icons.txt | 114 +
docs/gimprc.5.in | 33 +-
etc/gimprc | 32 +-
icons/Prototype/Color/16/gimp-bottom.png | Bin 634 -> 0 bytes
icons/Prototype/Color/16/gimp-channel-delete.png | Bin 911 -> 0 bytes
icons/Prototype/Color/16/gimp-channel-down.png | Bin 877 -> 0 bytes
icons/Prototype/Color/16/gimp-channel-edit.png | Bin 999 -> 0 bytes
icons/Prototype/Color/16/gimp-channel-new.png | Bin 845 -> 0 bytes
icons/Prototype/Color/16/gimp-channel-up.png | Bin 867 -> 0 bytes
icons/Prototype/Color/16/gimp-color-profile.png | Bin 884 -> 0 bytes
icons/Prototype/Color/16/gimp-configure.png | Bin 948 -> 0 bytes
icons/Prototype/Color/16/gimp-cut.png | Bin 993 -> 0 bytes
icons/Prototype/Color/16/gimp-delete.png | Bin 832 -> 0 bytes
icons/Prototype/Color/16/gimp-folder-open.png | Bin 652 -> 0 bytes
.../Color/16/gimp-image-fit-to-window.png | Bin 833 -> 0 bytes
icons/Prototype/Color/16/gimp-image-property.png | Bin 825 -> 0 bytes
icons/Prototype/Color/16/gimp-information.png | Bin 1078 -> 0 bytes
icons/Prototype/Color/16/gimp-layer-delete.png | Bin 744 -> 0 bytes
icons/Prototype/Color/16/gimp-layer-down.png | Bin 932 -> 0 bytes
icons/Prototype/Color/16/gimp-layer-new.png | Bin 778 -> 0 bytes
icons/Prototype/Color/16/gimp-layer-newgroup.png | Bin 840 -> 0 bytes
icons/Prototype/Color/16/gimp-layer-up.png | Bin 929 -> 0 bytes
icons/Prototype/Color/16/gimp-new-unit.png | Bin 866 -> 0 bytes
icons/Prototype/Color/16/gimp-okay.png | Bin 861 -> 0 bytes
icons/Prototype/Color/16/gimp-one-to-one.png | Bin 942 -> 0 bytes
icons/Prototype/Color/16/gimp-restore.png | Bin 642 -> 0 bytes
icons/Prototype/Color/16/gimp-revoke.png | Bin 646 -> 0 bytes
icons/Prototype/Color/16/gimp-script.png | Bin 613 -> 0 bytes
icons/Prototype/Color/16/gimp-search.png | Bin 958 -> 0 bytes
icons/Prototype/Color/16/gimp-set-scale.png | Bin 978 -> 0 bytes
icons/Prototype/Color/16/gimp-template-a3.png | Bin 757 -> 0 bytes
icons/Prototype/Color/16/gimp-template-a4.png | Bin 735 -> 0 bytes
icons/Prototype/Color/16/gimp-template-a5.png | Bin 761 -> 0 bytes
icons/Prototype/Color/16/gimp-template-b4.png | Bin 762 -> 0 bytes
icons/Prototype/Color/16/gimp-template-b5.png | Bin 765 -> 0 bytes
.../Prototype/Color/16/gimp-template-cd-label.png | Bin 1055 -> 0 bytes
.../Color/16/gimp-template-floppy-label.png | Bin 782 -> 0 bytes
icons/Prototype/Color/16/gimp-template-us.png | Bin 743 -> 0 bytes
.../Color/16/gimp-tool-options-delete.png | Bin 902 -> 0 bytes
.../Color/16/gimp-tool-options-restore.png | Bin 865 -> 0 bytes
.../Prototype/Color/16/gimp-tool-options-save.png | Bin 861 -> 0 bytes
.../Color/16/gimp-window-fit-to-image.png | Bin 960 -> 0 bytes
.../Prototype/Color/16/gimp-window-fit-to-size.png | Bin 874 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-bottom.png | Bin 521 -> 0 bytes
.../Prototype/Symbolic/16/gimp-channel-delete.png | Bin 677 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-channel-down.png | Bin 578 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-channel-edit.png | Bin 615 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-channel-new.png | Bin 469 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-channel-up.png | Bin 570 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-configure.png | Bin 859 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-cut.png | Bin 786 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-delete.png | Bin 875 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-folder-open.png | Bin 491 -> 0 bytes
.../Symbolic/16/gimp-image-fit-to-window.png | Bin 710 -> 0 bytes
.../Prototype/Symbolic/16/gimp-image-property.png | Bin 717 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-information.png | Bin 785 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-layer-delete.png | Bin 683 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-layer-down.png | Bin 661 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-layer-new.png | Bin 593 -> 0 bytes
.../Prototype/Symbolic/16/gimp-layer-newgroup.png | Bin 401 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-layer-up.png | Bin 642 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-new-unit.png | Bin 791 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-okay.png | Bin 708 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-one-to-one.png | Bin 674 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-restore.png | Bin 578 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-revoke.png | Bin 573 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-script.png | Bin 668 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-search.png | Bin 688 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-set-scale.png | Bin 714 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-template-a3.png | Bin 591 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-template-a4.png | Bin 564 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-template-a5.png | Bin 585 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-template-a6.png | Bin 592 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-template-b4.png | Bin 599 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-template-b5.png | Bin 607 -> 0 bytes
.../Symbolic/16/gimp-template-cd-label.png | Bin 743 -> 0 bytes
.../Symbolic/16/gimp-template-floppy-label.png | Bin 680 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-template-us.png | Bin 625 -> 0 bytes
.../Symbolic/16/gimp-tool-options-delete.png | Bin 711 -> 0 bytes
.../Symbolic/16/gimp-tool-options-restore.png | Bin 690 -> 0 bytes
.../Symbolic/16/gimp-tool-options-save.png | Bin 668 -> 0 bytes
.../Symbolic/16/gimp-tool-restore-preset.png | Bin 682 -> 0 bytes
icons/Prototype/Symbolic/16/gimp-unvisible.png | Bin 694 -> 0 bytes
.../Symbolic/16/gimp-window-fit-to-image.png | Bin 726 -> 0 bytes
.../Symbolic/16/gimp-window-fit-to-size.png | Bin 709 -> 0 bytes
icons/Symbolic-Inverted/Makefile.am | 8 +-
libgimpwidgets/gimpenumstore.c | 8 +-
plug-ins/Makefile.am | 5 +
plug-ins/common/border-average.c | 9 +-
plug-ins/common/file-gegl.c | 15 -
plug-ins/common/file-gif-save.c | 18 +-
plug-ins/file-tiff/file-tiff-io.c | 11 +-
plug-ins/file-webp/.gitignore | 7 +
plug-ins/file-webp/Makefile.am | 64 +
plug-ins/file-webp/file-webp-dialog.c | 315 +
plug-ins/file-webp/file-webp-dialog.h | 34 +
plug-ins/file-webp/file-webp-load.c | 262 +
plug-ins/file-webp/file-webp-load.h | 31 +
plug-ins/file-webp/file-webp-save.c | 641 ++
plug-ins/file-webp/file-webp-save.c.orig | 622 ++
plug-ins/file-webp/file-webp-save.h | 49 +
plug-ins/file-webp/file-webp.c | 277 +
plug-ins/file-webp/file-webp.h | 28 +
plug-ins/pygimp/gimpfu.py | 6 +-
plug-ins/pygimp/gimpplugin.py | 4 +
plug-ins/pygimp/gimpui.defs | 5 +
plug-ins/pygimp/gimpui.override | 12 +
plug-ins/pygimp/gimpuimodule.c | 6 +-
plug-ins/pygimp/plug-ins/gradients-save-as-css.py | 2 +-
plug-ins/pygimp/plug-ins/histogram-export.py | 2 +-
plug-ins/pygimp/plug-ins/pyconsole.py | 4 +-
po-libgimp/az.po | 1 +
po-libgimp/bg.po | 1 +
po-libgimp/br.po | 1 +
po-libgimp/ca valencia po | 2 +-
po-libgimp/dz.po | 1 +
po-libgimp/el.po | 137 +-
po-libgimp/en_CA.po | 1 +
po-libgimp/eo.po | 2 +-
po-libgimp/es.po | 163 +-
po-libgimp/fa.po | 1 +
po-libgimp/fr.po | 1 +
po-libgimp/ga.po | 1 +
po-libgimp/gl.po | 2 +-
po-libgimp/gu.po | 1 +
po-libgimp/he.po | 1 +
po-libgimp/hr.po | 1 +
po-libgimp/hu.po | 376 +-
po-libgimp/id.po | 1 +
po-libgimp/km.po | 1 +
po-libgimp/ko.po | 1 +
po-libgimp/mk.po | 1 +
po-libgimp/ms.po | 1 +
po-libgimp/my.po | 1 +
po-libgimp/nb.po | 2 +-
po-libgimp/ne.po | 1 +
po-libgimp/nl.po | 1 +
po-libgimp/nn.po | 2 +-
po-libgimp/pa.po | 1 +
po-libgimp/pl.po | 124 +-
po-libgimp/rw.po | 2 +-
po-libgimp/sl.po | 2 +-
po-libgimp/sr latin po | 1 +
po-libgimp/ta.po | 1 +
po-libgimp/te.po | 2 +-
po-libgimp/vi.po | 1 +
po-libgimp/xh.po | 1 +
po-libgimp/yi.po | 1 +
po-libgimp/zh_CN.po | 1 +
po-libgimp/zh_HK.po | 2 +-
po-plug-ins/POTFILES.in | 4 +
po-plug-ins/bg.po | 1 +
po-plug-ins/br.po | 1 +
po-plug-ins/bs.po | 1 +
po-plug-ins/ca valencia po | 2 +-
po-plug-ins/da.po | 2 +-
po-plug-ins/de.po | 1514 +++---
po-plug-ins/dz.po | 1 +
po-plug-ins/en_CA.po | 1 +
po-plug-ins/eo.po | 2 +-
po-plug-ins/es.po | 2 +-
po-plug-ins/et.po | 1 +
po-plug-ins/fa.po | 1 +
po-plug-ins/fi.po | 1 +
po-plug-ins/fr.po | 1 +
po-plug-ins/ga.po | 1 +
po-plug-ins/gl.po | 2 +-
po-plug-ins/gu.po | 1 +
po-plug-ins/he.po | 1 +
po-plug-ins/hr.po | 1 +
po-plug-ins/hu.po | 1271 +++--
po-plug-ins/id.po | 1 +
po-plug-ins/km.po | 1 +
po-plug-ins/kn.po | 1 +
po-plug-ins/ko.po | 1 +
po-plug-ins/lt.po | 1 +
po-plug-ins/mk.po | 1 +
po-plug-ins/ms.po | 1 +
po-plug-ins/my.po | 1 +
po-plug-ins/nb.po | 2 +-
po-plug-ins/ne.po | 1 +
po-plug-ins/nl.po | 1 +
po-plug-ins/nn.po | 1 +
po-plug-ins/pa.po | 1 +
po-plug-ins/pl.po | 615 ++-
po-plug-ins/pt.po | 549 +-
po-plug-ins/rw.po | 2 +-
po-plug-ins/sl.po | 2 +-
po-plug-ins/sr latin po | 1 +
po-plug-ins/vi.po | 1 +
po-plug-ins/xh.po | 1 +
po-plug-ins/yi.po | 1 +
po-plug-ins/zh_CN.po | 1 +
po-plug-ins/zh_HK.po | 2 +-
po-python/POTFILES.skip | 1 +
po-python/az.po | 1 +
po-python/be.po | 2 +-
po-python/bg.po | 1 +
po-python/br.po | 1 +
po-python/bs.po | 1 +
po-python/ca valencia po | 2 +-
po-python/dz.po | 1 +
po-python/en_CA.po | 1 +
po-python/eo.po | 1 +
po-python/es.po | 2 +-
po-python/et.po | 1 +
po-python/fa.po | 1 +
po-python/fi.po | 1 +
po-python/fr.po | 1 +
po-python/ga.po | 1 +
po-python/gu.po | 1 +
po-python/hr.po | 1 +
po-python/km.po | 1 +
po-python/ko.po | 1 +
po-python/lt.po | 1 +
po-python/mk.po | 1 +
po-python/ms.po | 1 +
po-python/my.po | 1 +
po-python/nb.po | 2 +-
po-python/ne.po | 1 +
po-python/nl.po | 1 +
po-python/pa.po | 43 +-
po-python/pl.po | 76 +-
po-python/rw.po | 2 +-
po-python/sr latin po | 1 +
po-python/te.po | 1 +
po-python/vi.po | 1 +
po-python/xh.po | 1 +
po-python/zh_CN.po | 1 +
po-python/zh_HK.po | 2 +-
po-script-fu/POTFILES.skip | 1 +
po-script-fu/az.po | 2 +-
po-script-fu/br.po | 2 +-
po-script-fu/ca valencia po | 2 +-
po-script-fu/da.po | 2 +-
po-script-fu/en_CA.po | 2 +-
po-script-fu/eo.po | 2 +-
po-script-fu/es.po | 4607 ++++++++-------
po-script-fu/fa.po | 2 +-
po-script-fu/fi.po | 2 +-
po-script-fu/fr.po | 2 +-
po-script-fu/ga.po | 2 +-
po-script-fu/gl.po | 2 +-
po-script-fu/it.po | 2 +-
po-script-fu/km.po | 2 +-
po-script-fu/mk.po | 2 +-
po-script-fu/ms.po | 2 +-
po-script-fu/nb.po | 2 +-
po-script-fu/nn.po | 2 +-
po-script-fu/pa.po | 2 +-
po-script-fu/pl.po | 120 +-
po-script-fu/ro.po | 2 +-
po-script-fu/rw.po | 1 -
po-script-fu/sr latin po | 2 +-
po-script-fu/te.po | 2 +-
po-script-fu/zh_CN.po | 2 +-
po-script-fu/zh_HK.po | 2 +-
po-tags/be.po | 1 +
po-tags/br.po | 1 +
po-tags/bs.po | 1 +
po-tags/ca.po | 1 +
po-tags/ca valencia po | 2 +-
po-tags/da.po | 1 +
po-tags/de.po | 1 +
po-tags/el.po | 1 +
po-tags/eo.po | 1 +
po-tags/es.po | 1 +
po-tags/fr.po | 1 +
po-tags/gl.po | 1 +
po-tags/he.po | 1 +
po-tags/hu.po | 1 +
po-tags/it.po | 1 +
po-tags/lt.po | 1 +
po-tags/lv.po | 1 +
po-tags/nb.po | 2 +-
po-tags/nn.po | 1 +
po-tags/pl.po | 18 +-
po-tags/pt.po | 2 +-
po-tags/pt_BR.po | 2 +-
po-tags/ru.po | 2 +-
po-tags/sl.po | 1 +
po-tags/sr.po | 1 +
po-tags/sr latin po | 1 +
po-tags/sv.po | 1 +
po-tags/te.po | 1 +
po-tags/tr.po | 1 +
po-tags/uk.po | 1 +
po-tags/zh_CN.po | 1 +
po-tags/zh_HK.po | 2 +-
po-tips/bg.po | 1 +
po-tips/br.po | 1 +
po-tips/bs.po | 1 +
po-tips/ca valencia po | 2 +-
po-tips/da.po | 1 +
po-tips/de.po | 1 +
po-tips/dz.po | 1 +
po-tips/en_CA.po | 1 +
po-tips/eo.po | 1 +
po-tips/es.po | 1 +
po-tips/fa.po | 1 +
po-tips/fr.po | 1 +
po-tips/gl.po | 1 +
po-tips/gu.po | 1 +
po-tips/he.po | 1 +
po-tips/hr.po | 1 +
po-tips/hu.po | 1 +
po-tips/id.po | 2 +-
po-tips/it.po | 2 +-
po-tips/km.po | 1 +
po-tips/ko.po | 1 +
po-tips/lt.po | 1 +
po-tips/mk.po | 1 +
po-tips/ms.po | 1 +
po-tips/my.po | 1 +
po-tips/nb.po | 2 +-
po-tips/ne.po | 1 +
po-tips/nl.po | 1 +
po-tips/nn.po | 1 +
po-tips/pa.po | 1 +
po-tips/pl.po | 118 +-
po-tips/pt.po | 2 +-
po-tips/ru.po | 1 +
po-tips/rw.po | 1 +
po-tips/sl.po | 1 +
po-tips/sr.po | 2 +-
po-tips/sr latin po | 2 +-
po-tips/ta.po | 1 +
po-tips/tr.po | 1 +
po-tips/vi.po | 1 +
po-tips/zh_CN.po | 1 +
po-tips/zh_HK.po | 2 +-
po/az.po | 2 +-
po/br.po | 2 +-
po/ca.po | 4 +-
po/ca valencia po | 2 +-
po/de.po | 302 +-
po/el.po | 768 ++--
po/en_CA.po | 2 +-
po/eo.po | 2 +-
po/es.po | 320 +-
po/et.po | 2 +-
po/fa.po | 2 +-
po/fr.po | 2 +-
po/hu.po | 6122 ++++++++------------
po/it.po | 1039 ++--
po/km.po | 2 +-
po/mk.po | 2 +-
po/ms.po | 2 +-
po/nb.po | 2 +-
po/nds.po | 2 +-
po/nn.po | 2 +-
po/pl.po | 1603 +++---
po/pt.po | 389 +-
po/rw.po | 1 -
po/si.po | 2 +-
po/sl.po | 2 +-
po/sr latin po | 2 +-
po/tt.po | 2 +-
po/zh_CN.po | 2 +-
po/zh_HK.po | 2 +-
po/zh_TW.po | 2 +-
themes/Dark/gtkrc | 1 +
themes/Darker/gtkrc | 1 +
themes/Gray/gtkrc | 1 +
themes/Light/gtkrc | 1 +
themes/Lighter/gtkrc | 1 +
tools/.gitignore | 4 +
tools/Makefile.am | 40 +-
426 files changed, 14447 insertions(+), 11475 deletions(-)
---
diff --cc app/core/gimp.c
index 9f44f64,9f44f64..192e385
--- a/app/core/gimp.c
+++ b/app/core/gimp.c
@@@ -36,6 -36,6 +36,8 @@@
#include "plug-in/gimppluginmanager.h"
#include "plug-in/gimppluginmanager-restore.h"
++#include "gui/gimpdebusservice-generated.h"
++
#include "paint/gimp-paint.h"
#include "text/gimp-fonts.h"
diff --cc app/gui/gui-unique.c
index 7eb9517,7eb9517..5ac5c04
--- a/app/gui/gui-unique.c
+++ b/app/gui/gui-unique.c
@@@ -64,7 -64,7 +64,7 @@@ static void gui_unique_quartz_exit (voi
static Gimp *unique_gimp = NULL;
static GimpAppleEventHandler *event_handler = NULL;
--#else
++#endif
static void gui_dbus_service_init (Gimp *gimp);
static void gui_dbus_service_exit (void);
@@@ -72,169 -72,169 +72,169 @@@
static GDBusObjectManagerServer *dbus_manager = NULL;
static guint dbus_name_id = 0;
--#endif
++//#endif
void
gui_unique_init (Gimp *gimp)
{
#ifdef G_OS_WIN32
-- gui_unique_win32_init (gimp);
++// gui_unique_win32_init (gimp);
#elif defined (GDK_WINDOWING_QUARTZ)
gui_unique_quartz_init (gimp);
--#else
-- gui_dbus_service_init (gimp);
#endif
++ gui_dbus_service_init (gimp);
++//#endif
}
void
gui_unique_exit (void)
{
#ifdef G_OS_WIN32
-- gui_unique_win32_exit ();
++// gui_unique_win32_exit ();
#elif defined (GDK_WINDOWING_QUARTZ)
gui_unique_quartz_exit ();
--#else
-- gui_dbus_service_exit ();
#endif
++ gui_dbus_service_exit ();
++//#endif
}
#ifdef G_OS_WIN32
--typedef struct
--{
-- GFile *file;
-- gboolean as_new;
--} IdleOpenData;
--
--static IdleOpenData *
--idle_open_data_new (GFile *file,
-- gboolean as_new)
--{
-- IdleOpenData *data = g_slice_new0 (IdleOpenData);
--
-- data->file = g_object_ref (file);
-- data->as_new = as_new;
--
-- return data;
--}
--
--static void
--idle_open_data_free (IdleOpenData *data)
--{
-- g_object_unref (data->file);
-- g_slice_free (IdleOpenData, data);
--}
--
--static gboolean
--gui_unique_win32_idle_open (IdleOpenData *data)
--{
-- /* We want to be called again later in case that GIMP is not fully
-- * started yet.
-- */
-- if (! gimp_is_restored (unique_gimp))
-- return TRUE;
--
-- if (data->file)
-- {
-- file_open_from_command_line (unique_gimp, data->file,
-- data->as_new, NULL, 0);
-- }
-- else
-- {
-- /* raise the first display */
-- GimpObject *display;
--
-- display = gimp_container_get_first_child (unique_gimp->displays);
--
-- gimp_display_shell_present (gimp_display_get_shell (GIMP_DISPLAY (display)));
-- }
--
-- return FALSE;
--}
--
--static LRESULT CALLBACK
--gui_unique_win32_message_handler (HWND hWnd,
-- UINT uMsg,
-- WPARAM wParam,
-- LPARAM lParam)
--{
-- switch (uMsg)
-- {
-- case WM_COPYDATA:
-- if (unique_gimp)
-- {
-- COPYDATASTRUCT *copydata = (COPYDATASTRUCT *) lParam;
--
-- if (copydata->cbData > 0)
-- {
-- GSource *source;
-- GClosure *closure;
-- GFile *file;
-- IdleOpenData *data;
--
-- file = g_file_new_for_uri (copydata->lpData);
--
-- data = idle_open_data_new (file,
-- copydata->dwData != 0);
--
-- g_object_unref (file);
--
-- closure = g_cclosure_new (G_CALLBACK (gui_unique_win32_idle_open),
-- data,
-- (GClosureNotify) idle_open_data_free);
--
-- g_object_watch_closure (G_OBJECT (unique_gimp), closure);
--
-- source = g_idle_source_new ();
-- g_source_set_priority (source, G_PRIORITY_LOW);
-- g_source_set_closure (source, closure);
-- g_source_attach (source, NULL);
-- g_source_unref (source);
-- }
-- }
-- return TRUE;
--
-- default:
-- return DefWindowProcW (hWnd, uMsg, wParam, lParam);
-- }
--}
--
--static void
--gui_unique_win32_init (Gimp *gimp)
--{
-- WNDCLASSW wc;
--
-- g_return_if_fail (GIMP_IS_GIMP (gimp));
-- g_return_if_fail (unique_gimp == NULL);
--
-- unique_gimp = gimp;
--
-- /* register window class for proxy window */
-- memset (&wc, 0, sizeof (wc));
--
-- wc.hInstance = GetModuleHandle (NULL);
-- wc.lpfnWndProc = gui_unique_win32_message_handler;
-- wc.lpszClassName = GIMP_UNIQUE_WIN32_WINDOW_CLASS;
--
-- RegisterClassW (&wc);
--
-- proxy_window = CreateWindowExW (0,
-- GIMP_UNIQUE_WIN32_WINDOW_CLASS,
-- GIMP_UNIQUE_WIN32_WINDOW_NAME,
-- WS_POPUP, 0, 0, 1, 1, NULL, NULL, wc.hInstance, NULL);
--}
--
--static void
--gui_unique_win32_exit (void)
--{
-- g_return_if_fail (GIMP_IS_GIMP (unique_gimp));
--
-- unique_gimp = NULL;
--
-- DestroyWindow (proxy_window);
--}
++//typedef struct
++//{
++// GFile *file;
++// gboolean as_new;
++//} IdleOpenData;
++//
++//static IdleOpenData *
++//idle_open_data_new (GFile *file,
++// gboolean as_new)
++//{
++// IdleOpenData *data = g_slice_new0 (IdleOpenData);
++//
++// data->file = g_object_ref (file);
++// data->as_new = as_new;
++//
++// return data;
++//}
++//
++//static void
++//idle_open_data_free (IdleOpenData *data)
++//{
++// g_object_unref (data->file);
++// g_slice_free (IdleOpenData, data);
++//}
++//
++//static gboolean
++//gui_unique_win32_idle_open (IdleOpenData *data)
++//{
++// /* We want to be called again later in case that GIMP is not fully
++// * started yet.
++// */
++// if (! gimp_is_restored (unique_gimp))
++// return TRUE;
++//
++// if (data->file)
++// {
++// file_open_from_command_line (unique_gimp, data->file,
++// data->as_new, NULL, 0);
++// }
++// else
++// {
++// /* raise the first display */
++// GimpObject *display;
++//
++// display = gimp_container_get_first_child (unique_gimp->displays);
++//
++// gimp_display_shell_present (gimp_display_get_shell (GIMP_DISPLAY (display)));
++// }
++//
++// return FALSE;
++//}
++//
++//static LRESULT CALLBACK
++//gui_unique_win32_message_handler (HWND hWnd,
++// UINT uMsg,
++// WPARAM wParam,
++// LPARAM lParam)
++//{
++// switch (uMsg)
++// {
++// case WM_COPYDATA:
++// if (unique_gimp)
++// {
++// COPYDATASTRUCT *copydata = (COPYDATASTRUCT *) lParam;
++//
++// if (copydata->cbData > 0)
++// {
++// GSource *source;
++// GClosure *closure;
++// GFile *file;
++// IdleOpenData *data;
++//
++// file = g_file_new_for_uri (copydata->lpData);
++//
++// data = idle_open_data_new (file,
++// copydata->dwData != 0);
++//
++// g_object_unref (file);
++//
++// closure = g_cclosure_new (G_CALLBACK (gui_unique_win32_idle_open),
++// data,
++// (GClosureNotify) idle_open_data_free);
++//
++// g_object_watch_closure (G_OBJECT (unique_gimp), closure);
++//
++// source = g_idle_source_new ();
++// g_source_set_priority (source, G_PRIORITY_LOW);
++// g_source_set_closure (source, closure);
++// g_source_attach (source, NULL);
++// g_source_unref (source);
++// }
++// }
++// return TRUE;
++//
++// default:
++// return DefWindowProcW (hWnd, uMsg, wParam, lParam);
++// }
++//}
++//
++//static void
++//gui_unique_win32_init (Gimp *gimp)
++//{
++// WNDCLASSW wc;
++//
++// g_return_if_fail (GIMP_IS_GIMP (gimp));
++// g_return_if_fail (unique_gimp == NULL);
++//
++// unique_gimp = gimp;
++//
++// /* register window class for proxy window */
++// memset (&wc, 0, sizeof (wc));
++//
++// wc.hInstance = GetModuleHandle (NULL);
++// wc.lpfnWndProc = gui_unique_win32_message_handler;
++// wc.lpszClassName = GIMP_UNIQUE_WIN32_WINDOW_CLASS;
++//
++// RegisterClassW (&wc);
++//
++// proxy_window = CreateWindowExW (0,
++// GIMP_UNIQUE_WIN32_WINDOW_CLASS,
++// GIMP_UNIQUE_WIN32_WINDOW_NAME,
++// WS_POPUP, 0, 0, 1, 1, NULL, NULL, wc.hInstance, NULL);
++//}
++//
++//static void
++//gui_unique_win32_exit (void)
++//{
++// g_return_if_fail (GIMP_IS_GIMP (unique_gimp));
++//
++// unique_gimp = NULL;
++//
++// DestroyWindow (proxy_window);
++//}
#elif defined (GDK_WINDOWING_QUARTZ)
@@@ -364,7 -364,7 +364,7 @@@ gui_unique_quartz_exit (void
event_handler = NULL;
}
--#else
++#endif
static void
gui_dbus_bus_acquired (GDBusConnection *connection,
@@@ -426,4 -426,4 +426,4 @@@ gui_dbus_service_exit (void
g_object_unref (dbus_manager);
}
--#endif
++//#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
