From 78ae5ca374ccff3644b702f36bfa4b932aabfcb7 Mon Sep 17 00:00:00 2001
From: Chen Asraf <casraf@pm.me>
Date: Sat, 26 Oct 2024 18:18:21 +0300
Subject: Fix Linux desktop files

---
 misc/dist/linux/org.godotengine.Godot.appdata.xml  | 36 --------------------
 misc/dist/linux/org.godotengine.Godot.desktop      | 20 -----------
 misc/dist/linux/org.godotengine.Godot.xml          | 39 ----------------------
 misc/dist/linux/org.redotengine.Redot.appdata.xml  | 36 ++++++++++++++++++++
 misc/dist/linux/org.redotengine.Redot.desktop      | 20 +++++++++++
 misc/dist/linux/org.redotengine.Redot.xml          | 39 ++++++++++++++++++++++
 .../linuxbsd/wayland/display_server_wayland.cpp    |  2 +-
 7 files changed, 96 insertions(+), 96 deletions(-)
 delete mode 100644 misc/dist/linux/org.godotengine.Godot.appdata.xml
 delete mode 100644 misc/dist/linux/org.godotengine.Godot.desktop
 delete mode 100644 misc/dist/linux/org.godotengine.Godot.xml
 create mode 100644 misc/dist/linux/org.redotengine.Redot.appdata.xml
 create mode 100644 misc/dist/linux/org.redotengine.Redot.desktop
 create mode 100644 misc/dist/linux/org.redotengine.Redot.xml

