Commit f3e9c377 authored by Michael Reeves's avatar Michael Reeves

fix parameter in new desktop file. Cleanup from merdge

parent 7aafa5cf
......@@ -76,7 +76,6 @@ if(KFILEITEMACTIONPLUGIN_FOUND)
message(STATUS " => kdiff3fileitemactionplugin (KDiff3 contextmenu plugin for Konqueror/Dolphin, KDE>4.6) will be built.")
message(STATUS "")
#add_subdirectory(icons)
add_subdirectory(kdiff3fileitemactionplugin)
else(KFILEITEMACTIONPLUGIN_FOUND)
message(STATUS "")
......
......@@ -51,9 +51,9 @@ install(TARGETS kdiff3 ${INSTALL_TARGETS_DEFAULT_ARGS})
install( FILES kdiff3part.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( FILES kdiff3_part.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdiff3part )
install( FILES kdiff3_shell.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdiff3 )
install( PROGRAMS kdiff3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
#install( PROGRAMS org.kde.kdiff3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
#install( FILES org.kde.kdiff3.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata )
#install( PROGRAMS kdiff3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( PROGRAMS org.kde.kdiff3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES org.kde.kdiff3.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata )
ecm_install_icons(ICONS
hicolor/16-apps-kdiff3.png
......
......@@ -78,7 +78,7 @@ GenericName[uk]=Графічна оболонка Diff/Patch
GenericName[x-test]=xxDiff/Patch Frontendxx
GenericName[zh_CN]=Diff/Patch 前端
GenericName[zh_TW]=比較/修補程式前端介面
Exec=kdiff3 %i -caption "%c"
Exec=kdiff3 %i -qwindowtitle "%c"
Icon=kdiff3
Type=Application
X-DocPath=kdiff3/index.html
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment