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
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-04-15 12:28:29 +0000
3+++ CMakeLists.txt 2015-05-21 17:55:13 +0000
4@@ -37,6 +37,12 @@
5 include (CPack)
6 add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
7
8+# Files
9+file (GLOB resources "${CMAKE_CURRENT_SOURCE_DIR}/data/*")
10+
11+install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-plug-useraccounts.desktop" DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
12+
13+
14 configure_file (${CMAKE_SOURCE_DIR}/data/org.pantheon.switchboard.user-accounts.policy.cmake ${CMAKE_BINARY_DIR}/data/org.pantheon.switchboard.user-accounts.policy)
15 install (FILES ${CMAKE_BINARY_DIR}/data/org.pantheon.switchboard.user-accounts.policy DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/polkit-1/actions/)
16
17
18=== added file 'data/pantheon-plug-useraccounts.desktop'
19--- data/pantheon-plug-useraccounts.desktop 1970-01-01 00:00:00 +0000
20+++ data/pantheon-plug-useraccounts.desktop 2015-05-21 17:55:13 +0000
21@@ -0,0 +1,12 @@
22+[Desktop Entry]
23+Name=User Accounts
24+Comment=Manage user accounts on your local system
25+Exec=switchboard -o system-pantheon-useraccounts
26+Icon=system-users
27+Terminal=false
28+Type=Application
29+StartupNotify=true
30+Categories=X-PANTHEON-Switchboard-Plugs;
31+OnlyShowIn=Pantheon;
32+Keywords=users;accounts;guest;password;
33+X-GNOME-Gettext-Domain=switchboard

Subscribers

People subscribed via source and target branches