Switchboard Online Accounts Plug

Merge lp:~elementary-pantheon/switchboard-plug-onlineaccounts/no-desktop into lp:~elementary-apps/switchboard-plug-onlineaccounts/trunk

  1. no-desktop
  2. Merge into trunk
Proposed by Danielle Foré
Status: Merged
Approved by: Corentin Noël
Approved revision: 243
Merged at revision: 243
Proposed branch: lp:~elementary-pantheon/switchboard-plug-onlineaccounts/no-desktop
Merge into: lp:~elementary-apps/switchboard-plug-onlineaccounts/trunk
Diff against target: 28 lines (+0/-14)
2 files modified
data/CMakeLists.txt (+0/-2)
data/pantheon-plug-onlineaccounts.desktop (+0/-12)
To merge this branch: bzr merge lp:~elementary-pantheon/switchboard-plug-onlineaccounts/no-desktop
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+281165@code.launchpad.net

Commit message

remove .desktop file

Description of the change

no longer needed since Slingshot pulls directly from switchboard API. This .desktop confuses appstream and makes online accounts show twice in search results

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 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2014-04-24 22:20:34 +0000
3+++ data/CMakeLists.txt 2015-12-22 01:26:21 +0000
4@@ -3,5 +3,3 @@
5
6 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${ONLINE_ACCOUNTS_SERVICE}.cmake ${CMAKE_CURRENT_BINARY_DIR}/${ONLINE_ACCOUNTS_SERVICE})
7 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ONLINE_ACCOUNTS_SERVICE} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dbus-1/services/)
8-
9-install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/pantheon-plug-onlineaccounts.desktop" DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
10\ No newline at end of file
11
12=== removed file 'data/pantheon-plug-onlineaccounts.desktop'
13--- data/pantheon-plug-onlineaccounts.desktop 2014-04-24 22:36:38 +0000
14+++ data/pantheon-plug-onlineaccounts.desktop 1970-01-01 00:00:00 +0000
15@@ -1,12 +0,0 @@
16-[Desktop Entry]
17-Name=Online Accounts
18-Comment=Synchronize your computer with all your online accounts around the web…
19-Exec=switchboard -o network-pantheon-online-accounts
20-Icon=preferences-desktop-online-accounts
21-Terminal=false
22-Type=Application
23-StartupNotify=true
24-Categories=X-PANTHEON-Switchboard-Plugs;
25-OnlyShowIn=Pantheon;
26-Keywords=Power;Energy;Battery
27-X-GNOME-Gettext-Domain=switchboard
28\ No newline at end of file

Subscribers

People subscribed via source and target branches