Add StartupWMClass xdg desktop entry (#1312)

* Revert "Fix bug 69294 : Incorrect application icon (#1307)"

This reverts commit 8bbe159.

* Add StartupWMClass

win-linux/package/linux/Makefile

@@ -148,7 +148,6 @@ build : $(LINUX_DEPS)
 	mkdir -p $@/main/opt/$(DESKTOPEDITORS_PREFIX)
 	cp -rft $@/main/opt/$(DESKTOPEDITORS_PREFIX) $(SOURCE_DIR)/desktopeditors/*
 	chmod 755 $@/main/opt/$(DESKTOPEDITORS_PREFIX)/DesktopEditors
-	ln -s DesktopEditors $@/main/opt/$(DESKTOPEDITORS_PREFIX)/$(DESKTOPEDITORS_EXEC)
 
 	cd $@; \
 	for path in main/$(HELP_GLOB); do \

win-linux/package/linux/common/desktopeditors.desktop.m4

@@ -26,6 +26,7 @@ Keywords=Text;Document;OpenDocument Text;Microsoft Word;Microsoft Works;odt;doc;
 Categories=Office;WordProcessor;Spreadsheet;Presentation;
 MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;text/spreadsheet;application/csv;application/excel;application/x-excel;application/x-msexcel;application/x-ms-excel;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;x-scheme-handler/M4_SCHEME_HANDLER;ifelse(M4_COMPANY_NAME,ONLYOFFICE,text/docxf;text/oform;application/pdf;)
 Actions=NewDocument;NewSpreadsheet;NewPresentation;ifelse(M4_COMPANY_NAME, ONLYOFFICE, NewForm;)
+StartupWMClass=M4_COMPANY_NAME M4_PRODUCT_NAME
 
 [Desktop Action NewDocument]
 Name=defn('NEWDOCUMENT[Name[en]]')

win-linux/package/linux/common/desktopeditors.sh.m4

@@ -133,4 +133,4 @@ export LD_LIBRARY_PATH=$DIR$LDLPATH,
 DIR_MV=/opt/M4_MEDIAVIEWER_PREFIX
 export LD_LIBRARY_PATH=$DIR:$DIR/converter:$DIR_MV$LDLPATH
 export VLC_PLUGIN_PATH=$DIR_MV/plugins)
-exec $DIR/M4_DESKTOPEDITORS_EXEC "$@"
+exec $DIR/DesktopEditors "$@"