summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Cheng <qantas94heavy@gmail.com>2019-02-20 08:36:01 +0000
committerQantas94Heavy <qantas94heavy@gmail.com>2019-02-20 22:39:01 +0000
commita6d9645ac2743a85aad1d763e7a5db1e65cefdfa (patch)
treee4bb5bba0dc07df6c5550cf1d974b16b4f04f623
parentRemove unneded code from previous commit (diff)
downloadinkscape-a6d9645ac2743a85aad1d763e7a5db1e65cefdfa.tar.gz
inkscape-a6d9645ac2743a85aad1d763e7a5db1e65cefdfa.zip
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.
-rw-r--r--CMakeScripts/inkscape-desktop.cmake2
-rw-r--r--org.inkscape.Inkscape.desktop.in22
2 files changed, 1 insertions, 23 deletions
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