git.iko.soy/unity8
on xenial help sign in
Refactor to remove redundant lightdm naming
312c81eJosh Arenson
CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -108,7 +108,7 @@ set(SHELL_APP unity8)
108set(DASH_APP unity8-dash)
108set(DASH_APP unity8-dash)
109set(SCOPE_TOOL unity-scope-tool)
109set(SCOPE_TOOL unity-scope-tool)
110set(INDICATORS_CLIENT_APP indicators-client)
110set(INDICATORS_CLIENT_APP indicators-client)
111−set(LIGHTDM_GREETER_APP lightdm-unity8-greeter)
111+set(GREETER_APP unity8-greeter)
112set(MOCK_INDICATOR_SERVICE_APP unity-mock-indicator-service)
112set(MOCK_INDICATOR_SERVICE_APP unity-mock-indicator-service)
113
113
114include_directories(
114include_directories(
data/CMakeLists.txt+2−2
@@ -2,7 +2,7 @@
2configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)
2configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)
3configure_file(${DASH_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop @ONLY)
3configure_file(${DASH_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop @ONLY)
4configure_file(${INDICATORS_CLIENT_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop @ONLY)
4configure_file(${INDICATORS_CLIENT_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop @ONLY)
5−configure_file(${LIGHTDM_GREETER_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${LIGHTDM_GREETER_APP}.desktop @ONLY)
5+configure_file(${GREETER_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop @ONLY)
6
6
7# install desktop files
7# install desktop files
8install(FILES
8install(FILES
@@ -13,7 +13,7 @@ install(FILES
13 )
13 )
14
14
15install(FILES
15install(FILES
16− ${CMAKE_CURRENT_BINARY_DIR}/${LIGHTDM_GREETER_APP}.desktop
16+ ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop
17 DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/greeters
17 DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/greeters
18 )
18 )
19
19
data/lightdm-unity8-greeter.desktop.in → data/unity8-greeter.desktop.inrenamed+2−2
@@ -1,7 +1,7 @@
1[Desktop Entry]
1[Desktop Entry]
2Type=Application
2Type=Application
3−Name=LightDM Unity 8 Greeter
3+Name=Unity 8 Greeter
4−Comment=The converged Unity shell's LightDM Greeter
4+Comment=The converged Unity shell's Greeter
5Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8 --mode=greeter
5Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8 --mode=greeter
6Terminal=false
6Terminal=false
7Icon=
7Icon=