Fix whitespace, remove some hacks
commit0b1f43a127f0bda07f4706100302162eaa804e09
authorJosh Arenson <joshua.arenson@canonical.com>
dateFri 22 Jan 2016, 09:41 (11 years ago)
parentd33fc23
data/CMakeLists.txt+1−1
@@ -22,7 +22,7 @@ install(FILES
2222 DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/lightdm.conf.d
2323 )
2424
25− # install dash icon
25+# install dash icon
2626install(FILES
2727 ${CMAKE_CURRENT_SOURCE_DIR}/${DASH_APP}.png
2828 DESTINATION ${SHELL_APP_DIR}/Dash/
data/unity8-greeter-wrapper+2−2
@@ -38,7 +38,7 @@ set_greeter_var()
3838 initctl set-env --global "$1=$2"
3939 fi
4040}
41−echo "JOSH: starting greeter wrapper" >&2
41+
4242SUB_SOCKET=$XDG_RUNTIME_DIR/mir_socket
4343rm -f $SUB_SOCKET # clear socket in case we were hard shut down
4444
@@ -92,7 +92,7 @@ if [ "$(id -u phablet 2>/dev/null)" = "32011" ]; then
9292fi
9393
9494# And finally actually start the greeter
95−exec env MIR_SERVER_FILE=$SUB_SOCKET $TOUCH_WRAPPER $@ &
95+exec env QT_QPA_PLATFORM=ubuntumirclient MIR_SERVER_FILE=$SUB_SOCKET $TOUCH_WRAPPER $@ &
9696CMD_PID=$!
9797wait $CMD_PID
9898CMD_PID=
data/unity8-greeter.desktop.in+1−2
@@ -2,7 +2,6 @@
22Type=Application
33Name=Unity 8 Greeter
44Comment=The converged Unity shell's Greeter
5−#FIXME: This is a WAR for lp:1528082
6−Exec=env QT_QPA_PLATFORM=ubuntumirclient MIR_SERVER_PLATFORM_GRAPHICS_LIB=/usr/lib/x86_64-linux-gnu/mir/server-platform/graphics-mesa-kms.so.7 /usr/bin/unity8-greeter-wrapper /usr/bin/unity8 --mode=greeter
5+Exec=/usr/bin/unity8-greeter-wrapper /usr/bin/unity8 --mode=greeter
76X-LightDM-Session-Type=mir
87X-Ubuntu-Touch=true