Switchboard Security & Privacy Plug

Merge lp:~elementary-pantheon/switchboard-plug-security-privacy/drop-desktop into lp:~elementary-apps/switchboard-plug-security-privacy/trunk

  1. drop-desktop
  2. Merge into trunk
Proposed by Danielle Foré
Status: Merged
Approved by: Cody Garver
Approved revision: 186
Merged at revision: 186
Proposed branch: lp:~elementary-pantheon/switchboard-plug-security-privacy/drop-desktop
Merge into: lp:~elementary-apps/switchboard-plug-security-privacy/trunk
Diff against target: 29 lines (+0/-13)
2 files modified
CMakeLists.txt (+0/-1)
data/pantheon-security-privacy-plug.desktop (+0/-12)
To merge this branch: bzr merge lp:~elementary-pantheon/switchboard-plug-security-privacy/drop-desktop
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+270908@code.launchpad.net

Commit message

drop .desktop file; Slingshot now uses switchboard API

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 05:27:56 +0000
+++ CMakeLists.txt 2015-09-13 18:21:23 +0000
@@ -41,7 +41,6 @@
41configure_file (${CMAKE_SOURCE_DIR}/data/org.pantheon.security-privacy.policy.cmake ${CMAKE_BINARY_DIR}/data/org.pantheon.security-privacy.policy)41configure_file (${CMAKE_SOURCE_DIR}/data/org.pantheon.security-privacy.policy.cmake ${CMAKE_BINARY_DIR}/data/org.pantheon.security-privacy.policy)
42install(FILES ${CMAKE_BINARY_DIR}/data/org.pantheon.security-privacy.policy DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/polkit-1/actions/)42install(FILES ${CMAKE_BINARY_DIR}/data/org.pantheon.security-privacy.policy DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/polkit-1/actions/)
43install(FILES ${CMAKE_SOURCE_DIR}/data/security-privacy-plug-helper PERMISSIONS OWNER_EXECUTE OWNER_READ DESTINATION ${PKGDATADIR}/)43install(FILES ${CMAKE_SOURCE_DIR}/data/security-privacy-plug-helper PERMISSIONS OWNER_EXECUTE OWNER_READ DESTINATION ${PKGDATADIR}/)
44install(FILES ${CMAKE_SOURCE_DIR}/data/pantheon-security-privacy-plug.desktop PERMISSIONS DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications/)
4544
46# Traslation stuff45# Traslation stuff
47add_subdirectory (po)46add_subdirectory (po)
4847
=== removed file 'data/pantheon-security-privacy-plug.desktop'
--- data/pantheon-security-privacy-plug.desktop 2014-08-09 18:22:03 +0000
+++ data/pantheon-security-privacy-plug.desktop 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
1[Desktop Entry]
2Name=Security & Privacy
3Comment=Privacy and Activity Manager
4Exec=switchboard -o pantheon-security-privacy
5Icon=preferences-system-privacy
6Terminal=false
7Type=Application
8StartupNotify=true
9Categories=GNOME;GTK;Settings;X-PANTHEON-Switchboard-Plugs;PersonalSettings
10OnlyShowIn=Pantheon;
11Keywords=Lock;Track;Firewall;ufw;
12X-GNOME-Gettext-Domain=pantheon-security-privacy-plug
13\ No newline at end of file0\ No newline at end of file

Subscribers

People subscribed via source and target branches