From ba142e9fe7b2241a87d8a6a10cefc08085e01cb6 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 9 Apr 2005 18:58:56 +0000 Subject: [PATCH] * pdc320.c: corectly detect both : and non : names. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7762 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/polaroid/ChangeLog | 5 +++++ camlibs/polaroid/pdc320.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/camlibs/polaroid/ChangeLog b/camlibs/polaroid/ChangeLog index bd015529c..c95170e41 100644 --- a/camlibs/polaroid/ChangeLog +++ b/camlibs/polaroid/ChangeLog @@ -1,3 +1,8 @@ +2005-04-09 Marcus Meissner + + * pdc320.c: Check for both : and non : names + in model detection. + 2004-01-08 Marcus Meissner From Mark Slemko diff --git a/camlibs/polaroid/pdc320.c b/camlibs/polaroid/pdc320.c index 700b5d77f..4131f2652 100644 --- a/camlibs/polaroid/pdc320.c +++ b/camlibs/polaroid/pdc320.c @@ -525,9 +525,13 @@ camera_init (Camera *camera, GPContext *context) /* What model are we talking to? */ gp_camera_get_abilities (camera, &abilities); - if (!strcmp (abilities.model, "Polaroid:Fun! 320")) + if ( !strcmp (abilities.model, "Polaroid:Fun! 320") || + !strcmp (abilities.model, "Polaroid Fun! 320") + ) camera->pl->model = PDC320; - else if (!strcmp (abilities.model, "Polaroid:640SE")) + else if (!strcmp (abilities.model, "Polaroid:640SE") || + !strcmp (abilities.model, "Polaroid 640SE") + ) camera->pl->model = PDC640SE; else { free (camera->pl);