From deecca6ad26579169d00a71a05a5ffae7dd4fb6c Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 3 Mar 2007 20:39:35 +0000 Subject: [PATCH] disabled canon fast directory git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10028 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/ptp2/ChangeLog | 5 +++++ camlibs/ptp2/library.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/camlibs/ptp2/ChangeLog b/camlibs/ptp2/ChangeLog index 5f9242424..ccb839b01 100644 --- a/camlibs/ptp2/ChangeLog +++ b/camlibs/ptp2/ChangeLog @@ -1,3 +1,8 @@ +2007-03-03 Marcus Meissner + + * library.c: Disable Canon fast directory retrieval, + since it reportedly fails with the Canon PowerShot A430. + 2007-02-27 Marcus Meissner * library.c: If we have a Canon USB device, but with diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index aaad6c120..bca194270 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -3613,7 +3613,11 @@ init_ptp_fs (Camera *camera, GPContext *context) return PTP_RC_OK; } +#if 0 /* CANON also has fast directory retrieval. And it is mostly complete, so we can use it as full replacement */ + /* Unfortunately this fails on the PowerShot A430. + * And I don't want to whitelist everyone, because I just don't own all of them. + * *sigh* -Marcus */ if ((params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) && ptp_operation_issupported(params,PTP_OC_CANON_GetDirectory)) @@ -3629,6 +3633,7 @@ init_ptp_fs (Camera *camera, GPContext *context) } /* fallthrough */ } +#endif /* Microsoft/MTP also has fast directory retrieval. */ if ((params->deviceinfo.VendorExtensionID == PTP_VENDOR_MICROSOFT) &&