morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 16:34:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

[client,desktop] fix StartupWMClass setting

Browse Source
This commit is contained in:
akallabeth
2025-06-26 10:09:27 +02:00
parent 049c34bd0f
commit f48b129414
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/SDL/SDL2/CMakeLists.txt
View File

@@ -79,10 +79,10 @@ if(NOT WITH_CLIENT_SDL_VERSIONED)
endif() endif()
string(TIMESTAMP SDL_CLIENT_YEAR "%Y") string(TIMESTAMP SDL_CLIENT_YEAR "%Y")
set(SDL_CLIENT_UUID "com.freerdp.client.sdl3") set(SDL_CLIENT_UUID "com.freerdp.client.sdl2")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/sdl_config.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/sdl_config.hpp @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/sdl_config.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/sdl_config.hpp @ONLY)
install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client) install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client)
install_freerdp_desktop("${MODULE_NAME}") install_freerdp_desktop("${MODULE_NAME}" "${SDL_CLIENT_UUID}")
add_subdirectory(man) add_subdirectory(man)

2
client/SDL/SDL3/CMakeLists.txt
View File

@@ -85,6 +85,6 @@ set(SDL_CLIENT_UUID "com.freerdp.client.sdl3")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/sdl_config.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/sdl_config.hpp @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/sdl_config.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/sdl_config.hpp @ONLY)
install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client) install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT client)
install_freerdp_desktop("${MODULE_NAME}" "${MODULE_NAME}") install_freerdp_desktop("${MODULE_NAME}" "${SDL_CLIENT_UUID}")
add_subdirectory(man) add_subdirectory(man)

6
cmake/InstallFreeRDPDesktop.cmake
View File

@@ -6,6 +6,12 @@ set(DESKTOP_RESOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../resources" CACHE INTERNAL
function(install_freerdp_desktop name) function(install_freerdp_desktop name)
if(WITH_INSTALL_CLIENT_DESKTOP_FILES) if(WITH_INSTALL_CLIENT_DESKTOP_FILES)
if(${ARGC} GREATER 1)
set(FREERDP_STARTUP_CLASS ${ARGV1})
else()
set(FREERDP_STARTUP_CLASS ${name})
endif()
get_target_property(FREERDP_APP_NAME ${name} OUTPUT_NAME) get_target_property(FREERDP_APP_NAME ${name} OUTPUT_NAME)
set(FREERDP_BIN_NAME "${CMAKE_INSTALL_FULL_BINDIR}/${FREERDP_APP_NAME}") set(FREERDP_BIN_NAME "${CMAKE_INSTALL_FULL_BINDIR}/${FREERDP_APP_NAME}")
set(FREERDP_DESKTOP_NAME "${CMAKE_CURRENT_BINARY_DIR}/${FREERDP_BIN_NAME}.desktop") set(FREERDP_DESKTOP_NAME "${CMAKE_CURRENT_BINARY_DIR}/${FREERDP_BIN_NAME}.desktop")

2
resources/freerdp.desktop.template
View File

@@ -10,4 +10,4 @@ Type=Application
Keywords=remote desktop;rdp; Keywords=remote desktop;rdp;
Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network; Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network;
StartupNotify=true StartupNotify=true
StartupWMClass=com.freerdp.FreeRDP StartupWMClass=@FREERDP_STARTUP_CLASS@