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

[Danielle Foré]

drop .desktop file; Slingshot now uses switchboard API

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-07-15 01:34:47 +0000
+++ CMakeLists.txt	2015-09-13 18:34:25 +0000
@@ -31,11 +31,6 @@
 add_definitions (-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
 add_definitions (-DGNOME_DESKTOP_USE_UNSTABLE_API)
 
-# Files
-file (GLOB resources "${CMAKE_CURRENT_SOURCE_DIR}/data/*")
-
-install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-plug-display.desktop" DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
-
 # Add 'make dist' command for creating release tarball
 set (CPACK_PACKAGE_VERSION ${VERSION})
 set (CPACK_SOURCE_GENERATOR "TGZ")
 
=== removed directory 'data'
=== removed file 'data/pantheon-plug-display.desktop'
--- data/pantheon-plug-display.desktop	2015-05-26 21:17:17 +0000
+++ data/pantheon-plug-display.desktop	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=Displays
-Comment=Change resolution and position of monitors and projectors
-Exec=switchboard -o hardware-pantheon-display
-Icon=preferences-desktop-display
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=X-PANTHEON-Switchboard-Plugs;
-OnlyShowIn=Pantheon;
-Keywords=displays;monitor;projector;resolution;rotation;
-X-GNOME-Gettext-Domain=pantheon-display-plug