From 62cb49a4c85e9051b861fdc90b8989a0a4f05598 Mon Sep 17 00:00:00 2001
From: Alexander Schwinn <alexxcons@xfce.org>
Date: Mon, 3 Jun 2019 23:27:15 +0200
Subject: [PATCH] mismatched names between thunar.appdata.xml and
 thunar.desktop (Bug #15498)

---
 Makefile.am                                                   |  4 ++--
 po/POTFILES.in                                                |  4 ++--
 ...k-rename.desktop.in.in => thunar-bulk-rename.desktop.in.in |  0
 thunar.desktop.in.in                                          | 11 +++++++++++
 thunar/thunar-file.c                                          |  2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)
 rename Thunar-bulk-rename.desktop.in.in => thunar-bulk-rename.desktop.in.in (100%)
 create mode 100644 thunar.desktop.in.in

diff --git a/Makefile.am b/Makefile.am
index 4744c0ce..63076bf0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,8 +48,8 @@ dist-hook: ChangeLog
 
 desktopdir = $(datadir)/applications
 desktop_in_in_files = 							\
-	Thunar.desktop.in.in						\
-	Thunar-bulk-rename.desktop.in.in
+	thunar.desktop.in.in						\
+	thunar-bulk-rename.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 %.desktop.in: %.desktop.in.in Makefile
 	$(AM_V_GEN) $(SED) -e "s,\@HELPERDIR\@,$(HELPER_PATH_PREFIX),g" < $< > $@
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 464f1247..63cc7e66 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -122,8 +122,8 @@ plugins/thunar-uca/uca.xml.in
 
 plugins/thunar-wallpaper/twp-provider.c
 
-Thunar.desktop.in.in
-Thunar-bulk-rename.desktop.in.in
+thunar.desktop.in.in
+thunar-bulk-rename.desktop.in.in
 thunar/thunar-settings.desktop.in
 org.xfce.thunar.appdata.xml.in
 org.xfce.thunar.policy.in.in
diff --git a/Thunar-bulk-rename.desktop.in.in b/thunar-bulk-rename.desktop.in.in
similarity index 100%
rename from Thunar-bulk-rename.desktop.in.in
rename to thunar-bulk-rename.desktop.in.in
diff --git a/thunar.desktop.in.in b/thunar.desktop.in.in
new file mode 100644
index 00000000..68801bf2
--- /dev/null
+++ b/thunar.desktop.in.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+_Name=Thunar File Manager
+_Comment=Browse the filesystem with the file manager
+_GenericName=File Manager
+Exec=thunar %F
+Icon=Thunar
+Terminal=false
+StartupNotify=true
+Type=Application
+Categories=System;Utility;Core;GTK;FileTools;FileManager;
+MimeType=inode/directory;
\ No newline at end of file
diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index 4299862d..ece10f05 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -1822,7 +1822,7 @@ thunar_file_launch (ThunarFile  *file,
   /* HACK: check if we're not trying to launch another file manager again, possibly
    * ourselfs which will end in a loop */
   if (g_strcmp0 (g_app_info_get_id (app_info), "exo-file-manager.desktop") == 0
-      || g_strcmp0 (g_app_info_get_id (app_info), "Thunar.desktop") == 0
+      || g_strcmp0 (g_app_info_get_id (app_info), "thunar.desktop") == 0
       || g_strcmp0 (g_app_info_get_name (app_info), "exo-file-manager") == 0)
     {
       g_object_unref (G_OBJECT (app_info));
-- 
2.11.0