[gvfs] Remove obsolte obexftp code

[Ondrej Holy <oholy src gnome org>]

commit 606ef241fb8677528bd5d5526854658f0f298a2c
Author: Ondrej Holy <oholy redhat com>
Date:   Wed Mar 4 17:13:40 2015 +0100

    Remove obsolte obexftp code

 INSTALL                                |    3 -
 client/test-uri-utils.c                |    2 -
 configure.ac                           |   35 -
 daemon/.gitignore                      |    1 -
 daemon/Makefile.am                     |   39 -
 daemon/gvfsbackendobexftp-cap-parser.c |  592 ---------
 daemon/gvfsbackendobexftp-cap-parser.h |   53 -
 daemon/gvfsbackendobexftp-fl-parser.c  |  437 -------
 daemon/gvfsbackendobexftp-fl-parser.h  |   37 -
 daemon/gvfsbackendobexftp.c            | 2183 --------------------------------
 daemon/gvfsbackendobexftp.h            |   50 -
 daemon/obexftp-marshal.list            |    5 -
 daemon/obexftp.mount.in                |    4 -
 man/gvfs.xml                           |    3 +-
 po/POTFILES.in                         |    1 -
 15 files changed, 1 insertions(+), 3444 deletions(-)
---
diff --git a/INSTALL b/INSTALL
index f10b340..e69de29 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,3 +0,0 @@
-The ObexFTP backend requires the obex-data-server D-Bus service in
-addition to the dependencies listed in the configure. See:
-http://wiki.muiline.com/obex-data-server
diff --git a/client/test-uri-utils.c b/client/test-uri-utils.c
index 4d21f16..5f1b4c6 100644
--- a/client/test-uri-utils.c
+++ b/client/test-uri-utils.c
@@ -14,8 +14,6 @@ static TestURIs uris[] = {
        { "https://[2001:0db8:85a3:08d3:1319:8a2e:0370:7344]:443/";, 
"[2001:0db8:85a3:08d3:1319:8a2e:0370:7344]", 443 },
        { "http://test:443/";, "test", 443 },
        { "http://test/";, "test", -1 },
-       { "obex://[00:FF:FF:FF:FF:FF]/MMC/foo.jpg", "[00:FF:FF:FF:FF:FF]", -1 },
-       { "obex://[00:FF:FF:FF:FF:FF]/C:", "[00:FF:FF:FF:FF:FF]", -1 },
        { "http://windows-host:8080/C:/";, "windows-host", 8080 },
        { "smb://user:password 192 192 192 192/foobar", "192.192.192.192", -1 },
        { 
"https://d134w4tst3t.s3.amazonaws.com/a?Signature=6VJ9%2BAdPVZ4Z7NnPShRvtDsLofc%3D&Expires=1249330377&AWSAccessKeyId=0EYZF4DV8A7WM0H73602";,
 "d134w4tst3t.s3.amazonaws.com", -1 },
diff --git a/configure.ac b/configure.ac
index f90c4ec..f868d9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -407,40 +407,6 @@ AC_SUBST(GOA_CFLAGS)
 
 AM_CONDITIONAL(USE_GOA, [test "$msg_goa" = "yes"])
 
-dnl *****************************************************
-dnl *** Check if we should build with obexftp backend ***
-dnl *****************************************************
-AC_ARG_ENABLE(obexftp, AS_HELP_STRING([--disable-obexftp],[build without ObexFTP backend]))
-msg_obexftp=no
-OBEXFTP_LIBS=
-OBEXFTP_CFLAGS=
-
-if test "x$enable_obexftp" != "xno";  then
-  PKG_CHECK_EXISTS(dbus-glib-1 bluez >= 4.0, msg_obexftp=yes)
-
-  dnl Make sure we have expat
-  AC_CHECK_LIB(expat, XML_ParserCreate_MM,
-               [ AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false) ],
-               have_expat=false)
-
-  if test "x$msg_obexftp" = "xyes" -a "x$have_expat" = "xtrue"; then
-    PKG_CHECK_MODULES(OBEXFTP, dbus-glib-1 bluez >= 4.0)
-    AC_SUBST(OBEXFTP_LIBS)
-    AC_SUBST(OBEXFTP_CFLAGS)
-
-    msg_obexftp=yes
-    AC_DEFINE(HAVE_OBEXFTP, 1, [Define to 1 if ObexFTP is going to be built])
-    EXPAT_CFLAGS=""
-    EXPAT_LIBS="-lexpat"
-  else
-    msg_obexftp=no
-  fi
-fi
-
-AC_SUBST(EXPAT_CFLAGS)
-AC_SUBST(EXPAT_LIBS)
-AM_CONDITIONAL(USE_OBEXFTP, [test "$msg_obexftp" = "yes"])
-
 dnl *************************
 dnl *** Check for gphoto2 ***
 dnl *************************
@@ -961,7 +927,6 @@ echo "
 
        Blu-ray metadata support:     $msg_bluray
         HTTP/WebDAV support:          $msg_http
-        ObexFTP support               $msg_obexftp
        Samba support:                $msg_samba
        FUSE support:                 $msg_fuse
         CDDA support:                 $msg_cdda
diff --git a/daemon/.gitignore b/daemon/.gitignore
index 96935bc..408dad9 100644
--- a/daemon/.gitignore
+++ b/daemon/.gitignore
@@ -15,7 +15,6 @@ gvfsd-localtest
 gvfsd-network
 gvfsd-mtp
 gvfsd-nfs
