Merge lp:~nonamenoname/switchboard-plug-onlineaccounts/fix-1084101 into lp:~elementary-apps/switchboard-plug-onlineaccounts/trunk

Proposed by No Name
Status: Merged
Approved by: Corentin Noël
Approved revision: 52
Merged at revision: 50
Proposed branch: lp:~nonamenoname/switchboard-plug-onlineaccounts/fix-1084101
Merge into: lp:~elementary-apps/switchboard-plug-onlineaccounts/trunk
Diff against target: 31 lines (+15/-1)
2 files modified
data/CMakeLists.txt (+3/-1)
data/pantheon-plug-onlineaccounts.desktop (+12/-0)
To merge this branch: bzr merge lp:~nonamenoname/switchboard-plug-onlineaccounts/fix-1084101
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+217135@code.launchpad.net

Commit message

added desktop file

Description of the change

Only added .desktop file and installation

To post a comment you must log in.
51. By Simon Dieterle <email address hidden>

changed install dir

52. By Simon Dieterle <email address hidden>

removed X-Ubuntu

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

Subscribers

People subscribed via source and target branches

to all changes: