diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt index a7156fe2d..6e6535448 100644 --- a/gtk/CMakeLists.txt +++ b/gtk/CMakeLists.txt @@ -48,7 +48,7 @@ add_custom_command( ) if(ENABLE_NLS) - set(${PROJECT_NAME}_DESKTOP_FILE "${PROJECT_BINARY_DIR}/${TR_NAME}-gtk.desktop") + set(${PROJECT_NAME}_DESKTOP_FILE "${PROJECT_BINARY_DIR}/${TR_NAME}.desktop") add_custom_command( OUTPUT ${${PROJECT_NAME}_DESKTOP_FILE} COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --desktop -d ${CMAKE_SOURCE_DIR}/po --template ${PROJECT_SOURCE_DIR}/transmission-gtk.desktop.in -o ${${PROJECT_NAME}_DESKTOP_FILE} @@ -193,5 +193,5 @@ if(ENABLE_NLS) install(FILES ${${PROJECT_NAME}_DESKTOP_FILE} DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) install(FILES ${${PROJECT_NAME}_APPDATA_FILE} DESTINATION ${CMAKE_INSTALL_DATADIR}/appdata) else() - install(FILES transmission-gtk.desktop.in DESTINATION ${CMAKE_INSTALL_DATADIR}/applications RENAME ${TR_NAME}-gtk.desktop) + install(FILES transmission-gtk.desktop.in DESTINATION ${CMAKE_INSTALL_DATADIR}/applications RENAME ${TR_NAME}.desktop) endif() diff --git a/gtk/transmission-gtk.desktop.in b/gtk/transmission-gtk.desktop.in index 8d568a8b7..23b7e8995 100644 --- a/gtk/transmission-gtk.desktop.in +++ b/gtk/transmission-gtk.desktop.in @@ -4,10 +4,10 @@ GenericName=BitTorrent Client Comment=Download and share files over BitTorrent # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Keywords=torrents;downloading;uploading;share;sharing; -Exec=transmission-gtk %U +Exec=transmission %U Icon=transmission Terminal=false -TryExec=transmission-gtk +TryExec=transmission Type=Application StartupNotify=true MimeType=application/x-bittorrent;x-scheme-handler/magnet; @@ -18,8 +18,8 @@ Actions=Pause;Minimize; [Desktop Action Pause] Name=Start Transmission with All Torrents Paused -Exec=transmission-gtk --paused +Exec=transmission --paused [Desktop Action Minimize] Name=Start Transmission Minimized -Exec=transmission-gtk --minimized +Exec=transmission --minimized diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index 65f170066..e81353a49 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -242,8 +242,6 @@ if(INSTALL_DOC) install(FILES ${TR_NAME}-qt.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) endif() -install(FILES transmission-qt.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) - if(ENABLE_NLS) install(FILES ${${PROJECT_NAME}_QM_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/${TR_NAME}/translations) endif()