Updated desktop integration files

Author: JanWielemaker

cmake/Desktop.cmake

@@ -7,6 +7,14 @@ if(has_xpce OR has_swipl_win)
   set(DESKTOP_SOURCE ${CMAKE_SOURCE_DIR}/desktop)
   set(SWIPL_INSTALL_DESKTOP ${SWIPL_INSTALL_PREFIX}/desktop)
 
+  if(EPILOG)
+    set(SWIPL_APP_ID org.swi_prolog.swipl-win)
+    set(SWIPL_CLI_ID org.swi_prolog.swipl-win)
+  else()
+    set(SWIPL_APP_ID SWI-Prolog)
+    set(SWIPL_CLI_ID SWI-Prolog)
+  endif()
+
   install_src(icon
     FILES
     ${DESKTOP_SOURCE}/swipl.png
@@ -16,7 +24,7 @@ if(has_xpce OR has_swipl_win)
 
   if(UNIX AND NOT APPLE)
     message("Configuring freedesktop.org desktop files")
-    if(has_swipl_win)
+    if(has_swipl_win OR EPILOG)
       configure_file(${DESKTOP_SOURCE}/swipl-win.desktop.in
 	${SWIPL_BUILD_HOME}/desktop/swipl-win.desktop)
       install(FILES ${SWIPL_BUILD_HOME}/desktop/swipl-win.desktop

desktop/swipl-win.desktop.in

@@ -4,5 +4,6 @@ Exec=@CMAKE_INSTALL_PREFIX@/@SWIPL_INSTALL_ARCH_EXE@/swipl-win %f
 Icon=@CMAKE_INSTALL_PREFIX@/@SWIPL_INSTALL_DESKTOP@/swipl.png
 Type=Application
 Terminal=false
-StartupWMClass=SWI-Prolog
+StartupWMClass=@SWIPL_APP_ID@
+X-AppStream-Identifier=@SWIPL_APP_ID@
 MimeType=application/x-prolog

desktop/swipl.desktop.in

@@ -4,5 +4,6 @@ Exec=@CMAKE_INSTALL_PREFIX@/@SWIPL_INSTALL_ARCH_EXE@/swipl %f
 Icon=@CMAKE_INSTALL_PREFIX@/@SWIPL_INSTALL_DESKTOP@/swipl-cli.png
 Type=Application
 Terminal=true
-StartupWMClass=SWI-Prolog
+StartupWMClass=@SWIPL_CLI_ID@
+X-AppStream-Identifier=@SWIPL_CLI_ID@
 MimeType=application/x-prolog