From a6d9645ac2743a85aad1d763e7a5db1e65cefdfa Mon Sep 17 00:00:00 2001 From: Karl Cheng Date: Wed, 20 Feb 2019 19:36:01 +1100 Subject: Fix icon location in Linux desktop file This was meant to be fixed by deeb288f but it seems this was overlooked. Also remove .desktop.in file which appears to be unused. --- CMakeScripts/inkscape-desktop.cmake | 2 +- org.inkscape.Inkscape.desktop.in | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 org.inkscape.Inkscape.desktop.in diff --git a/CMakeScripts/inkscape-desktop.cmake b/CMakeScripts/inkscape-desktop.cmake index e25cf5d20..e1f45644e 100644 --- a/CMakeScripts/inkscape-desktop.cmake +++ b/CMakeScripts/inkscape-desktop.cmake @@ -11,7 +11,7 @@ set(INKSCAPE_MIMETYPE "image/svg+xml;image/svg+xml-compressed;application/vnd.co if (ENABLE_BINRELOC) set(INKSCAPE_ICONPATH "\${SNAP}/share/inkscape/branding/inkscape.svg") else() - set(INKSCAPE_ICONPATH "inkscape") + set(INKSCAPE_ICONPATH "org.inkscape.Inkscape") endif() configure_file(${INKSCAPE_BINARY_DIR}/org.inkscape.Inkscape.desktop.template.in ${INKSCAPE_BINARY_DIR}/org.inkscape.Inkscape.desktop) diff --git a/org.inkscape.Inkscape.desktop.in b/org.inkscape.Inkscape.desktop.in deleted file mode 100644 index c0e3cc5e8..000000000 --- a/org.inkscape.Inkscape.desktop.in +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -[Desktop Entry] -Version=1.0 -_Name=Inkscape -_GenericName=Vector Graphics Editor -_X-GNOME-FullName=Inkscape Vector Graphics Editor -_Comment=Create and edit Scalable Vector Graphics images -_Keywords=image;editor;vector;drawing; -Type=Application -Categories=Graphics;VectorGraphics;GTK; -MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;image/cgm;image/x-wmf;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr;application/visio;application/x-visio;application/vnd.visio;application/visio.drawing;application/vsd;application/x-vsd;image/x-vsd; -Exec=inkscape %F -TryExec=inkscape -Terminal=false -StartupNotify=true -Icon=org.inkscape.Inkscape -X-Ayatana-Desktop-Shortcuts=Drawing - -[X-Drawing Shortcut Group] -_Name=New Drawing -Exec=inkscape -TargetEnvironment=Unity -- cgit v1.2.3