Merge lp:~elementary-pantheon/switchboard-plug-useraccounts/add-desktop into lp:~elementary-pantheon/switchboard-plug-useraccounts/trunk

Proposed by Danielle Foré
Status: Merged
Merged at revision: 160
Proposed branch: lp:~elementary-pantheon/switchboard-plug-useraccounts/add-desktop
Merge into: lp:~elementary-pantheon/switchboard-plug-useraccounts/trunk
Diff against target: 33 lines (+18/-0)
2 files modified
CMakeLists.txt (+6/-0)
data/pantheon-plug-useraccounts.desktop (+12/-0)
To merge this branch: bzr merge lp:~elementary-pantheon/switchboard-plug-useraccounts/add-desktop
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+259820@code.launchpad.net

Commit message

add .desktop file

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2015-04-15 12:28:29 +0000
+++ CMakeLists.txt 2015-05-21 17:55:13 +0000
@@ -37,6 +37,12 @@
37include (CPack)37include (CPack)
38add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)38add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
3939
40# Files
41file (GLOB resources "${CMAKE_CURRENT_SOURCE_DIR}/data/*")
42
43install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-plug-useraccounts.desktop" DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
44
45
40configure_file (${CMAKE_SOURCE_DIR}/data/org.pantheon.switchboard.user-accounts.policy.cmake ${CMAKE_BINARY_DIR}/data/org.pantheon.switchboard.user-accounts.policy)46configure_file (${CMAKE_SOURCE_DIR}/data/org.pantheon.switchboard.user-accounts.policy.cmake ${CMAKE_BINARY_DIR}/data/org.pantheon.switchboard.user-accounts.policy)
41install (FILES ${CMAKE_BINARY_DIR}/data/org.pantheon.switchboard.user-accounts.policy DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/polkit-1/actions/)47install (FILES ${CMAKE_BINARY_DIR}/data/org.pantheon.switchboard.user-accounts.policy DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/polkit-1/actions/)
4248
4349
=== added file 'data/pantheon-plug-useraccounts.desktop'
--- data/pantheon-plug-useraccounts.desktop 1970-01-01 00:00:00 +0000
+++ data/pantheon-plug-useraccounts.desktop 2015-05-21 17:55:13 +0000
@@ -0,0 +1,12 @@
1[Desktop Entry]
2Name=User Accounts
3Comment=Manage user accounts on your local system
4Exec=switchboard -o system-pantheon-useraccounts
5Icon=system-users
6Terminal=false
7Type=Application
8StartupNotify=true
9Categories=X-PANTHEON-Switchboard-Plugs;
10OnlyShowIn=Pantheon;
11Keywords=users;accounts;guest;password;
12X-GNOME-Gettext-Domain=switchboard

Subscribers

People subscribed via source and target branches