[gvfs: 65/65] Merge branch 'mtp-backend'

[Philip Langdale <philipl src gnome org>]

commit 55ef4a2a84731f6e87f9d5983ef8473269df4f65
Merge: 4cd213d 66015d2
Author: Philip Langdale <philipl overt org>
Date:   Fri Jan 11 20:34:25 2013 -0800

    Merge branch 'mtp-backend'
    
    This merge brings in the libmtp based backend for MTP devices.
    Previously, MTP devices were handled, with limited success by the
    GPhoto2 backend as MTP is nominally backwards compatible with PTP.
    
    The most serious limitation was that the GPhoto2 backend operated
    in a way that doesn't work reliably with Android 4.x based devices.
    This problem is rectified by the new MTP backend.

 configure.ac                                       |   36 +
 daemon/.gitignore                                  |    1 +
 daemon/Makefile.am                                 |   19 +
 daemon/gvfsbackendmtp.c                            | 1536 ++++++++++++++++++++
 daemon/gvfsbackendmtp.h                            |   70 +
 daemon/mtp.mount.in                                |    4 +
 monitor/Makefile.am                                |    6 +-
 monitor/gphoto2/ggphoto2volumemonitor.c            |    7 +
 monitor/mtp/.gitignore                             |    1 +
 monitor/mtp/Makefile.am                            |   51 +
 monitor/mtp/gmtpvolume.c                           |  433 ++++++
 monitor/mtp/gmtpvolume.h                           |   59 +
 monitor/mtp/gmtpvolumemonitor.c                    |  330 +++++
 monitor/mtp/gmtpvolumemonitor.h                    |   53 +
 monitor/mtp/mtp-volume-monitor-daemon.c            |   36 +
 monitor/mtp/mtp.monitor                            |    4 +
 .../org.gtk.Private.MTPVolumeMonitor.service.in    |    3 +
 17 files changed, 2648 insertions(+), 1 deletions(-)
---
diff --cc daemon/Makefile.am
index 3a1f684,45b76f5..24622a1
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@@ -448,8 -446,21 +454,21 @@@ els
  gvfsd_gphoto2_LDADD = $(libraries) $(GPHOTO2_LIBS) $(HAL_LIBS)
  endif
  
+ gvfsd_mtp_SOURCES = \
+ 	gvfsbackendmtp.c gvfsbackendmtp.h \
+ 	daemon-main.c daemon-main.h \
+ 	daemon-main-generic.c
+ 
+ gvfsd_mtp_CPPFLAGS = \
+ 	-DBACKEND_HEADER=gvfsbackendmtp.h \
+ 	-DDEFAULT_BACKEND_TYPE=mtp \
+ 	-DBACKEND_TYPES='"mtp", G_VFS_TYPE_BACKEND_MTP,' \
+ 	$(GUDEV_CFLAGS) $(LIBMTP_CFLAGS)
+ 
+ gvfsd_mtp_LDADD = $(libraries) $(GUDEV_LIBS) $(LIBMTP_LIBS)
+ 
  gvfsd_http_SOURCES = \
 -	soup-input-stream.c soup-input-stream.h \
 +	gvfshttpinputstream.c gvfshttpinputstream.h \
  	gvfsbackendhttp.c gvfsbackendhttp.h \
  	daemon-main.c daemon-main.h \
  	daemon-main-generic.c