From 681f1435a4ebe2d853cb52dcc6f6594a8b481ebb Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 10 Jul 2008 09:21:59 +0000 Subject: [PATCH] also move IXUS 500 handling to ptp2 driver git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@11206 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/canon/ChangeLog | 4 ++++ camlibs/canon/canon.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/camlibs/canon/ChangeLog b/camlibs/canon/ChangeLog index c4ebf2b81..4a807bd31 100644 --- a/camlibs/canon/ChangeLog +++ b/camlibs/canon/ChangeLog @@ -1,3 +1,7 @@ +2008-07-10 Marcus Meissner + + * canon.c: Also handle IXUS 500 in the ptp2 driver only. + 2008-05-16 Moreno Marzolla * canon.c, library.c: Added beep and zoom configurations. diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c index f404166e8..8d09125c2 100644 --- a/camlibs/canon/canon.c +++ b/camlibs/canon/canon.c @@ -269,9 +269,11 @@ const struct canonCamModelData models[] = { {"Canon:PowerShot S70 (normal mode)", CANON_CLASS_5, 0x04A9, 0x30b1, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, {"Canon:PowerShot S60 (normal mode)", CANON_CLASS_5, 0x04A9, 0x30b2, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, {"Canon:PowerShot G6 (normal mode)", CANON_CLASS_5, 0x04A9, 0x30b3, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, +#if 0 /* also confirmed problematic by Ubuntu users, see https://bugs.launchpad.net/ubuntu/+source/libgphoto2/+bug/158119 */ {"Canon:Digital IXUS 500 (normal mode)",CANON_CLASS_5, 0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, {"Canon:PowerShot S500 Digital ELPH (normal mode)",CANON_CLASS_5, 0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, {"Canon:IXY Digital 500 (normal mode)", CANON_CLASS_5, 0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, +#endif {"Canon:PowerShot A75", CANON_CLASS_1, 0x04A9, 0x30b5, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, {"Canon:PowerShot SD110 Digital ELPH", CANON_CLASS_1, 0x04A9, 0x30b6, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, {"Canon:Digital IXUS IIs", CANON_CLASS_1, 0x04A9, 0x30b6, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},