From: Colin Clark <colin.clark@cclark.uk>
Date: Thu, 30 Nov 2023 16:56:54 +0000 (+0000)
Subject: Bug fix: Change all .desktop files to RDNS style
X-Git-Tag: v2.2~29
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=8abd5eda07e186ac4e53d8fc513b63da72a4c935

Bug fix: Change all .desktop files to RDNS style

Some references to template.desktop were not changed.
---

diff --git a/meson.build b/meson.build
index 7838bd5c..056a20fb 100644
--- a/meson.build
+++ b/meson.build
@@ -26,7 +26,7 @@
 # gq_bindir     /usr/local/lib/geeqie               *   plugins scripts
 # datadir       /usr/local/share/
 #               /usr/local/share/applications           org.geeqie.Geeqie.desktop
-# [gq_]appdir   /usr/local/share/geeqie/            *   template.desktop
+# [gq_]appdir   /usr/local/share/geeqie/            *   org,geeqie.template.desktop
 # desktopdir    /usr/local/share/geeqie/applications    plugin desktop files
 # appdatadir    /usr/local/share/metainfo               org.geeqie.Geeqie.appdata.xml
 # icondir       /usr/local/share/pixmaps                geeqie.png icon
diff --git a/scripts/template-desktop.sh b/scripts/template-desktop.sh
index 654e064b..582ed775 100755
--- a/scripts/template-desktop.sh
+++ b/scripts/template-desktop.sh
@@ -10,7 +10,7 @@
 tmp_file=$(mktemp "${TMPDIR:-/tmp}/geeqie.XXXXXXXXXX")
 path=$(dirname "$(realpath "$0")")
 srcpath=$(dirname "$path")/src/layout-util.cc
-templatepath=$(dirname "$path")/plugins/template.desktop.in
+templatepath=$(dirname "$path")/plugins/org.geeqie.template.desktop.in
 
 awk -v src_path="$srcpath" 'BEGIN {
 menu_flag = 0
@@ -81,7 +81,7 @@ function get_menus()
 cat "$tmp_file"
 printf '%s\n' "$PWD"
 
-if diff --unified=0 "./plugins/template.desktop.in" "$tmp_file" | zenity --title="Plugin template update" --text-info --width=700 --height=400
+if diff --unified=0 "./plugins/org.geeqie.template.desktop.in" "$tmp_file" | zenity --title="Plugin template update" --text-info --width=700 --height=400
 then
 	mv "$tmp_file" "$templatepath"
 else
diff --git a/src/main.cc b/src/main.cc
index 7e361d0f..69881d0d 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1271,7 +1271,7 @@ static void create_application_paths()
 	gq_htmldir = g_build_filename(gq_prefix, GQ_HTMLDIR, NULL);
 	gq_appdir = g_build_filename(gq_prefix, GQ_APPDIR, NULL);
 	gq_bindir = g_build_filename(gq_prefix, GQ_BINDIR, NULL);
-	desktop_file_template = g_build_filename(gq_appdir, "template.desktop", NULL);
+	desktop_file_template = g_build_filename(gq_appdir, "org.geeqie.template.desktop", NULL);
 
 	g_free(dirname);
 	g_free(path);