From 6f574a307681a60457052adf58970646a6d2f82b Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Mon, 29 Sep 2025 19:00:18 -0400
Subject: [PATCH] refactor: set const for Reverse FQDN name to use for
 deployment on linux

---
 CMakeLists.txt                         | 1 +
 deploy/linux/deploy.cmake              | 6 +++---
 src/apps/deskflow-gui/CMakeLists.txt   | 2 +-
 src/apps/deskflow-gui/deskflow-gui.cpp | 2 +-
 src/lib/common/Constants.h.in          | 1 +
 src/lib/platform/XDGPortalRegistry.h   | 3 ++-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f477a64c..6603bd6e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,6 +89,7 @@ set(CMAKE_PROJECT_PROPER_NAME "Deskflow")
 set(CMAKE_PROJECT_VENDOR "${CMAKE_PROJECT_PROPER_NAME} Devs")
 set(CMAKE_PROJECT_COPYRIGHT "(C) 2024-2025 ${CMAKE_PROJECT_VENDOR}")
 set(CMAKE_PROJECT_CONTACT "${CMAKE_PROJECT_PROPER_NAME} <maintainers@deskflow.org>")
+set(CMAKE_PROJECT_REV_FQDN "org.deskflow.deskflow")
 
 #Unset the vars used in the project call
 unset(DESKFLOW_VERSION_MAJOR)
diff --git a/deploy/linux/deploy.cmake b/deploy/linux/deploy.cmake
index b93c3af3c..d827e0ba3 100644
--- a/deploy/linux/deploy.cmake
+++ b/deploy/linux/deploy.cmake
@@ -7,7 +7,7 @@ set(MY_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 # Install our desktop file
 install(
-  FILES ${MY_DIR}/org.deskflow.deskflow.desktop
+  FILES ${MY_DIR}/${CMAKE_PROJECT_REV_FQDN}.desktop
   DESTINATION share/applications
 )
 
@@ -15,12 +15,12 @@ install(
 install(
   FILES ${MY_DIR}/deskflow.png
   DESTINATION share/icons/hicolor/512x512/apps/
-  RENAME org.deskflow.deskflow.png
+  RENAME ${CMAKE_PROJECT_REV_FQDN}.png
 )
 
 # Install our metainfo
 install(
-  FILES ${MY_DIR}/org.deskflow.deskflow.metainfo.xml
+  FILES ${MY_DIR}/${CMAKE_PROJECT_REV_FQDN}.metainfo.xml
   DESTINATION share/metainfo/
 )
 
diff --git a/src/apps/deskflow-gui/CMakeLists.txt b/src/apps/deskflow-gui/CMakeLists.txt
index e822a3261..860034aa4 100644
--- a/src/apps/deskflow-gui/CMakeLists.txt
+++ b/src/apps/deskflow-gui/CMakeLists.txt
@@ -20,7 +20,7 @@ elseif(APPLE)
   set(BUNDLE_EXECUTABLE_NAME "${target}")
   set(BUNDLE_BUNDLE_NAME "${target}")
   set(BUNDLE_DISPLAY_NAME "${target}")
-  set(BUNDLE_GUI_IDENTIFIER "org.deskflow.deskflow")
+  set(BUNDLE_GUI_IDENTIFIER "${CMAKE_PROJECT_REV_FQDN}")
   set(BUNDLE_ICON_FILE ${target}.icns)
   set(BUNDLE_INFO_STRING "${CMAKE_PROJECT_DESCRIPTION}")
   set(BUNDLE_COPYRIGHT "${CMAKE_PROJECT_COPYRIGHT}")
diff --git a/src/apps/deskflow-gui/deskflow-gui.cpp b/src/apps/deskflow-gui/deskflow-gui.cpp
index 0aff866cf..b574ffdb6 100644
--- a/src/apps/deskflow-gui/deskflow-gui.cpp
+++ b/src/apps/deskflow-gui/deskflow-gui.cpp
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
   QCoreApplication::setOrganizationName(kAppName);
   QCoreApplication::setApplicationVersion(kVersion);
   QCoreApplication::setOrganizationDomain(kOrgDomain); // used in prefix, can't be a url
-  QGuiApplication::setDesktopFileName(QStringLiteral("org.deskflow.deskflow"));
+  QGuiApplication::setDesktopFileName(kRevFqdnName);
 
   QApplication app(argc, argv);
 
diff --git a/src/lib/common/Constants.h.in b/src/lib/common/Constants.h.in
index cf9f0ef9f..ef8b58227 100644
--- a/src/lib/common/Constants.h.in
+++ b/src/lib/common/Constants.h.in
@@ -14,6 +14,7 @@ const auto kDaemonBinName = "@CMAKE_PROJECT_NAME@-daemon";
 const auto kDaemonIpcName = "@CMAKE_PROJECT_NAME@-daemon";
 const auto kDaemonLogFilename = "@CMAKE_PROJECT_NAME@-daemon.log";
 const auto kDefaultLogFile = "@CMAKE_PROJECT_NAME@.log";
+const auto kRevFqdnName = "@CMAKE_PROJECT_REV_FQDN@";
 
 const auto kCopyright = //
     "Copyright @CMAKE_PROJECT_COPYRIGHT@\n"
diff --git a/src/lib/platform/XDGPortalRegistry.h b/src/lib/platform/XDGPortalRegistry.h
index abb996855..de5335317 100644
--- a/src/lib/platform/XDGPortalRegistry.h
+++ b/src/lib/platform/XDGPortalRegistry.h
@@ -10,6 +10,7 @@
 #include <QDBusInterface>
 #include <QDBusReply>
 
+#include "common/Constants.h"
 #include "platform/Wayland.h"
 
 namespace deskflow::platform {
@@ -35,7 +36,7 @@ inline void setAppId()
     return;
   }
 
-  std::ignore = i->call("Register", "org.deskflow.deskflow", QVariantMap{});
+  std::ignore = i->call("Register", kRevFqdnName, QVariantMap{});
 }
 
 } // namespace deskflow::platform