[gnome-user-share] data: Get started by the g-s-d sharing plugin

[Bastien Nocera <hadess src gnome org>]

commit 3d0e54cc85c72cfded71e704ee5a138391516975
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Jun 17 12:13:10 2014 +0200

    data: Get started by the g-s-d sharing plugin
    
    Remove the AutostartCondition so that we're started by the
    gnome-settings-daemon sharing plugin, not by gnome-session directly.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=731860

 data/Makefile.am                                   |    8 ++++++--
 data/gnome-user-share-webdav.desktop.in.in         |    3 +--
 data/gnome-user-share.convert                      |    1 -
 ...rg.gnome.desktop.file-sharing.gschema.xml.in.in |    6 ------
 4 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index cb0b667..99a0740 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,9 +1,13 @@
 SUBDIRS = icons
 
 @INTLTOOL_DESKTOP_RULE@
+applicationsdir = $(datadir)/applications/
+applications_DATA = $(applications_in_files:.desktop.in=.desktop)
+applications_in_files = gnome-user-share-webdav.desktop.in
+
 autostartdir = $(sysconfdir)/xdg/autostart/
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-autostart_in_files = gnome-user-share-obexpush.desktop.in gnome-user-share-webdav.desktop.in
+autostart_in_files = gnome-user-share-obexpush.desktop.in
 
 appdir = $(datadir)/gnome-user-share
 app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_user_2.4.conf dav_groupfile
@@ -23,7 +27,7 @@ EXTRA_DIST = $(app_DATA)  \
        gnome-user-share-obexpush.desktop.in.in \
        gnome-user-share-webdav.desktop.in.in
 
-CLEANFILES = $(autostart_DATA) $(gsettings_DATA)
+CLEANFILES = $(applications_DATA) $(autostart_DATA) $(gsettings_DATA)
 
 DISTCLEANFILES = $(gsettings_DATA)
 
diff --git a/data/gnome-user-share-webdav.desktop.in.in b/data/gnome-user-share-webdav.desktop.in.in
index 025443b..4b542fe 100644
--- a/data/gnome-user-share-webdav.desktop.in.in
+++ b/data/gnome-user-share-webdav.desktop.in.in
@@ -2,10 +2,9 @@
 _Name=Personal File Sharing
 _Comment=Launch Personal File Sharing if enabled
 _Keywords=share;files;bluetooth;obex;http;network;copy;send;
-AutostartCondition=GSETTINGS org.gnome.desktop.file-sharing enabled
 Icon=folder-remote
 Exec= installdir@/gnome-user-share-webdav
 Terminal=false
 Type=Application
 Categories=
-OnlyShowIn=GNOME;
+NoDisplay=true
diff --git a/data/gnome-user-share.convert b/data/gnome-user-share.convert
index 89fd986..4248803 100644
--- a/data/gnome-user-share.convert
+++ b/data/gnome-user-share.convert
@@ -1,6 +1,5 @@
 [org.gnome.desktop.file-sharing]
 
-enabled = /desktop/gnome/file_sharing/enabled
 require-password = /desktop/gnome/file_sharing/require_password
 bluetooth-enabled = /desktop/gnome/file_sharing/bluetooth_enabled
 bluetooth-allow-write = /desktop/gnome/file_sharing/bluetooth_allow_write
diff --git a/data/org.gnome.desktop.file-sharing.gschema.xml.in.in 
b/data/org.gnome.desktop.file-sharing.gschema.xml.in.in
index 33020d5..277a2b7 100644
--- a/data/org.gnome.desktop.file-sharing.gschema.xml.in.in
+++ b/data/org.gnome.desktop.file-sharing.gschema.xml.in.in
@@ -1,11 +1,5 @@
 <schemalist>
 <schema gettext-domain="gnome-user-share" id="org.gnome.desktop.file-sharing" 
path="/org/gnome/desktop/file-sharing/">
-       <key name="enabled" type="b">
-               <default>false</default>
-               <_summary>Share Public directory over the network</_summary>
-               <_description>If this is true, the Public directory in the users home directory will be 
shared over the network when the user is logged in.</_description>
-       </key>
-
        <key name="require-password" type="s">
                <default>'never'</default>
                <_summary>When to require passwords</_summary>