From cf632626d056a8a221c0295c62aa5509d3484172 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Wed, 21 Aug 2013 22:41:35 +0200
Subject: Fix turning on sharing not starting mate-user-share

---
 data/Makefile.am                   | 6 ++++--
 data/mate-user-share.desktop.in.in | 9 ---------
 2 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 data/mate-user-share.desktop.in.in

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 85367cb..665cf93 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,7 +7,7 @@ desktop_in_files = mate-user-share-properties.desktop.in
 
 autostartdir = $(sysconfdir)/xdg/autostart/
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-autostart_in_files = mate-user-share.desktop.in
+autostart_in_files = mate-user-share-obexftp.desktop.in mate-user-share-obexpush.desktop.in mate-user-share-webdav.desktop.in
 
 appdir = $(datadir)/mate-user-share
 app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_user_2.4.conf dav_groupfile file-share-properties.ui
@@ -21,7 +21,9 @@ convert_DATA = mate-user-share.convert
 EXTRA_DIST = $(gsettings_SCHEMAS) \
 	$(app_DATA)		\
 	$(desktop_in_files)	\
-	mate-user-share.desktop.in.in \
+	mate-user-share-obexftp.desktop.in.in \
+	mate-user-share-obexpush.desktop.in.in \
+	mate-user-share-webdav.desktop.in.in \
 	file-share-properties.ui
 
 CLEANFILES = $(desktop_DATA) $(autostart_DATA)
diff --git a/data/mate-user-share.desktop.in.in b/data/mate-user-share.desktop.in.in
deleted file mode 100644
index 39fe98c..0000000
--- a/data/mate-user-share.desktop.in.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-_Name=Personal File Sharing
-_Comment=Launch Personal File Sharing if enabled
-Icon=folder-remote
-Exec=@installdir@/mate-user-share
-Terminal=false
-Type=Application
-Categories=
-OnlyShowIn=MATE;
-- 
cgit v1.2.1