Merge lp:~donadigo/switchboard-plug-parental-controls/client-desktop-fixes into lp:~elementary-pantheon/switchboard-plug-parental-controls/trunk

[Adam Bieńkowski]

* Add missing entries in the client desktop file

This branch adds missing entries to the client desktop file for linking it in deb-packaging to /etc/xdg/autostart.

[lp:~donadigo/switchboard-plug-parental-controls/client-desktop-fixes]

227. By Adam Bieńkowski on 2016-09-01

Add links file

[Adam Bieńkowski (donadigo)]

New branch was proposed here: https://code.launchpad.net/~donadigo/switchboard-plug-parental-controls/debian-packaging-fixes/+merge/305349

Unmerged revisions

227. By Adam Bieńkowski on 2016-09-01

Add links file

226. By Adam Bieńkowski on 2016-08-31

Add missing client desktop entries

=== modified file 'data/pantheon-parental-controls-client.desktop'
--- data/pantheon-parental-controls-client.desktop	2016-08-03 20:28:47 +0000
+++ data/pantheon-parental-controls-client.desktop	2016-09-01 19:24:34 +0000
@@ -1,6 +1,10 @@
 [Desktop Entry]
 Name=Parental Controls Client
 Exec=pantheon-parental-controls-client
+Comment=Show parental control restrictions
 Icon=preferences-system-parental-controls
-Comment=Show parental control restrictions
+Terminal=false
+Type=Application
 NoDisplay=true
+X-GNOME-AutoRestart=true
+X-GNOME-Autostart-Phase=Applications
\ No newline at end of file

=== added file 'debian/links'
--- debian/links	1970-01-01 00:00:00 +0000
+++ debian/links	2016-09-01 19:24:34 +0000
@@ -0,0 +1,1 @@
+usr/share/applications/pantheon-parental-controls-client.desktop etc/xdg/autostart/pantheon-parental-controls-client.desktop
\ No newline at end of file