--- gphoto-suite-2.3.1/src/libgphoto2/camlibs/ptp2/ChangeLog.orig 2006-12-24 22:05:37 +0300 +++ gphoto-suite-2.3.1/src/libgphoto2/camlibs/ptp2/ChangeLog 2007-06-05 20:37:30 +0400 @@ -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. + 2006-12-17 Marcus Meissner * library.c: Fixed leaking CameraFile + data on Canon and Nikon --- gphoto-suite-2.3.1/src/libgphoto2/camlibs/ptp2/library.c.orig 2006-12-24 22:05:37 +0300 +++ gphoto-suite-2.3.1/src/libgphoto2/camlibs/ptp2/library.c 2007-06-05 20:25:22 +0400 @@ -3437,7 +3437,11 @@ init_ptp_fs (Camera *camera, GPContext * 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)) @@ -3453,6 +3457,7 @@ init_ptp_fs (Camera *camera, GPContext * } /* fallthrough */ } +#endif fallback: /* Get file handles array for filesystem */