[gnome-user-share] data: Fix turning on sharing not starting gnome-user-share

[Bastien Nocera <hadess src gnome org>]

commit 454676f158294cd9ac3e6d11a018a1333e37dac8
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Jun 13 16:26:21 2013 +0200

    data: Fix turning on sharing not starting gnome-user-share
    
    Use AutostartConditions in the desktop file to get gnome-user-share
    to start if either ObexFTP, ObexPush or WebDAV sharing is enabled.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=701188

 configure.ac                                       |    4 +++-
 data/Makefile.am                                   |    6 ++++--
 ...n.in => gnome-user-share-obexftp.desktop.in.in} |    1 +
 ....in => gnome-user-share-obexpush.desktop.in.in} |    1 +
 ...in.in => gnome-user-share-webdav.desktop.in.in} |    1 +
 po/POTFILES.in                                     |    4 +++-
 po/POTFILES.skip                                   |    4 +++-
 7 files changed, 16 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4208716..8959dd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -184,7 +184,9 @@ data/icons/16x16/Makefile
 data/icons/22x22/Makefile
 data/icons/32x32/Makefile
 data/icons/48x48/Makefile
-data/gnome-user-share.desktop.in
+data/gnome-user-share-webdav.desktop.in
+data/gnome-user-share-obexftp.desktop.in
+data/gnome-user-share-obexpush.desktop.in
 data/org.gnome.desktop.file-sharing.gschema.xml.in
 po/Makefile.in
 src/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 3c10c5e..63b875b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = icons
 @INTLTOOL_DESKTOP_RULE@
 autostartdir = $(sysconfdir)/xdg/autostart/
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-autostart_in_files = gnome-user-share.desktop.in
+autostart_in_files = gnome-user-share-obexftp.desktop.in gnome-user-share-obexpush.desktop.in 
gnome-user-share-webdav.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
@@ -20,7 +20,9 @@ convert_DATA = gnome-user-share.convert
 EXTRA_DIST = $(app_DATA)  \
        $(gsettings_in_files) \
        $(convert_DATA) \
-       gnome-user-share.desktop.in.in
+       gnome-user-share-obexftp.desktop.in.in \
+       gnome-user-share-obexpush.desktop.in.in \
+       gnome-user-share-webdav.desktop.in.in
 
 CLEANFILES = $(autostart_DATA) $(gsettings_DATA)
 
diff --git a/data/gnome-user-share.desktop.in.in b/data/gnome-user-share-obexftp.desktop.in.in
similarity index 77%
copy from data/gnome-user-share.desktop.in.in
copy to data/gnome-user-share-obexftp.desktop.in.in
index f388684..c36ffb9 100644
--- a/data/gnome-user-share.desktop.in.in
+++ b/data/gnome-user-share-obexftp.desktop.in.in
@@ -2,6 +2,7 @@
 _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 bluetooth-enabled
 Icon=folder-remote
 Exec= installdir@/gnome-user-share
 Terminal=false
diff --git a/data/gnome-user-share.desktop.in.in b/data/gnome-user-share-obexpush.desktop.in.in
similarity index 75%
copy from data/gnome-user-share.desktop.in.in
copy to data/gnome-user-share-obexpush.desktop.in.in
index f388684..2865d7c 100644
--- a/data/gnome-user-share.desktop.in.in
+++ b/data/gnome-user-share-obexpush.desktop.in.in
@@ -2,6 +2,7 @@
 _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 bluetooth-obexpush-enabled
 Icon=folder-remote
 Exec= installdir@/gnome-user-share
 Terminal=false
diff --git a/data/gnome-user-share.desktop.in.in b/data/gnome-user-share-webdav.desktop.in.in
similarity index 79%
rename from data/gnome-user-share.desktop.in.in
rename to data/gnome-user-share-webdav.desktop.in.in
index f388684..53c3c9a 100644
--- a/data/gnome-user-share.desktop.in.in
+++ b/data/gnome-user-share-webdav.desktop.in.in
@@ -2,6 +2,7 @@
 _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
 Terminal=false
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f3e6239..ad06ca2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,9 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 data/org.gnome.desktop.file-sharing.gschema.xml.in.in
-data/gnome-user-share.desktop.in.in
+data/gnome-user-share-obexftp.desktop.in.in
+data/gnome-user-share-obexpush.desktop.in.in
+data/gnome-user-share-webdav.desktop.in.in
 src/nautilus-share-bar.c
 src/share-extension.c
 src/http.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index d658f86..55d6924 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,5 +1,7 @@
 # List of source files that should NOT be translated.
 # Please keep this file sorted alphabetically.
 data/file-share-properties.ui
-data/gnome-user-share.desktop.in
+data/gnome-user-share-obexftp.desktop.in
+data/gnome-user-share-obexpush.desktop.in
+data/gnome-user-share-webdav.desktop.in
 data/org.gnome.desktop.file-sharing.gschema.xml.in