-gvfsd-obexftp
 gvfsd-recent
 gvfsd-sftp
 gvfsd-smb
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 13c7d99..34e4ad8 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -11,7 +11,6 @@ AM_CPPFLAGS =                                 \
        -I$(top_builddir)                       \
        -I$(top_builddir)/common                \
        $(GLIB_CFLAGS)                          \
-       $(OBEXFTP_CFLAGS) $(EXPAT_CFLAGS)       \
        $(KEYRING_CFLAGS)                       \
        -DLIBEXEC_DIR=\"$(libexecdir)\"         \
        -DMOUNTABLE_DIR=\"$(mountdir)\"         \
@@ -89,20 +88,6 @@ mount_DATA += mtp.mount
 libexec_PROGRAMS += gvfsd-mtp
 endif
 
-mount_in_files += obexftp.mount.in
-if USE_OBEXFTP
-mount_DATA += obexftp.mount
-libexec_PROGRAMS += gvfsd-obexftp
-BUILT_SOURCES = obexftp-marshal.c obexftp-marshal.h
-
-obexftp-marshal.h: obexftp-marshal.list
-       $(AM_V_GEN) glib-genmarshal $< --prefix=obexftp_marshal --header > $@
-
-obexftp-marshal.c: obexftp-marshal.list
-       $(AM_V_GEN) echo "#include \"obexftp-marshal.h\"" > $@ && glib-genmarshal $< --prefix=obexftp_marshal 
--body >> $@
-
-endif
-
 mount_in_files += dns-sd.mount.in
 if HAVE_AVAHI
 mount_DATA += dns-sd.mount
@@ -140,7 +125,6 @@ noinst_DATA = $(mount_DATA:.mount=.localmount)
 EXTRA_DIST =                           \
        gvfs-daemon.service.in          \
        $(mount_in_files)               \
-       obexftp-marshal.list            \
        $(gvfs_gschemas)                \
        $(gvfs_gschemas_convert_DATA)   \
        $(gsettings_ENUM_FILES)         \
@@ -275,29 +259,6 @@ gvfsd_smb_browse_CPPFLAGS = \
 
 gvfsd_smb_browse_LDADD = $(SAMBA_LIBS) $(libraries)
 
-gvfsd_obexftp_SOURCES = \
-       gvfsbackendobexftp.c gvfsbackendobexftp.h \
-       obexftp-marshal.c obexftp-marshal.h \
-       gvfsbackendobexftp-fl-parser.c gvfsbackendobexftp-fl-parser.h \
-       gvfsbackendobexftp-cap-parser.c gvfsbackendobexftp-cap-parser.h \
-       daemon-main.c daemon-main.h \
-       daemon-main-generic.c
-
-gvfsd_obexftp_CPPFLAGS = \
-       $(flags) \
-       -DBACKEND_HEADER=gvfsbackendobexftp.h \
-       -DDEFAULT_BACKEND_TYPE=obex \
-       -DMAX_JOB_THREADS=1 \
-       -DBACKEND_TYPES='"obex", G_VFS_TYPE_BACKEND_OBEXFTP,'
-if USE_HAL
-gvfsd_obexftp_CPPFLAGS += $(HAL_CFLAGS)
-endif
-
-gvfsd_obexftp_LDADD = $(OBEXFTP_LIBS) $(EXPAT_LIBS) $(libraries)
-if USE_HAL
-gvfsd_obexftp_LDADD += $(HAL_LIBS)
-endif
-
 gvfsd_ftp_SOURCES = \
        gvfsftpconnection.c gvfsftpconnection.h \
        gvfsftpdircache.c gvfsftpdircache.h \
diff --git a/man/gvfs.xml b/man/gvfs.xml
index cc52716..b85b81f 100644
--- a/man/gvfs.xml
+++ b/man/gvfs.xml
@@ -37,7 +37,7 @@
                 includes a 'local' implementation using POSIX. gvfs
                 provides implementations that go beyond that and allow
                 to access files and storage using many protocols, such
-                as ftp, http, sftp, dav, obexftp, etc. It also provides
+                as ftp, http, sftp, dav, etc. It also provides
                 support for trash folders, for cd burning and for monitoring
                 interesting devices and volumes on the computer.</para>
 
@@ -77,7 +77,6 @@
                         <listitem><para>gvfsd-http - mounts over HTTP</para></listitem>
                         <listitem><para>gvfsd-localtest - a test backend</para></listitem>
                         <listitem><para>gvfsd-network - provides network://</para></listitem>
-                        <listitem><para>gvfsd-obexftp - mounts over obexftp</para></listitem>
                         <listitem><para>gvfsd-recent - provides recent://</para></listitem>
                         <listitem><para>gvfsd-sftp - mounts over sftp</para></listitem>
                         <listitem><para>gvfsd-smb - mounts Windows Shares Filesystem 
volumes</para></listitem>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 60f500a..9293930 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -35,7 +35,6 @@ daemon/gvfsbackendlocaltest.c
 daemon/gvfsbackendmtp.c
 daemon/gvfsbackendnetwork.c
 daemon/gvfsbackendnfs.c
-daemon/gvfsbackendobexftp.c
 daemon/gvfsbackendrecent.c
 daemon/gvfsbackendsftp.c
 daemon/gvfsbackendsmbbrowse.c