← Back to branch summary

~tatokis/unity/gcc-72-errors

~tatokis/unity/gcc-72-errors

« back to all changes in this revision

Viewing changes to services/unity-panel-service-lockscreen.conf.in

Committer: Marco Trevisan (Treviño)
Date: 2016-08-31 15:57:01 UTC
mfrom: (4177.4.4 cmake-libs-prefixes)
mto: (3788.10.6 input-monitor-lockscreen-blank-window)
mto: This revision was merged to the branch mainline in revision 4193.
Revision ID: mail@3v1n0.net-20160831155701-97jxoyi4a8v9s13y

Merging with lp:~3v1n0/unity/cmake-libs-prefixes

files added:
resources/overlay_top_left_tile.png

unity-shared/SpreadWidgets.cpp

unity-shared/SpreadWidgets.h

files removed:
resources/dash_bottom_right_corner_rotated.png

resources/dash_bottom_right_corner_rotated_mask.png

resources/dash_bottom_tile.png

resources/dash_top_border_tile.png

resources/dash_top_border_tile_mask.png

resources/dash_top_left_corner.png

resources/dash_top_left_corner_mask.png

resources/dash_top_right_corner_rotated.png

resources/dash_top_right_corner_rotated_mask.png

files renamed:
com.canonical.Unity.gschema.xml => data/com.canonical.Unity.gschema.xml

files modified:
CMakeLists.txt

UnityCore/DBusIndicators.cpp

config.h.cmake

dash/FilterExpanderLabel.cpp

dash/FilterExpanderLabel.h

data/CMakeLists.txt

debian/changelog

debian/control

decorations/DecoratedWindow.cpp

decorations/DecoratedWindow.h

decorations/DecorationsForceQuitDialog.cpp

decorations/DecorationsPriv.h

decorations/DecorationsWindowButton.cpp

decorations/DecorationsWindowButton.h

launcher/SwitcherController.cpp

launcher/SwitcherView.cpp

lockscreen/UserAuthenticatorPam.cpp

panel/PanelView.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

services/CMakeLists.txt

services/unity-panel-service-lockscreen.conf.in

services/unity-panel-service-lockscreen.service.in

services/unity-panel-service.conf.in

services/unity-panel-service.service.in

shutdown/SessionView.cpp

tools/CMakeLists.txt

tools/unity-compiz-profile-select.in

unity-shared/CMakeLists.txt

unity-shared/CompizUtils.cpp

unity-shared/CompizUtils.h

unity-shared/DashStyle.cpp

unity-shared/DashStyle.h

unity-shared/DecorationStyle.cpp

unity-shared/OverlayRenderer.cpp

unity-shared/UnityWindowView.cpp

Show diffs side-by-side

added added

removed removed

services/unity-panel-service-lockscreen.conf.in

5

5

stop on desktop-unlock

6

6

7

7

respawn

8

exec ${CMAKE_INSTALL_FULL_LIBDIR}/unity/unity-panel-service --lockscreen-mode

8

exec @UNITY_LIBDIR@/unity-panel-service --lockscreen-mode

Older »