[gnome-user-share] obex: Remove OBEX FTP support

[Bastien Nocera <hadess src gnome org>]

commit f25f1f2e0f25d5a5cfbfc157f80f01a75e3445f9
Author: Bastien Nocera <hadess hadess net>
Date:   Sat Nov 9 15:27:02 2013 +0100

    obex: Remove OBEX FTP support
    
    The problem is two-fold:
    - There's barely any OBEX FTP clients left for the use cases we
      want to enable (sending files from a mobile device to the computer),
      and we don't have a native OBEX FTP client in GNOME anymore (as
      it was removed in recent gvfs)
    - It doesn't work as we expect, with no way to disable it when started.
      We expect to be able to cut the connection on already connected
      devices, for example, which obexd doesn't allow.

 configure.ac                                       |    1 -
 data/Makefile.am                                   |    3 +-
 data/gnome-user-share-obexftp.desktop.in.in        |   11 --
 ...rg.gnome.desktop.file-sharing.gschema.xml.in.in |   18 ---
 po/POTFILES.in                                     |    1 -
 po/POTFILES.skip                                   |    1 -
 src/obexftp.c                                      |  162 --------------------
 src/obexftp.h                                      |   30 ----
 src/user_share-private.h                           |    3 -
 9 files changed, 1 insertions(+), 229 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a8c881c..1809184 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,7 +192,6 @@ data/icons/22x22/Makefile
 data/icons/32x32/Makefile
 data/icons/48x48/Makefile
 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
diff --git a/data/Makefile.am b/data/Makefile.am
index 63b875b..cb0b667 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-obexftp.desktop.in gnome-user-share-obexpush.desktop.in 
gnome-user-share-webdav.desktop.in
+autostart_in_files = 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,6 @@ convert_DATA = gnome-user-share.convert
 EXTRA_DIST = $(app_DATA)  \
        $(gsettings_in_files) \
        $(convert_DATA) \
-       gnome-user-share-obexftp.desktop.in.in \
        gnome-user-share-obexpush.desktop.in.in \
        gnome-user-share-webdav.desktop.in.in
 
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 022ed86..5f54a18 100644
--- a/data/org.gnome.desktop.file-sharing.gschema.xml.in.in
+++ b/data/org.gnome.desktop.file-sharing.gschema.xml.in.in
@@ -12,24 +12,6 @@
                <_description>When to ask for passwords. Possible values are "never", "on_write", and 
"always".</_description>
        </key>
 
-       <key name="bluetooth-enabled" type="b">
-               <default>false</default>
-               <_summary>Share Public directory over Bluetooth</_summary>
-               <_description>If this is true, the Public directory in the users home directory will be 
shared over Bluetooth when the user is logged in.</_description>
-       </key>
-
-       <key name="bluetooth-allow-write" type="b">
-               <default>false</default>
-               <_summary>Whether to allow Bluetooth clients to write files.</_summary>
-               <_description>Whether to allow Bluetooth clients to write files, or share the files 
read-only.</_description>
-       </key>
-
-       <key name="bluetooth-require-pairing" type="b">
-               <default>true</default>
-               <_summary>Whether Bluetooth clients need to pair with the computer to send files.</_summary>
-               <_description>Whether Bluetooth clients need to pair with the computer to send 
files.</_description>
-       </key>
-
        <key name="bluetooth-obexpush-enabled" type="b">
                <default>false</default>
                <_summary>Whether Bluetooth clients can send files using ObexPush.</_summary>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ad06ca2..1f1f9d9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,6 @@
 # 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-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
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 55d6924..31cbd28 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,7 +1,6 @@
 # List of source files that should NOT be translated.
 # Please keep this file sorted alphabetically.
 data/file-share-properties.ui
-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
diff --git a/src/user_share-private.h b/src/user_share-private.h
index a7ef3fd..f57bc1e 100644
--- a/src/user_share-private.h
+++ b/src/user_share-private.h
@@ -28,12 +28,9 @@
 #define GNOME_USER_SHARE_SCHEMAS "org.gnome.desktop.file-sharing"
 
 #define FILE_SHARING_ENABLED "enabled"
-#define FILE_SHARING_BLUETOOTH_ENABLED "bluetooth-enabled"
 #define FILE_SHARING_BLUETOOTH_OBEXPUSH_ENABLED "bluetooth-obexpush-enabled"
 
 #define FILE_SHARING_REQUIRE_PASSWORD "require-password"
-#define FILE_SHARING_BLUETOOTH_ALLOW_WRITE "bluetooth-allow-write"
-#define FILE_SHARING_BLUETOOTH_REQUIRE_PAIRING "bluetooth-require-pairing"
 #define FILE_SHARING_BLUETOOTH_OBEXPUSH_ACCEPT_FILES "bluetooth-accept-files"
 #define FILE_SHARING_BLUETOOTH_OBEXPUSH_NOTIFY "bluetooth-notify"