diff --git a/misc/dist/linux/org.godotengine.Godot.appdata.xml b/misc/dist/linux/org.godotengine.Godot.appdata.xml
deleted file mode 100644
index 774b5c5633..0000000000
--- a/misc/dist/linux/org.godotengine.Godot.appdata.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2017-2022 Rémi Verschelde <remi@godotengine.org> -->
-<component type="desktop">
-  <id>org.redotengine.Redot</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>MIT</project_license>
-  <name>Redot Engine</name>
-  <summary>Multi-platform 2D and 3D game engine with a feature-rich editor</summary>
-  ​<launchable type="desktop-id">org.redotengine.Redot.desktop</launchable>
-  <description>
-    <p>
-      Redot is forked from Godot which is an advanced, feature-packed, multi-platform 2D and 3D game
-      engine. It provides a huge set of common tools, so you can just focus on
-      making your game without reinventing the wheel.
-    </p>
-    <p>
-      Redot is completely free and open source under the very permissive MIT
-      license. No strings attached, no royalties, nothing. Your game is yours,
-      down to the last line of engine code.
-    </p>
-  </description>
-  <screenshots>
-    <screenshot type="default" width="1330" height="720">
-      <caption>3D project loaded in the Redot Engine editor</caption>
-      <image>https://download.tuxfamily.org/godotengine/media/screenshots/editor_3d_fracteed-720p.jpg</image>
-    </screenshot>
-  </screenshots>
-  <url type="homepage">https://redotengine.org</url>
-  <url type="bugtracker">https://github.com/redot-engine/redot-engine/issues</url>
-  <url type="faq">https://docs.godotengine.org/en/latest/about/faq.html</url>
-  <url type="help">https://docs.godotengine.org</url>
-  <url type="donation">https://www.savethechildren.org</url>
-  <url type="translate">https://hosted.weblate.org/projects/godot-engine/godot</url>
-  <developer_name>The Redot Engine Community</developer_name>
-  <update_contact>redotengine@gmail.com</update_contact>
-</component>
diff --git a/misc/dist/linux/org.godotengine.Godot.desktop b/misc/dist/linux/org.godotengine.Godot.desktop
deleted file mode 100644
index d81e76bc90..0000000000
--- a/misc/dist/linux/org.godotengine.Godot.desktop
+++ /dev/null
@@ -1,20 +0,0 @@
-[Desktop Entry]
-Name=Redot Engine
-GenericName=forked game engine
-GenericName[el]=Ελεύθερη μηχανή παιχνιδιού
-GenericName[fr]=Moteur de jeu forked
-GenericName[nl]=Forked game-engine
-GenericName[zh_CN]=自由的游戏引擎
-Comment=Multi-platform 2D and 3D game engine with a feature-rich editor
-Comment[el]=2D και 3D μηχανή παιχνιδιού πολλαπλών πλατφορμών με επεξεργαστή πλούσιο σε χαρακτηριστικά
-Comment[fr]=Moteur de jeu 2D et 3D multiplateforme avec un éditeur riche en fonctionnalités
-Comment[nl]=Multi-platform 2D- en 3d-game-engine met een veelzijdige editor
-Comment[zh_CN]=多平台 2D 和 3D 游戏引擎，带有功能丰富的编辑器
-Exec=redot %f
-Icon=redot
-Terminal=false
-PrefersNonDefaultGPU=true
-Type=Application
-MimeType=application/x-godot-project;
-Categories=Development;IDE;
-StartupWMClass=Godot
diff --git a/misc/dist/linux/org.godotengine.Godot.xml b/misc/dist/linux/org.godotengine.Godot.xml
deleted file mode 100644
index cd3f179ac4..0000000000
--- a/misc/dist/linux/org.godotengine.Godot.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-godot-project">
-    <comment>Redot Engine project</comment>
-    <sub-class-of type="text/plain"/>
-    <icon name="x-godot-project"/>
-    <glob pattern="*.godot"/>
-    <glob pattern="*.redot"/>
-  </mime-type>
-
-  <mime-type type="application/x-godot-resource">
-    <comment>Redot Engine resource</comment>
-    <icon name="x-godot-resource"/>
-    <glob pattern="*.res"/>
-    <glob pattern="*.tres"/>
-  </mime-type>
-
-  <mime-type type="application/x-godot-scene">
-    <comment>Redot Engine scene</comment>
-    <icon name="x-godot-scene"/>
-    <glob pattern="*.scn"/>
-    <glob pattern="*.tscn"/>
-    <glob pattern="*.escn"/>
-  </mime-type>
-
-  <mime-type type="application/x-godot-shader">
-    <comment>Redot Engine shader</comment>
-    <sub-class-of type="text/plain"/>
-    <icon name="x-godot-shader"/>
-    <glob pattern="*.gdshader"/>
-  </mime-type>
-
-  <mime-type type="application/x-gdscript">
-    <comment>GDScript script</comment>
-    <sub-class-of type="text/plain"/>
-    <icon name="x-gdscript"/>
-    <glob pattern="*.gd"/>
-  </mime-type>
-</mime-info>
diff --git a/misc/dist/linux/org.redotengine.Redot.appdata.xml b/misc/dist/linux/org.redotengine.Redot.appdata.xml
new file mode 100644
index 0000000000..ab540690dd
--- /dev/null
+++ b/misc/dist/linux/org.redotengine.Redot.appdata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2017-2022 Rémi Verschelde <remi@godotengine.org> -->
+<component type="desktop">
+  <id>org.redotengine.Redot</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>MIT</project_license>
+  <name>Redot Engine</name>
+  <summary>Multi-platform 2D and 3D game engine with a feature-rich editor</summary>
+  <launchable type="desktop-id">org.redotengine.Redot.desktop</launchable>
+  <description>
+    <p>
+      Redot is forked from Godot which is an advanced, feature-packed, multi-platform 2D and 3D game
+      engine. It provides a huge set of common tools, so you can just focus on
+      making your game without reinventing the wheel.
+    </p>
+    <p>
+      Redot is completely free and open source under the very permissive MIT
+      license. No strings attached, no royalties, nothing. Your game is yours,
+      down to the last line of engine code.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default" width="1330" height="720">
+      <caption>3D project loaded in the Redot Engine editor</caption>
+      <image>https://download.tuxfamily.org/godotengine/media/screenshots/editor_3d_fracteed-720p.jpg</image>
+    </screenshot>
+  </screenshots>
+  <url type="homepage">https://redotengine.org</url>
+  <url type="bugtracker">https://github.com/redot-engine/redot-engine/issues</url>
+  <url type="faq">https://docs.godotengine.org/en/latest/about/faq.html</url>
+  <url type="help">https://docs.godotengine.org</url>
+  <url type="donation">https://www.savethechildren.org</url>
+  <url type="translate">https://hosted.weblate.org/projects/godot-engine/godot</url>
+  <developer_name>The Redot Engine Community</developer_name>
+  <update_contact>redotengine@gmail.com</update_contact>
+</component>
diff --git a/misc/dist/linux/org.redotengine.Redot.desktop b/misc/dist/linux/org.redotengine.Redot.desktop
new file mode 100644
index 0000000000..d81e76bc90
--- /dev/null
+++ b/misc/dist/linux/org.redotengine.Redot.desktop
@@ -0,0 +1,20 @@
+[Desktop Entry]
+Name=Redot Engine
+GenericName=forked game engine
+GenericName[el]=Ελεύθερη μηχανή παιχνιδιού
+GenericName[fr]=Moteur de jeu forked
+GenericName[nl]=Forked game-engine
+GenericName[zh_CN]=自由的游戏引擎
+Comment=Multi-platform 2D and 3D game engine with a feature-rich editor
+Comment[el]=2D και 3D μηχανή παιχνιδιού πολλαπλών πλατφορμών με επεξεργαστή πλούσιο σε χαρακτηριστικά
+Comment[fr]=Moteur de jeu 2D et 3D multiplateforme avec un éditeur riche en fonctionnalités
+Comment[nl]=Multi-platform 2D- en 3d-game-engine met een veelzijdige editor
+Comment[zh_CN]=多平台 2D 和 3D 游戏引擎，带有功能丰富的编辑器
+Exec=redot %f
+Icon=redot
+Terminal=false
+PrefersNonDefaultGPU=true
+Type=Application
+MimeType=application/x-godot-project;
+Categories=Development;IDE;
+StartupWMClass=Godot
diff --git a/misc/dist/linux/org.redotengine.Redot.xml b/misc/dist/linux/org.redotengine.Redot.xml
new file mode 100644
index 0000000000..cd3f179ac4
--- /dev/null
+++ b/misc/dist/linux/org.redotengine.Redot.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-godot-project">
+    <comment>Redot Engine project</comment>
+    <sub-class-of type="text/plain"/>
+    <icon name="x-godot-project"/>
+    <glob pattern="*.godot"/>
+    <glob pattern="*.redot"/>
+  </mime-type>
+
+  <mime-type type="application/x-godot-resource">
+    <comment>Redot Engine resource</comment>
+    <icon name="x-godot-resource"/>
+    <glob pattern="*.res"/>
+    <glob pattern="*.tres"/>
+  </mime-type>
+
+  <mime-type type="application/x-godot-scene">
+    <comment>Redot Engine scene</comment>
+    <icon name="x-godot-scene"/>
+    <glob pattern="*.scn"/>
+    <glob pattern="*.tscn"/>
+    <glob pattern="*.escn"/>
+  </mime-type>
+
+  <mime-type type="application/x-godot-shader">
+    <comment>Redot Engine shader</comment>
+    <sub-class-of type="text/plain"/>
+    <icon name="x-godot-shader"/>
+    <glob pattern="*.gdshader"/>
+  </mime-type>
+
+  <mime-type type="application/x-gdscript">
+    <comment>GDScript script</comment>
+    <sub-class-of type="text/plain"/>
+    <icon name="x-gdscript"/>
+    <glob pattern="*.gd"/>
+  </mime-type>
+</mime-info>
diff --git a/platform/linuxbsd/wayland/display_server_wayland.cpp b/platform/linuxbsd/wayland/display_server_wayland.cpp
index 119b62c24e..8c2ec317ff 100644
--- a/platform/linuxbsd/wayland/display_server_wayland.cpp
+++ b/platform/linuxbsd/wayland/display_server_wayland.cpp
@@ -70,7 +70,7 @@ String DisplayServerWayland::_get_app_id_from_context(Context p_context) {
 			if (config_name.length() != 0) {
 				app_id = config_name;
 			} else {
-				app_id = "org.godotengine.Godot";
+				app_id = "org.redotengine.Redot";
 			}
 		}
 	}
-- 
cgit v1.2.3